From 793ebb8ba8260ced7df87f8f3e90a46b04ee2bf6 Mon Sep 17 00:00:00 2001
From: HeyImChris <48299693+HeyImChris@users.noreply.github.com>
Date: Fri, 14 Jan 2022 13:11:09 -0800
Subject: [PATCH] Merge 0.66 into master (#951)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Rename immediate to ReactNativeMicrotask in Bridge

Summary:
Changelog: [Internal]

This diff replaced all the internal occurrences of "Immediate" with
"ReactNativeMicrotask" in the legacy bridge and then polyfilled the
original immediate APIs during the timer setup phases as aliases of them.

Note that this diff is part of a larger refactoring.

Reviewed By: RSNara

Differential Revision: D29785430

fbshipit-source-id: 7325d2a7358a6c9baa3e9abb8acf90414de5072f

* Implement View.removeClippedSubviews prop

Summary:
Changelog: [internal]

Fabric didn't have prop [removeClippedSubviews](https://reactnative.dev/docs/view#removeclippedsubviews) implemented. This diff adds it. It is

Reviewed By: JoshuaGross

Differential Revision: D29906458

fbshipit-source-id: 5851fa41d7facea9aab73ca131b4a0d23a2411ea

* Add "Use Native Driver" control to RNTester Animated Composing example

Summary: Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D29832704

fbshipit-source-id: dfd37d08d0f25fe86716a21682648894e8adad8b

* docs: Fix dead links in README for rn-tester (#31901)

Summary:
Part of https://github.com/facebook/react-native/issues/31788

~Updated link in README that was pointing to master branch to main branch~

Realized that link in rn-tester README and ReactAndroid README leads to a dead link, so I've fixed the links

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[INTERNAL] [FIXED] - Fix dead links in README

Pull Request resolved: https://github.com/facebook/react-native/pull/31901

Test Plan: - [ ] Updated link directs you to appropriate page

Reviewed By: PeteTheHeat

Differential Revision: D29933044

Pulled By: GijsWeterings

fbshipit-source-id: c1f301626acbb2995d74f78d8bc19214c70e9319

* docs: update links to forwarded page (#31903)

Summary:
Some of the links in `CONTRIBUTING.md` redirects you to a different page.
I've fixed the links so each link would directly send users to the appropriate page.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[INTERNAL] [Changed] - update links in CONTRIBUTING.md

Pull Request resolved: https://github.com/facebook/react-native/pull/31903

Test Plan: - [ ] Change links shows the appropriate content

Reviewed By: lunaleaps

Differential Revision: D29933105

Pulled By: GijsWeterings

fbshipit-source-id: b5be74181f8a8e88d8f43e44c469337b7393dedf

* Remove redundant warnings for RCTMountingManager

Summary:
Changelog: [internal]

The warnings are in-actionable for product engineers.

Reviewed By: JoshuaGross

Differential Revision: D29911438

fbshipit-source-id: f0f81588e8cbe88059e531c8be302ab19b8eb83f

* Ignore when a text string or number is supplied as a child.

Summary:
Currently, React Native throws an invariant violation error when a text string or number is supplied as a child. This is undesirable because core library components should be fault-tolerant and degrade gracefully (with soft errors, if relevant).

This change will work when a change in the host configs are landed (https://github.com/facebook/react/pull/21953).

Changelog: [internal]

Reviewed By: yungsters, sammy-SC

Differential Revision: D29894182

fbshipit-source-id: 827ff299991a476b57981382d196c7ee1396ec28

* React Native sync for revisions cae6350...419cc9c

Summary:
This sync includes the following changes:
- **[419cc9c37](https://github.com/facebook/react/commit/419cc9c37 )**: Fix: Hide new/updated nodes in already hidden tree ([#21929](https://github.com/facebook/react/pull/21929)) //<Andrew Clark>//
- **[4758e4533](https://github.com/facebook/react/commit/4758e4533 )**: React Native: Export getInspectorDataForInstance API ([#21572](https://github.com/facebook/react/pull/21572)) //<Brian Vaughn>//
- **[ae5d26154](https://github.com/facebook/react/commit/ae5d26154 )**: Fix: LegacyHidden should not toggle effects ([#21928](https://github.com/facebook/react/pull/21928)) //<Andrew Clark>//
- **[9ab90de60](https://github.com/facebook/react/commit/9ab90de60 )**: Clean-up: Move Offscreen logic from Suspense fiber ([#21925](https://github.com/facebook/react/pull/21925)) //<Andrew Clark>//
- **[3f62dec84](https://github.com/facebook/react/commit/3f62dec84 )**: Typo fix ([#21729](https://github.com/facebook/react/pull/21729)) //<Deniz Susman>//
- **[5579f1dc8](https://github.com/facebook/react/commit/5579f1dc8 )**: Update test comments with explanations ([#21857](https://github.com/facebook/react/pull/21857)) //<Ricky>//
- **[262ff7ad2](https://github.com/facebook/react/commit/262ff7ad2 )**: Refactor "disappear" logic into its own traversal ([#21901](https://github.com/facebook/react/pull/21901)) //<Andrew Clark>//
- **[34600f4fa](https://github.com/facebook/react/commit/34600f4fa )**: Refactor "reappear" logic into its own traversal ([#21898](https://github.com/facebook/react/pull/21898)) //<Andrew Clark>//
- **[310187264](https://github.com/facebook/react/commit/310187264 )**: Clean up flushSync flow types ([#21887](https://github.com/facebook/react/pull/21887)) //<Ricky>//
- **[a97b5ac07](https://github.com/facebook/react/commit/a97b5ac07 )**: [Bugfix] Don't hide/unhide unless visibility changes ([#21875](https://github.com/facebook/react/pull/21875)) //<Andrew Clark>//
- **[81346764b](https://github.com/facebook/react/commit/81346764b )**: Run persistent tests in more configurations in CI ([#21880](https://github.com/facebook/react/pull/21880)) //<Andrew Clark>//
- **[9090257e6](https://github.com/facebook/react/commit/9090257e6 )**: fix: restore execution context after RetryAfterError completed ([#21766](https://github.com/facebook/react/pull/21766)) //<Sebastian Silbermann>//
- **[14bac6193](https://github.com/facebook/react/commit/14bac6193 )**: Allow components to render undefined ([#21869](https://github.com/facebook/react/pull/21869)) //<Ricky>//
- **[87b67d319](https://github.com/facebook/react/commit/87b67d319 )**: Enable scheduling profiler flag for react-dom profiling builds ([#21867](https://github.com/facebook/react/pull/21867)) //<Brian Vaughn>//
- **[464f27572](https://github.com/facebook/react/commit/464f27572 )**: Update link to flow ([#21862](https://github.com/facebook/react/pull/21862)) //<Ehsan Hosseini>//
- **[9f5224a9c](https://github.com/facebook/react/commit/9f5224a9c )**: Restore DevTools console message ([#21864](https://github.com/facebook/react/pull/21864)) //<Dan Abramov>//
- **[a4ecd85e8](https://github.com/facebook/react/commit/a4ecd85e8 )**: act: Batch updates, even in legacy roots ([#21797](https://github.com/facebook/react/pull/21797)) //<Andrew Clark>//
- **[c2c6ea1fd](https://github.com/facebook/react/commit/c2c6ea1fd )**: Capture suspense boundaries with undefined fallbacks ([#21854](https://github.com/facebook/react/pull/21854)) //<Ricky>//
- **[0f09f14ae](https://github.com/facebook/react/commit/0f09f14ae )**: Check if already rendering before flushing //<Andrew Clark>//
- **[54e88ed12](https://github.com/facebook/react/commit/54e88ed12 )**: Bugfix: Flush legacy sync passive effects at beginning of event ([#21846](https://github.com/facebook/react/pull/21846)) //<Andrew Clark>//
- **[cb8afda18](https://github.com/facebook/react/commit/cb8afda18 )**: Add test for #21837 ([#21842](https://github.com/facebook/react/pull/21842)) //<Andrew Clark>//
- **[f85f429d5](https://github.com/facebook/react/commit/f85f429d5 )**: Use `act()` in ReactFabric tests ([#21839](https://github.com/facebook/react/pull/21839)) ([#21841](https://github.com/facebook/react/pull/21841)) //<Andrew Clark>//
- **[84639ab53](https://github.com/facebook/react/commit/84639ab53 )**: Guard against reused fibers in React Native commands ([#21837](https://github.com/facebook/react/pull/21837)) //<Timothy Yung>//
- **[c549bc491](https://github.com/facebook/react/commit/c549bc491 )**: Revert "Use `act()` in ReactFabric tests ([#21839](https://github.com/facebook/react/pull/21839))" ([#21840](https://github.com/facebook/react/pull/21840)) //<Timothy Yung>//
- **[59d3aca68](https://github.com/facebook/react/commit/59d3aca68 )**: Use `act()` in ReactFabric tests ([#21839](https://github.com/facebook/react/pull/21839)) //<Timothy Yung>//
- **[9ccc25a0e](https://github.com/facebook/react/commit/9ccc25a0e )**: Reverting recent flushSync changes ([#21816](https://github.com/facebook/react/pull/21816)) //<Brian Vaughn>//
- **[ed6c091fe](https://github.com/facebook/react/commit/ed6c091fe )**: Replace unbatchedUpdates with flushSync ([#21776](https://github.com/facebook/react/pull/21776)) //<Andrew Clark>//
- **[32eefcb3c](https://github.com/facebook/react/commit/32eefcb3c )**: Replace flushDiscreteUpdates with flushSync ([#21775](https://github.com/facebook/react/pull/21775)) //<Andrew Clark>//
- **[ab390c65e](https://github.com/facebook/react/commit/ab390c65e )**: ReactDebugHooks optionally includes fileName, and line/column numbers ([#21781](https://github.com/facebook/react/pull/21781)) //<Brian Vaughn>//
- **[c96761c7b](https://github.com/facebook/react/commit/c96761c7b )**: Delete batchedEventUpdates ([#21774](https://github.com/facebook/react/pull/21774)) //<Andrew Clark>//
- **[3e8c86c1c](https://github.com/facebook/react/commit/3e8c86c1c )**: fix: maxYieldInterval should not compare with currentTime directly in Scheduler-shouldYieldToHost //<郭帅彬>//
- **[d483463bc](https://github.com/facebook/react/commit/d483463bc )**: Updated scripts and config to replace "master" with "main" branch ([#21768](https://github.com/facebook/react/pull/21768)) //<Brian Vaughn>//

Changelog:
[General][Changed] - React Native sync for revisions cae6350...419cc9c

jest_e2e[run_all_tests]

Reviewed By: JoshuaGross

Differential Revision: D29913856

fbshipit-source-id: 58e4903766a312a64a17cfba0b0f684cf4bcacb0

* Remove option to make measure calls asynchronous

Summary:
Changelog: [internal]

Making measure calls asynchronous in Fabric regresses core metrics, let's remove the option.

Reviewed By: JoshuaGross

Differential Revision: D29909385

fbshipit-source-id: eea3fefc8da757c8db82cb0af340650e2ce6a947

* Fix android view dimensions

Summary:
This diff fixes the Android View dimensions in VR

PixelUtil.toSPFromPixel and PixelUtil.getDisplayMetricDensity() are both using getScreenDisplayMetrics() to perform conversion of dimensions. This is not correct because we should take into consideration the density of the Context / Activity instead of the Screen. This problem didn't raise before in Fabric Android because it seems that android OS on phones usually share the scale between the screen and the Activity?

These two methods are only used in Fabric and they were introduced by D9583972 (https://github.com/facebook/react-native/commit/5c0da011cbaa788c52519f8091157ca6d87d8abb) and D9173758 (https://github.com/facebook/react-native/commit/8b5e3fc16b1e58441318b6ada629dcff572dd120)

As part of this diff I'm also deleting the method toSPFromPixel in favor of toDIPFromPixel because I noticed the usages of these methods are meant to use toDIPFromPixel()

changelog: [Internal] internal

Reviewed By: JoshuaGross

Differential Revision: D29864944

fbshipit-source-id: a0a093c120bde21a6cf9e1043a83c31e870d4368

* Refactor DevServerHelper to separate checking if packager running

Summary:
Changelog: [Internal]
Separate the functionality of the  isPackagerRunning() function into a new class PackagerStatusCheck with the intention of being able to use this without needing a DevServerHelper

Reviewed By: makovkastar, ShikaSD

Differential Revision: D29933318

fbshipit-source-id: d708bb987b08634015d6ee6b6c8989faba416c5a

* Introduce queueMicrotask API

Summary:
Changelog:
[General][Added] - Add global.queueMicrotask

`queueMicrotask` is a relatively recent API defined in the WHATWG HTML spec
and it's been widely adopted by all web browsers and Node.js.

This diff introduced it to React Native by polyfilling it via a lazily-allocated
resolved Promise, or calling directly into a fast path provided by Hermes.

Reviewed By: RSNara

Differential Revision: D29838852

fbshipit-source-id: 8c4378b1b713fb8b0da5e67f92ba2ea9838766f7

* Shim Immediate APIs when Promise is queueing to JSVM

Summary:
Changelog: [Internal]

Historically, Immediate API is implemented upon the React Native's
internal microtask-y queue (known as "immediate queue"), which
is the same queue Promise polyfill is operating on.

To make React Native suitable of using the built-in Promises from JSVMs,
which usually enqueues to the JSVM internal microtask queue and has no
access to React Native microtask-y queue, we need to migrate the
Immediate API to use the JSVM microtask queue as well to preserve the
semantics of code relies on the interleaving of promises and immediates.

To do that, this diff implement a shim layer for immediate APIs via the
new `global.queueMicrotask` API (which enqueues to JSVM) in JS, by wrapping
the immediate callback into a "microtask callback", which validate the
`immediate ID` against `clearedImmediate` Set before invoking it.

Reviewed By: RSNara

Differential Revision: D29845305

fbshipit-source-id: c2ed3fed426a5316b1e0dfbfaad51706d1765d4d

* Attempt to fix undefined instance handle in EventTarget

Summary:
changelog: [internal]

Completion block can retain `_eventEmitter` beyond existence of the component. To fix this, do not retain `_eventEmitter` by block but try to acquire it inside it.

Reviewed By: JoshuaGross

Differential Revision: D29969189

fbshipit-source-id: 456c42f816acc160f9d6bbd3f9c8c55d611940b2

* Makes "force" property available to Apple Pencil based events. (#31780)

Summary:
Fixes https://github.com/facebook/react-native/issues/31779

For more detailed explanation, see issue https://github.com/facebook/react-native/issues/31779

React Native touch handler events (onTouchStart, onTouchMoved, etc..) are intended to have "force" properties when used on devices which support pressure input (3D Touch & Apple Pencil events). However, due to a check in RCTForceTouchAvailable() function which checks for UITraitCollection's "forceTouchCapability" to be equal to UIForceTouchCapabilityAvailable, the check returns NO on iPad-based devices, due to iPad devices returning UIForceTouchCapabilityUnavailable at all times. This causes "force" values of Apple Pencils to never be passed on to React Native.
Since simply passing 0 as a value for force across the RN bridge for every touch event seemed like a change that might seem jarring to some, I decided that a simple additional boolean check if the touch event's type is UITouchTypePencil (this is the same as UITouchTypeStylus) should also suffice.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[iOS] [Fixed] - Fixed "force" property of touch events for Apple Pencil/Stylus devices.
[iOS] [Feature] - Added "altitudeAngle" property to touch events from Apple Pencil/Stylus devices.

Pull Request resolved: https://github.com/facebook/react-native/pull/31780

Test Plan:
The code compiles and runs, and trying a simple handler for a View like
````
  touchMove = (e: GestureResponderEvent) => {
    console.log(`pressure, altitude (${e.nativeEvent.force}, ${e.nativeEvent.altitudeAngle})`);
````
results in
<img width="424" alt="Screen Shot 2564-06-28 at 17 13 22" src="https://user-images.githubusercontent.com/5000572/123621055-0b563f00-d835-11eb-9eff-526ba27fdf7b.png">
and when pencil is oriented perpendicular to the screen and pressed with full force shows
<img width="412" alt="Screen Shot 2564-06-28 at 17 13 58" src="https://user-images.githubusercontent.com/5000572/123621139-1c06b500-d835-11eb-8207-68a49720d708.png">

Reviewed By: sammy-SC

Differential Revision: D29964102

Pulled By: sota000

fbshipit-source-id: 5a1f41d64c6fe325afbd2b9579eaf20a522e92dc

* Fix typo in VirtualizedList-test.js (#31756)

Summary:
occured -> occurred

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Fixed] - Fixed typo in VirtualizedList-test.js

Pull Request resolved: https://github.com/facebook/react-native/pull/31756

Test Plan: NONE

Reviewed By: lunaleaps

Differential Revision: D29975153

Pulled By: charlesbdudley

fbshipit-source-id: 966d90df0bf015b4a6a2e3b1bf88c66b61161a7a

* Pass context through to all prop parser (core changes)

Summary:
Unfortunately, parsing some props requires stateful context - namely, PlatformColor on Android. We explored several different options but they all seemed inferior to the approach of using ContextContainer, and most would require using global state.

By introducing this change everywhere as early as possible, we can avoid later pain. It is likely that some prop, on some platform, will require this mechanism. We'll be ready for it!

Because we can pass a constref of the ContextContainer through to all props and because the context and context data is never retained by prop parsers, perf and memory hit should be ~0.

This diff contains core changes only. Leaf changes to all props structs and conversions files will be in next diff(s).

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D29838789

fbshipit-source-id: f5090e7f02eb6e8fbe0ef4dd201e7d12104a3e3c

* Pass context through to all prop parser (props structs changes)

Summary:
See previous diffs for context. This updates all of the relevant props structs.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D29855426

fbshipit-source-id: 30177c3380ef82ecf8f2a4321f128cfbe8a576e0

* Pass context through to all prop parser (conversions.h)

Summary:
See previous diffs for context. This updates all conversions.h files.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D29855425

fbshipit-source-id: d5751ddfc2724392e3a35f5e22bb68574e95e737

* Pass PropsParserContext to prop parsing layer

Summary: Changelog: [internal]

Reviewed By: mdvacca

Differential Revision: D29921232

fbshipit-source-id: ba045f545b564aedf1b287045a0e75428de30a0f

* Fix typo in Constants.h (#31049)

Summary:
controling -> controlling

## Changelog

[Internal] [Fixed] - Fixed typo in comment

Pull Request resolved: https://github.com/facebook/react-native/pull/31049

Test Plan: NONE

Reviewed By: lunaleaps

Differential Revision: D29980007

Pulled By: charlesbdudley

fbshipit-source-id: 419f28f08d74faa07db18a07ab41b62c41776344

* Daily `arc lint --take CLANGFORMAT`

Reviewed By: zertosh

Differential Revision: D29983521

fbshipit-source-id: bebd38e79180c544c8c1986605cc1af4b1f4df98

* Update Dimension.js typo (#29858)

Summary:
preferred instead of preffered

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[CATEGORY] [TYPE] - Message

Pull Request resolved: https://github.com/facebook/react-native/pull/29858

Reviewed By: charlesbdudley

Differential Revision: D29998754

Pulled By: sota000

fbshipit-source-id: f13fef58e9154ddf8087944d53e022fb9afa6b1b

* Make existential type an error in xplat

Summary:
This diff updates the xplat flowconfigs to make existential types an error.

Changelog: [Internal]

Reviewed By: pieterv

Differential Revision: D29967838

fbshipit-source-id: f08bbafe2a0269adb2c9afa4572b7a34fd254a4d

* Remove unused import (#30544)

Summary:
Remove unused import

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[iOS] [performance] - Remove unused import

Pull Request resolved: https://github.com/facebook/react-native/pull/30544

Test Plan: Should build on CI

Reviewed By: lunaleaps

Differential Revision: D30000901

Pulled By: charlesbdudley

fbshipit-source-id: 3d3310917823b7af57564ca1ea397cd32cd0c4d5

* Updated TextInput autoCompleteType prop to autoComplete 1/2 (#26010)

Summary:
Fix for bug https://github.com/facebook/react-native/issues/26003 Rename TextInput prop "autoCompleteType" to "autoComplete".

## Changelog

[Android] [Changed] - Updated `autoCompleteType` prop of `TextInput` to `autoComplete`

Pull Request resolved: https://github.com/facebook/react-native/pull/26010

Test Plan:
Test Pass

PR for [Doc Update](https://github.com/facebook/react-native-website/pull/1184)

Reviewed By: mdvacca

Differential Revision: D29980220

Pulled By: lunaleaps

fbshipit-source-id: 3c9e7d3250b5f95b0dbd523fdb0d917a039cd6a9

* Implement PlatformColor in Fabric Android

Summary:
This diff implements PlatformColor in Fabric Android

changelog: [internal] internal

Reviewed By: JoshuaGross

Differential Revision: D29841461

fbshipit-source-id: 63a523626b021c634bc399e749b639b55730391a

* Allows to set individual (left,top,right,bottom) dotted/dashed borders (#29099)

Summary:
This issue:

fixes https://github.com/facebook/react-native/issues/24224 fixes https://github.com/facebook/react-native/issues/28695 fixes https://github.com/facebook/react-native/issues/23651 fixes https://github.com/facebook/react-native/issues/23475  fixes https://github.com/facebook/react-native/issues/22256 fixes https://github.com/facebook/react-native/issues/22226 fixes https://github.com/facebook/react-native/issues/19234 fixes  https://github.com/facebook/react-native/issues/18285  fixes https://github.com/facebook/react-native/issues/17344 fixes https://github.com/facebook/react-native/issues/17343 fixes https://github.com/facebook/react-native/issues/17251 fixes https://github.com/facebook/react-native/issues/12817 fixes https://github.com/facebook/react-native/issues/12403 fixes https://github.com/facebook/react-native/issues/11042 fixes https://github.com/facebook/react-native/issues/9343 fixes https://github.com/facebook/react-native/issues/8236 fixes https://github.com/facebook/react-native/issues/8105 fixes https://github.com/facebook/react-native/issues/7838 fixes https://github.com/facebook/react-native/issues/6721 fixes https://github.com/facebook/react-native/issues/5411 fixes https://github.com/facebook/react-native/issues/3159 fixes https://github.com/facebook/react-native/issues/2335 fixes https://github.com/facebook/react-native/issues/840 fixes https://github.com/facebook/react-native/issues/27133 fixes https://github.com/facebook/react-native/issues/28695

Allows to set individual (left,top,right,bottom) dotted/dashed borders.

If a single border is specified and the borderStyle is dotted or dashed, each border will be drawn with moveTo and lineTo taking in consideration of the border style and thickness.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Fixed] - Quickfix individual border style dotted or dashed rendering as solid

Pull Request resolved: https://github.com/facebook/react-native/pull/29099

Test Plan:
**<details><summary>CLICK TO OPEN TESTS RESULTS</summary>**
<p>

| **AFTER** | **AFTER** |
|:-------------------------:|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/84158300-05e05800-aa6c-11ea-96a3-40007b2ca611.png" width="300" height="" /> | <img src="https://user-images.githubusercontent.com/24992535/84158309-07aa1b80-aa6c-11ea-973b-51e8e68b5808.png"  width="300" height="" /> |

| **AFTER** | **AFTER** |
|:-------------------------:|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/84158320-0d9ffc80-aa6c-11ea-9d7f-dfba49fbfe41.png" width="300" height="" /> | <img src="https://user-images.githubusercontent.com/24992535/84158334-11cc1a00-aa6c-11ea-8422-cd5b9384f391.png"  width="300" height="" /> |

| **AFTER** | **AFTER** |
|:-------------------------:|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/84158556-4c35b700-aa6c-11ea-9a4d-eea791b3813a.png" width="300" height="" /> | <img src="https://user-images.githubusercontent.com/24992535/84158574-51930180-aa6c-11ea-8e84-526cfb168f49.png"  width="300" height="" /> |

| **AFTER** | **AFTER** |
|:-------------------------:|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/84158586-55268880-aa6c-11ea-9540-51d79a8e4cb0.png" width="300" height="" /> | <img src="https://user-images.githubusercontent.com/24992535/84158601-5952a600-aa6c-11ea-82e7-85d54b858f1a.png"  width="300" height="" /> |

| **AFTER** | **AFTER** |
|:-------------------------:|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/84158638-62dc0e00-aa6c-11ea-8765-ecba0d9d126f.png" width="300" height="" /> | <img src="https://user-images.githubusercontent.com/24992535/84158652-67a0c200-aa6c-11ea-8336-e6eb8aa52e96.png"  width="300" height="" /> |

| **AFTER** | **AFTER** |
|:-------------------------:|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/84158690-738c8400-aa6c-11ea-9cf1-edec72d27cb7.png" width="300" height="" /> | <img src="https://user-images.githubusercontent.com/24992535/84158912-b6e6f280-aa6c-11ea-94a7-0ee0db685f38.png"  width="300" height="" /> |

</p>
</details>

Reviewed By: mdvacca

Differential Revision: D28688914

Pulled By: RSNara

fbshipit-source-id: 34781d63265dcf55e30f11c014e6b4a35d67dcbd

* Correct error message in getViewState method

Summary:
Changelog: [internal]

Here, getting `viewState` has failed, not its view property.

Reviewed By: mdvacca

Differential Revision: D30042652

fbshipit-source-id: 42831b577f17db1f64860e68be33870f5be27207

* Clean up RAIICallbackManager experiment

Summary:
This experiment was shipped in D27436402 (https://github.com/facebook/react-native/commit/3d1afbbda301d48a75e45f73b96cd51ae5105dd8).

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D30023039

fbshipit-source-id: 5f7335f2ddaf6f4e2d876a917aaff2cf3d906b5c

* Stop sharing LongLivedObjectCollection with the bridge

Summary:
## Context
Previously, when you'd call TurboModule methods with JavaScript callbacks, we'd [store the callbacks](https://www.internalfb.com/code/fbsource/[c503ff1b38621aebca87b2bbebeae088b01886c4]/xplat/js/react-native-github/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm?lines=173%2C248-249) into [this global LongLivedObjectCollection collection](https://www.internalfb.com/code/fbsource/[c503ff1b38621aebca87b2bbebeae088b01886c4]/xplat/js/react-native-github/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h?lines=65). Then, when React Native's JavaScript VM got torn down, we'd [clear the global collection](https://www.internalfb.com/code/fbsource/[e26f476ce208c578f05b1edb7639d1dad5612c7d]/xplat/js/react-native-github/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp?lines=49), which would ensure that we deleted all held jsi::Functions, before deleting the jsi::Runtime.

## Problem
With bridgeless mode enabled, there can be two TurboModule systems. Further, it is possible to tear down bridgeless mode, or the bridge, without tearing down the other initialization infra. In this scenario, the jsi::Function for the other initialization infra would also get deleted, which could lead to mysterious problems.

## Fix
In this diff, I refactored the jsi::Function cleanup in the TurboModule system. Now, there are 3 modes:
- kGlobalScope: Everything works as it did before
- kRCTGlobalScopeUsingRetainJSCallback: We still use the global LongLivedObjectCollection, but we do it through invoking a block passed to every ObjCTurboModule by the TurboModuleManager. This group exists to assess the impact of having each TurboModule retain/use the block. I suspect this will be negligible, but it'd be good to have actual data to back this claim.
- kRCTTurboModuleManagerScope: Every TurboModule uses a LongLivedObjectCollection that is owned by its TurboModuleManager. This should effectively fix the problem I outlined above.

Changelog: [Internal]

Reviewed By: p-sun

Differential Revision: D30019833

fbshipit-source-id: da50d884c7e37190107f570d8ed70eeda7d9ae83

* Stop sharing LongLivedObjectCollection with the bridge

Summary:
This is the Android analogue to D30019833.

Changelog: [Internal]

Reviewed By: p-sun

Differential Revision: D30029295

fbshipit-source-id: 13df0dfb915697eeedcc527dcdb6c246e89afb0c

* setup fragment based tab bar navigation

Summary: `Changelog: [Android] [Changed] - Make ReactFragment variables protected instead of private, create getter for ReactDelegate`

Reviewed By: keoskate

Differential Revision: D29981436

fbshipit-source-id: 3e5df811cd07edccf37f72c9f917f9ea0882be0b

* Remove 'using namespace facebook::jni'

Summary:
Ez diff to remove 'using namespace facebook::jni'

changelog: [internal] internal

Reviewed By: sshic

Differential Revision: D30046080

fbshipit-source-id: 52100970a408d772854cc0783fa13edd0cc39235

* Add TODO to fix and enable 'generated_tests-codegen_testsAndroid'

Summary:
Add TODO to fix and enable 'generated_tests-codegen_testsAndroid'

changelog: [internal] internal

Reviewed By: JoshuaGross

Differential Revision: D30046143

fbshipit-source-id: dbeba6f1d51b32c069bda8bb9ca976014d299dae

* Move RNTester Buck library to GitHub (#31435)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/31435

Moves the Facebook-internal Buck target definition for RNTester closer to the actual source files. This does not affect how RNTester is built in open source.

Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D27942209

fbshipit-source-id: 66c970a5464a9329597d155ceeca78fb7f4834e8

* Move react-native Buck library to GitHub

Summary:
Moves the Facebook-internal Buck target definition for React Native closer to the actual JS source files. This does not affect how React Native is built in open source.

Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D27942687

fbshipit-source-id: 328febb661ed6597feafdfd8efb2a95365325348

* Extract feature detection as an utilitiy module

Summary:
Changelog: [Internal]

This diff only extracted the `isNativeFunction` used in `setUpTimers`
into the `FeatureDetection` utility, but later we will add more functions
in it and reuse them in other places.

Reviewed By: RSNara

Differential Revision: D29986750

fbshipit-source-id: 6e48e38d92ceccb35eead3c52e00e1eecb81b5b0

* Conditionalize the Regenerator Setup

Summary:
Changelog: [Internal]

If generators are provided natively, that should suggest that the JS source
code did not go through the regenerator-transform (e.g. in Metro Hermes profile),
then there is no need to set up the regenerator runtime.

This should save some work during the Core initialization.

Reviewed By: motiz88

Differential Revision: D29986751

fbshipit-source-id: 129f5122e8e4c05535ee2aa5da6970a66843e8cd

* Protect against crashes when over-releasing a TouchEvent

Summary:
It seems that, possibly due to optimizations and refactoring elsewhere in the event system, some TouchEvents are being over-disposed.

This doesn't really pose a problem besides performance; and could even indicate that an Event was in a pool but never properly initialized. In these
cases it seems perfectly reasonable to silently continue, and to log a soft exception. This WILL still crash in debug mode, so we can gather more information
if we find a good repro; otherwise we will continue to get production data from this soft exception if it's an issue and we can investigate further.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D30061178

fbshipit-source-id: 05d1f60afc382ce0a202ac8f3de34770cf9a760d

* Co-locate Buck targets for JS polyfills with their sources

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D30032230

fbshipit-source-id: 0d714b4e0a79a9c5c1c21e79f782635d8bd9c5f1

* chore: update Dimensions API Flow types (#31898)

Summary:
This small PR updates the Flow types used in Dimensions. The following changes has been made:
* generic types has been replaced with types from `NativeDeviceInfo` (which already were used in event subscription update)
* ~simplification of `DisplayMetricsAndroid` by spreading via intersection with `DisplayMetrics` type and removing shared properties~
  > I have tried both notations, but according to the lint, it looks like a Native Modules typing limitation which requires redundancy / code duplication in cases like this.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Changed] - update Dimensions API Flow types

Pull Request resolved: https://github.com/facebook/react-native/pull/31898

Test Plan: Running `yarn flow` in the workspace yields no errors.

Reviewed By: yungsters

Differential Revision: D29932940

Pulled By: GijsWeterings

fbshipit-source-id: bf97bb972964c585207e2450ccf71d932555e291

* Fix order of calls for Native Animated Module

Summary:
Changelog: [internal]

Make sure the order of call is preserved for `NativeAnimatedModule`. The order of calls to NativeAnimatedModule needs to be preserved because its internals depend on it. For example, if you `getValue` is called before `createAnimatedNode`, it causes a crash.

To resolve it, we need to enqueue `getValue` onto operationQueue.

Reviewed By: JoshuaGross

Differential Revision: D30035911

fbshipit-source-id: bbd698a96cada5d2b1312a1a689ca99b04a07cdc

* Merge BUCK file at Libraries/ into root

Summary:
Merges the Facebook-internal Buck target definitions in `Libraries/` into the BUCK file at the root of the repo (which is currently not synced to GitHub at all). This does not affect how React Native is built in open source.

Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D27967499

fbshipit-source-id: 39c51a544b3868242598072d24cb6cfb5a6e2d8c

* Fix Buck package boundary violation in core components schema

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D29996246

fbshipit-source-id: e560c7261c4274da5219dc1e2d59d46b60e7549e

* Allow resolving view from FabricUIManager

Summary: Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D30043188

fbshipit-source-id: d8675754b29fb58a28a06777f602098da6dbc27f

* Flush operations queue when animation starts

Summary:
changelog: [internal]

If nodesManager has the information if animated node is managed by Fabric, we can't decide if the operation queue should be flushed before it is flushed. Therefore, keep the information about animated nodes inside a set instead of nodesManager.

For simplicity, I will refer to class `RCTNativeAnimatedTurboModule` as *NativeAnimated* and to `RCTNativeAnimatedNodesManager` as *NodesManager*

Notice that each call to *NativeAnimated* is queued up in `_operations` or `_preOperations`. When the queues are flushed, only then methods are called on `RCTNativeAnimatedNodesManager`.

There are two mechanisms that flush operations.
One is triggered by `RCTMountingManager` before mounting operations are applied and after they are applied. This works fine but is important to paint the picture.

The second mechanism is inside `[RCTNativeAnimatedTurboModule startAnimatingNode]`. It flushes the queues for Fabric nodes only (not sure why Fabric nodes only, I couldn't find any explanation in old diffs). It checks with *NativeAnimated* if a node is managed by Fabric. Keep in mind, *NodesManager* only knows about the nodes when the queues have been flushed.

Exampe:
JavaScript calls methods on *NativeAnimated*.
For example:
1. `createNode`
2. `connectAnimatedNodeToView`
3. `startAnimatingNode`. (here, the queues should be flushed, since we are in Fabric)

All of these operations are queued up and for as long as `RCTMountingManager` executes mounting, all proceeds as expected.
But if those operations happen after mounting phase, `startAnimatingNode` will not flush the operations queues, because it can't tell if nodeTag is managed by fabric or it isn't. This is because *NodesManager* hasn't been notified about any new nodes.

Reviewed By: JoshuaGross, p-sun

Differential Revision: D30053890

fbshipit-source-id: b7fe24861d5300f9cfefa813a53df8330fa56d86

* iOS: Log error when invalid NSNull data is passed to RCTAsyncLocalStorage

Summary: Changelog: [Internal]

Differential Revision: D30081478

fbshipit-source-id: 7d425e71b020eaeb4eb1b33b500fbf5df7ea9c29

* fbshipit-source-id: 909b2667480ed96ae376896d966f6c27f5e73964

* Update OSS Buck definitions (#31948)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/31948

Changelog: [Internal]

Adds necessary shims to bring our BUCK files closer to parsing/building correctly in open source. This is part of fixing the Buck-based tests on CircleCI which were broken by https://github.com/facebook/react-native/commit/d4ee734f3297463fe7b54af6d69e4ea151cf4cf9.

Reviewed By: sammy-SC

Differential Revision: D30072866

fbshipit-source-id: 4aebd9f67dd0a102516603915d9a021032611279

* Update Android Dockerfile to include root BUCK file (#31950)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/31950

Changelog: [Internal]

Adds the root BUCK file to the Docker image we use to test RNTester on CircleCI. See https://github.com/facebook/react-native/commit/df9cd05621f58fe5c67f889b741bfff20c780b0e

Reviewed By: ShikaSD

Differential Revision: D30099261

fbshipit-source-id: 936c505a0f4e7b791743901a06fa3b14c40b183e

* Check for negative `numberOfLines` in TextView

Summary:
Negative `numberOfLines` prop is not supported by Android and causes a crash during layout measurement. This change adds a check in JS to catch the error earlier.

Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D30047103

fbshipit-source-id: 4248a0f573c3b6facd25c7ae6ce007a357a1469b

* Fix NPE when hierarchy return null values

Summary:
This diff fixes a NullPointer that was being thorwn when hierarchy values are null

changelog: [internal] internal

Reviewed By: sammy-SC

Differential Revision: D30095407

fbshipit-source-id: b0a13661b4506cf94eeb5d99923d4c12cba0f972

* Extend getInspectorDataForInstance to return props

Summary:
This diff extends the FabricUIManager.getInspectorDataForInstance to return the props of the React Native component associated to the view passed as a parameter.

changelog: [internal] internal

Reviewed By: sammy-SC

Differential Revision: D30095406

fbshipit-source-id: 50fdba6636a1f5042dbc113e341c3cb2534a1b04

* Add documentation for FabricUIManager.getInspectorDataForInstance

Summary:
Add documentation for FabricUIManager.getInspectorDataForInstance

changelog: [internal] internal

Reviewed By: sammy-SC

Differential Revision: D30095818

fbshipit-source-id: dfe8590598099e7581460ca45bc0e779690463a6

* chore: remove FlowFixMe (#29468)

Summary:
Removed FlowFixMe that has been fixed

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[General] [Fixed] - Removed FlowFixMe that has been fixed

Pull Request resolved: https://github.com/facebook/react-native/pull/29468

Test Plan: flow check passes

Reviewed By: JoshuaGross

Differential Revision: D29967702

Pulled By: lunaleaps

fbshipit-source-id: 541279287ba6f21c5c7290bcba7c282f092126ff

* Move RCT* Buck targets to GitHub

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D30030454

fbshipit-source-id: 02a4c36f5c5ca519e4de3d1a3d79708d0d0b6d01

* Move integration test Buck targets to GitHub

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D30032467

fbshipit-source-id: 56e293c821f02e78fe13f5e7f22bcb2b2050019a

* Move RNTester unit/integration test Buck targets to GitHub

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D30032476

fbshipit-source-id: d1f9a39a6d2fc92f69b9ee931c2a0f3ba37687f6

* Move RCTTestApple into packages/rn-tester

Summary: Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D30056021

fbshipit-source-id: 9012ca6934f95946ff157ca472aa6a6e84d7d7e9

* React Native sync for revisions 419cc9c...19092ac

Summary:
This sync includes the following changes:
- **[19092ac8c](https://github.com/facebook/react/commit/19092ac8c )**: Re-add old Fabric Offscreen impl behind flag ([#22018](https://github.com/facebook/react/pull/22018)) //<Andrew Clark>//
- **[215db465a](https://github.com/facebook/react/commit/215db465a )**: [Fabric] Add `flex: 1` to Offscreen view container ([#22019](https://github.com/facebook/react/pull/22019)) //<Andrew Clark>//
- **[8a37b0ef3](https://github.com/facebook/react/commit/8a37b0ef3 )**: typos fixed ([#21955](https://github.com/facebook/react/pull/21955)) //<Sinan Sonmez (Chaush)>//
- **[e3049bb85](https://github.com/facebook/react/commit/e3049bb85 )**: DevTools scheduling profiler: Add React component measures ([#22013](https://github.com/facebook/react/pull/22013)) //<Brian Vaughn>//
- **[27bf6f9a8](https://github.com/facebook/react/commit/27bf6f9a8 )**: Scheduling profiler UX changes ([#21990](https://github.com/facebook/react/pull/21990)) //<Brian Vaughn>//
- **[f0d354efc](https://github.com/facebook/react/commit/f0d354efc )**: [Fabric] Fix reparenting bug in legacy Suspense mount ([#21995](https://github.com/facebook/react/pull/21995)) //<Andrew Clark>//
- **[34308b5ad](https://github.com/facebook/react/commit/34308b5ad )**: Tidy up early bailout logic at start of begin phase ([#21852](https://github.com/facebook/react/pull/21852)) //<Andrew Clark>//
- **[321087d13](https://github.com/facebook/react/commit/321087d13 )**: [Fizz] Don't add aborted segments to the completedSegments list ([#21976](https://github.com/facebook/react/pull/21976)) //<Sebastian Markbåge>//
- **[4cc8ec64c](https://github.com/facebook/react/commit/4cc8ec64c )**: Separate unit tests for ReactFabricHostComponent ([#21969](https://github.com/facebook/react/pull/21969)) //<Timothy Yung>//
- **[d4d786493](https://github.com/facebook/react/commit/d4d786493 )**: Fix `ReactFabricHostComponent` methods if detached ([#21967](https://github.com/facebook/react/pull/21967)) //<Timothy Yung>//
- **[392253a77](https://github.com/facebook/react/commit/392253a77 )**: [Fabric] Use container node to toggle the visibility of Offscreen and Suspense trees ([#21960](https://github.com/facebook/react/pull/21960)) //<Andrew Clark>//

Changelog:
[General][Changed] - React Native sync for revisions 419cc9c...19092ac

jest_e2e[run_all_tests]

Reviewed By: JoshuaGross

Differential Revision: D30092460

fbshipit-source-id: 9f118db2419a9a5db26a9b873868f91ab88f2f89

* refactor!: drop deprecated `StatusBarIOS` (#31466)

Summary:
This component has been merged with `StatusBar` and deprecated since [Jun 24, 2019](https://github.com/facebook/react-native/commit/a8337785539d572009d2cc4263aef7755ae03097)

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[JavaScript] [Removed] - refactor!: drop deprecated `StatusBarIOS`

Pull Request resolved: https://github.com/facebook/react-native/pull/31466

Test Plan: Warning when user imports `StatusBarIOS`

Reviewed By: yungsters

Differential Revision: D30109324

Pulled By: lunaleaps

fbshipit-source-id: fa2d3aa2cf35206ed8a196e09f12af57d3b61ccc

* Fix OSS Buck parsing errors (#31957)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/31957

Changelog: [Internal]

Some fixes for the GitHub shims for FB-internal Buck macros. Should fix the Buck-related breakages in the `test_android` and `test_docker` CI jobs.

Also adds license headers to some recently-added files that didn't have them.

Reviewed By: mdvacca

Differential Revision: D30114177

fbshipit-source-id: 88a24fa7130bd98dd60568566bde51fcfc89df60

* Fix Buck package boundary violation involving RCTEventDispatcher.h (#31965)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/31965

Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D30030580

fbshipit-source-id: 3b4140a831c7ad7282aae0ff79c54014dcd82615

* Remove package boundary exceptions in OSS Buck config

Summary: Changelog: [Internal]

Reviewed By: stepancheg

Differential Revision: D30102445

fbshipit-source-id: 571ab5dc41379e01d4482f64418f6383f660dbfa

* Update JSLoader.cpp (#29270)

Summary:
Since react-native-cli is deprecated, the correct command should be `npx react-native start`

Pull Request resolved: https://github.com/facebook/react-native/pull/29270

Reviewed By: sammy-SC

Differential Revision: D30017028

Pulled By: sota000

fbshipit-source-id: cfcf9e1d150f51750a4e86133bd3167506ee7348

* Warn when negative `numberOfLines` prop set on <Text/> component

Summary:
Updates previous variant that was crashing a surface to the non-crashing variant.
Now it prints error in console and modifies value to be 0.

Changelog: [General][Fixed] Clamp negative values for `numberOfLines` in <Text> component

Reviewed By: yungsters

Differential Revision: D30129658

fbshipit-source-id: fda47a262365573514d3e1e4bf8a26f6d30cdae0

* Make So loading inside generated TMM delegates less confusing

Summary:
## Rationale
Inlining the maybeLoadSoLibrary private static method makes following the So load chain from TurboModuleManagerDelegate through ReactPackageTurboModuleManagerDelegate to each app's TurboModuleManagerDelegate much easier to understand.

Changelog: [Internal]

Reviewed By: sshic

Differential Revision: D30082675

fbshipit-source-id: ff467d6ac8c792317dd9bdcd91844d3b480cbb60

* Add TODOs to unify component names between JS - Android - iOS - C++

Summary:
EZ diff that adds a few TODOs to unify component names between JS - Android - iOS - C++
see task: T97384889

changelog: [internal] internal

Reviewed By: sammy-SC

Differential Revision: D30139942

fbshipit-source-id: 91f51d04e7e7ecba7f059f94a121be43d820647d

* Replace Paper -> old renderer

Summary:
Replace Paper -> old renderer

changelog: [internal] internal

Reviewed By: sammy-SC

Differential Revision: D30139941

fbshipit-source-id: 3bb1e81a3df018aa669f3dba1de445107d70116c

* Fix Deadlock in RCTi18nUtil (iOS) (#31032)

Summary:
Note: PR to react-native-macos here https://github.com/microsoft/react-native-macos/pull/733

Internally in Microsoft code, we ran into a deadlock where the main queue and the UIManager queue were both trying to access `[RCTI18nUtil sharedInstance]`, and were blocked on each other. This is similar to an earlier issue with RCTScreenScale decsribed [here](https://github.com/facebook/react-native/issues/18096).

To summarize:
1- RCTShadowView (on the UIManager queue) and RCTView (on the main queue) both try to access `[RCTI18nUtil sharedInstance]`
2- The UIManager thread gets there first, and lazily initializes the sharedInstance. Meanwhile, the main thread is waiting on a lock possessed by the UIManager thread
3- As part of the initialization, we set an NSUserDefault, which seems to require the (blocked) main thread.
4- Deadlock.

For whatever reason, this only happens on debug. I did not figure out why, but I do know based on [this comment](https://github.com/facebook/react-native/issues/18096#issuecomment-368718081), that the UIManagerQueue should never block the main queue.

The fix is to not use NSUserDefaults, and simpy use atomic properties instead. We get the thread safety for free, and it also simplifies the code somewhat without changing the public API. The downside is values aren't persisted anymore, but I do not think that was necessary / intended.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[iOS] [Fixed] - Fix deadlock on RCTi18nUtil

Pull Request resolved: https://github.com/facebook/react-native/pull/31032

Test Plan:
Ran the RTLExample in RNTester, and ensured switching to RTL still worked, and that setting forceRTL would still work after reloading the bundle.

https://user-images.githubusercontent.com/6722175/108775429-aefdae80-7526-11eb-9a89-3114f7ddc2af.mov

Reviewed By: javache

Differential Revision: D29522152

Pulled By: RSNara

fbshipit-source-id: 160840f63a7b1d6721b0fd8294fb11990a4509fa

* Codegen: Always prepare filesystem

Summary:
For any Pod that uses the codegen, create references to code-gen'd files in local filesystem regardless of Pod install status by invoking the same command used by `prepare_command` whenever `pod install` is run.

This works around the issue where CocoaPods may decide to skip running `prepare_command`. While this is expected CocoaPods behavior, external factors may result in the deletion of the original code-gen'd files in which case we need to make sure that running `pod install` will bring these files back.

See Test Plan for more details on how to reproduce the issue being fixed.

Fixes T97404254.

Changelog:

[Internal] Codegen invoked with every `pod install` regardless of pod install status

Differential Revision: D30116640

fbshipit-source-id: 81db5dff1d4c4f8ae22b5dbe822609c770789ac8

* - Bump CLI to ^6.0.0 (#31971)

Summary:
Upgrade CLI to the v6 stable. [Changelog](https://github.com/react-native-community/cli/releases/tag/v6.0.0)

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[General] [Fix] - Bump CLI to ^6.0.0

Pull Request resolved: https://github.com/facebook/react-native/pull/31971

Test Plan: cc kelset grabbou

Reviewed By: TheSavior

Differential Revision: D30158170

Pulled By: ShikaSD

fbshipit-source-id: 392e22cb112a830778149b4a2b4a19198facf42b

* Fix to make taps on views outside parent bounds work on Android (#29039)

Summary:
By default, Views in React Native have `overflow: visible`. When a child view is outside of the parent view's boundaries, it's visible on Android, but not tappable. This behaviour is incorrect, and doesn't match iOS behaviour.

- Taps on Views outside the bounds of a parent with `overflow: visible` (or unset) should register
- Taps on Views outside the bounds of a parent with `overflow: hidden` should continue to not register

Related issues:

- fixes https://github.com/facebook/react-native/issues/21455
- fixes https://github.com/facebook/react-native/issues/27061
- fixes https://github.com/facebook/react-native/issues/27232

### Fix

- Made `findTouchTargetView` not check that the touch was in the bounds of the immediate children, but instead
  - Check that the touch is in its own bounds when returning itself
  - Check that the touch for a child is in its own bounds only when `overflow: hidden` is set
- Modified related code to adjust to this change
- Added RNTesterApp test

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Fixed] - Allow taps on views outside the bounds of a parent with `overflow: hidden`

Pull Request resolved: https://github.com/facebook/react-native/pull/29039

Test Plan:
This can be tested with 2 examples added to the bottom of the PointerEvents page of the RNTesterApp:

| Before | After |
| --- | --- |
| ![Before](https://user-images.githubusercontent.com/2937410/83610933-19079b00-a535-11ea-8add-22daae0191e1.gif) | ![After](https://user-images.githubusercontent.com/2937410/83610583-8830bf80-a534-11ea-97e2-71e180a70343.gif) |

Reviewed By: ShikaSD

Differential Revision: D30104853

Pulled By: JoshuaGross

fbshipit-source-id: 644a109706258bfe829096354dfe477599e2db23

* Create slider accessibility delegate in createViewInstance (#31942)

Summary:
Recent change in https://github.com/facebook/react-native/pull/31865 made it so if `ReactSliderManager` is created on the react context creation thread it will crash with the following error. This happens because `ReactAccessibilityDelegate` tries to create a handler on a thread without a looper.

This seems to happen because react-native-reanimated tries to get the UIManager module during its initialization which will cause view managers to be created and explains why the crash probably does not happens in RNTester or using only RN bundled modules.

```
08-03 14:44:56.318 21206 21360 E AndroidRuntime: FATAL EXCEPTION: create_react_context
08-03 14:44:56.318 21206 21360 E AndroidRuntime: Process: com.th3rdwave, PID: 21206
08-03 14:44:56.318 21206 21360 E AndroidRuntime: java.lang.ExceptionInInitializerError
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.shell.MainReactPackage.createViewManagers(MainReactPackage.java:166)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.ReactInstanceManager.getOrCreateViewManagers(ReactInstanceManager.java:882)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.CoreModulesPackage.createUIManager(CoreModulesPackage.java:137)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.CoreModulesPackage.getModule(CoreModulesPackage.java:102)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.TurboReactPackage$ModuleHolderProvider.get(TurboReactPackage.java:159)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.TurboReactPackage$ModuleHolderProvider.get(TurboReactPackage.java:147)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.bridge.ModuleHolder.create(ModuleHolder.java:191)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.bridge.ModuleHolder.getModule(ModuleHolder.java:156)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.bridge.NativeModuleRegistry.getModule(NativeModuleRegistry.java:153)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.bridge.CatalystInstanceImpl.getNativeModule(CatalystInstanceImpl.java:486)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.bridge.CatalystInstanceImpl.getNativeModule(CatalystInstanceImpl.java:462)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.bridge.ReactContext.getNativeModule(ReactContext.java:176)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.swmansion.reanimated.NodesManager.<init>(NodesManager.java:153)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.swmansion.reanimated.ReanimatedModule.getNodesManager(ReanimatedModule.java:101)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.swmansion.reanimated.ReanimatedJSIModulePackage.getJSIModules(ReanimatedJSIModulePackage.java:17)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.th3rdwave.MainApplication$1$1.getJSIModules(MainApplication.java:135)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.ReactInstanceManager.createReactContext(ReactInstanceManager.java:1329)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.ReactInstanceManager.access$1100(ReactInstanceManager.java:136)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.ReactInstanceManager$5.run(ReactInstanceManager.java:1058)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at java.lang.Thread.run(Thread.java:923)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: Caused by: java.lang.RuntimeException: Can't create handler inside thread Thread[create_react_context,5,main] that has not called Looper.prepare()
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at android.os.Handler.<init>(Handler.java:227)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at android.os.Handler.<init>(Handler.java:129)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.uimanager.ReactAccessibilityDelegate$1.<init>(ReactAccessibilityDelegate.java:185)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.uimanager.ReactAccessibilityDelegate.<init>(ReactAccessibilityDelegate.java:184)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.views.slider.ReactSliderManager$ReactSliderAccessibilityDelegate.<init>(ReactSliderManager.java:281)
08-03 14:44:56.318 21206 21360 E AndroidRuntime: 	at com.facebook.react.views.slider.ReactSliderManager.<clinit>(ReactSliderManager.java:301)
```

To fix it I changed the delegate creation to be done in `createViewInstance` which will be called on main thread. This is also more in line with how other accessibility delegates are created for other view managers. Since Slider is probably not used a lot, creating more delegate instance won't be an issue.

Another alternative could be to initialize a Looper on the thread that creates the react context, but it seems more involved and probably not needed.

## Changelog

[Android] [Fixed] - Create slider accessibility delegate in createViewInstance

Pull Request resolved: https://github.com/facebook/react-native/pull/31942

Test Plan: Reproduced the crash in an app and made sure this patch fixes it.

Reviewed By: JoshuaGross

Differential Revision: D30167451

Pulled By: p-sun

fbshipit-source-id: 5327130064db52ac0086e1ae5541a1b3e3954f15

* Flush operations queue when animation starts in RCTNativeAnimatedModule

Summary:
changelog: [internal]

If nodesManager has the information if animated node is managed by Fabric, we can't decide if the operation queue should be flushed before it is flushed. Therefore, keep the information about animated nodes inside a set instead of nodesManager.

For simplicity, I will refer to class `RCTNativeAnimatedTurboModule` as *NativeAnimated* and to `RCTNativeAnimatedNodesManager` as *NodesManager*

Notice that each call to *NativeAnimated* is queued up in `_operations` or `_preOperations`. When the queues are flushed, only then methods are called on `RCTNativeAnimatedNodesManager`.

There are two mechanisms that flush operations.
One is triggered by `RCTMountingManager` before mounting operations are applied and after they are applied. This works fine but is important to paint the picture.

The second mechanism is inside `[RCTNativeAnimatedTurboModule startAnimatingNode]`. It flushes the queues for Fabric nodes only (not sure why Fabric nodes only, I couldn't find any explanation in old diffs). It checks with *NativeAnimated* if a node is managed by Fabric. Keep in mind, *NodesManager* only knows about the nodes when the queues have been flushed.

Exampe:
JavaScript calls methods on *NativeAnimated*.
For example:
1. `createNode`
2. `connectAnimatedNodeToView`
3. `startAnimatingNode`. (here, the queues should be flushed, since we are in Fabric)

All of these operations are queued up and for as long as `RCTMountingManager` executes mounting, all proceeds as expected.
But if those operations happen after mounting phase, `startAnimatingNode` will not flush the operations queues, because it can't tell if nodeTag is managed by fabric or it isn't. This is because *NodesManager* hasn't been notified about any new nodes.

Reviewed By: RSNara

Differential Revision: D30099010

fbshipit-source-id: d3fc021dd4346d1cbbda3b49ecd9d982c543e705

* Add Flow libdefs for `global`

Summary:
Changelog: [Internal]

Currently, `global` is typed as `any` and any `global` properties
accesses are untyped. This diff add a flow libdefs for the `global`
object as a start point.

Reviewed By: yungsters

Differential Revision: D30000895

fbshipit-source-id: ab6988d01921a3c2a3434b534b2f69083570fb6d

* Feat/dynamic color borders (#31140)

Summary:
Following up my issue https://github.com/facebook/react-native/issues/30377 I decided to have a look myself and contribute.

On iOS, border colors using `PlatformColor` or `DynamicColorIOS` do not update on the fly when the system appearance updates.
When the component mounts, the color is correct for the current appearance, but a component unmout/remount is required in order to see the color changing after a system appearance change.

Fixes https://github.com/facebook/react-native/issues/30377

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Added] - Added `PlatformColor` and `DynamicColorIOS` examples to RNTester

Pull Request resolved: https://github.com/facebook/react-native/pull/31140

Test Plan:
I added 2 border examples, one using `PlatformColor` and the other using `DynamicColorIOS`. I recorded the following before/after videos showing the effect of my changes:

https://user-images.githubusercontent.com/4186230/110828711-9c5dd600-8297-11eb-8bc8-bdc9054b6b44.mov

https://user-images.githubusercontent.com/4186230/110828800-b4cdf080-8297-11eb-9d23-07f69dc3a702.mov

Reviewed By: lunaleaps

Differential Revision: D30073335

Pulled By: charlesbdudley

fbshipit-source-id: 2990a6ed40dd08fc2b1f20e93d6f21ec3d8980da

* Cleanup warnings in the NDK build

Summary:
This diff is cleaning up some configurations in the `Android.mk` files
of the native build. Specifically I simplified some of the rules and removed
a duplicate file specification.

Changelog:
Internal - Cleanup warnings in the NDK build

Reviewed By: ShikaSD

Differential Revision: D30220715

fbshipit-source-id: a100953fe977879a6d28cb0a2ef4b3358fb7c774

* Back out "Flush operations queue when animation starts in RCTNativeAnimatedModule"

Summary:
Changelog: [internal]

Original commit changeset: d3fc021dd434

Reviewed By: motiz88

Differential Revision: D30223203

fbshipit-source-id: 8edf79e109858855d13a36fabab2bcae36180df2

* Fix Undefined symbol: __swift_FORCE_LOAD_$_swiftFileProvider when building with Xcode 13

Summary:
Changelog: Fix Xcode 13 build error in HelloWorld template

Error:
{F640400959}

Fix:
Embed `libswiftFileProvider.tbd` in app.

Reviewed By: hramos

Differential Revision: D30192423

fbshipit-source-id: 59dbde441e61bc6ab870e2324e5202f4772bee8e

* introduce RCTPlatformColorUtils

Summary:
Changelog: [Internal]

in this diff, we add the logic to handle converting PlatformColor strings to their corresponding RGBA values, using `UIColor`'s API as the source of truth of these colors.

functionality not covered yet:
- customColor
- iOS Dynamic Colors
- Variant Colors

Reviewed By: sammy-SC

Differential Revision: D30103451

fbshipit-source-id: 7d7be0f08dc2fb95b606b8f5d73784766787a574

* hook up PlatformColorParser to RCTPlatformColorUtils

Summary:
Changelog: [Internal]

in this diff, we iterate through the list of color passed down in the props, and write the RGBA value of the first valid UIColor

Reviewed By: sammy-SC

Differential Revision: D30110297

fbshipit-source-id: c6730110129d0fe1f784fa89cd26b46d3dda7f28

* replace SharedColor alias with class for more reliable template deduction

Summary:
Changelog: [Internal]

when we try to write a `SharedColor` type prop in the renderer, the template function we match to is the following:

https://www.internalfb.com/intern/diffusion/FBS/browsefile/master/xplat/js/react-native-github/ReactCommon/react/renderer/core/propsConversions.h?commit=28dacb972cda702d37dedd4612bc67c212d4d9eb&lines=108-132

this is because `SharedColor` is an alias of `better::optional<Color>`. ultimately, this causes a crash in L130 - the template deduction in L130 interprets the T as an `int`, rather than `SharedColor`, but our `rawValue` is pointing to `SharedColor`.

there was a number of options i considered, but didn't feel the most correct:
- wrapping `SharedColor` in another `better::optional` - this felt like a hack and didn't really provide any real benefits of the `optional` wrapper.
- writing a template specialization on SharedColor - this didn't seem future proof because we could introduce another type that could potentially wrap an integer, which doesn't seem impossible in the future - then we would get some conflict with our `SharedColor` conversion, which is custom to the behavior of colors.
- coercing the template during the function call - from an engineering perspective, this didn't seem like a great idea since it isn't clear to the engineer that this would be necessary and they would most likely only find out to do this after seeing a crash on their builds.

i ultimately decided to convert `SharedColor` to a simple class wrapper, similar to the implementation already used in Android. this alleviates all of the concerns with the other options above.

Reviewed By: sammy-SC

Differential Revision: D30149880

fbshipit-source-id: 7e8abafcd9fd7465b13ef227d140e859f8df6ecd

* Deploy 0.157.0 to xplat

Summary: Changelog: [Internal]

Reviewed By: gkz

Differential Revision: D30148513

fbshipit-source-id: 7eb17353c3620d6f99d547dd6a781ac0a13a9a72

* General Logging Util (stab) class for native errors (#31998)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/31998

Overall Context: We want to add a way to log errors (e.g. mustfix, warn, etc on the server with stack trace) without crashing the app (e.g. react_native_assert crashes the app).

This diff: I am writing very simple logger functions which will get resolved at build time depending on the platforms/apps.

Changelog: [internal]

Reviewed By: JoshuaGross

Differential Revision: D30174404

fbshipit-source-id: 2e5bc865dd8576c5a758c56e080a1e582a8c3ada

* Documenting UserFlow.endFailure

Summary:
We had some confusion lately, where errorName was used to dump "error message". This caused problems in Scuba.
This doc should add some clarity on what is expected from endFailure users.

Changelog:
[Internal][Added] - Documentation for method in UserFlow.js class

Reviewed By: mityal

Differential Revision: D30192127

fbshipit-source-id: d057668aab714a9342131c83daf41cbe9372cb39

* iOS: When RCTSyncImageManager image times out, log warning instead of error

Reviewed By: fkgozali

Differential Revision: D30255710

fbshipit-source-id: e5238f718420718265823dd0fb93507d472d3cff

* Un-deprecate ReactSoftException

Summary:
After creating and using this utility, we learned that (1) it's really useful, and (2) its interface is good enough. So, let's un-deprecate this utility.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D30251651

fbshipit-source-id: d1ecf81484f865587a5552d5ddf0e68da86397d9

* Rename ReactSoftException to ReactSoftExceptionLogger

Summary:
ReactSoftException makes it seem like the class is an Exception, when it's actually a logger. This rename I think is more appropriate.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D30251735

fbshipit-source-id: 550bd543388e698774ec31753200bd3f722d8c17

* Updated TextInput autoCompleteType prop to autoComplete 2/2 (#26010)

Summary:
Fix for bug https://github.com/facebook/react-native/issues/26003 Rename TextInput prop "autoCompleteType" to "autoComplete".

## Changelog

[Android] [Breaking] - Updated `autoCompleteType` prop of `TextInput` to `autoComplete`

Pull Request resolved: https://github.com/facebook/react-native/pull/26010

Test Plan: Sandcastle

Reviewed By: mdvacca

Differential Revision: D29795575

Pulled By: lunaleaps

fbshipit-source-id: 6eba7030968e9b7384529a43a6cd1b3c9e8b2a2c

* Remove autoCompleteType as a native component prop

Summary: Changelog: [Android][Internal] - Cleanup `autoCompleteType` prop from Android native component.

Reviewed By: charlesbdudley

Differential Revision: D30057497

fbshipit-source-id: c80dd5682b314112ae70551bf8135372bb1ddc8b

* Match native*.js and Native*.js srcs

Summary:
Globbing is case sensitive only when eden is enabled. This causes Android cold builds to regress by 2 minutes because a large number of react native targets have to be built and fetched.

This change causes srcs to match with and without eden.

Changelog: [Internal]

Reviewed By: cute-jumper

Differential Revision: D30266076

fbshipit-source-id: 39ac2cbfa146fcdda1d8d3a6f40b0ec41bfb3c2f

* Fix TextInput Cursor jumping to the right when the placeholder null (#28995)

Summary:
This issue fixes https://github.com/facebook/react-native/issues/28794 fixes https://github.com/facebook/react-native/issues/27658
Flow type ?Stringish allows to set the placeholder value to null. The null value causes the cursor to jump to the right in a TextInput. The fix replaces the placeholder null value with an empty string which avoid calling setHint(null) as causes the placeholder to jump to the right.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Fixed] - avoid calling setHint with a null parameter causing cursor to jump to the right

Pull Request resolved: https://github.com/facebook/react-native/pull/28995

Test Plan:
**<details><summary>CLICK TO OPEN TESTS RESULTS (28 May 2020 20a9473aaa330ad9b6e7a0b42ebd9c4ed41ce60b)</summary>**
<p>

More videos and information included in issue https://github.com/facebook/react-native/issues/28794
The below test cases are from the [following repository](https://github.com/fabriziobertoglio1987/AwesomeProject)

| **BEFORE** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/83123470-3e2f8000-a0d5-11ea-8718-11e6a0575a0c.gif" />|

| **AFTER** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/83123554-599a8b00-a0d5-11ea-9701-6557f0d76044.gif" />|

Extensive testing on `RNTester` did not identify any regression.

| **AFTER** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/83123586-628b5c80-a0d5-11ea-92eb-449d499dcc7d.gif" />|

</p>
</details>

**<details><summary>CLICK TO OPEN TESTS RESULTS (15 February 2021 https://github.com/facebook/react-native/pull/28995/commits/20a9473aaa330ad9b6e7a0b42ebd9c4ed41ce60b)</summary>**
<p>

| **BEFORE** |
|:-------------------------:|
| <video src="https://user-images.githubusercontent.com/24992535/107960803-5d44a980-6fa5-11eb-90e2-f0d665e35291.mp4" />|

| **AFTER** |
|:-------------------------:|
| <video src="https://user-images.githubusercontent.com/24992535/107960602-1f478580-6fa5-11eb-8f39-b985fafa6a6c.mp4" />|

</p>
</details>

Reviewed By: charlesbdudley

Differential Revision: D30095877

Pulled By: lunaleaps

fbshipit-source-id: 38a3e788443a22d48a4335063cd4315638bd8e97

* Bump AGP to 4.2.2

Summary:
This is just a minor bump in the Android Gradle plugin.

Changelog:
[Android][Changed] - Bumped AGP to 4.2.2

allow-large-files

Reviewed By: ShikaSD

Differential Revision: D30220591

fbshipit-source-id: 217a21e4935bcd258ac3bcd45c7fb1ff5c0a1ead

* Flatten the `react-native-codegen` included build. (#32007)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/32007

This Diff simplifies the codegen Gradle build.
Previously the build used to have a 2-level nesting of included build.

Turns out that the `react-native-codegen/android/build.gradle` build
is just providing a task and including an inner build that contains the codegen
Gradle plugin. I've moved such plugin to the outer build.

This will also make sure that the Gradle plugin files are properly index by the
IDE when opening the build (as nested included build are not yet supported).

Changelog:
Internal - Flatten the `react-native-codegen` Gradle included build

Reviewed By: fkgozali, ShikaSD

Differential Revision: D30227784

fbshipit-source-id: af304afeeba1926f8b7b5b47cf69889d3f808f5f

* iOS: Log image url in test environment when image times out

Reviewed By: fkgozali

Differential Revision: D30280757

fbshipit-source-id: 57385d3fd64f564f1de9ad86ffb2c0064e941df9

* Fix BorderExample for DynamicColorIOS

Summary:
Changelog:
[Internal] - Fix border example for RNTester

Reviewed By: charlesbdudley

Differential Revision: D30262957

fbshipit-source-id: 677e7a9346bc2f1dc67ec7cc9ad7e36af34ffa60

* Add a flag to warn whenever the legacy NativeModule system is used

Summary:
When true, this flag will cause React Native to start logging soft exceptions, whenever the legacy NativeModule system is used. This flag is independent of useTurboModules. In practice, it's only enabled when TurboModules is enabled.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D30250363

fbshipit-source-id: f610567c5b99a4fbf8252c3962908668f483d028

* Log SoftExceptions when the legacy NativeModule system is used

Summary:
When ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse is true, we will log a SoftException, whenever:
1. A Java/Cxx NativeModule is created by the legacy system.
2. Any method on the Java NativeModule is executed, including getConstants().

NOTE: Logs to CXXModule use incoming.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D30252953

fbshipit-source-id: 570929624d0114bb298c593ba909e5cdbd54bd6c

* Introduce JReactSoftExceptionLogger to log SoftExceptions from C++

Summary:
When the TurboModule system is enabled, C++ NativeModules shouldn't be used in production. We'll use this JReactSoftExceptionLogger to log soft exceptions from C++ NativeModules this scenario.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D30272694

fbshipit-source-id: 8dadcfe51bcbc353d438d1a403e74da5e2cb9546

* Warn whenever CxxNativeModules are used

Summary:
After this diff, when ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse is enabled, the legacy NativeModule infra will log soft exceptions whenever legacy NativeModules are accessed/used.

Changelog: [Internal]

Reviewed By: p-sun

Differential Revision: D30272695

fbshipit-source-id: 7111402c1d8b883a600dcb4559e9ff1d56447070

* Fix typo in RCTConvert.m (#31067)

Summary:
seperated -> separated

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Fixed] - Fixed typo in comment

Pull Request resolved: https://github.com/facebook/react-native/pull/31067

Test Plan: NONE

Reviewed By: sammy-SC

Differential Revision: D30176244

Pulled By: sota000

fbshipit-source-id: 617607aaa7eb5f613344773c4bbbc09a8c5096c1

* Allow Modal to handle hardware escape key in the same way the back button is handled (#31564)

Summary:
On Android, when a hardware keyboard is connected pressing the escape key will partially dismiss an active `<Modal>` without calling the `onRequestClose` callback. The modal will disappear, but I beleive the underlying activity may still be present, blocking interaction with the main app below and leaving things in a partially broken state.

This code change allows the escape key to be handled in the same way as the hardware back button, calling the `onRequestClose` and allowing the developer to decide the behaviour.

This issue isn't present on iOS, so no change is required there.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Fixed] - Fix Modal being dismissed incorrectly when pressing escape on a hardware keyboard

Pull Request resolved: https://github.com/facebook/react-native/pull/31564

Test Plan: I've tested this manually locally, but unsure if it's possible to test in an automated way as the emulator didn't respond to a hardware escape key in the same way as a physical device.

Reviewed By: ShikaSD

Differential Revision: D28953718

Pulled By: lunaleaps

fbshipit-source-id: 5547bc5d894da0d3d9daf4515b1af9c2407815db

* Nullable ReconnectingWebSocket params

Summary: Changelog: [Internal] - Annotated the MessageCallback and ConnectionCallback params of the ReconnectingWebSocket with Nullable

Reviewed By: makovkastar

Differential Revision: D30298832

fbshipit-source-id: 4e0a6ea339d1d8b25fb7bb24dfbada93d5cebc96

* Clean up unbatched only experiment

Summary:
changelog: [internal]

The experiment isn't shipping.

Reviewed By: JoshuaGross

Differential Revision: D30303379

fbshipit-source-id: 80b89d3738c1640f6abefcad161f95397c88ee04

* Clean up AsyncEventBeatV2 experiment

Summary:
changelog: [internal]

This experiment is abandoned. It regressed engagement metrics.

Reviewed By: JoshuaGross

Differential Revision: D30303383

fbshipit-source-id: 1d86eb5c7c257d4b369632007d0bda23e80c88ab

* Back out "Fix Undefined symbol: __swift_FORCE_LOAD_$_swiftFileProvider when building with Xcode 13"

Summary:
Changelog: Backout "Fix Xcode 13 build error in HelloWorld template"

Original commit changeset: 59dbde441e61

This change breaks the template for Xcode 12.5:

{F642871165}

Reviewed By: philIip

Differential Revision: D30301800

fbshipit-source-id: 4fcd9a5413dafb2cedb2194d5b68ddfd46edd974

* Include Swift lib in LIBRARY_SEARCH_PATHS

Summary:
changelog: Fix Xcode 13 build error in HelloWorld template

Including `usr/lib/swift` fixes error:
{F642876047}

Reviewed By: p-sun

Differential Revision: D30301799

fbshipit-source-id: b93eb51ec5dd929ddc46574fc11bc89934eadeaf

* fix#29319 - ios dismiss modal (#31500)

Summary:
This PR aims to resolve iOS can't dismiss Modal on swipe gesture.
https://github.com/facebook/react-native/issues/29319

When modal presentationStyle is pageSheet, iOS allows to dismiss the modal using swipe gesture. This PR adds support for that feature
## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[iOS] [Added] - Support for onRequestClose for iOS Modal component.

Pull Request resolved: https://github.com/facebook/react-native/pull/31500

Test Plan:
- If onRequestClose updates the visibility state, modal will be closed.

```
<Modal
    visible={visible}
    animationType="slide"
    presentationStyle="pageSheet"
    onRequestClose={dismiss}>
</Modal>
```

https://user-images.githubusercontent.com/23293248/117590263-36cd7f00-b14c-11eb-940c-86e700c0b8e7.mov

## Notes
- In this PR, only support for partial drag is added. i.e. user can't drag the modal up and down completely. I added full user dragging but reverted in this [commit](https://github.com/facebook/react-native/commit/bb65b9a60d54b61652d608661eba876b49be3b17) to support controllable onRequestClose. If someone has any suggestion to have full draggable support + controllable onRequestClose, please let me know.

<!--

 the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes the user interface. -->

Reviewed By: p-sun

Differential Revision: D30041625

Pulled By: sammy-SC

fbshipit-source-id: 9675da760bd5c070c4f0e1d30271c8af5c50b998

* Fix selectionColor doesn't style Android TextInput selection handles (#31007)

Summary:
This issue fixes https://github.com/facebook/react-native/issues/30283 selectionColor does not change the handles color.

The method setCursorColor changes the cursor color of field `mCursorDrawable` using a reflection for Android Devices lower then API 28. This fix adds a reflection to change color of the left, center and right handles of a selection (mTextSelectHandleLeftRes, mTextSelectHandleRes and mTextSelectHandleRightRes).

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Fixed] - Fix selectionColor doesn't style Android TextInput selection handles

Pull Request resolved: https://github.com/facebook/react-native/pull/31007

Test Plan:
This changes fix the Java API for which I can not write Java tests as explained in commit https://github.com/facebook/react-native/commit/709a441ecf54cd9465f5946af0454ee7d10d5cbe
The java TextInputTest was excluded from the test suite in commit https://github.com/facebook/react-native/commit/709a441ecf54cd9465f5946af0454ee7d10d5cbe as they need the Yoga libraries to run

**<details><summary>CLICK TO OPEN TESTS RESULTS - API 22</summary>**
<p>

left/right handles do not change color with the cursor

| **BEFORE** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/108241887-98351180-714c-11eb-9c7b-7c693ea0bb06.png" width="250" height="" /> |

center Handle color does not change color

| **BEFORE** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/108241904-9ec38900-714c-11eb-9fc3-dbd26f83b979.png" width="250" height="" /> |

The left and right handle change color with the cursor color

| **AFTER** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/108241796-805d8d80-714c-11eb-9d90-6871ddaea86f.png" width="250" height="" /> |

The center handle color is correctly updated

| **AFTER** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/108241571-45f3f080-714c-11eb-8475-86e6dea64d73.png" width="250" height="" /> |

`setCursorColor` changes correctly the cursor color

| **AFTER** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/108241484-2d83d600-714c-11eb-8a0c-80a847f28537.png" width="250" height="" /> |

Default Colors do not have issues

| **AFTER** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/108241346-04634580-714c-11eb-933e-0dce504498a8.png" width="250" height="" /> |

| **AFTER** |
|:-------------------------:|
| <img src="https://user-images.githubusercontent.com/24992535/108241347-04fbdc00-714c-11eb-902a-fc057cf94986.png" width="250" height="" /> |

</p>
</details>

Reviewed By: ShikaSD

Differential Revision: D28682935

Pulled By: sota000

fbshipit-source-id: ff037c93f36bbf20c915373b995bbfd8e8ca92d0

* Fixing CI error "Entry file RNTester/js/RNTesterApp.ios.js does not exist" (#29263)

Summary:
PRs are failing with the error "Entry file RNTester/js/RNTesterApp.ios.js does not exist", despite it existing. The if statement around the checker will always trigger because when it looks to see if RNTester/js/RNTesterApp.ios.js exists it's inside of RNTester instead of root. I've added a "../" to solve this.

## Changelog

[Internal] [Fixed] - Fixing CI error "Entry file RNTester/js/RNTesterApp.ios.js does not exist"

Pull Request resolved: https://github.com/facebook/react-native/pull/29263

Test Plan:
![Screen Shot 2020-07-01 at 11 25 03](https://user-images.githubusercontent.com/65255457/86278790-cc43ce00-bb8d-11ea-8098-9f4a751667ae.png)
![Screen Shot 2020-07-01 at 11 26 52](https://user-images.githubusercontent.com/65255457/86278796-ccdc6480-bb8d-11ea-9d73-63801f77e840.png)

Reviewed By: sammy-SC

Differential Revision: D30176138

Pulled By: sota000

fbshipit-source-id: 41510b31d3f1a34de7b0b5218ab670ac99409622

* Fix dashed/dotted border drawing when border-radius is 0 (#28359)

Summary:
This PR fixes the border-style that is not respected when drawing a border with 0 border-radius on Android. This would cause the faster `drawRectangularBackgroundWithBorders` path to be used, but that uses rectangular drawing and doesn't support dashed/dotted stroke patterns.
This PR changes the behavior to use the generic `drawRoundedBackgroundWithBorders` code-path which does support dashed/dotted border-styles.

## Changelog

`[Android] [Fixed] - Fix dashed/dotted border-drawing when border-radius is 0`

Pull Request resolved: https://github.com/facebook/react-native/pull/28359

Test Plan:
**Faulty situation:**

![Screenshot_1584721992](https://user-images.githubusercontent.com/6184593/77184987-e838cd80-6ad0-11ea-9585-058eafbd361a.png)

**After the fix:**

![Screenshot_1584721410](https://user-images.githubusercontent.com/6184593/77184801-9d1eba80-6ad0-11ea-92a7-7212f40ace73.png)

Reviewed By: lunaleaps

Differential Revision: D20590739

Pulled By: charlesbdudley

fbshipit-source-id: 18657ea21e54f763e22c623bf979b3500c1bdcbd

* Add a way to bind log function to the unified react native logger.

Summary:
In this diff:
1. Convert the ReactNativeLogger to c function for the future compatibility.
2. Bind the log function from Catalyst app
3. Update the call site

Changelog: [internal]

Reviewed By: JoshuaGross

Differential Revision: D30271863

fbshipit-source-id: 4c0ea704cf19f53468a3b72631353959ea999884

* React Native sync for revisions 19092ac...5634ed1

Summary:
This sync includes the following changes:
- **[424fe5870](https://github.com/facebook/react/commit/424fe5870 )**: Revert "Show a soft error when a text string or number is supplied as a child to non text wrappers ([#21953](https://github.com/facebook/react/pull/21953))" ([#22108](https://github.com/facebook/react/pull/22108)) //<Sota>//
- **[aebf3b456](https://github.com/facebook/react/commit/aebf3b456 )**: [Scheduler] Check for continuous input events ([#22107](https://github.com/facebook/react/pull/22107)) //<Andrew Clark>//
- **[e9b2028b3](https://github.com/facebook/react/commit/e9b2028b3 )**: Show a soft error when a text string or number is supplied as a child to non text wrappers ([#21953](https://github.com/facebook/react/pull/21953)) //<Sota>//
- **[ecd73e17b](https://github.com/facebook/react/commit/ecd73e17b )**: Enable enableSuspenseLayoutEffectSemantics flag statically for Facebook ([#22050](https://github.com/facebook/react/pull/22050)) //<Brian Vaughn>//
- **[a8725a3e6](https://github.com/facebook/react/commit/a8725a3e6 )**: Scheduling profiler: Added lane labels and durations to React measures ([#22029](https://github.com/facebook/react/pull/22029)) //<Brian Vaughn>//

Changelog:
[General][Changed] - React Native sync for revisions 19092ac...5634ed1

jest_e2e[run_all_tests]

Reviewed By: kacieb

Differential Revision: D30225923

fbshipit-source-id: 562895d3e0d264f40770dadb89d4a16241967c4c

* Exclude nativeImageSource.js instead of matching [Nn]

Summary:
The change to this glob by D30266076 (https://github.com/facebook/react-native/commit/f1b4748a7c649ddff1739e4be57a1d4d89f1db56) lines up suspiciously to a non-reproducible failure in the sources to the rules that use this glob. Changing to see if it mitigates the issue.

See https://fb.workplace.com/groups/askbuck/posts/6473961645985729/?comment_id=6476777799037447&reply_comment_id=6477737555608138

Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D30361375

fbshipit-source-id: af7b7fe553364fc1d7012bea8d00bf02ee2804fa

* Revert D20590739

Summary:
This diff is reverting D20590739 (https://github.com/facebook/react-native/commit/3e5998e651eba840603dcb1a9c0be564fc3f868d)
D20590739 (https://github.com/facebook/react-native/commit/3e5998e651eba840603dcb1a9c0be564fc3f868d) is making the following tests to fail and this revert diff is either the revert of the blame diff or the revert of the stack of diffs that need to be reverted to revert the blame diff
Tests affected:
- https://www.internalfb.com/intern/test/281475012591721/
Multisect link:
https://www.internalfb.com/intern/testinfra/multisect/476214

## Changelog

`[Android] [Fixed] - Revert: Fix dashed/dotted border-drawing when border-radius is 0`

Reviewed By: charlesbdudley

Differential Revision: D30361262

fbshipit-source-id: 21dd507deb5817dda1063a267a38749c77e7ae1a

* Fix irregular indent in template (#29871)

Summary:
Fix irregular indent in template/android/app/build.gradle

![image](https://user-images.githubusercontent.com/26166657/92319046-46417900-f04f-11ea-9051-cb4d7bcc3049.png)

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Fixed] - Fix irregular indent in template

Pull Request resolved: https://github.com/facebook/react-native/pull/29871

Test Plan: N/A

Reviewed By: passy, cortinico

Differential Revision: D30360839

Pulled By: sota000

fbshipit-source-id: 7a92890007716c6e244ceffaa697cdd5ad1a0504

* JS: Fix "Modal | Basic" Test's Layout

Summary:
Fix the CSS on the main Modal test

Move the warning message for the "Transparent" switch to below the switch, since warnings messages are usually under the field they're warning.

Move Presentation Style to be before Transparent, since Transparent is a modifier of "overFullScreen" Presentation Style.

Reviewed By: lunaleaps

Differential Revision: D30323087

fbshipit-source-id: b13d6c958145096da95c9888181ff457b093fb49

* replace testing-support-lib with androidx buck targets in RN

Summary: Changelog: [Internal] - codemod testing library Buck redirect to actual dependency

Reviewed By: jiawei-lyu

Differential Revision: D30379180

fbshipit-source-id: eb9a22569230d07732bd0aa63dddfcfff7c3800f

* `Android/ColorProps`: ColorProps with value null should be defaultColor instead of transparent (#29830)

Summary:
This pr:
- Fixes: https://github.com/facebook/react-native/issues/30183
- Fixes: https://github.com/facebook/react-native/issues/30056
- Fixes: https://github.com/facebook/react-native/issues/29950
- Fixes: https://github.com/facebook/react-native/issues/29717
- Fixes: https://github.com/facebook/react-native/issues/29495
- Fixes: https://github.com/facebook/react-native/issues/29412
- Fixes: https://github.com/facebook/react-native/issues/29378

Because most of ReactProps(name = ViewProps.COLOR) accept @ Nullable Integer.
For example:
https://github.com/facebook/react-native/blob/abb6433f506851430dffb66f0dd34c1e70a223fe/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java#L472-L479

After update to react-native 0.63.2 to make PlatformColor work, there is a new ColorPropSetter.
https://github.com/facebook/react-native/blob/abb6433f506851430dffb66f0dd34c1e70a223fe/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java#L194-L215

But ColorPropSetter won't return an nullable value with getValueOrDefault, it will always return it's defaultValue which is 0.
And 0 is equal to TRANSPARENT, will cause <Text /> disappear.
## Changelog

[Android] [Fixed] - ColorProps with value null should be defaultColor instead of transparent

Pull Request resolved: https://github.com/facebook/react-native/pull/29830

Test Plan:
Please initiated a new project and replaced the app with the following code:
```
import * as React from 'react';
import {Text, View, TouchableOpacity, PlatformColor} from 'react-native';

export default function App() {
  const [active, setActive] = React.useState(false);

  return (
    <View>
      <Text style={active ? {color: 'green'} : null}>Example</Text>
      <Text
        style={
          active ? {color: PlatformColor('android:color/holo_purple')} : null
        }>
        Example2
      </Text>
      <TouchableOpacity onPress={() => setActive(!active)}>
        <Text>Toggle Active</Text>
      </TouchableOpacity>
    </View>
  );
}
```

Thanks you so much for your code review!

Reviewed By: JoshuaGross

Differential Revision: D30209262

Pulled By: lunaleaps

fbshipit-source-id: bc223f84a92f742266cb7b40eb26722551940d76

* Fix Dimensions not updating on Android (#31973)

Summary:
When retrieving the device dimensions through the JS `Dimensions` utility, the result of `Dimensions.get` can be incorrect on Android.

### Related issues

- https://github.com/facebook/react-native/issues/29105
- https://github.com/facebook/react-native/issues/29451
- https://github.com/facebook/react-native/issues/29323

The issue is caused by the Android `DeviceInfoModule` that provides initial screen dimensions and then subsequently updates those by emitting `didUpdateDimensions` events. The assumption in that implementation is that the initial display metrics will not have changed prior to the first check for updated metrics. However that is not the case as the device may be rotated (as shown in the attached video).

The solution in this PR is to keep track of the initial dimensions for comparison at the first check for updated metrics.

## Changelog

[Android] [Fixed] - Fix Dimensions not updating

Pull Request resolved: https://github.com/facebook/react-native/pull/31973

Test Plan:
### Steps to reproduce
1. Install the RNTester app on Android from the `main` branch.
2. Set the device auto-rotation to ON
3. Start the RNTester app
4. While the app is loading, rotate the device
5. Navigate to the `Dimensions` screen
6. Either
 a. Observe the screen width and height are reversed, or
 b. Quit the app and return to step 3.

### Verifying the fix

#### Manually
Using the above steps, the issue should no longer be reproducible.

#### Automatically
See unit tests in `ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java`

### Video

https://user-images.githubusercontent.com/4940864/128485453-2ae04724-4ac5-4267-a59a-140cc3af626b.mp4

Reviewed By: JoshuaGross

Differential Revision: D30319919

Pulled By: lunaleaps

fbshipit-source-id: 52a2faeafc522b1c2a196ca40357027eafa1a84b

* refactor: remove DefaultProps from the StatusBar Component (#31631)

Summary:
Issue https://github.com/facebook/react-native/issues/31607. defaultProps makes it difficult to migrate components to functional.

## Changelog

[General] [Changed] -  Remove defaultProps from the StatusBar Component.

Pull Request resolved: https://github.com/facebook/react-native/pull/31631

Test Plan:
Verified the behaviour of the existing functionality after the removal on the RN Tester app.

https://user-images.githubusercontent.com/11355609/120085709-a2b35f80-c0da-11eb-94f2-2649270155ef.mov

Reviewed By: sota000

Differential Revision: D30259324

Pulled By: lunaleaps

fbshipit-source-id: 0c8841691198761589fdd029cab36629f7dfa757

* fix AGP 7 compatibility (#32030)

Summary:
Android Gradle Plugin 7 removed dependency configurations, and it includes compile. Below is a snipped from release notes https://developer.android.com/studio/releases/gradle-plugin

I can confirm that RN 0.65.0 app is running as expected on Android with the patch.

> **compile**
Depending on use case, this has been replaced by api or implementation.
Also applies to *Compile variants, for example: debugCompile.

## Changelog

[Android] [Changed] - Android Gradle Plugin 7 compatibility

Pull Request resolved: https://github.com/facebook/react-native/pull/32030

Test Plan: Create a project with RN 0.65.0 and upgrade Android Gradle Plugin to 7.0.0, and Gradle to 7.0.2. It'll fail to sync. Then apply the change, and it'll sync as normal, and build the app.

Reviewed By: passy, ShikaSD

Differential Revision: D30394238

Pulled By: cortinico

fbshipit-source-id: cabc25754b9cd176a7d6c119d009728f2e5a93d9

* Clean up Fabric startSurface API used in Venice

Summary:
Update FabricUIManager methods for `SurfaceHandler` to start usual rendering or prerendering based on presence of the view instead of using two methods with same logic.

Changelog: [Internal]

Reviewed By: sshic

Differential Revision: D30346502

fbshipit-source-id: 297f2b4a16dc7af7c36379252bd73e6dc953ff59

* Expose "unreserved" trait constants that can be mapped per-component

Summary:
Fabric core uses a lot of traits - I am reserving a few more for core usage, and also exposing a few "unreserved" traits.

It is recommended that all custom components that do use traits rely on these constants instead of hard-coding any trait values. That way, in the unlikely event that these values change in the future, it will not break components.

Changelog: [Internal]

Reviewed By: cortinico, RSNara

Differential Revision: D30401743

fbshipit-source-id: fb2e8f5cf33c94e31a0c25a89055acfc4eccf066

* Call super.onActivityResult in ReactActivity

Summary:
This change allows native activities and fragments to also handle onActivityResult callbacks, in addition to sending the result to React Native.

Changelog:
[Android][Changed] - Call super.onActivityResult in ReactActivity's onActivityResult()

Reviewed By: JoshuaGross

Differential Revision: D30232449

fbshipit-source-id: cb080d6f2eff57dcf839660ee715cb4068ffcdd5

* Move react_native_log out of utils (#32042)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/32042

This diff moves react_native_log out of utils to make it easier/possible to import from modules.
Changelog: [internal]

Reviewed By: JoshuaGross

Differential Revision: D30411247

fbshipit-source-id: 5482761b259600df051a88c6eff1834c882e7230

* fix: Resolve NODE_BINARY *after* finding the path to node (#32029)

Summary:
We want to resolve `NODE_BINARY` **after** `find-node.sh` runs and sets up any node version manager that we need to setup, otherwise `NODE_BINARY` is always undefined.

## Changelog

[Internal] [Fixed] - Resolve NODE_BINARY after finding the right path to node

Pull Request resolved: https://github.com/facebook/react-native/pull/32029

Reviewed By: TheSavior

Differential Revision: D30401213

Pulled By: yungsters

fbshipit-source-id: 386ffeff15b5f371a452488ed078d3adebe0f211

* Ship "Disable 'virtual view' preallocation" experiment in code

Summary:
The impact of this has proven impressive, and safe. Ship in code and remove feature-flag.

Changelog: [Internal]

Reviewed By: philIip

Differential Revision: D30269561

fbshipit-source-id: 9bb72567cfd881928d14d9bee43cf32b390664fb

* Emit soft error for warning

Summary:
This diff adds a default behavior for the unified logger on Android.

Added the call site in the CXXNativeModule.

Changelog: [internal]

Reviewed By: JoshuaGross

Differential Revision: D30377767

fbshipit-source-id: 000014828f2f245dc9492e3617218895d9a33536

* Enable ktfmt

Summary: Changelog: [internal]

Reviewed By: zertosh

Differential Revision: D30423755

fbshipit-source-id: 8ae27b3666214f5144ef8b5ef7fe868afc19b4b9

* Pass configFile: false to Babel parser

Summary:
Changelog: [Internal]

Disables implicit `babel.config.js` lookup in a `parse()` call that does not need any user-specified config.

Reviewed By: javache

Differential Revision: D30396331

fbshipit-source-id: 9b07c361eae53cdffc6a76ba30f1146a7af65a10

* Passing the scheme field throughout all the metro connection pipeline to allow different scheme other than the default hardcoded http

Reviewed By: lunaleaps

Differential Revision: D30218490

fbshipit-source-id: 3832c731156a4f88ad1c55be0a0e4f68fa3e1d48

* Adding activity check to enable Dev mode

Summary:
It is assumed that there will always be an activity associated on enabling the dev support which is not the case. Hence adding that null check.

Changelog:
[Android][Fixed] - Added null check for activity in onHostResume()

Reviewed By: javache

Differential Revision: D30411311

fbshipit-source-id: 8936be2df7f16c355693163347d5e1d94c5ce2e1

* Deploy 0.158.0 to xplat

Summary: Changelog: [Internal]

Reviewed By: dsainati1

Differential Revision: D30426571

fbshipit-source-id: 70689323d066e3b25bf720f454d2146d195df8b3

* - Fix broken Circle CI due to missing BUCK rule for androidx:tests (#32052)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/32052

Changelog: Update the OSS React Native dependencies to match the internal dependency structure.

Reviewed By: cortinico

Differential Revision: D30397818

fbshipit-source-id: a70e26d764729f6ead9eb6a4d689e32d25243571

* Remove BUILD FILE SYNTAX from build files

Summary: Changelog: [Internal]

Reviewed By: zertosh

Differential Revision: D30410441

fbshipit-source-id: 62deebb502121f23270bfa18286b155ad161af2d

* Apply new buildifier fixes

Summary: Changelog: [Internal]

Reviewed By: zertosh

Differential Revision: D30407205

fbshipit-source-id: 022a02829d59a900764b228afb9856ed1ba2cf8c

* Remove redundant includes

Summary:
changelog: internal

Removing unused headers. Fewer headers = faster compilation

Reviewed By: p-sun

Differential Revision: D30398600

fbshipit-source-id: a64801e49d283ad1e2d0cb9c9d688445e30bf0ed

* Provide logger to YGConfig

Summary:
Changelog: [internal]

Logger needs to be supplied to YGConfig, otherwise the app crashes when Yoga tries to log.

Reviewed By: fkgozali

Differential Revision: D30394676

fbshipit-source-id: bda464a4e43cb815c00650e1fedf43fe0a06f973

* Set initial maximum surface size to viewport size

Summary:
Changelog: [internal]

There is a possibility of race between JavaScript sending "completeRoot" and maximum size set on surface. To prevent this race, we set the initial maximum size to be equal to the viewport size.

Alternative solution is to set maximumSize to {0, 0} initially instead of infinity. This is what old architecture does, even though not explicitly.

Reviewed By: fkgozali

Differential Revision: D30402207

fbshipit-source-id: 44427404eaf060a81de257797823edf971ffc1bb

* iOS: Don't display LogBox in Dev if Bridge was invalided

Summary: Bridge can get invalidated during tear down. If a JS error is thrown then, don't display a LogBox so we don't hit the invalid bridge assert in RCTSurface.

Reviewed By: fkgozali

Differential Revision: D30464848

fbshipit-source-id: 87a8daa95fd06342d194a4805ecfa97279820f2e

* Update ImageBackground.js (#32055)

Summary:
Currently ImageBackGround component has optional style props, but if you don't pass it as prop, it still "thinks" you pass style and crushes.
In this pr, I made width and height inside component to be optional so it won't crush.

## Changelog

[General] [Fix] - Changed ImageBackground's style so it won't crush.

[Screen Shot 2021-08-20 at 15 05 45](https://user-images.githubusercontent.com/62840630/130230568-be02b1a2-52ec-4f9d-b3d3-212552d3882b.png)

As you can see in this component, I tried to use ImageBackground without any style props, and my app crushes. Then I added style with empty object and the app didn't crush anymore, as you can see here:
![Screen Shot 2021-08-20 at 15 09 23](https://user-images.githubusercontent.com/62840630/130230932-a576c397-a910-4e40-a202-56482d83dd9c.png).

In conclusion, if we make width and height styles optionals inside ImageBackground component, it won't crush anymore.

Thoughts:
Maybe consider to make style props for this component none-optional because it isn't make any sense that image won't have any style at all.

Thanks ahead, that was my first pr, Eden Binyamin.

Pull Request resolved: https://github.com/facebook/react-native/pull/32055

Reviewed By: charlesbdudley

Differential Revision: D30452297

Pulled By: sshic

fbshipit-source-id: b7071aa457dba443ed2f627c2458ea84fd24b36d

* Fix typo and grammar (#31916)

Summary:
> Always leave the campground cleaner than you found it.

Fixing:
* typo in _dismissed_
* make the subject agree with the verb

## Changelog

[Internal] [Fixed] - A typo in a comment

Pull Request resolved: https://github.com/facebook/react-native/pull/31916

Test Plan: Grammarly says it's better now.

Reviewed By: lunaleaps

Differential Revision: D29967403

Pulled By: yungsters

fbshipit-source-id: 6cb33328e99e3fceba5f19f4baaa9446340fbbcc

* Added Selection prop to TextInputProps

Summary:
Changelog: [iOS][Added]
1. Added new primitive type "Selection" to C++
2. Added property "selection" to TextInputProps
3. Added parser for that

Reviewed By: sammy-SC

Differential Revision: D30043256

fbshipit-source-id: eefa67ca23759761901cba1d2ab3052877a153a7

* Selection prop is applied for TextInput when component is mounting

Summary:
Changelog: [Internal]
TextInput's predefined "selection" prop is now applied when view did move to window, and when attributed string is set.

Reviewed By: sammy-SC

Differential Revision: D30045271

fbshipit-source-id: e5495171b07a25e1e822421ff1627a8686cd0904

* use correct gradle packageTask and asserts dir for android libraries (#32026)

Summary:
Fixes https://github.com/facebook/react-native/issues/29577 and https://github.com/react-native-community/upgrade-support/issues/93, when building an android library the package task has a different name, which was not handled correctly in the react.gradle file. The fix uses the existing `packageTask` variable which is correctly set for applications and libraries. This PR also copies the bundled js file into the correct assets directory, which is different from the assets directory of applications.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Fixed] - Fixed Android library builds with react.gradle file

Pull Request resolved: https://github.com/facebook/react-native/pull/32026

Test Plan: Tested with my android library build which includes the `react.gradle` file and the build succeeded.

Reviewed By: sshic, ShikaSD

Differential Revision: D30368771

Pulled By: cortinico

fbshipit-source-id: 8f0df8c4d0fa38d85f7c0b9af56d88799571191d

* Codegen: Add codegen.js wrapper around generate-specs.sh

Summary:
Adds a simple wrapper around the generate-specs.sh bash script.
Supports optional flags.

Usage:
`node ./codegen.js --srcs ./js --modules_library_name FBReactNativeSpec`

Remove unused `USE_FABRIC` envvar code from `generate-specs.sh`.

Changelog:
[Internal]

Reviewed By: fkgozali

Differential Revision: D30439132

fbshipit-source-id: 07099c1d899606ac2e679fac6d32ea2fa4af40fc

* Add Flow libdefs for HermesInternalType

Summary:
Changelog: [Internal]

This diff add a flow libdefs for the `HermesInternalType` to type
`HermesInternal` as the first accurately typed `global` property,
and filled all the type holes.

Reviewed By: yungsters

Differential Revision: D29986749

fbshipit-source-id: a94be7919f989b5085f6b264e55145a85020fea9

* Add support for the UIAccessibilityTraitsTabBar

Summary:
Changelog:
Add the capability to set tabbar accessibilityRole which maps to the iOS's UIAccessibilityTraitsTabBar

Reviewed By: yungsters

Differential Revision: D30490752

fbshipit-source-id: f7561a8932306e133d2f65a5ab40ba0be3899ec3

* Add support for AccessibilityValue

Summary:
Changelog:
[Fabric][iOS] Add support for AccessibilityState

Specification: https://reactnative.dev/docs/accessibility#accessibilityvalue

Reviewed By: sammy-SC

Differential Revision: D30452786

fbshipit-source-id: 0d459d3a7b9c037bd1877e5c7ead40bbb42830c3

* fix typos in comments (#32061)

Summary:
Fixed some typos in the code comments.

## Changelog

[Internal] [Fixed] - Fixed typo in the comments

Pull Request resolved: https://github.com/facebook/react-native/pull/32061

Test Plan: N/A

Reviewed By: javache

Differential Revision: D30482511

Pulled By: cortinico

fbshipit-source-id: ff67bc00d57972df88e41ee7a933259673de3aa2

* Add window to jest setup (#28067)

Summary:
`window` exists in the React Native runtime, but not inside the test environment. Many libraries use `typeof window === 'undefined'` to check if code is running in SSR. Because of the difference in the real environment and test environment, tests can behave different than the real app, which is an unwanted behavior.

## Background

I'm using https://github.com/tannerlinsley/react-query in my React Native Project, which works really well. When writing tests, they wouldn't work: jest started and then seemingly did nothing. While debugging I noticed the render was stuck in an infinite loop. Then I noticed the following line inside `react-query`:

```js
const isServer = typeof window === 'undefined'
```

I didn't know that the React Native runtime has a global `window`, and thought it's a bug inside react-query. But it does have a `window`, which is not defined inside the test environment.

The infinite loop was caused by react-query thinking it is running on the server, which doesn't fetch any data. If the react-query hook mounts, it re-executes because then it should be mounted inside the client. But `isServer` was still `true`. This repeats forever.

## Changelog

[General] [Fixed] - Fix `window` not existing in jest setup

Pull Request resolved: https://github.com/facebook/react-native/pull/28067

Test Plan: Are there tests to check if the test environment is setup correctly? �

Reviewed By: yungsters

Differential Revision: D30317021

Pulled By: charlesbdudley

fbshipit-source-id: 837ed952833ef8e70c5132c9b4152b0e0f28b4dd

* React Native sync for revisions 424fe58...bd5bf55

Summary:
Post: https://fb.workplace.com/groups/rnsyncsquad/permalink/879923262900946/

This sync includes the following changes:
- **[fc3b6a411](https://github.com/facebook/react/commit/fc3b6a411 )**: Fix a few typos ([#22154](https://github.com/facebook/react/pull/22154)) //<Bowen>//
- **[986d0e61d](https://github.com/facebook/react/commit/986d0e61d )**: [Scheduler] Add tests for isInputPending ([#22140](https://github.com/facebook/react/pull/22140)) //<Andrew Clark>//
- **[d54be90be](https://github.com/facebook/react/commit/d54be90be )**: Set up test infra for dynamic Scheduler flags ([#22139](https://github.com/facebook/react/pull/22139)) //<Andrew Clark>//
- **[7ed0706d7](https://github.com/facebook/react/commit/7ed0706d7 )**: Remove the warning for setState on unmounted components ([#22114](https://github.com/facebook/react/pull/22114)) //<Dan Abramov>//
- **[9eb2aaaf8](https://github.com/facebook/react/commit/9eb2aaaf8 )**: Fixed ReactSharedInternals export in UMD bundle ([#22117](https://github.com/facebook/react/pull/22117)) //<Brian Vaughn>//
- **[bd255700d](https://github.com/facebook/react/commit/bd255700d )**: Show a soft error when a text string or number is supplied as a child to non text wrappers ([#22109](https://github.com/facebook/react/pull/22109)) //<Sota>//

Changelog:
[General][Changed] - React Native sync for revisions 424fe58...bd5bf55

jest_e2e[run_all_tests]

Reviewed By: yungsters

Differential Revision: D30485521

fbshipit-source-id: c5b92356e9e666eae94536ed31b8de43536419f8

* Remove usages of `dynamic_casts` that are used inside assertions

Summary:
This diff is part of a bigger effort to remove the RTTI flags.
To do so we need to remove occurrences of `dynamic_cast` and other functions that rely on runtime
type informations.

Changelog:
[Internal][Changed] - Removed extra asserts relying on dynamic_cast

Reviewed By: JoshuaGross

Differential Revision: D30483554

fbshipit-source-id: 92b31281841a92c7b43e918938248431265dd654

* Fix broken CI with a run of prettier

Summary:
This Diff is fixing a broken CircleCI on OSS due to
not properly formatted .js files. See https://app.circleci.com/pipelines/github/facebook/react-native/10040/workflows/923cb408-b09c-4425-87c1-2677a7af9681/jobs/213822

The offending diff was D29986749 (https://github.com/facebook/react-native/commit/ff4b33672a6a27d2ed68ae6602e9d29d9b7c3eb1)

Changelog:
[Internal] - Fix broken CI due to not formatted js files

Reviewed By: ShikaSD

Differential Revision: D30515439

fbshipit-source-id: 560de04347a8746065981b534ed96f0956d94b9c

* Fixed dynamic behavior of <Text adjustsFontSizeToFit={true}> on Android (#31538)

Summary:
This PR fixes https://github.com/facebook/react-native/issues/30717, a bug in `<Text adjustsFontSizeToFit={true}>` implementation that prevents it from adjusting text size dynamically on Android.

The way `adjustsFontSizeToFit` was implemented in https://github.com/facebook/react-native/issues/26389 (and the design of ReactTextShadowNode) implies that Yoga will call `onMeasure` on every size change of a `<Text>` component, which is actually not the case (Yoga can cache the results of the measures, call the function multiple times or do not call at all inferring the size from the size constraints). The implementation of `adjustsFontSizeToFit` computes the adjusted string inside the measure function and then eventually passes that to the view layer where it's being rendered.

The proper fix of this issue requires the full redesign of the measure and rendering pipelines and separating them, and that... would be too invasive. And, I believe, this issue is already fixed in Fabric where this part is already designed this way.

Instead, this diff implements a small workaround: if `adjustsFontSizeToFit` is enabled, we manually dirty the Yoga node and mark the shadow node updated to force remeasuring.

## Changelog

[Android] [Fixed] - Fixed dynamic behavior of <Text adjustsFontSizeToFit={true}> on Android

Pull Request resolved: https://github.com/facebook/react-native/pull/31538

Test Plan: https://user-images.githubusercontent.com/22032/118508162-8c79cc80-b6f4-11eb-853f-a1a09f82935f.mov

Reviewed By: mdvacca

Differential Revision: D28631465

Pulled By: yungsters

fbshipit-source-id: 7db1d22e2a5a464c7bf941d1d3df8e3fe8df66a2

* Bump @react-native/polyfills version (#32074)

Summary:
https://github.com/facebook/react-native/commit/8a62583f794875e6dc5d1e4a24889b3b702d9f86 did some renaming inside of the react-native/polyfills project, with the jest preset updated to use the new name. The new package for polyfills has not yet been published, so the jest preset in the main branch will be looking for the new name, while the old name is provided by the currently published react-native/polyfills@1.0.0. This is not hit inside the repo, since the dependency is linked instead of using the published one.

Bump react-native/polyfills to 2.0 (breaking change), in preparation for publish.

## Changelog

[Internal][Fixed] - Bump react-native/polyfills version

Pull Request resolved: https://github.com/facebook/react-native/pull/32074

Reviewed By: lunaleaps, cortinico

Differential Revision: D30498104

Pulled By: yungsters

fbshipit-source-id: 92dcb159d76bd74cd93cfa09e2155c9c1b2c0a86

* Include Swift lib in LIBRARY_SEARCH_PATHS

Summary:
changelog: Fix Xcode 13 build error in RNTester

Including `usr/lib/swift` fixes error:
{F642876047}

Reviewed By: fkgozali

Differential Revision: D30559838

fbshipit-source-id: 65aad16b550d156c8670eaefcc8bedae99606329

* chore: prefer the local react-native-codegen package (#32096)

Summary:
Currently, the build breaks if we move `react-native-codegen` from the template's dependencies to root. This is due to `scripts/generate-specs-cli.js` using the one installed under `node_modules` instead of the local one.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Fixed] - `scripts/generate-specs-cli.js` should prefer the local `react-native-codegen` package

Pull Request resolved: https://github.com/facebook/react-native/pull/32096

Test Plan:
1. Make the following changes
   ```diff
   diff --git a/package.json b/package.json
   index 847c726a69b..78da8232988 100644
   --- a/package.json
   +++ b/package.json
   @@ -107,6 +107,7 @@
        "promise": "^8.0.3",
        "prop-types": "^15.7.2",
        "react-devtools-core": "^4.13.0",
   +    "react-native-codegen": "^0.0.7",
        "react-refresh": "^0.4.0",
        "regenerator-runtime": "^0.13.2",
        "scheduler": "^0.20.2",
   diff --git a/template/package.json b/template/package.json
   index 715614112ac..5e0762b1b25 100644
   --- a/template/package.json
   +++ b/template/package.json
   @@ -21,7 +21,6 @@
        "eslint": "7.14.0",
        "jest": "^26.6.3",
        "metro-react-native-babel-preset": "^0.66.2",
   -    "react-native-codegen": "^0.0.7",
        "react-test-renderer": "17.0.2"
      },
      "jest": {
   ```
2. Run `scripts/test-manual-e2e.sh`

## Expected Behavior

Task `:ReactAndroid:buildReactNdkLib` succeeds.

## Actual Behavior

```
> Task :ReactAndroid:buildReactNdkLib FAILED
make: Entering directory '~/Source/react-native/ReactAndroid/src/main/jni/react/jni'
fcntl(): Bad file descriptor
make: Leaving directory '~/Source/react-native/ReactAndroid/src/main/jni/react/jni'
~/Library/Android/sdk/ndk/21.4.7075529/build/core/build-binary.mk:651: Android NDK: Module react_codegen_rncore depends on undefined modules: react_render_components_view
~/Library/Android/sdk/ndk/21.4.7075529/build/core/build-binary.mk:664: *** Android NDK: Note that old versions of ndk-build silently ignored this error case. If your project worked on those versions, the missing libraries were not needed and you can remove those dependencies from the module to fix your build. Alternatively, set APP_ALLOW_MISSING_DEPS=true to allow missing dependencies.    .  Stop.

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':ReactAndroid:buildReactNdkLib'.
> Process 'command '~/Library/Android/sdk/ndk/21.4.7075529/ndk-build'' finished with non-zero exit value 2

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.

* Get more help at https://help.gradle.org

Deprecated Gradle features were used in this build, making it incompatible with Gradle 7.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/6.9/userguide/command_line_interface.html#sec:command_line_warnings

BUILD FAILED in 19s
20 actionable tasks: 20 executed
Couldn't generate artifacts
```

Reviewed By: ShikaSD

Differential Revision: D30581194

Pulled By: hramos

fbshipit-source-id: 3f7a707b33377042502e50887856ff5641fdd52c

* feat: add Android 12 BLUETOOTH_ADVERTISE to PermissionsAndroid (#32079)

Summary:
This PR adds BLUETOOTH_ADVERTISE, which showed up in the latest Android 12 Beta build as new `dangerous` permissions requiring approval for them.

https://developer.android.com/reference/android/Manifest.permission.html#BLUETOOTH_ADVERTISE

You can see the new set of `SCAN/ADVERTISE/CONNECT` added in this doc - https://developer.android.com/about/versions/12/features/bluetooth-permissions, previously SCAN/CONNECT were added in: https://github.com/facebook/react-native/pull/31488

## Changelog

[Android] [Changed] - Add BLUETOOTH_ADVERTISE to PermissionsAndroid

Pull Request resolved: https://github.com/facebook/react-native/pull/32079

Test Plan:
```
PermissionsAndroid.BLUETOOTH_ADVERTISE === 'android.permission.BLUETOOTH_ADVERTISE'
```

Reviewed By: cortinico

Differential Revision: D30532656

Pulled By: yungsters

fbshipit-source-id: 986ad8cbfc27913df13ab24bba36f6e13104e7d9

* Update manual testing script to also test Hermes for RNTester

Summary: Changelog: [Internal] - Update test-manual-e2e.sh to test Hermes for RNTester

Reviewed By: ShikaSD

Differential Revision: D30569403

fbshipit-source-id: fd45c8158c4c5ad93f33bc7b80464c5fc387a737

* Move react-native-codegen to root

* [0.66.0-rc.0] Bump version numbers

* Native component check in deprecatedPropType was inverted (#31164)

Summary:
While investigating an issue hit on a recent sync of [react-native-windows](https://github.com/microsoft/react-native-windows) I noticed that https://github.com/facebook/react-native/commit/e68cf7cee9d36271a1d3899fecff817304bb8bdc appears to have accidently inverted the logic to avoid checking native components.

`!UIManager.getViewManagerConfig(componentName)`
become
`UIManager.hasViewManagerConfig(componentName)`
losing the !

Also adding a check in PaperUIManager's getViewManagerConfig to avoid trying to call a sync method when using Chrome Debugging.

[Internal] [Fixed] - Restored the previous logic of deprecatedPropType

Pull Request resolved: https://github.com/facebook/react-native/pull/31164

Test Plan:
Change tested and being submitted in react-native-windows:
https://github.com/microsoft/react-native-windows/pull/7397

Reviewed By: hramos

Differential Revision: D30624302

Pulled By: fkgozali

fbshipit-source-id: 0f26e750283a1fa5eb5f44ecd2cf90617b6d931f

* OSS: Fix $ENTRY_FILE check for non-Debug Xcode builds

Summary:
The original $ENTRY_FILE check was added in https://github.com/facebook/react-native/pull/29012 to help catch misconfiguration for the entry JS file. That turned out breaking some RNTester builds/tests, so https://github.com/facebook/react-native/pull/29263 was added to accommodate the fact that RNTester .xcodeproj file has its own directory hierarchy.

The 2nd PR had multiple issues:
* It is incorrect to assume that the $ENTRY_FILE always exists in the parent dir of the .xcodeproj location. This caused an issue in RC 0.66: https://github.com/react-native-community/releases/issues/249#issue-983474535
* RNTester has since moved to packages/rn-tester/ (from RNTester/), hence breaking that assumption

It turns out RNTester .xcodeproj has incorrectly misconfigured this JS bundling step (not sure since when). The original script invocation passed in the correct path for `RNTesterApp.ios.js`, but as an arg to the `react-native-xcode.sh` instead of by setting `ENTRY_FILE` env var.

So this diff does 2 things:
* Undid https://github.com/facebook/react-native/pull/29263
* Fix RNTester JS bundling invocation to set the ENTRY_FILE correctly

{F659123377}

Changelog: [iOS][Fixed] Unbreak $ENTRY_FILE handling for JS bundling

Reviewed By: lunaleaps

Differential Revision: D30690900

fbshipit-source-id: 7c5802b3eac56c0456edcd4b7478bfa4af48fc27

* OSS: add Xcode 12.5 + M1 machines CocoaPods post_install workaround

Summary:
Context: there are multiple issues currently exposed by Xcode 12.5 and/or M1 machine + Flipper. To unblock the new 0.66 release, let's add this workaround in the official react_native_pods.rb recipe and make RNTester and new app Podfile's call it directly.

Changelog: [iOS][Fixed] Added workaround for Xcode 12.5 / M1 machines build issues

Reviewed By: lunaleaps

Differential Revision: D30691291

fbshipit-source-id: 8b24cc60da3d620dbc90f95c77f2345e18c28212

* Switch order of search libraries to fix M1 build error

Summary: changelog: Resolve Xcode 13 build error on M1 Macs for projects created from RN template

Reviewed By: fkgozali

Differential Revision: D30693466

fbshipit-source-id: f0b4fd471de38119d636c8e337831aa4d4599c4e

* Copy repo-config dependencies for bumping release version

Summary:
Changelog: [Internal[Fixed] - Revert, yarn workspaces only used in private packages. Copy dependencies over from repo-config instead

Original commit changeset: 1dd2adc6a036

Reviewed By: fkgozali

Differential Revision: D30599065

fbshipit-source-id: 0efffaaf38bc23bac339e6e1d917736243e1750e

* [0.66.0-rc.1] Bump version numbers

* [LOCAL] postfix timestamp to bust yarn cache

* Make JSI a dynamic library

Summary:
Ship libjsi as a standalone dynamic library. This prevents problems
with exception handling caused by duplicate typeinfo across multiple
shared libs, and reduces bundle size by removing duplicate copies of
JSI.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D30599215

fbshipit-source-id: abad1398342a5328daa825f3f684e0067cad7a96

* Revert the Android specific max heap size GCConfig

Summary:
Changelog:
[Category][Internal]

This diff reverts the [Androids-specific heap size overrides](github.com/facebook/react-native/commit/63d20d3b1ef35cb4398d63d62f631f7f5d2935c7#diff-4c59ddca85e294a90a0e1bd15ed323ff4e130911d9642680dde44aacbcd7d32c) after
[Hermes has changed its default max heap size to 3GiB](https://github.com/facebook/hermes/commit/5f2b47d0be6281fd2605d24efc0b43af42b4033d).
You can read about more context there.

Reviewed By: yungsters

Differential Revision: D30726067

fbshipit-source-id: 1bcc93fdf4da817f3b3d60bd09c6a5a64166eb7e

* Bump Hermes npm to 0.9.0

Summary:
Changelog:
[General][Changed] - Bump Hermes to 0.9.0

allow-large-files

Reviewed By: lunaleaps

Differential Revision: D30726474

fbshipit-source-id: 742cf68b046d8768e83e00d754e8efcc97586c00

* Bump Hermes pod to 0.9.0

Summary:
Changelog:
[General][Changed] - Bump Hermes to 0.9.0

(Note: this ignores all push blocking failures!)

Reviewed By: lunaleaps

Differential Revision: D30726473

fbshipit-source-id: add4149454b3f0333f3c1cb8b5d632371fd1bd80

* Update Podfile.lock

* [0.66.0-rc.2] Bump version numbers

* Link RCT-Folly against libc++abi

Summary:
Folly now depends on libc++abi. This solves linker error for RCT-Folly.podspec like this:

```
Undefined symbols for architecture arm64:
  "___cxa_increment_exception_refcount", referenced from:
      folly::exception_ptr_get_type(std::exception_ptr const&) in libRCT-Folly.a(Exception.o)
ld: symbol(s) not found for architecture arm64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
```

See https://github.com/react-native-community/releases/issues/251

Note: RNTester was not affected by this bug for some reason, so the only way to verify is via the new app generated via `npx react-native init`.

Changelog: [Fixed][iOS] Unbreak Folly linker error

Reviewed By: lunaleaps

Differential Revision: D30950944

fbshipit-source-id: 3eb146e23faa308a02363761d08849d6801e21ca

* Update rn-tester Podfile.lock to prepare for 0.66.0-rc.3

* [0.66.0-rc.3] Bump version numbers

* Don’t hard-code CocoaPods’s sandbox path (#32243)

Summary:
When running `scripts/react_native_pods.rb`, the `Pods` directory may not be in the current working directory, for example, when calling [`pod install`](https://guides.cocoapods.org/terminal/commands.html#pod_install) with `--project-directory=ios`. Therefore, `sed` fails and, ultimately, the build fails.

References:
* https://rubydoc.info/gems/cocoapods/Pod%2FInstaller:sandbox
* https://rubydoc.info/gems/cocoapods/Pod/Sandbox#root-instance_method

## Changelog

[iOS] [Fixed] - Fix build error after running `pod install` with `--project-directory=ios`

Pull Request resolved: https://github.com/facebook/react-native/pull/32243

Test Plan:
1. `npx react-native init AwesomeProject --version 0.66.0-rc.3 --skip-install`
2. `cd AwesomeProject`
3. `yarn install`
4. `pod install --project-directory=ios`

This command prints “sed: Pods/RCT-Folly/folly/portability/Time.h: No such file or directory” but still exits with 0.

5. `npx react-native run-ios`

The build fails because of “typedef redefinition with different types” as described in https://github.com/facebook/flipper/issues/834.

6. Apply this patch using `(cd node_modules/react-native && curl https://github.com/kontist/react-native/commit/ec330f756e477e53dde891fe02fd74916d9faef0.patch | patch -p1)`
7. Re-run `pod install --project-directory=ios`
8. Re-run `npx react-native run-ios`

The iOS app should now run successfully.

Reviewed By: sota000

Differential Revision: D31089656

Pulled By: fkgozali

fbshipit-source-id: 431898bed88f68761c7e0e6c79074dc04f43ed23

* OSS: update Podfile.lock automatically when bumping release version

Summary:
To ensure consistency of RNTester Podfile.lock:
* introduce a script to run `pod install` on the current commit
* have the script check the exact CocoaPods version to use for consistency
* have version bump script run this automatically to keep it up-to-date with the version change

To validate, have this change in `0.66-stable` branch, then try:

```
./scripts/bump-oss-version.js 0.66.0-rc.5
```

This automatically ran `pod install` which produced the Podfile.lock update.

Changelog: [Internal]

Reviewed By: TheSavior

Differential Revision: D31132867

fbshipit-source-id: 1c82653ca0cfc5471ed2c5091c09648a7acbab90

* [LOCAL] Port react-native-codegen new .gitignore from main

This is to bring https://github.com/facebook/react-native/blob/c3ff336326302d7988bf7c187c9dcabed3bae10d/.gitignore#L107 to release branch

* OSS: bump-oss-version -- update Podfile.lock later in the flow

Summary:
There was some hardcoded validation logic to verify package.json and gradle.properties update. Running `pod install` before that failed this validation on release branch, so let's move the pod update a bit later in the flow.

This also restrict the version number change check to the specific files for better reliability

Changelog: [Internal]

Reviewed By: sota000

Differential Revision: D31160139

fbshipit-source-id: d32470d7dfc48c2efab1d2767f3892b33e0b77dd

* [0.66.0-rc.4] Bump version numbers

* [0.66.0] Bump version numbers

* get ios building

* remove isSelected and selectedRowIndexPath for now

* add workspace

* Restore .eslintignore to what it looks like in react-native-macos

* Fix easy eslint errors as per the `--fix` option

* Fix the rest of the yarn lint errors

* Update yarn.lock

* Add AccessibilityRole back to Button.js

* Fix flow issues on iOS and macOS

* Initialize state in VirtualizedSectionList

* Update snapshots

* Fix parseLogBoxLog tests to include native code blocks

* Specify state explicitly for DisplayOptionsStatusExample

* Disable "Text with custom accessibility actions" example

* android

* Fix AnimatedMock spring to handle animated configs

* Fix most compile issues for macOS

* Fix post_install sed script

* Changes that allow RNTester to launch on macOS

* Fix isHighContrastEnabled on RNTester accessibility page

* Bump special targets in RNTester Podfile to iOS 11

* BorderExample: use a platform color that also exists on macOS

* Disable dev mode on ship builds (#888)

* revert dev mode on ship builds

* rctuicolor

* remove unused variable

* pod install

* fix text fields on macOS

* add osx support

* image prop and scroll view build failures osx

* Fix yarn lint issues

* Update Podfile.lock

* endline changes

* Get rid of macOS RedBox in LayoutEventsExample

* fix: Apply proper accessibility role to images on macOS

* Add another macOS GH#774 tag

* fix snapshot image test failure

* upgrade ts to a compatible version

* bump podfile.lock

* Fix Android patches in fb66merge

* change cocoapods version

* update internal cocoapods requirements

* test increasing min deployable target

* min deployment error in CI, bump to 10.15 osx

* fix typedef redefinition build error in folly

* disable use_flipper in our templates

* disable USE_FRAMEWORKS for Flipper support

* Revert "disable USE_FRAMEWORKS for Flipper support"

This reverts commit c09b6c579c9dc59c1b19d9a82ce3071cd0505a04.

* disable post_install of flipper

* combine tempated macos post_install

* add generate-specs.sh

Co-authored-by: Xuan Huang <jsx@fb.com>
Co-authored-by: Samuel Susla <samuelsusla@fb.com>
Co-authored-by: Charles Dudley <charlesdudley@fb.com>
Co-authored-by: Jesse Katsumata <jesse.katsumata@gmail.com>
Co-authored-by: Sota Ogo <sota@fb.com>
Co-authored-by: Rick Hanlon <rickhanlonii@fb.com>
Co-authored-by: David Vacca <dvacca@fb.com>
Co-authored-by: Amy Nichol <amynichol@fb.com>
Co-authored-by: swittk <switt1995@gmail.com>
Co-authored-by: Ikko Ashimine <eltociear@gmail.com>
Co-authored-by: Joshua Gross <joshuagross@fb.com>
Co-authored-by: CodemodService FBSourceClangFormatLinterBot <>
Co-authored-by: Michael Chow <michael.chow@alumni.stanford.edu>
Co-authored-by: Evan Yeung <evanyeung@fb.com>
Co-authored-by: Jacob Parker <jacobparker1992@gmail.com>
Co-authored-by: jeswinsimon <jeswinsimon@gmail.com>
Co-authored-by: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Co-authored-by: Ramanpreet Nara <ramanpreet@fb.com>
Co-authored-by: Vegas Murphy <vegasmurphy@fb.com>
Co-authored-by: Moti Zilberman <moti@fb.com>
Co-authored-by: Test User <gosimek@gmail.com>
Co-authored-by: Pieter De Baets <pieterdb@fb.com>
Co-authored-by: Paige Sun <paigesun@fb.com>
Co-authored-by: Moti Zilberman <motiz88@gmail.com>
Co-authored-by: Andrei Shikov <ashikov@fb.com>
Co-authored-by: Andrew Clark <acdlite@fb.com>
Co-authored-by: Luis Miguel Alvarado <luismiguel1730@gmail.com>
Co-authored-by: Sunny Luo <sunnylqm@gmail.com>
Co-authored-by: Saad Najmi <saadnajmi2@gmail.com>
Co-authored-by: Héctor Ramos <hramos@fb.com>
Co-authored-by: Michał Pierzchała <thymikee@gmail.com>
Co-authored-by: Harry Yu <hy.harry.yu@gmail.com>
Co-authored-by: Janic Duplessis <janicduplessis@gmail.com>
Co-authored-by: Jordan Becker <jordanbeckerfr@gmail.com>
Co-authored-by: Nicola Corti <ncor@fb.com>
Co-authored-by: Phillip Pan <phillippan@fb.com>
Co-authored-by: Dmytro Voronkevych <zloy@fb.com>
Co-authored-by: Luna Wei <luwe@fb.com>
Co-authored-by: Chris Tolliday <ctolliday@fb.com>
Co-authored-by: Levi Buzolic <levibuzolic@gmail.com>
Co-authored-by: Nishan Bende <nishanbende@gmail.com>
Co-authored-by: Matthew Gray <Matgray@microsoft.com>
Co-authored-by: Hein Rutjes <hrutjes@gmail.com>
Co-authored-by: nacam403 <satnakam@gmail.com>
Co-authored-by: Nicholas Tinsley <nicktinsley@fb.com>
Co-authored-by: hank121314 <hank121314@gmail.com>
Co-authored-by: Jonathan Andrew <jonny.andrew@protonmail.com>
Co-authored-by: alessandro <alessandro.fan@welld.ch>
Co-authored-by: Dulmandakh <dulmandakh@gmail.com>
Co-authored-by: Albert Sun <fatalsun@fb.com>
Co-authored-by: pera <santiagofermendy@gmail.com>
Co-authored-by: Carmi Grushko <carmi@fb.com>
Co-authored-by: Jimmy Zhang <jimmyzh@fb.com>
Co-authored-by: Arushi Kesarwani <arushikesarwani@fb.com>
Co-authored-by: Marshall Roch <mroch@fb.com>
Co-authored-by: Chatura Atapattu <chatatap@fb.com>
Co-authored-by: edenb-moveo <71688494+edenb-moveo@users.noreply.github.com>
Co-authored-by: pietro909 <2094604+pietro909@users.noreply.github.com>
Co-authored-by: Dmitry Rykun <dmitryrykun@fb.com>
Co-authored-by: Leon Kiefer <leon.k97@gmx.de>
Co-authored-by: Steven Bell <bell-steven@users.noreply.github.com>
Co-authored-by: Timo Mämecke <timomeh@users.noreply.github.com>
Co-authored-by: Kacie Bawiec <kacieb@fb.com>
Co-authored-by: Valentin Shergin <valentin.shergin@coinbase.com>
Co-authored-by: Nick Gerleman <ngerlem@microsoft.com>
Co-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Co-authored-by: Connor Tumbleson <connor@sourcetoad.com>
Co-authored-by: Andrew Coates <30809111+acoates-ms@users.noreply.github.com>
Co-authored-by: Kevin Gozali <fkg@fb.com>
Co-authored-by: Neil Dhar <neildhar@fb.com>
Co-authored-by: Jakob Krigovsky <jakob@krigovsky.com>
Co-authored-by: Adam Gleitman <adam.gleitman@gmail.com>
---
 .buckconfig                                   |     3 +-
 .circleci/Dockerfiles/Dockerfile.android      |     3 +-
 .circleci/config.yml                          |   122 +-
 .editorconfig                                 |     7 +
 .eslintrc                                     |     8 +
 .flowconfig                                   |     9 +-
 .flowconfig.android                           |     9 +-
 .flowconfig.macos                             |     7 +-
 .gitattributes                                |     2 +-
 .github/SUPPORT.md                            |     2 +-
 ...ml => respond-to-issue-based-on-label.yml} |     2 +-
 ...label-actions.yml => on-issue-labeled.yml} |    10 +-
 .gitignore                                    |    10 +-
 .nvmrc                                        |     1 -
 BUCK                                          |  1386 ++
 CONTRIBUTING.md                               |    42 +-
 Folly/folly/portability/Time.h                |     4 +-
 IntegrationTests/AccessibilityManagerTest.js  |     2 -
 IntegrationTests/AsyncStorageTest.js          |    57 +-
 IntegrationTests/BUCK                         |    30 +
 .../GlobalEvalWithSourceUrlTest.js            |     2 +-
 IntegrationTests/ImageCachePolicyTest.js      |     8 +-
 .../IntegrationTestHarnessTest.js             |     7 +-
 IntegrationTests/IntegrationTestsApp.js       |    20 +-
 IntegrationTests/LayoutEventsTest.js          |     1 +
 .../ReactContentSizeUpdateTest.js             |     2 -
 IntegrationTests/SizeFlexibilityUpdateTest.js |     2 -
 IntegrationTests/TimersTest.js                |    15 +
 Libraries/ActionSheetIOS/ActionSheetIOS.js    |     4 +-
 .../NativeActionSheetManager.js               |     3 +-
 .../React-RCTActionSheet.podspec              |     4 +-
 Libraries/Alert/Alert.js                      |     8 +-
 Libraries/Alert/NativeAlertManager.js         |     2 -
 Libraries/Alert/RCTAlertManager.android.js    |     2 -
 Libraries/Alert/RCTAlertManager.ios.js        |     2 -
 Libraries/Animated/Animated.js                |     2 -
 Libraries/Animated/AnimatedEvent.js           |     7 +-
 Libraries/Animated/AnimatedImplementation.js  |     2 -
 Libraries/Animated/AnimatedMock.js            |    16 +-
 Libraries/Animated/AnimatedWeb.js             |     9 +-
 Libraries/Animated/NativeAnimatedHelper.js    |    17 +-
 Libraries/Animated/NativeAnimatedModule.js    |     2 -
 .../Animated/NativeAnimatedTurboModule.js     |     2 -
 Libraries/Animated/__tests__/Animated-test.js |    23 +-
 .../Animated/__tests__/AnimatedNative-test.js |     2 -
 .../createAnimatedComponentInjection-test.js  |    67 +
 Libraries/Animated/animations/Animation.js    |     1 +
 .../Animated/animations/DecayAnimation.js     |     2 +
 .../Animated/animations/SpringAnimation.js    |     1 +
 .../Animated/animations/TimingAnimation.js    |     3 +
 .../Animated/components/AnimatedFlatList.js   |     2 -
 .../Animated/components/AnimatedImage.js      |     8 +-
 .../Animated/components/AnimatedScrollView.js |     8 +-
 .../components/AnimatedSectionList.js         |     4 +-
 Libraries/Animated/components/AnimatedText.js |     8 +-
 Libraries/Animated/components/AnimatedView.js |     6 +-
 Libraries/Animated/createAnimatedComponent.js |    77 +-
 .../createAnimatedComponentInjection.js       |    48 +
 .../createAnimatedComponent_EXPERIMENTAL.js   |    48 +
 .../Animated/nodes/AnimatedInterpolation.js   |    43 +-
 Libraries/Animated/nodes/AnimatedProps.js     |     1 -
 Libraries/Animated/nodes/AnimatedValue.js     |    23 +-
 .../Animated/nodes/AnimatedWithChildren.js    |     1 +
 Libraries/Animated/useAnimatedProps.js        |   211 +
 Libraries/AppState/AppState.js                |   250 +-
 Libraries/AppState/NativeAppState.js          |     2 -
 Libraries/BUCK                                |    36 -
 Libraries/BatchedBridge/MessageQueue.js       |    33 +-
 Libraries/BatchedBridge/NativeModules.js      |     6 +-
 .../__tests__/MessageQueue-test.js            |     2 +-
 Libraries/Blob/BlobManager.js                 |     2 -
 Libraries/Blob/FileReader.js                  |     4 +-
 Libraries/Blob/NativeBlobModule.js            |     2 -
 Libraries/Blob/NativeFileReaderModule.js      |     2 -
 Libraries/Blob/RCTBlobManager.h               |     3 +-
 Libraries/Blob/RCTBlobManager.mm              |    22 +-
 Libraries/Blob/RCTBlobPlugins.mm              |     7 +-
 Libraries/Blob/RCTFileReaderModule.mm         |    12 +-
 Libraries/Blob/React-RCTBlob.podspec          |     6 +-
 Libraries/Blob/URL.js                         |    38 +-
 Libraries/BugReporting/BugReporting.js        |     4 +-
 Libraries/BugReporting/getReactData.js        |     4 +-
 .../AccessibilityInfo.android.js              |   165 -
 .../AccessibilityInfo.ios.js                  |   280 -
 .../AccessibilityInfo/AccessibilityInfo.js    |   372 +
 .../AccessibilityInfo.macos.js                |   231 -
 .../NativeAccessibilityInfo.js                |     6 +-
 .../NativeAccessibilityManager.js             |     2 -
 .../legacySendAccessibilityEvent.android.js   |    35 +
 .../legacySendAccessibilityEvent.ios.js       |    26 +
 .../legacySendAccessibilityEvent.macos.js     |    16 +
 .../ActivityIndicator/ActivityIndicator.js    |    43 +-
 .../ActivityIndicatorViewNativeComponent.js   |     2 -
 .../ActivityIndicator-test.js.snap            |     6 -
 Libraries/Components/Button.js                |    73 +-
 Libraries/Components/Clipboard/Clipboard.js   |     2 -
 .../Components/Clipboard/NativeClipboard.js   |     2 -
 .../DatePicker/DatePickerIOS.android.js       |     9 +-
 .../DatePicker/DatePickerIOS.ios.js           |    57 +-
 .../RCTDatePickerNativeComponent.js           |     3 +-
 .../DatePickerAndroid.android.js              |     2 -
 .../NativeDatePickerAndroid.js                |     2 -
 .../AndroidDrawerLayoutNativeComponent.js     |     2 -
 .../DrawerLayoutAndroid.android.js            |     2 -
 Libraries/Components/Keyboard/Keyboard.js     |   111 +-
 .../Keyboard/KeyboardAvoidingView.js          |    44 +-
 .../Keyboard/NativeKeyboardObserver.js        |     2 -
 .../Keyboard/__tests__/Keyboard-test.js       |    26 +-
 .../MaskedView/MaskedViewIOS.ios.js           |     6 +-
 .../AndroidDialogPickerNativeComponent.js     |    82 -
 .../Picker/AndroidDialogPickerViewConfig.js   |    30 -
 .../AndroidDropdownPickerNativeComponent.js   |    69 -
 Libraries/Components/Picker/Picker.js         |   168 -
 .../Picker/PickerAndroid.android.js           |   145 -
 Libraries/Components/Picker/PickerIOS.ios.js  |   165 -
 .../Picker/RCTPickerNativeComponent.js        |    72 -
 .../Components/Picker/RCTPickerViewConfig.js  |    41 -
 .../Picker/__tests__/Picker-test.js           |    34 -
 .../__snapshots__/Picker-test.js.snap         |    97 -
 Libraries/Components/Pressable/Pressable.js   |    27 +-
 .../Pressable/__tests__/Pressable-test.js     |    66 +-
 .../__snapshots__/Pressable-test.js.snap      |   312 +
 .../Pressable/useAndroidRippleForView.js      |    35 +-
 .../ProgressBarAndroid.android.js             |    28 +-
 .../ProgressBarAndroidNativeComponent.js      |     2 -
 .../ProgressBarAndroid-test.js.snap           |     2 -
 .../ProgressViewIOS.android.js                |     9 +-
 .../ProgressViewIOS/ProgressViewIOS.ios.js    |     7 +-
 .../RCTProgressViewNativeComponent.js         |     2 -
 ...ndroidSwipeRefreshLayoutNativeComponent.js |    14 +-
 .../PullToRefreshViewNativeComponent.js       |    12 +-
 .../RefreshControl/RefreshControl.js          |    33 +-
 .../__mocks__/RefreshControlMock.js           |     5 +-
 .../RCTSafeAreaViewNativeComponent.js         |     2 -
 .../Components/SafeAreaView/SafeAreaView.js   |     2 +-
 .../__tests__/SafeAreaView-test.js            |     2 +-
 Libraries/Components/ScrollResponder.js       |   772 -
 ...izontalScrollContentViewNativeComponent.js |    35 +-
 ...roidHorizontalScrollViewNativeComponent.js |    76 +-
 .../ScrollContentViewNativeComponent.js       |    38 +-
 Libraries/Components/ScrollView/ScrollView.js |  1021 +-
 .../ScrollView/ScrollViewContext.js           |     6 +-
 .../ScrollView/ScrollViewNativeComponent.js   |    96 +-
 .../ScrollViewNativeComponentType.js          |    17 +-
 .../ScrollView/ScrollViewStickyHeader.js      |   498 +-
 .../ScrollView/ScrollViewViewConfig.js        |    18 +-
 .../ScrollView/__tests__/ScrollView-test.js   |    28 +-
 .../__snapshots__/ScrollView-test.js.snap     |    16 +-
 .../ScrollView/processDecelerationRate.js     |     2 -
 .../RCTSegmentedControlNativeComponent.js     |     2 -
 .../SegmentedControlIOS.android.js            |     9 +-
 .../SegmentedControlIOS.ios.js                |    28 +-
 .../__tests__/SegmentedContolIOS-test.js      |    55 +
 .../SegmentedContolIOS-test.js.snap           |    86 +
 Libraries/Components/Slider/Slider.js         |    30 +-
 .../Slider/SliderNativeComponent.js           |     2 -
 .../Components/Sound/NativeSoundManager.js    |     2 -
 Libraries/Components/Sound/SoundManager.js    |     1 -
 .../NativeStatusBarManagerAndroid.js          |     2 -
 .../StatusBar/NativeStatusBarManagerIOS.js    |     2 -
 Libraries/Components/StatusBar/StatusBar.js   |    31 +-
 .../Components/StatusBar/StatusBarIOS.js      |    21 -
 .../StatusBar/__tests__/StatusBar-test.js     |    62 +
 .../Switch/AndroidSwitchNativeComponent.js    |     2 -
 Libraries/Components/Switch/Switch.js         |   216 +-
 .../Switch/SwitchNativeComponent.js           |     2 -
 .../AndroidTextInputNativeComponent.js        |    34 +-
 .../TextInput/AndroidTextInputViewConfig.js   |    12 +-
 .../TextInput/InputAccessoryView.js           |    14 +-
 .../RCTInputAccessoryViewNativeComponent.js   |     2 -
 .../RCTMultilineTextInputNativeComponent.js   |    11 +-
 .../RCTSingelineTextInputNativeComponent.js   |    22 +-
 ...iewConfig.js => RCTTextInputViewConfig.js} |     8 +-
 Libraries/Components/TextInput/TextInput.js   |   541 +-
 .../TextInput/TextInputNativeCommands.js      |     2 -
 .../Components/TextInput/TextInputState.js    |     4 +-
 .../TextInput/__tests__/TextInput-test.js     |     2 -
 .../__snapshots__/TextInput-test.js.snap      |    20 +-
 .../ToastAndroid/NativeToastAndroid.js        |     2 -
 .../ToastAndroid/ToastAndroid.android.js      |     1 -
 .../Touchable/BoundingDimensions.js           |     3 +-
 Libraries/Components/Touchable/PooledClass.js |     3 +-
 Libraries/Components/Touchable/Position.js    |     3 +-
 Libraries/Components/Touchable/Touchable.js   |    81 +-
 .../Components/Touchable/TouchableBounce.js   |     2 -
 .../Touchable/TouchableHighlight.js           |    28 +-
 .../Touchable/TouchableNativeFeedback.js      |    21 +-
 .../Components/Touchable/TouchableOpacity.js  |    30 +-
 .../Touchable/TouchableWithoutFeedback.js     |    20 +-
 .../__tests__/TouchableHighlight-test.js      |    72 +-
 .../__tests__/TouchableNativeFeedback-test.js |   115 +
 .../__tests__/TouchableOpacity-test.js        |    52 +
 .../TouchableWithoutFeedback-test.js          |    91 +
 .../TouchableHighlight-test.js.snap           |   126 +
 .../TouchableNativeFeedback-test.js.snap      |   141 +
 .../TouchableOpacity-test.js.snap             |    98 +
 .../TouchableWithoutFeedback-test.js.snap     |   137 +
 .../Touchable/ensurePositiveDelayProps.js     |     3 +-
 .../UnimplementedNativeViewNativeComponent.js |     2 -
 .../UnimplementedViews/UnimplementedView.js   |     5 +-
 .../View/ReactNativeStyleAttributes.js        |   201 +-
 .../View/ReactNativeViewAttributes.js         |     3 +-
 .../View/ReactNativeViewViewConfig.js         |    24 +-
 Libraries/Components/View/View.js             |     6 +-
 .../Components/View/ViewAccessibility.js      |     5 +-
 .../Components/View/ViewNativeComponent.js    |    79 +-
 Libraries/Components/__tests__/Button-test.js |    49 +
 Libraries/Components/__tests__/Slider-test.js |    37 +
 .../__snapshots__/Button-test.js.snap         |   396 +
 .../__snapshots__/Slider-test.js.snap         |   121 +
 .../parseHermesStack-test.js.snap             |    28 +
 .../__tests__/parseHermesStack-test.js        |    12 +
 Libraries/Core/Devtools/getDevServer.js       |     2 -
 Libraries/Core/Devtools/parseErrorStack.js    |     9 -
 Libraries/Core/Devtools/parseHermesStack.js   |     2 +-
 Libraries/Core/ExceptionsManager.js           |    88 +-
 Libraries/Core/ExtendedError.js               |    19 +
 Libraries/Core/InitializeCore.js              |     1 +
 Libraries/Core/NativeExceptionsManager.js     |     2 -
 Libraries/Core/ReactFiberErrorDialog.js       |    78 +-
 Libraries/Core/ReactNativeVersion.js          |     4 +-
 Libraries/Core/ReactNativeVersionCheck.js     |     2 -
 .../SegmentFetcher/NativeSegmentFetcher.js    |     2 -
 Libraries/Core/Timers/JSTimers.js             |    99 +-
 Libraries/Core/Timers/NativeTiming.js         |     2 -
 .../Core/Timers/__tests__/JSTimers-test.js    |    68 +-
 Libraries/Core/Timers/immediateShim.js        |    67 +
 Libraries/Core/Timers/queueMicrotask.js       |    41 +
 .../Core/__tests__/ExceptionsManager-test.js  |    44 +-
 Libraries/Core/polyfillPromise.js             |     2 +-
 Libraries/Core/setUpDeveloperTools.js         |   111 +-
 Libraries/Core/setUpReactDevTools.js          |    19 +-
 Libraries/Core/setUpReactRefresh.js           |     4 +-
 Libraries/Core/setUpRegeneratorRuntime.js     |    33 +-
 Libraries/Core/setUpTimers.js                 |    69 +-
 Libraries/Core/setUpXHR.js                    |     8 +-
 .../DeprecatedImagePropType.android.js        |   131 +
 ...Type.js => DeprecatedImagePropType.ios.js} |     0
 .../DeprecatedImagePropType.macos.js          |    16 +
 .../DeprecatedTextInputPropTypes.js           |    10 +-
 .../DeprecatedViewAccessibility.js            |     2 +
 Libraries/EventEmitter/NativeEventEmitter.js  |   147 +-
 .../EventEmitter/RCTDeviceEventEmitter.js     |    79 +-
 Libraries/EventEmitter/RCTEventEmitter.js     |     6 +-
 .../EventEmitter/RCTNativeAppEventEmitter.js  |     2 -
 .../__mocks__/NativeEventEmitter.js           |    39 +-
 Libraries/FBLazyVector/BUCK                   |     6 +-
 Libraries/FBLazyVector/FBLazyVector.podspec   |     4 +-
 Libraries/HeapCapture/HeapCapture.js          |     2 -
 Libraries/HeapCapture/NativeJSCHeapCapture.js |     2 -
 Libraries/Image/AssetSourceResolver.js        |    24 +-
 Libraries/Image/AssetUtils.js                 |    48 +
 Libraries/Image/Image.android.js              |   175 +-
 Libraries/Image/Image.ios.js                  |    90 +-
 Libraries/Image/ImageAnalyticsTagContext.js   |     6 +-
 Libraries/Image/ImageBackground.js            |     4 +-
 Libraries/Image/ImageInjection.js             |    28 +
 Libraries/Image/ImagePickerIOS.js             |     2 -
 Libraries/Image/ImageSource.js                |    71 +-
 Libraries/Image/ImageViewNativeComponent.js   |    97 +-
 Libraries/Image/ImageViewViewConfig.js        |    68 -
 Libraries/Image/NativeImageEditor.js          |     2 -
 Libraries/Image/NativeImageLoaderAndroid.js   |     2 -
 Libraries/Image/NativeImageLoaderIOS.js       |     8 +-
 Libraries/Image/NativeImagePickerIOS.js       |     2 -
 Libraries/Image/NativeImageStoreAndroid.js    |     2 -
 Libraries/Image/NativeImageStoreIOS.js        |     2 -
 Libraries/Image/RCTAnimatedImage.m            |     9 +-
 Libraries/Image/RCTGIFImageDecoder.mm         |     6 +
 Libraries/Image/RCTImageBlurUtils.m           |    28 +-
 Libraries/Image/RCTImageEditingManager.mm     |     8 +-
 Libraries/Image/RCTImageLoader.h              |     4 +-
 Libraries/Image/RCTImageLoader.mm             |    61 +-
 .../RCTImageLoaderWithAttributionProtocol.h   |     5 -
 Libraries/Image/RCTImagePlugins.mm            |     7 +-
 Libraries/Image/RCTImageStoreManager.mm       |    10 +-
 .../Image/RCTImageURLLoaderWithAttribution.h  |     1 +
 Libraries/Image/RCTImageView.mm               |     2 +-
 Libraries/Image/RCTLocalAssetImageLoader.mm   |     5 +
 Libraries/Image/React-RCTImage.podspec        |     6 +-
 .../Image/TextInlineImageNativeComponent.js   |    86 +-
 Libraries/Image/__tests__/AssetUtils-test.js  |    38 +
 .../__snapshots__/Image-test.js.snap          |     1 +
 Libraries/Image/nativeImageSource.js          |     2 -
 Libraries/Image/resolveAssetSource.js         |     3 +-
 Libraries/Inspector/ElementProperties.js      |     2 +-
 Libraries/Inspector/Inspector.js              |    17 +-
 Libraries/Inspector/InspectorPanel.js         |     2 +-
 Libraries/Interaction/FrameRateLogger.js      |     2 -
 Libraries/Interaction/InteractionManager.js   |    13 +-
 Libraries/Interaction/InteractionMixin.js     |     3 +-
 Libraries/Interaction/PanResponder.js         |     2 +-
 Libraries/LayoutAnimation/LayoutAnimation.js  |    70 +-
 Libraries/Linking/Linking.js                  |    29 +-
 Libraries/Linking/NativeIntentAndroid.js      |     2 -
 Libraries/Linking/NativeLinkingManager.js     |     2 -
 Libraries/LinkingIOS/RCTLinkingPlugins.mm     |     7 +-
 Libraries/LinkingIOS/React-RCTLinking.podspec |     6 +-
 Libraries/Lists/CellRenderMask.js             |   145 +
 Libraries/Lists/FillRateHelper.js             |     2 +-
 Libraries/Lists/FlatList.js                   |   132 +-
 Libraries/Lists/SectionList.js                |    43 +-
 Libraries/Lists/SectionListModern.js          |   249 +
 Libraries/Lists/ViewabilityHelper.js          |    18 +-
 Libraries/Lists/VirtualizeUtils.js            |    38 +-
 Libraries/Lists/VirtualizedList.js            |   329 +-
 Libraries/Lists/VirtualizedListContext.js     |     5 +-
 Libraries/Lists/VirtualizedSectionList.js     |   501 +-
 .../__flowtests__/SectionList-flowtest.js     |    12 +-
 .../Lists/__tests__/CellRenderMask-test.js    |   179 +
 Libraries/Lists/__tests__/SectionList-test.js |     6 +-
 .../Lists/__tests__/VirtualizeUtils-test.js   |     5 +-
 .../Lists/__tests__/VirtualizedList-test.js   |  1035 +-
 .../__tests__/VirtualizedSectionList-test.js  |    75 +-
 .../__snapshots__/FlatList-test.js.snap       |    56 +-
 .../__snapshots__/SectionList-test.js.snap    |    39 +-
 .../VirtualizedList-test.js.snap              |  4887 ++++-
 .../VirtualizedSectionList-test.js.snap       |   253 +-
 Libraries/LogBox/Data/LogBoxData.js           |     4 +-
 Libraries/LogBox/Data/LogBoxLog.js            |     2 -
 Libraries/LogBox/Data/LogBoxSymbolication.js  |     2 -
 .../LogBox/Data/__tests__/LogBoxData-test.js  |     6 +
 .../Data/__tests__/parseLogBoxLog-test.js     |    56 +-
 Libraries/LogBox/Data/parseLogBoxLog.js       |     2 -
 Libraries/LogBox/LogBox.js                    |   163 +-
 Libraries/LogBox/LogBoxInspectorContainer.js  |     2 -
 .../LogBox/LogBoxNotificationContainer.js     |     2 -
 Libraries/LogBox/UI/LogBoxButton.js           |     2 -
 Libraries/LogBox/UI/LogBoxInspector.js        |     2 -
 .../LogBox/UI/LogBoxInspectorCodeFrame.js     |     2 -
 Libraries/LogBox/UI/LogBoxInspectorFooter.js  |     2 -
 Libraries/LogBox/UI/LogBoxInspectorHeader.js  |     2 -
 .../LogBox/UI/LogBoxInspectorMessageHeader.js |     2 -
 .../LogBox/UI/LogBoxInspectorReactFrames.js   |     2 -
 Libraries/LogBox/UI/LogBoxInspectorSection.js |     2 -
 .../UI/LogBoxInspectorSourceMapStatus.js      |     9 +-
 .../LogBox/UI/LogBoxInspectorStackFrame.js    |     2 -
 .../LogBox/UI/LogBoxInspectorStackFrames.js   |     7 +-
 Libraries/LogBox/UI/LogBoxMessage.js          |     2 -
 Libraries/LogBox/UI/LogBoxNotification.js     |     7 +-
 Libraries/LogBox/UI/LogBoxStyle.js            |     2 -
 .../LogBox/UI/__tests__/LogBoxButton-test.js  |     2 -
 .../__tests__/LogBoxInspectorSection-test.js  |     2 -
 .../LogBoxInspectorStackFrames-test.js        |     2 -
 .../__tests__/LogBox-integration-test.js      |     2 -
 Libraries/LogBox/__tests__/LogBox-test.js     |   109 +-
 .../__fixtures__/ReactWarningFixtures.js      |     2 -
 Libraries/Modal/Modal.js                      |    67 +-
 .../Modal/ModalInjection.js                   |    11 +-
 Libraries/Modal/NativeModalManager.js         |     2 -
 .../Modal/RCTModalHostViewNativeComponent.js  |    13 +-
 .../__snapshots__/Modal-test.js.snap          |     2 +
 .../NativeAnimation/RCTAnimationPlugins.mm    |     7 +-
 .../RCTNativeAnimatedModule.mm                |     9 +-
 .../RCTNativeAnimatedNodesManager.h           |     2 +-
 .../RCTNativeAnimatedNodesManager.m           |     2 +-
 .../RCTNativeAnimatedTurboModule.h            |     3 +-
 .../RCTNativeAnimatedTurboModule.mm           |    54 +-
 .../React-RCTAnimation.podspec                |     8 +-
 .../NativeComponentRegistry.js                |   157 +
 Libraries/NativeComponent/ViewConfig.js       |    50 +
 .../specs/NativeAnimationsDebugModule.js      |     2 -
 .../NativeModules/specs/NativeDevMenu.js      |     2 -
 .../NativeModules/specs/NativeDevSettings.js  |     2 -
 .../specs/NativeDeviceEventManager.js         |     2 -
 .../specs/NativeDialogManagerAndroid.js       |     2 -
 Libraries/NativeModules/specs/NativeLogBox.js |     2 -
 Libraries/NativeModules/specs/NativeRedBox.js |     2 -
 .../NativeModules/specs/NativeSourceCode.js   |     2 -
 Libraries/Network/NativeNetworkingAndroid.js  |     2 -
 Libraries/Network/NativeNetworkingIOS.js      |     2 -
 Libraries/Network/RCTDataRequestHandler.mm    |     6 +
 Libraries/Network/RCTFileRequestHandler.mm    |     6 +
 Libraries/Network/RCTHTTPRequestHandler.h     |     5 +
 Libraries/Network/RCTHTTPRequestHandler.mm    |    36 +-
 Libraries/Network/RCTNetworkPlugins.mm        |     7 +-
 Libraries/Network/RCTNetworking.android.js    |    12 +-
 Libraries/Network/RCTNetworking.h             |     2 +-
 Libraries/Network/RCTNetworking.ios.js        |    83 +-
 Libraries/Network/RCTNetworking.mm            |    16 +-
 Libraries/Network/React-RCTNetwork.podspec    |     6 +-
 Libraries/Network/XMLHttpRequest.js           |     8 +-
 .../Network/__tests__/XMLHttpRequest-test.js  |     2 -
 Libraries/Network/convertRequestBody.js       |     3 +-
 Libraries/NewAppScreen/components/Colors.js   |     2 -
 Libraries/NewAppScreen/components/Header.js   |     2 +-
 .../NewAppScreen/components/HermesBadge.js    |     5 +-
 .../NewAppScreen/components/LearnMoreLinks.js |     1 -
 Libraries/NewAppScreen/index.js               |     2 -
 .../Performance/NativeJSCSamplingProfiler.js  |     2 -
 .../Performance/QuickPerformanceLogger.js     |     8 +-
 Libraries/Performance/Systrace.js             |     8 +-
 .../NativePermissionsAndroid.js               |     7 +-
 .../PermissionsAndroid/PermissionsAndroid.js  |    15 +-
 Libraries/Pressability/HoverState.js          |     2 -
 Libraries/Pressability/Pressability.js        |    46 +-
 Libraries/Pressability/PressabilityDebug.js   |    13 +-
 .../PressabilityPerformanceEventEmitter.js    |    47 +
 Libraries/Pressability/PressabilityTypes.js   |    18 +
 .../__tests__/Pressability-test.js            |    20 +-
 Libraries/Pressability/usePressability.js     |     2 -
 .../NativePushNotificationManagerIOS.js       |     3 +
 .../PushNotificationIOS.js                    |    50 +-
 .../RCTPushNotificationManager.mm             |    15 +-
 .../RCTPushNotificationPlugins.mm             |     7 +-
 .../React-RCTPushNotification.podspec         |     6 +-
 Libraries/RCTRequired/BUCK                    |     5 +-
 Libraries/RCTRequired/RCTRequired.podspec     |     4 +-
 Libraries/ReactNative/AppContainer.js         |    28 +-
 Libraries/ReactNative/AppRegistry.js          |    55 +-
 Libraries/ReactNative/DisplayMode.js          |    32 +
 Libraries/ReactNative/DummyUIManager.js       |    10 +-
 Libraries/ReactNative/FabricUIManager.js      |    11 +-
 Libraries/ReactNative/HeadlessJsTaskError.js  |     2 -
 Libraries/ReactNative/I18nManager.js          |    32 +-
 .../NativeHeadlessJsTaskSupport.js            |     2 -
 Libraries/ReactNative/NativeI18nManager.js    |     3 +-
 Libraries/ReactNative/NativeUIManager.js      |     5 +-
 Libraries/ReactNative/PaperUIManager.js       |   110 +-
 Libraries/ReactNative/RootTag.js              |    10 +-
 Libraries/ReactNative/UIManager.js            |    10 +-
 .../UIManagerInjection.js}                    |     8 +-
 Libraries/ReactNative/UIManagerProperties.js  |     1 +
 .../getCachedComponentWithDebugName.js        |    32 +
 .../getNativeComponentAttributes.js           |     3 +-
 Libraries/ReactNative/renderApplication.js    |    30 +-
 .../ReactNativePrivateInterface.js            |    12 +-
 Libraries/Reliability/UserFlow.js             |    30 +-
 Libraries/Renderer/REVISION                   |     2 +-
 .../implementations/ReactFabric-dev.fb.js     | 16536 ++++++++-------
 .../implementations/ReactFabric-dev.js        | 10715 +++++-----
 .../implementations/ReactFabric-prod.fb.js    |  5444 ++---
 .../implementations/ReactFabric-prod.js       |  4067 ++--
 .../ReactFabric-profiling.fb.js               |  6124 +++---
 .../implementations/ReactFabric-profiling.js  |  4842 ++---
 .../ReactNativeRenderer-dev.fb.js             | 16943 +++++++++-------
 .../ReactNativeRenderer-dev.js                | 10515 +++++-----
 .../ReactNativeRenderer-prod.fb.js            |  5191 ++---
 .../ReactNativeRenderer-prod.js               |  4417 ++--
 .../ReactNativeRenderer-profiling.fb.js       |  5777 +++---
 .../ReactNativeRenderer-profiling.js          |  4856 ++---
 Libraries/Renderer/shims/ReactFabric.js       |     8 +-
 Libraries/Renderer/shims/ReactFeatureFlags.js |     3 +
 Libraries/Renderer/shims/ReactNative.js       |     3 +
 Libraries/Renderer/shims/ReactNativeTypes.js  |   167 +-
 .../shims/ReactNativeViewConfigRegistry.js    |    19 +-
 .../shims/createReactNativeComponentClass.js  |     8 +-
 Libraries/Settings/NativeSettingsManager.js   |     2 -
 Libraries/Settings/RCTSettingsManager.mm      |     4 +-
 Libraries/Settings/RCTSettingsPlugins.mm      |     7 +-
 Libraries/Settings/React-RCTSettings.podspec  |     6 +-
 Libraries/Settings/Settings.ios.js            |     6 +-
 Libraries/Share/NativeShareModule.js          |     2 -
 Libraries/Share/Share.js                      |     2 -
 Libraries/Storage/AsyncStorage.js             |   117 +-
 Libraries/Storage/NativeAsyncLocalStorage.js  |    19 +-
 .../Storage/NativeAsyncSQLiteDBStorage.js     |    19 +-
 .../PlatformColorValueTypes.android.js        |     2 -
 .../StyleSheet/PlatformColorValueTypes.ios.js |    19 +-
 .../PlatformColorValueTypesIOS.ios.js         |    11 +-
 .../StyleSheet/PlatformColorValueTypesIOS.js  |     4 +-
 Libraries/StyleSheet/Rect.js                  |     2 -
 Libraries/StyleSheet/StyleSheet.js            |     8 +-
 Libraries/StyleSheet/StyleSheetTypes.js       |     5 +
 Libraries/StyleSheet/StyleSheetValidation.js  |   100 -
 .../StyleSheet/__tests__/flattenStyle-test.js |     6 -
 .../__tests__/normalizeColor-test.js          |    19 +
 .../__tests__/processColorArray-test.js       |    26 +-
 .../__tests__/splitLayoutProps-test.js        |     8 +-
 Libraries/StyleSheet/flattenStyle.js          |    12 +-
 Libraries/StyleSheet/normalizeColor.js        |     2 -
 Libraries/StyleSheet/processColorArray.js     |    22 +-
 Libraries/StyleSheet/processTransform.js      |    12 +-
 Libraries/StyleSheet/splitLayoutProps.js      |    98 +-
 .../RCTSurfaceHostingComponent.mm             |     2 +-
 Libraries/Text/React-RCTText.podspec          |     4 +-
 Libraries/Text/Text.js                        |   422 +-
 Libraries/Text/TextAncestor.js                |     8 +-
 .../Text/TextInput/Multiline/RCTUITextView.h  |     2 -
 .../Text/TextInput/Multiline/RCTUITextView.m  |    14 +
 .../Text/TextInput/RCTBaseTextInputView.m     |     8 +
 Libraries/Text/TextNativeComponent.js         |     7 +-
 Libraries/Text/TextProps.js                   |     6 +
 Libraries/TurboModule/RCTExport.js            |     2 +-
 Libraries/TurboModule/TurboModuleRegistry.js  |    31 +-
 .../samples/NativeSampleTurboModule.js        |     4 +-
 Libraries/TypeSafety/RCTTypeSafety.podspec    |     6 +-
 Libraries/Types/CodegenTypes.js               |     3 +-
 Libraries/Types/CoreEventTypes.js             |     4 +-
 .../RootTagTypes.js}                          |     5 +-
 Libraries/UTFSequence.js                      |     2 +-
 Libraries/Utilities/Appearance.js             |    30 +-
 Libraries/Utilities/BackHandler.android.js    |     2 -
 Libraries/Utilities/DebugEnvironment.js       |     4 +-
 Libraries/Utilities/DevSettings.js            |   107 +-
 Libraries/Utilities/DeviceInfo.js             |     2 -
 Libraries/Utilities/Dimensions.js             |    41 +-
 Libraries/Utilities/FeatureDetection.js       |    31 +
 .../Utilities/GlobalPerformanceLogger.js      |     1 -
 Libraries/Utilities/HMRClient.js              |    25 +-
 Libraries/Utilities/JSDevSupportModule.js     |     2 -
 Libraries/Utilities/LoadingView.android.js    |     2 -
 Libraries/Utilities/LoadingView.ios.js        |     2 -
 Libraries/Utilities/MatrixMath.js             |     2 +-
 Libraries/Utilities/NativeAppearance.js       |     2 -
 Libraries/Utilities/NativeDevLoadingView.js   |     2 -
 .../Utilities/NativeDevSplitBundleLoader.js   |     2 -
 Libraries/Utilities/NativeDeviceInfo.js       |     4 +-
 Libraries/Utilities/NativeJSDevSupport.js     |     2 -
 .../NativePlatformConstantsAndroid.js         |     2 -
 .../Utilities/NativePlatformConstantsIOS.js   |     2 -
 .../Utilities/PerformanceLoggerContext.js     |    15 +-
 Libraries/Utilities/Platform.android.js       |    11 +-
 Libraries/Utilities/Platform.ios.js           |     3 +-
 Libraries/Utilities/Platform.macos.js         |     9 +-
 Libraries/Utilities/ReactNativeTestTools.js   |    31 +-
 .../__tests__/PerformanceLogger-test.js       |     2 -
 .../__tests__/setAndForwardRef-test.js        |    12 +-
 .../Utilities/__tests__/stringifySafe-test.js |     2 -
 .../Utilities/__tests__/useMergeRefs-test.js  |   228 +
 .../Utilities/__tests__/useRefEffect-test.js  |   242 +
 ...erifyComponentAttributeEquivalence-test.js |    78 +-
 Libraries/Utilities/codegenNativeCommands.js  |     4 +-
 Libraries/Utilities/codegenNativeComponent.js |     2 -
 .../Utilities/createPerformanceLogger.js      |     2 -
 .../deepFreezeAndThrowOnMutationInDev.js      |     1 +
 .../Utilities/defineLazyObjectProperty.js     |     2 +-
 Libraries/Utilities/deprecatedPropType.js     |     8 +-
 .../Utilities/registerGeneratedViewConfig.js  |    83 -
 Libraries/Utilities/stringifySafe.js          |     4 +-
 Libraries/Utilities/useColorScheme.js         |     8 +-
 Libraries/Utilities/useMergeRefs.js           |    44 +
 Libraries/Utilities/useRefEffect.js           |    45 +
 Libraries/Utilities/useWindowDimensions.js    |    15 +-
 .../verifyComponentAttributeEquivalence.js    |    50 +-
 Libraries/Vibration/NativeVibration.js        |     2 -
 Libraries/Vibration/RCTVibrationPlugins.mm    |     7 +-
 .../Vibration/React-RCTVibration.podspec      |     6 +-
 Libraries/Vibration/Vibration.js              |     2 -
 Libraries/WebSocket/NativeWebSocketModule.js  |     2 -
 Libraries/WebSocket/WebSocket.js              |    43 +-
 Libraries/WebSocket/WebSocketInterceptor.js   |    11 +-
 .../WebSocket/__tests__/WebSocket-test.js     |     1 +
 Libraries/YellowBox/YellowBoxDeprecated.js    |     1 +
 .../__tests__/YellowBoxDeprecated-test.js     |    21 +-
 .../ReactNativeTypes-flowtest.js              |     2 -
 Libraries/promiseRejectionIsError.js          |    24 -
 Libraries/promiseRejectionTrackingOptions.js  |     4 +-
 Libraries/vendor/emitter/EventEmitter.js      |    41 +-
 Libraries/vendor/emitter/EventSubscription.js |    19 +
 .../vendor/emitter/_EmitterSubscription.js    |    31 +-
 Libraries/vendor/emitter/_EventEmitter.js     |    92 +-
 .../vendor/emitter/_EventSubscription.js      |    18 +-
 .../emitter/_EventSubscriptionVendor.js       |    35 +-
 .../__flowtests__/EventEmitter-flowtest.js    |   125 +
 README.md                                     |    29 +
 React-Core.podspec                            |    15 +-
 React.podspec                                 |     6 +-
 .../en.lproj/Localizable.strings              |     2 +-
 React/Base/RCTAssert.h                        |    53 +-
 React/Base/RCTAssert.m                        |    52 +
 React/Base/RCTBridge.h                        |    18 +-
 React/Base/RCTBridge.m                        |    19 +-
 React/Base/RCTBridgeModule.h                  |   104 +
 React/Base/RCTBundleManager.m                 |    78 +
 React/Base/RCTBundleURLProvider.h             |    44 +-
 React/Base/RCTBundleURLProvider.mm            |   111 +-
 React/Base/RCTCallableJSModules.m             |    47 +
 React/Base/RCTConstants.h                     |    19 +-
 React/Base/RCTConstants.m                     |    36 +-
 React/Base/RCTConvert.m                       |    48 +-
 React/Base/RCTCxxConvert.h                    |     2 +-
 React/Base/RCTDefines.h                       |    10 +
 React/Base/RCTEventDispatcherProtocol.h       |     3 +-
 .../RCTInitializing.h}                        |     6 +-
 React/Base/RCTJSInvokerModule.h               |    17 -
 React/Base/RCTJavaScriptLoader.mm             |     1 +
 React/Base/RCTModuleData.h                    |    23 +-
 React/Base/RCTModuleData.mm                   |   124 +-
 React/Base/RCTModuleRegistry.m                |    48 +
 React/Base/RCTMultipartStreamReader.m         |     2 -
 React/Base/RCTRootView.h                      |    11 +-
 React/Base/RCTRootView.m                      |    16 +-
 React/Base/RCTTouchHandler.m                  |    13 +-
 React/Base/RCTUIKit.h                         |     4 +
 React/Base/RCTUtils.m                         |     8 +-
 React/Base/RCTVersion.m                       |     4 +-
 React/Base/RCTViewRegistry.m                  |    45 +
 React/Base/Surface/RCTSurfaceStage.h          |    17 +-
 .../RCTSurfaceHostingProxyRootView.h          |     1 +
 .../RCTSurfaceHostingProxyRootView.mm         |    11 +
 .../RCTSurfaceHostingView.mm                  |     3 +
 React/CoreModules/BUCK                        |    11 +-
 React/CoreModules/CoreModulesPlugins.mm       |     7 +-
 React/CoreModules/RCTAccessibilityManager.mm  |    27 +-
 React/CoreModules/RCTActionSheetManager.mm    |    44 +-
 React/CoreModules/RCTAlertController.h        |     1 +
 React/CoreModules/RCTAlertController.m        |     5 +
 React/CoreModules/RCTAlertManager.mm          |     3 +
 React/CoreModules/RCTAsyncLocalStorage.mm     |     4 +
 React/CoreModules/RCTDevLoadingView.mm        |    45 +-
 React/CoreModules/RCTDevMenu.h                |     5 -
 React/CoreModules/RCTDevMenu.mm               |   123 +-
 React/CoreModules/RCTDevSettings.h            |    14 +-
 React/CoreModules/RCTDevSettings.mm           |   157 +-
 React/CoreModules/RCTDevSplitBundleLoader.mm  |     9 +-
 React/CoreModules/RCTDeviceInfo.h             |     4 +-
 React/CoreModules/RCTDeviceInfo.mm            |    50 +-
 React/CoreModules/RCTEventDispatcher.h        |     3 +-
 React/CoreModules/RCTEventDispatcher.mm       |    43 +-
 React/CoreModules/RCTExceptionsManager.mm     |    30 +-
 React/CoreModules/RCTKeyboardObserver.mm      |     2 +-
 React/CoreModules/RCTLogBox.mm                |    24 +-
 React/CoreModules/RCTPerfMonitor.mm           |    16 +-
 React/CoreModules/RCTRedBox.mm                |    13 +-
 React/CoreModules/RCTSourceCode.mm            |     3 +-
 React/CoreModules/RCTTiming.h                 |     3 +-
 React/CoreModules/RCTTiming.mm                |     4 +-
 React/CoreModules/RCTWebSocketExecutor.mm     |     6 +
 React/CoreModules/React-CoreModules.podspec   |     6 +-
 React/CxxBridge/RCTCxxBridge.mm               |   107 +-
 React/CxxModule/RCTNativeModule.mm            |     4 +-
 React/DevSupport/RCTPackagerConnection.mm     |    17 +-
 .../FBReactNativeSpec.podspec                 |    26 +-
 .../RCTActivityIndicatorViewComponentView.mm  |     2 +-
 .../Image/RCTImageComponentView.h             |     3 +-
 .../Image/RCTImageComponentView.mm            |    64 +-
 .../RCTInputAccessoryComponentView.mm         |    15 +-
 ...CTLegacyViewManagerInteropComponentView.mm |    22 +-
 ...acyViewManagerInteropCoordinatorAdapter.mm |     4 +-
 .../Modal/RCTFabricModalHostViewController.mm |     7 +
 .../Modal/RCTModalHostViewComponentView.h     |     4 +-
 .../Modal/RCTModalHostViewComponentView.mm    |    97 +-
 .../Picker/RCTPickerComponentView.h           |    19 -
 .../Picker/RCTPickerComponentView.mm          |   205 -
 .../RCTFabricComponentsPlugins.h              |     2 +-
 .../RCTFabricComponentsPlugins.mm             |     2 +-
 .../RCTSafeAreaViewComponentView.mm           |    54 +-
 .../ScrollView/RCTEnhancedScrollView.h        |     6 +
 .../ScrollView/RCTEnhancedScrollView.mm       |    27 +-
 .../RCTPullToRefreshViewComponentView.mm      |     2 +-
 .../ScrollView/RCTScrollViewComponentView.mm  |   285 +-
 .../Slider/RCTSliderComponentView.mm          |     2 +-
 .../Switch/RCTSwitchComponentView.mm          |     2 +-
 .../Text/RCTAccessibilityElement.h            |    23 +
 .../Text/RCTAccessibilityElement.mm           |    22 +
 ...ParagraphComponentAccessibilityProvider.mm |    23 +-
 .../Text/RCTParagraphComponentView.mm         |   148 +-
 .../TextInput/RCTTextInputComponentView.mm    |   137 +-
 .../TextInput/RCTTextInputUtils.mm            |    50 +-
 .../RCTUnimplementedViewComponentView.mm      |     2 +-
 .../View/RCTViewComponentView.mm              |   162 +-
 .../Fabric/Mounting/RCTComponentViewFactory.h |    12 +-
 .../Mounting/RCTComponentViewFactory.mm       |   129 +-
 .../Mounting/RCTComponentViewProtocol.h       |     3 +
 .../Mounting/RCTComponentViewRegistry.mm      |     2 +-
 React/Fabric/Mounting/RCTMountingManager.h    |    29 +-
 React/Fabric/Mounting/RCTMountingManager.mm   |    74 +-
 .../Mounting/UIView+ComponentViewProtocol.h   |     4 +
 .../Mounting/UIView+ComponentViewProtocol.mm  |    34 +-
 React/Fabric/RCTConversions.h                 |    36 +-
 React/Fabric/RCTScheduler.h                   |    27 +-
 React/Fabric/RCTScheduler.mm                  |    75 +-
 React/Fabric/RCTSurfacePresenter.h            |    25 +-
 React/Fabric/RCTSurfacePresenter.mm           |   227 +-
 .../Fabric/RCTSurfacePresenterBridgeAdapter.h |     6 +-
 .../RCTSurfacePresenterBridgeAdapter.mm       |     2 +-
 React/Fabric/RCTSurfaceRegistry.h             |     2 +-
 React/Fabric/RCTSurfaceTouchHandler.mm        |    46 +-
 React/Fabric/Surface/RCTFabricSurface.h       |    15 +-
 React/Fabric/Surface/RCTFabricSurface.mm      |   266 +-
 React/Modules/RCTEventEmitter.h               |     5 +-
 React/Modules/RCTEventEmitter.m               |    19 +-
 React/Modules/RCTI18nUtil.h                   |     8 +-
 React/Modules/RCTI18nUtil.m                   |     2 +-
 React/Modules/RCTUIManager.m                  |    28 +-
 React/Profiler/RCTProfile.m                   |    17 +-
 React/Profiler/RCTProfileTrampoline-arm.S     |     2 +-
 React/Profiler/RCTProfileTrampoline-arm64.S   |     4 +-
 React/React-RCTFabric.podspec                 |    18 +-
 .../Text/RCTParagraphComponentViewTests.mm    |    72 +
 React/Views/RCTBorderDrawing.m                |    53 +-
 React/Views/RCTComponentData.h                |    11 +-
 React/Views/RCTComponentData.m                |    31 +-
 React/Views/RCTConvert+CoreLocation.m         |     4 +-
 React/Views/RCTDatePickerManager.m            |    33 +
 React/Views/RCTLayout.m                       |    46 +-
 React/Views/RCTModalHostView.h                |     6 +-
 React/Views/RCTModalHostView.m                |    72 +-
 React/Views/RCTModalHostViewManager.m         |    24 +-
 React/Views/RCTModalManager.h                 |     2 +-
 React/Views/RCTModalManager.m                 |     4 +-
 React/Views/RCTPicker.h                       |    28 -
 React/Views/RCTPicker.m                       |   211 -
 React/Views/RCTPickerManager.m                |    68 -
 React/Views/RCTShadowView+Layout.m            |    27 +-
 React/Views/RCTShadowView.m                   |     5 +-
 React/Views/RCTView.h                         |    14 +-
 React/Views/RCTView.m                         |    80 +-
 React/Views/RCTViewManager.m                  |    21 +-
 React/Views/RCTWeakViewHolder.h               |    19 +
 .../Views/RefreshControl/RCTRefreshControl.m  |    26 +
 .../RefreshControl/RCTRefreshControlManager.m |     1 +
 React/Views/ScrollView/RCTScrollContentView.m |     2 +-
 React/Views/ScrollView/RCTScrollView.h        |     8 +-
 React/Views/ScrollView/RCTScrollView.m        |    82 +-
 React/Views/ScrollView/RCTScrollViewManager.m |     3 +
 React/third-party.xcconfig                    |     2 +-
 ReactAndroid/Android-prebuilt.mk              |    85 +-
 ReactAndroid/README.md                        |     4 +-
 ReactAndroid/build.gradle                     |   179 +-
 ReactAndroid/gradle.properties                |    13 +-
 ReactAndroid/proguard-rules.pro               |     8 +-
 ReactAndroid/release.gradle                   |   142 -
 ReactAndroid/src/androidTest/buck-runner/BUCK |     1 +
 .../java/com/facebook/react/testing/BUCK      |     3 +-
 .../ReactAppInstrumentationTestCase.java      |     2 +-
 .../facebook/react/testing/idledetection/BUCK |     3 +-
 .../idledetection/ReactIdleDetectionUtil.java |     2 +-
 .../com/facebook/react/testing/network/BUCK   |     1 +
 .../java/com/facebook/react/testing/rule/BUCK |    11 +-
 .../java/com/facebook/react/tests/BUCK        |     2 +-
 .../react/tests/ReactPickerTestCase.java      |   196 -
 .../react/tests/TextInputTestCase.java        |     3 +-
 .../java/com/facebook/react/tests/core/BUCK   |    11 +-
 ReactAndroid/src/androidTest/js/BUCK          |    26 +
 .../androidTest/js/PickerAndroidTestModule.js |    89 -
 ReactAndroid/src/androidTest/js/TestBundle.js |     5 -
 .../src/androidTest/js/UIManagerTestModule.js |    13 +-
 ReactAndroid/src/main/java/com/facebook/BUCK  |     1 +
 .../facebook/debug/debugoverlay/model/BUCK    |     1 +
 .../main/java/com/facebook/debug/holder/BUCK  |     1 +
 .../main/java/com/facebook/debug/tags/BUCK    |     1 +
 .../hermes/instrumentation/Android.mk         |     4 +-
 .../com/facebook/hermes/instrumentation/BUCK  |     2 +
 .../facebook/hermes/reactexecutor/Android.mk  |     8 +-
 .../com/facebook/hermes/reactexecutor/BUCK    |     2 +
 .../reactexecutor/HermesExecutorFactory.java  |     2 +-
 .../facebook/hermes/reactexecutor/OnLoad.cpp  |    15 +
 .../hermes/reactexecutor/RuntimeConfig.java   |     6 -
 .../java/com/facebook/hermes/unicode/BUCK     |     1 +
 .../src/main/java/com/facebook/perftest/BUCK  |     1 +
 .../com/facebook/proguard/annotations/BUCK    |     5 +-
 .../annotations/proguard_annotations.pro      |     1 +
 .../src/main/java/com/facebook/react/BUCK     |     5 +-
 .../facebook/react/CoreModulesPackage.java    |     5 +-
 .../com/facebook/react/ReactActivity.java     |     1 +
 .../facebook/react/ReactActivityDelegate.java |     6 +-
 .../ReactAndroidHWInputDeviceHelper.java      |     5 +
 .../com/facebook/react/ReactFragment.java     |     8 +-
 .../facebook/react/ReactFragmentActivity.java |    15 -
 .../facebook/react/ReactInstanceManager.java  |   212 +-
 .../react/ReactInstanceManagerBuilder.java    |    10 +-
 .../com/facebook/react/ReactNativeHost.java   |     9 +-
 ...eactPackageTurboModuleManagerDelegate.java |    24 +-
 .../com/facebook/react/ReactRootView.java     |   116 +-
 .../java/com/facebook/react/animated/BUCK     |     3 +-
 .../react/animated/NativeAnimatedModule.java  |    12 +-
 .../animated/NativeAnimatedNodesManager.java  |    99 +-
 .../com/facebook/react/bridge/Arguments.java  |     4 +
 .../main/java/com/facebook/react/bridge/BUCK  |     2 +
 .../react/bridge/BackgroundExecutor.java      |     5 +-
 .../facebook/react/bridge/BaseJavaModule.java |    12 +-
 .../react/bridge/CatalystInstanceImpl.java    |    10 +-
 .../react/bridge/CxxModuleWrapperBase.java    |     5 +-
 .../react/bridge/JSIModuleRegistry.java       |     4 +
 .../react/bridge/JavaModuleWrapper.java       |    37 +
 .../facebook/react/bridge/ModuleHolder.java   |     2 +-
 .../facebook/react/bridge/NativeModule.java   |     9 +-
 .../react/bridge/NativeModuleRegistry.java    |    26 +
 .../facebook/react/bridge/ReactContext.java   |    54 +-
 .../bridge/ReactContextBaseJavaModule.java    |     5 +-
 .../react/bridge/ReactMarkerConstants.java    |    16 +-
 ...ion.java => ReactSoftExceptionLogger.java} |    11 +-
 .../react/bridge/ReadableNativeMap.java       |    54 +-
 .../facebook/react/bridge/SoftAssertions.java |    15 +-
 .../com/facebook/react/bridge/UIManager.java  |    39 +-
 .../main/java/com/facebook/react/common/BUCK  |     3 +
 .../react/common/build/ReactBuildConfig.java  |     1 +
 .../com/facebook/react/common/mapbuffer/BUCK  |    29 +
 .../common/mapbuffer/ReadableMapBuffer.java   |   347 +
 .../mapbuffer/ReadableMapBufferSoLoader.java  |    33 +
 .../react/common/mapbuffer/jni/Android.mk     |    39 +
 .../facebook/react/common/mapbuffer/jni/BUCK  |    34 +
 .../jni/react/common/mapbuffer/OnLoad.cpp     |    15 +
 .../common/mapbuffer/ReadableMapBuffer.cpp    |    76 +
 .../common/mapbuffer/ReadableMapBuffer.h      |    51 +
 .../com/facebook/react/common/network/BUCK    |     1 +
 .../main/java/com/facebook/react/config/BUCK  |     4 +-
 .../react/config/ReactFeatureFlags.java       |    88 +-
 .../java/com/facebook/react/devsupport/BUCK   |     4 +-
 .../devsupport/BridgeDevSupportManager.java   |   275 +
 .../devsupport/DevLoadingViewController.java  |     4 +-
 .../react/devsupport/DevServerHelper.java     |    77 +-
 .../devsupport/DevSupportManagerBase.java     |   520 +-
 .../devsupport/DevSupportManagerFactory.java  |    16 +-
 .../devsupport/DevSupportManagerImpl.java     |    82 -
 .../devsupport/DisabledDevSupportManager.java |    14 +-
 .../react/devsupport/LogBoxModule.java        |     2 +-
 .../react/devsupport/PackagerStatusCheck.java |   100 +
 ...elper.java => ReactInstanceDevHelper.java} |     5 +-
 .../react/devsupport/RedBoxHandler.java       |    18 +-
 .../interfaces/BundleLoadCallback.java        |    10 +-
 .../interfaces/DevSupportManager.java         |     7 +-
 .../devsupport/interfaces/ErrorType.java      |    23 +
 .../main/java/com/facebook/react/fabric/BUCK  |     3 +-
 .../com/facebook/react/fabric/Binding.java    |    11 +-
 .../react/fabric/FabricComponents.java        |     7 +-
 .../react/fabric/FabricJSIModuleProvider.java |    88 +-
 .../react/fabric/FabricUIManager.java         |  1082 +-
 .../react/fabric/StateWrapperImpl.java        |    61 +-
 .../facebook/react/fabric/SurfaceHandler.java |    50 +
 .../react/fabric/SurfaceHandlerBinding.java   |   131 +
 .../fabric/events/EventEmitterWrapper.java    |    37 +-
 .../fabric/events/FabricEventEmitter.java     |    34 +-
 .../com/facebook/react/fabric/jni/Android.mk  |     9 +-
 .../java/com/facebook/react/fabric/jni/BUCK   |     9 +-
 .../com/facebook/react/fabric/jni/Binding.cpp |   915 +-
 .../com/facebook/react/fabric/jni/Binding.h   |    47 +-
 .../fabric/jni/CoreComponentsRegistry.cpp     |     9 +-
 .../react/fabric/jni/EventEmitterWrapper.cpp  |    24 +-
 .../react/fabric/jni/EventEmitterWrapper.h    |     4 +
 .../com/facebook/react/fabric/jni/OnLoad.cpp  |     2 +
 .../react/fabric/jni/StateWrapperImpl.cpp     |    43 +-
 .../react/fabric/jni/StateWrapperImpl.h       |     4 +-
 .../fabric/jni/SurfaceHandlerBinding.cpp      |   122 +
 .../react/fabric/jni/SurfaceHandlerBinding.h  |    68 +
 .../fabric/mounting/MountItemDispatcher.java  |   406 +
 .../fabric/mounting/MountingManager.java      |   929 +-
 .../mounting/SurfaceMountingManager.java      |  1008 +
 .../mounting/mountitems/BatchMountItem.java   |   117 -
 .../mounting/mountitems/CreateMountItem.java  |    68 -
 .../DispatchIntCommandMountItem.java          |    11 +-
 .../DispatchStringCommandMountItem.java       |    11 +-
 .../mounting/mountitems/InsertMountItem.java  |    47 -
 .../mountitems/IntBufferBatchMountItem.java   |    73 +-
 .../fabric/mounting/mountitems/MountItem.java |     4 +
 .../mountitems/PreAllocateViewMountItem.java  |    44 +-
 .../RemoveDeleteMultiMountItem.java           |    90 -
 .../mountitems/SendAccessibilityEvent.java    |    15 +-
 .../UpdateEventEmitterMountItem.java          |    33 -
 .../mountitems/UpdateLayoutMountItem.java     |    90 -
 .../mountitems/UpdatePaddingMountItem.java    |    53 -
 .../mountitems/UpdatePropsMountItem.java      |    42 -
 .../mountitems/UpdateStateMountItem.java      |    43 -
 .../com/facebook/react/jscexecutor/Android.mk |     4 +-
 .../java/com/facebook/react/jscexecutor/BUCK  |     1 +
 .../main/java/com/facebook/react/jstasks/BUCK |     1 +
 .../react/jstasks/HeadlessJsTaskContext.java  |     6 +-
 .../facebook/react/module/annotations/BUCK    |     1 +
 .../java/com/facebook/react/module/model/BUCK |     1 +
 .../AccessibilityInfoModule.java              |    25 +-
 .../react/modules/accessibilityinfo/BUCK      |     3 +-
 .../facebook/react/modules/appearance/BUCK    |     3 +-
 .../facebook/react/modules/appregistry/BUCK   |     1 +
 .../modules/appstate/AppStateModule.java      |    12 +-
 .../com/facebook/react/modules/appstate/BUCK  |     3 +-
 .../java/com/facebook/react/modules/blob/BUCK |     3 +-
 .../react/modules/blob/BlobProvider.java      |    42 +-
 .../react/modules/blob/jni/Android.mk         |     4 +-
 .../com/facebook/react/modules/blob/jni/BUCK  |     2 +-
 .../react/modules/blob/jni/BlobCollector.cpp  |     1 +
 .../facebook/react/modules/bundleloader/BUCK  |     3 +-
 .../com/facebook/react/modules/camera/BUCK    |     3 +-
 .../com/facebook/react/modules/clipboard/BUCK |     1 +
 .../com/facebook/react/modules/common/BUCK    |     1 +
 .../java/com/facebook/react/modules/core/BUCK |     3 +-
 .../react/modules/core/TimingModule.java      |     7 +-
 .../facebook/react/modules/datepicker/BUCK    |     3 +-
 .../datepicker/DatePickerDialogModule.java    |    32 +-
 .../modules/debug/AnimationsDebugModule.java  |     2 +-
 .../com/facebook/react/modules/debug/BUCK     |     4 +-
 .../facebook/react/modules/deviceinfo/BUCK    |     3 +-
 .../modules/deviceinfo/DeviceInfoModule.java  |    27 +-
 .../com/facebook/react/modules/dialog/BUCK    |     3 +-
 .../react/modules/dialog/DialogModule.java    |    16 +-
 .../com/facebook/react/modules/fabric/BUCK    |     1 +
 .../com/facebook/react/modules/fresco/BUCK    |     1 +
 .../react/modules/fresco/FrescoModule.java    |    10 +
 .../facebook/react/modules/i18nmanager/BUCK   |     4 +-
 .../i18nmanager/I18nManagerModule.java        |    24 +-
 .../com/facebook/react/modules/image/BUCK     |     3 +-
 .../com/facebook/react/modules/intent/BUCK    |     3 +-
 .../com/facebook/react/modules/network/BUCK   |     3 +-
 .../modules/network/NetworkingModule.java     |     2 +-
 .../modules/network/OkHttpClientProvider.java |    19 +-
 .../facebook/react/modules/permissions/BUCK   |     3 +-
 .../com/facebook/react/modules/share/BUCK     |     3 +-
 .../com/facebook/react/modules/sound/BUCK     |     3 +-
 .../com/facebook/react/modules/statusbar/BUCK |     3 +-
 .../modules/storage/AsyncStorageModule.java   |     2 +-
 .../com/facebook/react/modules/storage/BUCK   |     3 +-
 .../facebook/react/modules/systeminfo/BUCK    |     6 +-
 .../systeminfo/ReactNativeVersion.java        |     4 +-
 .../com/facebook/react/modules/toast/BUCK     |     3 +-
 .../com/facebook/react/modules/vibration/BUCK |     3 +-
 .../com/facebook/react/modules/websocket/BUCK |     3 +-
 .../facebook/react/packagerconnection/BUCK    |     1 +
 .../ReconnectingWebSocket.java                |     4 +-
 .../com/facebook/react/reactperflogger/BUCK   |     1 +
 .../react/reactperflogger/jni/Android.mk      |     2 +-
 .../facebook/react/reactperflogger/jni/BUCK   |     2 +-
 .../com/facebook/react/runtimescheduler/BUCK  |    20 +
 .../RuntimeSchedulerManager.java              |    39 +
 .../react/runtimescheduler/jni/Android.mk     |    34 +
 .../facebook/react/runtimescheduler/jni/BUCK  |    35 +
 .../react/runtimescheduler/jni/OnLoad.cpp     |    15 +
 .../jni/RuntimeSchedulerManager.cpp           |    46 +
 .../jni/RuntimeSchedulerManager.h             |    40 +
 .../main/java/com/facebook/react/shell/BUCK   |     2 +-
 .../react/shell/MainReactPackage.java         |     4 -
 .../main/java/com/facebook/react/surface/BUCK |     1 +
 .../main/java/com/facebook/react/touch/BUCK   |     1 +
 .../com/facebook/react/turbomodule/core/BUCK  |     3 +-
 .../turbomodule/core/TurboModuleManager.java  |    21 +-
 .../core/TurboModuleManagerDelegate.java      |     3 +
 .../core/TurboModulePerfLogger.java           |     2 +
 .../react/turbomodule/core/interfaces/BUCK    |     1 +
 .../core/interfaces/TurboModule.java          |     8 +-
 .../react/turbomodule/core/jni/Android.mk     |     8 +-
 .../facebook/react/turbomodule/core/jni/BUCK  |     5 +-
 .../jni/ReactCommon/TurboModuleManager.cpp    |   201 +-
 .../core/jni/ReactCommon/TurboModuleManager.h |    19 +-
 .../java/com/facebook/react/uimanager/BUCK    |     7 +-
 .../react/uimanager/BaseViewManager.java      |    16 +-
 .../uimanager/ComponentNameResolver.java      |    17 +
 .../ComponentNameResolverManager.java         |    41 +
 .../react/uimanager/DisplayMetricsHolder.java |    35 +-
 .../uimanager/FabricViewStateManager.java     |    24 +-
 .../react/uimanager/JSTouchDispatcher.java    |    27 +
 .../uimanager/NativeViewHierarchyManager.java |    17 +-
 .../NativeViewHierarchyOptimizer.java         |    23 +-
 .../react/uimanager/OnLayoutEvent.java        |    23 +-
 .../facebook/react/uimanager/PixelUtil.java   |     7 +-
 .../uimanager/ReactAccessibilityDelegate.java |    38 +-
 .../ReactClippingProhibitedView.java          |    26 +
 .../ReactClippingViewGroupHelper.java         |    54 +-
 .../react/uimanager/ReactOverflowView.java    |    25 +
 .../facebook/react/uimanager/ReactRoot.java   |    14 +
 .../react/uimanager/RootViewUtil.java         |    18 +
 .../react/uimanager/StateWrapper.java         |    28 +-
 .../react/uimanager/ThemedReactContext.java   |    42 +-
 .../react/uimanager/TouchTargetHelper.java    |   169 +-
 .../react/uimanager/UIImplementation.java     |    51 +-
 .../uimanager/UIImplementationProvider.java   |    48 +-
 .../react/uimanager/UIManagerHelper.java      |    97 +-
 .../react/uimanager/UIManagerModule.java      |   109 +-
 .../UIManagerModuleConstantsHelper.java       |     3 +-
 .../react/uimanager/UIViewOperationQueue.java |    19 +-
 .../facebook/react/uimanager/ViewManager.java |    28 +-
 .../react/uimanager/ViewManagerRegistry.java  |     4 +-
 .../react/uimanager/ViewManagerResolver.java  |    26 +
 .../uimanager/ViewManagersPropertyCache.java  |    17 +-
 .../facebook/react/uimanager/annotations/BUCK |     1 +
 .../com/facebook/react/uimanager/common/BUCK  |     2 +-
 .../events/BlackHoleEventDispatcher.java      |     3 +
 .../events/ContentSizeChangeEvent.java        |    11 +-
 .../react/uimanager/events/Event.java         |   140 +-
 .../uimanager/events/EventDispatcher.java     |     3 +
 .../uimanager/events/EventDispatcherImpl.java |    11 +-
 .../events/LockFreeEventDispatcherImpl.java   |   236 +
 .../uimanager/events/RCTEventEmitter.java     |    10 +
 .../events/RCTModernEventEmitter.java         |    32 +
 .../uimanager/events/ReactEventEmitter.java   |   105 +-
 .../react/uimanager/events/TouchEvent.java    |    71 +-
 .../react/uimanager/events/TouchesHelper.java |    11 +-
 .../facebook/react/uimanager/interfaces/BUCK  |    21 +
 .../BaseViewManagerDelegate.java              |     0
 .../BaseViewManagerInterface.java             |     0
 .../uimanager/{ => interfaces}/FloatUtil.java |     0
 .../uimanager/{ => interfaces}/Spacing.java   |     0
 .../{ => interfaces}/ViewManagerDelegate.java |     0
 .../uimanager/{ => interfaces}/ViewProps.java |    12 +-
 .../facebook/react/uimanager/jni/Android.mk   |    37 +
 .../com/facebook/react/uimanager/jni/BUCK     |    41 +
 .../jni/ComponentNameResolverManager.cpp      |    77 +
 .../jni/ComponentNameResolverManager.h        |    54 +
 .../facebook/react/uimanager/jni/OnLoad.cpp   |    16 +
 .../com/facebook/react/uimanager/util/BUCK    |     1 +
 .../main/java/com/facebook/react/util/BUCK    |     1 +
 .../ActivityIndicatorViewManagerDelegate.java |    42 -
 ...ActivityIndicatorViewManagerInterface.java |    20 -
 .../AndroidDialogPickerManagerDelegate.java   |    48 -
 .../AndroidDialogPickerManagerInterface.java  |    23 -
 .../AndroidDrawerLayoutManagerDelegate.java   |    61 -
 .../AndroidDrawerLayoutManagerInterface.java  |    24 -
 .../AndroidDropdownPickerManagerDelegate.java |    48 -
 ...AndroidDropdownPickerManagerInterface.java |    22 -
 .../AndroidProgressBarManagerDelegate.java    |    51 -
 .../AndroidProgressBarManagerInterface.java   |    23 -
 ...roidSwipeRefreshLayoutManagerDelegate.java |    58 -
 ...oidSwipeRefreshLayoutManagerInterface.java |    24 -
 .../AndroidSwitchManagerDelegate.java         |    67 -
 .../AndroidSwitchManagerInterface.java        |    26 -
 .../java/com/facebook/react/viewmanagers/BUCK |     1 +
 .../MaskedViewManagerDelegate.java            |    26 -
 .../MaskedViewManagerInterface.java           |    16 -
 .../ModalHostViewManagerDelegate.java         |    54 -
 .../ModalHostViewManagerInterface.java        |    25 -
 .../ProgressViewManagerDelegate.java          |    49 -
 .../ProgressViewManagerInterface.java         |    23 -
 .../SafeAreaViewManagerDelegate.java          |    32 -
 .../SafeAreaViewManagerInterface.java         |    16 -
 .../SegmentedControlManagerDelegate.java      |    52 -
 .../SegmentedControlManagerInterface.java     |    24 -
 .../viewmanagers/SliderManagerDelegate.java   |    73 -
 .../viewmanagers/SliderManagerInterface.java  |    31 -
 ...nimplementedNativeViewManagerDelegate.java |    32 -
 ...implementedNativeViewManagerInterface.java |    17 -
 .../react/viewmanagers/jni/Android.mk         |    29 -
 .../components/rncore/ComponentDescriptors.h  |    31 -
 .../components/rncore/EventEmitters.cpp       |   141 -
 .../components/rncore/EventEmitters.h         |   223 -
 .../renderer/components/rncore/Props.cpp      |   191 -
 .../react/renderer/components/rncore/Props.h  |   529 -
 .../components/rncore/ShadowNodes.cpp         |    28 -
 .../renderer/components/rncore/ShadowNodes.h  |   117 -
 .../java/com/facebook/react/views/common/BUCK |     1 +
 .../java/com/facebook/react/views/drawer/BUCK |     5 +-
 .../drawer/ReactDrawerLayoutManager.java      |    25 +-
 .../drawer/events/DrawerClosedEvent.java      |    19 +-
 .../drawer/events/DrawerOpenedEvent.java      |    19 +-
 .../views/drawer/events/DrawerSlideEvent.java |    20 +-
 .../events/DrawerStateChangedEvent.java       |    20 +-
 .../java/com/facebook/react/views/image/BUCK  |     2 +
 .../react/views/image/ImageLoadEvent.java     |    64 +-
 .../image/ReactCallerContextFactory.java      |     4 +-
 .../react/views/image/ReactImageManager.java  |    19 +-
 .../react/views/image/ReactImageView.java     |   101 +-
 .../com/facebook/react/views/imagehelper/BUCK |     2 +
 .../react/views/imagehelper/ImageSource.java  |    17 +
 .../java/com/facebook/react/views/modal/BUCK  |     6 +-
 .../views/modal/ReactModalHostManager.java    |    16 +-
 .../react/views/modal/ReactModalHostView.java |    55 +-
 .../react/views/modal/RequestCloseEvent.java  |    16 +-
 .../facebook/react/views/modal/ShowEvent.java |    16 +-
 .../java/com/facebook/react/views/picker/BUCK |    29 -
 .../picker/ReactDialogPickerManager.java      |    51 -
 .../picker/ReactDropdownPickerManager.java    |    50 -
 .../react/views/picker/ReactPicker.java       |   196 -
 .../views/picker/ReactPickerAdapter.java      |    95 -
 .../react/views/picker/ReactPickerItem.java   |    43 -
 .../views/picker/ReactPickerManager.java      |    97 -
 .../picker/events/PickerItemSelectEvent.java  |    40 -
 .../com/facebook/react/views/progressbar/BUCK |     5 +-
 .../java/com/facebook/react/views/scroll/BUCK |     2 +
 .../ReactHorizontalScrollContainerView.java   |    35 +-
 .../scroll/ReactHorizontalScrollView.java     |   213 +-
 .../ReactHorizontalScrollViewManager.java     |    13 +-
 .../react/views/scroll/ReactScrollView.java   |   126 +-
 .../views/scroll/ReactScrollViewHelper.java   |    23 +-
 .../views/scroll/ReactScrollViewManager.java  |    15 +-
 .../react/views/scroll/ScrollEvent.java       |    55 +-
 .../java/com/facebook/react/views/slider/BUCK |     5 +-
 .../react/views/slider/ReactSliderEvent.java  |     5 -
 .../views/slider/ReactSliderManager.java      |    49 +-
 .../slider/ReactSlidingCompleteEvent.java     |    29 +-
 .../facebook/react/views/swiperefresh/BUCK    |     5 +-
 .../views/swiperefresh/RefreshEvent.java      |    16 +-
 .../SwipeRefreshLayoutManager.java            |    25 +-
 .../com/facebook/react/views/switchview/BUCK  |     5 +-
 .../react/views/switchview/ReactSwitch.java   |    13 +
 .../views/switchview/ReactSwitchEvent.java    |    22 +-
 .../views/switchview/ReactSwitchManager.java  |    16 +-
 .../java/com/facebook/react/views/text/BUCK   |     2 +
 .../react/views/text/CustomStyleSpan.java     |    14 +-
 .../views/text/ReactBaseTextShadowNode.java   |    15 +-
 .../react/views/text/ReactClickableSpan.java  |     3 +-
 .../react/views/text/ReactFontManager.java    |   103 +-
 .../react/views/text/ReactTextShadowNode.java |    20 +-
 .../react/views/text/ReactTextView.java       |    11 +
 .../views/text/ReactTextViewManager.java      |    49 +-
 .../react/views/text/ReactTypefaceUtils.java  |   100 +-
 .../react/views/text/TextAttributeProps.java  |   354 +-
 .../react/views/text/TextLayoutManager.java   |    84 +-
 .../text/TextLayoutManagerMapBuffer.java      |   596 +
 .../react/views/text/TypefaceStyle.java       |    72 +
 .../react/views/text/frescosupport/BUCK       |     1 +
 .../com/facebook/react/views/textinput/BUCK   |     2 +
 .../ReactContentSizeChangedEvent.java         |    17 +-
 .../react/views/textinput/ReactEditText.java  |    59 +-
 .../ReactEditTextInputConnectionWrapper.java  |    11 +-
 .../textinput/ReactTextChangedEvent.java      |    16 +-
 .../textinput/ReactTextInputBlurEvent.java    |    16 +-
 .../ReactTextInputEndEditingEvent.java        |    16 +-
 .../views/textinput/ReactTextInputEvent.java  |    17 +-
 .../textinput/ReactTextInputFocusEvent.java   |    26 +-
 .../ReactTextInputKeyPressEvent.java          |    29 +-
 .../textinput/ReactTextInputManager.java      |   227 +-
 .../ReactTextInputSelectionEvent.java         |    17 +-
 .../ReactTextInputSubmitEditingEvent.java     |    26 +-
 .../react/views/unimplementedview/BUCK        |     1 +
 .../java/com/facebook/react/views/view/BUCK   |     1 +
 .../react/views/view/ReactDrawableHelper.java |     6 +-
 .../view/ReactViewBackgroundDrawable.java     |    47 +-
 .../react/views/view/ReactViewGroup.java      |   128 +-
 .../react/views/view/ReactViewManager.java    |     4 +-
 .../react/views/view/ViewGroupClickEvent.java |    15 +-
 .../src/main/java/com/facebook/systrace/BUCK  |     1 +
 .../main/java/com/facebook/yoga/YogaNode.java |    20 +-
 .../com/facebook/yoga/YogaNodeJNIBase.java    |    26 +-
 .../java/com/facebook/yoga/YogaProps.java     |   151 +
 ReactAndroid/src/main/jni/first-party/fb/BUCK |     4 +
 .../jni/first-party/fb/include/fb/RefPtr.h    |     2 +-
 .../fb/include/fb/StaticInitialized.h         |     2 +-
 .../first-party/yogajni/jni/YGJNIVanilla.cpp  |     9 +-
 .../first-party/yogajni/jni/YGJTypesVanilla.h |    12 +-
 .../src/main/jni/react/jni/Android.mk         |    12 +-
 ReactAndroid/src/main/jni/react/jni/BUCK      |     5 +-
 .../jni/react/jni/CatalystInstanceImpl.cpp    |    57 +-
 .../main/jni/react/jni/CatalystInstanceImpl.h |     4 +
 .../react/jni/JReactSoftExceptionLogger.cpp   |    21 +
 .../jni/react/jni/JReactSoftExceptionLogger.h |    28 +
 .../src/main/jni/react/jni/JSLoader.cpp       |     2 +-
 .../main/jni/react/jni/JavaModuleWrapper.cpp  |    94 -
 .../main/jni/react/jni/JavaModuleWrapper.h    |    30 -
 .../src/main/jni/react/jni/ProxyExecutor.h    |     1 +
 .../main/jni/react/jni/ReadableNativeMap.cpp  |    13 +-
 .../src/main/jni/third-party/boost/Android.mk |     9 +-
 .../boost/asm/arm/jump_arm_aapcs_elf_gas.S    |    86 +
 .../boost/asm/arm/make_arm_aapcs_elf_gas.S    |    79 +
 .../boost/asm/arm/ontop_arm_aapcs_elf_gas.S   |    91 +
 .../asm/arm64/jump_arm64_aapcs_elf_gas.S      |   114 +
 .../asm/arm64/make_arm64_aapcs_elf_gas.S      |    85 +
 .../asm/arm64/ontop_arm64_aapcs_elf_gas.S     |   113 +
 .../boost/asm/x86/jump_i386_sysv_elf_gas.S    |    78 +
 .../boost/asm/x86/make_i386_sysv_elf_gas.S    |   106 +
 .../boost/asm/x86/ontop_i386_sysv_elf_gas.S   |    85 +
 .../asm/x86_64/jump_x86_64_sysv_elf_gas.S     |    76 +
 .../asm/x86_64/make_x86_64_sysv_elf_gas.S     |    81 +
 .../asm/x86_64/ontop_x86_64_sysv_elf_gas.S    |    79 +
 .../src/main/jni/third-party/fmt/Android.mk   |    15 +
 .../src/main/jni/third-party/folly/Android.mk |    52 +-
 .../main/jni/third-party/libevent/Android.mk  |    36 +
 .../third-party/libevent/evconfig-private.h   |    49 +
 .../jni/third-party/libevent/event-config.h   |   340 +
 .../java/com/facebook/common/logging/BUCK     |     1 +
 ReactAndroid/src/main/libraries/fbjni/BUCK    |     4 +-
 .../libraries/fresco/fresco-react-native/BUCK |   107 +-
 .../soloader/java/com/facebook/soloader/BUCK  |    10 +-
 .../main/res/devsupport/values/strings.xml    |     3 +-
 .../uimanager/values/strings_unlocalized.xml  |    12 +-
 .../main/third-party/android/androidx/BUCK    |    61 +
 .../main/third-party/android/support/v4/BUCK  |   685 -
 .../android/support/v7/appcompat/BUCK         |    62 -
 .../support/v7/appcompat/aar-unpacker.py      |    20 -
 .../src/main/third-party/java/asm/BUCK        |     1 +
 .../src/main/third-party/java/fest/BUCK       |     1 +
 .../third-party/java/infer-annotations/BUCK   |     4 +-
 .../src/main/third-party/java/junit/BUCK      |     1 +
 .../src/main/third-party/java/mockito/BUCK    |     1 +
 .../src/main/third-party/java/mockito2/BUCK   |     1 +
 .../src/main/third-party/java/okhttp/BUCK     |    38 +-
 .../src/main/third-party/java/okio/BUCK       |    20 +-
 .../java/robolectric/{4.4 => }/BUCK           |     1 +
 .../src/main/third-party/java/sqlite/BUCK     |     1 +
 .../third-party/java/testing-support-lib/BUCK |    31 -
 ReactAndroid/src/main/third-party/kotlin/BUCK |    91 +
 .../java/com/facebook/common/logging/BUCK     |     1 +
 .../java/com/facebook/react/RootViewTest.java |    11 +-
 .../NativeAnimatedNodeTraversalTest.java      |     2 +-
 .../test/java/com/facebook/react/bridge/BUCK  |     3 +-
 .../react/bridge/ReactTestHelper.java         |     1 +
 .../JSDebuggerWebSocketClientTest.java        |     4 +-
 .../test/java/com/facebook/react/modules/BUCK |     1 +
 .../deviceinfo/DeviceInfoModuleTest.java      |   168 +
 .../modules/dialog/DialogModuleTest.java      |     2 +-
 .../modules/network/NetworkingModuleTest.java |    20 +-
 .../modules/timing/TimingModuleTest.java      |     2 +-
 .../react/uimanager/BaseViewManagerTest.java  |    32 +
 .../uimanager/SimpleViewPropertyTest.java     |    10 +-
 .../views/image/ReactImagePropertyTest.java   |     8 +
 .../textinput/ReactTextInputPropertyTest.java |     4 +
 .../test/java/org/mockito/configuration/BUCK  |     1 +
 ReactCommon/React-Fabric.podspec              |   240 +-
 ReactCommon/ReactCommon.podspec               |    13 +-
 ReactCommon/better/Android.mk                 |     2 +-
 ReactCommon/better/BUCK                       |     4 +-
 ReactCommon/callinvoker/Android.mk            |     2 +-
 ReactCommon/callinvoker/BUCK                  |     2 +-
 .../callinvoker/React-callinvoker.podspec     |     6 +-
 ReactCommon/cxxreact/Android.mk               |     3 +-
 ReactCommon/cxxreact/BUCK                     |     6 +-
 ReactCommon/cxxreact/CxxNativeModule.cpp      |    28 +
 ReactCommon/cxxreact/CxxNativeModule.h        |     9 +
 ReactCommon/cxxreact/Instance.cpp             |    34 +-
 ReactCommon/cxxreact/Instance.h               |     1 +
 ReactCommon/cxxreact/JSBundleType.cpp         |     5 +
 ReactCommon/cxxreact/JSBundleType.h           |     1 +
 ReactCommon/cxxreact/JsArgumentHelpers-inl.h  |     6 +-
 ReactCommon/cxxreact/JsArgumentHelpers.h      |     4 +-
 ReactCommon/cxxreact/MethodCall.cpp           |     4 +-
 ReactCommon/cxxreact/ModuleRegistry.cpp       |     5 +
 ReactCommon/cxxreact/NativeToJsBridge.cpp     |    21 -
 ReactCommon/cxxreact/NativeToJsBridge.h       |     6 -
 ReactCommon/cxxreact/React-cxxreact.podspec   |    11 +-
 ReactCommon/cxxreact/ReactNativeVersion.h     |     4 +-
 ReactCommon/cxxreact/SystraceSection.h        |     4 +-
 ReactCommon/cxxreact/re_worker_requirements   |     6 -
 ReactCommon/hermes/React-hermes.podspec       |    53 +
 ReactCommon/hermes/executor/Android.mk        |     8 +-
 ReactCommon/hermes/inspector/Android.mk       |     3 +-
 ReactCommon/hermes/inspector/BUCK             |    13 +-
 ReactCommon/hermes/inspector/Inspector.cpp    |     5 +-
 ReactCommon/hermes/inspector/Inspector.h      |    11 +-
 .../hermes/inspector/InspectorState.cpp       |    14 +-
 .../hermes/inspector/chrome/Connection.cpp    |   115 +
 .../hermes/inspector/chrome/MessageTypes.cpp  |   216 +-
 .../hermes/inspector/chrome/MessageTypes.h    |   116 +-
 .../hermes/inspector/chrome/cli/main.cpp      |    11 +-
 .../chrome/tests/ConnectionTests.cpp          |   144 +
 .../hermes/inspector/tools/message_types.txt  |     4 +
 .../tools/msggen/__tests__/CommandTest.js     |     4 +-
 .../tools/msggen/__tests__/EventTest.js       |     4 +-
 .../tools/msggen/__tests__/GraphTest.js       |     4 +-
 .../msggen/__tests__/HeaderWriterTest.js      |     4 +-
 .../__tests__/ImplementationWriterTest.js     |     4 +-
 .../tools/msggen/__tests__/PropertyTest.js    |     4 +-
 .../tools/msggen/__tests__/TypeTest.js        |     4 +-
 .../inspector/tools/msggen/package.json       |     2 +-
 .../inspector/tools/msggen/src/Command.js     |     2 -
 .../inspector/tools/msggen/src/Converters.js  |     2 -
 .../inspector/tools/msggen/src/Event.js       |     2 -
 .../inspector/tools/msggen/src/Graph.js       |     2 -
 .../tools/msggen/src/HeaderWriter.js          |     2 -
 .../tools/msggen/src/ImplementationWriter.js  |     2 -
 .../inspector/tools/msggen/src/Property.js    |     3 +-
 .../inspector/tools/msggen/src/TestHelpers.js |     4 +-
 .../hermes/inspector/tools/msggen/src/Type.js |     2 -
 .../inspector/tools/msggen/src/index.js       |     4 +-
 .../hermes/inspector/tools/msggen/yarn.lock   |  3642 ++--
 ReactCommon/jsi/Android.mk                    |     8 +-
 ReactCommon/jsi/BUCK                          |     6 +-
 ReactCommon/jsi/JSCRuntime.cpp                |     7 +
 ReactCommon/jsi/React-jsi.podspec             |    10 +-
 ReactCommon/jsi/jsi/CMakeLists.txt            |     2 +-
 ReactCommon/jsi/jsi/decorator.h               |    15 +
 ReactCommon/jsi/jsi/instrumentation.h         |    13 +
 ReactCommon/jsi/jsi/jsi.cpp                   |     3 +
 ReactCommon/jsi/jsi/jsi.h                     |    35 +-
 ReactCommon/jsi/jsi/jsilib-posix.cpp          |    12 +-
 ReactCommon/jsi/jsi/test/testlib.cpp          |     1 +
 ReactCommon/jsiexecutor/Android.mk            |     4 +-
 .../jsiexecutor/React-jsiexecutor.podspec     |     8 +-
 .../jsiexecutor/jsireact/JSIExecutor.cpp      |    39 +-
 .../jsiexecutor/jsireact/JSINativeModules.cpp |     2 +
 ReactCommon/jsinspector/BUCK                  |     2 +
 .../jsinspector/React-jsinspector.podspec     |     4 +-
 .../src/test/java/com/facebook/powermock/BUCK |     2 +
 ReactCommon/logger/Android.mk                 |    23 +
 ReactCommon/logger/BUCK                       |    43 +
 ReactCommon/logger/React-logger.podspec       |    40 +
 ReactCommon/logger/react_native_log.cpp       |    52 +
 ReactCommon/logger/react_native_log.h         |    33 +
 ReactCommon/react/config/Android.mk           |     2 +-
 ReactCommon/react/config/BUCK                 |     2 +-
 ReactCommon/react/debug/Android.mk            |    31 +
 ReactCommon/react/debug/BUCK                  |    69 +
 ReactCommon/react/debug/flags.h               |    19 +
 .../react/debug/react_native_assert.cpp       |    45 +
 ReactCommon/react/debug/react_native_assert.h |    64 +
 .../react/nativemodule/core/Android.mk        |     6 +-
 ReactCommon/react/nativemodule/core/BUCK      |     7 +-
 .../core/ReactCommon/LongLivedObject.cpp      |     1 +
 .../core/ReactCommon/LongLivedObject.h        |     5 +-
 .../core/ReactCommon/TurboModule.cpp          |     2 +-
 .../core/ReactCommon/TurboModule.h            |     4 +-
 .../core/ReactCommon/TurboModuleBinding.cpp   |    57 +-
 .../core/ReactCommon/TurboModuleBinding.h     |    14 +-
 .../core/ReactCommon/TurboModuleUtils.h       |    57 +-
 .../android/ReactCommon/JavaTurboModule.cpp   |   228 +-
 .../android/ReactCommon/JavaTurboModule.h     |    20 +-
 .../core/platform/ios/RCTBlockGuard.h         |    24 +
 .../core/platform/ios/RCTBlockGuard.mm        |    28 +
 .../core/platform/ios/RCTTurboModule.h        |    22 +-
 .../core/platform/ios/RCTTurboModule.mm       |   145 +-
 .../core/platform/ios/RCTTurboModuleManager.h |     6 -
 .../platform/ios/RCTTurboModuleManager.mm     |   217 +-
 ReactCommon/react/nativemodule/samples/BUCK   |    12 +-
 .../samples/platform/android/Android.mk       |     4 +-
 .../android/NativeSampleTurboModuleSpec.java  |     3 +
 .../platform/android/SampleTurboModule.java   |    10 +
 .../ios/RCTNativeSampleTurboModuleSpec.h      |     1 +
 .../ios/RCTNativeSampleTurboModuleSpec.mm     |    11 +
 .../platform/ios/RCTSampleTurboCxxModule.mm   |    12 +
 .../platform/ios/RCTSampleTurboModule.mm      |     8 +-
 .../ios/SampleTurboCxxModuleLegacyImpl.cpp    |    11 +
 .../ios/SampleTurboCxxModuleLegacyImpl.h      |     1 +
 .../react/renderer/animations/Android.mk      |     5 +-
 ReactCommon/react/renderer/animations/BUCK    |     8 +-
 .../animations/LayoutAnimationDriver.cpp      |   149 +-
 .../animations/LayoutAnimationDriver.h        |     5 +-
 .../LayoutAnimationKeyFrameManager.cpp        |  1066 +-
 .../LayoutAnimationKeyFrameManager.h          |   133 +-
 .../animations/tests/LayoutAnimationTest.cpp  |   544 +
 .../renderer/attributedstring/Android.mk      |     6 +-
 .../attributedstring/AttributedStringBox.cpp  |    34 +-
 .../attributedstring/AttributedStringBox.h    |     4 +-
 .../react/renderer/attributedstring/BUCK      |    13 +-
 .../attributedstring/TextAttributes.cpp       |     9 +-
 .../attributedstring/TextAttributes.h         |     2 +
 .../renderer/attributedstring/conversions.h   |   974 +-
 .../renderer/attributedstring/primitives.h    |    16 +
 .../tests/AttributedStringBoxTest.cpp         |   105 +
 .../tests/AttributedStringTest.cpp            |    37 +-
 .../tests/ParagraphAttributesTest.cpp         |    19 +-
 .../tests/TextAttributesTest.cpp              |    28 +-
 .../renderer/componentregistry/Android.mk     |     5 +-
 .../react/renderer/componentregistry/BUCK     |     9 +-
 .../ComponentDescriptorProvider.h             |     9 +-
 .../ComponentDescriptorProviderRegistry.cpp   |     4 +-
 .../ComponentDescriptorProviderRegistry.h     |     1 +
 .../ComponentDescriptorRegistry.cpp           |    90 +-
 .../ComponentDescriptorRegistry.h             |     5 +-
 .../componentNameByReactViewName.cpp          |    73 +
 .../componentNameByReactViewName.h}           |     9 +-
 .../componentregistry/native/Android.mk       |    29 +
 .../renderer/componentregistry/native/BUCK    |    58 +
 .../native/NativeComponentRegistryBinding.cpp |    68 +
 .../native/NativeComponentRegistryBinding.h   |    61 +
 .../renderer/components/image/Android.mk      |     8 +-
 .../react/renderer/components/image/BUCK      |    10 +-
 .../image/ImageComponentDescriptor.h          |     5 +-
 .../renderer/components/image/ImageProps.cpp  |    37 +-
 .../renderer/components/image/ImageProps.h    |     6 +-
 .../components/image/ImageShadowNode.cpp      |    10 +-
 .../renderer/components/image/ImageState.h    |    10 +-
 .../renderer/components/image/conversions.h   |    47 +-
 .../renderer/components/inputaccessory/BUCK   |     7 +-
 .../InputAccessoryComponentDescriptor.h       |     8 +-
 .../components/legacyviewmanagerinterop/BUCK  |     6 +-
 ...acyViewManagerInteropComponentDescriptor.h |     2 +-
 ...cyViewManagerInteropComponentDescriptor.mm |    21 +-
 .../LegacyViewManagerInteropViewProps.cpp     |     7 +-
 .../LegacyViewManagerInteropViewProps.h       |     2 +
 .../RCTLegacyViewManagerInteropCoordinator.h  |     2 +-
 .../RCTLegacyViewManagerInteropCoordinator.mm |    89 +-
 .../renderer/components/modal/Android.mk      |     7 +-
 .../react/renderer/components/modal/BUCK      |     8 +-
 .../modal/ModalHostViewComponentDescriptor.h  |     8 +-
 .../components/modal/ModalHostViewState.h     |    11 +-
 .../renderer/components/picker/Android.mk     |    37 -
 .../AndroidDialogPickerEventEmitter.cpp       |    23 -
 .../AndroidDialogPickerEventEmitter.h         |    27 -
 .../AndroidDialogPickerProps.cpp              |    28 -
 .../androidpicker/AndroidDialogPickerProps.h  |    77 -
 .../AndroidDialogPickerShadowNode.cpp         |    16 -
 .../AndroidDialogPickerShadowNode.h           |    29 -
 .../AndroidDropdownPickerEventEmitter.cpp     |    23 -
 .../AndroidDropdownPickerEventEmitter.h       |    27 -
 .../AndroidDropdownPickerProps.cpp            |    28 -
 .../AndroidDropdownPickerProps.h              |    77 -
 .../AndroidDropdownPickerShadowNode.cpp       |    17 -
 .../AndroidDropdownPickerShadowNode.h         |    29 -
 .../iospicker/PickerComponentDescriptor.h     |    26 -
 .../picker/iospicker/PickerEventEmitter.cpp   |    23 -
 .../picker/iospicker/PickerEventEmitter.h     |    28 -
 .../picker/iospicker/PickerProps.cpp          |    46 -
 .../components/picker/iospicker/PickerProps.h |    36 -
 .../picker/iospicker/PickerShadowNode.h       |    33 -
 .../components/picker/iospicker/conversions.h |    47 -
 .../components/picker/iospicker/primitives.h  |    29 -
 .../components/progressbar/Android.mk         |     6 +-
 .../renderer/components/progressbar/BUCK      |     7 +-
 .../AndroidProgressBarComponentDescriptor.h   |     6 +-
 .../react/renderer/components/root/Android.mk |     7 +-
 .../react/renderer/components/root/BUCK       |     7 +-
 .../renderer/components/root/RootProps.cpp    |    14 +-
 .../renderer/components/root/RootProps.h      |     7 +-
 .../components/root/RootShadowNode.cpp        |     8 +-
 .../renderer/components/root/RootShadowNode.h |     2 +
 .../root/tests/RootShadowNodeTest.cpp         |    38 +-
 .../renderer/components/safeareaview/BUCK     |     7 +-
 .../SafeAreaViewComponentDescriptor.h         |     8 +-
 .../safeareaview/SafeAreaViewShadowNode.h     |     7 +
 .../safeareaview/SafeAreaViewState.h          |     4 +-
 .../renderer/components/scrollview/Android.mk |     8 +-
 .../react/renderer/components/scrollview/BUCK |     9 +-
 .../scrollview/RCTComponentViewHelpers.h      |    38 +
 .../components/scrollview/ScrollViewProps.cpp |    65 +-
 .../components/scrollview/ScrollViewProps.h   |    15 +-
 .../scrollview/ScrollViewShadowNode.cpp       |    25 +-
 .../scrollview/ScrollViewShadowNode.h         |     1 +
 .../components/scrollview/ScrollViewState.cpp |     2 +-
 .../components/scrollview/ScrollViewState.h   |    19 +-
 .../components/scrollview/conversions.h       |     5 +
 .../renderer/components/slider/Android.mk     |     7 +-
 .../react/renderer/components/slider/BUCK     |     8 +-
 .../slider/SliderComponentDescriptor.h        |     6 +-
 .../components/slider/SliderShadowNode.h      |    17 +-
 .../renderer/components/slider/SliderState.h  |     8 +
 .../ios/SliderMeasurementsManager.cpp         |     4 +-
 .../renderer/components/switch/Android.mk     |     6 +-
 .../react/renderer/components/switch/BUCK     |     6 +-
 .../AndroidSwitchComponentDescriptor.h        |     6 +-
 .../react/renderer/components/text/Android.mk |     8 +-
 .../react/renderer/components/text/BUCK       |    14 +-
 .../components/text/BaseTextProps.cpp         |    32 +
 .../renderer/components/text/BaseTextProps.h  |     6 +-
 .../components/text/BaseTextShadowNode.cpp    |     5 +-
 .../text/ParagraphComponentDescriptor.h       |    15 +-
 .../components/text/ParagraphProps.cpp        |    21 +-
 .../renderer/components/text/ParagraphProps.h |     6 +-
 .../components/text/ParagraphShadowNode.cpp   |    32 +-
 .../components/text/ParagraphShadowNode.h     |    13 +-
 .../components/text/ParagraphState.cpp        |     4 +
 .../renderer/components/text/ParagraphState.h |    11 +-
 .../renderer/components/text/RawTextProps.cpp |     5 +-
 .../renderer/components/text/RawTextProps.h   |     6 +-
 .../components/text/RawTextShadowNode.h       |    38 +-
 .../renderer/components/text/TextProps.cpp    |     9 +-
 .../renderer/components/text/TextProps.h      |     6 +-
 .../renderer/components/text/TextShadowNode.h |    23 +
 .../renderer/components/text/conversions.h    |    22 +
 .../text/tests/ParagraphLocalDataTest.cpp     |    13 +-
 .../renderer/components/textinput/Android.mk  |     8 +-
 .../react/renderer/components/textinput/BUCK  |    12 +-
 .../AndroidTextInputComponentDescriptor.h     |    13 +-
 .../AndroidTextInputProps.cpp                 |   149 +-
 .../androidtextinput/AndroidTextInputProps.h  |    16 +-
 .../AndroidTextInputShadowNode.cpp            |    31 +-
 .../AndroidTextInputShadowNode.h              |    10 +-
 .../AndroidTextInputState.cpp                 |     3 -
 .../androidtextinput/AndroidTextInputState.h  |    13 +-
 .../components/textinput/iostextinput/BUCK    |     9 +-
 .../TextInputComponentDescriptor.h            |     8 +-
 .../textinput/iostextinput/TextInputProps.cpp |    68 +-
 .../textinput/iostextinput/TextInputProps.h   |    11 +-
 .../iostextinput/TextInputShadowNode.cpp      |     5 +-
 .../iostextinput/TextInputShadowNode.h        |    13 +-
 .../textinput/iostextinput/TextInputState.h   |     2 +
 .../textinput/iostextinput/conversions.h      |    26 +-
 .../textinput/iostextinput/primitives.h       |     6 +
 .../textinput/iostextinput/propsConversions.h |    65 +-
 .../components/unimplementedview/Android.mk   |     7 +-
 .../components/unimplementedview/BUCK         |     7 +-
 .../UnimplementedViewComponentDescriptor.cpp  |    11 +-
 .../UnimplementedViewComponentDescriptor.h    |     7 +-
 .../UnimplementedViewProps.h                  |     1 +
 .../components/view/AccessibilityPrimitives.h |    28 +
 .../components/view/AccessibilityProps.cpp    |    25 +-
 .../components/view/AccessibilityProps.h      |     5 +-
 .../react/renderer/components/view/Android.mk |     8 +-
 .../react/renderer/components/view/BUCK       |     8 +-
 .../react/renderer/components/view/Touch.h    |    33 +-
 .../renderer/components/view/TouchEvent.h     |     2 -
 .../components/view/TouchEventEmitter.cpp     |    40 +-
 .../components/view/TouchEventEmitter.h       |     3 +-
 .../components/view/ViewComponentDescriptor.h |    11 +-
 .../components/view/ViewEventEmitter.cpp      |    82 +-
 .../components/view/ViewEventEmitter.h        |    32 +-
 .../renderer/components/view/ViewProps.cpp    |    76 +-
 .../renderer/components/view/ViewProps.h      |     8 +-
 .../components/view/ViewPropsInterpolation.h  |    12 +-
 .../components/view/ViewShadowNode.cpp        |    21 +-
 .../view/YogaLayoutableShadowNode.cpp         |   264 +-
 .../view/YogaLayoutableShadowNode.h           |    13 +-
 .../components/view/YogaStylableProps.cpp     |     5 +-
 .../components/view/YogaStylableProps.h       |     2 +
 .../view/accessibilityPropsConversions.h      |   119 +-
 .../renderer/components/view/conversions.h    |   146 +-
 .../renderer/components/view/primitives.h     |     9 +-
 .../components/view/propsConversions.h        |   191 +-
 .../components/view/tests/ViewTest.cpp        |    20 +-
 ReactCommon/react/renderer/core/Android.mk    |     6 +-
 ReactCommon/react/renderer/core/BUCK          |    11 +-
 .../react/renderer/core/BatchedEventQueue.cpp |    26 +-
 .../react/renderer/core/BatchedEventQueue.h   |    12 +-
 .../react/renderer/core/ComponentDescriptor.h |     9 +-
 .../core/ConcreteComponentDescriptor.h        |    45 +-
 .../react/renderer/core/ConcreteShadowNode.h  |    17 +-
 .../react/renderer/core/ConcreteState.h       |    65 +-
 .../react/renderer/core/ConcreteStateTeller.h |   152 -
 ReactCommon/react/renderer/core/Constants.cpp |    24 +
 .../Constants.h}                              |    14 +-
 .../renderer/core/DynamicPropsUtilities.cpp   |    35 +
 .../DynamicPropsUtilities.h}                  |     9 +-
 .../react/renderer/core/EventDispatcher.cpp   |    24 +-
 .../react/renderer/core/EventDispatcher.h     |    15 +-
 .../react/renderer/core/EventEmitter.cpp      |    34 +-
 .../react/renderer/core/EventEmitter.h        |     9 +-
 ReactCommon/react/renderer/core/EventPipe.h   |     2 +
 .../react/renderer/core/EventPriority.h       |     2 +-
 .../react/renderer/core/EventQueue.cpp        |    79 +-
 ReactCommon/react/renderer/core/EventQueue.h  |    24 +-
 .../renderer/core/EventQueueProcessor.cpp     |    82 +
 .../react/renderer/core/EventQueueProcessor.h |    36 +
 .../react/renderer/core/EventTarget.cpp       |     6 +-
 .../react/renderer/core/LayoutConstraints.h   |    11 +-
 .../react/renderer/core/LayoutMetrics.cpp     |    65 +
 .../react/renderer/core/LayoutMetrics.h       |    42 +-
 .../react/renderer/core/LayoutPrimitives.h    |    20 +-
 .../renderer/core/LayoutableShadowNode.cpp    |     9 +-
 .../renderer/core/LayoutableShadowNode.h      |    24 +-
 ReactCommon/react/renderer/core/Props.cpp     |    12 +-
 ReactCommon/react/renderer/core/Props.h       |     6 +-
 .../react/renderer/core/PropsParserContext.h  |    28 +
 ReactCommon/react/renderer/core/RawEvent.cpp  |     6 +-
 ReactCommon/react/renderer/core/RawEvent.h    |    43 +-
 ReactCommon/react/renderer/core/RawProps.cpp  |     8 +-
 ReactCommon/react/renderer/core/RawProps.h    |     4 +-
 .../react/renderer/core/RawPropsKey.cpp       |    17 +-
 .../react/renderer/core/RawPropsKeyMap.cpp    |    14 +-
 .../react/renderer/core/RawPropsParser.cpp    |    17 +-
 .../react/renderer/core/RawPropsParser.h      |    17 +-
 ReactCommon/react/renderer/core/RawValue.h    |    16 +-
 .../react/renderer/core/ReactEventPriority.h  |    43 +
 .../react/renderer/core/ReactPrimitives.h     |    34 +
 ReactCommon/react/renderer/core/Sealable.cpp  |     7 +-
 ReactCommon/react/renderer/core/Sealable.h    |     6 +-
 .../react/renderer/core/ShadowNode.cpp        |    58 +-
 ReactCommon/react/renderer/core/ShadowNode.h  |    18 +-
 .../react/renderer/core/ShadowNodeFamily.cpp  |     3 +-
 .../react/renderer/core/ShadowNodeFamily.h    |     2 +-
 .../react/renderer/core/ShadowNodeTraits.h    |    37 +-
 ReactCommon/react/renderer/core/State.h       |     7 +-
 ReactCommon/react/renderer/core/StateData.h   |     3 +
 ReactCommon/react/renderer/core/StateUpdate.h |     2 -
 .../renderer/core/UnbatchedEventQueue.cpp     |     2 -
 ReactCommon/react/renderer/core/conversions.h |    11 +
 .../react/renderer/core/propsConversions.h    |    28 +-
 .../core/tests/ComponentDescriptorTest.cpp    |    20 +-
 .../core/tests/ConcreteShadowNodeTest.cpp     |     2 +-
 .../core/tests/DynamicPropsUtilitiesTest.cpp  |    66 +
 .../core/tests/EventQueueProcessorTest.cpp    |   134 +
 .../core/tests/LayoutableShadowNodeTest.cpp   |    33 +-
 .../renderer/core/tests/RawPropsTest.cpp      |   129 +-
 .../react/renderer/core/tests/TestComponent.h |    18 +-
 .../renderer/core/tests/traitCastTest.cpp     |    31 +
 ReactCommon/react/renderer/debug/Android.mk   |     2 +-
 ReactCommon/react/renderer/debug/BUCK         |    10 +-
 .../renderer/debug/DebugStringConvertible.h   |    36 +-
 .../react/renderer/debug/SystraceSection.h    |     4 +-
 ReactCommon/react/renderer/debug/flags.h      |    50 +
 ReactCommon/react/renderer/element/BUCK       |     6 +-
 .../renderer/element/ComponentBuilder.cpp     |     7 +-
 .../react/renderer/graphics/Android.mk        |     8 +-
 ReactCommon/react/renderer/graphics/BUCK      |    20 +-
 .../renderer/graphics/React-graphics.podspec  |    19 +-
 ReactCommon/react/renderer/graphics/Rect.h    |     7 +-
 .../renderer/graphics/RectangleCorners.h      |     4 +-
 .../react/renderer/graphics/RectangleEdges.h  |    29 +-
 .../react/renderer/graphics/Transform.cpp     |     7 +-
 .../react/renderer/graphics/conversions.h     |   146 +-
 .../renderer/graphics/PlatformColorParser.h   |    67 +
 .../cxx/react/renderer/graphics/Color.cpp     |    29 +-
 .../cxx/react/renderer/graphics/Color.h       |     2 +
 .../renderer/graphics/PlatformColorParser.h   |    29 +
 .../renderer/graphics/platform/ios/Color.cpp  |    29 +-
 .../renderer/graphics/platform/ios/Color.h    |    45 +-
 .../platform/ios/PlatformColorParser.h        |    34 +
 .../platform/ios/RCTPlatformColorUtils.h      |    12 +
 .../platform/ios/RCTPlatformColorUtils.mm     |   206 +
 .../react/renderer/graphics/rounding.h        |    15 +-
 .../renderer/graphics/tests/TransformTest.cpp |     1 +
 .../react/renderer/imagemanager/Android.mk    |     5 +-
 ReactCommon/react/renderer/imagemanager/BUCK  |     9 +-
 .../renderer/imagemanager/ImageRequest.h      |     4 +-
 .../ImageResponseObserverCoordinator.cpp      |     9 +-
 .../renderer/imagemanager/ImageTelemetry.cpp  |     6 -
 .../renderer/imagemanager/ImageTelemetry.h    |    15 +-
 .../platform/ios/ImageRequest.cpp             |     7 +-
 .../platform/ios/RCTImageManager.mm           |     1 -
 .../ios/RCTImagePrimitivesConversions.h       |    14 +-
 .../platform/ios/RCTSyncImageManager.mm       |     2 +-
 .../react/renderer/leakchecker/Android.mk     |    29 +
 .../picker/iospicker => leakchecker}/BUCK     |    20 +-
 .../renderer/leakchecker/LeakChecker.cpp      |    60 +
 .../react/renderer/leakchecker/LeakChecker.h  |    39 +
 .../leakchecker/WeakFamilyRegistry.cpp        |    37 +
 .../renderer/leakchecker/WeakFamilyRegistry.h |    39 +
 .../react/renderer/mapbuffer/Android.mk       |    15 +-
 ReactCommon/react/renderer/mapbuffer/BUCK     |    22 +-
 .../react/renderer/mapbuffer/MapBuffer.cpp    |   135 +-
 .../react/renderer/mapbuffer/MapBuffer.h      |    44 +-
 .../renderer/mapbuffer/MapBufferBuilder.cpp   |   226 +
 .../renderer/mapbuffer/MapBufferBuilder.h     |    94 +
 .../react/renderer/mapbuffer/primitives.h     |    91 +
 .../mapbuffer/tests/MapBufferTest.cpp         |   146 +-
 .../react/renderer/mounting/Android.mk        |     6 +-
 ReactCommon/react/renderer/mounting/BUCK      |     9 +-
 .../renderer/mounting/Differentiator.cpp      |  1807 +-
 .../react/renderer/mounting/Differentiator.h  |    50 +-
 .../renderer/mounting/MountingCoordinator.cpp |    32 +-
 .../renderer/mounting/MountingCoordinator.h   |    18 +-
 .../renderer/mounting/MountingTransaction.h   |     4 +-
 .../mounting/MountingTransactionMetadata.h    |     2 +-
 .../react/renderer/mounting/ShadowTree.cpp    |    97 +-
 .../react/renderer/mounting/ShadowTree.h      |    53 +-
 .../renderer/mounting/ShadowTreeDelegate.h    |    11 +
 .../renderer/mounting/ShadowTreeRegistry.cpp  |     4 +-
 .../renderer/mounting/ShadowTreeRevision.h    |     2 +-
 .../react/renderer/mounting/ShadowView.cpp    |    20 +-
 .../react/renderer/mounting/ShadowView.h      |    48 +-
 .../renderer/mounting/ShadowViewMutation.cpp  |    24 +-
 .../renderer/mounting/ShadowViewMutation.h    |    14 +-
 .../react/renderer/mounting/StubView.cpp      |    42 +-
 .../react/renderer/mounting/StubView.h        |     6 +
 .../react/renderer/mounting/StubViewTree.cpp  |   310 +-
 .../react/renderer/mounting/StubViewTree.h    |    18 +-
 .../renderer/mounting/TelemetryController.cpp |     2 +-
 .../renderer/mounting/TelemetryController.h   |     2 +-
 .../mounting/TransactionTelemetry.cpp         |   142 -
 ReactCommon/react/renderer/mounting/stubs.cpp |    60 +-
 ReactCommon/react/renderer/mounting/stubs.h   |    14 +-
 .../renderer/mounting/tests/MountingTest.cpp  |   195 +-
 .../tests/ShadowTreeLifeCycleTest.cpp         |   282 +-
 .../mounting/tests/StackingContextTest.cpp    |   787 +
 .../tests/StateReconciliationTest.cpp         |    57 +-
 .../tests/TransactionTelemetryTest.cpp        |   125 -
 .../renderer/runtimescheduler/Android.mk      |    27 +
 .../react/renderer/runtimescheduler/BUCK      |    77 +
 .../runtimescheduler/RuntimeScheduler.cpp     |   116 +
 .../runtimescheduler/RuntimeScheduler.h       |   103 +
 .../RuntimeSchedulerBinding.cpp               |   170 +
 .../RuntimeSchedulerBinding.h                 |    42 +
 .../runtimescheduler/RuntimeSchedulerClock.h  |    22 +
 .../runtimescheduler/SchedulerPriority.h      |    64 +
 .../react/renderer/runtimescheduler/Task.cpp  |    35 +
 .../react/renderer/runtimescheduler/Task.h    |    46 +
 .../renderer/runtimescheduler/primitives.h    |    39 +
 .../tests/RuntimeSchedulerTest.cpp            |   472 +
 .../tests/SchedulerPriorityTest.cpp           |    46 +
 .../runtimescheduler/tests/StubClock.h        |    41 +
 .../runtimescheduler/tests/StubQueue.h        |    38 +
 .../react/renderer/scheduler/Android.mk       |     6 +-
 .../scheduler/AsynchronousEventBeat.cpp       |    29 +-
 .../scheduler/AsynchronousEventBeat.h         |     8 +-
 ReactCommon/react/renderer/scheduler/BUCK     |     8 +-
 .../InspectorData.h}                          |    17 +-
 .../react/renderer/scheduler/Scheduler.cpp    |   256 +-
 .../react/renderer/scheduler/Scheduler.h      |    76 +-
 .../renderer/scheduler/SchedulerDelegate.h    |    26 +-
 .../renderer/scheduler/SchedulerToolbox.h     |    10 +
 .../renderer/scheduler/SurfaceHandler.cpp     |   317 +
 .../react/renderer/scheduler/SurfaceHandler.h |   209 +
 .../renderer/scheduler/SurfaceManager.cpp     |   104 +
 .../react/renderer/scheduler/SurfaceManager.h |    67 +
 .../scheduler/SynchronousEventBeat.cpp        |    19 +-
 .../renderer/scheduler/SynchronousEventBeat.h |     5 +-
 .../react/renderer/telemetry/Android.mk       |    31 +
 ReactCommon/react/renderer/telemetry/BUCK     |    84 +
 .../SurfaceTelemetry.cpp                      |     5 +
 .../SurfaceTelemetry.h                        |     4 +-
 .../telemetry/TransactionTelemetry.cpp        |   163 +
 .../TransactionTelemetry.h                    |    11 +
 .../tests/TransactionTelemetryTest.cpp        |   176 +
 .../renderer/templateprocessor/Android.mk     |     2 +-
 .../react/renderer/templateprocessor/BUCK     |     6 +-
 .../templateprocessor/UITemplateProcessor.cpp |    10 +-
 .../tests/UITemplateProcessorTest.cpp         |    10 +-
 .../renderer/textlayoutmanager/Android.mk     |     7 +-
 .../react/renderer/textlayoutmanager/BUCK     |     8 +-
 .../textlayoutmanager/TextMeasureCache.cpp    |    21 +-
 .../textlayoutmanager/TextLayoutManager.cpp   |   228 +-
 .../textlayoutmanager/TextLayoutManager.h     |    18 +-
 .../platform/cxx/TextLayoutManager.cpp        |    18 +-
 .../platform/cxx/TextLayoutManager.h          |    17 +-
 .../platform/ios/RCTAttributedTextUtils.mm    |    27 +-
 .../platform/ios/RCTTextLayoutManager.mm      |    25 +-
 .../platform/ios/TextLayoutManager.mm         |    28 +-
 .../{components/picker => timeline}/BUCK      |    54 +-
 .../react/renderer/timeline/Timeline.cpp      |   120 +
 .../react/renderer/timeline/Timeline.h        |    63 +
 .../renderer/timeline/TimelineController.cpp  |    77 +
 .../renderer/timeline/TimelineController.h    |    80 +
 .../react/renderer/timeline/TimelineFrame.cpp |    25 +
 .../react/renderer/timeline/TimelineFrame.h   |    46 +
 .../renderer/timeline/TimelineHandler.cpp     |    97 +
 .../react/renderer/timeline/TimelineHandler.h |    80 +
 .../renderer/timeline/TimelineSnapshot.cpp    |    30 +
 .../renderer/timeline/TimelineSnapshot.h      |    36 +
 .../react/renderer/uimanager/Android.mk       |     6 +-
 ReactCommon/react/renderer/uimanager/BUCK     |     8 +-
 .../uimanager/LayoutAnimationStatusDelegate.h |     6 +-
 .../react/renderer/uimanager/UIManager.cpp    |   253 +-
 .../react/renderer/uimanager/UIManager.h      |    92 +-
 .../uimanager/UIManagerAnimationDelegate.h    |     6 +-
 .../renderer/uimanager/UIManagerBinding.cpp   |   433 +-
 .../renderer/uimanager/UIManagerBinding.h     |    41 +-
 .../renderer/uimanager/UIManagerCommitHook.h  |    43 +
 .../renderer/uimanager/UIManagerDelegate.h    |    36 +-
 .../react/renderer/uimanager/primitives.h     |    66 +-
 ReactCommon/react/test_utils/BUCK             |    54 +
 .../mounting/tests => test_utils}/Entropy.h   |     4 +
 ReactCommon/react/test_utils/MockClock.h      |    29 +
 .../shadowTreeGeneration.h                    |    71 +-
 ReactCommon/react/utils/Android.mk            |    11 +-
 ReactCommon/react/utils/BUCK                  |    11 +-
 .../utils/CalledOnceMovableOnlyFunction.h     |    10 +-
 ReactCommon/react/utils/ContextContainer.h    |    21 +-
 ReactCommon/react/utils/LayoutManager.h       |   150 +
 .../react/utils/ManagedObjectWrapper.h        |     4 +-
 ReactCommon/react/utils/RunLoopObserver.cpp   |     9 +-
 ReactCommon/reactperflogger/Android.mk        |     2 +-
 ReactCommon/reactperflogger/BUCK              |     2 +-
 .../reactperflogger/React-perflogger.podspec  |     6 +-
 ReactCommon/runtimeexecutor/Android.mk        |     2 +-
 ReactCommon/runtimeexecutor/BUCK              |     4 +-
 .../React-runtimeexecutor.podspec             |     6 +-
 .../ReactCommon/RuntimeExecutor.h             |    16 +-
 ReactCommon/yoga/Yoga.podspec                 |     6 +-
 ReactCommon/yoga/yoga/BitUtils.h              |     5 +-
 ReactCommon/yoga/yoga/CompactValue.h          |     4 +-
 ReactCommon/yoga/yoga/Utils.cpp               |     2 +-
 ReactCommon/yoga/yoga/YGNode.cpp              |   221 +-
 ReactCommon/yoga/yoga/YGNode.h                |    11 +
 ReactCommon/yoga/yoga/YGNodePrint.cpp         |    11 +-
 ReactCommon/yoga/yoga/Yoga-internal.h         |     9 +-
 ReactCommon/yoga/yoga/Yoga.cpp                |   277 +-
 ReactCommon/yoga/yoga/Yoga.h                  |     2 +-
 .../React-TurboModuleCxx-RNW.podspec          |     4 +-
 .../React-TurboModuleCxx-WinRTPort.podspec    |     4 +-
 Releases.md                                   |    10 +-
 .../patches/Build/ReactAndroid/NuGet.Config   |     4 +-
 .../Build/ReactAndroid/ReactAndroid.nuspec    |     4 +-
 .../patches/Build/ReactAndroid/build.gradle   |    24 +-
 .../Build/ReactAndroid/gradle.properties      |    14 +-
 .../Build/ReactAndroid/packages.config        |     4 +-
 .../patches/Build/ReactAndroid/release.gradle |    10 -
 .../src/main/jni/third-party/boost/Android.mk |    12 +-
 .../View/ReactNativeViewViewConfigAndroid.js  |     8 +-
 .../views/view/ReactClippingViewManager.java  |     4 +-
 .../react/views/view/ReactViewFocusEvent.java |     4 +-
 .../react/views/view/ReactViewManager.java    |    18 +-
 .../uimanager/ViewManagersPropertyCache.java  |    35 -
 .../modules/debug/DevSettingsModule.java      |    12 +-
 .../facebook/react/ReactInstanceManager.java  |    18 +-
 .../react/bridge/CatalystInstance.java        |     4 +-
 .../react/bridge/CatalystInstanceImpl.java    |    24 +-
 .../jni/react/jni/CatalystInstanceImpl.cpp    |    27 +-
 .../main/jni/react/jni/CatalystInstanceImpl.h |    10 +-
 .../ReactCommon/cxxreact/CxxModule.h          |     4 +-
 .../ReactCommon/cxxreact/CxxNativeModule.cpp  |     6 +-
 .../ReactCommon/cxxreact/CxxNativeModule.h    |    10 +-
 .../ReactCommon/cxxreact/Instance.cpp         |     6 +-
 .../ReactCommon/cxxreact/Instance.h           |     4 +-
 .../ReactCommon/cxxreact/PlatformBundleInfo.h |     4 +-
 .../react/ReactInstanceManagerBuilder.java    |    10 +-
 .../react/bridge/ReactMarkerConstants.java    |    11 +-
 .../com/facebook/react/v8executor/Android.mk  |     4 +-
 .../com/facebook/react/v8executor/OnLoad.cpp  |     4 +-
 .../facebook/react/v8executor/V8Executor.java |     4 +-
 .../react/v8executor/V8ExecutorFactory.cpp    |     4 +-
 .../react/v8executor/V8ExecutorFactory.h      |     4 +-
 .../react/v8executor/V8ExecutorFactory.java   |     4 +-
 .../src/main/jni/react/jni/Android.mk         |    12 +-
 .../src/main/jni/react/jni/JReactMarker.cpp   |     6 +-
 .../src/main/jni/third-party/v8jsi/Android.mk |     4 +-
 .../V8/ReactCommon/cxxreact/ReactMarker.h     |     4 +-
 bots/README.md                                |     2 +-
 bots/code-analysis-bot.js                     |   150 +-
 bots/dangerfile.js                            |     8 +-
 bots/report-bundle-size.js                    |     4 +-
 build.gradle.kts                              |    18 +-
 flow-typed/npm/promise_v8.x.x.js              |     6 +-
 flow-typed/npm/react-test-renderer_v16.x.x.js |    79 +
 flow/HermesInternalType.js                    |   114 +
 flow/global.js                                |    23 +
 gradle.properties                             |     4 +
 gradle/wrapper/gradle-wrapper.properties      |     2 +-
 index.js                                      |   201 +-
 interface.js                                  |     8 -
 jest/mockNativeComponent.js                   |    36 +
 jest/preprocessor.js                          |    83 +-
 jest/renderer.js                              |    12 +-
 jest/setup.js                                 |    74 +-
 .../HelloWorld.xcodeproj/project.pbxproj      |     4 +-
 .../generator-macos/templates/macos/Podfile   |     8 +-
 metro.config.js                               |     2 -
 package.json                                  |    83 +-
 packages/assets/BUCK                          |     1 -
 .../__snapshots__/index-test.js.snap          |    40 +-
 .../__tests__/index-test.js                   |     1 +
 packages/babel-plugin-codegen/index.js        |    11 +-
 packages/babel-plugin-codegen/package.json    |     4 +-
 .../index.js                                  |     5 +-
 .../package.json                              |    17 +-
 .../yarn.lock                                 |   972 +-
 .../__tests__/react-native-modules-test.js    |   104 +-
 packages/eslint-plugin-codegen/package.json   |     2 +-
 .../react-native-modules.js                   |   132 +-
 .../README.md                                 |     2 +-
 .../platform-colors.js                        |     1 -
 packages/normalize-color/BUCK                 |     1 -
 packages/normalize-color/base.js              |    10 +
 packages/polyfills/BUCK                       |    12 +
 .../{Object.es7.js => Object.es8.js}          |     0
 ...{Object.es7-test.js => Object.es8-test.js} |     4 +-
 packages/polyfills/error-guard.js             |    10 +-
 packages/polyfills/index.js                   |     2 +-
 packages/polyfills/package.json               |     2 +-
 packages/react-native-codegen/BUCK            |    33 +-
 packages/react-native-codegen/DEFS.bzl        |   235 +-
 .../react-native-codegen/android/build.gradle |    58 +-
 .../gradle/wrapper/gradle-wrapper.properties  |     2 +-
 .../gradlePlugin/build.gradle                 |    27 -
 .../android/settings.gradle                   |     6 +-
 .../codegen/generator/JavaGenerator.java      |     0
 .../codegen/generator/SchemaJsonParser.java   |     0
 .../codegen/generator/model/AliasType.java    |     0
 .../codegen/generator/model/AnyType.java      |     0
 .../codegen/generator/model/ArrayType.java    |     0
 .../codegen/generator/model/BooleanType.java  |     0
 .../generator/model/CodegenException.java     |     0
 .../codegen/generator/model/DoubleType.java   |     0
 .../codegen/generator/model/FloatType.java    |     0
 .../codegen/generator/model/FunctionType.java |     0
 .../generator/model/GenericObjectType.java    |     0
 .../codegen/generator/model/Int32Type.java    |     0
 .../generator/model/NativeModuleType.java     |     0
 .../codegen/generator/model/NullableType.java |     0
 .../codegen/generator/model/NumberType.java   |     0
 .../codegen/generator/model/ObjectType.java   |     0
 .../codegen/generator/model/PromiseType.java  |     0
 .../model/ReservedFunctionValueType.java      |     0
 .../codegen/generator/model/StringType.java   |     0
 .../react/codegen/generator/model/Type.java   |     0
 .../codegen/generator/model/TypeData.java     |     0
 .../react/codegen/generator/model/TypeId.java |     0
 .../codegen/generator/model/VoidType.java     |     0
 .../generator/resolver/AliasResolvedType.java |     0
 .../generator/resolver/Annotations.java       |     0
 .../generator/resolver/AnyResolvedType.java   |     0
 .../generator/resolver/ArrayResolvedType.java |     0
 .../resolver/BooleanResolvedType.java         |     0
 .../generator/resolver/ClassNames.java        |     0
 .../resolver/FunctionResolvedType.java        |     2 +
 .../resolver/GenericObjectResolvedType.java   |     0
 .../resolver/NativeModuleResolvedType.java    |     0
 .../resolver/NullableResolvedType.java        |     0
 .../resolver/NumberResolvedType.java          |     0
 .../resolver/ObjectResolvedType.java          |     0
 .../resolver/PromiseResolvedType.java         |     0
 .../generator/resolver/ReactClassNames.java   |     0
 .../ReservedFunctionValueResolvedType.java    |     0
 .../generator/resolver/ResolvedType.java      |     0
 .../resolver/StringResolvedType.java          |     0
 .../generator/resolver/TypeResolver.java      |     0
 .../codegen/generator/resolver/TypeUtils.java |     0
 .../generator/resolver/VoidResolvedType.java  |     0
 .../react/codegen/plugin/CodegenPlugin.java   |     7 +-
 .../plugin/CodegenPluginExtension.java        |     2 +-
 .../components/ArrayPropsNativeComponent.js   |     2 -
 .../components/BooleanPropNativeComponent.js  |     2 -
 .../components/ColorPropNativeComponent.js    |     2 -
 .../EdgeInsetsPropNativeComponent.js          |     2 -
 .../components/EnumPropNativeComponent.js     |     2 -
 .../EventNestedObjectPropsNativeComponent.js  |     2 -
 .../components/EventPropsNativeComponent.js   |     2 -
 .../components/FloatPropsNativeComponent.js   |     2 -
 .../components/ImagePropNativeComponent.js    |     2 -
 .../components/IntegerPropNativeComponent.js  |     2 -
 .../InterfaceOnlyNativeComponent.js           |     2 -
 .../MultiNativePropNativeComponent.js         |     2 -
 .../NoPropsNoEventsNativeComponent.js         |     2 -
 .../components/ObjectPropsNativeComponent.js  |     2 -
 .../components/PointPropNativeComponent.js    |     2 -
 .../components/StringPropNativeComponent.js   |     2 -
 .../modules/NativeArrayTurboModule.js         |     2 -
 .../modules/NativeBooleanTurboModule.js       |     2 -
 .../modules/NativeCallbackTurboModule.js      |     2 -
 .../modules/NativeNullableTurboModule.js      |     2 -
 .../modules/NativeNumberTurboModule.js        |     2 -
 .../modules/NativeObjectTurboModule.js        |     2 -
 .../NativeOptionalObjectTurboModule.js        |     2 -
 .../modules/NativePromiseTurboModule.js       |     2 -
 .../modules/NativeSampleTurboModule.js        |     2 -
 .../modules/NativeSampleTurboModuleArrays.js  |     2 -
 .../NativeSampleTurboModuleNullable.js        |     2 -
 ...iveSampleTurboModuleNullableAndOptional.js |     2 -
 .../NativeSampleTurboModuleOptional.js        |     2 -
 .../modules/NativeStringTurboModule.js        |     2 -
 .../e2e/__tests__/modules/BUCK                |    11 -
 .../modules/GenerateModuleObjCpp-test.js      |    10 +-
 .../GenerateModuleObjCpp-test.js.snap         |  1209 +-
 packages/react-native-codegen/package.json    |     6 +-
 .../react-native-codegen/scripts/oss/build.sh |    50 +-
 .../react-native-codegen/src/CodegenSchema.js |   478 +-
 .../src/cli/generators/generate-all.js        |     8 +-
 .../src/cli/verify_with_old_codegen.js        |    52 -
 .../src/cli/verify_with_old_codegen.sh        |    19 -
 .../src/generators/RNCodegen.js               |    45 +-
 .../src/generators/Utils.js                   |    11 +-
 .../src/generators/components/CppHelpers.js   |     9 +-
 .../GenerateComponentDescriptorH.js           |     2 +-
 .../components/GenerateComponentHObjCpp.js    |    33 +-
 .../components/GenerateEventEmitterCpp.js     |    34 +-
 .../components/GenerateEventEmitterH.js       |    35 +-
 .../generators/components/GeneratePropsCpp.js |     9 +-
 .../generators/components/GeneratePropsH.js   |    52 +-
 .../components/GeneratePropsJavaDelegate.js   |    26 +-
 .../components/GeneratePropsJavaInterface.js  |    26 +-
 .../GeneratePropsJavaPojo/PojoCollector.js    |   187 +
 .../components/GeneratePropsJavaPojo/index.js |    80 +
 .../GeneratePropsJavaPojo/serializePojo.js    |   285 +
 .../components/GenerateShadowNodeCpp.js       |     2 +-
 .../components/GenerateShadowNodeH.js         |     2 +-
 .../generators/components/GenerateTests.js    |    20 +-
 .../components/GenerateViewConfigJs.js        |    14 +-
 .../components/__test_fixtures__/fixtures.js  |   170 +-
 .../GenerateComponentDescriptorH-test.js      |     4 +-
 .../GenerateComponentHObjCpp-test.js          |     4 +-
 .../__tests__/GenerateEventEmitterCpp-test.js |     4 +-
 .../__tests__/GenerateEventEmitterH-test.js   |     4 +-
 .../__tests__/GeneratePropsCpp-test.js        |     4 +-
 .../__tests__/GeneratePropsH-test.js          |     4 +-
 .../GeneratePropsJavaDelegate-test.js         |     4 +-
 .../GeneratePropsJavaInterface-test.js        |     4 +-
 .../__tests__/GeneratePropsJavaPojo-test.js   |    27 +
 .../__tests__/GenerateShadowNodeH-test.js     |     4 +-
 .../__tests__/GenerateTests-test.js           |     4 +-
 .../GeneratePropsCpp-test.js.snap             |   211 +-
 .../__snapshots__/GeneratePropsH-test.js.snap |   187 +-
 .../GeneratePropsJavaDelegate-test.js.snap    |    78 +-
 .../GeneratePropsJavaInterface-test.js.snap   |    52 +-
 .../GeneratePropsJavaPojo-test.js.snap        |  1177 ++
 .../__snapshots__/GenerateTests-test.js.snap  |   466 +-
 .../GenerateViewConfigJs-test.js.snap         |   460 +-
 .../generators/modules/GenerateModuleCpp.js   |    23 +-
 .../src/generators/modules/GenerateModuleH.js |    10 +-
 .../modules/GenerateModuleJavaSpec.js         |    35 +-
 .../modules/GenerateModuleJniCpp.js           |    53 +-
 .../generators/modules/GenerateModuleJniH.js  |    21 +-
 .../GenerateModuleObjCpp/StructCollector.js   |    19 +-
 .../modules/GenerateModuleObjCpp/Utils.js     |     4 -
 .../header/serializeConstantsStruct.js        |    33 +-
 .../header/serializeRegularStruct.js          |    31 +-
 .../header/serializeStruct.js                 |     4 +-
 .../modules/GenerateModuleObjCpp/index.js     |    31 +-
 .../GenerateModuleObjCpp/serializeMethod.js   |    54 +-
 .../source/serializeModule.js                 |    16 +-
 .../src/generators/modules/Utils.js           |     4 +-
 .../modules/__test_fixtures__/fixtures.js     |     4 +-
 .../__tests__/GenerateModuleCpp-test.js       |     6 +-
 .../modules/__tests__/GenerateModuleH-test.js |     6 +-
 .../__tests__/GenerateModuleHObjCpp-test.js   |     9 +-
 .../__tests__/GenerateModuleJavaSpec-test.js  |     6 +-
 .../__tests__/GenerateModuleJniCpp-test.js    |     6 +-
 .../__tests__/GenerateModuleJniH-test.js      |     6 +-
 .../__tests__/GenerateModuleMm-test.js        |    12 +-
 .../GenerateModuleHObjCpp-test.js.snap        |    16 +-
 .../GenerateModuleJavaSpec-test.js.snap       |    34 +
 .../GenerateModuleJniCpp-test.js.snap         |    24 +-
 .../GenerateModuleJniH-test.js.snap           |    60 +-
 .../GenerateModuleMm-test.js.snap             |    26 +-
 .../component-parser-test.js.snap             |  7769 ++++---
 .../src/parsers/flow/components/commands.js   |    17 +-
 .../src/parsers/flow/components/events.js     |    47 +-
 .../src/parsers/flow/components/extends.js    |     2 +-
 .../src/parsers/flow/components/index.js      |     2 +-
 .../src/parsers/flow/components/options.js    |     6 +-
 .../src/parsers/flow/components/props.js      |    17 +-
 .../src/parsers/flow/components/schema.js     |    13 +-
 .../src/parsers/flow/errors.js                |    12 +-
 .../src/parsers/flow/index.js                 |   210 +-
 .../modules/__test_fixtures__/fixtures.js     |    26 +
 .../module-parser-snapshot-test.js.snap       |    45 +-
 .../__tests__/module-parser-e2e-test.js       |    96 +-
 .../src/parsers/flow/modules/errors.js        |   119 +-
 .../src/parsers/flow/modules/index.js         |   322 +-
 .../src/parsers/flow/utils.js                 |    77 +-
 .../src/parsers/schema/index.js               |     2 +-
 .../build.gradle.kts                          |    29 +
 .../facebook/react/AndroidConfiguration.kt    |    22 +
 .../com/facebook/react/ReactAppExtension.kt   |   110 +
 .../com/facebook/react/ReactAppPlugin.kt      |    36 +
 .../com/facebook/react/TaskConfiguration.kt   |   241 +
 .../react/tasks/BundleJsAndAssetsTask.kt      |    80 +
 .../facebook/react/tasks/HermesBinaryTask.kt  |    74 +
 .../com/facebook/react/tasks/TaskUtils.kt     |    19 +
 packages/react-native-macos-init/package.json |     2 +-
 packages/react-native-macos-init/src/cli.ts   |    87 +-
 packages/rn-tester/BUCK                       |   250 +-
 packages/rn-tester/Gemfile                    |     3 +-
 .../NativeScreenshotManager.js                |     2 -
 packages/rn-tester/Podfile                    |    53 +-
 packages/rn-tester/Podfile.lock               |   307 +-
 packages/rn-tester/RCTTest/RCTTestModule.mm   |     3 +-
 packages/rn-tester/RCTTest/RCTTestRunner.m    |   103 +-
 .../rn-tester/RCTTest/React-RCTTest.podspec   |     6 +-
 packages/rn-tester/README.md                  |     2 +-
 .../rn-tester/RNTester-macOS/AppDelegate.mm   |     6 +-
 packages/rn-tester/RNTester-tvOS/Info.plist   |     2 -
 packages/rn-tester/RNTester/AppDelegate.mm    |   110 +-
 .../customColor.colorset/Contents.json        |    38 +
 packages/rn-tester/RNTester/Info.plist        |     2 -
 .../RNTester/RNTesterTurboModuleProvider.h    |     6 -
 .../RNTester/RNTesterTurboModuleProvider.mm   |     9 -
 .../RCTLoggingTests.m                         |    37 +-
 .../RNTesterPods.xcodeproj/project.pbxproj    |   462 +-
 .../RNTesterIntegrationTests.xcscheme         |     5 -
 .../RNTesterUnitTests/RCTBlobManagerTests.m   |     1 +
 .../RCTBundleURLProviderTests.m               |     2 +-
 .../RCTEventDispatcherTests.m                 |    49 +-
 .../RCTModuleInitNotificationRaceTests.m      |     6 +-
 .../RNTesterUnitTests/RCTModuleInitTests.m    |     6 +-
 packages/rn-tester/android/app/build.gradle   |    50 +-
 .../rn-tester/android/app/gradle.properties   |     2 +-
 .../android/app/src/main/AndroidManifest.xml  |     5 +
 .../react/uiapp/RNTesterApplication.java      |    55 +-
 .../RNTesterTurboModuleManagerDelegate.java   |    24 +-
 .../android/app/src/main/jni/Android.mk       |     4 +-
 .../main/jni/RNTesterAppModuleProvider.cpp    |     4 +-
 .../app/src/main/res/values/strings.xml       |     1 +
 packages/rn-tester/js/RNTesterApp.android.js  |     2 -
 packages/rn-tester/js/RNTesterApp.ios.js      |    22 +-
 packages/rn-tester/js/RNTesterAppShared.js    |   179 +-
 .../js/assets/bottom-nav-center-box.png       |   Bin 1340 -> 0 bytes
 .../rn-tester/js/components/ExamplePage.js    |    99 -
 .../js/components/ListExampleShared.js        |    26 +-
 .../js/components/RNTConfigurationBlock.js    |    44 +
 packages/rn-tester/js/components/RNTOption.js |    88 +
 .../js/components/RNTPressableRow.js          |    97 +
 .../rn-tester/js/components/RNTTestDetails.js |    96 +
 .../{RNTesterHeader.js => RNTTitleBar.js}     |    43 +-
 .../rn-tester/js/components/RNTesterBlock.js  |    28 +-
 .../js/components/RNTesterBookmarkButton.js   |     2 -
 .../rn-tester/js/components/RNTesterButton.js |     2 +
 .../js/components/RNTesterDocumentationURL.js |     2 -
 .../components/RNTesterEmptyBookmarksState.js |     2 -
 .../js/components/RNTesterExampleContainer.js |   113 -
 .../js/components/RNTesterExampleFilter.js    |    17 +-
 .../js/components/RNTesterModuleContainer.js  |   157 +
 ...erExampleList.js => RNTesterModuleList.js} |    92 +-
 .../rn-tester/js/components/RNTesterNavbar.js |    16 +-
 .../rn-tester/js/components/RNTesterPage.js   |     2 -
 .../js/components/RNTesterSettingSwitchRow.js |     6 +-
 .../rn-tester/js/components/RNTesterTheme.js  |     2 -
 .../rn-tester/js/components/RNTesterTitle.js  |     2 -
 .../rn-tester/js/components/TextInlineView.js |     6 +-
 .../rn-tester/js/components/TextLegend.js     |   470 +-
 .../js/components/createExamplePage.js        |     8 +-
 .../AccessibilityAndroidExample.android.js    |    52 +-
 .../Accessibility/AccessibilityExample.js     |   503 +-
 .../ActionSheetIOS/ActionSheetIOSExample.js   |    38 +
 .../ActivityIndicatorExample.js               |     1 -
 .../js/examples/Alert/AlertExample.js         |     2 -
 .../js/examples/Alert/AlertIOSExample.js      |    12 +-
 .../js/examples/Alert/AlertMacOSExample.js    |    10 +-
 .../js/examples/Animated/AnimatedExample.js   |   458 -
 .../js/examples/Animated/AnimatedIndex.js     |    44 +
 .../ComposeAnimationsWithEasingExample.js     |   136 +
 .../js/examples/Animated/ComposingExample.js  |   251 +
 .../Animated/ContinuousInteractionsExample.js |    22 +
 .../js/examples/Animated/EasingExample.js     |   208 +
 .../js/examples/Animated/FadeInViewExample.js |    99 +
 .../js/examples/Animated/LoopingExample.js    |   103 +
 .../js/examples/Animated/MovingBoxExample.js  |   138 +
 .../Animated/RotatingImagesExample.js         |   111 +
 .../Animated/TransformBounceExample.js        |   123 +
 .../Animated/TransformStylesExample.js        |   168 +
 .../Animated/utils/ToggleNativeDriver.js      |    48 +
 .../AnimatedGratuitousApp/AnExApp.js          |    19 +-
 .../AnimatedGratuitousApp/AnExBobble.js       |     0
 .../AnimatedGratuitousApp/AnExChained.js      |    10 +-
 .../AnimatedGratuitousApp/AnExScroll.js       |     0
 .../AnimatedGratuitousApp/AnExSet.js          |     0
 .../AnimatedGratuitousApp/AnExSlides.md       |     0
 .../AnimatedGratuitousApp/AnExTilt.js         |     2 +-
 .../js/examples/AppState/AppStateExample.js   |    53 +-
 .../examples/Appearance/AppearanceExample.js  |    19 +-
 .../js/examples/Border/BorderExample.js       |    46 +-
 .../js/examples/Button/ButtonExample.js       |    23 +
 .../js/examples/Crash/CrashExample.js         |     1 -
 .../DevSettings/DevSettingsExample.js         |     2 -
 .../examples/Dimensions/DimensionsExample.js  |    22 +-
 .../FlatList/FlatList-onEndReached.js         |    28 +
 .../FlatList-onViewableItemsChanged.js        |    38 +
 .../FlatList/FlatList-withSeparators.js       |    27 +
 .../js/examples/FlatList/FlatListExample.js   |    72 +-
 .../js/examples/FlatList/FlatListExamples.js  |   323 +
 .../js/examples/Image/ImageExample.js         |   346 +-
 .../JSResponderHandlerExample.js              |     2 -
 .../KeyboardAvoidingViewExample.js            |    55 +-
 .../js/examples/Layout/LayoutEventsExample.js |    15 +-
 .../js/examples/Modal/ModalExample.js         |   291 +-
 .../js/examples/Modal/ModalOnShow.js          |   137 +
 .../js/examples/Modal/ModalPresentation.js    |   264 +
 .../MultiColumn/MultiColumnExample.js         |    37 +-
 .../NativeAnimationsExample.js                |    24 +-
 .../OrientationChangeExample.js               |     2 -
 .../PanResponder/PanResponderExample.js       |    11 +-
 .../PermissionsAndroid/PermissionsExample.js  |   197 +-
 .../PlatformColor/PlatformColorExample.js     |    17 +-
 .../PointerEvents/PointerEventsExample.js     |   111 +-
 .../js/examples/Pressable/PressableExample.js |    23 +-
 .../rn-tester/js/examples/RTL/RTLExample.js   |     9 +-
 .../RefreshControl/RefreshControlExample.js   |     1 -
 .../RootViewSizeFlexibilityExampleApp.js      |     1 +
 .../ScrollView/ScrollViewAnimatedExample.js   |    11 +-
 .../examples/ScrollView/ScrollViewExample.js  |  1071 +-
 .../ScrollViewIndicatorInsetsExample.ios.js   |   112 +
 .../ScrollViewIndicatorInsetsExample.macos.js |   112 +
 .../ScrollViewPressableStickyHeaderExample.js |    97 +
 .../SectionList/SectionList-contentInset.js   |    84 +
 .../SectionList/SectionList-inverted.js       |    44 +
 .../SectionList/SectionList-onEndReached.js   |    46 +
 .../SectionList-onViewableItemsChanged.js     |    77 +
 .../SectionList/SectionList-scrollable.js     |   350 +
 .../SectionList-stickyHeadersEnabled.js       |    53 +
 .../SectionList/SectionList-withSeparators.js |    63 +
 .../SectionList/SectionListBaseExample.js     |   142 +
 .../SectionList/SectionListExample.js         |   304 -
 .../examples/SectionList/SectionListIndex.js  |    34 +
 .../js/examples/Share/ShareExample.js         |    46 +
 .../examples/Snapshot/SnapshotViewIOS.ios.js  |     4 +-
 .../SwipeableCardExample.js                   |   207 +
 .../js/examples/Switch/SwitchExample.js       |    21 +-
 .../Text/TextAdjustsDynamicLayoutExample.js   |    55 +
 .../js/examples/Text/TextExample.android.js   |    16 +-
 .../js/examples/Text/TextExample.ios.js       |    73 +-
 .../TextInput/TextInputExample.android.js     |    36 +-
 .../TextInput/TextInputExample.ios.js         |   106 +-
 .../TextInput/TextInputSharedExamples.js      |    99 +-
 .../js/examples/Timer/TimerExample.js         |     4 +
 .../js/examples/Touchable/TouchableExample.js |   119 +-
 .../js/examples/Transform/TransformExample.js |    20 +-
 .../TurboModule/SampleTurboModuleExample.js   |    20 +-
 .../rn-tester/js/examples/View/ViewExample.js |     1 +
 .../js/examples/XHR/XHRExampleBinaryUpload.js |    43 +-
 .../js/examples/XHR/XHRExampleOnTimeOut.js    |     1 +
 packages/rn-tester/js/types/RNTesterTypes.js  |    37 +-
 .../js/utils/RNTesterList.android.js          |    42 +-
 .../rn-tester/js/utils/RNTesterList.ios.js    |    52 +-
 .../rn-tester/js/utils/RNTesterReducer.js     |    27 +-
 .../js/utils/RNTesterStatePersister.js        |     8 +-
 .../rn-tester/js/utils/testerStateUtils.js    |    14 +-
 .../js/utils/useAsyncStorageReducer.js        |     2 -
 packages/rn-tester/package.json               |     4 +-
 packages/rn-tester/yarn.lock                  |  1026 +
 react.gradle                                  |    61 +-
 repo-config/package.json                      |    25 +-
 scripts/.tests.env                            |     4 +-
 scripts/bump-oss-version.js                   |    32 +-
 scripts/circleci/analyze_code.sh              |     2 +-
 scripts/circleci/buck_fetch.sh                |    46 +-
 scripts/circleci/gradle_download_deps.sh      |     2 +-
 scripts/codegen.js                            |    54 +
 scripts/find-node.sh                          |    39 +
 scripts/generate-native-modules-specs.sh      |    79 -
 scripts/generate-rncore.sh                    |    14 -
 ...les-specs-cli.js => generate-specs-cli.js} |    33 +-
 scripts/generate-specs.sh                     |    99 +
 scripts/ios-configure-glog.sh                 |     2 +-
 scripts/lint-java.js                          |   205 +
 scripts/publish-npm.js                        |     2 +-
 scripts/react-native-xcode.sh                 |    37 +-
 scripts/react_native_pods.rb                  |   159 +-
 scripts/test-manual-e2e.sh                    |    58 +-
 scripts/update_podfile_lock.sh                |    41 +
 settings.gradle.kts                           |     1 +
 template/_editorconfig                        |     3 +
 template/_flowconfig                          |     7 +-
 template/_gitattributes                       |     3 +
 template/_gitignore                           |     1 +
 template/android/app/build.gradle             |    19 +-
 .../app/src/main/res/values/styles.xml        |     1 -
 template/android/build.gradle                 |    14 +-
 template/android/gradle.properties            |     2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |     2 +-
 .../ios/HelloWorld.xcodeproj/project.pbxproj  |    10 +-
 template/ios/Podfile                          |    16 +-
 template/package.json                         |    21 +-
 third-party-podspecs/DoubleConversion.podspec |     4 +-
 third-party-podspecs/RCT-Folly.podspec        |    47 +-
 .../boost-for-react-native.podspec            |     2 +-
 third-party-podspecs/boost.podspec            |    23 +
 third-party-podspecs/glog.podspec             |     2 +-
 third-party-podspecs/libevent.podspec         |   565 -
 tools/build_defs/apple/config_utils_defs.bzl  |    12 +
 .../apple/fb_apple_asset_catalog.bzl          |     7 +-
 tools/build_defs/apple/fb_apple_bundle.bzl    |     7 +
 tools/build_defs/apple/fb_apple_test.bzl      |     7 +
 tools/build_defs/apple/fb_js_dep.bzl          |     7 +
 tools/build_defs/apple/flag_defs.bzl          |    16 +
 .../build_defs/apple/plugins/plugin_defs.bzl  |     7 +
 .../fb_xplat_platform_specific_rule.bzl       |    16 +
 tools/build_defs/fb_xplat_resource.bzl        |     7 +
 tools/build_defs/js_glob.bzl                  |    40 +
 tools/build_defs/oss/metro_defs.bzl           |     9 +
 tools/build_defs/oss/rn_codegen_defs.bzl      |    72 +
 tools/build_defs/oss/rn_defs.bzl              |   107 +-
 yarn.lock                                     |  5679 +++---
 2184 files changed, 129841 insertions(+), 85716 deletions(-)
 rename .github/{label-actions.yml => respond-to-issue-based-on-label.yml} (96%)
 rename .github/workflows/{process-label-actions.yml => on-issue-labeled.yml} (54%)
 delete mode 100644 .nvmrc
 create mode 100644 BUCK
 create mode 100644 IntegrationTests/BUCK
 create mode 100644 Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js
 create mode 100644 Libraries/Animated/createAnimatedComponentInjection.js
 create mode 100644 Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js
 create mode 100644 Libraries/Animated/useAnimatedProps.js
 delete mode 100644 Libraries/BUCK
 delete mode 100644 Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
 delete mode 100644 Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
 create mode 100644 Libraries/Components/AccessibilityInfo/AccessibilityInfo.js
 delete mode 100644 Libraries/Components/AccessibilityInfo/AccessibilityInfo.macos.js
 create mode 100644 Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.android.js
 create mode 100644 Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.ios.js
 create mode 100644 Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.macos.js
 delete mode 100644 Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js
 delete mode 100644 Libraries/Components/Picker/AndroidDialogPickerViewConfig.js
 delete mode 100644 Libraries/Components/Picker/AndroidDropdownPickerNativeComponent.js
 delete mode 100644 Libraries/Components/Picker/Picker.js
 delete mode 100644 Libraries/Components/Picker/PickerAndroid.android.js
 delete mode 100644 Libraries/Components/Picker/PickerIOS.ios.js
 delete mode 100644 Libraries/Components/Picker/RCTPickerNativeComponent.js
 delete mode 100644 Libraries/Components/Picker/RCTPickerViewConfig.js
 delete mode 100644 Libraries/Components/Picker/__tests__/Picker-test.js
 delete mode 100644 Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap
 delete mode 100644 Libraries/Components/ScrollResponder.js
 create mode 100644 Libraries/Components/SegmentedControlIOS/__tests__/SegmentedContolIOS-test.js
 create mode 100644 Libraries/Components/SegmentedControlIOS/__tests__/__snapshots__/SegmentedContolIOS-test.js.snap
 delete mode 100644 Libraries/Components/StatusBar/StatusBarIOS.js
 create mode 100644 Libraries/Components/StatusBar/__tests__/StatusBar-test.js
 rename Libraries/Components/TextInput/{RCTSinglelineTextInputViewConfig.js => RCTTextInputViewConfig.js} (93%)
 create mode 100644 Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js
 create mode 100644 Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js
 create mode 100644 Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js
 create mode 100644 Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap
 create mode 100644 Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap
 create mode 100644 Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap
 create mode 100644 Libraries/Components/__tests__/Button-test.js
 create mode 100644 Libraries/Components/__tests__/Slider-test.js
 create mode 100644 Libraries/Components/__tests__/__snapshots__/Button-test.js.snap
 create mode 100644 Libraries/Components/__tests__/__snapshots__/Slider-test.js.snap
 create mode 100644 Libraries/Core/ExtendedError.js
 create mode 100644 Libraries/Core/Timers/immediateShim.js
 create mode 100644 Libraries/Core/Timers/queueMicrotask.js
 create mode 100644 Libraries/DeprecatedPropTypes/DeprecatedImagePropType.android.js
 rename Libraries/DeprecatedPropTypes/{DeprecatedImagePropType.js => DeprecatedImagePropType.ios.js} (100%)
 create mode 100644 Libraries/DeprecatedPropTypes/DeprecatedImagePropType.macos.js
 create mode 100644 Libraries/Image/AssetUtils.js
 create mode 100644 Libraries/Image/ImageInjection.js
 delete mode 100644 Libraries/Image/ImageViewViewConfig.js
 create mode 100644 Libraries/Image/__tests__/AssetUtils-test.js
 create mode 100644 Libraries/Lists/CellRenderMask.js
 create mode 100644 Libraries/Lists/SectionListModern.js
 create mode 100644 Libraries/Lists/__tests__/CellRenderMask-test.js
 rename packages/react-native-codegen/android/gradlePlugin-build/settings.gradle => Libraries/Modal/ModalInjection.js (58%)
 create mode 100644 Libraries/NativeComponent/NativeComponentRegistry.js
 create mode 100644 Libraries/NativeComponent/ViewConfig.js
 create mode 100644 Libraries/Pressability/PressabilityPerformanceEventEmitter.js
 create mode 100644 Libraries/Pressability/PressabilityTypes.js
 create mode 100644 Libraries/ReactNative/DisplayMode.js
 rename Libraries/{Text/TextInjection.js => ReactNative/UIManagerInjection.js} (73%)
 create mode 100644 Libraries/ReactNative/getCachedComponentWithDebugName.js
 delete mode 100644 Libraries/StyleSheet/StyleSheetValidation.js
 rename Libraries/{Components/Picker/PickerAndroid.ios.js => Types/RootTagTypes.js} (70%)
 create mode 100644 Libraries/Utilities/FeatureDetection.js
 create mode 100644 Libraries/Utilities/__tests__/useMergeRefs-test.js
 create mode 100644 Libraries/Utilities/__tests__/useRefEffect-test.js
 delete mode 100644 Libraries/Utilities/registerGeneratedViewConfig.js
 create mode 100644 Libraries/Utilities/useMergeRefs.js
 create mode 100644 Libraries/Utilities/useRefEffect.js
 delete mode 100644 Libraries/promiseRejectionIsError.js
 create mode 100644 Libraries/vendor/emitter/EventSubscription.js
 create mode 100644 Libraries/vendor/emitter/__flowtests__/EventEmitter-flowtest.js
 create mode 100644 React/Base/RCTBundleManager.m
 create mode 100644 React/Base/RCTCallableJSModules.m
 rename React/{Views/RCTPickerManager.h => Base/RCTInitializing.h} (68%)
 delete mode 100644 React/Base/RCTJSInvokerModule.h
 create mode 100644 React/Base/RCTModuleRegistry.m
 create mode 100644 React/Base/RCTViewRegistry.m
 rename {Libraries => React}/FBReactNativeSpec/FBReactNativeSpec.podspec (60%)
 delete mode 100644 React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h
 delete mode 100644 React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
 create mode 100644 React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h
 create mode 100644 React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm
 delete mode 100644 React/Views/RCTPicker.h
 delete mode 100644 React/Views/RCTPicker.m
 delete mode 100644 React/Views/RCTPickerManager.m
 create mode 100644 React/Views/RCTWeakViewHolder.h
 delete mode 100644 ReactAndroid/release.gradle
 delete mode 100644 ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
 create mode 100644 ReactAndroid/src/androidTest/js/BUCK
 delete mode 100644 ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
 rename ReactAndroid/src/main/java/com/facebook/react/{turbomodule/core => }/ReactPackageTurboModuleManagerDelegate.java (82%)
 rename ReactAndroid/src/main/java/com/facebook/react/bridge/{ReactSoftException.java => ReactSoftExceptionLogger.java} (83%)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBufferSoLoader.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java
 rename ReactAndroid/src/main/java/com/facebook/react/devsupport/{ReactInstanceManagerDevHelper.java => ReactInstanceDevHelper.java} (88%)
 rename packages/react-native-codegen/android/gradlePlugin-build/build.gradle => ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/BundleLoadCallback.java (63%)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorType.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.cpp
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.h
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/CreateMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/InsertMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/RemoveDeleteMultiMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePaddingMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePropsMountItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateStateMountItem.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/RuntimeSchedulerManager.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/Android.mk
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/OnLoad.cpp
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.cpp
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.h
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolver.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolverManager.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingProhibitedView.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactOverflowView.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerResolver.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/events/LockFreeEventDispatcherImpl.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BUCK
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => interfaces}/BaseViewManagerDelegate.java (100%)
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => interfaces}/BaseViewManagerInterface.java (100%)
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => interfaces}/FloatUtil.java (100%)
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => interfaces}/Spacing.java (100%)
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => interfaces}/ViewManagerDelegate.java (100%)
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => interfaces}/ViewProps.java (96%)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerDelegate.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerInterface.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/Android.mk
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ComponentDescriptors.h
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.cpp
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.h
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.cpp
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.h
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.cpp
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.h
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerAdapter.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerItem.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/text/TypefaceStyle.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java
 create mode 100644 ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.cpp
 create mode 100644 ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/arm/jump_arm_aapcs_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/arm/make_arm_aapcs_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/arm/ontop_arm_aapcs_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/arm64/jump_arm64_aapcs_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/arm64/make_arm64_aapcs_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/arm64/ontop_arm64_aapcs_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/x86/jump_i386_sysv_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/x86/make_i386_sysv_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/x86/ontop_i386_sysv_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/jump_x86_64_sysv_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/make_x86_64_sysv_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/ontop_x86_64_sysv_elf_gas.S
 create mode 100644 ReactAndroid/src/main/jni/third-party/fmt/Android.mk
 create mode 100644 ReactAndroid/src/main/jni/third-party/libevent/Android.mk
 create mode 100644 ReactAndroid/src/main/jni/third-party/libevent/evconfig-private.h
 create mode 100644 ReactAndroid/src/main/jni/third-party/libevent/event-config.h
 delete mode 100644 ReactAndroid/src/main/third-party/android/support/v4/BUCK
 delete mode 100644 ReactAndroid/src/main/third-party/android/support/v7/appcompat/BUCK
 delete mode 100644 ReactAndroid/src/main/third-party/android/support/v7/appcompat/aar-unpacker.py
 rename ReactAndroid/src/main/third-party/java/robolectric/{4.4 => }/BUCK (99%)
 create mode 100644 ReactAndroid/src/main/third-party/kotlin/BUCK
 create mode 100644 ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java
 delete mode 100644 ReactCommon/cxxreact/re_worker_requirements
 create mode 100644 ReactCommon/hermes/React-hermes.podspec
 create mode 100644 ReactCommon/logger/Android.mk
 create mode 100644 ReactCommon/logger/BUCK
 create mode 100644 ReactCommon/logger/React-logger.podspec
 create mode 100644 ReactCommon/logger/react_native_log.cpp
 create mode 100644 ReactCommon/logger/react_native_log.h
 create mode 100644 ReactCommon/react/debug/Android.mk
 create mode 100644 ReactCommon/react/debug/BUCK
 create mode 100644 ReactCommon/react/debug/flags.h
 create mode 100644 ReactCommon/react/debug/react_native_assert.cpp
 create mode 100644 ReactCommon/react/debug/react_native_assert.h
 create mode 100644 ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.h
 create mode 100644 ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.mm
 create mode 100644 ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp
 create mode 100644 ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
 create mode 100644 ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
 rename ReactCommon/react/renderer/{components/picker/iospicker/PickerShadowNode.cpp => componentregistry/componentNameByReactViewName.h} (62%)
 create mode 100644 ReactCommon/react/renderer/componentregistry/native/Android.mk
 create mode 100644 ReactCommon/react/renderer/componentregistry/native/BUCK
 create mode 100644 ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp
 create mode 100644 ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/Android.mk
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/conversions.h
 delete mode 100644 ReactCommon/react/renderer/components/picker/iospicker/primitives.h
 delete mode 100644 ReactCommon/react/renderer/core/ConcreteStateTeller.h
 create mode 100644 ReactCommon/react/renderer/core/Constants.cpp
 rename ReactCommon/react/renderer/{components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerComponentDescriptor.h => core/Constants.h} (53%)
 create mode 100644 ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp
 rename ReactCommon/react/renderer/{components/picker/iospicker/PickerState.h => core/DynamicPropsUtilities.h} (68%)
 create mode 100644 ReactCommon/react/renderer/core/EventQueueProcessor.cpp
 create mode 100644 ReactCommon/react/renderer/core/EventQueueProcessor.h
 create mode 100644 ReactCommon/react/renderer/core/LayoutMetrics.cpp
 create mode 100644 ReactCommon/react/renderer/core/PropsParserContext.h
 create mode 100644 ReactCommon/react/renderer/core/ReactEventPriority.h
 create mode 100644 ReactCommon/react/renderer/core/tests/DynamicPropsUtilitiesTest.cpp
 create mode 100644 ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp
 create mode 100644 ReactCommon/react/renderer/debug/flags.h
 create mode 100644 ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h
 create mode 100644 ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h
 create mode 100644 ReactCommon/react/renderer/graphics/platform/ios/PlatformColorParser.h
 create mode 100644 ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.h
 create mode 100644 ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm
 create mode 100644 ReactCommon/react/renderer/leakchecker/Android.mk
 rename ReactCommon/react/renderer/{components/picker/iospicker => leakchecker}/BUCK (63%)
 create mode 100644 ReactCommon/react/renderer/leakchecker/LeakChecker.cpp
 create mode 100644 ReactCommon/react/renderer/leakchecker/LeakChecker.h
 create mode 100644 ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp
 create mode 100644 ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h
 create mode 100644 ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
 create mode 100644 ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
 create mode 100644 ReactCommon/react/renderer/mapbuffer/primitives.h
 delete mode 100644 ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp
 create mode 100644 ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp
 delete mode 100644 ReactCommon/react/renderer/mounting/tests/TransactionTelemetryTest.cpp
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/Android.mk
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/BUCK
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/Task.cpp
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/Task.h
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/primitives.h
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/tests/SchedulerPriorityTest.cpp
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/tests/StubClock.h
 create mode 100644 ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h
 rename ReactCommon/react/renderer/{components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerComponentDescriptor.h => scheduler/InspectorData.h} (51%)
 create mode 100644 ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp
 create mode 100644 ReactCommon/react/renderer/scheduler/SurfaceHandler.h
 create mode 100644 ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
 create mode 100644 ReactCommon/react/renderer/scheduler/SurfaceManager.h
 create mode 100644 ReactCommon/react/renderer/telemetry/Android.mk
 create mode 100644 ReactCommon/react/renderer/telemetry/BUCK
 rename ReactCommon/react/renderer/{mounting => telemetry}/SurfaceTelemetry.cpp (93%)
 rename ReactCommon/react/renderer/{mounting => telemetry}/SurfaceTelemetry.h (91%)
 create mode 100644 ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp
 rename ReactCommon/react/renderer/{mounting => telemetry}/TransactionTelemetry.h (85%)
 create mode 100644 ReactCommon/react/renderer/telemetry/tests/TransactionTelemetryTest.cpp
 rename ReactCommon/react/renderer/{components/picker => timeline}/BUCK (52%)
 create mode 100644 ReactCommon/react/renderer/timeline/Timeline.cpp
 create mode 100644 ReactCommon/react/renderer/timeline/Timeline.h
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineController.cpp
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineController.h
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineFrame.cpp
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineFrame.h
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineHandler.cpp
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineHandler.h
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp
 create mode 100644 ReactCommon/react/renderer/timeline/TimelineSnapshot.h
 create mode 100644 ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
 create mode 100644 ReactCommon/react/test_utils/BUCK
 rename ReactCommon/react/{renderer/mounting/tests => test_utils}/Entropy.h (96%)
 create mode 100644 ReactCommon/react/test_utils/MockClock.h
 rename ReactCommon/react/{renderer/mounting/tests => test_utils}/shadowTreeGeneration.h (74%)
 create mode 100644 ReactCommon/react/utils/LayoutManager.h
 delete mode 100644 android-patches/patches/Build/ReactAndroid/release.gradle
 create mode 100644 flow-typed/npm/react-test-renderer_v16.x.x.js
 create mode 100644 flow/HermesInternalType.js
 create mode 100644 flow/global.js
 create mode 100644 jest/mockNativeComponent.js
 rename packages/polyfills/{Object.es7.js => Object.es8.js} (100%)
 rename packages/polyfills/__tests__/{Object.es7-test.js => Object.es8-test.js} (98%)
 delete mode 100644 packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/StringType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/Type.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java (98%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java (100%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java (95%)
 rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java (94%)
 delete mode 100644 packages/react-native-codegen/e2e/__tests__/modules/BUCK
 delete mode 100755 packages/react-native-codegen/src/cli/verify_with_old_codegen.js
 delete mode 100755 packages/react-native-codegen/src/cli/verify_with_old_codegen.sh
 rename Libraries/Components/Picker/PickerIOS.android.js => packages/react-native-codegen/src/generators/Utils.js (58%)
 create mode 100644 packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/PojoCollector.js
 create mode 100644 packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/index.js
 create mode 100644 packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
 create mode 100644 packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js
 create mode 100644 packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
 create mode 100644 packages/react-native-gradle-plugin/build.gradle.kts
 create mode 100644 packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/AndroidConfiguration.kt
 create mode 100644 packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppExtension.kt
 create mode 100644 packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppPlugin.kt
 create mode 100644 packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
 create mode 100644 packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleJsAndAssetsTask.kt
 create mode 100644 packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/HermesBinaryTask.kt
 create mode 100644 packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/TaskUtils.kt
 create mode 100644 packages/rn-tester/RNTester/Images.xcassets/customColor.colorset/Contents.json
 delete mode 100644 packages/rn-tester/js/assets/bottom-nav-center-box.png
 delete mode 100644 packages/rn-tester/js/components/ExamplePage.js
 create mode 100644 packages/rn-tester/js/components/RNTConfigurationBlock.js
 create mode 100644 packages/rn-tester/js/components/RNTOption.js
 create mode 100644 packages/rn-tester/js/components/RNTPressableRow.js
 create mode 100644 packages/rn-tester/js/components/RNTTestDetails.js
 rename packages/rn-tester/js/components/{RNTesterHeader.js => RNTTitleBar.js} (78%)
 delete mode 100644 packages/rn-tester/js/components/RNTesterExampleContainer.js
 create mode 100644 packages/rn-tester/js/components/RNTesterModuleContainer.js
 rename packages/rn-tester/js/components/{RNTesterExampleList.js => RNTesterModuleList.js} (83%)
 delete mode 100644 packages/rn-tester/js/examples/Animated/AnimatedExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/AnimatedIndex.js
 create mode 100644 packages/rn-tester/js/examples/Animated/ComposeAnimationsWithEasingExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/ComposingExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/ContinuousInteractionsExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/EasingExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/FadeInViewExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/LoopingExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/MovingBoxExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/RotatingImagesExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/TransformBounceExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/TransformStylesExample.js
 create mode 100644 packages/rn-tester/js/examples/Animated/utils/ToggleNativeDriver.js
 rename packages/rn-tester/js/examples/{Animated => }/AnimatedGratuitousApp/AnExApp.js (95%)
 rename packages/rn-tester/js/examples/{Animated => }/AnimatedGratuitousApp/AnExBobble.js (100%)
 rename packages/rn-tester/js/examples/{Animated => }/AnimatedGratuitousApp/AnExChained.js (94%)
 rename packages/rn-tester/js/examples/{Animated => }/AnimatedGratuitousApp/AnExScroll.js (100%)
 rename packages/rn-tester/js/examples/{Animated => }/AnimatedGratuitousApp/AnExSet.js (100%)
 rename packages/rn-tester/js/examples/{Animated => }/AnimatedGratuitousApp/AnExSlides.md (100%)
 rename packages/rn-tester/js/examples/{Animated => }/AnimatedGratuitousApp/AnExTilt.js (98%)
 create mode 100644 packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js
 create mode 100644 packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js
 create mode 100644 packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js
 create mode 100644 packages/rn-tester/js/examples/FlatList/FlatListExamples.js
 create mode 100644 packages/rn-tester/js/examples/Modal/ModalOnShow.js
 create mode 100644 packages/rn-tester/js/examples/Modal/ModalPresentation.js
 create mode 100644 packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.ios.js
 create mode 100644 packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.macos.js
 create mode 100644 packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionList-contentInset.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionList-inverted.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionList-onViewableItemsChanged.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionList-stickyHeadersEnabled.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionListBaseExample.js
 delete mode 100644 packages/rn-tester/js/examples/SectionList/SectionListExample.js
 create mode 100644 packages/rn-tester/js/examples/SectionList/SectionListIndex.js
 create mode 100644 packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js
 create mode 100644 packages/rn-tester/js/examples/Text/TextAdjustsDynamicLayoutExample.js
 create mode 100644 packages/rn-tester/yarn.lock
 create mode 100644 scripts/codegen.js
 create mode 100755 scripts/find-node.sh
 delete mode 100755 scripts/generate-native-modules-specs.sh
 delete mode 100755 scripts/generate-rncore.sh
 rename scripts/{generate-native-modules-specs-cli.js => generate-specs-cli.js} (65%)
 create mode 100755 scripts/generate-specs.sh
 create mode 100644 scripts/lint-java.js
 create mode 100755 scripts/update_podfile_lock.sh
 create mode 100644 template/_editorconfig
 create mode 100644 template/_gitattributes
 create mode 100644 third-party-podspecs/boost.podspec
 delete mode 100644 third-party-podspecs/libevent.podspec
 create mode 100644 tools/build_defs/apple/config_utils_defs.bzl
 rename packages/react-native-codegen/src/cli/verify_all_modules_with_old_codegen.sh => tools/build_defs/apple/fb_apple_asset_catalog.bzl (58%)
 mode change 100755 => 100644
 create mode 100644 tools/build_defs/apple/fb_apple_bundle.bzl
 create mode 100644 tools/build_defs/apple/fb_apple_test.bzl
 create mode 100644 tools/build_defs/apple/fb_js_dep.bzl
 create mode 100644 tools/build_defs/apple/flag_defs.bzl
 create mode 100644 tools/build_defs/apple/plugins/plugin_defs.bzl
 create mode 100644 tools/build_defs/fb_xplat_platform_specific_rule.bzl
 create mode 100644 tools/build_defs/fb_xplat_resource.bzl
 create mode 100644 tools/build_defs/js_glob.bzl
 create mode 100644 tools/build_defs/oss/metro_defs.bzl

diff --git a/.buckconfig b/.buckconfig
index 0740647479601e..07ec813646f170 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -1,6 +1,6 @@
 
 [android]
-  target = android-29
+  target = android-30
 
 [download]
   max_number_of_retries = 3
@@ -8,7 +8,6 @@
 [maven_repositories]
   central = https://repo1.maven.org/maven2
   google = https://maven.google.com/
-  jcenter = https://jcenter.bintray.com/
 
 [alias]
   rntester = //packages/rn-tester/android/app:app
diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
index 23513414924ed2..96a361b9fa5ebb 100644
--- a/.circleci/Dockerfiles/Dockerfile.android
+++ b/.circleci/Dockerfiles/Dockerfile.android
@@ -14,7 +14,7 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:2.1
+FROM reactnativecommunity/react-native-android:4.0
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <hector@fb.com>"
@@ -26,6 +26,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
 
 ADD .buckconfig /app/.buckconfig
 ADD .buckjavaargs /app/.buckjavaargs
+ADD BUCK /app/BUCK
 ADD Libraries /app/Libraries
 ADD ReactAndroid /app/ReactAndroid
 ADD ReactCommon /app/ReactCommon
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8d15b406196098..baa53e7220cf91 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,10 +15,10 @@ defaults: &defaults
   environment:
     - GIT_COMMIT_DESC: git log --format=oneline -n 1 $CIRCLE_SHA1
     # The public github tokens are publicly visible by design
-    - PUBLIC_PULLBOT_GITHUB_TOKEN_A: "a6edf8e8d40ce4e8b11a"
-    - PUBLIC_PULLBOT_GITHUB_TOKEN_B: "150e1341f4dd9c944d2a"
-    - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A: &github_token_a "78a72af35445ca3f8180"
-    - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B: &github_token_b "b1a98e0bbd56ff1ccba1"
+    - PUBLIC_PULLBOT_GITHUB_TOKEN_A: &github_pullbot_token_a "a6edf8e8d40ce4e8b11a"
+    - PUBLIC_PULLBOT_GITHUB_TOKEN_B: &github_pullbot_token_b "150e1341f4dd9c944d2a"
+    - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A: &github_analysisbot_token_a "312d354b5c36f082cfe9"
+    - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B: &github_analysisbot_token_b "07973d757026bdd9f196"
 
 # -------------------------
 #        EXECUTORS
@@ -27,6 +27,7 @@ executors:
   nodelts:
     <<: *defaults
     docker:
+      # Note: Version set separately for Windows builds, see below.
       - image: circleci/node:14
   nodeprevlts:
     <<: *defaults
@@ -35,7 +36,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:2.1
+      - image: reactnativecommunity/react-native-android:4.0
     resource_class: "large"
     environment:
       - TERM: "dumb"
@@ -44,12 +45,14 @@ executors:
       - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"'
       - BUILD_THREADS: 2
       # Repeated here, as the environment key in this executor will overwrite the one in defaults
-      - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A: *github_token_a
-      - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B: *github_token_b
+      - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A: *github_analysisbot_token_a
+      - PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B: *github_analysisbot_token_b
+      - PUBLIC_PULLBOT_GITHUB_TOKEN_A: *github_pullbot_token_a
+      - PUBLIC_PULLBOT_GITHUB_TOKEN_B: *github_pullbot_token_b
   reactnativeios:
     <<: *defaults
     macos:
-      xcode: &_XCODE_VERSION "12.1.0"
+      xcode: &_XCODE_VERSION "12.5.0"
 
 # -------------------------
 #        COMMANDS
@@ -75,7 +78,6 @@ commands:
       - restore_cache:
           keys:
             - v4-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
-            - v4-yarn-cache-{{ arch }}
       - run:
           name: "Yarn: Install Dependencies"
           command: |
@@ -94,7 +96,6 @@ commands:
       - restore_cache:
           keys:
             - v3-buck-v2019.01.10.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
-            - v3-buck-v2019.01.10.01-
       - run:
           name: Install BUCK
           command: |
@@ -151,20 +152,20 @@ commands:
           command: cp packages/rn-tester/Podfile.lock packages/rn-tester/Podfile.lock.bak
       - restore_cache:
           keys:
-            - v3-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}
-            - v3-pods-{{ .Environment.CIRCLE_JOB }}-
+            # The committed lockfile is generated using USE_FRAMEWORKS=0 and USE_HERMES=0 so it could load an outdated cache if a change
+            # only affects the frameworks or hermes config. To help prevent this also cache based on the content of Podfile.
+            - v3-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
       - steps: << parameters.steps >>
       - save_cache:
           paths:
             - packages/rn-tester/Pods
-          key: v3-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}
+          key: v3-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
 
   download_gradle_dependencies:
     steps:
       - restore_cache:
           keys:
             - v1-gradle-{{ checksum "ReactAndroid/build.gradle" }}-{{ checksum "scripts/circleci/gradle_download_deps.sh" }}
-            - v1-gradle-
       - run:
           name: Download Dependencies Using Gradle
           command: ./scripts/circleci/gradle_download_deps.sh
@@ -236,17 +237,20 @@ jobs:
   # Issues will be posted to the PR itself via GitHub bots.
   # This workflow should only fail if the bots fail to run.
   analyze_pr:
-    executor: nodelts
+    executor: reactnativeandroid
     steps:
       - restore_cache_checkout:
-          checkout_type: node
+          checkout_type: android
       - run_yarn
 
       - install_github_bot_deps
 
+      # Note: The yarn gpg key needs to be refreshed to work around https://github.com/yarnpkg/yarn/issues/7866
       - run:
           name: Install additional GitHub bot dependencies
-          command: sudo apt update && sudo apt install -y shellcheck jq
+          command: |
+            curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+            apt update && apt install -y shellcheck jq
 
       - run:
           name: Run linters against modified files (analysis-bot)
@@ -264,10 +268,10 @@ jobs:
   #    JOBS: Analyze Code
   # -------------------------
   analyze_code:
-    executor: nodelts
+    executor: reactnativeandroid
     steps:
       - restore_cache_checkout:
-          checkout_type: node
+          checkout_type: android
       - setup_artifacts
       - run_yarn
 
@@ -276,6 +280,11 @@ jobs:
           command: scripts/circleci/exec_swallow_error.sh yarn lint --format junit -o ./reports/junit/eslint/results.xml
           when: always
 
+      - run:
+          name: Lint Java
+          command: scripts/circleci/exec_swallow_error.sh yarn lint-java --check
+          when: always
+
       - run:
           name: Check for errors in code using Flow (iOS)
           command: yarn flow-check-ios
@@ -423,7 +432,7 @@ jobs:
           steps:
             - run:
                 name: Generate RNTesterPods Workspace
-                command: cd packages/rn-tester && bundle exec pod install --verbose
+                command: cd packages/rn-tester && USE_FABRIC=1 bundle exec pod install --verbose
 
       # -------------------------
       # Runs iOS unit tests
@@ -495,12 +504,6 @@ jobs:
           command: source scripts/android-setup.sh && launchAVD
           background: true
 
-      # Keep configuring Android dependencies while AVD boots up
-
-      - run:
-          name: Install rsync, zip
-          command: apt-get update -y && apt-get install rsync zip -y
-
       # Install Buck
       - install_buck_tooling
 
@@ -606,14 +609,21 @@ jobs:
         default: false
     environment:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
-      - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\19.2.5345600"
-      - ANDROID_BUILD_VERSION: 28
-      - ANDROID_TOOLS_VERSION: 29.0.3
+      - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
+      - ANDROID_BUILD_VERSION: 30
+      - ANDROID_TOOLS_VERSION: 30.0.2
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
-      - NDK_VERSION: 19.2.5345600
+      - NDK_VERSION: 21.4.7075529
     steps:
       - checkout
 
+      - run:
+          name: Install Node
+          # Note: Version set separately for non-Windows builds, see above.
+          command: |
+            nvm install 14.17.0
+            nvm use 14.17.0
+
       # Setup Dependencies
       - run:
           name: Install Yarn
@@ -626,7 +636,6 @@ jobs:
       - restore_cache:
           keys:
             - v1-win-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
-            - v1-win-yarn-cache-{{ arch }}-
       - run:
           name: "Yarn: Install Dependencies"
           command: yarn install --frozen-lockfile --non-interactive
@@ -635,9 +644,11 @@ jobs:
           paths:
             - C:\Users\circleci\AppData\Local\Yarn
 
+      # Try to install the SDK up to 3 times, since network flakiness can cause install failures
+      # Using a timeout of 9 mins, as circle ci will timeout if there is no output for 10 mins
       - run:
           name: Install Android SDK Tools
-          command: choco install android-sdk
+          command: choco install android-sdk --timeout 540; if (!$?) { choco install android-sdk --timeout 540 --force --forcedependencies}; if (!$?) { choco install android-sdk  --force --forcedependencies}
 
       - run:
           name: Setup Android SDKs
@@ -778,30 +789,34 @@ workflows:
           run_unit_tests: true
           requires:
             - setup_ios
-      - test_ios:
-          name: test_ios_unit_frameworks_jsc
-          use_frameworks: true
-          run_unit_tests: true
-          requires:
-            - setup_ios
+      # DISABLED: USE_FRAMEWORKS=1 not supported by Flipper
+      # - test_ios:
+      #     name: test_ios_unit_frameworks_jsc
+      #     use_frameworks: true
+      #     run_unit_tests: true
+      #     requires:
+      #       - setup_ios
       - test_ios:
           name: test_ios_unit_hermes
           use_hermes: true
           run_unit_tests: true
           requires:
             - setup_ios
-      - test_ios:
-          name: test_ios_unit_frameworks_hermes
-          use_hermes: true
-          use_frameworks: true
-          run_unit_tests: true
-          requires:
-            - setup_ios
+      # DISABLED: USE_FRAMEWORKS=1 not supported by Flipper
+      # - test_ios:
+      #     name: test_ios_unit_frameworks_hermes
+      #     use_hermes: true
+      #     use_frameworks: true
+      #     run_unit_tests: true
+      #     requires:
+      #       - setup_ios
+      # DISABLED: Detox tests need to be fixed
       # - test_ios:
       #     name: test_ios_detox
       #     run_detox_tests: true
       #     requires:
       #       - setup_ios
+      # DISABLED: USE_FRAMEWORKS=1 not supported by Flipper
       # - test_ios:
       #     name: test_ios_detox_frameworks
       #     use_frameworks: true
@@ -856,11 +871,18 @@ workflows:
 
   analysis:
     jobs:
-      - setup
+      - setup:
+          name: setup_js
+
+      - setup:
+          name: setup_android
+          checkout_type: android
+          executor: reactnativeandroid
+
       # Run lints on every commit other than those to the gh-pages branch
       - analyze_code:
           requires:
-            - setup
+            - setup_android
           filters:
             branches:
               ignore: gh-pages
@@ -868,7 +890,7 @@ workflows:
       # Run code checks on PRs from forks
       - analyze_pr:
           requires:
-            - setup
+            - setup_android
           filters:
             branches:
               only: /^pull\/.*$/
@@ -876,7 +898,7 @@ workflows:
       # Gather coverage
       - js_coverage:
           requires:
-            - setup
+            - setup_js
           # [TODO(macOS GH#774): disable this test, it fails in the fork due to not being set up for coveralls
           filters:
             branches:
@@ -891,7 +913,7 @@ workflows:
               # [TODO(macOS GH#774): disable this release.  We never want to release anything from this fork via CCI.
               ignore: /.*/
               # only:
-              #   - master
+              #   - main
               # ]TODO(macOS GH#774)
     jobs:
       - nightly_job
diff --git a/.editorconfig b/.editorconfig
index 45dc2a9a3fecd4..355a800148a2d9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,5 +13,12 @@ indent_size = 2
 [*.gradle]
 indent_size = 4
 
+[*.kts]
+indent_size = 4
+
 [BUCK]
 indent_size = 4
+
+# Windows files
+[*.bat]
+end_of_line = crlf
diff --git a/.eslintrc b/.eslintrc
index 2c5a51053d8221..f990717831deb2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -21,6 +21,14 @@
         "@react-native/codegen/react-native-modules": 2
       }
     },
+    {
+      "files": [
+        "flow-typed/**/*.js",
+      ],
+      "rules": {
+        quotes: 0
+      }
+    },
     {
       "files": [
         "**/__fixtures__/**/*.js",
diff --git a/.flowconfig b/.flowconfig
index e45052fc3424cd..f763d569d9486c 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -35,6 +35,9 @@ flow/
 emoji=true
 
 exact_by_default=true
+indexed_access=false
+
+format.bracket_spacing=false
 
 module.file_ext=.js
 module.file_ext=.json
@@ -52,15 +55,13 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.abstract_locations=true
-
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
 sketchy-number=warn
 untyped-type-import=warn
 nonstrict-import=warn
-deprecated-type=warn
+deprecated-type=error
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
@@ -75,4 +76,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.137.0
+^0.158.0
diff --git a/.flowconfig.android b/.flowconfig.android
index 1fe01b8ea01f8b..ff3d0c92033437 100644
--- a/.flowconfig.android
+++ b/.flowconfig.android
@@ -35,6 +35,9 @@ flow/
 emoji=true
 
 exact_by_default=true
+indexed_access=false
+
+format.bracket_spacing=false
 
 module.file_ext=.js
 module.file_ext=.json
@@ -55,15 +58,13 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.abstract_locations=true
-
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
 sketchy-number=warn
 untyped-type-import=warn
 nonstrict-import=warn
-deprecated-type=warn
+deprecated-type=error
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
@@ -78,4 +79,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.137.0
+^0.158.0
diff --git a/.flowconfig.macos b/.flowconfig.macos
index 46e8755cec24ac..08ffca1b0204e2 100644
--- a/.flowconfig.macos
+++ b/.flowconfig.macos
@@ -34,9 +34,6 @@ flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
 exact_by_default=true
 
 module.file_ext=.js
@@ -55,8 +52,6 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-well_formed_exports=true
-types_first=true
 experimental.abstract_locations=true
 
 [lints]
@@ -81,4 +76,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.137.0
+^0.158.0
diff --git a/.gitattributes b/.gitattributes
index eaf618cafb2032..7c973903433b65 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,4 +3,4 @@
 *.sh       text eol=lf
 # Windows files should use crlf line endings
 # https://help.github.com/articles/dealing-with-line-endings/
-*.bat text eol=crlf
\ No newline at end of file
+*.bat text eol=crlf
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index 4e313c997e3094..e597d1e3334e5a 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -27,7 +27,7 @@ If you'd like to discuss topics related to the future of React Native, please ch
 
 If you want to participate in casual discussions about the use of React Native, consider participating in one of the following forums:
 
-- [Reactiflux Discord Server](https://www.reactiflux)
+- [Reactiflux Discord Server](https://www.reactiflux.com)
 - [Spectrum Chat](https://spectrum.chat/react-native)
 - [React Native Community Facebook Group](https://www.facebook.com/groups/react.native.community)
 
diff --git a/.github/label-actions.yml b/.github/respond-to-issue-based-on-label.yml
similarity index 96%
rename from .github/label-actions.yml
rename to .github/respond-to-issue-based-on-label.yml
index 8cef0647e0068c..65131ff0840db0 100644
--- a/.github/label-actions.yml
+++ b/.github/respond-to-issue-based-on-label.yml
@@ -1,4 +1,4 @@
-# Configuration for Label Actions - https://github.com/marketplace/actions/label-actions
+# Configuration for Respond To Issue Based on Label https://github.com/marketplace/actions/respond-to-issue-based-on-label
 
 "Type: Invalid":
   close: true
diff --git a/.github/workflows/process-label-actions.yml b/.github/workflows/on-issue-labeled.yml
similarity index 54%
rename from .github/workflows/process-label-actions.yml
rename to .github/workflows/on-issue-labeled.yml
index 2c63100f6e8392..e68682b2ecb71b 100644
--- a/.github/workflows/process-label-actions.yml
+++ b/.github/workflows/on-issue-labeled.yml
@@ -1,16 +1,16 @@
-name: Label Actions
+name: On Issue Labeled
 # This workflow is triggered when a label is added to an issue.
 on:
   issues:
     types: labeled
 
 jobs:
-  processLabelAction:
-    name: Process Label Action
+  respondToIssueBasedOnLabel:
+    name: Respond to Issue Based on Label
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Process Label Action
-        uses: hramos/label-actions@v1
+      - name: Respond to Issue Based on Label
+        uses: hramos/respond-to-issue-based-on-label@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index c9ad5eacf11c52..eebf7dd21c678b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ project.xcworkspace/*
 # Gradle
 /build/
 /packages/react-native-codegen/android/build/
-/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build
+/packages/react-native-gradle-plugin/build/
 /packages/rn-tester/android/app/.cxx/
 /packages/rn-tester/android/app/build/
 /packages/rn-tester/android/app/gradle/
@@ -94,9 +94,9 @@ package-lock.json
 
 # Libs that shouldn't have Xcode project
 /Libraries/FBLazyVector/**/*.xcodeproj
-/Libraries/FBReactNativeSpec/**/*.xcodeproj
 /Libraries/RCTRequired/**/*.xcodeproj
 /React/CoreModules/**/*.xcodeproj
+/React/FBReactNativeSpec/**/*.xcodeproj
 /packages/react-native-codegen/**/*.xcodeproj
 
 # CocoaPods
@@ -109,10 +109,10 @@ package-lock.json
 !/packages/rn-tester/Pods/__offline_mirrors__
 
 # react-native-codegen
-/Libraries/FBReactNativeSpec/FBReactNativeSpec
+/React/FBReactNativeSpec/FBReactNativeSpec
 /packages/react-native-codegen/lib
-/ReactCommon/fabric/components/rncore/
-/schema-rncore.json
+/ReactCommon/react/renderer/components/rncore/
+/packages/rn-tester/NativeModuleExample/ScreenshotManagerSpec*
 
 # Visual studio
 .vscode
diff --git a/.nvmrc b/.nvmrc
deleted file mode 100644
index dba04c1e1786b2..00000000000000
--- a/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-8.11.3
diff --git a/BUCK b/BUCK
new file mode 100644
index 00000000000000..b315295c974f53
--- /dev/null
+++ b/BUCK
@@ -0,0 +1,1386 @@
+load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
+load("//tools/build_defs/apple:config_utils_defs.bzl", "STATIC_LIBRARY_APPLETVOS_CONFIG", "fbobjc_configs")
+load("//tools/build_defs/apple:fb_apple_test.bzl", "fb_apple_test")
+load("//tools/build_defs/apple:flag_defs.bzl", "get_base_appletvos_flags", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags")
+load("//tools/build_defs/apple/plugins:plugin_defs.bzl", "plugin")
+load("//tools/build_defs/oss:metro_defs.bzl", "rn_library")
+load(
+    "//tools/build_defs/oss:rn_codegen_defs.bzl",
+    "rn_codegen",
+    "rn_codegen_components",
+)
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "APPLETVOS",
+    "HERMES_BYTECODE_VERSION",
+    "IOS",
+    "RCT_IMAGE_DATA_DECODER_SOCKET",
+    "RCT_IMAGE_URL_LOADER_SOCKET",
+    "RCT_URL_REQUEST_HANDLER_SOCKET",
+    "YOGA_CXX_TARGET",
+    "react_fabric_component_plugin_provider",
+    "react_module_plugin_providers",
+    "react_native_root_target",
+    "react_native_xplat_dep",
+    "react_native_xplat_target",
+    "rn_apple_library",
+    "rn_extra_build_flags",
+    "rn_xplat_cxx_library2",
+    "subdir_glob",
+)
+load("//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace")
+
+RCTCXXBRIDGE_PUBLIC_HEADERS = {
+    "React/" + x: "React/CxxBridge/" + x
+    for x in [
+        "JSCExecutorFactory.h",
+        "NSDataBigString.h",
+        "RCTCxxBridgeDelegate.h",
+        "RCTMessageThread.h",
+    ]
+}
+
+fb_native.genrule(
+    name = "codegen_rn_components_schema_rncore",
+    srcs = glob(
+        [
+            "Libraries/**/*NativeComponent.js",
+            "jest/**/*NativeComponent.js",
+            "packages/**/*NativeComponent.js",
+        ],
+        exclude = [
+            "**/__*__/**",
+
+            # Subfolders with their own BUCK files, referenced below
+            "packages/rn-tester/**",
+        ],
+    ) + [
+        react_native_root_target("packages/rn-tester:nativecomponent-srcs"),
+    ],
+    cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
+    out = "schema-rncore.json",
+)
+
+rn_codegen_components(
+    name = "rncore",
+    schema_target = ":codegen_rn_components_schema_rncore",
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTCxxBridge",
+    srcs = glob([
+        "React/CxxBridge/*.mm",
+    ]),
+    headers = subdir_glob(
+        [
+            (
+                "React/CxxBridge",
+                "*.h",
+            ),
+        ],
+        exclude = RCTCXXBRIDGE_PUBLIC_HEADERS.values(),
+        prefix = "React",
+    ),
+    header_namespace = "",
+    exported_headers = RCTCXXBRIDGE_PUBLIC_HEADERS,
+    compiler_flags = [
+        "-fobjc-arc-exceptions",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    exported_preprocessor_flags = rn_extra_build_flags(),
+    fbobjc_enable_exceptions = True,
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+    # Used via objc_lookupClass in RCTBridge. Semantics are meant to be "if
+    # it's linked in your app, transparently use it".
+    labels = [
+        "depslint_never_remove",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + [
+        "-DWITH_FBSYSTRACE=1",
+        "-DRCT_USE_HERMES=0",  # This is the default.
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":RCTCxxModule",
+        ":RCTCxxUtils",
+        ":ReactInternal",
+        "//fbobjc/Libraries/FBReactKit:RCTFBSystrace",
+        "//xplat/folly:molly",
+        react_native_root_target("React/CoreModules:CoreModules"),
+        react_native_xplat_target("cxxreact:bridge"),
+        react_native_xplat_target("cxxreact:jsbigstring"),
+        react_native_xplat_target("jsi:JSCRuntime"),
+        react_native_xplat_target("jsiexecutor:jsiexecutor"),
+        react_native_xplat_target("reactperflogger:reactperflogger"),
+    ],
+)
+
+RCTCXXMODULE_PUBLIC_HEADERS = {
+    "React/" + x: "React/CxxModule/" + x
+    for x in [
+        "RCTCxxMethod.h",
+        "RCTCxxModule.h",
+        "RCTCxxUtils.h",
+    ]
+}
+
+rn_xplat_cxx_library2(
+    name = "RCTCxxModule",
+    srcs = glob([
+        "React/CxxModule/*.mm",
+    ]),
+    headers = subdir_glob(
+        [
+            (
+                "React/CxxModule",
+                "*.h",
+            ),
+        ],
+        exclude = RCTCXXMODULE_PUBLIC_HEADERS.values(),
+        prefix = "React",
+    ),
+    header_namespace = "",
+    exported_headers = RCTCXXMODULE_PUBLIC_HEADERS,
+    compiler_flags = [
+        "-fobjc-arc-exceptions",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    fbobjc_enable_exceptions = True,
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + ["-DWITH_FBSYSTRACE=1"],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":RCTCxxUtils",
+        ":ReactInternal",
+        "//xplat/fbsystrace:fbsystrace",
+        "//xplat/folly:headers_only",
+        react_native_xplat_target("cxxreact:module"),
+        react_native_xplat_target("cxxreact:bridge"),
+        react_native_xplat_target("reactperflogger:reactperflogger"),
+        react_native_xplat_dep("jsi:jsi"),
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTCxxUtils",
+    srcs = glob([
+        "React/CxxUtils/*.mm",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            (
+                "React/CxxUtils",
+                "*.h",
+            ),
+        ],
+        exclude = RCTCXXMODULE_PUBLIC_HEADERS.values(),
+        prefix = "React",
+    ),
+    apple_sdks = (IOS, APPLETVOS),
+    appletvos_configs = fbobjc_configs(STATIC_LIBRARY_APPLETVOS_CONFIG),
+    appletvos_inherited_buck_flags = get_base_appletvos_flags(),
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    fbobjc_enable_exceptions = True,
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/folly:molly",
+    ],
+)
+
+RCTLIB_PATH = "Libraries/"
+
+RCTBASE_PATH = "React/Base/"
+
+RCTDEVSUPPORT_PATH = "React/DevSupport/"
+
+RCTMODULES_PATH = "React/Modules/"
+
+RCTVIEWS_PATH = "React/Views/"
+
+REACT_PUBLIC_HEADERS = {
+    "React/RCTAnimationType.h": RCTVIEWS_PATH + "RCTAnimationType.h",
+    "React/RCTAssert.h": RCTBASE_PATH + "RCTAssert.h",
+    "React/RCTAutoInsetsProtocol.h": RCTVIEWS_PATH + "RCTAutoInsetsProtocol.h",
+    "React/RCTBorderDrawing.h": RCTVIEWS_PATH + "RCTBorderDrawing.h",
+    "React/RCTBorderStyle.h": RCTVIEWS_PATH + "RCTBorderStyle.h",
+    "React/RCTBridge+Private.h": RCTBASE_PATH + "RCTBridge+Private.h",
+    "React/RCTBridge.h": RCTBASE_PATH + "RCTBridge.h",
+    "React/RCTBridgeDelegate.h": RCTBASE_PATH + "RCTBridgeDelegate.h",
+    "React/RCTBridgeMethod.h": RCTBASE_PATH + "RCTBridgeMethod.h",
+    "React/RCTBridgeModule.h": RCTBASE_PATH + "RCTBridgeModule.h",
+    "React/RCTBundleURLProvider.h": RCTBASE_PATH + "RCTBundleURLProvider.h",
+    "React/RCTComponent.h": RCTVIEWS_PATH + "RCTComponent.h",
+    "React/RCTComponentData.h": RCTVIEWS_PATH + "RCTComponentData.h",
+    "React/RCTComponentEvent.h": RCTBASE_PATH + "RCTComponentEvent.h",
+    "React/RCTConstants.h": RCTBASE_PATH + "RCTConstants.h",
+    "React/RCTConvert.h": RCTBASE_PATH + "RCTConvert.h",
+    "React/RCTCxxConvert.h": RCTBASE_PATH + "RCTCxxConvert.h",
+    "React/RCTDefines.h": RCTBASE_PATH + "RCTDefines.h",
+    "React/RCTDevLoadingViewProtocol.h": RCTDEVSUPPORT_PATH + "RCTDevLoadingViewProtocol.h",
+    "React/RCTDevLoadingViewSetEnabled.h": RCTDEVSUPPORT_PATH + "RCTDevLoadingViewSetEnabled.h",
+    "React/RCTDisplayLink.h": RCTBASE_PATH + "RCTDisplayLink.h",
+    "React/RCTErrorCustomizer.h": RCTBASE_PATH + "RCTErrorCustomizer.h",
+    "React/RCTErrorInfo.h": RCTBASE_PATH + "RCTErrorInfo.h",
+    # NOTE: RCTEventDispatcher.h is exported from CoreModules:CoreModulesApple
+    "React/RCTEventDispatcherProtocol.h": RCTBASE_PATH + "RCTEventDispatcherProtocol.h",
+    "React/RCTEventEmitter.h": RCTMODULES_PATH + "RCTEventEmitter.h",
+    "React/RCTFont.h": RCTVIEWS_PATH + "RCTFont.h",
+    "React/RCTFrameUpdate.h": RCTBASE_PATH + "RCTFrameUpdate.h",
+    "React/RCTI18nUtil.h": RCTMODULES_PATH + "RCTI18nUtil.h",
+    "React/RCTImageSource.h": RCTBASE_PATH + "RCTImageSource.h",
+    "React/RCTInitializing.h": RCTBASE_PATH + "RCTInitializing.h",
+    "React/RCTInspector.h": "React/Inspector/RCTInspector.h",
+    "React/RCTInspectorDevServerHelper.h": RCTDEVSUPPORT_PATH + "RCTInspectorDevServerHelper.h",
+    "React/RCTInspectorPackagerConnection.h": "React/Inspector/RCTInspectorPackagerConnection.h",
+    "React/RCTInvalidating.h": RCTBASE_PATH + "RCTInvalidating.h",
+    "React/RCTJSScriptLoaderModule.h": RCTBASE_PATH + "RCTJSScriptLoaderModule.h",
+    "React/RCTJSStackFrame.h": RCTBASE_PATH + "RCTJSStackFrame.h",
+    "React/RCTJavaScriptExecutor.h": RCTBASE_PATH + "RCTJavaScriptExecutor.h",
+    "React/RCTJavaScriptLoader.h": RCTBASE_PATH + "RCTJavaScriptLoader.h",
+    "React/RCTKeyCommands.h": RCTBASE_PATH + "RCTKeyCommands.h",
+    "React/RCTLayout.h": RCTVIEWS_PATH + "RCTLayout.h",
+    "React/RCTLayoutAnimation.h": RCTMODULES_PATH + "RCTLayoutAnimation.h",
+    "React/RCTLayoutAnimationGroup.h": RCTMODULES_PATH + "RCTLayoutAnimationGroup.h",
+    "React/RCTLog.h": RCTBASE_PATH + "RCTLog.h",
+    "React/RCTManagedPointer.h": RCTBASE_PATH + "RCTManagedPointer.h",
+    "React/RCTModalHostViewController.h": RCTVIEWS_PATH + "RCTModalHostViewController.h",
+    "React/RCTModalHostViewManager.h": RCTVIEWS_PATH + "RCTModalHostViewManager.h",
+    "React/RCTModalManager.h": RCTVIEWS_PATH + "RCTModalManager.h",
+    "React/RCTModuleData.h": RCTBASE_PATH + "RCTModuleData.h",
+    "React/RCTModuleMethod.h": RCTBASE_PATH + "RCTModuleMethod.h",
+    "React/RCTMultipartStreamReader.h": RCTBASE_PATH + "RCTMultipartStreamReader.h",
+    "React/RCTNullability.h": RCTBASE_PATH + "RCTNullability.h",
+    "React/RCTPackagerClient.h": RCTDEVSUPPORT_PATH + "RCTPackagerClient.h",
+    "React/RCTPackagerConnection.h": RCTDEVSUPPORT_PATH + "RCTPackagerConnection.h",
+    "React/RCTPerformanceLogger.h": RCTBASE_PATH + "RCTPerformanceLogger.h",
+    "React/RCTPointerEvents.h": RCTVIEWS_PATH + "RCTPointerEvents.h",
+    "React/RCTProfile.h": "React/Profiler/RCTProfile.h",
+    "React/RCTPushNotificationManager.h": RCTLIB_PATH + "PushNotificationIOS/RCTPushNotificationManager.h",
+    "React/RCTReconnectingWebSocket.h": RCTLIB_PATH + "WebSocket/RCTReconnectingWebSocket.h",
+    "React/RCTRedBoxExtraDataViewController.h": RCTMODULES_PATH + "RCTRedBoxExtraDataViewController.h",
+    "React/RCTRedBoxSetEnabled.h": RCTBASE_PATH + "RCTRedBoxSetEnabled.h",
+    "React/RCTRefreshableProtocol.h": RCTVIEWS_PATH + "RefreshControl/RCTRefreshableProtocol.h",
+    "React/RCTReloadCommand.h": RCTBASE_PATH + "RCTReloadCommand.h",
+    "React/RCTRootContentView.h": RCTBASE_PATH + "RCTRootContentView.h",
+    "React/RCTRootShadowView.h": RCTVIEWS_PATH + "RCTRootShadowView.h",
+    "React/RCTRootView.h": RCTBASE_PATH + "RCTRootView.h",
+    "React/RCTRootViewDelegate.h": RCTBASE_PATH + "RCTRootViewDelegate.h",
+    "React/RCTSRWebSocket.h": RCTLIB_PATH + "WebSocket/RCTSRWebSocket.h",
+    "React/RCTScrollEvent.h": RCTVIEWS_PATH + "ScrollView/RCTScrollEvent.h",
+    "React/RCTScrollView.h": RCTVIEWS_PATH + "ScrollView/RCTScrollView.h",
+    "React/RCTScrollableProtocol.h": RCTVIEWS_PATH + "ScrollView/RCTScrollableProtocol.h",
+    "React/RCTShadowView+Layout.h": RCTVIEWS_PATH + "RCTShadowView+Layout.h",
+    "React/RCTShadowView.h": RCTVIEWS_PATH + "RCTShadowView.h",
+    "React/RCTSurface.h": RCTBASE_PATH + "Surface/RCTSurface.h",
+    "React/RCTSurfaceDelegate.h": RCTBASE_PATH + "Surface/RCTSurfaceDelegate.h",
+    "React/RCTSurfaceHostingProxyRootView.h": RCTBASE_PATH + "Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h",
+    "React/RCTSurfaceHostingView.h": RCTBASE_PATH + "Surface/SurfaceHostingView/RCTSurfaceHostingView.h",
+    "React/RCTSurfacePresenterStub.h": RCTMODULES_PATH + "RCTSurfacePresenterStub.h",
+    "React/RCTSurfaceProtocol.h": RCTBASE_PATH + "Surface/RCTSurfaceProtocol.h",
+    "React/RCTSurfaceRootShadowView.h": RCTBASE_PATH + "Surface/RCTSurfaceRootShadowView.h",
+    "React/RCTSurfaceRootShadowViewDelegate.h": RCTBASE_PATH + "Surface/RCTSurfaceRootShadowViewDelegate.h",
+    "React/RCTSurfaceRootView.h": RCTBASE_PATH + "Surface/RCTSurfaceRootView.h",
+    "React/RCTSurfaceSizeMeasureMode.h": RCTBASE_PATH + "Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h",
+    "React/RCTSurfaceStage.h": RCTBASE_PATH + "Surface/RCTSurfaceStage.h",
+    "React/RCTSurfaceView+Internal.h": RCTBASE_PATH + "Surface/RCTSurfaceView+Internal.h",
+    "React/RCTSurfaceView.h": RCTBASE_PATH + "Surface/RCTSurfaceView.h",
+    "React/RCTTextDecorationLineType.h": RCTVIEWS_PATH + "RCTTextDecorationLineType.h",
+    "React/RCTTouchHandler.h": RCTBASE_PATH + "RCTTouchHandler.h",
+    "React/RCTUIManager.h": RCTMODULES_PATH + "RCTUIManager.h",
+    "React/RCTUIManagerObserverCoordinator.h": RCTMODULES_PATH + "RCTUIManagerObserverCoordinator.h",
+    "React/RCTUIManagerUtils.h": RCTMODULES_PATH + "RCTUIManagerUtils.h",
+    "React/RCTUIUtils.h": "React/UIUtils/RCTUIUtils.h",
+    "React/RCTURLRequestDelegate.h": RCTBASE_PATH + "RCTURLRequestDelegate.h",
+    "React/RCTURLRequestHandler.h": RCTBASE_PATH + "RCTURLRequestHandler.h",
+    "React/RCTUtils.h": RCTBASE_PATH + "RCTUtils.h",
+    "React/RCTUtilsUIOverride.h": RCTBASE_PATH + "RCTUtilsUIOverride.h",
+    "React/RCTVersion.h": RCTBASE_PATH + "RCTVersion.h",
+    "React/RCTView.h": RCTVIEWS_PATH + "RCTView.h",
+    "React/RCTViewManager.h": RCTVIEWS_PATH + "RCTViewManager.h",
+    "React/RCTWeakProxy.h": RCTBASE_PATH + "RCTWeakProxy.h",
+    "React/RCTWeakViewHolder.h": RCTVIEWS_PATH + "RCTWeakViewHolder.h",
+    "React/RCTWrapperViewController.h": RCTVIEWS_PATH + "RCTWrapperViewController.h",
+    "React/UIView+React.h": RCTVIEWS_PATH + "UIView+React.h",
+}
+
+REACT_COMPONENTVIEWS_BASE_FILES = [
+    "React/Fabric/Mounting/ComponentViews/Image/*.mm",
+    "React/Fabric/RCTImageResponseObserverProxy.mm",
+    "React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm",
+]
+
+rn_xplat_cxx_library2(
+    name = "ReactInternal",
+    srcs = glob(
+        [
+            "React/Base/**/*.m",
+            "React/Base/**/*.mm",
+            "React/DevSupport/**/*.m",
+            "React/DevSupport/**/*.mm",
+            "React/Inspector/**/*.m",
+            "React/Inspector/**/*.mm",
+            "React/Modules/**/*.m",
+            "React/Modules/**/*.mm",
+            "React/Profiler/**/*.m",
+            "React/Profiler/**/*.mm",
+            "React/Profiler/**/*.S",
+            "React/UIUtils/*.m",
+            "React/Views/**/*.m",
+            "React/Views/**/*.mm",
+            "Libraries/ActionSheetIOS/*.m",
+            "Libraries/WebSocket/*.m",
+        ],
+    ),
+    headers = glob(
+        [
+            "React/Base/**/*.h",
+            "React/DevSupport/**/*.h",
+            "React/Inspector/**/*.h",
+            "React/Modules/**/*.h",
+            "React/Profiler/**/*.h",
+            "React/Views/**/*.h",
+            "React/UIUtils/**/*.h",
+            "Libraries/ActionSheetIOS/*.h",
+            "Libraries/WebSocket/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = REACT_PUBLIC_HEADERS,
+    compiler_flags = [
+        "-Wno-error=unguarded-availability-new",
+        "-Wno-unknown-warning-option",
+        "-Wno-global-constructors",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    exported_linker_flags = [
+        "-weak_framework",
+        "UserNotifications",
+        "-weak_framework",
+        "WebKit",
+    ],
+    exported_preprocessor_flags = rn_extra_build_flags(),
+    fbobjc_enable_exceptions = True,
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/CFNetwork.framework",
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
+        "$SDKROOT/System/Library/Frameworks/CoreLocation.framework",
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/MapKit.framework",
+        "$SDKROOT/System/Library/Frameworks/QuartzCore.framework",
+        "$SDKROOT/System/Library/Frameworks/Security.framework",
+        "$SDKROOT/System/Library/Frameworks/SystemConfiguration.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+        "$SDKROOT/System/Library/Frameworks/UserNotifications.framework",
+    ],
+    labels = [
+        "depslint_never_add",
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    platform_preprocessor_flags = [(
+        "linux",
+        ["-D PIC_MODIFIER=@PLT"],
+    )],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + [
+        "-DHERMES_BYTECODE_VERSION={}".format(HERMES_BYTECODE_VERSION),
+    ] + rn_extra_build_flags(),
+    visibility = [
+        "//fbobjc/Apps/Internal/SparkLabs/...",
+        "//fbobjc/Apps/Internal/Venice/...",
+        "//fbobjc/Apps/Wilde/FBMarketplaceModule/...",
+        "//fbobjc/Apps/Wilde/FBReactModule2/...",
+        "//fbobjc/Libraries/FBQPLMetadataProviders/...",
+        "//fbobjc/Libraries/FBReactKit/...",
+        "//fbobjc/Libraries/FBiOSSecurityUtils/...",
+        "//fbobjc/VendorLib/react-native-maps:react-native-maps",
+        "//xplat/js:",
+        "//xplat/js/react-native-github/React/...",
+        "//xplat/js/react-native-github/ReactCommon/react/nativemodule/core:",
+        "//xplat/js/react-native-github/ReactCommon/react/nativemodule/samples:",
+        "//xplat/js/react-native-github/packages/rn-tester:",
+    ],
+    deps = [
+        YOGA_CXX_TARGET,
+        react_native_xplat_target("cxxreact:bridge"),
+        react_native_xplat_target("reactperflogger:reactperflogger"),
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTFabric",
+    srcs = glob(
+        [
+            "React/Fabric/**/*.cpp",
+            "React/Fabric/**/*.m",
+            "React/Fabric/**/*.mm",
+        ],
+        exclude = glob(REACT_COMPONENTVIEWS_BASE_FILES),
+    ),
+    headers = glob(
+        [
+            "React/Fabric/**/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = {
+        "React/RCTComponentViewDescriptor.h": "React/Fabric/Mounting/RCTComponentViewDescriptor.h",
+        "React/RCTComponentViewFactory.h": "React/Fabric/Mounting/RCTComponentViewFactory.h",
+        "React/RCTComponentViewRegistry.h": "React/Fabric/Mounting/RCTComponentViewRegistry.h",
+        "React/RCTFabricSurface.h": "React/Fabric/Surface/RCTFabricSurface.h",
+        "React/RCTFabricSurfaceHostingProxyRootView.h": "React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h",
+        "React/RCTFabricSurfaceHostingView.h": "React/Fabric/Surface/RCTFabricSurfaceHostingView.h",
+        "React/RCTGenericDelegateSplitter.h": "React/Fabric/Utils/RCTGenericDelegateSplitter.h",
+        "React/RCTLegacyViewManagerInteropComponentView.h": "React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h",
+        "React/RCTLocalizationProvider.h": "React/Fabric/RCTLocalizationProvider.h",
+        "React/RCTModalHostViewComponentView.h": "React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h",
+        "React/RCTMountingManager.h": "React/Fabric/Mounting/RCTMountingManager.h",
+        "React/RCTMountingManagerDelegate.h": "React/Fabric/Mounting/RCTMountingManagerDelegate.h",
+        "React/RCTMountingTransactionObserving.h": "React/Fabric/Mounting/RCTMountingTransactionObserving.h",
+        "React/RCTParagraphComponentAccessibilityProvider.h": "React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h",
+        "React/RCTParagraphComponentView.h": "React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.h",
+        "React/RCTPrimitives.h": "React/Fabric/RCTPrimitives.h",
+        "React/RCTRootComponentView.h": "React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.h",
+        "React/RCTScheduler.h": "React/Fabric/RCTScheduler.h",
+        "React/RCTScrollViewComponentView.h": "React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h",
+        "React/RCTSurfacePresenter.h": "React/Fabric/RCTSurfacePresenter.h",
+        "React/RCTSurfacePresenterBridgeAdapter.h": "React/Fabric/RCTSurfacePresenterBridgeAdapter.h",
+        "React/RCTSurfaceRegistry.h": "React/Fabric/RCTSurfaceRegistry.h",
+        "React/RCTSurfaceTouchHandler.h": "React/Fabric/RCTSurfaceTouchHandler.h",
+    },
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    fbobjc_enable_exceptions = True,
+    fbobjc_target_sdk_version = "11.0",
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/QuartzCore.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "disable_plugins_only_validation",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins = [
+        react_fabric_component_plugin_provider("SafeAreaView", "RCTSafeAreaViewCls"),
+        react_fabric_component_plugin_provider("ScrollView", "RCTScrollViewCls"),
+        react_fabric_component_plugin_provider("PullToRefreshView", "RCTPullToRefreshViewCls"),
+        react_fabric_component_plugin_provider("ActivityIndicatorView", "RCTActivityIndicatorViewCls"),
+        react_fabric_component_plugin_provider("Slider", "RCTSliderCls"),
+        react_fabric_component_plugin_provider("Switch", "RCTSwitchCls"),
+        react_fabric_component_plugin_provider("UnimplementedNativeView", "RCTUnimplementedNativeViewCls"),
+        react_fabric_component_plugin_provider("Paragraph", "RCTParagraphCls"),
+        react_fabric_component_plugin_provider("TextInput", "RCTTextInputCls"),
+        react_fabric_component_plugin_provider("InputAccessoryView", "RCTInputAccessoryCls"),
+        react_fabric_component_plugin_provider("View", "RCTViewCls"),
+    ],
+    plugins_header = "FBRCTFabricComponentsPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + [
+        "-DWITH_FBSYSTRACE=1",
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ] + rn_extra_build_flags(),
+    tests = [
+        ":MountingTests",
+        ":TextTests",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":RCTFabricComponentViewsBase",
+        "//fbobjc/Libraries/FBReactKit/RCTFabricComponent/RCTFabricComponentPlugin:RCTFabricComponentPlugin",
+        "//xplat/js/react-native-github:RCTCxxBridge",
+        "//xplat/js/react-native-github:RCTCxxUtils",
+        "//xplat/js/react-native-github:RCTImage",
+        "//xplat/js/react-native-github:RCTPushNotification",
+        "//xplat/js/react-native-github:RCTText",
+        "//xplat/js/react-native-github:ReactInternal",
+        react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
+        react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
+        react_native_xplat_target("react/renderer/componentregistry/native:native"),
+        react_native_xplat_target("react/renderer/textlayoutmanager:textlayoutmanager"),
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        YOGA_CXX_TARGET,
+        react_native_xplat_target("react/config:config"),
+        react_native_xplat_target("cxxreact:bridge"),
+    ],
+    exported_deps = [
+        react_native_xplat_target("react/renderer/animations:animations"),
+        react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
+        react_native_xplat_target("react/renderer/components/slider:slider"),
+        react_native_xplat_target("react/renderer/components/safeareaview:safeareaview"),
+        react_native_xplat_target("react/renderer/components/modal:modal"),
+        react_native_xplat_target("react/renderer/components/unimplementedview:unimplementedview"),
+        react_native_xplat_target("react/renderer/components/text:text"),
+        react_native_xplat_target("react/renderer/components/legacyviewmanagerinterop:legacyviewmanagerinterop"),
+        react_native_xplat_target("react/renderer/components/textinput/iostextinput:iostextinput"),
+        react_native_xplat_target("react/renderer/components/inputaccessory:inputaccessory"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/debug:debug"),
+        react_native_xplat_target("react/renderer/scheduler:scheduler"),
+        react_native_xplat_target("react/renderer/uimanager:uimanager"),
+        "//xplat/js/react-native-github:generated_components-rncore",
+    ],
+)
+
+rn_apple_library(
+    name = "RCTTypeSafety",
+    srcs = glob([
+        "Libraries/TypeSafety/**/*.mm",
+    ]),
+    exported_headers = glob(
+        [
+            "Libraries/TypeSafety/**/*.h",
+        ],
+    ),
+    autoglob = False,
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    extension_api_only = True,
+    frameworks = [
+        "$PLATFORM_DIR/Developer/Library/Frameworks/Foundation.framework",
+    ],
+    inherited_buck_flags = get_static_library_ios_flags(),
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    reexport_all_header_dependencies = True,
+    deps = [
+        ":ReactInternalApple",
+        "//xplat/folly:optionalApple",
+        "//xplat/js/react-native-github/Libraries/FBLazyVector:FBLazyVector",
+    ],
+)
+
+yarn_workspace(
+    name = "yarn-workspace",
+    srcs = [
+        "package.json",
+    ],
+    visibility = ["PUBLIC"],
+)
+
+fb_apple_test(
+    name = "TextTestsApple",
+    srcs = ["React/Tests/Text/RCTParagraphComponentViewTests.mm"],
+    frameworks = [
+        "$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework",
+    ],
+    oncall = "react_native",
+    deps = [
+        ":RCTFabricApple",
+        react_native_xplat_target("react/renderer/element:elementApple"),
+        "//xplat/js/react-native-github:RCTFabricComponentViewsBaseApple",
+        "//xplat/js/react-native-github:RCTTextApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/attributedstring:attributedstringApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/componentregistry:componentregistryApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/components/legacyviewmanagerinterop:legacyviewmanagerinteropApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/components/text:textApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/components/textinput/iostextinput:iostextinputApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/scheduler:schedulerApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/textlayoutmanager:textlayoutmanagerApple",
+        "//xplat/js/react-native-github/ReactCommon/runtimeexecutor:runtimeexecutorApple",
+    ],
+)
+
+fb_apple_test(
+    name = "MountingTestsApple",
+    srcs = ["React/Tests/Mounting/RCTComponentViewRegistryTests.mm"],
+    frameworks = [
+        "$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework",
+    ],
+    oncall = "react_native",
+    deps = [
+        ":ImageView",
+        ":RCTFabricApple",
+        "//xplat/js/react-native-github:RCTFabricComponentViewsBaseApple",
+        "//xplat/js/react-native-github:RCTTextApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/attributedstring:attributedstringApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/componentregistry:componentregistryApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/components/legacyviewmanagerinterop:legacyviewmanagerinteropApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/components/textinput/iostextinput:iostextinputApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/scheduler:schedulerApple",
+        "//xplat/js/react-native-github/ReactCommon/react/renderer/textlayoutmanager:textlayoutmanagerApple",
+        "//xplat/js/react-native-github/ReactCommon/runtimeexecutor:runtimeexecutorApple",
+    ],
+)
+
+rn_apple_library(
+    name = "ImageView",
+    autoglob = False,
+    compiler_flags = ["-Wall"],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    labels = [
+        "disable_plugins_only_validation",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins = [react_fabric_component_plugin_provider("Image", "RCTImageCls")],
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":RCTFabricComponentViewsBaseApple",
+    ],
+)
+
+# Reduce the RCTFabric target by moving OSS RCTViewComponentViews here, so that
+# eventually we can move all of React/Fabric/Mounting/ComponentViews/* here.
+# Ideally, each component view gets its own target, and each target uses react_fabric_component_plugin_provider.
+# For each component, an app can import the base component view, or an app-specific subclass.
+# i.e. Apps depend on "ImageView" target for RCTImageComponentView.h, and "FBReactImageView" target for FBReactImageComponentView.h
+rn_xplat_cxx_library2(
+    name = "RCTFabricComponentViewsBase",
+    srcs = glob(REACT_COMPONENTVIEWS_BASE_FILES),
+    header_namespace = "",
+    exported_headers = {
+        "React/RCTComponentViewProtocol.h": "React/Fabric/Mounting/RCTComponentViewProtocol.h",
+        "React/RCTConversions.h": "React/Fabric/RCTConversions.h",
+        "React/RCTImageComponentView.h": "React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h",
+        "React/RCTImageResponseDelegate.h": "React/Fabric/RCTImageResponseDelegate.h",
+        "React/RCTImageResponseObserverProxy.h": "React/Fabric/RCTImageResponseObserverProxy.h",
+        "React/RCTTouchableComponentViewProtocol.h": "React/Fabric/RCTTouchableComponentViewProtocol.h",
+        "React/RCTViewComponentView.h": "React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h",
+        "React/UIView+ComponentViewProtocol.h": "React/Fabric/Mounting/UIView+ComponentViewProtocol.h",
+    },
+    compiler_flags = ["-Wall"],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:RCTImage",
+        "//xplat/js/react-native-github:RCTLinking",
+        react_native_xplat_target("react/renderer/imagemanager:imagemanager"),
+        react_native_xplat_target("react/renderer/components/image:image"),
+        react_native_xplat_target("react/renderer/components/view:view"),
+        react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
+    ],
+)
+
+rn_library(
+    name = "react-native",
+    srcs = [
+        "package.json",
+        "index.js",
+    ] + glob(
+        [
+            "Libraries/**/*.js",
+            "Libraries/NewAppScreen/**/*.png",
+            "Libraries/LogBox/**/*.png",
+        ],
+        exclude = [
+            "**/__*__/**",
+            "**/gulpfile.js",
+            "Libraries/Components/Switch/SwitchSchema.js",
+        ],
+    ),
+    labels = ["supermodule:xplat/default/public.react_native.core"],
+    skip_processors = True,  # Don't anticipate routes or fbicon here
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js:node_modules__abort_19controller",
+        "//xplat/js:node_modules__anser",
+        "//xplat/js:node_modules__base64_19js",
+        "//xplat/js:node_modules__event_19target_19shim",
+        "//xplat/js:node_modules__invariant",
+        "//xplat/js:node_modules__nullthrows",
+        "//xplat/js:node_modules__pretty_19format",
+        "//xplat/js:node_modules__promise",
+        "//xplat/js:node_modules__prop_19types",
+        "//xplat/js:node_modules__react_19devtools_19core",
+        "//xplat/js:node_modules__react_19refresh",
+        "//xplat/js:node_modules__react_19shallow_19renderer",
+        "//xplat/js:node_modules__regenerator_19runtime",
+        "//xplat/js:node_modules__stacktrace_19parser",
+        "//xplat/js:node_modules__use_19subscription",
+        "//xplat/js:node_modules__whatwg_19fetch",
+        "//xplat/js/RKJSModules/Libraries/Polyfills:Polyfills",
+        "//xplat/js/RKJSModules/Libraries/React:React",
+        "//xplat/js/RKJSModules/vendor/react:react",
+        "//xplat/js/RKJSModules/vendor/react-test-renderer:react-test-renderer",
+        "//xplat/js/RKJSModules/vendor/scheduler:scheduler",
+        "//xplat/js/react-native-github/packages/assets:assets",
+        "//xplat/js/react-native-github/packages/normalize-color:normalize-color",
+        "//xplat/js/react-native-github/packages/polyfills:polyfills",
+        "//xplat/js/tools/metro/packages/metro-runtime/src/modules:modules",
+        "//xplat/js/tools/metro/packages/metro-runtime/src/polyfills:polyfills",
+    ],
+)
+
+rn_codegen(
+    name = "FBReactNativeSpec",
+    android_package_name = "com.facebook.fbreact.specs",
+    codegen_modules = True,
+    ios_assume_nonnull = False,
+    library_labels = ["supermodule:xplat/default/public.react_native.infra"],
+    native_module_spec_name = "FBReactNativeSpec",
+    src_prefix = "Libraries/",
+)
+
+# TODO: Merge this into FBReactNativeSpec
+rn_codegen(
+    name = "FBReactNativeComponentSpec",
+    codegen_components = True,
+    ios_assume_nonnull = False,
+    library_labels = ["supermodule:xplat/default/public.react_native.infra"],
+    src_prefix = "Libraries/",
+)
+
+rn_apple_library(
+    name = "RCTAnimationApple",
+    srcs = glob([
+        "Libraries/NativeAnimation/**/*.m",
+        "Libraries/NativeAnimation/**/*.mm",
+    ]),
+    headers = glob(
+        [
+            "Libraries/NativeAnimation/**/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = glob(
+        [
+            "Libraries/NativeAnimation/*.h",
+            "Libraries/NativeAnimation/Drivers/*.h",
+            "Libraries/NativeAnimation/Nodes/*.h",
+        ],
+    ),
+    autoglob = False,
+    frameworks = [
+        "Foundation",
+        "QuartzCore",
+        "UIKit",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
+        "extension_api_allow_unsafe_unavailable_usages",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins =
+        react_module_plugin_providers(
+            name = "NativeAnimatedModule",
+            native_class_func = "RCTNativeAnimatedModuleCls",
+        ) + react_module_plugin_providers(
+            name = "NativeAnimatedTurboModule",
+            native_class_func = "RCTNativeAnimatedTurboModuleCls",
+        ),
+    plugins_header = "FBRCTAnimationPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+    ],
+)
+
+rn_apple_library(
+    name = "RCTBlobApple",
+    srcs = glob([
+        "Libraries/Blob/*.m",
+        "Libraries/Blob/*.mm",
+    ]),
+    headers = glob(
+        [
+            "Libraries/Blob/*.h",
+        ],
+    ),
+    exported_headers = glob(
+        [
+            "Libraries/Blob/*.h",
+        ],
+    ),
+    autoglob = False,
+    enable_exceptions = True,
+    frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins =
+        react_module_plugin_providers(
+            name = "FileReaderModule",
+            native_class_func = "RCTFileReaderModuleCls",
+        ) + react_module_plugin_providers(
+            name = "BlobModule",
+            native_class_func = "RCTBlobManagerCls",
+        ) + [
+            plugin(
+                RCT_URL_REQUEST_HANDLER_SOCKET,
+                name = "BlobModule",
+            ),
+        ],
+    plugins_header = "FBRCTBlobPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":RCTNetworkApple",
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+        "//xplat/js/react-native-github/React/CoreModules:CoreModulesApple",
+        "//xplat/jsi:jsiApple",
+    ],
+)
+
+rn_apple_library(
+    name = "RCTLinkingApple",
+    srcs = glob([
+        "Libraries/LinkingIOS/*.m",
+        "Libraries/LinkingIOS/*.mm",
+    ]),
+    headers = glob(
+        [
+            "Libraries/LinkingIOS/*.h",
+        ],
+    ),
+    exported_headers = glob(
+        [
+            "Libraries/LinkingIOS/*.h",
+        ],
+    ),
+    autoglob = False,
+    enable_exceptions = True,
+    frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
+        "extension_api_allow_unsafe_unavailable_usages",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins =
+        react_module_plugin_providers(
+            name = "LinkingManager",
+            native_class_func = "RCTLinkingManagerCls",
+        ),
+    plugins_header = "FBRCTLinkingPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+        "//xplat/jsi:jsiApple",
+    ],
+)
+
+rn_apple_library(
+    name = "RCTPushNotificationApple",
+    srcs = glob([
+        "Libraries/PushNotificationIOS/*.m",
+        "Libraries/PushNotificationIOS/*.mm",
+    ]),
+    headers = glob(
+        [
+            "Libraries/PushNotificationIOS/*.h",
+        ],
+    ),
+    exported_headers = glob(
+        [
+            "Libraries/PushNotificationIOS/*.h",
+        ],
+    ),
+    autoglob = False,
+    enable_exceptions = True,
+    frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
+        "extension_api_allow_unsafe_unavailable_usages",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins =
+        react_module_plugin_providers(
+            name = "PushNotificationManager",
+            native_class_func = "RCTPushNotificationManagerCls",
+        ),
+    plugins_header = "FBRCTPushNotificationPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+        "//xplat/jsi:jsiApple",
+    ],
+)
+
+rn_apple_library(
+    name = "RCTImageApple",
+    srcs = glob([
+        "Libraries/Image/*.m",
+        "Libraries/Image/*.mm",
+    ]),
+    headers = glob(
+        [
+            "Libraries/Image/*.h",
+        ],
+    ),
+    exported_headers = glob(
+        [
+            "Libraries/Image/*.h",
+        ],
+    ),
+    autoglob = False,
+    frameworks = [
+        "AVFoundation",
+        "Accelerate",
+        "CoreMedia",
+        "Foundation",
+        "ImageIO",
+        "MobileCoreServices",
+        "QuartzCore",
+        "UIKit",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
+        "extension_api_allow_unsafe_unavailable_usages",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins =
+        react_module_plugin_providers(
+            name = "GIFImageDecoder",
+            native_class_func = "RCTGIFImageDecoderCls",
+        ) + react_module_plugin_providers(
+            name = "ImageEditingManager",
+            native_class_func = "RCTImageEditingManagerCls",
+        ) + react_module_plugin_providers(
+            name = "ImageLoader",
+            native_class_func = "RCTImageLoaderCls",
+        ) + react_module_plugin_providers(
+            name = "ImageStoreManager",
+            native_class_func = "RCTImageStoreManagerCls",
+        ) + react_module_plugin_providers(
+            name = "LocalAssetImageLoader",
+            native_class_func = "RCTLocalAssetImageLoaderCls",
+        ) + [
+            plugin(
+                RCT_IMAGE_DATA_DECODER_SOCKET,
+                name = "GIFImageDecoder",
+            ),
+            plugin(
+                RCT_IMAGE_URL_LOADER_SOCKET,
+                name = "LocalAssetImageLoader",
+            ),
+            plugin(
+                RCT_URL_REQUEST_HANDLER_SOCKET,
+                name = "ImageLoader",
+            ),
+            plugin(
+                RCT_URL_REQUEST_HANDLER_SOCKET,
+                name = "ImageStoreManager",
+            ),
+        ],
+    plugins_header = "FBRCTImagePlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":RCTNetworkApple",
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+    ],
+)
+
+RCTNETWORK_PUBLIC_HEADERS = [
+    "Libraries/Network/RCTNetworkTask.h",
+    "Libraries/Network/RCTNetworking.h",
+]
+
+rn_apple_library(
+    name = "RCTNetworkApple",
+    srcs = glob([
+        "Libraries/Network/*.m",
+        "Libraries/Network/*.mm",
+    ]),
+    headers = glob(
+        [
+            "Libraries/Network/*.h",
+        ],
+        exclude = RCTNETWORK_PUBLIC_HEADERS,
+    ),
+    exported_headers = RCTNETWORK_PUBLIC_HEADERS,
+    autoglob = False,
+    enable_exceptions = True,
+    frameworks = [
+        "CoreTelephony",
+        "Foundation",
+        "MobileCoreServices",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
+        "extension_api_allow_unsafe_unavailable_usages",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins =
+        react_module_plugin_providers(
+            name = "Networking",
+            native_class_func = "RCTNetworkingCls",
+        ) + react_module_plugin_providers(
+            name = "DataRequestHandler",
+            native_class_func = "RCTDataRequestHandlerCls",
+        ) + react_module_plugin_providers(
+            name = "FileRequestHandler",
+            native_class_func = "RCTFileRequestHandlerCls",
+        ) + react_module_plugin_providers(
+            name = "HTTPRequestHandler",
+            native_class_func = "RCTHTTPRequestHandlerCls",
+        ) + [
+            plugin(
+                RCT_URL_REQUEST_HANDLER_SOCKET,
+                name = "DataRequestHandler",
+            ),
+            plugin(
+                RCT_URL_REQUEST_HANDLER_SOCKET,
+                name = "FileRequestHandler",
+            ),
+            plugin(
+                RCT_URL_REQUEST_HANDLER_SOCKET,
+                name = "HTTPRequestHandler",
+            ),
+        ],
+    plugins_header = "FBRCTNetworkPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+    ],
+)
+
+rn_apple_library(
+    name = "RCTSettingsApple",
+    srcs = glob([
+        "Libraries/Settings/*.m",
+        "Libraries/Settings/*.mm",
+    ]),
+    exported_headers = glob(
+        [
+            "Libraries/Settings/*.h",
+        ],
+    ),
+    autoglob = False,
+    frameworks = [
+        "Foundation",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
+    ],
+    plugins = react_module_plugin_providers(
+        name = "SettingsManager",
+        native_class_func = "RCTSettingsManagerCls",
+    ),
+    plugins_header = "FBRCTSettingsPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTText",
+    srcs = glob([
+        "Libraries/Text/**/*.m",
+        "Libraries/Text/**/*.mm",
+    ]),
+    headers = glob(
+        [
+            "Libraries/Text/**/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            (
+                "Libraries/Text",
+                "*.h",
+            ),
+            (
+                "Libraries/Text/BaseText",
+                "*.h",
+            ),
+            (
+                "Libraries/Text/RawText",
+                "*.h",
+            ),
+            (
+                "Libraries/Text/Text",
+                "*.h",
+            ),
+            (
+                "Libraries/Text/TextInput",
+                "*.h",
+            ),
+            (
+                "Libraries/Text/TextInput/Multiline",
+                "*.h",
+            ),
+            (
+                "Libraries/Text/TextInput/Singleline",
+                "*.h",
+            ),
+            (
+                "Libraries/Text/VirtualText",
+                "*.h",
+            ),
+        ],
+        prefix = "React",
+    ),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:RCTLinking",
+        "//xplat/js/react-native-github:RCTPushNotification",
+        "//xplat/js/react-native-github:ReactInternal",
+        YOGA_CXX_TARGET,
+    ],
+)
+
+rn_apple_library(
+    name = "RCTVibrationApple",
+    srcs = glob([
+        "Libraries/Vibration/**/*.m",
+        "Libraries/Vibration/**/*.mm",
+    ]),
+    exported_headers = glob(
+        [
+            "Libraries/Vibration/*.h",
+        ],
+    ),
+    autoglob = False,
+    frameworks = [
+        "AudioToolbox",
+        "Foundation",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "depslint_never_remove",
+        "disable_plugins_only_validation",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    plugins = react_module_plugin_providers(
+        name = "Vibration",
+        native_class_func = "RCTVibrationCls",
+    ),
+    plugins_header = "FBRCTVibrationPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTWrapper",
+    srcs = glob([
+        "Libraries/Wrapper/*.m",
+        "Libraries/Wrapper/*.mm",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            (
+                "Libraries/Wrapper",
+                "*.h",
+            ),
+        ],
+        prefix = "RCTWrapper",
+    ),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+    labels = [
+        "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:RCTLinking",
+        "//xplat/js/react-native-github:RCTPushNotification",
+        "//xplat/js/react-native-github:ReactInternal",
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTWrapperExample",
+    srcs = glob([
+        "Libraries/Wrapper/Example/*.m",
+        "Libraries/Wrapper/Example/*.mm",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            (
+                "Libraries/Wrapper/Example",
+                "*.h",
+            ),
+        ],
+        prefix = "RCTWrapperExample",
+    ),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+    labels = [
+        "depslint_never_remove",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    visibility = ["PUBLIC"],
+    deps = [
+        ":RCTWrapper",
+        "//xplat/js/react-native-github:RCTLinking",
+        "//xplat/js/react-native-github:RCTPushNotification",
+        "//xplat/js/react-native-github:ReactInternal",
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTSurfaceHostingComponent",
+    srcs = glob([
+        "Libraries/SurfaceHostingComponent/**/*.m",
+        "Libraries/SurfaceHostingComponent/**/*.mm",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            (
+                "Libraries/SurfaceHostingComponent",
+                "*.h",
+            ),
+        ],
+        prefix = "RCTSurfaceHostingComponent",
+    ),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+    labels = [
+        "depslint_never_remove",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    visibility = ["PUBLIC"],
+    deps = [
+        "//fbobjc/Libraries/MobileUI/ComponentKit:ComponentKit",
+        "//xplat/js/react-native-github:RCTLinking",
+        "//xplat/js/react-native-github:RCTPushNotification",
+        "//xplat/js/react-native-github:ReactInternal",
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTSurfaceBackedComponent",
+    srcs = glob([
+        "Libraries/SurfaceBackedComponent/**/*.m",
+        "Libraries/SurfaceBackedComponent/**/*.mm",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            (
+                "Libraries/SurfaceBackedComponent",
+                "*.h",
+            ),
+        ],
+        prefix = "RCTSurfaceBackedComponent",
+    ),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+    labels = [
+        "depslint_never_remove",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    visibility = ["PUBLIC"],
+    deps = [
+        ":RCTSurfaceHostingComponent",
+        "//fbobjc/Libraries/MobileUI/ComponentKit:ComponentKit",
+        "//xplat/js/react-native-github:RCTLinking",
+        "//xplat/js/react-native-github:RCTPushNotification",
+        "//xplat/js/react-native-github:ReactInternal",
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RCTMapView_RNHeader",
+    header_namespace = "",
+    exported_headers = {
+        "React/RCTConvert+CoreLocation.h": RCTVIEWS_PATH + "RCTConvert+CoreLocation.h",
+    },
+    labels = [
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:RCTMapView",
+        "//fbobjc/VendorLib/react-native-maps:react-native-maps",
+    ],
+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 54af9968ff92a5..4944366f7b5ce3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,10 +21,19 @@ If you wish to contribute changes back to the **microsoft/react-native-macos** r
 git clone https://github.com/johndoe/react-native-macos.git
 ```
 
+### [Code of Conduct](https://github.com/facebook/react-native/blob/HEAD/CODE_OF_CONDUCT.md)
+
+As a reminder, all contributors are expected to adhere to the [Code of Conduct](https://github.com/facebook/react-native/blob/HEAD/CODE_OF_CONDUCT.md).
+
 ### Setting up the upstream repository
 
 Before starting to contribute changes, please setup your upstream repository to the primary **microsoft/react-native-macos** repository.
 
+
+1. **Replying and handling open issues.** We get a lot of issues every day, and some of them may lack necessary information. You can help out by guiding people through the process of filling out the issue template, asking for clarifying information, or pointing them to existing issues that match their description of the problem. We cover more about this process in the [Issue Triage wiki](https://github.com/facebook/react-native/wiki/Triaging-GitHub-Issues).
+2. **Reviewing pull requests for the docs.** Reviewing [documentation updates](https://github.com/facebook/react-native-website/pulls) can be as simple as checking for spelling and grammar. If you encounter situations that can be explained better in the docs, click **Edit** at the top of most docs pages to get started with your own contribution.
+3. **Help people write test plans.** Some pull requests sent to the main repository may lack a proper test plan. These help reviewers understand how the change was tested, and can speed up the time it takes for a contribution to be accepted.
+
 - When you run `git remote -v`, you should see only your fork in the output list
 
 ```bash
@@ -42,6 +51,9 @@ git remote add upstream https://github.com/microsoft/react-native-macos.git
 
 - Now running `git remote -v` should show the upstream repository also
 
+* [Issues](https://github.com/facebook/react-native/wiki/Triaging-GitHub-Issues)
+* [Pull Requests](https://github.com/facebook/react-native/wiki/Managing-Pull-Requests)
+
 ```bash
 git remote -v
 
@@ -57,12 +69,19 @@ git remote -v
 
 For each bug or task you complete, it is recommended that you start with a fresh branch. If you have any lingering changes in your current branch that you want to save, go ahead and commit them. If you are just beginning, then you are good to go. On github, navigate to your repository which should be forked from **microsoft/react-native-macos** as described in the above sections. Above the list of files is a dropdown that should say master. Use the dropdown to create a new branch and name is according to what you will be working on. (I.e. DropdownHighlight, CleanUpExamples, etc). Now you have created a new branch. 
 
+* **React Native website** which contains the source code for the website, including the documentation, located at <https://github.com/facebook/react-native-website>
+* **Releases** are coordinated through the <https://github.com/react-native-community/releases> repository. This includes important documents such as the Changelog.
+* **Discussions** about the future of React Native take place in the <https://github.com/react-native-community/discussions-and-proposals> repository.
+* **High-quality plugins** for React Native can be found throughout the [React Native Community GitHub Organization](http://github.com/react-native-community/).
+
 **SourceTree:**
 If you are using SourceTree you will want your branch to show up in SourceTree so you can commit changes to your branch. It takes time for it to show up automatically, so you can make it show by running `git pull --all` in your command prompt from the root. Once you see your new branch in SourceTree under Remotes on the left navigation pane, double click on your branch to check it out locally. A dialog will come up and the default settings should be fine, click Ok.  
 
 **Git Command Line**
 If you are using the command line, you will want to make sure you have your branch locally. It takes time for it to show up automatically, so you can make it show by running `git pull --all` in your command prompt from the root. Run `git branch -a` to see if your new branch shows up. Now you will want to check out your branch locally. You can do this with `git checkout -b branch-name`. Confirm you are now working out of the branch with `git branch`.
 
+We use GitHub issues to track bugs exclusively. We have documented our issue handling processes in the [Issues wiki](https://github.com/facebook/react-native/wiki/Triaging-GitHub-Issues).
+
 ### Merging upstream master into your fork master
 
 From time to time, your fork will get out of sync with the upstream remote. Use the following commands to get the master branch of your fork up up to date.
@@ -102,6 +121,8 @@ sudo xcode-select -s /Applications/Xcode.app
 arch -x86_64 pod install
 ```
 
+The React Native blog is generated [from the Markdown sources for the blog](https://github.com/facebook/react-native-website/tree/HEAD/website/blog).
+
 ### Make the fix
 Now that your branch is set up and ready for commits, go ahead and fix the bug you are working on or make some small change that you want to check in. 
  
@@ -114,6 +135,8 @@ yarn lint # run eslint on JavaScript
 yarn flow-check-macos # run Flow checks on JavaScript
 ```
 
+We recommend referring to the [CONTRIBUTING](https://github.com/facebook/react-native-website/blob/HEAD/CONTRIBUTING.md) document for the `react-native-website` repository to learn more about contributing to the website in general.
+
 ### Commit your changes
 
 **SourceTree:**
@@ -127,7 +150,18 @@ You can commit multiple times until you are ready to make a pull request. You sh
 ### Provide changelog information
 Run `yarn change` in the root of the repo.
 
-### Create a Pull Request
+1. Fork the React Native repository and create your branch from `main`.
+2. Make the desired changes to React Native sources. Use the `packages/rn-tester` app to test them out.
+3. If you've added code that should be tested, add tests.
+4. If you've changed APIs, update the documentation, which lives in [another repo](https://github.com/facebook/react-native-website/).
+5. Ensure the test suite passes, either locally or on CI once you opened a pull request.
+6. Make sure your code lints (for example via `yarn lint --fix`).
+7. Push the changes to your fork.
+8. Create a pull request to the React Native repository.
+9. Review and address comments on your pull request.
+    1. A bot may comment with suggestions. Generally we ask you to resolve these first before a maintainer will review your code.
+    2. If changes are requested and addressed, please [request review](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review) to notify reviewers to take another look.
+10. If you haven't already, please complete the [Contributor License Agreement](https://github.com/facebook/react-native/wiki/Contributor-License-Agreement) ("CLA"). **[Complete your CLA here.](https://code.facebook.com/cla)**
 
 **SourceTree:**
 In SourceTree click Push.
@@ -135,13 +169,11 @@ In SourceTree click Push.
 **Git Command Line**
 Run `git push`. 
 
-This will push any staged files you have in your branch.
- 
-Now go back to your fork on github. You should see a yellow bar at the top with your change and a button that says "Compare & Pull Request". Click that button. 
+Whenever you are ready to contribute code, check out our [step-by-step guide to sending your first pull request](https://github.com/facebook/react-native/wiki/How-to-Open-a-Pull-Request), or read the [How to Contribute Code](https://github.com/facebook/react-native/wiki/How-to-Contribute-Code) wiki for more details.
 
 Click "Create Pull Request".
 
-A bunch of tests will automatically kick off to verify your PR.  The tests marked as `required` must pass before a PR can be merged.  
+Tests help us prevent regressions from being introduced to the codebase. The GitHub repository is continuously tested using Circle and Appveyor, the results of which are available through the Checks functionality on [commits](https://github.com/facebook/react-native/commits/HEAD) and pull requests. You can learn more about running and writing tests in the [Tests wiki](http://github.com/facebook/react-native/wiki/Tests).
 
 Someone will also have to review your change before the change is allowed to be merged in. They may ask questions for more information or ask you to change things. Be sure to respond to their comments and push additional changes to the branch if they ask you to modify things before they sign off.
 
diff --git a/Folly/folly/portability/Time.h b/Folly/folly/portability/Time.h
index 0f024aab82f5d2..d4688ef8249900 100644
--- a/Folly/folly/portability/Time.h
+++ b/Folly/folly/portability/Time.h
@@ -28,8 +28,8 @@
 // then enable our implementation on the source side so that
 // gets linked in instead.
 #if __MACH__ &&                                                \
-    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12 || \
-     __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)
+    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0 || \ // TODO(macOS GH#774): Upgrade min allowed version to fix type redefinition bug with clock_t
+     __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_12_0) // TODO(macOS GH#774): Upgrade min allowed version to fix type redefinition bug with clock_t
 
 #ifdef FOLLY_HAVE_CLOCK_GETTIME
 #undef FOLLY_HAVE_CLOCK_GETTIME
diff --git a/IntegrationTests/AccessibilityManagerTest.js b/IntegrationTests/AccessibilityManagerTest.js
index 7501170f3acf89..a6f4c0d93bb64c 100644
--- a/IntegrationTests/AccessibilityManagerTest.js
+++ b/IntegrationTests/AccessibilityManagerTest.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import invariant from 'invariant';
 import NativeAccessibilityManager from 'react-native/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager';
 import {DeviceEventEmitter, NativeModules, View} from 'react-native';
diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js
index 12d9f3d620f331..51ce374556e90b 100644
--- a/IntegrationTests/AsyncStorageTest.js
+++ b/IntegrationTests/AsyncStorageTest.js
@@ -16,6 +16,7 @@ const {AsyncStorage, Text, View, StyleSheet} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
 const deepDiffer = require('react-native/Libraries/Utilities/differ/deepDiffer');
+const nullthrows = require('nullthrows');
 
 const DEBUG = false;
 
@@ -43,15 +44,32 @@ function expectTrue(condition: boolean, message: string) {
   }
 }
 
+// Type-safe wrapper around JSON.stringify
+function stringify(
+  value:
+    | void
+    | null
+    | string
+    | number
+    | boolean
+    | {...}
+    | $ReadOnlyArray<mixed>,
+): string {
+  if (typeof value === 'undefined') {
+    return 'undefined';
+  }
+  return JSON.stringify(value);
+}
+
 function expectEqual(lhs, rhs, testname: string) {
   expectTrue(
     !deepDiffer(lhs, rhs),
     'Error in test ' +
       testname +
       ': expected\n' +
-      JSON.stringify(rhs) +
+      stringify(rhs) +
       '\ngot\n' +
-      JSON.stringify(lhs),
+      stringify(lhs),
   );
 }
 
@@ -61,7 +79,7 @@ function expectAsyncNoError(place, err) {
   }
   expectTrue(
     err === null,
-    'Unexpected error in ' + place + ': ' + JSON.stringify(err),
+    'Unexpected error in ' + place + ': ' + stringify(err),
   );
 }
 
@@ -71,7 +89,7 @@ function testSetAndGet() {
     AsyncStorage.getItem(KEY_1, (err2, result) => {
       expectAsyncNoError('testSetAndGet/getItem', err2);
       expectEqual(result, VAL_1, 'testSetAndGet setItem');
-      updateMessage('get(key_1) correctly returned ' + result);
+      updateMessage('get(key_1) correctly returned ' + String(result));
       runTestCase('should get null for missing key', testMissingGet);
     });
   });
@@ -81,7 +99,7 @@ function testMissingGet() {
   AsyncStorage.getItem(KEY_2, (err, result) => {
     expectAsyncNoError('testMissingGet/setItem', err);
     expectEqual(result, null, 'testMissingGet');
-    updateMessage('missing get(key_2) correctly returned ' + result);
+    updateMessage('missing get(key_2) correctly returned ' + String(result));
     runTestCase('check set twice results in a single key', testSetTwice);
   });
 }
@@ -105,8 +123,9 @@ function testRemoveItem() {
       AsyncStorage.getAllKeys((err, result) => {
         expectAsyncNoError('testRemoveItem/getAllKeys', err);
         expectTrue(
-          result.indexOf(KEY_1) >= 0 && result.indexOf(KEY_2) >= 0,
-          'Missing KEY_1 or KEY_2 in ' + '(' + result + ')',
+          nullthrows(result).indexOf(KEY_1) >= 0 &&
+            nullthrows(result).indexOf(KEY_2) >= 0,
+          'Missing KEY_1 or KEY_2 in ' + '(' + nullthrows(result).join() + ')',
         );
         updateMessage('testRemoveItem - add two items');
         AsyncStorage.removeItem(KEY_1, err2 => {
@@ -123,8 +142,8 @@ function testRemoveItem() {
             AsyncStorage.getAllKeys((err4, result3) => {
               expectAsyncNoError('testRemoveItem/getAllKeys', err4);
               expectTrue(
-                result3.indexOf(KEY_1) === -1,
-                'Unexpected: KEY_1 present in ' + result3,
+                nullthrows(result3).indexOf(KEY_1) === -1,
+                'Unexpected: KEY_1 present in ' + nullthrows(result3).join(),
               );
               updateMessage('proper length returned.');
               runTestCase('should merge values', testMerge);
@@ -137,13 +156,17 @@ function testRemoveItem() {
 }
 
 function testMerge() {
-  AsyncStorage.setItem(KEY_MERGE, JSON.stringify(VAL_MERGE_1), err1 => {
+  AsyncStorage.setItem(KEY_MERGE, stringify(VAL_MERGE_1), err1 => {
     expectAsyncNoError('testMerge/setItem', err1);
-    AsyncStorage.mergeItem(KEY_MERGE, JSON.stringify(VAL_MERGE_2), err2 => {
+    AsyncStorage.mergeItem(KEY_MERGE, stringify(VAL_MERGE_2), err2 => {
       expectAsyncNoError('testMerge/mergeItem', err2);
       AsyncStorage.getItem(KEY_MERGE, (err3, result) => {
         expectAsyncNoError('testMerge/setItem', err3);
-        expectEqual(JSON.parse(result), VAL_MERGE_EXPECT, 'testMerge');
+        expectEqual(
+          JSON.parse(nullthrows(result)),
+          VAL_MERGE_EXPECT,
+          'testMerge',
+        );
         updateMessage('objects deeply merged\nDone!');
         runTestCase('multi set and get', testOptimizedMultiGet);
       });
@@ -165,8 +188,7 @@ function testOptimizedMultiGet() {
         expectAsyncNoError(`${i} testOptimizedMultiGet/multiGet`, err2);
         expectEqual(result, batch, `${i} testOptimizedMultiGet multiGet`);
         updateMessage(
-          'multiGet([key_1, key_2]) correctly returned ' +
-            JSON.stringify(result),
+          'multiGet([key_1, key_2]) correctly returned ' + stringify(result),
         );
         done();
       });
@@ -196,9 +218,10 @@ class AsyncStorageTest extends React.Component<{...}, $FlowFixMeState> {
     return (
       <View style={styles.container}>
         <Text>
-          {/* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
-           * comment suppresses an error found when Flow v0.54 was deployed.
-           * To see the error delete this comment and run Flow. */
+          {/* $FlowFixMe[incompatible-type] (>=0.54.0 site=react_native_fb,react_
+           * native_oss) This comment suppresses an error found when Flow v0.54
+           * was deployed. To see the error delete this comment and run Flow.
+           */
           this.constructor.displayName + ': '}
           {this.state.done ? 'Done' : 'Testing...'}
           {'\n\n' + this.state.messages}
diff --git a/IntegrationTests/BUCK b/IntegrationTests/BUCK
new file mode 100644
index 00000000000000..61e3de6466aaa5
--- /dev/null
+++ b/IntegrationTests/BUCK
@@ -0,0 +1,30 @@
+load("@fbsource//tools/build_defs:js_glob.bzl", "js_glob")
+load("@fbsource//tools/build_defs/oss:metro_defs.bzl", "rn_library")
+
+# This file was generated by running
+# js1 build buckfiles
+
+rn_library(
+    name = "IntegrationTests",
+    srcs = js_glob(
+        [
+            "**/*",
+        ],
+        excludes = [
+            "**/__*__/**",
+            "**/*.command",
+            "**/*.md",
+            "websocket_integration_test_server.js",
+        ],
+    ),
+    labels = ["supermodule:xplat/default/public.react_native.tests"],
+    skip_processors = True,
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js:node_modules__invariant",
+        "//xplat/js:node_modules__nullthrows",
+        "//xplat/js/RKJSModules/vendor/react:react",
+        "//xplat/js/react-native-github:react-native",
+        "//xplat/js/react-native-github/packages/assets:assets",
+    ],
+)
diff --git a/IntegrationTests/GlobalEvalWithSourceUrlTest.js b/IntegrationTests/GlobalEvalWithSourceUrlTest.js
index fca7bfbc2170c7..a69ee3728c48b0 100644
--- a/IntegrationTests/GlobalEvalWithSourceUrlTest.js
+++ b/IntegrationTests/GlobalEvalWithSourceUrlTest.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {ExtendedError} from 'react-native/Libraries/Core/Devtools/parseErrorStack';
+import type {ExtendedError} from 'react-native/Libraries/Core/ExtendedError';
 
 const React = require('react');
 const ReactNative = require('react-native');
diff --git a/IntegrationTests/ImageCachePolicyTest.js b/IntegrationTests/ImageCachePolicyTest.js
index 03857091072cf6..00d65fb736d119 100644
--- a/IntegrationTests/ImageCachePolicyTest.js
+++ b/IntegrationTests/ImageCachePolicyTest.js
@@ -64,7 +64,7 @@ class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {
         <Image
           source={{
             uri:
-              'https://raw.githubusercontent.com/facebook/react-native/master/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
+              'https://raw.githubusercontent.com/facebook/react-native/HEAD/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
               Date.now(),
             cache: 'only-if-cached',
           }}
@@ -75,7 +75,7 @@ class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {
         <Image
           source={{
             uri:
-              'https://raw.githubusercontent.com/facebook/react-native/master/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
+              'https://raw.githubusercontent.com/facebook/react-native/HEAD/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
               Date.now(),
             cache: 'default',
           }}
@@ -86,7 +86,7 @@ class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {
         <Image
           source={{
             uri:
-              'https://raw.githubusercontent.com/facebook/react-native/master/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
+              'https://raw.githubusercontent.com/facebook/react-native/HEAD/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
               Date.now(),
             cache: 'reload',
           }}
@@ -97,7 +97,7 @@ class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {
         <Image
           source={{
             uri:
-              'https://raw.githubusercontent.com/facebook/react-native/master/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
+              'https://raw.githubusercontent.com/facebook/react-native/HEAD/Libraries/NewAppScreen/components/logo.png?cacheBust=notinCache' +
               Date.now(),
             cache: 'force-cache',
           }}
diff --git a/IntegrationTests/IntegrationTestHarnessTest.js b/IntegrationTests/IntegrationTestHarnessTest.js
index fbc1ef8d472440..256bcd210e7538 100644
--- a/IntegrationTests/IntegrationTestHarnessTest.js
+++ b/IntegrationTests/IntegrationTestHarnessTest.js
@@ -56,9 +56,10 @@ class IntegrationTestHarnessTest extends React.Component<Props, State> {
     return (
       <View style={styles.container}>
         <Text>
-          {/* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
-           * comment suppresses an error found when Flow v0.54 was deployed.
-           * To see the error delete this comment and run Flow. */
+          {/* $FlowFixMe[incompatible-type] (>=0.54.0 site=react_native_fb,react_
+           * native_oss) This comment suppresses an error found when Flow v0.54
+           * was deployed. To see the error delete this comment and run Flow.
+           */
           this.constructor.displayName + ': '}
           {this.state.done ? 'Done' : 'Testing...'}
         </Text>
diff --git a/IntegrationTests/IntegrationTestsApp.js b/IntegrationTests/IntegrationTestsApp.js
index 1e52877b7b9908..af41da151c47de 100644
--- a/IntegrationTests/IntegrationTestsApp.js
+++ b/IntegrationTests/IntegrationTestsApp.js
@@ -40,9 +40,9 @@ const TESTS = [
 ];
 
 TESTS.forEach(
-  /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This comment
-   * suppresses an error found when Flow v0.54 was deployed. To see the error
-   * delete this comment and run Flow. */
+  /* $FlowFixMe[incompatible-call] (>=0.54.0 site=react_native_fb,react_native_
+   * oss) This comment suppresses an error found when Flow v0.54 was deployed.
+   * To see the error delete this comment and run Flow. */
   test => AppRegistry.registerComponent(test.displayName, () => test),
 );
 
@@ -60,9 +60,10 @@ class IntegrationTestsApp extends React.Component<{...}, $FlowFixMeState> {
     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. */}
+          {/* $FlowFixMe[type-as-value] (>=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>
       );
@@ -79,9 +80,10 @@ class IntegrationTestsApp extends React.Component<{...}, $FlowFixMeState> {
           {TESTS.map(test => [
             <TouchableOpacity
               onPress={() => this.setState({test})}
-              /* $FlowFixMe(>=0.115.0 site=react_native_fb) This comment
-               * suppresses an error found when Flow v0.115 was deployed. To
-               * see the error, delete this comment and run Flow. */
+              /* $FlowFixMe[incompatible-type] (>=0.115.0 site=react_native_fb)
+               * This comment suppresses an error found when Flow v0.115 was
+               * deployed. To see the error, delete this comment and run Flow.
+               */
               style={styles.row}>
               <Text style={styles.testName}>{test.displayName}</Text>
             </TouchableOpacity>,
diff --git a/IntegrationTests/LayoutEventsTest.js b/IntegrationTests/LayoutEventsTest.js
index d0c784ca545021..3993a6dcca5e09 100644
--- a/IntegrationTests/LayoutEventsTest.js
+++ b/IntegrationTests/LayoutEventsTest.js
@@ -203,4 +203,5 @@ const styles = StyleSheet.create({
   },
 });
 
+LayoutEventsTest.displayName = 'LayoutEventsTest';
 module.exports = LayoutEventsTest;
diff --git a/IntegrationTests/ReactContentSizeUpdateTest.js b/IntegrationTests/ReactContentSizeUpdateTest.js
index 7abcc4fb8b4627..9c826d9f4f5328 100644
--- a/IntegrationTests/ReactContentSizeUpdateTest.js
+++ b/IntegrationTests/ReactContentSizeUpdateTest.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const RCTNativeAppEventEmitter = require('react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter');
 const React = require('react');
 const ReactNative = require('react-native');
diff --git a/IntegrationTests/SizeFlexibilityUpdateTest.js b/IntegrationTests/SizeFlexibilityUpdateTest.js
index b2e4952b102c70..3577a5363b5339 100644
--- a/IntegrationTests/SizeFlexibilityUpdateTest.js
+++ b/IntegrationTests/SizeFlexibilityUpdateTest.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const RCTNativeAppEventEmitter = require('react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter');
 const React = require('react');
 const ReactNative = require('react-native');
diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js
index 8550c6f00eec6b..30473e3b8e752c 100644
--- a/IntegrationTests/TimersTest.js
+++ b/IntegrationTests/TimersTest.js
@@ -97,36 +97,46 @@ class TimersTest extends React.Component<Props, State> {
   }
 
   componentDidMount() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setTimeout(this.testSetTimeout0, 1000);
   }
 
   testSetTimeout0() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setTimeout(this.testSetTimeout1, 0);
   }
 
   testSetTimeout1() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setTimeout(this.testSetTimeout50, 1);
   }
 
   testSetTimeout50() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setTimeout(this.testRequestAnimationFrame, 50);
   }
 
   testRequestAnimationFrame() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.requestAnimationFrame(this.testSetInterval0);
   }
 
   testSetInterval0() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this._nextTest = this.testSetInterval20;
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this._interval = this.setInterval(this._incrementInterval, 0);
   }
 
   testSetInterval20() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this._nextTest = this.testSetImmediate;
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this._interval = this.setInterval(this._incrementInterval, 20);
   }
 
   testSetImmediate() {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setImmediate(this.testClearTimeout0);
   }
 
@@ -139,6 +149,7 @@ class TimersTest extends React.Component<Props, State> {
   testClearTimeout30() {
     const timeout = this.setTimeout(() => this._fail('testClearTimeout30'), 30);
     this.clearTimeout(timeout);
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setTimeout(this.testClearMulti, 50);
   }
 
@@ -156,6 +167,7 @@ class TimersTest extends React.Component<Props, State> {
     fails.forEach(timeout => this.clearTimeout(timeout));
     this.setTimeout(() => this.clearTimeout(delayClear), 20);
 
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setTimeout(this.testOrdering, 50);
   }
 
@@ -191,6 +203,7 @@ class TimersTest extends React.Component<Props, State> {
         ),
       25,
     );
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.setTimeout(this.done, 50);
   }
 
@@ -249,6 +262,7 @@ class TimersTest extends React.Component<Props, State> {
         this.clearInterval(this._interval);
         this._interval = null;
       }
+      // $FlowFixMe[method-unbinding]
       this.setState({count: 0}, this._nextTest);
       return;
     }
@@ -267,4 +281,5 @@ const styles = StyleSheet.create({
   },
 });
 
+TimersTest.displayName = 'TimersTest';
 module.exports = TimersTest;
diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js
index bc3a935dee298b..786839498f334f 100644
--- a/Libraries/ActionSheetIOS/ActionSheetIOS.js
+++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import RCTActionSheetManager from './NativeActionSheetManager';
 
 const invariant = require('invariant');
@@ -33,6 +31,7 @@ const ActionSheetIOS = {
    * - `destructiveButtonIndex` (int or array of ints) - index or indices of destructive buttons in `options`
    * - `title` (string) - a title to show above the action sheet
    * - `message` (string) - a message to show below the title
+   * - `disabledButtonIndices` (array of numbers) - a list of button indices which should be disabled
    *
    * The 'callback' function takes one parameter, the zero-based index
    * of the selected item.
@@ -49,6 +48,7 @@ const ActionSheetIOS = {
       +anchor?: ?number,
       +tintColor?: ColorValue | ProcessedColorValue,
       +userInterfaceStyle?: string,
+      +disabledButtonIndices?: Array<number>,
     |},
     callback: (buttonIndex: number) => void,
   ) {
diff --git a/Libraries/ActionSheetIOS/NativeActionSheetManager.js b/Libraries/ActionSheetIOS/NativeActionSheetManager.js
index 063d9147e1d69b..7c48f8e2d4bbc3 100644
--- a/Libraries/ActionSheetIOS/NativeActionSheetManager.js
+++ b/Libraries/ActionSheetIOS/NativeActionSheetManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
@@ -25,6 +23,7 @@ export interface Spec extends TurboModule {
       +anchor?: ?number,
       +tintColor?: ?number,
       +userInterfaceStyle?: ?string,
+      +disabledButtonIndices?: Array<number>,
     |},
     callback: (buttonIndex: number) => void,
   ) => void;
diff --git a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
index c43897e0a3c877..c6554c3d7ec534 100644
--- a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
+++ b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
@@ -11,7 +11,7 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/actionsheetios"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "*.{m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 17d306e9e985f3..cfa4cd80b9e983 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -8,13 +8,9 @@
  * @flow
  */
 
-'use strict';
-
 import AlertMacOS from './AlertMacOS'; // TODO(macOS GH#774)
 import Platform from '../Utilities/Platform';
-import NativeDialogManagerAndroid, {
-  type DialogOptions,
-} from '../NativeModules/specs/NativeDialogManagerAndroid';
+import type {DialogOptions} from '../NativeModules/specs/NativeDialogManagerAndroid';
 import RCTAlertManager from './RCTAlertManager';
 
 export type AlertType =
@@ -54,6 +50,8 @@ class Alert {
     ) {
       Alert.prompt(title, message, buttons, 'default');
     } else if (Platform.OS === 'android') {
+      const NativeDialogManagerAndroid = require('../NativeModules/specs/NativeDialogManagerAndroid')
+        .default;
       if (!NativeDialogManagerAndroid) {
         return;
       }
diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
index 929c165f32e584..c9f9327096bfd2 100644
--- a/Libraries/Alert/NativeAlertManager.js
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 import type {DefaultInputsArray} from './AlertMacOS'; // TODO(macOS GH#774)
diff --git a/Libraries/Alert/RCTAlertManager.android.js b/Libraries/Alert/RCTAlertManager.android.js
index 43f49a94e50bb1..366692bd906d04 100644
--- a/Libraries/Alert/RCTAlertManager.android.js
+++ b/Libraries/Alert/RCTAlertManager.android.js
@@ -7,8 +7,6 @@
  * @format
  */
 
-'use strict';
-
 import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManagerAndroid';
 
 function emptyCallback() {}
diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
index 8ededddf4b463c..a5dbdac5daf7dc 100644
--- a/Libraries/Alert/RCTAlertManager.ios.js
+++ b/Libraries/Alert/RCTAlertManager.ios.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeAlertManager from './NativeAlertManager';
 import type {Args} from './NativeAlertManager';
 
diff --git a/Libraries/Animated/Animated.js b/Libraries/Animated/Animated.js
index 323f8d38afc3e9..2f6ee99ae6b04e 100644
--- a/Libraries/Animated/Animated.js
+++ b/Libraries/Animated/Animated.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Platform from '../Utilities/Platform';
 import typeof AnimatedFlatList from './components/AnimatedFlatList';
 import typeof AnimatedImage from './components/AnimatedImage';
diff --git a/Libraries/Animated/AnimatedEvent.js b/Libraries/Animated/AnimatedEvent.js
index 98ff42eb197071..b6de725948a961 100644
--- a/Libraries/Animated/AnimatedEvent.js
+++ b/Libraries/Animated/AnimatedEvent.js
@@ -74,6 +74,7 @@ function attachNativeEvent(
           NativeAnimatedHelper.API.removeAnimatedEventFromView(
             viewTag,
             eventName,
+            // $FlowFixMe[incompatible-call]
             mapping.animatedValueTag,
           );
         });
@@ -210,9 +211,9 @@ class AnimatedEvent {
           }
         } else if (typeof recMapping === 'object') {
           for (const mappingKey in recMapping) {
-            /* $FlowFixMe(>=0.120.0) This comment suppresses an error found
-             * when Flow v0.120 was deployed. To see the error, delete this
-             * comment and run Flow. */
+            /* $FlowFixMe[prop-missing] (>=0.120.0) This comment suppresses an
+             * error found when Flow v0.120 was deployed. To see the error,
+             * delete this comment and run Flow. */
             traverse(recMapping[mappingKey], recEvt[mappingKey], mappingKey);
           }
         }
diff --git a/Libraries/Animated/AnimatedImplementation.js b/Libraries/Animated/AnimatedImplementation.js
index 12b225abab0616..706b87ea01e9e1 100644
--- a/Libraries/Animated/AnimatedImplementation.js
+++ b/Libraries/Animated/AnimatedImplementation.js
@@ -706,6 +706,4 @@ module.exports = {
    * Expose Event class, so it can be used as a type for type checkers.
    */
   Event: AnimatedEvent,
-
-  __PropsOnlyForTests: AnimatedProps,
 };
diff --git a/Libraries/Animated/AnimatedMock.js b/Libraries/Animated/AnimatedMock.js
index eecfbb884ec42b..ca6741719482d9 100644
--- a/Libraries/Animated/AnimatedMock.js
+++ b/Libraries/Animated/AnimatedMock.js
@@ -14,7 +14,6 @@ const {AnimatedEvent, attachNativeEvent} = require('./AnimatedEvent');
 const AnimatedImplementation = require('./AnimatedImplementation');
 const AnimatedInterpolation = require('./nodes/AnimatedInterpolation');
 const AnimatedNode = require('./nodes/AnimatedNode');
-const AnimatedProps = require('./nodes/AnimatedProps');
 const AnimatedValue = require('./nodes/AnimatedValue');
 const AnimatedValueXY = require('./nodes/AnimatedValueXY');
 
@@ -24,7 +23,6 @@ import type {EndCallback} from './animations/Animation';
 import type {TimingAnimationConfig} from './animations/TimingAnimation';
 import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
-import type {Mapping, EventConfig} from './AnimatedEvent';
 
 /**
  * Animations are a source of flakiness in snapshot testing. This mock replaces
@@ -58,7 +56,12 @@ const spring = function(
   return {
     ...emptyAnimation,
     start: (callback?: ?EndCallback): void => {
-      anyValue.setValue(config.toValue);
+      // TODO(macOS GH#774) - setValue can't handle AnimatedNodes
+      if (config.toValue instanceof AnimatedNode) {
+        anyValue.setValue(config.toValue.__getValue());
+      } else {
+        anyValue.setValue(config.toValue);
+      }
       callback && callback({finished: true});
     },
   };
@@ -123,10 +126,6 @@ const loop = function(
   return emptyAnimation;
 };
 
-const event = function(argMapping: Array<?Mapping>, config: EventConfig): any {
-  return null;
-};
-
 module.exports = {
   Value: AnimatedValue,
   ValueXY: AnimatedValueXY,
@@ -146,11 +145,10 @@ module.exports = {
   parallel,
   stagger,
   loop,
-  event,
+  event: AnimatedImplementation.event,
   createAnimatedComponent,
   attachNativeEvent,
   forkEvent: AnimatedImplementation.forkEvent,
   unforkEvent: AnimatedImplementation.unforkEvent,
   Event: AnimatedEvent,
-  __PropsOnlyForTests: AnimatedProps,
 };
diff --git a/Libraries/Animated/AnimatedWeb.js b/Libraries/Animated/AnimatedWeb.js
index 3f3313fe6c69e2..513f322b709d08 100644
--- a/Libraries/Animated/AnimatedWeb.js
+++ b/Libraries/Animated/AnimatedWeb.js
@@ -14,10 +14,13 @@ const AnimatedImplementation = require('./AnimatedImplementation');
 
 module.exports = {
   ...AnimatedImplementation,
-  // $FlowFixMe createAnimatedComponent expects to receive types. Plain intrinsic components can't be typed like this
+  /* $FlowFixMe[incompatible-call] createAnimatedComponent expects to receive
+   * types. Plain intrinsic components can't be typed like this */
   div: (AnimatedImplementation.createAnimatedComponent('div'): $FlowFixMe),
-  // $FlowFixMe createAnimatedComponent expects to receive types. Plain intrinsic components can't be typed like this
+  /* $FlowFixMe[incompatible-call] createAnimatedComponent expects to receive
+   * types. Plain intrinsic components can't be typed like this */
   span: (AnimatedImplementation.createAnimatedComponent('span'): $FlowFixMe),
-  // $FlowFixMe createAnimatedComponent expects to receive types. Plain intrinsic components can't be typed like this
+  /* $FlowFixMe[incompatible-call] createAnimatedComponent expects to receive
+   * types. Plain intrinsic components can't be typed like this */
   img: (AnimatedImplementation.createAnimatedComponent('img'): $FlowFixMe),
 };
diff --git a/Libraries/Animated/NativeAnimatedHelper.js b/Libraries/Animated/NativeAnimatedHelper.js
index af78a8d0987591..536b44c1cbdba5 100644
--- a/Libraries/Animated/NativeAnimatedHelper.js
+++ b/Libraries/Animated/NativeAnimatedHelper.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import NativeAnimatedNonTurboModule from './NativeAnimatedModule';
 import NativeAnimatedTurboModule from './NativeAnimatedTurboModule';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
@@ -49,9 +47,9 @@ const API = {
     saveValueCallback: (value: number) => void,
   ): void {
     invariant(NativeAnimatedModule, 'Native animated module is not available');
-    if (NativeAnimatedModule.getValue) {
+    API.queueOperation(() => {
       NativeAnimatedModule.getValue(tag, saveValueCallback);
-    }
+    });
   },
   setWaitingForIdentifier: function(id: string): void {
     waitingForQueuedOperations.add(id);
@@ -395,10 +393,17 @@ module.exports = {
   assertNativeAnimatedModule,
   shouldUseNativeDriver,
   transformDataType,
-  // $FlowExpectedError - unsafe getter lint suppresion
+  // $FlowExpectedError[unsafe-getters-setters] - unsafe getter lint suppresion
+  // $FlowExpectedError[missing-type-arg] - unsafe getter lint suppresion
   get nativeEventEmitter(): NativeEventEmitter {
     if (!nativeEventEmitter) {
-      nativeEventEmitter = new NativeEventEmitter(NativeAnimatedModule);
+      nativeEventEmitter = new NativeEventEmitter(
+        // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+        // If you want to use the native module on other platforms, please remove this condition and test its behavior
+        Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
+          ? null
+          : NativeAnimatedModule,
+      );
     }
     return nativeEventEmitter;
   },
diff --git a/Libraries/Animated/NativeAnimatedModule.js b/Libraries/Animated/NativeAnimatedModule.js
index be8ceb140fc31c..d126bfdaff96eb 100644
--- a/Libraries/Animated/NativeAnimatedModule.js
+++ b/Libraries/Animated/NativeAnimatedModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Animated/NativeAnimatedTurboModule.js b/Libraries/Animated/NativeAnimatedTurboModule.js
index b19fbde5f9b0f3..03ff0f26116560 100644
--- a/Libraries/Animated/NativeAnimatedTurboModule.js
+++ b/Libraries/Animated/NativeAnimatedTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Animated/__tests__/Animated-test.js b/Libraries/Animated/__tests__/Animated-test.js
index aa32306b7f5985..2b2ffe04dfdfb8 100644
--- a/Libraries/Animated/__tests__/Animated-test.js
+++ b/Libraries/Animated/__tests__/Animated-test.js
@@ -8,8 +8,7 @@
  * @emails oncall+react_native
  */
 
-'use strict';
-
+import AnimatedProps from '../nodes/AnimatedProps';
 import TestRenderer from 'react-test-renderer';
 import * as React from 'react';
 
@@ -23,6 +22,7 @@ jest.mock('../../BatchedBridge/NativeModules', () => ({
 }));
 
 let Animated = require('../Animated');
+
 describe('Animated tests', () => {
   beforeEach(() => {
     jest.resetModules();
@@ -34,7 +34,7 @@ describe('Animated tests', () => {
 
       const callback = jest.fn();
 
-      const node = new Animated.__PropsOnlyForTests(
+      const node = new AnimatedProps(
         {
           style: {
             backgroundColor: 'red',
@@ -57,8 +57,6 @@ describe('Animated tests', () => {
         callback,
       );
 
-      expect(anim.__getChildren().length).toBe(3);
-
       expect(node.__getValue()).toEqual({
         style: {
           backgroundColor: 'red',
@@ -71,6 +69,12 @@ describe('Animated tests', () => {
         },
       });
 
+      expect(anim.__getChildren().length).toBe(0);
+
+      node.__attach();
+
+      expect(anim.__getChildren().length).toBe(3);
+
       anim.setValue(0.5);
 
       expect(callback).toBeCalled();
@@ -788,7 +792,7 @@ describe('Animated tests', () => {
 
       const callback = jest.fn();
 
-      const node = new Animated.__PropsOnlyForTests(
+      const node = new AnimatedProps(
         {
           style: {
             opacity: vec.x.interpolate({
@@ -811,6 +815,10 @@ describe('Animated tests', () => {
         },
       });
 
+      node.__attach();
+
+      expect(callback.mock.calls.length).toBe(0);
+
       vec.setValue({x: 42, y: 1492});
 
       expect(callback.mock.calls.length).toBe(2); // once each for x, y
@@ -892,7 +900,7 @@ describe('Animated tests', () => {
       const value3 = new Animated.Value(0);
       const value4 = Animated.add(value3, Animated.multiply(value1, value2));
       const callback = jest.fn();
-      const view = new Animated.__PropsOnlyForTests(
+      const view = new AnimatedProps(
         {
           style: {
             transform: [
@@ -904,6 +912,7 @@ describe('Animated tests', () => {
         },
         callback,
       );
+      view.__attach();
       const listener = jest.fn();
       const id = value4.addListener(listener);
       value3.setValue(137);
diff --git a/Libraries/Animated/__tests__/AnimatedNative-test.js b/Libraries/Animated/__tests__/AnimatedNative-test.js
index ceb93dccd332fe..e5ecec1fb7d648 100644
--- a/Libraries/Animated/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/__tests__/AnimatedNative-test.js
@@ -8,8 +8,6 @@
  * @emails oncall+react_native
  */
 
-'use strict';
-
 jest
   .clearAllMocks()
   .mock('../../BatchedBridge/NativeModules', () => ({
diff --git a/Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js b/Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js
new file mode 100644
index 00000000000000..e82ea170a3eb95
--- /dev/null
+++ b/Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+react_native
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+const createAnimatedComponent = require('../createAnimatedComponent');
+const createAnimatedComponentInjection = require('../createAnimatedComponentInjection');
+const React = require('react');
+
+function injected<TProps: {...}, TInstance>(
+  Component: React.AbstractComponent<TProps, TInstance>,
+): React.AbstractComponent<TProps, TInstance> {
+  return createAnimatedComponent(Component);
+}
+
+beforeEach(() => {
+  jest.resetModules();
+  jest.resetAllMocks();
+});
+
+test('does nothing without injection', () => {
+  expect(typeof createAnimatedComponent).toBe('function');
+  expect(createAnimatedComponent).not.toBe(injected);
+});
+
+test('injection overrides `createAnimatedComponent`', () => {
+  createAnimatedComponentInjection.inject(injected);
+
+  expect(createAnimatedComponent).toBe(injected);
+});
+
+test('injection errors if called too late', () => {
+  jest.spyOn(console, 'error').mockReturnValue(undefined);
+
+  // Causes `createAnimatedComponent` to be initialized.
+  createAnimatedComponent;
+
+  createAnimatedComponentInjection.inject(injected);
+
+  expect(createAnimatedComponent).not.toBe(injected);
+  expect(console.error).toBeCalledWith(
+    'createAnimatedComponentInjection: Must be called before `createAnimatedComponent`.',
+  );
+});
+
+test('injection errors if called more than once', () => {
+  jest.spyOn(console, 'error').mockReturnValue(undefined);
+
+  createAnimatedComponentInjection.inject(injected);
+
+  expect(createAnimatedComponent).toBe(injected);
+  expect(console.error).not.toBeCalled();
+
+  createAnimatedComponentInjection.inject(injected);
+
+  expect(console.error).toBeCalledWith(
+    'createAnimatedComponentInjection: Cannot be called more than once.',
+  );
+});
diff --git a/Libraries/Animated/animations/Animation.js b/Libraries/Animated/animations/Animation.js
index 53967d96f9e109..3555bf2cc2665a 100644
--- a/Libraries/Animated/animations/Animation.js
+++ b/Libraries/Animated/animations/Animation.js
@@ -71,6 +71,7 @@ class Animation {
         this.__nativeId,
         animatedValue.__getNativeTag(),
         this.__getNativeAnimationConfig(),
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         this.__debouncedOnEnd.bind(this),
       );
     } catch (e) {
diff --git a/Libraries/Animated/animations/DecayAnimation.js b/Libraries/Animated/animations/DecayAnimation.js
index c3dce534f84baa..b04b911e7600c7 100644
--- a/Libraries/Animated/animations/DecayAnimation.js
+++ b/Libraries/Animated/animations/DecayAnimation.js
@@ -84,6 +84,7 @@ class DecayAnimation extends Animation {
     if (this._useNativeDriver) {
       this.__startNativeAnimation(animatedValue);
     } else {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
     }
   }
@@ -105,6 +106,7 @@ class DecayAnimation extends Animation {
 
     this._lastValue = value;
     if (this.__active) {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
     }
   }
diff --git a/Libraries/Animated/animations/SpringAnimation.js b/Libraries/Animated/animations/SpringAnimation.js
index aec87e5cecb732..e09db93b7c5340 100644
--- a/Libraries/Animated/animations/SpringAnimation.js
+++ b/Libraries/Animated/animations/SpringAnimation.js
@@ -344,6 +344,7 @@ class SpringAnimation extends Animation {
       this.__debouncedOnEnd({finished: true});
       return;
     }
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
   }
 
diff --git a/Libraries/Animated/animations/TimingAnimation.js b/Libraries/Animated/animations/TimingAnimation.js
index ffe8c8313be2f7..7f239ce0102faf 100644
--- a/Libraries/Animated/animations/TimingAnimation.js
+++ b/Libraries/Animated/animations/TimingAnimation.js
@@ -48,6 +48,7 @@ let _easeInOut;
 function easeInOut() {
   if (!_easeInOut) {
     const Easing = require('../Easing');
+    // $FlowFixMe[method-unbinding]
     _easeInOut = Easing.inOut(Easing.ease);
   }
   return _easeInOut;
@@ -117,6 +118,7 @@ class TimingAnimation extends Animation {
           this.__startNativeAnimation(animatedValue);
         } else {
           this._animationFrame = requestAnimationFrame(
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             this.onUpdate.bind(this),
           );
         }
@@ -149,6 +151,7 @@ class TimingAnimation extends Animation {
           (this._toValue - this._fromValue),
     );
     if (this.__active) {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       this._animationFrame = requestAnimationFrame(this.onUpdate.bind(this));
     }
   }
diff --git a/Libraries/Animated/components/AnimatedFlatList.js b/Libraries/Animated/components/AnimatedFlatList.js
index 64ba6c200beea0..49a1ebcbd19b37 100644
--- a/Libraries/Animated/components/AnimatedFlatList.js
+++ b/Libraries/Animated/components/AnimatedFlatList.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 const FlatList = require('../../Lists/FlatList');
diff --git a/Libraries/Animated/components/AnimatedImage.js b/Libraries/Animated/components/AnimatedImage.js
index 56cdb7d18f7908..107d601f50c91e 100644
--- a/Libraries/Animated/components/AnimatedImage.js
+++ b/Libraries/Animated/components/AnimatedImage.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 const Image = require('../../Image/Image');
@@ -17,9 +15,9 @@ const createAnimatedComponent = require('../createAnimatedComponent');
 
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
-module.exports = (createAnimatedComponent(
-  (Image: $FlowFixMe),
-): AnimatedComponentType<
+module.exports = (createAnimatedComponent((Image: $FlowFixMe), {
+  collapsable: false,
+}): AnimatedComponentType<
   React.ElementConfig<typeof Image>,
   React.ElementRef<typeof Image>,
 >);
diff --git a/Libraries/Animated/components/AnimatedScrollView.js b/Libraries/Animated/components/AnimatedScrollView.js
index 259cbb81b0ee2f..488e9d12041534 100644
--- a/Libraries/Animated/components/AnimatedScrollView.js
+++ b/Libraries/Animated/components/AnimatedScrollView.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 const ScrollView = require('../../Components/ScrollView/ScrollView');
@@ -24,9 +22,9 @@ const ScrollViewWithEventThrottle = React.forwardRef((props, ref) => (
   <ScrollView scrollEventThrottle={0.0001} {...props} ref={ref} />
 ));
 
-module.exports = (createAnimatedComponent(
-  ScrollViewWithEventThrottle,
-): AnimatedComponentType<
+module.exports = (createAnimatedComponent(ScrollViewWithEventThrottle, {
+  collapsable: false,
+}): AnimatedComponentType<
   React.ElementConfig<typeof ScrollView>,
   React.ElementRef<typeof ScrollView>,
 >);
diff --git a/Libraries/Animated/components/AnimatedSectionList.js b/Libraries/Animated/components/AnimatedSectionList.js
index 9beef55e879488..98ccd918460bc6 100644
--- a/Libraries/Animated/components/AnimatedSectionList.js
+++ b/Libraries/Animated/components/AnimatedSectionList.js
@@ -8,11 +8,9 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
-const SectionList = require('../../Lists/SectionList');
+import SectionList from '../../Lists/SectionList';
 const createAnimatedComponent = require('../createAnimatedComponent');
 
 import type {AnimatedComponentType} from '../createAnimatedComponent';
diff --git a/Libraries/Animated/components/AnimatedText.js b/Libraries/Animated/components/AnimatedText.js
index 5a184e0626fe17..dd4fb0b02378fb 100644
--- a/Libraries/Animated/components/AnimatedText.js
+++ b/Libraries/Animated/components/AnimatedText.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 const Text = require('../../Text/Text');
@@ -17,9 +15,9 @@ const createAnimatedComponent = require('../createAnimatedComponent');
 
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
-module.exports = (createAnimatedComponent(
-  (Text: $FlowFixMe),
-): AnimatedComponentType<
+module.exports = (createAnimatedComponent((Text: $FlowFixMe), {
+  collapsable: false,
+}): AnimatedComponentType<
   React.ElementConfig<typeof Text>,
   React.ElementRef<typeof Text>,
 >);
diff --git a/Libraries/Animated/components/AnimatedView.js b/Libraries/Animated/components/AnimatedView.js
index 0ce54601fe9990..79ebe1a0ea97cb 100644
--- a/Libraries/Animated/components/AnimatedView.js
+++ b/Libraries/Animated/components/AnimatedView.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 const View = require('../../Components/View/View');
@@ -17,7 +15,9 @@ const createAnimatedComponent = require('../createAnimatedComponent');
 
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
-module.exports = (createAnimatedComponent(View): AnimatedComponentType<
+module.exports = (createAnimatedComponent(View, {
+  collapsable: true,
+}): AnimatedComponentType<
   React.ElementConfig<typeof View>,
   React.ElementRef<typeof View>,
 >);
diff --git a/Libraries/Animated/createAnimatedComponent.js b/Libraries/Animated/createAnimatedComponent.js
index 230aa164203606..1154557c407908 100644
--- a/Libraries/Animated/createAnimatedComponent.js
+++ b/Libraries/Animated/createAnimatedComponent.js
@@ -10,6 +10,8 @@
 
 'use strict';
 
+import * as createAnimatedComponentInjection from './createAnimatedComponentInjection';
+
 const View = require('../Components/View/View');
 const {AnimatedEvent} = require('./AnimatedEvent');
 const AnimatedProps = require('./nodes/AnimatedProps');
@@ -37,8 +39,13 @@ export type AnimatedComponentType<
   Instance,
 >;
 
+type AnimatedComponentOptions = {
+  collapsable?: boolean,
+};
+
 function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
   Component: React.AbstractComponent<Props, Instance>,
+  options?: AnimatedComponentOptions,
 ): AnimatedComponentType<Props, Instance> {
   invariant(
     typeof Component !== 'function' ||
@@ -79,6 +86,11 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
     }
 
     _isFabric = (): boolean => {
+      // When called during the first render, `_component` is always null.
+      // Therefore, even if a component is rendered in Fabric, we can't detect
+      // that until ref is set, which happens sometime after the first render.
+      // In cases where this value switching between "false" and "true" on Fabric
+      // causes issues, add an additional check for _component nullity.
       if (this._component == null) {
         return false;
       }
@@ -164,14 +176,11 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
     _attachProps(nextProps) {
       const oldPropsAnimated = this._propsAnimated;
 
-      if (nextProps === oldPropsAnimated) {
-        return;
-      }
-
       this._propsAnimated = new AnimatedProps(
         nextProps,
         this._animatedPropsCallback,
       );
+      this._propsAnimated.__attach();
 
       // 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
@@ -192,19 +201,6 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
       setLocalRef: ref => {
         this._prevComponent = this._component;
         this._component = ref;
-
-        // TODO: Delete this in a future release.
-        if (ref != null && ref.getNode == null) {
-          ref.getNode = () => {
-            console.warn(
-              '%s: Calling `getNode()` on the ref of an Animated component ' +
-                'is no longer necessary. You can now directly use the ref ' +
-                'instead. This method will be removed in a future release.',
-              ref.constructor.name ?? '<<anonymous>>',
-            );
-            return ref;
-          };
-        }
       },
     });
 
@@ -213,23 +209,42 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
       const {style: passthruStyle = {}, ...passthruProps} =
         this.props.passthroughAnimatedPropExplicitValues || {};
       const mergedStyle = {...style, ...passthruStyle};
+
+      // On Fabric, we always want to ensure the container Animated View is *not*
+      // flattened.
+      // Because we do not get a host component ref immediately and thus cannot
+      // do a proper Fabric vs non-Fabric detection immediately, we default to assuming
+      // that Fabric *is* enabled until we know otherwise.
+      // Thus, in Fabric, this view will never be flattened. In non-Fabric, the view will
+      // not be flattened during the initial render but may be flattened in the second render
+      // and onwards.
+      const forceNativeIdFabric =
+        (this._component == null &&
+          (options?.collapsable === false || props.collapsable !== true)) ||
+        this._isFabric();
+
+      const forceNativeId =
+        props.collapsable ??
+        (this._propsAnimated.__isNative ||
+          forceNativeIdFabric ||
+          options?.collapsable === false);
+      // 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 NativeViewHierarchyManager since it operates on the shadow
+      // thread. TODO: T68258846
+      const collapsableProps = forceNativeId
+        ? {
+            nativeID: props.nativeID ?? 'animatedComponent',
+            collapsable: false,
+          }
+        : {};
       return (
         <Component
           {...props}
           {...passthruProps}
+          {...collapsableProps}
           style={mergedStyle}
           ref={this._setComponentRef}
-          nativeID={
-            props.nativeID ??
-            (this._isFabric() ? 'animatedComponent' : undefined)
-          } /* TODO: T68258846. */
-          // 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 NativeViewHierarchyManager since it operates on the shadow
-          // thread.
-          collapsable={
-            this._propsAnimated.__isNative ? false : props.collapsable
-          }
         />
       );
     }
@@ -270,6 +285,8 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
       this._propsAnimated && this._propsAnimated.__detach();
       this._detachNativeEvents();
       this._markUpdateComplete();
+      this._component = null;
+      this._prevComponent = null;
     }
   }
 
@@ -283,4 +300,6 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
   });
 }
 
-module.exports = createAnimatedComponent;
+// $FlowIgnore[incompatible-cast] - Will be compatible after refactors.
+module.exports = (createAnimatedComponentInjection.recordAndRetrieve() ??
+  createAnimatedComponent: typeof createAnimatedComponent);
diff --git a/Libraries/Animated/createAnimatedComponentInjection.js b/Libraries/Animated/createAnimatedComponentInjection.js
new file mode 100644
index 00000000000000..5a1727e959a9b7
--- /dev/null
+++ b/Libraries/Animated/createAnimatedComponentInjection.js
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import * as React from 'react';
+
+type createAnimatedComponent = <TProps: {...}, TInstance>(
+  Component: React.AbstractComponent<TProps, TInstance>,
+) => React.AbstractComponent<TProps, TInstance>;
+
+// This can be undefined, null, or the experimental implementation. If this is
+// null, that means `createAnimatedComponent` has already been initialized and
+// it is too late to call `inject`.
+let injected: ?createAnimatedComponent;
+
+/**
+ * Call during bundle initialization to opt-in to new `createAnimatedComponent`.
+ */
+export function inject(newInjected: createAnimatedComponent): void {
+  if (injected !== undefined) {
+    if (__DEV__) {
+      console.error(
+        'createAnimatedComponentInjection: ' +
+          (injected == null
+            ? 'Must be called before `createAnimatedComponent`.'
+            : 'Cannot be called more than once.'),
+      );
+    }
+    return;
+  }
+  injected = newInjected;
+}
+
+/**
+ * Only called by `createAnimatedComponent.js`.
+ */
+export function recordAndRetrieve(): createAnimatedComponent | null {
+  if (injected === undefined) {
+    injected = null;
+  }
+  return injected;
+}
diff --git a/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js b/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js
new file mode 100644
index 00000000000000..a7d5f8169e5636
--- /dev/null
+++ b/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import useAnimatedProps from './useAnimatedProps';
+import useMergeRefs from '../Utilities/useMergeRefs';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import * as React from 'react';
+
+/**
+ * Experimental implementation of `createAnimatedComponent` that is intended to
+ * be compatible with concurrent rendering.
+ */
+export default function createAnimatedComponent<TProps: {...}, TInstance>(
+  Component: React.AbstractComponent<TProps, TInstance>,
+): React.AbstractComponent<TProps, TInstance> {
+  return React.forwardRef((props, forwardedRef) => {
+    const [reducedProps, callbackRef] = useAnimatedProps<TProps, TInstance>(
+      props,
+    );
+    const ref = useMergeRefs<TInstance | null>(callbackRef, forwardedRef);
+
+    // Some components require explicit passthrough values for animation
+    // to work properly. For example, if an animated component is
+    // transformed and Pressable, onPress will not work after transform
+    // without these passthrough values.
+    // $FlowFixMe[prop-missing]
+    const {passthroughAnimatedPropExplicitValues, style} = reducedProps;
+    const {style: passthroughStyle, ...passthroughProps} =
+      passthroughAnimatedPropExplicitValues ?? {};
+    const mergedStyle = StyleSheet.compose(style, passthroughStyle);
+
+    return (
+      <Component
+        {...reducedProps}
+        {...passthroughProps}
+        style={mergedStyle}
+        ref={ref}
+      />
+    );
+  });
+}
diff --git a/Libraries/Animated/nodes/AnimatedInterpolation.js b/Libraries/Animated/nodes/AnimatedInterpolation.js
index 63dfa670f1705e..ce06272b5c6d79 100644
--- a/Libraries/Animated/nodes/AnimatedInterpolation.js
+++ b/Libraries/Animated/nodes/AnimatedInterpolation.js
@@ -205,14 +205,12 @@ function createInterpolationFromStringOutputRange(
   //   [200, 250],
   //   [0, 0.5],
   // ]
-  /* $FlowFixMe(>=0.18.0): `outputRange[0].match()` can return `null`. Need to
-   * guard against this possibility.
-   */
+  /* $FlowFixMe[incompatible-use] (>=0.18.0): `outputRange[0].match()` can
+   * return `null`. Need to guard against this possibility. */
   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.
-     */
+    /* $FlowFixMe[incompatible-use] (>=0.18.0): `value.match()` can return
+     * `null`. Need to guard against this possibility. */
     value.match(stringShapeRegex).forEach((number, i) => {
       outputRanges[i].push(+number);
     });
@@ -220,8 +218,10 @@ function createInterpolationFromStringOutputRange(
 
   const interpolations = outputRange[0]
     .match(stringShapeRegex)
-    /* $FlowFixMe(>=0.18.0): `outputRange[0].match()` can return `null`. Need
-     * to guard against this possibility. */
+    /* $FlowFixMe[incompatible-use] (>=0.18.0): `outputRange[0].match()` can
+     * return `null`. Need to guard against this possibility. */
+    /* $FlowFixMe[incompatible-call] (>=0.18.0): `outputRange[0].match()` can
+     * return `null`. Need to guard against this possibility. */
     .map((value, i) => {
       return createInterpolation({
         ...config,
@@ -277,12 +277,11 @@ function checkValidInputRange(arr: $ReadOnlyArray<number>) {
   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,
-       * one or both of the operands may be something that doesn't cleanly
-       * convert to a string, like undefined, null, and object, etc. If you really
-       * mean this implicit string conversion, you can do something like
-       * String(myThing)
-       */
+      /* $FlowFixMe[incompatible-type] (>=0.13.0) - In the addition expression
+       * below this comment, one or both of the operands may be something that
+       * doesn't cleanly convert to a string, like undefined, null, and object,
+       * etc. If you really mean this implicit string conversion, you can do
+       * something like String(myThing) */
       'inputRange must be monotonically non-decreasing ' + arr,
     );
   }
@@ -292,12 +291,11 @@ function checkInfiniteRange(name: string, arr: $ReadOnlyArray<number>) {
   invariant(arr.length >= 2, name + ' must have at least 2 elements');
   invariant(
     arr.length !== 2 || arr[0] !== -Infinity || arr[1] !== Infinity,
-    /* $FlowFixMe(>=0.13.0) - In the addition expression below this comment,
-     * one or both of the operands may be something that doesn't cleanly convert
-     * to a string, like undefined, null, and object, etc. If you really mean
-     * this implicit string conversion, you can do something like
-     * String(myThing)
-     */
+    /* $FlowFixMe[incompatible-type] (>=0.13.0) - In the addition expression
+     * below this comment, one or both of the operands may be something that
+     * doesn't cleanly convert to a string, like undefined, null, and object,
+     * etc. If you really mean this implicit string conversion, you can do
+     * something like String(myThing) */
     name + 'cannot be ]-infinity;+infinity[ ' + arr,
   );
 }
@@ -358,8 +356,9 @@ class AnimatedInterpolation extends AnimatedWithChildren {
     return {
       inputRange: this._config.inputRange,
       // Only the `outputRange` can contain strings so we don't need to transform `inputRange` here
-      /* $FlowFixMe(>=0.38.0) - Flow error detected during the deployment of
-       * v0.38.0. To see the error, remove this comment and run flow */
+      /* $FlowFixMe[incompatible-call] (>=0.38.0) - Flow error detected during
+       * the deployment of v0.38.0. To see the error, remove this comment and
+       * run flow */
       outputRange: this.__transformDataType(this._config.outputRange),
       extrapolateLeft:
         this._config.extrapolateLeft || this._config.extrapolate || 'extend',
diff --git a/Libraries/Animated/nodes/AnimatedProps.js b/Libraries/Animated/nodes/AnimatedProps.js
index 578ed6718d213f..6f915bb5b8fd1d 100644
--- a/Libraries/Animated/nodes/AnimatedProps.js
+++ b/Libraries/Animated/nodes/AnimatedProps.js
@@ -33,7 +33,6 @@ class AnimatedProps extends AnimatedNode {
     }
     this._props = props;
     this._callback = callback;
-    this.__attach();
   }
 
   __getValue(): Object {
diff --git a/Libraries/Animated/nodes/AnimatedValue.js b/Libraries/Animated/nodes/AnimatedValue.js
index 1be77112eef6f5..92baefb2cc8e07 100644
--- a/Libraries/Animated/nodes/AnimatedValue.js
+++ b/Libraries/Animated/nodes/AnimatedValue.js
@@ -46,9 +46,9 @@ const NativeAnimatedAPI = NativeAnimatedHelper.API;
 function _flush(rootNode: AnimatedValue): void {
   const animatedStyles = new Set();
   function findAnimatedStyles(node) {
-    /* $FlowFixMe(>=0.68.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.68 was deployed. To see the error delete this
-     * comment and run Flow. */
+    /* $FlowFixMe[prop-missing] (>=0.68.0 site=react_native_fb) This comment
+     * suppresses an error found when Flow v0.68 was deployed. To see the error
+     * delete this comment and run Flow. */
     if (typeof node.update === 'function') {
       animatedStyles.add(node);
     } else {
@@ -56,10 +56,21 @@ function _flush(rootNode: AnimatedValue): void {
     }
   }
   findAnimatedStyles(rootNode);
-  /* $FlowFixMe */
+  // $FlowFixMe[prop-missing]
   animatedStyles.forEach(animatedStyle => animatedStyle.update());
 }
 
+/**
+ * Some operations are executed only on batch end, which is _mostly_ scheduled when
+ * Animated component props change. For some of the changes which require immediate execution
+ * (e.g. setValue), we create a separate batch in case none is scheduled.
+ */
+function _executeAsAnimatedBatch(id: string, operation: () => void) {
+  NativeAnimatedAPI.setWaitingForIdentifier(id);
+  operation();
+  NativeAnimatedAPI.unsetWaitingForIdentifier(id);
+}
+
 /**
  * Standard value for driving animations.  One `Animated.Value` can drive
  * multiple properties in a synchronized fashion, but can only be driven by one
@@ -115,7 +126,9 @@ class AnimatedValue extends AnimatedWithChildren {
       !this.__isNative /* don't perform a flush for natively driven values */,
     );
     if (this.__isNative) {
-      NativeAnimatedAPI.setAnimatedNodeValue(this.__getNativeTag(), value);
+      _executeAsAnimatedBatch(this.__getNativeTag().toString(), () => {
+        NativeAnimatedAPI.setAnimatedNodeValue(this.__getNativeTag(), value);
+      });
     }
   }
 
diff --git a/Libraries/Animated/nodes/AnimatedWithChildren.js b/Libraries/Animated/nodes/AnimatedWithChildren.js
index e46dbf2f629762..5f4ff1c6de1f91 100644
--- a/Libraries/Animated/nodes/AnimatedWithChildren.js
+++ b/Libraries/Animated/nodes/AnimatedWithChildren.js
@@ -76,6 +76,7 @@ class AnimatedWithChildren extends AnimatedNode {
     super.__callListeners(value);
     if (!this.__isNative) {
       for (const child of this._children) {
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         if (child.__getValue) {
           child.__callListeners(child.__getValue());
         }
diff --git a/Libraries/Animated/useAnimatedProps.js b/Libraries/Animated/useAnimatedProps.js
new file mode 100644
index 00000000000000..142faedb1b2396
--- /dev/null
+++ b/Libraries/Animated/useAnimatedProps.js
@@ -0,0 +1,211 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import AnimatedProps from './nodes/AnimatedProps';
+import {AnimatedEvent} from './AnimatedEvent';
+import useRefEffect from '../Utilities/useRefEffect';
+import NativeAnimatedHelper from './NativeAnimatedHelper';
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+} from 'react';
+
+type ReducedProps<TProps> = {
+  ...TProps,
+  collapsable: boolean,
+  ...
+};
+type CallbackRef<T> = T => mixed;
+
+let animatedComponentNextId = 1;
+
+export default function useAnimatedProps<TProps: {...}, TInstance>(
+  props: TProps,
+): [ReducedProps<TProps>, CallbackRef<TInstance | null>] {
+  const [, scheduleUpdate] = useReducer(count => count + 1, 0);
+  const onUpdateRef = useRef<?() => void>(null);
+
+  // TODO: Only invalidate `node` if animated props or `style` change. In the
+  // previous implementation, we permitted `style` to override props with the
+  // same name property name as styles, so we can probably continue doing that.
+  // The ordering of other props *should* not matter.
+  const node = useMemo(
+    () => new AnimatedProps(props, () => onUpdateRef.current?.()),
+    [props],
+  );
+  useAnimatedPropsLifecycle(node);
+
+  // TODO: This "effect" does three things:
+  //
+  //   1) Call `setNativeView`.
+  //   2) Update `onUpdateRef`.
+  //   3) Update listeners for `AnimatedEvent` props.
+  //
+  // Ideally, each of these would be separat "effects" so that they are not
+  // unnecessarily re-run when irrelevant dependencies change. For example, we
+  // should be able to hoist all `AnimatedEvent` props and only do #3 if either
+  // the `AnimatedEvent` props change or `instance` changes.
+  //
+  // But there is no way to transparently compose three separate callback refs,
+  // so we just combine them all into one for now.
+  const refEffect = useCallback(
+    instance => {
+      // NOTE: This may be called more often than necessary (e.g. when `props`
+      // changes), but `setNativeView` already optimizes for that.
+      node.setNativeView(instance);
+
+      // NOTE: This callback is only used by the JavaScript animation driver.
+      onUpdateRef.current = () => {
+        if (
+          process.env.NODE_ENV === 'test' ||
+          typeof instance !== 'object' ||
+          typeof instance?.setNativeProps !== 'function' ||
+          isFabricInstance(instance)
+        ) {
+          // Schedule an update for this component to update `reducedProps`,
+          // but do not compute it immediately. If a parent also updated, we
+          // need to merge those new props in before updating.
+          scheduleUpdate();
+        } else if (!node.__isNative) {
+          // $FlowIgnore[not-a-function] - Assume it's still a function.
+          instance.setNativeProps(node.__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`',
+          );
+        }
+      };
+
+      const target = getEventTarget(instance);
+      const events = [];
+
+      for (const propName in props) {
+        const propValue = props[propName];
+        if (propValue instanceof AnimatedEvent && propValue.__isNative) {
+          propValue.__attach(target, propName);
+          events.push([propName, propValue]);
+        }
+      }
+
+      return () => {
+        onUpdateRef.current = null;
+
+        for (const [propName, propValue] of events) {
+          propValue.__detach(target, propName);
+        }
+      };
+    },
+    [props, node],
+  );
+  const callbackRef = useRefEffect<TInstance>(refEffect);
+
+  return [reduceAnimatedProps<TProps>(node), callbackRef];
+}
+
+function reduceAnimatedProps<TProps>(
+  node: AnimatedProps,
+): ReducedProps<TProps> {
+  // Force `collapsable` to be false so that the native view is not flattened.
+  // Flattened views cannot be accurately referenced by the native driver.
+  return {
+    ...node.__getValue(),
+    collapsable: false,
+  };
+}
+
+/**
+ * Manages the lifecycle of the supplied `AnimatedProps` by invoking `__attach`
+ * and `__detach`. However, this is more complicated because `AnimatedProps`
+ * uses reference counting to determine when to recursively detach its children
+ * nodes. So in order to optimize this, we avoid detaching until the next attach
+ * unless we are unmounting.
+ */
+function useAnimatedPropsLifecycle(node: AnimatedProps): void {
+  const prevNodeRef = useRef<?AnimatedProps>(null);
+  const isUnmountingRef = useRef<boolean>(false);
+
+  const [animatedComponentId] = useState(
+    () => `${animatedComponentNextId++}:animatedComponent`,
+  );
+
+  useLayoutEffect(() => {
+    NativeAnimatedHelper.API.setWaitingForIdentifier(animatedComponentId);
+  });
+
+  useEffect(() => {
+    NativeAnimatedHelper.API.unsetWaitingForIdentifier(animatedComponentId);
+  });
+
+  useLayoutEffect(() => {
+    isUnmountingRef.current = false;
+    return () => {
+      isUnmountingRef.current = true;
+    };
+  }, []);
+
+  useLayoutEffect(() => {
+    node.__attach();
+    if (prevNodeRef.current != null) {
+      const prevNode = prevNodeRef.current;
+      // TODO: Stop restoring default values (unless `reset` is called).
+      prevNode.__restoreDefaultValues();
+      prevNode.__detach();
+      prevNodeRef.current = null;
+    }
+    return () => {
+      if (isUnmountingRef.current) {
+        // NOTE: Do not restore default values on unmount, see D18197735.
+        node.__detach();
+      } else {
+        prevNodeRef.current = node;
+      }
+    };
+  }, [node]);
+}
+
+function getEventTarget<TInstance>(instance: TInstance): TInstance {
+  return typeof instance === 'object' &&
+    typeof instance?.getScrollableNode === 'function'
+    ? // $FlowFixMe[incompatible-use] - Legacy instance assumptions.
+      instance.getScrollableNode()
+    : instance;
+}
+
+// $FlowFixMe[unclear-type] - Legacy instance assumptions.
+function isFabricInstance(instance: any): boolean {
+  return (
+    hasFabricHandle(instance) ||
+    // Some components have a setNativeProps function but aren't a host component
+    // such as lists like FlatList and SectionList. These should also use
+    // forceUpdate in Fabric since setNativeProps doesn't exist on the underlying
+    // host component. This crazy hack is essentially special casing those lists and
+    // ScrollView itself to use forceUpdate in Fabric.
+    // If these components end up using forwardRef then these hacks can go away
+    // as instance would actually be the underlying host component and the above check
+    // would be sufficient.
+    hasFabricHandle(instance?.getNativeScrollRef?.()) ||
+    hasFabricHandle(instance?.getScrollResponder?.()?.getNativeScrollRef?.())
+  );
+}
+
+// $FlowFixMe[unclear-type] - Legacy instance assumptions.
+function hasFabricHandle(instance: any): boolean {
+  // eslint-disable-next-line dot-notation
+  return instance?.['_internalInstanceHandle']?.stateNode?.canonical != null;
+}
diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js
index cc8a62a381ff8e..04492206127d79 100644
--- a/Libraries/AppState/AppState.js
+++ b/Libraries/AppState/AppState.js
@@ -4,17 +4,30 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict-local
  * @format
- * @flow
  */
 
-'use strict';
-
+import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import logError from '../Utilities/logError';
-import EventEmitter from '../vendor/emitter/EventEmitter';
 import NativeAppState from './NativeAppState';
-import invariant from 'invariant';
+import Platform from '../Utilities/Platform';
+
+export type AppStateValues = 'inactive' | 'background' | 'active';
+
+type AppStateEventDefinitions = {
+  change: [AppStateValues],
+  memoryWarning: [],
+  blur: [],
+  focus: [],
+};
+
+type NativeAppStateEventDefinitions = {
+  appStateDidChange: [{app_state: AppStateValues}],
+  appStateFocusChange: [boolean],
+  memoryWarning: [],
+};
 
 /**
  * `AppState` can tell you if the app is in the foreground or background,
@@ -22,44 +35,52 @@ import invariant from 'invariant';
  *
  * See https://reactnative.dev/docs/appstate.html
  */
-class AppState extends NativeEventEmitter {
-  _eventHandlers: Object;
-  _supportedEvents = ['change', 'memoryWarning', 'blur', 'focus'];
-  currentState: ?string;
+class AppState {
+  currentState: ?string = null;
   isAvailable: boolean;
 
-  constructor() {
-    super(NativeAppState);
-
-    this.isAvailable = true;
-    this._eventHandlers = this._supportedEvents.reduce((handlers, key) => {
-      handlers[key] = new Map();
-      return handlers;
-    }, {});
-
-    this.currentState = NativeAppState.getConstants().initialAppState;
-
-    let eventUpdated = false;
+  _emitter: ?NativeEventEmitter<NativeAppStateEventDefinitions>;
 
-    // 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 `currentState` property and get rid of this.
-    this.addListener('appStateDidChange', appStateData => {
-      eventUpdated = true;
-      this.currentState = appStateData.app_state;
-    });
-
-    // TODO: see above - this request just populates the value of `currentState`
-    // when the module is first initialized. Would be better to get rid of the
-    // prop and expose `getCurrentAppState` method directly.
-    NativeAppState.getCurrentAppState(appStateData => {
-      // It's possible that the state will have changed here & listeners need to be notified
-      if (!eventUpdated && this.currentState !== appStateData.app_state) {
+  constructor() {
+    if (NativeAppState == null) {
+      this.isAvailable = false;
+    } else {
+      this.isAvailable = true;
+
+      const emitter: NativeEventEmitter<NativeAppStateEventDefinitions> = new NativeEventEmitter(
+        // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+        // If you want to use the native module on other platforms, please remove this condition and test its behavior
+        Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
+          ? null
+          : NativeAppState,
+      );
+      this._emitter = emitter;
+
+      this.currentState = NativeAppState.getConstants().initialAppState;
+
+      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 `currentState` property and get rid of this.
+      emitter.addListener('appStateDidChange', appStateData => {
+        eventUpdated = true;
         this.currentState = appStateData.app_state;
-        this.emit('appStateDidChange', appStateData);
-      }
-    }, logError);
+      });
+
+      // TODO: see above - this request just populates the value of `currentState`
+      // when the module is first initialized. Would be better to get rid of the
+      // prop and expose `getCurrentAppState` method directly.
+      // $FlowExpectedError[incompatible-call]
+      NativeAppState.getCurrentAppState(appStateData => {
+        // It's possible that the state will have changed here & listeners need to be notified
+        if (!eventUpdated && this.currentState !== appStateData.app_state) {
+          this.currentState = appStateData.app_state;
+          emitter.emit('appStateDidChange', appStateData);
+        }
+      }, logError);
+    }
   }
 
   // TODO: now that AppState is a subclass of NativeEventEmitter, we could
@@ -73,107 +94,72 @@ class AppState extends NativeEventEmitter {
    *
    * See https://reactnative.dev/docs/appstate.html#addeventlistener
    */
-  addEventListener(type: string, handler: Function) {
-    invariant(
-      this._supportedEvents.indexOf(type) !== -1,
-      'Trying to subscribe to unknown event: "%s"',
-      type,
-    );
-
+  addEventListener<K: $Keys<AppStateEventDefinitions>>(
+    type: K,
+    handler: (...$ElementType<AppStateEventDefinitions, K>) => void,
+  ): EventSubscription {
+    const emitter = this._emitter;
+    if (emitter == null) {
+      throw new Error('Cannot use AppState when `isAvailable` is false.');
+    }
     switch (type) {
-      case 'change': {
-        this._eventHandlers[type].set(
-          handler,
-          this.addListener('appStateDidChange', appStateData => {
-            handler(appStateData.app_state);
-          }),
-        );
-        break;
-      }
-      case 'memoryWarning': {
-        this._eventHandlers[type].set(
-          handler,
-          this.addListener('memoryWarning', handler),
-        );
-        break;
-      }
-
+      case 'change':
+        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        const changeHandler: AppStateValues => void = handler;
+        return emitter.addListener('appStateDidChange', appStateData => {
+          changeHandler(appStateData.app_state);
+        });
+      case 'memoryWarning':
+        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        const memoryWarningHandler: () => void = handler;
+        return emitter.addListener('memoryWarning', memoryWarningHandler);
       case 'blur':
-      case 'focus': {
-        this._eventHandlers[type].set(
-          handler,
-          this.addListener('appStateFocusChange', hasFocus => {
-            if (type === 'blur' && !hasFocus) {
-              handler();
-            }
-            if (type === 'focus' && hasFocus) {
-              handler();
-            }
-          }),
-        );
-      }
+      case 'focus':
+        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        const focusOrBlurHandler: () => void = handler;
+        return emitter.addListener('appStateFocusChange', hasFocus => {
+          if (type === 'blur' && !hasFocus) {
+            focusOrBlurHandler();
+          }
+          if (type === 'focus' && hasFocus) {
+            focusOrBlurHandler();
+          }
+        });
     }
+    throw new Error('Trying to subscribe to unknown event: ' + type);
   }
 
   /**
-   * Remove a handler by passing the `change` event type and the handler.
-   *
-   * See https://reactnative.dev/docs/appstate.html#removeeventlistener
+   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
    */
-  removeEventListener(type: string, handler: Function) {
-    invariant(
-      this._supportedEvents.indexOf(type) !== -1,
-      'Trying to remove listener for unknown event: "%s"',
-      type,
-    );
-    if (!this._eventHandlers[type].has(handler)) {
-      return;
+  removeEventListener<K: $Keys<AppStateEventDefinitions>>(
+    type: K,
+    listener: (...$ElementType<AppStateEventDefinitions, K>) => mixed,
+  ): void {
+    const emitter = this._emitter;
+    if (emitter == null) {
+      throw new Error('Cannot use AppState when `isAvailable` is false.');
     }
-    this._eventHandlers[type].get(handler).remove();
-    this._eventHandlers[type].delete(handler);
-  }
-}
-
-function throwMissingNativeModule() {
-  invariant(
-    false,
-    'Cannot use AppState module when native RCTAppState is not included in the build.\n' +
-      'Either include it, or check AppState.isAvailable before calling any methods.',
-  );
-}
-
-class MissingNativeAppStateShim extends EventEmitter {
-  // AppState
-  isAvailable: boolean = false;
-  currentState: ?string = null;
-
-  addEventListener(type: string, handler: Function) {
-    throwMissingNativeModule();
-  }
-
-  removeEventListener(type: string, handler: Function) {
-    throwMissingNativeModule();
-  }
-
-  // EventEmitter
-  addListener() {
-    throwMissingNativeModule();
-  }
-
-  removeAllListeners() {
-    throwMissingNativeModule();
-  }
-
-  removeSubscription() {
-    throwMissingNativeModule();
+    // NOTE: This will report a deprecation notice via `console.error`.
+    switch (type) {
+      case 'change':
+        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        // $FlowIssue[incompatible-call]
+        emitter.removeListener('appStateDidChange', listener);
+        return;
+      case 'memoryWarning':
+        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        emitter.removeListener('memoryWarning', listener);
+        return;
+      case 'blur':
+      case 'focus':
+        // $FlowIssue[invalid-tuple-arity] Flow cannot refine handler based on the event type
+        // $FlowIssue[incompatible-call]
+        emitter.addListener('appStateFocusChange', listener);
+        return;
+    }
+    throw new Error('Trying to unsubscribe from unknown event: ' + type);
   }
 }
 
-// This module depends on the native `RCTAppState` module. If you don't include it,
-// `AppState.isAvailable` will return `false`, and any method calls will throw.
-// We reassign the class variable to keep the autodoc generator happy.
-const AppStateInstance: AppState | MissingNativeAppStateShim = NativeAppState
-  ? new AppState()
-  : new MissingNativeAppStateShim();
-
-module.exports = AppStateInstance;
+module.exports = (new AppState(): AppState);
diff --git a/Libraries/AppState/NativeAppState.js b/Libraries/AppState/NativeAppState.js
index 76f3b71619ef2c..b08fe5ca81a5c4 100644
--- a/Libraries/AppState/NativeAppState.js
+++ b/Libraries/AppState/NativeAppState.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/BUCK b/Libraries/BUCK
deleted file mode 100644
index 0993fce3acf8fe..00000000000000
--- a/Libraries/BUCK
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load(
-    "//tools/build_defs/oss:rn_codegen_defs.bzl",
-    "rn_codegen_modules",
-)
-load(
-    "//tools/build_defs/oss:rn_defs.bzl",
-    "react_native_root_target",
-)
-
-fb_native.genrule(
-    name = "react_native_codegen_schema",
-    srcs = glob(
-        [
-            "**/*.js",
-        ],
-        exclude = [
-            "**/__tests__/**/*",
-        ],
-    ),
-    cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
-    out = "schema.json",
-    labels = ["codegen_rule"],
-)
-
-rn_codegen_modules(
-    name = "FBReactNativeSpec",
-    library_labels = ["supermodule:xplat/default/public.react_native.infra"],
-    native_module_spec_name = "FBReactNativeSpec",
-    schema_target = ":react_native_codegen_schema",
-)
diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js
index fa2147b540d299..c01bbb14749ccb 100644
--- a/Libraries/BatchedBridge/MessageQueue.js
+++ b/Libraries/BatchedBridge/MessageQueue.js
@@ -47,7 +47,7 @@ class MessageQueue {
   _callID: number;
   _lastFlush: number;
   _eventLoopStartTime: number;
-  _immediatesCallback: ?() => void;
+  _reactNativeMicrotasksCallback: ?() => void;
 
   _debugInfo: {[number]: [number, number], ...};
   _remoteModuleTable: {[number]: string, ...};
@@ -63,7 +63,7 @@ class MessageQueue {
     this._callID = 0;
     this._lastFlush = 0;
     this._eventLoopStartTime = Date.now();
-    this._immediatesCallback = null;
+    this._reactNativeMicrotasksCallback = null;
 
     if (__DEV__) {
       this._debugInfo = {};
@@ -72,13 +72,16 @@ class MessageQueue {
     }
 
     // $FlowFixMe[cannot-write]
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.callFunctionReturnFlushedQueue = this.callFunctionReturnFlushedQueue.bind(
       this,
     );
     // $FlowFixMe[cannot-write]
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.flushedQueue = this.flushedQueue.bind(this);
 
     // $FlowFixMe[cannot-write]
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.invokeCallbackAndReturnFlushedQueue = this.invokeCallbackAndReturnFlushedQueue.bind(
       this,
     );
@@ -129,7 +132,7 @@ class MessageQueue {
 
   flushedQueue(): null | [Array<number>, Array<number>, Array<mixed>, number] {
     this.__guard(() => {
-      this.__callImmediates();
+      this.__callReactNativeMicrotasks();
     });
 
     const queue = this._queue;
@@ -145,14 +148,16 @@ class MessageQueue {
     this._lazyCallableModules[name] = () => module;
   }
 
-  registerLazyCallableModule(name: string, factory: void => {...}) {
-    let module: {...};
-    let getValue: ?(void) => {...} = factory;
+  registerLazyCallableModule(name: string, factory: void => interface {}) {
+    let module: interface {};
+    let getValue: ?(void) => interface {} = factory;
     this._lazyCallableModules[name] = () => {
       if (getValue) {
         module = getValue();
         getValue = null;
       }
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for
+       * this parameters */
       return module;
     };
   }
@@ -349,8 +354,8 @@ class MessageQueue {
   // For JSTimers to register its callback. Otherwise a circular dependency
   // between modules is introduced. Note that only one callback may be
   // registered at a time.
-  setImmediatesCallback(fn: () => void) {
-    this._immediatesCallback = fn;
+  setReactNativeMicrotasksCallback(fn: () => void) {
+    this._reactNativeMicrotasksCallback = fn;
   }
 
   /**
@@ -376,16 +381,16 @@ class MessageQueue {
   // can be configured by the VM or any Inspector
   __shouldPauseOnThrow(): boolean {
     return (
-      // $FlowFixMe
+      // $FlowFixMe[cannot-resolve-name]
       typeof DebuggerInternal !== 'undefined' &&
       DebuggerInternal.shouldPauseOnThrow === true // eslint-disable-line no-undef
     );
   }
 
-  __callImmediates() {
-    Systrace.beginEvent('JSTimers.callImmediates()');
-    if (this._immediatesCallback != null) {
-      this._immediatesCallback();
+  __callReactNativeMicrotasks() {
+    Systrace.beginEvent('JSTimers.callReactNativeMicrotasks()');
+    if (this._reactNativeMicrotasksCallback != null) {
+      this._reactNativeMicrotasksCallback();
     }
     Systrace.endEvent();
   }
@@ -404,7 +409,7 @@ class MessageQueue {
     const moduleMethods = this.getCallableModule(module);
     invariant(
       !!moduleMethods,
-      `Module ${module} is not a registered callable module (calling ${method}). A frequent cause of the error is that the application entry file path is incorrect. 
+      `Module ${module} is not a registered callable module (calling ${method}). A frequent cause of the error is that the application entry file path is incorrect.
       This can also happen when the JS bundle is corrupt or there is an early initialization error when loading React Native.`,
     );
     invariant(
diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js
index 4f764463738d9f..257436199d3484 100644
--- a/Libraries/BatchedBridge/NativeModules.js
+++ b/Libraries/BatchedBridge/NativeModules.js
@@ -14,7 +14,7 @@ const BatchedBridge = require('./BatchedBridge');
 
 const invariant = require('invariant');
 
-import type {ExtendedError} from '../Core/Devtools/parseErrorStack';
+import type {ExtendedError} from '../Core/ExtendedError';
 
 export type ModuleConfig = [
   string /* name */,
@@ -101,6 +101,8 @@ function genMethod(moduleID: number, methodID: number, type: MethodType) {
   if (type === 'promise') {
     fn = function promiseMethodWrapper(...args: Array<mixed>) {
       // In case we reject, capture a useful stack trace here.
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for
+       * this parameters */
       const enqueueingFrameError: ExtendedError = new Error();
       return new Promise((resolve, reject) => {
         BatchedBridge.enqueueNativeCall(
@@ -166,6 +168,8 @@ function updateErrorWithErrorData(
   errorData: {message: string, ...},
   error: ExtendedError,
 ): ExtendedError {
+  /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+   * parameters */
   return Object.assign(error, errorData || {});
 }
 
diff --git a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
index e1b7fd84d32411..9c63238d8a099a 100644
--- a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
+++ b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
@@ -108,7 +108,7 @@ describe('MessageQueue', function() {
     const unknownModule = 'UnknownModule',
       unknownMethod = 'UnknownMethod';
     expect(() => queue.__callFunction(unknownModule, unknownMethod)).toThrow(
-      `Module ${unknownModule} is not a registered callable module (calling ${unknownMethod}). A frequent cause of the error is that the application entry file path is incorrect. 
+      `Module ${unknownModule} is not a registered callable module (calling ${unknownMethod}). A frequent cause of the error is that the application entry file path is incorrect.
       This can also happen when the JS bundle is corrupt or there is an early initialization error when loading React Native.`,
     );
   });
diff --git a/Libraries/Blob/BlobManager.js b/Libraries/Blob/BlobManager.js
index e12512392a3e78..4f4310adddb582 100644
--- a/Libraries/Blob/BlobManager.js
+++ b/Libraries/Blob/BlobManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const Blob = require('./Blob');
 const BlobRegistry = require('./BlobRegistry');
 
diff --git a/Libraries/Blob/FileReader.js b/Libraries/Blob/FileReader.js
index 15a8b44d0bb522..a71d10fc562d3d 100644
--- a/Libraries/Blob/FileReader.js
+++ b/Libraries/Blob/FileReader.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const Blob = require('./Blob');
 const EventTarget = require('event-target-shim');
 
@@ -48,7 +46,7 @@ class FileReader extends (EventTarget(...READER_EVENTS): any) {
   _error: ?Error;
   _result: ?ReaderResult;
   _aborted: boolean = false;
-  _subscriptions: Array<*> = [];
+  _subscriptions: Array<any> = [];
 
   constructor() {
     super();
diff --git a/Libraries/Blob/NativeBlobModule.js b/Libraries/Blob/NativeBlobModule.js
index d58aeeab6ebd4f..d43c8bc3e3b21f 100644
--- a/Libraries/Blob/NativeBlobModule.js
+++ b/Libraries/Blob/NativeBlobModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Blob/NativeFileReaderModule.js b/Libraries/Blob/NativeFileReaderModule.js
index ac135db7394d19..a33d5d9b7754dd 100644
--- a/Libraries/Blob/NativeFileReaderModule.js
+++ b/Libraries/Blob/NativeFileReaderModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Blob/RCTBlobManager.h b/Libraries/Blob/RCTBlobManager.h
index 96c8f0722f02c9..04b905ccb92a24 100755
--- a/Libraries/Blob/RCTBlobManager.h
+++ b/Libraries/Blob/RCTBlobManager.h
@@ -8,8 +8,9 @@
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTURLRequestHandler.h>
+#import <React/RCTInitializing.h>
 
-@interface RCTBlobManager : NSObject <RCTBridgeModule, RCTURLRequestHandler>
+@interface RCTBlobManager : NSObject <RCTBridgeModule, RCTURLRequestHandler, RCTInitializing>
 
 - (NSString *)store:(NSData *)data;
 
diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
index a75844ed6ae1ed..425dc73fb6c077 100755
--- a/Libraries/Blob/RCTBlobManager.mm
+++ b/Libraries/Blob/RCTBlobManager.mm
@@ -37,13 +37,11 @@ @implementation RCTBlobManager
 RCT_EXPORT_MODULE(BlobModule)
 
 @synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 @synthesize methodQueue = _methodQueue;
-@synthesize turboModuleRegistry = _turboModuleRegistry;
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  _bridge = bridge;
-
   std::lock_guard<std::mutex> lock(_blobsMutex);
   _blobs = [NSMutableDictionary new];
 
@@ -140,9 +138,9 @@ - (void)remove:(NSString *)blobId
 
 RCT_EXPORT_METHOD(addNetworkingHandler)
 {
-  RCTNetworking *const networking = _bridge ? _bridge.networking : [_turboModuleRegistry moduleForName:"RCTNetworking"];
+  RCTNetworking *const networking = [_moduleRegistry moduleForName:"Networking"];
 
-  // TODO(T63516227): Why can methodQueue be nil here? 
+  // TODO(T63516227): Why can methodQueue be nil here?
   // We don't want to do anything when methodQueue is nil.
   if (!networking.methodQueue) {
     return;
@@ -156,23 +154,23 @@ - (void)remove:(NSString *)blobId
 
 RCT_EXPORT_METHOD(addWebSocketHandler:(double)socketID)
 {
-  dispatch_async(_bridge.webSocketModule.methodQueue, ^{
-    [self->_bridge.webSocketModule setContentHandler:self forSocketID:[NSNumber numberWithDouble:socketID]];
+  dispatch_async(((RCTWebSocketModule *)[_moduleRegistry moduleForName:"WebSocketModule"]).methodQueue, ^{
+    [[self->_moduleRegistry moduleForName:"WebSocketModule"] setContentHandler:self forSocketID:[NSNumber numberWithDouble:socketID]];
   });
 }
 
 RCT_EXPORT_METHOD(removeWebSocketHandler:(double)socketID)
 {
-  dispatch_async(_bridge.webSocketModule.methodQueue, ^{
-    [self->_bridge.webSocketModule setContentHandler:nil forSocketID:[NSNumber numberWithDouble:socketID]];
+  dispatch_async(((RCTWebSocketModule *)[_moduleRegistry moduleForName:"WebSocketModule"]).methodQueue, ^{
+    [[self->_moduleRegistry moduleForName:"WebSocketModule"] setContentHandler:nil forSocketID:[NSNumber numberWithDouble:socketID]];
   });
 }
 
 // @lint-ignore FBOBJCUNTYPEDCOLLECTION1
 RCT_EXPORT_METHOD(sendOverSocket:(NSDictionary *)blob socketID:(double)socketID)
 {
-  dispatch_async(_bridge.webSocketModule.methodQueue, ^{
-    [self->_bridge.webSocketModule sendData:[self resolve:blob] forSocketID:[NSNumber numberWithDouble:socketID]];
+  dispatch_async(((RCTWebSocketModule *)[_moduleRegistry moduleForName:"WebSocketModule"]).methodQueue, ^{
+    [[self->_moduleRegistry moduleForName:"WebSocketModule"] sendData:[self resolve:blob] forSocketID:[NSNumber numberWithDouble:socketID]];
   });
 }
 
diff --git a/Libraries/Blob/RCTBlobPlugins.mm b/Libraries/Blob/RCTBlobPlugins.mm
index d06f40e5d21120..289094f35d43a0 100644
--- a/Libraries/Blob/RCTBlobPlugins.mm
+++ b/Libraries/Blob/RCTBlobPlugins.mm
@@ -17,13 +17,14 @@
 #import <unordered_map>
 
 Class RCTBlobClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"FileReaderModule", RCTFileReaderModuleCls},
     {"BlobModule", RCTBlobManagerCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/Blob/RCTFileReaderModule.mm b/Libraries/Blob/RCTFileReaderModule.mm
index 315605acc1174d..2525de0c201b2b 100644
--- a/Libraries/Blob/RCTFileReaderModule.mm
+++ b/Libraries/Blob/RCTFileReaderModule.mm
@@ -23,15 +23,14 @@ @implementation RCTFileReaderModule
 
 RCT_EXPORT_MODULE(FileReaderModule)
 
-@synthesize bridge = _bridge;
-@synthesize turboModuleRegistry = _turboModuleRegistry;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_METHOD(readAsText:(NSDictionary<NSString *, id> *)blob
                   encoding:(NSString *)encoding
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
-  RCTBlobManager *blobManager = [[self bridge] moduleForClass:[RCTBlobManager class]];
+  RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
   NSData *data = [blobManager resolve:blob];
 
   if (data == nil) {
@@ -56,12 +55,7 @@ @implementation RCTFileReaderModule
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
-  RCTBlobManager *blobManager = nil;
-  if ([self bridge]) {
-    blobManager = [[self bridge] moduleForClass:[RCTBlobManager class]];
-  } else {
-    blobManager = [[self turboModuleRegistry] moduleForName:[NSStringFromClass([RCTBlobManager class]) UTF8String]];
-  }
+  RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
   NSData *data = [blobManager resolve:blob];
 
   if (data == nil) {
diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec
index 8522ca699905cb..7edd6d980a7d66 100644
--- a/Libraries/Blob/React-RCTBlob.podspec
+++ b/Libraries/Blob/React-RCTBlob.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTBlob"
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{h,m,mm}"
diff --git a/Libraries/Blob/URL.js b/Libraries/Blob/URL.js
index bf9ab01bf1a786..3e63ff753fa179 100644
--- a/Libraries/Blob/URL.js
+++ b/Libraries/Blob/URL.js
@@ -7,8 +7,6 @@
  * @format
  */
 
-'use strict';
-
 const Blob = require('./Blob');
 
 import NativeBlobModule from './NativeBlobModule';
@@ -51,7 +49,7 @@ if (
  * ```
  */
 
-// Small subset from whatwg-url: https://github.com/jsdom/whatwg-url/tree/master/lib
+// Small subset from whatwg-url: https://github.com/jsdom/whatwg-url/tree/master/src
 // The reference code bloat comes from Unicode issues with URLs, so those won't work here.
 export class URLSearchParams {
   _searchParams = [];
@@ -67,27 +65,27 @@ export class URLSearchParams {
   }
 
   delete(name) {
-    throw new Error('not implemented');
+    throw new Error('URLSearchParams.delete is not implemented');
   }
 
   get(name) {
-    throw new Error('not implemented');
+    throw new Error('URLSearchParams.get is not implemented');
   }
 
   getAll(name) {
-    throw new Error('not implemented');
+    throw new Error('URLSearchParams.getAll is not implemented');
   }
 
   has(name) {
-    throw new Error('not implemented');
+    throw new Error('URLSearchParams.has is not implemented');
   }
 
   set(name, value) {
-    throw new Error('not implemented');
+    throw new Error('URLSearchParams.set is not implemented');
   }
 
   sort() {
-    throw new Error('not implemented');
+    throw new Error('URLSearchParams.sort is not implemented');
   }
 
   [Symbol.iterator]() {
@@ -107,7 +105,7 @@ export class URLSearchParams {
 
 function validateBaseUrl(url: string) {
   // from this MIT-licensed gist: https://gist.github.com/dperini/729294
-  return /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,}))?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(
+  return /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)*(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/.test(
     url,
   );
 }
@@ -156,15 +154,15 @@ export class URL {
   }
 
   get hash() {
-    throw new Error('not implemented');
+    throw new Error('URL.hash is not implemented');
   }
 
   get host() {
-    throw new Error('not implemented');
+    throw new Error('URL.host is not implemented');
   }
 
   get hostname() {
-    throw new Error('not implemented');
+    throw new Error('URL.hostname is not implemented');
   }
 
   get href(): string {
@@ -172,27 +170,27 @@ export class URL {
   }
 
   get origin() {
-    throw new Error('not implemented');
+    throw new Error('URL.origin is not implemented');
   }
 
   get password() {
-    throw new Error('not implemented');
+    throw new Error('URL.password is not implemented');
   }
 
   get pathname() {
-    throw new Error('not implemented');
+    throw new Error('URL.pathname not implemented');
   }
 
   get port() {
-    throw new Error('not implemented');
+    throw new Error('URL.port is not implemented');
   }
 
   get protocol() {
-    throw new Error('not implemented');
+    throw new Error('URL.protocol is not implemented');
   }
 
   get search() {
-    throw new Error('not implemented');
+    throw new Error('URL.search is not implemented');
   }
 
   get searchParams(): URLSearchParams {
@@ -215,6 +213,6 @@ export class URL {
   }
 
   get username() {
-    throw new Error('not implemented');
+    throw new Error('URL.username is not implemented');
   }
 }
diff --git a/Libraries/BugReporting/BugReporting.js b/Libraries/BugReporting/BugReporting.js
index d2f3c4a442a4c9..d0f8dc2b18c73e 100644
--- a/Libraries/BugReporting/BugReporting.js
+++ b/Libraries/BugReporting/BugReporting.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import NativeRedBox from '../NativeModules/specs/NativeRedBox';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
@@ -45,6 +43,7 @@ class BugReporting {
     if (!BugReporting._subscription) {
       BugReporting._subscription = RCTDeviceEventEmitter.addListener(
         'collectBugExtraData',
+        // $FlowFixMe[method-unbinding]
         BugReporting.collectExtraData,
         null,
       );
@@ -54,6 +53,7 @@ class BugReporting {
     if (!BugReporting._redboxSubscription) {
       BugReporting._redboxSubscription = RCTDeviceEventEmitter.addListener(
         'collectRedBoxExtraData',
+        // $FlowFixMe[method-unbinding]
         BugReporting.collectExtraData,
         null,
       );
diff --git a/Libraries/BugReporting/getReactData.js b/Libraries/BugReporting/getReactData.js
index cc9bc55f0cc394..c851f76f993f6a 100644
--- a/Libraries/BugReporting/getReactData.js
+++ b/Libraries/BugReporting/getReactData.js
@@ -14,7 +14,7 @@
  * Convert a react internal instance to a sanitized data object.
  *
  * This is shamelessly stolen from react-devtools:
- * https://github.com/facebook/react-devtools/blob/master/backend/getData.js
+ * https://github.com/facebook/react-devtools/blob/HEAD/backend/getData.js
  */
 function getData(element: Object): Object {
   let children = null;
@@ -162,7 +162,7 @@ function copyWithSetImpl(obj, path, idx, value) {
   }
   const key = path[idx];
   const updated = Array.isArray(obj) ? obj.slice() : {...obj};
-  // $FlowFixMe number or string is fine here
+  // $FlowFixMe[incompatible-use] number or string is fine here
   updated[key] = copyWithSetImpl(obj[key], path, idx + 1, value);
   return updated;
 }
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
deleted file mode 100644
index 138912dcf14ac7..00000000000000
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-import RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
-import UIManager from '../../ReactNative/UIManager';
-import NativeAccessibilityInfo from './NativeAccessibilityInfo';
-
-const REDUCE_MOTION_EVENT = 'reduceMotionDidChange';
-const TOUCH_EXPLORATION_EVENT = 'touchExplorationDidChange';
-
-type ChangeEventName = $Keys<{
-  change: string,
-  reduceMotionChanged: string,
-  screenReaderChanged: string,
-  ...
-}>;
-
-const _subscriptions = new Map();
-
-/**
- * Sometimes it's useful to know whether or not the device has a screen reader
- * that is currently active. The `AccessibilityInfo` API is designed for this
- * purpose. You can use it to query the current state of the screen reader as
- * well as to register to be notified when the state of the screen reader
- * changes.
- *
- * See https://reactnative.dev/docs/accessibilityinfo.html
- */
-
-const AccessibilityInfo = {
-  /**
-   * iOS only
-   */
-  isBoldTextEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  /**
-   * iOS only
-   */
-  isGrayscaleEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  /**
-   * macOS only
-   */
-  isHighContrastEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  /**
-   * iOS only
-   */
-  isInvertColorsEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  isReduceMotionEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityInfo) {
-        NativeAccessibilityInfo.isReduceMotionEnabled(resolve);
-      } else {
-        reject(false);
-      }
-    });
-  },
-
-  /**
-   * iOS only
-   */
-  isReduceTransparencyEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  isScreenReaderEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityInfo) {
-        NativeAccessibilityInfo.isTouchExplorationEnabled(resolve);
-      } else {
-        reject(false);
-      }
-    });
-  },
-
-  /**
-   * Deprecated
-   *
-   * Same as `isScreenReaderEnabled`
-   */
-  // $FlowFixMe[unsafe-getters-setters]
-  get fetch(): () => Promise<boolean> {
-    console.warn(
-      'AccessibilityInfo.fetch is deprecated, call AccessibilityInfo.isScreenReaderEnabled instead',
-    );
-    return this.isScreenReaderEnabled;
-  },
-
-  addEventListener: function<T>(eventName: ChangeEventName, handler: T): void {
-    let listener;
-
-    if (eventName === 'change' || eventName === 'screenReaderChanged') {
-      listener = RCTDeviceEventEmitter.addListener(
-        TOUCH_EXPLORATION_EVENT,
-        handler,
-      );
-    } else if (eventName === 'reduceMotionChanged') {
-      listener = RCTDeviceEventEmitter.addListener(
-        REDUCE_MOTION_EVENT,
-        handler,
-      );
-    }
-
-    // $FlowFixMe[escaped-generic]
-    _subscriptions.set(handler, listener);
-  },
-
-  removeEventListener: function<T>(
-    eventName: ChangeEventName,
-    handler: T,
-  ): void {
-    // $FlowFixMe[escaped-generic]
-    const listener = _subscriptions.get(handler);
-    if (!listener) {
-      return;
-    }
-    listener.remove();
-    // $FlowFixMe[escaped-generic]
-    _subscriptions.delete(handler);
-  },
-
-  /**
-   * Set accessibility focus to a react component.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#setaccessibilityfocus
-   */
-  setAccessibilityFocus: function(reactTag: number): void {
-    UIManager.sendAccessibilityEvent(
-      reactTag,
-      UIManager.getConstants().AccessibilityEventTypes.typeViewFocused,
-    );
-  },
-
-  /**
-   * Post a string to be announced by the screen reader.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#announceforaccessibility
-   */
-  announceForAccessibility: function(announcement: string): void {
-    if (NativeAccessibilityInfo) {
-      NativeAccessibilityInfo.announceForAccessibility(announcement);
-    }
-  },
-};
-
-module.exports = AccessibilityInfo;
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
deleted file mode 100644
index fa73f4d692151a..00000000000000
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-import RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
-import NativeAccessibilityManager from './NativeAccessibilityManager';
-
-const CHANGE_EVENT_NAME = {
-  announcementFinished: 'announcementFinished',
-  boldTextChanged: 'boldTextChanged',
-  grayscaleChanged: 'grayscaleChanged',
-  invertColorsChanged: 'invertColorsChanged',
-  reduceMotionChanged: 'reduceMotionChanged',
-  reduceTransparencyChanged: 'reduceTransparencyChanged',
-  screenReaderChanged: 'screenReaderChanged',
-};
-
-type ChangeEventName = $Keys<{
-  announcementFinished: string,
-  boldTextChanged: string,
-  change: string,
-  grayscaleChanged: string,
-  invertColorsChanged: string,
-  reduceMotionChanged: string,
-  reduceTransparencyChanged: string,
-  screenReaderChanged: string,
-  ...
-}>;
-
-const _subscriptions = new Map();
-
-/**
- * Sometimes it's useful to know whether or not the device has a screen reader
- * that is currently active. The `AccessibilityInfo` API is designed for this
- * purpose. You can use it to query the current state of the screen reader as
- * well as to register to be notified when the state of the screen reader
- * changes.
- *
- * See https://reactnative.dev/docs/accessibilityinfo.html
- */
-const AccessibilityInfo = {
-  /**
-   * Query whether bold text is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when bold text is enabled and `false` otherwise.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#isBoldTextEnabled
-   */
-  isBoldTextEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentBoldTextState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether grayscale is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when grayscale is enabled and `false` otherwise.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#isGrayscaleEnabled
-   */
-  isGrayscaleEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentGrayscaleState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * macOS only
-   */
-  isHighContrastEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  /**
-   * Query whether inverted colors are currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when invert color is enabled and `false` otherwise.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#isInvertColorsEnabled
-   */
-  isInvertColorsEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentInvertColorsState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether reduced motion is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when a reduce motion is enabled and `false` otherwise.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#isReduceMotionEnabled
-   */
-  isReduceMotionEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentReduceMotionState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether reduced transparency is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when a reduce transparency is enabled and `false` otherwise.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#isReduceTransparencyEnabled
-   */
-  isReduceTransparencyEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentReduceTransparencyState(
-          resolve,
-          reject,
-        );
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether a screen reader is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when a screen reader is enabled and `false` otherwise.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#isScreenReaderEnabled
-   */
-  isScreenReaderEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentVoiceOverState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Deprecated
-   *
-   * Same as `isScreenReaderEnabled`
-   */
-  // $FlowFixMe[unsafe-getters-setters]
-  get fetch(): $FlowFixMe {
-    console.warn(
-      'AccessibilityInfo.fetch is deprecated, call AccessibilityInfo.isScreenReaderEnabled instead',
-    );
-    return this.isScreenReaderEnabled;
-  },
-
-  /**
-   * Add an event handler. Supported events:
-   *
-   * - `boldTextChanged`: iOS-only event. Fires when the state of the bold text toggle changes.
-   *   The argument to the event handler is a boolean. The boolean is `true` when a bold text
-   *   is enabled and `false` otherwise.
-   * - `grayscaleChanged`: iOS-only event. Fires when the state of the gray scale toggle changes.
-   *   The argument to the event handler is a boolean. The boolean is `true` when a gray scale
-   *   is enabled and `false` otherwise.
-   * - `invertColorsChanged`: iOS-only event. Fires when the state of the invert colors toggle
-   *   changes. The argument to the event handler is a boolean. The boolean is `true` when a invert
-   *   colors is enabled and `false` otherwise.
-   * - `reduceMotionChanged`: Fires when the state of the reduce motion toggle changes.
-   *   The argument to the event handler is a boolean. The boolean is `true` when a reduce
-   *   motion is enabled (or when "Transition Animation Scale" in "Developer options" is
-   *   "Animation off") and `false` otherwise.
-   * - `reduceTransparencyChanged`: iOS-only event. Fires when the state of the reduce transparency
-   *   toggle changes.  The argument to the event handler is a boolean. The boolean is `true`
-   *   when a reduce transparency is enabled and `false` otherwise.
-   * - `screenReaderChanged`: Fires when the state of the screen reader changes. The argument
-   *   to the event handler is a boolean. The boolean is `true` when a screen
-   *   reader is enabled and `false` otherwise.
-   * - `announcementFinished`: iOS-only event. Fires when the screen reader has
-   *   finished making an announcement. The argument to the event handler is a
-   *   dictionary with these keys:
-   *     - `announcement`: The string announced by the screen reader.
-   *     - `success`: A boolean indicating whether the announcement was
-   *       successfully made.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#addeventlistener
-   */
-  addEventListener: function<T>(
-    eventName: ChangeEventName,
-    handler: T,
-  ): {remove: () => void} {
-    let listener;
-
-    if (eventName === 'change') {
-      listener = RCTDeviceEventEmitter.addListener(
-        CHANGE_EVENT_NAME.screenReaderChanged,
-        handler,
-      );
-    } else if (CHANGE_EVENT_NAME[eventName]) {
-      listener = RCTDeviceEventEmitter.addListener(eventName, handler);
-    }
-
-    // $FlowFixMe[escaped-generic]
-    _subscriptions.set(handler, listener);
-    return {
-      remove: AccessibilityInfo.removeEventListener.bind(
-        null,
-        eventName,
-        handler,
-      ),
-    };
-  },
-
-  /**
-   * Set accessibility focus to a react component.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#setaccessibilityfocus
-   */
-  setAccessibilityFocus: function(reactTag: number): void {
-    if (NativeAccessibilityManager) {
-      NativeAccessibilityManager.setAccessibilityFocus(reactTag);
-    }
-  },
-
-  /**
-   * Post a string to be announced by the screen reader.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#announceforaccessibility
-   */
-  announceForAccessibility: function(announcement: string): void {
-    if (NativeAccessibilityManager) {
-      NativeAccessibilityManager.announceForAccessibility(announcement);
-    }
-  },
-
-  /**
-   * Remove an event handler.
-   *
-   * See https://reactnative.dev/docs/accessibilityinfo.html#removeeventlistener
-   */
-  removeEventListener: function<T>(
-    eventName: ChangeEventName,
-    handler: T,
-  ): void {
-    // $FlowFixMe[escaped-generic]
-    const listener = _subscriptions.get(handler);
-    if (!listener) {
-      return;
-    }
-    listener.remove();
-    // $FlowFixMe[escaped-generic]
-    _subscriptions.delete(handler);
-  },
-};
-
-module.exports = AccessibilityInfo;
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js
new file mode 100644
index 00000000000000..8c3f38204d12fa
--- /dev/null
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js
@@ -0,0 +1,372 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
+import {sendAccessibilityEvent} from '../../Renderer/shims/ReactNative';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import Platform from '../../Utilities/Platform';
+import type EventEmitter from '../../vendor/emitter/EventEmitter';
+import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import NativeAccessibilityInfoAndroid from './NativeAccessibilityInfo';
+import NativeAccessibilityManagerApple from './NativeAccessibilityManager';
+import legacySendAccessibilityEvent from './legacySendAccessibilityEvent';
+import type {ElementRef} from 'react';
+
+// Events that are only supported on iOS.
+type AccessibilityEventDefinitionsIOS = {
+  announcementFinished: [{announcement: string, success: boolean}],
+  boldTextChanged: [boolean],
+  grayscaleChanged: [boolean],
+  invertColorsChanged: [boolean],
+  reduceTransparencyChanged: [boolean],
+};
+
+type AccessibilityEventDefinitions = {
+  ...AccessibilityEventDefinitionsIOS,
+  highContrastChanged: [boolean], // TODO(macOS GH#774) - highContrastChanged is used on macOS
+  change: [boolean], // screenReaderChanged
+  reduceMotionChanged: [boolean],
+  screenReaderChanged: [boolean],
+};
+
+type AccessibilityEventTypes = 'click' | 'focus';
+
+// Mapping of public event names to platform-specific event names.
+const EventNames: Map<$Keys<AccessibilityEventDefinitions>, string> =
+  Platform.OS === 'android'
+    ? new Map([
+        ['change', 'touchExplorationDidChange'],
+        ['reduceMotionChanged', 'reduceMotionDidChange'],
+        ['screenReaderChanged', 'touchExplorationDidChange'],
+      ])
+    : new Map([
+        ['announcementFinished', 'announcementFinished'],
+        ['boldTextChanged', 'boldTextChanged'],
+        ['change', 'screenReaderChanged'],
+        ['grayscaleChanged', 'grayscaleChanged'],
+        ['highContrastChanged', 'highContrastChanged'],
+        ['invertColorsChanged', 'invertColorsChanged'],
+        ['reduceMotionChanged', 'reduceMotionChanged'],
+        ['reduceTransparencyChanged', 'reduceTransparencyChanged'],
+        ['screenReaderChanged', 'screenReaderChanged'],
+      ]);
+
+/**
+ * Sometimes it's useful to know whether or not the device has a screen reader
+ * that is currently active. The `AccessibilityInfo` API is designed for this
+ * purpose. You can use it to query the current state of the screen reader as
+ * well as to register to be notified when the state of the screen reader
+ * changes.
+ *
+ * See https://reactnative.dev/docs/accessibilityinfo.html
+ */
+const AccessibilityInfo = {
+  /**
+   * Query whether bold text is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when bold text is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#isBoldTextEnabled
+   */
+  isBoldTextEnabled(): Promise<boolean> {
+    if (Platform.OS === 'android') {
+      return Promise.resolve(false);
+    } else {
+      return new Promise((resolve, reject) => {
+        if (NativeAccessibilityManagerApple != null) {
+          NativeAccessibilityManagerApple.getCurrentBoldTextState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(null);
+        }
+      });
+    }
+  },
+
+  /**
+   * Query whether grayscale is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when grayscale is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#isGrayscaleEnabled
+   */
+  isGrayscaleEnabled(): Promise<boolean> {
+    if (Platform.OS === 'android') {
+      return Promise.resolve(false);
+    } else {
+      return new Promise((resolve, reject) => {
+        if (NativeAccessibilityManagerApple != null) {
+          NativeAccessibilityManagerApple.getCurrentGrayscaleState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(null);
+        }
+      });
+    }
+  },
+
+  /**
+   * macOS only
+   */
+  isHighContrastEnabled: function(): Promise<boolean> {
+    if (Platform.OS === 'macos') {
+      return new Promise((resolve, reject) => {
+        if (NativeAccessibilityManagerApple) {
+          NativeAccessibilityManagerApple.getCurrentHighContrastState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(reject);
+        }
+      });
+    } else {
+      return Promise.resolve(false);
+    }
+  },
+
+  /**
+   * Query whether inverted colors are currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when invert color is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#isInvertColorsEnabled
+   */
+  isInvertColorsEnabled(): Promise<boolean> {
+    if (Platform.OS === 'android') {
+      return Promise.resolve(false);
+    } else {
+      return new Promise((resolve, reject) => {
+        if (NativeAccessibilityManagerApple != null) {
+          NativeAccessibilityManagerApple.getCurrentInvertColorsState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(null);
+        }
+      });
+    }
+  },
+
+  /**
+   * Query whether reduced motion is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when a reduce motion is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#isReduceMotionEnabled
+   */
+  isReduceMotionEnabled(): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+      if (Platform.OS === 'android') {
+        if (NativeAccessibilityInfoAndroid != null) {
+          NativeAccessibilityInfoAndroid.isReduceMotionEnabled(resolve);
+        } else {
+          reject(null);
+        }
+      } else {
+        if (NativeAccessibilityManagerApple != null) {
+          NativeAccessibilityManagerApple.getCurrentReduceMotionState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(null);
+        }
+      }
+    });
+  },
+
+  /**
+   * Query whether reduced transparency is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when a reduce transparency is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#isReduceTransparencyEnabled
+   */
+  isReduceTransparencyEnabled(): Promise<boolean> {
+    if (Platform.OS === 'android') {
+      return Promise.resolve(false);
+    } else {
+      return new Promise((resolve, reject) => {
+        if (NativeAccessibilityManagerApple != null) {
+          NativeAccessibilityManagerApple.getCurrentReduceTransparencyState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(null);
+        }
+      });
+    }
+  },
+
+  /**
+   * Query whether a screen reader is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when a screen reader is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#isScreenReaderEnabled
+   */
+  isScreenReaderEnabled(): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+      if (Platform.OS === 'android') {
+        if (NativeAccessibilityInfoAndroid != null) {
+          NativeAccessibilityInfoAndroid.isTouchExplorationEnabled(resolve);
+        } else {
+          reject(null);
+        }
+      } else {
+        if (NativeAccessibilityManagerApple != null) {
+          NativeAccessibilityManagerApple.getCurrentVoiceOverState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(null);
+        }
+      }
+    });
+  },
+
+  /**
+   * Add an event handler. Supported events:
+   *
+   * - `reduceMotionChanged`: Fires when the state of the reduce motion toggle changes.
+   *   The argument to the event handler is a boolean. The boolean is `true` when a reduce
+   *   motion is enabled (or when "Transition Animation Scale" in "Developer options" is
+   *   "Animation off") and `false` otherwise.
+   * - `screenReaderChanged`: Fires when the state of the screen reader changes. The argument
+   *   to the event handler is a boolean. The boolean is `true` when a screen
+   *   reader is enabled and `false` otherwise.
+   *
+   * These events are only supported on iOS:
+   *
+   * - `boldTextChanged`: iOS-only event. Fires when the state of the bold text toggle changes.
+   *   The argument to the event handler is a boolean. The boolean is `true` when a bold text
+   *   is enabled and `false` otherwise.
+   * - `grayscaleChanged`: iOS-only event. Fires when the state of the gray scale toggle changes.
+   *   The argument to the event handler is a boolean. The boolean is `true` when a gray scale
+   *   is enabled and `false` otherwise.
+   * - `invertColorsChanged`: iOS-only event. Fires when the state of the invert colors toggle
+   *   changes. The argument to the event handler is a boolean. The boolean is `true` when a invert
+   *   colors is enabled and `false` otherwise.
+   * - `reduceTransparencyChanged`: iOS-only event. Fires when the state of the reduce transparency
+   *   toggle changes.  The argument to the event handler is a boolean. The boolean is `true`
+   *   when a reduce transparency is enabled and `false` otherwise.
+   * - `announcementFinished`: iOS-only event. Fires when the screen reader has
+   *   finished making an announcement. The argument to the event handler is a
+   *   dictionary with these keys:
+   *     - `announcement`: The string announced by the screen reader.
+   *     - `success`: A boolean indicating whether the announcement was
+   *       successfully made.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#addeventlistener
+   */
+  addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
+    eventName: K,
+    handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
+  ): EventSubscription {
+    const deviceEventName = EventNames.get(eventName);
+    return deviceEventName == null
+      ? {remove(): void {}}
+      : RCTDeviceEventEmitter.addListener(deviceEventName, handler);
+  },
+
+  /**
+   * Set accessibility focus to a React component.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#setaccessibilityfocus
+   */
+  setAccessibilityFocus(reactTag: number): void {
+    legacySendAccessibilityEvent(reactTag, 'focus');
+  },
+
+  /**
+   * Send a named accessibility event to a HostComponent.
+   */
+  sendAccessibilityEvent_unstable(
+    handle: ElementRef<HostComponent<mixed>>,
+    eventType: AccessibilityEventTypes,
+  ) {
+    // iOS only supports 'focus' event types
+    if (Platform.OS === 'ios' && eventType === 'click') {
+      return;
+    }
+    // route through React renderer to distinguish between Fabric and non-Fabric handles
+    sendAccessibilityEvent(handle, eventType);
+  },
+
+  /**
+   * Post a string to be announced by the screen reader.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#announceforaccessibility
+   */
+  announceForAccessibility(announcement: string): void {
+    if (Platform.OS === 'android') {
+      NativeAccessibilityInfoAndroid?.announceForAccessibility(announcement);
+    } else {
+      NativeAccessibilityManagerApple?.announceForAccessibility(announcement);
+    }
+  },
+
+  /**
+   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
+   */
+  removeEventListener<K: $Keys<AccessibilityEventDefinitions>>(
+    eventName: K,
+    handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
+  ): void {
+    // NOTE: This will report a deprecation notice via `console.error`.
+    const deviceEventName = EventNames.get(eventName);
+    if (deviceEventName != null) {
+      // $FlowIgnore[incompatible-cast]
+      (RCTDeviceEventEmitter: EventEmitter<$FlowFixMe>).removeListener(
+        'deviceEventName',
+        // $FlowFixMe[invalid-tuple-arity]
+        handler,
+      );
+    }
+  },
+
+  /**
+   * Get the recommended timeout for changes to the UI needed by this user.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo.html#getrecommendedtimeoutmillis
+   */
+  getRecommendedTimeoutMillis(originalTimeout: number): Promise<number> {
+    if (Platform.OS === 'android') {
+      return new Promise((resolve, reject) => {
+        if (NativeAccessibilityInfoAndroid?.getRecommendedTimeoutMillis) {
+          NativeAccessibilityInfoAndroid.getRecommendedTimeoutMillis(
+            originalTimeout,
+            resolve,
+          );
+        } else {
+          resolve(originalTimeout);
+        }
+      });
+    } else {
+      return Promise.resolve(originalTimeout);
+    }
+  },
+};
+
+export default AccessibilityInfo;
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.macos.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.macos.js
deleted file mode 100644
index 910fbc1f047e5d..00000000000000
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.macos.js
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-// TODO(macOS GH#774)
-
-'use strict';
-
-const Promise = require('../../Promise');
-import RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
-
-import NativeAccessibilityManager from './NativeAccessibilityManager';
-
-const CHANGE_EVENT_NAME = {
-  highContrastChanged: 'highContrastChanged',
-  invertColorsChanged: 'invertColorsChanged',
-  reduceMotionChanged: 'reduceMotionChanged',
-  reduceTransparencyChanged: 'reduceTransparencyChanged',
-  screenReaderChanged: 'screenReaderChanged',
-};
-
-type ChangeEventName = $Keys<{
-  change: string,
-  highContrastChanged: string,
-  invertColorsChanged: string,
-  reduceMotionChanged: string,
-  reduceTransparencyChanged: string,
-  screenReaderChanged: string,
-}>;
-
-const _subscriptions = new Map();
-
-/**
- * Sometimes it's useful to know whether or not the device has a screen reader
- * that is currently active. The `AccessibilityInfo` API is designed for this
- * purpose. You can use it to query the current state of the screen reader as
- * well as to register to be notified when the state of the screen reader
- * changes.
- *
- * See http://facebook.github.io/react-native/docs/accessibilityinfo.html
- */
-const AccessibilityInfo = {
-  /**
-   * iOS only
-   */
-  isBoldTextEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  /**
-   * iOS only
-   */
-  isGrayscaleEnabled: function(): Promise<boolean> {
-    return Promise.resolve(false);
-  },
-
-  /**
-   * Query whether high contrast is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when invert color is enabled and `false` otherwise.
-   */
-  isHighContrastEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentHighContrastState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether inverted colors are currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when invert color is enabled and `false` otherwise.
-   *
-   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#isInvertColorsEnabled
-   */
-  isInvertColorsEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentInvertColorsState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether reduced motion is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when a reduce motion is enabled and `false` otherwise.
-   *
-   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#isReduceMotionEnabled
-   */
-  isReduceMotionEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentReduceMotionState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether reduced transparency is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when a reduce transparency is enabled and `false` otherwise.
-   *
-   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#isReduceTransparencyEnabled
-   */
-  isReduceTransparencyEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentReduceTransparencyState(
-          resolve,
-          reject,
-        );
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Query whether a screen reader is currently enabled.
-   *
-   * Returns a promise which resolves to a boolean.
-   * The result is `true` when a screen reader is enabled and `false` otherwise.
-   *
-   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#isScreenReaderEnabled
-   */
-  isScreenReaderEnabled: function(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      if (NativeAccessibilityManager) {
-        NativeAccessibilityManager.getCurrentVoiceOverState(resolve, reject);
-      } else {
-        reject(reject);
-      }
-    });
-  },
-
-  /**
-   * Deprecated
-   *
-   * Same as `isScreenReaderEnabled`
-   */
-  get fetch(): $FlowFixMe {
-    console.warn(
-      'AccessibilityInfo.fetch is deprecated, call Accessibility.isScreenReaderEnabled instead',
-    );
-    return this.isScreenReaderEnabled;
-  },
-
-  addEventListener: function(
-    eventName: ChangeEventName,
-    handler: Function,
-  ): Object {
-    let listener;
-
-    if (eventName === 'change') {
-      listener = RCTDeviceEventEmitter.addListener(
-        CHANGE_EVENT_NAME.screenReaderChanged,
-        handler,
-      );
-    } else if (CHANGE_EVENT_NAME[eventName]) {
-      listener = RCTDeviceEventEmitter.addListener(eventName, handler);
-    }
-
-    _subscriptions.set(handler, listener);
-    return {
-      remove: AccessibilityInfo.removeEventListener.bind(
-        null,
-        eventName,
-        handler,
-      ),
-    };
-  },
-
-  /**
-   * Set accessibility focus to a react component.
-   *
-   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#setaccessibilityfocus
-   */
-  setAccessibilityFocus: function(reactTag: number): void {
-    if (NativeAccessibilityManager) {
-      NativeAccessibilityManager.setAccessibilityFocus(reactTag);
-    }
-  },
-
-  /**
-   * Post a string to be announced by the screen reader.
-   *
-   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#announceforaccessibility
-   */
-  announceForAccessibility: function(announcement: string): void {
-    if (NativeAccessibilityManager) {
-      NativeAccessibilityManager.announceForAccessibility(announcement);
-    }
-  },
-
-  /**
-   * Remove an event handler.
-   *
-   * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#removeeventlistener
-   */
-  removeEventListener: function(
-    eventName: ChangeEventName,
-    handler: Function,
-  ): void {
-    const listener = _subscriptions.get(handler);
-    if (!listener) {
-      return;
-    }
-    listener.remove();
-    _subscriptions.delete(handler);
-  },
-};
-
-module.exports = AccessibilityInfo;
diff --git a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js
index 03484f2158c10d..916667aa5c2c0a 100644
--- a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js
+++ b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
@@ -22,6 +20,10 @@ export interface Spec extends TurboModule {
   ) => void;
   +setAccessibilityFocus: (reactTag: number) => void;
   +announceForAccessibility: (announcement: string) => void;
+  +getRecommendedTimeoutMillis?: (
+    mSec: number,
+    onSuccess: (recommendedTimeoutMillis: number) => void,
+  ) => void;
 }
 
 export default (TurboModuleRegistry.get<Spec>('AccessibilityInfo'): ?Spec);
diff --git a/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js b/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js
index 6fc0f56e13e7cd..e8e95f22c3abc3 100644
--- a/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js
+++ b/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.android.js b/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.android.js
new file mode 100644
index 00000000000000..3bb1c554950d50
--- /dev/null
+++ b/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.android.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import UIManager from '../../ReactNative/UIManager';
+
+/**
+ * This is a function exposed to the React Renderer that can be used by the
+ * pre-Fabric renderer to emit accessibility events to pre-Fabric nodes.
+ */
+function legacySendAccessibilityEvent(
+  reactTag: number,
+  eventType: string,
+): void {
+  if (eventType === 'focus') {
+    UIManager.sendAccessibilityEvent(
+      reactTag,
+      UIManager.getConstants().AccessibilityEventTypes.typeViewFocused,
+    );
+  }
+  if (eventType === 'click') {
+    UIManager.sendAccessibilityEvent(
+      reactTag,
+      UIManager.getConstants().AccessibilityEventTypes.typeViewClicked,
+    );
+  }
+}
+
+module.exports = legacySendAccessibilityEvent;
diff --git a/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.ios.js b/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.ios.js
new file mode 100644
index 00000000000000..950336d1101c44
--- /dev/null
+++ b/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.ios.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import NativeAccessibilityManager from './NativeAccessibilityManager';
+
+/**
+ * This is a function exposed to the React Renderer that can be used by the
+ * pre-Fabric renderer to emit accessibility events to pre-Fabric nodes.
+ */
+function legacySendAccessibilityEvent(
+  reactTag: number,
+  eventType: string,
+): void {
+  if (eventType === 'focus' && NativeAccessibilityManager) {
+    NativeAccessibilityManager.setAccessibilityFocus(reactTag);
+  }
+}
+
+module.exports = legacySendAccessibilityEvent;
diff --git a/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.macos.js b/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.macos.js
new file mode 100644
index 00000000000000..831db39d1336c1
--- /dev/null
+++ b/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.macos.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+// TODO(macOS GH#774)
+
+/* $FlowFixMe allow macOS to share iOS file */
+const legacySendAccessibilityEvent = require('./legacySendAccessibilityEvent.ios');
+
+module.exports = legacySendAccessibilityEvent;
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index 52cbda4a7312e2..9100cf6483de2a 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -10,14 +10,12 @@
  */
 
 'use strict';
-
-const Platform = require('../../Utilities/Platform');
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const View = require('../View/View');
+import * as React from 'react';
+import Platform from '../../Utilities/Platform';
+import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet';
+import View from '../View/View';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
 const PlatformActivityIndicator =
   Platform.OS === 'android'
@@ -62,8 +60,18 @@ type Props = $ReadOnly<{|
   size?: ?IndicatorSize,
 |}>;
 
-const ActivityIndicator = (props: Props, forwardedRef?: any) => {
-  const {onLayout, style, size, ...restProps} = props;
+const ActivityIndicator = (
+  {
+    animating = true,
+    color = Platform.OS === 'ios' ? GRAY : null,
+    hidesWhenStopped = true,
+    onLayout,
+    size = 'small',
+    style,
+    ...restProps
+  }: Props,
+  forwardedRef?: any,
+) => {
   let sizeStyle;
   let sizeProp;
 
@@ -77,11 +85,14 @@ const ActivityIndicator = (props: Props, forwardedRef?: any) => {
       sizeProp = 'large';
       break;
     default:
-      sizeStyle = {height: props.size, width: props.size};
+      sizeStyle = {height: size, width: size};
       break;
   }
 
   const nativeProps = {
+    animating,
+    color,
+    hidesWhenStopped,
     ...restProps,
     ref: forwardedRef,
     style: sizeStyle,
@@ -98,10 +109,10 @@ const ActivityIndicator = (props: Props, forwardedRef?: any) => {
       onLayout={onLayout}
       style={StyleSheet.compose(styles.container, style)}>
       {Platform.OS === 'android' ? (
-        // $FlowFixMe Flow doesn't know when this is the android component
+        // $FlowFixMe[prop-missing] Flow doesn't know when this is the android component
         <PlatformActivityIndicator {...nativeProps} {...androidProps} />
       ) : (
-        /* $FlowFixMe(>=0.106.0 site=react_native_android_fb) This comment
+        /* $FlowFixMe[prop-missing] (>=0.106.0 site=react_native_android_fb) This comment
          * suppresses an error found when Flow v0.106 was deployed. To see the
          * error, delete this comment and run Flow. */
         <PlatformActivityIndicator {...nativeProps} />
@@ -178,16 +189,6 @@ const ActivityIndicatorWithRef: React.AbstractComponent<
 > = React.forwardRef(ActivityIndicator);
 ActivityIndicatorWithRef.displayName = 'ActivityIndicator';
 
-/* $FlowFixMe(>=0.89.0 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.89 was deployed. To see the error, delete this comment
- * and run Flow. */
-ActivityIndicatorWithRef.defaultProps = {
-  animating: true,
-  color: Platform.OS === 'ios' ? GRAY : null,
-  hidesWhenStopped: true,
-  size: 'small',
-};
-
 const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js b/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js
index a7a95da5943c1d..3475cebeddeabd 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {WithDefault} from '../../Types/CodegenTypes';
 
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
diff --git a/Libraries/Components/ActivityIndicator/__tests__/__snapshots__/ActivityIndicator-test.js.snap b/Libraries/Components/ActivityIndicator/__tests__/__snapshots__/ActivityIndicator-test.js.snap
index d8316e939d13d1..4326d7f8ae20f3 100644
--- a/Libraries/Components/ActivityIndicator/__tests__/__snapshots__/ActivityIndicator-test.js.snap
+++ b/Libraries/Components/ActivityIndicator/__tests__/__snapshots__/ActivityIndicator-test.js.snap
@@ -2,9 +2,7 @@
 
 exports[`<ActivityIndicator /> should render as expected: should deep render when mocked (please verify output manually) 1`] = `
 <ActivityIndicator
-  animating={true}
   color="#0000ff"
-  hidesWhenStopped={true}
   size="large"
 />
 `;
@@ -35,18 +33,14 @@ exports[`<ActivityIndicator /> should render as expected: should deep render whe
 
 exports[`<ActivityIndicator /> should render as expected: should shallow render as <ActivityIndicator /> when mocked 1`] = `
 <ActivityIndicator
-  animating={true}
   color="#0000ff"
-  hidesWhenStopped={true}
   size="large"
 />
 `;
 
 exports[`<ActivityIndicator /> should render as expected: should shallow render as <ActivityIndicator /> when not mocked 1`] = `
 <ActivityIndicator
-  animating={true}
   color="#0000ff"
-  hidesWhenStopped={true}
   size="large"
 />
 `;
diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index 9c712d492fc5fd..d47fbfb938c887 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -11,24 +11,24 @@
 
 'use strict';
 
-const Platform = require('../Utilities/Platform');
-const React = require('react');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const Text = require('../Text/Text');
-const TouchableNativeFeedback = require('./Touchable/TouchableNativeFeedback');
-const TouchableOpacity = require('./Touchable/TouchableOpacity');
-const View = require('./View/View');
-
-const invariant = require('invariant');
-
-import type {PressEvent, KeyEvent} from '../Types/CoreEventTypes';
+import * as React from 'react';
+import Platform from '../Utilities/Platform';
+import StyleSheet, {type ColorValue} from '../StyleSheet/StyleSheet';
+import Text from '../Text/Text';
+import TouchableNativeFeedback from './Touchable/TouchableNativeFeedback';
+import TouchableOpacity from './Touchable/TouchableOpacity';
+import View from './View/View';
+import invariant from 'invariant';
+import type {KeyEvent} from '../Types/CoreEventTypes'; // TODO(OSS Candidate ISS#2710739)
 import type {FocusEvent, BlurEvent} from './TextInput/TextInput'; // TODO(OSS Candidate ISS#2710739)
-import type {ColorValue} from '../StyleSheet/StyleSheet';
+
 import type {
   AccessibilityActionEvent,
   AccessibilityActionInfo,
   AccessibilityRole,
+  AccessibilityState,
 } from './View/ViewAccessibility';
+import type {PressEvent} from '../Types/CoreEventTypes';
 
 type ButtonProps = $ReadOnly<{|
   /**
@@ -143,7 +143,6 @@ type ButtonProps = $ReadOnly<{|
   /**
    * Accessibility action handlers
    */
-  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
 
   /**
@@ -196,6 +195,14 @@ type ButtonProps = $ReadOnly<{|
    */
   tooltip?: string,
   // ]TODO(OSS Candidate ISS#2710739)
+
+  /**
+   * Accessibility props.
+   */
+  accessible?: ?boolean,
+  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
+  onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
+  accessibilityState?: ?AccessibilityState,
 |}>;
 
 /**
@@ -210,7 +217,7 @@ type ButtonProps = $ReadOnly<{|
   [button:examples].
 
   [button:source]:
-  https://github.com/facebook/react-native/blob/master/Libraries/Components/Button.js
+  https://github.com/facebook/react-native/blob/HEAD/Libraries/Components/Button.js
 
   [button:examples]:
   https://js.coach/?menu%5Bcollections%5D=React%20Native&page=1&query=button
@@ -313,10 +320,6 @@ class Button extends React.Component<ButtonProps> {
   render(): React.Node {
     const {
       accessibilityLabel,
-      accessibilityHint, // TODO(OSS Candidate ISS#2710739)
-      accessibilityRole, // TODO(OSS Candidate ISS#2710739)
-      accessibilityActions, // TODO(OSS Candidate ISS#2710739)
-      onAccessibilityAction, // TODO(OSS Candidate ISS#2710739)
       color,
       onPress,
       touchSoundDisabled,
@@ -327,15 +330,19 @@ class Button extends React.Component<ButtonProps> {
       nextFocusLeft,
       nextFocusRight,
       nextFocusUp,
-      disabled,
       testID,
       onFocus, // TODO(OSS Candidate ISS#2710739)
       onBlur, // TODO(OSS Candidate ISS#2710739)
-      onKeyDown,
-      onKeyUp,
-      validKeysDown,
-      validKeysUp,
+      onKeyDown, // TODO(OSS Candidate ISS#2710739)
+      onKeyUp, // TODO(OSS Candidate ISS#2710739)
+      validKeysDown, // TODO(OSS Candidate ISS#2710739)
+      validKeysUp, // TODO(OSS Candidate ISS#2710739)
       tooltip,
+      accessible,
+      accessibilityActions,
+      accessibilityHint, // TODO(OSS Candidate ISS#2710739)
+      accessibilityRole, // TODO(OSS Candidate ISS#2710739)
+      onAccessibilityAction,
     } = this.props;
     const buttonStyles = [styles.button];
     const textStyles = [styles.text];
@@ -349,12 +356,22 @@ class Button extends React.Component<ButtonProps> {
         buttonStyles.push({backgroundColor: color});
       }
     }
-    const accessibilityState = {};
+
+    const disabled =
+      this.props.disabled != null
+        ? this.props.disabled
+        : this.props.accessibilityState?.disabled;
+
+    const accessibilityState =
+      disabled !== this.props.accessibilityState?.disabled
+        ? {...this.props.accessibilityState, disabled}
+        : this.props.accessibilityState;
+
     if (disabled) {
       buttonStyles.push(styles.buttonDisabled);
       textStyles.push(styles.textDisabled);
-      accessibilityState.disabled = true;
     }
+
     invariant(
       typeof title === 'string',
       'The title prop of a Button must be a string',
@@ -363,14 +380,16 @@ class Button extends React.Component<ButtonProps> {
       Platform.OS === 'android' ? title.toUpperCase() : title;
     const Touchable =
       Platform.OS === 'android' ? TouchableNativeFeedback : TouchableOpacity;
+
     return (
       <Touchable
+        accessible={accessible}
+        accessibilityActions={accessibilityActions}
+        onAccessibilityAction={onAccessibilityAction}
         accessibilityLabel={accessibilityLabel}
         accessibilityHint={accessibilityHint} // TODO(OSS Candidate ISS#2710739)
         accessibilityRole={accessibilityRole || 'button'} // TODO(OSS Candidate ISS#2710739)
         accessibilityState={accessibilityState}
-        accessibilityActions={accessibilityActions}
-        onAccessibilityAction={onAccessibilityAction}
         hasTVPreferredFocus={hasTVPreferredFocus}
         nextFocusDown={nextFocusDown}
         nextFocusForward={nextFocusForward}
diff --git a/Libraries/Components/Clipboard/Clipboard.js b/Libraries/Components/Clipboard/Clipboard.js
index fa0b9a050d4e64..970aa93d494bde 100644
--- a/Libraries/Components/Clipboard/Clipboard.js
+++ b/Libraries/Components/Clipboard/Clipboard.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import NativeClipboard from './NativeClipboard';
 
 /**
diff --git a/Libraries/Components/Clipboard/NativeClipboard.js b/Libraries/Components/Clipboard/NativeClipboard.js
index b585a108e04371..6e33b2edce76f5 100644
--- a/Libraries/Components/Clipboard/NativeClipboard.js
+++ b/Libraries/Components/Clipboard/NativeClipboard.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js
index 4c26ab962855b0..a3531c770b42b1 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.android.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js
@@ -8,11 +8,10 @@
  */
 
 'use strict';
-
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const Text = require('../../Text/Text');
-const View = require('../View/View');
+import * as React from 'react';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import View from '../View/View';
 
 class DummyDatePickerIOS extends React.Component {
   render() {
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
index 016c65bf5abb36..30cc13ad55f0b0 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -10,16 +10,13 @@
 
 // This is a controlled component version of RCTDatePickerIOS.
 
-'use strict';
-
+import * as React from 'react';
 import RCTDatePickerNativeComponent, {
   Commands as DatePickerCommands,
 } from './RCTDatePickerNativeComponent';
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const View = require('../View/View');
-
-const invariant = require('invariant');
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import View from '../View/View';
+import invariant from 'invariant';
 
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
@@ -103,6 +100,13 @@ type Props = $ReadOnly<{|
    * instance, to show times in Pacific Standard Time, pass -7 * 60.
    */
   timeZoneOffsetInMinutes?: ?number,
+
+  /**
+   * The date picker style
+   * This is only available on devices with iOS 14.0 and later.
+   * 'spinner' is the default style if this prop isn't set.
+   */
+  pickerStyle?: ?('compact' | 'spinner' | 'inline'),
 |}>;
 
 /**
@@ -149,7 +153,7 @@ class DatePickerIOS extends React.Component<Props> {
           ref={picker => {
             this._picker = picker;
           }}
-          style={styles.datePickerIOS}
+          style={getHeight(props.pickerStyle, props.mode)}
           date={
             props.date
               ? props.date.getTime()
@@ -174,16 +178,51 @@ class DatePickerIOS extends React.Component<Props> {
           onChange={this._onChange}
           onStartShouldSetResponder={() => true}
           onResponderTerminationRequest={() => false}
+          pickerStyle={props.pickerStyle}
         />
       </View>
     );
   }
 }
 
+const inlineHeightForDatePicker = 318.5;
+const inlineHeightForTimePicker = 49.5;
+const compactHeight = 40;
+const spinnerHeight = 216;
+
 const styles = StyleSheet.create({
   datePickerIOS: {
-    height: 216,
+    height: spinnerHeight,
+  },
+  datePickerIOSCompact: {
+    height: compactHeight,
+  },
+  datePickerIOSInline: {
+    height: inlineHeightForDatePicker + inlineHeightForTimePicker * 2,
+  },
+  datePickerIOSInlineDate: {
+    height: inlineHeightForDatePicker + inlineHeightForTimePicker,
+  },
+  datePickerIOSInlineTime: {
+    height: inlineHeightForTimePicker,
   },
 });
 
+function getHeight(pickerStyle, mode) {
+  if (pickerStyle === 'compact') {
+    return styles.datePickerIOSCompact;
+  }
+  if (pickerStyle === 'inline') {
+    switch (mode) {
+      case 'date':
+        return styles.datePickerIOSInlineDate;
+      case 'time':
+        return styles.datePickerIOSInlineTime;
+      default:
+        return styles.datePickerIOSInline;
+    }
+  }
+  return styles.datePickerIOS;
+}
+
 module.exports = DatePickerIOS;
diff --git a/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js b/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js
index 99e5d92c051e17..e577f3ee37b4d9 100644
--- a/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js
+++ b/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
@@ -39,6 +37,7 @@ type NativeProps = $ReadOnly<{|
   mode?: WithDefault<'date' | 'time' | 'datetime', 'date'>,
   onChange?: ?BubblingEventHandler<Event>,
   timeZoneOffsetInMinutes?: ?Float,
+  pickerStyle?: WithDefault<'compact' | 'spinner' | 'inline', 'spinner'>,
 |}>;
 
 type ComponentType = HostComponent<NativeProps>;
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
index 4f9358e21a88ef..9f29433e1e1898 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {Options, DatePickerOpenAction} from './DatePickerAndroidTypes';
 import NativeDatePickerAndroid from './NativeDatePickerAndroid';
 
diff --git a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js
index 778befa4ebc84a..c8c157a2f8ecfa 100644
--- a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js
+++ b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
index aff340c6f748ab..7efb3491e0e337 100644
--- a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
+++ b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
 import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheet';
 import type {
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index 1537250d9b097f..deebd5102e05a3 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Platform from '../../Utilities/Platform';
 import * as React from 'react';
 import StatusBar from '../StatusBar/StatusBar';
diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js
index a9e0a29771ddfd..e204e00b6c3881 100644
--- a/Libraries/Components/Keyboard/Keyboard.js
+++ b/Libraries/Components/Keyboard/Keyboard.js
@@ -8,24 +8,14 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeEventEmitter from '../../EventEmitter/NativeEventEmitter';
 import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
 import dismissKeyboard from '../../Utilities/dismissKeyboard';
+import Platform from '../../Utilities/Platform';
 import NativeKeyboardObserver from './NativeKeyboardObserver';
-import invariant from 'invariant';
-const KeyboardEventEmitter: NativeEventEmitter = new NativeEventEmitter(
-  NativeKeyboardObserver,
-);
-
-export type KeyboardEventName =
-  | 'keyboardWillShow'
-  | 'keyboardDidShow'
-  | 'keyboardWillHide'
-  | 'keyboardDidHide'
-  | 'keyboardWillChangeFrame'
-  | 'keyboardDidChangeFrame';
+import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+
+export type KeyboardEventName = $Keys<KeyboardEventDefinitions>;
 
 export type KeyboardEventEasing =
   | 'easeIn'
@@ -61,11 +51,14 @@ export type IOSKeyboardEvent = $ReadOnly<{|
   isEventFromThisApp: boolean,
 |}>;
 
-type KeyboardEventListener = (e: KeyboardEvent) => void;
-
-// The following object exists for documentation purposes
-// Actual work happens in
-// https://github.com/facebook/react-native/blob/master/Libraries/EventEmitter/NativeEventEmitter.js
+type KeyboardEventDefinitions = {
+  keyboardWillShow: [KeyboardEvent],
+  keyboardDidShow: [KeyboardEvent],
+  keyboardWillHide: [KeyboardEvent],
+  keyboardDidHide: [KeyboardEvent],
+  keyboardWillChangeFrame: [KeyboardEvent],
+  keyboardDidChangeFrame: [KeyboardEvent],
+};
 
 /**
  * `Keyboard` module to control keyboard events.
@@ -109,7 +102,15 @@ type KeyboardEventListener = (e: KeyboardEvent) => void;
  *```
  */
 
-const Keyboard = {
+class Keyboard {
+  _emitter: NativeEventEmitter<KeyboardEventDefinitions> = new NativeEventEmitter(
+    // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+    // If you want to use the native module on other platforms, please remove this condition and test its behavior
+    Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
+      ? null
+      : NativeKeyboardObserver,
+  );
+
   /**
    * The `addListener` function connects a JavaScript function to an identified native
    * keyboard notification event.
@@ -133,61 +134,57 @@ const Keyboard = {
    *
    * @param {function} callback function to be called when the event fires.
    */
-  addListener(eventName: KeyboardEventName, callback: KeyboardEventListener) {
-    invariant(false, 'Dummy method used for documentation');
-  },
+  addListener<K: $Keys<KeyboardEventDefinitions>>(
+    eventType: K,
+    listener: (...$ElementType<KeyboardEventDefinitions, K>) => mixed,
+    context?: mixed,
+  ): EventSubscription {
+    return this._emitter.addListener(eventType, listener);
+  }
 
   /**
-   * Removes a specific listener.
-   *
-   * @param {string} eventName The `nativeEvent` is the string that identifies the event you're listening for.
-   * @param {function} callback function to be called when the event fires.
+   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
    */
-  removeListener(
-    eventName: KeyboardEventName,
-    callback: KeyboardEventListener,
-  ) {
-    invariant(false, 'Dummy method used for documentation');
-  },
+  removeEventListener<K: $Keys<KeyboardEventDefinitions>>(
+    eventType: K,
+    listener: (...$ElementType<KeyboardEventDefinitions, K>) => mixed,
+  ): void {
+    // NOTE: This will report a deprecation notice via `console.error`.
+    this._emitter.removeListener(eventType, listener);
+  }
 
   /**
    * Removes all listeners for a specific event type.
    *
    * @param {string} eventType The native event string listeners are watching which will be removed.
    */
-  removeAllListeners(eventName: KeyboardEventName) {
-    invariant(false, 'Dummy method used for documentation');
-  },
+  removeAllListeners<K: $Keys<KeyboardEventDefinitions>>(eventType: ?K): void {
+    this._emitter.removeAllListeners(eventType);
+  }
 
   /**
    * Dismisses the active keyboard and removes focus.
    */
-  dismiss() {
-    invariant(false, 'Dummy method used for documentation');
-  },
+  dismiss(): void {
+    dismissKeyboard();
+  }
 
   /**
    * Useful for syncing TextInput (or other keyboard accessory view) size of
    * position changes with keyboard movements.
    */
-  scheduleLayoutAnimation(event: KeyboardEvent) {
-    invariant(false, 'Dummy method used for documentation');
-  },
-};
-
-// Throw away the dummy object and reassign it to original module
-KeyboardEventEmitter.dismiss = dismissKeyboard;
-KeyboardEventEmitter.scheduleLayoutAnimation = function(event: KeyboardEvent) {
-  const {duration, easing} = event;
-  if (duration != null && duration !== 0) {
-    LayoutAnimation.configureNext({
-      duration: duration,
-      update: {
+  scheduleLayoutAnimation(event: KeyboardEvent): void {
+    const {duration, easing} = event;
+    if (duration != null && duration !== 0) {
+      LayoutAnimation.configureNext({
         duration: duration,
-        type: (easing != null && LayoutAnimation.Types[easing]) || 'keyboard',
-      },
-    });
+        update: {
+          duration: duration,
+          type: (easing != null && LayoutAnimation.Types[easing]) || 'keyboard',
+        },
+      });
+    }
   }
-};
+}
 
-module.exports = KeyboardEventEmitter;
+module.exports = (new Keyboard(): Keyboard);
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
index 4e87a3f16c8d76..26897f1632da1e 100644
--- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -5,17 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
-'use strict';
-
-const Keyboard = require('./Keyboard');
-const LayoutAnimation = require('../../LayoutAnimation/LayoutAnimation');
-const Platform = require('../../Utilities/Platform');
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const View = require('../View/View');
+import Keyboard from './Keyboard';
+import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
+import Platform from '../../Utilities/Platform';
+import * as React from 'react';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import View from '../View/View';
 
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import {type EventSubscription} from '../../vendor/emitter/EventEmitter';
@@ -43,13 +41,13 @@ type Props = $ReadOnly<{|
    * Controls whether this `KeyboardAvoidingView` instance should take effect.
    * This is useful when more than one is on the screen. Defaults to true.
    */
-  enabled: ?boolean,
+  enabled?: ?boolean,
 
   /**
    * Distance between the top of the user screen and the React Native view. This
    * may be non-zero in some cases. Defaults to 0.
    */
-  keyboardVerticalOffset: number,
+  keyboardVerticalOffset?: number,
 |}>;
 
 type State = {|
@@ -61,15 +59,10 @@ type State = {|
  * adjusting its height, position, or bottom padding.
  */
 class KeyboardAvoidingView extends React.Component<Props, State> {
-  static defaultProps: {|enabled: boolean, keyboardVerticalOffset: number|} = {
-    enabled: true,
-    keyboardVerticalOffset: 0,
-  };
-
   _frame: ?ViewLayout = null;
   _keyboardEvent: ?KeyboardEvent = null;
   _subscriptions: Array<EventSubscription> = [];
-  viewRef: {current: React.ElementRef<any> | null, ...};
+  viewRef: {current: React.ElementRef<typeof View> | null, ...};
   _initialFrameHeight: number = 0;
 
   constructor(props: Props) {
@@ -84,7 +77,8 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
       return 0;
     }
 
-    const keyboardY = keyboardFrame.screenY - this.props.keyboardVerticalOffset;
+    const keyboardY =
+      keyboardFrame.screenY - (this.props.keyboardVerticalOffset ?? 0);
 
     // Calculate the displacement needed for the view such that it
     // no longer overlaps with the keyboard
@@ -97,13 +91,16 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   };
 
   _onLayout = (event: ViewLayoutEvent) => {
+    const wasFrameNull = this._frame == null;
     this._frame = event.nativeEvent.layout;
     if (!this._initialFrameHeight) {
       // save the initial frame height, before the keyboard is visible
       this._initialFrameHeight = this._frame.height;
     }
 
-    this._updateBottomIfNecesarry();
+    if (wasFrameNull) {
+      this._updateBottomIfNecesarry();
+    }
   };
 
   _updateBottomIfNecesarry = () => {
@@ -156,12 +153,13 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
       behavior,
       children,
       contentContainerStyle,
-      enabled,
-      keyboardVerticalOffset,
+      enabled = true,
+      // eslint-disable-next-line no-unused-vars
+      keyboardVerticalOffset = 0,
       style,
       ...props
     } = this.props;
-    const bottomHeight = enabled ? this.state.bottom : 0;
+    const bottomHeight = enabled === true ? this.state.bottom : 0;
     switch (behavior) {
       case 'height':
         let heightStyle;
@@ -226,4 +224,4 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   }
 }
 
-module.exports = KeyboardAvoidingView;
+export default KeyboardAvoidingView;
diff --git a/Libraries/Components/Keyboard/NativeKeyboardObserver.js b/Libraries/Components/Keyboard/NativeKeyboardObserver.js
index 7f077c3c88baa8..7868dd9fb0941a 100644
--- a/Libraries/Components/Keyboard/NativeKeyboardObserver.js
+++ b/Libraries/Components/Keyboard/NativeKeyboardObserver.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/Keyboard/__tests__/Keyboard-test.js b/Libraries/Components/Keyboard/__tests__/Keyboard-test.js
index 639cdd0db5f4f0..2c7befec418355 100644
--- a/Libraries/Components/Keyboard/__tests__/Keyboard-test.js
+++ b/Libraries/Components/Keyboard/__tests__/Keyboard-test.js
@@ -9,41 +9,27 @@
  * @emails oncall+react_native
  */
 
-'use strict';
-
-const NativeModules = require('../../../BatchedBridge/NativeModules');
 const LayoutAnimation = require('../../../LayoutAnimation/LayoutAnimation');
 const dismissKeyboard = require('../../../Utilities/dismissKeyboard');
 const Keyboard = require('../Keyboard');
 
-import NativeEventEmitter from '../../../EventEmitter/NativeEventEmitter';
-
 jest.mock('../../../LayoutAnimation/LayoutAnimation');
+jest.mock('../../../Utilities/dismissKeyboard');
 
 describe('Keyboard', () => {
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
-  it('exposes KeyboardEventEmitter methods', () => {
-    const KeyboardObserver = NativeModules.KeyboardObserver;
-    const KeyboardEventEmitter = new NativeEventEmitter(KeyboardObserver);
-
-    // $FlowFixMe
-    expect(Keyboard._subscriber).toBe(KeyboardEventEmitter._subscriber);
-    // $FlowFixMe Cannot access private property
-    expect(Keyboard._nativeModule).toBe(KeyboardEventEmitter._nativeModule);
-  });
-
   it('uses dismissKeyboard utility', () => {
-    expect(Keyboard.dismiss).toBe(dismissKeyboard);
+    Keyboard.dismiss();
+    expect(dismissKeyboard).toHaveBeenCalled();
   });
 
   describe('scheduling layout animation', () => {
-    const scheduleLayoutAnimation = (
-      duration: number | null,
-      easing: string | null,
-    ): void => Keyboard.scheduleLayoutAnimation({duration, easing});
+    const scheduleLayoutAnimation = (duration, easing): void =>
+      // $FlowFixMe[incompatible-call]
+      Keyboard.scheduleLayoutAnimation({duration, easing});
 
     it('triggers layout animation', () => {
       scheduleLayoutAnimation(12, 'spring');
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
index 4a32d29836f8d0..eb69fc4233affc 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
+++ b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
@@ -8,9 +8,9 @@
  * @flow
  */
 
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const View = require('../View/View');
+import * as React from 'react';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import View from '../View/View';
 
 import type {ViewProps} from '../View/ViewPropTypes';
 import RCTMaskedViewNativeComponent from './RCTMaskedViewNativeComponent';
diff --git a/Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js b/Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js
deleted file mode 100644
index d01757865909fc..00000000000000
--- a/Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-import * as React from 'react';
-
-import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
-import registerGeneratedViewConfig from '../../Utilities/registerGeneratedViewConfig';
-import AndroidDialogPickerViewConfig from './AndroidDialogPickerViewConfig';
-
-import type {
-  DirectEventHandler,
-  Int32,
-  WithDefault,
-} from '../../Types/CodegenTypes';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {ProcessedColorValue} from '../../StyleSheet/processColor';
-import type {ViewProps} from '../../Components/View/ViewPropTypes';
-
-type PickerItem = $ReadOnly<{|
-  label: string,
-  color?: ?ProcessedColorValue,
-|}>;
-
-type PickerItemSelectEvent = $ReadOnly<{|
-  position: Int32,
-|}>;
-
-type NativeProps = $ReadOnly<{|
-  ...ViewProps,
-  style?: ?TextStyleProp,
-
-  // Props
-  color?: ?ColorValue,
-  backgroundColor?: ?ColorValue,
-  enabled?: WithDefault<boolean, true>,
-  items: $ReadOnlyArray<PickerItem>,
-  prompt?: WithDefault<string, ''>,
-  selected: Int32,
-
-  // Events
-  onSelect?: DirectEventHandler<PickerItemSelectEvent>,
-|}>;
-
-type NativeType = HostComponent<NativeProps>;
-
-interface NativeCommands {
-  +setNativeSelectedPosition: (
-    viewRef: React.ElementRef<NativeType>,
-    index: number,
-  ) => void;
-}
-
-export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['setNativeSelectedPosition'],
-});
-
-let AndroidDialogPickerNativeComponent;
-if (global.RN$Bridgeless) {
-  registerGeneratedViewConfig(
-    'AndroidDialogPicker',
-    AndroidDialogPickerViewConfig,
-  );
-  AndroidDialogPickerNativeComponent = 'AndroidDialogPicker';
-} else {
-  AndroidDialogPickerNativeComponent = requireNativeComponent<NativeProps>(
-    'AndroidDialogPicker',
-  );
-}
-
-export default ((AndroidDialogPickerNativeComponent: any): NativeType);
diff --git a/Libraries/Components/Picker/AndroidDialogPickerViewConfig.js b/Libraries/Components/Picker/AndroidDialogPickerViewConfig.js
deleted file mode 100644
index 1108b8105e37e1..00000000000000
--- a/Libraries/Components/Picker/AndroidDialogPickerViewConfig.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-import type {GeneratedViewConfig} from '../../Utilities/registerGeneratedViewConfig';
-
-const AndroidDialogPickerViewConfig = {
-  uiViewClassName: 'AndroidDialogPicker',
-  bubblingEventTypes: {},
-  directEventTypes: {},
-  validAttributes: {
-    color: {process: require('../../StyleSheet/processColor')},
-    backgroundColor: {process: require('../../StyleSheet/processColor')},
-    enabled: true,
-    items: true,
-    prompt: true,
-    selected: true,
-    onSelect: true,
-  },
-};
-
-module.exports = (AndroidDialogPickerViewConfig: GeneratedViewConfig);
diff --git a/Libraries/Components/Picker/AndroidDropdownPickerNativeComponent.js b/Libraries/Components/Picker/AndroidDropdownPickerNativeComponent.js
deleted file mode 100644
index f6ddb741888247..00000000000000
--- a/Libraries/Components/Picker/AndroidDropdownPickerNativeComponent.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-import * as React from 'react';
-
-import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
-
-import type {
-  DirectEventHandler,
-  Int32,
-  WithDefault,
-} from '../../Types/CodegenTypes';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {ProcessedColorValue} from '../../StyleSheet/processColor';
-import type {ViewProps} from '../../Components/View/ViewPropTypes';
-
-type PickerItem = $ReadOnly<{|
-  label: string,
-  color?: ?ProcessedColorValue,
-|}>;
-
-type PickerItemSelectEvent = $ReadOnly<{|
-  position: Int32,
-|}>;
-
-type NativeProps = $ReadOnly<{|
-  ...ViewProps,
-  style?: ?TextStyleProp,
-
-  // Props
-  color?: ?ColorValue,
-  backgroundColor?: ?ColorValue,
-  enabled?: WithDefault<boolean, true>,
-  items: $ReadOnlyArray<PickerItem>,
-  prompt?: WithDefault<string, ''>,
-  selected: Int32,
-
-  // Events
-  onSelect?: DirectEventHandler<PickerItemSelectEvent>,
-|}>;
-
-type NativeType = HostComponent<NativeProps>;
-
-interface NativeCommands {
-  +setNativeSelectedPosition: (
-    viewRef: React.ElementRef<NativeType>,
-    index: number,
-  ) => void;
-}
-
-export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['setNativeSelectedPosition'],
-});
-
-export default (requireNativeComponent<NativeProps>(
-  'AndroidDropdownPicker',
-): NativeType);
diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
deleted file mode 100644
index 01e5ae3664862d..00000000000000
--- a/Libraries/Components/Picker/Picker.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-const PickerAndroid = require('./PickerAndroid');
-const PickerIOS = require('./PickerIOS');
-const Platform = require('../../Utilities/Platform');
-const React = require('react');
-const UnimplementedView = require('../UnimplementedViews/UnimplementedView');
-
-import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-
-const MODE_DIALOG = 'dialog';
-const MODE_DROPDOWN = 'dropdown';
-
-type PickerItemProps = $ReadOnly<{|
-  /**
-   * Text to display for this item.
-   */
-  label: string,
-
-  /**
-   * The value to be passed to picker's `onValueChange` callback when
-   * this item is selected.
-   */
-  value?: ?string,
-
-  /**
-   * Color of this item's text.
-   * @platform android
-   */
-  color?: ColorValue,
-
-  /**
-   * Used to locate the item in end-to-end tests.
-   */
-  testID?: string,
-|}>;
-
-/**
- * Individual selectable item in a Picker.
- */
-export type {PickerItem};
-class PickerItem extends React.Component<PickerItemProps> {
-  render() {
-    // The items are not rendered directly
-    throw null;
-  }
-}
-
-type PickerProps = $ReadOnly<{|
-  children?: React.Node,
-  style?: ?TextStyleProp,
-
-  /**
-   * Value matching value of one of the items.
-   */
-  selectedValue?: ?string,
-
-  /**
-   * Callback for when an item is selected. This is called with the following parameters:
-   *   - `itemValue`: the `value` prop of the item that was selected
-   *   - `itemIndex`: the index of the selected item in this picker
-   */
-  onValueChange?: ?(itemValue: string | number, itemIndex: number) => mixed,
-
-  /**
-   * If set to false, the picker will be disabled, i.e. the user will not be able to make a
-   * selection.
-   * @platform android
-   */
-  enabled?: ?boolean,
-
-  /**
-   * On Android, specifies how to display the selection items when the user taps on the picker:
-   *
-   *   - 'dialog': Show a modal dialog. This is the default.
-   *   - 'dropdown': Shows a dropdown anchored to the picker view
-   *
-   * @platform android
-   */
-  mode?: ?('dialog' | 'dropdown'),
-
-  /**
-   * Style to apply to each of the item labels.
-   * @platform ios
-   */
-  itemStyle?: ?TextStyleProp,
-
-  /**
-   * Color of the item background.
-   * @platform android
-   */
-  backgroundColor?: ColorValue,
-
-  /**
-   * Prompt string for this picker, used on Android in dialog mode as the title of the dialog.
-   * @platform android
-   */
-  prompt?: ?string,
-
-  /**
-   * Used to locate this view in end-to-end tests.
-   */
-  testID?: ?string,
-  /**
-   * The string used for the accessibility label. Will be read once focused on the picker but not on change.
-   */
-  accessibilityLabel?: ?string,
-|}>;
-
-/**
- * Renders the native picker component on iOS and Android. Example:
- *
- *     <Picker
- *       selectedValue={this.state.language}
- *       onValueChange={(itemValue, itemIndex) => this.setState({language: itemValue})}>
- *       <Picker.Item label="Java" value="java" />
- *       <Picker.Item label="JavaScript" value="js" />
- *     </Picker>
- */
-class Picker extends React.Component<PickerProps> {
-  /**
-   * On Android, display the options in a dialog.
-   */
-  static MODE_DIALOG: $TEMPORARY$string<'dialog'> = MODE_DIALOG;
-
-  /**
-   * On Android, display the options in a dropdown (this is the default).
-   */
-  static MODE_DROPDOWN: $TEMPORARY$string<'dropdown'> = MODE_DROPDOWN;
-
-  static Item: typeof PickerItem = PickerItem;
-
-  static defaultProps: {|mode: $TEMPORARY$string<'dialog'>|} = {
-    mode: MODE_DIALOG,
-  };
-
-  render(): React.Node {
-    if (
-      Platform.OS === 'ios' ||
-      Platform.OS === 'macos' /* TODO(macOS GH#774) */
-    ) {
-      /* $FlowFixMe(>=0.81.0 site=react_native_ios_fb) This suppression was
-       * added when renaming suppression sites. */
-      return <PickerIOS {...this.props}>{this.props.children}</PickerIOS>;
-    } else if (Platform.OS === 'android') {
-      return (
-        /* $FlowFixMe(>=0.81.0 site=react_native_android_fb) This suppression
-         * was added when renaming suppression sites. */
-        <PickerAndroid {...this.props}>{this.props.children}</PickerAndroid>
-      );
-    } else {
-      return <UnimplementedView />;
-    }
-  }
-}
-
-module.exports = Picker;
diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js
deleted file mode 100644
index ccefd18833d214..00000000000000
--- a/Libraries/Components/Picker/PickerAndroid.android.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-import AndroidDropdownPickerNativeComponent, {
-  Commands as AndroidDropdownPickerCommands,
-} from './AndroidDropdownPickerNativeComponent';
-import AndroidDialogPickerNativeComponent, {
-  Commands as AndroidDialogPickerCommands,
-} from './AndroidDialogPickerNativeComponent';
-import * as React from 'react';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import invariant from 'invariant';
-import processColor from '../../StyleSheet/processColor';
-
-import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {ColorValue, TextStyleProp} from '../../StyleSheet/StyleSheet';
-
-type PickerItemSelectSyntheticEvent = SyntheticEvent<
-  $ReadOnly<{|
-    position: number,
-  |}>,
->;
-
-type PickerItemValue = number | string;
-
-type Props = $ReadOnly<{|
-  accessibilityLabel?: ?Stringish,
-  children?: React.Node,
-  style?: ?TextStyleProp,
-  backgroundColor?: ?ColorValue,
-  selectedValue?: ?PickerItemValue,
-  enabled?: ?boolean,
-  mode?: ?('dialog' | 'dropdown'),
-  onValueChange?: ?(itemValue: ?PickerItemValue, itemIndex: number) => mixed,
-  prompt?: ?string,
-  testID?: string,
-|}>;
-
-/**
- * Not exposed as a public API - use <Picker> instead.
- */
-function PickerAndroid(props: Props): React.Node {
-  const pickerRef = React.useRef(null);
-
-  const [items, selected] = React.useMemo(() => {
-    // eslint-disable-next-line no-shadow
-    let selected = 0;
-    // eslint-disable-next-line no-shadow
-    const items = React.Children.map(props.children, (child, index) => {
-      if (child === null) {
-        return null;
-      }
-      if (child.props.value === props.selectedValue) {
-        selected = index;
-      }
-      const {color, label} = child.props;
-      const processedColor = processColor(color);
-      invariant(
-        processedColor == null || typeof processedColor === 'number',
-        'Unexpected color given for PickerAndroid color prop',
-      );
-      return {
-        color: color == null ? null : processedColor,
-        label,
-      };
-    });
-    return [items, selected];
-  }, [props.children, props.selectedValue]);
-
-  const onSelect = React.useCallback(
-    ({nativeEvent}: PickerItemSelectSyntheticEvent) => {
-      const {position} = nativeEvent;
-      const onValueChange = props.onValueChange;
-
-      if (onValueChange != null) {
-        if (position >= 0) {
-          const children = React.Children.toArray(props.children).filter(
-            item => item != null,
-          );
-          const value = children[position].props.value;
-          if (props.selectedValue !== value) {
-            onValueChange(value, position);
-          }
-        } else {
-          onValueChange(null, position);
-        }
-      }
-      const {current} = pickerRef;
-      if (current != null && position !== selected) {
-        const Commands =
-          props.mode === 'dropdown'
-            ? AndroidDropdownPickerCommands
-            : AndroidDialogPickerCommands;
-        Commands.setNativeSelectedPosition(current, position);
-      }
-    },
-    [
-      props.children,
-      props.onValueChange,
-      props.selectedValue,
-      props.mode,
-      selected,
-    ],
-  );
-
-  const rootProps = {
-    accessibilityLabel: props.accessibilityLabel,
-    enabled: props.enabled,
-    items,
-    onSelect,
-    prompt: props.prompt,
-    ref: pickerRef,
-    selected,
-    style: StyleSheet.compose(styles.pickerAndroid, props.style),
-    backgroundColor: props.backgroundColor,
-    testID: props.testID,
-  };
-  return props.mode === 'dropdown' ? (
-    <AndroidDropdownPickerNativeComponent {...rootProps} />
-  ) : (
-    <AndroidDialogPickerNativeComponent {...rootProps} />
-  );
-}
-
-const styles = StyleSheet.create({
-  pickerAndroid: {
-    // The picker will conform to whatever width is given, but we do
-    // have to set the component's height explicitly on the
-    // surrounding view to ensure it gets rendered.
-    // TODO would be better to export a native constant for this,
-    // like in iOS the RCTDatePickerManager.m
-    height: 50,
-  },
-});
-
-module.exports = PickerAndroid;
diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js
deleted file mode 100644
index 4b4c50d00b1d2a..00000000000000
--- a/Libraries/Components/Picker/PickerIOS.ios.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-// This is a controlled component version of RCTPickerIOS.
-
-'use strict';
-
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const View = require('../View/View');
-const Platform = require('../../Utilities/Platform'); // TODO(macOS GH#774)
-
-const invariant = require('invariant');
-const processColor = require('../../StyleSheet/processColor');
-
-import RCTPickerNativeComponent, {
-  Commands as PickerCommands,
-} from './RCTPickerNativeComponent';
-import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {ProcessedColorValue} from '../../StyleSheet/processColor';
-import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {ViewProps} from '../View/ViewPropTypes';
-
-type PickerIOSChangeEvent = SyntheticEvent<
-  $ReadOnly<{|
-    newValue: number | string,
-    newIndex: number,
-  |}>,
->;
-
-type RCTPickerIOSItemType = $ReadOnly<{|
-  label: ?Label,
-  value: ?string,
-  textColor: ?ProcessedColorValue,
-|}>;
-
-type Label = Stringish | number;
-
-type Props = $ReadOnly<{|
-  ...ViewProps,
-  children: React.ChildrenArray<React.Element<typeof PickerIOSItem>>,
-  itemStyle?: ?TextStyleProp,
-  onChange?: ?(event: PickerIOSChangeEvent) => mixed,
-  onValueChange?: ?(itemValue: string | number, itemIndex: number) => mixed,
-  selectedValue: ?string,
-  accessibilityLabel?: ?string,
-|}>;
-
-type State = {|
-  selectedIndex: number,
-  items: $ReadOnlyArray<RCTPickerIOSItemType>,
-|};
-
-type ItemProps = $ReadOnly<{|
-  label: ?Label,
-  value?: ?string,
-  color?: ?ColorValue,
-|}>;
-
-const PickerIOSItem = (props: ItemProps): null => {
-  return null;
-};
-
-class PickerIOS extends React.Component<Props, State> {
-  _picker: ?React.ElementRef<typeof RCTPickerNativeComponent> = null;
-  _lastNativeValue: ?number;
-
-  state: State = {
-    selectedIndex: 0,
-    items: [],
-  };
-
-  static Item: (props: ItemProps) => null = PickerIOSItem;
-
-  static getDerivedStateFromProps(props: Props): State {
-    let selectedIndex = 0;
-    const items = [];
-    React.Children.toArray(props.children)
-      .filter(child => child !== null)
-      .forEach(function(child, index) {
-        if (child.props.value === props.selectedValue) {
-          selectedIndex = index;
-        }
-        const processedTextColor = processColor(child.props.color);
-        invariant(
-          processedTextColor == null || typeof processedTextColor === 'number',
-          'Unexpected color given for PickerIOSItem color',
-        );
-        items.push({
-          value: child.props.value,
-          label: child.props.label,
-          textColor: processedTextColor,
-        });
-      });
-    return {selectedIndex, items};
-  }
-
-  render(): React.Node {
-    return (
-      <View style={this.props.style}>
-        <RCTPickerNativeComponent
-          ref={picker => {
-            this._picker = picker;
-          }}
-          testID={this.props.testID}
-          style={[styles.pickerIOS, this.props.itemStyle]}
-          items={this.state.items}
-          selectedIndex={this.state.selectedIndex}
-          onChange={this._onChange}
-          accessibilityLabel={this.props.accessibilityLabel}
-        />
-      </View>
-    );
-  }
-
-  componentDidUpdate() {
-    // This is necessary in case native updates the picker and JS decides
-    // that the update should be ignored and we should stick with the value
-    // that we have in JS.
-    if (
-      this._picker &&
-      this._lastNativeValue !== undefined &&
-      this._lastNativeValue !== this.state.selectedIndex
-    ) {
-      PickerCommands.setNativeSelectedIndex(
-        this._picker,
-        this.state.selectedIndex,
-      );
-    }
-  }
-
-  _onChange = event => {
-    if (this.props.onChange) {
-      this.props.onChange(event);
-    }
-    if (this.props.onValueChange) {
-      this.props.onValueChange(
-        event.nativeEvent.newValue,
-        event.nativeEvent.newIndex,
-      );
-    }
-
-    this._lastNativeValue = event.nativeEvent.newIndex;
-    this.forceUpdate();
-  };
-}
-
-const styles = StyleSheet.create({
-  pickerIOS: {
-    // The picker will conform to whatever width is given, but we do
-    // have to set the component's height explicitly on the
-    // surrounding view to ensure it gets rendered.
-    height: Platform.OS === 'ios' ? 216 : 25, // TODO(macOS GH#774): NSComboBox in Storyboards is 25 points.
-  },
-});
-
-module.exports = PickerIOS;
diff --git a/Libraries/Components/Picker/RCTPickerNativeComponent.js b/Libraries/Components/Picker/RCTPickerNativeComponent.js
deleted file mode 100644
index 7fdbe9c76c80fd..00000000000000
--- a/Libraries/Components/Picker/RCTPickerNativeComponent.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-const requireNativeComponent = require('../../ReactNative/requireNativeComponent');
-const ReactNativeViewConfigRegistry = require('../../Renderer/shims/ReactNativeViewConfigRegistry');
-
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ProcessedColorValue} from '../../StyleSheet/processColor';
-import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
-import RCTPickerViewConfig from './RCTPickerViewConfig';
-import * as React from 'react';
-
-type PickerIOSChangeEvent = SyntheticEvent<
-  $ReadOnly<{|
-    newValue: number | string,
-    newIndex: number,
-  |}>,
->;
-
-type RCTPickerIOSItemType = $ReadOnly<{|
-  label: ?Label,
-  value: ?string,
-  textColor: ?ProcessedColorValue,
-|}>;
-
-type Label = Stringish | number;
-
-type NativeProps = $ReadOnly<{|
-  items: $ReadOnlyArray<RCTPickerIOSItemType>,
-  onChange: (event: PickerIOSChangeEvent) => void,
-  selectedIndex: number,
-  style?: ?TextStyleProp,
-  testID?: ?string,
-  accessibilityLabel?: ?string,
-|}>;
-
-type ComponentType = HostComponent<NativeProps>;
-
-interface NativeCommands {
-  +setNativeSelectedIndex: (
-    viewRef: React.ElementRef<ComponentType>,
-    index: number,
-  ) => void;
-}
-
-export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['setNativeSelectedIndex'],
-});
-
-let RCTPickerNativeComponent;
-if (global.RN$Bridgeless) {
-  ReactNativeViewConfigRegistry.register('RCTPicker', () => {
-    return RCTPickerViewConfig;
-  });
-  RCTPickerNativeComponent = 'RCTPicker';
-} else {
-  RCTPickerNativeComponent = requireNativeComponent<NativeProps>('RCTPicker');
-}
-
-// flowlint-next-line unclear-type:off
-export default ((RCTPickerNativeComponent: any): HostComponent<NativeProps>);
diff --git a/Libraries/Components/Picker/RCTPickerViewConfig.js b/Libraries/Components/Picker/RCTPickerViewConfig.js
deleted file mode 100644
index 448bc2a2b8e5cf..00000000000000
--- a/Libraries/Components/Picker/RCTPickerViewConfig.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-import ReactNativeViewViewConfig from '../../Components/View/ReactNativeViewViewConfig';
-import type {ReactNativeBaseComponentViewConfig} from '../../Renderer/shims/ReactNativeTypes';
-
-const RCTPickerViewConfig = {
-  uiViewClassName: 'RCTPicker',
-  bubblingEventTypes: {
-    topChange: {
-      phasedRegistrationNames: {
-        bubbled: 'onChange',
-        captured: 'onChangeCapture',
-      },
-    },
-  },
-  directEventTypes: {},
-  validAttributes: {
-    ...ReactNativeViewViewConfig.validAttributes,
-    color: {process: require('../../StyleSheet/processColor')},
-    fontFamily: true,
-    fontSize: true,
-    fontStyle: true,
-    fontWeight: true,
-    items: true,
-    onChange: true,
-    selectedIndex: true,
-    textAlign: true,
-  },
-};
-
-module.exports = (RCTPickerViewConfig: ReactNativeBaseComponentViewConfig<>);
diff --git a/Libraries/Components/Picker/__tests__/Picker-test.js b/Libraries/Components/Picker/__tests__/Picker-test.js
deleted file mode 100644
index 1a22421c5686c0..00000000000000
--- a/Libraries/Components/Picker/__tests__/Picker-test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @emails oncall+react_native
- * @flow strict-local
- */
-
-'use strict';
-
-const React = require('react');
-const Picker = require('../Picker');
-
-const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
-
-describe('<Picker />', () => {
-  it('should render as expected', () => {
-    ReactNativeTestTools.expectRendersMatchingSnapshot(
-      'Picker',
-      () => (
-        <Picker selectedValue="foo" onValueChange={jest.fn()}>
-          <Picker.Item label="foo" value="foo" />
-          <Picker.Item label="bar" value="bar" />
-        </Picker>
-      ),
-      () => {
-        jest.dontMock('../Picker');
-      },
-    );
-  });
-});
diff --git a/Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap b/Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap
deleted file mode 100644
index 32c40aa992d57a..00000000000000
--- a/Libraries/Components/Picker/__tests__/__snapshots__/Picker-test.js.snap
+++ /dev/null
@@ -1,97 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Picker /> should render as expected: should deep render when mocked (please verify output manually) 1`] = `
-<View>
-  <RCTPicker
-    items={
-      Array [
-        Object {
-          "label": "foo",
-          "textColor": undefined,
-          "value": "foo",
-        },
-        Object {
-          "label": "bar",
-          "textColor": undefined,
-          "value": "bar",
-        },
-      ]
-    }
-    onChange={[Function]}
-    selectedIndex={0}
-    style={
-      Array [
-        Object {
-          "height": 216,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`<Picker /> should render as expected: should deep render when not mocked (please verify output manually) 1`] = `
-<View>
-  <RCTPicker
-    items={
-      Array [
-        Object {
-          "label": "foo",
-          "textColor": undefined,
-          "value": "foo",
-        },
-        Object {
-          "label": "bar",
-          "textColor": undefined,
-          "value": "bar",
-        },
-      ]
-    }
-    onChange={[Function]}
-    selectedIndex={0}
-    style={
-      Array [
-        Object {
-          "height": 216,
-        },
-        undefined,
-      ]
-    }
-  />
-</View>
-`;
-
-exports[`<Picker /> should render as expected: should shallow render as <Picker /> when mocked 1`] = `
-<Picker
-  mode="dialog"
-  onValueChange={[MockFunction]}
-  selectedValue="foo"
->
-  <PickerItem
-    label="foo"
-    value="foo"
-  />
-  <PickerItem
-    label="bar"
-    value="bar"
-  />
-</Picker>
-`;
-
-exports[`<Picker /> should render as expected: should shallow render as <Picker /> when not mocked 1`] = `
-<Picker
-  mode="dialog"
-  onValueChange={[MockFunction]}
-  selectedValue="foo"
->
-  <PickerItem
-    label="foo"
-    value="foo"
-  />
-  <PickerItem
-    label="bar"
-    value="bar"
-  />
-</Picker>
-`;
diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js
index ec0e2343dfb3ee..59760863a020ee 100644
--- a/Libraries/Components/Pressable/Pressable.js
+++ b/Libraries/Components/Pressable/Pressable.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import {useMemo, useState, useRef, useImperativeHandle} from 'react';
 import useAndroidRippleForView, {
@@ -58,6 +56,12 @@ type Props = $ReadOnly<{|
   importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
 
+  /**
+   * Whether a press gesture can be interrupted by a parent gesture such as a
+   * scroll event. Defaults to true.
+   */
+  cancelable?: ?boolean,
+
   /**
    * Either children or a render prop that receives a boolean reflecting whether
    * the component is currently pressed.
@@ -98,7 +102,7 @@ type Props = $ReadOnly<{|
   /**
    * Called when this view's layout changes.
    */
-  onLayout?: ?(event: LayoutEvent) => void,
+  onLayout?: ?(event: LayoutEvent) => mixed,
 
   /**
    * Called when the hover is activated to provide visual feedback.
@@ -113,22 +117,22 @@ type Props = $ReadOnly<{|
   /**
    * Called when a long-tap gesture is detected.
    */
-  onLongPress?: ?(event: PressEvent) => void,
+  onLongPress?: ?(event: PressEvent) => mixed,
 
   /**
    * Called when a single tap gesture is detected.
    */
-  onPress?: ?(event: PressEvent) => void,
+  onPress?: ?(event: PressEvent) => mixed,
 
   /**
    * Called when a touch is engaged before `onPress`.
    */
-  onPressIn?: ?(event: PressEvent) => void,
+  onPressIn?: ?(event: PressEvent) => mixed,
 
   /**
    * Called when a touch is released before `onPress`.
    */
-  onPressOut?: ?(event: PressEvent) => void,
+  onPressOut?: ?(event: PressEvent) => mixed,
 
   /**
    * Either view styles or a function that receives a boolean reflecting whether
@@ -183,6 +187,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
     accessible,
     android_disableSound,
     android_ripple,
+    cancelable,
     children,
     delayHoverIn,
     delayHoverOut,
@@ -211,6 +216,11 @@ function Pressable(props: Props, forwardedRef): React.Node {
 
   const hitSlop = normalizeRect(props.hitSlop);
 
+  const accessibilityState =
+    disabled != null
+      ? {...props.accessibilityState, disabled}
+      : props.accessibilityState;
+
   const restPropsWithDefaults: React.ElementConfig<typeof View> = {
     ...restProps,
     ...android_rippleConfig?.viewProps,
@@ -218,11 +228,13 @@ function Pressable(props: Props, forwardedRef): React.Node {
     enableFocusRing: enableFocusRing !== false && !disabled,
     accessible: accessible !== false,
     focusable: focusable !== false && !disabled, // ]TODO(macOS GH#774)
+    accessibilityState,
     hitSlop,
   };
 
   const config = useMemo(
     () => ({
+      cancelable,
       disabled,
       hitSlop,
       pressRectOffset: pressRetentionOffset,
@@ -258,6 +270,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
     [
       android_disableSound,
       android_rippleConfig,
+      cancelable,
       delayHoverIn,
       delayHoverOut,
       delayLongPress,
diff --git a/Libraries/Components/Pressable/__tests__/Pressable-test.js b/Libraries/Components/Pressable/__tests__/Pressable-test.js
index a8c5af535e8518..46909623347aa1 100644
--- a/Libraries/Components/Pressable/__tests__/Pressable-test.js
+++ b/Libraries/Components/Pressable/__tests__/Pressable-test.js
@@ -9,8 +9,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import * as React from 'react';
 
 import Pressable from '../Pressable';
@@ -32,3 +30,67 @@ describe('<Pressable />', () => {
     );
   });
 });
+
+describe('<Pressable disabled={true} />', () => {
+  it('should be disabled when disabled is true', () => {
+    expectRendersMatchingSnapshot(
+      'Pressable',
+      () => (
+        <Pressable disabled={true}>
+          <View />
+        </Pressable>
+      ),
+      () => {
+        jest.dontMock('../Pressable');
+      },
+    );
+  });
+});
+
+describe('<Pressable disabled={true} accessibilityState={{}} />', () => {
+  it('should be disabled when disabled is true and accessibilityState is empty', () => {
+    expectRendersMatchingSnapshot(
+      'Pressable',
+      () => (
+        <Pressable disabled={true} accessibilityState={{}}>
+          <View />
+        </Pressable>
+      ),
+      () => {
+        jest.dontMock('../Pressable');
+      },
+    );
+  });
+});
+
+describe('<Pressable disabled={true} accessibilityState={{checked: true}} />', () => {
+  it('should keep accessibilityState when disabled is true', () => {
+    expectRendersMatchingSnapshot(
+      'Pressable',
+      () => (
+        <Pressable disabled={true} accessibilityState={{checked: true}}>
+          <View />
+        </Pressable>
+      ),
+      () => {
+        jest.dontMock('../Pressable');
+      },
+    );
+  });
+});
+
+describe('<Pressable disabled={true} accessibilityState={{disabled: false}} />', () => {
+  it('should overwrite accessibilityState with value of disabled prop', () => {
+    expectRendersMatchingSnapshot(
+      'Pressable',
+      () => (
+        <Pressable disabled={true} accessibilityState={{disabled: false}}>
+          <View />
+        </Pressable>
+      ),
+      () => {
+        jest.dontMock('../Pressable');
+      },
+    );
+  });
+});
diff --git a/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap b/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
index 6f244c492b92fb..c4add53c23e111 100644
--- a/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
+++ b/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
@@ -57,3 +57,315 @@ exports[`<Pressable /> should render as expected: should shallow render as <Pres
   <View />
 </Memo(Pressable)>
 `;
+
+exports[`<Pressable disabled={true} /> should be disabled when disabled is true: should deep render when mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} /> should be disabled when disabled is true: should deep render when not mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} /> should be disabled when disabled is true: should shallow render as <Pressable /> when mocked 1`] = `
+<Memo(Pressable)
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
+
+exports[`<Pressable disabled={true} /> should be disabled when disabled is true: should shallow render as <Pressable /> when not mocked 1`] = `
+<Memo(Pressable)
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disabled when disabled is true and accessibilityState is empty: should deep render when mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disabled when disabled is true and accessibilityState is empty: should deep render when not mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disabled when disabled is true and accessibilityState is empty: should shallow render as <Pressable /> when mocked 1`] = `
+<Memo(Pressable)
+  accessibilityState={Object {}}
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disabled when disabled is true and accessibilityState is empty: should shallow render as <Pressable /> when not mocked 1`] = `
+<Memo(Pressable)
+  accessibilityState={Object {}}
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> should keep accessibilityState when disabled is true: should deep render when mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "checked": true,
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> should keep accessibilityState when disabled is true: should deep render when not mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "checked": true,
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> should keep accessibilityState when disabled is true: should shallow render as <Pressable /> when mocked 1`] = `
+<Memo(Pressable)
+  accessibilityState={
+    Object {
+      "checked": true,
+    }
+  }
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> should keep accessibilityState when disabled is true: should shallow render as <Pressable /> when not mocked 1`] = `
+<Memo(Pressable)
+  accessibilityState={
+    Object {
+      "checked": true,
+    }
+  }
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> should overwrite accessibilityState with value of disabled prop: should deep render when mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> should overwrite accessibilityState with value of disabled prop: should deep render when not mocked (please verify output manually) 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> should overwrite accessibilityState with value of disabled prop: should shallow render as <Pressable /> when mocked 1`] = `
+<Memo(Pressable)
+  accessibilityState={
+    Object {
+      "disabled": false,
+    }
+  }
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
+
+exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> should overwrite accessibilityState with value of disabled prop: should shallow render as <Pressable /> when not mocked 1`] = `
+<Memo(Pressable)
+  accessibilityState={
+    Object {
+      "disabled": false,
+    }
+  }
+  disabled={true}
+>
+  <View />
+</Memo(Pressable)>
+`;
diff --git a/Libraries/Components/Pressable/useAndroidRippleForView.js b/Libraries/Components/Pressable/useAndroidRippleForView.js
index 1e33f2a144c762..18ee3d5c6a4623 100644
--- a/Libraries/Components/Pressable/useAndroidRippleForView.js
+++ b/Libraries/Components/Pressable/useAndroidRippleForView.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import invariant from 'invariant';
 import {Commands} from '../View/ViewNativeComponent';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
@@ -29,6 +27,7 @@ export type RippleConfig = {|
   color?: ColorValue,
   borderless?: boolean,
   radius?: number,
+  foreground?: boolean,
 |};
 
 /**
@@ -42,11 +41,11 @@ export default function useAndroidRippleForView(
   onPressIn: (event: PressEvent) => void,
   onPressMove: (event: PressEvent) => void,
   onPressOut: (event: PressEvent) => void,
-  viewProps: $ReadOnly<{|
-    nativeBackgroundAndroid: NativeBackgroundProp,
-  |}>,
+  viewProps:
+    | $ReadOnly<{|nativeBackgroundAndroid: NativeBackgroundProp|}>
+    | $ReadOnly<{|nativeForegroundAndroid: NativeBackgroundProp|}>,
 |}> {
-  const {color, borderless, radius} = rippleConfig ?? {};
+  const {color, borderless, radius, foreground} = rippleConfig ?? {};
 
   return useMemo(() => {
     if (
@@ -60,25 +59,27 @@ export default function useAndroidRippleForView(
         'Unexpected color given for Ripple color',
       );
 
+      const nativeRippleValue = {
+        type: 'RippleAndroid',
+        color: processedColor,
+        borderless: borderless === true,
+        rippleRadius: radius,
+      };
+
       return {
-        viewProps: {
-          // Consider supporting `nativeForegroundAndroid`
-          nativeBackgroundAndroid: {
-            type: 'RippleAndroid',
-            color: processedColor,
-            borderless: borderless === true,
-            rippleRadius: radius,
-          },
-        },
+        viewProps:
+          foreground === true
+            ? {nativeForegroundAndroid: nativeRippleValue}
+            : {nativeBackgroundAndroid: nativeRippleValue},
         onPressIn(event: PressEvent): void {
           const view = viewRef.current;
           if (view != null) {
-            Commands.setPressed(view, true);
             Commands.hotspotUpdate(
               view,
               event.nativeEvent.locationX ?? 0,
               event.nativeEvent.locationY ?? 0,
             );
+            Commands.setPressed(view, true);
           }
         },
         onPressMove(event: PressEvent): void {
@@ -100,5 +101,5 @@ export default function useAndroidRippleForView(
       };
     }
     return null;
-  }, [color, borderless, radius, viewRef]);
+  }, [borderless, color, foreground, radius, viewRef]);
 }
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
index 61663d6ad50b30..51803f1df2e8a6 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const React = require('react');
 
 import ProgressBarAndroidNativeComponent from './ProgressBarAndroidNativeComponent';
@@ -81,23 +79,27 @@ export type ProgressBarAndroidProps = $ReadOnly<{|
  * ```
  */
 const ProgressBarAndroid = (
-  props: ProgressBarAndroidProps,
+  {
+    styleAttr = 'Normal',
+    indeterminate = true,
+    animating = true,
+    ...restProps
+  }: ProgressBarAndroidProps,
   forwardedRef: ?React.Ref<typeof ProgressBarAndroidNativeComponent>,
 ) => {
-  return <ProgressBarAndroidNativeComponent {...props} ref={forwardedRef} />;
+  return (
+    <ProgressBarAndroidNativeComponent
+      styleAttr={styleAttr}
+      indeterminate={indeterminate}
+      animating={animating}
+      {...restProps}
+      ref={forwardedRef}
+    />
+  );
 };
 
 const ProgressBarAndroidToExport = React.forwardRef(ProgressBarAndroid);
 
-/* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
-ProgressBarAndroidToExport.defaultProps = {
-  styleAttr: 'Normal',
-  indeterminate: true,
-  animating: true,
-};
-
 /* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
  * error found when Flow v0.89 was deployed. To see the error, delete this
  * comment and run Flow. */
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js
index 0274e5866792e0..5b2fb1a222f99f 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {Double, WithDefault} from '../../Types/CodegenTypes';
diff --git a/Libraries/Components/ProgressBarAndroid/__tests__/__snapshots__/ProgressBarAndroid-test.js.snap b/Libraries/Components/ProgressBarAndroid/__tests__/__snapshots__/ProgressBarAndroid-test.js.snap
index 87b8c16da4f277..f1985dfedb660a 100644
--- a/Libraries/Components/ProgressBarAndroid/__tests__/__snapshots__/ProgressBarAndroid-test.js.snap
+++ b/Libraries/Components/ProgressBarAndroid/__tests__/__snapshots__/ProgressBarAndroid-test.js.snap
@@ -18,7 +18,6 @@ exports[`<ProgressBarAndroid /> should render as expected: should deep render wh
 
 exports[`<ProgressBarAndroid /> should render as expected: should shallow render as <ProgressBarAndroid /> when mocked 1`] = `
 <ForwardRef(ProgressBarAndroid)
-  animating={true}
   indeterminate={true}
   styleAttr="Horizontal"
 />
@@ -26,7 +25,6 @@ exports[`<ProgressBarAndroid /> should render as expected: should shallow render
 
 exports[`<ProgressBarAndroid /> should render as expected: should shallow render as <ProgressBarAndroid /> when not mocked 1`] = `
 <ForwardRef(ProgressBarAndroid)
-  animating={true}
   indeterminate={true}
   styleAttr="Horizontal"
 />
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
index 8396ac4e87981e..d642a6545ab5bb 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
@@ -8,11 +8,10 @@
  */
 
 'use strict';
-
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const Text = require('../../Text/Text');
-const View = require('../View/View');
+import * as React from 'react';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import View from '../View/View';
 
 class DummyProgressViewIOS extends React.Component {
   render() {
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
index 189f7be3872ee0..d465440d174872 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
@@ -8,14 +8,11 @@
  * @flow strict-local
  */
 
-'use strict';
-
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
+import * as React from 'react';
+import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet';
 
 import RCTProgressViewNativeComponent from './RCTProgressViewNativeComponent';
 import type {ImageSource} from '../../Image/ImageSource';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 type Props = $ReadOnly<{|
diff --git a/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js b/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js
index ccdd15e5100489..c0c0b56bfef280 100644
--- a/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js
+++ b/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {Float, WithDefault} from '../../Types/CodegenTypes';
 import type {ImageSource} from '../../Image/ImageSource';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
diff --git a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
index 9bd3600eb31571..de1b8d9a2a52f1 100644
--- a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
+++ b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import * as React from 'react';
 
 import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
@@ -41,17 +39,9 @@ type NativeProps = $ReadOnly<{|
    */
   progressBackgroundColor?: ?ColorValue,
   /**
-   * Size of the refresh indicator, see RefreshControl.SIZE.
-   *
-   * This type isn't currently accurate. It really is specific numbers
-   * hard coded in the Android platform.
-   *
-   * Also, 1 isn't actually a safe default. We are able to set this here
-   * because native code isn't currently consuming the generated artifact.
-   * This will end up being
-   * size?: WithDefault<'default' | 'large', 'default'>,
+   * Size of the refresh indicator.
    */
-  size?: WithDefault<Int32, 1>,
+  size?: WithDefault<'default' | 'large', 'default'>,
   /**
    * Progress view top offset
    */
diff --git a/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js b/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js
index 7f97db35b6120f..fa4791f2ab620c 100644
--- a/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js
+++ b/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js
@@ -8,9 +8,11 @@
  * @flow strict-local
  */
 
-'use strict';
-
-import type {DirectEventHandler, WithDefault} from '../../Types/CodegenTypes';
+import type {
+  DirectEventHandler,
+  Float,
+  WithDefault,
+} from '../../Types/CodegenTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import * as React from 'react';
@@ -34,6 +36,10 @@ type NativeProps = $ReadOnly<{|
    * The title displayed under the refresh indicator.
    */
   title?: WithDefault<string, null>,
+  /**
+   * Progress view top offset
+   */
+  progressViewOffset?: WithDefault<Float, 0>,
 
   /**
    * Called when the view starts refreshing.
diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index a85c820791d1e1..0f0a16dbbccfc5 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const Platform = require('../../Utilities/Platform');
 const React = require('react');
 
@@ -22,18 +20,6 @@ import PullToRefreshViewNativeComponent, {
   Commands as PullToRefreshCommands,
 } from './PullToRefreshViewNativeComponent';
 
-let RefreshLayoutConsts: any;
-if (Platform.OS === 'android') {
-  const AndroidSwipeRefreshLayout = require('../../ReactNative/UIManager').getViewManagerConfig(
-    'AndroidSwipeRefreshLayout',
-  );
-  RefreshLayoutConsts = AndroidSwipeRefreshLayout
-    ? AndroidSwipeRefreshLayout.Constants
-    : {SIZE: {}};
-} else {
-  RefreshLayoutConsts = {SIZE: {}};
-}
-
 type IOSProps = $ReadOnly<{|
   /**
    * The color of the refresh indicator.
@@ -63,16 +49,9 @@ type AndroidProps = $ReadOnly<{|
    */
   progressBackgroundColor?: ?ColorValue,
   /**
-   * Size of the refresh indicator, see RefreshControl.SIZE.
+   * Size of the refresh indicator.
    */
-  size?: ?(
-    | typeof RefreshLayoutConsts.SIZE.DEFAULT
-    | typeof RefreshLayoutConsts.SIZE.LARGE
-  ),
-  /**
-   * Progress view top offset
-   */
-  progressViewOffset?: ?number,
+  size?: ?('default' | 'large'),
 |}>;
 
 export type RefreshControlProps = $ReadOnly<{|
@@ -89,6 +68,11 @@ export type RefreshControlProps = $ReadOnly<{|
    * Whether the view should be indicating an active refresh.
    */
   refreshing: boolean,
+
+  /**
+   * Progress view top offset
+   */
+  progressViewOffset?: ?number,
 |}>;
 
 /**
@@ -137,8 +121,6 @@ export type RefreshControlProps = $ReadOnly<{|
  * in the `onRefresh` function otherwise the refresh indicator will stop immediately.
  */
 class RefreshControl extends React.Component<RefreshControlProps> {
-  static SIZE: any = RefreshLayoutConsts.SIZE;
-
   _nativeRef: ?React.ElementRef<
     | typeof PullToRefreshViewNativeComponent
     | typeof AndroidSwipeRefreshLayoutNativeComponent,
@@ -181,7 +163,6 @@ class RefreshControl extends React.Component<RefreshControlProps> {
         colors,
         progressBackgroundColor,
         size,
-        progressViewOffset,
         ...props
       } = this.props;
       return (
diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
index 40d41abbdc68ec..696eaa37ae7d2d 100644
--- a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
+++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
@@ -9,10 +9,9 @@
  */
 
 'use strict';
+import * as React from 'react';
 
-const React = require('react');
-
-const requireNativeComponent = require('../../../ReactNative/requireNativeComponent');
+import requireNativeComponent from '../../../ReactNative/requireNativeComponent';
 
 import type {HostComponent} from '../../../Renderer/shims/ReactNativeTypes';
 
diff --git a/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js b/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js
index 9025f1a88195d5..5365e35f8fce53 100644
--- a/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js
+++ b/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {WithDefault} from '../../Types/CodegenTypes';
 
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.js b/Libraries/Components/SafeAreaView/SafeAreaView.js
index 8fc76bed849dc8..827965958439b5 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.js
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.js
@@ -59,4 +59,4 @@ if (Platform.OS !== 'ios') {
   );
 }
 
-module.exports = exported;
+export default exported;
diff --git a/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js b/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js
index 133fd1da8a9f85..4b7edf60fee47e 100644
--- a/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js
+++ b/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js
@@ -12,7 +12,7 @@
 'use strict';
 
 const React = require('react');
-const SafeAreaView = require('../SafeAreaView');
+import SafeAreaView from '../SafeAreaView';
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
 const View = require('../../View/View');
 const Text = require('../../../Text/Text');
diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
deleted file mode 100644
index 7aef247b62c869..00000000000000
--- a/Libraries/Components/ScrollResponder.js
+++ /dev/null
@@ -1,772 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-const Dimensions = require('../Utilities/Dimensions');
-const FrameRateLogger = require('../Interaction/FrameRateLogger');
-const Keyboard = require('./Keyboard/Keyboard');
-const Platform = require('../Utilities/Platform');
-const React = require('react');
-const ReactNative = require('../Renderer/shims/ReactNative');
-const TextInputState = require('./TextInput/TextInputState');
-const UIManager = require('../ReactNative/UIManager');
-
-const invariant = require('invariant');
-
-import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
-import type {PressEvent, ScrollEvent} from '../Types/CoreEventTypes';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
-import type {KeyboardEvent} from './Keyboard/Keyboard';
-import typeof ScrollView from './ScrollView/ScrollView';
-import type {Props as ScrollViewProps} from './ScrollView/ScrollView';
-import Commands from './ScrollView/ScrollViewCommands';
-
-/**
- * Mixin that can be integrated in order to handle scrolling that plays well
- * with `ResponderEventPlugin`. Integrate with your platform specific scroll
- * views, or even your custom built (every-frame animating) scroll views so that
- * all of these systems play well with the `ResponderEventPlugin`.
- *
- * iOS scroll event timing nuances:
- * ===============================
- *
- *
- * Scrolling without bouncing, if you touch down:
- * -------------------------------
- *
- * 1. `onMomentumScrollBegin` (when animation begins after letting up)
- *    ... physical touch starts ...
- * 2. `onTouchStartCapture`   (when you press down to stop the scroll)
- * 3. `onTouchStart`          (same, but bubble phase)
- * 4. `onResponderRelease`    (when lifting up - you could pause forever before * lifting)
- * 5. `onMomentumScrollEnd`
- *
- *
- * Scrolling with bouncing, if you touch down:
- * -------------------------------
- *
- * 1. `onMomentumScrollBegin` (when animation begins after letting up)
- *    ... bounce begins ...
- *    ... some time elapses ...
- *    ... physical touch during bounce ...
- * 2. `onMomentumScrollEnd`   (Makes no sense why this occurs first during bounce)
- * 3. `onTouchStartCapture`   (immediately after `onMomentumScrollEnd`)
- * 4. `onTouchStart`          (same, but bubble phase)
- * 5. `onTouchEnd`            (You could hold the touch start for a long time)
- * 6. `onMomentumScrollBegin` (When releasing the view starts bouncing back)
- *
- * So when we receive an `onTouchStart`, how can we tell if we are touching
- * *during* an animation (which then causes the animation to stop)? The only way
- * to tell is if the `touchStart` occurred immediately after the
- * `onMomentumScrollEnd`.
- *
- * This is abstracted out for you, so you can just call this.scrollResponderIsAnimating() if
- * necessary
- *
- * `ScrollResponder` also includes logic for blurring a currently focused input
- * if one is focused while scrolling. The `ScrollResponder` is a natural place
- * to put this logic since it can support not dismissing the keyboard while
- * scrolling, unless a recognized "tap"-like gesture has occurred.
- *
- * The public lifecycle API includes events for keyboard interaction, responder
- * interaction, and scrolling (among others). The keyboard callbacks
- * `onKeyboardWill/Did/*` are *global* events, but are invoked on scroll
- * responder's props so that you can guarantee that the scroll responder's
- * internal state has been updated accordingly (and deterministically) by
- * the time the props callbacks are invoke. Otherwise, you would always wonder
- * if the scroll responder is currently in a state where it recognizes new
- * keyboard positions etc. If coordinating scrolling with keyboard movement,
- * *always* use these hooks instead of listening to your own global keyboard
- * events.
- *
- * Public keyboard lifecycle API: (props callbacks)
- *
- * Standard Keyboard Appearance Sequence:
- *
- *   this.props.onKeyboardWillShow
- *   this.props.onKeyboardDidShow
- *
- * `onScrollResponderKeyboardDismissed` will be invoked if an appropriate
- * tap inside the scroll responder's scrollable region was responsible
- * for the dismissal of the keyboard. There are other reasons why the
- * keyboard could be dismissed.
- *
- *   this.props.onScrollResponderKeyboardDismissed
- *
- * Standard Keyboard Hide Sequence:
- *
- *   this.props.onKeyboardWillHide
- *   this.props.onKeyboardDidHide
- */
-
-const IS_ANIMATING_TOUCH_START_THRESHOLD_MS = 16;
-
-export type State = {|
-  isTouching: boolean,
-  lastMomentumScrollBeginTime: number,
-  lastMomentumScrollEndTime: number,
-  observedScrollSinceBecomingResponder: boolean,
-  becameResponderWhileAnimating: boolean,
-|};
-
-const ScrollResponderMixin = {
-  _subscriptionKeyboardWillShow: (null: ?EventSubscription),
-  _subscriptionKeyboardWillHide: (null: ?EventSubscription),
-  _subscriptionKeyboardDidShow: (null: ?EventSubscription),
-  _subscriptionKeyboardDidHide: (null: ?EventSubscription),
-  scrollResponderMixinGetInitialState: function(): State {
-    return {
-      isTouching: false,
-      lastMomentumScrollBeginTime: 0,
-      lastMomentumScrollEndTime: 0,
-
-      // Reset to false every time becomes responder. This is used to:
-      // - Determine if the scroll view has been scrolled and therefore should
-      // refuse to give up its responder lock.
-      // - Determine if releasing should dismiss the keyboard when we are in
-      // tap-to-dismiss mode (this.props.keyboardShouldPersistTaps !== 'always').
-      observedScrollSinceBecomingResponder: false,
-      becameResponderWhileAnimating: false,
-    };
-  },
-
-  /**
-   * Invoke this from an `onScroll` event.
-   */
-  scrollResponderHandleScrollShouldSetResponder: function(): boolean {
-    // Allow any event touch pass through if the default pan responder is disabled
-    if (this.props.disableScrollViewPanResponder === true) {
-      return false;
-    }
-    return this.state.isTouching;
-  },
-
-  /**
-   * Merely touch starting is not sufficient for a scroll view to become the
-   * responder. Being the "responder" means that the very next touch move/end
-   * event will result in an action/movement.
-   *
-   * Invoke this from an `onStartShouldSetResponder` event.
-   *
-   * `onStartShouldSetResponder` is used when the next move/end will trigger
-   * some UI movement/action, but when you want to yield priority to views
-   * nested inside of the view.
-   *
-   * There may be some cases where scroll views actually should return `true`
-   * from `onStartShouldSetResponder`: Any time we are detecting a standard tap
-   * that gives priority to nested views.
-   *
-   * - If a single tap on the scroll view triggers an action such as
-   *   recentering a map style view yet wants to give priority to interaction
-   *   views inside (such as dropped pins or labels), then we would return true
-   *   from this method when there is a single touch.
-   *
-   * - Similar to the previous case, if a two finger "tap" should trigger a
-   *   zoom, we would check the `touches` count, and if `>= 2`, we would return
-   *   true.
-   *
-   */
-  scrollResponderHandleStartShouldSetResponder: function(
-    e: PressEvent,
-  ): boolean {
-    // Allow any event touch pass through if the default pan responder is disabled
-    if (this.props.disableScrollViewPanResponder === true) {
-      return false;
-    }
-
-    const currentlyFocusedInput = TextInputState.currentlyFocusedInput();
-
-    if (
-      this.props.keyboardShouldPersistTaps === 'handled' &&
-      currentlyFocusedInput != null &&
-      e.target !== currentlyFocusedInput
-    ) {
-      return true;
-    }
-    return false;
-  },
-
-  /**
-   * There are times when the scroll view wants to become the responder
-   * (meaning respond to the next immediate `touchStart/touchEnd`), in a way
-   * that *doesn't* give priority to nested views (hence the capture phase):
-   *
-   * - Currently animating.
-   * - Tapping anywhere that is not a text input, while the keyboard is
-   *   up (which should dismiss the keyboard).
-   *
-   * Invoke this from an `onStartShouldSetResponderCapture` event.
-   */
-  scrollResponderHandleStartShouldSetResponderCapture: function(
-    e: PressEvent,
-  ): boolean {
-    // The scroll view should receive taps instead of its descendants if:
-    // * it is already animating/decelerating
-    if (this.scrollResponderIsAnimating()) {
-      return true;
-    }
-
-    // Allow any event touch pass through if the default pan responder is disabled
-    if (this.props.disableScrollViewPanResponder === true) {
-      return false;
-    }
-
-    // * the keyboard is up, keyboardShouldPersistTaps is 'never' (the default),
-    // and a new touch starts with a non-textinput target (in which case the
-    // first tap should be sent to the scroll view and dismiss the keyboard,
-    // then the second tap goes to the actual interior view)
-    const currentlyFocusedTextInput = TextInputState.currentlyFocusedInput();
-    const {keyboardShouldPersistTaps} = this.props;
-    const keyboardNeverPersistTaps =
-      !keyboardShouldPersistTaps || keyboardShouldPersistTaps === 'never';
-
-    if (typeof e.target === 'number') {
-      if (__DEV__) {
-        console.error(
-          'Did not expect event target to be a number. Should have been a native component',
-        );
-      }
-
-      return false;
-    }
-
-    if (
-      keyboardNeverPersistTaps &&
-      currentlyFocusedTextInput != null &&
-      e.target != null &&
-      !TextInputState.isTextInput(e.target)
-    ) {
-      return true;
-    }
-
-    return false;
-  },
-
-  /**
-   * Invoke this from an `onResponderReject` event.
-   *
-   * Some other element is not yielding its role as responder. Normally, we'd
-   * just disable the `UIScrollView`, but a touch has already began on it, the
-   * `UIScrollView` will not accept being disabled after that. The easiest
-   * solution for now is to accept the limitation of disallowing this
-   * altogether. To improve this, find a way to disable the `UIScrollView` after
-   * a touch has already started.
-   */
-  scrollResponderHandleResponderReject: function() {},
-
-  /**
-   * We will allow the scroll view to give up its lock iff it acquired the lock
-   * during an animation. This is a very useful default that happens to satisfy
-   * many common user experiences.
-   *
-   * - Stop a scroll on the left edge, then turn that into an outer view's
-   *   backswipe.
-   * - Stop a scroll mid-bounce at the top, continue pulling to have the outer
-   *   view dismiss.
-   * - However, without catching the scroll view mid-bounce (while it is
-   *   motionless), if you drag far enough for the scroll view to become
-   *   responder (and therefore drag the scroll view a bit), any backswipe
-   *   navigation of a swipe gesture higher in the view hierarchy, should be
-   *   rejected.
-   */
-  scrollResponderHandleTerminationRequest: function(): boolean {
-    return !this.state.observedScrollSinceBecomingResponder;
-  },
-
-  /**
-   * Invoke this from an `onTouchEnd` event.
-   *
-   * @param {PressEvent} e Event.
-   */
-  scrollResponderHandleTouchEnd: function(e: PressEvent) {
-    const nativeEvent = e.nativeEvent;
-    this.state.isTouching = nativeEvent.touches.length !== 0;
-    this.props.onTouchEnd && this.props.onTouchEnd(e);
-  },
-
-  /**
-   * Invoke this from an `onTouchCancel` event.
-   *
-   * @param {PressEvent} e Event.
-   */
-  scrollResponderHandleTouchCancel: function(e: PressEvent) {
-    this.state.isTouching = false;
-    this.props.onTouchCancel && this.props.onTouchCancel(e);
-  },
-
-  /**
-   * Invoke this from an `onResponderRelease` event.
-   */
-  scrollResponderHandleResponderRelease: function(e: PressEvent) {
-    this.props.onResponderRelease && this.props.onResponderRelease(e);
-
-    if (typeof e.target === 'number') {
-      if (__DEV__) {
-        console.error(
-          'Did not expect event target to be a number. Should have been a native component',
-        );
-      }
-
-      return;
-    }
-
-    // By default scroll views will unfocus a textField
-    // if another touch occurs outside of it
-    const currentlyFocusedTextInput = TextInputState.currentlyFocusedInput();
-    if (
-      this.props.keyboardShouldPersistTaps !== true &&
-      this.props.keyboardShouldPersistTaps !== 'always' &&
-      currentlyFocusedTextInput != null &&
-      e.target !== currentlyFocusedTextInput &&
-      !this.state.observedScrollSinceBecomingResponder &&
-      !this.state.becameResponderWhileAnimating
-    ) {
-      this.props.onScrollResponderKeyboardDismissed &&
-        this.props.onScrollResponderKeyboardDismissed(e);
-      TextInputState.blurTextInput(currentlyFocusedTextInput);
-    }
-  },
-
-  scrollResponderHandleScroll: function(e: ScrollEvent) {
-    (this: any).state.observedScrollSinceBecomingResponder = true;
-    (this: any).props.onScroll && (this: any).props.onScroll(e);
-  },
-
-  /**
-   * Invoke this from an `onResponderGrant` event.
-   */
-  scrollResponderHandleResponderGrant: function(e: ScrollEvent) {
-    this.state.observedScrollSinceBecomingResponder = false;
-    this.props.onResponderGrant && this.props.onResponderGrant(e);
-    this.state.becameResponderWhileAnimating = this.scrollResponderIsAnimating();
-  },
-
-  /**
-   * Unfortunately, `onScrollBeginDrag` also fires when *stopping* the scroll
-   * animation, and there's not an easy way to distinguish a drag vs. stopping
-   * momentum.
-   *
-   * Invoke this from an `onScrollBeginDrag` event.
-   */
-  scrollResponderHandleScrollBeginDrag: function(e: ScrollEvent) {
-    FrameRateLogger.beginScroll(); // TODO: track all scrolls after implementing onScrollEndAnimation
-    this.props.onScrollBeginDrag && this.props.onScrollBeginDrag(e);
-  },
-
-  /**
-   * Invoke this from an `onScrollEndDrag` event.
-   */
-  scrollResponderHandleScrollEndDrag: function(e: ScrollEvent) {
-    const {velocity} = e.nativeEvent;
-    // - If we are animating, then this is a "drag" that is stopping the scrollview and momentum end
-    //   will fire.
-    // - If velocity is non-zero, then the interaction will stop when momentum scroll ends or
-    //   another drag starts and ends.
-    // - If we don't get velocity, better to stop the interaction twice than not stop it.
-    if (
-      !this.scrollResponderIsAnimating() &&
-      (!velocity || (velocity.x === 0 && velocity.y === 0))
-    ) {
-      FrameRateLogger.endScroll();
-    }
-    this.props.onScrollEndDrag && this.props.onScrollEndDrag(e);
-  },
-
-  /**
-   * Invoke this from an `onMomentumScrollBegin` event.
-   */
-  scrollResponderHandleMomentumScrollBegin: function(e: ScrollEvent) {
-    this.state.lastMomentumScrollBeginTime = global.performance.now();
-    this.props.onMomentumScrollBegin && this.props.onMomentumScrollBegin(e);
-  },
-
-  /**
-   * Invoke this from an `onMomentumScrollEnd` event.
-   */
-  scrollResponderHandleMomentumScrollEnd: function(e: ScrollEvent) {
-    FrameRateLogger.endScroll();
-    this.state.lastMomentumScrollEndTime = global.performance.now();
-    this.props.onMomentumScrollEnd && this.props.onMomentumScrollEnd(e);
-  },
-
-  /**
-   * Invoke this from an `onTouchStart` event.
-   *
-   * Since we know that the `SimpleEventPlugin` occurs later in the plugin
-   * order, after `ResponderEventPlugin`, we can detect that we were *not*
-   * permitted to be the responder (presumably because a contained view became
-   * responder). The `onResponderReject` won't fire in that case - it only
-   * fires when a *current* responder rejects our request.
-   *
-   * @param {PressEvent} e Touch Start event.
-   */
-  scrollResponderHandleTouchStart: function(e: PressEvent) {
-    this.state.isTouching = true;
-    this.props.onTouchStart && this.props.onTouchStart(e);
-  },
-
-  /**
-   * Invoke this from an `onTouchMove` event.
-   *
-   * Since we know that the `SimpleEventPlugin` occurs later in the plugin
-   * order, after `ResponderEventPlugin`, we can detect that we were *not*
-   * permitted to be the responder (presumably because a contained view became
-   * responder). The `onResponderReject` won't fire in that case - it only
-   * fires when a *current* responder rejects our request.
-   *
-   * @param {PressEvent} e Touch Start event.
-   */
-  scrollResponderHandleTouchMove: function(e: PressEvent) {
-    this.props.onTouchMove && this.props.onTouchMove(e);
-  },
-
-  /**
-   * A helper function for this class that lets us quickly determine if the
-   * view is currently animating. This is particularly useful to know when
-   * a touch has just started or ended.
-   */
-  scrollResponderIsAnimating: function(): boolean {
-    const now = global.performance.now();
-    const timeSinceLastMomentumScrollEnd =
-      now - this.state.lastMomentumScrollEndTime;
-    const isAnimating =
-      timeSinceLastMomentumScrollEnd < IS_ANIMATING_TOUCH_START_THRESHOLD_MS ||
-      this.state.lastMomentumScrollEndTime <
-        this.state.lastMomentumScrollBeginTime;
-    return isAnimating;
-  },
-
-  /**
-   * Returns the node that represents native view that can be scrolled.
-   * Components can pass what node to use by defining a `getScrollableNode`
-   * function otherwise `this` is used.
-   */
-  scrollResponderGetScrollableNode: function(): ?number {
-    return this.getScrollableNode
-      ? this.getScrollableNode()
-      : ReactNative.findNodeHandle(this);
-  },
-
-  /**
-   * A helper function to scroll to a specific point in the ScrollView.
-   * This is currently used to help focus child TextViews, but can also
-   * be used to quickly scroll to any element we want to focus. Syntax:
-   *
-   * `scrollResponderScrollTo(options: {x: number = 0; y: number = 0; animated: boolean = true})`
-   *
-   * Note: The weird argument signature is due to the fact that, for historical reasons,
-   * the function also accepts separate arguments as as alternative to the options object.
-   * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
-   */
-  scrollResponderScrollTo: function(
-    x?:
-      | number
-      | {
-          x?: number,
-          y?: number,
-          animated?: boolean,
-          ...
-        },
-    y?: number,
-    animated?: boolean,
-  ) {
-    if (typeof x === 'number') {
-      console.warn(
-        '`scrollResponderScrollTo(x, y, animated)` is deprecated. Use `scrollResponderScrollTo({x: 5, y: 5, animated: true})` instead.',
-      );
-    } else {
-      ({x, y, animated} = x || {});
-    }
-
-    const that: React.ElementRef<ScrollView> = (this: any);
-    invariant(
-      that.getNativeScrollRef != null,
-      'Expected scrollTo to be called on a scrollViewRef. If this exception occurs it is likely a bug in React Native',
-    );
-    const nativeScrollRef = that.getNativeScrollRef();
-    if (nativeScrollRef == null) {
-      return;
-    }
-    Commands.scrollTo(nativeScrollRef, x || 0, y || 0, animated !== false);
-  },
-
-  /**
-   * Scrolls to the end of the ScrollView, either immediately or with a smooth
-   * animation.
-   *
-   * Example:
-   *
-   * `scrollResponderScrollToEnd({animated: true})`
-   */
-  scrollResponderScrollToEnd: function(options?: {animated?: boolean, ...}) {
-    // Default to true
-    const animated = (options && options.animated) !== false;
-
-    const that: React.ElementRef<ScrollView> = (this: any);
-    invariant(
-      that.getNativeScrollRef != null,
-      'Expected scrollToEnd to be called on a scrollViewRef. If this exception occurs it is likely a bug in React Native',
-    );
-    const nativeScrollRef = that.getNativeScrollRef();
-    if (nativeScrollRef == null) {
-      return;
-    }
-
-    Commands.scrollToEnd(nativeScrollRef, animated);
-  },
-
-  /**
-   * A helper function to zoom to a specific rect in the scrollview. The argument has the shape
-   * {x: number; y: number; width: number; height: number; animated: boolean = true}
-   *
-   * @platform ios
-   */
-  scrollResponderZoomTo: function(
-    rect: {|
-      x: number,
-      y: number,
-      width: number,
-      height: number,
-      animated?: boolean,
-    |},
-    animated?: boolean, // deprecated, put this inside the rect argument instead
-  ) {
-    invariant(Platform.OS === 'ios', 'zoomToRect is not implemented');
-    if ('animated' in rect) {
-      animated = rect.animated;
-      delete rect.animated;
-    } else if (typeof animated !== 'undefined') {
-      console.warn(
-        '`scrollResponderZoomTo` `animated` argument is deprecated. Use `options.animated` instead',
-      );
-    }
-
-    const that: React.ElementRef<ScrollView> = this;
-    invariant(
-      that.getNativeScrollRef != null,
-      'Expected zoomToRect to be called on a scrollViewRef. If this exception occurs it is likely a bug in React Native',
-    );
-    const nativeScrollRef = that.getNativeScrollRef();
-    if (nativeScrollRef == null) {
-      return;
-    }
-    Commands.zoomToRect(nativeScrollRef, rect, animated !== false);
-  },
-
-  /**
-   * Displays the scroll indicators momentarily.
-   */
-  scrollResponderFlashScrollIndicators: function() {
-    const that: React.ElementRef<ScrollView> = (this: any);
-    invariant(
-      that.getNativeScrollRef != null,
-      'Expected flashScrollIndicators to be called on a scrollViewRef. If this exception occurs it is likely a bug in React Native',
-    );
-    const nativeScrollRef = that.getNativeScrollRef();
-    if (nativeScrollRef == null) {
-      return;
-    }
-    Commands.flashScrollIndicators(nativeScrollRef);
-  },
-
-  /**
-   * This method should be used as the callback to onFocus in a TextInputs'
-   * parent view. Note that any module using this mixin needs to return
-   * the parent view's ref in getScrollViewRef() in order to use this method.
-   * @param {number} nodeHandle The TextInput node handle
-   * @param {number} additionalOffset The scroll view's bottom "contentInset".
-   *        Default is 0.
-   * @param {bool} preventNegativeScrolling Whether to allow pulling the content
-   *        down to make it meet the keyboard's top. Default is false.
-   */
-  scrollResponderScrollNativeHandleToKeyboard: function<T>(
-    nodeHandle: number | React.ElementRef<HostComponent<T>>,
-    additionalOffset?: number,
-    preventNegativeScrollOffset?: boolean,
-  ) {
-    this.additionalScrollOffset = additionalOffset || 0;
-    this.preventNegativeScrollOffset = !!preventNegativeScrollOffset;
-
-    if (typeof nodeHandle === 'number') {
-      UIManager.measureLayout(
-        nodeHandle,
-        ReactNative.findNodeHandle(this.getInnerViewNode()),
-        this.scrollResponderTextInputFocusError,
-        this.scrollResponderInputMeasureAndScrollToKeyboard,
-      );
-    } else {
-      const innerRef = this.getInnerViewRef();
-
-      if (innerRef == null) {
-        return;
-      }
-
-      nodeHandle.measureLayout(
-        innerRef,
-        this.scrollResponderInputMeasureAndScrollToKeyboard,
-        this.scrollResponderTextInputFocusError,
-      );
-    }
-  },
-
-  /**
-   * The calculations performed here assume the scroll view takes up the entire
-   * screen - even if has some content inset. We then measure the offsets of the
-   * keyboard, and compensate both for the scroll view's "contentInset".
-   *
-   * @param {number} left Position of input w.r.t. table view.
-   * @param {number} top Position of input w.r.t. table view.
-   * @param {number} width Width of the text input.
-   * @param {number} height Height of the text input.
-   */
-  scrollResponderInputMeasureAndScrollToKeyboard: function(
-    left: number,
-    top: number,
-    width: number,
-    height: number,
-  ) {
-    let keyboardScreenY = Dimensions.get('window').height;
-    if (this.keyboardWillOpenTo) {
-      keyboardScreenY = this.keyboardWillOpenTo.endCoordinates.screenY;
-    }
-    let scrollOffsetY =
-      top - keyboardScreenY + height + this.additionalScrollOffset;
-
-    // By default, this can scroll with negative offset, pulling the content
-    // down so that the target component's bottom meets the keyboard's top.
-    // If requested otherwise, cap the offset at 0 minimum to avoid content
-    // shifting down.
-    if (this.preventNegativeScrollOffset) {
-      scrollOffsetY = Math.max(0, scrollOffsetY);
-    }
-    this.scrollResponderScrollTo({x: 0, y: scrollOffsetY, animated: true});
-
-    this.additionalOffset = 0;
-    this.preventNegativeScrollOffset = false;
-  },
-
-  scrollResponderTextInputFocusError: function(msg: string) {
-    console.error('Error measuring text field: ', msg);
-  },
-
-  /**
-   * `componentWillMount` is the closest thing to a  standard "constructor" for
-   * React components.
-   *
-   * The `keyboardWillShow` is called before input focus.
-   */
-  UNSAFE_componentWillMount: function() {
-    const {keyboardShouldPersistTaps} = ((this: any).props: ScrollViewProps);
-    if (typeof keyboardShouldPersistTaps === 'boolean') {
-      console.warn(
-        `'keyboardShouldPersistTaps={${
-          keyboardShouldPersistTaps === true ? 'true' : 'false'
-        }}' is deprecated. ` +
-          `Use 'keyboardShouldPersistTaps="${
-            keyboardShouldPersistTaps ? 'always' : 'never'
-          }"' instead`,
-      );
-    }
-
-    (this: any).keyboardWillOpenTo = null;
-    (this: any).additionalScrollOffset = 0;
-    this._subscriptionKeyboardWillShow = Keyboard.addListener(
-      'keyboardWillShow',
-      this.scrollResponderKeyboardWillShow,
-    );
-
-    this._subscriptionKeyboardWillHide = Keyboard.addListener(
-      'keyboardWillHide',
-      this.scrollResponderKeyboardWillHide,
-    );
-    this._subscriptionKeyboardDidShow = Keyboard.addListener(
-      'keyboardDidShow',
-      this.scrollResponderKeyboardDidShow,
-    );
-    this._subscriptionKeyboardDidHide = Keyboard.addListener(
-      'keyboardDidHide',
-      this.scrollResponderKeyboardDidHide,
-    );
-  },
-
-  componentWillUnmount: function() {
-    if (this._subscriptionKeyboardWillShow != null) {
-      this._subscriptionKeyboardWillShow.remove();
-    }
-    if (this._subscriptionKeyboardWillHide != null) {
-      this._subscriptionKeyboardWillHide.remove();
-    }
-    if (this._subscriptionKeyboardDidShow != null) {
-      this._subscriptionKeyboardDidShow.remove();
-    }
-    if (this._subscriptionKeyboardDidHide != null) {
-      this._subscriptionKeyboardDidHide.remove();
-    }
-  },
-
-  /**
-   * Warning, this may be called several times for a single keyboard opening.
-   * It's best to store the information in this method and then take any action
-   * at a later point (either in `keyboardDidShow` or other).
-   *
-   * Here's the order that events occur in:
-   * - focus
-   * - willShow {startCoordinates, endCoordinates} several times
-   * - didShow several times
-   * - blur
-   * - willHide {startCoordinates, endCoordinates} several times
-   * - didHide several times
-   *
-   * The `ScrollResponder` module callbacks for each of these events.
-   * Even though any user could have easily listened to keyboard events
-   * themselves, using these `props` callbacks ensures that ordering of events
-   * is consistent - and not dependent on the order that the keyboard events are
-   * subscribed to. This matters when telling the scroll view to scroll to where
-   * the keyboard is headed - the scroll responder better have been notified of
-   * the keyboard destination before being instructed to scroll to where the
-   * keyboard will be. Stick to the `ScrollResponder` callbacks, and everything
-   * will work.
-   *
-   * WARNING: These callbacks will fire even if a keyboard is displayed in a
-   * different navigation pane. Filter out the events to determine if they are
-   * relevant to you. (For example, only if you receive these callbacks after
-   * you had explicitly focused a node etc).
-   */
-  scrollResponderKeyboardWillShow: function(e: KeyboardEvent) {
-    this.keyboardWillOpenTo = e;
-    this.props.onKeyboardWillShow && this.props.onKeyboardWillShow(e);
-  },
-
-  scrollResponderKeyboardWillHide: function(e: KeyboardEvent) {
-    this.keyboardWillOpenTo = null;
-    this.props.onKeyboardWillHide && this.props.onKeyboardWillHide(e);
-  },
-
-  scrollResponderKeyboardDidShow: function(e: KeyboardEvent) {
-    // TODO(7693961): The event for DidShow is not available on iOS yet.
-    // Use the one from WillShow and do not assign.
-    if (e) {
-      this.keyboardWillOpenTo = e;
-    }
-    this.props.onKeyboardDidShow && this.props.onKeyboardDidShow(e);
-  },
-
-  scrollResponderKeyboardDidHide: function(e: KeyboardEvent) {
-    this.keyboardWillOpenTo = null;
-    this.props.onKeyboardDidHide && this.props.onKeyboardDidHide(e);
-  },
-};
-
-const ScrollResponder = {
-  Mixin: ScrollResponderMixin,
-};
-
-module.exports = ScrollResponder;
diff --git a/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js b/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js
index fa0a173a4fdcc5..71210f989d7e20 100644
--- a/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js
@@ -5,36 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
-'use strict';
-
-import registerGeneratedViewConfig from '../../Utilities/registerGeneratedViewConfig';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
-
+import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
-const AndroidHorizontalScrollContentViewViewConfig = {
-  uiViewClassName: 'AndroidHorizontalScrollContentView',
-  bubblingEventTypes: {},
-  directEventTypes: {},
-  validAttributes: {},
-};
+type NativeProps = $ReadOnly<{|
+  ...ViewProps,
+|}>;
 
-let AndroidHorizontalScrollContentViewNativeComponent;
-if (global.RN$Bridgeless) {
-  registerGeneratedViewConfig(
-    'AndroidHorizontalScrollContentView',
-    AndroidHorizontalScrollContentViewViewConfig,
-  );
-  AndroidHorizontalScrollContentViewNativeComponent =
-    'AndroidHorizontalScrollContentView';
-} else {
-  AndroidHorizontalScrollContentViewNativeComponent = requireNativeComponent<ViewProps>(
-    'AndroidHorizontalScrollContentView',
-  );
-}
+type NativeType = HostComponent<NativeProps>;
 
-export default ((AndroidHorizontalScrollContentViewNativeComponent: any): HostComponent<ViewProps>);
+export default (codegenNativeComponent<NativeProps>(
+  'AndroidHorizontalScrollContentView',
+): NativeType);
diff --git a/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js b/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js
index a4a0d4e6bb8dba..05f629e01a1d1e 100644
--- a/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js
@@ -4,54 +4,40 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict-local
  * @format
- * @flow
  */
 
-'use strict';
-
-import registerGeneratedViewConfig from '../../Utilities/registerGeneratedViewConfig';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
-
+import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {ScrollViewNativeProps} from './ScrollViewNativeComponentType';
-
-const AndroidHorizontalScrollViewViewConfig = {
-  uiViewClassName: 'AndroidHorizontalScrollView',
-  bubblingEventTypes: {},
-  directEventTypes: {},
-  validAttributes: {
-    decelerationRate: true,
-    disableIntervalMomentum: true,
-    endFillColor: {process: require('../../StyleSheet/processColor')},
-    fadingEdgeLength: true,
-    nestedScrollEnabled: true,
-    overScrollMode: true,
-    pagingEnabled: true,
-    persistentScrollbar: true,
-    scrollEnabled: true,
-    scrollPerfTag: true,
-    sendMomentumEvents: true,
-    showsHorizontalScrollIndicator: true,
-    snapToEnd: true,
-    snapToInterval: true,
-    snapToStart: true,
-    snapToOffsets: true,
-    contentOffset: true,
-  },
-};
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 
-let AndroidHorizontalScrollViewNativeComponent;
-if (global.RN$Bridgeless) {
-  registerGeneratedViewConfig(
-    'AndroidHorizontalScrollView',
-    AndroidHorizontalScrollViewViewConfig,
-  );
-  AndroidHorizontalScrollViewNativeComponent = 'AndroidHorizontalScrollView';
-} else {
-  AndroidHorizontalScrollViewNativeComponent = requireNativeComponent<ScrollViewNativeProps>(
-    'AndroidHorizontalScrollView',
-  );
-}
+const AndroidHorizontalScrollViewNativeComponent: HostComponent<Props> = NativeComponentRegistry.get<Props>(
+  'AndroidHorizontalScrollView',
+  () => ({
+    uiViewClassName: 'AndroidHorizontalScrollView',
+    bubblingEventTypes: {},
+    directEventTypes: {},
+    validAttributes: {
+      decelerationRate: true,
+      disableIntervalMomentum: true,
+      endFillColor: {process: require('../../StyleSheet/processColor')},
+      fadingEdgeLength: true,
+      nestedScrollEnabled: true,
+      overScrollMode: true,
+      pagingEnabled: true,
+      persistentScrollbar: true,
+      scrollEnabled: true,
+      scrollPerfTag: true,
+      sendMomentumEvents: true,
+      showsHorizontalScrollIndicator: true,
+      snapToEnd: true,
+      snapToInterval: true,
+      snapToStart: true,
+      snapToOffsets: true,
+      contentOffset: true,
+    },
+  }),
+);
 
-export default ((AndroidHorizontalScrollViewNativeComponent: any): HostComponent<ScrollViewNativeProps>);
+export default AndroidHorizontalScrollViewNativeComponent;
diff --git a/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js b/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js
index 6a94a30a72dae7..4e3174044dfc8b 100644
--- a/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js
@@ -8,32 +8,18 @@
  * @flow
  */
 
-'use strict';
-
-import registerGeneratedViewConfig from '../../Utilities/registerGeneratedViewConfig';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
-
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {ViewProps} from '../View/ViewPropTypes';
-
-const ScrollContentViewViewConfig = {
-  uiViewClassName: 'RCTScrollContentView',
-  bubblingEventTypes: {},
-  directEventTypes: {},
-  validAttributes: {},
-};
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+import type {ViewProps as Props} from '../View/ViewPropTypes';
 
-let ScrollContentViewNativeComponent;
-if (global.RN$Bridgeless) {
-  registerGeneratedViewConfig(
-    'RCTScrollContentView',
-    ScrollContentViewViewConfig,
-  );
-  ScrollContentViewNativeComponent = 'RCTScrollContentView';
-} else {
-  ScrollContentViewNativeComponent = requireNativeComponent<ViewProps>(
-    'RCTScrollContentView',
-  );
-}
+const ScrollContentViewNativeComponent: HostComponent<Props> = NativeComponentRegistry.get<Props>(
+  'RCTScrollContentView',
+  () => ({
+    uiViewClassName: 'RCTScrollContentView',
+    bubblingEventTypes: {},
+    directEventTypes: {},
+    validAttributes: {},
+  }),
+);
 
-export default ((ScrollContentViewNativeComponent: any): HostComponent<ViewProps>);
+export default ScrollContentViewNativeComponent;
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index cdaafbe4a6b2af..541245effac1c2 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -8,23 +8,24 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import AnimatedImplementation from '../../Animated/AnimatedImplementation';
+import Dimensions from '../../Utilities/Dimensions';
 import Platform from '../../Utilities/Platform';
 import * as React from 'react';
 import ReactNative from '../../Renderer/shims/ReactNative';
 require('../../Renderer/shims/ReactNative'); // Force side effects to prevent T55744311
-import ScrollResponder from '../ScrollResponder';
 import ScrollViewStickyHeader from './ScrollViewStickyHeader';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import View from '../View/View';
+import UIManager from '../../ReactNative/UIManager';
+import Keyboard from '../Keyboard/Keyboard';
+import FrameRateLogger from '../../Interaction/FrameRateLogger';
+import TextInputState from '../TextInput/TextInputState';
 
 import dismissKeyboard from '../../Utilities/dismissKeyboard';
 import flattenStyle from '../../StyleSheet/flattenStyle';
 import invariant from 'invariant';
 import processDecelerationRate from './processDecelerationRate';
-import resolveAssetSource from '../../Image/resolveAssetSource';
 import splitLayoutProps from '../../StyleSheet/splitLayoutProps';
 import setAndForwardRef from '../../Utilities/setAndForwardRef';
 
@@ -38,33 +39,110 @@ import type {
   LayoutEvent,
 } from '../../Types/CoreEventTypes';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {State as ScrollResponderState} from '../ScrollResponder';
 import type {ViewProps} from '../View/ViewPropTypes';
+import ScrollViewContext, {HORIZONTAL, VERTICAL} from './ScrollViewContext';
 import type {Props as ScrollViewStickyHeaderProps} from './ScrollViewStickyHeader';
+import type {KeyboardEvent} from '../Keyboard/Keyboard';
+import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
 
-import ScrollViewContext, {HORIZONTAL, VERTICAL} from './ScrollViewContext';
-import ScrollViewNativeComponent from './ScrollViewNativeComponent';
-import ScrollContentViewNativeComponent from './ScrollContentViewNativeComponent';
-import AndroidHorizontalScrollViewNativeComponent from './AndroidHorizontalScrollViewNativeComponent';
+import Commands from './ScrollViewCommands';
 import AndroidHorizontalScrollContentViewNativeComponent from './AndroidHorizontalScrollContentViewNativeComponent';
+import AndroidHorizontalScrollViewNativeComponent from './AndroidHorizontalScrollViewNativeComponent';
+import ScrollContentViewNativeComponent from './ScrollContentViewNativeComponent';
+import ScrollViewNativeComponent from './ScrollViewNativeComponent';
 
-let AndroidScrollView;
-let AndroidHorizontalScrollContentView;
-let AndroidHorizontalScrollView;
-let RCTScrollView;
-let RCTScrollContentView;
-
-if (Platform.OS === 'android') {
-  AndroidScrollView = ScrollViewNativeComponent;
-  AndroidHorizontalScrollView = AndroidHorizontalScrollViewNativeComponent;
-  AndroidHorizontalScrollContentView = AndroidHorizontalScrollContentViewNativeComponent;
-} else if (
-  Platform.OS === 'ios' ||
-  Platform.OS === 'macos' /*TODO(macOS GH#774)*/
-) {
-  RCTScrollView = ScrollViewNativeComponent;
-  RCTScrollContentView = ScrollContentViewNativeComponent;
-}
+const {NativeHorizontalScrollViewTuple, NativeVerticalScrollViewTuple} =
+  Platform.OS === 'android'
+    ? {
+        NativeHorizontalScrollViewTuple: [
+          AndroidHorizontalScrollViewNativeComponent,
+          AndroidHorizontalScrollContentViewNativeComponent,
+        ],
+        NativeVerticalScrollViewTuple: [ScrollViewNativeComponent, View],
+      }
+    : {
+        NativeHorizontalScrollViewTuple: [
+          ScrollViewNativeComponent,
+          ScrollContentViewNativeComponent,
+        ],
+        NativeVerticalScrollViewTuple: [
+          ScrollViewNativeComponent,
+          ScrollContentViewNativeComponent,
+        ],
+      };
+
+/*
+ * iOS scroll event timing nuances:
+ * ===============================
+ *
+ *
+ * Scrolling without bouncing, if you touch down:
+ * -------------------------------
+ *
+ * 1. `onMomentumScrollBegin` (when animation begins after letting up)
+ *    ... physical touch starts ...
+ * 2. `onTouchStartCapture`   (when you press down to stop the scroll)
+ * 3. `onTouchStart`          (same, but bubble phase)
+ * 4. `onResponderRelease`    (when lifting up - you could pause forever before * lifting)
+ * 5. `onMomentumScrollEnd`
+ *
+ *
+ * Scrolling with bouncing, if you touch down:
+ * -------------------------------
+ *
+ * 1. `onMomentumScrollBegin` (when animation begins after letting up)
+ *    ... bounce begins ...
+ *    ... some time elapses ...
+ *    ... physical touch during bounce ...
+ * 2. `onMomentumScrollEnd`   (Makes no sense why this occurs first during bounce)
+ * 3. `onTouchStartCapture`   (immediately after `onMomentumScrollEnd`)
+ * 4. `onTouchStart`          (same, but bubble phase)
+ * 5. `onTouchEnd`            (You could hold the touch start for a long time)
+ * 6. `onMomentumScrollBegin` (When releasing the view starts bouncing back)
+ *
+ * So when we receive an `onTouchStart`, how can we tell if we are touching
+ * *during* an animation (which then causes the animation to stop)? The only way
+ * to tell is if the `touchStart` occurred immediately after the
+ * `onMomentumScrollEnd`.
+ *
+ * This is abstracted out for you, so you can just call this.scrollResponderIsAnimating() if
+ * necessary
+ *
+ * `ScrollView` also includes logic for blurring a currently focused input
+ * if one is focused while scrolling. This is a natural place
+ * to put this logic since it can support not dismissing the keyboard while
+ * scrolling, unless a recognized "tap"-like gesture has occurred.
+ *
+ * The public lifecycle API includes events for keyboard interaction, responder
+ * interaction, and scrolling (among others). The keyboard callbacks
+ * `onKeyboardWill/Did/*` are *global* events, but are invoked on scroll
+ * responder's props so that you can guarantee that the scroll responder's
+ * internal state has been updated accordingly (and deterministically) by
+ * the time the props callbacks are invoke. Otherwise, you would always wonder
+ * if the scroll responder is currently in a state where it recognizes new
+ * keyboard positions etc. If coordinating scrolling with keyboard movement,
+ * *always* use these hooks instead of listening to your own global keyboard
+ * events.
+ *
+ * Public keyboard lifecycle API: (props callbacks)
+ *
+ * Standard Keyboard Appearance Sequence:
+ *
+ *   this.props.onKeyboardWillShow
+ *   this.props.onKeyboardDidShow
+ *
+ * `onScrollResponderKeyboardDismissed` will be invoked if an appropriate
+ * tap inside the scroll responder's scrollable region was responsible
+ * for the dismissal of the keyboard. There are other reasons why the
+ * keyboard could be dismissed.
+ *
+ *   this.props.onScrollResponderKeyboardDismissed
+ *
+ * Standard Keyboard Hide Sequence:
+ *
+ *   this.props.onKeyboardWillHide
+ *   this.props.onKeyboardDidHide
+ */
 
 // Public methods for ScrollView
 export type ScrollViewImperativeMethods = $ReadOnly<{|
@@ -76,14 +154,9 @@ export type ScrollViewImperativeMethods = $ReadOnly<{|
   scrollTo: $PropertyType<ScrollView, 'scrollTo'>,
   scrollToEnd: $PropertyType<ScrollView, 'scrollToEnd'>,
   flashScrollIndicators: $PropertyType<ScrollView, 'flashScrollIndicators'>,
-
-  // ScrollResponder.Mixin public methods
-  scrollResponderZoomTo: $PropertyType<
-    typeof ScrollResponder.Mixin,
-    'scrollResponderZoomTo',
-  >,
+  scrollResponderZoomTo: $PropertyType<ScrollView, 'scrollResponderZoomTo'>,
   scrollResponderScrollNativeHandleToKeyboard: $PropertyType<
-    typeof ScrollResponder.Mixin,
+    ScrollView,
     'scrollResponderScrollNativeHandleToKeyboard',
   >,
 |}>;
@@ -98,6 +171,12 @@ type IOSProps = $ReadOnly<{|
    * @platform ios
    */
   automaticallyAdjustContentInsets?: ?boolean,
+  /**
+   * Controls whether iOS should automatically adjust the scroll indicator
+   * insets. The default value is true. Available on iOS 13 and later.
+   * @platform ios
+   */
+  automaticallyAdjustsScrollIndicatorInsets?: ?boolean,
   /**
    * The amount by which the scroll view content is inset from the edges
    * of the scroll view. Defaults to `{top: 0, left: 0, bottom: 0, right: 0}`.
@@ -368,32 +447,15 @@ type AndroidProps = $ReadOnly<{|
   fadingEdgeLength?: ?number,
 |}>;
 
-type VRProps = $ReadOnly<{|
-  /**
-   * Optionally an image can be used for the scroll bar thumb. This will
-   * override the color. While the image is loading or the image fails to
-   * load the color will be used instead. Use an alpha of 0 in the color
-   * to avoid seeing it while the image is loading.
-   *
-   * - `uri` - a string representing the resource identifier for the image, which
-   * should be either a local file path or the name of a static image resource
-   * - `number` - Opaque type returned by something like
-   * `import IMAGE from './image.jpg'`.
-   * @platform vr
-   */
-  scrollBarThumbImage?: ?($ReadOnly<{||}> | number), // Opaque type returned by import IMAGE from './image.jpg'
-|}>;
-
 type StickyHeaderComponentType = React.AbstractComponent<
   ScrollViewStickyHeaderProps,
-  $ReadOnly<{setNextHeaderY: number => void, ...}>,
+  $ReadOnly<interface {setNextHeaderY: number => void}>,
 >;
 
 export type Props = $ReadOnly<{|
   ...ViewProps,
   ...IOSProps,
   ...AndroidProps,
-  ...VRProps,
 
   /**
    * These styles will be applied to the scroll view content container which
@@ -456,10 +518,8 @@ export type Props = $ReadOnly<{|
    *     On android this is not supported and it will have the same behavior as 'none'.
    */
   keyboardDismissMode?: ?// default
-  (| 'none' // cross-platform
-    | 'on-drag'
-    | 'interactive'
-  ), // ios only
+  // cross-platform
+  ('none' | 'on-drag' | 'interactive'), // ios only
   /**
    * Determines when the keyboard should stay visible after a tap.
    *
@@ -506,7 +566,10 @@ export type Props = $ReadOnly<{|
    * which this ScrollView renders.
    */
   onContentSizeChange?: (contentWidth: number, contentHeight: number) => void,
-  onKeyboardDidShow?: (event: PressEvent) => void,
+  onKeyboardDidShow?: (event: KeyboardEvent) => void,
+  onKeyboardDidHide?: (event: KeyboardEvent) => void,
+  onKeyboardWillShow?: (event: KeyboardEvent) => void,
+  onKeyboardWillHide?: (event: KeyboardEvent) => void,
   /**
    * When true, the scroll view stops on multiples of the scroll view's size
    * when scrolling. This can be used for horizontal pagination. The default
@@ -528,6 +591,11 @@ export type Props = $ReadOnly<{|
    * The default value is true.
    */
   showsVerticalScrollIndicator?: ?boolean,
+  /**
+   * When true, Sticky header is hidden when scrolling down, and dock at the top
+   * when scrolling up
+   */
+  stickyHeaderHiddenOnScroll?: ?boolean,
   /**
    * An array of child indices determining which children get docked to the
    * top of the screen when scrolling. For example, passing
@@ -591,7 +659,8 @@ export type Props = $ReadOnly<{|
    *
    * See [RefreshControl](docs/refreshcontrol.html).
    */
-  // $FlowFixMe - how to handle generic type without existential operator?
+  /* $FlowFixMe[unclear-type] - how to handle generic type without existential
+   * operator? */
   refreshControl?: ?React.Element<any>,
   children?: React.Node,
   /**
@@ -612,22 +681,9 @@ export type Props = $ReadOnly<{|
 type State = {|
   contentKey: number, // TODO(macOS GH#774)
   layoutHeight: ?number,
-  ...ScrollResponderState,
 |};
 
-function createScrollResponder(
-  node: React.ElementRef<typeof ScrollView>,
-): typeof ScrollResponder.Mixin {
-  const scrollResponder = {...ScrollResponder.Mixin};
-
-  for (const key in scrollResponder) {
-    if (typeof scrollResponder[key] === 'function') {
-      scrollResponder[key] = scrollResponder[key].bind(node);
-    }
-  }
-
-  return scrollResponder;
-}
+const IS_ANIMATING_TOUCH_START_THRESHOLD_MS = 16;
 
 type ScrollViewComponentStatics = $ReadOnly<{|
   Context: typeof ScrollViewContext,
@@ -670,61 +726,17 @@ type ScrollViewComponentStatics = $ReadOnly<{|
  */
 class ScrollView extends React.Component<Props, State> {
   static Context: typeof ScrollViewContext = ScrollViewContext;
-  /**
-   * Part 1: Removing ScrollResponder.Mixin:
-   *
-   * 1. Mixin methods should be flow typed. That's why we create a
-   *    copy of ScrollResponder.Mixin and attach it to this._scrollResponder.
-   *    Otherwise, we'd have to manually declare each method on the component
-   *    class and assign it a flow type.
-   * 2. Mixin methods can call component methods, and access the component's
-   *    props and state. So, we need to bind all mixin methods to the
-   *    component instance.
-   * 3. Continued...
-   */
-  _scrollResponder: typeof ScrollResponder.Mixin = createScrollResponder(this);
 
   constructor(props: Props) {
     super(props);
 
-    /**
-     * Part 2: Removing ScrollResponder.Mixin
-     *
-     * 3. Mixin methods access other mixin methods via dynamic dispatch using
-     *    this. Since mixin methods are bound to the component instance, we need
-     *    to copy all mixin methods to the component instance. This is also
-     *    necessary because getScrollResponder() is a public method that returns
-     *    an object that can be used to execute all scrollResponder methods.
-     *    Since the object returned from that method is the ScrollView instance,
-     *    we need to bind all mixin methods to the ScrollView instance.
-     */
-    for (const key in ScrollResponder.Mixin) {
-      if (
-        typeof ScrollResponder.Mixin[key] === 'function' &&
-        key.startsWith('scrollResponder')
-      ) {
-        // $FlowFixMe - dynamically adding properties to a class
-        (this: any)[key] = ScrollResponder.Mixin[key].bind(this);
-      }
-    }
-
-    /**
-     * Part 3: Removing ScrollResponder.Mixin
-     *
-     * 4. Mixins can initialize properties and use properties on the component
-     *    instance.
-     */
-    Object.keys(ScrollResponder.Mixin)
-      .filter(key => typeof ScrollResponder.Mixin[key] !== 'function')
-      .forEach(key => {
-        // $FlowFixMe - dynamically adding properties to a class
-        (this: any)[key] = ScrollResponder.Mixin[key];
-      });
+    this._scrollAnimatedValue = new AnimatedImplementation.Value(
+      this.props.contentOffset?.y ?? 0,
+    );
+    this._scrollAnimatedValue.setOffset(this.props.contentInset?.top ?? 0);
   }
 
-  _scrollAnimatedValue: AnimatedImplementation.Value = new AnimatedImplementation.Value(
-    0,
-  );
+  _scrollAnimatedValue: AnimatedImplementation.Value;
   _scrollAnimatedValueAttachment: ?{detach: () => void, ...} = null;
   _stickyHeaderRefs: Map<
     string,
@@ -732,44 +744,96 @@ class ScrollView extends React.Component<Props, State> {
   > = new Map();
   _headerLayoutYs: Map<string, number> = new Map();
 
+  _keyboardWillOpenTo: ?KeyboardEvent = null;
+  _additionalScrollOffset: number = 0;
+  _isTouching: boolean = false;
+  _lastMomentumScrollBeginTime: number = 0;
+  _lastMomentumScrollEndTime: number = 0;
+
+  // Reset to false every time becomes responder. This is used to:
+  // - Determine if the scroll view has been scrolled and therefore should
+  // refuse to give up its responder lock.
+  // - Determine if releasing should dismiss the keyboard when we are in
+  // tap-to-dismiss mode (this.props.keyboardShouldPersistTaps !== 'always').
+  _observedScrollSinceBecomingResponder: boolean = false;
+  _becameResponderWhileAnimating: boolean = false;
+  _preventNegativeScrollOffset: ?boolean = null;
+
+  _animated = null;
+
+  _subscriptionKeyboardWillShow: ?EventSubscription = null;
+  _subscriptionKeyboardWillHide: ?EventSubscription = null;
+  _subscriptionKeyboardDidShow: ?EventSubscription = null;
+  _subscriptionKeyboardDidHide: ?EventSubscription = null;
+
   state: State = {
     contentKey: 1, // TODO(macOS GH#774)
     layoutHeight: null,
-    ...ScrollResponder.Mixin.scrollResponderMixinGetInitialState(),
   };
 
-  UNSAFE_componentWillMount() {
-    this._scrollResponder.UNSAFE_componentWillMount();
-    this._scrollAnimatedValue = new AnimatedImplementation.Value(
-      this.props.contentOffset?.y ?? 0,
+  componentDidMount() {
+    if (typeof this.props.keyboardShouldPersistTaps === 'boolean') {
+      console.warn(
+        `'keyboardShouldPersistTaps={${
+          this.props.keyboardShouldPersistTaps === true ? 'true' : 'false'
+        }}' is deprecated. ` +
+          `Use 'keyboardShouldPersistTaps="${
+            this.props.keyboardShouldPersistTaps ? 'always' : 'never'
+          }"' instead`,
+      );
+    }
+
+    this._keyboardWillOpenTo = null;
+    this._additionalScrollOffset = 0;
+
+    this._subscriptionKeyboardWillShow = Keyboard.addListener(
+      'keyboardWillShow',
+      this.scrollResponderKeyboardWillShow,
     );
-    this._scrollAnimatedValue.setOffset(this.props.contentInset?.top ?? 0);
-    this._stickyHeaderRefs = new Map();
-    this._headerLayoutYs = new Map();
+    this._subscriptionKeyboardWillHide = Keyboard.addListener(
+      'keyboardWillHide',
+      this.scrollResponderKeyboardWillHide,
+    );
+    this._subscriptionKeyboardDidShow = Keyboard.addListener(
+      'keyboardDidShow',
+      this.scrollResponderKeyboardDidShow,
+    );
+    this._subscriptionKeyboardDidHide = Keyboard.addListener(
+      'keyboardDidHide',
+      this.scrollResponderKeyboardDidHide,
+    );
+
+    this._updateAnimatedNodeAttachment();
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps: Props) {
-    const currentContentInsetTop = this.props.contentInset
-      ? this.props.contentInset.top
+  componentDidUpdate(prevProps: Props) {
+    const prevContentInsetTop = prevProps.contentInset
+      ? prevProps.contentInset.top
       : 0;
-    const nextContentInsetTop = nextProps.contentInset
-      ? nextProps.contentInset.top
+    const newContentInsetTop = this.props.contentInset
+      ? this.props.contentInset.top
       : 0;
-    if (currentContentInsetTop !== nextContentInsetTop) {
-      this._scrollAnimatedValue.setOffset(nextContentInsetTop || 0);
+    if (prevContentInsetTop !== newContentInsetTop) {
+      this._scrollAnimatedValue.setOffset(newContentInsetTop || 0);
     }
-  }
 
-  componentDidMount() {
-    this._updateAnimatedNodeAttachment();
-  }
-
-  componentDidUpdate() {
     this._updateAnimatedNodeAttachment();
   }
 
   componentWillUnmount() {
-    this._scrollResponder.componentWillUnmount();
+    if (this._subscriptionKeyboardWillShow != null) {
+      this._subscriptionKeyboardWillShow.remove();
+    }
+    if (this._subscriptionKeyboardWillHide != null) {
+      this._subscriptionKeyboardWillHide.remove();
+    }
+    if (this._subscriptionKeyboardDidShow != null) {
+      this._subscriptionKeyboardDidShow.remove();
+    }
+    if (this._subscriptionKeyboardDidHide != null) {
+      this._subscriptionKeyboardDidHide.remove();
+    }
+
     if (this._scrollAnimatedValueAttachment) {
       this._scrollAnimatedValueAttachment.detach();
     }
@@ -798,10 +862,7 @@ class ScrollView extends React.Component<Props, State> {
         ref.scrollTo = this.scrollTo;
         ref.scrollToEnd = this.scrollToEnd;
         ref.flashScrollIndicators = this.flashScrollIndicators;
-
-        // $FlowFixMe - This method was manually bound from ScrollResponder.mixin
         ref.scrollResponderZoomTo = this.scrollResponderZoomTo;
-        // $FlowFixMe - This method was manually bound from ScrollResponder.mixin
         ref.scrollResponderScrollNativeHandleToKeyboard = this.scrollResponderScrollNativeHandleToKeyboard;
       }
     },
@@ -814,7 +875,7 @@ class ScrollView extends React.Component<Props, State> {
    * to the underlying scroll responder's methods.
    */
   getScrollResponder: () => ScrollResponderType = () => {
-    // $FlowFixMe - overriding type to include ScrollResponder.Mixin
+    // $FlowFixMe[unclear-type]
     return ((this: any): ScrollResponderType);
   };
 
@@ -822,13 +883,13 @@ class ScrollView extends React.Component<Props, State> {
     return ReactNative.findNodeHandle(this._scrollViewRef);
   };
 
-  getInnerViewNode(): ?number {
+  getInnerViewNode: () => ?number = () => {
     return ReactNative.findNodeHandle(this._innerViewRef);
-  }
+  };
 
-  getInnerViewRef(): ?React.ElementRef<typeof View> {
+  getInnerViewRef: () => ?React.ElementRef<typeof View> = () => {
     return this._innerViewRef;
-  }
+  };
 
   getNativeScrollRef: () => ?React.ElementRef<HostComponent<mixed>> = () => {
     return this._scrollViewRef;
@@ -882,11 +943,10 @@ class ScrollView extends React.Component<Props, State> {
       x = options.x;
       animated = options.animated;
     }
-    this._scrollResponder.scrollResponderScrollTo({
-      x: x || 0,
-      y: y || 0,
-      animated: animated !== false,
-    });
+    if (this._scrollViewRef == null) {
+      return;
+    }
+    Commands.scrollTo(this._scrollViewRef, x || 0, y || 0, animated !== false);
   };
 
   /**
@@ -902,9 +962,10 @@ class ScrollView extends React.Component<Props, State> {
   ) => {
     // Default to true
     const animated = (options && options.animated) !== false;
-    this._scrollResponder.scrollResponderScrollToEnd({
-      animated: animated,
-    });
+    if (this._scrollViewRef == null) {
+      return;
+    }
+    Commands.scrollToEnd(this._scrollViewRef, animated);
   };
 
   /**
@@ -913,7 +974,150 @@ class ScrollView extends React.Component<Props, State> {
    * @platform ios
    */
   flashScrollIndicators: () => void = () => {
-    this._scrollResponder.scrollResponderFlashScrollIndicators();
+    if (this._scrollViewRef == null) {
+      return;
+    }
+    Commands.flashScrollIndicators(this._scrollViewRef);
+  };
+
+  /**
+   * This method should be used as the callback to onFocus in a TextInputs'
+   * parent view. Note that any module using this mixin needs to return
+   * the parent view's ref in getScrollViewRef() in order to use this method.
+   * @param {number} nodeHandle The TextInput node handle
+   * @param {number} additionalOffset The scroll view's bottom "contentInset".
+   *        Default is 0.
+   * @param {bool} preventNegativeScrolling Whether to allow pulling the content
+   *        down to make it meet the keyboard's top. Default is false.
+   */
+  scrollResponderScrollNativeHandleToKeyboard: <T>(
+    nodeHandle: number | React.ElementRef<HostComponent<T>>,
+    additionalOffset?: number,
+    preventNegativeScrollOffset?: boolean,
+  ) => void = <T>(
+    nodeHandle: number | React.ElementRef<HostComponent<T>>,
+    additionalOffset?: number,
+    preventNegativeScrollOffset?: boolean,
+  ) => {
+    this._additionalScrollOffset = additionalOffset || 0;
+    this._preventNegativeScrollOffset = !!preventNegativeScrollOffset;
+
+    if (this._innerViewRef == null) {
+      return;
+    }
+
+    if (typeof nodeHandle === 'number') {
+      UIManager.measureLayout(
+        nodeHandle,
+        ReactNative.findNodeHandle(this),
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+        this._textInputFocusError,
+        this._inputMeasureAndScrollToKeyboard,
+      );
+    } else {
+      nodeHandle.measureLayout(
+        this._innerViewRef,
+        this._inputMeasureAndScrollToKeyboard,
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+        this._textInputFocusError,
+      );
+    }
+  };
+
+  /**
+   * A helper function to zoom to a specific rect in the scrollview. The argument has the shape
+   * {x: number; y: number; width: number; height: number; animated: boolean = true}
+   *
+   * @platform ios
+   */
+  scrollResponderZoomTo: (
+    rect: {|
+      x: number,
+      y: number,
+      width: number,
+      height: number,
+      animated?: boolean,
+    |},
+    animated?: boolean, // deprecated, put this inside the rect argument instead
+  ) => void = (
+    rect: {|
+      x: number,
+      y: number,
+      width: number,
+      height: number,
+      animated?: boolean,
+    |},
+    animated?: boolean, // deprecated, put this inside the rect argument instead
+  ) => {
+    invariant(Platform.OS === 'ios', 'zoomToRect is not implemented');
+    if ('animated' in rect) {
+      this._animated = rect.animated;
+      delete rect.animated;
+    } else if (typeof animated !== 'undefined') {
+      console.warn(
+        '`scrollResponderZoomTo` `animated` argument is deprecated. Use `options.animated` instead',
+      );
+    }
+
+    if (this._scrollViewRef == null) {
+      return;
+    }
+    Commands.zoomToRect(this._scrollViewRef, rect, animated !== false);
+  };
+
+  _textInputFocusError() {
+    console.warn('Error measuring text field.');
+  }
+
+  /**
+   * The calculations performed here assume the scroll view takes up the entire
+   * screen - even if has some content inset. We then measure the offsets of the
+   * keyboard, and compensate both for the scroll view's "contentInset".
+   *
+   * @param {number} left Position of input w.r.t. table view.
+   * @param {number} top Position of input w.r.t. table view.
+   * @param {number} width Width of the text input.
+   * @param {number} height Height of the text input.
+   */
+  _inputMeasureAndScrollToKeyboard: (
+    left: number,
+    top: number,
+    width: number,
+    height: number,
+  ) => void = (left: number, top: number, width: number, height: number) => {
+    let keyboardScreenY = Dimensions.get('window').height;
+
+    const scrollTextInputIntoVisibleRect = () => {
+      if (this._keyboardWillOpenTo != null) {
+        keyboardScreenY = this._keyboardWillOpenTo.endCoordinates.screenY;
+      }
+      let scrollOffsetY =
+        top - keyboardScreenY + height + this._additionalScrollOffset;
+
+      // By default, this can scroll with negative offset, pulling the content
+      // down so that the target component's bottom meets the keyboard's top.
+      // If requested otherwise, cap the offset at 0 minimum to avoid content
+      // shifting down.
+      if (this._preventNegativeScrollOffset === true) {
+        scrollOffsetY = Math.max(0, scrollOffsetY);
+      }
+      this.scrollTo({x: 0, y: scrollOffsetY, animated: true});
+
+      this._additionalScrollOffset = 0;
+      this._preventNegativeScrollOffset = false;
+    };
+
+    if (this._keyboardWillOpenTo == null) {
+      // `_keyboardWillOpenTo` is set inside `scrollResponderKeyboardWillShow` which
+      // is not guaranteed to be called before `_inputMeasureAndScrollToKeyboard` but native has already scheduled it.
+      // In case it was not called before `_inputMeasureAndScrollToKeyboard`, we postpone scrolling to
+      // text input.
+      setTimeout(() => {
+        scrollTextInputIntoVisibleRect();
+      }, 0);
+    } else {
+      scrollTextInputIntoVisibleRect();
+    }
   };
 
   _getKeyForIndex(index, childArray) {
@@ -1072,14 +1276,12 @@ class ScrollView extends React.Component<Props, State> {
       }
     }
     if (Platform.OS === 'android') {
-      if (
-        this.props.keyboardDismissMode === 'on-drag' &&
-        this.state.isTouching
-      ) {
+      if (this.props.keyboardDismissMode === 'on-drag' && this._isTouching) {
         dismissKeyboard();
       }
     }
-    this._scrollResponder.scrollResponderHandleScroll(e);
+    this._observedScrollSinceBecomingResponder = true;
+    this.props.onScroll && this.props.onScroll(e);
   };
 
   _handleLayout = (e: LayoutEvent) => {
@@ -1107,31 +1309,395 @@ class ScrollView extends React.Component<Props, State> {
     },
   });
 
-  render(): React.Node | React.Element<string> {
-    let ScrollViewClass;
-    let ScrollContentContainerViewClass;
-    if (Platform.OS === 'android') {
-      if (this.props.horizontal === true) {
-        ScrollViewClass = AndroidHorizontalScrollView;
-        ScrollContentContainerViewClass = AndroidHorizontalScrollContentView;
-      } else {
-        ScrollViewClass = AndroidScrollView;
-        ScrollContentContainerViewClass = View;
+  /**
+   * Warning, this may be called several times for a single keyboard opening.
+   * It's best to store the information in this method and then take any action
+   * at a later point (either in `keyboardDidShow` or other).
+   *
+   * Here's the order that events occur in:
+   * - focus
+   * - willShow {startCoordinates, endCoordinates} several times
+   * - didShow several times
+   * - blur
+   * - willHide {startCoordinates, endCoordinates} several times
+   * - didHide several times
+   *
+   * The `ScrollResponder` module callbacks for each of these events.
+   * Even though any user could have easily listened to keyboard events
+   * themselves, using these `props` callbacks ensures that ordering of events
+   * is consistent - and not dependent on the order that the keyboard events are
+   * subscribed to. This matters when telling the scroll view to scroll to where
+   * the keyboard is headed - the scroll responder better have been notified of
+   * the keyboard destination before being instructed to scroll to where the
+   * keyboard will be. Stick to the `ScrollResponder` callbacks, and everything
+   * will work.
+   *
+   * WARNING: These callbacks will fire even if a keyboard is displayed in a
+   * different navigation pane. Filter out the events to determine if they are
+   * relevant to you. (For example, only if you receive these callbacks after
+   * you had explicitly focused a node etc).
+   */
+
+  scrollResponderKeyboardWillShow: (e: KeyboardEvent) => void = (
+    e: KeyboardEvent,
+  ) => {
+    this._keyboardWillOpenTo = e;
+    this.props.onKeyboardWillShow && this.props.onKeyboardWillShow(e);
+  };
+
+  scrollResponderKeyboardWillHide: (e: KeyboardEvent) => void = (
+    e: KeyboardEvent,
+  ) => {
+    this._keyboardWillOpenTo = null;
+    this.props.onKeyboardWillHide && this.props.onKeyboardWillHide(e);
+  };
+
+  scrollResponderKeyboardDidShow: (e: KeyboardEvent) => void = (
+    e: KeyboardEvent,
+  ) => {
+    // TODO(7693961): The event for DidShow is not available on iOS yet.
+    // Use the one from WillShow and do not assign.
+    if (e) {
+      this._keyboardWillOpenTo = e;
+    }
+    this.props.onKeyboardDidShow && this.props.onKeyboardDidShow(e);
+  };
+
+  scrollResponderKeyboardDidHide: (e: KeyboardEvent) => void = (
+    e: KeyboardEvent,
+  ) => {
+    this._keyboardWillOpenTo = null;
+    this.props.onKeyboardDidHide && this.props.onKeyboardDidHide(e);
+  };
+
+  /**
+   * Invoke this from an `onMomentumScrollBegin` event.
+   */
+  _handleMomentumScrollBegin: (e: ScrollEvent) => void = (e: ScrollEvent) => {
+    this._lastMomentumScrollBeginTime = global.performance.now();
+    this.props.onMomentumScrollBegin && this.props.onMomentumScrollBegin(e);
+  };
+
+  /**
+   * Invoke this from an `onMomentumScrollEnd` event.
+   */
+  _handleMomentumScrollEnd: (e: ScrollEvent) => void = (e: ScrollEvent) => {
+    FrameRateLogger.endScroll();
+    this._lastMomentumScrollEndTime = global.performance.now();
+    this.props.onMomentumScrollEnd && this.props.onMomentumScrollEnd(e);
+  };
+
+  /**
+   * Unfortunately, `onScrollBeginDrag` also fires when *stopping* the scroll
+   * animation, and there's not an easy way to distinguish a drag vs. stopping
+   * momentum.
+   *
+   * Invoke this from an `onScrollBeginDrag` event.
+   */
+  _handleScrollBeginDrag: (e: ScrollEvent) => void = (e: ScrollEvent) => {
+    FrameRateLogger.beginScroll(); // TODO: track all scrolls after implementing onScrollEndAnimation
+    this.props.onScrollBeginDrag && this.props.onScrollBeginDrag(e);
+  };
+
+  /**
+   * Invoke this from an `onScrollEndDrag` event.
+   */
+  _handleScrollEndDrag: (e: ScrollEvent) => void = (e: ScrollEvent) => {
+    const {velocity} = e.nativeEvent;
+    // - If we are animating, then this is a "drag" that is stopping the scrollview and momentum end
+    //   will fire.
+    // - If velocity is non-zero, then the interaction will stop when momentum scroll ends or
+    //   another drag starts and ends.
+    // - If we don't get velocity, better to stop the interaction twice than not stop it.
+    if (
+      !this._isAnimating() &&
+      (!velocity || (velocity.x === 0 && velocity.y === 0))
+    ) {
+      FrameRateLogger.endScroll();
+    }
+    this.props.onScrollEndDrag && this.props.onScrollEndDrag(e);
+  };
+
+  /**
+   * A helper function for this class that lets us quickly determine if the
+   * view is currently animating. This is particularly useful to know when
+   * a touch has just started or ended.
+   */
+  _isAnimating: () => boolean = () => {
+    const now = global.performance.now();
+    const timeSinceLastMomentumScrollEnd =
+      now - this._lastMomentumScrollEndTime;
+    const isAnimating =
+      timeSinceLastMomentumScrollEnd < IS_ANIMATING_TOUCH_START_THRESHOLD_MS ||
+      this._lastMomentumScrollEndTime < this._lastMomentumScrollBeginTime;
+    return isAnimating;
+  };
+
+  /**
+   * Invoke this from an `onResponderGrant` event.
+   */
+  _handleResponderGrant: (e: PressEvent) => void = (e: PressEvent) => {
+    this._observedScrollSinceBecomingResponder = false;
+    this.props.onResponderGrant && this.props.onResponderGrant(e);
+    this._becameResponderWhileAnimating = this._isAnimating();
+  };
+
+  /**
+   * Invoke this from an `onResponderReject` event.
+   *
+   * Some other element is not yielding its role as responder. Normally, we'd
+   * just disable the `UIScrollView`, but a touch has already began on it, the
+   * `UIScrollView` will not accept being disabled after that. The easiest
+   * solution for now is to accept the limitation of disallowing this
+   * altogether. To improve this, find a way to disable the `UIScrollView` after
+   * a touch has already started.
+   */
+  _handleResponderReject: () => void = () => {};
+
+  /**
+   * Invoke this from an `onResponderRelease` event.
+   */
+  _handleResponderRelease: (e: PressEvent) => void = (e: PressEvent) => {
+    this._isTouching = e.nativeEvent.touches.length !== 0;
+    this.props.onResponderRelease && this.props.onResponderRelease(e);
+
+    if (typeof e.target === 'number') {
+      if (__DEV__) {
+        console.error(
+          'Did not expect event target to be a number. Should have been a native component',
+        );
       }
-    } else {
-      ScrollViewClass = RCTScrollView;
-      ScrollContentContainerViewClass = RCTScrollContentView;
+
+      return;
     }
 
-    invariant(
-      ScrollViewClass !== undefined,
-      'ScrollViewClass must not be undefined',
-    );
+    // By default scroll views will unfocus a textField
+    // if another touch occurs outside of it
+    const currentlyFocusedTextInput = TextInputState.currentlyFocusedInput();
+    if (
+      this.props.keyboardShouldPersistTaps !== true &&
+      this.props.keyboardShouldPersistTaps !== 'always' &&
+      this._keyboardIsDismissible() &&
+      e.target !== currentlyFocusedTextInput &&
+      !this._observedScrollSinceBecomingResponder &&
+      !this._becameResponderWhileAnimating
+    ) {
+      TextInputState.blurTextInput(currentlyFocusedTextInput);
+    }
+  };
 
-    invariant(
-      ScrollContentContainerViewClass !== undefined,
-      'ScrollContentContainerViewClass must not be undefined',
-    );
+  /**
+   * We will allow the scroll view to give up its lock iff it acquired the lock
+   * during an animation. This is a very useful default that happens to satisfy
+   * many common user experiences.
+   *
+   * - Stop a scroll on the left edge, then turn that into an outer view's
+   *   backswipe.
+   * - Stop a scroll mid-bounce at the top, continue pulling to have the outer
+   *   view dismiss.
+   * - However, without catching the scroll view mid-bounce (while it is
+   *   motionless), if you drag far enough for the scroll view to become
+   *   responder (and therefore drag the scroll view a bit), any backswipe
+   *   navigation of a swipe gesture higher in the view hierarchy, should be
+   *   rejected.
+   */
+  _handleResponderTerminationRequest: () => boolean = () => {
+    return !this._observedScrollSinceBecomingResponder;
+  };
+
+  /**
+   * Invoke this from an `onScroll` event.
+   */
+  _handleScrollShouldSetResponder: () => boolean = () => {
+    // Allow any event touch pass through if the default pan responder is disabled
+    if (this.props.disableScrollViewPanResponder === true) {
+      return false;
+    }
+    return this._isTouching;
+  };
+
+  /**
+   * Merely touch starting is not sufficient for a scroll view to become the
+   * responder. Being the "responder" means that the very next touch move/end
+   * event will result in an action/movement.
+   *
+   * Invoke this from an `onStartShouldSetResponder` event.
+   *
+   * `onStartShouldSetResponder` is used when the next move/end will trigger
+   * some UI movement/action, but when you want to yield priority to views
+   * nested inside of the view.
+   *
+   * There may be some cases where scroll views actually should return `true`
+   * from `onStartShouldSetResponder`: Any time we are detecting a standard tap
+   * that gives priority to nested views.
+   *
+   * - If a single tap on the scroll view triggers an action such as
+   *   recentering a map style view yet wants to give priority to interaction
+   *   views inside (such as dropped pins or labels), then we would return true
+   *   from this method when there is a single touch.
+   *
+   * - Similar to the previous case, if a two finger "tap" should trigger a
+   *   zoom, we would check the `touches` count, and if `>= 2`, we would return
+   *   true.
+   *
+   */
+  _handleStartShouldSetResponder: (e: PressEvent) => boolean = (
+    e: PressEvent,
+  ) => {
+    // Allow any event touch pass through if the default pan responder is disabled
+    if (this.props.disableScrollViewPanResponder === true) {
+      return false;
+    }
+
+    const currentlyFocusedInput = TextInputState.currentlyFocusedInput();
+
+    if (
+      this.props.keyboardShouldPersistTaps === 'handled' &&
+      this._keyboardIsDismissible() &&
+      e.target !== currentlyFocusedInput
+    ) {
+      return true;
+    }
+    return false;
+  };
+
+  /**
+   * There are times when the scroll view wants to become the responder
+   * (meaning respond to the next immediate `touchStart/touchEnd`), in a way
+   * that *doesn't* give priority to nested views (hence the capture phase):
+   *
+   * - Currently animating.
+   * - Tapping anywhere that is not a text input, while the keyboard is
+   *   up (which should dismiss the keyboard).
+   *
+   * Invoke this from an `onStartShouldSetResponderCapture` event.
+   */
+  _handleStartShouldSetResponderCapture: (e: PressEvent) => boolean = (
+    e: PressEvent,
+  ) => {
+    // The scroll view should receive taps instead of its descendants if:
+    // * it is already animating/decelerating
+    if (this._isAnimating()) {
+      return true;
+    }
+
+    // Allow any event touch pass through if the default pan responder is disabled
+    if (this.props.disableScrollViewPanResponder === true) {
+      return false;
+    }
+
+    // * the keyboard is up, keyboardShouldPersistTaps is 'never' (the default),
+    // and a new touch starts with a non-textinput target (in which case the
+    // first tap should be sent to the scroll view and dismiss the keyboard,
+    // then the second tap goes to the actual interior view)
+    const {keyboardShouldPersistTaps} = this.props;
+    const keyboardNeverPersistTaps =
+      !keyboardShouldPersistTaps || keyboardShouldPersistTaps === 'never';
+
+    if (typeof e.target === 'number') {
+      if (__DEV__) {
+        console.error(
+          'Did not expect event target to be a number. Should have been a native component',
+        );
+      }
+
+      return false;
+    }
+
+    if (
+      keyboardNeverPersistTaps &&
+      this._keyboardIsDismissible() &&
+      e.target != null &&
+      !TextInputState.isTextInput(e.target)
+    ) {
+      return true;
+    }
+
+    return false;
+  };
+
+  /**
+   * Do we consider there to be a dismissible soft-keyboard open?
+   */
+  _keyboardIsDismissible: () => boolean = () => {
+    const currentlyFocusedInput = TextInputState.currentlyFocusedInput();
+
+    // We cannot dismiss the keyboard without an input to blur, even if a soft
+    // keyboard is open (e.g. when keyboard is open due to a native component
+    // not participating in TextInputState). It's also possible that the
+    // currently focused input isn't a TextInput (such as by calling ref.focus
+    // on a non-TextInput).
+    const hasFocusedTextInput =
+      currentlyFocusedInput != null &&
+      TextInputState.isTextInput(currentlyFocusedInput);
+
+    // Even if an input is focused, we may not have a keyboard to dismiss. E.g
+    // when using a physical keyboard. Ensure we have an event for an opened
+    // keyboard, except on Android where setting windowSoftInputMode to
+    // adjustNone leads to missing keyboard events.
+    const softKeyboardMayBeOpen =
+      this._keyboardWillOpenTo != null || Platform.OS === 'android';
+
+    return hasFocusedTextInput && softKeyboardMayBeOpen;
+  };
+
+  /**
+   * Invoke this from an `onTouchEnd` event.
+   *
+   * @param {PressEvent} e Event.
+   */
+  _handleTouchEnd: (e: PressEvent) => void = (e: PressEvent) => {
+    const nativeEvent = e.nativeEvent;
+    this._isTouching = nativeEvent.touches.length !== 0;
+    this.props.onTouchEnd && this.props.onTouchEnd(e);
+  };
+
+  /**
+   * Invoke this from an `onTouchCancel` event.
+   *
+   * @param {PressEvent} e Event.
+   */
+  _handleTouchCancel: (e: PressEvent) => void = (e: PressEvent) => {
+    this._isTouching = false;
+    this.props.onTouchCancel && this.props.onTouchCancel(e);
+  };
+
+  /**
+   * Invoke this from an `onTouchStart` event.
+   *
+   * Since we know that the `SimpleEventPlugin` occurs later in the plugin
+   * order, after `ResponderEventPlugin`, we can detect that we were *not*
+   * permitted to be the responder (presumably because a contained view became
+   * responder). The `onResponderReject` won't fire in that case - it only
+   * fires when a *current* responder rejects our request.
+   *
+   * @param {PressEvent} e Touch Start event.
+   */
+  _handleTouchStart: (e: PressEvent) => void = (e: PressEvent) => {
+    this._isTouching = true;
+    this.props.onTouchStart && this.props.onTouchStart(e);
+  };
+
+  /**
+   * Invoke this from an `onTouchMove` event.
+   *
+   * Since we know that the `SimpleEventPlugin` occurs later in the plugin
+   * order, after `ResponderEventPlugin`, we can detect that we were *not*
+   * permitted to be the responder (presumably because a contained view became
+   * responder). The `onResponderReject` won't fire in that case - it only
+   * fires when a *current* responder rejects our request.
+   *
+   * @param {PressEvent} e Touch Start event.
+   */
+  _handleTouchMove: (e: PressEvent) => void = (e: PressEvent) => {
+    this.props.onTouchMove && this.props.onTouchMove(e);
+  };
+
+  render(): React.Node | React.Element<string> {
+    const [NativeDirectionalScrollView, NativeDirectionalScrollContentView] =
+      this.props.horizontal === true
+        ? NativeHorizontalScrollViewTuple
+        : NativeVerticalScrollViewTuple;
 
     const contentContainerStyle = [
       this.props.horizontal === true && styles.contentContainerHorizontal,
@@ -1150,12 +1716,12 @@ class ScrollView extends React.Component<Props, State> {
       );
     }
 
-    let contentSizeChangeProps = {};
-    if (this.props.onContentSizeChange) {
-      contentSizeChangeProps = {
-        onLayout: this._handleContentOnLayout,
-      };
-    }
+    const contentSizeChangeProps =
+      this.props.onContentSizeChange == null
+        ? null
+        : {
+            onLayout: this._handleContentOnLayout,
+          };
 
     const {stickyHeaderIndices} = this.props;
     let children = this.props.children;
@@ -1181,6 +1747,7 @@ class ScrollView extends React.Component<Props, State> {
               onLayout={event => this._onStickyHeaderLayout(index, event, key)}
               scrollAnimatedValue={this._scrollAnimatedValue}
               inverted={this.props.invertStickyHeaders}
+              hiddenOnScroll={this.props.stickyHeaderHiddenOnScroll}
               scrollViewHeight={this.state.layoutHeight}>
               {child}
             </StickyHeaderComponent>
@@ -1201,10 +1768,7 @@ class ScrollView extends React.Component<Props, State> {
       Array.isArray(stickyHeaderIndices) && stickyHeaderIndices.length > 0;
 
     const contentContainer = (
-      /* $FlowFixMe(>=0.112.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.112 was deployed. To see the error, delete
-       * this comment and run Flow. */
-      <ScrollContentContainerViewClass
+      <NativeDirectionalScrollContentView
         {...contentSizeChangeProps}
         ref={this._setInnerViewRef}
         style={contentContainerStyle}
@@ -1218,7 +1782,7 @@ class ScrollView extends React.Component<Props, State> {
         key={this.state.contentKey} // TODO(macOS GH#774)
         collapsable={false}>
         {children}
-      </ScrollContentContainerViewClass>
+      </NativeDirectionalScrollContentView>
     );
 
     const alwaysBounceHorizontal =
@@ -1239,7 +1803,7 @@ class ScrollView extends React.Component<Props, State> {
       ...this.props,
       alwaysBounceHorizontal,
       alwaysBounceVertical,
-      style: [baseStyle, this.props.style],
+      style: StyleSheet.compose(baseStyle, this.props.style),
       // Override the onContentSizeChange from props, since this event can
       // bubble up from TextInputs
       onContentSizeChange: null,
@@ -1247,33 +1811,23 @@ class ScrollView extends React.Component<Props, State> {
       onPreferredScrollerStyleDidChange: this
         ._handlePreferredScrollerStyleDidChange, // TODO(macOS GH#774)
       onLayout: this._handleLayout,
-      onMomentumScrollBegin: this._scrollResponder
-        .scrollResponderHandleMomentumScrollBegin,
-      onMomentumScrollEnd: this._scrollResponder
-        .scrollResponderHandleMomentumScrollEnd,
-      onResponderGrant: this._scrollResponder
-        .scrollResponderHandleResponderGrant,
-      onResponderReject: this._scrollResponder
-        .scrollResponderHandleResponderReject,
-      onResponderRelease: this._scrollResponder
-        .scrollResponderHandleResponderRelease,
-      onResponderTerminationRequest: this._scrollResponder
-        .scrollResponderHandleTerminationRequest,
-      onScrollBeginDrag: this._scrollResponder
-        .scrollResponderHandleScrollBeginDrag,
-      onScrollEndDrag: this._scrollResponder.scrollResponderHandleScrollEndDrag,
-      onScrollShouldSetResponder: this._scrollResponder
-        .scrollResponderHandleScrollShouldSetResponder,
-      onStartShouldSetResponder: this._scrollResponder
-        .scrollResponderHandleStartShouldSetResponder,
-      onStartShouldSetResponderCapture: this._scrollResponder
-        .scrollResponderHandleStartShouldSetResponderCapture,
-      onTouchEnd: this._scrollResponder.scrollResponderHandleTouchEnd,
-      onTouchMove: this._scrollResponder.scrollResponderHandleTouchMove,
-      onTouchStart: this._scrollResponder.scrollResponderHandleTouchStart,
-      onTouchCancel: this._scrollResponder.scrollResponderHandleTouchCancel,
+      onMomentumScrollBegin: this._handleMomentumScrollBegin,
+      onMomentumScrollEnd: this._handleMomentumScrollEnd,
+      onResponderGrant: this._handleResponderGrant,
+      onResponderReject: this._handleResponderReject,
+      onResponderRelease: this._handleResponderRelease,
+      onResponderTerminationRequest: this._handleResponderTerminationRequest,
+      onScrollBeginDrag: this._handleScrollBeginDrag,
+      onScrollEndDrag: this._handleScrollEndDrag,
+      onScrollShouldSetResponder: this._handleScrollShouldSetResponder,
+      onStartShouldSetResponder: this._handleStartShouldSetResponder,
+      onStartShouldSetResponderCapture: this
+        ._handleStartShouldSetResponderCapture,
+      onTouchEnd: this._handleTouchEnd,
+      onTouchMove: this._handleTouchMove,
+      onTouchStart: this._handleTouchStart,
+      onTouchCancel: this._handleTouchCancel,
       onScroll: this._handleScroll,
-      scrollBarThumbImage: resolveAssetSource(this.props.scrollBarThumbImage),
       scrollEventThrottle: hasStickyHeaders
         ? 1
         : this.props.scrollEventThrottle,
@@ -1316,13 +1870,10 @@ class ScrollView extends React.Component<Props, State> {
       if (Platform.OS === 'ios') {
         // On iOS the RefreshControl is a child of the ScrollView.
         return (
-          /* $FlowFixMe(>=0.117.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.117 was deployed. To see the error,
-           * delete this comment and run Flow. */
-          <ScrollViewClass {...props} ref={this._setNativeRef}>
+          <NativeDirectionalScrollView {...props} ref={this._setNativeRef}>
             {refreshControl}
             {contentContainer}
-          </ScrollViewClass>
+          </NativeDirectionalScrollView>
         );
       } else if (Platform.OS === 'android') {
         // On Android wrap the ScrollView with a AndroidSwipeRefreshLayout.
@@ -1333,20 +1884,20 @@ class ScrollView extends React.Component<Props, State> {
         const {outer, inner} = splitLayoutProps(flattenStyle(props.style));
         return React.cloneElement(
           refreshControl,
-          {style: [baseStyle, outer]},
-          <ScrollViewClass
+          {style: StyleSheet.compose(baseStyle, outer)},
+          <NativeDirectionalScrollView
             {...props}
-            style={[baseStyle, inner]}
+            style={StyleSheet.compose(baseStyle, inner)}
             ref={this._setNativeRef}>
             {contentContainer}
-          </ScrollViewClass>,
+          </NativeDirectionalScrollView>,
         );
       }
     }
     return (
-      <ScrollViewClass {...props} ref={this._setNativeRef}>
+      <NativeDirectionalScrollView {...props} ref={this._setNativeRef}>
         {contentContainer}
-      </ScrollViewClass>
+      </NativeDirectionalScrollView>
     );
   }
 }
@@ -1375,7 +1926,7 @@ function Wrapper(props, ref) {
 Wrapper.displayName = 'ScrollView';
 const ForwardedScrollView = React.forwardRef(Wrapper);
 
-// $FlowFixMe Add static context to ForwardedScrollView
+// $FlowFixMe[prop-missing] Add static context to ForwardedScrollView
 ForwardedScrollView.Context = ScrollViewContext;
 
 ForwardedScrollView.displayName = 'ScrollView';
diff --git a/Libraries/Components/ScrollView/ScrollViewContext.js b/Libraries/Components/ScrollView/ScrollViewContext.js
index f774483912d928..0b5e9ac40de003 100644
--- a/Libraries/Components/ScrollView/ScrollViewContext.js
+++ b/Libraries/Components/ScrollView/ScrollViewContext.js
@@ -8,14 +8,14 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 type Value = {horizontal: boolean} | null;
 
 const ScrollViewContext: React.Context<Value> = React.createContext(null);
-
+if (__DEV__) {
+  ScrollViewContext.displayName = 'ScrollViewContext';
+}
 export default ScrollViewContext;
 
 export const HORIZONTAL: Value = Object.freeze({horizontal: true});
diff --git a/Libraries/Components/ScrollView/ScrollViewNativeComponent.js b/Libraries/Components/ScrollView/ScrollViewNativeComponent.js
index 1e1100f0cc3165..cdfc8ff450f3c3 100644
--- a/Libraries/Components/ScrollView/ScrollViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/ScrollViewNativeComponent.js
@@ -4,29 +4,83 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict-local
  * @format
- * @flow
  */
 
-'use strict';
+import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 
-import registerGeneratedViewConfig from '../../Utilities/registerGeneratedViewConfig';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
-import ScrollViewViewConfig from './ScrollViewViewConfig';
+const ScrollViewNativeComponent: HostComponent<Props> = NativeComponentRegistry.get<Props>(
+  'RCTScrollView',
+  () => ({
+    uiViewClassName: 'RCTScrollView',
+    bubblingEventTypes: {},
+    directEventTypes: {
+      topScrollToTop: {
+        registrationName: 'onScrollToTop',
+      },
+    },
+    validAttributes: {
+      alwaysBounceHorizontal: true,
+      alwaysBounceVertical: true,
+      automaticallyAdjustContentInsets: true,
+      automaticallyAdjustsScrollIndicatorInsets: true,
+      bounces: true,
+      bouncesZoom: true,
+      canCancelContentTouches: true,
+      centerContent: true,
+      contentInset: {
+        diff: require('../../Utilities/differ/pointsDiffer'),
+      },
+      contentOffset: {
+        diff: require('../../Utilities/differ/pointsDiffer'),
+      },
+      contentInsetAdjustmentBehavior: true,
+      decelerationRate: true,
+      directionalLockEnabled: true,
+      disableIntervalMomentum: true,
+      endFillColor: {
+        process: require('../../StyleSheet/processColor'),
+      },
+      fadingEdgeLength: true,
+      indicatorStyle: true,
+      inverted: true,
+      keyboardDismissMode: true,
+      maintainVisibleContentPosition: true,
+      maximumZoomScale: true,
+      minimumZoomScale: true,
+      nestedScrollEnabled: true,
+      onMomentumScrollBegin: true,
+      onMomentumScrollEnd: true,
+      onScroll: true,
+      onScrollBeginDrag: true,
+      onScrollEndDrag: true,
+      onScrollToTop: true,
+      overScrollMode: true,
+      pagingEnabled: true,
+      persistentScrollbar: true,
+      pinchGestureEnabled: true,
+      scrollEnabled: true,
+      scrollEventThrottle: true,
+      scrollIndicatorInsets: {
+        diff: require('../../Utilities/differ/pointsDiffer'),
+      },
+      scrollPerfTag: true,
+      scrollToOverflowEnabled: true,
+      scrollsToTop: true,
+      sendMomentumEvents: true,
+      showsHorizontalScrollIndicator: true,
+      showsVerticalScrollIndicator: true,
+      snapToAlignment: true,
+      snapToEnd: true,
+      snapToInterval: true,
+      snapToOffsets: true,
+      snapToStart: true,
+      zoomScale: true,
+    },
+  }),
+);
 
-import type {
-  ScrollViewNativeProps,
-  ScrollViewNativeComponentType,
-} from './ScrollViewNativeComponentType';
-
-let ScrollViewNativeComponent;
-if (global.RN$Bridgeless) {
-  registerGeneratedViewConfig('RCTScrollView', ScrollViewViewConfig);
-  ScrollViewNativeComponent = 'RCTScrollView';
-} else {
-  ScrollViewNativeComponent = requireNativeComponent<ScrollViewNativeProps>(
-    'RCTScrollView',
-  );
-}
-
-export default ((ScrollViewNativeComponent: any): ScrollViewNativeComponentType);
+export default ScrollViewNativeComponent;
diff --git a/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js b/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js
index a6366e8b62b347..24e0c70f442787 100644
--- a/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js
+++ b/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js
@@ -4,18 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict-local
  * @format
- * @flow
  */
 
 'use strict';
 
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
-import type {
-  ViewStyleProp,
-  DangerouslyImpreciseStyle,
-} from '../../StyleSheet/StyleSheet';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {ScrollEvent} from '../../Types/CoreEventTypes';
@@ -26,6 +21,7 @@ export type ScrollViewNativeProps = $ReadOnly<{
   alwaysBounceHorizontal?: ?boolean,
   alwaysBounceVertical?: ?boolean,
   automaticallyAdjustContentInsets?: ?boolean,
+  automaticallyAdjustsScrollIndicatorInsets?: ?boolean,
   bounces?: ?boolean,
   bouncesZoom?: ?boolean,
   canCancelContentTouches?: ?boolean,
@@ -45,10 +41,10 @@ export type ScrollViewNativeProps = $ReadOnly<{
   fadingEdgeLength?: ?number,
   indicatorStyle?: ?('default' | 'black' | 'white'),
   keyboardDismissMode?: ?('none' | 'on-drag' | 'interactive'),
-  maintainVisibleContentPosition?: ?$ReadOnly<{|
+  maintainVisibleContentPosition?: ?$ReadOnly<{
     minIndexForVisible: number,
     autoscrollToTopThreshold?: ?number,
-  |}>,
+  }>,
   maximumZoomScale?: ?number,
   minimumZoomScale?: ?number,
   nestedScrollEnabled?: ?boolean,
@@ -78,9 +74,6 @@ export type ScrollViewNativeProps = $ReadOnly<{
   snapToStart?: ?boolean,
   zoomScale?: ?number,
   // Overrides
-  style?: {...ViewStyleProp, ...} | DangerouslyImpreciseStyle,
-  onResponderGrant?: ?(e: any) => void | boolean,
+  onResponderGrant?: ?(e: $FlowFixMe) => void | boolean,
   ...
 }>;
-
-export type ScrollViewNativeComponentType = HostComponent<ScrollViewNativeProps>;
diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
index a71b9d56020386..f530be611602e1 100644
--- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
+++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
@@ -4,289 +4,303 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-'use strict';
-
-import AnimatedImplementation from '../../Animated/AnimatedImplementation';
-import * as React from 'react';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import View from '../View/View';
-import Platform from '../../Utilities/Platform';
-
 import type {LayoutEvent} from '../../Types/CoreEventTypes';
+import setAndForwardRef from 'react-native/Libraries/Utilities/setAndForwardRef';
+import Platform from '../../Utilities/Platform';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Animated from '../../Animated/Animated';
+import * as React from 'react';
+import {useEffect, useMemo, useRef, useCallback} from 'react';
 
-const AnimatedView = AnimatedImplementation.createAnimatedComponent(View);
+const AnimatedView = Animated.View;
 
-export type Props = {
-  children?: React.Element<any>,
+export type Props = $ReadOnly<{
+  children?: React.Element<$FlowFixMe>,
   nextHeaderLayoutY: ?number,
   onLayout: (event: LayoutEvent) => void,
-  scrollAnimatedValue: AnimatedImplementation.Value,
+  scrollAnimatedValue: Animated.Value,
   // Will cause sticky headers to stick at the bottom of the ScrollView instead
   // of the top.
   inverted: ?boolean,
   // The height of the parent ScrollView. Currently only set when inverted.
   scrollViewHeight: ?number,
   nativeID?: ?string,
-  ...
-};
-
-type State = {
-  measured: boolean,
-  layoutY: number,
-  layoutHeight: number,
-  nextHeaderLayoutY: ?number,
-  translateY: ?number,
-  ...
-};
+  hiddenOnScroll?: ?boolean,
+}>;
 
-class ScrollViewStickyHeader extends React.Component<Props, State> {
-  state: State = {
-    measured: false,
-    layoutY: 0,
-    layoutHeight: 0,
-    nextHeaderLayoutY: this.props.nextHeaderLayoutY,
-    translateY: null,
-  };
+const ScrollViewStickyHeaderWithForwardedRef: React.AbstractComponent<
+  Props,
+  $ReadOnly<{
+    setNextHeaderY: number => void,
+    ...$Exact<React.ElementRef<typeof AnimatedView>>,
+  }>,
+> = React.forwardRef(function ScrollViewStickyHeader(props, forwardedRef) {
+  const {
+    inverted,
+    scrollViewHeight,
+    hiddenOnScroll,
+    scrollAnimatedValue,
+    nextHeaderLayoutY: _nextHeaderLayoutY,
+  } = props;
 
-  _translateY: ?AnimatedImplementation.Interpolation = null;
-  _shouldRecreateTranslateY: boolean = true;
-  _haveReceivedInitialZeroTranslateY: boolean = true;
-  _ref: any; // TODO T53738161: flow type this, and the whole file
+  const [measured, setMeasured] = React.useState<boolean>(false);
+  const [layoutY, setLayoutY] = React.useState<number>(0);
+  const [layoutHeight, setLayoutHeight] = React.useState<number>(0);
+  const [translateY, setTranslateY] = React.useState<?number>(null);
+  const [nextHeaderLayoutY, setNextHeaderLayoutY] = React.useState<?number>(
+    _nextHeaderLayoutY,
+  );
+  const [isFabric, setIsFabric] = React.useState<boolean>(false);
 
-  // Fabric-only:
-  _timer: ?TimeoutID;
-  _animatedValueListenerId: string;
-  _animatedValueListener: (valueObject: $ReadOnly<{|value: number|}>) => void;
-  _debounceTimeout: number = Platform.OS === 'android' ? 15 : 64;
+  const componentRef = React.useRef<?React.ElementRef<typeof AnimatedView>>();
+  const _setNativeRef = setAndForwardRef({
+    getForwardedRef: () => forwardedRef,
+    setLocalRef: ref => {
+      componentRef.current = ref;
+      if (ref) {
+        ref.setNextHeaderY = value => {
+          setNextHeaderLayoutY(value);
+        };
+        setIsFabric(
+          !!(
+            // An internal transform mangles variables with leading "_" as private.
+            // eslint-disable-next-line dot-notation
+            ref['_internalInstanceHandle']?.stateNode?.canonical
+          ),
+        );
+      }
+    },
+  });
 
-  setNextHeaderY(y: number) {
-    this.setState({nextHeaderLayoutY: y});
-  }
+  const offset = useMemo(
+    () =>
+      hiddenOnScroll === true
+        ? Animated.diffClamp(
+            scrollAnimatedValue
+              .interpolate({
+                extrapolateLeft: 'clamp',
+                inputRange: [layoutY, layoutY + 1],
+                outputRange: ([0, 1]: Array<number>),
+              })
+              .interpolate({
+                inputRange: [0, 1],
+                outputRange: ([0, -1]: Array<number>),
+              }),
+            -layoutHeight,
+            0,
+          )
+        : null,
+    [scrollAnimatedValue, layoutHeight, layoutY, hiddenOnScroll],
+  );
 
-  UNSAFE_componentWillReceiveProps(nextProps: Props) {
-    if (
-      nextProps.scrollViewHeight !== this.props.scrollViewHeight ||
-      nextProps.scrollAnimatedValue !== this.props.scrollAnimatedValue ||
-      nextProps.inverted !== this.props.inverted
-    ) {
-      this._shouldRecreateTranslateY = true;
-    }
-  }
+  const [
+    animatedTranslateY,
+    setAnimatedTranslateY,
+  ] = React.useState<Animated.Node>(() => {
+    const inputRange: Array<number> = [-1, 0];
+    const outputRange: Array<number> = [0, 0];
+    const initialTranslateY: Animated.Interpolation = scrollAnimatedValue.interpolate(
+      {
+        inputRange,
+        outputRange,
+      },
+    );
 
-  updateTranslateListener(
-    translateY: AnimatedImplementation.Interpolation,
-    isFabric: boolean,
-  ) {
-    if (this._translateY != null && this._animatedValueListenerId != null) {
-      this._translateY.removeListener(this._animatedValueListenerId);
+    if (offset != null) {
+      return Animated.add(initialTranslateY, offset);
     }
+    return initialTranslateY;
+  });
 
-    this._translateY = translateY;
-    this._shouldRecreateTranslateY = false;
+  const _haveReceivedInitialZeroTranslateY = useRef<boolean>(true);
+  const _timer = useRef<?TimeoutID>(null);
 
-    if (!isFabric) {
-      return;
+  useEffect(() => {
+    if (translateY !== 0 && translateY != null) {
+      _haveReceivedInitialZeroTranslateY.current = false;
     }
+  }, [translateY]);
 
-    if (!this._animatedValueListener) {
-      // This is called whenever the (Interpolated) Animated Value
-      // updates, which is several times per frame during scrolling.
-      // To ensure that the Fabric ShadowTree has the most recent
-      // translate style of this node, we debounce the value and then
-      // pass it through to the underlying node during render.
-      // This is:
-      // 1. Only an issue in Fabric.
-      // 2. Worse in Android than iOS. In Android, but not iOS, you
-      //    can touch and move your finger slightly and still trigger
-      //    a "tap" event. In iOS, moving will cancel the tap in
-      //    both Fabric and non-Fabric. On Android when you move
-      //    your finger, the hit-detection moves from the Android
-      //    platform to JS, so we need the ShadowTree to have knowledge
-      //    of the current position.
-      this._animatedValueListener = ({value}) => {
-        // When the AnimatedInterpolation is recreated, it always initializes
-        // to a value of zero and emits a value change of 0 to its listeners.
-        if (value === 0 && !this._haveReceivedInitialZeroTranslateY) {
-          this._haveReceivedInitialZeroTranslateY = true;
-          return;
-        }
-        if (this._timer) {
-          clearTimeout(this._timer);
+  // This is called whenever the (Interpolated) Animated Value
+  // updates, which is several times per frame during scrolling.
+  // To ensure that the Fabric ShadowTree has the most recent
+  // translate style of this node, we debounce the value and then
+  // pass it through to the underlying node during render.
+  // This is:
+  // 1. Only an issue in Fabric.
+  // 2. Worse in Android than iOS. In Android, but not iOS, you
+  //    can touch and move your finger slightly and still trigger
+  //    a "tap" event. In iOS, moving will cancel the tap in
+  //    both Fabric and non-Fabric. On Android when you move
+  //    your finger, the hit-detection moves from the Android
+  //    platform to JS, so we need the ShadowTree to have knowledge
+  //    of the current position.
+  const animatedValueListener = useCallback(
+    ({value}) => {
+      const _debounceTimeout: number = Platform.OS === 'android' ? 15 : 64;
+      // When the AnimatedInterpolation is recreated, it always initializes
+      // to a value of zero and emits a value change of 0 to its listeners.
+      if (value === 0 && !_haveReceivedInitialZeroTranslateY.current) {
+        _haveReceivedInitialZeroTranslateY.current = true;
+        return;
+      }
+      if (_timer.current != null) {
+        clearTimeout(_timer.current);
+      }
+      _timer.current = setTimeout(() => {
+        if (value !== translateY) {
+          setTranslateY(value);
         }
-        this._timer = setTimeout(() => {
-          if (value !== this.state.translateY) {
-            this.setState({
-              translateY: value,
-            });
-          }
-        }, this._debounceTimeout);
-      };
-    }
-    if (this.state.translateY !== 0 && this.state.translateY != null) {
-      this._haveReceivedInitialZeroTranslateY = false;
-    }
-    this._animatedValueListenerId = translateY.addListener(
-      this._animatedValueListener,
-    );
-  }
+      }, _debounceTimeout);
+    },
+    [translateY],
+  );
 
-  _onLayout = event => {
-    const layoutY = event.nativeEvent.layout.y;
-    const layoutHeight = event.nativeEvent.layout.height;
-    const measured = true;
+  useEffect(() => {
+    const inputRange: Array<number> = [-1, 0];
+    const outputRange: Array<number> = [0, 0];
 
-    if (
-      layoutY !== this.state.layoutY ||
-      layoutHeight !== this.state.layoutHeight ||
-      measured !== this.state.measured
-    ) {
-      this._shouldRecreateTranslateY = true;
+    if (measured) {
+      if (inverted === true) {
+        // The interpolation looks like:
+        // - Negative scroll: no translation
+        // - `stickStartPoint` is the point at which the header will start sticking.
+        //   It is calculated using the ScrollView viewport height so it is a the bottom.
+        // - Headers that are in the initial viewport will never stick, `stickStartPoint`
+        //   will be negative.
+        // - From 0 to `stickStartPoint` no translation. This will cause the header
+        //   to scroll normally until it reaches the top of the scroll view.
+        // - From `stickStartPoint` to when the next header y hits the bottom edge of the header: translate
+        //   equally to scroll. This will cause the header to stay at the top of the scroll view.
+        // - Past the collision with the next header y: no more translation. This will cause the
+        //   header to continue scrolling up and make room for the next sticky header.
+        //   In the case that there is no next header just translate equally to
+        //   scroll indefinitely.
+        if (scrollViewHeight != null) {
+          const stickStartPoint = layoutY + layoutHeight - scrollViewHeight;
+          if (stickStartPoint > 0) {
+            inputRange.push(stickStartPoint);
+            outputRange.push(0);
+            inputRange.push(stickStartPoint + 1);
+            outputRange.push(1);
+            // If the next sticky header has not loaded yet (probably windowing) or is the last
+            // we can just keep it sticked forever.
+            const collisionPoint =
+              (nextHeaderLayoutY || 0) - layoutHeight - scrollViewHeight;
+            if (collisionPoint > stickStartPoint) {
+              inputRange.push(collisionPoint, collisionPoint + 1);
+              outputRange.push(
+                collisionPoint - stickStartPoint,
+                collisionPoint - stickStartPoint,
+              );
+            }
+          }
+        }
+      } else {
+        // The interpolation looks like:
+        // - Negative scroll: no translation
+        // - From 0 to the y of the header: no translation. This will cause the header
+        //   to scroll normally until it reaches the top of the scroll view.
+        // - From header y to when the next header y hits the bottom edge of the header: translate
+        //   equally to scroll. This will cause the header to stay at the top of the scroll view.
+        // - Past the collision with the next header y: no more translation. This will cause the
+        //   header to continue scrolling up and make room for the next sticky header.
+        //   In the case that there is no next header just translate equally to
+        //   scroll indefinitely.
+        inputRange.push(layoutY);
+        outputRange.push(0);
+        // If the next sticky header has not loaded yet (probably windowing) or is the last
+        // we can just keep it sticked forever.
+        const collisionPoint = (nextHeaderLayoutY || 0) - layoutHeight;
+        if (collisionPoint >= layoutY) {
+          inputRange.push(collisionPoint, collisionPoint + 1);
+          outputRange.push(collisionPoint - layoutY, collisionPoint - layoutY);
+        } else {
+          inputRange.push(layoutY + 1);
+          outputRange.push(1);
+        }
+      }
     }
 
-    this.setState({
-      measured,
-      layoutY,
-      layoutHeight,
+    let newAnimatedTranslateY: Animated.Node = scrollAnimatedValue.interpolate({
+      inputRange,
+      outputRange,
     });
 
-    this.props.onLayout(event);
-    const child = React.Children.only(this.props.children);
-    if (child.props.onLayout) {
-      child.props.onLayout(event);
+    if (offset != null) {
+      newAnimatedTranslateY = Animated.add(newAnimatedTranslateY, offset);
     }
-  };
-
-  _setComponentRef = ref => {
-    this._ref = ref;
-  };
 
-  render(): React.Node {
-    // Fabric Detection
-    const isFabric = !!(
-      // An internal transform mangles variables with leading "_" as private.
-      // eslint-disable-next-line dot-notation
-      (this._ref && this._ref['_internalInstanceHandle']?.stateNode?.canonical)
-    );
+    // add the event listener
+    let animatedListenerId;
+    if (isFabric) {
+      animatedListenerId = newAnimatedTranslateY.addListener(
+        animatedValueListener,
+      );
+    }
 
-    // Initially and in the case of updated props or layout, we
-    // recreate this interpolated value. Otherwise, we do not recreate
-    // when there are state changes.
-    if (this._shouldRecreateTranslateY) {
-      const {inverted, scrollViewHeight} = this.props;
-      const {measured, layoutHeight, layoutY, nextHeaderLayoutY} = this.state;
-      const inputRange: Array<number> = [-1, 0];
-      const outputRange: Array<number> = [0, 0];
+    setAnimatedTranslateY(newAnimatedTranslateY);
 
-      if (measured) {
-        if (inverted) {
-          // The interpolation looks like:
-          // - Negative scroll: no translation
-          // - `stickStartPoint` is the point at which the header will start sticking.
-          //   It is calculated using the ScrollView viewport height so it is a the bottom.
-          // - Headers that are in the initial viewport will never stick, `stickStartPoint`
-          //   will be negative.
-          // - From 0 to `stickStartPoint` no translation. This will cause the header
-          //   to scroll normally until it reaches the top of the scroll view.
-          // - From `stickStartPoint` to when the next header y hits the bottom edge of the header: translate
-          //   equally to scroll. This will cause the header to stay at the top of the scroll view.
-          // - Past the collision with the next header y: no more translation. This will cause the
-          //   header to continue scrolling up and make room for the next sticky header.
-          //   In the case that there is no next header just translate equally to
-          //   scroll indefinitely.
-          if (scrollViewHeight != null) {
-            const stickStartPoint = layoutY + layoutHeight - scrollViewHeight;
-            if (stickStartPoint > 0) {
-              inputRange.push(stickStartPoint);
-              outputRange.push(0);
-              inputRange.push(stickStartPoint + 1);
-              outputRange.push(1);
-              // If the next sticky header has not loaded yet (probably windowing) or is the last
-              // we can just keep it sticked forever.
-              const collisionPoint =
-                (nextHeaderLayoutY || 0) - layoutHeight - scrollViewHeight;
-              if (collisionPoint > stickStartPoint) {
-                inputRange.push(collisionPoint, collisionPoint + 1);
-                outputRange.push(
-                  collisionPoint - stickStartPoint,
-                  collisionPoint - stickStartPoint,
-                );
-              }
-            }
-          }
-        } else {
-          // The interpolation looks like:
-          // - Negative scroll: no translation
-          // - From 0 to the y of the header: no translation. This will cause the header
-          //   to scroll normally until it reaches the top of the scroll view.
-          // - From header y to when the next header y hits the bottom edge of the header: translate
-          //   equally to scroll. This will cause the header to stay at the top of the scroll view.
-          // - Past the collision with the next header y: no more translation. This will cause the
-          //   header to continue scrolling up and make room for the next sticky header.
-          //   In the case that there is no next header just translate equally to
-          //   scroll indefinitely.
-          inputRange.push(layoutY);
-          outputRange.push(0);
-          // If the next sticky header has not loaded yet (probably windowing) or is the last
-          // we can just keep it sticked forever.
-          const collisionPoint = (nextHeaderLayoutY || 0) - layoutHeight;
-          if (collisionPoint >= layoutY) {
-            inputRange.push(collisionPoint, collisionPoint + 1);
-            outputRange.push(
-              collisionPoint - layoutY,
-              collisionPoint - layoutY,
-            );
-          } else {
-            inputRange.push(layoutY + 1);
-            outputRange.push(1);
-          }
-        }
+    // clean up the event listener and timer
+    return () => {
+      if (animatedListenerId) {
+        newAnimatedTranslateY.removeListener(animatedListenerId);
+      }
+      if (_timer.current != null) {
+        clearTimeout(_timer.current);
       }
+    };
+  }, [nextHeaderLayoutY, measured, layoutHeight, layoutY, scrollViewHeight, scrollAnimatedValue, inverted, offset, animatedValueListener, isFabric]);
 
-      this.updateTranslateListener(
-        this.props.scrollAnimatedValue.interpolate({
-          inputRange,
-          outputRange,
-        }),
-        isFabric,
-      );
+  const _onLayout = (event: LayoutEvent) => {
+    setLayoutY(event.nativeEvent.layout.y);
+    setLayoutHeight(event.nativeEvent.layout.height);
+    setMeasured(true);
+
+    props.onLayout(event);
+    const child = React.Children.only(props.children);
+    if (child.props.onLayout) {
+      child.props.onLayout(event);
     }
+  };
 
-    const child = React.Children.only(this.props.children);
+  const child = React.Children.only(props.children);
 
-    // TODO T68319535: remove this if NativeAnimated is rewritten for Fabric
-    const passthroughAnimatedPropExplicitValues =
-      isFabric && this.state.translateY != null
-        ? {
-            style: {transform: [{translateY: this.state.translateY}]},
-          }
-        : null;
+  // TODO T68319535: remove this if NativeAnimated is rewritten for Fabric
+  const passthroughAnimatedPropExplicitValues =
+    isFabric && translateY != null
+      ? {
+          style: {transform: [{translateY: translateY}]},
+        }
+      : null;
 
-    return (
-      <AnimatedView
-        collapsable={false}
-        nativeID={this.props.nativeID}
-        onLayout={this._onLayout}
-        ref={this._setComponentRef}
-        style={[
-          child.props.style,
-          styles.header,
-          {transform: [{translateY: this._translateY}]},
-        ]}
-        passthroughAnimatedPropExplicitValues={
-          passthroughAnimatedPropExplicitValues
-        }>
-        {React.cloneElement(child, {
-          style: styles.fill, // We transfer the child style to the wrapper.
-          onLayout: undefined, // we call this manually through our this._onLayout
-        })}
-      </AnimatedView>
-    );
-  }
-}
+  return (
+    /* $FlowFixMe[prop-missing] passthroughAnimatedPropExplicitValues isn't properly
+       included in the Animated.View flow type. */
+    <AnimatedView
+      collapsable={false}
+      nativeID={props.nativeID}
+      onLayout={_onLayout}
+      ref={_setNativeRef}
+      style={[
+        child.props.style,
+        styles.header,
+        {transform: [{translateY: animatedTranslateY}]},
+      ]}
+      passthroughAnimatedPropExplicitValues={
+        passthroughAnimatedPropExplicitValues
+      }>
+      {React.cloneElement(child, {
+        style: styles.fill, // We transfer the child style to the wrapper.
+        onLayout: undefined, // we call this manually through our this._onLayout
+      })}
+    </AnimatedView>
+  );
+});
 
 const styles = StyleSheet.create({
   header: {
@@ -298,4 +312,4 @@ const styles = StyleSheet.create({
   },
 });
 
-module.exports = ScrollViewStickyHeader;
+export default ScrollViewStickyHeaderWithForwardedRef;
diff --git a/Libraries/Components/ScrollView/ScrollViewViewConfig.js b/Libraries/Components/ScrollView/ScrollViewViewConfig.js
index b2a3a9246b343b..5b276d54fa0fe0 100644
--- a/Libraries/Components/ScrollView/ScrollViewViewConfig.js
+++ b/Libraries/Components/ScrollView/ScrollViewViewConfig.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {GeneratedViewConfig} from '../../Utilities/registerGeneratedViewConfig';
+import type {PartialViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 
 const ScrollViewViewConfig = {
   uiViewClassName: 'RCTScrollView',
@@ -24,19 +24,27 @@ const ScrollViewViewConfig = {
     alwaysBounceHorizontal: true,
     alwaysBounceVertical: true,
     automaticallyAdjustContentInsets: true,
+    automaticallyAdjustsScrollIndicatorInsets: true,
     bounces: true,
     bouncesZoom: true,
     canCancelContentTouches: true,
     centerContent: true,
-    contentInset: {diff: require('../../Utilities/differ/pointsDiffer')},
-    contentOffset: {diff: require('../../Utilities/differ/pointsDiffer')},
+    contentInset: {
+      diff: require('../../Utilities/differ/pointsDiffer'),
+    },
+    contentOffset: {
+      diff: require('../../Utilities/differ/pointsDiffer'),
+    },
     contentInsetAdjustmentBehavior: true,
     decelerationRate: true,
     directionalLockEnabled: true,
     disableIntervalMomentum: true,
-    endFillColor: {process: require('../../StyleSheet/processColor')},
+    endFillColor: {
+      process: require('../../StyleSheet/processColor'),
+    },
     fadingEdgeLength: true,
     indicatorStyle: true,
+    inverted: true,
     keyboardDismissMode: true,
     maintainVisibleContentPosition: true,
     maximumZoomScale: true,
@@ -72,4 +80,4 @@ const ScrollViewViewConfig = {
   },
 };
 
-module.exports = (ScrollViewViewConfig: GeneratedViewConfig);
+module.exports = (ScrollViewViewConfig: PartialViewConfig);
diff --git a/Libraries/Components/ScrollView/__tests__/ScrollView-test.js b/Libraries/Components/ScrollView/__tests__/ScrollView-test.js
index fb7aa74a55703e..f2a7abe2c9f852 100644
--- a/Libraries/Components/ScrollView/__tests__/ScrollView-test.js
+++ b/Libraries/Components/ScrollView/__tests__/ScrollView-test.js
@@ -11,12 +11,12 @@
 
 'use strict';
 
-const React = require('react');
-const ScrollView = require('../ScrollView');
-const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
-const ReactTestRenderer = require('react-test-renderer');
-const View = require('../../View/View');
-const Text = require('../../../Text/Text');
+import * as React from 'react';
+import ScrollView from '../ScrollView';
+import * as ReactNativeTestTools from '../../../Utilities/ReactNativeTestTools';
+import ReactTestRenderer from 'react-test-renderer';
+import View from '../../View/View';
+import Text from '../../../Text/Text';
 
 describe('<ScrollView />', () => {
   it('should render as expected', () => {
@@ -48,4 +48,20 @@ describe('<ScrollView />', () => {
       jest.fn().constructor,
     );
   });
+  it('getInnerViewRef for case where it returns a native view', () => {
+    jest.resetModules();
+    jest.unmock('../ScrollView');
+
+    const scrollViewRef = React.createRef(null);
+
+    ReactTestRenderer.create(<ScrollView ref={scrollViewRef} />);
+
+    const innerViewRef = scrollViewRef.current.getInnerViewRef();
+
+    // This is checking if the ref acts like a host component. If we had an
+    // `isHostComponent(ref)` method, that would be preferred.
+    expect(innerViewRef.measure).toBeInstanceOf(jest.fn().constructor);
+    expect(innerViewRef.measureLayout).toBeInstanceOf(jest.fn().constructor);
+    expect(innerViewRef.measureInWindow).toBeInstanceOf(jest.fn().constructor);
+  });
 });
diff --git a/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap b/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap
index 47a15d64c9348e..6fb8cfb75c3c1b 100644
--- a/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap
+++ b/Libraries/Components/ScrollView/__tests__/__snapshots__/ScrollView-test.js.snap
@@ -36,21 +36,17 @@ exports[`<ScrollView /> should render as expected: should deep render when not m
   onTouchMove={[Function]}
   onTouchStart={[Function]}
   pagingEnabled={false}
-  scrollBarThumbImage={null}
   scrollViewRef={null}
   sendMomentumEvents={false}
   snapToEnd={true}
   snapToStart={true}
   style={
-    Array [
-      Object {
-        "flexDirection": "column",
-        "flexGrow": 1,
-        "flexShrink": 1,
-        "overflow": "scroll",
-      },
-      undefined,
-    ]
+    Object {
+      "flexDirection": "column",
+      "flexGrow": 1,
+      "flexShrink": 1,
+      "overflow": "scroll",
+    }
   }
 >
   <RCTScrollContentView
diff --git a/Libraries/Components/ScrollView/processDecelerationRate.js b/Libraries/Components/ScrollView/processDecelerationRate.js
index ac6b3d28780e3e..b3d9542b6e55aa 100644
--- a/Libraries/Components/ScrollView/processDecelerationRate.js
+++ b/Libraries/Components/ScrollView/processDecelerationRate.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import Platform from '../../Utilities/Platform';
 
 function processDecelerationRate(
diff --git a/Libraries/Components/SegmentedControlIOS/RCTSegmentedControlNativeComponent.js b/Libraries/Components/SegmentedControlIOS/RCTSegmentedControlNativeComponent.js
index c860c04ea9dcbb..a00ff34c34a0ac 100644
--- a/Libraries/Components/SegmentedControlIOS/RCTSegmentedControlNativeComponent.js
+++ b/Libraries/Components/SegmentedControlIOS/RCTSegmentedControlNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
index a5f56f2f7a7cab..a4cbc5e98425b2 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
@@ -8,11 +8,10 @@
  */
 
 'use strict';
-
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const Text = require('../../Text/Text');
-const View = require('../View/View');
+import * as React from 'react';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import View from '../View/View';
 
 class DummySegmentedControlIOS extends React.Component {
   render() {
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
index 2983e77d1ac096..84770d7646b9e6 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import type {OnChangeEvent} from './RCTSegmentedControlNativeComponent';
@@ -21,6 +19,8 @@ type SegmentedControlIOSProps = $ReadOnly<{|
   ...ViewProps,
   /**
    * The labels for the control's segment buttons, in order.
+   *
+   * The default value is an empty array.
    */
   values?: $ReadOnlyArray<string>,
   /**
@@ -29,6 +29,8 @@ type SegmentedControlIOSProps = $ReadOnly<{|
   selectedIndex?: ?number,
   /**
    * If false the user won't be able to interact with the control.
+   *
+   * The default value is true.
    */
   enabled?: boolean,
   /**
@@ -78,11 +80,6 @@ type Props = $ReadOnly<{|
  */
 
 class SegmentedControlIOS extends React.Component<Props> {
-  static defaultProps = {
-    values: [],
-    enabled: true,
-  };
-
   _onChange = (event: SyntheticEvent<OnChangeEvent>) => {
     this.props.onChange && this.props.onChange(event);
     this.props.onValueChange &&
@@ -90,12 +87,21 @@ class SegmentedControlIOS extends React.Component<Props> {
   };
 
   render() {
-    const {forwardedRef, onValueChange, style, ...props} = this.props;
+    const {
+      enabled,
+      forwardedRef,
+      onValueChange,
+      style,
+      values,
+      ...props
+    } = this.props;
     return (
       <RCTSegmentedControlNativeComponent
         {...props}
         ref={forwardedRef}
         style={[styles.segmentedControl, style]}
+        enabled={enabled !== false}
+        values={values ?? []}
         onChange={this._onChange}
       />
     );
@@ -117,7 +123,7 @@ const SegmentedControlIOSWithRef = React.forwardRef(
   },
 );
 
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[cannot-resolve-name] (>=0.89.0 site=react_native_ios_fb) This
+ * comment suppresses an error found when Flow v0.89 was deployed. To see the
+ * error, delete this comment and run Flow. */
 module.exports = (SegmentedControlIOSWithRef: NativeSegmentedControlIOS);
diff --git a/Libraries/Components/SegmentedControlIOS/__tests__/SegmentedContolIOS-test.js b/Libraries/Components/SegmentedControlIOS/__tests__/SegmentedContolIOS-test.js
new file mode 100644
index 00000000000000..605864bf697b88
--- /dev/null
+++ b/Libraries/Components/SegmentedControlIOS/__tests__/SegmentedContolIOS-test.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @emails oncall+react_native
+ */
+
+'use strict';
+
+const React = require('react');
+const ReactTestRenderer = require('react-test-renderer');
+
+const SegmentedControlIOS = require('../SegmentedControlIOS.ios');
+
+describe('SegmentedControlIOS', () => {
+  it('renders the segmented control', () => {
+    const component = ReactTestRenderer.create(<SegmentedControlIOS />);
+    expect(component).not.toBeNull();
+  });
+  it('renders the segmented control with enabled default value', () => {
+    const component = ReactTestRenderer.create(<SegmentedControlIOS />);
+    expect(component.toTree().rendered.props.enabled).toBe(true);
+    expect(component).toMatchSnapshot();
+  });
+  it('renders the segmented control with enabled', () => {
+    const component = ReactTestRenderer.create(
+      <SegmentedControlIOS enabled={true} />,
+    );
+    expect(component.toTree().rendered.props.enabled).toBe(true);
+    expect(component).toMatchSnapshot();
+  });
+  it('renders the segmented control with enabled set to false', () => {
+    const component = ReactTestRenderer.create(
+      <SegmentedControlIOS enabled={false} />,
+    );
+    expect(component.toTree().rendered.props.enabled).toBe(false);
+    expect(component).toMatchSnapshot();
+  });
+  it('renders the segmented control with values default value', () => {
+    const component = ReactTestRenderer.create(<SegmentedControlIOS />);
+    expect(component.toTree().rendered.props.values).toEqual([]);
+    expect(component).toMatchSnapshot();
+  });
+  it('renders the segmented control with values', () => {
+    const values = ['One', 'Two'];
+    const component = ReactTestRenderer.create(
+      <SegmentedControlIOS values={values} />,
+    );
+    expect(component.toTree().rendered.props.values).toBe(values);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/Components/SegmentedControlIOS/__tests__/__snapshots__/SegmentedContolIOS-test.js.snap b/Libraries/Components/SegmentedControlIOS/__tests__/__snapshots__/SegmentedContolIOS-test.js.snap
new file mode 100644
index 00000000000000..30195d27c7f857
--- /dev/null
+++ b/Libraries/Components/SegmentedControlIOS/__tests__/__snapshots__/SegmentedContolIOS-test.js.snap
@@ -0,0 +1,86 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SegmentedControlIOS renders the segmented control with enabled 1`] = `
+<RCTSegmentedControl
+  enabled={true}
+  onChange={[Function]}
+  style={
+    Array [
+      Object {
+        "height": 28,
+      },
+      undefined,
+    ]
+  }
+  values={Array []}
+/>
+`;
+
+exports[`SegmentedControlIOS renders the segmented control with enabled default value 1`] = `
+<RCTSegmentedControl
+  enabled={true}
+  onChange={[Function]}
+  style={
+    Array [
+      Object {
+        "height": 28,
+      },
+      undefined,
+    ]
+  }
+  values={Array []}
+/>
+`;
+
+exports[`SegmentedControlIOS renders the segmented control with enabled set to false 1`] = `
+<RCTSegmentedControl
+  enabled={false}
+  onChange={[Function]}
+  style={
+    Array [
+      Object {
+        "height": 28,
+      },
+      undefined,
+    ]
+  }
+  values={Array []}
+/>
+`;
+
+exports[`SegmentedControlIOS renders the segmented control with values 1`] = `
+<RCTSegmentedControl
+  enabled={true}
+  onChange={[Function]}
+  style={
+    Array [
+      Object {
+        "height": 28,
+      },
+      undefined,
+    ]
+  }
+  values={
+    Array [
+      "One",
+      "Two",
+    ]
+  }
+/>
+`;
+
+exports[`SegmentedControlIOS renders the segmented control with values default value 1`] = `
+<RCTSegmentedControl
+  enabled={true}
+  onChange={[Function]}
+  style={
+    Array [
+      Object {
+        "height": 28,
+      },
+      undefined,
+    ]
+  }
+  values={Array []}
+/>
+`;
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index 784af7cc272750..1edf184c172ec9 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -8,18 +8,18 @@
  * @flow strict-local
  */
 
-'use strict';
-
-const Platform = require('../../Utilities/Platform');
+import * as React from 'react';
+import Platform from '../../Utilities/Platform';
 import SliderNativeComponent from './SliderNativeComponent';
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
+import StyleSheet, {
+  type ViewStyleProp,
+  type ColorValue,
+} from '../../StyleSheet/StyleSheet';
 
 import type {ImageSource} from '../../Image/ImageSource';
-import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
+import type {AccessibilityState} from '../View/ViewAccessibility';
 
 type Event = SyntheticEvent<
   $ReadOnly<{|
@@ -132,10 +132,18 @@ type Props = $ReadOnly<{|
    * Used to locate this view in UI automation tests.
    */
   testID?: ?string,
+
+  // [ TODO(macOS GH#774)
   /**
    * Specifies the tooltip.
    */
   tooltip?: ?string,
+  // TODO(macOS GH#774) ]
+
+  /**
+    Indicates to accessibility services that UI Component is in a specific State.
+   */
+  accessibilityState?: ?AccessibilityState,
 |}>;
 
 /**
@@ -205,7 +213,6 @@ const Slider = (
   const style = StyleSheet.compose(styles.slider, props.style);
 
   const {
-    disabled = false,
     value = 0.5,
     minimumValue = 0,
     maximumValue = 1,
@@ -235,9 +242,16 @@ const Slider = (
       }
     : null;
 
+  const disabled =
+    props.disabled === true || props.accessibilityState?.disabled === true;
+  const accessibilityState = disabled
+    ? {...props.accessibilityState, disabled: true}
+    : props.accessibilityState;
+
   return (
     <SliderNativeComponent
       {...localProps}
+      accessibilityState={accessibilityState}
       // TODO: Reconcile these across the two platforms.
       enabled={!disabled}
       disabled={disabled}
diff --git a/Libraries/Components/Slider/SliderNativeComponent.js b/Libraries/Components/Slider/SliderNativeComponent.js
index c79d0fb730630f..18868e9a003de7 100644
--- a/Libraries/Components/Slider/SliderNativeComponent.js
+++ b/Libraries/Components/Slider/SliderNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {
   BubblingEventHandler,
   DirectEventHandler,
diff --git a/Libraries/Components/Sound/NativeSoundManager.js b/Libraries/Components/Sound/NativeSoundManager.js
index d278168552fcae..fcf14489741db9 100644
--- a/Libraries/Components/Sound/NativeSoundManager.js
+++ b/Libraries/Components/Sound/NativeSoundManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/Sound/SoundManager.js b/Libraries/Components/Sound/SoundManager.js
index 0e63332728f5cb..f65776be07dbcc 100644
--- a/Libraries/Components/Sound/SoundManager.js
+++ b/Libraries/Components/Sound/SoundManager.js
@@ -8,7 +8,6 @@
  * @flow strict
  */
 
-'use strict';
 import NativeSoundManager from './NativeSoundManager';
 
 const SoundManager = {
diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
index e9168b5dc52b06..9a3e582c6d3c51 100644
--- a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
+++ b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
index b5da2851bf2436..4765b603a86543 100644
--- a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
+++ b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js
index b1e78f6b114b04..e0e3e6694eab34 100644
--- a/Libraries/Components/StatusBar/StatusBar.js
+++ b/Libraries/Components/StatusBar/StatusBar.js
@@ -8,13 +8,10 @@
  * @flow
  */
 
-'use strict';
-
-const Platform = require('../../Utilities/Platform');
-const React = require('react');
-
-const invariant = require('invariant');
-const processColor = require('../../StyleSheet/processColor');
+import * as React from 'react';
+import Platform from '../../Utilities/Platform';
+import invariant from 'invariant';
+import processColor from '../../StyleSheet/processColor';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
 import NativeStatusBarManagerAndroid from './NativeStatusBarManagerAndroid';
@@ -130,19 +127,21 @@ function mergePropsStack(
  * and the transition/animation info.
  */
 function createStackEntry(props: any): any {
+  const animated = props.animated ?? false;
+  const showHideTransition = props.showHideTransition ?? 'fade';
   return {
     backgroundColor:
       props.backgroundColor != null
         ? {
             value: props.backgroundColor,
-            animated: props.animated,
+            animated,
           }
         : null,
     barStyle:
       props.barStyle != null
         ? {
             value: props.barStyle,
-            animated: props.animated,
+            animated,
           }
         : null,
     translucent: props.translucent,
@@ -150,8 +149,8 @@ function createStackEntry(props: any): any {
       props.hidden != null
         ? {
             value: props.hidden,
-            animated: props.animated,
-            transition: props.showHideTransition,
+            animated,
+            transition: showHideTransition,
           }
         : null,
     networkActivityIndicatorVisible: props.networkActivityIndicatorVisible,
@@ -224,8 +223,6 @@ class StatusBar extends React.Component<Props> {
   static _propsStack = [];
 
   static _defaultProps = createStackEntry({
-    animated: false,
-    showHideTransition: 'fade',
     backgroundColor:
       Platform.OS === 'android'
         ? NativeStatusBarManagerAndroid.getConstants()
@@ -387,14 +384,6 @@ class StatusBar extends React.Component<Props> {
     return newEntry;
   }
 
-  static defaultProps: {|
-    animated: boolean,
-    showHideTransition: $TEMPORARY$string<'fade'>,
-  |} = {
-    animated: false,
-    showHideTransition: 'fade',
-  };
-
   _stackEntry = null;
 
   componentDidMount() {
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.js b/Libraries/Components/StatusBar/StatusBarIOS.js
deleted file mode 100644
index ccc561103f187c..00000000000000
--- a/Libraries/Components/StatusBar/StatusBarIOS.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-import NativeEventEmitter from '../../EventEmitter/NativeEventEmitter';
-import NativeStatusBarManagerIOS from './NativeStatusBarManagerIOS';
-
-/**
- * Use `StatusBar` for mutating the status bar.
- */
-class StatusBarIOS extends NativeEventEmitter {}
-
-module.exports = (new StatusBarIOS(NativeStatusBarManagerIOS): StatusBarIOS);
diff --git a/Libraries/Components/StatusBar/__tests__/StatusBar-test.js b/Libraries/Components/StatusBar/__tests__/StatusBar-test.js
new file mode 100644
index 00000000000000..a75d4fc1b0d31c
--- /dev/null
+++ b/Libraries/Components/StatusBar/__tests__/StatusBar-test.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @emails oncall+react_native
+ */
+
+'use strict';
+
+const React = require('react');
+const ReactTestRenderer = require('react-test-renderer');
+
+const StatusBar = require('../StatusBar');
+
+describe('StatusBar', () => {
+  it('renders the statusbar', () => {
+    const component = ReactTestRenderer.create(<StatusBar />);
+    expect(component).not.toBeNull();
+  });
+  it('renders the statusbar animated enabled', () => {
+    const component = ReactTestRenderer.create(<StatusBar animated={true} />);
+    expect(component.toTree().props.animated).toBe(true);
+  });
+  it('renders the statusbar with fade transition on hide', () => {
+    const component = ReactTestRenderer.create(<StatusBar hidden={true} />);
+    expect(component.toTree().props.hidden).toBe(true);
+  });
+  it('renders the statusbar with a background color', () => {
+    const component = ReactTestRenderer.create(
+      <StatusBar backgroundColor={'#fff'} />,
+    );
+    expect(component.toTree().props.backgroundColor).toBe('#fff');
+    expect(component.toTree().type._defaultProps.backgroundColor.animated).toBe(
+      false,
+    );
+  });
+  it('renders the statusbar with default barStyle', () => {
+    const component = ReactTestRenderer.create(<StatusBar />);
+    StatusBar.setBarStyle('default');
+    expect(component.toTree().type._defaultProps.barStyle.value).toBe(
+      'default',
+    );
+    expect(component.toTree().type._defaultProps.barStyle.animated).toBe(false);
+  });
+  it('renders the statusbar but should not be visible', () => {
+    const component = ReactTestRenderer.create(<StatusBar hidden={true} />);
+    expect(component.toTree().props.hidden).toBe(true);
+    expect(component.toTree().type._defaultProps.hidden.animated).toBe(false);
+    expect(component.toTree().type._defaultProps.hidden.transition).toBe(
+      'fade',
+    );
+  });
+  it('renders the statusbar with networkActivityIndicatorVisible true', () => {
+    const component = ReactTestRenderer.create(
+      <StatusBar networkActivityIndicatorVisible={true} />,
+    );
+    expect(component.toTree().props.networkActivityIndicatorVisible).toBe(true);
+  });
+});
diff --git a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js
index 61629b32cc6335..7d7b8dd36820c3 100644
--- a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js
+++ b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 import type {
diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index d2f4cf750e35ae..abb7f00b761df7 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -9,11 +9,10 @@
  * @generate-docs
  */
 
-'use strict';
-
 import Platform from '../../Utilities/Platform';
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
+import useMergeRefs from '../../Utilities/useMergeRefs';
 
 import AndroidSwitchNativeComponent, {
   Commands as AndroidSwitchCommands,
@@ -87,6 +86,8 @@ export type Props = $ReadOnly<{|
    */
   onValueChange?: ?(value: boolean) => Promise<void> | void,
 |}>;
+const returnsFalse = () => false;
+const returnsTrue = () => true;
 
 /**
   Renders a boolean input.
@@ -129,135 +130,114 @@ export type Props = $ReadOnly<{|
   export default App;
   ```
  */
-class Switch extends React.Component<Props> {
-  _nativeSwitchRef: ?React.ElementRef<
+
+const SwitchWithForwardedRef: React.AbstractComponent<
+  Props,
+  React.ElementRef<
+    typeof SwitchNativeComponent | typeof AndroidSwitchNativeComponent,
+  >,
+> = React.forwardRef(function Switch(props, forwardedRef): React.Node {
+  const {
+    disabled,
+    ios_backgroundColor,
+    onChange,
+    onValueChange,
+    style,
+    thumbColor,
+    trackColor,
+    value,
+    ...restProps
+  } = props;
+  const trackColorForFalse = trackColor?.false;
+  const trackColorForTrue = trackColor?.true;
+
+  const nativeSwitchRef = React.useRef<React.ElementRef<
     typeof SwitchNativeComponent | typeof AndroidSwitchNativeComponent,
-  >;
-  _lastNativeValue: ?boolean;
+  > | null>(null);
 
-  render(): React.Node {
-    const {
-      disabled,
-      ios_backgroundColor,
-      onChange,
-      onValueChange,
-      style,
-      thumbColor,
-      trackColor,
-      value,
-      ...props
-    } = this.props;
-
-    const trackColorForFalse = trackColor?.false;
-    const trackColorForTrue = trackColor?.true;
-
-    if (Platform.OS === 'android') {
-      const platformProps = {
-        enabled: disabled !== true,
-        on: value === true,
-        style,
-        thumbTintColor: thumbColor,
-        trackColorForFalse: trackColorForFalse,
-        trackColorForTrue: trackColorForTrue,
-        trackTintColor: value === true ? trackColorForTrue : trackColorForFalse,
-      };
-
-      return (
-        <AndroidSwitchNativeComponent
-          {...props}
-          {...platformProps}
-          accessibilityRole={props.accessibilityRole ?? 'switch'}
-          onChange={this._handleChange}
-          onResponderTerminationRequest={returnsFalse}
-          onStartShouldSetResponder={returnsTrue}
-          ref={this._handleSwitchNativeComponentRef}
-        />
-      );
-    } else {
-      const platformProps = {
-        disabled,
-        onTintColor: trackColorForTrue,
-        style: StyleSheet.compose(
-          {height: 31, width: 51},
-          StyleSheet.compose(
-            style,
-            ios_backgroundColor == null
-              ? null
-              : {
-                  backgroundColor: ios_backgroundColor,
-                  borderRadius: 16,
-                },
-          ),
-        ),
-        thumbTintColor: thumbColor,
-        tintColor: trackColorForFalse,
-        value: value === true,
-      };
-
-      return (
-        <SwitchNativeComponent
-          {...props}
-          {...platformProps}
-          accessibilityRole={props.accessibilityRole ?? 'switch'}
-          onChange={this._handleChange}
-          onResponderTerminationRequest={returnsFalse}
-          onStartShouldSetResponder={returnsTrue}
-          ref={this._handleSwitchNativeComponentRef}
-        />
-      );
-    }
-  }
+  const ref = useMergeRefs(nativeSwitchRef, forwardedRef);
 
-  componentDidUpdate() {
+  const [native, setNative] = React.useState({value: null});
+
+  const handleChange = (event: SwitchChangeEvent) => {
+    onChange?.(event);
+    onValueChange?.(event.nativeEvent.value);
+    setNative({value: event.nativeEvent.value});
+  };
+
+  React.useLayoutEffect(() => {
     // This is necessary in case native updates the switch and JS decides
     // that the update should be ignored and we should stick with the value
     // that we have in JS.
-    const nativeProps = {};
-    const value = this.props.value === true;
-
-    if (this._lastNativeValue !== value) {
-      nativeProps.value = value;
-    }
-
+    const jsValue = value === true;
+    const shouldUpdateNativeSwitch = native.value !== jsValue;
     if (
-      Object.keys(nativeProps).length > 0 &&
-      this._nativeSwitchRef &&
-      this._nativeSwitchRef.setNativeProps
+      shouldUpdateNativeSwitch &&
+      nativeSwitchRef.current?.setNativeProps != null
     ) {
       if (Platform.OS === 'android') {
-        AndroidSwitchCommands.setNativeValue(
-          this._nativeSwitchRef,
-          nativeProps.value,
-        );
+        AndroidSwitchCommands.setNativeValue(nativeSwitchRef.current, jsValue);
       } else {
-        SwitchCommands.setValue(this._nativeSwitchRef, nativeProps.value);
+        SwitchCommands.setValue(nativeSwitchRef.current, jsValue);
       }
     }
-  }
-
-  _handleChange = (event: SwitchChangeEvent) => {
-    if (this.props.onChange != null) {
-      this.props.onChange(event);
-    }
-
-    if (this.props.onValueChange != null) {
-      this.props.onValueChange(event.nativeEvent.value);
-    }
+  }, [value, native]);
 
-    this._lastNativeValue = event.nativeEvent.value;
-    this.forceUpdate();
-  };
+  if (Platform.OS === 'android') {
+    const platformProps = {
+      enabled: disabled !== true,
+      on: value === true,
+      style,
+      thumbTintColor: thumbColor,
+      trackColorForFalse: trackColorForFalse,
+      trackColorForTrue: trackColorForTrue,
+      trackTintColor: value === true ? trackColorForTrue : trackColorForFalse,
+    };
 
-  _handleSwitchNativeComponentRef = (
-    ref: ?React.ElementRef<
-      typeof SwitchNativeComponent | typeof AndroidSwitchNativeComponent,
-    >,
-  ) => {
-    this._nativeSwitchRef = ref;
-  };
-}
+    return (
+      <AndroidSwitchNativeComponent
+        {...restProps}
+        {...platformProps}
+        accessibilityRole={props.accessibilityRole ?? 'switch'}
+        onChange={handleChange}
+        onResponderTerminationRequest={returnsFalse}
+        onStartShouldSetResponder={returnsTrue}
+        ref={ref}
+      />
+    );
+  } else {
+    const platformProps = {
+      disabled,
+      onTintColor: trackColorForTrue,
+      style: StyleSheet.compose(
+        {height: 31, width: 51},
+        StyleSheet.compose(
+          style,
+          ios_backgroundColor == null
+            ? null
+            : {
+                backgroundColor: ios_backgroundColor,
+                borderRadius: 16,
+              },
+        ),
+      ),
+      thumbTintColor: thumbColor,
+      tintColor: trackColorForFalse,
+      value: value === true,
+    };
 
-const returnsFalse = () => false;
-const returnsTrue = () => true;
+    return (
+      <SwitchNativeComponent
+        {...restProps}
+        {...platformProps}
+        accessibilityRole={props.accessibilityRole ?? 'switch'}
+        onChange={handleChange}
+        onResponderTerminationRequest={returnsFalse}
+        onStartShouldSetResponder={returnsTrue}
+        ref={ref}
+      />
+    );
+  }
+});
 
-module.exports = Switch;
+export default SwitchWithForwardedRef;
diff --git a/Libraries/Components/Switch/SwitchNativeComponent.js b/Libraries/Components/Switch/SwitchNativeComponent.js
index 82e3be7dbbdbb7..7f4715de180865 100644
--- a/Libraries/Components/Switch/SwitchNativeComponent.js
+++ b/Libraries/Components/Switch/SwitchNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {BubblingEventHandler, WithDefault} from '../../Types/CodegenTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
diff --git a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
index dffccc428ff01a..944d4844e3f31a 100644
--- a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {
   BubblingEventHandler,
@@ -20,13 +18,15 @@ import type {
   WithDefault,
 } from '../../Types/CodegenTypes';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {TextStyleProp, ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
+import type {
+  TextStyleProp,
+  ViewStyleProp,
+  ColorValue,
+} from '../../StyleSheet/StyleSheet';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
 import AndroidTextInputViewConfig from './AndroidTextInputViewConfig';
-const ReactNativeViewConfigRegistry = require('../../Renderer/shims/ReactNativeViewConfigRegistry');
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 
 export type KeyboardType =
   // Cross Platform
@@ -36,10 +36,10 @@ export type KeyboardType =
   | 'phone-pad'
   | 'number-pad'
   | 'decimal-pad'
+  | 'url'
   // iOS-only
   | 'ascii-capable'
   | 'numbers-and-punctuation'
-  | 'url'
   | 'name-phone-pad'
   | 'twitter'
   | 'web-search'
@@ -96,7 +96,7 @@ export type NativeProps = $ReadOnly<{|
    *
    * @platform android
    */
-  autoCompleteType?: WithDefault<
+  autoComplete?: WithDefault<
     | 'cc-csc'
     | 'cc-exp'
     | 'cc-exp-month'
@@ -243,6 +243,7 @@ export type NativeProps = $ReadOnly<{|
    * - `decimal-pad`
    * - `email-address`
    * - `phone-pad`
+   * - `url`
    *
    * *Android Only*
    *
@@ -413,7 +414,7 @@ export type NativeProps = $ReadOnly<{|
   /**
    * The string that will be rendered before text input has been entered.
    */
-  placeholder?: ?string,
+  placeholder?: ?Stringish,
 
   /**
    * The text color of the placeholder string.
@@ -545,17 +546,10 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['focus', 'blur', 'setTextAndSelection'],
 });
 
-let AndroidTextInputNativeComponent;
-if (global.RN$Bridgeless) {
-  ReactNativeViewConfigRegistry.register('AndroidTextInput', () => {
-    return AndroidTextInputViewConfig;
-  });
-  AndroidTextInputNativeComponent = 'AndroidTextInput';
-} else {
-  AndroidTextInputNativeComponent = requireNativeComponent<NativeProps>(
-    'AndroidTextInput',
-  );
-}
+let AndroidTextInputNativeComponent = NativeComponentRegistry.get<NativeProps>(
+  'AndroidTextInput',
+  () => AndroidTextInputViewConfig,
+);
 
 // flowlint-next-line unclear-type:off
 export default ((AndroidTextInputNativeComponent: any): HostComponent<NativeProps>);
diff --git a/Libraries/Components/TextInput/AndroidTextInputViewConfig.js b/Libraries/Components/TextInput/AndroidTextInputViewConfig.js
index 0853b60a75dc65..bb36f91ffbf65e 100644
--- a/Libraries/Components/TextInput/AndroidTextInputViewConfig.js
+++ b/Libraries/Components/TextInput/AndroidTextInputViewConfig.js
@@ -8,10 +8,8 @@
  * @format
  */
 
-'use strict';
-
 import ReactNativeViewViewConfig from '../../Components/View/ReactNativeViewViewConfig';
-import type {ReactNativeBaseComponentViewConfig} from '../../Renderer/shims/ReactNativeTypes';
+import type {PartialViewConfig} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
 
 const AndroidTextInputViewConfig = {
   uiViewClassName: 'AndroidTextInput',
@@ -58,6 +56,9 @@ const AndroidTextInputViewConfig = {
     ...ReactNativeViewViewConfig.validAttributes,
 
     maxFontSizeMultiplier: true,
+    adjustsFontSizeToFit: true,
+    minimumFontScale: true,
+    autoFocus: true,
     placeholder: true,
     inlineImagePadding: true,
     contextMenuHidden: true,
@@ -80,8 +81,9 @@ const AndroidTextInputViewConfig = {
     returnKeyType: true,
     keyboardType: true,
     multiline: true,
-    color: true,
+    color: {process: require('../../StyleSheet/processColor')},
     autoCompleteType: true,
+    autoComplete: true,
     numberOfLines: true,
     letterSpacing: true,
     returnKeyLabel: true,
@@ -111,4 +113,4 @@ const AndroidTextInputViewConfig = {
   },
 };
 
-module.exports = (AndroidTextInputViewConfig: ReactNativeBaseComponentViewConfig<>);
+module.exports = (AndroidTextInputViewConfig: PartialViewConfig);
diff --git a/Libraries/Components/TextInput/InputAccessoryView.js b/Libraries/Components/TextInput/InputAccessoryView.js
index 71c225bc4de3e2..eb83a9ca0e7b8e 100644
--- a/Libraries/Components/TextInput/InputAccessoryView.js
+++ b/Libraries/Components/TextInput/InputAccessoryView.js
@@ -8,17 +8,15 @@
  * @format
  */
 
-'use strict';
-
-const Platform = require('../../Utilities/Platform');
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
+import * as React from 'react';
+import Platform from '../../Utilities/Platform';
+import StyleSheet, {
+  type ViewStyleProp,
+  type ColorValue,
+} from '../../StyleSheet/StyleSheet';
 
 import RCTInputAccessoryViewNativeComponent from './RCTInputAccessoryViewNativeComponent';
 
-import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-
 /**
  * Note: iOS only
  *
diff --git a/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js b/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js
index 6120e1614c0c22..1a37cd95e75c67 100644
--- a/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js
+++ b/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
diff --git a/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js b/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js
index 426cc610a0cf37..51e79f707e8d64 100644
--- a/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js
@@ -8,12 +8,11 @@
  * @format
  */
 
-'use strict';
-
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
+import RCTTextInputViewConfig from './RCTTextInputViewConfig';
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 
 type NativeType = HostComponent<mixed>;
 
@@ -23,8 +22,10 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['focus', 'blur', 'setTextAndSelection'],
 });
 
-const SinglelineTextInputNativeComponent: HostComponent<mixed> = requireNativeComponent<mixed>(
+const MultilineTextInputNativeComponent: HostComponent<mixed> = NativeComponentRegistry.get<mixed>(
   'RCTMultilineTextInputView',
+  () => RCTTextInputViewConfig,
 );
 
-export default SinglelineTextInputNativeComponent;
+// flowlint-next-line unclear-type:off
+export default ((MultilineTextInputNativeComponent: any): HostComponent<mixed>);
diff --git a/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js b/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js
index 7255649db8579b..e9ac2bc9cc20ca 100644
--- a/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js
@@ -8,14 +8,11 @@
  * @format
  */
 
-'use strict';
-
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import requireNativeComponent from '../../ReactNative/requireNativeComponent';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
-import RCTSinglelineTextInputViewConfig from './RCTSinglelineTextInputViewConfig';
-const ReactNativeViewConfigRegistry = require('../../Renderer/shims/ReactNativeViewConfigRegistry');
+import RCTTextInputViewConfig from './RCTTextInputViewConfig';
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 
 type NativeType = HostComponent<mixed>;
 
@@ -25,17 +22,10 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['focus', 'blur', 'setTextAndSelection'],
 });
 
-let SinglelineTextInputNativeComponent;
-if (global.RN$Bridgeless) {
-  ReactNativeViewConfigRegistry.register('RCTSinglelineTextInputView', () => {
-    return RCTSinglelineTextInputViewConfig;
-  });
-  SinglelineTextInputNativeComponent = 'RCTSinglelineTextInputView';
-} else {
-  SinglelineTextInputNativeComponent = requireNativeComponent<mixed>(
-    'RCTSinglelineTextInputView',
-  );
-}
+const SinglelineTextInputNativeComponent: HostComponent<mixed> = NativeComponentRegistry.get<mixed>(
+  'RCTSinglelineTextInputView',
+  () => RCTTextInputViewConfig,
+);
 
 // flowlint-next-line unclear-type:off
 export default ((SinglelineTextInputNativeComponent: any): HostComponent<mixed>);
diff --git a/Libraries/Components/TextInput/RCTSinglelineTextInputViewConfig.js b/Libraries/Components/TextInput/RCTTextInputViewConfig.js
similarity index 93%
rename from Libraries/Components/TextInput/RCTSinglelineTextInputViewConfig.js
rename to Libraries/Components/TextInput/RCTTextInputViewConfig.js
index 4836323d1a3615..ecd4868759c5ff 100644
--- a/Libraries/Components/TextInput/RCTSinglelineTextInputViewConfig.js
+++ b/Libraries/Components/TextInput/RCTTextInputViewConfig.js
@@ -8,12 +8,10 @@
  * @format
  */
 
-'use strict';
-
+import type {PartialViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 import ReactNativeViewViewConfig from '../../Components/View/ReactNativeViewViewConfig';
-import type {ReactNativeBaseComponentViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 
-const RCTSinglelineTextInputViewConfig = {
+const RCTTextInputViewConfig = {
   uiViewClassName: 'RCTSinglelineTextInputView',
   bubblingEventTypes: {
     topBlur: {
@@ -131,4 +129,4 @@ const RCTSinglelineTextInputViewConfig = {
   },
 };
 
-module.exports = (RCTSinglelineTextInputViewConfig: ReactNativeBaseComponentViewConfig<>);
+module.exports = (RCTTextInputViewConfig: PartialViewConfig);
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 36fa606e82a8f8..b9b3ec7344ed2e 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -4,30 +4,35 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-'use strict';
+import * as React from 'react';
 
-const DeprecatedTextInputPropTypes = require('../../DeprecatedPropTypes/DeprecatedTextInputPropTypes');
-const Platform = require('../../Utilities/Platform');
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const Text = require('../../Text/Text');
-const TextAncestor = require('../../Text/TextAncestor');
-const TextInputState = require('./TextInputState');
-const TouchableWithoutFeedback = require('../Touchable/TouchableWithoutFeedback');
+import DeprecatedTextInputPropTypes from '../../DeprecatedPropTypes/DeprecatedTextInputPropTypes';
 
-const invariant = require('invariant');
-const nullthrows = require('nullthrows');
-const setAndForwardRef = require('../../Utilities/setAndForwardRef');
+import Platform from '../../Utilities/Platform';
+import StyleSheet, {
+  type TextStyleProp,
+  type ViewStyleProp,
+  type ColorValue,
+} from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import TextAncestor from '../../Text/TextAncestor';
+import TextInputState from './TextInputState';
+import invariant from 'invariant';
+import nullthrows from 'nullthrows';
+import setAndForwardRef from '../../Utilities/setAndForwardRef';
+
+import usePressability from '../../Pressability/usePressability';
 
-import type {TextStyleProp, ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
-import type {SyntheticEvent, ScrollEvent} from '../../Types/CoreEventTypes';
-import type {PressEvent} from '../../Types/CoreEventTypes';
+import type {
+  SyntheticEvent,
+  ScrollEvent,
+  PressEvent,
+} from '../../Types/CoreEventTypes';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
 
@@ -156,10 +161,10 @@ export type KeyboardType =
   | 'phone-pad'
   | 'number-pad'
   | 'decimal-pad'
+  | 'url'
   // iOS-only
   | 'ascii-capable'
   | 'numbers-and-punctuation'
-  | 'url'
   | 'name-phone-pad'
   | 'twitter'
   | 'web-search'
@@ -221,26 +226,6 @@ export type TextContentType =
 type PasswordRules = string;
 
 type IOSProps = $ReadOnly<{|
-  /**
-   * If `false`, disables spell-check style (i.e. red underlines).
-   * The default value is inherited from `autoCorrect`.
-   * @platform ios
-   */
-  spellCheck?: ?boolean,
-
-  /**
-   * Determines the color of the keyboard.
-   * @platform ios
-   */
-  keyboardAppearance?: ?('default' | 'light' | 'dark'),
-
-  /**
-   * If `true`, the keyboard disables the return key when there is no text and
-   * automatically enables it when there is text. The default value is `false`.
-   * @platform ios
-   */
-  enablesReturnKeyAutomatically?: ?boolean,
-
   /**
    * When the clear button should appear on the right side of the text view.
    * This property is supported only for single-line TextInput component.
@@ -276,6 +261,13 @@ type IOSProps = $ReadOnly<{|
     | ?DataDetectorTypesType
     | $ReadOnlyArray<DataDetectorTypesType>,
 
+  /**
+   * If `true`, the keyboard disables the return key when there is no text and
+   * automatically enables it when there is text. The default value is `false`.
+   * @platform ios
+   */
+  enablesReturnKeyAutomatically?: ?boolean,
+
   /**
    * An optional identifier which links a custom InputAccessoryView to
    * this text input. The InputAccessoryView is rendered above the
@@ -285,11 +277,10 @@ type IOSProps = $ReadOnly<{|
   inputAccessoryViewID?: ?string,
 
   /**
-   * Give the keyboard and the system information about the
-   * expected semantic meaning for the content that users enter.
+   * Determines the color of the keyboard.
    * @platform ios
    */
-  textContentType?: ?TextContentType,
+  keyboardAppearance?: ?('default' | 'light' | 'dark'),
 
   /**
    * Provide rules for your password.
@@ -314,6 +305,20 @@ type IOSProps = $ReadOnly<{|
    * @platform ios
    */
   scrollEnabled?: ?boolean,
+
+  /**
+   * If `false`, disables spell-check style (i.e. red underlines).
+   * The default value is inherited from `autoCorrect`.
+   * @platform ios
+   */
+  spellCheck?: ?boolean,
+
+  /**
+   * Give the keyboard and the system information about the
+   * expected semantic meaning for the content that users enter.
+   * @platform ios
+   */
+  textContentType?: ?TextContentType,
 |}>;
 
 type AndroidProps = $ReadOnly<{|
@@ -341,35 +346,46 @@ type AndroidProps = $ReadOnly<{|
    *
    * @platform android
    */
-  autoCompleteType?: ?(
+  autoComplete?: ?(
+    | 'birthdate-day'
+    | 'birthdate-full'
+    | 'birthdate-month'
+    | 'birthdate-year'
     | 'cc-csc'
     | 'cc-exp'
+    | 'cc-exp-day'
     | 'cc-exp-month'
     | 'cc-exp-year'
     | 'cc-number'
     | 'email'
+    | 'gender'
     | 'name'
+    | 'name-family'
+    | 'name-given'
+    | 'name-middle'
+    | 'name-middle-initial'
+    | 'name-prefix'
+    | 'name-suffix'
     | 'password'
+    | 'password-new'
+    | 'postal-address'
+    | 'postal-address-country'
+    | 'postal-address-extended'
+    | 'postal-address-extended-postal-code'
+    | 'postal-address-locality'
+    | 'postal-address-region'
     | 'postal-code'
     | 'street-address'
+    | 'sms-otp'
     | 'tel'
+    | 'tel-country-code'
+    | 'tel-national'
+    | 'tel-device'
     | 'username'
+    | 'username-new'
     | 'off'
   ),
 
-  /**
-   * Sets the return key to the label. Use it instead of `returnKeyType`.
-   * @platform android
-   */
-  returnKeyLabel?: ?string,
-
-  /**
-   * Sets the number of lines for a `TextInput`. Use it with multiline set to
-   * `true` to be able to fill the lines.
-   * @platform android
-   */
-  numberOfLines?: ?number,
-
   /**
    * When `false`, if there is a small amount of space available around a text input
    * (e.g. landscape orientation on a phone), the OS may choose to have the user edit
@@ -380,18 +396,13 @@ type AndroidProps = $ReadOnly<{|
    */
   disableFullscreenUI?: ?boolean,
 
-  /**
-   * Set text break strategy on Android API Level 23+, possible values are `simple`, `highQuality`, `balanced`
-   * The default value is `simple`.
-   * @platform android
-   */
-  textBreakStrategy?: ?('simple' | 'highQuality' | 'balanced'),
-
-  /**
-   * The color of the `TextInput` underline.
-   * @platform android
-   */
-  underlineColorAndroid?: ?ColorValue,
+  importantForAutofill?: ?(
+    | 'auto'
+    | 'no'
+    | 'noExcludeDescendants'
+    | 'yes'
+    | 'yesExcludeDescendants'
+  ),
 
   /**
    * If defined, the provided image resource will be rendered on the left.
@@ -412,19 +423,37 @@ type AndroidProps = $ReadOnly<{|
    */
   inlineImagePadding?: ?number,
 
-  importantForAutofill?: ?(
-    | 'auto'
-    | 'no'
-    | 'noExcludeDescendants'
-    | 'yes'
-    | 'yesExcludeDescendants'
-  ),
+  /**
+   * Sets the number of lines for a `TextInput`. Use it with multiline set to
+   * `true` to be able to fill the lines.
+   * @platform android
+   */
+  numberOfLines?: ?number,
+
+  /**
+   * Sets the return key to the label. Use it instead of `returnKeyType`.
+   * @platform android
+   */
+  returnKeyLabel?: ?string,
 
   /**
    * When `false`, it will prevent the soft keyboard from showing when the field is focused.
    * Defaults to `true`.
    */
   showSoftInputOnFocus?: ?boolean,
+
+  /**
+   * Set text break strategy on Android API Level 23+, possible values are `simple`, `highQuality`, `balanced`
+   * The default value is `simple`.
+   * @platform android
+   */
+  textBreakStrategy?: ?('simple' | 'highQuality' | 'balanced'),
+
+  /**
+   * The color of the `TextInput` underline.
+   * @platform android
+   */
+  underlineColorAndroid?: ?ColorValue,
 |}>;
 
 export type Props = $ReadOnly<{|
@@ -460,19 +489,46 @@ export type Props = $ReadOnly<{|
   allowFontScaling?: ?boolean,
 
   /**
-   * Specifies largest possible scale a font can reach when `allowFontScaling` is enabled.
-   * Possible values:
-   * `null/undefined` (default): inherit from the parent node or the global default (0)
-   * `0`: no max, ignore parent/global default
-   * `>= 1`: sets the maxFontSizeMultiplier of this node to this value
+   * If `true`, the text field will blur when submitted.
+   * The default value is true for single-line fields and false for
+   * multiline fields. Note that for multiline fields, setting `blurOnSubmit`
+   * to `true` means that pressing return will blur the field and trigger the
+   * `onSubmitEditing` event instead of inserting a newline into the field.
    */
-  maxFontSizeMultiplier?: ?number,
+  blurOnSubmit?: ?boolean,
+
+  /**
+   * If `true`, caret is hidden. The default value is `false`.
+   *
+   * On Android devices manufactured by Xiaomi with Android Q,
+   * when keyboardType equals 'email-address'this will be set
+   * in native to 'true' to prevent a system related crash. This
+   * will cause cursor to be diabled as a side-effect.
+   *
+   */
+  caretHidden?: ?boolean,
+
+  /*
+   * If `true`, contextMenuHidden is hidden. The default value is `false`.
+   */
+  contextMenuHidden?: ?boolean,
+
+  /**
+   * Provides an initial value that will change when the user starts typing.
+   * Useful for simple use-cases where you do not want to deal with listening
+   * to events and updating the value prop to keep the controlled state in sync.
+   */
+  defaultValue?: ?Stringish,
 
   /**
    * If `false`, text is not editable. The default value is `true`.
    */
   editable?: ?boolean,
 
+  forwardedRef?: ?ReactRefSetter<
+    React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
+  >,
+
   /**
    * Determines which keyboard to open, e.g.`numeric`.
    *
@@ -484,6 +540,7 @@ export type Props = $ReadOnly<{|
    * - `decimal-pad`
    * - `email-address`
    * - `phone-pad`
+   * - `url`
    *
    * *iOS Only*
    *
@@ -491,7 +548,6 @@ export type Props = $ReadOnly<{|
    *
    * - `ascii-capable`
    * - `numbers-and-punctuation`
-   * - `url`
    * - `name-phone-pad`
    * - `twitter`
    * - `web-search`
@@ -506,38 +562,13 @@ export type Props = $ReadOnly<{|
   keyboardType?: ?KeyboardType,
 
   /**
-   * Determines how the return key should look. On Android you can also use
-   * `returnKeyLabel`.
-   *
-   * *Cross platform*
-   *
-   * The following values work across platforms:
-   *
-   * - `done`
-   * - `go`
-   * - `next`
-   * - `search`
-   * - `send`
-   *
-   * *Android Only*
-   *
-   * The following values work on Android only:
-   *
-   * - `none`
-   * - `previous`
-   *
-   * *iOS Only*
-   *
-   * The following values work on iOS only:
-   *
-   * - `default`
-   * - `emergency-call`
-   * - `google`
-   * - `join`
-   * - `route`
-   * - `yahoo`
+   * Specifies largest possible scale a font can reach when `allowFontScaling` is enabled.
+   * Possible values:
+   * `null/undefined` (default): inherit from the parent node or the global default (0)
+   * `0`: no max, ignore parent/global default
+   * `>= 1`: sets the maxFontSizeMultiplier of this node to this value
    */
-  returnKeyType?: ?ReturnKeyType,
+  maxFontSizeMultiplier?: ?number,
 
   /**
    * Limits the maximum number of characters that can be entered. Use this
@@ -556,11 +587,6 @@ export type Props = $ReadOnly<{|
    */
   onBlur?: ?(e: BlurEvent) => mixed,
 
-  /**
-   * Callback that is called when the text input is focused.
-   */
-  onFocus?: ?(e: FocusEvent) => mixed,
-
   /**
    * Callback that is called when the text input's text changes.
    */
@@ -586,6 +612,20 @@ export type Props = $ReadOnly<{|
    */
   onEndEditing?: ?(e: EditingEvent) => mixed,
 
+  /**
+   * Callback that is called when the text input is focused.
+   */
+  onFocus?: ?(e: FocusEvent) => mixed,
+
+  /**
+   * Callback that is called when a key is pressed.
+   * This will be called with `{ nativeEvent: { key: keyValue } }`
+   * where `keyValue` is `'Enter'` or `'Backspace'` for respective keys and
+   * the typed-in character otherwise including `' '` for space.
+   * Fires before `onChange` callbacks.
+   */
+  onKeyPress?: ?(e: KeyPressEvent) => mixed,
+
   /**
    * Called when a touch is engaged.
    */
@@ -609,15 +649,6 @@ export type Props = $ReadOnly<{|
    */
   onSubmitEditing?: ?(e: EditingEvent) => mixed,
 
-  /**
-   * Callback that is called when a key is pressed.
-   * This will be called with `{ nativeEvent: { key: keyValue } }`
-   * where `keyValue` is `'Enter'` or `'Backspace'` for respective keys and
-   * the typed-in character otherwise including `' '` for space.
-   * Fires before `onChange` callbacks.
-   */
-  onKeyPress?: ?(e: KeyPressEvent) => mixed,
-
   /**
    * Invoked on content scroll with `{ nativeEvent: { contentOffset: { x, y } } }`.
    * May also contain other properties from ScrollEvent but on Android contentSize
@@ -636,15 +667,44 @@ export type Props = $ReadOnly<{|
   placeholderTextColor?: ?ColorValue,
 
   /**
-   * If `true`, the text input obscures the text entered so that sensitive text
-   * like passwords stay secure. The default value is `false`. Does not work with 'multiline={true}'.
+   * Determines how the return key should look. On Android you can also use
+   * `returnKeyLabel`.
+   *
+   * *Cross platform*
+   *
+   * The following values work across platforms:
+   *
+   * - `done`
+   * - `go`
+   * - `next`
+   * - `search`
+   * - `send`
+   *
+   * *Android Only*
+   *
+   * The following values work on Android only:
+   *
+   * - `none`
+   * - `previous`
+   *
+   * *iOS Only*
+   *
+   * The following values work on iOS only:
+   *
+   * - `default`
+   * - `emergency-call`
+   * - `google`
+   * - `join`
+   * - `route`
+   * - `yahoo`
    */
-  secureTextEntry?: ?boolean,
+  returnKeyType?: ?ReturnKeyType,
 
   /**
-   * The highlight and cursor color of the text input.
+   * If `true`, the text input obscures the text entered so that sensitive text
+   * like passwords stay secure. The default value is `false`. Does not work with 'multiline={true}'.
    */
-  selectionColor?: ?ColorValue,
+  secureTextEntry?: ?boolean,
 
   /**
    * The start and end of the text input's selection. Set start and end to
@@ -656,37 +716,15 @@ export type Props = $ReadOnly<{|
   |}>,
 
   /**
-   * The value to show for the text input. `TextInput` is a controlled
-   * component, which means the native value will be forced to match this
-   * value prop if provided. For most uses, this works great, but in some
-   * cases this may cause flickering - one common cause is preventing edits
-   * by keeping value the same. In addition to simply setting the same value,
-   * either set `editable={false}`, or set/update `maxLength` to prevent
-   * unwanted edits without flicker.
-   */
-  value?: ?Stringish,
-
-  /**
-   * Provides an initial value that will change when the user starts typing.
-   * Useful for simple use-cases where you do not want to deal with listening
-   * to events and updating the value prop to keep the controlled state in sync.
+   * The highlight and cursor color of the text input.
    */
-  defaultValue?: ?Stringish,
+  selectionColor?: ?ColorValue,
 
   /**
    * If `true`, all text will automatically be selected on focus.
    */
   selectTextOnFocus?: ?boolean,
 
-  /**
-   * If `true`, the text field will blur when submitted.
-   * The default value is true for single-line fields and false for
-   * multiline fields. Note that for multiline fields, setting `blurOnSubmit`
-   * to `true` means that pressing return will blur the field and trigger the
-   * `onSubmitEditing` event instead of inserting a newline into the field.
-   */
-  blurOnSubmit?: ?boolean,
-
   /**
    * Note that not all Text styles are supported, an incomplete list of what is not supported includes:
    *
@@ -706,29 +744,22 @@ export type Props = $ReadOnly<{|
    */
   style?: ?TextStyleProp,
 
-  /**
-   * If `true`, caret is hidden. The default value is `false`.
-   *
-   * On Android devices manufactured by Xiaomi with Android Q,
-   * when keyboardType equals 'email-address'this will be set
-   * in native to 'true' to prevent a system related crash. This
-   * will cause cursor to be diabled as a side-effect.
-   *
-   */
-  caretHidden?: ?boolean,
-
+  // [ TODO(macOS GH#774)
   /*
-   * If `true`, contextMenuHidden is hidden. The default value is `false`.
+   * Specifies the tooltip.
    */
-  contextMenuHidden?: ?boolean,
+  tooltip?: ?string, // TODO(macOS GH#774) ]
 
-  forwardedRef?: ?ReactRefSetter<
-    React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
-  >,
-  /*
-   * Specifies the tooltip.
+  /**
+   * The value to show for the text input. `TextInput` is a controlled
+   * component, which means the native value will be forced to match this
+   * value prop if provided. For most uses, this works great, but in some
+   * cases this may cause flickering - one common cause is preventing edits
+   * by keeping value the same. In addition to simply setting the same value,
+   * either set `editable={false}`, or set/update `maxLength` to prevent
+   * unwanted edits without flicker.
    */
-  tooltip?: ?string,
+  value?: ?Stringish,
 |}>;
 
 type ImperativeMethods = $ReadOnly<{|
@@ -874,6 +905,8 @@ function InternalTextInput(props: Props): React.Node {
   // Therefore, we ignore selections and pass them through until the selection event has
   // been sent.
   // Note that this mitigation is NOT needed for Fabric.
+  // discovered when upgrading react-hooks
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   let selection: ?Selection =
     props.selection == null
       ? null
@@ -898,13 +931,14 @@ function InternalTextInput(props: Props): React.Node {
     selection = null;
   }
 
-  let viewCommands: TextInputNativeCommands<HostComponent<any>>;
+  let viewCommands;
   if (AndroidTextInputCommands) {
     viewCommands = AndroidTextInputCommands;
   } else {
-    viewCommands = props.multiline
-      ? RCTMultilineTextInputNativeCommands
-      : RCTSinglelineTextInputNativeCommands;
+    viewCommands =
+      props.multiline === true
+        ? RCTMultilineTextInputNativeCommands
+        : RCTSinglelineTextInputNativeCommands;
   }
 
   const text =
@@ -1032,12 +1066,6 @@ function InternalTextInput(props: Props): React.Node {
     },
   });
 
-  const _onPress = (event: PressEvent) => {
-    if (props.editable || props.editable === undefined) {
-      nullthrows(inputRef.current).focus();
-    }
-  };
-
   const _onChange = (event: ChangeEvent) => {
     const text = event.nativeEvent.text;
     props.onChange && props.onChange(event);
@@ -1091,39 +1119,71 @@ function InternalTextInput(props: Props): React.Node {
   };
 
   let textInput = null;
-  let additionalTouchableProps: {|
-    rejectResponderTermination?: $PropertyType<
-      Props,
-      'rejectResponderTermination',
-    >,
-    // This is a hack to let Flow know we want an exact object
-  |} = {...null};
 
   // The default value for `blurOnSubmit` is true for single-line fields and
   // false for multi-line fields.
   const blurOnSubmit = props.blurOnSubmit ?? !props.multiline;
 
-  if (
-    Platform.OS === 'ios' ||
-    Platform.OS === 'macos' /* TODO(macOS GH#774) */
-  ) {
-    const RCTTextInputView = props.multiline
-      ? RCTMultilineTextInputView
-      : RCTSinglelineTextInputView;
+  const accessible = props.accessible !== false;
+  const focusable = props.focusable !== false;
+
+  const config = React.useMemo(
+    () => ({
+      onPress: (event: PressEvent) => {
+        if (props.editable !== false) {
+          if (inputRef.current != null) {
+            inputRef.current.focus();
+          }
+        }
+      },
+      onPressIn: props.onPressIn,
+      onPressOut: props.onPressOut,
+      cancelable:
+        Platform.OS === 'ios' ||
+        Platform.OS === 'macos' /* TODO(macOS GH#774) */
+          ? !props.rejectResponderTermination
+          : null,
+    }),
+    [
+      props.editable,
+      props.onPressIn,
+      props.onPressOut,
+      props.rejectResponderTermination,
+    ],
+  );
+
+  // Hide caret during test runs due to a flashing caret
+  // makes screenshot tests flakey
+  let caretHidden = props.caretHidden;
+  if (Platform.isTesting) {
+    caretHidden = true;
+  }
+
+  // TextInput handles onBlur and onFocus events
+  // so omitting onBlur and onFocus pressability handlers here.
+  const {onBlur, onFocus, ...eventHandlers} = usePressability(config) || {};
 
-    const style = props.multiline
-      ? [styles.multilineInput, props.style]
-      : props.style;
+  if (Platform.OS === 'ios' || Platform.OS === 'macos') {
+    const RCTTextInputView =
+      props.multiline === true
+        ? RCTMultilineTextInputView
+        : RCTSinglelineTextInputView;
 
-    additionalTouchableProps.rejectResponderTermination =
-      props.rejectResponderTermination;
+    const style =
+      props.multiline === true
+        ? [styles.multilineInput, props.style]
+        : props.style;
 
     textInput = (
       <RCTTextInputView
         ref={_setNativeRef}
         {...props}
+        {...eventHandlers}
+        accessible={accessible}
         blurOnSubmit={blurOnSubmit}
+        caretHidden={caretHidden}
         dataDetectorTypes={props.dataDetectorTypes}
+        focusable={focusable}
         mostRecentEventCount={mostRecentEventCount}
         onBlur={_onBlur}
         onChange={_onChange}
@@ -1140,10 +1200,11 @@ function InternalTextInput(props: Props): React.Node {
   } else if (Platform.OS === 'android') {
     const style = [props.style];
     const autoCapitalize = props.autoCapitalize || 'sentences';
+    const placeholder = props.placeholder ?? '';
     let children = props.children;
     const childCount = React.Children.count(children);
     invariant(
-      !(props.value && childCount),
+      !(props.value != null && childCount),
       'Cannot specify both value and children.',
     );
     if (childCount > 1) {
@@ -1151,23 +1212,38 @@ function InternalTextInput(props: Props): React.Node {
     }
 
     textInput = (
-      /* $FlowFixMe the types for AndroidTextInput don't match up exactly with
-        the props for TextInput. This will need to get fixed */
+      /* $FlowFixMe[prop-missing] the types for AndroidTextInput don't match up
+       * exactly with the props for TextInput. This will need to get fixed */
+      /* $FlowFixMe[incompatible-type] the types for AndroidTextInput don't
+       * match up exactly with the props for TextInput. This will need to get
+       * fixed */
+      /* $FlowFixMe[incompatible-type-arg] the types for AndroidTextInput don't
+       * match up exactly with the props for TextInput. This will need to get
+       * fixed */
       <AndroidTextInput
         ref={_setNativeRef}
         {...props}
+        {...eventHandlers}
+        accessible={accessible}
         autoCapitalize={autoCapitalize}
         blurOnSubmit={blurOnSubmit}
+        caretHidden={caretHidden}
         children={children}
         disableFullscreenUI={props.disableFullscreenUI}
+        focusable={focusable}
         mostRecentEventCount={mostRecentEventCount}
         onBlur={_onBlur}
         onChange={_onChange}
         onFocus={_onFocus}
-        /* $FlowFixMe the types for AndroidTextInput don't match up exactly
-         * with the props for TextInput. This will need to get fixed */
+        /* $FlowFixMe[prop-missing] the types for AndroidTextInput don't match
+         * up exactly with the props for TextInput. This will need to get fixed
+         */
+        /* $FlowFixMe[incompatible-type-arg] the types for AndroidTextInput
+         * don't match up exactly with the props for TextInput. This will need
+         * to get fixed */
         onScroll={_onScroll}
         onSelectionChange={_onSelectionChange}
+        placeholder={placeholder}
         selection={selection}
         style={style}
         text={text}
@@ -1176,26 +1252,7 @@ function InternalTextInput(props: Props): React.Node {
     );
   }
   return (
-    <TextAncestor.Provider value={true}>
-      <TouchableWithoutFeedback
-        onLayout={props.onLayout}
-        onPress={_onPress}
-        onFocus={_onFocus} // TODO(macOS GH#774)
-        onBlur={_onBlur} // TODO(macOS GH#774)
-        onPressIn={props.onPressIn}
-        onPressOut={props.onPressOut}
-        accessible={props.accessible}
-        accessibilityLabel={props.accessibilityLabel}
-        accessibilityRole={props.accessibilityRole}
-        accessibilityHint={props.accessibilityHint} // TODO(macOS GH#774)
-        accessibilityState={props.accessibilityState}
-        nativeID={props.nativeID}
-        testID={props.testID}
-        enableFocusRing={props.enableFocusRing} // TODO(macOS GH#774)
-        {...additionalTouchableProps}>
-        {textInput}
-      </TouchableWithoutFeedback>
-    </TextAncestor.Provider>
+    <TextAncestor.Provider value={true}>{textInput}</TextAncestor.Provider>
   );
 }
 
@@ -1203,26 +1260,31 @@ const ExportedForwardRef: React.AbstractComponent<
   React.ElementConfig<typeof InternalTextInput>,
   React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
 > = React.forwardRef(function TextInput(
-  props,
+  {
+    allowFontScaling = true,
+    rejectResponderTermination = true,
+    underlineColorAndroid = 'transparent',
+    ...restProps
+  },
   forwardedRef: ReactRefSetter<
     React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
   >,
 ) {
-  return <InternalTextInput {...props} forwardedRef={forwardedRef} />;
+  return (
+    <InternalTextInput
+      allowFontScaling={allowFontScaling}
+      rejectResponderTermination={rejectResponderTermination}
+      underlineColorAndroid={underlineColorAndroid}
+      {...restProps}
+      forwardedRef={forwardedRef}
+    />
+  );
 });
 
-// $FlowFixMe
-ExportedForwardRef.defaultProps = {
-  allowFontScaling: true,
-  rejectResponderTermination: true,
-  underlineColorAndroid: 'transparent',
-};
-
 // TODO: Deprecate this
-// $FlowFixMe
 ExportedForwardRef.propTypes = DeprecatedTextInputPropTypes;
 
-// $FlowFixMe
+// $FlowFixMe[prop-missing]
 ExportedForwardRef.State = {
   currentlyFocusedInput: TextInputState.currentlyFocusedInput,
 
@@ -1250,6 +1312,7 @@ const styles = StyleSheet.create({
   },
 });
 
+// $FlowFixMe[unclear-type] Unclear type. Using `any` type is not safe.
 module.exports = ((ExportedForwardRef: any): React.AbstractComponent<
   React.ElementConfig<typeof InternalTextInput>,
   $ReadOnly<{|
diff --git a/Libraries/Components/TextInput/TextInputNativeCommands.js b/Libraries/Components/TextInput/TextInputNativeCommands.js
index 2584b7516c804b..5177dc5c7141e0 100644
--- a/Libraries/Components/TextInput/TextInputNativeCommands.js
+++ b/Libraries/Components/TextInput/TextInputNativeCommands.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 import type {Int32} from '../../Types/CodegenTypes';
diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js
index c1c8c523492fef..16679998506689 100644
--- a/Libraries/Components/TextInput/TextInputState.js
+++ b/Libraries/Components/TextInput/TextInputState.js
@@ -12,8 +12,6 @@
 // TextInputs. All calls relating to the keyboard should be funneled
 // through here.
 
-'use strict';
-
 const React = require('react');
 const Platform = require('../../Utilities/Platform');
 const {findNodeHandle} = require('../../Renderer/shims/ReactNative');
@@ -115,7 +113,7 @@ function blurTextInput(textField: ?ComponentRef) {
   if (typeof textField === 'number') {
     if (__DEV__) {
       console.error(
-        'focusTextInput must be called with a host component. Passing a react tag is deprecated.',
+        'blurTextInput must be called with a host component. Passing a react tag is deprecated.',
       );
     }
 
diff --git a/Libraries/Components/TextInput/__tests__/TextInput-test.js b/Libraries/Components/TextInput/__tests__/TextInput-test.js
index 38a64dccb6936c..5d912d78aef0b3 100644
--- a/Libraries/Components/TextInput/__tests__/TextInput-test.js
+++ b/Libraries/Components/TextInput/__tests__/TextInput-test.js
@@ -9,8 +9,6 @@
  * @flow-strict
  */
 
-'use strict';
-
 const React = require('react');
 const ReactTestRenderer = require('react-test-renderer');
 const TextInput = require('../TextInput');
diff --git a/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap b/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap
index f0d02d64ceacd7..ae28e1a23714ed 100644
--- a/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap
+++ b/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap
@@ -2,11 +2,9 @@
 
 exports[`TextInput tests should render as expected: should deep render when mocked (please verify output manually) 1`] = `
 <RCTSinglelineTextInputView
-  acceptsFirstMouse={true}
   accessible={true}
   allowFontScaling={true}
   blurOnSubmit={true}
-  enableFocusRing={true}
   focusable={true}
   forwardedRef={null}
   mostRecentEventCount={0}
@@ -34,11 +32,9 @@ exports[`TextInput tests should render as expected: should deep render when mock
 
 exports[`TextInput tests should render as expected: should deep render when not mocked (please verify output manually) 1`] = `
 <RCTSinglelineTextInputView
-  acceptsFirstMouse={true}
   accessible={true}
   allowFontScaling={true}
   blurOnSubmit={true}
-  enableFocusRing={true}
   focusable={true}
   forwardedRef={null}
   mostRecentEventCount={0}
@@ -64,18 +60,6 @@ exports[`TextInput tests should render as expected: should deep render when not
 />
 `;
 
-exports[`TextInput tests should render as expected: should shallow render as <TextInput /> when mocked 1`] = `
-<ForwardRef(TextInput)
-  allowFontScaling={true}
-  rejectResponderTermination={true}
-  underlineColorAndroid="transparent"
-/>
-`;
+exports[`TextInput tests should render as expected: should shallow render as <TextInput /> when mocked 1`] = `<ForwardRef(TextInput) />`;
 
-exports[`TextInput tests should render as expected: should shallow render as <TextInput /> when not mocked 1`] = `
-<ForwardRef(TextInput)
-  allowFontScaling={true}
-  rejectResponderTermination={true}
-  underlineColorAndroid="transparent"
-/>
-`;
+exports[`TextInput tests should render as expected: should shallow render as <TextInput /> when not mocked 1`] = `<ForwardRef(TextInput) />`;
diff --git a/Libraries/Components/ToastAndroid/NativeToastAndroid.js b/Libraries/Components/ToastAndroid/NativeToastAndroid.js
index 97f70204e9bfae..7325c47d484d52 100644
--- a/Libraries/Components/ToastAndroid/NativeToastAndroid.js
+++ b/Libraries/Components/ToastAndroid/NativeToastAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.android.js b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
index eb4374c2e48135..b15100a1769e2c 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.android.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
@@ -8,7 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
 import NativeToastAndroid from './NativeToastAndroid';
 
 /**
diff --git a/Libraries/Components/Touchable/BoundingDimensions.js b/Libraries/Components/Touchable/BoundingDimensions.js
index b0a48d0eccd65c..114b950733df31 100644
--- a/Libraries/Components/Touchable/BoundingDimensions.js
+++ b/Libraries/Components/Touchable/BoundingDimensions.js
@@ -8,8 +8,7 @@
  */
 
 'use strict';
-
-const PooledClass = require('./PooledClass');
+import PooledClass from './PooledClass';
 
 const twoArgumentPooler = PooledClass.twoArgumentPooler;
 
diff --git a/Libraries/Components/Touchable/PooledClass.js b/Libraries/Components/Touchable/PooledClass.js
index 4aee28a81c5ad7..1c9e940bd53df5 100644
--- a/Libraries/Components/Touchable/PooledClass.js
+++ b/Libraries/Components/Touchable/PooledClass.js
@@ -9,8 +9,7 @@
  */
 
 'use strict';
-
-const invariant = require('invariant');
+import invariant from 'invariant';
 
 /**
  * Static poolers. Several custom versions for each potential number of
diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js
index 37c9738dd4b844..5656bf9aaab912 100644
--- a/Libraries/Components/Touchable/Position.js
+++ b/Libraries/Components/Touchable/Position.js
@@ -8,8 +8,7 @@
  */
 
 'use strict';
-
-const PooledClass = require('./PooledClass');
+import PooledClass from './PooledClass';
 
 const twoArgumentPooler = PooledClass.twoArgumentPooler;
 
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index aae584d497337d..6622645cab6bca 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -8,19 +8,16 @@
  * @format
  */
 
-'use strict';
+import * as React from 'react';
+import BoundingDimensions from './BoundingDimensions';
+import Platform from '../../Utilities/Platform';
+import Position from './Position';
+import UIManager from '../../ReactNative/UIManager';
+import SoundManager from '../Sound/SoundManager';
 
-const BoundingDimensions = require('./BoundingDimensions');
-const Platform = require('../../Utilities/Platform');
-const Position = require('./Position');
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const UIManager = require('../../ReactNative/UIManager');
-const View = require('../View/View');
-const SoundManager = require('../Sound/SoundManager');
-
-const normalizeColor = require('../../StyleSheet/normalizeColor');
+import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {PressEvent} from '../../Types/CoreEventTypes';
 
@@ -421,6 +418,7 @@ const TouchableMixin = {
    * @param {SyntheticEvent} e Synthetic event from event system.
    *
    */
+  // $FlowFixMe[signature-verification-failure]
   touchableHandleResponderGrant: function(e: PressEvent) {
     const dispatchID = e.currentTarget;
     // Since e is used in a callback invoked on another event loop
@@ -462,6 +460,7 @@ const TouchableMixin = {
   /**
    * Place as callback for a DOM element's `onResponderRelease` event.
    */
+  // $FlowFixMe[signature-verification-failure]
   touchableHandleResponderRelease: function(e: PressEvent) {
     this.pressInLocation = null;
     this._receiveSignal(Signals.RESPONDER_RELEASE, e);
@@ -470,6 +469,7 @@ const TouchableMixin = {
   /**
    * Place as callback for a DOM element's `onResponderTerminate` event.
    */
+  // $FlowFixMe[signature-verification-failure]
   touchableHandleResponderTerminate: function(e: PressEvent) {
     this.pressInLocation = null;
     this._receiveSignal(Signals.RESPONDER_TERMINATED, e);
@@ -478,6 +478,7 @@ const TouchableMixin = {
   /**
    * Place as callback for a DOM element's `onResponderMove` event.
    */
+  // $FlowFixMe[signature-verification-failure]
   touchableHandleResponderMove: function(e: PressEvent) {
     // Measurement may not have returned yet.
     if (!this.state.touchable.positionOnActivate) {
@@ -563,6 +564,7 @@ const TouchableMixin = {
    * element that was blurred just prior to this. This can be overridden when
    * using `Touchable.Mixin.withoutDefaultFocusAndBlur`.
    */
+  // $FlowFixMe[signature-verification-failure]
   touchableHandleFocus: function(e: Event) {
     this.props.onFocus && this.props.onFocus(e);
   },
@@ -575,6 +577,7 @@ const TouchableMixin = {
    * This can be overridden when using
    * `Touchable.Mixin.withoutDefaultFocusAndBlur`.
    */
+  // $FlowFixMe[signature-verification-failure]
   touchableHandleBlur: function(e: Event) {
     this.props.onBlur && this.props.onBlur(e);
   },
@@ -668,6 +671,7 @@ const TouchableMixin = {
     }
   },
 
+  // $FlowFixMe[signature-verification-failure]
   _handleQueryLayout: function(
     l: number,
     t: number,
@@ -694,11 +698,13 @@ const TouchableMixin = {
     );
   },
 
+  // $FlowFixMe[signature-verification-failure]
   _handleDelay: function(e: PressEvent) {
     this.touchableDelayTimeout = null;
     this._receiveSignal(Signals.DELAY, e);
   },
 
+  // $FlowFixMe[signature-verification-failure]
   _handleLongDelay: function(e: PressEvent) {
     this.longPressDelayTimeout = null;
     const curState = this.state.touchable.touchState;
@@ -718,6 +724,7 @@ const TouchableMixin = {
    * @throws Error if invalid state transition or unrecognized signal.
    * @sideeffects
    */
+  // $FlowFixMe[signature-verification-failure]
   _receiveSignal: function(signal: Signal, e: PressEvent) {
     const responderID = this.state.touchable.responderID;
     const curState = this.state.touchable.touchState;
@@ -769,6 +776,7 @@ const TouchableMixin = {
     );
   },
 
+  // $FlowFixMe[signature-verification-failure]
   _savePressInLocation: function(e: PressEvent) {
     const touch = extractSingleTouch(e.nativeEvent);
     const pageX = touch && touch.pageX;
@@ -800,6 +808,7 @@ const TouchableMixin = {
    * @param {Event} e Native event.
    * @sideeffects
    */
+  // $FlowFixMe[signature-verification-failure]
   _performSideEffectsForTransition: function(
     curState: State,
     nextState: State,
@@ -861,11 +870,13 @@ const TouchableMixin = {
     this.touchableDelayTimeout = null;
   },
 
+  // $FlowFixMe[signature-verification-failure]
   _startHighlight: function(e: PressEvent) {
     this._savePressInLocation(e);
     this.touchableHandleActivePressIn && this.touchableHandleActivePressIn(e);
   },
 
+  // $FlowFixMe[signature-verification-failure]
   _endHighlight: function(e: PressEvent) {
     if (this.touchableHandleActivePressOut) {
       if (
@@ -899,7 +910,6 @@ TouchableMixin.withoutDefaultFocusAndBlur = TouchableMixinWithoutDefaultFocusAnd
 
 const Touchable = {
   Mixin: TouchableMixin,
-  TOUCH_TARGET_DEBUG: false, // Highlights all touchable targets. Toggle with Inspector.
   /**
    * Renders a debugging overlay to visualize touch target with hitSlop (might not work on Android).
    */
@@ -907,54 +917,15 @@ const Touchable = {
     color,
     hitSlop,
   }: {
-    color: string | number,
+    color: ColorValue,
     hitSlop: EdgeInsetsProp,
     ...
   }): null | React.Node => {
-    if (!Touchable.TOUCH_TARGET_DEBUG) {
-      return null;
-    }
-    if (!__DEV__) {
-      throw Error(
-        'Touchable.TOUCH_TARGET_DEBUG should not be enabled in prod!',
-      );
-    }
-    const debugHitSlopStyle = {};
-    hitSlop = hitSlop || {top: 0, bottom: 0, left: 0, right: 0};
-    for (const key in hitSlop) {
-      debugHitSlopStyle[key] = -hitSlop[key];
-    }
-    const normalizedColor = normalizeColor(color);
-    if (typeof normalizedColor !== 'number') {
-      return null;
+    if (__DEV__) {
+      return <PressabilityDebugView color={color} hitSlop={hitSlop} />;
     }
-    const hexColor =
-      '#' + ('00000000' + normalizedColor.toString(16)).substr(-8);
-    return (
-      <View
-        pointerEvents="none"
-        style={[
-          styles.debug,
-          /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.111 was deployed. To see the error,
-           * delete this comment and run Flow. */
-          {
-            borderColor: hexColor.slice(0, -2) + '55', // More opaque
-            backgroundColor: hexColor.slice(0, -2) + '0F', // Less opaque
-            ...debugHitSlopStyle,
-          },
-        ]}
-      />
-    );
+    return null;
   },
 };
 
-const styles = StyleSheet.create({
-  debug: {
-    position: 'absolute',
-    borderWidth: 1,
-    borderStyle: 'dashed',
-  },
-});
-
 module.exports = Touchable;
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index 9e1ae1abdf57f1..42b7e02c40acc6 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index d555c0a5f63e3d..e2b262d2f43a07 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
@@ -167,7 +165,10 @@ class TouchableHighlight extends React.Component<Props, State> {
   _createPressabilityConfig(): PressabilityConfig {
     return {
       cancelable: !this.props.rejectResponderTermination,
-      disabled: this.props.disabled,
+      disabled:
+        this.props.disabled != null
+          ? this.props.disabled
+          : this.props.accessibilityState?.disabled,
       hitSlop: this.props.hitSlop,
       delayLongPress: this.props.delayLongPress,
       delayPressIn: this.props.delayPressIn,
@@ -287,13 +288,21 @@ class TouchableHighlight extends React.Component<Props, State> {
       ...eventHandlersWithoutBlurAndFocus
     } = this.state.pressability.getEventHandlers();
 
+    const accessibilityState =
+      this.props.disabled != null
+        ? {
+            ...this.props.accessibilityState,
+            disabled: this.props.disabled,
+          }
+        : this.props.accessibilityState;
+
     return (
       <View
         accessible={this.props.accessible !== false}
         accessibilityLabel={this.props.accessibilityLabel}
         accessibilityHint={this.props.accessibilityHint} // TODO(OSS Candidate ISS#2710739)
         accessibilityRole={this.props.accessibilityRole}
-        accessibilityState={this.props.accessibilityState}
+        accessibilityState={accessibilityState}
         accessibilityValue={this.props.accessibilityValue}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
@@ -378,6 +387,13 @@ class TouchableHighlight extends React.Component<Props, State> {
   }
 }
 
-module.exports = (React.forwardRef((props, hostRef) => (
+const Touchable = (React.forwardRef((props, hostRef) => (
   <TouchableHighlight {...props} hostRef={hostRef} />
-)): React.AbstractComponent<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);
+)): React.AbstractComponent<
+  $ReadOnly<$Diff<Props, {|hostRef: React.Ref<typeof View>|}>>,
+  React.ElementRef<typeof View>,
+>);
+
+Touchable.displayName = 'TouchableHighlight';
+
+module.exports = Touchable;
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.js b/Libraries/Components/Touchable/TouchableNativeFeedback.js
index 05be0f481d35f0..a50a7680dc67b0 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
@@ -184,7 +182,10 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
   _createPressabilityConfig(): PressabilityConfig {
     return {
       cancelable: !this.props.rejectResponderTermination,
-      disabled: this.props.disabled,
+      disabled:
+        this.props.disabled != null
+          ? this.props.disabled
+          : this.props.accessibilityState?.disabled,
       hitSlop: this.props.hitSlop,
       delayLongPress: this.props.delayLongPress,
       delayPressIn: this.props.delayPressIn,
@@ -196,8 +197,8 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
       onPress: this.props.onPress,
       onPressIn: event => {
         if (Platform.OS === 'android') {
-          this._dispatchPressedStateChange(true);
           this._dispatchHotspotUpdate(event);
+          this._dispatchPressedStateChange(true);
         }
         if (this.props.onPressIn != null) {
           this.props.onPressIn(event);
@@ -271,6 +272,14 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
       ...eventHandlersWithoutBlurAndFocus
     } = this.state.pressability.getEventHandlers();
 
+    const accessibilityState =
+      this.props.disabled != null
+        ? {
+            ...this.props.accessibilityState,
+            disabled: this.props.disabled,
+          }
+        : this.props.accessibilityState;
+
     return React.cloneElement(
       element,
       {
@@ -285,7 +294,7 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
         accessibilityHint: this.props.accessibilityHint,
         accessibilityLabel: this.props.accessibilityLabel,
         accessibilityRole: this.props.accessibilityRole,
-        accessibilityState: this.props.accessibilityState,
+        accessibilityState: accessibilityState,
         accessibilityActions: this.props.accessibilityActions,
         onAccessibilityAction: this.props.onAccessibilityAction,
         accessibilityValue: this.props.accessibilityValue,
@@ -331,4 +340,6 @@ const getBackgroundProp =
           : {nativeBackgroundAndroid: background}
     : (background, useForeground) => null;
 
+TouchableNativeFeedback.displayName = 'TouchableNativeFeedback';
+
 module.exports = TouchableNativeFeedback;
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index 4e9d33d25c0d9e..b440d7a52ef0dd 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
@@ -38,7 +36,9 @@ type Props = $ReadOnly<{|
   activeOpacity?: ?number,
   style?: ?ViewStyleProp,
 
-  hostRef: React.Ref<typeof Animated.View>,
+  hostRef?: ?React.Ref<typeof Animated.View>,
+
+  // [ TODO(macOS GH#774)
   /*
    * Array of keys to receive key down events for
    * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
@@ -50,6 +50,7 @@ type Props = $ReadOnly<{|
    * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysUp?: ?Array<string>,
+  // TODO(macOS GH#774) ]
 |}>;
 
 type State = $ReadOnly<{|
@@ -150,7 +151,7 @@ class TouchableOpacity extends React.Component<Props, State> {
   _createPressabilityConfig(): PressabilityConfig {
     return {
       cancelable: !this.props.rejectResponderTermination,
-      disabled: this.props.disabled,
+      disabled: this.props.disabled ?? this.props.accessibilityState?.disabled,
       hitSlop: this.props.hitSlop,
       delayLongPress: this.props.delayLongPress,
       delayPressIn: this.props.delayPressIn,
@@ -213,6 +214,7 @@ class TouchableOpacity extends React.Component<Props, State> {
     Animated.timing(this.state.anim, {
       toValue,
       duration,
+      // $FlowFixMe[method-unbinding]
       easing: Easing.inOut(Easing.quad),
       useNativeDriver: true,
     }).start();
@@ -242,13 +244,21 @@ class TouchableOpacity extends React.Component<Props, State> {
       ...eventHandlersWithoutBlurAndFocus
     } = this.state.pressability.getEventHandlers();
 
+    const accessibilityState =
+      this.props.disabled != null
+        ? {
+            ...this.props.accessibilityState,
+            disabled: this.props.disabled,
+          }
+        : this.props.accessibilityState;
+
     return (
       <Animated.View
         accessible={this.props.accessible !== false}
         accessibilityLabel={this.props.accessibilityLabel}
         accessibilityHint={this.props.accessibilityHint}
         accessibilityRole={this.props.accessibilityRole}
-        accessibilityState={this.props.accessibilityState}
+        accessibilityState={accessibilityState}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
         accessibilityValue={this.props.accessibilityValue}
@@ -324,6 +334,10 @@ class TouchableOpacity extends React.Component<Props, State> {
   }
 }
 
-module.exports = (React.forwardRef((props, hostRef) => (
-  <TouchableOpacity {...props} hostRef={hostRef} />
-)): React.AbstractComponent<$ReadOnly<$Diff<Props, {|hostRef: mixed|}>>>);
+const Touchable = (React.forwardRef((props, ref) => (
+  <TouchableOpacity {...props} hostRef={ref} />
+)): React.AbstractComponent<Props, React.ElementRef<typeof Animated.View>>);
+
+Touchable.displayName = 'TouchableOpacity';
+
+module.exports = Touchable;
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 86c200783d2908..3082d96ccec552 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
@@ -34,7 +32,6 @@ import type {
 // [TODO(macOS GH#774)
 import type {DraggedTypesType} from '../View/DraggedType';
 // ]TODO(macOS GH#774)
-
 import View from '../../Components/View/View';
 import * as React from 'react';
 
@@ -99,7 +96,6 @@ const PASSTHROUGH_PROPS = [
   'accessibilityLabel',
   'accessibilityLiveRegion',
   'accessibilityRole',
-  'accessibilityState',
   'accessibilityValue',
   'accessibilityViewIsModal',
   'hitSlop',
@@ -152,6 +148,15 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
     const elementProps: {[string]: mixed, ...} = {
       ...eventHandlersWithoutBlurAndFocus,
       accessible: this.props.accessible !== false,
+      accessibilityState:
+        this.props.disabled != null
+          ? {
+              ...this.props.accessibilityState,
+              disabled: this.props.disabled,
+            }
+          : this.props.accessibilityState,
+      focusable:
+        this.props.focusable !== false && this.props.onPress !== undefined,
       acceptsFirstMouse:
         this.props.acceptsFirstMouse !== false && !this.props.disabled, // [TODO(macOS GH#774)
       // [macOS #656 We need to reconcile between focusable and acceptsKeyboardFocus
@@ -191,7 +196,10 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
 function createPressabilityConfig(props: Props): PressabilityConfig {
   return {
     cancelable: !props.rejectResponderTermination,
-    disabled: props.disabled,
+    disabled:
+      props.disabled !== null
+        ? props.disabled
+        : props.accessibilityState?.disabled,
     hitSlop: props.hitSlop,
     delayLongPress: props.delayLongPress,
     delayPressIn: props.delayPressIn,
@@ -212,4 +220,6 @@ function createPressabilityConfig(props: Props): PressabilityConfig {
   };
 }
 
+TouchableWithoutFeedback.displayName = 'TouchableWithoutFeedback';
+
 module.exports = TouchableWithoutFeedback;
diff --git a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
index 453f7407a2d12e..f25f4150dedf31 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
@@ -10,14 +10,16 @@
 
 'use strict';
 
-const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
-const Text = require('../../../Text/Text');
-const TouchableHighlight = require('../TouchableHighlight');
+import * as React from 'react';
+import Text from '../../../Text/Text';
+import View from '../../View/View';
+import TouchableHighlight from '../TouchableHighlight';
+
+const render = require('../../../../jest/renderer');
 
 describe('TouchableHighlight', () => {
   it('renders correctly', () => {
-    const instance = ReactTestRenderer.create(
+    const instance = render.create(
       <TouchableHighlight style={{}}>
         <Text>Touchable</Text>
       </TouchableHighlight>,
@@ -25,4 +27,64 @@ describe('TouchableHighlight', () => {
 
     expect(instance.toJSON()).toMatchSnapshot();
   });
+
+  it('has displayName', () => {
+    expect(TouchableHighlight.displayName).toEqual('TouchableHighlight');
+  });
+});
+
+describe('TouchableHighlight with disabled state', () => {
+  it('should be disabled when disabled is true', () => {
+    expect(
+      render.create(
+        <TouchableHighlight disabled={true}>
+          <View />
+        </TouchableHighlight>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should be disabled when disabled is true and accessibilityState is empty', () => {
+    expect(
+      render.create(
+        <TouchableHighlight disabled={true} accessibilityState={{}}>
+          <View />
+        </TouchableHighlight>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should keep accessibilityState when disabled is true', () => {
+    expect(
+      render.create(
+        <TouchableHighlight
+          disabled={true}
+          accessibilityState={{checked: true}}>
+          <View />
+        </TouchableHighlight>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should overwrite accessibilityState with value of disabled prop', () => {
+    expect(
+      render.create(
+        <TouchableHighlight
+          disabled={true}
+          accessibilityState={{disabled: false}}>
+          <View />
+        </TouchableHighlight>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should disable button when accessibilityState is disabled', () => {
+    expect(
+      render.create(
+        <TouchableHighlight accessibilityState={{disabled: true}}>
+          <View />
+        </TouchableHighlight>,
+      ),
+    ).toMatchSnapshot();
+  });
 });
diff --git a/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js b/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js
new file mode 100644
index 00000000000000..237b1a22745cb9
--- /dev/null
+++ b/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @emails oncall+react_native
+ */
+
+'use strict';
+
+import * as React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
+import Text from '../../../Text/Text';
+import TouchableNativeFeedback from '../TouchableNativeFeedback';
+import View from '../../View/View';
+
+const render = require('../../../../jest/renderer');
+
+describe('TouchableWithoutFeedback', () => {
+  it('renders correctly', () => {
+    const instance = render.create(
+      <TouchableNativeFeedback style={{}}>
+        <Text>Touchable</Text>
+      </TouchableNativeFeedback>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+
+  it('has displayName', () => {
+    expect(TouchableNativeFeedback.displayName).toEqual(
+      'TouchableNativeFeedback',
+    );
+  });
+});
+
+describe('<TouchableNativeFeedback />', () => {
+  it('should render as expected', () => {
+    const instance = ReactTestRenderer.create(
+      <TouchableNativeFeedback>
+        <View />
+      </TouchableNativeFeedback>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+});
+
+describe('<TouchableNativeFeedback disabled={true}>', () => {
+  it('should be disabled when disabled is true', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableNativeFeedback disabled={true}>
+          <View />
+        </TouchableNativeFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+});
+
+describe('<TouchableNativeFeedback disabled={true} accessibilityState={{}}>', () => {
+  it('should be disabled when disabled is true and accessibilityState is empty', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableNativeFeedback disabled={true} accessibilityState={{}}>
+          <View />
+        </TouchableNativeFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+});
+
+describe('<TouchableNativeFeedback disabled={true} accessibilityState={{checked: true}}>', () => {
+  it('should keep accessibilityState when disabled is true', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableNativeFeedback
+          disabled={true}
+          accessibilityState={{checked: true}}>
+          <View />
+        </TouchableNativeFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+});
+
+describe('<TouchableNativeFeedback disabled={true} accessibilityState={{disabled:false}}>', () => {
+  it('should overwrite accessibilityState with value of disabled prop', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableNativeFeedback
+          disabled={true}
+          accessibilityState={{disabled: false}}>
+          <View />
+        </TouchableNativeFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+});
+
+describe('<TouchableNativeFeedback disabled={false} accessibilityState={{disabled:true}}>', () => {
+  it('should overwrite accessibilityState with value of disabled prop', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableNativeFeedback
+          disabled={false}
+          accessibilityState={{disabled: true}}>
+          <View />
+        </TouchableNativeFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js b/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js
new file mode 100644
index 00000000000000..f38211b67aeb46
--- /dev/null
+++ b/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @emails oncall+react_native
+ */
+
+'use strict';
+
+const React = require('react');
+const ReactTestRenderer = require('react-test-renderer');
+const Text = require('../../../Text/Text');
+const TouchableOpacity = require('../TouchableOpacity');
+
+describe('TouchableOpacity', () => {
+  it('renders correctly', () => {
+    const instance = ReactTestRenderer.create(
+      <TouchableOpacity>
+        <Text>Touchable</Text>
+      </TouchableOpacity>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+
+  it('renders in disabled state when a disabled prop is passed', () => {
+    const instance = ReactTestRenderer.create(
+      <TouchableOpacity disabled={true}>
+        <Text>Touchable</Text>
+      </TouchableOpacity>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+
+  it('renders in disabled state when a key disabled in accessibilityState is passed', () => {
+    const instance = ReactTestRenderer.create(
+      <TouchableOpacity accessibilityState={{disabled: true}}>
+        <Text>Touchable</Text>
+      </TouchableOpacity>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+
+  it('has displayName', () => {
+    expect(TouchableOpacity.displayName).toEqual('TouchableOpacity');
+  });
+});
diff --git a/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js b/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js
new file mode 100644
index 00000000000000..0648d372d3883d
--- /dev/null
+++ b/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @emails oncall+react_native
+ */
+
+'use strict';
+
+import * as React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
+import Text from '../../../Text/Text';
+import View from '../../View/View';
+import TouchableWithoutFeedback from '../TouchableWithoutFeedback';
+
+describe('TouchableWithoutFeedback', () => {
+  it('renders correctly', () => {
+    const instance = ReactTestRenderer.create(
+      <TouchableWithoutFeedback style={{}}>
+        <Text>Touchable</Text>
+      </TouchableWithoutFeedback>,
+    );
+
+    expect(instance.toJSON()).toMatchSnapshot();
+  });
+
+  it('has displayName', () => {
+    expect(TouchableWithoutFeedback.displayName).toEqual(
+      'TouchableWithoutFeedback',
+    );
+  });
+});
+
+describe('TouchableWithoutFeedback with disabled state', () => {
+  it('should be disabled when disabled is true', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableWithoutFeedback disabled={true}>
+          <View />
+        </TouchableWithoutFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should be disabled when disabled is true and accessibilityState is empty', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableWithoutFeedback disabled={true} accessibilityState={{}}>
+          <View />
+        </TouchableWithoutFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should keep accessibilityState when disabled is true', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableWithoutFeedback
+          disabled={true}
+          accessibilityState={{checked: true}}>
+          <View />
+        </TouchableWithoutFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should overwrite accessibilityState with value of disabled prop', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableWithoutFeedback
+          disabled={true}
+          accessibilityState={{disabled: false}}>
+          <View />
+        </TouchableWithoutFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('should disable button when accessibilityState is disabled', () => {
+    expect(
+      ReactTestRenderer.create(
+        <TouchableWithoutFeedback accessibilityState={{disabled: true}}>
+          <View />
+        </TouchableWithoutFeedback>,
+      ),
+    ).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
index b1706023acaf4a..a5684fefd19f48 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
@@ -22,3 +22,129 @@ exports[`TouchableHighlight renders correctly 1`] = `
   </Text>
 </View>
 `;
+
+exports[`TouchableHighlight with disabled state should be disabled when disabled is true 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`TouchableHighlight with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`TouchableHighlight with disabled state should disable button when accessibilityState is disabled 1`] = `
+<View
+  acceptsFirstMouse={true}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={true}
+  focusable={true}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`TouchableHighlight with disabled state should keep accessibilityState when disabled is true 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "checked": true,
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
+
+exports[`TouchableHighlight with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  <View />
+</View>
+`;
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap
new file mode 100644
index 00000000000000..4c9f7b2c846993
--- /dev/null
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap
@@ -0,0 +1,141 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<TouchableNativeFeedback /> should render as expected 1`] = `
+<View
+  accessible={true}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`<TouchableNativeFeedback disabled={false} accessibilityState={{disabled:true}}> should overwrite accessibilityState with value of disabled prop 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "disabled": false,
+    }
+  }
+  accessible={true}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{}}> should be disabled when disabled is true and accessibilityState is empty 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{checked: true}}> should keep accessibilityState when disabled is true 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "checked": true,
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{disabled:false}}> should overwrite accessibilityState with value of disabled prop 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`<TouchableNativeFeedback disabled={true}> should be disabled when disabled is true 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`TouchableWithoutFeedback renders correctly 1`] = `
+<Text
+  accessible={true}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  Touchable
+</Text>
+`;
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap
new file mode 100644
index 00000000000000..d72c557b33faba
--- /dev/null
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap
@@ -0,0 +1,98 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TouchableOpacity renders correctly 1`] = `
+<View
+  acceptsFirstMouse={true}
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={true}
+  focusable={true}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <Text>
+    Touchable
+  </Text>
+</View>
+`;
+
+exports[`TouchableOpacity renders in disabled state when a disabled prop is passed 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <Text>
+    Touchable
+  </Text>
+</View>
+`;
+
+exports[`TouchableOpacity renders in disabled state when a key disabled in accessibilityState is passed 1`] = `
+<View
+  acceptsFirstMouse={true}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={true}
+  focusable={true}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <Text>
+    Touchable
+  </Text>
+</View>
+`;
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap
new file mode 100644
index 00000000000000..9dfeb4e6d44ce5
--- /dev/null
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap
@@ -0,0 +1,137 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TouchableWithoutFeedback renders correctly 1`] = `
+<Text
+  acceptsFirstMouse={true}
+  accessible={true}
+  enableFocusRing={true}
+  focusable={true}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+>
+  Touchable
+</Text>
+`;
+
+exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`TouchableWithoutFeedback with disabled state should be disabled when disabled is true and accessibilityState is empty 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`TouchableWithoutFeedback with disabled state should disable button when accessibilityState is disabled 1`] = `
+<View
+  acceptsFirstMouse={true}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={true}
+  focusable={true}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`TouchableWithoutFeedback with disabled state should keep accessibilityState when disabled is true 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "checked": true,
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
+
+exports[`TouchableWithoutFeedback with disabled state should overwrite accessibilityState with value of disabled prop 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  enableFocusRing={false}
+  focusable={false}
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+/>
+`;
diff --git a/Libraries/Components/Touchable/ensurePositiveDelayProps.js b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
index 69dad5539faf2b..bd9b3028399cd0 100644
--- a/Libraries/Components/Touchable/ensurePositiveDelayProps.js
+++ b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
@@ -9,8 +9,7 @@
  */
 
 'use strict';
-
-const invariant = require('invariant');
+import invariant from 'invariant';
 
 const ensurePositiveDelayProps = function(props: any) {
   invariant(
diff --git a/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js b/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js
index 796650fefc53e3..2a2969905bc65d 100644
--- a/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js
+++ b/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {WithDefault} from '../../Types/CodegenTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js
index 58804b7a772583..4bbb41060ff32f 100644
--- a/Libraries/Components/UnimplementedViews/UnimplementedView.js
+++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js
@@ -9,9 +9,8 @@
  */
 
 'use strict';
-
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
+import * as React from 'react';
+import StyleSheet from '../../StyleSheet/StyleSheet';
 
 /**
  * Common implementation for a simple stubbed view. Simply applies the view's styles to the inner
diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js
index ebd3c63df5614b..9f87352219ef2b 100644
--- a/Libraries/Components/View/ReactNativeStyleAttributes.js
+++ b/Libraries/Components/View/ReactNativeStyleAttributes.js
@@ -8,80 +8,145 @@
  * @flow
  */
 
-'use strict';
+import type {AnyAttributeType} from '../../Renderer/shims/ReactNativeTypes';
+import processColor from '../../StyleSheet/processColor';
+import processTransform from '../../StyleSheet/processTransform';
+import sizesDiffer from '../../Utilities/differ/sizesDiffer';
 
-const DeprecatedImageStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedImageStylePropTypes');
-const DeprecatedTextStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedTextStylePropTypes');
-const DeprecatedViewStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedViewStylePropTypes');
-
-const processColor = require('../../StyleSheet/processColor');
-const processTransform = require('../../StyleSheet/processTransform');
-const sizesDiffer = require('../../Utilities/differ/sizesDiffer');
+const colorAttributes = {process: processColor};
 
-type ReturnBoolType = <V>(V) => true;
-type BoolifiedDeprecatedViewStylePropTypes = $ObjMap<
-  typeof DeprecatedViewStylePropTypes,
-  ReturnBoolType,
->;
-type BoolifiedDeprecatedTextStylePropTypes = $ObjMapi<
-  typeof DeprecatedTextStylePropTypes,
-  ReturnBoolType,
->;
-type BoolifiedDeprecatedImageStylePropTypes = $ObjMapi<
-  typeof DeprecatedImageStylePropTypes,
-  ReturnBoolType,
->;
+const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
+  /**
+   * Layout
+   */
+  alignContent: true,
+  alignItems: true,
+  alignSelf: true,
+  aspectRatio: true,
+  borderBottomWidth: true,
+  borderEndWidth: true,
+  borderLeftWidth: true,
+  borderRightWidth: true,
+  borderStartWidth: true,
+  borderTopWidth: true,
+  borderWidth: true,
+  bottom: true,
+  direction: true,
+  display: true,
+  end: true,
+  flex: true,
+  flexBasis: true,
+  flexDirection: true,
+  flexGrow: true,
+  flexShrink: true,
+  flexWrap: true,
+  height: true,
+  justifyContent: true,
+  left: true,
+  margin: true,
+  marginBottom: true,
+  marginEnd: true,
+  marginHorizontal: true,
+  marginLeft: true,
+  marginRight: true,
+  marginStart: true,
+  marginTop: true,
+  marginVertical: true,
+  maxHeight: true,
+  maxWidth: true,
+  minHeight: true,
+  minWidth: true,
+  overflow: true,
+  padding: true,
+  paddingBottom: true,
+  paddingEnd: true,
+  paddingHorizontal: true,
+  paddingLeft: true,
+  paddingRight: true,
+  paddingStart: true,
+  paddingTop: true,
+  paddingVertical: true,
+  position: true,
+  right: true,
+  start: true,
+  top: true,
+  width: true,
+  zIndex: true,
 
-type StyleAttributesType = {
-  ...BoolifiedDeprecatedViewStylePropTypes,
-  ...BoolifiedDeprecatedTextStylePropTypes,
-  ...BoolifiedDeprecatedImageStylePropTypes,
-  transform: $ReadOnly<{|process: typeof processTransform|}> | true,
-  shadowOffset: $ReadOnly<{|diff: typeof sizesDiffer|}> | true,
-  backgroundColor: typeof colorAttributes | true,
-  borderBottomColor: typeof colorAttributes | true,
-  borderColor: typeof colorAttributes | true,
-  borderLeftColor: typeof colorAttributes | true,
-  borderRightColor: typeof colorAttributes | true,
-  borderTopColor: typeof colorAttributes | true,
-  borderStartColor: typeof colorAttributes | true,
-  borderEndColor: typeof colorAttributes | true,
-  color: typeof colorAttributes | true,
-  shadowColor: typeof colorAttributes | true,
-  textDecorationColor: typeof colorAttributes | true,
-  tintColor: typeof colorAttributes | true,
-  textShadowColor: typeof colorAttributes | true,
-  overlayColor: typeof colorAttributes | true,
-  ...
-};
+  /**
+   * Shadow
+   */
+  elevation: true,
+  shadowColor: colorAttributes,
+  shadowOffset: {diff: sizesDiffer},
+  shadowOpacity: true,
+  shadowRadius: true,
 
-const ReactNativeStyleAttributes: StyleAttributesType = {};
+  /**
+   * Transform
+   */
+  decomposedMatrix: true, // @deprecated
+  rotation: true, // @deprecated
+  scaleX: true, // @deprecated
+  scaleY: true, // @deprecated
+  transform: {process: processTransform},
+  transformMatrix: true, // @deprecated
+  translateX: true, // @deprecated
+  translateY: true, // @deprecated
 
-for (const attributeName of Object.keys({
-  ...DeprecatedViewStylePropTypes,
-  ...DeprecatedTextStylePropTypes,
-  ...DeprecatedImageStylePropTypes,
-})) {
-  ReactNativeStyleAttributes[attributeName] = true;
-}
+  /**
+   * View
+   */
+  backfaceVisibility: true,
+  backgroundColor: colorAttributes,
+  borderBottomColor: colorAttributes,
+  borderBottomEndRadius: true,
+  borderBottomLeftRadius: true,
+  borderBottomRightRadius: true,
+  borderBottomStartRadius: true,
+  borderColor: colorAttributes,
+  borderEndColor: colorAttributes,
+  borderLeftColor: colorAttributes,
+  borderRadius: true,
+  borderRightColor: colorAttributes,
+  borderStartColor: colorAttributes,
+  borderStyle: true,
+  borderTopColor: colorAttributes,
+  borderTopEndRadius: true,
+  borderTopLeftRadius: true,
+  borderTopRightRadius: true,
+  borderTopStartRadius: true,
+  opacity: true,
 
-ReactNativeStyleAttributes.transform = {process: processTransform};
-ReactNativeStyleAttributes.shadowOffset = {diff: sizesDiffer};
+  /**
+   * Text
+   */
+  color: colorAttributes,
+  fontFamily: true,
+  fontSize: true,
+  fontStyle: true,
+  fontVariant: true,
+  fontWeight: true,
+  includeFontPadding: true,
+  letterSpacing: true,
+  lineHeight: true,
+  textAlign: true,
+  textAlignVertical: true,
+  textDecorationColor: colorAttributes,
+  textDecorationLine: true,
+  textDecorationStyle: true,
+  textShadowColor: colorAttributes,
+  textShadowOffset: true,
+  textShadowRadius: true,
+  textTransform: true,
+  writingDirection: true,
 
-const colorAttributes = {process: processColor};
-ReactNativeStyleAttributes.backgroundColor = colorAttributes;
-ReactNativeStyleAttributes.borderBottomColor = colorAttributes;
-ReactNativeStyleAttributes.borderColor = colorAttributes;
-ReactNativeStyleAttributes.borderLeftColor = colorAttributes;
-ReactNativeStyleAttributes.borderRightColor = colorAttributes;
-ReactNativeStyleAttributes.borderTopColor = colorAttributes;
-ReactNativeStyleAttributes.borderStartColor = colorAttributes;
-ReactNativeStyleAttributes.borderEndColor = colorAttributes;
-ReactNativeStyleAttributes.color = colorAttributes;
-ReactNativeStyleAttributes.shadowColor = colorAttributes;
-ReactNativeStyleAttributes.textDecorationColor = colorAttributes;
-ReactNativeStyleAttributes.tintColor = colorAttributes;
-ReactNativeStyleAttributes.textShadowColor = colorAttributes;
-ReactNativeStyleAttributes.overlayColor = colorAttributes;
+  /**
+   * Image
+   */
+  overlayColor: colorAttributes,
+  resizeMode: true,
+  tintColor: colorAttributes,
+};
 
 module.exports = ReactNativeStyleAttributes;
diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js
index 7f9452fc9447ec..2e5ffda73f9105 100644
--- a/Libraries/Components/View/ReactNativeViewAttributes.js
+++ b/Libraries/Components/View/ReactNativeViewAttributes.js
@@ -9,8 +9,7 @@
  */
 
 'use strict';
-
-const ReactNativeStyleAttributes = require('./ReactNativeStyleAttributes');
+import ReactNativeStyleAttributes from './ReactNativeStyleAttributes';
 
 const UIView = {
   pointerEvents: true,
diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js
index 4e0c813f71357b..0a3a27ac0370df 100644
--- a/Libraries/Components/View/ReactNativeViewViewConfig.js
+++ b/Libraries/Components/View/ReactNativeViewViewConfig.js
@@ -8,17 +8,17 @@
  * @format
  */
 
-'use strict';
+import type {ViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 import ReactNativeViewViewConfigAndroid from './ReactNativeViewViewConfigAndroid';
 import ReactNativeViewViewConfigMacOS from './ReactNativeViewViewConfigMacOS'; // TODO(macOS GH#774)
 import {Platform} from 'react-native';
 
-const ReactNativeViewConfig = {
+const ReactNativeViewConfig: ViewConfig = {
   uiViewClassName: 'RCTView',
   baseModuleName: null,
   Manager: 'ViewManager',
-  Commands: ({}: {...}),
-  Constants: ({}: {...}),
+  Commands: {},
+  Constants: {},
   bubblingEventTypes: {
     ...ReactNativeViewViewConfigAndroid.bubblingEventTypes,
     topBlur: {
@@ -180,7 +180,7 @@ const ReactNativeViewConfig = {
     flexShrink: true,
     flexWrap: true,
     height: true,
-    hitSlop: {diff: (require('../../Utilities/differ/insetsDiffer'): any)},
+    hitSlop: {diff: require('../../Utilities/differ/insetsDiffer')},
     importantForAccessibility: true,
     justifyContent: true,
     left: true,
@@ -332,9 +332,10 @@ const ReactNativeViewConfig = {
       textTransform: true,
       tintColor: {process: require('../../StyleSheet/processColor')},
       top: true,
-      transform: ((Platform.OS === 'ios' || Platform.OS === 'macos' // TODO(macOS GH#774)
-        ? {diff: require('../../Utilities/differ/matricesDiffer')}
-        : {process: require('../../StyleSheet/processTransform')}): any),
+      transform:
+        Platform.OS === 'ios' || Platform.OS === 'macos' // TODO(macOS GH#774)
+          ? {diff: require('../../Utilities/differ/matricesDiffer')}
+          : {process: require('../../StyleSheet/processTransform')},
       transformMatrix: true,
       translateX: true,
       translateY: true,
@@ -344,9 +345,10 @@ const ReactNativeViewConfig = {
     },
     testID: true,
     top: true,
-    transform: ((Platform.OS === 'ios' || Platform.OS === 'macos' // TODO(macOS GH#774)
-      ? {diff: require('../../Utilities/differ/matricesDiffer')}
-      : {process: require('../../StyleSheet/processTransform')}): any),
+    transform:
+      Platform.OS === 'ios' || Platform.OS === 'macos' // TODO(macOS GH#774)
+        ? {diff: require('../../Utilities/differ/matricesDiffer')}
+        : {process: require('../../StyleSheet/processTransform')},
     translateX: true,
     translateY: true,
     validKeysDown: true,
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index c221e4991bc753..a1b7a7abb277ed 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -8,14 +8,12 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ViewProps} from './ViewPropTypes';
 
-const React = require('react');
 import ViewNativeComponent from './ViewNativeComponent';
-const TextAncestor = require('../../Text/TextAncestor');
+import TextAncestor from '../../Text/TextAncestor';
 import warnOnce from '../../Utilities/warnOnce'; // [macOS #656]
+import * as React from 'react';
 
 export type Props = ViewProps;
 
diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js
index 485b208b411fb4..9c056b64c9c753 100644
--- a/Libraries/Components/View/ViewAccessibility.js
+++ b/Libraries/Components/View/ViewAccessibility.js
@@ -21,6 +21,7 @@ export type AccessibilityNodeInfoProp = {
 export type AccessibilityRole =
   | 'none'
   | 'button'
+  | 'togglebutton'
   | 'link'
   | 'search'
   | 'image'
@@ -43,11 +44,13 @@ export type AccessibilityRole =
   | 'spinbutton'
   | 'switch'
   | 'tab'
+  | 'tabbar'
   | 'tablist'
   | 'timer'
+  | 'list'
   | 'toolbar'
   | 'popupbutton'
-  | 'menubutton';
+  | 'menubutton'; // TODO(macOS GH#774)
 
 // the info associated with an accessibility action
 export type AccessibilityActionInfo = $ReadOnly<{
diff --git a/Libraries/Components/View/ViewNativeComponent.js b/Libraries/Components/View/ViewNativeComponent.js
index 902414c4eb45e3..4ca5ec9cf3c479 100644
--- a/Libraries/Components/View/ViewNativeComponent.js
+++ b/Libraries/Components/View/ViewNativeComponent.js
@@ -4,72 +4,25 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict-local
  * @format
- * @flow
  */
 
-'use strict';
-
-const Platform = require('../../Utilities/Platform');
-const ReactNativeViewViewConfigAndroid = require('./ReactNativeViewViewConfigAndroid');
-
-const registerGeneratedViewConfig = require('../../Utilities/registerGeneratedViewConfig');
-const requireNativeComponent = require('../../ReactNative/requireNativeComponent');
-
-import * as React from 'react';
-
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+import {type HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import Platform from '../../Utilities/Platform';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
-import type {ViewProps} from './ViewPropTypes';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-
-export type ViewNativeComponentType = HostComponent<ViewProps>;
-
-let NativeViewComponent;
-let viewConfig:
-  | {...}
-  | {|
-      bubblingEventTypes?: $ReadOnly<{
-        [eventName: string]: $ReadOnly<{|
-          phasedRegistrationNames: $ReadOnly<{|
-            bubbled: string,
-            captured: string,
-          |}>,
-        |}>,
-        ...,
-      }>,
-      directEventTypes?: $ReadOnly<{
-        [eventName: string]: $ReadOnly<{|registrationName: string|}>,
-        ...,
-      }>,
-      uiViewClassName: string,
-      validAttributes?: {
-        [propName: string]:
-          | true
-          | $ReadOnly<{|
-              diff?: <T>(arg1: any, arg2: any) => boolean,
-              process?: (arg1: any) => any,
-            |}>,
-        ...,
-      },
-    |};
-
-if (__DEV__ || global.RN$Bridgeless) {
-  // On Android, View extends the base component with additional view-only props
-  // On iOS, the base component is View
-  if (Platform.OS === 'android') {
-    viewConfig = ReactNativeViewViewConfigAndroid;
-    registerGeneratedViewConfig('RCTView', ReactNativeViewViewConfigAndroid);
-  } else {
-    viewConfig = {};
-    registerGeneratedViewConfig('RCTView', {uiViewClassName: 'RCTView'});
-  }
-
-  NativeViewComponent = 'RCTView';
-} else {
-  NativeViewComponent = requireNativeComponent('RCTView');
-}
+import ReactNativeViewViewConfigAndroid from './ReactNativeViewViewConfigAndroid';
+import {type ViewProps as Props} from './ViewPropTypes';
+import * as React from 'react';
 
-export const __INTERNAL_VIEW_CONFIG = viewConfig;
+const ViewNativeComponent: HostComponent<Props> = NativeComponentRegistry.get<Props>(
+  'RCTView',
+  () =>
+    Platform.OS === 'android'
+      ? ReactNativeViewViewConfigAndroid
+      : {uiViewClassName: 'RCTView'},
+);
 
 interface NativeCommands {
   +hotspotUpdate: (
@@ -87,4 +40,6 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['hotspotUpdate', 'setPressed'],
 });
 
-export default ((NativeViewComponent: any): ViewNativeComponentType);
+export default ViewNativeComponent;
+
+export type ViewNativeComponentType = HostComponent<Props>;
diff --git a/Libraries/Components/__tests__/Button-test.js b/Libraries/Components/__tests__/Button-test.js
new file mode 100644
index 00000000000000..f81f9bc63d229e
--- /dev/null
+++ b/Libraries/Components/__tests__/Button-test.js
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
+import Button from '../Button';
+
+describe('<Button />', () => {
+  it('should render as expected', () => {
+    expect(ReactTestRenderer.create(<Button title="Test Button" />)).toMatchSnapshot();
+  });
+
+  it('should be disabled and it should set accessibilityState to disabled when disabled={true}', () => {
+    expect(
+      ReactTestRenderer.create(<Button title="Test Button" disabled={true} />)
+    ).toMatchSnapshot();
+  });
+
+  it('should be disabled when disabled={true} and accessibilityState={{disabled: true}}', () => {
+    expect(
+      ReactTestRenderer.create(<Button title="Test Button" disabled={true} accessibilityState={{disabled: true}} />)
+    ).toMatchSnapshot();
+  });
+
+  it('should be disabled when disabled is empty and accessibilityState={{disabled: true}}', () => {
+    expect(
+      ReactTestRenderer.create(<Button title="Test Button" accessibilityState={{disabled: true}} />)
+    ).toMatchSnapshot();
+  });
+
+  it('should overwrite accessibilityState with value of disabled prop', () => {
+    expect(ReactTestRenderer.create(<Button title="Test Button" disabled={true} accessibilityState={{disabled: false}} />)
+    ).toMatchSnapshot();
+  });
+
+  it('should not be disabled when disabled={false} and accessibilityState={{disabled: true}}', () => {
+    expect(ReactTestRenderer.create(<Button title="Test Button" disabled={false} accessibilityState={{disabled: true}} />)
+    ).toMatchSnapshot();
+  });
+
+  it('should not be disabled when disabled={false} and accessibilityState={{disabled: false}}', () => {
+    expect(ReactTestRenderer.create( <Button title="Test Button" disabled={false} accessibilityState={{disabled: false}} />)
+    ).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/Components/__tests__/Slider-test.js b/Libraries/Components/__tests__/Slider-test.js
new file mode 100644
index 00000000000000..5e3a9f47f86b77
--- /dev/null
+++ b/Libraries/Components/__tests__/Slider-test.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import * as React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
+import Slider from '../Slider/Slider';
+
+describe('<Slider />', () => {
+  it('should render as expected', () => {
+    expect(ReactTestRenderer.create(<Slider />)).toMatchSnapshot();
+  });
+
+  it('should set disabled as false', () => {
+    // Slider component should set disabled prop as false by default
+    expect(ReactTestRenderer.create(<Slider />)).toMatchSnapshot();
+    expect(
+      ReactTestRenderer.create(
+        <Slider accessibilityState={{disabled: false}} />,
+      ),
+    ).toMatchSnapshot();
+  });
+  it('should set disabled as true', () => {
+    expect(ReactTestRenderer.create(<Slider disabled />)).toMatchSnapshot();
+    expect(
+      ReactTestRenderer.create(
+        <Slider accessibilityState={{disabled: true}} />,
+      ),
+    ).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/Components/__tests__/__snapshots__/Button-test.js.snap b/Libraries/Components/__tests__/__snapshots__/Button-test.js.snap
new file mode 100644
index 00000000000000..98a0dcb1aa318a
--- /dev/null
+++ b/Libraries/Components/__tests__/__snapshots__/Button-test.js.snap
@@ -0,0 +1,396 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<Button /> should be disabled and it should set accessibilityState to disabled when disabled={true} 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+        Object {},
+      ]
+    }
+  >
+    <Text
+      disabled={true}
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+          Object {
+            "color": "#cdcdcd",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`<Button /> should be disabled when disabled is empty and accessibilityState={{disabled: true}} 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+        Object {},
+      ]
+    }
+  >
+    <Text
+      disabled={true}
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+          Object {
+            "color": "#cdcdcd",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`<Button /> should be disabled when disabled={true} and accessibilityState={{disabled: true}} 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+        Object {},
+      ]
+    }
+  >
+    <Text
+      disabled={true}
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+          Object {
+            "color": "#cdcdcd",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`<Button /> should not be disabled when disabled={false} and accessibilityState={{disabled: false}} 1`] = `
+<View
+  acceptsFirstMouse={true}
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "disabled": false,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={true}
+  focusable={true}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+      ]
+    }
+  >
+    <Text
+      disabled={false}
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`<Button /> should not be disabled when disabled={false} and accessibilityState={{disabled: true}} 1`] = `
+<View
+  acceptsFirstMouse={true}
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "disabled": false,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={true}
+  focusable={true}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+      ]
+    }
+  >
+    <Text
+      disabled={false}
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`<Button /> should overwrite accessibilityState with value of disabled prop 1`] = `
+<View
+  acceptsFirstMouse={false}
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={false}
+  focusable={false}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+        Object {},
+      ]
+    }
+  >
+    <Text
+      disabled={true}
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+          Object {
+            "color": "#cdcdcd",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`<Button /> should render as expected 1`] = `
+<View
+  acceptsFirstMouse={true}
+  accessibilityRole="button"
+  accessible={true}
+  collapsable={false}
+  enableFocusRing={true}
+  focusable={true}
+  nativeID="animatedComponent"
+  onClick={[Function]}
+  onKeyDown={[Function]}
+  onKeyUp={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+      ]
+    }
+  >
+    <Text
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
diff --git a/Libraries/Components/__tests__/__snapshots__/Slider-test.js.snap b/Libraries/Components/__tests__/__snapshots__/Slider-test.js.snap
new file mode 100644
index 00000000000000..63c3e3507a55c7
--- /dev/null
+++ b/Libraries/Components/__tests__/__snapshots__/Slider-test.js.snap
@@ -0,0 +1,121 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<Slider /> should render as expected 1`] = `
+<RCTSlider
+  disabled={false}
+  enabled={true}
+  maximumValue={1}
+  minimumValue={0}
+  onChange={null}
+  onResponderTerminationRequest={[Function]}
+  onSlidingComplete={null}
+  onStartShouldSetResponder={[Function]}
+  onValueChange={null}
+  step={0}
+  style={
+    Object {
+      "height": 40,
+    }
+  }
+  value={0.5}
+/>
+`;
+
+exports[`<Slider /> should set disabled as false 1`] = `
+<RCTSlider
+  disabled={false}
+  enabled={true}
+  maximumValue={1}
+  minimumValue={0}
+  onChange={null}
+  onResponderTerminationRequest={[Function]}
+  onSlidingComplete={null}
+  onStartShouldSetResponder={[Function]}
+  onValueChange={null}
+  step={0}
+  style={
+    Object {
+      "height": 40,
+    }
+  }
+  value={0.5}
+/>
+`;
+
+exports[`<Slider /> should set disabled as false 2`] = `
+<RCTSlider
+  accessibilityState={
+    Object {
+      "disabled": false,
+    }
+  }
+  disabled={false}
+  enabled={true}
+  maximumValue={1}
+  minimumValue={0}
+  onChange={null}
+  onResponderTerminationRequest={[Function]}
+  onSlidingComplete={null}
+  onStartShouldSetResponder={[Function]}
+  onValueChange={null}
+  step={0}
+  style={
+    Object {
+      "height": 40,
+    }
+  }
+  value={0.5}
+/>
+`;
+
+exports[`<Slider /> should set disabled as true 1`] = `
+<RCTSlider
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  disabled={true}
+  enabled={false}
+  maximumValue={1}
+  minimumValue={0}
+  onChange={null}
+  onResponderTerminationRequest={[Function]}
+  onSlidingComplete={null}
+  onStartShouldSetResponder={[Function]}
+  onValueChange={null}
+  step={0}
+  style={
+    Object {
+      "height": 40,
+    }
+  }
+  value={0.5}
+/>
+`;
+
+exports[`<Slider /> should set disabled as true 2`] = `
+<RCTSlider
+  accessibilityState={
+    Object {
+      "disabled": true,
+    }
+  }
+  disabled={true}
+  enabled={false}
+  maximumValue={1}
+  minimumValue={0}
+  onChange={null}
+  onResponderTerminationRequest={[Function]}
+  onSlidingComplete={null}
+  onStartShouldSetResponder={[Function]}
+  onValueChange={null}
+  step={0}
+  style={
+    Object {
+      "height": 40,
+    }
+  }
+  value={0.5}
+/>
+`;
diff --git a/Libraries/Core/Devtools/__tests__/__snapshots__/parseHermesStack-test.js.snap b/Libraries/Core/Devtools/__tests__/__snapshots__/parseHermesStack-test.js.snap
index c3ff6f79a652a5..99798d8b6132b4 100644
--- a/Libraries/Core/Devtools/__tests__/__snapshots__/parseHermesStack-test.js.snap
+++ b/Libraries/Core/Devtools/__tests__/__snapshots__/parseHermesStack-test.js.snap
@@ -107,3 +107,31 @@ Object {
   "message": "TypeError: undefined is not a function",
 }
 `;
+
+exports[`parseHermesStack tolerate empty filename 1`] = `
+Object {
+  "entries": Array [
+    Object {
+      "functionName": "global",
+      "location": Object {
+        "column1Based": 9,
+        "line1Based": 1,
+        "sourceUrl": "unknown",
+        "type": "SOURCE",
+      },
+      "type": "FRAME",
+    },
+    Object {
+      "functionName": "foo$bar",
+      "location": Object {
+        "column1Based": 1234,
+        "line1Based": 10,
+        "sourceUrl": "",
+        "type": "SOURCE",
+      },
+      "type": "FRAME",
+    },
+  ],
+  "message": "TypeError: undefined is not a function",
+}
+`;
diff --git a/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js b/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js
index 3a299df8f47785..8b24b97294659a 100644
--- a/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js
+++ b/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js
@@ -38,6 +38,18 @@ describe('parseHermesStack', () => {
     ).toMatchSnapshot();
   });
 
+  test('tolerate empty filename', () => {
+    expect(
+      parseHermesStack(
+        [
+          'TypeError: undefined is not a function',
+          '    at global (unknown:1:9)',
+          '    at foo$bar (:10:1234)',
+        ].join('\n'),
+      ),
+    ).toMatchSnapshot();
+  });
+
   test('skipped frames', () => {
     expect(
       parseHermesStack(
diff --git a/Libraries/Core/Devtools/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js
index 97c7c72468c188..d820a9ee5dcad8 100644
--- a/Libraries/Core/Devtools/getDevServer.js
+++ b/Libraries/Core/Devtools/getDevServer.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import NativeSourceCode from '../../NativeModules/specs/NativeSourceCode';
 
 let _cachedDevServerURL: ?string;
diff --git a/Libraries/Core/Devtools/parseErrorStack.js b/Libraries/Core/Devtools/parseErrorStack.js
index fe2cc205375b45..185ddcb7e75332 100644
--- a/Libraries/Core/Devtools/parseErrorStack.js
+++ b/Libraries/Core/Devtools/parseErrorStack.js
@@ -15,15 +15,6 @@ import type {HermesParsedStack} from './parseHermesStack';
 
 const parseHermesStack = require('./parseHermesStack');
 
-export type ExtendedError = Error & {
-  jsEngine?: string,
-  preventSymbolication?: boolean,
-  componentStack?: string,
-  forceRedbox?: boolean,
-  isComponentError?: boolean,
-  ...
-};
-
 function convertHermesStack(stack: HermesParsedStack): Array<StackFrame> {
   const frames = [];
   for (const entry of stack.entries) {
diff --git a/Libraries/Core/Devtools/parseHermesStack.js b/Libraries/Core/Devtools/parseHermesStack.js
index 9d3ba2f9284f2f..70d47a0991d538 100644
--- a/Libraries/Core/Devtools/parseHermesStack.js
+++ b/Libraries/Core/Devtools/parseHermesStack.js
@@ -58,7 +58,7 @@ export type HermesParsedStack = {|
 // 4. source URL (filename)
 // 5. line number (1 based)
 // 6. column number (1 based) or virtual offset (0 based)
-const RE_FRAME = /^ {4}at (.+?)(?: \((native)\)?| \((address at )?(.+?):(\d+):(\d+)\))$/;
+const RE_FRAME = /^ {4}at (.+?)(?: \((native)\)?| \((address at )?(.*?):(\d+):(\d+)\))$/;
 
 // Capturing groups:
 // 1. count of skipped frames
diff --git a/Libraries/Core/ExceptionsManager.js b/Libraries/Core/ExceptionsManager.js
index 6da6d8a4a302cb..6e64a40ad48a66 100644
--- a/Libraries/Core/ExceptionsManager.js
+++ b/Libraries/Core/ExceptionsManager.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {ExtendedError} from './Devtools/parseErrorStack';
+import type {ExtendedError} from './ExtendedError';
 import type {ExceptionData} from './NativeExceptionsManager';
 
 class SyntheticError extends Error {
@@ -105,35 +105,37 @@ function reportException(
     }
 
     if (__DEV__ && isHandledByLogBox) {
-      const LogBoxData = require('../LogBox/Data/LogBoxData');
-      LogBoxData.addException({
+      const LogBox = require('../LogBox/LogBox');
+      LogBox.addException({
         ...data,
         isComponentError: !!e.isComponentError,
       });
     }
 
-    NativeExceptionsManager.reportException(data);
+    if (isFatal || e.type !== 'warn') {
+      NativeExceptionsManager.reportException(data);
 
-    if (__DEV__ && !global.RN$Express) {
-      if (e.preventSymbolication === true) {
-        return;
+      if (__DEV__ && !global.RN$Express) {
+        if (e.preventSymbolication === true) {
+          return;
+        }
+        const symbolicateStackTrace = require('./Devtools/symbolicateStackTrace');
+        symbolicateStackTrace(stack)
+          .then(({stack: prettyStack}) => {
+            if (prettyStack) {
+              NativeExceptionsManager.updateExceptionMessage(
+                data.message,
+                prettyStack,
+                currentExceptionID,
+              );
+            } else {
+              throw new Error('The stack is null');
+            }
+          })
+          .catch(error => {
+            console.log('Unable to symbolicate stack trace: ' + error.message);
+          });
       }
-      const symbolicateStackTrace = require('./Devtools/symbolicateStackTrace');
-      symbolicateStackTrace(stack)
-        .then(({stack: prettyStack}) => {
-          if (prettyStack) {
-            NativeExceptionsManager.updateExceptionMessage(
-              data.message,
-              prettyStack,
-              currentExceptionID,
-            );
-          } else {
-            throw new Error('The stack is null');
-          }
-        })
-        .catch(error => {
-          console.log('Unable to symbolicate stack trace: ' + error.message);
-        });
     }
   } else if (reportToConsole) {
     // we feed back into console.error, to make sure any methods that are
@@ -169,15 +171,17 @@ function handleException(e: mixed, isFatal: boolean) {
   }
   try {
     inExceptionHandler = true;
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+     * parameters */
     reportException(error, isFatal, /*reportToConsole*/ true);
   } finally {
     inExceptionHandler = false;
   }
 }
 
-function reactConsoleErrorHandler() {
+function reactConsoleErrorHandler(...args) {
   // bubble up to any original handlers
-  console._errorOriginal.apply(console, arguments);
+  console._errorOriginal(...args);
   if (!console.reportErrorsAsExceptions) {
     return;
   }
@@ -213,31 +217,35 @@ function reactConsoleErrorHandler() {
     return;
   }
 
-  if (arguments[0] && arguments[0].stack) {
+  let error;
+
+  const firstArg = args[0];
+  if (firstArg?.stack) {
     // reportException will console.error this with high enough fidelity.
-    reportException(
-      arguments[0],
-      /* isFatal */ false,
-      /*reportToConsole*/ false,
-    );
+    error = firstArg;
   } else {
     const stringifySafe = require('../Utilities/stringifySafe').default;
-    const str = Array.prototype.map
-      .call(arguments, value =>
-        typeof value === 'string' ? value : stringifySafe(value),
-      )
-      .join(' ');
-
-    if (str.slice(0, 9) === 'Warning: ') {
+    if (typeof firstArg === 'string' && firstArg.startsWith('Warning: ')) {
       // React warnings use console.error so that a stack trace is shown, but
       // we don't (currently) want these to show a redbox
       // (Note: Logic duplicated in polyfills/console.js.)
       return;
     }
-    const error: ExtendedError = new SyntheticError(str);
+    const message = args
+      .map(arg => (typeof arg === 'string' ? arg : stringifySafe(arg)))
+      .join(' ');
+
+    error = new SyntheticError(message);
     error.name = 'console.error';
-    reportException(error, /* isFatal */ false, /*reportToConsole*/ false);
   }
+
+  reportException(
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+     * parameters */
+    error,
+    false, // isFatal
+    false, // reportToConsole
+  );
 }
 
 /**
diff --git a/Libraries/Core/ExtendedError.js b/Libraries/Core/ExtendedError.js
new file mode 100644
index 00000000000000..88e6331ced0c98
--- /dev/null
+++ b/Libraries/Core/ExtendedError.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+export type ExtendedError = Error & {
+  jsEngine?: string,
+  preventSymbolication?: boolean,
+  componentStack?: string,
+  forceRedbox?: boolean,
+  isComponentError?: boolean,
+  type?: string,
+  ...
+};
diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index e00120aa4b48a5..e30baa2eb72564 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -43,6 +43,7 @@ require('./setUpSegmentFetcher');
 if (__DEV__) {
   require('./checkNativeVersion');
   require('./setUpDeveloperTools');
+  require('../LogBox/LogBox').install();
 }
 
 const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
diff --git a/Libraries/Core/NativeExceptionsManager.js b/Libraries/Core/NativeExceptionsManager.js
index 798bb45686ebcd..b227b323c7272c 100644
--- a/Libraries/Core/NativeExceptionsManager.js
+++ b/Libraries/Core/NativeExceptionsManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Core/ReactFiberErrorDialog.js b/Libraries/Core/ReactFiberErrorDialog.js
index d329e2d27bd4cb..28ce55d57565d5 100644
--- a/Libraries/Core/ReactFiberErrorDialog.js
+++ b/Libraries/Core/ReactFiberErrorDialog.js
@@ -8,6 +8,10 @@
  * @flow strict-local
  */
 
+import {handleException, SyntheticError} from './ExceptionsManager';
+
+import type {ExtendedError} from './ExtendedError';
+
 export type CapturedError = {
   +componentStack: string,
   +error: mixed,
@@ -15,38 +19,44 @@ export type CapturedError = {
   ...
 };
 
-import type {ExtendedError} from './Devtools/parseErrorStack';
-
-import {handleException, SyntheticError} from './ExceptionsManager';
+const ReactFiberErrorDialog = {
+  /**
+   * Intercept lifecycle errors and ensure they are shown with the correct stack
+   * trace within the native redbox component.
+   */
+  showErrorDialog({componentStack, error: errorValue}: CapturedError): boolean {
+    let error: ?ExtendedError;
+
+    // Typically, `errorValue` should be an error. However, other values such as
+    // strings (or even null) are sometimes thrown.
+    if (errorValue instanceof Error) {
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for
+       * this parameters */
+      error = (errorValue: ExtendedError);
+    } else if (typeof errorValue === 'string') {
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for
+       * this parameters */
+      error = (new SyntheticError(errorValue): ExtendedError);
+    } else {
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for
+       * this parameters */
+      error = (new SyntheticError('Unspecified error'): ExtendedError);
+    }
+    try {
+      error.componentStack = componentStack;
+      error.isComponentError = true;
+    } catch {
+      // Ignored.
+    }
+
+    handleException(error, false);
+
+    // Return false here to prevent ReactFiberErrorLogger default behavior of
+    // logging error details to console.error. Calls to console.error are
+    // automatically routed to the native redbox controller, which we've already
+    // done above by calling ExceptionsManager.
+    return false;
+  },
+};
 
-/**
- * Intercept lifecycle errors and ensure they are shown with the correct stack
- * trace within the native redbox component.
- */
-function showErrorDialog(capturedError: CapturedError): boolean {
-  const {componentStack, error} = capturedError;
-
-  let errorToHandle;
-
-  // Typically Errors are thrown but eg strings or null can be thrown as well.
-  if (error instanceof Error) {
-    errorToHandle = (error: ExtendedError);
-  } else if (typeof error === 'string') {
-    errorToHandle = (new SyntheticError(error): ExtendedError);
-  } else {
-    errorToHandle = (new SyntheticError('Unspecified error'): ExtendedError);
-  }
-  try {
-    errorToHandle.componentStack = componentStack;
-    errorToHandle.isComponentError = true;
-  } catch (e) {}
-  handleException(errorToHandle, false);
-
-  // Return false here to prevent ReactFiberErrorLogger default behavior of
-  // logging error details to console.error. Calls to console.error are
-  // automatically routed to the native redbox controller, which we've already
-  // done above by calling ExceptionsManager.
-  return false;
-}
-
-module.exports = {showErrorDialog};
+export default ReactFiberErrorDialog;
diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 0a6de3d068056a..243fe2b5406591 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -11,7 +11,7 @@
 
 exports.version = {
   major: 0,
-  minor: 63,
-  patch: 3,
+  minor: 66,
+  patch: 0,
   prerelease: null,
 };
diff --git a/Libraries/Core/ReactNativeVersionCheck.js b/Libraries/Core/ReactNativeVersionCheck.js
index 5958842b30f020..9536899f7dd25f 100644
--- a/Libraries/Core/ReactNativeVersionCheck.js
+++ b/Libraries/Core/ReactNativeVersionCheck.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Platform from '../Utilities/Platform';
 const ReactNativeVersion = require('./ReactNativeVersion');
 
diff --git a/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js b/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js
index 8baeee3d4c1716..e90abdf3aead8b 100644
--- a/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js
+++ b/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
index 9c5d2a099e3887..5c2f0d854e5f69 100644
--- a/Libraries/Core/Timers/JSTimers.js
+++ b/Libraries/Core/Timers/JSTimers.js
@@ -8,10 +8,7 @@
  * @flow
  */
 
-'use strict';
-
 const BatchedBridge = require('../../BatchedBridge/BatchedBridge');
-const Platform = require('../../Utilities/Platform');
 const Systrace = require('../../Performance/Systrace');
 
 const invariant = require('invariant');
@@ -28,7 +25,7 @@ export type JSTimerType =
   | 'setTimeout'
   | 'setInterval'
   | 'requestAnimationFrame'
-  | 'setImmediate'
+  | 'queueReactNativeMicrotask'
   | 'requestIdleCallback';
 
 // These timing constants should be kept in sync with the ones in native ios and
@@ -36,19 +33,11 @@ export type JSTimerType =
 const FRAME_DURATION = 1000 / 60;
 const IDLE_CALLBACK_FRAME_DEADLINE = 1;
 
-const MAX_TIMER_DURATION_MS = 60 * 1000;
-const IS_ANDROID = Platform.OS === 'android';
-const ANDROID_LONG_TIMER_MESSAGE =
-  'Setting a timer for a long period of time, i.e. multiple minutes, is a ' +
-  'performance and correctness issue on Android as it keeps the timer ' +
-  'module awake, and timers can only be called when the app is in the foreground. ' +
-  'See https://github.com/facebook/react-native/issues/12981 for more info.';
-
 // Parallel arrays
 const callbacks: Array<?Function> = [];
 const types: Array<?JSTimerType> = [];
 const timerIDs: Array<?number> = [];
-let immediates: Array<number> = [];
+let reactNativeMicrotasks: Array<number> = [];
 let requestIdleCallbacks: Array<number> = [];
 const requestIdleCallbackTimeouts: {[number]: number, ...} = {};
 
@@ -118,7 +107,7 @@ function _callTimer(timerID: number, frameTime: number, didTimeout: ?boolean) {
     if (
       type === 'setTimeout' ||
       type === 'setInterval' ||
-      type === 'setImmediate'
+      type === 'queueReactNativeMicrotask'
     ) {
       callback();
     } else if (type === 'requestAnimationFrame') {
@@ -154,33 +143,33 @@ function _callTimer(timerID: number, frameTime: number, didTimeout: ?boolean) {
 }
 
 /**
- * Performs a single pass over the enqueued immediates. Returns whether
- * more immediates are queued up (can be used as a condition a while loop).
+ * Performs a single pass over the enqueued reactNativeMicrotasks. Returns whether
+ * more reactNativeMicrotasks are queued up (can be used as a condition a while loop).
  */
-function _callImmediatesPass() {
-  if (immediates.length === 0) {
+function _callReactNativeMicrotasksPass() {
+  if (reactNativeMicrotasks.length === 0) {
     return false;
   }
 
   if (__DEV__) {
-    Systrace.beginEvent('callImmediatesPass()');
+    Systrace.beginEvent('callReactNativeMicrotasksPass()');
   }
 
   // The main reason to extract a single pass is so that we can track
   // in the system trace
-  const passImmediates = immediates;
-  immediates = [];
+  const passReactNativeMicrotasks = reactNativeMicrotasks;
+  reactNativeMicrotasks = [];
 
   // Use for loop rather than forEach as per @vjeux's advice
   // https://github.com/facebook/react-native/commit/c8fd9f7588ad02d2293cac7224715f4af7b0f352#commitcomment-14570051
-  for (let i = 0; i < passImmediates.length; ++i) {
-    _callTimer(passImmediates[i], 0);
+  for (let i = 0; i < passReactNativeMicrotasks.length; ++i) {
+    _callTimer(passReactNativeMicrotasks[i], 0);
   }
 
   if (__DEV__) {
     Systrace.endEvent();
   }
-  return immediates.length > 0;
+  return reactNativeMicrotasks.length > 0;
 }
 
 function _clearIndex(i: number) {
@@ -201,7 +190,10 @@ function _freeCallback(timerID: number) {
   if (index !== -1) {
     const type = types[index];
     _clearIndex(index);
-    if (type !== 'setImmediate' && type !== 'requestIdleCallback') {
+    if (
+      type !== 'queueReactNativeMicrotask' &&
+      type !== 'requestIdleCallback'
+    ) {
       deleteTimer(timerID);
     }
   }
@@ -218,15 +210,6 @@ const JSTimers = {
    * @param {number} duration Number of milliseconds.
    */
   setTimeout: function(func: Function, duration: number, ...args: any): number {
-    if (__DEV__ && IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
-      console.warn(
-        ANDROID_LONG_TIMER_MESSAGE +
-          '\n' +
-          '(Saw setTimeout with duration ' +
-          duration +
-          'ms)',
-      );
-    }
     const id = _allocateCallback(
       () => func.apply(undefined, args),
       'setTimeout',
@@ -244,15 +227,6 @@ const JSTimers = {
     duration: number,
     ...args: any
   ): number {
-    if (__DEV__ && IS_ANDROID && duration > MAX_TIMER_DURATION_MS) {
-      console.warn(
-        ANDROID_LONG_TIMER_MESSAGE +
-          '\n' +
-          '(Saw setInterval with duration ' +
-          duration +
-          'ms)',
-      );
-    }
     const id = _allocateCallback(
       () => func.apply(undefined, args),
       'setInterval',
@@ -262,15 +236,19 @@ const JSTimers = {
   },
 
   /**
+   * The React Native microtask mechanism is used to back public APIs e.g.
+   * `queueMicrotask`, `clearImmediate`, and `setImmediate` (which is used by
+   * the Promise polyfill) when the JSVM microtask mechanism is not used.
+   *
    * @param {function} func Callback to be invoked before the end of the
    * current JavaScript execution loop.
    */
-  setImmediate: function(func: Function, ...args: any) {
+  queueReactNativeMicrotask: function(func: Function, ...args: any) {
     const id = _allocateCallback(
       () => func.apply(undefined, args),
-      'setImmediate',
+      'queueReactNativeMicrotask',
     );
-    immediates.push(id);
+    reactNativeMicrotasks.push(id);
     return id;
   },
 
@@ -352,11 +330,11 @@ const JSTimers = {
     _freeCallback(timerID);
   },
 
-  clearImmediate: function(timerID: number) {
+  clearReactNativeMicrotask: function(timerID: number) {
     _freeCallback(timerID);
-    const index = immediates.indexOf(timerID);
+    const index = reactNativeMicrotasks.indexOf(timerID);
     if (index !== -1) {
-      immediates.splice(index, 1);
+      reactNativeMicrotasks.splice(index, 1);
     }
   },
 
@@ -380,6 +358,7 @@ const JSTimers = {
     }
 
     if (errors) {
+      // $FlowFixMe[incompatible-use]
       const errorCount = errors.length;
       if (errorCount > 1) {
         // Throw all the other errors in a setTimeout, which will throw each
@@ -388,11 +367,13 @@ const JSTimers = {
           JSTimers.setTimeout(
             (error => {
               throw error;
+              // $FlowFixMe[incompatible-use]
             }).bind(null, errors[ii]),
             0,
           );
         }
       }
+      // $FlowFixMe[incompatible-use]
       throw errors[0];
     }
   },
@@ -432,9 +413,9 @@ const JSTimers = {
    * This is called after we execute any command we receive from native but
    * before we hand control back to native.
    */
-  callImmediates() {
+  callReactNativeMicrotasks() {
     errors = (null: ?Array<Error>);
-    while (_callImmediatesPass()) {}
+    while (_callReactNativeMicrotasksPass()) {}
     if (errors) {
       errors.forEach(error =>
         JSTimers.setTimeout(() => {
@@ -478,32 +459,34 @@ function setSendIdleEvents(sendIdleEvents: boolean): void {
 
 let ExportedJSTimers: {|
   callIdleCallbacks: (frameTime: number) => any | void,
-  callImmediates: () => void,
+  callReactNativeMicrotasks: () => void,
   callTimers: (timersToCall: Array<number>) => any | void,
   cancelAnimationFrame: (timerID: number) => void,
   cancelIdleCallback: (timerID: number) => void,
-  clearImmediate: (timerID: number) => void,
+  clearReactNativeMicrotask: (timerID: number) => void,
   clearInterval: (timerID: number) => void,
   clearTimeout: (timerID: number) => void,
   emitTimeDriftWarning: (warningMessage: string) => any | void,
   requestAnimationFrame: (func: any) => any | number,
   requestIdleCallback: (func: any, options: ?any) => any | number,
-  setImmediate: (func: any, ...args: any) => number,
+  queueReactNativeMicrotask: (func: any, ...args: any) => number,
   setInterval: (func: any, duration: number, ...args: any) => number,
   setTimeout: (func: any, duration: number, ...args: any) => number,
 |};
 
 if (!NativeTiming) {
   console.warn("Timing native module is not available, can't set timers.");
-  // $FlowFixMe: we can assume timers are generally available
+  // $FlowFixMe[prop-missing] : we can assume timers are generally available
   ExportedJSTimers = ({
-    callImmediates: JSTimers.callImmediates,
-    setImmediate: JSTimers.setImmediate,
+    callReactNativeMicrotasks: JSTimers.callReactNativeMicrotasks,
+    queueReactNativeMicrotask: JSTimers.queueReactNativeMicrotask,
   }: typeof JSTimers);
 } else {
   ExportedJSTimers = JSTimers;
 }
 
-BatchedBridge.setImmediatesCallback(JSTimers.callImmediates);
+BatchedBridge.setReactNativeMicrotasksCallback(
+  JSTimers.callReactNativeMicrotasks,
+);
 
 module.exports = ExportedJSTimers;
diff --git a/Libraries/Core/Timers/NativeTiming.js b/Libraries/Core/Timers/NativeTiming.js
index 53477dd6584fa8..cc487a52a3181b 100644
--- a/Libraries/Core/Timers/NativeTiming.js
+++ b/Libraries/Core/Timers/NativeTiming.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Core/Timers/__tests__/JSTimers-test.js b/Libraries/Core/Timers/__tests__/JSTimers-test.js
index 46fbd0d10236fe..371e8548a91b37 100644
--- a/Libraries/Core/Timers/__tests__/JSTimers-test.js
+++ b/Libraries/Core/Timers/__tests__/JSTimers-test.js
@@ -65,15 +65,15 @@ describe('JSTimers', function() {
     expect(callCount).toBe(1);
   });
 
-  it('should call nested setImmediate when cleared', function() {
+  it('should call nested queueReactNativeMicrotask when cleared', function() {
     let id1, id2, id3;
     let callCount = 0;
 
-    id1 = JSTimers.setImmediate(function() {
-      JSTimers.clearImmediate(id1);
-      id2 = JSTimers.setImmediate(function() {
-        JSTimers.clearImmediate(id2);
-        id3 = JSTimers.setImmediate(function() {
+    id1 = JSTimers.queueReactNativeMicrotask(function() {
+      JSTimers.clearReactNativeMicrotask(id1);
+      id2 = JSTimers.queueReactNativeMicrotask(function() {
+        JSTimers.clearReactNativeMicrotask(id2);
+        id3 = JSTimers.queueReactNativeMicrotask(function() {
           callCount += 1;
         });
       });
@@ -132,64 +132,64 @@ describe('JSTimers', function() {
     expect(callback).toBeCalledTimes(1);
   });
 
-  it('should call function with setImmediate', function() {
+  it('should call function with queueReactNativeMicrotask', function() {
     const callback = jest.fn();
-    JSTimers.setImmediate(callback);
-    JSTimers.callImmediates();
+    JSTimers.queueReactNativeMicrotask(callback);
+    JSTimers.callReactNativeMicrotasks();
     expect(callback).toBeCalledTimes(1);
   });
 
-  it('should not call function with clearImmediate', function() {
+  it('should not call function with clearReactNativeMicrotask', function() {
     const callback = jest.fn();
-    const id = JSTimers.setImmediate(callback);
-    JSTimers.clearImmediate(id);
-    JSTimers.callImmediates();
+    const id = JSTimers.queueReactNativeMicrotask(callback);
+    JSTimers.clearReactNativeMicrotask(id);
+    JSTimers.callReactNativeMicrotasks();
     expect(callback).not.toBeCalled();
   });
 
-  it('should call functions in the right order with setImmediate', function() {
+  it('should call functions in the right order with queueReactNativeMicrotask', function() {
     let count = 0;
     let firstCalled = null;
     let secondCalled = null;
-    JSTimers.setImmediate(function() {
+    JSTimers.queueReactNativeMicrotask(function() {
       firstCalled = count++;
     });
-    JSTimers.setImmediate(function() {
+    JSTimers.queueReactNativeMicrotask(function() {
       secondCalled = count++;
     });
-    JSTimers.callImmediates();
+    JSTimers.callReactNativeMicrotasks();
     expect(firstCalled).toBe(0);
     expect(secondCalled).toBe(1);
   });
 
-  it('should call functions in the right order with nested setImmediate', function() {
+  it('should call functions in the right order with nested queueReactNativeMicrotask', function() {
     let count = 0;
     let firstCalled = null;
     let secondCalled = null;
     let thirdCalled = null;
-    JSTimers.setImmediate(function() {
+    JSTimers.queueReactNativeMicrotask(function() {
       firstCalled = count++;
-      JSTimers.setImmediate(function() {
+      JSTimers.queueReactNativeMicrotask(function() {
         thirdCalled = count++;
       });
       secondCalled = count++;
     });
-    JSTimers.callImmediates();
+    JSTimers.callReactNativeMicrotasks();
     expect(firstCalled).toBe(0);
     expect(secondCalled).toBe(1);
     expect(thirdCalled).toBe(2);
   });
 
-  it('should call nested setImmediate', function() {
+  it('should call nested queueReactNativeMicrotask', function() {
     let firstCalled = false;
     let secondCalled = false;
-    JSTimers.setImmediate(function() {
+    JSTimers.queueReactNativeMicrotask(function() {
       firstCalled = true;
-      JSTimers.setImmediate(function() {
+      JSTimers.queueReactNativeMicrotask(function() {
         secondCalled = true;
       });
     });
-    JSTimers.callImmediates();
+    JSTimers.callReactNativeMicrotasks();
     expect(firstCalled).toBe(true);
     expect(secondCalled).toBe(true);
   });
@@ -319,34 +319,34 @@ describe('JSTimers', function() {
     );
   });
 
-  it('should pass along errors thrown from setImmediate', function() {
-    JSTimers.setImmediate(function() {
-      throw new Error('error within setImmediate');
+  it('should pass along errors thrown from queueReactNativeMicrotask', function() {
+    JSTimers.queueReactNativeMicrotask(function() {
+      throw new Error('error within queueReactNativeMicrotask');
     });
 
     NativeTiming.createTimer = jest.fn();
-    JSTimers.callImmediates();
+    JSTimers.callReactNativeMicrotasks();
 
     // The remaining errors should be called within setTimeout, in case there
     // are a series of them
     expect(NativeTiming.createTimer).toBeCalled();
     const timerID = NativeTiming.createTimer.mock.calls[0][0];
     expect(JSTimers.callTimers.bind(null, [timerID])).toThrowError(
-      'error within setImmediate',
+      'error within queueReactNativeMicrotask',
     );
   });
 
-  it('should throw all errors from setImmediate', function() {
-    JSTimers.setImmediate(function() {
+  it('should throw all errors from queueReactNativeMicrotask', function() {
+    JSTimers.queueReactNativeMicrotask(function() {
       throw new Error('first error');
     });
 
-    JSTimers.setImmediate(function() {
+    JSTimers.queueReactNativeMicrotask(function() {
       throw new Error('second error');
     });
 
     NativeTiming.createTimer = jest.fn();
-    JSTimers.callImmediates();
+    JSTimers.callReactNativeMicrotasks();
 
     expect(NativeTiming.createTimer.mock.calls.length).toBe(2);
 
diff --git a/Libraries/Core/Timers/immediateShim.js b/Libraries/Core/Timers/immediateShim.js
new file mode 100644
index 00000000000000..6eef9f58f1d843
--- /dev/null
+++ b/Libraries/Core/Timers/immediateShim.js
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+
+// Globally Unique Immediate ID.
+let GUIID = 1;
+
+// A global set of the currently cleared immediates.
+const clearedImmediates: Set<number> = new Set();
+
+/**
+ * Shim the setImmediate API on top of queueMicrotask.
+ * @param {function} func Callback to be invoked before the end of the
+ * current JavaScript execution loop.
+ */
+function setImmediate(callback: Function, ...args: any): number {
+  if (arguments.length < 1) {
+    throw new TypeError(
+      'setImmediate must be called with at least one argument (a function to call)',
+    );
+  }
+  if (typeof callback !== 'function') {
+    throw new TypeError(
+      'The first argument to setImmediate must be a function.',
+    );
+  }
+
+  const id = GUIID++;
+  // This is an edgey case in which the sequentially assigned ID has been
+  // "guessed" and "cleared" ahead of time, so we need to clear it up first.
+  if (clearedImmediates.has(id)) {
+    clearedImmediates.delete(id);
+  }
+
+  global.queueMicrotask(() => {
+    if (!clearedImmediates.has(id)) {
+      callback.apply(undefined, args);
+    } else {
+      // Free up the Set entry.
+      clearedImmediates.delete(id);
+    }
+  });
+
+  return id;
+}
+
+/**
+ * @param {number} immediateID The ID of the immediate to be clearred.
+ */
+function clearImmediate(immediateID: number) {
+  clearedImmediates.add(immediateID);
+}
+
+const immediateShim = {
+  setImmediate: setImmediate,
+  clearImmediate: clearImmediate,
+};
+
+module.exports = immediateShim;
diff --git a/Libraries/Core/Timers/queueMicrotask.js b/Libraries/Core/Timers/queueMicrotask.js
new file mode 100644
index 00000000000000..a131696dcf64af
--- /dev/null
+++ b/Libraries/Core/Timers/queueMicrotask.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+
+let resolvedPromise;
+
+/**
+ * Polyfill for the microtask queuening API defined by WHATWG HTMP spec.
+ * https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#dom-queuemicrotask
+ *
+ * The method must queue a microtask to invoke @param {function} callback, and
+ * if the callback throws an exception, report the exception.
+ */
+export default function queueMicrotask(callback: Function) {
+  if (arguments.length < 1) {
+    throw new TypeError(
+      'queueMicrotask must be called with at least one argument (a function to call)',
+    );
+  }
+  if (typeof callback !== 'function') {
+    throw new TypeError('The argument to queueMicrotask must be a function.');
+  }
+
+  // Try to reuse a lazily allocated resolved promise from closure.
+  (resolvedPromise || (resolvedPromise = Promise.resolve()))
+    .then(callback)
+    .catch(error =>
+      // Report the exception until the next tick.
+      setTimeout(() => {
+        throw error;
+      }, 0),
+    );
+}
diff --git a/Libraries/Core/__tests__/ExceptionsManager-test.js b/Libraries/Core/__tests__/ExceptionsManager-test.js
index 71e3be3cb94164..ffd3be593eebe2 100644
--- a/Libraries/Core/__tests__/ExceptionsManager-test.js
+++ b/Libraries/Core/__tests__/ExceptionsManager-test.js
@@ -10,6 +10,9 @@
 
 'use strict';
 
+const ExceptionsManager = require('../ExceptionsManager');
+const NativeExceptionsManager = require('../NativeExceptionsManager').default;
+const ReactFiberErrorDialog = require('../ReactFiberErrorDialog').default;
 const fs = require('fs');
 const path = require('path');
 
@@ -23,10 +26,8 @@ const capturedErrorDefaults = {
 };
 
 describe('ExceptionsManager', () => {
-  let ReactFiberErrorDialog,
-    ExceptionsManager,
-    NativeExceptionsManager,
-    nativeReportException;
+  let nativeReportException;
+
   beforeEach(() => {
     jest.resetModules();
     jest.mock('../NativeExceptionsManager', () => {
@@ -46,11 +47,8 @@ describe('ExceptionsManager', () => {
           return {stack};
         },
     );
-    jest.spyOn(console, 'error').mockImplementation(() => {});
-    ReactFiberErrorDialog = require('../ReactFiberErrorDialog');
-    NativeExceptionsManager = require('../NativeExceptionsManager').default;
+    jest.spyOn(console, 'error').mockReturnValue(undefined);
     nativeReportException = NativeExceptionsManager.reportException;
-    ExceptionsManager = require('../ExceptionsManager');
   });
 
   afterEach(() => {
@@ -360,6 +358,27 @@ describe('ExceptionsManager', () => {
       expect(mockError.mock.calls[0]).toEqual(args);
     });
 
+    test('logging a warning-looking object', () => {
+      // Forces `strignifySafe` to invoke `toString()`.
+      const object = {toString: () => 'Warning: Some error may have happened'};
+      object.cycle = object;
+
+      const args = [object];
+
+      console.error(...args);
+
+      expect(nativeReportException).toHaveBeenCalled();
+    });
+
+    test('does not log "warn"-type errors', () => {
+      const error = new Error('This is a warning.');
+      error.type = 'warn';
+
+      console.error(error);
+
+      expect(nativeReportException).not.toHaveBeenCalled();
+    });
+
     test('reportErrorsAsExceptions = false', () => {
       console.reportErrorsAsExceptions = false;
       const message = 'Some error happened';
@@ -460,6 +479,15 @@ describe('ExceptionsManager', () => {
         "const error = new Error('Some error happened');",
       );
     });
+
+    test('logs fatal "warn"-type errors', () => {
+      const error = new Error('This is a fatal... warning?');
+      error.type = 'warn';
+
+      ExceptionsManager.handleException(error, true);
+
+      expect(nativeReportException).toHaveBeenCalled();
+    });
   });
 
   describe('unstable_setExceptionDecorator', () => {
diff --git a/Libraries/Core/polyfillPromise.js b/Libraries/Core/polyfillPromise.js
index 6551745bf52c5d..f83fea90248b9d 100644
--- a/Libraries/Core/polyfillPromise.js
+++ b/Libraries/Core/polyfillPromise.js
@@ -29,7 +29,7 @@ if (global?.HermesInternal?.hasPromise?.()) {
     if (typeof HermesPromise !== 'function') {
       console.error('HermesPromise does not exist');
     }
-    global.HermesInternal.enablePromiseRejectionTracker(
+    global.HermesInternal?.enablePromiseRejectionTracker?.(
       require('../promiseRejectionTrackingOptions').default,
     );
   }
diff --git a/Libraries/Core/setUpDeveloperTools.js b/Libraries/Core/setUpDeveloperTools.js
index 3ee84d8727349d..86f2732643ac8d 100644
--- a/Libraries/Core/setUpDeveloperTools.js
+++ b/Libraries/Core/setUpDeveloperTools.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Platform from '../Utilities/Platform';
 
 declare var console: typeof console & {_isPolyfilled: boolean, ...};
@@ -19,66 +17,63 @@ declare var console: typeof console & {_isPolyfilled: boolean, ...};
  * You can use this module directly, or just require InitializeCore.
  */
 if (__DEV__) {
-  // TODO (T45803484) Enable devtools for bridgeless RN
-  if (!global.RN$Bridgeless) {
-    if (!global.__RCTProfileIsProfiling) {
-      require('./setUpReactDevTools');
+  if (!global.__RCTProfileIsProfiling) {
+    require('./setUpReactDevTools');
 
-      // Set up inspector
-      const JSInspector = require('../JSInspector/JSInspector');
-      JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
-    }
+    // Set up inspector
+    const JSInspector = require('../JSInspector/JSInspector');
+    JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
+  }
 
-    // Note we can't check if console is "native" because it would appear "native" in JSC and Hermes.
-    // We also can't check any properties that don't exist in the Chrome worker environment.
-    // So we check a navigator property that's set to a particular value ("Netscape") in all real browsers.
-    const isLikelyARealBrowser =
-      global.navigator != null &&
-      /*              _
-       *             | |
-       *   _ __   ___| |_ ___  ___ __ _ _ __   ___
-       *  | '_ \ / _ \ __/ __|/ __/ _` | '_ \ / _ \
-       *  | | | |  __/ |_\__ \ (_| (_| | |_) |  __/
-       *  |_| |_|\___|\__|___/\___\__,_| .__/ \___|
-       *                               | |
-       *                               |_|
-       */
-      global.navigator.appName === 'Netscape'; // Any real browser
+  // Note we can't check if console is "native" because it would appear "native" in JSC and Hermes.
+  // We also can't check any properties that don't exist in the Chrome worker environment.
+  // So we check a navigator property that's set to a particular value ("Netscape") in all real browsers.
+  const isLikelyARealBrowser =
+    global.navigator != null &&
+    /*              _
+     *             | |
+     *   _ __   ___| |_ ___  ___ __ _ _ __   ___
+     *  | '_ \ / _ \ __/ __|/ __/ _` | '_ \ / _ \
+     *  | | | |  __/ |_\__ \ (_| (_| | |_) |  __/
+     *  |_| |_|\___|\__|___/\___\__,_| .__/ \___|
+     *                               | |
+     *                               |_|
+     */
+    global.navigator.appName === 'Netscape'; // Any real browser
 
-    if (!Platform.isTesting) {
-      const HMRClient = require('../Utilities/HMRClient');
+  if (!Platform.isTesting) {
+    const HMRClient = require('../Utilities/HMRClient');
 
-      if (console._isPolyfilled) {
-        // We assume full control over the console and send JavaScript logs to Metro.
-        [
-          'trace',
-          'info',
-          'warn',
-          'error',
-          'log',
-          'group',
-          'groupCollapsed',
-          'groupEnd',
-          'debug',
-        ].forEach(level => {
-          const originalFunction = console[level];
-          console[level] = function(...args) {
-            HMRClient.log(level, args);
-            originalFunction.apply(console, args);
-          };
-        });
-      } else {
-        // We assume the environment has a real rich console (like Chrome), and don't hijack it to log to Metro.
-        // It's likely the developer is using rich console to debug anyway, and hijacking it would
-        // lose the filenames in console.log calls: https://github.com/facebook/react-native/issues/26788.
-        HMRClient.log('log', [
-          `JavaScript logs will appear in your ${
-            isLikelyARealBrowser ? 'browser' : 'environment'
-          } console`,
-        ]);
-      }
+    if (console._isPolyfilled) {
+      // We assume full control over the console and send JavaScript logs to Metro.
+      [
+        'trace',
+        'info',
+        'warn',
+        'error',
+        'log',
+        'group',
+        'groupCollapsed',
+        'groupEnd',
+        'debug',
+      ].forEach(level => {
+        const originalFunction = console[level];
+        console[level] = function(...args) {
+          HMRClient.log(level, args);
+          originalFunction.apply(console, args);
+        };
+      });
+    } else {
+      // We assume the environment has a real rich console (like Chrome), and don't hijack it to log to Metro.
+      // It's likely the developer is using rich console to debug anyway, and hijacking it would
+      // lose the filenames in console.log calls: https://github.com/facebook/react-native/issues/26788.
+      HMRClient.log('log', [
+        `JavaScript logs will appear in your ${
+          isLikelyARealBrowser ? 'browser' : 'environment'
+        } console`,
+      ]);
     }
-
-    require('./setUpReactRefresh');
   }
+
+  require('./setUpReactRefresh');
 }
diff --git a/Libraries/Core/setUpReactDevTools.js b/Libraries/Core/setUpReactDevTools.js
index 2ba4c5dc6a41b0..099f12242bc56e 100644
--- a/Libraries/Core/setUpReactDevTools.js
+++ b/Libraries/Core/setUpReactDevTools.js
@@ -11,8 +11,19 @@
 'use strict';
 
 if (__DEV__) {
+  let isWebSocketOpen = false;
+  let ws = null;
+
   const reactDevTools = require('react-devtools-core');
   const connectToDevTools = () => {
+    if (ws !== null && isWebSocketOpen) {
+      // If the DevTools backend is already connected, don't recreate the WebSocket.
+      // This would break the connection.
+      // If there isn't an active connection, a backend may be waiting to connect,
+      // in which case it's okay to make a new one.
+      return;
+    }
+
     // not when debugging in chrome
     // TODO(t12832058) This check is broken
     if (!window.document) {
@@ -39,7 +50,13 @@ if (__DEV__) {
           : 8097;
 
       const WebSocket = require('../WebSocket/WebSocket');
-      const ws = new WebSocket('ws://' + host + ':' + port);
+      ws = new WebSocket('ws://' + host + ':' + port);
+      ws.addEventListener('close', event => {
+        isWebSocketOpen = false;
+      });
+      ws.addEventListener('open', event => {
+        isWebSocketOpen = true;
+      });
 
       const viewConfig = require('../Components/View/ReactNativeViewViewConfig');
       reactDevTools.connectToDevTools({
diff --git a/Libraries/Core/setUpReactRefresh.js b/Libraries/Core/setUpReactRefresh.js
index 4ee10acf086ffa..ccc67ca22398b5 100644
--- a/Libraries/Core/setUpReactRefresh.js
+++ b/Libraries/Core/setUpReactRefresh.js
@@ -45,5 +45,7 @@ if (__DEV__) {
     },
   };
 
-  (require: any).Refresh = Refresh;
+  // The metro require polyfill can not have dependencies (applies for all polyfills).
+  // Expose `Refresh` by assigning it to global to make it available in the polyfill.
+  global[(global.__METRO_GLOBAL_PREFIX__ || '') + '__ReactRefresh'] = Refresh;
 }
diff --git a/Libraries/Core/setUpRegeneratorRuntime.js b/Libraries/Core/setUpRegeneratorRuntime.js
index b10aab3a5fbd6f..426e9b3b1604a4 100644
--- a/Libraries/Core/setUpRegeneratorRuntime.js
+++ b/Libraries/Core/setUpRegeneratorRuntime.js
@@ -11,17 +11,34 @@
 'use strict';
 
 const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
+const {hasNativeConstructor} = require('../Utilities/FeatureDetection');
 
 /**
  * Set up regenerator.
  * You can use this module directly, or just require InitializeCore.
  */
-polyfillGlobal('regeneratorRuntime', () => {
-  // The require just sets up the global, so make sure when we first
-  // invoke it the global does not exist
-  delete global.regeneratorRuntime;
 
-  // regenerator-runtime/runtime exports the regeneratorRuntime object, so we
-  // can return it safely.
-  return require('regenerator-runtime/runtime'); // flowlint-line untyped-import:off
-});
+let hasNativeGenerator;
+try {
+  // If this function was lowered by regenerator-transform, it will try to
+  // access `global.regeneratorRuntime` which doesn't exist yet and will throw.
+  hasNativeGenerator = hasNativeConstructor(function*() {},
+  'GeneratorFunction');
+} catch {
+  // In this case, we know generators are not provided natively.
+  hasNativeGenerator = false;
+}
+
+// If generators are provided natively, which suggests that there was no
+// regenerator-transform, then there is no need to set up the runtime.
+if (!hasNativeGenerator) {
+  polyfillGlobal('regeneratorRuntime', () => {
+    // The require just sets up the global, so make sure when we first
+    // invoke it the global does not exist
+    delete global.regeneratorRuntime;
+
+    // regenerator-runtime/runtime exports the regeneratorRuntime object, so we
+    // can return it safely.
+    return require('regenerator-runtime/runtime'); // flowlint-line untyped-import:off
+  });
+}
diff --git a/Libraries/Core/setUpTimers.js b/Libraries/Core/setUpTimers.js
index 89df16cc80cdec..9d2020f83641e0 100644
--- a/Libraries/Core/setUpTimers.js
+++ b/Libraries/Core/setUpTimers.js
@@ -10,10 +10,25 @@
 
 'use strict';
 
+const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
+const {isNativeFunction} = require('../Utilities/FeatureDetection');
+
+if (__DEV__) {
+  if (typeof global.Promise !== 'function') {
+    console.error('Promise should exist before setting up timers.');
+  }
+}
+
+// Currently, Hermes `Promise` is implemented via Internal Bytecode.
+const hasHermesPromiseQueuedToJSVM =
+  global.HermesInternal?.hasPromise?.() === true &&
+  global.HermesInternal?.useEngineQueue?.() === true;
+
+const hasNativePromise = isNativeFunction(Promise);
+const hasPromiseQueuedToJSVM = hasNativePromise || hasHermesPromiseQueuedToJSVM;
+
 // In bridgeless mode, timers are host functions installed from cpp.
 if (!global.RN$Bridgeless) {
-  const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
-
   /**
    * Set up timers.
    * You can use this module directly, or just require InitializeCore.
@@ -22,13 +37,57 @@ if (!global.RN$Bridgeless) {
     polyfillGlobal(name, () => require('./Timers/JSTimers')[name]);
   };
   defineLazyTimer('setTimeout');
-  defineLazyTimer('setInterval');
-  defineLazyTimer('setImmediate');
   defineLazyTimer('clearTimeout');
+  defineLazyTimer('setInterval');
   defineLazyTimer('clearInterval');
-  defineLazyTimer('clearImmediate');
   defineLazyTimer('requestAnimationFrame');
   defineLazyTimer('cancelAnimationFrame');
   defineLazyTimer('requestIdleCallback');
   defineLazyTimer('cancelIdleCallback');
 }
+
+/**
+ * Set up immediate APIs, which is required to use the same microtask queue
+ * as the Promise.
+ */
+if (hasPromiseQueuedToJSVM) {
+  // When promise queues to the JSVM microtasks queue, we shim the immedaite
+  // APIs via `queueMicrotask` to maintain the backward compatibility.
+  polyfillGlobal(
+    'setImmediate',
+    () => require('./Timers/immediateShim').setImmediate,
+  );
+  polyfillGlobal(
+    'clearImmediate',
+    () => require('./Timers/immediateShim').clearImmediate,
+  );
+} else {
+  // When promise was polyfilled hence is queued to the RN microtask queue,
+  // we polyfill the immediate APIs as aliases to the ReactNativeMicrotask APIs.
+  // Note that in bridgeless mode, immediate APIs are installed from cpp.
+  if (!global.RN$Bridgeless) {
+    polyfillGlobal(
+      'setImmediate',
+      () => require('./Timers/JSTimers').queueReactNativeMicrotask,
+    );
+    polyfillGlobal(
+      'clearImmediate',
+      () => require('./Timers/JSTimers').clearReactNativeMicrotask,
+    );
+  }
+}
+
+/**
+ * Set up the microtask queueing API, which is required to use the same
+ * microtask queue as the Promise.
+ */
+if (hasHermesPromiseQueuedToJSVM) {
+  // Fast path for Hermes.
+  polyfillGlobal('queueMicrotask', () => global.HermesInternal?.enqueueJob);
+} else {
+  // Polyfill it with promise (regardless it's polyfiled or native) otherwise.
+  polyfillGlobal(
+    'queueMicrotask',
+    () => require('./Timers/queueMicrotask.js').default,
+  );
+}
diff --git a/Libraries/Core/setUpXHR.js b/Libraries/Core/setUpXHR.js
index 15cdb3b9e559ad..413fcd7e1f5385 100644
--- a/Libraries/Core/setUpXHR.js
+++ b/Libraries/Core/setUpXHR.js
@@ -21,10 +21,10 @@ const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 polyfillGlobal('XMLHttpRequest', () => require('../Network/XMLHttpRequest'));
 polyfillGlobal('FormData', () => require('../Network/FormData'));
 
-polyfillGlobal('fetch', () => require('../Network/fetch').fetch); // flowlint-line untyped-import:off
-polyfillGlobal('Headers', () => require('../Network/fetch').Headers); // flowlint-line untyped-import:off
-polyfillGlobal('Request', () => require('../Network/fetch').Request); // flowlint-line untyped-import:off
-polyfillGlobal('Response', () => require('../Network/fetch').Response); // flowlint-line untyped-import:off
+polyfillGlobal('fetch', () => require('../Network/fetch').fetch);
+polyfillGlobal('Headers', () => require('../Network/fetch').Headers);
+polyfillGlobal('Request', () => require('../Network/fetch').Request);
+polyfillGlobal('Response', () => require('../Network/fetch').Response);
 polyfillGlobal('WebSocket', () => require('../WebSocket/WebSocket'));
 polyfillGlobal('Blob', () => require('../Blob/Blob'));
 polyfillGlobal('File', () => require('../Blob/File'));
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.android.js b/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.android.js
new file mode 100644
index 00000000000000..7df9fbf644cdba
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.android.js
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const DeprecatedImageStylePropTypes = require('./DeprecatedImageStylePropTypes');
+const DeprecatedStyleSheetPropType = require('./DeprecatedStyleSheetPropType');
+const DeprecatedViewPropTypes = require('./DeprecatedViewPropTypes');
+const PropTypes = require('prop-types');
+
+const DeprecatedImagePropType = {
+  ...DeprecatedViewPropTypes,
+  style: (DeprecatedStyleSheetPropType(
+    DeprecatedImageStylePropTypes,
+  ): ReactPropsCheckType),
+  /**
+   * See https://reactnative.dev/docs/image.html#source
+   */
+  source: (PropTypes.oneOfType([
+    PropTypes.shape({
+      uri: PropTypes.string,
+      headers: PropTypes.objectOf(PropTypes.string),
+    }),
+    // Opaque type returned by require('./image.jpg')
+    PropTypes.number,
+    // Multiple sources
+    PropTypes.arrayOf(
+      PropTypes.shape({
+        uri: PropTypes.string,
+        width: PropTypes.number,
+        height: PropTypes.number,
+        headers: PropTypes.objectOf(PropTypes.string),
+      }),
+    ),
+  ]): React$PropType$Primitive<
+    | {
+        headers?: {[string]: string, ...},
+        uri?: string,
+        ...
+      }
+    | number
+    | Array<{
+        headers?: {[string]: string, ...},
+        height?: number,
+        uri?: string,
+        width?: number,
+        ...
+      }>,
+  >),
+  /**
+   * blurRadius: the blur radius of the blur filter added to the image
+   *
+   * See https://reactnative.dev/docs/image.html#blurradius
+   */
+  blurRadius: PropTypes.number,
+  /**
+   * See https://reactnative.dev/docs/image.html#defaultsource
+   */
+  defaultSource: PropTypes.number,
+  /**
+   * See https://reactnative.dev/docs/image.html#loadingindicatorsource
+   */
+  loadingIndicatorSource: (PropTypes.oneOfType([
+    PropTypes.shape({
+      uri: PropTypes.string,
+    }),
+    // Opaque type returned by require('./image.jpg')
+    PropTypes.number,
+  ]): React$PropType$Primitive<{uri?: string, ...} | number>),
+  progressiveRenderingEnabled: PropTypes.bool,
+  fadeDuration: PropTypes.number,
+  /**
+   * Analytics Tag used by this Image
+   */
+  internal_analyticTag: PropTypes.string,
+  /**
+   * Invoked on load start
+   */
+  onLoadStart: PropTypes.func,
+  /**
+   * Invoked on load error
+   */
+  onError: PropTypes.func,
+  /**
+   * Invoked when load completes successfully
+   */
+  onLoad: PropTypes.func,
+  /**
+   * Invoked when load either succeeds or fails
+   */
+  onLoadEnd: PropTypes.func,
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID: PropTypes.string,
+  /**
+   * The mechanism that should be used to resize the image when the image's dimensions
+   * differ from the image view's dimensions. Defaults to `auto`.
+   *
+   * See https://reactnative.dev/docs/image.html#resizemethod
+   */
+  resizeMethod: (PropTypes.oneOf([
+    'auto',
+    'resize',
+    'scale',
+  ]): React$PropType$Primitive<'auto' | 'resize' | 'scale'>),
+  /**
+   * Determines how to resize the image when the frame doesn't match the raw
+   * image dimensions.
+   *
+   * See https://reactnative.dev/docs/image.html#resizemode
+   */
+  resizeMode: (PropTypes.oneOf([
+    'cover',
+    'contain',
+    'stretch',
+    'repeat',
+    'center',
+  ]): React$PropType$Primitive<
+    'cover' | 'contain' | 'stretch' | 'repeat' | 'center',
+  >),
+};
+
+module.exports = DeprecatedImagePropType;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.js b/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.ios.js
similarity index 100%
rename from Libraries/DeprecatedPropTypes/DeprecatedImagePropType.js
rename to Libraries/DeprecatedPropTypes/DeprecatedImagePropType.ios.js
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.macos.js b/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.macos.js
new file mode 100644
index 00000000000000..9773a9cee71377
--- /dev/null
+++ b/Libraries/DeprecatedPropTypes/DeprecatedImagePropType.macos.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+// TODO(macOS GH#774)
+
+/* $FlowFixMe allow macOS to share iOS file */
+const DeprecatedImagePropType = require('./DeprecatedImagePropType.ios.js');
+
+module.exports = DeprecatedImagePropType;
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedTextInputPropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedTextInputPropTypes.js
index dca4fe0a475776..937e1c7a73e73c 100644
--- a/Libraries/DeprecatedPropTypes/DeprecatedTextInputPropTypes.js
+++ b/Libraries/DeprecatedPropTypes/DeprecatedTextInputPropTypes.js
@@ -11,9 +11,9 @@
 'use strict';
 
 const DeprecatedColorPropType = require('./DeprecatedColorPropType');
+const DeprecatedTextPropTypes = require('./DeprecatedTextPropTypes');
 const DeprecatedViewPropTypes = require('./DeprecatedViewPropTypes');
 const PropTypes = require('prop-types');
-const Text = require('../Text/Text');
 
 const DataDetectorTypes = [
   'phoneNumber',
@@ -64,7 +64,7 @@ module.exports = {
    *
    * @platform android
    */
-  autoCompleteType: (PropTypes.oneOf([
+  autoComplete: (PropTypes.oneOf([
     'cc-csc',
     'cc-exp',
     'cc-exp-month',
@@ -136,6 +136,7 @@ module.exports = {
    * - `decimal-pad`
    * - `email-address`
    * - `phone-pad`
+   * - `url`
    *
    * *iOS Only*
    *
@@ -143,7 +144,6 @@ module.exports = {
    *
    * - `ascii-capable`
    * - `numbers-and-punctuation`
-   * - `url`
    * - `name-phone-pad`
    * - `twitter`
    * - `web-search`
@@ -162,10 +162,10 @@ module.exports = {
     'numeric',
     'phone-pad',
     'number-pad',
+    'url',
     // iOS-only
     'ascii-capable',
     'numbers-and-punctuation',
-    'url',
     'name-phone-pad',
     'decimal-pad',
     'twitter',
@@ -467,7 +467,7 @@ module.exports = {
    * [Styles](docs/style.html)
    */
   // $FlowFixMe[incompatible-use]
-  style: Text.propTypes.style,
+  style: DeprecatedTextPropTypes.style,
   /**
    * The color of the `TextInput` underline.
    * @platform android
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js b/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
index 77c4146a865f5b..2ba6f3115c98f3 100644
--- a/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
+++ b/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
@@ -15,6 +15,7 @@ module.exports = {
   DeprecatedAccessibilityRoles: [
     'none',
     'button',
+    'togglebutton',
     'link',
     'search',
     'image',
@@ -39,6 +40,7 @@ module.exports = {
     'tab',
     'tablist',
     'timer',
+    'list',
     'toolbar',
   ],
 };
diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js
index 99f17ebb2c5dda..247e75c7a42074 100644
--- a/Libraries/EventEmitter/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/NativeEventEmitter.js
@@ -4,80 +4,133 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict-local
  * @format
- * @flow
  */
 
 'use strict';
 
+import {
+  type EventSubscription,
+  type IEventEmitter,
+} from '../vendor/emitter/EventEmitter';
 import Platform from '../Utilities/Platform';
-import EventEmitter from '../vendor/emitter/EventEmitter';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import RCTDeviceEventEmitter from './RCTDeviceEventEmitter';
 import invariant from 'invariant';
 
-type NativeModule = {
-  +addListener: (eventType: string) => void,
-  +removeListeners: (count: number) => void,
-  ...
-};
-
-type NativeEventEmitterOptions = $ReadOnly<{|
-  __SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: boolean,
-|}>;
+interface NativeModule {
+  addListener(eventType: string): void;
+  removeListeners(count: number): void;
+}
 
-const DEFAULT_NATIVE_EVENT_EMITTER_OPTIONS = {
-  __SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: false,
-};
+export type {EventSubscription};
 
 /**
- * Abstract base class for implementing event-emitting modules. This implements
- * a subset of the standard EventEmitter node module API.
+ * `NativeEventEmitter` is intended for use by Native Modules to emit events to
+ * JavaScript listeners. If a `NativeModule` is supplied to the constructor, it
+ * will be notified (via `addListener` and `removeListeners`) when the listener
+ * count changes to manage "native memory".
+ *
+ * Currently, all native events are fired via a global `RCTDeviceEventEmitter`.
+ * This means event names must be globally unique, and it means that call sites
+ * can theoretically listen to `RCTDeviceEventEmitter` (although discouraged).
  */
-export default class NativeEventEmitter extends EventEmitter {
+export default class NativeEventEmitter<TEventToArgsMap: {...}>
+  implements IEventEmitter<TEventToArgsMap> {
   _nativeModule: ?NativeModule;
-  _disableCallsIntoModule: boolean;
 
-  constructor(
-    nativeModule: ?NativeModule,
-    options: NativeEventEmitterOptions = DEFAULT_NATIVE_EVENT_EMITTER_OPTIONS,
-  ) {
-    super(RCTDeviceEventEmitter.sharedSubscriber);
-    this._disableCallsIntoModule =
-      options.__SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+  constructor(nativeModule: ?NativeModule) {
     if (
       Platform.OS === 'ios' ||
       Platform.OS === 'macos' /* TODO(macOS GH#774) */
     ) {
-      invariant(nativeModule, 'Native module cannot be null.');
+      invariant(
+        nativeModule != null,
+        '`new NativeEventEmitter()` requires a non-null argument.',
+      );
+    }
+
+    const hasAddListener =
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      !!nativeModule && typeof nativeModule.addListener === 'function';
+    const hasRemoveListeners =
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      !!nativeModule && typeof nativeModule.removeListeners === 'function';
+
+    if (nativeModule && hasAddListener && hasRemoveListeners) {
       this._nativeModule = nativeModule;
+    } else if (nativeModule != null) {
+      if (!hasAddListener) {
+        console.warn(
+          '`new NativeEventEmitter()` was called with a non-null argument without the required `addListener` method.',
+        );
+      }
+      if (!hasRemoveListeners) {
+        console.warn(
+          '`new NativeEventEmitter()` was called with a non-null argument without the required `removeListeners` method.',
+        );
+      }
     }
   }
 
-  addListener(
-    eventType: string,
-    listener: Function,
-    context: ?Object,
+  addListener<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+    context?: mixed,
   ): EventSubscription {
-    if (this._nativeModule != null && !this._disableCallsIntoModule) {
-      this._nativeModule.addListener(eventType);
-    }
-    return super.addListener(eventType, listener, context);
+    this._nativeModule?.addListener(eventType);
+    let subscription: ?EventSubscription = RCTDeviceEventEmitter.addListener(
+      eventType,
+      listener,
+      context,
+    );
+
+    return {
+      remove: () => {
+        if (subscription != null) {
+          this._nativeModule?.removeListeners(1);
+          // $FlowFixMe[incompatible-use]
+          subscription.remove();
+          subscription = null;
+        }
+      },
+    };
   }
 
-  removeAllListeners(eventType: string) {
-    invariant(eventType, 'eventType argument is required.');
-    const count = this.listenerCount(eventType);
-    if (this._nativeModule != null && !this._disableCallsIntoModule) {
-      this._nativeModule.removeListeners(count);
-    }
-    super.removeAllListeners(eventType);
+  /**
+   * @deprecated Use `remove` on the EventSubscription from `addListener`.
+   */
+  removeListener<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+  ): void {
+    this._nativeModule?.removeListeners(1);
+    // NOTE: This will report a deprecation notice via `console.error`.
+    // $FlowFixMe[prop-missing] - `removeListener` exists but is deprecated.
+    RCTDeviceEventEmitter.removeListener(eventType, listener);
   }
 
-  removeSubscription(subscription: EventSubscription) {
-    if (this._nativeModule != null && !this._disableCallsIntoModule) {
-      this._nativeModule.removeListeners(1);
-    }
-    super.removeSubscription(subscription);
+  emit<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    ...args: $ElementType<TEventToArgsMap, TEvent>
+  ): void {
+    // Generally, `RCTDeviceEventEmitter` is directly invoked. But this is
+    // included for completeness.
+    RCTDeviceEventEmitter.emit(eventType, ...args);
+  }
+
+  removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(
+    eventType?: ?TEvent,
+  ): void {
+    invariant(
+      eventType != null,
+      '`NativeEventEmitter.removeAllListener()` requires a non-null argument.',
+    );
+    this._nativeModule?.removeListeners(this.listenerCount(eventType));
+    RCTDeviceEventEmitter.removeAllListeners(eventType);
+  }
+
+  listenerCount<TEvent: $Keys<TEventToArgsMap>>(eventType: TEvent): number {
+    return RCTDeviceEventEmitter.listenerCount(eventType);
   }
 }
diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
index 39e456b8096b52..f4e57ef40f765d 100644
--- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js
+++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
@@ -4,80 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict
  * @format
- * @flow
  */
 
-'use strict';
+import EventEmitter, {type IEventEmitter} from '../vendor/emitter/EventEmitter';
 
-import EventEmitter from '../vendor/emitter/EventEmitter';
-import type EmitterSubscription from '../vendor/emitter/_EmitterSubscription';
-import EventSubscriptionVendor from '../vendor/emitter/_EventSubscriptionVendor';
-
-function checkNativeEventModule(eventType: ?string) {
-  if (eventType) {
-    if (eventType.lastIndexOf('statusBar', 0) === 0) {
-      throw new Error(
-        '`' +
-          eventType +
-          '` event should be registered via the StatusBarIOS module',
-      );
-    }
-    if (eventType.lastIndexOf('keyboard', 0) === 0) {
-      throw new Error(
-        '`' +
-          eventType +
-          '` event should be registered via the Keyboard module',
-      );
-    }
-    if (eventType === 'appStateDidChange' || eventType === 'memoryWarning') {
-      throw new Error(
-        '`' +
-          eventType +
-          '` event should be registered via the AppState module',
-      );
-    }
-  }
-}
+// FIXME: use typed events
+type RCTDeviceEventDefinitions = $FlowFixMe;
 
 /**
- * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
- * adding all event listeners directly to RCTDeviceEventEmitter.
+ * Global EventEmitter used by the native platform to emit events to JavaScript.
+ * Events are identified by globally unique event names.
+ *
+ * NativeModules that emit events should instead subclass `NativeEventEmitter`.
  */
-class RCTDeviceEventEmitter extends EventEmitter {
-  sharedSubscriber: EventSubscriptionVendor;
-
-  constructor() {
-    const sharedSubscriber = new EventSubscriptionVendor();
-    super(sharedSubscriber);
-    this.sharedSubscriber = sharedSubscriber;
-  }
-
-  addListener(
-    eventType: string,
-    listener: Function,
-    context: ?Object,
-  ): EmitterSubscription {
-    if (__DEV__) {
-      checkNativeEventModule(eventType);
-    }
-    return super.addListener(eventType, listener, context);
-  }
-
-  removeAllListeners(eventType: ?string) {
-    if (__DEV__) {
-      checkNativeEventModule(eventType);
-    }
-    super.removeAllListeners(eventType);
-  }
-
-  removeSubscription(subscription: EmitterSubscription) {
-    if (subscription.emitter !== this) {
-      subscription.emitter.removeSubscription(subscription);
-    } else {
-      super.removeSubscription(subscription);
-    }
-  }
-}
-
-export default (new RCTDeviceEventEmitter(): RCTDeviceEventEmitter);
+export default (new EventEmitter(): IEventEmitter<RCTDeviceEventDefinitions>);
diff --git a/Libraries/EventEmitter/RCTEventEmitter.js b/Libraries/EventEmitter/RCTEventEmitter.js
index 8001a7cf36a005..fd0ac72eaf9995 100644
--- a/Libraries/EventEmitter/RCTEventEmitter.js
+++ b/Libraries/EventEmitter/RCTEventEmitter.js
@@ -14,7 +14,11 @@ const BatchedBridge = require('../BatchedBridge/BatchedBridge');
 
 const RCTEventEmitter = {
   register(eventEmitter: any) {
-    BatchedBridge.registerCallableModule('RCTEventEmitter', eventEmitter);
+    if (global.RN$Bridgeless) {
+      global.RN$registerCallableModule('RCTEventEmitter', () => eventEmitter);
+    } else {
+      BatchedBridge.registerCallableModule('RCTEventEmitter', eventEmitter);
+    }
   },
 };
 
diff --git a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
index 0e3c4faf51ccc1..9e7f4918450c83 100644
--- a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
+++ b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import RCTDeviceEventEmitter from './RCTDeviceEventEmitter';
 
 /**
diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
index cf812706d0266f..6863f81ef5f677 100644
--- a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
@@ -5,19 +5,42 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
-'use strict';
-
-import EventEmitter from '../../vendor/emitter/EventEmitter';
+import {
+  type EventSubscription,
+  type IEventEmitter,
+} from '../../vendor/emitter/EventEmitter';
 import RCTDeviceEventEmitter from '../RCTDeviceEventEmitter';
 
 /**
- * Mock the NativeEventEmitter as a normal JS EventEmitter.
+ * Mock `NativeEventEmitter` to ignore Native Modules.
  */
-export default class NativeEventEmitter extends EventEmitter {
-  constructor() {
-    super(RCTDeviceEventEmitter.sharedSubscriber);
+export default class NativeEventEmitter<TEventToArgsMap: {...}>
+  implements IEventEmitter<TEventToArgsMap> {
+  addListener<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+    context?: mixed,
+  ): EventSubscription {
+    return RCTDeviceEventEmitter.addListener(eventType, listener, context);
+  }
+
+  emit<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    ...args: $ElementType<TEventToArgsMap, TEvent>
+  ): void {
+    RCTDeviceEventEmitter.emit(eventType, ...args);
+  }
+
+  removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(
+    eventType?: ?TEvent,
+  ): void {
+    RCTDeviceEventEmitter.removeAllListeners(eventType);
+  }
+
+  listenerCount<TEvent: $Keys<TEventToArgsMap>>(eventType: TEvent): number {
+    return RCTDeviceEventEmitter.listenerCount(eventType);
   }
 }
diff --git a/Libraries/FBLazyVector/BUCK b/Libraries/FBLazyVector/BUCK
index d526718e2de05b..089bca264b12ab 100644
--- a/Libraries/FBLazyVector/BUCK
+++ b/Libraries/FBLazyVector/BUCK
@@ -2,7 +2,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "fb_apple_library")
 
 fb_apple_library(
     name = "FBLazyVector",
-    autoglob = True,
+    exported_headers = [
+        "FBLazyVector/FBLazyIterator.h",
+        "FBLazyVector/FBLazyVector.h",
+    ],
+    autoglob = False,
     complete_nullability = True,
     contacts = ["oncall+react_native@xmail.facebook.com"],
     enable_exceptions = False,
diff --git a/Libraries/FBLazyVector/FBLazyVector.podspec b/Libraries/FBLazyVector/FBLazyVector.podspec
index 4ecf18b34ae38e..e08210ef80285e 100644
--- a/Libraries/FBLazyVector/FBLazyVector.podspec
+++ b/Libraries/FBLazyVector/FBLazyVector.podspec
@@ -11,7 +11,7 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#774)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#774)
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "FBLazyVector"
diff --git a/Libraries/HeapCapture/HeapCapture.js b/Libraries/HeapCapture/HeapCapture.js
index d48368d8aa1608..1e76fd2cb1b676 100644
--- a/Libraries/HeapCapture/HeapCapture.js
+++ b/Libraries/HeapCapture/HeapCapture.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import NativeJSCHeapCapture from './NativeJSCHeapCapture';
 
 const HeapCapture = {
diff --git a/Libraries/HeapCapture/NativeJSCHeapCapture.js b/Libraries/HeapCapture/NativeJSCHeapCapture.js
index 0605cd119e099b..9a9b7abb0f0e10 100644
--- a/Libraries/HeapCapture/NativeJSCHeapCapture.js
+++ b/Libraries/HeapCapture/NativeJSCHeapCapture.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js
index 5ebd97a3d0298f..ee81537631cc14 100644
--- a/Libraries/Image/AssetSourceResolver.js
+++ b/Libraries/Image/AssetSourceResolver.js
@@ -21,6 +21,7 @@ export type ResolvedAssetSource = {|
 import type {PackagerAsset} from '@react-native/assets/registry';
 
 const PixelRatio = require('../Utilities/PixelRatio');
+const {pickScale} = require('./AssetUtils');
 const Platform = require('../Utilities/Platform');
 
 const invariant = require('invariant');
@@ -35,7 +36,7 @@ const {
  * Returns a path like 'assets/AwesomeModule/icon@2x.png'
  */
 function getScaledAssetPath(asset): string {
-  const scale = AssetSourceResolver.pickScale(asset.scales, PixelRatio.get());
+  const scale = pickScale(asset.scales, PixelRatio.get());
   const scaleSuffix = scale === 1 ? '' : '@' + scale + 'x';
   const assetDir = getBasePath(asset);
   return assetDir + '/' + asset.name + scaleSuffix + '.' + asset.type;
@@ -45,7 +46,7 @@ function getScaledAssetPath(asset): string {
  * Returns a path like 'drawable-mdpi/icon.png'
  */
 function getAssetPathInDrawableFolder(asset): string {
-  const scale = AssetSourceResolver.pickScale(asset.scales, PixelRatio.get());
+  const scale = pickScale(asset.scales, PixelRatio.get());
   const drawbleFolder = getAndroidResourceFolderName(asset, scale);
   const fileName = getAndroidResourceIdentifier(asset);
   return drawbleFolder + '/' + fileName + '.' + asset.type;
@@ -154,23 +155,14 @@ class AssetSourceResolver {
       width: this.asset.width,
       height: this.asset.height,
       uri: source,
-      scale: AssetSourceResolver.pickScale(this.asset.scales, PixelRatio.get()),
+      scale: pickScale(this.asset.scales, PixelRatio.get()),
     };
   }
 
-  static pickScale(scales: Array<number>, deviceScale: number): number {
-    // Packager guarantees that `scales` array is sorted
-    for (let i = 0; i < scales.length; i++) {
-      if (scales[i] >= deviceScale) {
-        return scales[i];
-      }
-    }
-
-    // If nothing matches, device scale is larger than any available
-    // scales, so we return the biggest one. Unless the array is empty,
-    // in which case we default to 1
-    return scales[scales.length - 1] || 1;
-  }
+  static pickScale: (
+    scales: Array<number>,
+    deviceScale?: number,
+  ) => number = pickScale;
 }
 
 module.exports = AssetSourceResolver;
diff --git a/Libraries/Image/AssetUtils.js b/Libraries/Image/AssetUtils.js
new file mode 100644
index 00000000000000..a2f85473ffc4be
--- /dev/null
+++ b/Libraries/Image/AssetUtils.js
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import PixelRatio from '../Utilities/PixelRatio';
+
+let cacheBreaker;
+let warnIfCacheBreakerUnset = true;
+
+export function pickScale(scales: Array<number>, deviceScale?: number): number {
+  if (deviceScale == null) {
+    deviceScale = PixelRatio.get();
+  }
+  // Packager guarantees that `scales` array is sorted
+  for (let i = 0; i < scales.length; i++) {
+    if (scales[i] >= deviceScale) {
+      return scales[i];
+    }
+  }
+
+  // If nothing matches, device scale is larger than any available
+  // scales, so we return the biggest one. Unless the array is empty,
+  // in which case we default to 1
+  return scales[scales.length - 1] || 1;
+}
+
+export function setUrlCacheBreaker(appendage: string) {
+  cacheBreaker = appendage;
+}
+
+export function getUrlCacheBreaker(): string {
+  if (cacheBreaker == null) {
+    if (__DEV__ && warnIfCacheBreakerUnset) {
+      warnIfCacheBreakerUnset = false;
+      console.warn(
+        'AssetUtils.getUrlCacheBreaker: Cache breaker value is unset',
+      );
+    }
+    return '';
+  }
+  return cacheBreaker;
+}
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index 5e57732a855424..e878ad5dbeb60e 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -8,146 +8,28 @@
  * @format
  */
 
-'use strict';
-
-const DeprecatedImageStylePropTypes = require('../DeprecatedPropTypes/DeprecatedImageStylePropTypes');
-const DeprecatedStyleSheetPropType = require('../DeprecatedPropTypes/DeprecatedStyleSheetPropType');
-const DeprecatedViewPropTypes = require('../DeprecatedPropTypes/DeprecatedViewPropTypes');
+import DeprecatedImagePropType from '../DeprecatedPropTypes/DeprecatedImagePropType';
 import ImageViewNativeComponent from './ImageViewNativeComponent';
-const PropTypes = require('prop-types');
-const React = require('react');
-const ReactNative = require('../Renderer/shims/ReactNative'); // eslint-disable-line no-unused-vars
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const TextAncestor = require('../Text/TextAncestor');
-
-const ImageAnalyticsTagContext = require('./ImageAnalyticsTagContext').default;
-const flattenStyle = require('../StyleSheet/flattenStyle');
-const resolveAssetSource = require('./resolveAssetSource');
+import * as React from 'react';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import TextAncestor from '../Text/TextAncestor';
+import ImageInjection from './ImageInjection';
+import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
+import flattenStyle from '../StyleSheet/flattenStyle';
+import resolveAssetSource from './resolveAssetSource';
 
 import NativeImageLoaderAndroid from './NativeImageLoaderAndroid';
 
-const TextInlineImageNativeComponent = require('./TextInlineImageNativeComponent');
+import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
 
 import type {ImageProps as ImagePropsType} from './ImageProps';
+import type {RootTag} from '../Types/RootTagTypes';
 
 let _requestId = 1;
 function generateRequestId() {
   return _requestId++;
 }
 
-const ImageProps = {
-  ...DeprecatedViewPropTypes,
-  style: (DeprecatedStyleSheetPropType(
-    DeprecatedImageStylePropTypes,
-  ): ReactPropsCheckType),
-  /**
-   * See https://reactnative.dev/docs/image.html#source
-   */
-  source: (PropTypes.oneOfType([
-    PropTypes.shape({
-      uri: PropTypes.string,
-      headers: PropTypes.objectOf(PropTypes.string),
-    }),
-    // Opaque type returned by require('./image.jpg')
-    PropTypes.number,
-    // Multiple sources
-    PropTypes.arrayOf(
-      PropTypes.shape({
-        uri: PropTypes.string,
-        width: PropTypes.number,
-        height: PropTypes.number,
-        headers: PropTypes.objectOf(PropTypes.string),
-      }),
-    ),
-  ]): React$PropType$Primitive<
-    | {
-        headers?: {[string]: string, ...},
-        uri?: string,
-        ...
-      }
-    | number
-    | Array<{
-        headers?: {[string]: string, ...},
-        height?: number,
-        uri?: string,
-        width?: number,
-        ...
-      }>,
-  >),
-  /**
-   * blurRadius: the blur radius of the blur filter added to the image
-   *
-   * See https://reactnative.dev/docs/image.html#blurradius
-   */
-  blurRadius: PropTypes.number,
-  /**
-   * See https://reactnative.dev/docs/image.html#defaultsource
-   */
-  defaultSource: PropTypes.number,
-  /**
-   * See https://reactnative.dev/docs/image.html#loadingindicatorsource
-   */
-  loadingIndicatorSource: (PropTypes.oneOfType([
-    PropTypes.shape({
-      uri: PropTypes.string,
-    }),
-    // Opaque type returned by require('./image.jpg')
-    PropTypes.number,
-  ]): React$PropType$Primitive<{uri?: string, ...} | number>),
-  progressiveRenderingEnabled: PropTypes.bool,
-  fadeDuration: PropTypes.number,
-  /**
-   * Analytics Tag used by this Image
-   */
-  internal_analyticTag: PropTypes.string,
-  /**
-   * Invoked on load start
-   */
-  onLoadStart: PropTypes.func,
-  /**
-   * Invoked on load error
-   */
-  onError: PropTypes.func,
-  /**
-   * Invoked when load completes successfully
-   */
-  onLoad: PropTypes.func,
-  /**
-   * Invoked when load either succeeds or fails
-   */
-  onLoadEnd: PropTypes.func,
-  /**
-   * Used to locate this view in end-to-end tests.
-   */
-  testID: PropTypes.string,
-  /**
-   * The mechanism that should be used to resize the image when the image's dimensions
-   * differ from the image view's dimensions. Defaults to `auto`.
-   *
-   * See https://reactnative.dev/docs/image.html#resizemethod
-   */
-  resizeMethod: (PropTypes.oneOf([
-    'auto',
-    'resize',
-    'scale',
-  ]): React$PropType$Primitive<'auto' | 'resize' | 'scale'>),
-  /**
-   * Determines how to resize the image when the frame doesn't match the raw
-   * image dimensions.
-   *
-   * See https://reactnative.dev/docs/image.html#resizemode
-   */
-  resizeMode: (PropTypes.oneOf([
-    'cover',
-    'contain',
-    'stretch',
-    'repeat',
-    'center',
-  ]): React$PropType$Primitive<
-    'cover' | 'contain' | 'stretch' | 'repeat' | 'center',
-  >),
-};
-
 /**
  * Retrieve the width and height (in pixels) of an image prior to displaying it
  *
@@ -194,6 +76,16 @@ function getSizeWithHeaders(
     );
 }
 
+function prefetchWithMetadata(
+  url: string,
+  queryRootName: string,
+  rootTag?: ?RootTag,
+  callback: ?Function,
+): any {
+  // TODO: T79192300 Log queryRootName and rootTag
+  prefetch(url, callback);
+}
+
 function prefetch(url: string, callback: ?Function): any {
   const requestId = generateRequestId();
   callback && callback(requestId);
@@ -219,10 +111,11 @@ type ImageComponentStatics = $ReadOnly<{|
   getSize: typeof getSize,
   getSizeWithHeaders: typeof getSizeWithHeaders,
   prefetch: typeof prefetch,
+  prefetchWithMetadata: typeof prefetchWithMetadata,
   abortPrefetch: typeof abortPrefetch,
   queryCache: typeof queryCache,
   resolveAssetSource: typeof resolveAssetSource,
-  propTypes: typeof ImageProps,
+  propTypes: typeof DeprecatedImagePropType,
 |}>;
 
 /**
@@ -239,8 +132,11 @@ let Image = (props: ImagePropsType, forwardedRef) => {
     props.loadingIndicatorSource,
   );
 
-  if (source && source.uri === '') {
-    console.warn('source.uri should not be an empty string');
+  if (source) {
+    const uri = source.uri;
+    if (uri === '') {
+      console.warn('source.uri should not be an empty string');
+    }
   }
 
   if (props.src) {
@@ -324,6 +220,10 @@ Image = React.forwardRef<
   | React.ElementRef<typeof ImageViewNativeComponent>,
 >(Image);
 
+if (ImageInjection.unstable_createImageComponent != null) {
+  Image = ImageInjection.unstable_createImageComponent(Image);
+}
+
 Image.displayName = 'Image';
 
 /**
@@ -358,6 +258,17 @@ Image.getSizeWithHeaders = getSizeWithHeaders;
  * comment and run Flow. */
 Image.prefetch = prefetch;
 
+/**
+ * Prefetches a remote image for later use by downloading it to the disk
+ * cache, and adds metadata for queryRootName and rootTag.
+ *
+ * See https://reactnative.dev/docs/image.html#prefetch
+ */
+/* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
+ * error found when Flow v0.89 was deployed. To see the error, delete this
+ * comment and run Flow. */
+Image.prefetchWithMetadata = prefetchWithMetadata;
+
 /**
  * Abort prefetch request.
  *
@@ -391,7 +302,7 @@ Image.resolveAssetSource = resolveAssetSource;
 /* $FlowFixMe(>=0.89.0 site=react_native_android_fb) This comment suppresses an
  * error found when Flow v0.89 was deployed. To see the error, delete this
  * comment and run Flow. */
-Image.propTypes = ImageProps;
+Image.propTypes = DeprecatedImagePropType;
 
 const styles = StyleSheet.create({
   base: {
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
index e5ff46e73827bf..49b508c9965b84 100644
--- a/Libraries/Image/Image.ios.js
+++ b/Libraries/Image/Image.ios.js
@@ -8,16 +8,13 @@
  * @format
  */
 
-'use strict';
+import DeprecatedImagePropType from '../DeprecatedPropTypes/DeprecatedImagePropType';
+import * as React from 'react';
+import StyleSheet from '../StyleSheet/StyleSheet';
 
-const DeprecatedImagePropType = require('../DeprecatedPropTypes/DeprecatedImagePropType');
-const React = require('react');
-const ReactNative = require('../Renderer/shims/ReactNative'); // eslint-disable-line no-unused-vars
-const StyleSheet = require('../StyleSheet/StyleSheet');
-
-const ImageAnalyticsTagContext = require('./ImageAnalyticsTagContext').default;
-const flattenStyle = require('../StyleSheet/flattenStyle');
-const resolveAssetSource = require('./resolveAssetSource');
+import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
+import flattenStyle from '../StyleSheet/flattenStyle';
+import resolveAssetSource from './resolveAssetSource';
 
 import type {ImageProps as ImagePropsType} from './ImageProps';
 
@@ -25,6 +22,7 @@ import type {ImageStyleProp} from '../StyleSheet/StyleSheet';
 import NativeImageLoaderIOS from './NativeImageLoaderIOS';
 
 import ImageViewNativeComponent from './ImageViewNativeComponent';
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 function getSize(
   uri: string,
@@ -59,6 +57,25 @@ function getSizeWithHeaders(
     );
 }
 
+function prefetchWithMetadata(
+  url: string,
+  queryRootName: string,
+  rootTag?: ?RootTag,
+): any {
+  if (NativeImageLoaderIOS.prefetchImageWithMetadata) {
+    // number params like rootTag cannot be nullable before TurboModules is available
+    return NativeImageLoaderIOS.prefetchImageWithMetadata(
+      url,
+      queryRootName,
+      // NOTE: RootTag type
+      // $FlowFixMe[incompatible-call] RootTag: number is incompatible with RootTag
+      rootTag ? rootTag : 0,
+    );
+  } else {
+    return NativeImageLoaderIOS.prefetchImage(url);
+  }
+}
+
 function prefetch(url: string): any {
   return NativeImageLoaderIOS.prefetchImage(url);
 }
@@ -73,6 +90,7 @@ type ImageComponentStatics = $ReadOnly<{|
   getSize: typeof getSize,
   getSizeWithHeaders: typeof getSizeWithHeaders,
   prefetch: typeof prefetch,
+  prefetchWithMetadata: typeof prefetchWithMetadata,
   queryCache: typeof queryCache,
   resolveAssetSource: typeof resolveAssetSource,
   propTypes: typeof DeprecatedImagePropType,
@@ -95,12 +113,10 @@ let Image = (props: ImagePropsType, forwardedRef) => {
   let sources;
   let style: ImageStyleProp;
   if (Array.isArray(source)) {
-    // $FlowFixMe flattenStyle is not strong enough
     style = flattenStyle([styles.base, props.style]) || {};
     sources = source;
   } else {
     const {width, height, uri} = source;
-    // $FlowFixMe flattenStyle is not strong enough
     style = flattenStyle([{width, height}, styles.base, props.style]) || {};
     sources = [source];
 
@@ -109,7 +125,11 @@ let Image = (props: ImagePropsType, forwardedRef) => {
     }
   }
 
+  // $FlowFixMe[incompatible-use]
+  // $FlowFixMe[incompatible-type]
   const resizeMode = props.resizeMode || style.resizeMode || 'cover';
+  // $FlowFixMe[prop-missing]
+  // $FlowFixMe[incompatible-use]
   const tintColor = style.tintColor;
 
   if (props.src != null) {
@@ -124,14 +144,18 @@ let Image = (props: ImagePropsType, forwardedRef) => {
     );
   }
 
+  const accessibilityRole = props.accessibilityRole || 'image';
+
   return (
     <ImageAnalyticsTagContext.Consumer>
       {analyticTag => {
         return (
           <ImageViewNativeComponent
             {...props}
+            accessibilityRole={accessibilityRole}
             ref={forwardedRef}
             style={style}
+            // $FlowFixMe[incompatible-type]
             resizeMode={resizeMode}
             tintColor={tintColor}
             source={sources}
@@ -154,9 +178,9 @@ Image.displayName = 'Image';
  *
  * See https://reactnative.dev/docs/image.html#getsize
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.getSize = getSize;
 
 /**
@@ -165,9 +189,9 @@ Image.getSize = getSize;
  *
  * See https://reactnative.dev/docs/image.html#getsizewithheaders
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.getSizeWithHeaders = getSizeWithHeaders;
 
 /**
@@ -176,19 +200,30 @@ Image.getSizeWithHeaders = getSizeWithHeaders;
  *
  * See https://reactnative.dev/docs/image.html#prefetch
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.prefetch = prefetch;
 
+/**
+ * Prefetches a remote image for later use by downloading it to the disk
+ * cache, and adds metadata for queryRootName and rootTag.
+ *
+ * See https://reactnative.dev/docs/image.html#prefetch
+ */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
+Image.prefetchWithMetadata = prefetchWithMetadata;
+
 /**
  * Performs cache interrogation.
  *
  *  See https://reactnative.dev/docs/image.html#querycache
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.queryCache = queryCache;
 
 /**
@@ -196,14 +231,11 @@ Image.queryCache = queryCache;
  *
  * See https://reactnative.dev/docs/image.html#resolveassetsource
  */
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
+ * suppresses an error found when Flow v0.89 was deployed. To see the error,
+ * delete this comment and run Flow. */
 Image.resolveAssetSource = resolveAssetSource;
 
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
 Image.propTypes = DeprecatedImagePropType;
 
 const styles = StyleSheet.create({
diff --git a/Libraries/Image/ImageAnalyticsTagContext.js b/Libraries/Image/ImageAnalyticsTagContext.js
index ea458bf0c28043..54d8b65a26b29a 100644
--- a/Libraries/Image/ImageAnalyticsTagContext.js
+++ b/Libraries/Image/ImageAnalyticsTagContext.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 type ContextType = ?string;
@@ -18,4 +16,8 @@ const Context: React.Context<ContextType> = React.createContext<ContextType>(
   null,
 );
 
+if (__DEV__) {
+  Context.displayName = 'ImageAnalyticsTagContext';
+}
+
 export default Context;
diff --git a/Libraries/Image/ImageBackground.js b/Libraries/Image/ImageBackground.js
index b4b6223b846b61..84bb98551f07a0 100644
--- a/Libraries/Image/ImageBackground.js
+++ b/Libraries/Image/ImageBackground.js
@@ -74,8 +74,8 @@ class ImageBackground extends React.Component<$FlowFixMeProps> {
               // So, we have to proxy/reapply these styles explicitly for actual <Image> component.
               // This workaround should be removed after implementing proper support of
               // intrinsic content size of the <Image>.
-              width: style.width,
-              height: style.height,
+              width: style?.width,
+              height: style?.height,
             },
             imageStyle,
           ]}
diff --git a/Libraries/Image/ImageInjection.js b/Libraries/Image/ImageInjection.js
new file mode 100644
index 00000000000000..43723fa37566ce
--- /dev/null
+++ b/Libraries/Image/ImageInjection.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format strict-local
+ * @flow
+ */
+
+import * as React from 'react';
+import type {ImageProps as ImagePropsType} from './ImageProps';
+import ImageViewNativeComponent from './ImageViewNativeComponent';
+import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
+
+export default {
+  unstable_createImageComponent: (null: ?(
+    Image: React.AbstractComponent<
+      ImagePropsType,
+      | React.ElementRef<typeof TextInlineImageNativeComponent>
+      | React.ElementRef<typeof ImageViewNativeComponent>,
+    >,
+  ) => React.AbstractComponent<
+    ImagePropsType,
+    | React.ElementRef<typeof TextInlineImageNativeComponent>
+    | React.ElementRef<typeof ImageViewNativeComponent>,
+  >),
+};
diff --git a/Libraries/Image/ImagePickerIOS.js b/Libraries/Image/ImagePickerIOS.js
index a9127deaabf273..1d7438f2b53d53 100644
--- a/Libraries/Image/ImagePickerIOS.js
+++ b/Libraries/Image/ImagePickerIOS.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeImagePickerIOS from './NativeImagePickerIOS';
 import invariant from 'invariant';
 
diff --git a/Libraries/Image/ImageSource.js b/Libraries/Image/ImageSource.js
index b2ee46baa1b1d5..903b144b9ac889 100644
--- a/Libraries/Image/ImageSource.js
+++ b/Libraries/Image/ImageSource.js
@@ -13,42 +13,42 @@
 /**
  * Keep this in sync with `DeprecatedImageSourcePropType.js`.
  *
- * This type is intentinoally inexact in order to permit call sites that supply
+ * This type is intentionally inexact in order to permit call sites that supply
  * extra properties.
  */
-export type ImageURISource = $ReadOnly<{
+export interface ImageURISource {
   /**
    * `uri` is a string representing the resource identifier for the image, which
    * could be an http address, a local file path, or the name of a static image
    * resource (which should be wrapped in the `require('./path/to/image.png')`
    * function).
    */
-  uri?: ?string,
+  +uri?: ?string;
 
   /**
    * `bundle` is the iOS asset bundle which the image is included in. This
    * will default to [NSBundle mainBundle] if not set.
    * @platform ios
    */
-  bundle?: ?string,
+  +bundle?: ?string;
 
   /**
    * `method` is the HTTP Method to use. Defaults to GET if not specified.
    */
-  method?: ?string,
+  +method?: ?string;
 
   /**
    * `headers` is an object representing the HTTP headers to send along with the
    * request for a remote image.
    */
-  headers?: ?{[string]: string},
+  +headers?: ?{[string]: string};
 
   /**
    * `body` is the HTTP body to send with the request. This must be a valid
    * UTF-8 string, and will be sent exactly as specified, with no
    * additional encoding (e.g. URL-escaping or base64) applied.
    */
-  body?: ?string,
+  +body?: ?string;
 
   /**
    * `cache` determines how the requests handles potentially cached
@@ -70,25 +70,68 @@ export type ImageURISource = $ReadOnly<{
    *
    * @platform ios
    */
-  cache?: ?('default' | 'reload' | 'force-cache' | 'only-if-cached'),
+  +cache?: ?('default' | 'reload' | 'force-cache' | 'only-if-cached');
 
   /**
    * `width` and `height` can be specified if known at build time, in which case
    * these will be used to set the default `<Image/>` component dimensions.
    */
-  width?: ?number,
-  height?: ?number,
+  +width?: ?number;
+  +height?: ?number;
 
   /**
    * `scale` is used to indicate the scale factor of the image. Defaults to 1.0 if
    * unspecified, meaning that one image pixel equates to one display point / DIP.
    */
-  scale?: ?number,
-
-  ...
-}>;
+  +scale?: ?number;
+}
 
 export type ImageSource =
   | number
   | ImageURISource
   | $ReadOnlyArray<ImageURISource>;
+
+export function getImageSourceProperties(
+  imageSource: ImageURISource,
+): $ReadOnly<{
+  body?: ?string,
+  bundle?: ?string,
+  cache?: ?('default' | 'reload' | 'force-cache' | 'only-if-cached'),
+  headers?: ?{[string]: string},
+  height?: ?number,
+  method?: ?string,
+  scale?: ?number,
+  uri?: ?string,
+  width?: ?number,
+  ...
+}> {
+  const object = {};
+  if (imageSource.body != null) {
+    object.body = imageSource.body;
+  }
+  if (imageSource.bundle != null) {
+    object.bundle = imageSource.bundle;
+  }
+  if (imageSource.cache != null) {
+    object.cache = imageSource.cache;
+  }
+  if (imageSource.headers != null) {
+    object.headers = imageSource.headers;
+  }
+  if (imageSource.height != null) {
+    object.height = imageSource.height;
+  }
+  if (imageSource.method != null) {
+    object.method = imageSource.method;
+  }
+  if (imageSource.scale != null) {
+    object.scale = imageSource.scale;
+  }
+  if (imageSource.uri != null) {
+    object.uri = imageSource.uri;
+  }
+  if (imageSource.width != null) {
+    object.width = imageSource.width;
+  }
+  return object;
+}
diff --git a/Libraries/Image/ImageViewNativeComponent.js b/Libraries/Image/ImageViewNativeComponent.js
index 8a6c0b25aab2e4..7f26d89dcff43a 100644
--- a/Libraries/Image/ImageViewNativeComponent.js
+++ b/Libraries/Image/ImageViewNativeComponent.js
@@ -4,26 +4,22 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict-local
+ * @format
  */
 
-'use strict';
-
-const requireNativeComponent = require('../ReactNative/requireNativeComponent');
-
-import type {DangerouslyImpreciseStyle} from '../StyleSheet/StyleSheet';
 import type {ResolvedAssetSource} from './AssetSourceResolver';
-import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type {ImageProps} from './ImageProps';
 import type {ViewProps} from '../Components/View/ViewPropTypes';
-import type {ImageStyleProp} from '../StyleSheet/StyleSheet';
-import type {ColorValue} from '../StyleSheet/StyleSheet';
-
-import ImageViewViewConfig from './ImageViewViewConfig';
-const ReactNativeViewConfigRegistry = require('../Renderer/shims/ReactNativeViewConfigRegistry');
+import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
+import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import type {
+  ColorValue,
+  DangerouslyImpreciseStyle,
+  ImageStyleProp,
+} from '../StyleSheet/StyleSheet';
 
-type NativeProps = $ReadOnly<{|
+type Props = $ReadOnly<{
   ...ImageProps,
   ...ViewProps,
 
@@ -38,19 +34,66 @@ type NativeProps = $ReadOnly<{|
   headers?: ?string,
   defaultSrc?: ?string,
   loadingIndicatorSrc?: ?string,
-|}>;
+}>;
 
-let ImageViewNativeComponent;
-if (global.RN$Bridgeless) {
-  ReactNativeViewConfigRegistry.register('RCTImageView', () => {
-    return ImageViewViewConfig;
-  });
-  ImageViewNativeComponent = 'RCTImageView';
-} else {
-  ImageViewNativeComponent = requireNativeComponent<NativeProps>(
-    'RCTImageView',
-  );
-}
+const ImageViewNativeComponent: HostComponent<Props> = NativeComponentRegistry.get<Props>(
+  'RCTImageView',
+  () => ({
+    uiViewClassName: 'RCTImageView',
+    bubblingEventTypes: {},
+    directEventTypes: {
+      topLoadStart: {
+        registrationName: 'onLoadStart',
+      },
+      topProgress: {
+        registrationName: 'onProgress',
+      },
+      topError: {
+        registrationName: 'onError',
+      },
+      topPartialLoad: {
+        registrationName: 'onPartialLoad',
+      },
+      topLoad: {
+        registrationName: 'onLoad',
+      },
+      topLoadEnd: {
+        registrationName: 'onLoadEnd',
+      },
+    },
+    validAttributes: {
+      blurRadius: true,
+      capInsets: {
+        diff: require('../Utilities/differ/insetsDiffer'),
+      },
+      defaultSource: {
+        process: require('./resolveAssetSource'),
+      },
+      defaultSrc: true,
+      fadeDuration: true,
+      headers: true,
+      internal_analyticTag: true,
+      loadingIndicatorSrc: true,
+      onError: true,
+      onLoad: true,
+      onLoadEnd: true,
+      onLoadStart: true,
+      onPartialLoad: true,
+      onProgress: true,
+      overlayColor: {
+        process: require('../StyleSheet/processColor'),
+      },
+      progressiveRenderingEnabled: true,
+      resizeMethod: true,
+      resizeMode: true,
+      shouldNotifyLoadEvents: true,
+      source: true,
+      src: true,
+      tintColor: {
+        process: require('../StyleSheet/processColor'),
+      },
+    },
+  }),
+);
 
-// flowlint-next-line unclear-type:off
-export default ((ImageViewNativeComponent: any): HostComponent<NativeProps>);
+export default ImageViewNativeComponent;
diff --git a/Libraries/Image/ImageViewViewConfig.js b/Libraries/Image/ImageViewViewConfig.js
deleted file mode 100644
index 5870038e97d584..00000000000000
--- a/Libraries/Image/ImageViewViewConfig.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-import ReactNativeViewViewConfig from '../Components/View/ReactNativeViewViewConfig';
-import type {ReactNativeBaseComponentViewConfig} from '../Renderer/shims/ReactNativeTypes';
-
-const ImageViewViewConfig = {
-  uiViewClassName: 'RCTImageView',
-  bubblingEventTypes: {},
-  directEventTypes: {
-    topLoadStart: {
-      registrationName: 'onLoadStart',
-    },
-    topProgress: {
-      registrationName: 'onProgress',
-    },
-    topError: {
-      registrationName: 'onError',
-    },
-    topPartialLoad: {
-      registrationName: 'onPartialLoad',
-    },
-    topLoad: {
-      registrationName: 'onLoad',
-    },
-    topLoadEnd: {
-      registrationName: 'onLoadEnd',
-    },
-  },
-  validAttributes: {
-    ...ReactNativeViewViewConfig.validAttributes,
-    blurRadius: true,
-    // flowlint-next-line unclear-type:off
-    capInsets: {diff: (require('../Utilities/differ/insetsDiffer'): any)},
-    defaultSource: {
-      process: require('./resolveAssetSource'),
-    },
-    defaultSrc: true,
-    fadeDuration: true,
-    headers: true,
-    loadingIndicatorSrc: true,
-    onError: true,
-    onLoad: true,
-    onLoadEnd: true,
-    onLoadStart: true,
-    onPartialLoad: true,
-    onProgress: true,
-    overlayColor: {process: require('../StyleSheet/processColor')},
-    progressiveRenderingEnabled: true,
-    resizeMethod: true,
-    resizeMode: true,
-    shouldNotifyLoadEvents: true,
-    source: true,
-    src: true,
-    tintColor: {process: require('../StyleSheet/processColor')},
-  },
-};
-
-module.exports = (ImageViewViewConfig: ReactNativeBaseComponentViewConfig<>);
diff --git a/Libraries/Image/NativeImageEditor.js b/Libraries/Image/NativeImageEditor.js
index c6fdc63f7d4812..726bf2b0b9e1c7 100644
--- a/Libraries/Image/NativeImageEditor.js
+++ b/Libraries/Image/NativeImageEditor.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Image/NativeImageLoaderAndroid.js b/Libraries/Image/NativeImageLoaderAndroid.js
index 5fc3d2709ac240..c55fe6eb9d6c37 100644
--- a/Libraries/Image/NativeImageLoaderAndroid.js
+++ b/Libraries/Image/NativeImageLoaderAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Image/NativeImageLoaderIOS.js b/Libraries/Image/NativeImageLoaderIOS.js
index 842294d0af2a75..91c65a6e245cad 100644
--- a/Libraries/Image/NativeImageLoaderIOS.js
+++ b/Libraries/Image/NativeImageLoaderIOS.js
@@ -8,8 +8,7 @@
  * @format
  */
 
-'use strict';
-
+import type {RootTag} from '../TurboModule/RCTExport';
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
@@ -26,6 +25,11 @@ export interface Spec extends TurboModule {
     ...
   }>;
   +prefetchImage: (uri: string) => Promise<boolean>;
+  +prefetchImageWithMetadata?: (
+    uri: string,
+    queryRootName: string,
+    rootTag: RootTag,
+  ) => Promise<boolean>;
   +queryCache: (uris: Array<string>) => Promise<Object>;
 }
 
diff --git a/Libraries/Image/NativeImagePickerIOS.js b/Libraries/Image/NativeImagePickerIOS.js
index fa64998c57b945..8db58d407e2108 100644
--- a/Libraries/Image/NativeImagePickerIOS.js
+++ b/Libraries/Image/NativeImagePickerIOS.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Image/NativeImageStoreAndroid.js b/Libraries/Image/NativeImageStoreAndroid.js
index 8ab6dc7c1a2315..4f870f6c067861 100644
--- a/Libraries/Image/NativeImageStoreAndroid.js
+++ b/Libraries/Image/NativeImageStoreAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Image/NativeImageStoreIOS.js b/Libraries/Image/NativeImageStoreIOS.js
index d94f1ef4f35095..4b30843e9cabb1 100644
--- a/Libraries/Image/NativeImageStoreIOS.js
+++ b/Libraries/Image/NativeImageStoreIOS.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Image/RCTAnimatedImage.m b/Libraries/Image/RCTAnimatedImage.m
index d248e4bd8a56c1..4a27412437c24d 100644
--- a/Libraries/Image/RCTAnimatedImage.m
+++ b/Libraries/Image/RCTAnimatedImage.m
@@ -91,9 +91,12 @@ - (NSUInteger)imageLoopCountWithSource:(CGImageSourceRef)source
     NSNumber *gifLoopCount = gifProperties[(__bridge NSString *)kCGImagePropertyGIFLoopCount];
     if (gifLoopCount != nil) {
       loopCount = gifLoopCount.unsignedIntegerValue;
-      // A loop count of 1 means it should repeat twice, 2 means, thrice, etc.
-      if (loopCount != 0) {
-        loopCount++;
+      if (@available(iOS 14, *)) {
+      } else {
+      // A loop count of 1 means it should animate twice, 2 means, thrice, etc.
+        if (loopCount != 0) {
+          loopCount++;
+        }
       }
     }
   }
diff --git a/Libraries/Image/RCTGIFImageDecoder.mm b/Libraries/Image/RCTGIFImageDecoder.mm
index ffa1a7527b6a0c..2dd15a576ac408 100644
--- a/Libraries/Image/RCTGIFImageDecoder.mm
+++ b/Libraries/Image/RCTGIFImageDecoder.mm
@@ -47,6 +47,12 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData
   return ^{};
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 Class RCTGIFImageDecoderCls() {
diff --git a/Libraries/Image/RCTImageBlurUtils.m b/Libraries/Image/RCTImageBlurUtils.m
index 0c3ec8874a7ca7..4060b320616659 100644
--- a/Libraries/Image/RCTImageBlurUtils.m
+++ b/Libraries/Image/RCTImageBlurUtils.m
@@ -44,12 +44,13 @@
   buffer1.rowBytes = buffer2.rowBytes = CGImageGetBytesPerRow(imageRef);
   size_t bytes = buffer1.rowBytes * buffer1.height;
   buffer1.data = malloc(bytes);
+  if (!buffer1.data) {
+    return inputImage;
+  }
   buffer2.data = malloc(bytes);
-  if (!buffer1.data || !buffer2.data) {
-    // CWE - 391 : Unchecked error condition
-    // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
-    // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
-    abort();
+  if (!buffer2.data) {
+    free(buffer1.data);
+    return inputImage;
   }
 
   // A description of how to compute the box kernel width from the Gaussian
@@ -59,13 +60,18 @@
   boxSize |= 1; // Ensure boxSize is odd
 
   //create temp buffer
-  void *tempBuffer = malloc((size_t)vImageBoxConvolve_ARGB8888(&buffer1, &buffer2, NULL, 0, 0, boxSize, boxSize,
-                                                               NULL, kvImageEdgeExtend + kvImageGetTempBufferSize));
+  vImage_Error tempBufferSize = vImageBoxConvolve_ARGB8888(&buffer1, &buffer2, NULL, 0, 0, boxSize, boxSize,
+                                                             NULL, kvImageGetTempBufferSize | kvImageEdgeExtend);
+  if (tempBufferSize < 0) {
+    free(buffer1.data);
+    free(buffer2.data);
+    return inputImage;
+  }
+  void *tempBuffer = malloc(tempBufferSize);
   if (!tempBuffer) {
-    // CWE - 391 : Unchecked error condition
-    // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
-    // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
-    abort();
+    free(buffer1.data);
+    free(buffer2.data);
+    return inputImage;
   }
 
   //copy image data
diff --git a/Libraries/Image/RCTImageEditingManager.mm b/Libraries/Image/RCTImageEditingManager.mm
index 4ef22667c68d1b..4211d0cb01620a 100644
--- a/Libraries/Image/RCTImageEditingManager.mm
+++ b/Libraries/Image/RCTImageEditingManager.mm
@@ -26,7 +26,7 @@ @implementation RCTImageEditingManager
 
 RCT_EXPORT_MODULE()
 
-@synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 
 /**
  * Crops an image and adds the result to the image store.
@@ -53,11 +53,11 @@ @implementation RCTImageEditingManager
       @"height": @(cropData.size().height()),
     }]
   };
-  
+
   // We must keep a copy of cropData so that we can access data from it at a later time
   JS::NativeImageEditor::Options cropDataCopy = cropData;
 
-  [[_bridge moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES]
+  [[_moduleRegistry moduleForName:"ImageLoader"]
    loadImageWithURLRequest:imageRequest callback:^(NSError *error, UIImage *image) {
      if (error) {
        errorCallback(@[RCTJSErrorFromNSError(error)]);
@@ -80,7 +80,7 @@ @implementation RCTImageEditingManager
      }
 
      // Store image
-     [self->_bridge.imageStoreManager storeImage:croppedImage withBlock:^(NSString *croppedImageTag) {
+     [[self->_moduleRegistry moduleForName:"ImageStoreManager"] storeImage:croppedImage withBlock:^(NSString *croppedImageTag) {
        if (!croppedImageTag) {
          NSString *errorMessage = @"Error storing cropped image in RCTImageStoreManager";
          RCTLogWarn(@"%@", errorMessage);
diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
index 1d06b2914ba34b..d1b434b8102af7 100644
--- a/Libraries/Image/RCTImageLoader.h
+++ b/Libraries/Image/RCTImageLoader.h
@@ -21,8 +21,8 @@
 - (instancetype)init;
 - (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate
-                              loadersProvider:(NSArray<id<RCTImageURLLoader>> * (^)(void))getLoaders
-                             decodersProvider:(NSArray<id<RCTImageDataDecoder>> * (^)(void))getDecoders;
+                              loadersProvider:(NSArray<id<RCTImageURLLoader>> * (^)(RCTModuleRegistry *))getLoaders
+                             decodersProvider:(NSArray<id<RCTImageDataDecoder>> * (^)(RCTModuleRegistry *))getDecoders;
 - (NSInteger)activeTasks; // TODO(OSS Candidate ISS#2710739)
 @end
 
diff --git a/Libraries/Image/RCTImageLoader.mm b/Libraries/Image/RCTImageLoader.mm
index 8bcd347e74c82a..c1030567fd679c 100644
--- a/Libraries/Image/RCTImageLoader.mm
+++ b/Libraries/Image/RCTImageLoader.mm
@@ -40,18 +40,6 @@ void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled)
   imagePerfInstrumentationEnabled = enabled;
 }
 
-static BOOL (^getImagePerfInstrumentationForFabricEnabled)() = (^BOOL () {
-  return NO;
-});
-
-BOOL RCTGetImageLoadingPerfInstrumentationForFabricEnabled() {
-  return getImagePerfInstrumentationForFabricEnabled();
-}
-
-void RCTSetImageLoadingPerfInstrumentationForFabricEnabledBlock(BOOL (^getMobileConfigEnabled)()) {
-  getImagePerfInstrumentationForFabricEnabled = getMobileConfigEnabled;
-}
-
 static NSInteger RCTImageBytesForImage(UIImage *image)
 {
   CGFloat imageScale = 1.0;
@@ -117,8 +105,8 @@ - (void)setReactDecodedImageBytes:(NSInteger)bytes
 
 @implementation RCTImageLoader
 {
-  NSArray<id<RCTImageURLLoader>> * (^_loadersProvider)(void);
-  NSArray<id<RCTImageDataDecoder>> * (^_decodersProvider)(void);
+  NSArray<id<RCTImageURLLoader>> * (^_loadersProvider)(RCTModuleRegistry *);
+  NSArray<id<RCTImageDataDecoder>> * (^_decodersProvider)(RCTModuleRegistry *);
   NSArray<id<RCTImageURLLoader>> *_loaders;
   NSArray<id<RCTImageDataDecoder>> *_decoders;
   NSOperationQueue *_imageDecodeQueue;
@@ -134,10 +122,10 @@ @implementation RCTImageLoader
 }
 
 @synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 @synthesize maxConcurrentLoadingTasks = _maxConcurrentLoadingTasks;
 @synthesize maxConcurrentDecodingTasks = _maxConcurrentDecodingTasks;
 @synthesize maxConcurrentDecodingBytes = _maxConcurrentDecodingBytes;
-@synthesize turboModuleRegistry = _turboModuleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -160,8 +148,8 @@ - (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectD
 }
 
 - (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate
-                         loadersProvider:(NSArray<id<RCTImageURLLoader>> * (^)(void))getLoaders
-                        decodersProvider:(NSArray<id<RCTImageDataDecoder>> * (^)(void))getHandlers
+                         loadersProvider:(NSArray<id<RCTImageURLLoader>> * (^)(RCTModuleRegistry *))getLoaders
+                        decodersProvider:(NSArray<id<RCTImageDataDecoder>> * (^)(RCTModuleRegistry *))getHandlers
 {
   if (self = [self initWithRedirectDelegate:redirectDelegate]) {
     _loadersProvider = getLoaders;
@@ -212,10 +200,10 @@ - (void)setImageCache:(id<RCTImageCache>)cache
   if (!_loaders) {
     std::unique_lock<std::mutex> guard(_loadersMutex);
     if (!_loaders) {
-      
+
       // Get loaders, sorted in reverse priority order (highest priority first)
       if (_loadersProvider) {
-        _loaders = _loadersProvider();
+        _loaders = _loadersProvider(self.moduleRegistry);
       } else {
         RCTAssert(_bridge, @"Trying to find RCTImageURLLoaders and bridge not set.");
         _loaders = [_bridge modulesConformingToProtocol:@protocol(RCTImageURLLoader)];
@@ -282,7 +270,7 @@ - (void)setImageCache:(id<RCTImageCache>)cache
     // Get decoders, sorted in reverse priority order (highest priority first)
 
     if (_decodersProvider) {
-      _decoders = _decodersProvider();
+      _decoders = _decodersProvider(self.moduleRegistry);
     } else {
       RCTAssert(_bridge, @"Trying to find RCTImageDataDecoders and bridge not set.");
       _decoders = [_bridge modulesConformingToProtocol:@protocol(RCTImageDataDecoder)];
@@ -675,20 +663,14 @@ - (RCTImageLoaderCancellationBlock)_loadURLRequest:(NSURLRequest *)request
                                      progressBlock:(RCTImageLoaderProgressBlock)progressHandler
                                    completionBlock:(void (^)(NSError *error, id imageOrData, NSURLResponse *response))completionHandler
 {
-  // Check if networking module is available
-  if (RCT_DEBUG && ![_bridge respondsToSelector:@selector(networking)]
-      && ![_turboModuleRegistry moduleForName:"RCTNetworking"]) {
+  RCTNetworking *networking = [_moduleRegistry moduleForName:"Networking"];
+  if (RCT_DEBUG && !networking) {
     RCTLogError(@"No suitable image URL loader found for %@. You may need to "
                 " import the RCTNetwork library in order to load images.",
                 request.URL.absoluteString);
     return NULL;
   }
 
-  RCTNetworking *networking = [_bridge networking];
-  if (!networking) {
-    networking = [_turboModuleRegistry moduleForName:"RCTNetworking"];
-  }
-
   // Check if networking module can load image
   if (RCT_DEBUG && ![networking canHandleRequest:request]) {
     RCTLogError(@"No suitable image URL loader found for %@", request.URL.absoluteString);
@@ -1243,11 +1225,30 @@ - (void)cancelRequest:(id)requestToken
 RCT_EXPORT_METHOD(prefetchImage:(NSString *)uri
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject)
+{
+  [self prefetchImageWithMetadata:uri queryRootName:nil rootTag:0 resolve:resolve reject:reject];
+}
+
+RCT_EXPORT_METHOD(prefetchImageWithMetadata:(NSString *)uri
+                  queryRootName:(NSString *)queryRootName
+                  rootTag:(double)rootTag
+              resolve:(RCTPromiseResolveBlock)resolve
+               reject:(RCTPromiseRejectBlock)reject)
 {
   NSURLRequest *request = [RCTConvert NSURLRequest:uri];
   [self loadImageWithURLRequest:request
-   priority:RCTImageLoaderPriorityPrefetch
-   callback:^(NSError *error, UIImage *image) {
+                           size:CGSizeZero
+                          scale:1
+                        clipped:YES
+                     resizeMode:RCTResizeModeStretch
+                       priority:RCTImageLoaderPriorityPrefetch
+                    attribution:{
+                                  .queryRootName = queryRootName ? [queryRootName UTF8String] : "",
+                                  .surfaceId = (int)rootTag,
+                                }
+                  progressBlock:nil
+               partialLoadBlock:nil
+                       completionBlock:^(NSError *error, UIImage *image, id completionMetadata) {
      if (error) {
        reject(@"E_PREFETCH_FAILURE", nil, error);
        return;
diff --git a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
index 403ba2a698ff09..02c23813a9c258 100644
--- a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
+++ b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
@@ -10,14 +10,9 @@
 #import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTImageURLLoaderWithAttribution.h>
 
-RCT_EXTERN BOOL RCTImageLoadingInstrumentationEnabled(void);
 RCT_EXTERN BOOL RCTImageLoadingPerfInstrumentationEnabled(void);
-RCT_EXTERN void RCTEnableImageLoadingInstrumentation(BOOL enabled);
 RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
 
-RCT_EXTERN BOOL RCTGetImageLoadingPerfInstrumentationForFabricEnabled();
-RCT_EXTERN void RCTSetImageLoadingPerfInstrumentationForFabricEnabledBlock(BOOL (^getEnabled)());
-
 @protocol RCTImageLoaderWithAttributionProtocol<RCTImageLoaderProtocol, RCTImageLoaderLoggableProtocol>
 
 // TODO (T61325135): Remove C++ checks
diff --git a/Libraries/Image/RCTImagePlugins.mm b/Libraries/Image/RCTImagePlugins.mm
index 3cde9e95650e5b..1e03e76066e244 100644
--- a/Libraries/Image/RCTImagePlugins.mm
+++ b/Libraries/Image/RCTImagePlugins.mm
@@ -17,7 +17,8 @@
 #import <unordered_map>
 
 Class RCTImageClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"GIFImageDecoder", RCTGIFImageDecoderCls},
     {"ImageEditingManager", RCTImageEditingManagerCls},
     {"ImageLoader", RCTImageLoaderCls},
@@ -25,8 +26,8 @@ Class RCTImageClassProvider(const char *name) {
     {"LocalAssetImageLoader", RCTLocalAssetImageLoaderCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/Image/RCTImageStoreManager.mm b/Libraries/Image/RCTImageStoreManager.mm
index cccf9ed597b921..a6901156ab6f6a 100644
--- a/Libraries/Image/RCTImageStoreManager.mm
+++ b/Libraries/Image/RCTImageStoreManager.mm
@@ -198,6 +198,11 @@ - (void)cancelRequest:(id)requestToken
   }
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<facebook::react::NativeImageStoreIOSSpecJSI>(params);
+}
+
 @end
 
 @implementation RCTImageStoreManager (Deprecated)
@@ -236,11 +241,6 @@ - (void)getImageForTag:(NSString *)imageTag withBlock:(void (^)(UIImage *image))
   });
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
-{
-  return std::make_shared<facebook::react::NativeImageStoreIOSSpecJSI>(params);
-}
-
 @end
 
 @implementation RCTBridge (RCTImageStoreManager)
diff --git a/Libraries/Image/RCTImageURLLoaderWithAttribution.h b/Libraries/Image/RCTImageURLLoaderWithAttribution.h
index affc51c8ce034c..6df9b1f06783f1 100644
--- a/Libraries/Image/RCTImageURLLoaderWithAttribution.h
+++ b/Libraries/Image/RCTImageURLLoaderWithAttribution.h
@@ -19,6 +19,7 @@ namespace react {
 struct ImageURLLoaderAttribution {
   int32_t nativeViewTag = 0;
   int32_t surfaceId = 0;
+  std::string queryRootName;
   NSString *analyticTag;
 };
 
diff --git a/Libraries/Image/RCTImageView.mm b/Libraries/Image/RCTImageView.mm
index 7cbe9a50517a29..68818b3a427df3 100644
--- a/Libraries/Image/RCTImageView.mm
+++ b/Libraries/Image/RCTImageView.mm
@@ -644,7 +644,7 @@ - (void)windowDidChangeBackingProperties:(NSNotification *)notification
   
 - (RCTPlatformView *)reactAccessibilityElement
 {
-  return (RCTPlatformView *)_imageView.cell;
+  return _imageView;
 }
 
 - (NSColor *)tintColor
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.mm b/Libraries/Image/RCTLocalAssetImageLoader.mm
index 0387af805e97d9..9cb0d46b1b0008 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.mm
+++ b/Libraries/Image/RCTLocalAssetImageLoader.mm
@@ -64,6 +64,11 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
   return nil;
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 Class RCTLocalAssetImageLoaderCls(void) {
diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec
index b7e7b7b765bc2d..37c98aaba33481 100644
--- a/Libraries/Image/React-RCTImage.podspec
+++ b/Libraries/Image/React-RCTImage.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTImage"
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/image"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/Image/TextInlineImageNativeComponent.js b/Libraries/Image/TextInlineImageNativeComponent.js
index 139c88ba8a17f0..c17de2581f0cb6 100644
--- a/Libraries/Image/TextInlineImageNativeComponent.js
+++ b/Libraries/Image/TextInlineImageNativeComponent.js
@@ -10,11 +10,93 @@
 
 'use strict';
 
-const requireNativeComponent = require('../ReactNative/requireNativeComponent');
+import type {ResolvedAssetSource} from './AssetSourceResolver';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import type {ImageProps} from './ImageProps';
+import type {ViewProps} from '../Components/View/ViewPropTypes';
+import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
+import type {
+  ColorValue,
+  DangerouslyImpreciseStyle,
+  ImageStyleProp,
+} from '../StyleSheet/StyleSheet';
 
-const TextInlineImage: HostComponent<mixed> = requireNativeComponent<mixed>(
+type Props = $ReadOnly<{
+  ...ImageProps,
+  ...ViewProps,
+
+  style?: ImageStyleProp | DangerouslyImpreciseStyle,
+
+  // iOS native props
+  tintColor?: ColorValue,
+
+  // Android native props
+  shouldNotifyLoadEvents?: boolean,
+  src?: ?ResolvedAssetSource | $ReadOnlyArray<{uri: string, ...}>,
+  headers?: ?string,
+  defaultSrc?: ?string,
+  loadingIndicatorSrc?: ?string,
+  internal_analyticTag?: ?string,
+}>;
+
+const TextInlineImage: HostComponent<Props> = NativeComponentRegistry.get<Props>(
   'RCTTextInlineImage',
+  () => ({
+    uiViewClassName: 'RCTImageView',
+    bubblingEventTypes: {},
+    directEventTypes: {
+      topLoadStart: {
+        registrationName: 'onLoadStart',
+      },
+      topProgress: {
+        registrationName: 'onProgress',
+      },
+      topError: {
+        registrationName: 'onError',
+      },
+      topPartialLoad: {
+        registrationName: 'onPartialLoad',
+      },
+      topLoad: {
+        registrationName: 'onLoad',
+      },
+      topLoadEnd: {
+        registrationName: 'onLoadEnd',
+      },
+    },
+    validAttributes: {
+      blurRadius: true,
+      capInsets: {
+        diff: require('../Utilities/differ/insetsDiffer'),
+      },
+      defaultSource: {
+        process: require('./resolveAssetSource'),
+      },
+      defaultSrc: true,
+      fadeDuration: true,
+      headers: true,
+      internal_analyticTag: true,
+      loadingIndicatorSrc: true,
+      onError: true,
+      onLoad: true,
+      onLoadEnd: true,
+      onLoadStart: true,
+      onPartialLoad: true,
+      onProgress: true,
+      overlayColor: {
+        process: require('../StyleSheet/processColor'),
+      },
+      progressiveRenderingEnabled: true,
+      resizeMethod: true,
+      resizeMode: true,
+      shouldNotifyLoadEvents: true,
+      source: true,
+      src: true,
+      tintColor: {
+        process: require('../StyleSheet/processColor'),
+      },
+    },
+  }),
 );
 
 module.exports = TextInlineImage;
diff --git a/Libraries/Image/__tests__/AssetUtils-test.js b/Libraries/Image/__tests__/AssetUtils-test.js
new file mode 100644
index 00000000000000..a5315293b9c304
--- /dev/null
+++ b/Libraries/Image/__tests__/AssetUtils-test.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @emails oncall+react_native
+ */
+
+import {getUrlCacheBreaker, setUrlCacheBreaker} from '../AssetUtils';
+
+describe('AssetUtils', () => {
+  afterEach(() => {
+    global.__DEV__ = true;
+    jest.clearAllMocks();
+  });
+
+  it('should return empty string and warn once if no cacheBreaker set (DEV)', () => {
+    const mockWarn = jest.spyOn(console, 'warn');
+    global.__DEV__ = true;
+    expect(getUrlCacheBreaker()).toEqual('');
+    expect(getUrlCacheBreaker()).toEqual('');
+    expect(mockWarn).toHaveBeenCalledTimes(1);
+  });
+
+  it('should return empty string if no cacheBreaker set in prod', () => {
+    const mockWarn = jest.spyOn(console, 'warn');
+    global.__DEV__ = false;
+    expect(getUrlCacheBreaker()).toEqual('');
+    expect(mockWarn).not.toHaveBeenCalled();
+  });
+
+  it('should return set cacheBreaker value', () => {
+    setUrlCacheBreaker('my-cache-breaker-value');
+    expect(getUrlCacheBreaker()).toEqual('my-cache-breaker-value');
+  });
+});
diff --git a/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap b/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap
index ddb928125e2145..808fed0d41cddd 100644
--- a/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap
+++ b/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap
@@ -12,6 +12,7 @@ exports[`<Image /> should render as <Image> when mocked 1`] = `
 
 exports[`<Image /> should render as <RCTImageView> when not mocked 1`] = `
 <RCTImageView
+  accessibilityRole="image"
   internal_analyticTag={null}
   resizeMode="cover"
   source={
diff --git a/Libraries/Image/nativeImageSource.js b/Libraries/Image/nativeImageSource.js
index a53a64670e2b40..6f4d776139f284 100644
--- a/Libraries/Image/nativeImageSource.js
+++ b/Libraries/Image/nativeImageSource.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Platform from '../Utilities/Platform';
 
 import type {ImageURISource} from './ImageSource';
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
index 71df2005163baa..fe8e543e1ff91e 100644
--- a/Libraries/Image/resolveAssetSource.js
+++ b/Libraries/Image/resolveAssetSource.js
@@ -14,6 +14,7 @@
 
 const AssetRegistry = require('@react-native/assets/registry');
 const AssetSourceResolver = require('./AssetSourceResolver');
+const {pickScale} = require('./AssetUtils');
 
 import type {ResolvedAssetSource} from './AssetSourceResolver';
 
@@ -105,5 +106,5 @@ function resolveAssetSource(source: any): ?ResolvedAssetSource {
 }
 
 module.exports = resolveAssetSource;
-module.exports.pickScale = AssetSourceResolver.pickScale;
+module.exports.pickScale = pickScale;
 module.exports.setCustomSourceTransformer = setCustomSourceTransformer;
diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js
index 48a7ff491b63db..a97ef83370fd5e 100644
--- a/Libraries/Inspector/ElementProperties.js
+++ b/Libraries/Inspector/ElementProperties.js
@@ -70,7 +70,7 @@ class ElementProperties extends React.Component<Props> {
                 <TouchableHighlight
                   key={'item-' + i}
                   style={[styles.breadItem, i === selection && styles.selected]}
-                  // $FlowFixMe found when converting React.createClass to ES6
+                  // $FlowFixMe[not-a-function] found when converting React.createClass to ES6
                   onPress={() => this.props.setSelection(i)}>
                   <Text style={styles.breadItemText}>{hierarchyItem.name}</Text>
                 </TouchableHighlight>
diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js
index 2394a3dded98a1..3ed92c07e6eabe 100644
--- a/Libraries/Inspector/Inspector.js
+++ b/Libraries/Inspector/Inspector.js
@@ -14,10 +14,10 @@ const Dimensions = require('../Utilities/Dimensions');
 const InspectorOverlay = require('./InspectorOverlay');
 const InspectorPanel = require('./InspectorPanel');
 const Platform = require('../Utilities/Platform');
+const PressabilityDebug = require('../Pressability/PressabilityDebug');
 const React = require('react');
 const ReactNative = require('../Renderer/shims/ReactNative');
 const StyleSheet = require('../StyleSheet/StyleSheet');
-const Touchable = require('../Components/Touchable/Touchable');
 const View = require('../Components/View/View');
 
 const invariant = require('invariant');
@@ -170,7 +170,10 @@ class Inspector extends React.Component<
   _onAgentShowNativeHighlight = node => {
     clearTimeout(this._hideTimeoutID);
 
-    node.measure((x, y, width, height, left, top) => {
+    // Shape of `node` is different in Fabric.
+    const component = node.canonical ?? node;
+
+    component.measure((x, y, width, height, left, top) => {
       this.setState({
         hierarchy: [],
         inspected: {
@@ -279,7 +282,7 @@ class Inspector extends React.Component<
   }
 
   setTouchTargeting(val: boolean) {
-    Touchable.TOUCH_TARGET_DEBUG = val;
+    PressabilityDebug.setEnabled(val);
     this.props.onRequestRerenderApp(inspectedView => {
       this.setState({inspectedView});
     });
@@ -304,6 +307,7 @@ class Inspector extends React.Component<
         {this.state.inspecting && (
           <InspectorOverlay
             inspected={this.state.inspected}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             onTouchPoint={this.onTouchPoint.bind(this)}
           />
         )}
@@ -312,15 +316,20 @@ class Inspector extends React.Component<
             devtoolsIsOpen={!!this.state.devtoolsAgent}
             inspecting={this.state.inspecting}
             perfing={this.state.perfing}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             setPerfing={this.setPerfing.bind(this)}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             setInspecting={this.setInspecting.bind(this)}
             inspected={this.state.inspected}
             hierarchy={this.state.hierarchy}
             selection={this.state.selection}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             setSelection={this.setSelection.bind(this)}
-            touchTargeting={Touchable.TOUCH_TARGET_DEBUG}
+            touchTargeting={PressabilityDebug.isEnabled()}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             setTouchTargeting={this.setTouchTargeting.bind(this)}
             networking={this.state.networking}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             setNetworking={this.setNetworking.bind(this)}
           />
         </View>
diff --git a/Libraries/Inspector/InspectorPanel.js b/Libraries/Inspector/InspectorPanel.js
index 9cf47a83770a0f..145fc4a77fccb8 100644
--- a/Libraries/Inspector/InspectorPanel.js
+++ b/Libraries/Inspector/InspectorPanel.js
@@ -69,7 +69,7 @@ class InspectorPanel extends React.Component<Props> {
             style={this.props.inspected.style}
             frame={this.props.inspected.frame}
             source={this.props.inspected.source}
-            // $FlowFixMe: Hierarchy should be non-nullable
+            // $FlowFixMe[incompatible-type] : Hierarchy should be non-nullable
             hierarchy={this.props.hierarchy}
             selection={this.props.selection}
             setSelection={this.props.setSelection}
diff --git a/Libraries/Interaction/FrameRateLogger.js b/Libraries/Interaction/FrameRateLogger.js
index 434e962b02755a..cad15c2cac71bb 100644
--- a/Libraries/Interaction/FrameRateLogger.js
+++ b/Libraries/Interaction/FrameRateLogger.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeFrameRateLogger from './NativeFrameRateLogger';
 
 const invariant = require('invariant');
diff --git a/Libraries/Interaction/InteractionManager.js b/Libraries/Interaction/InteractionManager.js
index 8aec6727e33c8d..b5a84145d5023d 100644
--- a/Libraries/Interaction/InteractionManager.js
+++ b/Libraries/Interaction/InteractionManager.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const BatchedBridge = require('../BatchedBridge/BatchedBridge');
 const TaskQueue = require('./TaskQueue');
 
@@ -21,7 +19,10 @@ import EventEmitter from '../vendor/emitter/EventEmitter';
 export type Handle = number;
 import type {Task} from './TaskQueue';
 
-const _emitter = new EventEmitter();
+const _emitter = new EventEmitter<{
+  interactionComplete: [],
+  interactionStart: [],
+}>();
 
 const DEBUG_DELAY: 0 = 0;
 const DEBUG: false = false;
@@ -109,8 +110,10 @@ const InteractionManager = {
       _taskQueue.enqueueTasks(tasks);
     });
     return {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       then: promise.then.bind(promise),
       done: (...args) => {
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         if (promise.done) {
           return promise.done(...args);
         } else {
@@ -147,6 +150,7 @@ const InteractionManager = {
     _deleteInteractionSet.add(handle);
   },
 
+  // $FlowFixMe[method-unbinding] added when improving typing for this parameters
   addListener: (_emitter.addListener.bind(_emitter): $FlowFixMe),
 
   /**
@@ -173,9 +177,6 @@ let _deadline = -1;
 function _scheduleUpdate() {
   if (!_nextUpdateHandle) {
     if (_deadline > 0) {
-      /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.63 was deployed. To see the error delete this
-       * comment and run Flow. */
       _nextUpdateHandle = setTimeout(_processUpdate, 0 + DEBUG_DELAY);
     } else {
       _nextUpdateHandle = setImmediate(_processUpdate);
diff --git a/Libraries/Interaction/InteractionMixin.js b/Libraries/Interaction/InteractionMixin.js
index fcbd88f5a1958e..e7c80a90846ec2 100644
--- a/Libraries/Interaction/InteractionMixin.js
+++ b/Libraries/Interaction/InteractionMixin.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const InteractionManager = require('./InteractionManager');
 import {type Handle} from './InteractionManager';
 
@@ -35,6 +33,7 @@ const InteractionMixin = {
     return handle;
   },
 
+  // $FlowFixMe[signature-verification-failure]
   clearInteractionHandle: function(clearHandle: number): void {
     InteractionManager.clearInteractionHandle(clearHandle);
     this._interactionMixinHandles = this._interactionMixinHandles.filter(
diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js
index 4106597cb6d40c..a41d34e01856e9 100644
--- a/Libraries/Interaction/PanResponder.js
+++ b/Libraries/Interaction/PanResponder.js
@@ -121,7 +121,7 @@ const currentCentroidY = TouchHistoryMath.currentCentroidY;
  * ### Working Example
  *
  * To see it in action, try the
- * [PanResponder example in RNTester](https://github.com/facebook/react-native/blob/master/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js)
+ * [PanResponder example in RNTester](https://github.com/facebook/react-native/blob/HEAD/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js)
  */
 
 export type GestureState = {|
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js
index 91949ede460b22..efb12afa5dc78f 100644
--- a/Libraries/LayoutAnimation/LayoutAnimation.js
+++ b/Libraries/LayoutAnimation/LayoutAnimation.js
@@ -26,29 +26,65 @@ export type LayoutAnimationConfig = LayoutAnimationConfig_;
 type OnAnimationDidEndCallback = () => void;
 type OnAnimationDidFailCallback = () => void;
 
+/**
+ * Configures the next commit to be animated.
+ *
+ * onAnimationDidEnd is guaranteed to be called when the animation completes.
+ * onAnimationDidFail is *never* called in the classic, pre-Fabric renderer,
+ * and never has been. In the new renderer (Fabric) it is called only if configuration
+ * parsing fails.
+ */
 function configureNext(
   config: LayoutAnimationConfig,
   onAnimationDidEnd?: OnAnimationDidEndCallback,
   onAnimationDidFail?: OnAnimationDidFailCallback,
 ) {
-  if (!Platform.isTesting) {
-    if (UIManager?.configureNextLayoutAnimation) {
-      UIManager.configureNextLayoutAnimation(
-        config,
-        onAnimationDidEnd ?? function() {},
-        onAnimationDidFail ??
-          function() {} /* this should never be called in Non-Fabric */,
-      );
-    }
-    const FabricUIManager: FabricUIManagerSpec = global?.nativeFabricUIManager;
-    if (FabricUIManager?.configureNextLayoutAnimation) {
-      global?.nativeFabricUIManager?.configureNextLayoutAnimation(
-        config,
-        onAnimationDidEnd ?? function() {},
-        onAnimationDidFail ??
-          function() {} /* this will only be called if configuration fails */,
-      );
+  if (Platform.isTesting) {
+    return;
+  }
+
+  // Since LayoutAnimations may possibly be disabled for now on iOS (Fabric),
+  // or Android (non-Fabric) we race a setTimeout with animation completion,
+  // in case onComplete is never called
+  // from native. Once LayoutAnimations+Fabric unconditionally ship everywhere, we can
+  // delete this mechanism at least in the Fabric branch.
+  let animationCompletionHasRun = false;
+  const onAnimationComplete = () => {
+    if (animationCompletionHasRun) {
+      return;
     }
+    animationCompletionHasRun = true;
+    clearTimeout(raceWithAnimationId);
+    onAnimationDidEnd?.();
+  };
+  const raceWithAnimationId = setTimeout(
+    onAnimationComplete,
+    (config.duration ?? 0) + 17 /* one frame + 1ms */,
+  );
+
+  // In Fabric, LayoutAnimations are unconditionally enabled for Android, and
+  // conditionally enabled on iOS (pending fully shipping; this is a temporary state).
+  const FabricUIManager: FabricUIManagerSpec = global?.nativeFabricUIManager;
+  if (FabricUIManager?.configureNextLayoutAnimation) {
+    global?.nativeFabricUIManager?.configureNextLayoutAnimation(
+      config,
+      onAnimationComplete,
+      onAnimationDidFail ??
+        function() {} /* this will only be called if configuration parsing fails */,
+    );
+    return;
+  }
+
+  // This will only run if Fabric is *not* installed.
+  // If you have Fabric + non-Fabric running in the same VM, non-Fabric LayoutAnimations
+  // will not work.
+  if (UIManager?.configureNextLayoutAnimation) {
+    UIManager.configureNextLayoutAnimation(
+      config,
+      onAnimationComplete ?? function() {},
+      onAnimationDidFail ??
+        function() {} /* this should never be called in Non-Fabric */,
+    );
   }
 }
 
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 191ff8f8e668ae..61a7e482ada038 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -8,8 +8,7 @@
  * @flow strict-local
  */
 
-'use strict';
-
+import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import InteractionManager from '../Interaction/InteractionManager';
 import Platform from '../Utilities/Platform';
@@ -18,13 +17,17 @@ import NativeIntentAndroid from './NativeIntentAndroid';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
+type LinkingEventDefinitions = {
+  url: [{url: string}],
+};
+
 /**
  * `Linking` gives you a general interface to interact with both incoming
  * and outgoing app links.
  *
  * See https://reactnative.dev/docs/linking.html
  */
-class Linking extends NativeEventEmitter {
+class Linking extends NativeEventEmitter<LinkingEventDefinitions> {
   constructor() {
     super(
       Platform.OS === 'ios' || Platform.OS === 'macos' // TODO(macOS GH#774
@@ -39,17 +42,23 @@ class Linking extends NativeEventEmitter {
    *
    * See https://reactnative.dev/docs/linking.html#addeventlistener
    */
-  addEventListener<T>(type: string, handler: T) {
-    this.addListener(type, handler);
+  addEventListener<K: $Keys<LinkingEventDefinitions>>(
+    eventType: K,
+    listener: (...$ElementType<LinkingEventDefinitions, K>) => mixed,
+    context: $FlowFixMe,
+  ): EventSubscription {
+    return this.addListener(eventType, listener);
   }
 
   /**
-   * Remove a handler by passing the `url` event type and the handler.
-   *
-   * See https://reactnative.dev/docs/linking.html#removeeventlistener
+   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
    */
-  removeEventListener<T>(type: string, handler: T) {
-    this.removeListener(type, handler);
+  removeEventListener<K: $Keys<LinkingEventDefinitions>>(
+    eventType: K,
+    listener: (...$ElementType<LinkingEventDefinitions, K>) => mixed,
+  ): void {
+    // NOTE: This will report a deprecation notice via `console.error`.
+    this.removeListener(eventType, listener);
   }
 
   /**
diff --git a/Libraries/Linking/NativeIntentAndroid.js b/Libraries/Linking/NativeIntentAndroid.js
index b5d61e975d4def..7f045fd8f9c1ad 100644
--- a/Libraries/Linking/NativeIntentAndroid.js
+++ b/Libraries/Linking/NativeIntentAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Linking/NativeLinkingManager.js b/Libraries/Linking/NativeLinkingManager.js
index 95a93817c32233..2626ce0d3bcdd5 100644
--- a/Libraries/Linking/NativeLinkingManager.js
+++ b/Libraries/Linking/NativeLinkingManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/LinkingIOS/RCTLinkingPlugins.mm b/Libraries/LinkingIOS/RCTLinkingPlugins.mm
index b2549557558b23..b5993a9b306ff5 100644
--- a/Libraries/LinkingIOS/RCTLinkingPlugins.mm
+++ b/Libraries/LinkingIOS/RCTLinkingPlugins.mm
@@ -17,12 +17,13 @@
 #import <unordered_map>
 
 Class RCTLinkingClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"LinkingManager", RCTLinkingManagerCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec
index 95fcd9f43b2102..7bcf18ab26c001 100644
--- a/Libraries/LinkingIOS/React-RCTLinking.podspec
+++ b/Libraries/LinkingIOS/React-RCTLinking.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTLinking"
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/linking"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/Lists/CellRenderMask.js b/Libraries/Lists/CellRenderMask.js
new file mode 100644
index 00000000000000..786ae7b00bad42
--- /dev/null
+++ b/Libraries/Lists/CellRenderMask.js
@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+import invariant from 'invariant';
+
+export type CellRegion = {
+  first: number,
+  last: number,
+  isSpacer: boolean,
+};
+
+export class CellRenderMask {
+  _numCells: number;
+  _regions: Array<CellRegion>;
+
+  constructor(numCells: number) {
+    invariant(
+      numCells >= 0,
+      'CellRenderMask must contain a non-negative number os cells',
+    );
+
+    this._numCells = numCells;
+
+    if (numCells === 0) {
+      this._regions = [];
+    } else {
+      this._regions = [
+        {
+          first: 0,
+          last: numCells - 1,
+          isSpacer: true,
+        },
+      ];
+    }
+  }
+
+  enumerateRegions(): $ReadOnlyArray<CellRegion> {
+    return this._regions;
+  }
+
+  addCells(cells: {first: number, last: number}) {
+    invariant(
+      cells.first >= 0 &&
+        cells.first < this._numCells &&
+        cells.last >= 0 &&
+        cells.last < this._numCells &&
+        cells.last >= cells.first,
+      'CellRenderMask.addCells called with invalid cell range',
+    );
+
+    const [firstIntersect, firstIntersectIdx] = this._findRegion(cells.first);
+    const [lastIntersect, lastIntersectIdx] = this._findRegion(cells.last);
+
+    // Fast-path if the cells to add are already all present in the mask. We
+    // will otherwise need to do some mutation.
+    if (firstIntersectIdx === lastIntersectIdx && !firstIntersect.isSpacer) {
+      return;
+    }
+
+    // We need to replace the existing covered regions with 1-3 new regions
+    // depending whether we need to split spacers out of overlapping regions.
+    const newLeadRegion: Array<CellRegion> = [];
+    const newTailRegion: Array<CellRegion> = [];
+    const newMainRegion: CellRegion = {
+      ...cells,
+      isSpacer: false,
+    };
+
+    if (firstIntersect.first < newMainRegion.first) {
+      if (firstIntersect.isSpacer) {
+        newLeadRegion.push({
+          first: firstIntersect.first,
+          last: newMainRegion.first - 1,
+          isSpacer: true,
+        });
+      } else {
+        newMainRegion.first = firstIntersect.first;
+      }
+    }
+
+    if (lastIntersect.last > newMainRegion.last) {
+      if (lastIntersect.isSpacer) {
+        newTailRegion.push({
+          first: newMainRegion.last + 1,
+          last: lastIntersect.last,
+          isSpacer: true,
+        });
+      } else {
+        newMainRegion.last = lastIntersect.last;
+      }
+    }
+
+    const replacementRegions: Array<CellRegion> = [
+      ...newLeadRegion,
+      newMainRegion,
+      ...newTailRegion,
+    ];
+    const numRegionsToDelete = lastIntersectIdx - firstIntersectIdx + 1;
+    this._regions.splice(
+      firstIntersectIdx,
+      numRegionsToDelete,
+      ...replacementRegions,
+    );
+  }
+
+  equals(other: CellRenderMask): boolean {
+    return (
+      this._numCells === other._numCells &&
+      this._regions.length === other._regions.length &&
+      this._regions.every(
+        (region, i) =>
+          region.first === other._regions[i].first &&
+          region.last === other._regions[i].last &&
+          region.isSpacer === other._regions[i].isSpacer,
+      )
+    );
+  }
+
+  _findRegion(cellIdx: number): [CellRegion, number] {
+    let firstIdx = 0;
+    let lastIdx = this._regions.length - 1;
+
+    while (firstIdx <= lastIdx) {
+      const middleIdx = Math.floor((firstIdx + lastIdx) / 2);
+      const middleRegion = this._regions[middleIdx];
+
+      if (cellIdx >= middleRegion.first && cellIdx <= middleRegion.last) {
+        return [middleRegion, middleIdx];
+      } else if (cellIdx < middleRegion.first) {
+        lastIdx = middleIdx - 1;
+      } else if (cellIdx > middleRegion.last) {
+        firstIdx = middleIdx + 1;
+      }
+    }
+
+    invariant(false, `A region was not found containing cellIdx ${cellIdx}`);
+  }
+}
diff --git a/Libraries/Lists/FillRateHelper.js b/Libraries/Lists/FillRateHelper.js
index 5c4aa005fef344..6e18000b48f7be 100644
--- a/Libraries/Lists/FillRateHelper.js
+++ b/Libraries/Lists/FillRateHelper.js
@@ -135,7 +135,7 @@ class FillRateHelper {
     props: {
       data: any,
       getItemCount: (data: any) => number,
-      initialNumToRender: number,
+      initialNumToRender?: ?number,
       ...
     },
     state: {
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index 9743afa9e14511..bda4951e24687b 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const Platform = require('../Utilities/Platform');
 const deepDiffer = require('../Utilities/differ/deepDiffer');
 const React = require('react');
@@ -19,14 +17,15 @@ const StyleSheet = require('../StyleSheet/StyleSheet');
 
 const invariant = require('invariant');
 
+import typeof ScrollViewNativeComponent from '../Components/ScrollView/ScrollViewNativeComponent';
 import {type ScrollResponderType} from '../Components/ScrollView/ScrollView';
-import type {ScrollViewNativeComponentType} from '../Components/ScrollView/ScrollViewNativeComponentType.js';
 import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 import type {
   ViewToken,
   ViewabilityConfigCallbackPair,
 } from './ViewabilityHelper';
 import type {RenderItemType, RenderItemProps} from './VirtualizedList';
+import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils';
 
 type RequiredProps<ItemT> = {|
   /**
@@ -104,7 +103,7 @@ type OptionalProps<ItemT> = {|
    * much more. Note these items will never be unmounted as part of the windowed rendering in order
    * to improve perceived performance of scroll-to-top actions.
    */
-  initialNumToRender: number,
+  initialNumToRender?: ?number,
   /**
    * Instead of starting at the top with the first item, start at `initialScrollIndex`. This
    * disables the "scroll to top" optimization that keeps the first `initialNumToRender` items
@@ -121,18 +120,43 @@ type OptionalProps<ItemT> = {|
    * and as the react key to track item re-ordering. The default extractor checks `item.key`, then
    * falls back to using the index, like React does.
    */
-  keyExtractor: (item: ItemT, index: number) => string,
+  keyExtractor?: ?(item: ItemT, index: number) => string,
   /**
    * Multiple columns can only be rendered with `horizontal={false}` and will zig-zag like a
    * `flexWrap` layout. Items should all be the same height - masonry layouts are not supported.
+   *
+   * The default value is 1.
+   */
+  numColumns?: number,
+  /**
+   * Note: may have bugs (missing content) in some circumstances - use at your own risk.
+   *
+   * This may improve scroll performance for large lists.
+   *
+   * The default value is true for Android.
    */
-  numColumns: number,
+  removeClippedSubviews?: boolean,
   /**
    * See `ScrollView` for flow type and further documentation.
    */
   fadingEdgeLength?: ?number,
 |};
 
+/**
+ * Default Props Helper Functions
+ * Use the following helper functions for default values
+ */
+
+// removeClippedSubviewsOrDefault(this.props.removeClippedSubviews)
+function removeClippedSubviewsOrDefault(removeClippedSubviews: ?boolean) {
+  return removeClippedSubviews ?? Platform.OS === 'android';
+}
+
+// numColumnsOrDefault(this.props.numColumns)
+function numColumnsOrDefault(numColumns: ?number) {
+  return numColumns ?? 1;
+}
+
 type FlatListProps<ItemT> = {|
   ...RequiredProps<ItemT>,
   ...OptionalProps<ItemT>,
@@ -156,18 +180,6 @@ export type Props<ItemT> = {
   ...
 };
 
-const defaultProps = {
-  ...VirtualizedList.defaultProps,
-  numColumns: 1,
-  /**
-   * Enabling this prop on Android greatly improves scrolling performance with no known issues.
-   * The alternative is that scrolling on Android is unusably bad. Enabling it on iOS has a few
-   * known issues.
-   */
-  removeClippedSubviews: Platform.OS === 'android',
-};
-export type DefaultProps = typeof defaultProps;
-
 /**
  * A performant interface for rendering simple, flat lists, supporting the most handy features:
  *
@@ -277,7 +289,6 @@ export type DefaultProps = typeof defaultProps;
  * Also inherits [ScrollView Props](docs/scrollview.html#props), unless it is nested in another FlatList of same orientation.
  */
 class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
-  static defaultProps: DefaultProps = defaultProps;
   props: Props<ItemT>;
   /**
    * Scrolls to the end of the content. May be janky without `getItemLayout` prop.
@@ -372,8 +383,10 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
    */
   getNativeScrollRef():
     | ?React.ElementRef<typeof View>
-    | ?React.ElementRef<ScrollViewNativeComponentType> {
+    | ?React.ElementRef<ScrollViewNativeComponent> {
     if (this._listRef) {
+      /* $FlowFixMe[incompatible-return] Suppresses errors found when fixing
+       * TextInput typing */
       return this._listRef.getScrollRef();
     }
   }
@@ -404,9 +417,9 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       );
     } else if (this.props.onViewableItemsChanged) {
       this._virtualizedListPairs.push({
-        /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-         * error found when Flow v0.63 was deployed. To see the error delete
-         * this comment and run Flow. */
+        /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb) This
+         * comment suppresses an error found when Flow v0.63 was deployed. To
+         * see the error delete this comment and run Flow. */
         viewabilityConfig: this.props.viewabilityConfig,
         onViewableItemsChanged: this._createOnViewableItemsChanged(
           this.props.onViewableItemsChanged,
@@ -447,16 +460,16 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
 
   _checkProps(props: Props<ItemT>) {
     const {
-      // $FlowFixMe this prop doesn't exist, is only used for an invariant
+      // $FlowFixMe[prop-missing] this prop doesn't exist, is only used for an invariant
       getItem,
-      // $FlowFixMe this prop doesn't exist, is only used for an invariant
+      // $FlowFixMe[prop-missing] this prop doesn't exist, is only used for an invariant
       getItemCount,
       horizontal,
-      numColumns,
       columnWrapperStyle,
       onViewableItemsChanged,
       viewabilityConfigCallbackPairs,
     } = props;
+    const numColumns = numColumnsOrDefault(this.props.numColumns);
     invariant(
       !getItem && !getItemCount,
       'FlatList does not support custom data formats.',
@@ -477,7 +490,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   }
 
   _getItem = (data: Array<ItemT>, index: number) => {
-    const {numColumns} = this.props;
+    const numColumns = numColumnsOrDefault(this.props.numColumns);
     if (numColumns > 1) {
       const ret = [];
       for (let kk = 0; kk < numColumns; kk++) {
@@ -494,7 +507,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
 
   _getItemCount = (data: ?Array<ItemT>): number => {
     if (data) {
-      const {numColumns} = this.props;
+      const numColumns = numColumnsOrDefault(this.props.numColumns);
       return numColumns > 1 ? Math.ceil(data.length / numColumns) : data.length;
     } else {
       return 0;
@@ -502,25 +515,33 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   };
 
   _keyExtractor = (items: ItemT | Array<ItemT>, index: number) => {
-    const {keyExtractor, numColumns} = this.props;
+    const numColumns = numColumnsOrDefault(this.props.numColumns);
+    const keyExtractor = this.props.keyExtractor ?? defaultKeyExtractor;
+
     if (numColumns > 1) {
-      invariant(
-        Array.isArray(items),
-        'FlatList: Encountered internal consistency error, expected each item to consist of an ' +
-          'array with 1-%s columns; instead, received a single item.',
-        numColumns,
-      );
-      return items
-        .map((it, kk) => keyExtractor(it, index * numColumns + kk))
-        .join(':');
+      if (Array.isArray(items)) {
+        return items
+          .map((item, kk) =>
+            keyExtractor(((item: $FlowFixMe): ItemT), index * numColumns + kk),
+          )
+          .join(':');
+      } else {
+        invariant(
+          Array.isArray(items),
+          'FlatList: Encountered internal consistency error, expected each item to consist of an ' +
+            'array with 1-%s columns; instead, received a single item.',
+          numColumns,
+        );
+      }
     } else {
-      // $FlowFixMe Can't call keyExtractor with an array
+      // $FlowFixMe[incompatible-call] Can't call keyExtractor with an array
       return keyExtractor(items, index);
     }
   };
 
   _pushMultiColumnViewable(arr: Array<ViewToken>, v: ViewToken): void {
-    const {numColumns, keyExtractor} = this.props;
+    const numColumns = numColumnsOrDefault(this.props.numColumns);
+    const keyExtractor = this.props.keyExtractor ?? defaultKeyExtractor;
     v.item.forEach((item, ii) => {
       invariant(v.index != null, 'Missing index!');
       const index = v.index * numColumns + ii;
@@ -540,7 +561,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       changed: Array<ViewToken>,
       ...
     }) => {
-      const {numColumns} = this.props;
+      const numColumns = numColumnsOrDefault(this.props.numColumns);
       if (onViewableItemsChanged) {
         if (numColumns > 1) {
           const changed = [];
@@ -558,12 +579,8 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   }
 
   _renderer = () => {
-    const {
-      ListItemComponent,
-      renderItem,
-      numColumns,
-      columnWrapperStyle,
-    } = this.props;
+    const {ListItemComponent, renderItem, columnWrapperStyle} = this.props;
+    const numColumns = numColumnsOrDefault(this.props.numColumns);
 
     let virtualizedListRenderKey = ListItemComponent
       ? 'ListItemComponent'
@@ -571,9 +588,12 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
 
     const renderer = (props): React.Node => {
       if (ListItemComponent) {
-        // $FlowFixMe Component isn't valid
+        // $FlowFixMe[not-a-component] Component isn't valid
+        // $FlowFixMe[incompatible-type-arg] Component isn't valid
+        // $FlowFixMe[incompatible-return] Component isn't valid
         return <ListItemComponent {...props} />;
       } else if (renderItem) {
+        // $FlowFixMe[incompatible-call]
         return renderItem(props);
       } else {
         return null;
@@ -581,9 +601,9 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
     };
 
     return {
-      /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.111 was deployed. To see the error, delete
-       * this comment and run Flow. */
+      /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb)
+       * This comment suppresses an error found when Flow v0.111 was deployed.
+       * To see the error, delete this comment and run Flow. */
       [virtualizedListRenderKey]: (info: RenderItemProps<ItemT>) => {
         if (numColumns > 1) {
           const {item, index} = info;
@@ -614,7 +634,12 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   };
 
   render(): React.Node {
-    const {numColumns, columnWrapperStyle, ...restProps} = this.props;
+    const {
+      numColumns,
+      columnWrapperStyle,
+      removeClippedSubviews: _removeClippedSubviews,
+      ...restProps
+    } = this.props;
 
     return (
       <VirtualizedList
@@ -624,6 +649,9 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
         keyExtractor={this._keyExtractor}
         ref={this._captureRef}
         viewabilityConfigCallbackPairs={this._virtualizedListPairs}
+        removeClippedSubviews={removeClippedSubviewsOrDefault(
+          _removeClippedSubviews,
+        )}
         {...this._renderer()}
       />
     );
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 3484c250c73b7c..a0148bc3844612 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const Platform = require('../Utilities/Platform');
-const React = require('react');
-const VirtualizedSectionList = require('./VirtualizedSectionList');
+import Platform from '../Utilities/Platform';
+import * as React from 'react';
+import VirtualizedSectionList from './VirtualizedSectionList';
 
 import type {ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import type {
@@ -68,7 +68,7 @@ type OptionalProps<SectionT: SectionBase<any>> = {|
    * much more. Note these items will never be unmounted as part of the windowed rendering in order
    * to improve perceived performance of scroll-to-top actions.
    */
-  initialNumToRender: number,
+  initialNumToRender?: ?number,
   /**
    * Reverses the direction of scroll. Uses scale transforms of -1.
    */
@@ -79,7 +79,7 @@ type OptionalProps<SectionT: SectionBase<any>> = {|
    * falls back to using the index, like react does. Note that this sets keys for each item, but
    * each overall section still needs its own key.
    */
-  keyExtractor: (item: Item, index: number) => string,
+  keyExtractor?: ?(item: Item, index: number) => string,
   /**
    * Called once when the scroll position gets within `onEndReachedThreshold` of the rendered
    * content.
@@ -106,6 +106,10 @@ export type Props<SectionT> = {|
         VirtualizedSectionListProps<SectionT>,
         'renderItem',
       >,
+      keyExtractor: $PropertyType<
+        VirtualizedSectionListProps<SectionT>,
+        'keyExtractor',
+      >,
       ...
     },
   >,
@@ -113,13 +117,6 @@ export type Props<SectionT> = {|
   ...OptionalProps<SectionT>,
 |};
 
-const defaultProps = {
-  ...VirtualizedSectionList.defaultProps,
-  stickySectionHeadersEnabled: Platform.OS === 'ios',
-};
-
-type DefaultProps = typeof defaultProps;
-
 /**
  * A performant interface for rendering sectioned lists, supporting the most handy features:
  *
@@ -175,12 +172,10 @@ type DefaultProps = typeof defaultProps;
  *   Alternatively, you can provide a custom `keyExtractor` prop.
  *
  */
-class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
-  Props<SectionT>,
-  void,
-> {
+export default class SectionList<
+  SectionT: SectionBase<any>,
+> extends React.PureComponent<Props<SectionT>, void> {
   props: Props<SectionT>;
-  static defaultProps: DefaultProps = defaultProps;
 
   /**
    * Scrolls to the item at the specified `sectionIndex` and `itemIndex` (within the section)
@@ -243,9 +238,16 @@ class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
   }
 
   render(): React.Node {
+    const {
+      stickySectionHeadersEnabled: _stickySectionHeadersEnabled,
+      ...restProps
+    } = this.props;
+    const stickySectionHeadersEnabled =
+      _stickySectionHeadersEnabled ?? Platform.OS === 'ios';
     return (
       <VirtualizedSectionList
-        {...this.props}
+        {...restProps}
+        stickySectionHeadersEnabled={stickySectionHeadersEnabled}
         ref={this._captureRef}
         getItemCount={items => items.length}
         getItem={(items, index) => items[index]}
@@ -255,11 +257,6 @@ class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
 
   _wrapperListRef: ?React.ElementRef<typeof VirtualizedSectionList>;
   _captureRef = ref => {
-    /* $FlowFixMe(>=0.99.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.99 was deployed. To see the error, delete this
-     * comment and run Flow. */
     this._wrapperListRef = ref;
   };
 }
-
-module.exports = SectionList;
diff --git a/Libraries/Lists/SectionListModern.js b/Libraries/Lists/SectionListModern.js
new file mode 100644
index 00000000000000..e0eca61209b06d
--- /dev/null
+++ b/Libraries/Lists/SectionListModern.js
@@ -0,0 +1,249 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import Platform from '../Utilities/Platform';
+import React, {useRef, forwardRef, useImperativeHandle} from 'react';
+import VirtualizedSectionList from './VirtualizedSectionList';
+
+import type {ScrollResponderType} from '../Components/ScrollView/ScrollView';
+import type {
+  SectionBase as _SectionBase,
+  Props as VirtualizedSectionListProps,
+  ScrollToLocationParamsType,
+} from './VirtualizedSectionList';
+import type {Element, ElementRef, AbstractComponent} from 'react';
+
+type Item = any;
+
+export type SectionBase<SectionItemT> = _SectionBase<SectionItemT>;
+
+type RequiredProps<SectionT: SectionBase<any>> = {|
+  /**
+   * The actual data to render, akin to the `data` prop in [`<FlatList>`](https://reactnative.dev/docs/flatlist.html).
+   *
+   * General shape:
+   *
+   *     sections: $ReadOnlyArray<{
+   *       data: $ReadOnlyArray<SectionItem>,
+   *       renderItem?: ({item: SectionItem, ...}) => ?React.Element<*>,
+   *       ItemSeparatorComponent?: ?ReactClass<{highlighted: boolean, ...}>,
+   *     }>
+   */
+  sections: $ReadOnlyArray<SectionT>,
+|};
+
+type OptionalProps<SectionT: SectionBase<any>> = {|
+  /**
+   * Default renderer for every item in every section. Can be over-ridden on a per-section basis.
+   */
+  renderItem?: (info: {
+    item: Item,
+    index: number,
+    section: SectionT,
+    separators: {
+      highlight: () => void,
+      unhighlight: () => void,
+      updateProps: (select: 'leading' | 'trailing', newProps: Object) => void,
+      ...
+    },
+    ...
+  }) => null | Element<any>,
+  /**
+   * A marker property for telling the list to re-render (since it implements `PureComponent`). If
+   * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
+   * `data` prop, stick it here and treat it immutably.
+   */
+  extraData?: any,
+  /**
+   * How many items to render in the initial batch. This should be enough to fill the screen but not
+   * much more. Note these items will never be unmounted as part of the windowed rendering in order
+   * to improve perceived performance of scroll-to-top actions.
+   */
+  initialNumToRender?: ?number,
+  /**
+   * Reverses the direction of scroll. Uses scale transforms of -1.
+   */
+  inverted?: ?boolean,
+  /**
+   * Used to extract a unique key for a given item at the specified index. Key is used for caching
+   * and as the react key to track item re-ordering. The default extractor checks item.key, then
+   * falls back to using the index, like react does. Note that this sets keys for each item, but
+   * each overall section still needs its own key.
+   */
+  keyExtractor?: ?(item: Item, index: number) => string,
+  /**
+   * Called once when the scroll position gets within `onEndReachedThreshold` of the rendered
+   * content.
+   */
+  onEndReached?: ?(info: {distanceFromEnd: number, ...}) => void,
+  /**
+   * Note: may have bugs (missing content) in some circumstances - use at your own risk.
+   *
+   * This may improve scroll performance for large lists.
+   */
+  removeClippedSubviews?: boolean,
+|};
+
+export type Props<SectionT> = {|
+  ...$Diff<
+    VirtualizedSectionListProps<SectionT>,
+    {
+      getItem: $PropertyType<VirtualizedSectionListProps<SectionT>, 'getItem'>,
+      getItemCount: $PropertyType<
+        VirtualizedSectionListProps<SectionT>,
+        'getItemCount',
+      >,
+      renderItem: $PropertyType<
+        VirtualizedSectionListProps<SectionT>,
+        'renderItem',
+      >,
+      keyExtractor: $PropertyType<
+        VirtualizedSectionListProps<SectionT>,
+        'keyExtractor',
+      >,
+      ...
+    },
+  >,
+  ...RequiredProps<SectionT>,
+  ...OptionalProps<SectionT>,
+|};
+
+/**
+ * A performant interface for rendering sectioned lists, supporting the most handy features:
+ *
+ *  - Fully cross-platform.
+ *  - Configurable viewability callbacks.
+ *  - List header support.
+ *  - List footer support.
+ *  - Item separator support.
+ *  - Section header support.
+ *  - Section separator support.
+ *  - Heterogeneous data and item rendering support.
+ *  - Pull to Refresh.
+ *  - Scroll loading.
+ *
+ * If you don't need section support and want a simpler interface, use
+ * [`<FlatList>`](https://reactnative.dev/docs/flatlist.html).
+ *
+ * Simple Examples:
+ *
+ *     <SectionList
+ *       renderItem={({item}) => <ListItem title={item} />}
+ *       renderSectionHeader={({section}) => <Header title={section.title} />}
+ *       sections={[ // homogeneous rendering between sections
+ *         {data: [...], title: ...},
+ *         {data: [...], title: ...},
+ *         {data: [...], title: ...},
+ *       ]}
+ *     />
+ *
+ *     <SectionList
+ *       sections={[ // heterogeneous rendering between sections
+ *         {data: [...], renderItem: ...},
+ *         {data: [...], renderItem: ...},
+ *         {data: [...], renderItem: ...},
+ *       ]}
+ *     />
+ *
+ * This is a convenience wrapper around [`<VirtualizedList>`](docs/virtualizedlist.html),
+ * and thus inherits its props (as well as those of `ScrollView`) that aren't explicitly listed
+ * here, along with the following caveats:
+ *
+ * - Internal state is not preserved when content scrolls out of the render window. Make sure all
+ *   your data is captured in the item data or external stores like Flux, Redux, or Relay.
+ * - This is a `PureComponent` which means that it will not re-render if `props` remain shallow-
+ *   equal. Make sure that everything your `renderItem` function depends on is passed as a prop
+ *   (e.g. `extraData`) that is not `===` after updates, otherwise your UI may not update on
+ *   changes. This includes the `data` prop and parent component state.
+ * - In order to constrain memory and enable smooth scrolling, content is rendered asynchronously
+ *   offscreen. This means it's possible to scroll faster than the fill rate and momentarily see
+ *   blank content. This is a tradeoff that can be adjusted to suit the needs of each application,
+ *   and we are working on improving it behind the scenes.
+ * - By default, the list looks for a `key` prop on each item and uses that for the React key.
+ *   Alternatively, you can provide a custom `keyExtractor` prop.
+ *
+ */
+const SectionList: AbstractComponent<Props<SectionBase<any>>, any> = forwardRef<
+  Props<SectionBase<any>>,
+  any,
+>((props, ref) => {
+  const propsWithDefaults = {
+    stickySectionHeadersEnabled: Platform.OS === 'ios',
+    ...props,
+  };
+
+  const wrapperRef = useRef<?ElementRef<typeof VirtualizedSectionList>>();
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      /**
+       * Scrolls to the item at the specified `sectionIndex` and `itemIndex` (within the section)
+       * positioned in the viewable area such that `viewPosition` 0 places it at the top (and may be
+       * covered by a sticky header), 1 at the bottom, and 0.5 centered in the middle. `viewOffset` is a
+       * fixed number of pixels to offset the final target position, e.g. to compensate for sticky
+       * headers.
+       *
+       * Note: cannot scroll to locations outside the render window without specifying the
+       * `getItemLayout` prop.
+       */
+      scrollToLocation(params: ScrollToLocationParamsType) {
+        wrapperRef.current?.scrollToLocation(params);
+      },
+
+      /**
+       * Tells the list an interaction has occurred, which should trigger viewability calculations, e.g.
+       * if `waitForInteractions` is true and the user has not scrolled. This is typically called by
+       * taps on items or by navigation actions.
+       */
+      recordInteraction() {
+        wrapperRef.current?.getListRef()?.recordInteraction();
+      },
+
+      /**
+       * Displays the scroll indicators momentarily.
+       *
+       * @platform ios
+       */
+      flashScrollIndicators() {
+        wrapperRef.current?.getListRef()?.flashScrollIndicators();
+      },
+
+      /**
+       * Provides a handle to the underlying scroll responder.
+       */
+      getScrollResponder(): ?ScrollResponderType {
+        wrapperRef.current?.getListRef()?.getScrollResponder();
+      },
+
+      getScrollableNode(): any {
+        wrapperRef.current?.getListRef()?.getScrollableNode();
+      },
+
+      setNativeProps(nativeProps: Object) {
+        wrapperRef.current?.getListRef()?.setNativeProps(nativeProps);
+      },
+    }),
+    [wrapperRef],
+  );
+
+  return (
+    <VirtualizedSectionList
+      {...propsWithDefaults}
+      ref={wrapperRef}
+      getItemCount={items => items.length}
+      getItem={(items, index) => items[index]}
+    />
+  );
+});
+
+export default SectionList;
diff --git a/Libraries/Lists/ViewabilityHelper.js b/Libraries/Lists/ViewabilityHelper.js
index 48425b00707776..8b1d49fd8ba17c 100644
--- a/Libraries/Lists/ViewabilityHelper.js
+++ b/Libraries/Lists/ViewabilityHelper.js
@@ -89,9 +89,9 @@ class ViewabilityHelper {
    * Cleanup, e.g. on unmount. Clears any pending timers.
    */
   dispose() {
-    /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.63 was deployed. To see the error delete this
-     * comment and run Flow. */
+    /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb) This
+     * comment suppresses an error found when Flow v0.63 was deployed. To see
+     * the error delete this comment and run Flow. */
     this._timers.forEach(clearTimeout);
   }
 
@@ -227,9 +227,9 @@ class ViewabilityHelper {
     this._viewableIndices = viewableIndices;
     if (this._config.minimumViewTime) {
       const handle = setTimeout(() => {
-        /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-         * error found when Flow v0.63 was deployed. To see the error delete
-         * this comment and run Flow. */
+        /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb) This
+         * comment suppresses an error found when Flow v0.63 was deployed. To
+         * see the error delete this comment and run Flow. */
         this._timers.delete(handle);
         this._onUpdateSync(
           viewableIndices,
@@ -237,9 +237,9 @@ class ViewabilityHelper {
           createViewToken,
         );
       }, this._config.minimumViewTime);
-      /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.63 was deployed. To see the error delete this
-       * comment and run Flow. */
+      /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb) This
+       * comment suppresses an error found when Flow v0.63 was deployed. To see
+       * the error delete this comment and run Flow. */
       this._timers.add(handle);
     } else {
       this._onUpdateSync(
diff --git a/Libraries/Lists/VirtualizeUtils.js b/Libraries/Lists/VirtualizeUtils.js
index 2d4c8ae8c60bdc..1d80b378aa8d7a 100644
--- a/Libraries/Lists/VirtualizeUtils.js
+++ b/Libraries/Lists/VirtualizeUtils.js
@@ -10,14 +10,14 @@
 
 'use strict';
 
-const invariant = require('invariant');
+import invariant from 'invariant';
 
 /**
  * Used to find the indices of the frames that overlap the given offsets. Useful for finding the
  * items that bound different windows of content, such as the visible area or the buffered overscan
  * area.
  */
-function elementsThatOverlapOffsets(
+export function elementsThatOverlapOffsets(
   offsets: Array<number>,
   itemCount: number,
   getFrameMetrics: (
@@ -57,7 +57,7 @@ function elementsThatOverlapOffsets(
  * can restrict the number of new items render at once so that content can appear on the screen
  * faster.
  */
-function newRangeCount(
+export function newRangeCount(
   prev: {
     first: number,
     last: number,
@@ -86,14 +86,11 @@ function newRangeCount(
  * prioritizes the visible area first, then expands that with overscan regions ahead and behind,
  * biased in the direction of scroll.
  */
-function computeWindowedRenderLimits(
-  props: {
-    data: any,
-    getItemCount: (data: any) => number,
-    maxToRenderPerBatch: number,
-    windowSize: number,
-    ...
-  },
+export function computeWindowedRenderLimits(
+  data: any,
+  getItemCount: (data: any) => number,
+  maxToRenderPerBatch: number,
+  windowSize: number,
   prev: {
     first: number,
     last: number,
@@ -118,7 +115,6 @@ function computeWindowedRenderLimits(
   last: number,
   ...
 } {
-  const {data, getItemCount, maxToRenderPerBatch, windowSize} = props;
   const itemCount = getItemCount(data);
   if (itemCount === 0) {
     return prev;
@@ -156,7 +152,7 @@ function computeWindowedRenderLimits(
   // Find the indices that correspond to the items at the render boundaries we're targeting.
   let [overscanFirst, first, last, overscanLast] = elementsThatOverlapOffsets(
     [overscanBegin, visibleBegin, visibleEnd, overscanEnd],
-    props.getItemCount(props.data),
+    itemCount,
     getFrameMetricsApprox,
   );
   overscanFirst = overscanFirst == null ? 0 : overscanFirst;
@@ -238,10 +234,12 @@ function computeWindowedRenderLimits(
   return {first, last};
 }
 
-const VirtualizeUtils = {
-  computeWindowedRenderLimits,
-  elementsThatOverlapOffsets,
-  newRangeCount,
-};
-
-module.exports = VirtualizeUtils;
+export function keyExtractor(item: any, index: number): string {
+  if (typeof item === 'object' && item?.key != null) {
+    return item.key;
+  }
+  if (typeof item === 'object' && item?.id != null) {
+    return item.id;
+  }
+  return String(index);
+}
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index f3a363fb232647..1422f27a444fd5 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const Batchinator = require('../Interaction/Batchinator');
 const FillRateHelper = require('./FillRateHelper');
 const Platform = require('../Utilities/Platform'); // TODO(macOS GH#774)
@@ -24,7 +22,10 @@ const flattenStyle = require('../StyleSheet/flattenStyle');
 const infoLog = require('../Utilities/infoLog');
 const invariant = require('invariant');
 
-const {computeWindowedRenderLimits} = require('./VirtualizeUtils');
+import {
+  keyExtractor as defaultKeyExtractor,
+  computeWindowedRenderLimits,
+} from './VirtualizeUtils';
 
 import * as React from 'react';
 import type {ScrollResponderType} from '../Components/ScrollView/ScrollView';
@@ -105,7 +106,7 @@ type OptionalProps = {|
   /**
    * DEPRECATED: Virtualization provides significant performance and memory optimizations, but fully
    * unmounts react instances that are outside of the render window. You should only need to disable
-   * this for debugging purposes.
+   * this for debugging purposes. Defaults to false.
    */
   disableVirtualization?: ?boolean,
   /**
@@ -136,7 +137,7 @@ type OptionalProps = {|
    * much more. Note these items will never be unmounted as part of the windowed rendering in order
    * to improve perceived performance of scroll-to-top actions.
    */
-  initialNumToRender: number,
+  initialNumToRender?: ?number,
   /**
    * Instead of starting at the top with the first item, start at `initialScrollIndex`. This
    * disables the "scroll to top" optimization that keeps the first `initialNumToRender` items
@@ -148,7 +149,7 @@ type OptionalProps = {|
    * Reverses the direction of scroll. Uses scale transforms of -1.
    */
   inverted?: ?boolean,
-  keyExtractor: (item: Item, index: number) => string,
+  keyExtractor?: ?(item: Item, index: number) => string,
   /**
    * Each cell is rendered using this element. Can be a React Component Class,
    * or a render function. Defaults to using View.
@@ -222,7 +223,7 @@ type OptionalProps = {|
    * once, the better the fill rate, but responsiveness may suffer because rendering content may
    * interfere with responding to button taps or other interactions.
    */
-  maxToRenderPerBatch: number,
+  maxToRenderPerBatch?: ?number,
   /**
    * Called once when the scroll position gets within `onEndReachedThreshold` of the rendered
    * content.
@@ -284,7 +285,6 @@ type OptionalProps = {|
   persistentScrollbar?: ?boolean,
   /**
    * Set this when offset is needed for the loading indicator to show correctly.
-   * @platform android
    */
   progressViewOffset?: number,
   /**
@@ -311,7 +311,7 @@ type OptionalProps = {|
    * Amount of time between low-pri item render batches, e.g. for rendering items quite a ways off
    * screen. Similar fill rate/responsiveness tradeoff as `maxToRenderPerBatch`.
    */
-  updateCellsBatchingPeriod: number,
+  updateCellsBatchingPeriod?: ?number,
   /**
    * See `ViewabilityHelper` for flow type and further documentation.
    */
@@ -328,7 +328,7 @@ type OptionalProps = {|
    * this number will reduce memory consumption and may improve performance, but will increase the
    * chance that fast scrolling may reveal momentary blank areas of unrendered content.
    */
-  windowSize: number,
+  windowSize?: ?number,
   /**
    * The legacy implementation is no longer supported.
    */
@@ -341,18 +341,6 @@ type Props = {|
   ...OptionalProps,
 |};
 
-type DefaultProps = {|
-  disableVirtualization: boolean,
-  horizontal: boolean,
-  initialNumToRender: number,
-  keyExtractor: (item: Item, index: number) => string,
-  maxToRenderPerBatch: number,
-  onEndReachedThreshold: number,
-  scrollEventThrottle: number,
-  updateCellsBatchingPeriod: number,
-  windowSize: number,
-|};
-
 let _usedIndexForKey = false;
 let _keylessItemComponentName: string = '';
 
@@ -363,6 +351,41 @@ type State = {
   ...
 };
 
+/**
+ * Default Props Helper Functions
+ * Use the following helper functions for default values
+ */
+
+// horizontalOrDefault(this.props.horizontal)
+function horizontalOrDefault(horizontal: ?boolean) {
+  return horizontal ?? false;
+}
+
+// initialNumToRenderOrDefault(this.props.initialNumToRenderOrDefault)
+function initialNumToRenderOrDefault(initialNumToRender: ?number) {
+  return initialNumToRender ?? 10;
+}
+
+// maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch)
+function maxToRenderPerBatchOrDefault(maxToRenderPerBatch: ?number) {
+  return maxToRenderPerBatch ?? 10;
+}
+
+// onEndReachedThresholdOrDefault(this.props.onEndReachedThreshold)
+function onEndReachedThresholdOrDefault(onEndReachedThreshold: ?number) {
+  return onEndReachedThreshold ?? 2;
+}
+
+// scrollEventThrottleOrDefault(this.props.scrollEventThrottle)
+function scrollEventThrottleOrDefault(scrollEventThrottle: ?number) {
+  return scrollEventThrottle ?? 50;
+}
+
+// windowSizeOrDefault(this.props.windowSize)
+function windowSizeOrDefault(windowSize: ?number) {
+  return windowSize ?? 21;
+}
+
 /**
  * Base implementation for the more convenient [`<FlatList>`](https://reactnative.dev/docs/flatlist.html)
  * and [`<SectionList>`](https://reactnative.dev/docs/sectionlist.html) components, which are also better
@@ -389,6 +412,7 @@ type State = {
  *   and we are working on improving it behind the scenes.
  * - By default, the list looks for a `key` or `id` prop on each item and uses that for the React key.
  *   Alternatively, you can provide a custom `keyExtractor` prop.
+ * - As an effort to remove defaultProps, use helper functions when referencing certain props
  *
  */
 class VirtualizedList extends React.PureComponent<Props, State> {
@@ -421,7 +445,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
 
     this._scrollRef.scrollTo(
-      this.props.horizontal ? {x: offset, animated} : {y: offset, animated},
+      horizontalOrDefault(this.props.horizontal)
+        ? {x: offset, animated}
+        : {y: offset, animated},
     );
   }
 
@@ -543,7 +569,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
 
     this._scrollRef.scrollTo(
-      this.props.horizontal ? {x: offset, animated} : {y: offset, animated},
+      horizontalOrDefault(this.props.horizontal)
+        ? {x: offset, animated}
+        : {y: offset, animated},
     );
   }
 
@@ -619,30 +647,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   }
 
-  static defaultProps: DefaultProps = {
-    disableVirtualization: false,
-    horizontal: false,
-    initialNumToRender: 10,
-    keyExtractor: (item: Item, index: number) => {
-      if (item.key != null) {
-        return item.key;
-      }
-      if (item.id != null) {
-        return item.id;
-      }
-      _usedIndexForKey = true;
-      if (item.type && item.type.displayName) {
-        _keylessItemComponentName = item.type.displayName;
-      }
-      return String(index);
-    },
-    maxToRenderPerBatch: 10,
-    onEndReachedThreshold: 2, // multiples of length
-    scrollEventThrottle: 50,
-    updateCellsBatchingPeriod: 50,
-    windowSize: 21, // multiples of length
-  };
-
   _getCellKey(): string {
     return this.context?.cellKey || 'rootList';
   }
@@ -655,7 +659,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     return {
       listKey: this._getListKey(),
       cellKey: this._getCellKey(),
-      horizontal: !!this.props.horizontal,
+      horizontal: horizontalOrDefault(this.props.horizontal),
       parent: this.context?.debugInfo,
     };
   }
@@ -733,21 +737,20 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   constructor(props: Props) {
     super(props);
     invariant(
-      // $FlowFixMe
+      // $FlowFixMe[prop-missing]
       !props.onScroll || !props.onScroll.__isNative,
       'Components based on VirtualizedList must be wrapped with Animated.createAnimatedComponent ' +
         'to support native onScroll events with useNativeDriver',
     );
-
     invariant(
-      props.windowSize > 0,
+      windowSizeOrDefault(props.windowSize) > 0,
       'VirtualizedList: The windowSize prop must be present and set to a value greater than 0.',
     );
 
     this._fillRateHelper = new FillRateHelper(this._getFrameMetrics);
     this._updateCellsToRenderBatcher = new Batchinator(
       this._updateCellsToRender,
-      this.props.updateCellsBatchingPeriod,
+      this.props.updateCellsBatchingPeriod ?? 50,
     );
 
     if (this.props.viewabilityConfigCallbackPairs) {
@@ -760,6 +763,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     } else if (this.props.onViewableItemsChanged) {
       this._viewabilityTuples.push({
         viewabilityHelper: new ViewabilityHelper(this.props.viewabilityConfig),
+        // $FlowFixMe[incompatible-call]
         onViewableItemsChanged: this.props.onViewableItemsChanged,
       });
     }
@@ -769,7 +773,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       last:
         Math.min(
           this.props.getItemCount(this.props.data),
-          (this.props.initialScrollIndex || 0) + this.props.initialNumToRender,
+          (this.props.initialScrollIndex || 0) +
+            initialNumToRenderOrDefault(this.props.initialNumToRender),
         ) - 1,
       selectedRowIndex: 0, // TODO(macOS GH#774)
     };
@@ -821,7 +826,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   }
 
   static getDerivedStateFromProps(newProps: Props, prevState: State): State {
-    const {data, getItemCount, maxToRenderPerBatch} = newProps;
+    const {data, getItemCount} = newProps;
+    const maxToRenderPerBatch = maxToRenderPerBatchOrDefault(
+      newProps.maxToRenderPerBatch,
+    );
     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
     // sure we're rendering a reasonable range here.
     return {
@@ -852,7 +860,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       getItem,
       getItemCount,
       horizontal,
-      keyExtractor,
     } = this.props;
     const stickyOffset = this.props.ListHeaderComponent ? 1 : 0;
     const end = getItemCount(data) - 1;
@@ -860,7 +867,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     last = Math.min(end, last);
     for (let ii = first; ii <= last; ii++) {
       const item = getItem(data, ii);
-      const key = keyExtractor(item, ii);
+      const key = this._keyExtractor(item, ii);
       this._indicesToKeys.set(ii, key);
       if (stickyIndicesFromProps.has(ii + stickyOffset)) {
         stickyHeaderIndices.push(cells.length);
@@ -905,10 +912,29 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   _isNestedWithSameOrientation(): boolean {
     const nestedContext = this.context;
     return !!(
-      nestedContext && !!nestedContext.horizontal === !!this.props.horizontal
+      nestedContext &&
+      !!nestedContext.horizontal === horizontalOrDefault(this.props.horizontal)
     );
   }
 
+  _getSpacerKey = (isVertical: boolean): string =>
+    isVertical ? 'height' : 'width';
+
+  _keyExtractor(item: Item, index: number) {
+    if (this.props.keyExtractor != null) {
+      return this.props.keyExtractor(item, index);
+    }
+
+    const key = defaultKeyExtractor(item, index);
+    if (key === String(index)) {
+      _usedIndexForKey = true;
+      if (item.type && item.type.displayName) {
+        _keylessItemComponentName = item.type.displayName;
+      }
+    }
+    return key;
+  }
+
   render(): React.Node {
     if (__DEV__) {
       const flatStyles = flattenStyle(this.props.contentContainerStyle);
@@ -927,7 +953,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     const {data, horizontal} = this.props;
     const isVirtualizationDisabled = this._isVirtualizationDisabled();
     const inversionStyle = this.props.inverted
-      ? this.props.horizontal
+      ? horizontalOrDefault(this.props.horizontal)
         ? styles.horizontallyInverted
         : styles.verticallyInverted
       : null;
@@ -941,7 +967,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       const element = React.isValidElement(ListHeaderComponent) ? (
         ListHeaderComponent
       ) : (
-        // $FlowFixMe
+        // $FlowFixMe[not-a-component]
+        // $FlowFixMe[incompatible-type-arg]
         <ListHeaderComponent />
       );
       cells.push(
@@ -955,7 +982,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
               this.props.ListHeaderComponentStyle,
             )}>
             {
-              // $FlowFixMe - Typing ReactNativeComponent revealed errors
+              // $FlowFixMe[incompatible-type] - Typing ReactNativeComponent revealed errors
               element
             }
           </View>
@@ -966,10 +993,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     if (itemCount > 0) {
       _usedIndexForKey = false;
       _keylessItemComponentName = '';
-      const spacerKey = !horizontal ? 'height' : 'width';
+      const spacerKey = this._getSpacerKey(!horizontal);
       const lastInitialIndex = this.props.initialScrollIndex
         ? -1
-        : this.props.initialNumToRender - 1;
+        : initialNumToRenderOrDefault(this.props.initialNumToRender) - 1;
       const {first, last} = this.state;
       this._pushCells(
         cells,
@@ -994,9 +1021,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
                 initBlock.offset -
                 (this.props.initialScrollIndex ? 0 : initBlock.length);
               cells.push(
-                /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment
-                 * suppresses an error found when Flow v0.111 was deployed. To
-                 * see the error, delete this comment and run Flow. */
                 <View key="$sticky_lead" style={{[spacerKey]: leadSpace}} />,
               );
               this._pushCells(
@@ -1011,9 +1035,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
                 this._getFrameMetricsApprox(first).offset -
                 (stickyBlock.offset + stickyBlock.length);
               cells.push(
-                /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment
-                 * suppresses an error found when Flow v0.111 was deployed. To
-                 * see the error, delete this comment and run Flow. */
                 <View key="$sticky_trail" style={{[spacerKey]: trailSpace}} />,
               );
               insertedStickySpacer = true;
@@ -1027,9 +1048,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
             this._getFrameMetricsApprox(first).offset -
             (initBlock.offset + initBlock.length);
           cells.push(
-            /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.111 was deployed. To see
-             * the error, delete this comment and run Flow. */
             <View key="$lead_spacer" style={{[spacerKey]: firstSpace}} />,
           );
         }
@@ -1064,9 +1082,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           endFrame.length -
           (lastFrame.offset + lastFrame.length);
         cells.push(
-          /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.111 was deployed. To see the error,
-           * delete this comment and run Flow. */
           <View key="$tail_spacer" style={{[spacerKey]: tailSpacerLength}} />,
         );
       }
@@ -1076,7 +1091,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       ) ? (
         ListEmptyComponent
       ) : (
-        // $FlowFixMe
+        // $FlowFixMe[not-a-component]
+        // $FlowFixMe[incompatible-type-arg]
         <ListEmptyComponent />
       )): any);
       cells.push(
@@ -1096,7 +1112,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       const element = React.isValidElement(ListFooterComponent) ? (
         ListFooterComponent
       ) : (
-        // $FlowFixMe
+        // $FlowFixMe[not-a-component]
+        // $FlowFixMe[incompatible-type-arg]
         <ListFooterComponent />
       );
       cells.push(
@@ -1110,7 +1127,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
               this.props.ListFooterComponentStyle,
             )}>
             {
-              // $FlowFixMe - Typing ReactNativeComponent revealed errors
+              // $FlowFixMe[incompatible-type] - Typing ReactNativeComponent revealed errors
               element
             }
           </View>
@@ -1124,8 +1141,11 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       onScroll: this._onScroll,
       onScrollBeginDrag: this._onScrollBeginDrag,
       onScrollEndDrag: this._onScrollEndDrag,
+      onMomentumScrollBegin: this._onMomentumScrollBegin,
       onMomentumScrollEnd: this._onMomentumScrollEnd,
-      scrollEventThrottle: this.props.scrollEventThrottle, // TODO: Android support
+      scrollEventThrottle: scrollEventThrottleOrDefault(
+        this.props.scrollEventThrottle,
+      ), // TODO: Android support
       invertStickyHeaders:
         this.props.invertStickyHeaders !== undefined
           ? this.props.invertStickyHeaders
@@ -1144,7 +1164,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         value={{
           cellKey: null,
           getScrollMetrics: this._getScrollMetrics,
-          horizontal: this.props.horizontal,
+          horizontal: horizontalOrDefault(this.props.horizontal),
           getOutermostParentListRef: this._getOutermostParentListRef,
           getNestedChildState: this._getNestedChildState,
           registerAsNestedChild: this._registerAsNestedChild,
@@ -1170,7 +1190,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           {scrollContext => {
             if (
               scrollContext != null &&
-              !scrollContext.horizontal === !this.props.horizontal &&
+              !scrollContext.horizontal ===
+                !horizontalOrDefault(this.props.horizontal) &&
               !this._hasWarned.nesting &&
               this.context == null
             ) {
@@ -1289,20 +1310,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       .onPreferredScrollerStyleDidChange; // ]TODO(macOS GH#774)
     const onRefresh = props.onRefresh;
     if (this._isNestedWithSameOrientation()) {
-      // $FlowFixMe - Typing ReactNativeComponent revealed errors
+      // $FlowFixMe[prop-missing] - Typing ReactNativeComponent revealed errors
       return <View {...props} />;
     } else if (onRefresh) {
       invariant(
         typeof props.refreshing === 'boolean',
         '`refreshing` prop must be set as a boolean in order to use `onRefresh`, but got `' +
-          /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.111 was deployed. To see the error,
-           * delete this comment and run Flow. */
-          JSON.stringify(props.refreshing) +
+          JSON.stringify(props.refreshing ?? 'undefined') +
           '`',
       );
       return (
-        // $FlowFixMe Invalid prop usage
+        // $FlowFixMe[prop-missing] Invalid prop usage
         <ScrollView
           {...props}
           onScrollKeyDown={keyEventHandler} // TODO(macOS GH#774)
@@ -1327,12 +1345,13 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         // $FlowFixMe Invalid prop usage
         <ScrollView
           {...props}
-          onScrollKeyDown={keyEventHandler}
+          onScrollKeyDown={keyEventHandler} // TODO(macOS GH#774)
           onPreferredScrollerStyleDidChange={
-            preferredScrollerStyleDidChangeHandler
+            // TODO(macOS GH#774)
+            preferredScrollerStyleDidChangeHandler // TODO(macOS GH#774)
           }
         />
-      ); // TODO(macOS GH#774)
+      );
     }
   };
   _onCellLayout(e, cellKey, index) {
@@ -1409,8 +1428,28 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           const scrollMetrics = this._convertParentScrollMetrics(
             this.context.getScrollMetrics(),
           );
-          this._scrollMetrics.visibleLength = scrollMetrics.visibleLength;
-          this._scrollMetrics.offset = scrollMetrics.offset;
+
+          const metricsChanged =
+            this._scrollMetrics.visibleLength !== scrollMetrics.visibleLength ||
+            this._scrollMetrics.offset !== scrollMetrics.offset;
+
+          if (metricsChanged) {
+            this._scrollMetrics.visibleLength = scrollMetrics.visibleLength;
+            this._scrollMetrics.offset = scrollMetrics.offset;
+
+            // If metrics of the scrollView changed, then we triggered remeasure for child list
+            // to ensure VirtualizedList has the right information.
+            this._cellKeysToChildListKeys.forEach(childListKeys => {
+              if (childListKeys) {
+                for (let childKey of childListKeys) {
+                  const childList = this._nestedChildLists.get(childKey);
+                  childList &&
+                    childList.ref &&
+                    childList.ref.measureLayoutRelativeToContainingList();
+                }
+              }
+            });
+          }
         },
         error => {
           console.warn(
@@ -1547,9 +1586,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     const itemCount = this.props.getItemCount(this.props.data);
     for (let ii = 0; ii < itemCount; ii++) {
       const frame = this._getFrameMetricsApprox(ii);
-      /* $FlowFixMe(>=0.68.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.68 was deployed. To see the error delete this
-       * comment and run Flow. */
+      /* $FlowFixMe[prop-missing] (>=0.68.0 site=react_native_fb) This comment
+       * suppresses an error found when Flow v0.68 was deployed. To see the
+       * error delete this comment and run Flow. */
       if (frame.inLayout) {
         framesInLayout.push(frame);
       }
@@ -1606,7 +1645,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       ...
     }>,
   ): number {
-    return !this.props.horizontal ? metrics.height : metrics.width;
+    return !horizontalOrDefault(this.props.horizontal)
+      ? metrics.height
+      : metrics.width;
   }
 
   _selectOffset(
@@ -1616,7 +1657,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       ...
     }>,
   ): number {
-    return !this.props.horizontal ? metrics.y : metrics.x;
+    return !horizontalOrDefault(this.props.horizontal) ? metrics.y : metrics.x;
   }
 
   _maybeCallOnEndReached() {
@@ -1628,9 +1669,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     } = this.props;
     const {contentLength, visibleLength, offset} = this._scrollMetrics;
     const distanceFromEnd = contentLength - visibleLength - offset;
-    const threshold = onEndReachedThreshold
-      ? onEndReachedThreshold * visibleLength
-      : 2;
+    const threshold =
+      onEndReachedThreshold != null ? onEndReachedThreshold * visibleLength : 2;
     if (
       onEndReached &&
       this.state.last === getItemCount(data) - 1 &&
@@ -1769,11 +1809,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     const {offset, visibleLength, velocity} = this._scrollMetrics;
     const itemCount = this.props.getItemCount(this.props.data);
     let hiPri = false;
-    const scrollingThreshold =
-      /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.63 was deployed. To see the error delete
-       * this comment and run Flow. */
-      (this.props.onEndReachedThreshold * visibleLength) / 2;
+    const onEndReachedThreshold = onEndReachedThresholdOrDefault(
+      this.props.onEndReachedThreshold,
+    );
+    const scrollingThreshold = (onEndReachedThreshold * visibleLength) / 2;
     // Mark as high priority if we're close to the start of the first item
     // But only if there are items before the first rendered item
     if (first > 0) {
@@ -1826,6 +1865,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   };
 
   _onScrollEndDrag = (e): void => {
+    this._nestedChildLists.forEach(childList => {
+      childList.ref && childList.ref._onScrollEndDrag(e);
+    });
     const {velocity} = e.nativeEvent;
     if (velocity) {
       this._scrollMetrics.velocity = this._selectOffset(velocity);
@@ -1834,14 +1876,31 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this.props.onScrollEndDrag && this.props.onScrollEndDrag(e);
   };
 
+  _onMomentumScrollBegin = (e): void => {
+    this._nestedChildLists.forEach(childList => {
+      childList.ref && childList.ref._onMomentumScrollBegin(e);
+    });
+    this.props.onMomentumScrollBegin && this.props.onMomentumScrollBegin(e);
+  };
+
   _onMomentumScrollEnd = (e): void => {
+    this._nestedChildLists.forEach(childList => {
+      childList.ref && childList.ref._onMomentumScrollEnd(e);
+    });
     this._scrollMetrics.velocity = 0;
     this._computeBlankness();
     this.props.onMomentumScrollEnd && this.props.onMomentumScrollEnd(e);
   };
 
   _updateCellsToRender = () => {
-    const {data, getItemCount, onEndReachedThreshold} = this.props;
+    const {
+      data,
+      getItemCount,
+      onEndReachedThreshold: _onEndReachedThreshold,
+    } = this.props;
+    const onEndReachedThreshold = onEndReachedThresholdOrDefault(
+      _onEndReachedThreshold,
+    );
     const isVirtualizationDisabled = this._isVirtualizationDisabled();
     this._updateViewableItems(data);
     if (!data) {
@@ -1862,7 +1921,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           // we will trust the initialScrollIndex suggestion.
           if (!this.props.initialScrollIndex || this._scrollMetrics.offset) {
             newState = computeWindowedRenderLimits(
-              this.props,
+              this.props.data,
+              this.props.getItemCount,
+              maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch),
+              windowSizeOrDefault(this.props.windowSize),
               state,
               this._getFrameMetricsApprox,
               this._scrollMetrics,
@@ -1872,11 +1934,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       } else {
         const distanceFromEnd = contentLength - visibleLength - offset;
         const renderAhead =
-          /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.63 was deployed. To see the error
-           * delete this comment and run Flow. */
           distanceFromEnd < onEndReachedThreshold * visibleLength
-            ? this.props.maxToRenderPerBatch
+            ? maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch)
             : 0;
         newState = {
           first: 0,
@@ -1908,6 +1967,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
             }
           }
           if (someChildHasMore) {
+            // $FlowFixMe[incompatible-use]
             newState.last = ii;
             break;
           }
@@ -1925,9 +1985,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   };
 
   _createViewToken = (index: number, isViewable: boolean) => {
-    const {data, getItem, keyExtractor} = this.props;
+    const {data, getItem} = this.props;
     const item = getItem(data, index);
-    return {index, item, key: keyExtractor(item, index), isViewable};
+    return {index, item, key: this._keyExtractor(item, index), isViewable};
   };
 
   _getFrameMetricsApprox = (
@@ -1963,27 +2023,21 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     inLayout?: boolean,
     ...
   } => {
-    const {
-      data,
-      getItem,
-      getItemCount,
-      getItemLayout,
-      keyExtractor,
-    } = this.props;
+    const {data, getItem, getItemCount, getItemLayout} = this.props;
     invariant(
       getItemCount(data) > index,
       'Tried to get frame for out of range index ' + index,
     );
     const item = getItem(data, index);
-    let frame = item && this._frames[keyExtractor(item, index)];
+    let frame = item && this._frames[this._keyExtractor(item, index)];
     if (!frame || frame.index !== index) {
       if (getItemLayout) {
         frame = getItemLayout(data, index);
       }
     }
-    /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.63 was deployed. To see the error delete this
-     * comment and run Flow. */
+    /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
+     * suppresses an error found when Flow v0.63 was deployed. To see the error
+     * delete this comment and run Flow. */
     return frame;
   };
 
@@ -2006,7 +2060,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
 type CellRendererProps = {
   CellRendererComponent?: ?React.ComponentType<any>,
-  ItemSeparatorComponent: ?React.ComponentType<*>,
+  ItemSeparatorComponent: ?React.ComponentType<
+    any | {highlighted: boolean, leadingItem: ?Item},
+  >,
   cellKey: string,
   fillRateHelper: FillRateHelper,
   horizontal: ?boolean,
@@ -2107,7 +2163,7 @@ class CellRenderer extends React.Component<
     ListItemComponent,
     item,
     index,
-    isSelected /* TODO(macOS GH#774 */,
+    isSelected, // TODO(macOS GH#774)
   ) {
     if (renderItem && ListItemComponent) {
       console.warn(
@@ -2117,9 +2173,12 @@ class CellRenderer extends React.Component<
     }
 
     if (ListItemComponent) {
-      /* $FlowFixMe(>=0.108.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.108 was deployed. To see the error, delete
-       * this comment and run Flow. */
+      /* $FlowFixMe[not-a-component] (>=0.108.0 site=react_native_fb) This
+       * comment suppresses an error found when Flow v0.108 was deployed. To
+       * see the error, delete this comment and run Flow. */
+      /* $FlowFixMe[incompatible-type-arg] (>=0.108.0 site=react_native_fb)
+       * This comment suppresses an error found when Flow v0.108 was deployed.
+       * To see the error, delete this comment and run Flow. */
       return React.createElement(ListItemComponent, {
         item,
         index,
@@ -2164,9 +2223,9 @@ class CellRenderer extends React.Component<
     );
 
     const onLayout =
-      /* $FlowFixMe(>=0.68.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.68 was deployed. To see the error delete this
-       * comment and run Flow. */
+      /* $FlowFixMe[prop-missing] (>=0.68.0 site=react_native_fb) This comment
+       * suppresses an error found when Flow v0.68 was deployed. To see the
+       * error delete this comment and run Flow. */
       getItemLayout && !parentProps.debug && !fillRateHelper.enabled()
         ? undefined
         : this.props.onLayout;
@@ -2183,9 +2242,9 @@ class CellRenderer extends React.Component<
       ? [styles.row, inversionStyle]
       : inversionStyle;
     const result = !CellRendererComponent ? (
-      /* $FlowFixMe(>=0.89.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.89 was deployed. To see the error, delete
-       * this comment and run Flow. */
+      /* $FlowFixMe[incompatible-type-arg] (>=0.89.0 site=react_native_fb) *
+        This comment suppresses an error found when Flow v0.89 was deployed. *
+        To see the error, delete this comment and run Flow. */
       <View style={cellStyle} onLayout={onLayout}>
         {element}
         {itemSeparator}
diff --git a/Libraries/Lists/VirtualizedListContext.js b/Libraries/Lists/VirtualizedListContext.js
index 130315a1b08d57..b2f8d063dca0d5 100644
--- a/Libraries/Lists/VirtualizedListContext.js
+++ b/Libraries/Lists/VirtualizedListContext.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type VirtualizedList from './VirtualizedList.js';
 import * as React from 'react';
 import {useMemo, useContext} from 'react';
@@ -69,6 +67,9 @@ type Context = $ReadOnly<{
 export const VirtualizedListContext: React.Context<?Context> = React.createContext(
   null,
 );
+if (__DEV__) {
+  VirtualizedListContext.displayName = 'VirtualizedListContext';
+}
 
 /**
  * Resets the context. Intended for use by portal-like components (e.g. Modal).
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index fe0999a5ecd820..0c6745705a7698 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -8,18 +8,14 @@
  * @format
  */
 
-'use strict';
-
-const React = require('react');
-const View = require('../Components/View/View');
-const VirtualizedList = require('./VirtualizedList');
 const Platform = require('../Utilities/Platform'); // TODO(macOS GH#774)
-
-const invariant = require('invariant');
-
+import invariant from 'invariant';
 import type {ViewToken} from './ViewabilityHelper';
 import type {SelectedRowIndexPathType} from './VirtualizedList'; // TODO(macOS GH#774)
 import type {ScrollEvent} from '../Types/CoreEventTypes'; // TODO(macOS GH#774)
+import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils';
+import {View, VirtualizedList} from 'react-native';
+import * as React from 'react';
 
 type Item = any;
 
@@ -37,7 +33,7 @@ export type SectionBase<SectionItemT> = {
   renderItem?: ?(info: {
     item: SectionItemT,
     index: number,
-    isSelected?: boolean, // TODO(macOS GH#774)
+    // isSelected?: boolean, // TODO(macOS GH#774)
     section: SectionBase<SectionItemT>,
     separators: {
       highlight: () => void,
@@ -127,14 +123,18 @@ type OptionalProps<SectionT: SectionBase<any>> = {|
   onSelectionEntered?: ?(item: ?Item) => void, // TODO(macOS GH#774)
 |};
 
-type VirtualizedListProps = React.ElementProps<typeof VirtualizedList>;
+type VirtualizedListProps = React.ElementConfig<typeof VirtualizedList>;
 
 export type Props<SectionT> = {|
   ...RequiredProps<SectionT>,
   ...OptionalProps<SectionT>,
   ...$Diff<
     VirtualizedListProps,
-    {renderItem: $PropertyType<VirtualizedListProps, 'renderItem'>, ...},
+    {
+      renderItem: $PropertyType<VirtualizedListProps, 'renderItem'>,
+      data: $PropertyType<VirtualizedListProps, 'data'>,
+      ...
+    },
   >,
 |};
 export type ScrollToLocationParamsType = {|
@@ -145,14 +145,9 @@ export type ScrollToLocationParamsType = {|
   viewPosition?: number,
 |};
 
-type DefaultProps = {|
-  ...typeof VirtualizedList.defaultProps,
-  data: $ReadOnlyArray<Item>,
-|};
-
+// TODO(macOS GH#774)
 type State = {
-  childProps: VirtualizedListProps,
-  selectedRowIndexPath: SelectedRowIndexPathType, // TODO(macOS GH#774)
+  selectedRowIndexPath: SelectedRowIndexPathType,
   ...
 };
 
@@ -164,19 +159,17 @@ type State = {
 class VirtualizedSectionList<
   SectionT: SectionBase<any>,
 > extends React.PureComponent<Props<SectionT>, State> {
-  static defaultProps: DefaultProps = {
-    ...VirtualizedList.defaultProps,
-    data: [],
-  };
-
   scrollToLocation(params: ScrollToLocationParamsType) {
     let index = params.itemIndex;
     for (let i = 0; i < params.sectionIndex; i++) {
       index += this.props.getItemCount(this.props.sections[i].data) + 2;
     }
     let viewOffset = params.viewOffset || 0;
+    if (this._listRef == null) {
+      return;
+    }
     if (params.itemIndex > 0 && this.props.stickySectionHeadersEnabled) {
-      // $FlowFixMe Cannot access private property
+      // $FlowFixMe[prop-missing] Cannot access private property
       const frame = this._listRef._getFrameMetricsApprox(
         index - params.itemIndex,
       );
@@ -190,59 +183,71 @@ class VirtualizedSectionList<
     this._listRef.scrollToIndex(toIndexParams);
   }
 
-  getListRef(): VirtualizedList {
+  getListRef(): ?React.ElementRef<typeof VirtualizedList> {
     return this._listRef;
   }
 
+  // TODO(macOS GH#774)
   constructor(props: Props<SectionT>, context: Object) {
     super(props, context);
-    this.state = this._computeState(props);
-  }
-
-  UNSAFE_componentWillReceiveProps(nextProps: Props<SectionT>) {
-    this.setState(this._computeState(nextProps));
+    this.state = {
+      selectedRowIndexPath: {sectionIndex: 0, rowIndex: -1},
+    };
   }
 
-  _computeState(props: Props<SectionT>): State {
-    const offset = props.ListHeaderComponent ? 1 : 0;
-    const stickyHeaderIndices = [];
-    const itemCount = props.sections
-      ? props.sections.reduce((v, section) => {
-          stickyHeaderIndices.push(v + offset);
-          return v + props.getItemCount(section.data) + 2; // Add two for the section header and footer.
-        }, 0)
-      : 0;
-
+  render(): React.Node {
     const {
+      ItemSeparatorComponent, // don't pass through, rendered with renderItem
       SectionSeparatorComponent,
-      renderItem,
+      renderItem: _renderItem,
       renderSectionFooter,
       renderSectionHeader,
       sections: _sections,
       stickySectionHeadersEnabled,
-      ...restProps
-    } = props;
+      ...passThroughProps
+    } = this.props;
 
-    return {
-      childProps: {
-        ...restProps,
-        renderItem: this._renderItem,
-        ItemSeparatorComponent: undefined, // Rendered with renderItem
-        data: props.sections,
-        getItemCount: () => itemCount,
-        // $FlowFixMe
-        getItem: (sections, index) => this._getItem(props, sections, index),
-        keyExtractor: this._keyExtractor,
-        onViewableItemsChanged: props.onViewableItemsChanged
-          ? this._onViewableItemsChanged
-          : undefined,
-        stickyHeaderIndices: props.stickySectionHeadersEnabled
-          ? stickyHeaderIndices
-          : undefined,
-      },
-      selectedRowIndexPath: {sectionIndex: 0, rowIndex: -1}, // TODO(macOS GH#774)
-    };
+    const listHeaderOffset = this.props.ListHeaderComponent ? 1 : 0;
+
+    const stickyHeaderIndices = this.props.stickySectionHeadersEnabled
+      ? []
+      : undefined;
+
+    let itemCount = 0;
+    for (const section of this.props.sections) {
+      // Track the section header indices
+      if (stickyHeaderIndices != null) {
+        stickyHeaderIndices.push(itemCount + listHeaderOffset);
+      }
+
+      // Add two for the section header and footer.
+      itemCount += 2;
+      itemCount += this.props.getItemCount(section.data);
+    }
+    const renderItem = this._renderItem(itemCount);
+
+    return (
+      <VirtualizedList
+        {...passThroughProps}
+        keyExtractor={this._keyExtractor}
+        stickyHeaderIndices={stickyHeaderIndices}
+        renderItem={renderItem}
+        data={this.props.sections}
+        getItem={(sections, index) =>
+          this._getItem(this.props, sections, index)
+        }
+        getItemCount={() => itemCount}
+        onViewableItemsChanged={
+          this.props.onViewableItemsChanged
+            ? this._onViewableItemsChanged
+            : undefined
+        }
+        {...this.state.selectedRowIndexPath} // TODO(macOS GH#774)
+        ref={this._captureRef}
+      />
+    );
   }
+
   // [TODO(macOS GH#774)
   _selectRowAboveIndexPath = rowIndexPath => {
     let sectionIndex = rowIndexPath.sectionIndex;
@@ -297,11 +302,13 @@ class VirtualizedSectionList<
   };
 
   _ensureItemAtIndexPathIsVisible = rowIndexPath => {
-    let index = rowIndexPath.rowIndex + 1;
-    for (let ii = 0; ii < rowIndexPath.sectionIndex; ii++) {
-      index += this.props.sections[ii].data.length + 2;
+    if (this._listRef) {
+      let index = rowIndexPath.rowIndex + 1;
+      for (let ii = 0; ii < rowIndexPath.sectionIndex; ii++) {
+        index += this.props.sections[ii].data.length + 2;
+      }
+      this._listRef.ensureItemAtIndexIsVisible(index);
     }
-    this._listRef.ensureItemAtIndexIsVisible(index);
   };
 
   _handleKeyDown = (e: ScrollEvent) => {
@@ -346,33 +353,11 @@ class VirtualizedSectionList<
     }
   }; // ]TODO(macOS GH#774)
 
-  render(): React.Node {
-    let keyEventHandler = this.props.onScrollKeyDown; // [TODO(macOS GH#774)
-    if (!keyEventHandler) {
-      keyEventHandler = this.props.enableSelectionOnKeyPress
-        ? this._handleKeyDown
-        : null;
-    }
-    const preferredScrollerStyleDidChangeHandler = this.props
-      .onPreferredScrollerStyleDidChange; // ]TODO(macOS GH#774)
-    return (
-      <VirtualizedList
-        {...this.state.childProps}
-        ref={this._captureRef}
-        onScrollKeyDown={keyEventHandler}
-        onPreferredScrollerStyleDidChange={
-          preferredScrollerStyleDidChangeHandler
-        }
-        {...this.state.selectedRowIndexPath}
-      /> // TODO(macOS GH#774)
-    );
-  }
-
-  _getItem = (
+  _getItem(
     props: Props<SectionT>,
     sections: ?$ReadOnlyArray<Item>,
     index: number,
-  ): ?Item => {
+  ): ?Item {
     if (!sections) {
       return null;
     }
@@ -394,7 +379,7 @@ class VirtualizedSectionList<
       }
     }
     return null;
-  };
+  }
 
   _keyExtractor = (item: Item, index: number) => {
     const info = this._subExtractor(index);
@@ -443,7 +428,8 @@ class VirtualizedSectionList<
           trailingSection: sections[i + 1],
         };
       } else {
-        const extractor = section.keyExtractor || keyExtractor;
+        const extractor =
+          section.keyExtractor || keyExtractor || defaultKeyExtractor;
         return {
           section,
           key:
@@ -464,14 +450,18 @@ class VirtualizedSectionList<
     if (!info) {
       return null;
     }
-    const keyExtractor = info.section.keyExtractor || this.props.keyExtractor;
+    const keyExtractorWithNullableIndex = info.section.keyExtractor;
+    const keyExtractorWithNonNullableIndex =
+      this.props.keyExtractor || defaultKeyExtractor;
+    const key =
+      keyExtractorWithNullableIndex != null
+        ? keyExtractorWithNullableIndex(viewable.item, info.index)
+        : keyExtractorWithNonNullableIndex(viewable.item, info.index ?? 0);
+
     return {
       ...viewable,
       index: info.index,
-      /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.63 was deployed. To see the error delete this
-       * comment and run Flow. */
-      key: keyExtractor(viewable.item, info.index),
+      key,
       section: info.section,
     };
   };
@@ -513,7 +503,14 @@ class VirtualizedSectionList<
   };
   // ]TODO(macOS GH#774)
 
-  _renderItem = ({item, index}: {item: Item, index: number, ...}) => {
+  _renderItem = (listItemCount: number) => ({
+    item,
+    index,
+  }: {
+    item: Item,
+    index: number,
+    ...
+  }) => {
     const info = this._subExtractor(index);
     if (!info) {
       return null;
@@ -530,7 +527,11 @@ class VirtualizedSectionList<
       }
     } else {
       const renderItem = info.section.renderItem || this.props.renderItem;
-      const SeparatorComponent = this._getSeparatorComponent(index, info);
+      const SeparatorComponent = this._getSeparatorComponent(
+        index,
+        info,
+        listItemCount,
+      );
       invariant(renderItem, 'no renderItem!');
       return (
         <ItemWithSeparator
@@ -544,11 +545,13 @@ class VirtualizedSectionList<
           item={item}
           leadingItem={info.leadingItem}
           leadingSection={info.leadingSection}
-          onUpdateSeparator={this._onUpdateSeparator}
           prevCellKey={(this._subExtractor(index - 1) || {}).key}
-          ref={ref => {
-            this._cellRefs[info.key] = ref;
-          }}
+          // Callback to provide updateHighlight for this item
+          setSelfHighlightCallback={this._setUpdateHighlightFor}
+          setSelfUpdatePropsCallback={this._setUpdatePropsFor}
+          // Provide child ability to set highlight/updateProps for previous item using prevCellKey
+          updateHighlightFor={this._updateHighlightFor}
+          updatePropsFor={this._updatePropsFor}
           renderItem={renderItem}
           section={info.section}
           trailingItem={info.trailingItem}
@@ -559,14 +562,40 @@ class VirtualizedSectionList<
     }
   };
 
-  _onUpdateSeparator = (key: string, newProps: Object) => {
-    const ref = this._cellRefs[key];
-    ref && ref.updateSeparatorProps(newProps);
+  _updatePropsFor = (cellKey, value) => {
+    const updateProps = this._updatePropsMap[cellKey];
+    if (updateProps != null) {
+      updateProps(value);
+    }
+  };
+
+  _updateHighlightFor = (cellKey, value) => {
+    const updateHighlight = this._updateHighlightMap[cellKey];
+    if (updateHighlight != null) {
+      updateHighlight(value);
+    }
+  };
+
+  _setUpdateHighlightFor = (cellKey, updateHighlightFn) => {
+    if (updateHighlightFn != null) {
+      this._updateHighlightMap[cellKey] = updateHighlightFn;
+    } else {
+      delete this._updateHighlightFor[cellKey];
+    }
+  };
+
+  _setUpdatePropsFor = (cellKey, updatePropsFn) => {
+    if (updatePropsFn != null) {
+      this._updatePropsMap[cellKey] = updatePropsFn;
+    } else {
+      delete this._updatePropsMap[cellKey];
+    }
   };
 
   _getSeparatorComponent(
     index: number,
     info?: ?Object,
+    listItemCount: number,
   ): ?React.ComponentType<any> {
     info = info || this._subExtractor(index);
     if (!info) {
@@ -575,7 +604,7 @@ class VirtualizedSectionList<
     const ItemSeparatorComponent =
       info.section.ItemSeparatorComponent || this.props.ItemSeparatorComponent;
     const {SectionSeparatorComponent} = this.props;
-    const isLastItemInList = index === this.state.childProps.getItemCount() - 1;
+    const isLastItemInList = index === listItemCount - 1;
     const isLastItemInSection =
       info.index === this.props.getItemCount(info.section.data) - 1;
     if (SectionSeparatorComponent && isLastItemInSection) {
@@ -587,12 +616,10 @@ class VirtualizedSectionList<
     return null;
   }
 
-  _cellRefs = {};
-  _listRef: VirtualizedList;
+  _updateHighlightMap = {};
+  _updatePropsMap = {};
+  _listRef: ?React.ElementRef<typeof VirtualizedList>;
   _captureRef = 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._listRef = ref;
   };
 }
@@ -613,139 +640,145 @@ type ItemWithSeparatorProps = $ReadOnly<{|
   index: number,
   item: Item,
   isSelected: boolean, // TODO(macOS GH#774)
-  onUpdateSeparator: (cellKey: string, newProps: Object) => void,
+  setSelfHighlightCallback: (
+    cellKey: string,
+    updateFn: ?(boolean) => void,
+  ) => void,
+  setSelfUpdatePropsCallback: (
+    cellKey: string,
+    updateFn: ?(boolean) => void,
+  ) => void,
   prevCellKey?: ?string,
+  updateHighlightFor: (prevCellKey: string, value: boolean) => void,
+  updatePropsFor: (prevCellKey: string, value: Object) => void,
   renderItem: Function,
   inverted: boolean,
 |}>;
 
-type ItemWithSeparatorState = {
-  separatorProps: $ReadOnly<{|
-    highlighted: false,
-    ...ItemWithSeparatorCommonProps,
-  |}>,
-  leadingSeparatorProps: $ReadOnly<{|
-    highlighted: false,
-    ...ItemWithSeparatorCommonProps,
-  |}>,
-  ...
-};
-
-class ItemWithSeparator extends React.Component<
-  ItemWithSeparatorProps,
-  ItemWithSeparatorState,
-> {
-  state = {
-    separatorProps: {
-      highlighted: false,
-      leadingItem: this.props.item,
-      leadingSection: this.props.leadingSection,
-      section: this.props.section,
-      trailingItem: this.props.trailingItem,
-      trailingSection: this.props.trailingSection,
-    },
-    leadingSeparatorProps: {
-      highlighted: false,
-      leadingItem: this.props.leadingItem,
-      leadingSection: this.props.leadingSection,
-      section: this.props.section,
-      trailingItem: this.props.item,
-      trailingSection: this.props.trailingSection,
-    },
-  };
-
-  _separators = {
+function ItemWithSeparator(props: ItemWithSeparatorProps): React.Node {
+  const {
+    LeadingSeparatorComponent,
+    // this is the trailing separator and is associated with this item
+    SeparatorComponent,
+    cellKey,
+    prevCellKey,
+    setSelfHighlightCallback,
+    updateHighlightFor,
+    setSelfUpdatePropsCallback,
+    updatePropsFor,
+    item,
+    isSelected, // TODO(macOS GH#774)
+    index,
+    section,
+    inverted,
+  } = props;
+
+  const [
+    leadingSeparatorHiglighted,
+    setLeadingSeparatorHighlighted,
+  ] = React.useState(false);
+
+  const [separatorHighlighted, setSeparatorHighlighted] = React.useState(false);
+
+  const [leadingSeparatorProps, setLeadingSeparatorProps] = React.useState({
+    leadingItem: props.leadingItem,
+    leadingSection: props.leadingSection,
+    section: props.section,
+    trailingItem: props.item,
+    trailingSection: props.trailingSection,
+  });
+  const [separatorProps, setSeparatorProps] = React.useState({
+    leadingItem: props.item,
+    leadingSection: props.leadingSection,
+    section: props.section,
+    trailingItem: props.trailingItem,
+    trailingSection: props.trailingSection,
+  });
+
+  React.useEffect(() => {
+    setSelfHighlightCallback(cellKey, setSeparatorHighlighted);
+    setSelfUpdatePropsCallback(cellKey, setSeparatorProps);
+
+    return () => {
+      setSelfUpdatePropsCallback(cellKey, null);
+      setSelfHighlightCallback(cellKey, null);
+    };
+  }, [
+    cellKey,
+    setSelfHighlightCallback,
+    setSeparatorProps,
+    setSelfUpdatePropsCallback,
+  ]);
+
+  const separators = {
     highlight: () => {
-      ['leading', 'trailing'].forEach(s =>
-        this._separators.updateProps(s, {highlighted: true}),
-      );
+      setLeadingSeparatorHighlighted(true);
+      setSeparatorHighlighted(true);
+      if (prevCellKey != null) {
+        updateHighlightFor(prevCellKey, true);
+      }
     },
     unhighlight: () => {
-      ['leading', 'trailing'].forEach(s =>
-        this._separators.updateProps(s, {highlighted: false}),
-      );
+      setLeadingSeparatorHighlighted(false);
+      setSeparatorHighlighted(false);
+      if (prevCellKey != null) {
+        updateHighlightFor(prevCellKey, false);
+      }
     },
-    updateProps: (select: 'leading' | 'trailing', newProps: Object) => {
-      const {LeadingSeparatorComponent, cellKey, prevCellKey} = this.props;
-      if (select === 'leading' && LeadingSeparatorComponent != null) {
-        this.setState(state => ({
-          leadingSeparatorProps: {...state.leadingSeparatorProps, ...newProps},
-        }));
-      } else {
-        this.props.onUpdateSeparator(
-          (select === 'leading' && prevCellKey) || cellKey,
-          newProps,
-        );
+    updateProps: (
+      select: 'leading' | 'trailing',
+      newProps: $Shape<ItemWithSeparatorCommonProps>,
+    ) => {
+      if (select === 'leading') {
+        if (LeadingSeparatorComponent != null) {
+          setLeadingSeparatorProps({...leadingSeparatorProps, ...newProps});
+        } else if (prevCellKey != null) {
+          // update the previous item's separator
+          updatePropsFor(prevCellKey, {...leadingSeparatorProps, ...newProps});
+        }
+      } else if (select === 'trailing' && SeparatorComponent != null) {
+        setSeparatorProps({...separatorProps, ...newProps});
       }
     },
   };
-
-  static getDerivedStateFromProps(
-    props: ItemWithSeparatorProps,
-    prevState: ItemWithSeparatorState,
-  ): ?ItemWithSeparatorState {
-    return {
-      separatorProps: {
-        ...prevState.separatorProps,
-        leadingItem: props.item,
-        leadingSection: props.leadingSection,
-        section: props.section,
-        trailingItem: props.trailingItem,
-        trailingSection: props.trailingSection,
-      },
-      leadingSeparatorProps: {
-        ...prevState.leadingSeparatorProps,
-        leadingItem: props.leadingItem,
-        leadingSection: props.leadingSection,
-        section: props.section,
-        trailingItem: props.item,
-        trailingSection: props.trailingSection,
-      },
-    };
-  }
-
-  updateSeparatorProps(newProps: Object) {
-    this.setState(state => ({
-      separatorProps: {...state.separatorProps, ...newProps},
-    }));
-  }
-
-  render() {
-    const {
-      LeadingSeparatorComponent,
-      SeparatorComponent,
-      item,
-      index,
-      isSelected, // TODO(macOS GH#774)
-      section,
-      inverted,
-    } = this.props;
-    const element = this.props.renderItem({
-      item,
-      index,
-      isSelected, // TODO(macOS GH#774)
-      section,
-      separators: this._separators,
-    });
-    const leadingSeparator = LeadingSeparatorComponent && (
-      <LeadingSeparatorComponent {...this.state.leadingSeparatorProps} />
-    );
-    const separator = SeparatorComponent && (
-      <SeparatorComponent {...this.state.separatorProps} />
-    );
-    return leadingSeparator || separator ? (
-      /* $FlowFixMe(>=0.89.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.89 was deployed. To see the error, delete
-       * this comment and run Flow. */
-      <View>
-        {!inverted ? leadingSeparator : separator}
-        {element}
-        {!inverted ? separator : leadingSeparator}
-      </View>
-    ) : (
-      element
-    );
-  }
+  const element = props.renderItem({
+    item,
+    index,
+    isSelected, // TODO(macOS GH#774)
+    section,
+    separators,
+  });
+  const leadingSeparator = LeadingSeparatorComponent != null && (
+    <LeadingSeparatorComponent
+      highlighted={leadingSeparatorHiglighted}
+      {...leadingSeparatorProps}
+    />
+  );
+  const separator = SeparatorComponent != null && (
+    <SeparatorComponent
+      highlighted={separatorHighlighted}
+      {...separatorProps}
+    />
+  );
+  return leadingSeparator || separator ? (
+    <View>
+      {inverted === false ? leadingSeparator : separator}
+      {element}
+      {inverted === false ? separator : leadingSeparator}
+    </View>
+  ) : (
+    element
+  );
 }
 
-module.exports = VirtualizedSectionList;
+/* $FlowFixMe[class-object-subtyping] added when improving typing for this
+ * parameters */
+// $FlowFixMe[method-unbinding]
+module.exports = (VirtualizedSectionList: React.AbstractComponent<
+  React.ElementConfig<typeof VirtualizedSectionList>,
+  $ReadOnly<{
+    getListRef: () => ?React.ElementRef<typeof VirtualizedList>,
+    scrollToLocation: (params: ScrollToLocationParamsType) => void,
+    ...
+  }>,
+>);
diff --git a/Libraries/Lists/__flowtests__/SectionList-flowtest.js b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
index 9425bacd5cf8a5..38dac9cb6fb35e 100644
--- a/Libraries/Lists/__flowtests__/SectionList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const React = require('react');
-const SectionList = require('../SectionList');
+import * as React from 'react';
+import SectionList from '../SectionList';
 
 function renderMyListItem(info: {
   item: {title: string, ...},
@@ -75,7 +75,7 @@ module.exports = {
     ];
   },
 
-  testBadInheritedDefaultProp(): React.Element<*> {
+  testBadInheritedDefaultProp(): React.MixedElement {
     const sections = [];
     return (
       <SectionList
@@ -87,12 +87,12 @@ module.exports = {
     );
   },
 
-  testMissingData(): React.Element<*> {
+  testMissingData(): React.MixedElement {
     // $FlowExpectedError - missing `sections` prop
     return <SectionList renderItem={renderMyListItem} />;
   },
 
-  testBadSectionsShape(): React.Element<*> {
+  testBadSectionsShape(): React.MixedElement {
     const sections = [
       {
         key: 'a',
@@ -108,7 +108,7 @@ module.exports = {
     return <SectionList renderItem={renderMyListItem} sections={sections} />;
   },
 
-  testBadSectionsMetadata(): React.Element<*> {
+  testBadSectionsMetadata(): React.MixedElement {
     const sections = [
       {
         key: 'a',
diff --git a/Libraries/Lists/__tests__/CellRenderMask-test.js b/Libraries/Lists/__tests__/CellRenderMask-test.js
new file mode 100644
index 00000000000000..702cf65ab976e8
--- /dev/null
+++ b/Libraries/Lists/__tests__/CellRenderMask-test.js
@@ -0,0 +1,179 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+import {CellRenderMask} from '../CellRenderMask';
+
+describe('CellRenderMask', () => {
+  it('throws when constructed with invalid size', () => {
+    expect(() => new CellRenderMask(-1)).toThrow();
+  });
+
+  it('allows creation of empty mask', () => {
+    const renderMask = new CellRenderMask(0);
+    expect(renderMask.enumerateRegions()).toEqual([]);
+  });
+
+  it('allows creation of single-cell mask', () => {
+    const renderMask = new CellRenderMask(1);
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 0, isSpacer: true},
+    ]);
+  });
+
+  it('throws when adding invalid cell ranges', () => {
+    const renderMask = new CellRenderMask(5);
+
+    expect(() => renderMask.addCells({first: -1, last: 0})).toThrow();
+    expect(() => renderMask.addCells({first: 1, last: 0})).toThrow();
+    expect(() => renderMask.addCells({first: 0, last: 5})).toThrow();
+    expect(() => renderMask.addCells({first: 6, last: 7})).toThrow();
+  });
+
+  it('allows adding single cell at beginning', () => {
+    const renderMask = new CellRenderMask(5);
+    renderMask.addCells({first: 0, last: 0});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 0, isSpacer: false},
+      {first: 1, last: 4, isSpacer: true},
+    ]);
+  });
+
+  it('allows adding single cell at end', () => {
+    const renderMask = new CellRenderMask(5);
+    renderMask.addCells({first: 4, last: 4});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 3, isSpacer: true},
+      {first: 4, last: 4, isSpacer: false},
+    ]);
+  });
+
+  it('allows adding single cell in middle', () => {
+    const renderMask = new CellRenderMask(5);
+    renderMask.addCells({first: 2, last: 2});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 1, isSpacer: true},
+      {first: 2, last: 2, isSpacer: false},
+      {first: 3, last: 4, isSpacer: true},
+    ]);
+  });
+
+  it('allows marking entire cell range', () => {
+    const renderMask = new CellRenderMask(5);
+    renderMask.addCells({first: 0, last: 4});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 4, isSpacer: false},
+    ]);
+  });
+
+  it('correctly replaces fragmented cell ranges', () => {
+    const renderMask = new CellRenderMask(10);
+
+    renderMask.addCells({first: 3, last: 3});
+    renderMask.addCells({first: 5, last: 7});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 2, isSpacer: true},
+      {first: 3, last: 3, isSpacer: false},
+      {first: 4, last: 4, isSpacer: true},
+      {first: 5, last: 7, isSpacer: false},
+      {first: 8, last: 9, isSpacer: true},
+    ]);
+
+    renderMask.addCells({first: 3, last: 7});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 2, isSpacer: true},
+      {first: 3, last: 7, isSpacer: false},
+      {first: 8, last: 9, isSpacer: true},
+    ]);
+  });
+
+  it('left-expands region', () => {
+    const renderMask = new CellRenderMask(5);
+
+    renderMask.addCells({first: 3, last: 3});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 2, isSpacer: true},
+      {first: 3, last: 3, isSpacer: false},
+      {first: 4, last: 4, isSpacer: true},
+    ]);
+
+    renderMask.addCells({first: 2, last: 3});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 1, isSpacer: true},
+      {first: 2, last: 3, isSpacer: false},
+      {first: 4, last: 4, isSpacer: true},
+    ]);
+  });
+
+  it('right-expands region', () => {
+    const renderMask = new CellRenderMask(5);
+
+    renderMask.addCells({first: 3, last: 3});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 2, isSpacer: true},
+      {first: 3, last: 3, isSpacer: false},
+      {first: 4, last: 4, isSpacer: true},
+    ]);
+
+    renderMask.addCells({first: 3, last: 4});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 2, isSpacer: true},
+      {first: 3, last: 4, isSpacer: false},
+    ]);
+  });
+
+  it('left+right expands region', () => {
+    const renderMask = new CellRenderMask(5);
+
+    renderMask.addCells({first: 3, last: 3});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 2, isSpacer: true},
+      {first: 3, last: 3, isSpacer: false},
+      {first: 4, last: 4, isSpacer: true},
+    ]);
+
+    renderMask.addCells({first: 2, last: 4});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 1, isSpacer: true},
+      {first: 2, last: 4, isSpacer: false},
+    ]);
+  });
+
+  it('does nothing when adding existing cells', () => {
+    const renderMask = new CellRenderMask(5);
+
+    renderMask.addCells({first: 2, last: 3});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 1, isSpacer: true},
+      {first: 2, last: 3, isSpacer: false},
+      {first: 4, last: 4, isSpacer: true},
+    ]);
+
+    renderMask.addCells({first: 3, last: 3});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 1, isSpacer: true},
+      {first: 2, last: 3, isSpacer: false},
+      {first: 4, last: 4, isSpacer: true},
+    ]);
+  });
+});
diff --git a/Libraries/Lists/__tests__/SectionList-test.js b/Libraries/Lists/__tests__/SectionList-test.js
index 93e31f9a329dcf..8b414b64800cdd 100644
--- a/Libraries/Lists/__tests__/SectionList-test.js
+++ b/Libraries/Lists/__tests__/SectionList-test.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
+import * as React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
 
-const SectionList = require('../SectionList');
+import SectionList from '../SectionList';
 
 describe('SectionList', () => {
   it('renders empty list', () => {
diff --git a/Libraries/Lists/__tests__/VirtualizeUtils-test.js b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
index b2620c90265a23..389f4f537583fb 100644
--- a/Libraries/Lists/__tests__/VirtualizeUtils-test.js
+++ b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
@@ -10,10 +10,7 @@
 
 'use strict';
 
-const {
-  elementsThatOverlapOffsets,
-  newRangeCount,
-} = require('../VirtualizeUtils');
+import {elementsThatOverlapOffsets, newRangeCount} from '../VirtualizeUtils';
 
 describe('newRangeCount', function() {
   it('handles subset', function() {
diff --git a/Libraries/Lists/__tests__/VirtualizedList-test.js b/Libraries/Lists/__tests__/VirtualizedList-test.js
index 271fad276fe55e..6fd9d915f47989 100644
--- a/Libraries/Lists/__tests__/VirtualizedList-test.js
+++ b/Libraries/Lists/__tests__/VirtualizedList-test.js
@@ -71,7 +71,7 @@ describe('VirtualizedList', () => {
     // Silence the React error boundary warning; we expect an uncaught error.
     const consoleError = console.error;
     jest.spyOn(console, 'error').mockImplementation(message => {
-      if (message.startsWith('The above error occured in the ')) {
+      if (message.startsWith('The above error occurred in the ')) {
         return;
       }
       consoleError(message);
@@ -104,6 +104,28 @@ describe('VirtualizedList', () => {
     expect(component).toMatchSnapshot();
   });
 
+  it('renders empty list after batch', () => {
+    const component = ReactTestRenderer.create(
+      <VirtualizedList
+        data={[]}
+        renderItem={({item}) => <item value={item.key} />}
+        getItem={(data, index) => data[index]}
+        getItemCount={data => data.length}
+      />,
+    );
+
+    ReactTestRenderer.act(() => {
+      simulateLayout(component, {
+        viewport: {width: 10, height: 50},
+        content: {width: 10, height: 200},
+      });
+
+      performAllBatches();
+    });
+
+    expect(component).toMatchSnapshot();
+  });
+
   it('renders null list', () => {
     const component = ReactTestRenderer.create(
       <VirtualizedList
@@ -370,7 +392,7 @@ describe('VirtualizedList', () => {
     // onLayout, which can cause https://github.com/facebook/react-native/issues/16067
     instance._onContentSizeChange(300, initialContentHeight);
     instance._onContentSizeChange(300, data.length * ITEM_HEIGHT);
-    jest.runAllTimers();
+    performAllBatches();
 
     expect(onEndReached).not.toHaveBeenCalled();
 
@@ -384,7 +406,7 @@ describe('VirtualizedList', () => {
         contentInset: {right: 0, top: 0, left: 0, bottom: 0},
       },
     });
-    jest.runAllTimers();
+    performAllBatches();
 
     expect(onEndReached).toHaveBeenCalled();
   });
@@ -393,7 +415,7 @@ describe('VirtualizedList', () => {
     const errors = [];
     jest.spyOn(console, 'error').mockImplementation((...args) => {
       // Silence the DEV-only React error boundary warning.
-      if ((args[0] || '').startsWith('The above error occured in the ')) {
+      if ((args[0] || '').startsWith('The above error occurred in the ')) {
         return;
       }
       errors.push(args);
@@ -504,4 +526,1009 @@ describe('VirtualizedList', () => {
       'scrollToIndex out of range: requested index 3 is out of 0 to 2',
     );
   });
+
+  it('forwards correct stickyHeaderIndices when all in initial render window', () => {
+    const items = generateItemsStickyEveryN(10, 3);
+    const ITEM_HEIGHT = 10;
+
+    const component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+
+    // The initial render is specified to be the length of items provided.
+    // Expect that all sticky items (1 every 3) are passed to the underlying
+    // scrollview.
+    expect(component).toMatchSnapshot();
+  });
+
+  it('forwards correct stickyHeaderIndices when ListHeaderComponent present', () => {
+    const items = generateItemsStickyEveryN(10, 3);
+    const ITEM_HEIGHT = 10;
+
+    const component = ReactTestRenderer.create(
+      <VirtualizedList
+        ListHeaderComponent={() => React.createElement('Header')}
+        initialNumToRender={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+
+    // The initial render is specified to be the length of items provided.
+    // Expect that all sticky items (1 every 3) are passed to the underlying
+    // scrollview, indices offset by 1 to account for the the header component.
+    expect(component).toMatchSnapshot();
+  });
+
+  it('forwards correct stickyHeaderIndices when partially in initial render window', () => {
+    const items = generateItemsStickyEveryN(10, 3);
+
+    const ITEM_HEIGHT = 10;
+
+    const component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+
+    // The initial render is specified to be half the length of items provided.
+    // Expect that all sticky items of index < 5 are passed to the underlying
+    // scrollview.
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders sticky headers in viewport on batched render', () => {
+    const items = generateItemsStickyEveryN(10, 3);
+    const ITEM_HEIGHT = 10;
+
+    let component;
+    ReactTestRenderer.act(() => {
+      component = ReactTestRenderer.create(
+        <VirtualizedList
+          initialNumToRender={1}
+          windowSize={1}
+          {...baseItemProps(items)}
+          {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+        />,
+      );
+    });
+
+    ReactTestRenderer.act(() => {
+      simulateLayout(component, {
+        viewport: {width: 10, height: 50},
+        content: {width: 10, height: 100},
+      });
+      performAllBatches();
+    });
+
+    // A windowSize of 1 means we will render just the viewport height (50dip).
+    // Expect 5 10dip items to eventually be rendered, with sticky headers in
+    // the first 5 propagated.
+    expect(component).toMatchSnapshot();
+  });
+
+  it('keeps sticky headers above viewport visualized', () => {
+    const items = generateItemsStickyEveryN(20, 3);
+    const ITEM_HEIGHT = 10;
+
+    let component;
+    ReactTestRenderer.act(() => {
+      component = ReactTestRenderer.create(
+        <VirtualizedList
+          initialNumToRender={1}
+          windowSize={1}
+          {...baseItemProps(items)}
+          {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+        />,
+      );
+    });
+
+    ReactTestRenderer.act(() => {
+      simulateLayout(component, {
+        viewport: {width: 10, height: 50},
+        content: {width: 10, height: 200},
+      });
+      performAllBatches();
+    });
+
+    ReactTestRenderer.act(() => {
+      simulateScroll(component, {x: 0, y: 150});
+      performAllBatches();
+    });
+
+    // Scroll to the bottom 50 dip (last five items) of the content. Expect the
+    // last five items to be rendered (possibly more if realization window is
+    // larger), along with the most recent sticky header above the realization
+    // region, even though they are out of the viewport window in layout
+    // coordinates. This is because they will remain rendered even once
+    // scrolled-past in layout space.
+    expect(component).toMatchSnapshot();
+  });
+});
+
+it('unmounts sticky headers moved below viewport', () => {
+  const items = generateItemsStickyEveryN(20, 3);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 150});
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 0});
+    performAllBatches();
+  });
+
+  // Scroll to the bottom 50 dip (last five items) of the content, then back up
+  // to the first 5. Ensure that sticky items are unmounted once they are below
+  // the render area.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders offset cells in initial render when initialScrollIndex set', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={4}
+      initialNumToRender={4}
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  // Check that the first render respects initialScrollIndex
+  expect(component).toMatchSnapshot();
+});
+
+it('does not over-render when there is less than initialNumToRender cells', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={4}
+      initialNumToRender={20}
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  // Check that the first render clamps to the last item when intialNumToRender
+  // goes over it.
+  expect(component).toMatchSnapshot();
+});
+
+it('retains intitial render if initialScrollIndex == 0', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        initialScrollIndex={0}
+        windowSize={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 150});
+    performAllBatches();
+  });
+
+  // If initialScrollIndex is 0 (the default), we should never unmount the top
+  // initialNumToRender as part of the "scroll to top optimization", even after
+  // scrolling to the bottom five items.
+  expect(component).toMatchSnapshot();
 });
+
+it('discards intitial render if initialScrollIndex != 0', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialScrollIndex={5}
+        initialNumToRender={5}
+        windowSize={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 150});
+    performAllBatches();
+  });
+
+  // If initialScrollIndex is not 0, we do not enable retaining initial render
+  // as part of "scroll to top" optimization.
+  expect(component).toMatchSnapshot();
+});
+
+it('expands render area by maxToRenderPerBatch on tick', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  const props = {
+    initialNumToRender: 5,
+    maxToRenderPerBatch: 2,
+  };
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+        {...props}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performNextBatch();
+  });
+
+  // We start by rendering 5 items in the initial render, but have default
+  // windowSize, enabling eventual rendering up to 20 viewports worth of
+  // content. We limit this to rendering 2 items per-batch via
+  // maxToRenderPerBatch, so we should only have 7 items rendered after the
+  // initial timer tick.
+  expect(component).toMatchSnapshot();
+});
+
+it('does not adjust render area until content area layed out', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        windowSize={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateViewportLayout(component, {width: 10, height: 50});
+    performAllBatches();
+  });
+
+  // We should not start layout-based logic to expand rendered area until
+  // content is layed out. Expect only the 5 initial items to be rendered after
+  // processing all batch work, even though the windowSize allows for more.
+  expect(component).toMatchSnapshot();
+});
+
+it('does not adjust render area with non-zero initialScrollIndex until scrolled', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        initialScrollIndex={1}
+        windowSize={10}
+        maxToRenderPerBatch={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  // Layout information from before the time we scroll to initial index may not
+  // correspond to the area "initialScrollIndex" points to. Expect only the 5
+  // initial items (starting at initialScrollIndex) to be rendered after
+  // processing all batch work, even though the windowSize allows for more.
+  expect(component).toMatchSnapshot();
+});
+
+it('adjusts render area with non-zero initialScrollIndex after scrolled', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        initialScrollIndex={1}
+        windowSize={10}
+        maxToRenderPerBatch={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+
+    simulateScroll(component, {x: 0, y: 10});
+    performAllBatches();
+  });
+
+  // We should expand the render area after receiving a message indcating we
+  // arrived at initialScrollIndex.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders initialNumToRender cells when virtualization disabled', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialNumToRender={5}
+      initialScrollIndex={1}
+      disableVirtualization
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  // We should render initialNumToRender items with no spacers on initial render
+  // when virtualization is disabled
+  expect(component).toMatchSnapshot();
+});
+
+it('renders no spacers up to initialScrollIndex on first render when virtualization disabled', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={2}
+        initialScrollIndex={4}
+        maxToRenderPerBatch={1}
+        disableVirtualization
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  // There should be no spacers present in an offset initial render with
+  // virtualiztion disabled. Only initialNumToRender items starting at
+  // initialScrollIndex.
+  expect(component).toMatchSnapshot();
+});
+
+it('expands first in viewport to render up to maxToRenderPerBatch on initial render', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={2}
+        initialScrollIndex={4}
+        maxToRenderPerBatch={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  // When virtualization is disabled we may render items before initialItemIndex
+  // if initialItemIndex + initialNumToRender < maToRenderPerBatch. Expect cells
+  // 0-3 to be rendered in this example, even though initialScrollIndex is 4.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders items before initialScrollIndex on first batch tick when virtualization disabled', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        initialScrollIndex={5}
+        maxToRenderPerBatch={1}
+        disableVirtualization
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 100},
+    });
+    performNextBatch();
+  });
+
+  // When virtualization is disabled, we render "maxToRenderPerBatch" items
+  // sequentially per batch tick. Any items not yet rendered before
+  // initialScrollIndex are currently rendered at this time. Expect the first
+  // tick to render all items before initialScrollIndex, along with
+  // maxToRenderPerBatch after.
+  expect(component).toMatchSnapshot();
+});
+
+it('eventually renders all items when virtualization disabled', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        initialScrollIndex={1}
+        windowSize={1}
+        maxToRenderPerBatch={10}
+        disableVirtualization
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  // After all batch ticks, all items should eventually be rendered when\
+  // virtualization is disabled.
+  expect(component).toMatchSnapshot();
+});
+
+it('retains initial render region when an item is appended', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={3}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    component.update(
+      <VirtualizedList
+        initialNumToRender={3}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+        data={generateItems(11)}
+      />,
+    );
+  });
+
+  // Adding an item to the list before batch render should keep the existing
+  // rendered items rendered. Expect the first 3 items rendered, and a spacer
+  // for 8 items (including the 11th, added item).
+  expect(component).toMatchSnapshot();
+});
+
+it('retains batch render region when an item is appended', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        maxToRenderPerBatch={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.update(
+      <VirtualizedList
+        initialNumToRender={1}
+        maxToRenderPerBatch={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+        data={generateItems(11)}
+      />,
+    );
+  });
+
+  // Adding an item to the list after batch render should keep the existing
+  // rendered items rendered. We batch render 10 items, then add an 11th. Expect
+  // the first ten items to be present, with a spacer for the 11th until the
+  // next batch render.
+  expect(component).toMatchSnapshot();
+});
+
+it('constrains batch render region when an item is removed', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        maxToRenderPerBatch={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.update(
+      <VirtualizedList
+        initialNumToRender={1}
+        maxToRenderPerBatch={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+        data={generateItems(5)}
+      />,
+    );
+  });
+
+  // If the number of items is reduced, we should remove the corresponding
+  // already rendered items. Expect there to be 5 items present. New items in a
+  // previously occupied index may also be immediately rendered.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders a zero-height tail spacer on initial render if getItemLayout not defined', () => {
+  const items = generateItems(10);
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList initialNumToRender={3} {...baseItemProps(items)} />,
+  );
+
+  // Do not add space for out-of-viewport content on initial render when we do
+  // not yet know how large it should be (no getItemLayout and cell onLayout not
+  // yet called). Expect the tail spacer not to occupy space.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders zero-height tail spacer on batch render if cells not yet measured and getItemLayout not defined', () => {
+  const items = generateItems(10);
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={3}
+        maxToRenderPerBatch={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performNextBatch();
+  });
+
+  // Do not add space for out-of-viewport content unless the cell has previously
+  // been layed out and measurements cached. Expect the tail spacer not to
+  // occupy space.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders tail spacer up to last measured index if getItemLayout not defined', () => {
+  const items = generateItems(10);
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={3}
+        maxToRenderPerBatch={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    const LAST_MEASURED_CELL = 6;
+    for (let i = 0; i <= LAST_MEASURED_CELL; ++i) {
+      simulateCellLayout(component, items, i, {
+        width: 10,
+        height: 10,
+        x: 0,
+        y: 10 * i,
+      });
+    }
+
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 30},
+    });
+    performNextBatch();
+  });
+
+  // If cells in the out-of-viewport area have been measured, their space can be
+  // incorporated into the tail spacer, without space for the cells we can not
+  // measure until layout. Expect there to be a tail spacer occupying the space
+  // for measured, but not yet rendered items (up to and including item 6).
+  expect(component).toMatchSnapshot();
+});
+
+it('renders tail spacer up to last measured with irregular layout when getItemLayout undefined', () => {
+  const items = generateItems(10);
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={3}
+        maxToRenderPerBatch={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    const LAST_MEASURED_CELL = 6;
+
+    let currentY = 0;
+    for (let i = 0; i <= LAST_MEASURED_CELL; ++i) {
+      simulateCellLayout(component, items, i, {
+        width: 10,
+        height: i,
+        x: 0,
+        y: currentY + i,
+      });
+      currentY += i;
+    }
+
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 30},
+    });
+    performNextBatch();
+  });
+
+  // If cells in the out-of-viewport area have been measured, their space can be
+  // incorporated into the tail spacer, without space for the cells we can not
+  // measure until layout. Expect there to be a tail spacer occupying the space
+  // for measured, but not yet rendered items (up to and including item 6).
+  expect(component).toMatchSnapshot();
+});
+
+it('renders full tail spacer if all cells measured', () => {
+  const items = generateItems(10);
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={3}
+        maxToRenderPerBatch={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    const LAST_MEASURED_CELL = 9;
+    for (let i = 0; i <= LAST_MEASURED_CELL; ++i) {
+      simulateCellLayout(component, items, i, {
+        width: 10,
+        height: 10,
+        x: 0,
+        y: 10 * i,
+      });
+    }
+
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 30},
+    });
+    performNextBatch();
+  });
+
+  // The tail-spacer should occupy the space of all non-rendered items if all
+  // items have been measured.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders windowSize derived region at top', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        maxToRenderPerBatch={1}
+        windowSize={3}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 20},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  // A windowSize of 3 means that we should render a viewport's worth of content
+  // above and below the current. A 20 dip viewport at the top of the list means
+  // we should render the top 4 10-dip items (for the current viewport, and
+  // 20dip below).
+  expect(component).toMatchSnapshot();
+});
+
+it('renders windowSize derived region in middle', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        maxToRenderPerBatch={1}
+        windowSize={3}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 20},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 50});
+    performAllBatches();
+  });
+
+  // A windowSize of 3 means that we should render a viewport's worth of content
+  // above and below the current. A 20 dip viewport in the top of the list means
+  // we should render the 6 10-dip items (for the current viewport, 20 dip above
+  // and below), along with retaining the top initialNumToRenderItems. We seem
+  // to actually render 7 in the middle due to rounding at the moment.
+  expect(component).toMatchSnapshot();
+});
+
+it('renders windowSize derived region at bottom', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        maxToRenderPerBatch={1}
+        windowSize={3}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 20},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 80});
+    performAllBatches();
+  });
+
+  // A windowSize of 3 means that we should render a viewport's worth of content
+  // above and below the current. A 20 dip viewport at the bottom of the list
+  // means we should render the bottom 4 10-dip items (for the current viewport,
+  // and 20dip above), along with retaining the top initialNumToRenderItems. We
+  // seem to actually render 4 at the bottom due to rounding at the moment.
+  expect(component).toMatchSnapshot();
+});
+
+function generateItems(count) {
+  return Array(count)
+    .fill()
+    .map((_, i) => ({key: i}));
+}
+
+function generateItemsStickyEveryN(count, n) {
+  return Array(count)
+    .fill()
+    .map((_, i) => (i % n === 0 ? {key: i, sticky: true} : {key: i}));
+}
+
+function baseItemProps(items) {
+  return {
+    data: items,
+    renderItem: ({item}) =>
+      React.createElement('MockCellItem', {value: item.key, ...item}),
+    getItem: (data, index) => data[index],
+    getItemCount: data => data.length,
+    stickyHeaderIndices: stickyHeaderIndices(items),
+  };
+}
+
+function stickyHeaderIndices(items) {
+  return items.filter(item => item.sticky).map(item => item.key);
+}
+
+function fixedHeightItemLayoutProps(height) {
+  return {
+    getItemLayout: (_, index) => ({
+      length: height,
+      offset: height * index,
+      index,
+    }),
+  };
+}
+
+let lastViewportLayout;
+let lastContentLayout;
+
+function simulateLayout(component, args) {
+  simulateViewportLayout(component, args.viewport);
+  simulateContentLayout(component, args.content);
+}
+
+function simulateViewportLayout(component, dimensions) {
+  lastViewportLayout = dimensions;
+  component.getInstance()._onLayout({nativeEvent: {layout: dimensions}});
+}
+
+function simulateContentLayout(component, dimensions) {
+  lastContentLayout = dimensions;
+  component
+    .getInstance()
+    ._onContentSizeChange(dimensions.width, dimensions.height);
+}
+
+function simulateCellLayout(component, items, itemIndex, dimensions) {
+  const instance = component.getInstance();
+  const cellKey = instance._keyExtractor(items[itemIndex], itemIndex);
+  instance._onCellLayout(
+    {nativeEvent: {layout: dimensions}},
+    cellKey,
+    itemIndex,
+  );
+}
+
+function simulateScroll(component, position) {
+  component.getInstance()._onScroll({
+    nativeEvent: {
+      contentOffset: position,
+      contentSize: lastContentLayout,
+      layoutMeasurement: lastViewportLayout,
+    },
+  });
+}
+
+function performAllBatches() {
+  jest.runAllTimers();
+}
+
+function performNextBatch() {
+  jest.runOnlyPendingTimers();
+}
diff --git a/Libraries/Lists/__tests__/VirtualizedSectionList-test.js b/Libraries/Lists/__tests__/VirtualizedSectionList-test.js
index 9bb461bf973f37..f4760ec5563fd7 100644
--- a/Libraries/Lists/__tests__/VirtualizedSectionList-test.js
+++ b/Libraries/Lists/__tests__/VirtualizedSectionList-test.js
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow
  * @emails oncall+react_native
  */
 
@@ -42,18 +43,6 @@ describe('VirtualizedSectionList', () => {
     expect(component).toMatchSnapshot();
   });
 
-  it('renders null list', () => {
-    const component = ReactTestRenderer.create(
-      <VirtualizedSectionList
-        sections={undefined}
-        renderItem={({item}) => <item value={item.key} />}
-        getItem={(data, key) => data[key]}
-        getItemCount={data => 0}
-      />,
-    );
-    expect(component).toMatchSnapshot();
-  });
-
   it('renders empty list with empty component', () => {
     const component = ReactTestRenderer.create(
       <VirtualizedSectionList
@@ -97,7 +86,11 @@ describe('VirtualizedSectionList', () => {
         ]}
         getItem={(data, key) => data[key]}
         getItemCount={data => data.length}
-        getItemLayout={({index}) => ({length: 50, offset: index * 50})}
+        getItemLayout={({index}) => ({
+          index: -1,
+          length: 50,
+          offset: index * 50,
+        })}
         inverted={true}
         keyExtractor={(item, index) => item.id}
         onRefresh={jest.fn()}
@@ -110,26 +103,37 @@ describe('VirtualizedSectionList', () => {
 
   it('handles separators correctly', () => {
     const infos = [];
-    const component = ReactTestRenderer.create(
-      <VirtualizedSectionList
-        ItemSeparatorComponent={props => <separator {...props} />}
-        sections={[
-          {title: 's0', data: [{key: 'i0'}, {key: 'i1'}, {key: 'i2'}]},
-        ]}
-        renderItem={info => {
-          infos.push(info);
-          return <item title={info.item.key} />;
-        }}
-        getItem={(data, key) => data[key]}
-        getItemCount={data => data.length}
-      />,
-    );
+    let component;
+    ReactTestRenderer.act(() => {
+      component = ReactTestRenderer.create(
+        <VirtualizedSectionList
+          ItemSeparatorComponent={props => <separator {...props} />}
+          sections={[
+            {title: 's0', data: [{key: 'i0'}, {key: 'i1'}, {key: 'i2'}]},
+          ]}
+          renderItem={info => {
+            infos.push(info);
+            return <item title={info.item.key} />;
+          }}
+          getItem={(data, key) => data[key]}
+          getItemCount={data => data.length}
+        />,
+      );
+    });
     expect(component).toMatchSnapshot();
-    infos[1].separators.highlight();
+
+    ReactTestRenderer.act(() => {
+      infos[1].separators.highlight();
+    });
+    expect(component).toMatchSnapshot();
+    ReactTestRenderer.act(() => {
+      infos[2].separators.updateProps('leading', {press: true});
+    });
     expect(component).toMatchSnapshot();
-    infos[2].separators.updateProps('leading', {press: true});
+    ReactTestRenderer.act(() => {
+      infos[1].separators.unhighlight();
+    });
     expect(component).toMatchSnapshot();
-    infos[1].separators.unhighlight();
   });
 
   it('handles nested lists', () => {
@@ -185,7 +189,11 @@ describe('VirtualizedSectionList', () => {
       );
       const instance = component.getInstance();
       const spy = jest.fn();
+
+      // $FlowFixMe[incompatible-use] wrong types
+      // $FlowFixMe[prop-missing] wrong types
       instance._listRef.scrollToIndex = spy;
+
       return {
         instance,
         spy,
@@ -199,7 +207,8 @@ describe('VirtualizedSectionList', () => {
 
       const viewOffset = 25;
 
-      instance.scrollToLocation({
+      // $FlowFixMe[prop-missing] scrollToLocation isn't on instance
+      instance?.scrollToLocation({
         sectionIndex: 0,
         itemIndex: 1,
         viewOffset,
@@ -249,8 +258,8 @@ describe('VirtualizedSectionList', () => {
       'given sectionIndex, itemIndex and viewOffset, scrollToIndex is called with correct params',
       (scrollToLocationParams, expected) => {
         const {instance, spy} = createVirtualizedSectionList();
-
-        instance.scrollToLocation(scrollToLocationParams);
+        // $FlowFixMe[prop-missing] scrollToLocation not on instance
+        instance?.scrollToLocation(scrollToLocationParams);
         expect(spy).toHaveBeenCalledWith(expected);
       },
     );
diff --git a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
index b79984494c1523..7bcd01696983f9 100644
--- a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -25,17 +25,13 @@ exports[`FlatList renders all the bells and whistles 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
   getItemLayout={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onRefresh={[MockFunction]}
   onScroll={[Function]}
@@ -53,9 +49,7 @@ exports[`FlatList renders all the bells and whistles 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <RCTRefreshControl />
   <View>
@@ -129,16 +123,12 @@ exports[`FlatList renders all the bells and whistles 1`] = `
 exports[`FlatList renders empty list 1`] = `
 <RCTScrollView
   data={Array []}
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -148,9 +138,7 @@ exports[`FlatList renders empty list 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -158,16 +146,12 @@ exports[`FlatList renders empty list 1`] = `
 
 exports[`FlatList renders null list 1`] = `
 <RCTScrollView
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -177,9 +161,7 @@ exports[`FlatList renders null list 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -200,16 +182,12 @@ exports[`FlatList renders simple list (multiple columns) 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -219,9 +197,7 @@ exports[`FlatList renders simple list (multiple columns) 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
@@ -278,16 +254,12 @@ exports[`FlatList renders simple list 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -297,9 +269,7 @@ exports[`FlatList renders simple list 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
@@ -346,16 +316,12 @@ exports[`FlatList renders simple list using ListItemComponent (multiple columns)
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -364,9 +330,7 @@ exports[`FlatList renders simple list using ListItemComponent (multiple columns)
   removeClippedSubviews={false}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
@@ -424,16 +388,12 @@ exports[`FlatList renders simple list using ListItemComponent 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -442,9 +402,7 @@ exports[`FlatList renders simple list using ListItemComponent 1`] = `
   removeClippedSubviews={false}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
diff --git a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index 73263f11df719a..7e5243f044024b 100644
--- a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -17,16 +17,12 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -41,8 +37,6 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
       0,
     ]
   }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -83,16 +77,12 @@ exports[`SectionList renders a footer when there is no data 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -107,8 +97,6 @@ exports[`SectionList renders a footer when there is no data 1`] = `
       0,
     ]
   }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -141,16 +129,12 @@ exports[`SectionList renders a footer when there is no data and no header 1`] =
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -165,8 +149,6 @@ exports[`SectionList renders a footer when there is no data and no header 1`] =
       0,
     ]
   }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -230,16 +212,13 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
   initialNumToRender={Infinity}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onRefresh={[MockFunction]}
   onScroll={[Function]}
@@ -264,8 +243,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       9,
     ]
   }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <RCTRefreshControl />
   <View>
@@ -425,16 +402,12 @@ exports[`SectionList renders all the bells and whistles 1`] = `
 exports[`SectionList renders empty list 1`] = `
 <RCTScrollView
   data={Array []}
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -445,8 +418,6 @@ exports[`SectionList renders empty list 1`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
diff --git a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
index 708509db4ff9b6..cdda0f7f13cfed 100644
--- a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
@@ -1,27 +1,53 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`VirtualizedList handles nested lists 1`] = `
+exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderComponent present 1`] = `
 <RCTScrollView
+  ListHeaderComponent={[Function]}
   data={
     Array [
       Object {
-        "key": "outer0",
+        "key": 0,
+        "sticky": true,
       },
       Object {
-        "key": "outer1",
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+        "sticky": true,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+        "sticky": true,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+        "sticky": true,
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
+  getItemLayout={[Function]}
   initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -29,246 +55,146 @@ exports[`VirtualizedList handles nested lists 1`] = `
   onScrollKeyDown={null}
   renderItem={[Function]}
   scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
+  stickyHeaderIndices={
+    Array [
+      0,
+      3,
+      6,
+      9,
+    ]
+  }
 >
   <View>
     <View
       onLayout={[Function]}
+    >
+      <Header />
+    </View>
+    <View
       style={null}
     >
-      <View
-        data={
-          Array [
-            Object {
-              "key": "outer0:inner0",
-            },
-            Object {
-              "key": "outer0:inner1",
-            },
-          ]
-        }
-        disableVirtualization={false}
-        getItem={[Function]}
-        getItemCount={[Function]}
-        horizontal={false}
-        initialNumToRender={10}
-        keyExtractor={[Function]}
-        maxToRenderPerBatch={10}
-        onContentSizeChange={[Function]}
-        onEndReachedThreshold={2}
-        onLayout={[Function]}
-        onMomentumScrollEnd={[Function]}
-        onScroll={[Function]}
-        onScrollBeginDrag={[Function]}
-        onScrollEndDrag={[Function]}
-        renderItem={[Function]}
-        scrollEventThrottle={50}
-        stickyHeaderIndices={Array []}
-        updateCellsBatchingPeriod={50}
-        windowSize={21}
-      >
-        <View
-          onLayout={[Function]}
-          style={null}
-        >
-          <item
-            title="outer0:inner0"
-          />
-        </View>
-        <View
-          onLayout={[Function]}
-          style={null}
-        >
-          <item
-            title="outer0:inner1"
-          />
-        </View>
-      </View>
+      <MockCellItem
+        sticky={true}
+        value={0}
+      />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <RCTScrollView
-        data={
-          Array [
-            Object {
-              "key": "outer1:inner0",
-            },
-            Object {
-              "key": "outer1:inner1",
-            },
-          ]
-        }
-        disableVirtualization={false}
-        getItem={[Function]}
-        getItemCount={[Function]}
-        horizontal={true}
-        initialNumToRender={10}
-        keyExtractor={[Function]}
-        maxToRenderPerBatch={10}
-        onContentSizeChange={[Function]}
-        onEndReachedThreshold={2}
-        onLayout={[Function]}
-        onMomentumScrollEnd={[Function]}
-        onScroll={[Function]}
-        onScrollBeginDrag={[Function]}
-        onScrollEndDrag={[Function]}
-        onScrollKeyDown={null}
-        renderItem={[Function]}
-        scrollEventThrottle={50}
-        stickyHeaderIndices={Array []}
-        updateCellsBatchingPeriod={50}
-        windowSize={21}
-      >
-        <View>
-          <View
-            onLayout={[Function]}
-            style={
-              Array [
-                Object {
-                  "flexDirection": "row",
-                },
-                null,
-              ]
-            }
-          >
-            <item
-              title="outer1:inner0"
-            />
-          </View>
-          <View
-            onLayout={[Function]}
-            style={
-              Array [
-                Object {
-                  "flexDirection": "row",
-                },
-                null,
-              ]
-            }
-          >
-            <item
-              title="outer1:inner1"
-            />
-          </View>
-        </View>
-      </RCTScrollView>
+      <MockCellItem
+        value={1}
+      />
     </View>
-  </View>
-</RCTScrollView>
-`;
-
-exports[`VirtualizedList handles separators correctly 1`] = `
-<RCTScrollView
-  ItemSeparatorComponent={[Function]}
-  data={
-    Array [
-      Object {
-        "key": "i0",
-      },
-      Object {
-        "key": "i1",
-      },
-      Object {
-        "key": "i2",
-      },
-    ]
-  }
-  disableVirtualization={false}
-  getItem={[Function]}
-  getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
-  onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
-  onLayout={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onScroll={[Function]}
-  onScrollBeginDrag={[Function]}
-  onScrollEndDrag={[Function]}
-  onScrollKeyDown={null}
-  renderItem={[Function]}
-  scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
->
-  <View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i0"
+      <MockCellItem
+        value={2}
       />
-      <separator
-        highlighted={false}
-        leadingItem={
-          Object {
-            "key": "i0",
-          }
-        }
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={3}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i1"
+      <MockCellItem
+        value={4}
       />
-      <separator
-        highlighted={false}
-        leadingItem={
-          Object {
-            "key": "i1",
-          }
-        }
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i2"
+      <MockCellItem
+        sticky={true}
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={9}
       />
     </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList handles separators correctly 2`] = `
+exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initial render window 1`] = `
 <RCTScrollView
-  ItemSeparatorComponent={[Function]}
   data={
     Array [
       Object {
-        "key": "i0",
+        "key": 0,
+        "sticky": true,
       },
       Object {
-        "key": "i1",
+        "key": 1,
       },
       Object {
-        "key": "i2",
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+        "sticky": true,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+        "sticky": true,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+        "sticky": true,
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
+  getItemLayout={[Function]}
   initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -276,389 +202,367 @@ exports[`VirtualizedList handles separators correctly 2`] = `
   onScrollKeyDown={null}
   renderItem={[Function]}
   scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
+  stickyHeaderIndices={
+    Array [
+      0,
+      3,
+      6,
+      9,
+    ]
+  }
 >
   <View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i0"
-      />
-      <separator
-        highlighted={true}
-        leadingItem={
-          Object {
-            "key": "i0",
-          }
-        }
+      <MockCellItem
+        sticky={true}
+        value={0}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i1"
+      <MockCellItem
+        value={1}
       />
-      <separator
-        highlighted={true}
-        leadingItem={
-          Object {
-            "key": "i1",
-          }
-        }
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i2"
+      <MockCellItem
+        sticky={true}
+        value={3}
       />
     </View>
-  </View>
-</RCTScrollView>
-`;
-
-exports[`VirtualizedList handles separators correctly 3`] = `
-<RCTScrollView
-  ItemSeparatorComponent={[Function]}
-  data={
-    Array [
-      Object {
-        "key": "i0",
-      },
-      Object {
-        "key": "i1",
-      },
-      Object {
-        "key": "i2",
-      },
-    ]
-  }
-  disableVirtualization={false}
-  getItem={[Function]}
-  getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
-  onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
-  onLayout={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onScroll={[Function]}
-  onScrollBeginDrag={[Function]}
-  onScrollEndDrag={[Function]}
-  onScrollKeyDown={null}
-  renderItem={[Function]}
-  scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
->
-  <View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i0"
+      <MockCellItem
+        value={4}
       />
-      <separator
-        highlighted={true}
-        leadingItem={
-          Object {
-            "key": "i0",
-          }
-        }
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i1"
+      <MockCellItem
+        sticky={true}
+        value={6}
       />
-      <separator
-        highlighted={true}
-        leadingItem={
-          Object {
-            "key": "i1",
-          }
-        }
-        press={true}
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        title="i2"
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={9}
       />
     </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList renders all the bells and whistles 1`] = `
+exports[`VirtualizedList forwards correct stickyHeaderIndices when partially in initial render window 1`] = `
 <RCTScrollView
-  ItemSeparatorComponent={[Function]}
-  ListEmptyComponent={[Function]}
-  ListFooterComponent={[Function]}
-  ListHeaderComponent={[Function]}
   data={
     Array [
       Object {
-        "id": "0",
+        "key": 0,
+        "sticky": true,
       },
       Object {
-        "id": "1",
+        "key": 1,
       },
       Object {
-        "id": "2",
+        "key": 2,
       },
       Object {
-        "id": "3",
+        "key": 3,
+        "sticky": true,
       },
       Object {
-        "id": "4",
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+        "sticky": true,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+        "sticky": true,
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
   getItemLayout={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  invertStickyHeaders={true}
-  inverted={true}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
+  initialNumToRender={5}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
-  onRefresh={[MockFunction]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
   onScrollEndDrag={[Function]}
   onScrollKeyDown={null}
-  refreshControl={
-    <RefreshControlMock
-      onRefresh={[MockFunction]}
-      refreshing={false}
-    />
-  }
-  refreshing={false}
   renderItem={[Function]}
   scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
-  style={
+  stickyHeaderIndices={
     Array [
-      Object {
-        "transform": Array [
-          Object {
-            "scaleY": -1,
-          },
-        ],
-      },
-      undefined,
+      0,
+      3,
     ]
   }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
-  <RCTRefreshControl />
   <View>
     <View
-      onLayout={[Function]}
-      style={
-        Object {
-          "transform": Array [
-            Object {
-              "scaleY": -1,
-            },
-          ],
-        }
-      }
-    >
-      <header />
-    </View>
-    <View
-      style={
-        Array [
-          Object {
-            "flexDirection": "column-reverse",
-          },
-          Object {
-            "transform": Array [
-              Object {
-                "scaleY": -1,
-              },
-            ],
-          },
-        ]
-      }
+      style={null}
     >
-      <item
-        value="0"
+      <MockCellItem
+        sticky={true}
+        value={0}
       />
-      <separator />
     </View>
     <View
-      style={
-        Array [
-          Object {
-            "flexDirection": "column-reverse",
-          },
-          Object {
-            "transform": Array [
-              Object {
-                "scaleY": -1,
-              },
-            ],
-          },
-        ]
-      }
+      style={null}
     >
-      <item
-        value="1"
+      <MockCellItem
+        value={1}
       />
-      <separator />
     </View>
     <View
-      style={
-        Array [
-          Object {
-            "flexDirection": "column-reverse",
-          },
-          Object {
-            "transform": Array [
-              Object {
-                "scaleY": -1,
-              },
-            ],
-          },
-        ]
-      }
+      style={null}
     >
-      <item
-        value="2"
+      <MockCellItem
+        value={2}
       />
-      <separator />
     </View>
     <View
-      style={
-        Array [
-          Object {
-            "flexDirection": "column-reverse",
-          },
-          Object {
-            "transform": Array [
-              Object {
-                "scaleY": -1,
-              },
-            ],
-          },
-        ]
-      }
+      style={null}
     >
-      <item
-        value="3"
+      <MockCellItem
+        sticky={true}
+        value={3}
       />
-      <separator />
     </View>
     <View
-      style={
-        Array [
-          Object {
-            "flexDirection": "column-reverse",
-          },
-          Object {
-            "transform": Array [
-              Object {
-                "scaleY": -1,
-              },
-            ],
-          },
-        ]
-      }
+      style={null}
     >
-      <item
-        value="4"
+      <MockCellItem
+        value={4}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={
         Object {
-          "transform": Array [
-            Object {
-              "scaleY": -1,
-            },
-          ],
+          "height": 50,
         }
       }
-    >
-      <footer />
-    </View>
+    />
   </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList renders empty list 1`] = `
+exports[`VirtualizedList handles nested lists 1`] = `
 <RCTScrollView
-  data={Array []}
-  disableVirtualization={false}
-  getItem={[Function]}
-  getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
-  onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
-  onLayout={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onScroll={[Function]}
+  data={
+    Array [
+      Object {
+        "key": "outer0",
+      },
+      Object {
+        "key": "outer1",
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
   onScrollBeginDrag={[Function]}
   onScrollEndDrag={[Function]}
   onScrollKeyDown={null}
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
-  <View />
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <View
+        data={
+          Array [
+            Object {
+              "key": "outer0:inner0",
+            },
+            Object {
+              "key": "outer0:inner1",
+            },
+          ]
+        }
+        getItem={[Function]}
+        getItemCount={[Function]}
+        horizontal={false}
+        onContentSizeChange={[Function]}
+        onLayout={[Function]}
+        onMomentumScrollBegin={[Function]}
+        onMomentumScrollEnd={[Function]}
+        onScroll={[Function]}
+        onScrollBeginDrag={[Function]}
+        onScrollEndDrag={[Function]}
+        renderItem={[Function]}
+        scrollEventThrottle={50}
+        stickyHeaderIndices={Array []}
+      >
+        <View
+          onLayout={[Function]}
+          style={null}
+        >
+          <item
+            title="outer0:inner0"
+          />
+        </View>
+        <View
+          onLayout={[Function]}
+          style={null}
+        >
+          <item
+            title="outer0:inner1"
+          />
+        </View>
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <RCTScrollView
+        data={
+          Array [
+            Object {
+              "key": "outer1:inner0",
+            },
+            Object {
+              "key": "outer1:inner1",
+            },
+          ]
+        }
+        getItem={[Function]}
+        getItemCount={[Function]}
+        horizontal={true}
+        onContentSizeChange={[Function]}
+        onLayout={[Function]}
+        onMomentumScrollBegin={[Function]}
+        onMomentumScrollEnd={[Function]}
+        onScroll={[Function]}
+        onScrollBeginDrag={[Function]}
+        onScrollEndDrag={[Function]}
+        onScrollKeyDown={null}
+        renderItem={[Function]}
+        scrollEventThrottle={50}
+        stickyHeaderIndices={Array []}
+      >
+        <View>
+          <View
+            onLayout={[Function]}
+            style={
+              Array [
+                Object {
+                  "flexDirection": "row",
+                },
+                null,
+              ]
+            }
+          >
+            <item
+              title="outer1:inner0"
+            />
+          </View>
+          <View
+            onLayout={[Function]}
+            style={
+              Array [
+                Object {
+                  "flexDirection": "row",
+                },
+                null,
+              ]
+            }
+          >
+            <item
+              title="outer1:inner1"
+            />
+          </View>
+        </View>
+      </RCTScrollView>
+    </View>
+  </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList renders empty list with empty component 1`] = `
+exports[`VirtualizedList handles separators correctly 1`] = `
 <RCTScrollView
-  ListEmptyComponent={[Function]}
-  ListFooterComponent={[Function]}
-  ListHeaderComponent={[Function]}
-  data={Array []}
-  disableVirtualization={false}
+  ItemSeparatorComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "key": "i0",
+      },
+      Object {
+        "key": "i1",
+      },
+      Object {
+        "key": "i2",
+      },
+    ]
+  }
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -667,45 +571,73 @@ exports[`VirtualizedList renders empty list with empty component 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
       onLayout={[Function]}
+      style={null}
     >
-      <header />
+      <item
+        title="i0"
+      />
+      <separator
+        highlighted={false}
+        leadingItem={
+          Object {
+            "key": "i0",
+          }
+        }
+      />
     </View>
-    <empty />
     <View
       onLayout={[Function]}
+      style={null}
     >
-      <footer />
+      <item
+        title="i1"
+      />
+      <separator
+        highlighted={false}
+        leadingItem={
+          Object {
+            "key": "i1",
+          }
+        }
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        title="i2"
+      />
     </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList renders list with empty component 1`] = `
+exports[`VirtualizedList handles separators correctly 2`] = `
 <RCTScrollView
-  ListEmptyComponent={[Function]}
+  ItemSeparatorComponent={[Function]}
   data={
     Array [
       Object {
-        "key": "hello",
+        "key": "i0",
+      },
+      Object {
+        "key": "i1",
+      },
+      Object {
+        "key": "i2",
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -714,8 +646,6 @@ exports[`VirtualizedList renders list with empty component 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -723,25 +653,66 @@ exports[`VirtualizedList renders list with empty component 1`] = `
       style={null}
     >
       <item
-        value="hello"
+        title="i0"
+      />
+      <separator
+        highlighted={true}
+        leadingItem={
+          Object {
+            "key": "i0",
+          }
+        }
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        title="i1"
+      />
+      <separator
+        highlighted={true}
+        leadingItem={
+          Object {
+            "key": "i1",
+          }
+        }
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        title="i2"
       />
     </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList renders null list 1`] = `
+exports[`VirtualizedList handles separators correctly 3`] = `
 <RCTScrollView
-  disableVirtualization={false}
+  ItemSeparatorComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "key": "i0",
+      },
+      Object {
+        "key": "i1",
+      },
+      Object {
+        "key": "i2",
+      },
+    ]
+  }
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -750,38 +721,3569 @@ exports[`VirtualizedList renders null list 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
-  <View />
-</RCTScrollView>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        title="i0"
+      />
+      <separator
+        highlighted={true}
+        leadingItem={
+          Object {
+            "key": "i0",
+          }
+        }
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        title="i1"
+      />
+      <separator
+        highlighted={true}
+        leadingItem={
+          Object {
+            "key": "i1",
+          }
+        }
+        press={true}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        title="i2"
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+        "sticky": true,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+        "sticky": true,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+        "sticky": true,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+        "sticky": true,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+        "sticky": true,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+        "sticky": true,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+        "sticky": true,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={
+    Array [
+      0,
+      2,
+      4,
+      7,
+      10,
+      13,
+    ]
+  }
+  windowSize={1}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={0}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 50,
+        }
+      }
+    />
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={6}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 20,
+        }
+      }
+    />
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={9}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={10}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={11}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={12}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={13}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={14}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={15}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={16}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={17}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={18}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={19}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders all the bells and whistles 1`] = `
+<RCTScrollView
+  ItemSeparatorComponent={[Function]}
+  ListEmptyComponent={[Function]}
+  ListFooterComponent={[Function]}
+  ListHeaderComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "id": "0",
+      },
+      Object {
+        "id": "1",
+      },
+      Object {
+        "id": "2",
+      },
+      Object {
+        "id": "3",
+      },
+      Object {
+        "id": "4",
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  invertStickyHeaders={true}
+  inverted={true}
+  keyExtractor={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onRefresh={[MockFunction]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  refreshControl={
+    <RefreshControlMock
+      onRefresh={[MockFunction]}
+      refreshing={false}
+    />
+  }
+  refreshing={false}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  style={
+    Array [
+      Object {
+        "transform": Array [
+          Object {
+            "scaleY": -1,
+          },
+        ],
+      },
+      undefined,
+    ]
+  }
+>
+  <RCTRefreshControl />
+  <View>
+    <View
+      onLayout={[Function]}
+      style={
+        Object {
+          "transform": Array [
+            Object {
+              "scaleY": -1,
+            },
+          ],
+        }
+      }
+    >
+      <header />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "column-reverse",
+          },
+          Object {
+            "transform": Array [
+              Object {
+                "scaleY": -1,
+              },
+            ],
+          },
+        ]
+      }
+    >
+      <item
+        value="0"
+      />
+      <separator />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "column-reverse",
+          },
+          Object {
+            "transform": Array [
+              Object {
+                "scaleY": -1,
+              },
+            ],
+          },
+        ]
+      }
+    >
+      <item
+        value="1"
+      />
+      <separator />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "column-reverse",
+          },
+          Object {
+            "transform": Array [
+              Object {
+                "scaleY": -1,
+              },
+            ],
+          },
+        ]
+      }
+    >
+      <item
+        value="2"
+      />
+      <separator />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "column-reverse",
+          },
+          Object {
+            "transform": Array [
+              Object {
+                "scaleY": -1,
+              },
+            ],
+          },
+        ]
+      }
+    >
+      <item
+        value="3"
+      />
+      <separator />
+    </View>
+    <View
+      style={
+        Array [
+          Object {
+            "flexDirection": "column-reverse",
+          },
+          Object {
+            "transform": Array [
+              Object {
+                "scaleY": -1,
+              },
+            ],
+          },
+        ]
+      }
+    >
+      <item
+        value="4"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={
+        Object {
+          "transform": Array [
+            Object {
+              "scaleY": -1,
+            },
+          ],
+        }
+      }
+    >
+      <footer />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders empty list 1`] = `
+<RCTScrollView
+  data={Array []}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View />
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders empty list after batch 1`] = `
+<RCTScrollView
+  data={Array []}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View />
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders empty list with empty component 1`] = `
+<RCTScrollView
+  ListEmptyComponent={[Function]}
+  ListFooterComponent={[Function]}
+  ListHeaderComponent={[Function]}
+  data={Array []}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+    >
+      <header />
+    </View>
+    <empty />
+    <View
+      onLayout={[Function]}
+    >
+      <footer />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders list with empty component 1`] = `
+<RCTScrollView
+  ListEmptyComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "key": "hello",
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="hello"
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders null list 1`] = `
+<RCTScrollView
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View />
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders simple list 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": "i1",
+      },
+      Object {
+        "key": "i2",
+      },
+      Object {
+        "key": "i3",
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="i1"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="i2"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="i3"
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders simple list using ListItemComponent 1`] = `
+<RCTScrollView
+  ListItemComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "key": "i1",
+      },
+      Object {
+        "key": "i2",
+      },
+      Object {
+        "key": "i3",
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="i1"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="i2"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="i3"
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList renders sticky headers in viewport on batched render 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+        "sticky": true,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+        "sticky": true,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+        "sticky": true,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+        "sticky": true,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={
+    Array [
+      0,
+      3,
+    ]
+  }
+  windowSize={1}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 50,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList test getItem functionality where data is not an Array 1`] = `
+<RCTScrollView
+  data={
+    Map {
+      "id_0" => Object {
+        "key": "item_0",
+      },
+    }
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        value="item_0"
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`VirtualizedList warns if both renderItem or ListItemComponent are specified. Uses ListItemComponent 1`] = `
+<RCTScrollView
+  ListItemComponent={[Function]}
+  data={
+    Array [
+      Object {
+        "key": "i1",
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        testID="i1-ListItemComponent"
+        value="i1"
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`adjusts render area with non-zero initialScrollIndex after scrolled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={1}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={10}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={10}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={11}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={12}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={13}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={14}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={15}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={16}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={17}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={18}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={19}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`constrains batch render region when an item is removed 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`discards intitial render if initialScrollIndex != 0 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={5}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      style={
+        Object {
+          "height": 90,
+        }
+      }
+    />
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={10}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={11}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={12}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={13}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={14}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={15}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={16}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={17}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={18}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={19}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`does not adjust render area until content area layed out 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={10}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 150,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`does not adjust render area with non-zero initialScrollIndex until scrolled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={1}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={10}
+>
+  <View>
+    <View
+      style={
+        Object {
+          "height": 10,
+        }
+      }
+    />
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 140,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`does not over-render when there is less than initialNumToRender cells 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={20}
+  initialScrollIndex={4}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`eventually renders all items when virtualization disabled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  disableVirtualization={true}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={1}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`expands first in viewport to render up to maxToRenderPerBatch on initial render 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={2}
+  initialScrollIndex={4}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  maxToRenderPerBatch={2}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 130,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders a zero-height tail spacer on initial render if getItemLayout not defined 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  initialNumToRender={3}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 0,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders full tail spacer if all cells measured 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  initialNumToRender={3}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 50,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  disableVirtualization={true}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders items before initialScrollIndex on first batch tick when virtualization disabled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  disableVirtualization={true}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  initialScrollIndex={5}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders no spacers up to initialScrollIndex on first render when virtualization disabled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  disableVirtualization={true}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={2}
+  initialScrollIndex={4}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders offset cells in initial render when initialScrollIndex set 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={4}
+  initialScrollIndex={4}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 20,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders tail spacer up to last measured index if getItemLayout not defined 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  initialNumToRender={3}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 20,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders tail spacer up to last measured with irregular layout when getItemLayout undefined 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  initialNumToRender={3}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 18,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders windowSize derived region at bottom 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={3}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders windowSize derived region at top 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={3}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 60,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders windowSize derived region in middle 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={3}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 10,
+        }
+      }
+    />
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 10,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
 `;
 
-exports[`VirtualizedList renders simple list 1`] = `
+exports[`renders zero-height tail spacer on batch render if cells not yet measured and getItemLayout not defined 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  initialNumToRender={3}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 0,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`retains batch render region when an item is appended 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 10,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`retains initial render region when an item is appended 1`] = `
 <RCTScrollView
   data={
     Array [
       Object {
-        "key": "i1",
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
       },
       Object {
-        "key": "i2",
+        "key": 8,
       },
       Object {
-        "key": "i3",
+        "key": 9,
+      },
+      Object {
+        "key": 10,
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
+  getItemLayout={[Function]}
+  initialNumToRender={3}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -790,166 +4292,328 @@ exports[`VirtualizedList renders simple list 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        value="i1"
+      <MockCellItem
+        value={0}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        value="i2"
+      <MockCellItem
+        value={1}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        value="i3"
+      <MockCellItem
+        value={2}
       />
     </View>
+    <View
+      style={
+        Object {
+          "height": 80,
+        }
+      }
+    />
   </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList renders simple list using ListItemComponent 1`] = `
+exports[`retains intitial render if initialScrollIndex == 0 1`] = `
 <RCTScrollView
-  ListItemComponent={[Function]}
   data={
     Array [
       Object {
-        "key": "i1",
+        "key": 0,
       },
       Object {
-        "key": "i2",
+        "key": 1,
       },
       Object {
-        "key": "i3",
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={0}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
   onScrollEndDrag={[Function]}
   onScrollKeyDown={null}
+  renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
+  windowSize={1}
 >
   <View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        value="i1"
+      <MockCellItem
+        value={0}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        value="i2"
+      <MockCellItem
+        value={1}
       />
     </View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        value="i3"
+      <MockCellItem
+        value={2}
       />
     </View>
-  </View>
-</RCTScrollView>
-`;
-
-exports[`VirtualizedList test getItem functionality where data is not an Array 1`] = `
-<RCTScrollView
-  data={
-    Map {
-      "id_0" => Object {
-        "key": "item_0",
-      },
-    }
-  }
-  disableVirtualization={false}
-  getItem={[Function]}
-  getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
-  onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
-  onLayout={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onScroll={[Function]}
-  onScrollBeginDrag={[Function]}
-  onScrollEndDrag={[Function]}
-  onScrollKeyDown={null}
-  renderItem={[Function]}
-  scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
->
-  <View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        value="item_0"
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={10}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={11}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={12}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={13}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={14}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={15}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={16}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={17}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={18}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={19}
       />
     </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`VirtualizedList warns if both renderItem or ListItemComponent are specified. Uses ListItemComponent 1`] = `
+exports[`unmounts sticky headers moved below viewport 1`] = `
 <RCTScrollView
-  ListItemComponent={[Function]}
   data={
     Array [
       Object {
-        "key": "i1",
+        "key": 0,
+        "sticky": true,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+        "sticky": true,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+        "sticky": true,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+        "sticky": true,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+        "sticky": true,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+        "sticky": true,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+        "sticky": true,
+      },
+      Object {
+        "key": 19,
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -957,20 +4621,59 @@ exports[`VirtualizedList warns if both renderItem or ListItemComponent are speci
   onScrollKeyDown={null}
   renderItem={[Function]}
   scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
+  stickyHeaderIndices={
+    Array [
+      0,
+      3,
+    ]
+  }
+  windowSize={1}
 >
   <View>
     <View
-      onLayout={[Function]}
       style={null}
     >
-      <item
-        testID="i1-ListItemComponent"
-        value="i1"
+      <MockCellItem
+        sticky={true}
+        value={0}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={2}
       />
     </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={3}
+      />
+    </View>
+    <View
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 150,
+        }
+      }
+    />
   </View>
 </RCTScrollView>
 `;
diff --git a/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
index 4b258d07169dec..68614f20c2db7a 100644
--- a/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
@@ -17,16 +17,12 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -37,8 +33,6 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -65,28 +59,22 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
             },
           ]
         }
-        disableVirtualization={false}
         getItem={[Function]}
         getItemCount={[Function]}
         horizontal={false}
-        initialNumToRender={10}
         keyExtractor={[Function]}
-        maxToRenderPerBatch={10}
         onContentSizeChange={[Function]}
-        onEndReachedThreshold={2}
         onLayout={[Function]}
+        onMomentumScrollBegin={[Function]}
         onMomentumScrollEnd={[Function]}
         onScroll={[Function]}
         onScrollBeginDrag={[Function]}
         onScrollEndDrag={[Function]}
-        onScrollKeyDown={null}
         renderItem={[Function]}
         rowIndex={-1}
         scrollEventThrottle={50}
         sectionIndex={0}
         stickyHeaderIndices={Array []}
-        updateCellsBatchingPeriod={50}
-        windowSize={21}
       >
         <View
           onLayout={[Function]}
@@ -134,16 +122,13 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
             },
           ]
         }
-        disableVirtualization={false}
         getItem={[Function]}
         getItemCount={[Function]}
         horizontal={true}
-        initialNumToRender={10}
         keyExtractor={[Function]}
-        maxToRenderPerBatch={10}
         onContentSizeChange={[Function]}
-        onEndReachedThreshold={2}
         onLayout={[Function]}
+        onMomentumScrollBegin={[Function]}
         onMomentumScrollEnd={[Function]}
         onScroll={[Function]}
         onScrollBeginDrag={[Function]}
@@ -154,8 +139,6 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
         scrollEventThrottle={50}
         sectionIndex={0}
         stickyHeaderIndices={Array []}
-        updateCellsBatchingPeriod={50}
-        windowSize={21}
       >
         <View>
           <View
@@ -241,16 +224,12 @@ exports[`VirtualizedSectionList handles separators correctly 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -261,8 +240,6 @@ exports[`VirtualizedSectionList handles separators correctly 1`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -383,16 +360,12 @@ exports[`VirtualizedSectionList handles separators correctly 2`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -403,8 +376,6 @@ exports[`VirtualizedSectionList handles separators correctly 2`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -525,16 +496,12 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -545,8 +512,6 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -648,6 +613,143 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
 </RCTScrollView>
 `;
 
+exports[`VirtualizedSectionList handles separators correctly 4`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "data": Array [
+          Object {
+            "key": "i0",
+          },
+          Object {
+            "key": "i1",
+          },
+          Object {
+            "key": "i2",
+          },
+        ],
+        "title": "s0",
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  keyExtractor={[Function]}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  onScrollKeyDown={null}
+  renderItem={[Function]}
+  rowIndex={-1}
+  scrollEventThrottle={50}
+  sectionIndex={0}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    />
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <View>
+        <item
+          title="i0"
+        />
+        <separator
+          highlighted={false}
+          leadingItem={
+            Object {
+              "key": "i0",
+            }
+          }
+          section={
+            Object {
+              "data": Array [
+                Object {
+                  "key": "i0",
+                },
+                Object {
+                  "key": "i1",
+                },
+                Object {
+                  "key": "i2",
+                },
+              ],
+              "title": "s0",
+            }
+          }
+          trailingItem={
+            Object {
+              "key": "i1",
+            }
+          }
+        />
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <View>
+        <item
+          title="i1"
+        />
+        <separator
+          highlighted={false}
+          leadingItem={
+            Object {
+              "key": "i1",
+            }
+          }
+          press={true}
+          section={
+            Object {
+              "data": Array [
+                Object {
+                  "key": "i0",
+                },
+                Object {
+                  "key": "i1",
+                },
+                Object {
+                  "key": "i2",
+                },
+              ],
+              "title": "s0",
+            }
+          }
+          trailingItem={
+            Object {
+              "key": "i2",
+            }
+          }
+        />
+      </View>
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    >
+      <item
+        title="i2"
+      />
+    </View>
+    <View
+      onLayout={[Function]}
+      style={null}
+    />
+  </View>
+</RCTScrollView>
+`;
+
 exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
 <RCTScrollView
   ListEmptyComponent={[Function]}
@@ -677,19 +779,15 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
   getItemLayout={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   invertStickyHeaders={true}
   inverted={true}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onRefresh={[MockFunction]}
   onScroll={[Function]}
@@ -720,8 +818,6 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       undefined,
     ]
   }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <RCTRefreshControl />
   <View>
@@ -904,16 +1000,12 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
 exports[`VirtualizedSectionList renders empty list 1`] = `
 <RCTScrollView
   data={Array []}
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -924,8 +1016,6 @@ exports[`VirtualizedSectionList renders empty list 1`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -937,16 +1027,12 @@ exports[`VirtualizedSectionList renders empty list with empty component 1`] = `
   ListFooterComponent={[Function]}
   ListHeaderComponent={[Function]}
   data={Array []}
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -957,8 +1043,6 @@ exports[`VirtualizedSectionList renders empty list with empty component 1`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -991,16 +1075,12 @@ exports[`VirtualizedSectionList renders list with empty component 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -1011,8 +1091,6 @@ exports[`VirtualizedSectionList renders list with empty component 1`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1035,35 +1113,6 @@ exports[`VirtualizedSectionList renders list with empty component 1`] = `
 </RCTScrollView>
 `;
 
-exports[`VirtualizedSectionList renders null list 1`] = `
-<RCTScrollView
-  disableVirtualization={false}
-  getItem={[Function]}
-  getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
-  onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
-  onLayout={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onScroll={[Function]}
-  onScrollBeginDrag={[Function]}
-  onScrollEndDrag={[Function]}
-  onScrollKeyDown={null}
-  renderItem={[Function]}
-  rowIndex={-1}
-  scrollEventThrottle={50}
-  sectionIndex={0}
-  stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
->
-  <View />
-</RCTScrollView>
-`;
-
 exports[`VirtualizedSectionList renders simple list 1`] = `
 <RCTScrollView
   data={
@@ -1084,16 +1133,12 @@ exports[`VirtualizedSectionList renders simple list 1`] = `
       },
     ]
   }
-  disableVirtualization={false}
   getItem={[Function]}
   getItemCount={[Function]}
-  horizontal={false}
-  initialNumToRender={10}
   keyExtractor={[Function]}
-  maxToRenderPerBatch={10}
   onContentSizeChange={[Function]}
-  onEndReachedThreshold={2}
   onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
   onMomentumScrollEnd={[Function]}
   onScroll={[Function]}
   onScrollBeginDrag={[Function]}
@@ -1104,8 +1149,6 @@ exports[`VirtualizedSectionList renders simple list 1`] = `
   scrollEventThrottle={50}
   sectionIndex={0}
   stickyHeaderIndices={Array []}
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
diff --git a/Libraries/LogBox/Data/LogBoxData.js b/Libraries/LogBox/Data/LogBoxData.js
index b9890449b4c0c7..04681c2814273c 100644
--- a/Libraries/LogBox/Data/LogBoxData.js
+++ b/Libraries/LogBox/Data/LogBoxData.js
@@ -21,7 +21,7 @@ import type {
   ExtendedExceptionData,
 } from './parseLogBoxLog';
 import parseErrorStack from '../../Core/Devtools/parseErrorStack';
-import type {ExtendedError} from '../../Core/Devtools/parseErrorStack';
+import type {ExtendedError} from '../../Core/ExtendedError';
 import NativeLogBox from '../../NativeModules/specs/NativeLogBox';
 export type LogBoxLogs = Set<LogBoxLog>;
 export type LogData = $ReadOnly<{|
@@ -407,6 +407,8 @@ export function withSubscription(
     }
 
     componentDidCatch(err: Error, errorInfo: {componentStack: string, ...}) {
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for
+       * this parameters */
       reportLogBoxError(err, errorInfo.componentStack);
     }
 
diff --git a/Libraries/LogBox/Data/LogBoxLog.js b/Libraries/LogBox/Data/LogBoxLog.js
index 2d019518306d76..1617ba282adf9b 100644
--- a/Libraries/LogBox/Data/LogBoxLog.js
+++ b/Libraries/LogBox/Data/LogBoxLog.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as LogBoxSymbolication from './LogBoxSymbolication';
 
 import type {
diff --git a/Libraries/LogBox/Data/LogBoxSymbolication.js b/Libraries/LogBox/Data/LogBoxSymbolication.js
index 2ed86cc042088e..36f6d8146bb914 100644
--- a/Libraries/LogBox/Data/LogBoxSymbolication.js
+++ b/Libraries/LogBox/Data/LogBoxSymbolication.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import symbolicateStackTrace from '../../Core/Devtools/symbolicateStackTrace';
 
 import type {StackFrame} from '../../Core/NativeExceptionsManager';
diff --git a/Libraries/LogBox/Data/__tests__/LogBoxData-test.js b/Libraries/LogBox/Data/__tests__/LogBoxData-test.js
index 2c0df65b9aa622..3cc4ac2a9877b1 100644
--- a/Libraries/LogBox/Data/__tests__/LogBoxData-test.js
+++ b/Libraries/LogBox/Data/__tests__/LogBoxData-test.js
@@ -648,6 +648,8 @@ describe('LogBoxData', () => {
 
   it('reportLogBoxError creates a native redbox with a componentStack', () => {
     LogBoxData.reportLogBoxError(
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for
+       * this parameters */
       new Error('Simulated Error'),
       '    in Component (file.js:1)',
     );
@@ -661,6 +663,8 @@ describe('LogBoxData', () => {
   });
 
   it('reportLogBoxError creates a native redbox without a componentStack', () => {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+     * parameters */
     LogBoxData.reportLogBoxError(new Error('Simulated Error'));
 
     const receivedError = ExceptionsManager.handleException.mock.calls[0][0];
@@ -672,6 +676,8 @@ describe('LogBoxData', () => {
   });
 
   it('reportLogBoxError creates an error message that is also ignored', () => {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+     * parameters */
     LogBoxData.reportLogBoxError(new Error('Simulated Error'));
 
     const receivedErrorMessage =
diff --git a/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js b/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js
index ad1bf18210035c..5fa23c7fbede7f 100644
--- a/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js
+++ b/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js
@@ -956,8 +956,12 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
             fileName: '/path/to/filename.js',
             location: {column: 1, row: 1},
           },
-          // TODO: we're missing the second component,
-          // because stackframe-parser does not recognize it.
+          {
+            collapse: false,
+            content: 'forEach',
+            fileName: '[native code]',
+            location: {column: -1, row: -1},
+          },
           {
             collapse: false,
             content: 'MyAppComponent',
@@ -993,8 +997,12 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
             fileName: '/path/to/filename.js',
             location: {column: 1, row: 1},
           },
-          // TODO: we're missing the second component,
-          // because stackframe-parser does not recognize it.
+          {
+            collapse: false,
+            content: 'forEach',
+            fileName: '[native code]',
+            location: {column: -1, row: -1},
+          },
           {
             collapse: false,
             content: 'MyAppComponent',
@@ -1023,8 +1031,12 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
             fileName: '/path/to/filename.js',
             location: {column: 1, row: 1},
           },
-          // TODO: we're missing the second component,
-          // because stackframe-parser does not recognize it.
+          {
+            collapse: false,
+            content: 'forEach',
+            fileName: '[native code]',
+            location: {column: -1, row: -1},
+          },
           {
             collapse: false,
             content: 'MyAppComponent',
@@ -1054,8 +1066,12 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
             fileName: '/path/to/filename.js',
             location: {column: 1, row: 1},
           },
-          // TODO: we're missing the second component,
-          // because stackframe-parser does not recognize it.
+          {
+            collapse: false,
+            content: 'forEach',
+            fileName: '[native code]',
+            location: {column: -1, row: -1},
+          },
           {
             collapse: false,
             content: 'MyAppComponent',
@@ -1087,8 +1103,12 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
             fileName: '/path/to/filename.js',
             location: {column: 1, row: 1},
           },
-          // TODO: we're missing the second component,
-          // because stackframe-parser does not recognize it.
+          {
+            collapse: false,
+            content: 'forEach',
+            fileName: '[native code]',
+            location: {column: -1, row: -1},
+          },
           {
             collapse: false,
             content: 'MyAppComponent',
@@ -1151,8 +1171,12 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
             fileName: '/path/to/filename.js',
             location: {column: 1, row: 1},
           },
-          // TODO: we're missing the second component,
-          // because stackframe-parser does not recognize it.
+          {
+            collapse: false,
+            content: 'forEach',
+            fileName: '[native code]',
+            location: {column: -1, row: -1},
+          },
           {
             collapse: false,
             content: 'MyAppComponent',
@@ -1212,8 +1236,12 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
             fileName: '/path/to/filename.js',
             location: {column: 1, row: 1},
           },
-          // TODO: we're missing the second component,
-          // because stackframe-parser does not recognize it.
+          {
+            collapse: false,
+            content: 'forEach',
+            fileName: '[native code]',
+            location: {column: -1, row: -1},
+          },
           {
             collapse: false,
             content: 'MyAppComponent',
diff --git a/Libraries/LogBox/Data/parseLogBoxLog.js b/Libraries/LogBox/Data/parseLogBoxLog.js
index e9021e9b4192de..df75479bb5dd90 100644
--- a/Libraries/LogBox/Data/parseLogBoxLog.js
+++ b/Libraries/LogBox/Data/parseLogBoxLog.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import UTFSequence from '../../UTFSequence';
 import stringifySafe from '../../Utilities/stringifySafe';
 import type {ExceptionData} from '../../Core/NativeExceptionsManager';
diff --git a/Libraries/LogBox/LogBox.js b/Libraries/LogBox/LogBox.js
index e2754504c1257a..23492d721656f8 100644
--- a/Libraries/LogBox/LogBox.js
+++ b/Libraries/LogBox/LogBox.js
@@ -8,15 +8,27 @@
  * @format
  */
 
-'use strict';
-
 import Platform from '../Utilities/Platform';
 import RCTLog from '../Utilities/RCTLog';
 
-import type {IgnorePattern} from './Data/LogBoxData';
+import type {IgnorePattern, LogData} from './Data/LogBoxData';
+import type {ExtendedExceptionData} from './Data/parseLogBoxLog';
+
+export type {LogData, ExtendedExceptionData, IgnorePattern};
 
 let LogBox;
 
+interface ILogBox {
+  install(): void;
+  uninstall(): void;
+  isInstalled(): boolean;
+  ignoreLogs($ReadOnlyArray<IgnorePattern>): void;
+  ignoreAllLogs(?boolean): void;
+  clearAllLogs(): void;
+  addLog(log: LogData): void;
+  addException(error: ExtendedExceptionData): void;
+}
+
 /**
  * LogBox displays logs in the app.
  */
@@ -24,45 +36,44 @@ if (__DEV__) {
   const LogBoxData = require('./Data/LogBoxData');
   const {parseLogBoxLog, parseInterpolation} = require('./Data/parseLogBoxLog');
 
-  // LogBox needs to insert itself early,
-  // in order to access the component stacks appended by React DevTools.
-  const {error, warn} = console;
-  let errorImpl = error.bind(console);
-  let warnImpl = warn.bind(console);
+  let originalConsoleError;
+  let originalConsoleWarn;
+  let consoleErrorImpl;
+  let consoleWarnImpl;
 
-  (console: any).error = function(...args) {
-    errorImpl(...args);
-  };
-  (console: any).warn = function(...args) {
-    warnImpl(...args);
-  };
+  let isLogBoxInstalled: boolean = false;
 
   LogBox = {
-    ignoreLogs: (patterns: $ReadOnlyArray<IgnorePattern>): void => {
-      LogBoxData.addIgnorePatterns(patterns);
-    },
-
-    ignoreAllLogs: (value?: ?boolean): void => {
-      LogBoxData.setDisabled(value == null ? true : value);
-    },
+    install(): void {
+      if (isLogBoxInstalled) {
+        return;
+      }
 
-    uninstall: (): void => {
-      errorImpl = error;
-      warnImpl = warn;
-      delete (console: any).disableLogBox;
-    },
+      isLogBoxInstalled = true;
 
-    install: (): void => {
       // Trigger lazy initialization of module.
       require('../NativeModules/specs/NativeLogBox');
 
-      errorImpl = function(...args) {
-        registerError(...args);
-      };
+      // IMPORTANT: we only overwrite `console.error` and `console.warn` once.
+      // When we uninstall we keep the same reference and only change its
+      // internal implementation
+      const isFirstInstall = originalConsoleError == null;
+      if (isFirstInstall) {
+        originalConsoleError = console.error.bind(console);
+        originalConsoleWarn = console.warn.bind(console);
+
+        // $FlowExpectedError[cannot-write]
+        console.error = (...args) => {
+          consoleErrorImpl(...args);
+        };
+        // $FlowExpectedError[cannot-write]
+        console.warn = (...args) => {
+          consoleWarnImpl(...args);
+        };
+      }
 
-      warnImpl = function(...args) {
-        registerWarning(...args);
-      };
+      consoleErrorImpl = registerError;
+      consoleWarnImpl = registerWarning;
 
       if ((console: any).disableYellowBox === true) {
         LogBoxData.setDisabled(true);
@@ -90,6 +101,50 @@ if (__DEV__) {
         registerWarning(...args);
       });
     },
+
+    uninstall(): void {
+      if (!isLogBoxInstalled) {
+        return;
+      }
+
+      isLogBoxInstalled = false;
+
+      // IMPORTANT: we don't re-assign to `console` in case the method has been
+      // decorated again after installing LogBox. E.g.:
+      // Before uninstalling: original > LogBox > OtherErrorHandler
+      // After uninstalling:  original > LogBox (noop) > OtherErrorHandler
+      consoleErrorImpl = originalConsoleError;
+      consoleWarnImpl = originalConsoleWarn;
+      delete (console: any).disableLogBox;
+    },
+
+    isInstalled(): boolean {
+      return isLogBoxInstalled;
+    },
+
+    ignoreLogs(patterns: $ReadOnlyArray<IgnorePattern>): void {
+      LogBoxData.addIgnorePatterns(patterns);
+    },
+
+    ignoreAllLogs(value?: ?boolean): void {
+      LogBoxData.setDisabled(value == null ? true : value);
+    },
+
+    clearAllLogs(): void {
+      LogBoxData.clear();
+    },
+
+    addLog(log: LogData): void {
+      if (isLogBoxInstalled) {
+        LogBoxData.addLog(log);
+      }
+    },
+
+    addException(error: ExtendedExceptionData): void {
+      if (isLogBoxInstalled) {
+        LogBoxData.addException(error);
+      }
+    },
   };
 
   const isRCTLogAdviceWarning = (...args) => {
@@ -105,7 +160,7 @@ if (__DEV__) {
   const registerWarning = (...args): void => {
     // Let warnings within LogBox itself fall through.
     if (LogBoxData.isLogBoxErrorMessage(String(args[0]))) {
-      error.call(console, ...args);
+      originalConsoleError(...args);
       return;
     }
 
@@ -115,7 +170,7 @@ if (__DEV__) {
 
         if (!LogBoxData.isMessageIgnored(message.content)) {
           // Be sure to pass LogBox warnings through.
-          warn.call(console, ...args);
+          originalConsoleWarn(...args);
 
           LogBoxData.addLog({
             level: 'warn',
@@ -133,7 +188,7 @@ if (__DEV__) {
   const registerError = (...args): void => {
     // Let errors within LogBox itself fall through.
     if (LogBoxData.isLogBoxErrorMessage(args[0])) {
-      error.call(console, ...args);
+      originalConsoleError(...args);
       return;
     }
 
@@ -146,7 +201,7 @@ if (__DEV__) {
         //
         // The 'warning' module needs to be handled here because React internally calls
         // `console.error('Warning: ')` with the component stack already included.
-        error.call(console, ...args);
+        originalConsoleError(...args);
         return;
       }
 
@@ -171,7 +226,7 @@ if (__DEV__) {
         // Interpolate the message so they are formatted for adb and other CLIs.
         // This is different than the message.content above because it includes component stacks.
         const interpolated = parseInterpolation(args);
-        error.call(console, interpolated.message.content);
+        originalConsoleError(interpolated.message.content);
 
         LogBoxData.addLog({
           level,
@@ -186,28 +241,38 @@ if (__DEV__) {
   };
 } else {
   LogBox = {
-    ignoreLogs: (patterns: $ReadOnlyArray<IgnorePattern>): void => {
+    install(): void {
+      // Do nothing.
+    },
+
+    uninstall(): void {
+      // Do nothing.
+    },
+
+    isInstalled(): boolean {
+      return false;
+    },
+
+    ignoreLogs(patterns: $ReadOnlyArray<IgnorePattern>): void {
+      // Do nothing.
+    },
+
+    ignoreAllLogs(value?: ?boolean): void {
       // Do nothing.
     },
 
-    ignoreAllLogs: (value?: ?boolean): void => {
+    clearAllLogs(): void {
       // Do nothing.
     },
 
-    install: (): void => {
+    addLog(log: LogData): void {
       // Do nothing.
     },
 
-    uninstall: (): void => {
+    addException(error: ExtendedExceptionData): void {
       // Do nothing.
     },
   };
 }
 
-module.exports = (LogBox: {
-  ignoreLogs($ReadOnlyArray<IgnorePattern>): void,
-  ignoreAllLogs(?boolean): void,
-  install(): void,
-  uninstall(): void,
-  ...
-});
+module.exports = (LogBox: ILogBox);
diff --git a/Libraries/LogBox/LogBoxInspectorContainer.js b/Libraries/LogBox/LogBoxInspectorContainer.js
index 35f19628810e89..bb7fb4916cf626 100644
--- a/Libraries/LogBox/LogBoxInspectorContainer.js
+++ b/Libraries/LogBox/LogBoxInspectorContainer.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import {View, StyleSheet} from 'react-native';
 import * as LogBoxData from './Data/LogBoxData';
diff --git a/Libraries/LogBox/LogBoxNotificationContainer.js b/Libraries/LogBox/LogBoxNotificationContainer.js
index bc5237560a485a..51f78fb7256297 100644
--- a/Libraries/LogBox/LogBoxNotificationContainer.js
+++ b/Libraries/LogBox/LogBoxNotificationContainer.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import View from '../Components/View/View';
diff --git a/Libraries/LogBox/UI/LogBoxButton.js b/Libraries/LogBox/UI/LogBoxButton.js
index 9fd149638fe4fd..12f5845afc6732 100644
--- a/Libraries/LogBox/UI/LogBoxButton.js
+++ b/Libraries/LogBox/UI/LogBoxButton.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import TouchableWithoutFeedback from '../../Components/Touchable/TouchableWithoutFeedback';
diff --git a/Libraries/LogBox/UI/LogBoxInspector.js b/Libraries/LogBox/UI/LogBoxInspector.js
index 68c591f11e37de..d67a25ee3f61c3 100644
--- a/Libraries/LogBox/UI/LogBoxInspector.js
+++ b/Libraries/LogBox/UI/LogBoxInspector.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import LogBoxInspectorCodeFrame from './LogBoxInspectorCodeFrame';
 import * as React from 'react';
 import ScrollView from '../../Components/ScrollView/ScrollView';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js b/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js
index 2c4e1036a17761..f9af7848e3cfde 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import Platform from '../../Utilities/Platform';
 import ScrollView from '../../Components/ScrollView/ScrollView';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorFooter.js b/Libraries/LogBox/UI/LogBoxInspectorFooter.js
index f0013f5fa8934d..fbb16682300344 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorFooter.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorFooter.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {LogLevel} from '../Data/LogBoxLog';
 
 import * as React from 'react';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorHeader.js b/Libraries/LogBox/UI/LogBoxInspectorHeader.js
index be3db862b60555..8ad4aa2d6f51a6 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorHeader.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorHeader.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Image from '../../Image/Image';
 import Platform from '../../Utilities/Platform';
 import * as React from 'react';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js b/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js
index 991417e230f4cc..5fde1f3d841d87 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js b/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
index 45f9574c554c72..dd47dda5ea0160 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Platform from '../../Utilities/Platform';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorSection.js b/Libraries/LogBox/UI/LogBoxInspectorSection.js
index 896bccc7c7304b..28c2b1e1d49864 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorSection.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorSection.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js b/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js
index 4327ac8e0681c2..fd9ec23926b50b 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Animated from '../../Animated/Animated';
 import Easing from '../../Animated/Easing';
 import * as React from 'react';
@@ -38,6 +36,7 @@ function LogBoxInspectorSourceMapStatus(props: Props): React.Node {
         const animation = Animated.loop(
           Animated.timing(animated, {
             duration: 2000,
+            // $FlowFixMe[method-unbinding]
             easing: Easing.linear,
             toValue: 1,
             useNativeDriver: true,
@@ -47,9 +46,9 @@ function LogBoxInspectorSourceMapStatus(props: Props): React.Node {
           animation,
           rotate: animated.interpolate({
             inputRange: [0, 1],
-            /* $FlowFixMe(>=0.38.0) - Flow error detected during the deployment
-             * of v0.38.0. To see the error, remove this comment and run flow
-             */
+            /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error
+             * detected during the deployment of v0.38.0. To see the error,
+             * remove this comment and run flow */
             outputRange: ['0deg', '360deg'],
           }),
         });
diff --git a/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js b/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js
index c87feb0800614c..dc6208930b6743 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
diff --git a/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js b/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js
index e1fe8b2159b45f..9827a1c58b1948 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
@@ -65,7 +63,10 @@ export function getCollapseMessage(
 }
 
 function LogBoxInspectorStackFrames(props: Props): React.Node {
-  const [collapsed, setCollapsed] = React.useState(true);
+  const [collapsed, setCollapsed] = React.useState(() => {
+    // Only collapse frames initially if some frames are not collapsed.
+    return props.log.getAvailableStack().some(({collapse}) => !collapse);
+  });
 
   function getStackList() {
     if (collapsed === true) {
diff --git a/Libraries/LogBox/UI/LogBoxMessage.js b/Libraries/LogBox/UI/LogBoxMessage.js
index dd300c12a02d14..155fa468a30653 100644
--- a/Libraries/LogBox/UI/LogBoxMessage.js
+++ b/Libraries/LogBox/UI/LogBoxMessage.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import Text from '../../Text/Text';
 
diff --git a/Libraries/LogBox/UI/LogBoxNotification.js b/Libraries/LogBox/UI/LogBoxNotification.js
index 26264ecb5e1cb7..81a0e2e130df87 100644
--- a/Libraries/LogBox/UI/LogBoxNotification.js
+++ b/Libraries/LogBox/UI/LogBoxNotification.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import Image from '../../Image/Image';
 import StyleSheet from '../../StyleSheet/StyleSheet';
@@ -59,8 +57,9 @@ function LogBoxLogNotification(props: Props): React.Node {
 function CountBadge(props) {
   return (
     <View style={countStyles.outside}>
-      {/* $FlowFixMe(>=0.114.0) This suppression was added when fixing the type
-       * of `StyleSheet.create`. Remove this comment to see the error. */}
+      {/* $FlowFixMe[incompatible-type] (>=0.114.0) This suppression was added
+       * when fixing the type of `StyleSheet.create`. Remove this comment to
+       * see the error. */}
       <View style={[countStyles.inside, countStyles[props.level]]}>
         <Text style={countStyles.text}>
           {props.count <= 1 ? '!' : props.count}
diff --git a/Libraries/LogBox/UI/LogBoxStyle.js b/Libraries/LogBox/UI/LogBoxStyle.js
index c01f8cb7f3131c..ae0bc97c743d37 100644
--- a/Libraries/LogBox/UI/LogBoxStyle.js
+++ b/Libraries/LogBox/UI/LogBoxStyle.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 export function getBackgroundColor(opacity?: number): string {
   return `rgba(51, 51, 51, ${opacity == null ? 1 : opacity})`;
 }
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js b/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js
index f2d537b8aeac93..5ffe42c0a50adc 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js
@@ -9,8 +9,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const React = require('react');
 const LogBoxButton = require('../LogBoxButton').default;
 const render = require('../../../../jest/renderer');
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js
index 4ad2b5d9d012fc..6d41ee7e2c8328 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js
@@ -9,8 +9,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const React = require('react');
 import Text from '../../../Text/Text';
 const LogBoxInspectorSection = require('../LogBoxInspectorSection').default;
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js
index 96e4f3e88e2225..8540f4543dcef8 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js
@@ -9,8 +9,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const React = require('react');
 import LogBoxInspectorStackFrames, {
   getCollapseMessage,
diff --git a/Libraries/LogBox/__tests__/LogBox-integration-test.js b/Libraries/LogBox/__tests__/LogBox-integration-test.js
index 8a02754df3df83..22355633c8ea42 100644
--- a/Libraries/LogBox/__tests__/LogBox-integration-test.js
+++ b/Libraries/LogBox/__tests__/LogBox-integration-test.js
@@ -8,8 +8,6 @@
  * @emails oncall+react_native
  */
 
-'use strict';
-
 const LogBoxData = require('../Data/LogBoxData');
 const TestRenderer = require('react-test-renderer');
 
diff --git a/Libraries/LogBox/__tests__/LogBox-test.js b/Libraries/LogBox/__tests__/LogBox-test.js
index 56857f8ba29903..4c8144c7334c72 100644
--- a/Libraries/LogBox/__tests__/LogBox-test.js
+++ b/Libraries/LogBox/__tests__/LogBox-test.js
@@ -31,11 +31,13 @@ function mockFilterResult(returnValues) {
 
 describe('LogBox', () => {
   const {error, warn} = console;
+  let consoleError;
+  let consoleWarn;
 
   beforeEach(() => {
     jest.resetModules();
-    console.error = jest.fn();
-    console.warn = jest.fn();
+    console.error = consoleError = jest.fn();
+    console.warn = consoleWarn = jest.fn();
     console.disableYellowBox = false;
   });
 
@@ -276,4 +278,107 @@ describe('LogBox', () => {
       },
     });
   });
+
+  it('ignores console methods after uninstalling', () => {
+    jest.mock('../Data/LogBoxData');
+
+    LogBox.install();
+    LogBox.uninstall();
+
+    console.log('Test');
+    console.warn('Test');
+    console.error('Test');
+
+    expect(LogBoxData.addLog).not.toHaveBeenCalled();
+  });
+
+  it('does not add logs after uninstalling', () => {
+    jest.mock('../Data/LogBoxData');
+
+    LogBox.install();
+    LogBox.uninstall();
+
+    LogBox.addLog({
+      level: 'warn',
+      category: 'test',
+      message: {content: 'Some warning', substitutions: []},
+      componentStack: [],
+    });
+
+    expect(LogBoxData.addLog).not.toHaveBeenCalled();
+  });
+
+  it('does not add exceptions after uninstalling', () => {
+    jest.mock('../Data/LogBoxData');
+
+    LogBox.install();
+    LogBox.uninstall();
+
+    LogBox.addException({
+      message: 'Some error',
+      originalMessage: null,
+      name: 'Error',
+      componentStack: null,
+      stack: [],
+      id: 12,
+      isFatal: true,
+      isComponentError: false,
+    });
+
+    expect(LogBoxData.addException).not.toHaveBeenCalled();
+  });
+
+  it('preserves decorations of console.error after installing/uninstalling', () => {
+    LogBox.install();
+
+    const originalConsoleError = console.error;
+    console.error = message => {
+      originalConsoleError('Custom: ' + message);
+    };
+
+    console.error('before uninstalling');
+
+    expect(consoleError).toHaveBeenCalledWith('Custom: before uninstalling');
+
+    LogBox.uninstall();
+
+    console.error('after uninstalling');
+
+    expect(consoleError).toHaveBeenCalledWith('Custom: after uninstalling');
+
+    LogBox.install();
+
+    console.error('after installing for the second time');
+
+    expect(consoleError).toHaveBeenCalledWith(
+      'Custom: after installing for the second time',
+    );
+  });
+
+  it('preserves decorations of console.warn after installing/uninstalling', () => {
+    LogBox.install();
+
+    const originalConsoleWarn = console.warn;
+    console.warn = message => {
+      originalConsoleWarn('Custom: ' + message);
+    };
+
+    console.warn('before uninstalling');
+
+    expect(consoleWarn).toHaveBeenCalledWith('Custom: before uninstalling');
+
+    LogBox.uninstall();
+
+    console.warn('after uninstalling');
+
+    expect(consoleWarn).toHaveBeenCalledWith('Custom: after uninstalling');
+
+    LogBox.install();
+
+    console.warn('after installing for the second time');
+
+    expect(consoleWarn).toHaveBeenCalledWith(
+      'Custom: after installing for the second time',
+    );
+  });
 });
diff --git a/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js b/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js
index f8962098c649c5..2b6c1573e70415 100644
--- a/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js
+++ b/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js
@@ -8,8 +8,6 @@
  * @emails oncall+react_native
  */
 
-'use strict';
-
 import {Text} from 'react-native';
 import * as React from 'react';
 
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index ffb5fbec89f984..47ec21d1a4b68f 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -8,10 +8,9 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const AppContainer = require('../ReactNative/AppContainer');
 const I18nManager = require('../ReactNative/I18nManager');
+import ModalInjection from './ModalInjection';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import NativeModalManager from './NativeModalManager';
 const Platform = require('../Utilities/Platform');
@@ -30,9 +29,17 @@ import type {DirectEventHandler} from '../Types/CodegenTypes';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import RCTModalHostView from './RCTModalHostViewNativeComponent';
 
+type ModalEventDefinitions = {
+  modalDismissed: [{modalID: number}],
+};
+
 const ModalEventEmitter =
   Platform.OS === 'ios' && NativeModalManager != null
-    ? new NativeEventEmitter(NativeModalManager)
+    ? new NativeEventEmitter<ModalEventDefinitions>(
+        // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+        // If you want to use the native module on other platforms, please remove this condition and test its behavior
+        Platform.OS !== 'ios' ? null : NativeModalManager,
+      )
     : null;
 
 /**
@@ -153,6 +160,20 @@ export type Props = $ReadOnly<{|
   onOrientationChange?: ?DirectEventHandler<OrientationChangeEvent>,
 |}>;
 
+function confirmProps(props: Props) {
+  if (__DEV__) {
+    if (
+      props.presentationStyle &&
+      props.presentationStyle !== 'overFullScreen' &&
+      props.transparent === true
+    ) {
+      console.warn(
+        `Modal with '${props.presentationStyle}' presentation style and 'transparent' value is not supported.`,
+      );
+    }
+  }
+}
+
 class Modal extends React.Component<Props> {
   static defaultProps: {|hardwareAccelerated: boolean, visible: boolean|} = {
     visible: true,
@@ -166,11 +187,14 @@ class Modal extends React.Component<Props> {
 
   constructor(props: Props) {
     super(props);
-    Modal._confirmProps(props);
+    if (__DEV__) {
+      confirmProps(props);
+    }
     this._identifier = uniqueModalIdentifier++;
   }
 
   componentDidMount() {
+    // 'modalDismissed' is for the old renderer in iOS only
     if (ModalEventEmitter) {
       this._eventSubscription = ModalEventEmitter.addListener(
         'modalDismissed',
@@ -189,19 +213,9 @@ class Modal extends React.Component<Props> {
     }
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps: Props) {
-    Modal._confirmProps(nextProps);
-  }
-
-  static _confirmProps(props: Props) {
-    if (
-      props.presentationStyle &&
-      props.presentationStyle !== 'overFullScreen' &&
-      props.transparent === true
-    ) {
-      console.warn(
-        `Modal with '${props.presentationStyle}' presentation style and 'transparent' value is not supported.`,
-      );
+  componentDidUpdate() {
+    if (__DEV__) {
+      confirmProps(this.props);
     }
   }
 
@@ -239,9 +253,16 @@ class Modal extends React.Component<Props> {
         hardwareAccelerated={this.props.hardwareAccelerated}
         onRequestClose={this.props.onRequestClose}
         onShow={this.props.onShow}
+        onDismiss={() => {
+          if (this.props.onDismiss) {
+            this.props.onDismiss();
+          }
+        }}
+        visible={this.props.visible}
         statusBarTranslucent={this.props.statusBarTranslucent}
         identifier={this._identifier}
         style={styles.modal}
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         onStartShouldSetResponder={this._shouldSetResponder}
         supportedOrientations={this.props.supportedOrientations}
         onOrientationChange={this.props.onOrientationChange}>
@@ -270,13 +291,17 @@ const styles = StyleSheet.create({
     position: 'absolute',
   },
   container: {
-    /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.111 was deployed. To see the error, delete this
-     * comment and run Flow. */
+    /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb) This
+     * comment suppresses an error found when Flow v0.111 was deployed. To see
+     * the error, delete this comment and run Flow. */
     [side]: 0,
     top: 0,
     flex: 1,
   },
 });
 
-module.exports = Modal;
+const ExportedModal: React.AbstractComponent<
+  React.ElementConfig<typeof Modal>,
+> = ModalInjection.unstable_Modal ?? Modal;
+
+module.exports = ExportedModal;
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/settings.gradle b/Libraries/Modal/ModalInjection.js
similarity index 58%
rename from packages/react-native-codegen/android/gradlePlugin-build/settings.gradle
rename to Libraries/Modal/ModalInjection.js
index b9fdc14c3e531a..5f4db446822c91 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/settings.gradle
+++ b/Libraries/Modal/ModalInjection.js
@@ -1,10 +1,15 @@
-/*
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
  */
 
-rootProject.name = 'react-native-codegen-gradlePlugin-build'
+import typeof Modal from './Modal';
 
-include(":gradlePlugin")
+export default {
+  unstable_Modal: (null: ?Modal),
+};
diff --git a/Libraries/Modal/NativeModalManager.js b/Libraries/Modal/NativeModalManager.js
index 05fc5b2c73cc8d..a64b677eb739ea 100644
--- a/Libraries/Modal/NativeModalManager.js
+++ b/Libraries/Modal/NativeModalManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Modal/RCTModalHostViewNativeComponent.js b/Libraries/Modal/RCTModalHostViewNativeComponent.js
index ebc154146c7f54..b663d045ce2693 100644
--- a/Libraries/Modal/RCTModalHostViewNativeComponent.js
+++ b/Libraries/Modal/RCTModalHostViewNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import codegenNativeComponent from '../Utilities/codegenNativeComponent';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type {
@@ -91,9 +89,16 @@ type NativeProps = $ReadOnly<{|
    * The `onDismiss` prop allows passing a function that will be called once
    * the modal has been dismissed.
    *
-   * See https://facebook.github.io/react-native/docs/modal.html#ondismiss
+   * See https://reactnative.dev/docs/modal.html#ondismiss
+   */
+  onDismiss?: ?DirectEventHandler<null>,
+
+  /**
+   * The `visible` prop determines whether your modal is visible.
+   *
+   * See https://reactnative.dev/docs/modal.html#visible
    */
-  onDismiss?: ?BubblingEventHandler<null>,
+  visible?: WithDefault<boolean, false>,
 
   /**
    * Deprecated. Use the `animationType` prop instead.
diff --git a/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap b/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap
index d6272a92fb5fbe..b8afa443934ab0 100644
--- a/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap
+++ b/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap
@@ -14,6 +14,7 @@ exports[`<Modal /> should render as <RCTModalHostView> when not mocked 1`] = `
   animationType="none"
   hardwareAccelerated={false}
   identifier={1}
+  onDismiss={[Function]}
   onStartShouldSetResponder={[Function]}
   presentationStyle="fullScreen"
   style={
@@ -21,6 +22,7 @@ exports[`<Modal /> should render as <RCTModalHostView> when not mocked 1`] = `
       "position": "absolute",
     }
   }
+  visible={true}
 >
   <View
     collapsable={false}
diff --git a/Libraries/NativeAnimation/RCTAnimationPlugins.mm b/Libraries/NativeAnimation/RCTAnimationPlugins.mm
index 6b9768b5257e10..b0eecfc9b8826a 100644
--- a/Libraries/NativeAnimation/RCTAnimationPlugins.mm
+++ b/Libraries/NativeAnimation/RCTAnimationPlugins.mm
@@ -17,13 +17,14 @@
 #import <unordered_map>
 
 Class RCTAnimationClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"NativeAnimatedModule", RCTNativeAnimatedModuleCls},
     {"NativeAnimatedTurboModule", RCTNativeAnimatedTurboModuleCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
index f0df049793d067..cb6936a86eb3b9 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
@@ -48,7 +48,7 @@ - (void)invalidate
 {
   [super invalidate];
   [_nodesManager stopAnimationLoop];
-  [self.bridge.eventDispatcher removeDispatchObserver:self];
+  [[self.moduleRegistry moduleForName:"EventDispatcher"] removeDispatchObserver:self];
   [self.bridge.uiManager.observerCoordinator removeObserver:self];
   [self.bridge.surfacePresenter removeObserver:self];
 }
@@ -65,11 +65,16 @@ - (void)setBridge:(RCTBridge *)bridge
 {
   [super setBridge:bridge];
   _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:bridge.surfacePresenter];
-  [bridge.eventDispatcher addDispatchObserver:self];
   [bridge.uiManager.observerCoordinator addObserver:self];
   [bridge.surfacePresenter addObserver:self];
 }
 
+- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
+{
+  [super setModuleRegistry:moduleRegistry];
+  [[moduleRegistry moduleForName:"EventDispatcher"] addDispatchObserver:self];
+}
+
 /*
  * This selector should only be invoked in bridgeless mode, which is not compatible with this non turbo module.
  */
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
index d64811594d645c..46e61af32b3c12 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
@@ -16,7 +16,7 @@
 
 @interface RCTNativeAnimatedNodesManager : NSObject
 
-- (nonnull instancetype)initWithBridge:(nonnull RCTBridge *)bridge
+- (nonnull instancetype)initWithBridge:(RCTBridge *)bridge
                       surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 
 - (void)updateAnimations;
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
index 91a1fe5d91e15f..508a674a33ad3b 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
@@ -55,7 +55,7 @@ @implementation RCTNativeAnimatedNodesManager
   RCTPlatformDisplayLink *_displayLink; // TODO(macOS GH#774)
 }
 
-- (instancetype)initWithBridge:(nonnull RCTBridge *)bridge surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
+- (instancetype)initWithBridge:(RCTBridge *)bridge surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 {
   if ((self = [super init])) {
     _bridge = bridge;
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
index 2da04a1277eb1f..8f500132273613 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
@@ -12,12 +12,13 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
 #import <React/RCTUIManagerUtils.h>
+#import <React/RCTInitializing.h>
 
 #import "RCTValueAnimatedNode.h"
 
 // TODO T69437152 @petetheheat - Delete this fork when Fabric ships to 100%.
 // NOTE: This module is temporarily forked (see RCTNativeAnimatedModule).
 // When making any changes, be sure to apply them to the fork as well.
-@interface RCTNativeAnimatedTurboModule: RCTEventEmitter <RCTBridgeModule, RCTValueAnimatedNodeObserver, RCTEventDispatcherObserver, RCTUIManagerObserver, RCTSurfacePresenterObserver>
+@interface RCTNativeAnimatedTurboModule: RCTEventEmitter <RCTBridgeModule, RCTValueAnimatedNodeObserver, RCTEventDispatcherObserver, RCTUIManagerObserver, RCTSurfacePresenterObserver, RCTInitializing>
 
 @end
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
index 1ad8e3220e2f67..5675b40baa44bc 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
@@ -26,6 +26,9 @@ @implementation RCTNativeAnimatedTurboModule
   // Operations called before views have been updated.
   NSMutableArray<AnimatedOperation> *_preOperations;
   NSMutableDictionary<NSNumber *, NSNumber *> *_animIdIsManagedByFabric;
+  // A set of nodeIDs managed by Fabric.
+  NSMutableSet<NSNumber *> *_nodeIDsManagedByFabric;
+
 }
 
 RCT_EXPORT_MODULE();
@@ -41,15 +44,31 @@ - (instancetype)init
     _operations = [NSMutableArray new];
     _preOperations = [NSMutableArray new];
     _animIdIsManagedByFabric = [NSMutableDictionary new];
+    _nodeIDsManagedByFabric = [NSMutableSet new];
   }
   return self;
 }
 
+- (void)initialize
+{
+  if (self.bridge) {
+    _surfacePresenter = self.bridge.surfacePresenter;
+    _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:_surfacePresenter];
+    [self.bridge.uiManager.observerCoordinator addObserver:self];
+  } else {
+    // _surfacePresenter set in setSurfacePresenter:
+    _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:nil surfacePresenter:_surfacePresenter];
+  }
+
+  [_surfacePresenter addObserver:self];
+  [[self.moduleRegistry moduleForName:"EventDispatcher"] addDispatchObserver:self];
+}
+
 - (void)invalidate
 {
   [super invalidate];
   [_nodesManager stopAnimationLoop];
-  [self.bridge.eventDispatcher removeDispatchObserver:self];
+  [[self.moduleRegistry moduleForName:"EventDispatcher"] removeDispatchObserver:self];
   [self.bridge.uiManager.observerCoordinator removeObserver:self];
   [_surfacePresenter removeObserver:self];
 }
@@ -62,16 +81,6 @@ - (dispatch_queue_t)methodQueue
   return RCTGetUIManagerQueue();
 }
 
-- (void)setBridge:(RCTBridge *)bridge
-{
-  [super setBridge:bridge];
-  _surfacePresenter = bridge.surfacePresenter;
-  _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:_surfacePresenter];
-  [bridge.eventDispatcher addDispatchObserver:self];
-  [bridge.uiManager.observerCoordinator addObserver:self];
-  [_surfacePresenter addObserver:self];
-}
-
 /*
  * In bridgeless mode, `setBridge` is never called during initializtion. Instead this selector is invoked via
  * BridgelessTurboModuleSetup.
@@ -79,8 +88,6 @@ - (void)setBridge:(RCTBridge *)bridge
 - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 {
   _surfacePresenter = surfacePresenter;
-  _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:_surfacePresenter];
-  [_surfacePresenter addObserver:self];
 }
 
 #pragma mark -- API
@@ -106,6 +113,9 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 RCT_EXPORT_METHOD(connectAnimatedNodes:(double)parentTag
                   childTag:(double)childTag)
 {
+  if ([_nodeIDsManagedByFabric containsObject:@(childTag)]) {
+    [_nodeIDsManagedByFabric addObject:@(parentTag)];
+  }
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager connectAnimatedNodes:[NSNumber numberWithDouble:parentTag] childTag:[NSNumber numberWithDouble:childTag]];
   }];
@@ -128,16 +138,11 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
     [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId] nodeTag:[NSNumber numberWithDouble:nodeTag] config:config endCallback:callBack];
   }];
 
- RCTExecuteOnMainQueue(^{
-   if (![self->_nodesManager isNodeManagedByFabric:[NSNumber numberWithDouble:nodeTag]]) {
-     return;
-   }
-
-   RCTExecuteOnUIManagerQueue(^{
-     self->_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] = @YES;
-     [self flushOperationQueues];
-   });
- });
+  BOOL isNodeManagedByFabric = [_nodeIDsManagedByFabric containsObject:@(nodeTag)];
+  if (isNodeManagedByFabric) {
+    self->_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] = @YES;
+    [self flushOperationQueues];
+  }
 }
 
 RCT_EXPORT_METHOD(stopAnimation:(double)animationId)
@@ -183,6 +188,9 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 RCT_EXPORT_METHOD(connectAnimatedNodeToView:(double)nodeTag
                   viewTag:(double)viewTag)
 {
+  if (RCTUIManagerTypeForTagIsFabric(@(viewTag))) {
+    [_nodeIDsManagedByFabric addObject:@(nodeTag)];
+  }
   NSString *viewName = [self.bridge.uiManager viewNameForReactTag:[NSNumber numberWithDouble:viewTag]];
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag] viewName:viewName];
diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec
index 65453a45ae9a8e..6120ab4fa75048 100644
--- a/Libraries/NativeAnimation/React-RCTAnimation.podspec
+++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTAnimation"
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "{Drivers/*,Nodes/*,*}.{m,mm}"
@@ -39,9 +39,9 @@ Pod::Spec.new do |s|
                              }
 
   s.dependency "RCT-Folly", folly_version
+  s.dependency "FBReactNativeSpec", version
   s.dependency "RCTTypeSafety", version
   s.dependency "ReactCommon/turbomodule/core", version
   s.dependency "React-jsi", version
-  s.dependency "FBReactNativeSpec", version
   s.dependency "React-Core/RCTAnimationHeaders", version
 end
diff --git a/Libraries/NativeComponent/NativeComponentRegistry.js b/Libraries/NativeComponent/NativeComponentRegistry.js
new file mode 100644
index 00000000000000..0dce50704b55d5
--- /dev/null
+++ b/Libraries/NativeComponent/NativeComponentRegistry.js
@@ -0,0 +1,157 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import {createViewConfig} from './ViewConfig';
+import UIManager from '../ReactNative/UIManager';
+import type {
+  HostComponent,
+  PartialViewConfig,
+} from '../Renderer/shims/ReactNativeTypes';
+import ReactNativeViewConfigRegistry from '../Renderer/shims/ReactNativeViewConfigRegistry';
+import getNativeComponentAttributes from '../ReactNative/getNativeComponentAttributes';
+import verifyComponentAttributeEquivalence from '../Utilities/verifyComponentAttributeEquivalence';
+import invariant from 'invariant';
+import * as React from 'react';
+
+let getRuntimeConfig;
+
+let componentNameToExists: Map<string, boolean> = new Map();
+
+/**
+ * Configures a function that is called to determine whether a given component
+ * should be registered using reflection of the native component at runtime.
+ *
+ * The provider should return null if the native component is unavailable in
+ * the current environment.
+ */
+export function setRuntimeConfigProvider(
+  runtimeConfigProvider: (
+    name: string,
+  ) => ?{
+    native: boolean,
+    verify: boolean,
+  },
+): void {
+  invariant(
+    getRuntimeConfig == null,
+    'NativeComponentRegistry.setRuntimeConfigProvider() called more than once.',
+  );
+  getRuntimeConfig = runtimeConfigProvider;
+}
+
+/**
+ * Gets a `NativeComponent` that can be rendered by React Native.
+ *
+ * The supplied `viewConfigProvider` may or may not be invoked and utilized,
+ * depending on how `setRuntimeConfigProvider` is configured.
+ */
+export function get<Config>(
+  name: string,
+  viewConfigProvider: () => PartialViewConfig,
+): HostComponent<Config> {
+  ReactNativeViewConfigRegistry.register(name, () => {
+    const {native, verify} = getRuntimeConfig?.(name) ?? {
+      native: true,
+      verify: false,
+    };
+
+    const viewConfig = native
+      ? getNativeComponentAttributes(name)
+      : createViewConfig(viewConfigProvider());
+
+    if (verify) {
+      if (native) {
+        verifyComponentAttributeEquivalence(
+          viewConfig,
+          createViewConfig(viewConfigProvider()),
+        );
+      } else {
+        verifyComponentAttributeEquivalence(
+          getNativeComponentAttributes(name),
+          viewConfig,
+        );
+      }
+    }
+
+    return viewConfig;
+  });
+
+  // $FlowFixMe[incompatible-return] `NativeComponent` is actually string!
+  return name;
+}
+
+/**
+ * Same as `NativeComponentRegistry.get(...)`, except this will check either
+ * the `setRuntimeConfigProvider` configuration or use native reflection (slow)
+ * to determine whether this native component is available.
+ *
+ * If the native component is not available, a stub component is returned. Note
+ * that the return value of this is not `HostComponent` because the returned
+ * component instance is not guaranteed to have native methods.
+ */
+export function getWithFallback_DEPRECATED<Config>(
+  name: string,
+  viewConfigProvider: () => PartialViewConfig,
+): React.AbstractComponent<Config> {
+  if (getRuntimeConfig == null) {
+    // If `setRuntimeConfigProvider` is not configured, use native reflection.
+    if (hasNativeViewConfig(name)) {
+      return get<Config>(name, viewConfigProvider);
+    }
+  } else {
+    // If there is no runtime config, then the native component is unavailable.
+    if (getRuntimeConfig(name) != null) {
+      return get<Config>(name, viewConfigProvider);
+    }
+  }
+
+  const FallbackNativeComponent = function(props: Config): React.Node {
+    return null;
+  };
+  FallbackNativeComponent.displayName = `Fallback(${name})`;
+  return FallbackNativeComponent;
+}
+
+function hasNativeViewConfig(name: string): boolean {
+  invariant(getRuntimeConfig == null, 'Unexpected invocation!');
+  return UIManager.getViewManagerConfig(name) != null;
+}
+
+/**
+ * Unstable API. Do not use!
+ *
+ * This method returns if there is a StaticViewConfig registered for the
+ * component name received as a parameter.
+ */
+export function unstable_hasStaticViewConfig(name: string): boolean {
+  const {native} = getRuntimeConfig?.(name) ?? {
+    native: true,
+  };
+  return !native;
+}
+
+/**
+ * Unstable API. Do not use!
+ *
+ * This method returns if the component with name received as a parameter
+ * is registed in the native platform.
+ */
+export function unstable_hasComponent(name: string): boolean {
+  let hasNativeComponent = componentNameToExists.get(name);
+  if (hasNativeComponent == null) {
+    if (global.__nativeComponentRegistry__hasComponent) {
+      hasNativeComponent = global.__nativeComponentRegistry__hasComponent(name);
+      componentNameToExists.set(name, hasNativeComponent);
+    } else {
+      throw `unstable_hasComponent('${name}'): Global function is not registered`;
+    }
+  }
+  return hasNativeComponent;
+}
diff --git a/Libraries/NativeComponent/ViewConfig.js b/Libraries/NativeComponent/ViewConfig.js
new file mode 100644
index 00000000000000..d04535a4096736
--- /dev/null
+++ b/Libraries/NativeComponent/ViewConfig.js
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import ReactNativeViewViewConfig from '../Components/View/ReactNativeViewViewConfig';
+import type {
+  PartialViewConfig,
+  ViewConfig,
+} from '../Renderer/shims/ReactNativeTypes';
+
+/**
+ * Creates a complete `ViewConfig` from a `PartialViewConfig`.
+ */
+export function createViewConfig(
+  partialViewConfig: PartialViewConfig,
+): ViewConfig {
+  return {
+    uiViewClassName: partialViewConfig.uiViewClassName,
+    Commands: {},
+    bubblingEventTypes: composeIndexers(
+      ReactNativeViewViewConfig.bubblingEventTypes,
+      partialViewConfig.bubblingEventTypes,
+    ),
+    directEventTypes: composeIndexers(
+      ReactNativeViewViewConfig.directEventTypes,
+      partialViewConfig.directEventTypes,
+    ),
+    validAttributes: composeIndexers(
+      // $FlowFixMe[incompatible-call] `style` property confuses Flow.
+      ReactNativeViewViewConfig.validAttributes,
+      // $FlowFixMe[incompatible-call] `style` property confuses Flow.
+      partialViewConfig.validAttributes,
+    ),
+  };
+}
+
+function composeIndexers<T>(
+  maybeA: ?{+[string]: T},
+  maybeB: ?{+[string]: T},
+): {+[string]: T} {
+  return maybeA == null || maybeB == null
+    ? maybeA ?? maybeB ?? {}
+    : {...maybeA, ...maybeB};
+}
diff --git a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js
index 55c24c1f9d1dd3..5f826cd8bdd48b 100644
--- a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js
+++ b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/NativeModules/specs/NativeDevMenu.js b/Libraries/NativeModules/specs/NativeDevMenu.js
index 20b858a1c7d4c4..f2e32cd595b6e0 100644
--- a/Libraries/NativeModules/specs/NativeDevMenu.js
+++ b/Libraries/NativeModules/specs/NativeDevMenu.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/NativeModules/specs/NativeDevSettings.js b/Libraries/NativeModules/specs/NativeDevSettings.js
index 5cfc21a320b21b..7d4d7a1a908336 100644
--- a/Libraries/NativeModules/specs/NativeDevSettings.js
+++ b/Libraries/NativeModules/specs/NativeDevSettings.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/NativeModules/specs/NativeDeviceEventManager.js b/Libraries/NativeModules/specs/NativeDeviceEventManager.js
index 775767e7275e3b..ca0a0863bcc1b9 100644
--- a/Libraries/NativeModules/specs/NativeDeviceEventManager.js
+++ b/Libraries/NativeModules/specs/NativeDeviceEventManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
index fcc476b3419c33..f24c2cf8238379 100644
--- a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
+++ b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/NativeModules/specs/NativeLogBox.js b/Libraries/NativeModules/specs/NativeLogBox.js
index 782d1b078d40a7..bdf4f09ce4c559 100644
--- a/Libraries/NativeModules/specs/NativeLogBox.js
+++ b/Libraries/NativeModules/specs/NativeLogBox.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/NativeModules/specs/NativeRedBox.js b/Libraries/NativeModules/specs/NativeRedBox.js
index 469465e343650a..6df25078c36579 100644
--- a/Libraries/NativeModules/specs/NativeRedBox.js
+++ b/Libraries/NativeModules/specs/NativeRedBox.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/NativeModules/specs/NativeSourceCode.js b/Libraries/NativeModules/specs/NativeSourceCode.js
index b1fb30fc292247..5b4f8342de636d 100644
--- a/Libraries/NativeModules/specs/NativeSourceCode.js
+++ b/Libraries/NativeModules/specs/NativeSourceCode.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Network/NativeNetworkingAndroid.js b/Libraries/Network/NativeNetworkingAndroid.js
index 3d65967736def6..293d74afe89188 100644
--- a/Libraries/Network/NativeNetworkingAndroid.js
+++ b/Libraries/Network/NativeNetworkingAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Network/NativeNetworkingIOS.js b/Libraries/Network/NativeNetworkingIOS.js
index 59b3da849a9b49..45d00320349930 100644
--- a/Libraries/Network/NativeNetworkingIOS.js
+++ b/Libraries/Network/NativeNetworkingIOS.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Network/RCTDataRequestHandler.mm b/Libraries/Network/RCTDataRequestHandler.mm
index 469f3d3f8cad89..1021566a8fb480 100644
--- a/Libraries/Network/RCTDataRequestHandler.mm
+++ b/Libraries/Network/RCTDataRequestHandler.mm
@@ -76,6 +76,12 @@ - (void)cancelRequest:(NSOperation *)op
   [op cancel];
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 Class RCTDataRequestHandlerCls(void) {
diff --git a/Libraries/Network/RCTFileRequestHandler.mm b/Libraries/Network/RCTFileRequestHandler.mm
index c8d5a3cb4ed0b4..c555aac2d3e837 100644
--- a/Libraries/Network/RCTFileRequestHandler.mm
+++ b/Libraries/Network/RCTFileRequestHandler.mm
@@ -97,6 +97,12 @@ - (void)cancelRequest:(NSOperation *)op
   [op cancel];
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 Class RCTFileRequestHandlerCls(void) {
diff --git a/Libraries/Network/RCTHTTPRequestHandler.h b/Libraries/Network/RCTHTTPRequestHandler.h
index 75b84eb1224354..5a91bd0a71fa3a 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.h
+++ b/Libraries/Network/RCTHTTPRequestHandler.h
@@ -8,6 +8,11 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTURLRequestHandler.h>
 
+typedef NSURLSessionConfiguration* (^NSURLSessionConfigurationProvider)(void);
+/**
+ *  The block provided via this function will provide the NSURLSessionConfiguration for all HTTP requests made by the app.
+*/
+RCT_EXTERN void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider);
 /**
  * This is the default RCTURLRequestHandler implementation for HTTP requests.
  */
diff --git a/Libraries/Network/RCTHTTPRequestHandler.mm b/Libraries/Network/RCTHTTPRequestHandler.mm
index 274f3810f25980..d160a9e72f9e4f 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.mm
+++ b/Libraries/Network/RCTHTTPRequestHandler.mm
@@ -18,6 +18,12 @@ @interface RCTHTTPRequestHandler () <NSURLSessionDataDelegate, RCTTurboModule>
 
 @end
 
+static NSURLSessionConfigurationProvider urlSessionConfigurationProvider;
+
+void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider provider) {
+  urlSessionConfigurationProvider = provider;
+}
+
 @implementation RCTHTTPRequestHandler
 {
   NSMapTable *_delegates;
@@ -25,7 +31,7 @@ @implementation RCTHTTPRequestHandler
   std::mutex _mutex;
 }
 
-@synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 @synthesize methodQueue = _methodQueue;
 
 RCT_EXPORT_MODULE()
@@ -74,15 +80,21 @@ - (NSURLSessionDataTask *)sendRequest:(NSURLRequest *)request
 
     NSOperationQueue *callbackQueue = [NSOperationQueue new];
     callbackQueue.maxConcurrentOperationCount = 1;
-    callbackQueue.underlyingQueue = [[_bridge networking] methodQueue];
-    NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
-    // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
-    if (useWifiOnly) {
-      configuration.allowsCellularAccess = ![useWifiOnly boolValue];
+    callbackQueue.underlyingQueue = [[_moduleRegistry moduleForName:"Networking"] methodQueue];
+    NSURLSessionConfiguration *configuration;
+    if (urlSessionConfigurationProvider) {
+      configuration = urlSessionConfigurationProvider();
+    } else {
+      configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+      // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
+      if (useWifiOnly) {
+        configuration.allowsCellularAccess = ![useWifiOnly boolValue];
+      }
+      [configuration setHTTPShouldSetCookies:YES];
+      [configuration setHTTPCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
+      [configuration setHTTPCookieStorage:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
     }
-    [configuration setHTTPShouldSetCookies:YES];
-    [configuration setHTTPCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
-    [configuration setHTTPCookieStorage:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
+    assert(configuration != nil);
     _session = [NSURLSession sessionWithConfiguration:configuration
                                              delegate:self
                                         delegateQueue:callbackQueue];
@@ -174,6 +186,12 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
   [delegate URLRequest:task didCompleteWithError:error];
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 Class RCTHTTPRequestHandlerCls(void) {
diff --git a/Libraries/Network/RCTNetworkPlugins.mm b/Libraries/Network/RCTNetworkPlugins.mm
index 6a00252c5679b8..f1a016e1d209c8 100644
--- a/Libraries/Network/RCTNetworkPlugins.mm
+++ b/Libraries/Network/RCTNetworkPlugins.mm
@@ -17,15 +17,16 @@
 #import <unordered_map>
 
 Class RCTNetworkClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"Networking", RCTNetworkingCls},
     {"DataRequestHandler", RCTDataRequestHandlerCls},
     {"FileRequestHandler", RCTFileRequestHandlerCls},
     {"HTTPRequestHandler", RCTHTTPRequestHandlerCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/Network/RCTNetworking.android.js b/Libraries/Network/RCTNetworking.android.js
index 12864c9c9af7da..abca231af64341 100644
--- a/Libraries/Network/RCTNetworking.android.js
+++ b/Libraries/Network/RCTNetworking.android.js
@@ -8,14 +8,13 @@
  * @flow
  */
 
-'use strict';
-
 // Do not require the native RCTNetworking module directly! Use this wrapper module instead.
 // It will add the necessary requestId, so that you don't have to generate it yourself.
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import NativeNetworkingAndroid from './NativeNetworkingAndroid';
 import convertRequestBody from './convertRequestBody';
 import type {RequestBody} from './convertRequestBody';
+import Platform from '../Utilities/Platform';
 
 type Header = [string, string];
 
@@ -38,9 +37,14 @@ function generateRequestId(): number {
  * This class is a wrapper around the native RCTNetworking module. It adds a necessary unique
  * requestId to each network request that can be used to abort that request later on.
  */
-class RCTNetworking extends NativeEventEmitter {
+// FIXME: use typed events
+class RCTNetworking extends NativeEventEmitter<$FlowFixMe> {
   constructor() {
-    super(NativeNetworkingAndroid);
+    super(
+      // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+      // If you want to use the native module on other platforms, please remove this condition and test its behavior
+      Platform.OS !== 'ios' ? null : NativeNetworkingAndroid,
+    );
   }
 
   sendRequest(
diff --git a/Libraries/Network/RCTNetworking.h b/Libraries/Network/RCTNetworking.h
index 18344302ea8034..2068f32b803038 100644
--- a/Libraries/Network/RCTNetworking.h
+++ b/Libraries/Network/RCTNetworking.h
@@ -31,7 +31,7 @@
  * Allows RCTNetworking instances to be initialized with handlers.
  * The handlers will be requested via the bridge's moduleForName method when required.
  */
-- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(void))getHandlers;
+- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(RCTModuleRegistry *))getHandlers;
 
 /**
  * Does a handler exist for the specified request?
diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js
index bc1081aab357d6..67db8dd88dacbd 100644
--- a/Libraries/Network/RCTNetworking.ios.js
+++ b/Libraries/Network/RCTNetworking.ios.js
@@ -4,29 +4,72 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict-local
+ * @format
  */
 
 'use strict';
 
-import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import NativeNetworkingIOS from './NativeNetworkingIOS';
-import type {NativeResponseType} from './XMLHttpRequest';
-import convertRequestBody from './convertRequestBody';
-import type {RequestBody} from './convertRequestBody';
+import {type NativeResponseType} from './XMLHttpRequest';
+import convertRequestBody, {type RequestBody} from './convertRequestBody';
+import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 
-class RCTNetworking extends NativeEventEmitter {
-  constructor() {
-    const disableCallsIntoModule =
-      typeof global.__disableRCTNetworkingExtraneousModuleCalls === 'function'
-        ? global.__disableRCTNetworkingExtraneousModuleCalls()
-        : false;
+type RCTNetworkingEventDefinitions = $ReadOnly<{
+  didSendNetworkData: [
+    [
+      number, // requestId
+      number, // progress
+      number, // total
+    ],
+  ],
+  didReceiveNetworkResponse: [
+    [
+      number, // requestId
+      number, // status
+      ?{[string]: string}, // responseHeaders
+      ?string, // responseURL
+    ],
+  ],
+  didReceiveNetworkData: [
+    [
+      number, // requestId
+      string, // response
+    ],
+  ],
+  didReceiveNetworkIncrementalData: [
+    [
+      number, // requestId
+      string, // responseText
+      number, // progress
+      number, // total
+    ],
+  ],
+  didReceiveNetworkDataProgress: [
+    [
+      number, // requestId
+      number, // loaded
+      number, // total
+    ],
+  ],
+  didCompleteNetworkResponse: [
+    [
+      number, // requestId
+      string, // error
+      boolean, // timeOutError
+    ],
+  ],
+}>;
 
-    super(NativeNetworkingIOS, {
-      __SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: disableCallsIntoModule,
-    });
-  }
+const RCTNetworking = {
+  addListener<K: $Keys<RCTNetworkingEventDefinitions>>(
+    eventType: K,
+    listener: (...$ElementType<RCTNetworkingEventDefinitions, K>) => mixed,
+    context?: mixed,
+  ): EventSubscription {
+    return RCTDeviceEventEmitter.addListener(eventType, listener, context);
+  },
 
   sendRequest(
     method: string,
@@ -54,15 +97,15 @@ class RCTNetworking extends NativeEventEmitter {
       },
       callback,
     );
-  }
+  },
 
   abortRequest(requestId: number) {
     NativeNetworkingIOS.abortRequest(requestId);
-  }
+  },
 
   clearCookies(callback: (result: boolean) => void) {
     NativeNetworkingIOS.clearCookies(callback);
-  }
-}
+  },
+};
 
-module.exports = (new RCTNetworking(): RCTNetworking);
+module.exports = RCTNetworking;
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index edbbe814e6e57f..22ca45b0fa3ff4 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -148,7 +148,7 @@ @implementation RCTNetworking
   NSMutableDictionary<NSNumber *, RCTNetworkTask *> *_tasksByRequestID;
   std::mutex _handlersLock;
   NSArray<id<RCTURLRequestHandler>> *_handlers;
-  NSArray<id<RCTURLRequestHandler>> * (^_handlersProvider)(void);
+  NSArray<id<RCTURLRequestHandler>> * (^_handlersProvider)(RCTModuleRegistry *);
   NSMutableArray<id<RCTNetworkingRequestHandler>> *_requestHandlers;
   NSMutableArray<id<RCTNetworkingResponseHandler>> *_responseHandlers;
 }
@@ -157,7 +157,17 @@ @implementation RCTNetworking
 
 RCT_EXPORT_MODULE()
 
-- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(void))getHandlers
++ (BOOL)requiresMainQueueSetup
+{
+  return YES;
+}
+
+- (instancetype)init
+{
+  return [super initWithDisabledObservation];
+}
+
+- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(RCTModuleRegistry *moduleRegistry))getHandlers
 {
   if (self = [super initWithDisabledObservation]) {
     _handlersProvider = getHandlers;
@@ -199,7 +209,7 @@ - (void)invalidate
 
     if (!_handlers) {
       if (_handlersProvider) {
-        _handlers = _handlersProvider();
+        _handlers = _handlersProvider(self.moduleRegistry);
       } else {
         _handlers = [self.bridge modulesConformingToProtocol:@protocol(RCTURLRequestHandler)];
       }
diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec
index c7b5acfc76d3bb..3282e4f5e8672f 100644
--- a/Libraries/Network/React-RCTNetwork.podspec
+++ b/Libraries/Network/React-RCTNetwork.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTNetwork"
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/Network/XMLHttpRequest.js b/Libraries/Network/XMLHttpRequest.js
index be38c07ca21902..c12888f087a146 100644
--- a/Libraries/Network/XMLHttpRequest.js
+++ b/Libraries/Network/XMLHttpRequest.js
@@ -10,6 +10,8 @@
 
 'use strict';
 
+import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 
 const BlobManager = require('../Blob/BlobManager');
@@ -32,7 +34,7 @@ export type ResponseType =
   | 'text';
 export type Response = ?Object | string;
 
-type XHRInterceptor = {
+type XHRInterceptor = interface {
   requestSent(id: number, url: string, method: string, headers: Object): void,
   responseReceived(
     id: number,
@@ -43,7 +45,6 @@ type XHRInterceptor = {
   dataReceived(id: number, data: string): void,
   loadingFinished(id: number, encodedDataLength: number): void,
   loadingFailed(id: number, error: string): void,
-  ...
 };
 
 // The native blob module is optional so inject it here if available.
@@ -126,7 +127,7 @@ class XMLHttpRequest extends (EventTarget(...XHR_EVENTS): any) {
   upload: XMLHttpRequestEventTarget = new XMLHttpRequestEventTarget();
 
   _requestId: ?number;
-  _subscriptions: Array<*>;
+  _subscriptions: Array<EventSubscription>;
 
   _aborted: boolean = false;
   _cachedResponse: Response;
@@ -552,6 +553,7 @@ class XMLHttpRequest extends (EventTarget(...XHR_EVENTS): any) {
         nativeResponseType,
         incrementalEvents,
         this.timeout,
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         this.__didCreateRequest.bind(this),
         this.withCredentials,
       );
diff --git a/Libraries/Network/__tests__/XMLHttpRequest-test.js b/Libraries/Network/__tests__/XMLHttpRequest-test.js
index f9d709fdb1e1ef..aa45cca99c783c 100644
--- a/Libraries/Network/__tests__/XMLHttpRequest-test.js
+++ b/Libraries/Network/__tests__/XMLHttpRequest-test.js
@@ -8,8 +8,6 @@
  * @emails oncall+react_native
  */
 
-'use strict';
-
 import createPerformanceLogger from '../../Utilities/createPerformanceLogger';
 
 jest.unmock('../../Utilities/Platform');
diff --git a/Libraries/Network/convertRequestBody.js b/Libraries/Network/convertRequestBody.js
index 0db3ed709778b8..68940a1db24191 100644
--- a/Libraries/Network/convertRequestBody.js
+++ b/Libraries/Network/convertRequestBody.js
@@ -34,7 +34,8 @@ function convertRequestBody(body: RequestBody): Object {
     return {formData: body.getParts()};
   }
   if (body instanceof ArrayBuffer || ArrayBuffer.isView(body)) {
-    // $FlowFixMe: no way to assert that 'body' is indeed an ArrayBufferView
+    /* $FlowFixMe[incompatible-call] : no way to assert that 'body' is indeed
+     * an ArrayBufferView */
     return {base64: binaryToBase64(body)};
   }
   return body;
diff --git a/Libraries/NewAppScreen/components/Colors.js b/Libraries/NewAppScreen/components/Colors.js
index 471751de7580e4..4179617bf641ad 100644
--- a/Libraries/NewAppScreen/components/Colors.js
+++ b/Libraries/NewAppScreen/components/Colors.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 export default {
   primary: '#1292B4',
   white: '#FFF',
diff --git a/Libraries/NewAppScreen/components/Header.js b/Libraries/NewAppScreen/components/Header.js
index 541a51ebf64431..f8c186b5d5b54b 100644
--- a/Libraries/NewAppScreen/components/Header.js
+++ b/Libraries/NewAppScreen/components/Header.js
@@ -8,7 +8,6 @@
  * @format
  */
 
-'use strict';
 import type {Node} from 'react';
 import {ImageBackground, StyleSheet, Text, useColorScheme} from 'react-native';
 import React from 'react';
@@ -20,6 +19,7 @@ const Header = (): Node => {
   return (
     <ImageBackground
       accessibilityRole="image"
+      testID="new-app-screen-header"
       source={require('./logo.png')}
       style={[
         styles.background,
diff --git a/Libraries/NewAppScreen/components/HermesBadge.js b/Libraries/NewAppScreen/components/HermesBadge.js
index aa02f3a9881455..b0907266e02406 100644
--- a/Libraries/NewAppScreen/components/HermesBadge.js
+++ b/Libraries/NewAppScreen/components/HermesBadge.js
@@ -15,6 +15,9 @@ import Colors from './Colors';
 
 const HermesBadge = (): Node => {
   const isDarkMode = useColorScheme() === 'dark';
+  const version =
+    global.HermesInternal?.getRuntimeProperties?.()['OSS Release Version'] ??
+    '';
   return global.HermesInternal ? (
     <View style={styles.badge}>
       <Text
@@ -24,7 +27,7 @@ const HermesBadge = (): Node => {
             color: isDarkMode ? Colors.light : Colors.dark,
           },
         ]}>
-        Engine: Hermes
+        {`Engine: Hermes ${version}`}
       </Text>
     </View>
   ) : null;
diff --git a/Libraries/NewAppScreen/components/LearnMoreLinks.js b/Libraries/NewAppScreen/components/LearnMoreLinks.js
index 9e12acc8ead130..ab69dd888bc3a0 100644
--- a/Libraries/NewAppScreen/components/LearnMoreLinks.js
+++ b/Libraries/NewAppScreen/components/LearnMoreLinks.js
@@ -8,7 +8,6 @@
  * @format
  */
 
-'use strict';
 import Colors from './Colors';
 import type {Node} from 'react';
 import openURLInBrowser from 'react-native/Libraries/Core/Devtools/openURLInBrowser';
diff --git a/Libraries/NewAppScreen/index.js b/Libraries/NewAppScreen/index.js
index 9da6d362b32924..fc7d7315f0b7b1 100644
--- a/Libraries/NewAppScreen/index.js
+++ b/Libraries/NewAppScreen/index.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Colors from './components/Colors';
 import Header from './components/Header';
 import HermesBadge from './components/HermesBadge';
diff --git a/Libraries/Performance/NativeJSCSamplingProfiler.js b/Libraries/Performance/NativeJSCSamplingProfiler.js
index 9ef08c961599a7..4925e79d44210a 100644
--- a/Libraries/Performance/NativeJSCSamplingProfiler.js
+++ b/Libraries/Performance/NativeJSCSamplingProfiler.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Performance/QuickPerformanceLogger.js b/Libraries/Performance/QuickPerformanceLogger.js
index 6dfed3cdbd0328..94f7cdbc790dd2 100644
--- a/Libraries/Performance/QuickPerformanceLogger.js
+++ b/Libraries/Performance/QuickPerformanceLogger.js
@@ -65,9 +65,8 @@ const QuickPerformanceLogger = {
     markerId: number,
     instanceKey?: number = DUMMY_INSTANCE_KEY,
   ): void {
-    if (global.nativeQPLMarkerCancel) {
-      global.nativeQPLMarkerCancel(markerId, instanceKey);
-    }
+    // $FlowFixMe[object-this-reference]
+    this.markerDrop(markerId, instanceKey);
   },
 
   markerPoint(
@@ -75,9 +74,10 @@ const QuickPerformanceLogger = {
     name: string,
     instanceKey: number = DUMMY_INSTANCE_KEY,
     timestamp: number = AUTO_SET_TIMESTAMP,
+    data: ?string = null,
   ): void {
     if (global.nativeQPLMarkerPoint) {
-      global.nativeQPLMarkerPoint(markerId, name, instanceKey, timestamp);
+      global.nativeQPLMarkerPoint(markerId, name, instanceKey, timestamp, data);
     }
   },
 
diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index 048c3d404271ad..6089016521b862 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -209,11 +209,9 @@ const Systrace = {
 };
 
 if (__DEV__) {
-  // This is needed, because require callis in polyfills are not processed as
-  // other files. Therefore, calls to `require('moduleId')` are not replaced
-  // with numeric IDs
-  // TODO(davidaurelio) Scan polyfills for dependencies, too (t9759686)
-  (require: $FlowFixMe).Systrace = Systrace;
+  // The metro require polyfill can not have dependencies (true for all polyfills).
+  // Ensure that `Systrace` is available in polyfill by exposing it globally.
+  global[(global.__METRO_GLOBAL_PREFIX__ || '') + '__SYSTRACE'] = Systrace;
 }
 
 module.exports = Systrace;
diff --git a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
index 2e834fc725cb42..358882c8ec4820 100644
--- a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
@@ -43,7 +41,10 @@ export type PermissionType =
   | 'android.permission.RECEIVE_WAP_PUSH'
   | 'android.permission.RECEIVE_MMS'
   | 'android.permission.READ_EXTERNAL_STORAGE'
-  | 'android.permission.WRITE_EXTERNAL_STORAGE';
+  | 'android.permission.WRITE_EXTERNAL_STORAGE'
+  | 'android.permission.BLUETOOTH_CONNECT'
+  | 'android.permission.BLUETOOTH_SCAN'
+  | 'android.permission.BLUETOOTH_ADVERTISE';
 */
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js
index d99ccd5ec836ee..1006cd3192451d 100644
--- a/Libraries/PermissionsAndroid/PermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/PermissionsAndroid.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 const Platform = require('../Utilities/Platform');
 
 import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManagerAndroid';
@@ -61,6 +59,9 @@ const PERMISSIONS = Object.freeze({
   RECEIVE_MMS: 'android.permission.RECEIVE_MMS',
   READ_EXTERNAL_STORAGE: 'android.permission.READ_EXTERNAL_STORAGE',
   WRITE_EXTERNAL_STORAGE: 'android.permission.WRITE_EXTERNAL_STORAGE',
+  BLUETOOTH_CONNECT: 'android.permission.BLUETOOTH_CONNECT',
+  BLUETOOTH_SCAN: 'android.permission.BLUETOOTH_SCAN',
+  BLUETOOTH_ADVERTISE: 'android.permission.BLUETOOTH_ADVERTISE',
 });
 
 /**
@@ -75,6 +76,9 @@ class PermissionsAndroid {
     ACCESS_COARSE_LOCATION: string,
     ACCESS_FINE_LOCATION: string,
     ADD_VOICEMAIL: string,
+    BLUETOOTH_ADVERTISE: string,
+    BLUETOOTH_CONNECT: string,
+    BLUETOOTH_SCAN: string,
     BODY_SENSORS: string,
     CALL_PHONE: string,
     CAMERA: string,
@@ -217,9 +221,10 @@ class PermissionsAndroid {
             ...rationale,
           };
           NativeDialogManagerAndroid.showAlert(
-            /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.111 was deployed. To see
-             * the error, delete this comment and run Flow. */
+            /* $FlowFixMe[incompatible-exact] (>=0.111.0 site=react_native_fb)
+             * This comment suppresses an error found when Flow v0.111 was
+             * deployed. To see the error, delete this comment and run Flow.
+             */
             options,
             () => reject(new Error('Error showing rationale')),
             () =>
diff --git a/Libraries/Pressability/HoverState.js b/Libraries/Pressability/HoverState.js
index 5a2ac60732b72e..768babe3ff2f05 100644
--- a/Libraries/Pressability/HoverState.js
+++ b/Libraries/Pressability/HoverState.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Platform from '../Utilities/Platform';
 
 let isEnabled = false;
diff --git a/Libraries/Pressability/Pressability.js b/Libraries/Pressability/Pressability.js
index f490161be2b0a0..8f57ec6e55fb52 100644
--- a/Libraries/Pressability/Pressability.js
+++ b/Libraries/Pressability/Pressability.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import {isHoverEnabled} from './HoverState';
 import invariant from 'invariant';
 import SoundManager from '../Components/Sound/SoundManager';
@@ -21,6 +19,8 @@ import type {
   PressEvent,
   MouseEvent,
 } from '../Types/CoreEventTypes';
+import PressabilityPerformanceEventEmitter from './PressabilityPerformanceEventEmitter.js';
+import {type PressabilityTouchSignal as TouchSignal} from './PressabilityTypes.js';
 import Platform from '../Utilities/Platform';
 import UIManager from '../ReactNative/UIManager';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
@@ -201,15 +201,6 @@ type TouchState =
   | 'RESPONDER_ACTIVE_LONG_PRESS_OUT'
   | 'ERROR';
 
-type TouchSignal =
-  | 'DELAY'
-  | 'RESPONDER_GRANT'
-  | 'RESPONDER_RELEASE'
-  | 'RESPONDER_TERMINATED'
-  | 'ENTER_PRESS_RECT'
-  | 'LEAVE_PRESS_RECT'
-  | 'LONG_PRESS_DETECTED';
-
 const Transitions = Object.freeze({
   NOT_RESPONDER: {
     DELAY: 'ERROR',
@@ -531,8 +522,9 @@ export default class Pressability {
       },
 
       onResponderMove: (event: PressEvent): void => {
-        if (this._config.onPressMove != null) {
-          this._config.onPressMove(event);
+        const {onPressMove} = this._config;
+        if (onPressMove != null) {
+          onPressMove(event);
         }
 
         // Region may not have finished being measured, yet.
@@ -584,8 +576,8 @@ export default class Pressability {
       },
 
       onClick: (event: PressEvent): void => {
-        const {onPress} = this._config;
-        if (onPress != null) {
+        const {onPress, disabled} = this._config;
+        if (onPress != null && disabled !== true) {
           onPress(event);
         }
       },
@@ -672,6 +664,19 @@ export default class Pressability {
         : '<<host component>>',
     );
     if (prevState !== nextState) {
+      // Especially on iOS, not all events have timestamps associated.
+      // For telemetry purposes, this doesn't matter too much, as long as *some* do.
+      // Since the native timestamp is integral for logging telemetry, just skip
+      // events if they don't have a timestamp attached.
+      if (event.nativeEvent.timestamp != null) {
+        PressabilityPerformanceEventEmitter.emitEvent(() => {
+          return {
+            signal,
+            touchDelayMs: Date.now() - event.nativeEvent.timestamp,
+          };
+        });
+      }
+
       this._performTransitionSideEffects(prevState, nextState, signal, event);
       this._touchState = nextState;
     }
@@ -696,10 +701,10 @@ export default class Pressability {
       prevState === 'NOT_RESPONDER' &&
       nextState === 'RESPONDER_INACTIVE_PRESS_IN';
 
-    const isActivationTransiton =
+    const isActivationTransition =
       !isActivationSignal(prevState) && isActivationSignal(nextState);
 
-    if (isInitialTransition || isActivationTransiton) {
+    if (isInitialTransition || isActivationTransition) {
       this._measureResponderRegion();
     }
 
@@ -745,11 +750,8 @@ export default class Pressability {
 
   _activate(event: PressEvent): void {
     const {onPressIn} = this._config;
-    const touch = getTouchFromPressEvent(event);
-    this._touchActivatePosition = {
-      pageX: touch.pageX,
-      pageY: touch.pageY,
-    };
+    const {pageX, pageY} = getTouchFromPressEvent(event);
+    this._touchActivatePosition = {pageX, pageY};
     this._touchActivateTime = Date.now();
     if (onPressIn != null) {
       onPressIn(event);
diff --git a/Libraries/Pressability/PressabilityDebug.js b/Libraries/Pressability/PressabilityDebug.js
index dd8ecdd2d172e0..27017a4760823c 100644
--- a/Libraries/Pressability/PressabilityDebug.js
+++ b/Libraries/Pressability/PressabilityDebug.js
@@ -8,12 +8,9 @@
  * @format
  */
 
-'use strict';
-
 import normalizeColor from '../StyleSheet/normalizeColor';
 import type {ColorValue} from '../StyleSheet/StyleSheet';
 
-import Touchable from '../Components/Touchable/Touchable';
 import View from '../Components/View/View';
 import * as React from 'react';
 
@@ -73,9 +70,17 @@ export function PressabilityDebugView({color, hitSlop}: Props): React.Node {
   return null;
 }
 
+let isDebugEnabled = false;
+
 export function isEnabled(): boolean {
   if (__DEV__) {
-    return Touchable.TOUCH_TARGET_DEBUG;
+    return isDebugEnabled;
   }
   return false;
 }
+
+export function setEnabled(value: boolean): void {
+  if (__DEV__) {
+    isDebugEnabled = value;
+  }
+}
diff --git a/Libraries/Pressability/PressabilityPerformanceEventEmitter.js b/Libraries/Pressability/PressabilityPerformanceEventEmitter.js
new file mode 100644
index 00000000000000..832b1ee270e7e0
--- /dev/null
+++ b/Libraries/Pressability/PressabilityPerformanceEventEmitter.js
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import {type PressabilityTouchSignal as TouchSignal} from './PressabilityTypes.js';
+
+export type PressabilityPerformanceEvent = $ReadOnly<{|
+  signal: TouchSignal,
+  touchDelayMs: number,
+|}>;
+export type PressabilityPerformanceEventListener = PressabilityPerformanceEvent => void;
+
+class PressabilityPerformanceEventEmitter {
+  _listeners: Array<PressabilityPerformanceEventListener> = [];
+
+  constructor() {}
+
+  addListener(listener: PressabilityPerformanceEventListener): void {
+    this._listeners.push(listener);
+  }
+
+  removeListener(listener: PressabilityPerformanceEventListener): void {
+    const index = this._listeners.indexOf(listener);
+    if (index > -1) {
+      this._listeners.splice(index, 1);
+    }
+  }
+
+  emitEvent(constructEvent: () => PressabilityPerformanceEvent): void {
+    if (this._listeners.length === 0) {
+      return;
+    }
+
+    const event = constructEvent();
+    this._listeners.forEach(listener => listener(event));
+  }
+}
+
+const PressabilityPerformanceEventEmitterSingleton: PressabilityPerformanceEventEmitter = new PressabilityPerformanceEventEmitter();
+
+export default PressabilityPerformanceEventEmitterSingleton;
diff --git a/Libraries/Pressability/PressabilityTypes.js b/Libraries/Pressability/PressabilityTypes.js
new file mode 100644
index 00000000000000..5e8b1ffdb8ab47
--- /dev/null
+++ b/Libraries/Pressability/PressabilityTypes.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+export type PressabilityTouchSignal =
+  | 'DELAY'
+  | 'RESPONDER_GRANT'
+  | 'RESPONDER_RELEASE'
+  | 'RESPONDER_TERMINATED'
+  | 'ENTER_PRESS_RECT'
+  | 'LEAVE_PRESS_RECT'
+  | 'LONG_PRESS_DETECTED';
diff --git a/Libraries/Pressability/__tests__/Pressability-test.js b/Libraries/Pressability/__tests__/Pressability-test.js
index d584d215b7cc3e..6960546e376a74 100644
--- a/Libraries/Pressability/__tests__/Pressability-test.js
+++ b/Libraries/Pressability/__tests__/Pressability-test.js
@@ -9,8 +9,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {PressEvent} from '../../Types/CoreEventTypes';
 import * as HoverState from '../HoverState';
 import Pressability from '../Pressability';
@@ -258,7 +256,7 @@ describe('Pressability', () => {
     beforeEach(() => {
       originalPlatform = Platform.OS;
       Platform.OS = 'web';
-      // $FlowExpectedError
+      // $FlowExpectedError[prop-missing]
       HoverState.isHoverEnabled.mockReturnValue(true);
     });
 
@@ -278,7 +276,7 @@ describe('Pressability', () => {
         typeof handlers.onMouseEnter === 'function',
         'Expected to find "onMouseEnter" function',
       );
-      // $FlowExpectedError
+      // $FlowExpectedError[not-a-function]
       handlers.onMouseEnter(createMockMouseEvent('onMouseEnter'));
       expect(config.onHoverIn).toBeCalled();
     });
@@ -291,7 +289,7 @@ describe('Pressability', () => {
         typeof handlers.onMouseEnter === 'function',
         'Expected to find "onMouseEnter" function',
       );
-      // $FlowExpectedError
+      // $FlowExpectedError[not-a-function]
       handlers.onMouseEnter(createMockMouseEvent('onMouseEnter'));
       expect(config.onHoverIn).toBeCalled();
     });
@@ -304,7 +302,7 @@ describe('Pressability', () => {
         typeof handlers.onMouseEnter === 'function',
         'Expected to find "onMouseEnter" function',
       );
-      // $FlowExpectedError
+      // $FlowExpectedError[not-a-function]
       handlers.onMouseEnter(createMockMouseEvent('onMouseEnter'));
       expect(config.onHoverIn).toBeCalled();
     });
@@ -317,7 +315,7 @@ describe('Pressability', () => {
         typeof handlers.onMouseEnter === 'function',
         'Expected to find "onMouseEnter" function',
       );
-      // $FlowExpectedError
+      // $FlowExpectedError[not-a-function]
       handlers.onMouseEnter(createMockMouseEvent('onMouseEnter'));
       jest.advanceTimersByTime(499);
       expect(config.onHoverIn).not.toBeCalled();
@@ -333,7 +331,7 @@ describe('Pressability', () => {
         typeof handlers.onMouseEnter === 'function',
         'Expected to find "onMouseEnter" function',
       );
-      // $FlowExpectedError
+      // $FlowExpectedError[not-a-function]
       handlers.onMouseEnter(createMockMouseEvent('onMouseEnter'));
       expect(config.onHoverIn).toBeCalled();
     });
@@ -716,7 +714,9 @@ describe('Pressability', () => {
         handlers.onResponderMove(
           createMockPressEvent({
             registrationName: 'onResponderMove',
+            // $FlowFixMe[unsafe-addition]
             pageX: mockRegion.width + mockSlop.right / 2,
+            // $FlowFixMe[unsafe-addition]
             pageY: mockRegion.height + mockSlop.bottom / 2,
           }),
         );
@@ -750,7 +750,9 @@ describe('Pressability', () => {
         handlers.onResponderMove(
           createMockPressEvent({
             registrationName: 'onResponderMove',
+            // $FlowFixMe[unsafe-addition]
             pageX: mockRegion.width + mockSlop.right / 2,
+            // $FlowFixMe[unsafe-addition]
             pageY: mockRegion.height + mockSlop.bottom / 2,
           }),
         );
@@ -870,9 +872,11 @@ describe('Pressability', () => {
         config.onStartShouldSetResponder_DEPRECATED,
       );
 
+      // $FlowFixMe[prop-missing]
       onStartShouldSetResponder_DEPRECATED.mockReturnValue(false);
       expect(handlers.onStartShouldSetResponder()).toBe(false);
 
+      // $FlowFixMe[prop-missing]
       onStartShouldSetResponder_DEPRECATED.mockReturnValue(true);
       expect(handlers.onStartShouldSetResponder()).toBe(true);
     });
diff --git a/Libraries/Pressability/usePressability.js b/Libraries/Pressability/usePressability.js
index 9ed4cc22197437..605a9d8c406e9d 100644
--- a/Libraries/Pressability/usePressability.js
+++ b/Libraries/Pressability/usePressability.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import Pressability, {
   type EventHandlers,
   type PressabilityConfig,
diff --git a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
index 1eec7bde81481b..84d59b030a9df1 100644
--- a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
+++ b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
@@ -65,6 +65,9 @@ export interface Spec extends TurboModule {
   +getDeliveredNotifications: (
     callback: (notification: Array<Notification>) => void,
   ) => void;
+  +getAuthorizationStatus: (
+    callback: (authorizationStatus: number) => void,
+  ) => void;
   +addListener: (eventType: string) => void;
   +removeListeners: (count: number) => void;
 }
diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js
index fa6262057ed5a9..7ad34cd41d4b74 100644
--- a/Libraries/PushNotificationIOS/PushNotificationIOS.js
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js
@@ -8,15 +8,41 @@
  * @flow
  */
 
-'use strict';
-
-import {Platform} from 'react-native'; // TODO(macOS GH#774)
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import NativePushNotificationManagerIOS from './NativePushNotificationManagerIOS';
 import invariant from 'invariant';
+import Platform from '../Utilities/Platform';
+
+type NativePushNotificationIOSEventDefinitions = {
+  remoteNotificationReceived: [
+    {
+      notificationId: string,
+      remote: boolean,
+      ...
+    },
+  ],
+  remoteNotificationsRegistered: [
+    {
+      deviceToken?: ?string,
+      ...
+    },
+  ],
+  remoteNotificationRegistrationError: [
+    {
+      message: string,
+      code: number,
+      details: {...},
+    },
+  ],
+  localNotificationReceived: [{...}],
+};
 
-const PushNotificationEmitter = new NativeEventEmitter(
-  NativePushNotificationManagerIOS,
+const PushNotificationEmitter = new NativeEventEmitter<NativePushNotificationIOSEventDefinitions>(
+  // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+  // If you want to use the native module on other platforms, please remove this condition and test its behavior
+  Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
+    ? null
+    : NativePushNotificationManagerIOS,
 );
 
 const _notifHandlers = new Map();
@@ -378,6 +404,20 @@ class PushNotificationIOS {
     );
   }
 
+  /**
+   * This method returns a promise that resolves to notification authorization status.
+   */
+  static getAuthorizationStatus(
+    callback: (authorizationStatus: number) => void,
+  ): void {
+    invariant(
+      NativePushNotificationManagerIOS,
+      'PushNotificationManager is not available.',
+    );
+
+    NativePushNotificationManagerIOS.getAuthorizationStatus(callback);
+  }
+
   /**
    * You will never need to instantiate `PushNotificationIOS` yourself.
    * Listening to the `notification` event and invoking
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
index f930b14deaaf20..5696ec7787da21 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
@@ -7,9 +7,7 @@
 
 #import <React/RCTPushNotificationManager.h>
 
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
 #import <UserNotifications/UserNotifications.h>
-#endif // TODO(macOS GH#774)
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
@@ -661,6 +659,14 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 #endif // ]TODO(macOS GH#774)
 }
 
+RCT_EXPORT_METHOD(getAuthorizationStatus:(RCTResponseSenderBlock)callback)
+{
+  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+  [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings)  {
+    callback(@[@(settings.authorizationStatus)]);
+  }];
+}
+
 #else // TARGET_OS_UIKITFORMAC
 
 RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult)
@@ -741,6 +747,11 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
+RCT_EXPORT_METHOD(getAuthorizationStatus:(RCTResponseSenderBlock)callback)
+{
+  RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
+}
+
 - (NSArray<NSString *> *)supportedEvents
 {
   return @[];
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationPlugins.mm b/Libraries/PushNotificationIOS/RCTPushNotificationPlugins.mm
index 587a7b17a86688..434829371738ec 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationPlugins.mm
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationPlugins.mm
@@ -17,12 +17,13 @@
 #import <unordered_map>
 
 Class RCTPushNotificationClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"PushNotificationManager", RCTPushNotificationManagerCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
index 97e419d1f1e7f8..6180dbe4864aab 100644
--- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
+++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTPushNotification"
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/pushnotificationios"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/RCTRequired/BUCK b/Libraries/RCTRequired/BUCK
index 18d34dc7750d91..53eb8a475d3ba7 100644
--- a/Libraries/RCTRequired/BUCK
+++ b/Libraries/RCTRequired/BUCK
@@ -2,7 +2,10 @@ load("//tools/build_defs/oss:rn_defs.bzl", "fb_apple_library")
 
 fb_apple_library(
     name = "RCTRequired",
-    autoglob = True,
+    exported_headers = [
+        "RCTRequired/RCTRequired.h",
+    ],
+    autoglob = False,
     complete_nullability = True,
     contacts = ["oncall+react_native@xmail.facebook.com"],
     extension_api_only = True,
diff --git a/Libraries/RCTRequired/RCTRequired.podspec b/Libraries/RCTRequired/RCTRequired.podspec
index e4d10d5d15960c..f535eb70d75154 100644
--- a/Libraries/RCTRequired/RCTRequired.podspec
+++ b/Libraries/RCTRequired/RCTRequired.podspec
@@ -11,7 +11,7 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#774)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#774)
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "RCTRequired"
diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
index 68dd3169dd612e..23da450a3108e7 100644
--- a/Libraries/ReactNative/AppContainer.js
+++ b/Libraries/ReactNative/AppContainer.js
@@ -8,22 +8,19 @@
  * @flow
  */
 
-'use strict';
-
 import View from '../Components/View/View';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import {RootTagContext, createRootTag} from './RootTag';
-import PropTypes from 'prop-types';
+import type {RootTag} from './RootTag';
 import * as React from 'react';
 
-type Context = {rootTag: number, ...};
-
 type Props = $ReadOnly<{|
   children?: React.Node,
   fabric?: boolean,
-  rootTag: number,
+  useConcurrentRoot?: boolean,
+  rootTag: number | RootTag,
   initialProps?: {...},
   showArchitectureIndicator?: boolean,
   WrapperComponent?: ?React.ComponentType<any>,
@@ -47,18 +44,6 @@ class AppContainer extends React.Component<Props, State> {
 
   static getDerivedStateFromError: any = undefined;
 
-  static childContextTypes:
-    | any
-    | {|rootTag: React$PropType$Primitive<number>|} = {
-    rootTag: PropTypes.number,
-  };
-
-  getChildContext(): Context {
-    return {
-      rootTag: this.props.rootTag,
-    };
-  }
-
   componentDidMount(): void {
     if (__DEV__) {
       if (!global.__RCTProfileIsProfiling) {
@@ -147,11 +132,4 @@ const styles = StyleSheet.create({
   },
 });
 
-if (__DEV__) {
-  if (!global.__RCTProfileIsProfiling) {
-    const LogBox = require('../LogBox/LogBox');
-    LogBox.install();
-  }
-}
-
 module.exports = AppContainer;
diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index 389b2f5240f295..93c4447c41a81d 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const BatchedBridge = require('../BatchedBridge/BatchedBridge');
 const BugReporting = require('../BugReporting/BugReporting');
 const ReactNative = require('../Renderer/shims/ReactNative');
@@ -20,9 +18,11 @@ const invariant = require('invariant');
 const renderApplication = require('./renderApplication');
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 
+import {coerceDisplayMode} from './DisplayMode';
 import createPerformanceLogger from '../Utilities/createPerformanceLogger';
 import NativeHeadlessJsTaskSupport from './NativeHeadlessJsTaskSupport';
 import HeadlessJsTaskError from './HeadlessJsTaskError';
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 type Task = (taskData: any) => Promise<void>;
 export type TaskProvider = () => Task;
@@ -52,7 +52,7 @@ export type Registry = {
   runnables: Runnables,
   ...
 };
-export type WrapperComponentProvider = any => React$ComponentType<*>;
+export type WrapperComponentProvider = any => React$ComponentType<any>;
 
 const runnables: Runnables = {};
 let runCount = 1;
@@ -113,7 +113,7 @@ const AppRegistry = {
     let scopedPerformanceLogger = createPerformanceLogger();
     runnables[appKey] = {
       componentProvider,
-      run: appParameters => {
+      run: (appParameters, displayMode) => {
         renderApplication(
           componentProviderInstrumentationHook(
             componentProvider,
@@ -126,6 +126,9 @@ const AppRegistry = {
           showArchitectureIndicator,
           scopedPerformanceLogger,
           appKey === 'LogBox',
+          appKey,
+          coerceDisplayMode(displayMode),
+          appParameters.concurrentRoot,
         );
       },
     };
@@ -180,7 +183,11 @@ const AppRegistry = {
    *
    * See https://reactnative.dev/docs/appregistry.html#runapplication
    */
-  runApplication(appKey: string, appParameters: any): void {
+  runApplication(
+    appKey: string,
+    appParameters: any,
+    displayMode?: number,
+  ): void {
     if (appKey !== 'LogBox') {
       const msg =
         'Running "' + appKey + '" with ' + JSON.stringify(appParameters);
@@ -199,7 +206,38 @@ const AppRegistry = {
     );
 
     SceneTracker.setActiveScene({name: appKey});
-    runnables[appKey].run(appParameters);
+    runnables[appKey].run(appParameters, displayMode);
+  },
+
+  /**
+   * Update initial props for a surface that's already rendered
+   */
+  setSurfaceProps(
+    appKey: string,
+    appParameters: any,
+    displayMode?: number,
+  ): void {
+    if (appKey !== 'LogBox') {
+      const msg =
+        'Updating props for Surface "' +
+        appKey +
+        '" with ' +
+        JSON.stringify(appParameters);
+      infoLog(msg);
+      BugReporting.addSource(
+        'AppRegistry.setSurfaceProps' + runCount++,
+        () => msg,
+      );
+    }
+    invariant(
+      runnables[appKey] && runnables[appKey].run,
+      `"${appKey}" has not been registered. This can happen if:\n` +
+        '* Metro (the local dev server) is run from the wrong folder. ' +
+        'Check if Metro is running, stop it and restart it in the current project.\n' +
+        "* A module failed to load due to an error and `AppRegistry.registerComponent` wasn't called.",
+    );
+
+    runnables[appKey].run(appParameters, displayMode);
   },
 
   /**
@@ -207,7 +245,9 @@ const AppRegistry = {
    *
    * See https://reactnative.dev/docs/appregistry.html#unmountapplicationcomponentatroottag
    */
-  unmountApplicationComponentAtRootTag(rootTag: number): void {
+  unmountApplicationComponentAtRootTag(rootTag: RootTag): void {
+    // NOTE: RootTag type
+    // $FlowFixMe[incompatible-call] RootTag: RootTag is incompatible with number, needs an updated synced version of the ReactNativeTypes.js file
     ReactNative.unmountComponentAtNodeAndRemoveContainer(rootTag);
   },
 
@@ -217,6 +257,7 @@ const AppRegistry = {
    * See https://reactnative.dev/docs/appregistry.html#registerheadlesstask
    */
   registerHeadlessTask(taskKey: string, taskProvider: TaskProvider): void {
+    // $FlowFixMe[object-this-reference]
     this.registerCancellableHeadlessTask(taskKey, taskProvider, () => () => {
       /* Cancel is no-op */
     });
diff --git a/Libraries/ReactNative/DisplayMode.js b/Libraries/ReactNative/DisplayMode.js
new file mode 100644
index 00000000000000..e6850f0eb4ca0b
--- /dev/null
+++ b/Libraries/ReactNative/DisplayMode.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+export opaque type DisplayModeType = number;
+
+/** DisplayMode should be in sync with the method displayModeToInt from
+ * react/renderer/uimanager/primitives.h. */
+const DisplayMode: {[string]: DisplayModeType} = Object.freeze({
+  VISIBLE: 1,
+  SUSPENDED: 2,
+  HIDDEN: 3,
+});
+
+export function coerceDisplayMode(value: ?number): DisplayModeType {
+  switch (value) {
+    case DisplayMode.SUSPENDED:
+      return DisplayMode.SUSPENDED;
+    case DisplayMode.HIDDEN:
+      return DisplayMode.HIDDEN;
+    default:
+      return DisplayMode.VISIBLE;
+  }
+}
+
+export default DisplayMode;
diff --git a/Libraries/ReactNative/DummyUIManager.js b/Libraries/ReactNative/DummyUIManager.js
index ba816c1cb3c444..6b86a985666d30 100644
--- a/Libraries/ReactNative/DummyUIManager.js
+++ b/Libraries/ReactNative/DummyUIManager.js
@@ -9,6 +9,8 @@
  */
 'use strict';
 
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
+
 module.exports = {
   getViewManagerConfig: (viewManagerName: string): mixed => {
     console.warn(
@@ -19,6 +21,12 @@ module.exports = {
     }
     return null;
   },
+  hasViewManagerConfig: (viewManagerName: string): boolean => {
+    return (
+      viewManagerName === 'RCTVirtualText' ||
+      viewManagerName === 'RCTShimmeringView'
+    );
+  },
   getConstants: (): {...} => ({}),
   getConstantsForViewManager: (viewManagerName: string) => {},
   getDefaultEventTypes: (): Array<$FlowFixMe> => [],
@@ -26,7 +34,7 @@ module.exports = {
   createView: (
     reactTag: ?number,
     viewName: string,
-    rootTag: number,
+    rootTag: RootTag,
     props: Object,
   ) => {},
   updateView: (reactTag: number, viewName: string, props: Object) => {},
diff --git a/Libraries/ReactNative/FabricUIManager.js b/Libraries/ReactNative/FabricUIManager.js
index 2b88069742229e..987ef84f3812da 100644
--- a/Libraries/ReactNative/FabricUIManager.js
+++ b/Libraries/ReactNative/FabricUIManager.js
@@ -16,6 +16,7 @@ import type {
   MeasureLayoutOnSuccessCallback,
   LayoutAnimationConfig,
 } from '../Renderer/shims/ReactNativeTypes';
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 // TODO: type these properly.
 type Node = {...};
@@ -26,7 +27,7 @@ export type Spec = {|
   +createNode: (
     reactTag: number,
     viewName: string,
-    rootTag: number,
+    rootTag: RootTag,
     props: NodeProps,
     instanceHandle: InstanceHandle,
   ) => Node,
@@ -34,11 +35,10 @@ export type Spec = {|
   +cloneNodeWithNewChildren: (node: Node) => Node,
   +cloneNodeWithNewProps: (node: Node, newProps: NodeProps) => Node,
   +cloneNodeWithNewChildrenAndProps: (node: Node, newProps: NodeProps) => Node,
-  +createChildSet: (rootTag: number) => NodeSet,
+  +createChildSet: (rootTag: RootTag) => NodeSet,
   +appendChild: (parentNode: Node, child: Node) => Node,
   +appendChildToSet: (childSet: NodeSet, child: Node) => void,
-  +completeRoot: (rootTag: number, childSet: NodeSet) => void,
-  +setNativeProps: (node: Node, nativeProps: NodeProps) => void,
+  +completeRoot: (rootTag: RootTag, childSet: NodeSet) => void,
   +measure: (node: Node, callback: MeasureOnSuccessCallback) => void,
   +measureInWindow: (
     node: Node,
@@ -54,9 +54,10 @@ export type Spec = {|
     config: LayoutAnimationConfig,
     callback: () => void, // check what is returned here
     // This error isn't currently called anywhere, so the `error` object is really not defined
-    // $FlowFixMe
+    // $FlowFixMe[unclear-type]
     errorCallback: (error: Object) => void,
   ) => void,
+  +sendAccessibilityEvent: (node: Node, eventType: string) => void,
 |};
 
 const FabricUIManager: ?Spec = global.nativeFabricUIManager;
diff --git a/Libraries/ReactNative/HeadlessJsTaskError.js b/Libraries/ReactNative/HeadlessJsTaskError.js
index 18789932b04040..877ed3c9b73d2c 100644
--- a/Libraries/ReactNative/HeadlessJsTaskError.js
+++ b/Libraries/ReactNative/HeadlessJsTaskError.js
@@ -8,6 +8,4 @@
  * @format
  */
 
-'use strict';
-
 export default class HeadlessJsTaskError extends Error {}
diff --git a/Libraries/ReactNative/I18nManager.js b/Libraries/ReactNative/I18nManager.js
index 8fc7bce6c0456b..1095ab81cdb3ee 100644
--- a/Libraries/ReactNative/I18nManager.js
+++ b/Libraries/ReactNative/I18nManager.js
@@ -8,22 +8,36 @@
  * @format
  */
 
-'use strict';
-
 import NativeI18nManager from './NativeI18nManager';
 
 const i18nConstants: {|
   doLeftAndRightSwapInRTL: boolean,
   isRTL: boolean,
-|} = NativeI18nManager
-  ? NativeI18nManager.getConstants()
-  : {
-      isRTL: false,
-      doLeftAndRightSwapInRTL: true,
-    };
+  localeIdentifier?: ?string,
+|} = getI18nManagerConstants();
+
+function getI18nManagerConstants() {
+  if (NativeI18nManager) {
+    const {
+      isRTL,
+      doLeftAndRightSwapInRTL,
+      localeIdentifier,
+    } = NativeI18nManager.getConstants();
+    return {isRTL, doLeftAndRightSwapInRTL, localeIdentifier};
+  }
+
+  return {
+    isRTL: false,
+    doLeftAndRightSwapInRTL: true,
+  };
+}
 
 module.exports = {
-  getConstants: (): {|doLeftAndRightSwapInRTL: boolean, isRTL: boolean|} => {
+  getConstants: (): {|
+    doLeftAndRightSwapInRTL: boolean,
+    isRTL: boolean,
+    localeIdentifier: ?string,
+  |} => {
     return i18nConstants;
   },
 
diff --git a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js
index 45f25deb2114f0..de7c9912c1bdd8 100644
--- a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js
+++ b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/ReactNative/NativeI18nManager.js b/Libraries/ReactNative/NativeI18nManager.js
index 28933d510b30e7..b9cb0efebcc93d 100644
--- a/Libraries/ReactNative/NativeI18nManager.js
+++ b/Libraries/ReactNative/NativeI18nManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
@@ -17,6 +15,7 @@ export interface Spec extends TurboModule {
   +getConstants: () => {|
     isRTL: boolean,
     doLeftAndRightSwapInRTL: boolean,
+    localeIdentifier: ?string,
   |};
   allowRTL: (allowRTL: boolean) => void;
   forceRTL: (forceRTL: boolean) => void;
diff --git a/Libraries/ReactNative/NativeUIManager.js b/Libraries/ReactNative/NativeUIManager.js
index 30e2d1f2c7d0df..ce77d2d4db341d 100644
--- a/Libraries/ReactNative/NativeUIManager.js
+++ b/Libraries/ReactNative/NativeUIManager.js
@@ -8,8 +8,7 @@
  * @format
  */
 
-'use strict';
-
+import type {RootTag} from '../TurboModule/RCTExport';
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
@@ -21,7 +20,7 @@ export interface Spec extends TurboModule {
   +createView: (
     reactTag: ?number,
     viewName: string,
-    rootTag: number,
+    rootTag: RootTag,
     props: Object,
   ) => void;
   +updateView: (reactTag: number, viewName: string, props: Object) => void;
diff --git a/Libraries/ReactNative/PaperUIManager.js b/Libraries/ReactNative/PaperUIManager.js
index a3e850e06c90c3..613b3801cbdbb3 100644
--- a/Libraries/ReactNative/PaperUIManager.js
+++ b/Libraries/ReactNative/PaperUIManager.js
@@ -7,7 +7,6 @@
  * @flow
  * @format
  */
-'use strict';
 
 const NativeModules = require('../BatchedBridge/NativeModules');
 const Platform = require('../Utilities/Platform');
@@ -16,6 +15,7 @@ const UIManagerProperties = require('./UIManagerProperties');
 const defineLazyObjectProperty = require('../Utilities/defineLazyObjectProperty');
 
 import NativeUIManager from './NativeUIManager';
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 const viewManagerConfigs = {};
 
@@ -31,52 +31,80 @@ function getConstants(): Object {
   return NativeUIManagerConstants;
 }
 
-/* $FlowFixMe(>=0.123.0 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.123.0 was deployed. To see the error, delete this comment
- * and run Flow. */
-const UIManagerJS = {
-  ...NativeUIManager,
-  getConstants(): Object {
-    return getConstants();
-  },
-  getViewManagerConfig: function(viewManagerName: string): any {
-    if (
-      viewManagerConfigs[viewManagerName] === undefined &&
-      NativeUIManager.getConstantsForViewManager
-    ) {
-      try {
-        viewManagerConfigs[
-          viewManagerName
-        ] = NativeUIManager.getConstantsForViewManager(viewManagerName);
-      } catch (e) {
-        viewManagerConfigs[viewManagerName] = null;
-      }
+function getViewManagerConfig(viewManagerName: string): any {
+  if (
+    viewManagerConfigs[viewManagerName] === undefined &&
+    global.nativeCallSyncHook && // If we're in the Chrome Debugger, let's not even try calling the sync method
+    NativeUIManager.getConstantsForViewManager
+  ) {
+    try {
+      viewManagerConfigs[
+        viewManagerName
+      ] = NativeUIManager.getConstantsForViewManager(viewManagerName);
+    } catch (e) {
+      console.error(
+        "NativeUIManager.getConstantsForViewManager('" +
+          viewManagerName +
+          "') threw an exception.",
+        e,
+      );
+      viewManagerConfigs[viewManagerName] = null;
     }
+  }
 
-    const config = viewManagerConfigs[viewManagerName];
-    if (config) {
-      return config;
-    }
+  const config = viewManagerConfigs[viewManagerName];
+  if (config) {
+    return config;
+  }
+
+  // If we're in the Chrome Debugger, let's not even try calling the sync
+  // method.
+  if (!global.nativeCallSyncHook) {
+    return config;
+  }
 
-    // If we're in the Chrome Debugger, let's not even try calling the sync
-    // method.
-    if (!global.nativeCallSyncHook) {
-      return config;
+  if (
+    NativeUIManager.lazilyLoadView &&
+    !triedLoadingConfig.has(viewManagerName)
+  ) {
+    const result = NativeUIManager.lazilyLoadView(viewManagerName);
+    triedLoadingConfig.add(viewManagerName);
+    if (result != null && result.viewConfig != null) {
+      getConstants()[viewManagerName] = result.viewConfig;
+      lazifyViewManagerConfig(viewManagerName);
     }
+  }
 
-    if (
-      NativeUIManager.lazilyLoadView &&
-      !triedLoadingConfig.has(viewManagerName)
-    ) {
-      const result = NativeUIManager.lazilyLoadView(viewManagerName);
-      triedLoadingConfig.add(viewManagerName);
-      if (result.viewConfig) {
-        getConstants()[viewManagerName] = result.viewConfig;
-        lazifyViewManagerConfig(viewManagerName);
-      }
+  return viewManagerConfigs[viewManagerName];
+}
+
+/* $FlowFixMe[cannot-spread-interface] (>=0.123.0 site=react_native_fb) This
+ * comment suppresses an error found when Flow v0.123.0 was deployed. To see
+ * the error, delete this comment and run Flow. */
+const UIManagerJS = {
+  ...NativeUIManager,
+  createView(
+    reactTag: ?number,
+    viewName: string,
+    rootTag: RootTag,
+    props: Object,
+  ): void {
+    if (Platform.OS === 'ios' && viewManagerConfigs[viewName] === undefined) {
+      // This is necessary to force the initialization of native viewManager
+      // classes in iOS when using static ViewConfigs
+      getViewManagerConfig(viewName);
     }
 
-    return viewManagerConfigs[viewManagerName];
+    NativeUIManager.createView(reactTag, viewName, rootTag, props);
+  },
+  getConstants(): Object {
+    return getConstants();
+  },
+  getViewManagerConfig(viewManagerName: string): any {
+    return getViewManagerConfig(viewManagerName);
+  },
+  hasViewManagerConfig(viewManagerName: string): boolean {
+    return getViewManagerConfig(viewManagerName) != null;
   },
 };
 
@@ -84,7 +112,7 @@ const UIManagerJS = {
 // 3rd party libs may be calling `NativeModules.UIManager.getViewManagerConfig()`
 // instead of `UIManager.getViewManagerConfig()` off UIManager.js.
 // This is a workaround for now.
-// $FlowFixMe
+// $FlowFixMe[prop-missing]
 NativeUIManager.getViewManagerConfig = UIManagerJS.getViewManagerConfig;
 
 function lazifyViewManagerConfig(viewName) {
diff --git a/Libraries/ReactNative/RootTag.js b/Libraries/ReactNative/RootTag.js
index 24b151544d43b2..03c83a86af9713 100644
--- a/Libraries/ReactNative/RootTag.js
+++ b/Libraries/ReactNative/RootTag.js
@@ -8,20 +8,22 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 
 // TODO: Make this into an opaque type.
-export type RootTag = number;
+export opaque type RootTag = number;
 
 export const RootTagContext: React$Context<RootTag> = React.createContext<RootTag>(
   0,
 );
 
+if (__DEV__) {
+  RootTagContext.displayName = 'RootTagContext';
+}
+
 /**
  * Intended to only be used by `AppContainer`.
  */
-export function createRootTag(rootTag: number): RootTag {
+export function createRootTag(rootTag: number | RootTag): RootTag {
   return rootTag;
 }
diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index 035a667099a236..ac916e66a2410b 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -7,16 +7,18 @@
  * @flow
  * @format
  */
-'use strict';
 
+import UIManagerInjection from './UIManagerInjection';
 import type {Spec} from './NativeUIManager';
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 interface UIManagerJSInterface extends Spec {
   +getViewManagerConfig: (viewManagerName: string) => Object;
+  +hasViewManagerConfig: (viewManagerName: string) => boolean;
   +createView: (
     reactTag: ?number,
     viewName: string,
-    rootTag: number,
+    rootTag: RootTag,
     props: Object,
   ) => void;
   +updateView: (reactTag: number, viewName: string, props: Object) => void;
@@ -33,6 +35,8 @@ interface UIManagerJSInterface extends Spec {
 const UIManager: UIManagerJSInterface =
   global.RN$Bridgeless === true
     ? require('./DummyUIManager') // No UIManager in bridgeless mode
-    : require('./PaperUIManager');
+    : UIManagerInjection.unstable_UIManager == null
+    ? require('./PaperUIManager')
+    : UIManagerInjection.unstable_UIManager;
 
 module.exports = UIManager;
diff --git a/Libraries/Text/TextInjection.js b/Libraries/ReactNative/UIManagerInjection.js
similarity index 73%
rename from Libraries/Text/TextInjection.js
rename to Libraries/ReactNative/UIManagerInjection.js
index 0297aa2d073ef4..00a16ac045780a 100644
--- a/Libraries/Text/TextInjection.js
+++ b/Libraries/ReactNative/UIManagerInjection.js
@@ -4,14 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
-'use strict';
-
-import typeof Text from './Text';
-
 export default {
-  unstable_Text: (null: ?Text),
+  unstable_UIManager: (null: ?any),
 };
diff --git a/Libraries/ReactNative/UIManagerProperties.js b/Libraries/ReactNative/UIManagerProperties.js
index 77e67267e57b19..f8f9f6b7ea82bc 100644
--- a/Libraries/ReactNative/UIManagerProperties.js
+++ b/Libraries/ReactNative/UIManagerProperties.js
@@ -57,6 +57,7 @@ module.exports = [
   'AccessibilityEventTypes',
   'UIView',
   'getViewManagerConfig',
+  'hasViewManagerConfig',
   'blur',
   'focus',
   'genericBubblingEventTypes',
diff --git a/Libraries/ReactNative/getCachedComponentWithDebugName.js b/Libraries/ReactNative/getCachedComponentWithDebugName.js
new file mode 100644
index 00000000000000..7e5e116399adf7
--- /dev/null
+++ b/Libraries/ReactNative/getCachedComponentWithDebugName.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+import type {AbstractComponent, Node} from 'react';
+
+type NoopComponent = AbstractComponent<{children: Node}>;
+
+const cache: Map<
+  string, // displayName
+  NoopComponent, // ComponentWithDisplayName
+> = new Map();
+
+export default function getCachedComponentWithDisplayName(
+  displayName: string,
+): NoopComponent {
+  let ComponentWithDisplayName = cache.get(displayName);
+
+  if (!ComponentWithDisplayName) {
+    ComponentWithDisplayName = ({children}) => children;
+    ComponentWithDisplayName.displayName = displayName;
+    cache.set(displayName, ComponentWithDisplayName);
+  }
+
+  return ComponentWithDisplayName;
+}
diff --git a/Libraries/ReactNative/getNativeComponentAttributes.js b/Libraries/ReactNative/getNativeComponentAttributes.js
index b31603098a5dbf..732e9b6745cfe7 100644
--- a/Libraries/ReactNative/getNativeComponentAttributes.js
+++ b/Libraries/ReactNative/getNativeComponentAttributes.js
@@ -154,7 +154,8 @@ function getDifferForType(
     case 'UIEdgeInsets':
       return insetsDiffer;
     // Android Types
-    // (not yet implemented)
+    case 'Point':
+      return pointsDiffer;
   }
   return null;
 }
diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js
index 8b39b288f64ff3..9eb3b932ce742b 100644
--- a/Libraries/ReactNative/renderApplication.js
+++ b/Libraries/ReactNative/renderApplication.js
@@ -8,12 +8,12 @@
  * @flow
  */
 
-'use strict';
-
 const AppContainer = require('./AppContainer');
 import GlobalPerformanceLogger from '../Utilities/GlobalPerformanceLogger';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 import PerformanceLoggerContext from '../Utilities/PerformanceLoggerContext';
+import type {DisplayModeType} from './DisplayMode';
+import getCachedComponentWithDebugName from './getCachedComponentWithDebugName';
 const React = require('react');
 
 const invariant = require('invariant');
@@ -25,17 +25,20 @@ function renderApplication<Props: Object>(
   RootComponent: React.ComponentType<Props>,
   initialProps: Props,
   rootTag: any,
-  WrapperComponent?: ?React.ComponentType<*>,
+  WrapperComponent?: ?React.ComponentType<any>,
   fabric?: boolean,
   showArchitectureIndicator?: boolean,
   scopedPerformanceLogger?: IPerformanceLogger,
   isLogBox?: boolean,
+  debugName?: string,
+  displayMode?: ?DisplayModeType,
+  useConcurrentRoot?: boolean,
 ) {
   invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag);
 
   const performanceLogger = scopedPerformanceLogger ?? GlobalPerformanceLogger;
 
-  const renderable = (
+  let renderable = (
     <PerformanceLoggerContext.Provider value={performanceLogger}>
       <AppContainer
         rootTag={rootTag}
@@ -49,11 +52,26 @@ function renderApplication<Props: Object>(
     </PerformanceLoggerContext.Provider>
   );
 
+  if (__DEV__ && debugName) {
+    const RootComponentWithMeaningfulName = getCachedComponentWithDebugName(
+      `${debugName}(RootComponent)`,
+    );
+    renderable = (
+      <RootComponentWithMeaningfulName>
+        {renderable}
+      </RootComponentWithMeaningfulName>
+    );
+  }
+
   performanceLogger.startTimespan('renderApplication_React_render');
   performanceLogger.setExtra('usedReactFabric', fabric ? '1' : '0');
-
   if (fabric) {
-    require('../Renderer/shims/ReactFabric').render(renderable, rootTag);
+    require('../Renderer/shims/ReactFabric').render(
+      renderable,
+      rootTag,
+      null,
+      useConcurrentRoot,
+    );
   } else {
     require('../Renderer/shims/ReactNative').render(renderable, rootTag);
   }
diff --git a/Libraries/ReactPrivate/ReactNativePrivateInterface.js b/Libraries/ReactPrivate/ReactNativePrivateInterface.js
index d67720d28fe1a7..7e8abb94c78676 100644
--- a/Libraries/ReactPrivate/ReactNativePrivateInterface.js
+++ b/Libraries/ReactPrivate/ReactNativePrivateInterface.js
@@ -18,7 +18,9 @@ import typeof UIManager from '../ReactNative/UIManager';
 import typeof deepDiffer from '../Utilities/differ/deepDiffer';
 import typeof deepFreezeAndThrowOnMutationInDev from '../Utilities/deepFreezeAndThrowOnMutationInDev';
 import typeof flattenStyle from '../StyleSheet/flattenStyle';
+import {type DangerouslyImpreciseStyleProp} from '../StyleSheet/StyleSheet';
 import typeof ReactFiberErrorDialog from '../Core/ReactFiberErrorDialog';
+import typeof legacySendAccessibilityEvent from '../Components/AccessibilityInfo/legacySendAccessibilityEvent';
 
 // flowlint unsafe-getters-setters:off
 module.exports = {
@@ -47,15 +49,17 @@ module.exports = {
     return require('../Utilities/differ/deepDiffer');
   },
   get deepFreezeAndThrowOnMutationInDev(): deepFreezeAndThrowOnMutationInDev<
-    // $FlowFixMe - can't properly parameterize the getter's type
-    *,
+    {...} | Array<mixed>,
   > {
     return require('../Utilities/deepFreezeAndThrowOnMutationInDev');
   },
-  get flattenStyle(): flattenStyle {
+  get flattenStyle(): flattenStyle<DangerouslyImpreciseStyleProp> {
     return require('../StyleSheet/flattenStyle');
   },
   get ReactFiberErrorDialog(): ReactFiberErrorDialog {
-    return require('../Core/ReactFiberErrorDialog');
+    return require('../Core/ReactFiberErrorDialog').default;
+  },
+  get legacySendAccessibilityEvent(): legacySendAccessibilityEvent {
+    return require('../Components/AccessibilityInfo/legacySendAccessibilityEvent');
   },
 };
diff --git a/Libraries/Reliability/UserFlow.js b/Libraries/Reliability/UserFlow.js
index 5116e2af3f6431..c6206df5771644 100644
--- a/Libraries/Reliability/UserFlow.js
+++ b/Libraries/Reliability/UserFlow.js
@@ -34,7 +34,7 @@ export type PointData = $Shape<{
  * Example:
  * const flowId = UserFlow.newFlowId(QuickLogItentifiersExample.EXAMPLE_EVENT);
  * ...
- * UserFlow.start(flowId, "user_click");
+ * UserFlow.start(flowId, {triggerSource: "user_click", cancelOnBackground: true});
  * ...
  * UserFlow.addAnnotation(flowId, "cached", "true");
  * ...
@@ -53,7 +53,7 @@ const UserFlow = {
     var resolvedInstanceKey = instanceKey;
     if (instanceKey === AUTO_INSTANCE_KEY) {
       if (global.nativeUserFlowNextInstanceKey) {
-        resolvedInstanceKey = global.nativeUserFlowNextInstanceKey();
+        resolvedInstanceKey = global.nativeUserFlowNextInstanceKey(markerId);
       } else {
         // There is no JSI methods installed, API won't do anything
         resolvedInstanceKey = 0;
@@ -65,12 +65,27 @@ const UserFlow = {
     };
   },
 
-  start(flowId: FlowId, triggerSource: string): void {
+  /**
+   * Starts new flow.
+   * Example:
+   * UserFlow.start(flowId, {triggerSource: 'user_click', cancelOnBackground: true})
+   *
+   * Specify triggerSource as a place where your flow has started.
+   * Specify if flow should be automatically cancelled if applicaton goes to background.
+   * It is recommended to use true for cancelOnBackground - this reduces amount of lost flows due to instrumentation mistakes.
+   * Only if you know that your flow should survive app backgrounding - use false. This includes cases of tracking cross application interactions.
+   *
+   */
+  start(
+    flowId: FlowId,
+    options: {triggerSource: string, cancelOnBackground: boolean},
+  ): void {
     if (global.nativeUserFlowStart) {
       global.nativeUserFlowStart(
         flowId.markerId,
         flowId.instanceKey,
-        triggerSource,
+        options.triggerSource,
+        options.cancelOnBackground,
       );
     }
   },
@@ -107,6 +122,13 @@ const UserFlow = {
     }
   },
 
+  /**
+   * Completes flow as failed
+   *
+   * ErrorName should be short and easily categorazable (it is attached as point to the UserFlow and can be used for aggregations).
+   * For example: io_error, network_error, parse_error, validation_error.
+   * DebugInfo is free-form string, where you can attach detailed error message. It is attached as data to the point (see ErrorName).
+   */
   endFailure(
     flowId: FlowId,
     errorName: string,
diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 25abc612cfd324..280c372baf4449 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-4e5d7faf54b38ebfc7a2dcadbd09a25d6f330ac0
\ No newline at end of file
+bd5bf555e1167e7088a4391e5cd419dccb39714c
\ No newline at end of file
diff --git a/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
index bf59a6a287948b..7d7d9908ca0cb4 100644
--- a/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
+++ b/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
@@ -7,7 +7,7 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated
+ * @generated SignedSource<<0105b67942f03415395650d296aa846a>>
  */
 
 'use strict';
@@ -19,8 +19,8 @@ if (__DEV__) {
 var React = require("react");
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface");
+var dynamicFlags = require("ReactNativeInternalFeatureFlags");
 var Scheduler = require("scheduler");
-var tracing = require("scheduler/tracing");
 
 var ReactSharedInternals =
   React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
@@ -380,6 +380,12 @@ function clearCaughtError() {
   }
 }
 
+var isArrayImpl = Array.isArray; // eslint-disable-next-line no-redeclare
+
+function isArray(a) {
+  return isArrayImpl(a);
+}
+
 var getFiberCurrentPropsFromNode = null;
 var getInstanceFromNode = null;
 var getNodeFromInstance = null;
@@ -407,13 +413,13 @@ var validateEventDispatches;
   validateEventDispatches = function(event) {
     var dispatchListeners = event._dispatchListeners;
     var dispatchInstances = event._dispatchInstances;
-    var listenersIsArr = Array.isArray(dispatchListeners);
+    var listenersIsArr = isArray(dispatchListeners);
     var listenersLen = listenersIsArr
       ? dispatchListeners.length
       : dispatchListeners
       ? 1
       : 0;
-    var instancesIsArr = Array.isArray(dispatchInstances);
+    var instancesIsArr = isArray(dispatchInstances);
     var instancesLen = instancesIsArr
       ? dispatchInstances.length
       : dispatchInstances
@@ -450,7 +456,7 @@ function executeDispatchesInOrder(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -481,7 +487,7 @@ function executeDispatchesInOrderStopAtTrueImpl(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -527,7 +533,7 @@ function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners;
   var dispatchInstance = event._dispatchInstances;
 
-  if (!!Array.isArray(dispatchListener)) {
+  if (!!isArray(dispatchListener)) {
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   }
 
@@ -1084,8 +1090,19 @@ function printTouchBank() {
   return printed;
 }
 
+var instrumentationCallback;
 var ResponderTouchHistoryStore = {
+  /**
+   * Registers a listener which can be used to instrument every touch event.
+   */
+  instrument: function(callback) {
+    instrumentationCallback = callback;
+  },
   recordTouchTrack: function(topLevelType, nativeEvent) {
+    if (instrumentationCallback != null) {
+      instrumentationCallback(topLevelType, nativeEvent);
+    }
+
     if (isMoveish(topLevelType)) {
       nativeEvent.changedTouches.forEach(recordTouchMove);
     } else if (isStartish(topLevelType)) {
@@ -1143,11 +1160,11 @@ function accumulate(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
+  if (isArray(current)) {
     return current.concat(next);
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     return [current].concat(next);
   }
 
@@ -1179,8 +1196,8 @@ function accumulateInto(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) {
+  if (isArray(current)) {
+    if (isArray(next)) {
       current.push.apply(current, next);
       return current;
     }
@@ -1189,7 +1206,7 @@ function accumulateInto(current, next) {
     return current;
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     // A bit too dangerous to mutate `next`.
     return [current].concat(next);
   }
@@ -1237,11 +1254,10 @@ var LazyComponent = 16;
 var IncompleteClassComponent = 17;
 var DehydratedFragment = 18;
 var SuspenseListComponent = 19;
-var FundamentalComponent = 20;
 var ScopeComponent = 21;
-var Block = 22;
-var OffscreenComponent = 23;
-var LegacyHiddenComponent = 24;
+var OffscreenComponent = 22;
+var LegacyHiddenComponent = 23;
+var CacheComponent = 24;
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -2494,14 +2510,40 @@ function getFiberCurrentPropsFromNode$1(inst) {
 // Module provided by RN:
 var ReactFabricGlobalResponderHandler = {
   onChange: function(from, to, blockNativeResponder) {
-    if (to !== null) {
-      var tag = to.stateNode.canonical._nativeTag;
-      ReactNativePrivateInterface.UIManager.setJSResponder(
-        tag,
-        blockNativeResponder
-      );
+    var fromOrTo = from || to;
+    var fromOrToStateNode = fromOrTo && fromOrTo.stateNode;
+    var isFabric = !!(
+      fromOrToStateNode && fromOrToStateNode.canonical._internalInstanceHandle
+    );
+
+    if (isFabric) {
+      if (from) {
+        // equivalent to clearJSResponder
+        nativeFabricUIManager.setIsJSResponder(
+          from.stateNode.node,
+          false,
+          blockNativeResponder || false
+        );
+      }
+
+      if (to) {
+        // equivalent to setJSResponder
+        nativeFabricUIManager.setIsJSResponder(
+          to.stateNode.node,
+          true,
+          blockNativeResponder || false
+        );
+      }
     } else {
-      ReactNativePrivateInterface.UIManager.clearJSResponder();
+      if (to !== null) {
+        var tag = to.stateNode.canonical._nativeTag;
+        ReactNativePrivateInterface.UIManager.setJSResponder(
+          tag,
+          blockNativeResponder
+        );
+      } else {
+        ReactNativePrivateInterface.UIManager.clearJSResponder();
+      }
     }
   }
 };
@@ -2548,14 +2590,12 @@ var REACT_SUSPENSE_TYPE = 0xead1;
 var REACT_SUSPENSE_LIST_TYPE = 0xead8;
 var REACT_MEMO_TYPE = 0xead3;
 var REACT_LAZY_TYPE = 0xead4;
-var REACT_BLOCK_TYPE = 0xead9;
-var REACT_SERVER_BLOCK_TYPE = 0xeada;
-var REACT_FUNDAMENTAL_TYPE = 0xead5;
 var REACT_SCOPE_TYPE = 0xead7;
 var REACT_OPAQUE_ID_TYPE = 0xeae0;
 var REACT_DEBUG_TRACING_MODE_TYPE = 0xeae1;
 var REACT_OFFSCREEN_TYPE = 0xeae2;
 var REACT_LEGACY_HIDDEN_TYPE = 0xeae3;
+var REACT_CACHE_TYPE = 0xeae4;
 
 if (typeof Symbol === "function" && Symbol.for) {
   var symbolFor = Symbol.for;
@@ -2571,14 +2611,12 @@ if (typeof Symbol === "function" && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
-  REACT_SERVER_BLOCK_TYPE = symbolFor("react.server.block");
-  REACT_FUNDAMENTAL_TYPE = symbolFor("react.fundamental");
   REACT_SCOPE_TYPE = symbolFor("react.scope");
   REACT_OPAQUE_ID_TYPE = symbolFor("react.opaque.id");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
@@ -2600,18 +2638,23 @@ function getIteratorFn(maybeIterable) {
 }
 
 function getWrappedName(outerType, innerType, wrapperName) {
+  var displayName = outerType.displayName;
+
+  if (displayName) {
+    return displayName;
+  }
+
   var functionName = innerType.displayName || innerType.name || "";
-  return (
-    outerType.displayName ||
-    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
-  );
-}
+  return functionName !== ""
+    ? wrapperName + "(" + functionName + ")"
+    : wrapperName;
+} // Keep in sync with react-reconciler/getComponentNameFromFiber
 
 function getContextName(type) {
   return type.displayName || "Context";
-}
+} // Note that the reconciler package should generally prefer to use getComponentNameFromFiber() instead.
 
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (type == null) {
     // Host root, text node or just invalid type.
     return null;
@@ -2620,7 +2663,7 @@ function getComponentName(type) {
   {
     if (typeof type.tag === "number") {
       error(
-        "Received an unexpected object in getComponentName(). " +
+        "Received an unexpected object in getComponentNameFromType(). " +
           "This is likely a bug in React. Please file an issue."
       );
     }
@@ -2652,6 +2695,9 @@ function getComponentName(type) {
 
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
 
   if (typeof type === "object") {
@@ -2668,10 +2714,13 @@ function getComponentName(type) {
         return getWrappedName(type, type.render, "ForwardRef");
 
       case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
+        var outerName = type.displayName || null;
+
+        if (outerName !== null) {
+          return outerName;
+        }
 
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
+        return getComponentNameFromType(type.type) || "Memo";
 
       case REACT_LAZY_TYPE: {
         var lazyComponent = type;
@@ -2679,7 +2728,7 @@ function getComponentName(type) {
         var init = lazyComponent._init;
 
         try {
-          return getComponentName(init(payload));
+          return getComponentNameFromType(init(payload));
         } catch (x) {
           return null;
         }
@@ -2690,10 +2739,118 @@ function getComponentName(type) {
   return null;
 }
 
-// The rest of the flags are static for better dead code elimination.
+function getWrappedName$1(outerType, innerType, wrapperName) {
+  var functionName = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
+  );
+} // Keep in sync with shared/getComponentNameFromType
+
+function getContextName$1(type) {
+  return type.displayName || "Context";
+}
+
+function getComponentNameFromFiber(fiber) {
+  var tag = fiber.tag,
+    type = fiber.type;
+
+  switch (tag) {
+    case CacheComponent:
+      return "Cache";
+
+    case ContextConsumer:
+      var context = type;
+      return getContextName$1(context) + ".Consumer";
+
+    case ContextProvider:
+      var provider = type;
+      return getContextName$1(provider._context) + ".Provider";
+
+    case DehydratedFragment:
+      return "DehydratedFragment";
+
+    case ForwardRef:
+      return getWrappedName$1(type, type.render, "ForwardRef");
+
+    case Fragment:
+      return "Fragment";
+
+    case HostComponent:
+      // Host component type is the display name (e.g. "div", "View")
+      return type;
+
+    case HostPortal:
+      return "Portal";
+
+    case HostRoot:
+      return "Root";
+
+    case HostText:
+      return "Text";
+
+    case LazyComponent:
+      // Name comes from the type in this case; we don't have a tag.
+      return getComponentNameFromType(type);
+
+    case LegacyHiddenComponent:
+      return "LegacyHidden";
+
+    case Mode:
+      if (type === REACT_STRICT_MODE_TYPE) {
+        // Don't be less specific than shared/getComponentNameFromType
+        return "StrictMode";
+      }
+
+      return "Mode";
+
+    case OffscreenComponent:
+      return "Offscreen";
+
+    case Profiler:
+      return "Profiler";
+
+    case ScopeComponent:
+      return "Scope";
+
+    case SuspenseComponent:
+      return "Suspense";
+
+    case SuspenseListComponent:
+      return "SuspenseList";
+    // The display name for this tags come from the user-provided type:
+
+    case ClassComponent:
+    case FunctionComponent:
+    case IncompleteClassComponent:
+    case IndeterminateComponent:
+    case MemoComponent:
+    case SimpleMemoComponent:
+      if (typeof type === "function") {
+        return type.displayName || type.name || null;
+      }
+
+      if (typeof type === "string") {
+        return type;
+      }
+
+      break;
+  }
+
+  return null;
+}
+
+// Re-export dynamic flags from the internal module. Intentionally using *
+// the exports object every time a flag is read.
+
+var enablePersistentOffscreenHostContainer =
+  dynamicFlags.enablePersistentOffscreenHostContainer; // The rest of the flags are static for better dead code elimination.
 var enableProfilerTimer = true;
+var enableProfilerCommitHooks = true;
+var enableLazyElements = false;
 var warnAboutStringRefs = false;
 var enableNewReconciler = false;
+var enableLazyContextPropagation = false;
 
 // Don't change these two values. They're used by React Dev Tools.
 var NoFlags =
@@ -2711,53 +2868,95 @@ var Update =
   4;
 var PlacementAndUpdate =
   /*           */
-  6;
-var Deletion =
-  /*                     */
-  8;
+  Placement | Update;
+var ChildDeletion =
+  /*                */
+  16;
 var ContentReset =
   /*                 */
-  16;
+  32;
 var Callback =
   /*                     */
-  32;
+  64;
 var DidCapture =
   /*                   */
-  64;
+  128;
 var Ref =
   /*                          */
-  128;
+  256;
 var Snapshot =
   /*                     */
-  256;
+  512;
 var Passive =
   /*                      */
-  512;
+  1024;
 var Hydrating =
   /*                    */
-  1024;
+  2048;
 var HydratingAndUpdate =
   /*           */
-  1028;
+  Hydrating | Update;
+var Visibility =
+  /*                   */
+  4096;
 var LifecycleEffectMask = Passive | Update | Callback | Ref | Snapshot; // Union of all commit flags (flags with the lifetime of a particular commit)
 
 var HostEffectMask =
   /*               */
-  4095; // These are not really side effects, but we still reuse this field.
+  8191; // These are not really side effects, but we still reuse this field.
 
 var Incomplete =
   /*                   */
-  4096;
+  8192;
 var ShouldCapture =
   /*                */
-  8192; // TODO (effects) Remove this bit once the new reconciler is synced to the old.
-
-var PassiveUnmountPendingDev =
-  /*     */
   16384;
 var ForceUpdateForLegacySuspense =
   /* */
-  32768; // Static tags describe aspects of a fiber that are not specific to a render,
+  32768;
+// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
+// This enables us to defer more work in the unmount case,
+// since we can defer traversing the tree during layout to look for Passive effects,
+// and instead rely on the static flag as a signal that there may be cleanup work.
+
+var RefStatic =
+  /*                    */
+  262144;
+var LayoutStatic =
+  /*                 */
+  524288;
+var PassiveStatic =
+  /*                */
+  1048576; // These flags allow us to traverse to fibers that have effects on mount
+// without traversing the entire tree after every commit for
+// double invoking
+
+var MountLayoutDev =
+  /*               */
+  2097152;
+var MountPassiveDev =
+  /*              */
+  4194304; // Groups of flags that are used in the commit phase to skip over trees that
+// don't contain effects, by checking subtreeFlags.
+
+var BeforeMutationMask = // TODO: Remove Update flag from before mutation phase by re-landing Visibility
+  // flag logic (see #20043)
+  Update | Snapshot | 0;
+var MutationMask =
+  Placement |
+  Update |
+  ChildDeletion |
+  ContentReset |
+  Ref |
+  Hydrating |
+  Visibility;
+var LayoutMask = Update | Callback | Ref | Visibility; // TODO: Split into PassiveMountMask and PassiveUnmountMask
+
+var PassiveMask = Passive | ChildDeletion; // Union of tags that don't get reset on clones.
+// This allows certain concepts to persist without recalculating them,
+// e.g. whether a subtree contains passive effects or portals.
+
+var StaticMask = LayoutStatic | PassiveStatic | RefStatic;
 
 var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 function getNearestMountedFiber(fiber) {
@@ -2814,7 +3013,7 @@ function isMounted(component) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(ownerFiber.type) || "A component"
+          getComponentNameFromFiber(ownerFiber) || "A component"
         );
       }
 
@@ -2997,54 +3196,30 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   var currentParent = findCurrentFiberUsingSlowPath(parent);
+  return currentParent !== null
+    ? findCurrentHostFiberImpl(currentParent)
+    : null;
+}
 
-  if (!currentParent) {
-    return null;
-  } // Next we'll drill down this component to find the first HostComponent/Text.
-
-  var node = currentParent;
-
-  while (true) {
-    if (node.tag === HostComponent || node.tag === HostText) {
-      return node;
-    } else if (node.child) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-
-    if (node === currentParent) {
-      return null;
-    }
-
-    while (!node.sibling) {
-      if (!node.return || node.return === currentParent) {
-        return null;
-      }
-
-      node = node.return;
-    }
+function findCurrentHostFiberImpl(node) {
+  // Next we'll drill down this component to find the first HostComponent/Text.
+  if (node.tag === HostComponent || node.tag === HostText) {
+    return node;
+  }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
-  } // Flow needs the return null here, but ESLint complains about it.
-  // eslint-disable-next-line no-unreachable
+  var child = node.child;
 
-  return null;
-}
-function doesFiberContain(parentFiber, childFiber) {
-  var node = childFiber;
-  var parentFiberAlternate = parentFiber.alternate;
+  while (child !== null) {
+    var match = findCurrentHostFiberImpl(child);
 
-  while (node !== null) {
-    if (node === parentFiber || node === parentFiberAlternate) {
-      return true;
+    if (match !== null) {
+      return match;
     }
 
-    node = node.return;
+    child = child.sibling;
   }
 
-  return false;
+  return null;
 }
 
 /**
@@ -3115,7 +3290,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node)) {
+  if (isArray(node)) {
     var i = node.length;
 
     while (i-- && removedKeyCount > 0) {
@@ -3240,12 +3415,12 @@ function diffNestedProperty(
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp)) {
+  if (!isArray(prevProp) && !isArray(nextProp)) {
     // Both are leaves, we can diff the leaves.
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
   }
 
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArray(prevProp) && isArray(nextProp)) {
     // Both are arrays, we can diff the arrays.
     return diffNestedArrayProperty(
       updatePayload,
@@ -3255,7 +3430,7 @@ function diffNestedProperty(
     );
   }
 
-  if (Array.isArray(prevProp)) {
+  if (isArray(prevProp)) {
     return diffProperties(
       updatePayload, // $FlowFixMe - We know that this is always an object when the input is.
       ReactNativePrivateInterface.flattenStyle(prevProp), // $FlowFixMe - We know that this isn't an array because of above flow.
@@ -3282,7 +3457,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(nextProp)) {
+  if (!isArray(nextProp)) {
     // Add each property of the leaf.
     return addProperties(updatePayload, nextProp, validAttributes);
   }
@@ -3308,7 +3483,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp)) {
+  if (!isArray(prevProp)) {
     // Add each property of the leaf.
     return clearProperties(updatePayload, prevProp, validAttributes);
   }
@@ -3544,6 +3719,7 @@ function diff(prevProps, nextProps, validAttributes) {
 var batchedUpdatesImpl = function(fn, bookkeeping) {
   return fn(bookkeeping);
 };
+
 var isInsideEventHandler = false;
 function batchedUpdates(fn, bookkeeping) {
   if (isInsideEventHandler) {
@@ -3560,12 +3736,7 @@ function batchedUpdates(fn, bookkeeping) {
     isInsideEventHandler = false;
   }
 }
-function setBatchingImplementation(
-  _batchedUpdatesImpl,
-  _discreteUpdatesImpl,
-  _flushDiscreteUpdatesImpl,
-  _batchedEventUpdatesImpl
-) {
+function setBatchingImplementation(_batchedUpdatesImpl, _discreteUpdatesImpl) {
   batchedUpdatesImpl = _batchedUpdatesImpl;
 }
 
@@ -3697,2033 +3868,2039 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
   // where it would do it.
 }
 
-// can re-export everything from this module.
+// This module only exists as an ESM wrapper around the external CommonJS
+var scheduleCallback = Scheduler.unstable_scheduleCallback;
+var cancelCallback = Scheduler.unstable_cancelCallback;
+var shouldYield = Scheduler.unstable_shouldYield;
+var requestPaint = Scheduler.unstable_requestPaint;
+var now = Scheduler.unstable_now;
+var ImmediatePriority = Scheduler.unstable_ImmediatePriority;
+var UserBlockingPriority = Scheduler.unstable_UserBlockingPriority;
+var NormalPriority = Scheduler.unstable_NormalPriority;
+var IdlePriority = Scheduler.unstable_IdlePriority;
 
-function shim() {
-  {
-    throw Error(
-      "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
-    );
+var rendererID = null;
+var injectedHook = null;
+var hasLoggedError = false;
+var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
   }
-} // Mutation (when unsupported)
-
-var supportsMutation = false;
-var commitMount = shim;
-var clearContainer = shim;
 
-// can re-export everything from this module.
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
 
-function shim$1() {
-  {
-    throw Error(
-      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
-    );
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
   }
-} // Hydration (when unsupported)
-var isSuspenseInstancePending = shim$1;
-var isSuspenseInstanceFallback = shim$1;
-var hydrateTextInstance = shim$1;
 
-var _nativeFabricUIManage = nativeFabricUIManager,
-  createNode = _nativeFabricUIManage.createNode,
-  cloneNode = _nativeFabricUIManage.cloneNode,
-  cloneNodeWithNewChildren = _nativeFabricUIManage.cloneNodeWithNewChildren,
-  cloneNodeWithNewChildrenAndProps =
-    _nativeFabricUIManage.cloneNodeWithNewChildrenAndProps,
-  cloneNodeWithNewProps = _nativeFabricUIManage.cloneNodeWithNewProps,
-  createChildNodeSet = _nativeFabricUIManage.createChildSet,
-  appendChildNode = _nativeFabricUIManage.appendChild,
-  appendChildNodeToSet = _nativeFabricUIManage.appendChildToSet,
-  completeRoot = _nativeFabricUIManage.completeRoot,
-  registerEventHandler = _nativeFabricUIManage.registerEventHandler,
-  fabricMeasure = _nativeFabricUIManage.measure,
-  fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
-  fabricMeasureLayout = _nativeFabricUIManage.measureLayout;
-var getViewConfigForType =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
-// % 10 === 1 means it is a rootTag.
-// % 2 === 0 means it is a Fabric tag.
-// This means that they never overlap.
+  if (!hook.supportsFiber) {
+    {
+      error(
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://reactjs.org/link/react-devtools"
+      );
+    } // DevTools exists, even though it doesn't support Fiber.
 
-var nextReactTag = 2;
+    return true;
+  }
 
-// TODO: Remove this conditional once all changes have propagated.
-if (registerEventHandler) {
-  /**
-   * Register the event emitter with the native bridge
-   */
-  registerEventHandler(dispatchEvent);
-}
-/**
- * This is used for refs on host components.
- */
+  try {
+    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
 
-var ReactFabricHostComponent = /*#__PURE__*/ (function() {
-  function ReactFabricHostComponent(
-    tag,
-    viewConfig,
-    props,
-    internalInstanceHandle
-  ) {
-    this._nativeTag = tag;
-    this.viewConfig = viewConfig;
-    this.currentProps = props;
-    this._internalInstanceHandle = internalInstanceHandle;
+    injectedHook = hook;
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      error("React instrumentation encountered an error: %s.", err);
+    }
   }
 
-  var _proto = ReactFabricHostComponent.prototype;
-
-  _proto.blur = function blur() {
-    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
-  };
-
-  _proto.focus = function focus() {
-    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
-  };
-
-  _proto.measure = function measure(callback) {
-    fabricMeasure(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-
-  _proto.measureInWindow = function measureInWindow(callback) {
-    fabricMeasureInWindow(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-
-  _proto.measureLayout = function measureLayout(
-    relativeToNativeNode,
-    onSuccess,
-    onFail
-  ) /* currently unused */
+  if (hook.checkDCE) {
+    // This is the real DevTools.
+    return true;
+  } else {
+    // This is likely a hook installed by Fast Refresh runtime.
+    return false;
+  }
+}
+function onScheduleRoot(root, children) {
   {
     if (
-      typeof relativeToNativeNode === "number" ||
-      !(relativeToNativeNode instanceof ReactFabricHostComponent)
+      injectedHook &&
+      typeof injectedHook.onScheduleFiberRoot === "function"
     ) {
-      {
-        error(
-          "Warning: ref.measureLayout must be called with a ref to a native component."
-        );
-      }
+      try {
+        injectedHook.onScheduleFiberRoot(rendererID, root, children);
+      } catch (err) {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-      return;
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
     }
+  }
+}
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
+    try {
+      var didError = (root.current.flags & DidCapture) === DidCapture;
 
-    fabricMeasureLayout(
-      this._internalInstanceHandle.stateNode.node,
-      relativeToNativeNode._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-      mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
-    );
-  };
+      if (enableProfilerTimer) {
+        var schedulerPriority;
 
-  _proto.setNativeProps = function setNativeProps(nativeProps) {
-    {
-      error("Warning: setNativeProps is not currently supported in Fabric");
-    }
+        switch (eventPriority) {
+          case DiscreteEventPriority:
+            schedulerPriority = ImmediatePriority;
+            break;
 
-    return;
-  };
+          case ContinuousEventPriority:
+            schedulerPriority = UserBlockingPriority;
+            break;
 
-  return ReactFabricHostComponent;
-})(); // eslint-disable-next-line no-unused-expressions
-function appendInitialChild(parentInstance, child) {
-  appendChildNode(parentInstance.node, child.node);
-}
-function createInstance(
-  type,
-  props,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  var tag = nextReactTag;
-  nextReactTag += 2;
-  var viewConfig = getViewConfigForType(type);
+          case DefaultEventPriority:
+            schedulerPriority = NormalPriority;
+            break;
 
-  {
-    for (var key in viewConfig.validAttributes) {
-      if (props.hasOwnProperty(key)) {
-        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
-          props[key]
+          case IdleEventPriority:
+            schedulerPriority = IdlePriority;
+            break;
+
+          default:
+            schedulerPriority = NormalPriority;
+            break;
+        }
+
+        injectedHook.onCommitFiberRoot(
+          rendererID,
+          root,
+          schedulerPriority,
+          didError
         );
+      } else {
+        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
       }
-    }
-  }
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  var updatePayload = create(props, viewConfig.validAttributes);
-  var node = createNode(
-    tag, // reactTag
-    viewConfig.uiViewClassName, // viewName
-    rootContainerInstance, // rootTag
-    updatePayload, // props
-    internalInstanceHandle // internalInstanceHandle
-  );
-  var component = new ReactFabricHostComponent(
-    tag,
-    viewConfig,
-    props,
-    internalInstanceHandle
-  );
-  return {
-    node: node,
-    canonical: component
-  };
-}
-function createTextInstance(
-  text,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  if (!hostContext.isInAParentText) {
-    throw Error("Text strings must be rendered within a <Text> component.");
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
-
-  var tag = nextReactTag;
-  nextReactTag += 2;
-  var node = createNode(
-    tag, // reactTag
-    "RCTRawText", // viewName
-    rootContainerInstance, // rootTag
-    {
-      text: text
-    }, // props
-    internalInstanceHandle // instance handle
-  );
-  return {
-    node: node
-  };
 }
-function getRootHostContext(rootContainerInstance) {
-  return {
-    isInAParentText: false
-  };
-}
-function getChildHostContext(parentHostContext, type, rootContainerInstance) {
-  var prevIsInAParentText = parentHostContext.isInAParentText;
-  var isInAParentText =
-    type === "AndroidTextInput" || // Android
-    type === "RCTMultilineTextInputView" || // iOS
-    type === "RCTSinglelineTextInputView" || // iOS
-    type === "RCTText" ||
-    type === "RCTVirtualText";
+function onPostCommitRoot(root) {
+  if (
+    injectedHook &&
+    typeof injectedHook.onPostCommitFiberRoot === "function"
+  ) {
+    try {
+      injectedHook.onPostCommitFiberRoot(rendererID, root);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (prevIsInAParentText !== isInAParentText) {
-    return {
-      isInAParentText: isInAParentText
-    };
-  } else {
-    return parentHostContext;
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function getPublicInstance(instance) {
-  return instance.canonical;
-}
-function prepareForCommit(containerInfo) {
-  // Noop
-  return null;
-}
-function prepareUpdate(
-  instance,
-  type,
-  oldProps,
-  newProps,
-  rootContainerInstance,
-  hostContext
-) {
-  var viewConfig = instance.canonical.viewConfig;
-  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // TODO: If the event handlers have changed, we need to update the current props
-  // in the commit phase but there is no host config hook to do it yet.
-  // So instead we hack it by updating it in the render phase.
-
-  instance.canonical.currentProps = newProps;
-  return updatePayload;
-}
-function resetAfterCommit(containerInfo) {
-  // Noop
-}
-function shouldSetTextContent(type, props) {
-  // TODO (bvaughn) Revisit this decision.
-  // Always returning false simplifies the createInstance() implementation,
-  // But creates an additional child Fiber for raw text children.
-  // No additional native views are created though.
-  // It's not clear to me which is better so I'm deferring for now.
-  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
-  return false;
-} // The Fabric renderer is secondary to the existing React Native renderer.
-var scheduleTimeout = setTimeout;
-var cancelTimeout = clearTimeout;
-var noTimeout = -1; // -------------------
-function cloneInstance(
-  instance,
-  updatePayload,
-  type,
-  oldProps,
-  newProps,
-  internalInstanceHandle,
-  keepChildren,
-  recyclableInstance
-) {
-  var node = instance.node;
-  var clone;
+function onCommitUnmount(fiber) {
+  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
+    try {
+      injectedHook.onCommitFiberUnmount(rendererID, fiber);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (keepChildren) {
-    if (updatePayload !== null) {
-      clone = cloneNodeWithNewProps(node, updatePayload);
-    } else {
-      clone = cloneNode(node);
-    }
-  } else {
-    if (updatePayload !== null) {
-      clone = cloneNodeWithNewChildrenAndProps(node, updatePayload);
-    } else {
-      clone = cloneNodeWithNewChildren(node);
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
     }
   }
-
-  return {
-    node: clone,
-    canonical: instance.canonical
-  };
 }
-function cloneHiddenInstance(instance, type, props, internalInstanceHandle) {
-  var viewConfig = instance.canonical.viewConfig;
-  var node = instance.node;
-  var updatePayload = create(
-    {
-      style: {
-        display: "none"
-      }
-    },
-    viewConfig.validAttributes
-  );
-  return {
-    node: cloneNodeWithNewProps(node, updatePayload),
-    canonical: instance.canonical
-  };
-}
-function cloneHiddenTextInstance(instance, text, internalInstanceHandle) {
-  throw new Error("Not yet implemented.");
-}
-function createContainerChildSet(container) {
-  return createChildNodeSet(container);
-}
-function appendChildToContainerChildSet(childSet, child) {
-  appendChildNodeToSet(childSet, child.node);
-}
-function finalizeContainerChildren(container, newChildren) {
-  completeRoot(container, newChildren);
-}
-function makeClientIdInDEV(warnOnAccessInDEV) {
-  throw new Error("Not yet implemented");
-}
-function preparePortalMount(portalInstance) {
-  // noop
-}
-
-// Helpers to patch console.logs to avoid logging during side-effect free
-// replaying on render function. This currently only patches the object
-// lazily which won't cover if the log function was extracted eagerly.
-// We could also eagerly patch the method.
-var disabledDepth = 0;
-var prevLog;
-var prevInfo;
-var prevWarn;
-var prevError;
-var prevGroup;
-var prevGroupCollapsed;
-var prevGroupEnd;
 
-function disabledLog() {}
+var NoMode =
+  /*                         */
+  0; // TODO: Remove ConcurrentMode by reading from the root tag instead
 
-disabledLog.__reactDisabledLog = true;
-function disableLogs() {
-  {
-    if (disabledDepth === 0) {
-      /* eslint-disable react-internal/no-production-logging */
-      prevLog = console.log;
-      prevInfo = console.info;
-      prevWarn = console.warn;
-      prevError = console.error;
-      prevGroup = console.group;
-      prevGroupCollapsed = console.groupCollapsed;
-      prevGroupEnd = console.groupEnd; // https://github.com/facebook/react/issues/19099
+var ConcurrentMode =
+  /*                 */
+  1;
+var ProfileMode =
+  /*                    */
+  2;
+var DebugTracingMode =
+  /*               */
+  4;
+var StrictLegacyMode =
+  /*               */
+  8;
+var StrictEffectsMode =
+  /*              */
+  16;
+var ConcurrentUpdatesByDefaultMode =
+  /* */
+  32;
 
-      var props = {
-        configurable: true,
-        enumerable: true,
-        value: disabledLog,
-        writable: true
-      }; // $FlowFixMe Flow thinks console is immutable.
+// If those values are changed that package should be rebuilt and redeployed.
 
-      Object.defineProperties(console, {
-        info: props,
-        log: props,
-        warn: props,
-        error: props,
-        group: props,
-        groupCollapsed: props,
-        groupEnd: props
-      });
-      /* eslint-enable react-internal/no-production-logging */
-    }
+var TotalLanes = 31;
+var NoLanes =
+  /*                        */
+  0;
+var NoLane =
+  /*                          */
+  0;
+var SyncLane =
+  /*                        */
+  1;
+var InputContinuousHydrationLane =
+  /*    */
+  2;
+var InputContinuousLane =
+  /*            */
+  4;
+var DefaultHydrationLane =
+  /*            */
+  8;
+var DefaultLane =
+  /*                    */
+  16;
+var TransitionHydrationLane =
+  /*                */
+  32;
+var TransitionLanes =
+  /*                       */
+  4194240;
+var TransitionLane1 =
+  /*                        */
+  64;
+var TransitionLane2 =
+  /*                        */
+  128;
+var TransitionLane3 =
+  /*                        */
+  256;
+var TransitionLane4 =
+  /*                        */
+  512;
+var TransitionLane5 =
+  /*                        */
+  1024;
+var TransitionLane6 =
+  /*                        */
+  2048;
+var TransitionLane7 =
+  /*                        */
+  4096;
+var TransitionLane8 =
+  /*                        */
+  8192;
+var TransitionLane9 =
+  /*                        */
+  16384;
+var TransitionLane10 =
+  /*                       */
+  32768;
+var TransitionLane11 =
+  /*                       */
+  65536;
+var TransitionLane12 =
+  /*                       */
+  131072;
+var TransitionLane13 =
+  /*                       */
+  262144;
+var TransitionLane14 =
+  /*                       */
+  524288;
+var TransitionLane15 =
+  /*                       */
+  1048576;
+var TransitionLane16 =
+  /*                       */
+  2097152;
+var RetryLanes =
+  /*                            */
+  130023424;
+var RetryLane1 =
+  /*                             */
+  4194304;
+var RetryLane2 =
+  /*                             */
+  8388608;
+var RetryLane3 =
+  /*                             */
+  16777216;
+var RetryLane4 =
+  /*                             */
+  33554432;
+var RetryLane5 =
+  /*                             */
+  67108864;
+var SomeRetryLane = RetryLane1;
+var SelectiveHydrationLane =
+  /*          */
+  134217728;
+var NonIdleLanes =
+  /*                                 */
+  268435455;
+var IdleHydrationLane =
+  /*               */
+  268435456;
+var IdleLane =
+  /*                       */
+  536870912;
+var OffscreenLane =
+  /*                   */
+  1073741824; // This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
+var NoTimestamp = -1;
+var nextTransitionLane = TransitionLane1;
+var nextRetryLane = RetryLane1;
 
-    disabledDepth++;
-  }
-}
-function reenableLogs() {
-  {
-    disabledDepth--;
+function getHighestPriorityLanes(lanes) {
+  switch (getHighestPriorityLane(lanes)) {
+    case SyncLane:
+      return SyncLane;
 
-    if (disabledDepth === 0) {
-      /* eslint-disable react-internal/no-production-logging */
-      var props = {
-        configurable: true,
-        enumerable: true,
-        writable: true
-      }; // $FlowFixMe Flow thinks console is immutable.
+    case InputContinuousHydrationLane:
+      return InputContinuousHydrationLane;
+
+    case InputContinuousLane:
+      return InputContinuousLane;
+
+    case DefaultHydrationLane:
+      return DefaultHydrationLane;
+
+    case DefaultLane:
+      return DefaultLane;
+
+    case TransitionHydrationLane:
+      return TransitionHydrationLane;
+
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return lanes & TransitionLanes;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      return lanes & RetryLanes;
+
+    case SelectiveHydrationLane:
+      return SelectiveHydrationLane;
+
+    case IdleHydrationLane:
+      return IdleHydrationLane;
+
+    case IdleLane:
+      return IdleLane;
+
+    case OffscreenLane:
+      return OffscreenLane;
 
-      Object.defineProperties(console, {
-        log: Object.assign({}, props, {
-          value: prevLog
-        }),
-        info: Object.assign({}, props, {
-          value: prevInfo
-        }),
-        warn: Object.assign({}, props, {
-          value: prevWarn
-        }),
-        error: Object.assign({}, props, {
-          value: prevError
-        }),
-        group: Object.assign({}, props, {
-          value: prevGroup
-        }),
-        groupCollapsed: Object.assign({}, props, {
-          value: prevGroupCollapsed
-        }),
-        groupEnd: Object.assign({}, props, {
-          value: prevGroupEnd
-        })
-      });
-      /* eslint-enable react-internal/no-production-logging */
-    }
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
+      } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
 
-    if (disabledDepth < 0) {
-      error(
-        "disabledDepth fell below zero. " +
-          "This is a bug in React. Please file an issue."
-      );
-    }
+      return lanes;
   }
 }
 
-var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
-function describeBuiltInComponentFrame(name, source, ownerFn) {
-  {
-    var ownerName = null;
-
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
+function getNextLanes(root, wipLanes) {
+  // Early bailout if there's no pending work left.
+  var pendingLanes = root.pendingLanes;
 
-    return describeComponentFrame(name, source, ownerName);
+  if (pendingLanes === NoLanes) {
+    return NoLanes;
   }
-}
-var componentFrameCache;
-
-{
-  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
-  componentFrameCache = new PossiblyWeakMap();
-}
-var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
 
-function describeComponentFrame(name, source, ownerName) {
-  var sourceInfo = "";
+  var nextLanes = NoLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes; // Do not work on any idle work until all the non-idle work has finished,
+  // even if the work is suspended.
 
-  if (source) {
-    var path = source.fileName;
-    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
-    // prefer "folder/index.js" instead of just "index.js".
+  var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
 
-    if (/^index\./.test(fileName)) {
-      var match = path.match(BEFORE_SLASH_RE);
+  if (nonIdlePendingLanes !== NoLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
 
-      if (match) {
-        var pathBeforeSlash = match[1];
+    if (nonIdleUnblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
+    } else {
+      var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
 
-        if (pathBeforeSlash) {
-          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
-          fileName = folderName + "/" + fileName;
-        }
+      if (nonIdlePingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
       }
     }
+  } else {
+    // The only remaining work is Idle.
+    var unblockedLanes = pendingLanes & ~suspendedLanes;
 
-    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
-  } else if (ownerName) {
-    sourceInfo = " (created by " + ownerName + ")";
+    if (unblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(unblockedLanes);
+    } else {
+      if (pingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(pingedLanes);
+      }
+    }
   }
 
-  return "\n    in " + (name || "Unknown") + sourceInfo;
-}
+  if (nextLanes === NoLanes) {
+    // This should only be reachable if we're suspended
+    // TODO: Consider warning in this path if a fallback timer is not scheduled.
+    return NoLanes;
+  } // If we're already in the middle of a render, switching lanes will interrupt
+  // it and we'll lose our progress. We should only do this if the new lanes are
+  // higher priority.
 
-function describeClassComponentFrame(ctor, source, ownerFn) {
-  {
-    return describeFunctionComponentFrame(ctor, source, ownerFn);
-  }
-}
-function describeFunctionComponentFrame(fn, source, ownerFn) {
-  {
-    if (!fn) {
-      return "";
+  if (
+    wipLanes !== NoLanes &&
+    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
+    // bother waiting until the root is complete.
+    (wipLanes & suspendedLanes) === NoLanes
+  ) {
+    var nextLane = getHighestPriorityLane(nextLanes);
+    var wipLane = getHighestPriorityLane(wipLanes);
+
+    if (
+      // Tests whether the next lane is equal or lower priority than the wip
+      // one. This works because the bits decrease in priority as you go left.
+      nextLane >= wipLane || // Default priority updates should not interrupt transition updates. The
+      // only difference between default updates and transition updates is that
+      // default updates do not support refresh transitions.
+      (nextLane === DefaultLane && (wipLane & TransitionLanes) !== NoLanes)
+    ) {
+      // Keep working on the existing in-progress tree. Do not interrupt.
+      return wipLanes;
     }
+  }
 
-    var name = fn.displayName || fn.name || null;
-    var ownerName = null;
+  if ((root.current.mode & ConcurrentUpdatesByDefaultMode) !== NoMode);
+  else if ((nextLanes & InputContinuousLane) !== NoLanes) {
+    // When updates are sync by default, we entangle continuous priority updates
+    // and default updates, so they render in the same batch. The only reason
+    // they use separate lanes is because continuous updates should interrupt
+    // transitions, but default updates should not.
+    nextLanes |= pendingLanes & DefaultLane;
+  } // Check for entangled lanes and add them to the batch.
+  //
+  // A lane is said to be entangled with another when it's not allowed to render
+  // in a batch that does not also include the other lane. Typically we do this
+  // when multiple updates have the same source, and we only want to respond to
+  // the most recent event from that source.
+  //
+  // Note that we apply entanglements *after* checking for partial work above.
+  // This means that if a lane is entangled during an interleaved event while
+  // it's already rendering, we won't interrupt it. This is intentional, since
+  // entanglement is usually "best effort": we'll try our best to render the
+  // lanes in the same batch, but it's not worth throwing out partially
+  // completed work in order to do it.
+  // TODO: Reconsider this. The counter-argument is that the partial work
+  // represents an intermediate state, which we don't want to show to the user.
+  // And by spending extra time finishing it, we're increasing the amount of
+  // time it takes to show the final state, which is what they are actually
+  // waiting for.
+  //
+  // For those exceptions where entanglement is semantically important, like
+  // useMutableSource, we should ensure that there is no partial work at the
+  // time we apply the entanglement.
 
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
+  var entangledLanes = root.entangledLanes;
 
-    return describeComponentFrame(name, source, ownerName);
+  if (entangledLanes !== NoLanes) {
+    var entanglements = root.entanglements;
+    var lanes = nextLanes & entangledLanes;
+
+    while (lanes > 0) {
+      var index = pickArbitraryLaneIndex(lanes);
+      var lane = 1 << index;
+      nextLanes |= entanglements[index];
+      lanes &= ~lane;
+    }
   }
+
+  return nextLanes;
 }
+function getMostRecentEventTime(root, lanes) {
+  var eventTimes = root.eventTimes;
+  var mostRecentEventTime = NoTimestamp;
 
-function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
-  if (type == null) {
-    return "";
-  }
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var eventTime = eventTimes[index];
 
-  if (typeof type === "function") {
-    {
-      return describeFunctionComponentFrame(type, source, ownerFn);
+    if (eventTime > mostRecentEventTime) {
+      mostRecentEventTime = eventTime;
     }
-  }
 
-  if (typeof type === "string") {
-    return describeBuiltInComponentFrame(type, source, ownerFn);
+    lanes &= ~lane;
   }
 
-  switch (type) {
-    case REACT_SUSPENSE_TYPE:
-      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
+  return mostRecentEventTime;
+}
 
-    case REACT_SUSPENSE_LIST_TYPE:
-      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
-  }
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case SyncLane:
+    case InputContinuousHydrationLane:
+    case InputContinuousLane:
+      // User interactions should expire slightly more quickly.
+      //
+      // NOTE: This is set to the corresponding constant as in Scheduler.js.
+      // When we made it larger, a product metric in www regressed, suggesting
+      // there's a user interaction that's being starved by a series of
+      // synchronous updates. If that theory is correct, the proper solution is
+      // to fix the starvation. However, this scenario supports the idea that
+      // expiration times are an important safeguard when starvation
+      // does happen.
+      return currentTime + 250;
+
+    case DefaultHydrationLane:
+    case DefaultLane:
+    case TransitionHydrationLane:
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return currentTime + 5000;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      // TODO: Retries should be allowed to expire if they are CPU bound for
+      // too long, but when I made this change it caused a spike in browser
+      // crashes. There must be some other underlying bug; not super urgent but
+      // ideally should figure out why and fix it. Unfortunately we don't have
+      // a repro for the crashes, only detected via production metrics.
+      return NoTimestamp;
+
+    case SelectiveHydrationLane:
+    case IdleHydrationLane:
+    case IdleLane:
+    case OffscreenLane:
+      // Anything idle priority or lower should never expire.
+      return NoTimestamp;
 
-  if (typeof type === "object") {
-    switch (type.$$typeof) {
-      case REACT_FORWARD_REF_TYPE:
-        return describeFunctionComponentFrame(type.render, source, ownerFn);
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
+      }
 
-      case REACT_MEMO_TYPE:
-        // Memo may contain any component type so we recursively resolve it.
-        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
+      return NoTimestamp;
+  }
+}
+
+function markStarvedLanesAsExpired(root, currentTime) {
+  // TODO: This gets called every time we yield. We can optimize by storing
+  // the earliest expiration time on the root. Then use that to quickly bail out
+  // of this function.
+  var pendingLanes = root.pendingLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes;
+  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
+  // expiration time. If so, we'll assume the update is being starved and mark
+  // it as expired to force it to finish.
 
-      case REACT_BLOCK_TYPE:
-        return describeFunctionComponentFrame(type._render, source, ownerFn);
+  var lanes = pendingLanes;
 
-      case REACT_LAZY_TYPE: {
-        var lazyComponent = type;
-        var payload = lazyComponent._payload;
-        var init = lazyComponent._init;
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var expirationTime = expirationTimes[index];
 
-        try {
-          // Lazy may contain any component type so we recursively resolve it.
-          return describeUnknownElementTypeFrameInDEV(
-            init(payload),
-            source,
-            ownerFn
-          );
-        } catch (x) {}
+    if (expirationTime === NoTimestamp) {
+      // Found a pending lane with no expiration time. If it's not suspended, or
+      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
+      // using the current time.
+      if (
+        (lane & suspendedLanes) === NoLanes ||
+        (lane & pingedLanes) !== NoLanes
+      ) {
+        // Assumes timestamps are monotonically increasing.
+        expirationTimes[index] = computeExpirationTime(lane, currentTime);
       }
+    } else if (expirationTime <= currentTime) {
+      // This lane expired
+      root.expiredLanes |= lane;
     }
-  }
 
-  return "";
-}
+    lanes &= ~lane;
+  }
+} // This returns the highest priority pending lanes regardless of whether they
+function getLanesToRetrySynchronouslyOnError(root) {
+  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
 
-var loggedTypeFailures = {};
-var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+  if (everythingButOffscreen !== NoLanes) {
+    return everythingButOffscreen;
+  }
 
-function setCurrentlyValidatingElement(element) {
-  {
-    if (element) {
-      var owner = element._owner;
-      var stack = describeUnknownElementTypeFrameInDEV(
-        element.type,
-        element._source,
-        owner ? owner.type : null
-      );
-      ReactDebugCurrentFrame.setExtraStackFrame(stack);
-    } else {
-      ReactDebugCurrentFrame.setExtraStackFrame(null);
-    }
+  if (everythingButOffscreen & OffscreenLane) {
+    return OffscreenLane;
   }
+
+  return NoLanes;
+}
+function includesNonIdleWork(lanes) {
+  return (lanes & NonIdleLanes) !== NoLanes;
 }
+function includesOnlyRetries(lanes) {
+  return (lanes & RetryLanes) === lanes;
+}
+function includesOnlyTransitions(lanes) {
+  return (lanes & TransitionLanes) === lanes;
+}
+function shouldTimeSlice(root, lanes) {
+  if ((lanes & root.expiredLanes) !== NoLanes) {
+    // At least one of these lanes expired. To prevent additional starvation,
+    // finish rendering without yielding execution.
+    return false;
+  }
 
-function checkPropTypes(typeSpecs, values, location, componentName, element) {
-  {
-    // $FlowFixMe This is okay but Flow doesn't know it.
-    var has = Function.call.bind(Object.prototype.hasOwnProperty);
+  if ((root.current.mode & ConcurrentUpdatesByDefaultMode) !== NoMode) {
+    // Concurrent updates by default always use time slicing.
+    return true;
+  }
 
-    for (var typeSpecName in typeSpecs) {
-      if (has(typeSpecs, typeSpecName)) {
-        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
-        // fail the render phase where it didn't fail before. So we log it.
-        // After these have been cleaned up, we'll let them throw.
+  var SyncDefaultLanes =
+    InputContinuousHydrationLane |
+    InputContinuousLane |
+    DefaultHydrationLane |
+    DefaultLane;
+  return (lanes & SyncDefaultLanes) === NoLanes;
+}
+function isTransitionLane(lane) {
+  return (lane & TransitionLanes) !== 0;
+}
+function claimNextTransitionLane() {
+  // Cycle through the lanes, assigning each new transition to the next lane.
+  // In most cases, this means every transition gets its own lane, until we
+  // run out of lanes and cycle back to the beginning.
+  var lane = nextTransitionLane;
+  nextTransitionLane <<= 1;
 
-        try {
-          // This is intentionally an invariant that gets caught. It's the same
-          // behavior as without this statement except with a better message.
-          if (typeof typeSpecs[typeSpecName] !== "function") {
-            var err = Error(
-              (componentName || "React class") +
-                ": " +
-                location +
-                " type `" +
-                typeSpecName +
-                "` is invalid; " +
-                "it must be a function, usually from the `prop-types` package, but received `" +
-                typeof typeSpecs[typeSpecName] +
-                "`." +
-                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
-            );
-            err.name = "Invariant Violation";
-            throw err;
-          }
+  if ((nextTransitionLane & TransitionLanes) === 0) {
+    nextTransitionLane = TransitionLane1;
+  }
 
-          error$1 = typeSpecs[typeSpecName](
-            values,
-            typeSpecName,
-            componentName,
-            location,
-            null,
-            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
-          );
-        } catch (ex) {
-          error$1 = ex;
-        }
+  return lane;
+}
+function claimNextRetryLane() {
+  var lane = nextRetryLane;
+  nextRetryLane <<= 1;
 
-        if (error$1 && !(error$1 instanceof Error)) {
-          setCurrentlyValidatingElement(element);
+  if ((nextRetryLane & RetryLanes) === 0) {
+    nextRetryLane = RetryLane1;
+  }
 
-          error(
-            "%s: type specification of %s" +
-              " `%s` is invalid; the type checker " +
-              "function must return `null` or an `Error` but returned a %s. " +
-              "You may have forgotten to pass an argument to the type checker " +
-              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
-              "shape all require an argument).",
-            componentName || "React class",
-            location,
-            typeSpecName,
-            typeof error$1
-          );
+  return lane;
+}
+function getHighestPriorityLane(lanes) {
+  return lanes & -lanes;
+}
+function pickArbitraryLane(lanes) {
+  // This wrapper function gets inlined. Only exists so to communicate that it
+  // doesn't matter which bit is selected; you can pick any bit without
+  // affecting the algorithms where its used. Here I'm using
+  // getHighestPriorityLane because it requires the fewest operations.
+  return getHighestPriorityLane(lanes);
+}
 
-          setCurrentlyValidatingElement(null);
-        }
+function pickArbitraryLaneIndex(lanes) {
+  return 31 - clz32(lanes);
+}
 
-        if (
-          error$1 instanceof Error &&
-          !(error$1.message in loggedTypeFailures)
-        ) {
-          // Only monitor this failure once because there tends to be a lot of the
-          // same error.
-          loggedTypeFailures[error$1.message] = true;
-          setCurrentlyValidatingElement(element);
-
-          error("Failed %s type: %s", location, error$1.message);
-
-          setCurrentlyValidatingElement(null);
-        }
-      }
-    }
-  }
+function laneToIndex(lane) {
+  return pickArbitraryLaneIndex(lane);
 }
 
-var valueStack = [];
-var fiberStack;
-
-{
-  fiberStack = [];
+function includesSomeLane(a, b) {
+  return (a & b) !== NoLanes;
 }
-
-var index = -1;
-
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+function isSubsetOfLanes(set, subset) {
+  return (set & subset) === subset;
 }
+function mergeLanes(a, b) {
+  return a | b;
+}
+function removeLanes(set, subset) {
+  return set & ~subset;
+}
+function intersectLanes(a, b) {
+  return a & b;
+} // Seems redundant, but it changes the type from a single lane (used for
+// updates) to a group of lanes (used for flushing work).
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      error("Unexpected pop.");
-    }
-
-    return;
-  }
+function laneToLanes(lane) {
+  return lane;
+}
+function createLaneMap(initial) {
+  // Intentionally pushing one by one.
+  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
+  var laneMap = [];
 
-  {
-    if (fiber !== fiberStack[index]) {
-      error("Unexpected Fiber popped.");
-    }
+  for (var i = 0; i < TotalLanes; i++) {
+    laneMap.push(initial);
   }
 
-  cursor.current = valueStack[index];
-  valueStack[index] = null;
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane; // If there are any suspended transitions, it's possible this new update
+  // could unblock them. Clear the suspended lanes so that we can try rendering
+  // them again.
+  //
+  // TODO: We really only need to unsuspend only lanes that are in the
+  // `subtreeLanes` of the updated fiber, or the update lanes of the return
+  // path. This would exclude suspended updates in an unrelated sibling tree,
+  // since there's no way for this update to unblock it.
+  //
+  // We don't do this if the incoming update is idle, because we never process
+  // idle updates until after all the regular updates have finished; there's no
+  // way it could unblock a transition.
 
-  {
-    fiberStack[index] = null;
+  if (updateLane !== IdleLane) {
+    root.suspendedLanes = NoLanes;
+    root.pingedLanes = NoLanes;
   }
 
-  index--;
+  var eventTimes = root.eventTimes;
+  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
+  // recent event, and we assume time is monotonically increasing.
+
+  eventTimes[index] = eventTime;
 }
+function markRootSuspended(root, suspendedLanes) {
+  root.suspendedLanes |= suspendedLanes;
+  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
 
-function push(cursor, value, fiber) {
-  index++;
-  valueStack[index] = cursor.current;
+  var expirationTimes = root.expirationTimes;
+  var lanes = suspendedLanes;
 
-  {
-    fiberStack[index] = fiber;
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
   }
-
-  cursor.current = value;
 }
-
-var warnedAboutMissingGetChildContext;
-
-{
-  warnedAboutMissingGetChildContext = {};
+function markRootPinged(root, pingedLanes, eventTime) {
+  root.pingedLanes |= root.suspendedLanes & pingedLanes;
+}
+function markRootMutableRead(root, updateLane) {
+  root.mutableReadLanes |= updateLane & root.pendingLanes;
 }
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes; // Let's try everything again
 
-var emptyContextObject = {};
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
 
-{
-  Object.freeze(emptyContextObject);
-} // A cursor to the current merged context object on the stack.
+  var entanglements = root.entanglements;
+  var eventTimes = root.eventTimes;
+  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
 
-var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
+  var lanes = noLongerPendingLanes;
 
-var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    entanglements[index] = NoLanes;
+    eventTimes[index] = NoTimestamp;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  // In addition to entangling each of the given lanes with each other, we also
+  // have to consider _transitive_ entanglements. For each lane that is already
+  // entangled with *any* of the given lanes, that lane is now transitively
+  // entangled with *all* the given lanes.
+  //
+  // Translated: If C is entangled with A, then entangling A with B also
+  // entangles C with B.
+  //
+  // If this is hard to grasp, it might help to intentionally break this
+  // function and look at the tests that fail in ReactTransition-test.js. Try
+  // commenting out one of the conditions below.
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  var entanglements = root.entanglements;
+  var lanes = rootEntangledLanes;
 
-var previousContext = emptyContextObject;
+  while (lanes) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
 
-function getUnmaskedContext(
-  workInProgress,
-  Component,
-  didPushOwnContextIfProvider
-) {
-  {
-    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
-      // If the fiber is a context provider itself, when we read its context
-      // we may have already pushed its own child context on the stack. A context
-      // provider should not "see" its own child context. Therefore we read the
-      // previous (parent) context instead for a context provider.
-      return previousContext;
+    if (
+      // Is this one of the newly entangled lanes?
+      (lane & entangledLanes) | // Is this lane transitively entangled with the newly entangled lanes?
+      (entanglements[index] & entangledLanes)
+    ) {
+      entanglements[index] |= entangledLanes;
     }
 
-    return contextStackCursor.current;
+    lanes &= ~lane;
   }
 }
-
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  {
-    var instance = workInProgress.stateNode;
-    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (!isDevToolsPresent) {
+    return;
   }
-}
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  {
-    var type = workInProgress.type;
-    var contextTypes = type.contextTypes;
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
 
-    if (!contextTypes) {
-      return emptyContextObject;
-    } // Avoid recreating masked context unless unmasked context has changed.
-    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
+    updaters.add(fiber);
+    lanes &= ~lane;
+  }
+}
+function movePendingFibersToMemoized(root, lanes) {
+  if (!isDevToolsPresent) {
+    return;
+  }
 
-    var instance = workInProgress.stateNode;
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
+  var memoizedUpdaters = root.memoizedUpdaters;
 
-    if (
-      instance &&
-      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-    ) {
-      return instance.__reactInternalMemoizedMaskedChildContext;
-    }
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
 
-    var context = {};
+    if (updaters.size > 0) {
+      updaters.forEach(function(fiber) {
+        var alternate = fiber.alternate;
 
-    for (var key in contextTypes) {
-      context[key] = unmaskedContext[key];
+        if (alternate === null || !memoizedUpdaters.has(alternate)) {
+          memoizedUpdaters.add(fiber);
+        }
+      });
+      updaters.clear();
     }
 
-    {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(contextTypes, context, "context", name);
-    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // Context is created before the class component is instantiated so check for instance.
+    lanes &= ~lane;
+  }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
+// Based on:
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
 
-    if (instance) {
-      cacheContext(workInProgress, unmaskedContext, context);
-    }
+var log = Math.log;
+var LN2 = Math.LN2;
 
-    return context;
+function clz32Fallback(lanes) {
+  if (lanes === 0) {
+    return 32;
   }
+
+  return (31 - ((log(lanes) / LN2) | 0)) | 0;
 }
 
-function hasContextChanged() {
-  {
-    return didPerformWorkStackCursor.current;
-  }
+var DiscreteEventPriority = SyncLane;
+var ContinuousEventPriority = InputContinuousLane;
+var DefaultEventPriority = DefaultLane;
+var IdleEventPriority = IdleLane;
+var currentUpdatePriority = NoLane;
+function getCurrentUpdatePriority() {
+  return currentUpdatePriority;
+}
+function setCurrentUpdatePriority(newPriority) {
+  currentUpdatePriority = newPriority;
+}
+function higherEventPriority(a, b) {
+  return a !== 0 && a < b ? a : b;
+}
+function lowerEventPriority(a, b) {
+  return a === 0 || a > b ? a : b;
 }
+function isHigherEventPriority(a, b) {
+  return a !== 0 && a < b;
+}
+function lanesToEventPriority(lanes) {
+  var lane = getHighestPriorityLane(lanes);
 
-function isContextProvider(type) {
-  {
-    var childContextTypes = type.childContextTypes;
-    return childContextTypes !== null && childContextTypes !== undefined;
+  if (!isHigherEventPriority(DiscreteEventPriority, lane)) {
+    return DiscreteEventPriority;
   }
-}
 
-function popContext(fiber) {
-  {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+  if (!isHigherEventPriority(ContinuousEventPriority, lane)) {
+    return ContinuousEventPriority;
   }
-}
 
-function popTopLevelContextObject(fiber) {
-  {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+  if (includesNonIdleWork(lane)) {
+    return DefaultEventPriority;
   }
+
+  return IdleEventPriority;
 }
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  {
-    if (!(contextStackCursor.current === emptyContextObject)) {
-      throw Error(
-        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
+// can re-export everything from this module.
 
-    push(contextStackCursor, context, fiber);
-    push(didPerformWorkStackCursor, didChange, fiber);
+function shim() {
+  {
+    throw Error(
+      "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
+    );
   }
-}
+} // Mutation (when unsupported)
 
-function processChildContext(fiber, type, parentContext) {
-  {
-    var instance = fiber.stateNode;
-    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-
-    if (typeof instance.getChildContext !== "function") {
-      {
-        var componentName = getComponentName(type) || "Unknown";
-
-        if (!warnedAboutMissingGetChildContext[componentName]) {
-          warnedAboutMissingGetChildContext[componentName] = true;
+var supportsMutation = false;
+var commitMount = shim;
+var clearContainer = shim;
 
-          error(
-            "%s.childContextTypes is specified but there is no getChildContext() method " +
-              "on the instance. You can either define getChildContext() on %s or remove " +
-              "childContextTypes from it.",
-            componentName,
-            componentName
-          );
-        }
-      }
+// can re-export everything from this module.
 
-      return parentContext;
-    }
+function shim$1() {
+  {
+    throw Error(
+      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+} // Hydration (when unsupported)
+var isSuspenseInstancePending = shim$1;
+var isSuspenseInstanceFallback = shim$1;
+var hydrateTextInstance = shim$1;
+var errorHydratingContainer = shim$1;
 
-    var childContext = instance.getChildContext();
+var _nativeFabricUIManage = nativeFabricUIManager,
+  createNode = _nativeFabricUIManage.createNode,
+  cloneNode = _nativeFabricUIManage.cloneNode,
+  cloneNodeWithNewChildren = _nativeFabricUIManage.cloneNodeWithNewChildren,
+  cloneNodeWithNewChildrenAndProps =
+    _nativeFabricUIManage.cloneNodeWithNewChildrenAndProps,
+  cloneNodeWithNewProps = _nativeFabricUIManage.cloneNodeWithNewProps,
+  createChildNodeSet = _nativeFabricUIManage.createChildSet,
+  appendChildNode = _nativeFabricUIManage.appendChild,
+  appendChildNodeToSet = _nativeFabricUIManage.appendChildToSet,
+  completeRoot = _nativeFabricUIManage.completeRoot,
+  registerEventHandler = _nativeFabricUIManage.registerEventHandler,
+  fabricMeasure = _nativeFabricUIManage.measure,
+  fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
+  fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
+  FabricDefaultPriority = _nativeFabricUIManage.unstable_DefaultEventPriority,
+  FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
+  fabricGetCurrentEventPriority =
+    _nativeFabricUIManage.unstable_getCurrentEventPriority;
+var getViewConfigForType =
+  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
+// % 10 === 1 means it is a rootTag.
+// % 2 === 0 means it is a Fabric tag.
+// This means that they never overlap.
 
-    for (var contextKey in childContext) {
-      if (!(contextKey in childContextTypes)) {
-        throw Error(
-          (getComponentName(type) || "Unknown") +
-            '.getChildContext(): key "' +
-            contextKey +
-            '" is not defined in childContextTypes.'
-        );
-      }
-    }
+var nextReactTag = 2;
 
-    {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(childContextTypes, childContext, "child context", name);
-    }
+// TODO: Remove this conditional once all changes have propagated.
+if (registerEventHandler) {
+  /**
+   * Register the event emitter with the native bridge
+   */
+  registerEventHandler(dispatchEvent);
+}
+/**
+ * This is used for refs on host components.
+ */
 
-    return Object.assign({}, parentContext, childContext);
+var ReactFabricHostComponent = /*#__PURE__*/ (function() {
+  function ReactFabricHostComponent(
+    tag,
+    viewConfig,
+    props,
+    internalInstanceHandle
+  ) {
+    this._nativeTag = tag;
+    this.viewConfig = viewConfig;
+    this.currentProps = props;
+    this._internalInstanceHandle = internalInstanceHandle;
   }
-}
 
-function pushContextProvider(workInProgress) {
-  {
-    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
-    // If the instance does not exist yet, we will push null at first,
-    // and replace it on the stack later when invalidating the context.
+  var _proto = ReactFabricHostComponent.prototype;
 
-    var memoizedMergedChildContext =
-      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-      emptyContextObject; // Remember the parent context so we can merge with it later.
-    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+  _proto.blur = function blur() {
+    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
+  };
 
-    previousContext = contextStackCursor.current;
-    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-    push(
-      didPerformWorkStackCursor,
-      didPerformWorkStackCursor.current,
-      workInProgress
-    );
-    return true;
-  }
-}
+  _proto.focus = function focus() {
+    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
+  };
 
-function invalidateContextProvider(workInProgress, type, didChange) {
-  {
-    var instance = workInProgress.stateNode;
+  _proto.measure = function measure(callback) {
+    var stateNode = this._internalInstanceHandle.stateNode;
 
-    if (!instance) {
-      throw Error(
-        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+    if (stateNode != null) {
+      fabricMeasure(
+        stateNode.node,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
     }
+  };
 
-    if (didChange) {
-      // Merge parent and own context.
-      // Skip this if we're not updating due to sCU.
-      // This avoids unnecessarily recomputing memoized values.
-      var mergedContext = processChildContext(
-        workInProgress,
-        type,
-        previousContext
+  _proto.measureInWindow = function measureInWindow(callback) {
+    var stateNode = this._internalInstanceHandle.stateNode;
+
+    if (stateNode != null) {
+      fabricMeasureInWindow(
+        stateNode.node,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
-      // It is important to unwind the context in the reverse order.
+    }
+  };
 
-      pop(didPerformWorkStackCursor, workInProgress);
-      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
+  _proto.measureLayout = function measureLayout(
+    relativeToNativeNode,
+    onSuccess,
+    onFail
+  ) /* currently unused */
+  {
+    if (
+      typeof relativeToNativeNode === "number" ||
+      !(relativeToNativeNode instanceof ReactFabricHostComponent)
+    ) {
+      {
+        error(
+          "Warning: ref.measureLayout must be called with a ref to a native component."
+        );
+      }
 
-      push(contextStackCursor, mergedContext, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    } else {
-      pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
+      return;
     }
-  }
-}
 
-function findCurrentUnmaskedContext(fiber) {
-  {
-    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-    // makes sense elsewhere
-    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
-      throw Error(
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+    var toStateNode = this._internalInstanceHandle.stateNode;
+    var fromStateNode = relativeToNativeNode._internalInstanceHandle.stateNode;
+
+    if (toStateNode != null && fromStateNode != null) {
+      fabricMeasureLayout(
+        toStateNode.node,
+        fromStateNode.node,
+        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
       );
     }
+  };
 
-    var node = fiber;
-
-    do {
-      switch (node.tag) {
-        case HostRoot:
-          return node.stateNode.context;
+  _proto.setNativeProps = function setNativeProps(nativeProps) {
+    {
+      error("Warning: setNativeProps is not currently supported in Fabric");
+    }
 
-        case ClassComponent: {
-          var Component = node.type;
+    return;
+  };
 
-          if (isContextProvider(Component)) {
-            return node.stateNode.__reactInternalMemoizedMergedChildContext;
-          }
+  return ReactFabricHostComponent;
+})(); // eslint-disable-next-line no-unused-expressions
+function appendInitialChild(parentInstance, child) {
+  appendChildNode(parentInstance.node, child.node);
+}
+function createInstance(
+  type,
+  props,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  var tag = nextReactTag;
+  nextReactTag += 2;
+  var viewConfig = getViewConfigForType(type);
 
-          break;
-        }
+  {
+    for (var key in viewConfig.validAttributes) {
+      if (props.hasOwnProperty(key)) {
+        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
+          props[key]
+        );
       }
-
-      node = node.return;
-    } while (node !== null);
-
-    {
-      throw Error(
-        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-      );
     }
   }
-}
 
-var LegacyRoot = 0;
-var BlockingRoot = 1;
-var ConcurrentRoot = 2;
+  var updatePayload = create(props, viewConfig.validAttributes);
+  var node = createNode(
+    tag, // reactTag
+    viewConfig.uiViewClassName, // viewName
+    rootContainerInstance, // rootTag
+    updatePayload, // props
+    internalInstanceHandle // internalInstanceHandle
+  );
+  var component = new ReactFabricHostComponent(
+    tag,
+    viewConfig,
+    props,
+    internalInstanceHandle
+  );
+  return {
+    node: node,
+    canonical: component
+  };
+}
+function createTextInstance(
+  text,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  {
+    if (!hostContext.isInAParentText) {
+      error("Text strings must be rendered within a <Text> component.");
+    }
+  }
 
-var rendererID = null;
-var injectedHook = null;
-var hasLoggedError = false;
-var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-
-  if (!hook.supportsFiber) {
+  var tag = nextReactTag;
+  nextReactTag += 2;
+  var node = createNode(
+    tag, // reactTag
+    "RCTRawText", // viewName
+    rootContainerInstance, // rootTag
     {
-      error(
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://reactjs.org/link/react-devtools"
-      );
-    } // DevTools exists, even though it doesn't support Fiber.
+      text: text
+    }, // props
+    internalInstanceHandle // instance handle
+  );
+  return {
+    node: node
+  };
+}
+function getRootHostContext(rootContainerInstance) {
+  return {
+    isInAParentText: false
+  };
+}
+function getChildHostContext(parentHostContext, type, rootContainerInstance) {
+  var prevIsInAParentText = parentHostContext.isInAParentText;
+  var isInAParentText =
+    type === "AndroidTextInput" || // Android
+    type === "RCTMultilineTextInputView" || // iOS
+    type === "RCTSinglelineTextInputView" || // iOS
+    type === "RCTText" ||
+    type === "RCTVirtualText"; // TODO: If this is an offscreen host container, we should reuse the
+  // parent context.
 
-    return true;
+  if (prevIsInAParentText !== isInAParentText) {
+    return {
+      isInAParentText: isInAParentText
+    };
+  } else {
+    return parentHostContext;
   }
+}
+function getPublicInstance(instance) {
+  return instance.canonical;
+}
+function prepareForCommit(containerInfo) {
+  // Noop
+  return null;
+}
+function prepareUpdate(
+  instance,
+  type,
+  oldProps,
+  newProps,
+  rootContainerInstance,
+  hostContext
+) {
+  var viewConfig = instance.canonical.viewConfig;
+  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // TODO: If the event handlers have changed, we need to update the current props
+  // in the commit phase but there is no host config hook to do it yet.
+  // So instead we hack it by updating it in the render phase.
 
-  try {
-    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
+  instance.canonical.currentProps = newProps;
+  return updatePayload;
+}
+function resetAfterCommit(containerInfo) {
+  // Noop
+}
+function shouldSetTextContent(type, props) {
+  // TODO (bvaughn) Revisit this decision.
+  // Always returning false simplifies the createInstance() implementation,
+  // But creates an additional child Fiber for raw text children.
+  // No additional native views are created though.
+  // It's not clear to me which is better so I'm deferring for now.
+  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
+  return false;
+}
+function getCurrentEventPriority() {
+  var currentEventPriority = fabricGetCurrentEventPriority
+    ? fabricGetCurrentEventPriority()
+    : null;
 
-    injectedHook = hook;
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      error("React instrumentation encountered an error: %s.", err);
+  if (currentEventPriority != null) {
+    switch (currentEventPriority) {
+      case FabricDiscretePriority:
+        return DiscreteEventPriority;
+
+      case FabricDefaultPriority:
+      default:
+        return DefaultEventPriority;
     }
-  } // DevTools exists
+  }
 
-  return true;
-}
-function onScheduleRoot(root, children) {
-  {
-    if (
-      injectedHook &&
-      typeof injectedHook.onScheduleFiberRoot === "function"
-    ) {
-      try {
-        injectedHook.onScheduleFiberRoot(rendererID, root, children);
-      } catch (err) {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
+  return DefaultEventPriority;
+} // The Fabric renderer is secondary to the existing React Native renderer.
+var scheduleTimeout = setTimeout;
+var cancelTimeout = clearTimeout;
+var noTimeout = -1; // -------------------
+//     Persistence
+// -------------------
 
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
+var supportsPersistence = true;
+function cloneInstance(
+  instance,
+  updatePayload,
+  type,
+  oldProps,
+  newProps,
+  internalInstanceHandle,
+  keepChildren,
+  recyclableInstance
+) {
+  var node = instance.node;
+  var clone;
+
+  if (keepChildren) {
+    if (updatePayload !== null) {
+      clone = cloneNodeWithNewProps(node, updatePayload);
+    } else {
+      clone = cloneNode(node);
+    }
+  } else {
+    if (updatePayload !== null) {
+      clone = cloneNodeWithNewChildrenAndProps(node, updatePayload);
+    } else {
+      clone = cloneNodeWithNewChildren(node);
     }
   }
-}
-function onCommitRoot(root, priorityLevel) {
-  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
-    try {
-      var didError = (root.current.flags & DidCapture) === DidCapture;
 
-      if (enableProfilerTimer) {
-        injectedHook.onCommitFiberRoot(
-          rendererID,
-          root,
-          priorityLevel,
-          didError
-        );
-      } else {
-        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
+  return {
+    node: clone,
+    canonical: instance.canonical
+  };
+} // TODO: These two methods should be replaced with `createOffscreenInstance` and
+// `cloneOffscreenInstance`. I did it this way for now because the offscreen
+// instance is stored on an extra HostComponent fiber instead of the
+// OffscreenComponent fiber, and I didn't want to add an extra check to the
+// generic HostComponent path. Instead we should use the OffscreenComponent
+// fiber, but currently Fabric expects a 1:1 correspondence between Fabric
+// instances and host fibers, so I'm leaving this optimization for later once
+// we can confirm this won't break any downstream expectations.
+
+function getOffscreenContainerType() {
+  return "RCTView";
+}
+function getOffscreenContainerProps(mode, children) {
+  if (mode === "hidden") {
+    return {
+      children: children,
+      style: {
+        display: "none"
       }
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
-
-          error("React instrumentation encountered an error: %s", err);
-        }
+    };
+  } else {
+    return {
+      children: children,
+      style: {
+        flex: 1
       }
-    }
+    };
   }
 }
-function onCommitUnmount(fiber) {
-  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
-    try {
-      injectedHook.onCommitFiberUnmount(rendererID, fiber);
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
-
-          error("React instrumentation encountered an error: %s", err);
-        }
+function cloneHiddenInstance(instance, type, props, internalInstanceHandle) {
+  var viewConfig = instance.canonical.viewConfig;
+  var node = instance.node;
+  var updatePayload = create(
+    {
+      style: {
+        display: "none"
       }
-    }
-  }
+    },
+    viewConfig.validAttributes
+  );
+  return {
+    node: cloneNodeWithNewProps(node, updatePayload),
+    canonical: instance.canonical
+  };
+}
+function cloneHiddenTextInstance(instance, text, internalInstanceHandle) {
+  throw new Error("Not yet implemented.");
+}
+function createContainerChildSet(container) {
+  return createChildNodeSet(container);
+}
+function appendChildToContainerChildSet(childSet, child) {
+  appendChildNodeToSet(childSet, child.node);
+}
+function finalizeContainerChildren(container, newChildren) {
+  completeRoot(container, newChildren);
+}
+function makeClientIdInDEV(warnOnAccessInDEV) {
+  throw new Error("Not yet implemented");
+}
+function preparePortalMount(portalInstance) {
+  // noop
 }
 
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_now = Scheduler.unstable_now;
+// Helpers to patch console.logs to avoid logging during side-effect free
+// replaying on render function. This currently only patches the object
+// lazily which won't cover if the log function was extracted eagerly.
+// We could also eagerly patch the method.
+var disabledDepth = 0;
+var prevLog;
+var prevInfo;
+var prevWarn;
+var prevError;
+var prevGroup;
+var prevGroupCollapsed;
+var prevGroupEnd;
 
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-    );
-  }
-}
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
-
-var ImmediatePriority = 99;
-var UserBlockingPriority = 98;
-var NormalPriority = 97;
-var LowPriority = 96;
-var IdlePriority = 95; // NoPriority is the absence of priority. Also React-only.
-
-var NoPriority = 90;
-var initialTimeMs = Scheduler_now(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-
-var SyncLanePriority = 15;
-var SyncBatchedLanePriority = 14;
-var InputDiscreteHydrationLanePriority = 13;
-var InputDiscreteLanePriority = 12;
-var InputContinuousHydrationLanePriority = 11;
-var InputContinuousLanePriority = 10;
-var DefaultHydrationLanePriority = 9;
-var DefaultLanePriority = 8;
-var TransitionHydrationPriority = 7;
-var TransitionPriority = 6;
-var RetryLanePriority = 5;
-var SelectiveHydrationLanePriority = 4;
-var IdleHydrationLanePriority = 3;
-var IdleLanePriority = 2;
-var OffscreenLanePriority = 1;
-var NoLanePriority = 0;
-var TotalLanes = 31;
-var NoLanes =
-  /*                        */
-  0;
-var NoLane =
-  /*                          */
-  0;
-var SyncLane =
-  /*                        */
-  1;
-var SyncBatchedLane =
-  /*                 */
-  2;
-var InputDiscreteHydrationLane =
-  /*      */
-  4;
-var InputDiscreteLanes =
-  /*                    */
-  24;
-var InputContinuousHydrationLane =
-  /*           */
-  32;
-var InputContinuousLanes =
-  /*                  */
-  192;
-var DefaultHydrationLane =
-  /*            */
-  256;
-var DefaultLanes =
-  /*                   */
-  3584;
-var TransitionHydrationLane =
-  /*                */
-  4096;
-var TransitionLanes =
-  /*                       */
-  4186112;
-var RetryLanes =
-  /*                            */
-  62914560;
-var SomeRetryLane =
-  /*                  */
-  33554432;
-var SelectiveHydrationLane =
-  /*          */
-  67108864;
-var NonIdleLanes =
-  /*                                 */
-  134217727;
-var IdleHydrationLane =
-  /*               */
-  134217728;
-var IdleLanes =
-  /*                             */
-  805306368;
-var OffscreenLane =
-  /*                   */
-  1073741824;
-var NoTimestamp = -1;
-// Used by getHighestPriorityLanes and getNextLanes:
-
-var return_highestLanePriority = DefaultLanePriority;
-
-function getHighestPriorityLanes(lanes) {
-  if ((SyncLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncLanePriority;
-    return SyncLane;
-  }
-
-  if ((SyncBatchedLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncBatchedLanePriority;
-    return SyncBatchedLane;
-  }
+function disabledLog() {}
 
-  if ((InputDiscreteHydrationLane & lanes) !== NoLanes) {
-    return_highestLanePriority = InputDiscreteHydrationLanePriority;
-    return InputDiscreteHydrationLane;
-  }
+disabledLog.__reactDisabledLog = true;
+function disableLogs() {
+  {
+    if (disabledDepth === 0) {
+      /* eslint-disable react-internal/no-production-logging */
+      prevLog = console.log;
+      prevInfo = console.info;
+      prevWarn = console.warn;
+      prevError = console.error;
+      prevGroup = console.group;
+      prevGroupCollapsed = console.groupCollapsed;
+      prevGroupEnd = console.groupEnd; // https://github.com/facebook/react/issues/19099
 
-  var inputDiscreteLanes = InputDiscreteLanes & lanes;
+      var props = {
+        configurable: true,
+        enumerable: true,
+        value: disabledLog,
+        writable: true
+      }; // $FlowFixMe Flow thinks console is immutable.
 
-  if (inputDiscreteLanes !== NoLanes) {
-    return_highestLanePriority = InputDiscreteLanePriority;
-    return inputDiscreteLanes;
-  }
+      Object.defineProperties(console, {
+        info: props,
+        log: props,
+        warn: props,
+        error: props,
+        group: props,
+        groupCollapsed: props,
+        groupEnd: props
+      });
+      /* eslint-enable react-internal/no-production-logging */
+    }
 
-  if ((lanes & InputContinuousHydrationLane) !== NoLanes) {
-    return_highestLanePriority = InputContinuousHydrationLanePriority;
-    return InputContinuousHydrationLane;
+    disabledDepth++;
   }
+}
+function reenableLogs() {
+  {
+    disabledDepth--;
 
-  var inputContinuousLanes = InputContinuousLanes & lanes;
+    if (disabledDepth === 0) {
+      /* eslint-disable react-internal/no-production-logging */
+      var props = {
+        configurable: true,
+        enumerable: true,
+        writable: true
+      }; // $FlowFixMe Flow thinks console is immutable.
 
-  if (inputContinuousLanes !== NoLanes) {
-    return_highestLanePriority = InputContinuousLanePriority;
-    return inputContinuousLanes;
-  }
+      Object.defineProperties(console, {
+        log: Object.assign({}, props, {
+          value: prevLog
+        }),
+        info: Object.assign({}, props, {
+          value: prevInfo
+        }),
+        warn: Object.assign({}, props, {
+          value: prevWarn
+        }),
+        error: Object.assign({}, props, {
+          value: prevError
+        }),
+        group: Object.assign({}, props, {
+          value: prevGroup
+        }),
+        groupCollapsed: Object.assign({}, props, {
+          value: prevGroupCollapsed
+        }),
+        groupEnd: Object.assign({}, props, {
+          value: prevGroupEnd
+        })
+      });
+      /* eslint-enable react-internal/no-production-logging */
+    }
 
-  if ((lanes & DefaultHydrationLane) !== NoLanes) {
-    return_highestLanePriority = DefaultHydrationLanePriority;
-    return DefaultHydrationLane;
+    if (disabledDepth < 0) {
+      error(
+        "disabledDepth fell below zero. " +
+          "This is a bug in React. Please file an issue."
+      );
+    }
   }
+}
 
-  var defaultLanes = DefaultLanes & lanes;
+var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
+function describeBuiltInComponentFrame(name, source, ownerFn) {
+  {
+    var ownerName = null;
 
-  if (defaultLanes !== NoLanes) {
-    return_highestLanePriority = DefaultLanePriority;
-    return defaultLanes;
-  }
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
+    }
 
-  if ((lanes & TransitionHydrationLane) !== NoLanes) {
-    return_highestLanePriority = TransitionHydrationPriority;
-    return TransitionHydrationLane;
+    return describeComponentFrame(name, source, ownerName);
   }
+}
+var componentFrameCache;
 
-  var transitionLanes = TransitionLanes & lanes;
-
-  if (transitionLanes !== NoLanes) {
-    return_highestLanePriority = TransitionPriority;
-    return transitionLanes;
-  }
+{
+  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
+  componentFrameCache = new PossiblyWeakMap();
+}
+var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
 
-  var retryLanes = RetryLanes & lanes;
+function describeComponentFrame(name, source, ownerName) {
+  var sourceInfo = "";
 
-  if (retryLanes !== NoLanes) {
-    return_highestLanePriority = RetryLanePriority;
-    return retryLanes;
-  }
+  if (source) {
+    var path = source.fileName;
+    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
+    // prefer "folder/index.js" instead of just "index.js".
 
-  if (lanes & SelectiveHydrationLane) {
-    return_highestLanePriority = SelectiveHydrationLanePriority;
-    return SelectiveHydrationLane;
-  }
+    if (/^index\./.test(fileName)) {
+      var match = path.match(BEFORE_SLASH_RE);
 
-  if ((lanes & IdleHydrationLane) !== NoLanes) {
-    return_highestLanePriority = IdleHydrationLanePriority;
-    return IdleHydrationLane;
-  }
+      if (match) {
+        var pathBeforeSlash = match[1];
 
-  var idleLanes = IdleLanes & lanes;
+        if (pathBeforeSlash) {
+          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
+          fileName = folderName + "/" + fileName;
+        }
+      }
+    }
 
-  if (idleLanes !== NoLanes) {
-    return_highestLanePriority = IdleLanePriority;
-    return idleLanes;
+    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
+  } else if (ownerName) {
+    sourceInfo = " (created by " + ownerName + ")";
   }
 
-  if ((OffscreenLane & lanes) !== NoLanes) {
-    return_highestLanePriority = OffscreenLanePriority;
-    return OffscreenLane;
-  }
+  return "\n    in " + (name || "Unknown") + sourceInfo;
+}
 
+function describeClassComponentFrame(ctor, source, ownerFn) {
   {
-    error("Should have found matching lanes. This is a bug in React.");
-  } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
-
-  return_highestLanePriority = DefaultLanePriority;
-  return lanes;
+    return describeFunctionComponentFrame(ctor, source, ownerFn);
+  }
 }
+function describeFunctionComponentFrame(fn, source, ownerFn) {
+  {
+    if (!fn) {
+      return "";
+    }
 
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case ImmediatePriority:
-      return SyncLanePriority;
-
-    case UserBlockingPriority:
-      return InputContinuousLanePriority;
-
-    case NormalPriority:
-    case LowPriority:
-      // TODO: Handle LowSchedulerPriority, somehow. Maybe the same lane as hydration.
-      return DefaultLanePriority;
+    var name = fn.displayName || fn.name || null;
+    var ownerName = null;
 
-    case IdlePriority:
-      return IdleLanePriority;
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
+    }
 
-    default:
-      return NoLanePriority;
+    return describeComponentFrame(name, source, ownerName);
   }
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case SyncLanePriority:
-    case SyncBatchedLanePriority:
-      return ImmediatePriority;
-
-    case InputDiscreteHydrationLanePriority:
-    case InputDiscreteLanePriority:
-    case InputContinuousHydrationLanePriority:
-    case InputContinuousLanePriority:
-      return UserBlockingPriority;
-
-    case DefaultHydrationLanePriority:
-    case DefaultLanePriority:
-    case TransitionHydrationPriority:
-    case TransitionPriority:
-    case SelectiveHydrationLanePriority:
-    case RetryLanePriority:
-      return NormalPriority;
-
-    case IdleHydrationLanePriority:
-    case IdleLanePriority:
-    case OffscreenLanePriority:
-      return IdlePriority;
 
-    case NoLanePriority:
-      return NoPriority;
+function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
+  if (type == null) {
+    return "";
+  }
 
-    default: {
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
+  if (typeof type === "function") {
+    {
+      return describeFunctionComponentFrame(type, source, ownerFn);
     }
   }
-}
-function getNextLanes(root, wipLanes) {
-  // Early bailout if there's no pending work left.
-  var pendingLanes = root.pendingLanes;
 
-  if (pendingLanes === NoLanes) {
-    return_highestLanePriority = NoLanePriority;
-    return NoLanes;
+  if (typeof type === "string") {
+    return describeBuiltInComponentFrame(type, source, ownerFn);
   }
 
-  var nextLanes = NoLanes;
-  var nextLanePriority = NoLanePriority;
-  var expiredLanes = root.expiredLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes; // Check if any work has expired.
+  switch (type) {
+    case REACT_SUSPENSE_TYPE:
+      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
 
-  if (expiredLanes !== NoLanes) {
-    nextLanes = expiredLanes;
-    nextLanePriority = return_highestLanePriority = SyncLanePriority;
-  } else {
-    // Do not work on any idle work until all the non-idle work has finished,
-    // even if the work is suspended.
-    var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
+    case REACT_SUSPENSE_LIST_TYPE:
+      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
+  }
 
-    if (nonIdlePendingLanes !== NoLanes) {
-      var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+  if (typeof type === "object") {
+    switch (type.$$typeof) {
+      case REACT_FORWARD_REF_TYPE:
+        return describeFunctionComponentFrame(type.render, source, ownerFn);
 
-      if (nonIdleUnblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
+      case REACT_MEMO_TYPE:
+        // Memo may contain any component type so we recursively resolve it.
+        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
 
-        if (nonIdlePingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
-          nextLanePriority = return_highestLanePriority;
-        }
-      }
-    } else {
-      // The only remaining work is Idle.
-      var unblockedLanes = pendingLanes & ~suspendedLanes;
+      case REACT_LAZY_TYPE: {
+        var lazyComponent = type;
+        var payload = lazyComponent._payload;
+        var init = lazyComponent._init;
 
-      if (unblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(unblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        if (pingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(pingedLanes);
-          nextLanePriority = return_highestLanePriority;
-        }
+        try {
+          // Lazy may contain any component type so we recursively resolve it.
+          return describeUnknownElementTypeFrameInDEV(
+            init(payload),
+            source,
+            ownerFn
+          );
+        } catch (x) {}
       }
     }
   }
 
-  if (nextLanes === NoLanes) {
-    // This should only be reachable if we're suspended
-    // TODO: Consider warning in this path if a fallback timer is not scheduled.
-    return NoLanes;
-  } // If there are higher priority lanes, we'll include them even if they
-  // are suspended.
+  return "";
+}
 
-  nextLanes = pendingLanes & getEqualOrHigherPriorityLanes(nextLanes); // If we're already in the middle of a render, switching lanes will interrupt
-  // it and we'll lose our progress. We should only do this if the new lanes are
-  // higher priority.
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 
-  if (
-    wipLanes !== NoLanes &&
-    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
-    // bother waiting until the root is complete.
-    (wipLanes & suspendedLanes) === NoLanes
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    var wipLanePriority = return_highestLanePriority;
+var loggedTypeFailures = {};
+var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
 
-    if (nextLanePriority <= wipLanePriority) {
-      return wipLanes;
+function setCurrentlyValidatingElement(element) {
+  {
+    if (element) {
+      var owner = element._owner;
+      var stack = describeUnknownElementTypeFrameInDEV(
+        element.type,
+        element._source,
+        owner ? owner.type : null
+      );
+      ReactDebugCurrentFrame.setExtraStackFrame(stack);
     } else {
-      return_highestLanePriority = nextLanePriority;
+      ReactDebugCurrentFrame.setExtraStackFrame(null);
     }
-  } // Check for entangled lanes and add them to the batch.
-  //
-  // A lane is said to be entangled with another when it's not allowed to render
-  // in a batch that does not also include the other lane. Typically we do this
-  // when multiple updates have the same source, and we only want to respond to
-  // the most recent event from that source.
-  //
-  // Note that we apply entanglements *after* checking for partial work above.
-  // This means that if a lane is entangled during an interleaved event while
-  // it's already rendering, we won't interrupt it. This is intentional, since
-  // entanglement is usually "best effort": we'll try our best to render the
-  // lanes in the same batch, but it's not worth throwing out partially
-  // completed work in order to do it.
-  //
-  // For those exceptions where entanglement is semantically important, like
-  // useMutableSource, we should ensure that there is no partial work at the
-  // time we apply the entanglement.
+  }
+}
 
-  var entangledLanes = root.entangledLanes;
+function checkPropTypes(typeSpecs, values, location, componentName, element) {
+  {
+    // $FlowFixMe This is okay but Flow doesn't know it.
+    var has = Function.call.bind(hasOwnProperty);
 
-  if (entangledLanes !== NoLanes) {
-    var entanglements = root.entanglements;
-    var lanes = nextLanes & entangledLanes;
+    for (var typeSpecName in typeSpecs) {
+      if (has(typeSpecs, typeSpecName)) {
+        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
+        // fail the render phase where it didn't fail before. So we log it.
+        // After these have been cleaned up, we'll let them throw.
 
-    while (lanes > 0) {
-      var index = pickArbitraryLaneIndex(lanes);
-      var lane = 1 << index;
-      nextLanes |= entanglements[index];
-      lanes &= ~lane;
-    }
-  }
+        try {
+          // This is intentionally an invariant that gets caught. It's the same
+          // behavior as without this statement except with a better message.
+          if (typeof typeSpecs[typeSpecName] !== "function") {
+            var err = Error(
+              (componentName || "React class") +
+                ": " +
+                location +
+                " type `" +
+                typeSpecName +
+                "` is invalid; " +
+                "it must be a function, usually from the `prop-types` package, but received `" +
+                typeof typeSpecs[typeSpecName] +
+                "`." +
+                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
+            );
+            err.name = "Invariant Violation";
+            throw err;
+          }
 
-  return nextLanes;
-}
-function getMostRecentEventTime(root, lanes) {
-  var eventTimes = root.eventTimes;
-  var mostRecentEventTime = NoTimestamp;
+          error$1 = typeSpecs[typeSpecName](
+            values,
+            typeSpecName,
+            componentName,
+            location,
+            null,
+            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
+          );
+        } catch (ex) {
+          error$1 = ex;
+        }
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var eventTime = eventTimes[index];
+        if (error$1 && !(error$1 instanceof Error)) {
+          setCurrentlyValidatingElement(element);
 
-    if (eventTime > mostRecentEventTime) {
-      mostRecentEventTime = eventTime;
-    }
+          error(
+            "%s: type specification of %s" +
+              " `%s` is invalid; the type checker " +
+              "function must return `null` or an `Error` but returned a %s. " +
+              "You may have forgotten to pass an argument to the type checker " +
+              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
+              "shape all require an argument).",
+            componentName || "React class",
+            location,
+            typeSpecName,
+            typeof error$1
+          );
 
-    lanes &= ~lane;
-  }
+          setCurrentlyValidatingElement(null);
+        }
 
-  return mostRecentEventTime;
-}
+        if (
+          error$1 instanceof Error &&
+          !(error$1.message in loggedTypeFailures)
+        ) {
+          // Only monitor this failure once because there tends to be a lot of the
+          // same error.
+          loggedTypeFailures[error$1.message] = true;
+          setCurrentlyValidatingElement(element);
 
-function computeExpirationTime(lane, currentTime) {
-  // TODO: Expiration heuristic is constant per lane, so could use a map.
-  getHighestPriorityLanes(lane);
-  var priority = return_highestLanePriority;
+          error("Failed %s type: %s", location, error$1.message);
 
-  if (priority >= InputContinuousLanePriority) {
-    // User interactions should expire slightly more quickly.
-    //
-    // NOTE: This is set to the corresponding constant as in Scheduler.js. When
-    // we made it larger, a product metric in www regressed, suggesting there's
-    // a user interaction that's being starved by a series of synchronous
-    // updates. If that theory is correct, the proper solution is to fix the
-    // starvation. However, this scenario supports the idea that expiration
-    // times are an important safeguard when starvation does happen.
-    //
-    // Also note that, in the case of user input specifically, this will soon no
-    // longer be an issue because we plan to make user input synchronous by
-    // default (until you enter `startTransition`, of course.)
-    //
-    // If weren't planning to make these updates synchronous soon anyway, I
-    // would probably make this number a configurable parameter.
-    return currentTime + 250;
-  } else if (priority >= TransitionPriority) {
-    return currentTime + 5000;
-  } else {
-    // Anything idle priority or lower should never expire.
-    return NoTimestamp;
+          setCurrentlyValidatingElement(null);
+        }
+      }
+    }
   }
 }
 
-function markStarvedLanesAsExpired(root, currentTime) {
-  // TODO: This gets called every time we yield. We can optimize by storing
-  // the earliest expiration time on the root. Then use that to quickly bail out
-  // of this function.
-  var pendingLanes = root.pendingLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes;
-  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
-  // expiration time. If so, we'll assume the update is being starved and mark
-  // it as expired to force it to finish.
+var valueStack = [];
+var fiberStack;
 
-  var lanes = pendingLanes;
+{
+  fiberStack = [];
+}
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var expirationTime = expirationTimes[index];
+var index = -1;
 
-    if (expirationTime === NoTimestamp) {
-      // Found a pending lane with no expiration time. If it's not suspended, or
-      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
-      // using the current time.
-      if (
-        (lane & suspendedLanes) === NoLanes ||
-        (lane & pingedLanes) !== NoLanes
-      ) {
-        // Assumes timestamps are monotonically increasing.
-        expirationTimes[index] = computeExpirationTime(lane, currentTime);
-      }
-    } else if (expirationTime <= currentTime) {
-      // This lane expired
-      root.expiredLanes |= lane;
+function createCursor(defaultValue) {
+  return {
+    current: defaultValue
+  };
+}
+
+function pop(cursor, fiber) {
+  if (index < 0) {
+    {
+      error("Unexpected pop.");
     }
 
-    lanes &= ~lane;
+    return;
   }
-} // This returns the highest priority pending lanes regardless of whether they
-function getLanesToRetrySynchronouslyOnError(root) {
-  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
 
-  if (everythingButOffscreen !== NoLanes) {
-    return everythingButOffscreen;
+  {
+    if (fiber !== fiberStack[index]) {
+      error("Unexpected Fiber popped.");
+    }
   }
 
-  if (everythingButOffscreen & OffscreenLane) {
-    return OffscreenLane;
+  cursor.current = valueStack[index];
+  valueStack[index] = null;
+
+  {
+    fiberStack[index] = null;
   }
 
-  return NoLanes;
-}
-function returnNextLanesPriority() {
-  return return_highestLanePriority;
-}
-function includesNonIdleWork(lanes) {
-  return (lanes & NonIdleLanes) !== NoLanes;
-}
-function includesOnlyRetries(lanes) {
-  return (lanes & RetryLanes) === lanes;
+  index--;
 }
-function includesOnlyTransitions(lanes) {
-  return (lanes & TransitionLanes) === lanes;
-} // To ensure consistency across multiple updates in the same event, this should
-// be a pure function, so that it always returns the same lane for given inputs.
-
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case NoLanePriority:
-      break;
-
-    case SyncLanePriority:
-      return SyncLane;
 
-    case SyncBatchedLanePriority:
-      return SyncBatchedLane;
+function push(cursor, value, fiber) {
+  index++;
+  valueStack[index] = cursor.current;
 
-    case InputDiscreteLanePriority: {
-      var _lane = pickArbitraryLane(InputDiscreteLanes & ~wipLanes);
+  {
+    fiberStack[index] = fiber;
+  }
 
-      if (_lane === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(InputContinuousLanePriority, wipLanes);
-      }
+  cursor.current = value;
+}
 
-      return _lane;
-    }
+var warnedAboutMissingGetChildContext;
 
-    case InputContinuousLanePriority: {
-      var _lane2 = pickArbitraryLane(InputContinuousLanes & ~wipLanes);
+{
+  warnedAboutMissingGetChildContext = {};
+}
 
-      if (_lane2 === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(DefaultLanePriority, wipLanes);
-      }
+var emptyContextObject = {};
 
-      return _lane2;
-    }
+{
+  Object.freeze(emptyContextObject);
+} // A cursor to the current merged context object on the stack.
 
-    case DefaultLanePriority: {
-      var _lane3 = pickArbitraryLane(DefaultLanes & ~wipLanes);
+var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
 
-      if (_lane3 === NoLane) {
-        // If all the default lanes are already being worked on, look for a
-        // lane in the transition range.
-        _lane3 = pickArbitraryLane(TransitionLanes & ~wipLanes);
+var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
+// We use this to get access to the parent context after we have already
+// pushed the next context provider, and now need to merge their contexts.
 
-        if (_lane3 === NoLane) {
-          // All the transition lanes are taken, too. This should be very
-          // rare, but as a last resort, pick a default lane. This will have
-          // the effect of interrupting the current work-in-progress render.
-          _lane3 = pickArbitraryLane(DefaultLanes);
-        }
-      }
+var previousContext = emptyContextObject;
 
-      return _lane3;
+function getUnmaskedContext(
+  workInProgress,
+  Component,
+  didPushOwnContextIfProvider
+) {
+  {
+    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
+      // If the fiber is a context provider itself, when we read its context
+      // we may have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
     }
 
-    case TransitionPriority: // Should be handled by findTransitionLane instead
-
-    case RetryLanePriority:
-      // Should be handled by findRetryLane instead
-      break;
-
-    case IdleLanePriority:
-      var lane = pickArbitraryLane(IdleLanes & ~wipLanes);
-
-      if (lane === NoLane) {
-        lane = pickArbitraryLane(IdleLanes);
-      }
-
-      return lane;
+    return contextStackCursor.current;
   }
+}
 
+function cacheContext(workInProgress, unmaskedContext, maskedContext) {
   {
-    throw Error(
-      "Invalid update priority: " + lanePriority + ". This is a bug in React."
-    );
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
   }
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
-
-function findTransitionLane(wipLanes, pendingLanes) {
-  // First look for lanes that are completely unclaimed, i.e. have no
-  // pending work.
-  var lane = pickArbitraryLane(TransitionLanes & ~pendingLanes);
+}
 
-  if (lane === NoLane) {
-    // If all lanes have pending work, look for a lane that isn't currently
-    // being worked on.
-    lane = pickArbitraryLane(TransitionLanes & ~wipLanes);
+function getMaskedContext(workInProgress, unmaskedContext) {
+  {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
 
-    if (lane === NoLane) {
-      // If everything is being worked on, pick any lane. This has the
-      // effect of interrupting the current work-in-progress.
-      lane = pickArbitraryLane(TransitionLanes);
-    }
-  }
+    if (!contextTypes) {
+      return emptyContextObject;
+    } // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
 
-  return lane;
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
+    var instance = workInProgress.stateNode;
 
-function findRetryLane(wipLanes) {
-  // This is a fork of `findUpdateLane` designed specifically for Suspense
-  // "retries" — a special update that attempts to flip a Suspense boundary
-  // from its placeholder state to its primary/resolved state.
-  var lane = pickArbitraryLane(RetryLanes & ~wipLanes);
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
 
-  if (lane === NoLane) {
-    lane = pickArbitraryLane(RetryLanes);
-  }
+    var context = {};
 
-  return lane;
-}
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
 
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
+    {
+      var name = getComponentNameFromFiber(workInProgress) || "Unknown";
+      checkPropTypes(contextTypes, context, "context", name);
+    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
 
-function getLowestPriorityLane(lanes) {
-  // This finds the most significant non-zero bit.
-  var index = 31 - clz32(lanes);
-  return index < 0 ? NoLanes : 1 << index;
-}
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
 
-function getEqualOrHigherPriorityLanes(lanes) {
-  return (getLowestPriorityLane(lanes) << 1) - 1;
+    return context;
+  }
 }
 
-function pickArbitraryLane(lanes) {
-  // This wrapper function gets inlined. Only exists so to communicate that it
-  // doesn't matter which bit is selected; you can pick any bit without
-  // affecting the algorithms where its used. Here I'm using
-  // getHighestPriorityLane because it requires the fewest operations.
-  return getHighestPriorityLane(lanes);
+function hasContextChanged() {
+  {
+    return didPerformWorkStackCursor.current;
+  }
 }
 
-function pickArbitraryLaneIndex(lanes) {
-  return 31 - clz32(lanes);
+function isContextProvider(type) {
+  {
+    var childContextTypes = type.childContextTypes;
+    return childContextTypes !== null && childContextTypes !== undefined;
+  }
 }
 
-function laneToIndex(lane) {
-  return pickArbitraryLaneIndex(lane);
+function popContext(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
 }
 
-function includesSomeLane(a, b) {
-  return (a & b) !== NoLanes;
-}
-function isSubsetOfLanes(set, subset) {
-  return (set & subset) === subset;
-}
-function mergeLanes(a, b) {
-  return a | b;
+function popTopLevelContextObject(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
 }
-function removeLanes(set, subset) {
-  return set & ~subset;
-} // Seems redundant, but it changes the type from a single lane (used for
-// updates) to a group of lanes (used for flushing work).
 
-function laneToLanes(lane) {
-  return lane;
-}
-function createLaneMap(initial) {
-  // Intentionally pushing one by one.
-  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
-  var laneMap = [];
+function pushTopLevelContextObject(fiber, context, didChange) {
+  {
+    if (!(contextStackCursor.current === emptyContextObject)) {
+      throw Error(
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-  for (var i = 0; i < TotalLanes; i++) {
-    laneMap.push(initial);
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
   }
-
-  return laneMap;
 }
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane; // TODO: Theoretically, any update to any lane can unblock any other lane. But
-  // it's not practical to try every single possible combination. We need a
-  // heuristic to decide which lanes to attempt to render, and in which batches.
-  // For now, we use the same heuristic as in the old ExpirationTimes model:
-  // retry any lane at equal or lower priority, but don't try updates at higher
-  // priority without also including the lower priority updates. This works well
-  // when considering updates across different priority levels, but isn't
-  // sufficient for updates within the same priority, since we want to treat
-  // those updates as parallel.
-  // Unsuspend any update at equal or lower priority.
-
-  var higherPriorityLanes = updateLane - 1; // Turns 0b1000 into 0b0111
-
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  var eventTimes = root.eventTimes;
-  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
-  // recent event, and we assume time is monotonically increasing.
 
-  eventTimes[index] = eventTime;
-}
-function markRootSuspended(root, suspendedLanes) {
-  root.suspendedLanes |= suspendedLanes;
-  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
+function processChildContext(fiber, type, parentContext) {
+  {
+    var instance = fiber.stateNode;
+    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
 
-  var expirationTimes = root.expirationTimes;
-  var lanes = suspendedLanes;
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentNameFromFiber(fiber) || "Unknown";
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
-  }
-}
-function markRootPinged(root, pingedLanes, eventTime) {
-  root.pingedLanes |= root.suspendedLanes & pingedLanes;
-}
-function hasDiscreteLanes(lanes) {
-  return (lanes & InputDiscreteLanes) !== NoLanes;
-}
-function markRootMutableRead(root, updateLane) {
-  root.mutableReadLanes |= updateLane & root.pendingLanes;
-}
-function markRootFinished(root, remainingLanes) {
-  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
-  root.pendingLanes = remainingLanes; // Let's try everything again
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
 
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes;
-  root.mutableReadLanes &= remainingLanes;
-  root.entangledLanes &= remainingLanes;
-  var entanglements = root.entanglements;
-  var eventTimes = root.eventTimes;
-  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
+          error(
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
 
-  var lanes = noLongerPendingLanes;
+      return parentContext;
+    }
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] = NoLanes;
-    eventTimes[index] = NoTimestamp;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
-  }
-}
-function markRootEntangled(root, entangledLanes) {
-  root.entangledLanes |= entangledLanes;
-  var entanglements = root.entanglements;
-  var lanes = entangledLanes;
+    var childContext = instance.getChildContext();
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] |= entangledLanes;
-    lanes &= ~lane;
-  }
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
-// Based on:
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
+    for (var contextKey in childContext) {
+      if (!(contextKey in childContextTypes)) {
+        throw Error(
+          (getComponentNameFromFiber(fiber) || "Unknown") +
+            '.getChildContext(): key "' +
+            contextKey +
+            '" is not defined in childContextTypes.'
+        );
+      }
+    }
 
-var log = Math.log;
-var LN2 = Math.LN2;
+    {
+      var name = getComponentNameFromFiber(fiber) || "Unknown";
+      checkPropTypes(childContextTypes, childContext, "child context", name);
+    }
 
-function clz32Fallback(lanes) {
-  if (lanes === 0) {
-    return 32;
+    return Object.assign({}, parentContext, childContext);
   }
-
-  return (31 - ((log(lanes) / LN2) | 0)) | 0;
 }
 
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
+function pushContextProvider(workInProgress) {
+  {
+    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
 
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyContextObject; // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
     );
+    return true;
   }
 }
 
-var fakeCallbackNode = {}; // Except for NoPriority, these correspond to Scheduler priorities. We use
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
-
-var ImmediatePriority$1 = 99;
-var UserBlockingPriority$1 = 98;
-var NormalPriority$1 = 97;
-var LowPriority$1 = 96;
-var IdlePriority$1 = 95; // NoPriority is the absence of priority. Also React-only.
-
-var NoPriority$1 = 90;
-var shouldYield = Scheduler_shouldYield;
-var requestPaint = // Fall back gracefully if we're running an older version of Scheduler.
-  Scheduler_requestPaint !== undefined ? Scheduler_requestPaint : function() {};
-var syncQueue = null;
-var immediateQueueCallbackNode = null;
-var isFlushingSyncQueue = false;
-var initialTimeMs$1 = Scheduler_now$1(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-// This will be the case for modern browsers that support `performance.now`. In
-// older browsers, Scheduler falls back to `Date.now`, which returns a Unix
-// timestamp. In that case, subtract the module initialization time to simulate
-// the behavior of performance.now and keep our times small enough to fit
-// within 32 bits.
-// TODO: Consider lifting this into Scheduler.
-
-var now =
-  initialTimeMs$1 < 10000
-    ? Scheduler_now$1
-    : function() {
-        return Scheduler_now$1() - initialTimeMs$1;
-      };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return ImmediatePriority$1;
-
-    case Scheduler_UserBlockingPriority:
-      return UserBlockingPriority$1;
+function invalidateContextProvider(workInProgress, type, didChange) {
+  {
+    var instance = workInProgress.stateNode;
 
-    case Scheduler_NormalPriority:
-      return NormalPriority$1;
+    if (!instance) {
+      throw Error(
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-    case Scheduler_LowPriority:
-      return LowPriority$1;
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(
+        workInProgress,
+        type,
+        previousContext
+      );
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
 
-    case Scheduler_IdlePriority:
-      return IdlePriority$1;
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
 
-    default: {
-      throw Error("Unknown priority level.");
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
     }
   }
 }
 
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case ImmediatePriority$1:
-      return Scheduler_ImmediatePriority;
-
-    case UserBlockingPriority$1:
-      return Scheduler_UserBlockingPriority;
-
-    case NormalPriority$1:
-      return Scheduler_NormalPriority;
-
-    case LowPriority$1:
-      return Scheduler_LowPriority;
-
-    case IdlePriority$1:
-      return Scheduler_IdlePriority;
+function findCurrentUnmaskedContext(fiber) {
+  {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
+      throw Error(
+        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-    default: {
-      throw Error("Unknown priority level.");
+    var node = fiber;
+
+    do {
+      switch (node.tag) {
+        case HostRoot:
+          return node.stateNode.context;
+
+        case ClassComponent: {
+          var Component = node.type;
+
+          if (isContextProvider(Component)) {
+            return node.stateNode.__reactInternalMemoizedMergedChildContext;
+          }
+
+          break;
+        }
+      }
+
+      node = node.return;
+    } while (node !== null);
+
+    {
+      throw Error(
+        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+      );
     }
   }
 }
 
-function runWithPriority(reactPriorityLevel, fn) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(priorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(priorityLevel, callback, options);
-}
+var LegacyRoot = 0;
+var ConcurrentRoot = 1;
+
+var syncQueue = null;
+var includesLegacySyncCallbacks = false;
+var isFlushingSyncQueue = false;
 function scheduleSyncCallback(callback) {
   // Push this callback into an internal queue. We'll flush these either in
   // the next tick, or earlier if something calls `flushSyncCallbackQueue`.
   if (syncQueue === null) {
-    syncQueue = [callback]; // Flush the queue in the next tick, at the earliest.
-
-    immediateQueueCallbackNode = Scheduler_scheduleCallback(
-      Scheduler_ImmediatePriority,
-      flushSyncCallbackQueueImpl
-    );
+    syncQueue = [callback];
   } else {
     // Push onto existing queue. Don't need to schedule a callback because
     // we already scheduled one when we created the queue.
     syncQueue.push(callback);
   }
-
-  return fakeCallbackNode;
 }
-function cancelCallback(callbackNode) {
-  if (callbackNode !== fakeCallbackNode) {
-    Scheduler_cancelCallback(callbackNode);
-  }
+function scheduleLegacySyncCallback(callback) {
+  includesLegacySyncCallbacks = true;
+  scheduleSyncCallback(callback);
 }
-function flushSyncCallbackQueue() {
-  if (immediateQueueCallbackNode !== null) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
+function flushSyncCallbacksOnlyInLegacyMode() {
+  // Only flushes the queue if there's a legacy sync callback scheduled.
+  // TODO: There's only a single type of callback: performSyncOnWorkOnRoot. So
+  // it might make more sense for the queue to be a list of roots instead of a
+  // list of generic callbacks. Then we can have two: one for legacy roots, one
+  // for concurrent roots. And this method would only flush the legacy ones.
+  if (includesLegacySyncCallbacks) {
+    flushSyncCallbacks();
   }
-
-  flushSyncCallbackQueueImpl();
 }
-
-function flushSyncCallbackQueueImpl() {
+function flushSyncCallbacks() {
   if (!isFlushingSyncQueue && syncQueue !== null) {
-    // Prevent re-entrancy.
+    // Prevent re-entrance.
     isFlushingSyncQueue = true;
     var i = 0;
+    var previousUpdatePriority = getCurrentUpdatePriority();
 
-    {
-      try {
-        var _isSync2 = true;
-        var _queue = syncQueue;
-        runWithPriority(ImmediatePriority$1, function() {
-          for (; i < _queue.length; i++) {
-            var callback = _queue[i];
-
-            do {
-              callback = callback(_isSync2);
-            } while (callback !== null);
-          }
-        });
-        syncQueue = null;
-      } catch (error) {
-        // If something throws, leave the remaining callbacks on the queue.
-        if (syncQueue !== null) {
-          syncQueue = syncQueue.slice(i + 1);
-        } // Resume flushing in the next tick
-
-        Scheduler_scheduleCallback(
-          Scheduler_ImmediatePriority,
-          flushSyncCallbackQueue
-        );
-        throw error;
-      } finally {
-        isFlushingSyncQueue = false;
+    try {
+      var isSync = true;
+      var queue = syncQueue; // TODO: Is this necessary anymore? The only user code that runs in this
+      // queue is in the render or commit phases.
+
+      setCurrentUpdatePriority(DiscreteEventPriority);
+
+      for (; i < queue.length; i++) {
+        var callback = queue[i];
+
+        do {
+          callback = callback(isSync);
+        } while (callback !== null);
       }
+
+      syncQueue = null;
+      includesLegacySyncCallbacks = false;
+    } catch (error) {
+      // If something throws, leave the remaining callbacks on the queue.
+      if (syncQueue !== null) {
+        syncQueue = syncQueue.slice(i + 1);
+      } // Resume flushing in the next tick
+
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks);
+      throw error;
+    } finally {
+      setCurrentUpdatePriority(previousUpdatePriority);
+      isFlushingSyncQueue = false;
     }
   }
-}
-
-// TODO: this is special because it gets imported during build.
-var ReactVersion = "17.0.1-4e5d7faf5";
 
-var NoMode = 0;
-var StrictMode = 1; // TODO: Remove BlockingMode and ConcurrentMode by reading from the root
-// tag instead
+  return null;
+}
 
-var BlockingMode = 2;
-var ConcurrentMode = 4;
-var ProfileMode = 8;
-var DebugTracingMode = 16;
+var ReactVersion = "18.0.0-bd5bf555e-20210823";
 
 var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
 var NoTransition = 0;
@@ -5743,7 +5920,6 @@ function is(x, y) {
 
 var objectIs = typeof Object.is === "function" ? Object.is : is;
 
-var hasOwnProperty = Object.prototype.hasOwnProperty;
 /**
  * Performs equality by iterating through keys on an object and returning false
  * when any key has values which are not strictly equal between the arguments.
@@ -5808,9 +5984,6 @@ function describeFiber(fiber) {
     case ForwardRef:
       return describeFunctionComponentFrame(fiber.type.render, source, owner);
 
-    case Block:
-      return describeFunctionComponentFrame(fiber.type._render, source, owner);
-
     case ClassComponent:
       return describeClassComponentFrame(fiber.type, source, owner);
 
@@ -5847,7 +6020,7 @@ function getCurrentFiberOwnerNameInDevOrNull() {
     var owner = current._debugOwner;
 
     if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner.type);
+      return getComponentNameFromFiber(owner);
     }
   }
 
@@ -5904,7 +6077,7 @@ var ReactStrictModeWarnings = {
     var node = fiber;
 
     while (node !== null) {
-      if (node.mode & StrictMode) {
+      if (node.mode & StrictLegacyMode) {
         maybeStrictRoot = node;
       }
 
@@ -5935,7 +6108,7 @@ var ReactStrictModeWarnings = {
     fiber,
     instance
   ) {
-    // Dedup strategy: Warn once per component.
+    // Dedupe strategy: Warn once per component.
     if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
       return;
     }
@@ -5948,7 +6121,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillMount === "function"
     ) {
       pendingUNSAFE_ComponentWillMountWarnings.push(fiber);
@@ -5962,7 +6135,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillReceiveProps === "function"
     ) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.push(fiber);
@@ -5976,7 +6149,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillUpdate === "function"
     ) {
       pendingUNSAFE_ComponentWillUpdateWarnings.push(fiber);
@@ -5990,7 +6163,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillMountWarnings.length > 0) {
       pendingComponentWillMountWarnings.forEach(function(fiber) {
         componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6002,7 +6175,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillMountWarnings.length > 0) {
       pendingUNSAFE_ComponentWillMountWarnings.forEach(function(fiber) {
         UNSAFE_componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6014,7 +6187,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillReceivePropsWarnings.length > 0) {
       pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
         componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6026,7 +6199,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillReceivePropsWarnings.length > 0) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.forEach(function(fiber) {
         UNSAFE_componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6038,7 +6211,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillUpdateWarnings.length > 0) {
       pendingComponentWillUpdateWarnings.forEach(function(fiber) {
         componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6050,7 +6223,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillUpdateWarnings.length > 0) {
       pendingUNSAFE_ComponentWillUpdateWarnings.forEach(function(fiber) {
         UNSAFE_componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6205,7 +6378,7 @@ var ReactStrictModeWarnings = {
       var firstFiber = fiberArray[0];
       var uniqueNames = new Set();
       fiberArray.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber.type) || "Component");
+        uniqueNames.add(getComponentNameFromFiber(fiber) || "Component");
         didWarnAboutLegacyContext.add(fiber.type);
       });
       var sortedNames = setToSortedString(uniqueNames);
@@ -6256,11 +6429,6 @@ function resolveDefaultProps(Component, baseProps) {
   return baseProps;
 }
 
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
 var valueCursor = createCursor(null);
 var rendererSigil;
 
@@ -6271,14 +6439,14 @@ var rendererSigil;
 
 var currentlyRenderingFiber = null;
 var lastContextDependency = null;
-var lastContextWithAllBitsObserved = null;
+var lastFullyObservedContext = null;
 var isDisallowedContextReadInDEV = false;
 function resetContextDependencies() {
   // This is called right before React yields execution, to ensure `readContext`
   // cannot be called outside the render phase.
   currentlyRenderingFiber = null;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 
   {
     isDisallowedContextReadInDEV = false;
@@ -6294,9 +6462,7 @@ function exitDisallowedContextReadInDEV() {
     isDisallowedContextReadInDEV = false;
   }
 }
-function pushProvider(providerFiber, nextValue) {
-  var context = providerFiber.type._context;
-
+function pushProvider(providerFiber, context, nextValue) {
   {
     push(valueCursor, context._currentValue2, providerFiber);
     context._currentValue2 = nextValue;
@@ -6317,38 +6483,14 @@ function pushProvider(providerFiber, nextValue) {
     }
   }
 }
-function popProvider(providerFiber) {
+function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
   pop(valueCursor, providerFiber);
-  var context = providerFiber.type._context;
 
   {
     context._currentValue2 = currentValue;
   }
 }
-function calculateChangedBits(context, newValue, oldValue) {
-  if (objectIs(oldValue, newValue)) {
-    // No change
-    return 0;
-  } else {
-    var changedBits =
-      typeof context._calculateChangedBits === "function"
-        ? context._calculateChangedBits(oldValue, newValue)
-        : MAX_SIGNED_31_BIT_INT;
-
-    {
-      if ((changedBits & MAX_SIGNED_31_BIT_INT) !== changedBits) {
-        error(
-          "calculateChangedBits: Expected the return value to be a " +
-            "31-bit integer. Instead received: %s",
-          changedBits
-        );
-      }
-    }
-
-    return changedBits | 0;
-  }
-}
 function scheduleWorkOnParentPath(parent, renderLanes) {
   // Update the child lanes of all the ancestors, including the alternates.
   var node = parent;
@@ -6376,12 +6518,13 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
     node = node.return;
   }
 }
-function propagateContextChange(
-  workInProgress,
-  context,
-  changedBits,
-  renderLanes
-) {
+function propagateContextChange(workInProgress, context, renderLanes) {
+  {
+    propagateContextChange_eager(workInProgress, context, renderLanes);
+  }
+}
+
+function propagateContextChange_eager(workInProgress, context, renderLanes) {
   var fiber = workInProgress.child;
 
   if (fiber !== null) {
@@ -6400,23 +6543,35 @@ function propagateContextChange(
 
       while (dependency !== null) {
         // Check if the context matches.
-        if (
-          dependency.context === context &&
-          (dependency.observedBits & changedBits) !== 0
-        ) {
+        if (dependency.context === context) {
           // Match! Schedule an update on this fiber.
           if (fiber.tag === ClassComponent) {
             // Schedule a force update on the work-in-progress.
-            var update = createUpdate(
-              NoTimestamp,
-              pickArbitraryLane(renderLanes)
-            );
+            var lane = pickArbitraryLane(renderLanes);
+            var update = createUpdate(NoTimestamp, lane);
             update.tag = ForceUpdate; // TODO: Because we don't have a work-in-progress, this will add the
             // update to the current fiber, too, which means it will persist even if
             // this render is thrown away. Since it's a race condition, not sure it's
             // worth fixing.
+            // Inlined `enqueueUpdate` to remove interleaved update check
+
+            var updateQueue = fiber.updateQueue;
+
+            if (updateQueue === null);
+            else {
+              var sharedQueue = updateQueue.shared;
+              var pending = sharedQueue.pending;
+
+              if (pending === null) {
+                // This is the first update. Create a circular list.
+                update.next = update;
+              } else {
+                update.next = pending.next;
+                pending.next = update;
+              }
 
-            enqueueUpdate(fiber, update);
+              sharedQueue.pending = update;
+            }
           }
 
           fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
@@ -6477,23 +6632,25 @@ function propagateContextChange(
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
   var dependencies = workInProgress.dependencies;
 
   if (dependencies !== null) {
-    var firstContext = dependencies.firstContext;
+    {
+      var firstContext = dependencies.firstContext;
 
-    if (firstContext !== null) {
-      if (includesSomeLane(dependencies.lanes, renderLanes)) {
-        // Context list has a pending update. Mark that this fiber performed work.
-        markWorkInProgressReceivedUpdate();
-      } // Reset the work-in-progress list
+      if (firstContext !== null) {
+        if (includesSomeLane(dependencies.lanes, renderLanes)) {
+          // Context list has a pending update. Mark that this fiber performed work.
+          markWorkInProgressReceivedUpdate();
+        } // Reset the work-in-progress list
 
-      dependencies.firstContext = null;
+        dependencies.firstContext = null;
+      }
     }
   }
 }
-function readContext(context, observedBits) {
+function readContext(context) {
   {
     // This warning would fire if you read context inside a Hook like useMemo.
     // Unlike the class check below, it's not enforced in production for perf.
@@ -6507,25 +6664,13 @@ function readContext(context, observedBits) {
     }
   }
 
-  if (lastContextWithAllBitsObserved === context);
-  else if (observedBits === false || observedBits === 0);
-  else {
-    var resolvedObservedBits; // Avoid deopting on observable arguments or heterogeneous types.
-
-    if (
-      typeof observedBits !== "number" ||
-      observedBits === MAX_SIGNED_31_BIT_INT
-    ) {
-      // Observe all updates.
-      lastContextWithAllBitsObserved = context;
-      resolvedObservedBits = MAX_SIGNED_31_BIT_INT;
-    } else {
-      resolvedObservedBits = observedBits;
-    }
+  var value = context._currentValue2;
 
+  if (lastFullyObservedContext === context);
+  else {
     var contextItem = {
       context: context,
-      observedBits: resolvedObservedBits,
+      memoizedValue: value,
       next: null
     };
 
@@ -6539,8 +6684,7 @@ function readContext(context, observedBits) {
       lastContextDependency = contextItem;
       currentlyRenderingFiber.dependencies = {
         lanes: NoLanes,
-        firstContext: contextItem,
-        responders: null
+        firstContext: contextItem
       };
     } else {
       // Append a new context item.
@@ -6548,7 +6692,49 @@ function readContext(context, observedBits) {
     }
   }
 
-  return context._currentValue2;
+  return value;
+}
+
+// An array of all update queues that received updates during the current
+// render. When this render exits, either because it finishes or because it is
+// interrupted, the interleaved updates will be transferred onto the main part
+// of the queue.
+var interleavedQueues = null;
+function pushInterleavedQueue(queue) {
+  if (interleavedQueues === null) {
+    interleavedQueues = [queue];
+  } else {
+    interleavedQueues.push(queue);
+  }
+}
+function enqueueInterleavedUpdates() {
+  // Transfer the interleaved updates onto the main queue. Each queue has a
+  // `pending` field and an `interleaved` field. When they are not null, they
+  // point to the last node in a circular linked list. We need to append the
+  // interleaved list to the end of the pending list by joining them into a
+  // single, circular list.
+  if (interleavedQueues !== null) {
+    for (var i = 0; i < interleavedQueues.length; i++) {
+      var queue = interleavedQueues[i];
+      var lastInterleavedUpdate = queue.interleaved;
+
+      if (lastInterleavedUpdate !== null) {
+        queue.interleaved = null;
+        var firstInterleavedUpdate = lastInterleavedUpdate.next;
+        var lastPendingUpdate = queue.pending;
+
+        if (lastPendingUpdate !== null) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = firstInterleavedUpdate;
+          lastInterleavedUpdate.next = firstPendingUpdate;
+        }
+
+        queue.pending = lastInterleavedUpdate;
+      }
+    }
+
+    interleavedQueues = null;
+  }
 }
 
 var UpdateState = 0;
@@ -6573,7 +6759,9 @@ function initializeUpdateQueue(fiber) {
     firstBaseUpdate: null,
     lastBaseUpdate: null,
     shared: {
-      pending: null
+      pending: null,
+      interleaved: null,
+      lanes: NoLanes
     },
     effects: null
   };
@@ -6606,7 +6794,7 @@ function createUpdate(eventTime, lane) {
   };
   return update;
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
 
   if (updateQueue === null) {
@@ -6615,17 +6803,35 @@ function enqueueUpdate(fiber, update) {
   }
 
   var sharedQueue = updateQueue.shared;
-  var pending = sharedQueue.pending;
 
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
+  if (isInterleavedUpdate(fiber)) {
+    var interleaved = sharedQueue.interleaved;
+
+    if (interleaved === null) {
+      // This is the first update. Create a circular list.
+      update.next = update; // At the end of the current render, this queue's interleaved updates will
+      // be transferred to the pending queue.
+
+      pushInterleavedQueue(sharedQueue);
+    } else {
+      update.next = interleaved.next;
+      interleaved.next = update;
+    }
+
+    sharedQueue.interleaved = update;
   } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
+    var pending = sharedQueue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
 
-  sharedQueue.pending = update;
+    sharedQueue.pending = update;
+  }
 
   {
     if (
@@ -6643,6 +6849,33 @@ function enqueueUpdate(fiber, update) {
     }
   }
 }
+function entangleTransitions(root, fiber, lane) {
+  var updateQueue = fiber.updateQueue;
+
+  if (updateQueue === null) {
+    // Only occurs if the fiber has been unmounted.
+    return;
+  }
+
+  var sharedQueue = updateQueue.shared;
+
+  if (isTransitionLane(lane)) {
+    var queueLanes = sharedQueue.lanes; // If any entangled lanes are no longer pending on the root, then they must
+    // have finished. We can remove them from the shared queue, which represents
+    // a superset of the actually pending lanes. In some cases we may entangle
+    // more than we need to, but that's OK. In fact it's worse if we *don't*
+    // entangle when we should.
+
+    queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+    var newQueueLanes = mergeLanes(queueLanes, lane);
+    sharedQueue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+    // the lane finished since the last time we entangled it. So we need to
+    // entangle it again, just to be sure.
+
+    markRootEntangled(root, newQueueLanes);
+  }
+}
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
   // Captured updates are updates that are thrown by a child during the render
   // phase. They should be discarded if the render is aborted. Therefore,
@@ -6744,7 +6977,7 @@ function getStateFromUpdate(
         var nextState = payload.call(instance, prevState, nextProps);
 
         {
-          if (workInProgress.mode & StrictMode) {
+          if (workInProgress.mode & StrictLegacyMode) {
             disableLogs();
 
             try {
@@ -6782,7 +7015,7 @@ function getStateFromUpdate(
         partialState = _payload.call(instance, prevState, nextProps);
 
         {
-          if (workInProgress.mode & StrictMode) {
+          if (workInProgress.mode & StrictLegacyMode) {
             disableLogs();
 
             try {
@@ -6932,7 +7165,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
         );
         var callback = update.callback;
 
-        if (callback !== null) {
+        if (
+          callback !== null && // If the update was already committed, we should not queue its
+          // callback again.
+          update.lane !== NoLane
+        ) {
           workInProgress.flags |= Callback;
           var effects = queue.effects;
 
@@ -6972,7 +7209,24 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
 
     queue.baseState = newBaseState;
     queue.firstBaseUpdate = newFirstBaseUpdate;
-    queue.lastBaseUpdate = newLastBaseUpdate; // Set the remaining expiration time to be whatever is remaining in the queue.
+    queue.lastBaseUpdate = newLastBaseUpdate; // Interleaved updates are stored on a separate queue. We aren't going to
+    // process them during this render, but we do need to track which lanes
+    // are remaining.
+
+    var lastInterleaved = queue.shared.interleaved;
+
+    if (lastInterleaved !== null) {
+      var interleaved = lastInterleaved;
+
+      do {
+        newLanes = mergeLanes(newLanes, interleaved.lane);
+        interleaved = interleaved.next;
+      } while (interleaved !== lastInterleaved);
+    } else if (firstBaseUpdate === null) {
+      // `queue.lanes` is used for entangling transitions. We can set it back to
+      // zero once the queue is empty.
+      queue.shared.lanes = NoLanes;
+    } // Set the remaining expiration time to be whatever is remaining in the queue.
     // This should be fine because the only two other things that contribute to
     // expiration time are props and context. We're already in the middle of the
     // begin phase by the time we start processing the queue, so we've already
@@ -7025,8 +7279,7 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   }
 }
 
-var fakeInternalInstance = {};
-var isArray = Array.isArray; // React.Component uses a shared frozen object by default.
+var fakeInternalInstance = {}; // React.Component uses a shared frozen object by default.
 // We'll use it to determine whether we need to initialize legacy refs.
 
 var emptyRefsObject = new React.Component().refs;
@@ -7073,7 +7326,7 @@ var didWarnAboutInvalidateContextType;
 
   warnOnUndefinedDerivedState = function(type, partialState) {
     if (partialState === undefined) {
-      var componentName = getComponentName(type) || "Component";
+      var componentName = getComponentNameFromType(type) || "Component";
 
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
@@ -7111,23 +7364,20 @@ function applyDerivedStateFromProps(
   nextProps
 ) {
   var prevState = workInProgress.memoizedState;
+  var partialState = getDerivedStateFromProps(nextProps, prevState);
 
   {
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       disableLogs();
 
       try {
         // Invoke the function an extra time to help detect side-effects.
-        getDerivedStateFromProps(nextProps, prevState);
+        partialState = getDerivedStateFromProps(nextProps, prevState);
       } finally {
         reenableLogs();
       }
     }
-  }
 
-  var partialState = getDerivedStateFromProps(nextProps, prevState);
-
-  {
     warnOnUndefinedDerivedState(ctor, partialState);
   } // Merge the partial state and the previous state.
 
@@ -7144,6 +7394,7 @@ function applyDerivedStateFromProps(
     updateQueue.baseState = memoizedState;
   }
 }
+
 var classComponentUpdater = {
   isMounted: isMounted,
   enqueueSetState: function(inst, payload, callback) {
@@ -7162,7 +7413,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueReplaceState: function(inst, payload, callback) {
     var fiber = get(inst);
@@ -7181,7 +7436,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueForceUpdate: function(inst, callback) {
     var fiber = get(inst);
@@ -7199,7 +7458,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   }
 };
 
@@ -7215,31 +7478,33 @@ function checkShouldComponentUpdate(
   var instance = workInProgress.stateNode;
 
   if (typeof instance.shouldComponentUpdate === "function") {
+    var shouldUpdate = instance.shouldComponentUpdate(
+      newProps,
+      newState,
+      nextContext
+    );
+
     {
-      if (workInProgress.mode & StrictMode) {
+      if (workInProgress.mode & StrictLegacyMode) {
         disableLogs();
 
         try {
           // Invoke the function an extra time to help detect side-effects.
-          instance.shouldComponentUpdate(newProps, newState, nextContext);
+          shouldUpdate = instance.shouldComponentUpdate(
+            newProps,
+            newState,
+            nextContext
+          );
         } finally {
           reenableLogs();
         }
       }
-    }
-
-    var shouldUpdate = instance.shouldComponentUpdate(
-      newProps,
-      newState,
-      nextContext
-    );
 
-    {
       if (shouldUpdate === undefined) {
         error(
           "%s.shouldComponentUpdate(): Returned undefined instead of a " +
             "boolean value. Make sure to return true or false.",
-          getComponentName(ctor) || "Component"
+          getComponentNameFromType(ctor) || "Component"
         );
       }
     }
@@ -7260,7 +7525,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
   var instance = workInProgress.stateNode;
 
   {
-    var name = getComponentName(ctor) || "Component";
+    var name = getComponentNameFromType(ctor) || "Component";
     var renderPresent = instance.render;
 
     if (!renderPresent) {
@@ -7363,7 +7628,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
         "%s has a method called shouldComponentUpdate(). " +
           "shouldComponentUpdate should not be used when extending React.PureComponent. " +
           "Please extend React.Component if shouldComponentUpdate is used.",
-        getComponentName(ctor) || "A pure component"
+        getComponentNameFromType(ctor) || "A pure component"
       );
     }
 
@@ -7433,7 +7698,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
       error(
         "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
           "This component defines getSnapshotBeforeUpdate() only.",
-        getComponentName(ctor)
+        getComponentNameFromType(ctor)
       );
     }
 
@@ -7532,7 +7797,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         error(
           "%s defines an invalid contextType. " +
             "contextType should point to the Context object returned by React.createContext().%s",
-          getComponentName(ctor) || "Component",
+          getComponentNameFromType(ctor) || "Component",
           addendum
         );
       }
@@ -7549,21 +7814,22 @@ function constructClassInstance(workInProgress, ctor, props) {
     context = isLegacyContextConsumer
       ? getMaskedContext(workInProgress, unmaskedContext)
       : emptyContextObject;
-  } // Instantiate twice to help detect side-effects.
+  }
+
+  var instance = new ctor(props, context); // Instantiate twice to help detect side-effects.
 
   {
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       disableLogs();
 
       try {
-        new ctor(props, context); // eslint-disable-line no-new
+        instance = new ctor(props, context); // eslint-disable-line no-new
       } finally {
         reenableLogs();
       }
     }
   }
 
-  var instance = new ctor(props, context);
   var state = (workInProgress.memoizedState =
     instance.state !== null && instance.state !== undefined
       ? instance.state
@@ -7572,7 +7838,7 @@ function constructClassInstance(workInProgress, ctor, props) {
 
   {
     if (typeof ctor.getDerivedStateFromProps === "function" && state === null) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
@@ -7633,7 +7899,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         foundWillReceivePropsName !== null ||
         foundWillUpdateName !== null
       ) {
-        var _componentName = getComponentName(ctor) || "Component";
+        var _componentName = getComponentNameFromType(ctor) || "Component";
 
         var newApiName =
           typeof ctor.getDerivedStateFromProps === "function"
@@ -7686,7 +7952,7 @@ function callComponentWillMount(workInProgress, instance) {
         "%s.componentWillMount(): Assigning directly to this.state is " +
           "deprecated (except inside a component's " +
           "constructor). Use setState instead.",
-        getComponentName(workInProgress.type) || "Component"
+        getComponentNameFromFiber(workInProgress) || "Component"
       );
     }
 
@@ -7712,7 +7978,8 @@ function callComponentWillReceiveProps(
 
   if (instance.state !== oldState) {
     {
-      var componentName = getComponentName(workInProgress.type) || "Component";
+      var componentName =
+        getComponentNameFromFiber(workInProgress) || "Component";
 
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
@@ -7751,7 +8018,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
 
   {
     if (instance.state === newProps) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutDirectlyAssigningPropsToState.has(componentName)) {
         didWarnAboutDirectlyAssigningPropsToState.add(componentName);
@@ -7765,7 +8032,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
       }
     }
 
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       ReactStrictModeWarnings.recordLegacyContextWarning(
         workInProgress,
         instance
@@ -7780,7 +8047,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
   }
 
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
 
@@ -7809,7 +8075,13 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   }
 
   if (typeof instance.componentDidMount === "function") {
-    workInProgress.flags |= Update;
+    var fiberFlags = Update;
+
+    if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+      fiberFlags |= MountLayoutDev;
+    }
+
+    workInProgress.flags |= fiberFlags;
   }
 }
 
@@ -7871,7 +8143,13 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var fiberFlags = Update;
+
+      if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+        fiberFlags |= MountLayoutDev;
+      }
+
+      workInProgress.flags |= fiberFlags;
     }
 
     return false;
@@ -7917,13 +8195,25 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
 
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags = Update;
+
+      if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+        _fiberFlags |= MountLayoutDev;
+      }
+
+      workInProgress.flags |= _fiberFlags;
     }
   } else {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags2 = Update;
+
+      if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+        _fiberFlags2 |= MountLayoutDev;
+      }
+
+      workInProgress.flags |= _fiberFlags2;
     } // If shouldComponentUpdate returned false, we should still update the
     // memoized state to indicate that this work can be reused.
 
@@ -8002,7 +8292,8 @@ function updateClassInstance(
     unresolvedOldProps === unresolvedNewProps &&
     oldState === newState &&
     !hasContextChanged() &&
-    !checkHasForceUpdateAfterProcessing()
+    !checkHasForceUpdateAfterProcessing() &&
+    !enableLazyContextPropagation
   ) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
@@ -8047,7 +8338,11 @@ function updateClassInstance(
       oldState,
       newState,
       nextContext
-    );
+    ) || // TODO: In some cases, we'll end up checking if context has changed twice,
+    // both before and after `shouldComponentUpdate` has been called. Not ideal,
+    // but I'm loath to refactor this function. This only happens for memoized
+    // components so it's not that common.
+    enableLazyContextPropagation;
 
   if (shouldUpdate) {
     // In order to support react-lifecycles-compat polyfilled components,
@@ -8143,7 +8438,7 @@ var warnForMissingKey = function(child, returnFiber) {};
     }
 
     child._store.validated = true;
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasKeyUseWarning[componentName]) {
       return;
@@ -8159,8 +8454,6 @@ var warnForMissingKey = function(child, returnFiber) {};
   };
 }
 
-var isArray$1 = Array.isArray;
-
 function coerceRef(returnFiber, current, element) {
   var mixedRef = element.ref;
 
@@ -8173,7 +8466,7 @@ function coerceRef(returnFiber, current, element) {
       // TODO: Clean this up once we turn on the string ref warning for
       // everyone, because the strict mode case will no longer be relevant
       if (
-        (returnFiber.mode & StrictMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
+        (returnFiber.mode & StrictLegacyMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
         // because these cannot be automatically converted to an arrow function
         // using a codemod. Therefore, we don't have to warn about string refs again.
         !(
@@ -8182,7 +8475,8 @@ function coerceRef(returnFiber, current, element) {
           element._owner.stateNode !== element._self
         )
       ) {
-        var componentName = getComponentName(returnFiber.type) || "Component";
+        var componentName =
+          getComponentNameFromFiber(returnFiber) || "Component";
 
         if (!didWarnAboutStringRefs[componentName]) {
           {
@@ -8274,22 +8568,22 @@ function coerceRef(returnFiber, current, element) {
 }
 
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if (returnFiber.type !== "textarea") {
-    {
-      throw Error(
-        "Objects are not valid as a React child (found: " +
-          (Object.prototype.toString.call(newChild) === "[object Object]"
-            ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-            : newChild) +
-          "). If you meant to render a collection of children, use an array instead."
-      );
-    }
+  var childString = Object.prototype.toString.call(newChild);
+
+  {
+    throw Error(
+      "Objects are not valid as a React child (found: " +
+        (childString === "[object Object]"
+          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+          : childString) +
+        "). If you meant to render a collection of children, use an array instead."
+    );
   }
 }
 
 function warnOnFunctionType(returnFiber) {
   {
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasFunctionTypeWarning[componentName]) {
       return;
@@ -8303,7 +8597,7 @@ function warnOnFunctionType(returnFiber) {
         "Or maybe you meant to call this function rather than return it."
     );
   }
-} // We avoid inlining this to avoid potential deopts from using try/catch.
+}
 // to be able to optimize each path individually by branching early. This needs
 // a compiler or we can do it manually. Helpers that don't need this branching
 // live outside of this function.
@@ -8313,23 +8607,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     if (!shouldTrackSideEffects) {
       // Noop.
       return;
-    } // Deletions are added in reversed order so we add it to the front.
-    // At this point, the return fiber's effect list is empty except for
-    // deletions, so we can just append the deletion to the list. The remaining
-    // effects aren't added until the complete phase. Once we implement
-    // resuming, this may not be true.
+    }
 
-    var last = returnFiber.lastEffect;
+    var deletions = returnFiber.deletions;
 
-    if (last !== null) {
-      last.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
+    if (deletions === null) {
+      returnFiber.deletions = [childToDelete];
+      returnFiber.flags |= ChildDeletion;
     } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+      deletions.push(childToDelete);
     }
-
-    childToDelete.nextEffect = null;
-    childToDelete.flags = Deletion;
   }
 
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -8393,7 +8680,7 @@ function ChildReconciler(shouldTrackSideEffects) {
 
       if (oldIndex < lastPlacedIndex) {
         // This is a move.
-        newFiber.flags = Placement;
+        newFiber.flags |= Placement;
         return lastPlacedIndex;
       } else {
         // This item can stay in place.
@@ -8401,7 +8688,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       }
     } else {
       // This is an insertion.
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
       return lastPlacedIndex;
     }
   }
@@ -8410,7 +8697,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     // This is simpler for the single child case. We only need to do a
     // placement for inserting new children.
     if (shouldTrackSideEffects && newFiber.alternate === null) {
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
     }
 
     return newFiber;
@@ -8431,10 +8718,26 @@ function ChildReconciler(shouldTrackSideEffects) {
   }
 
   function updateElement(returnFiber, current, element, lanes) {
+    var elementType = element.type;
+
+    if (elementType === REACT_FRAGMENT_TYPE) {
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    }
+
     if (current !== null) {
       if (
-        current.elementType === element.type || // Keep this check inline so it only runs on the false path:
-        isCompatibleFamilyForHotReloading(current, element)
+        current.elementType === elementType || // Keep this check inline so it only runs on the false path:
+        isCompatibleFamilyForHotReloading(current, element) || // Lazy types should reconcile their resolved type.
+        // We need to do this after the Hot Reloading check above,
+        // because hot reloading has different semantics than prod because
+        // it doesn't resuspend. So we can't let the call below suspend.
+        enableLazyElements
       ) {
         // Move based on index
         var existing = useFiber(current, element.props);
@@ -8530,7 +8833,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _created3 = createFiberFromFragment(
           newChild,
           returnFiber.mode,
@@ -8573,16 +8876,6 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE: {
           if (newChild.key === key) {
-            if (newChild.type === REACT_FRAGMENT_TYPE) {
-              return updateFragment(
-                returnFiber,
-                oldFiber,
-                newChild.props.children,
-                lanes,
-                key
-              );
-            }
-
             return updateElement(returnFiber, oldFiber, newChild, lanes);
           } else {
             return null;
@@ -8598,7 +8891,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         if (key !== null) {
           return null;
         }
@@ -8640,16 +8933,6 @@ function ChildReconciler(shouldTrackSideEffects) {
               newChild.key === null ? newIdx : newChild.key
             ) || null;
 
-          if (newChild.type === REACT_FRAGMENT_TYPE) {
-            return updateFragment(
-              returnFiber,
-              _matchedFiber,
-              newChild.props.children,
-              lanes,
-              newChild.key
-            );
-          }
-
           return updateElement(returnFiber, _matchedFiber, newChild, lanes);
         }
 
@@ -8663,7 +8946,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _matchedFiber3 = existingChildren.get(newIdx) || null;
 
         return updateFragment(
@@ -9143,50 +9426,43 @@ function ChildReconciler(shouldTrackSideEffects) {
       // TODO: If key === null and child.key === null, then this only applies to
       // the first item in the list.
       if (child.key === key) {
-        switch (child.tag) {
-          case Fragment: {
-            if (element.type === REACT_FRAGMENT_TYPE) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-              var existing = useFiber(child, element.props.children);
-              existing.return = returnFiber;
+        var elementType = element.type;
 
-              {
-                existing._debugSource = element._source;
-                existing._debugOwner = element._owner;
-              }
+        if (elementType === REACT_FRAGMENT_TYPE) {
+          if (child.tag === Fragment) {
+            deleteRemainingChildren(returnFiber, child.sibling);
+            var existing = useFiber(child, element.props.children);
+            existing.return = returnFiber;
 
-              return existing;
+            {
+              existing._debugSource = element._source;
+              existing._debugOwner = element._owner;
             }
 
-            break;
+            return existing;
           }
+        } else {
+          if (
+            child.elementType === elementType || // Keep this check inline so it only runs on the false path:
+            isCompatibleFamilyForHotReloading(child, element) || // Lazy types should reconcile their resolved type.
+            // We need to do this after the Hot Reloading check above,
+            // because hot reloading has different semantics than prod because
+            // it doesn't resuspend. So we can't let the call below suspend.
+            enableLazyElements
+          ) {
+            deleteRemainingChildren(returnFiber, child.sibling);
 
-          case Block:
-
-          // We intentionally fallthrough here if enableBlocksAPI is not on.
-          // eslint-disable-next-lined no-fallthrough
-
-          default: {
-            if (
-              child.elementType === element.type || // Keep this check inline so it only runs on the false path:
-              isCompatibleFamilyForHotReloading(child, element)
-            ) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-
-              var _existing3 = useFiber(child, element.props);
-
-              _existing3.ref = coerceRef(returnFiber, child, element);
-              _existing3.return = returnFiber;
+            var _existing = useFiber(child, element.props);
 
-              {
-                _existing3._debugSource = element._source;
-                _existing3._debugOwner = element._owner;
-              }
+            _existing.ref = coerceRef(returnFiber, child, element);
+            _existing.return = returnFiber;
 
-              return _existing3;
+            {
+              _existing._debugSource = element._source;
+              _existing._debugOwner = element._owner;
             }
 
-            break;
+            return _existing;
           }
         } // Didn't match.
 
@@ -9280,9 +9556,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild = newChild.props.children;
     } // Handle object types
 
-    var isObject = typeof newChild === "object" && newChild !== null;
-
-    if (isObject) {
+    if (typeof newChild === "object" && newChild !== null) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return placeSingleChild(
@@ -9304,6 +9578,26 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
+
+      if (isArray(newChild)) {
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      if (getIteratorFn(newChild)) {
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     if (typeof newChild === "string" || typeof newChild === "number") {
@@ -9317,65 +9611,10 @@ function ChildReconciler(shouldTrackSideEffects) {
       );
     }
 
-    if (isArray$1(newChild)) {
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (getIteratorFn(newChild)) {
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (isObject) {
-      throwOnInvalidObjectType(returnFiber, newChild);
-    }
-
     {
       if (typeof newChild === "function") {
         warnOnFunctionType(returnFiber);
       }
-    }
-
-    if (typeof newChild === "undefined" && !isUnkeyedTopLevelFragment) {
-      // If the new child is undefined, and the return fiber is a composite
-      // component, throw an error. If Fiber return types are disabled,
-      // we already threw above.
-      switch (returnFiber.tag) {
-        case ClassComponent: {
-          {
-            var instance = returnFiber.stateNode;
-
-            if (instance.render._isMockFunction) {
-              // We allow auto-mocks to proceed as if they're returning null.
-              break;
-            }
-          }
-        }
-        // Intentionally fall through to the next case, which handles both
-        // functions and classes
-        // eslint-disable-next-lined no-fallthrough
-
-        case Block:
-        case FunctionComponent:
-        case ForwardRef:
-        case SimpleMemoComponent: {
-          {
-            throw Error(
-              (getComponentName(returnFiber.type) || "Component") +
-                "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
-            );
-          }
-        }
-      }
     } // Remaining cases are all treated as empty.
 
     return deleteRemainingChildren(returnFiber, currentFirstChild);
@@ -9548,11 +9787,7 @@ function shouldCaptureSuspense(workInProgress, hasInvisibleParent) {
     return false;
   }
 
-  var props = workInProgress.memoizedProps; // In order to capture, the Suspense component must have a fallback prop.
-
-  if (props.fallback === undefined) {
-    return false;
-  } // Regular boundaries always capture.
+  var props = workInProgress.memoizedProps; // Regular boundaries always capture.
 
   if (props.unstable_avoidThisFallback !== true) {
     return true;
@@ -9728,6 +9963,12 @@ function warnAboutMultipleRenderersDEV(mutableSource) {
   }
 } // Eager reads the version of a mutable source and stores it on the root.
 
+function getSuspendedCachePool() {
+  {
+    return null;
+  } // We check the cache on the stack first, since that's the one any new Caches
+}
+
 var ReactCurrentDispatcher$1 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentBatchConfig$1 = ReactSharedInternals.ReactCurrentBatchConfig;
 var didWarnAboutMismatchedHooksForComponent;
@@ -9800,7 +10041,7 @@ function updateHookTypesDev() {
 
 function checkDepsAreArrayDev(deps) {
   {
-    if (deps !== undefined && deps !== null && !Array.isArray(deps)) {
+    if (deps !== undefined && deps !== null && !isArray(deps)) {
       // Verify deps, but only on mount to avoid extra checks.
       // It's unlikely their type would change as usually you define them inline.
       error(
@@ -9815,7 +10056,7 @@ function checkDepsAreArrayDev(deps) {
 
 function warnOnHookMismatchInDev(currentHookName) {
   {
-    var componentName = getComponentName(currentlyRenderingFiber$1.type);
+    var componentName = getComponentNameFromFiber(currentlyRenderingFiber$1);
 
     if (!didWarnAboutMismatchedHooksForComponent.has(componentName)) {
       didWarnAboutMismatchedHooksForComponent.add(componentName);
@@ -9995,7 +10236,7 @@ function renderWithHooks(
       children = Component(props, secondArg);
     } while (didScheduleRenderPhaseUpdateDuringThisPass);
   } // We can assume the previous dispatcher is always this one, since we set it
-  // at the beginning of the render phase and there's no re-entrancy.
+  // at the beginning of the render phase and there's no re-entrance.
 
   ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
 
@@ -10013,7 +10254,25 @@ function renderWithHooks(
   {
     currentHookNameInDev = null;
     hookTypesDev = null;
-    hookTypesUpdateIndexDev = -1;
+    hookTypesUpdateIndexDev = -1; // Confirm that a static flag was not added or removed since the last
+    // render. If this fires, it suggests that we incorrectly reset the static
+    // flags in some other part of the codebase. This has happened before, for
+    // example, in the SuspenseList implementation.
+
+    if (
+      current !== null &&
+      (current.flags & StaticMask) !== (workInProgress.flags & StaticMask) && // Disable this warning in legacy mode, because legacy Suspense is weird
+      // and creates false positives. To make this work in legacy mode, we'd
+      // need to mark fibers that commit in an incomplete state, somehow. For
+      // now I'll disable the warning that most of the bugs that would trigger
+      // it are either exclusive to concurrent mode or exist in both.
+      (current.mode & ConcurrentMode) !== NoMode
+    ) {
+      error(
+        "Internal React error: Expected static flag was missing. Please " +
+          "notify the React team."
+      );
+    }
   }
 
   didScheduleRenderPhaseUpdate = false;
@@ -10027,13 +10286,25 @@ function renderWithHooks(
   return children;
 }
 function bailoutHooks(current, workInProgress, lanes) {
-  workInProgress.updateQueue = current.updateQueue;
-  workInProgress.flags &= ~(Passive | Update);
+  workInProgress.updateQueue = current.updateQueue; // TODO: Don't need to reset the flags here, because they're reset in the
+  // complete phase (bubbleProperties).
+
+  if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+    workInProgress.flags &= ~(
+      MountPassiveDev |
+      MountLayoutDev |
+      Passive |
+      Update
+    );
+  } else {
+    workInProgress.flags &= ~(Passive | Update);
+  }
+
   current.lanes = removeLanes(current.lanes, lanes);
 }
 function resetHooksAfterThrow() {
   // We can assume the previous dispatcher is always this one, since we set it
-  // at the beginning of the render phase and there's no re-entrancy.
+  // at the beginning of the render phase and there's no re-entrance.
   ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
 
   if (didScheduleRenderPhaseUpdate) {
@@ -10179,6 +10450,8 @@ function mountReducer(reducer, initialArg, init) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: reducer,
     lastRenderedState: initialState
@@ -10316,6 +10589,28 @@ function updateReducer(reducer, initialArg, init) {
     hook.baseState = newBaseState;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = newState;
+  } // Interleaved updates are stored on a separate queue. We aren't going to
+  // process them during this render, but we do need to track which lanes
+  // are remaining.
+
+  var lastInterleaved = queue.interleaved;
+
+  if (lastInterleaved !== null) {
+    var interleaved = lastInterleaved;
+
+    do {
+      var interleavedLane = interleaved.lane;
+      currentlyRenderingFiber$1.lanes = mergeLanes(
+        currentlyRenderingFiber$1.lanes,
+        interleavedLane
+      );
+      markSkippedUpdateLanes(interleavedLane);
+      interleaved = interleaved.next;
+    } while (interleaved !== lastInterleaved);
+  } else if (baseQueue === null) {
+    // `queue.lanes` is used for entangling transitions. We can set it back to
+    // zero once the queue is empty.
+    queue.lanes = NoLanes;
   }
 
   var dispatch = queue.dispatch;
@@ -10374,7 +10669,7 @@ function rerenderReducer(reducer, initialArg, init) {
   return [newState, dispatch];
 }
 
-function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
+function readFromUnsubscribedMutableSource(root, source, getSnapshot) {
   {
     warnAboutMultipleRenderersDEV(source);
   }
@@ -10443,11 +10738,50 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
     //
     // This can lead to tearing in the first renderer when it resumes,
     // but there's nothing we can do about that (short of throwing here and refusing to continue the render).
-    markSourceAsDirty(source);
+    markSourceAsDirty(source); // Intentioally throw an error to force React to retry synchronously. During
+    // the synchronous retry, it will block interleaved mutations, so we should
+    // get a consistent read. Therefore, the following error should never be
+    // visible to the user.
+    //
+    // If it were to become visible to the user, it suggests one of two things:
+    // a bug in React, or (more likely), a mutation during the render phase that
+    // caused the second re-render attempt to be different from the first.
+    //
+    // We know it's the second case if the logs are currently disabled. So in
+    // dev, we can present a more accurate error message.
+
+    {
+      // eslint-disable-next-line react-internal/no-production-logging
+      if (console.log.__reactDisabledLog) {
+        // If the logs are disabled, this is the dev-only double render. This is
+        // only reachable if there was a mutation during render. Show a helpful
+        // error message.
+        //
+        // Something interesting to note: because we only double render in
+        // development, this error will never happen during production. This is
+        // actually true of all errors that occur during a double render,
+        // because if the first render had thrown, we would have exited the
+        // begin phase without double rendering. We should consider suppressing
+        // any error from a double render (with a warning) to more closely match
+        // the production behavior.
+        var componentName = getComponentNameFromFiber(
+          currentlyRenderingFiber$1
+        );
+
+        {
+          throw Error(
+            "A mutable source was mutated while the " +
+              componentName +
+              " component was rendering. This is not supported. Move any mutations into event handlers or effects."
+          );
+        }
+      }
+    } // We expect this error not to be thrown during the synchronous retry,
+    // because we blocked interleaved mutations.
 
     {
       throw Error(
-        "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+        "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
       );
     }
   }
@@ -10467,7 +10801,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
   var dispatcher = ReactCurrentDispatcher$1.current; // eslint-disable-next-line prefer-const
 
   var _dispatcher$useState = dispatcher.useState(function() {
-      return readFromUnsubcribedMutableSource(root, source, getSnapshot);
+      return readFromUnsubscribedMutableSource(root, source, getSnapshot);
     }),
     currentSnapshot = _dispatcher$useState[0],
     setSnapshot = _dispatcher$useState[1];
@@ -10583,6 +10917,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     // including any interleaving updates that occur.
     var newQueue = {
       pending: null,
+      interleaved: null,
+      lanes: NoLanes,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -10594,7 +10930,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     );
     stateHook.queue = newQueue;
     stateHook.baseQueue = null;
-    snapshot = readFromUnsubcribedMutableSource(root, source, getSnapshot);
+    snapshot = readFromUnsubscribedMutableSource(root, source, getSnapshot);
     stateHook.memoizedState = stateHook.baseState = snapshot;
   }
 
@@ -10630,6 +10966,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -10723,7 +11061,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
       var prevDeps = prevEffect.deps;
 
       if (areHookInputsEqual(nextDeps, prevDeps)) {
-        pushEffect(hookFlags, create, destroy, nextDeps);
+        hook.memoizedState = pushEffect(hookFlags, create, destroy, nextDeps);
         return;
       }
     }
@@ -10739,15 +11077,30 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
 }
 
 function mountEffect(create, deps) {
-  return mountEffectImpl(Update | Passive, Passive$1, create, deps);
+  if ((currentlyRenderingFiber$1.mode & StrictEffectsMode) !== NoMode) {
+    return mountEffectImpl(
+      MountPassiveDev | Passive | PassiveStatic,
+      Passive$1,
+      create,
+      deps
+    );
+  } else {
+    return mountEffectImpl(Passive | PassiveStatic, Passive$1, create, deps);
+  }
 }
 
 function updateEffect(create, deps) {
-  return updateEffectImpl(Update | Passive, Passive$1, create, deps);
+  return updateEffectImpl(Passive, Passive$1, create, deps);
 }
 
 function mountLayoutEffect(create, deps) {
-  return mountEffectImpl(Update, Layout, create, deps);
+  var fiberFlags = Update;
+
+  if ((currentlyRenderingFiber$1.mode & StrictEffectsMode) !== NoMode) {
+    fiberFlags |= MountLayoutDev;
+  }
+
+  return mountEffectImpl(fiberFlags, Layout, create, deps);
 }
 
 function updateLayoutEffect(create, deps) {
@@ -10799,8 +11152,14 @@ function mountImperativeHandle(ref, create, deps) {
 
   var effectDeps =
     deps !== null && deps !== undefined ? deps.concat([ref]) : null;
+  var fiberFlags = Update;
+
+  if ((currentlyRenderingFiber$1.mode & StrictEffectsMode) !== NoMode) {
+    fiberFlags |= MountLayoutDev;
+  }
+
   return mountEffectImpl(
-    Update,
+    fiberFlags,
     Layout,
     imperativeHandleEffect.bind(null, create, ref),
     effectDeps
@@ -10955,31 +11314,20 @@ function rerenderDeferredValue(value) {
 }
 
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-
-  {
-    runWithPriority(
-      priorityLevel < UserBlockingPriority$1
-        ? UserBlockingPriority$1
-        : priorityLevel,
-      function() {
-        setPending(true);
-      }
-    );
-    runWithPriority(
-      priorityLevel > NormalPriority$1 ? NormalPriority$1 : priorityLevel,
-      function() {
-        var prevTransition = ReactCurrentBatchConfig$1.transition;
-        ReactCurrentBatchConfig$1.transition = 1;
+  var previousPriority = getCurrentUpdatePriority();
+  setCurrentUpdatePriority(
+    higherEventPriority(previousPriority, ContinuousEventPriority)
+  );
+  setPending(true);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
 
-        try {
-          setPending(false);
-          callback();
-        } finally {
-          ReactCurrentBatchConfig$1.transition = prevTransition;
-        }
-      }
-    );
+  try {
+    setPending(false);
+    callback();
+  } finally {
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$1.transition = prevTransition;
   }
 }
 
@@ -10991,7 +11339,7 @@ function mountTransition() {
   var start = startTransition.bind(null, setPending);
   var hook = mountWorkInProgressHook();
   hook.memoizedState = start;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function updateTransition() {
@@ -11000,7 +11348,7 @@ function updateTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function rerenderTransition() {
@@ -11009,7 +11357,7 @@ function rerenderTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 var isUpdatingOpaqueValueInRenderPhase = false;
@@ -11022,7 +11370,7 @@ function getIsUpdatingOpaqueValueInRenderPhaseInDEV() {
 function warnOnOpaqueIdentifierAccessInDEV(fiber) {
   {
     // TODO: Should warn in effects and callbacks, too
-    var name = getComponentName(fiber.type) || "Unknown";
+    var name = getComponentNameFromFiber(fiber) || "Unknown";
 
     if (getIsRendering() && !didWarnAboutUseOpaqueIdentifier[name]) {
       error(
@@ -11079,19 +11427,7 @@ function dispatchAction(fiber, queue, action) {
     eagerReducer: null,
     eagerState: null,
     next: null
-  }; // Append the update to the end of the list.
-
-  var pending = queue.pending;
-
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
-  } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
-
-  queue.pending = update;
+  };
   var alternate = fiber.alternate;
 
   if (
@@ -11102,7 +11438,47 @@ function dispatchAction(fiber, queue, action) {
     // queue -> linked list of updates. After this render pass, we'll restart
     // and apply the stashed updates on top of the work-in-progress hook.
     didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = true;
+    var pending = queue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
+
+    queue.pending = update;
   } else {
+    if (isInterleavedUpdate(fiber)) {
+      var interleaved = queue.interleaved;
+
+      if (interleaved === null) {
+        // This is the first update. Create a circular list.
+        update.next = update; // At the end of the current render, this queue's interleaved updates will
+        // be transferred to the pending queue.
+
+        pushInterleavedQueue(queue);
+      } else {
+        update.next = interleaved.next;
+        interleaved.next = update;
+      }
+
+      queue.interleaved = update;
+    } else {
+      var _pending = queue.pending;
+
+      if (_pending === null) {
+        // This is the first update. Create a circular list.
+        update.next = update;
+      } else {
+        update.next = _pending.next;
+        _pending.next = update;
+      }
+
+      queue.pending = update;
+    }
+
     if (
       fiber.lanes === NoLanes &&
       (alternate === null || alternate.lanes === NoLanes)
@@ -11147,7 +11523,24 @@ function dispatchAction(fiber, queue, action) {
       }
     }
 
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (isTransitionLane(lane) && root !== null) {
+      var queueLanes = queue.lanes; // If any entangled lanes are no longer pending on the root, then they
+      // must have finished. We can remove them from the shared queue, which
+      // represents a superset of the actually pending lanes. In some cases we
+      // may entangle more than we need to, but that's OK. In fact it's worse if
+      // we *don't* entangle when we should.
+
+      queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+      var newQueueLanes = mergeLanes(queueLanes, lane);
+      queue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+      // the lane finished since the last time we entangled it. So we need to
+      // entangle it again, just to be sure.
+
+      markRootEntangled(root, newQueueLanes);
+    }
   }
 }
 
@@ -11169,6 +11562,7 @@ var ContextOnlyDispatcher = {
   useOpaqueIdentifier: throwInvalidHookError,
   unstable_isNewReconciler: enableNewReconciler
 };
+
 var HooksDispatcherOnMountInDEV = null;
 var HooksDispatcherOnMountWithHookTypesInDEV = null;
 var HooksDispatcherOnUpdateInDEV = null;
@@ -11197,8 +11591,8 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
   };
 
   HooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11206,10 +11600,10 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       checkDepsAreArrayDev(deps);
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11298,19 +11692,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnMountWithHookTypesInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11395,19 +11790,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11492,19 +11888,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11589,10 +11986,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11600,11 +11998,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       mountHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11701,10 +12099,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11712,11 +12111,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11813,10 +12212,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11824,11 +12224,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11929,7 +12329,52 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
 
 var now$1 = Scheduler.unstable_now;
 var commitTime = 0;
+var layoutEffectStartTime = -1;
 var profilerStartTime = -1;
+var passiveEffectStartTime = -1;
+/**
+ * Tracks whether the current update was a nested/cascading update (scheduled from a layout effect).
+ *
+ * The overall sequence is:
+ *   1. render
+ *   2. commit (and call `onRender`, `onCommit`)
+ *   3. check for nested updates
+ *   4. flush passive effects (and call `onPostCommit`)
+ *
+ * Nested updates are identified in step 3 above,
+ * but step 4 still applies to the work that was just committed.
+ * We use two flags to track nested updates then:
+ * one tracks whether the upcoming update is a nested update,
+ * and the other tracks whether the current update was a nested update.
+ * The first value gets synced to the second at the start of the render phase.
+ */
+
+var currentUpdateIsNested = false;
+var nestedUpdateScheduled = false;
+
+function isCurrentUpdateNested() {
+  return currentUpdateIsNested;
+}
+
+function markNestedUpdateScheduled() {
+  {
+    nestedUpdateScheduled = true;
+  }
+}
+
+function resetNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = false;
+    nestedUpdateScheduled = false;
+  }
+}
+
+function syncNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = nestedUpdateScheduled;
+    nestedUpdateScheduled = false;
+  }
+}
 
 function getCommitTime() {
   return commitTime;
@@ -11939,3750 +12384,4620 @@ function recordCommitTime() {
   commitTime = now$1();
 }
 
-function startProfilerTimer(fiber) {
-  profilerStartTime = now$1();
+function startProfilerTimer(fiber) {
+  profilerStartTime = now$1();
+
+  if (fiber.actualStartTime < 0) {
+    fiber.actualStartTime = now$1();
+  }
+}
+
+function stopProfilerTimerIfRunning(fiber) {
+  profilerStartTime = -1;
+}
+
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
+  if (profilerStartTime >= 0) {
+    var elapsedTime = now$1() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+
+    if (overrideBaseTime) {
+      fiber.selfBaseDuration = elapsedTime;
+    }
+
+    profilerStartTime = -1;
+  }
+}
+
+function recordLayoutEffectDuration(fiber) {
+  if (layoutEffectStartTime >= 0) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+          root.effectDuration += elapsedTime;
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+          parentStateNode.effectDuration += elapsedTime;
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function recordPassiveEffectDuration(fiber) {
+  if (passiveEffectStartTime >= 0) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+
+          if (root !== null) {
+            root.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+
+          if (parentStateNode !== null) {
+            // Detached fibers have their state node cleared out.
+            // In this case, the return pointer is also cleared out,
+            // so we won't be able to report the time spent in this Profiler's subtree.
+            parentStateNode.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
+
+function startPassiveEffectTimer() {
+  passiveEffectStartTime = now$1();
+}
+
+function transferActualDuration(fiber) {
+  // Transfer time spent rendering these children so we don't lose it
+  // after we rerender. This is used as a helper in special cases
+  // where we should count the work of multiple passes.
+  var child = fiber.child;
+
+  while (child) {
+    fiber.actualDuration += child.actualDuration;
+    child = child.sibling;
+  }
+}
+
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
+}
+
+if (
+  !(
+    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
+    "function"
+  )
+) {
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+}
+
+function showErrorDialog(boundary, errorInfo) {
+  var capturedError = {
+    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
+    error: errorInfo.value,
+    errorBoundary:
+      boundary !== null && boundary.tag === ClassComponent
+        ? boundary.stateNode
+        : null
+  };
+  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
+    capturedError
+  );
+}
+
+function logCapturedError(boundary, errorInfo) {
+  try {
+    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
+    // This enables renderers like ReactNative to better manage redbox behavior.
+
+    if (logError === false) {
+      return;
+    }
+
+    var error = errorInfo.value;
+
+    if (true) {
+      var source = errorInfo.source;
+      var stack = errorInfo.stack;
+      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
+      // `preventDefault()` in window `error` handler.
+      // We record this information as an expando on the error.
+
+      if (error != null && error._suppressLogging) {
+        if (boundary.tag === ClassComponent) {
+          // The error is recoverable and was silenced.
+          // Ignore it and don't print the stack addendum.
+          // This is handy for testing error boundaries without noise.
+          return;
+        } // The error is fatal. Since the silencing might have
+        // been accidental, we'll surface it anyway.
+        // However, the browser would have silenced the original error
+        // so we'll print it first, and then print the stack addendum.
+
+        console["error"](error); // Don't transform to our wrapper
+        // For a more detailed description of this block, see:
+        // https://github.com/facebook/react/pull/13384
+      }
+
+      var componentName = source ? getComponentNameFromFiber(source) : null;
+      var componentNameMessage = componentName
+        ? "The above error occurred in the <" + componentName + "> component:"
+        : "The above error occurred in one of your React components:";
+      var errorBoundaryMessage;
+
+      if (boundary.tag === HostRoot) {
+        errorBoundaryMessage =
+          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
+      } else {
+        var errorBoundaryName =
+          getComponentNameFromFiber(boundary) || "Anonymous";
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      }
+
+      var combinedMessage =
+        componentNameMessage +
+        "\n" +
+        componentStack +
+        "\n\n" +
+        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
+      // We don't include the original error message and JS stack because the browser
+      // has already printed it. Even if the application swallows the error, it is still
+      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+
+      console["error"](combinedMessage); // Don't transform to our wrapper
+    } else {
+      // In production, we print the error directly.
+      // This will include the message, the JS stack, and anything the browser wants to show.
+      // We pass the error object instead of custom message so that the browser displays the error natively.
+      console["error"](error); // Don't transform to our wrapper
+    }
+  } catch (e) {
+    // This method must not throw, or React internal state will get messed up.
+    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
+    // we want to report this error outside of the normal stack as a last resort.
+    // https://github.com/facebook/react/issues/13188
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+
+var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
+
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
+
+  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
+  // being called "element".
+
+  update.payload = {
+    element: null
+  };
+  var error = errorInfo.value;
+
+  update.callback = function() {
+    onUncaughtError(error);
+    logCapturedError(fiber, errorInfo);
+  };
+
+  return update;
+}
+
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane);
+  update.tag = CaptureUpdate;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+
+  if (typeof getDerivedStateFromError === "function") {
+    var error$1 = errorInfo.value;
+
+    update.payload = function() {
+      return getDerivedStateFromError(error$1);
+    };
+
+    update.callback = function() {
+      {
+        markFailedErrorBoundaryForHotReloading(fiber);
+      }
+
+      logCapturedError(fiber, errorInfo);
+    };
+  }
+
+  var inst = fiber.stateNode;
+
+  if (inst !== null && typeof inst.componentDidCatch === "function") {
+    update.callback = function callback() {
+      {
+        markFailedErrorBoundaryForHotReloading(fiber);
+      }
+
+      logCapturedError(fiber, errorInfo);
+
+      if (typeof getDerivedStateFromError !== "function") {
+        // To preserve the preexisting retry behavior of error boundaries,
+        // we keep track of which ones already failed during this batch.
+        // This gets reset before we yield back to the browser.
+        // TODO: Warn in strict mode if getDerivedStateFromError is
+        // not defined.
+        markLegacyErrorBoundaryAsFailed(this);
+      }
+
+      var error$1 = errorInfo.value;
+      var stack = errorInfo.stack;
+      this.componentDidCatch(error$1, {
+        componentStack: stack !== null ? stack : ""
+      });
+
+      {
+        if (typeof getDerivedStateFromError !== "function") {
+          // If componentDidCatch is the only error boundary method defined,
+          // then it needs to call setState to recover from errors.
+          // If no state update is scheduled then the boundary will swallow the error.
+          if (!includesSomeLane(fiber.lanes, SyncLane)) {
+            error(
+              "%s: Error boundaries should implement getDerivedStateFromError(). " +
+                "In that method, return a state update to display an error message or fallback UI.",
+              getComponentNameFromFiber(fiber) || "Unknown"
+            );
+          }
+        }
+      }
+    };
+  }
+
+  return update;
+}
+
+function attachPingListener(root, wakeable, lanes) {
+  // Attach a listener to the promise to "ping" the root and retry. But only if
+  // one does not already exist for the lanes we're currently rendering (which
+  // acts like a "thread ID" here).
+  var pingCache = root.pingCache;
+  var threadIDs;
+
+  if (pingCache === null) {
+    pingCache = root.pingCache = new PossiblyWeakMap$1();
+    threadIDs = new Set();
+    pingCache.set(wakeable, threadIDs);
+  } else {
+    threadIDs = pingCache.get(wakeable);
+
+    if (threadIDs === undefined) {
+      threadIDs = new Set();
+      pingCache.set(wakeable, threadIDs);
+    }
+  }
+
+  if (!threadIDs.has(lanes)) {
+    // Memoize using the thread ID to prevent redundant listeners.
+    threadIDs.add(lanes);
+    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
+
+    {
+      if (isDevToolsPresent) {
+        // If we have pending work still, restore the original updaters
+        restorePendingUpdaters(root, lanes);
+      }
+    }
+
+    wakeable.then(ping, ping);
+  }
+}
+
+function throwException(
+  root,
+  returnFiber,
+  sourceFiber,
+  value,
+  rootRenderLanes
+) {
+  // The source fiber did not complete.
+  sourceFiber.flags |= Incomplete;
+
+  {
+    if (isDevToolsPresent) {
+      // If we have pending work still, restore the original updaters
+      restorePendingUpdaters(root, rootRenderLanes);
+    }
+  }
+
+  if (
+    value !== null &&
+    typeof value === "object" &&
+    typeof value.then === "function"
+  ) {
+    var wakeable = value;
+    // A legacy mode Suspense quirk, only relevant to hook components.
+
+    var tag = sourceFiber.tag;
+
+    if (
+      (sourceFiber.mode & ConcurrentMode) === NoMode &&
+      (tag === FunctionComponent ||
+        tag === ForwardRef ||
+        tag === SimpleMemoComponent)
+    ) {
+      var currentSource = sourceFiber.alternate;
+
+      if (currentSource) {
+        sourceFiber.updateQueue = currentSource.updateQueue;
+        sourceFiber.memoizedState = currentSource.memoizedState;
+        sourceFiber.lanes = currentSource.lanes;
+      } else {
+        sourceFiber.updateQueue = null;
+        sourceFiber.memoizedState = null;
+      }
+    }
+
+    var hasInvisibleParentBoundary = hasSuspenseContext(
+      suspenseStackCursor.current,
+      InvisibleParentSuspenseContext
+    ); // Schedule the nearest Suspense to re-render the timed out view.
+
+    var _workInProgress = returnFiber;
+
+    do {
+      if (
+        _workInProgress.tag === SuspenseComponent &&
+        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
+      ) {
+        // Found the nearest boundary.
+        // Stash the promise on the boundary fiber. If the boundary times out, we'll
+        // attach another listener to flip the boundary back to its normal state.
+        var wakeables = _workInProgress.updateQueue;
+
+        if (wakeables === null) {
+          var updateQueue = new Set();
+          updateQueue.add(wakeable);
+          _workInProgress.updateQueue = updateQueue;
+        } else {
+          wakeables.add(wakeable);
+        } // If the boundary is in legacy mode, we should *not*
+        // suspend the commit. Pretend as if the suspended component rendered
+        // null and keep rendering. In the commit phase, we'll schedule a
+        // subsequent synchronous update to re-render the Suspense.
+        //
+        // Note: It doesn't matter whether the component that suspended was
+        // inside a concurrent mode tree. If the Suspense is outside of it, we
+        // should *not* suspend the commit.
+        //
+        // If the suspense boundary suspended itself suspended, we don't have to
+        // do this trick because nothing was partially started. We can just
+        // directly do a second pass over the fallback in this render and
+        // pretend we meant to render that directly.
+
+        if (
+          (_workInProgress.mode & ConcurrentMode) === NoMode &&
+          _workInProgress !== returnFiber
+        ) {
+          _workInProgress.flags |= DidCapture;
+          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
+          // But we shouldn't call any lifecycle methods or callbacks. Remove
+          // all lifecycle effect tags.
+
+          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+
+          if (enablePersistentOffscreenHostContainer) {
+            // Another legacy Suspense quirk. In persistent mode, if this is the
+            // initial mount, override the props of the host container to hide
+            // its contents.
+            var currentSuspenseBoundary = _workInProgress.alternate;
+
+            if (currentSuspenseBoundary === null) {
+              var offscreenFiber = _workInProgress.child;
+              var offscreenContainer = offscreenFiber.child;
+
+              if (offscreenContainer !== null) {
+                var children = offscreenContainer.memoizedProps.children;
+                var containerProps = getOffscreenContainerProps(
+                  "hidden",
+                  children
+                );
+                offscreenContainer.pendingProps = containerProps;
+                offscreenContainer.memoizedProps = containerProps;
+              }
+            }
+          }
+
+          if (sourceFiber.tag === ClassComponent) {
+            var _currentSourceFiber = sourceFiber.alternate;
+
+            if (_currentSourceFiber === null) {
+              // This is a new mount. Change the tag so it's not mistaken for a
+              // completed class component. For example, we should not call
+              // componentWillUnmount if it is deleted.
+              sourceFiber.tag = IncompleteClassComponent;
+            } else {
+              // When we try rendering again, we should not reuse the current fiber,
+              // since it's known to be in an inconsistent state. Use a force update to
+              // prevent a bail out.
+              var update = createUpdate(NoTimestamp, SyncLane);
+              update.tag = ForceUpdate;
+              enqueueUpdate(sourceFiber, update);
+            }
+          } // The source fiber did not complete. Mark it with Sync priority to
+          // indicate that it still has pending work.
+
+          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
+
+          return;
+        } // Confirmed that the boundary is in a concurrent mode tree. Continue
+        // with the normal suspend path.
+        //
+        // After this we'll use a set of heuristics to determine whether this
+        // render pass will run to completion or restart or "suspend" the commit.
+        // The actual logic for this is spread out in different places.
+        //
+        // This first principle is that if we're going to suspend when we complete
+        // a root, then we should also restart if we get an update or ping that
+        // might unsuspend it, and vice versa. The only reason to suspend is
+        // because you think you might want to restart before committing. However,
+        // it doesn't make sense to restart only while in the period we're suspended.
+        //
+        // Restarting too aggressively is also not good because it starves out any
+        // intermediate loading state. So we use heuristics to determine when.
+        // Suspense Heuristics
+        //
+        // If nothing threw a Promise or all the same fallbacks are already showing,
+        // then don't suspend/restart.
+        //
+        // If this is an initial render of a new tree of Suspense boundaries and
+        // those trigger a fallback, then don't suspend/restart. We want to ensure
+        // that we can show the initial loading state as quickly as possible.
+        //
+        // If we hit a "Delayed" case, such as when we'd switch from content back into
+        // a fallback, then we should always suspend/restart. Transitions apply
+        // to this case. If none is defined, JND is used instead.
+        //
+        // If we're already showing a fallback and it gets "retried", allowing us to show
+        // another level, but there's still an inner boundary that would show a fallback,
+        // then we suspend/restart for 500ms since the last time we showed a fallback
+        // anywhere in the tree. This effectively throttles progressive loading into a
+        // consistent train of commits. This also gives us an opportunity to restart to
+        // get to the completed state slightly earlier.
+        //
+        // If there's ambiguity due to batching it's resolved in preference of:
+        // 1) "delayed", 2) "initial render", 3) "retry".
+        //
+        // We want to ensure that a "busy" state doesn't get force committed. We want to
+        // ensure that new initial loading states can commit as soon as possible.
+
+        attachPingListener(root, wakeable, rootRenderLanes);
+        _workInProgress.flags |= ShouldCapture; // TODO: I think we can remove this, since we now use `DidCapture` in
+        // the begin phase to prevent an early bailout.
+
+        _workInProgress.lanes = rootRenderLanes;
+        return;
+      } // This boundary already captured during this render. Continue to the next
+      // boundary.
+
+      _workInProgress = _workInProgress.return;
+    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
+    // TODO: Use invariant so the message is stripped in prod?
+
+    value = new Error(
+      (getComponentNameFromFiber(sourceFiber) || "A React component") +
+        " suspended while rendering, but no fallback UI was specified.\n" +
+        "\n" +
+        "Add a <Suspense fallback=...> component higher in the tree to " +
+        "provide a loading indicator or placeholder to display."
+    );
+  } // We didn't find a boundary that could handle this type of exception. Start
+  // over and traverse parent path again, this time treating the exception
+  // as an error.
+
+  renderDidError();
+  value = createCapturedValue(value, sourceFiber);
+  var workInProgress = returnFiber;
+
+  do {
+    switch (workInProgress.tag) {
+      case HostRoot: {
+        var _errorInfo = value;
+        workInProgress.flags |= ShouldCapture;
+        var lane = pickArbitraryLane(rootRenderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
+
+        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
+
+        enqueueCapturedUpdate(workInProgress, _update);
+        return;
+      }
+
+      case ClassComponent:
+        // Capture and retry
+        var errorInfo = value;
+        var ctor = workInProgress.type;
+        var instance = workInProgress.stateNode;
+
+        if (
+          (workInProgress.flags & DidCapture) === NoFlags &&
+          (typeof ctor.getDerivedStateFromError === "function" ||
+            (instance !== null &&
+              typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance)))
+        ) {
+          workInProgress.flags |= ShouldCapture;
+
+          var _lane = pickArbitraryLane(rootRenderLanes);
+
+          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
+
+          var _update2 = createClassErrorUpdate(
+            workInProgress,
+            errorInfo,
+            _lane
+          );
+
+          enqueueCapturedUpdate(workInProgress, _update2);
+          return;
+        }
+
+        break;
+    }
+
+    workInProgress = workInProgress.return;
+  } while (workInProgress !== null);
+}
+
+function markUpdate(workInProgress) {
+  // Tag the fiber with an update effect. This turns a Placement into
+  // a PlacementAndUpdate.
+  workInProgress.flags |= Update;
+}
+
+function markRef(workInProgress) {
+  workInProgress.flags |= Ref;
+}
+
+function hadNoMutationsEffects(current, completedWork) {
+  var didBailout = current !== null && current.child === completedWork.child;
+
+  if (didBailout) {
+    return true;
+  }
+
+  if ((completedWork.flags & ChildDeletion) !== NoFlags) {
+    return false;
+  } // TODO: If we move the `hadNoMutationsEffects` call after `bubbleProperties`
+  // then we only have to check the `completedWork.subtreeFlags`.
+
+  var child = completedWork.child;
+
+  while (child !== null) {
+    if (
+      (child.flags & MutationMask) !== NoFlags ||
+      (child.subtreeFlags & MutationMask) !== NoFlags
+    ) {
+      return false;
+    }
+
+    child = child.sibling;
+  }
+
+  return true;
+}
+
+var appendAllChildren;
+var updateHostContainer;
+var updateHostComponent;
+var updateHostText;
+
+{
+  // Persistent host tree mode
+  appendAllChildren = function(
+    parent,
+    workInProgress,
+    needsVisibilityToggle,
+    isHidden
+  ) {
+    // We only have the top Fiber that was created but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = workInProgress.child;
+
+    while (node !== null) {
+      // eslint-disable-next-line no-labels
+      if (node.tag === HostComponent) {
+        var instance = node.stateNode;
+
+        if (needsVisibilityToggle && isHidden) {
+          // This child is inside a timed out tree. Hide it.
+          var props = node.memoizedProps;
+          var type = node.type;
+          instance = cloneHiddenInstance(instance);
+        }
+
+        appendInitialChild(parent, instance);
+      } else if (node.tag === HostText) {
+        var _instance = node.stateNode;
+
+        if (needsVisibilityToggle && isHidden) {
+          // This child is inside a timed out tree. Hide it.
+          var text = node.memoizedProps;
+          _instance = cloneHiddenTextInstance();
+        }
+
+        appendInitialChild(parent, _instance);
+      } else if (node.tag === HostPortal);
+      else if (node.tag === OffscreenComponent && node.memoizedState !== null) {
+        // The children in this boundary are hidden. Toggle their visibility
+        // before appending.
+        var child = node.child;
 
-  if (fiber.actualStartTime < 0) {
-    fiber.actualStartTime = now$1();
-  }
-}
+        if (child !== null) {
+          child.return = node;
+        }
 
-function stopProfilerTimerIfRunning(fiber) {
-  profilerStartTime = -1;
-}
+        if (enablePersistentOffscreenHostContainer) {
+          appendAllChildren(parent, node, false, false);
+        } else {
+          appendAllChildren(parent, node, true, true);
+        }
+      } else if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      } // $FlowFixMe This is correct but Flow is confused by the labeled break.
 
-function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
-  if (profilerStartTime >= 0) {
-    var elapsedTime = now$1() - profilerStartTime;
-    fiber.actualDuration += elapsedTime;
+      node = node;
 
-    if (overrideBaseTime) {
-      fiber.selfBaseDuration = elapsedTime;
-    }
+      if (node === workInProgress) {
+        return;
+      }
 
-    profilerStartTime = -1;
-  }
-}
+      while (node.sibling === null) {
+        if (node.return === null || node.return === workInProgress) {
+          return;
+        }
 
-function transferActualDuration(fiber) {
-  // Transfer time spent rendering these children so we don't lose it
-  // after we rerender. This is used as a helper in special cases
-  // where we should count the work of multiple passes.
-  var child = fiber.child;
+        node = node.return;
+      }
 
-  while (child) {
-    fiber.actualDuration += child.actualDuration;
-    child = child.sibling;
-  }
-}
+      node.sibling.return = node.return;
+      node = node.sibling;
+    }
+  }; // An unfortunate fork of appendAllChildren because we have two different parent types.
 
-var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
-var didReceiveUpdate = false;
-var didWarnAboutBadClass;
-var didWarnAboutModulePatternComponent;
-var didWarnAboutContextTypeOnFunctionComponent;
-var didWarnAboutGetDerivedStateOnFunctionComponent;
-var didWarnAboutFunctionRefs;
-var didWarnAboutReassigningProps;
-var didWarnAboutRevealOrder;
-var didWarnAboutTailOptions;
+  var appendAllChildrenToContainer = function(
+    containerChildSet,
+    workInProgress,
+    needsVisibilityToggle,
+    isHidden
+  ) {
+    // We only have the top Fiber that was created but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = workInProgress.child;
 
-{
-  didWarnAboutBadClass = {};
-  didWarnAboutModulePatternComponent = {};
-  didWarnAboutContextTypeOnFunctionComponent = {};
-  didWarnAboutGetDerivedStateOnFunctionComponent = {};
-  didWarnAboutFunctionRefs = {};
-  didWarnAboutReassigningProps = false;
-  didWarnAboutRevealOrder = {};
-  didWarnAboutTailOptions = {};
-}
+    while (node !== null) {
+      // eslint-disable-next-line no-labels
+      if (node.tag === HostComponent) {
+        var instance = node.stateNode;
 
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  if (current === null) {
-    // If this is a fresh new component that hasn't been rendered yet, we
-    // won't update its child set by applying minimal side-effects. Instead,
-    // we will add them all to the child before it gets rendered. That means
-    // we can optimize this reconciliation pass by not tracking side-effects.
-    workInProgress.child = mountChildFibers(
-      workInProgress,
-      null,
-      nextChildren,
-      renderLanes
-    );
-  } else {
-    // If the current child is the same as the work in progress, it means that
-    // we haven't yet started any work on these children. Therefore, we use
-    // the clone algorithm to create a copy of all the current children.
-    // If we had any progressed work already, that is invalid at this point so
-    // let's throw it out.
-    workInProgress.child = reconcileChildFibers(
-      workInProgress,
-      current.child,
-      nextChildren,
-      renderLanes
-    );
-  }
-}
+        if (needsVisibilityToggle && isHidden) {
+          // This child is inside a timed out tree. Hide it.
+          var props = node.memoizedProps;
+          var type = node.type;
+          instance = cloneHiddenInstance(instance);
+        }
 
-function forceUnmountCurrentAndReconcile(
-  current,
-  workInProgress,
-  nextChildren,
-  renderLanes
-) {
-  // This function is fork of reconcileChildren. It's used in cases where we
-  // want to reconcile without matching against the existing set. This has the
-  // effect of all current children being unmounted; even if the type and key
-  // are the same, the old child is unmounted and a new child is created.
-  //
-  // To do this, we're going to go through the reconcile algorithm twice. In
-  // the first pass, we schedule a deletion for all the current children by
-  // passing null.
-  workInProgress.child = reconcileChildFibers(
-    workInProgress,
-    current.child,
-    null,
-    renderLanes
-  ); // In the second pass, we mount the new children. The trick here is that we
-  // pass null in place of where we usually pass the current child set. This has
-  // the effect of remounting all children regardless of whether their
-  // identities match.
+        appendChildToContainerChildSet(containerChildSet, instance);
+      } else if (node.tag === HostText) {
+        var _instance2 = node.stateNode;
 
-  workInProgress.child = reconcileChildFibers(
-    workInProgress,
-    null,
-    nextChildren,
-    renderLanes
-  );
-}
+        if (needsVisibilityToggle && isHidden) {
+          // This child is inside a timed out tree. Hide it.
+          var text = node.memoizedProps;
+          _instance2 = cloneHiddenTextInstance();
+        }
 
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  // TODO: current can be non-null here even if the component
-  // hasn't yet mounted. This happens after the first render suspends.
-  // We'll need to figure out if this is fine or can cause issues.
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var innerPropTypes = Component.propTypes;
+        appendChildToContainerChildSet(containerChildSet, _instance2);
+      } else if (node.tag === HostPortal);
+      else if (node.tag === OffscreenComponent && node.memoizedState !== null) {
+        // The children in this boundary are hidden. Toggle their visibility
+        // before appending.
+        var child = node.child;
 
-      if (innerPropTypes) {
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(Component)
-        );
-      }
-    }
-  }
+        if (child !== null) {
+          child.return = node;
+        }
 
-  var render = Component.render;
-  var ref = workInProgress.ref; // The rest is a fork of updateFunctionComponent
+        if (enablePersistentOffscreenHostContainer) {
+          appendAllChildrenToContainer(containerChildSet, node, false, false);
+        } else {
+          appendAllChildrenToContainer(containerChildSet, node, true, true);
+        }
+      } else if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      } // $FlowFixMe This is correct but Flow is confused by the labeled break.
 
-  var nextChildren;
-  prepareToReadContext(workInProgress, renderLanes);
+      node = node;
 
-  {
-    ReactCurrentOwner$1.current = workInProgress;
-    setIsRendering(true);
-    nextChildren = renderWithHooks(
-      current,
-      workInProgress,
-      render,
-      nextProps,
-      ref,
-      renderLanes
-    );
+      if (node === workInProgress) {
+        return;
+      }
 
-    if (workInProgress.mode & StrictMode) {
-      disableLogs();
+      while (node.sibling === null) {
+        if (node.return === null || node.return === workInProgress) {
+          return;
+        }
 
-      try {
-        nextChildren = renderWithHooks(
-          current,
-          workInProgress,
-          render,
-          nextProps,
-          ref,
-          renderLanes
-        );
-      } finally {
-        reenableLogs();
+        node = node.return;
       }
+
+      node.sibling.return = node.return;
+      node = node.sibling;
     }
+  };
 
-    setIsRendering(false);
-  }
+  updateHostContainer = function(current, workInProgress) {
+    var portalOrRoot = workInProgress.stateNode;
+    var childrenUnchanged = hadNoMutationsEffects(current, workInProgress);
 
-  if (current !== null && !didReceiveUpdate) {
-    bailoutHooks(current, workInProgress, renderLanes);
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  } // React DevTools reads this flag.
+    if (childrenUnchanged);
+    else {
+      var container = portalOrRoot.containerInfo;
+      var newChildSet = createContainerChildSet(container); // If children might have changed, we have to add them all to the set.
 
-  workInProgress.flags |= PerformedWork;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-}
+      appendAllChildrenToContainer(newChildSet, workInProgress, false, false);
+      portalOrRoot.pendingChildren = newChildSet; // Schedule an update on the container to swap out the container.
 
-function updateMemoComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  updateLanes,
-  renderLanes
-) {
-  if (current === null) {
-    var type = Component.type;
+      markUpdate(workInProgress);
+      finalizeContainerChildren(container, newChildSet);
+    }
+  };
 
-    if (
-      isSimpleFunctionComponent(type) &&
-      Component.compare === null && // SimpleMemoComponent codepath doesn't resolve outer props either.
-      Component.defaultProps === undefined
-    ) {
-      var resolvedType = type;
+  updateHostComponent = function(
+    current,
+    workInProgress,
+    type,
+    newProps,
+    rootContainerInstance
+  ) {
+    var currentInstance = current.stateNode;
+    var oldProps = current.memoizedProps; // If there are no effects associated with this node, then none of our children had any updates.
+    // This guarantees that we can reuse all of them.
 
-      {
-        resolvedType = resolveFunctionForHotReloading(type);
-      } // If this is a plain function component without default props,
-      // and with only the default shallow comparison, we upgrade it
-      // to a SimpleMemoComponent to allow fast path updates.
+    var childrenUnchanged = hadNoMutationsEffects(current, workInProgress);
 
-      workInProgress.tag = SimpleMemoComponent;
-      workInProgress.type = resolvedType;
+    if (childrenUnchanged && oldProps === newProps) {
+      // No changes, just reuse the existing instance.
+      // Note that this might release a previous clone.
+      workInProgress.stateNode = currentInstance;
+      return;
+    }
 
-      {
-        validateFunctionComponentInDev(workInProgress, type);
-      }
+    var recyclableInstance = workInProgress.stateNode;
+    var currentHostContext = getHostContext();
+    var updatePayload = null;
 
-      return updateSimpleMemoComponent(
-        current,
-        workInProgress,
-        resolvedType,
-        nextProps,
-        updateLanes,
-        renderLanes
+    if (oldProps !== newProps) {
+      updatePayload = prepareUpdate(
+        recyclableInstance,
+        type,
+        oldProps,
+        newProps
       );
     }
 
-    {
-      var innerPropTypes = type.propTypes;
-
-      if (innerPropTypes) {
-        // Inner memo component props aren't currently validated in createElement.
-        // We could move it there, but we'd still need this for lazy code path.
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(type)
-        );
-      }
+    if (childrenUnchanged && updatePayload === null) {
+      // No changes, just reuse the existing instance.
+      // Note that this might release a previous clone.
+      workInProgress.stateNode = currentInstance;
+      return;
     }
 
-    var child = createFiberFromTypeAndProps(
-      Component.type,
-      null,
-      nextProps,
+    var newInstance = cloneInstance(
+      currentInstance,
+      updatePayload,
+      type,
+      oldProps,
+      newProps,
       workInProgress,
-      workInProgress.mode,
-      renderLanes
+      childrenUnchanged
     );
-    child.ref = workInProgress.ref;
-    child.return = workInProgress;
-    workInProgress.child = child;
-    return child;
-  }
 
-  {
-    var _type = Component.type;
-    var _innerPropTypes = _type.propTypes;
+    workInProgress.stateNode = newInstance;
 
-    if (_innerPropTypes) {
-      // Inner memo component props aren't currently validated in createElement.
-      // We could move it there, but we'd still need this for lazy code path.
-      checkPropTypes(
-        _innerPropTypes,
-        nextProps, // Resolved props
-        "prop",
-        getComponentName(_type)
-      );
+    if (childrenUnchanged) {
+      // If there are no other effects in this tree, we need to flag this node as having one.
+      // Even though we're not going to use it for anything.
+      // Otherwise parents won't know that there are new children to propagate upwards.
+      markUpdate(workInProgress);
+    } else {
+      // If children might have changed, we have to add them all to the set.
+      appendAllChildren(newInstance, workInProgress, false, false);
     }
-  }
-
-  var currentChild = current.child; // This is always exactly one child
-
-  if (!includesSomeLane(updateLanes, renderLanes)) {
-    // This will be the props with resolved defaultProps,
-    // unlike current.memoizedProps which will be the unresolved ones.
-    var prevProps = currentChild.memoizedProps; // Default to shallow comparison
+  };
 
-    var compare = Component.compare;
-    compare = compare !== null ? compare : shallowEqual;
+  updateHostText = function(current, workInProgress, oldText, newText) {
+    if (oldText !== newText) {
+      // If the text content differs, we'll create a new text instance for it.
+      var rootContainerInstance = getRootHostContainer();
+      var currentHostContext = getHostContext();
+      workInProgress.stateNode = createTextInstance(
+        newText,
+        rootContainerInstance,
+        currentHostContext,
+        workInProgress
+      ); // We'll have to mark it as having an effect, even though we won't use the effect for anything.
+      // This lets the parents know that at least one of their children has changed.
 
-    if (compare(prevProps, nextProps) && current.ref === workInProgress.ref) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+      markUpdate(workInProgress);
+    } else {
+      workInProgress.stateNode = current.stateNode;
     }
-  } // React DevTools reads this flag.
-
-  workInProgress.flags |= PerformedWork;
-  var newChild = createWorkInProgress(currentChild, nextProps);
-  newChild.ref = workInProgress.ref;
-  newChild.return = workInProgress;
-  workInProgress.child = newChild;
-  return newChild;
+  };
 }
 
-function updateSimpleMemoComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  updateLanes,
-  renderLanes
-) {
-  // TODO: current can be non-null here even if the component
-  // hasn't yet mounted. This happens when the inner render suspends.
-  // We'll need to figure out if this is fine or can cause issues.
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var outerMemoType = workInProgress.elementType;
-
-      if (outerMemoType.$$typeof === REACT_LAZY_TYPE) {
-        // We warn when you define propTypes on lazy()
-        // so let's just skip over it to find memo() outer wrapper.
-        // Inner props for memo are validated later.
-        var lazyComponent = outerMemoType;
-        var payload = lazyComponent._payload;
-        var init = lazyComponent._init;
+function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
+  switch (renderState.tailMode) {
+    case "hidden": {
+      // Any insertions at the end of the tail list after this point
+      // should be invisible. If there are already mounted boundaries
+      // anything before them are not considered for collapsing.
+      // Therefore we need to go through the whole tail to find if
+      // there are any.
+      var tailNode = renderState.tail;
+      var lastTailNode = null;
 
-        try {
-          outerMemoType = init(payload);
-        } catch (x) {
-          outerMemoType = null;
-        } // Inner propTypes will be validated in the function component path.
+      while (tailNode !== null) {
+        if (tailNode.alternate !== null) {
+          lastTailNode = tailNode;
+        }
 
-        var outerPropTypes = outerMemoType && outerMemoType.propTypes;
+        tailNode = tailNode.sibling;
+      } // Next we're simply going to delete all insertions after the
+      // last rendered item.
 
-        if (outerPropTypes) {
-          checkPropTypes(
-            outerPropTypes,
-            nextProps, // Resolved (SimpleMemoComponent has no defaultProps)
-            "prop",
-            getComponentName(outerMemoType)
-          );
-        }
+      if (lastTailNode === null) {
+        // All remaining items in the tail are insertions.
+        renderState.tail = null;
+      } else {
+        // Detach the insertion after the last node that was already
+        // inserted.
+        lastTailNode.sibling = null;
       }
+
+      break;
     }
-  }
 
-  if (current !== null) {
-    var prevProps = current.memoizedProps;
+    case "collapsed": {
+      // Any insertions at the end of the tail list after this point
+      // should be invisible. If there are already mounted boundaries
+      // anything before them are not considered for collapsing.
+      // Therefore we need to go through the whole tail to find if
+      // there are any.
+      var _tailNode = renderState.tail;
+      var _lastTailNode = null;
 
-    if (
-      shallowEqual(prevProps, nextProps) &&
-      current.ref === workInProgress.ref && // Prevent bailout if the implementation changed due to hot reload.
-      workInProgress.type === current.type
-    ) {
-      didReceiveUpdate = false;
+      while (_tailNode !== null) {
+        if (_tailNode.alternate !== null) {
+          _lastTailNode = _tailNode;
+        }
 
-      if (!includesSomeLane(renderLanes, updateLanes)) {
-        // The pending lanes were cleared at the beginning of beginWork. We're
-        // about to bail out, but there might be other lanes that weren't
-        // included in the current render. Usually, the priority level of the
-        // remaining updates is accumlated during the evaluation of the
-        // component (i.e. when processing the update queue). But since since
-        // we're bailing out early *without* evaluating the component, we need
-        // to account for it here, too. Reset to the value of the current fiber.
-        // NOTE: This only applies to SimpleMemoComponent, not MemoComponent,
-        // because a MemoComponent fiber does not have hooks or an update queue;
-        // rather, it wraps around an inner component, which may or may not
-        // contains hooks.
-        // TODO: Move the reset at in beginWork out of the common path so that
-        // this is no longer necessary.
-        workInProgress.lanes = current.lanes;
-        return bailoutOnAlreadyFinishedWork(
-          current,
-          workInProgress,
-          renderLanes
-        );
-      } else if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
-        // This is a special case that only exists for legacy mode.
-        // See https://github.com/facebook/react/pull/19216.
-        didReceiveUpdate = true;
+        _tailNode = _tailNode.sibling;
+      } // Next we're simply going to delete all insertions after the
+      // last rendered item.
+
+      if (_lastTailNode === null) {
+        // All remaining items in the tail are insertions.
+        if (!hasRenderedATailFallback && renderState.tail !== null) {
+          // We suspended during the head. We want to show at least one
+          // row at the tail. So we'll keep on and cut off the rest.
+          renderState.tail.sibling = null;
+        } else {
+          renderState.tail = null;
+        }
+      } else {
+        // Detach the insertion after the last node that was already
+        // inserted.
+        _lastTailNode.sibling = null;
       }
+
+      break;
     }
   }
-
-  return updateFunctionComponent(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    renderLanes
-  );
 }
 
-function updateOffscreenComponent(current, workInProgress, renderLanes) {
-  var nextProps = workInProgress.pendingProps;
-  var nextChildren = nextProps.children;
-  var prevState = current !== null ? current.memoizedState : null;
+function bubbleProperties(completedWork) {
+  var didBailout =
+    completedWork.alternate !== null &&
+    completedWork.alternate.child === completedWork.child;
+  var newChildLanes = NoLanes;
+  var subtreeFlags = NoFlags;
 
-  if (
-    nextProps.mode === "hidden" ||
-    nextProps.mode === "unstable-defer-without-hiding"
-  ) {
-    if ((workInProgress.mode & ConcurrentMode) === NoMode) {
-      // In legacy sync mode, don't defer the subtree. Render it now.
-      // TODO: Figure out what we should do in Blocking mode.
-      var nextState = {
-        baseLanes: NoLanes
-      };
-      workInProgress.memoizedState = nextState;
-      pushRenderLanes(workInProgress, renderLanes);
-    } else if (!includesSomeLane(renderLanes, OffscreenLane)) {
-      var nextBaseLanes;
+  if (!didBailout) {
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var actualDuration = completedWork.actualDuration;
+      var treeBaseDuration = completedWork.selfBaseDuration;
+      var child = completedWork.child;
 
-      if (prevState !== null) {
-        var prevBaseLanes = prevState.baseLanes;
-        nextBaseLanes = mergeLanes(prevBaseLanes, renderLanes);
-      } else {
-        nextBaseLanes = renderLanes;
-      } // Schedule this fiber to re-render at offscreen priority. Then bailout.
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes)
+        );
+        subtreeFlags |= child.subtreeFlags;
+        subtreeFlags |= child.flags; // When a fiber is cloned, its actualDuration is reset to 0. This value will
+        // only be updated if work is done on the fiber (i.e. it doesn't bailout).
+        // When work is done, it should bubble to the parent's actualDuration. If
+        // the fiber has not been cloned though, (meaning no work was done), then
+        // this value will reflect the amount of time spent working on a previous
+        // render. In that case it should not bubble. We determine whether it was
+        // cloned by comparing the child pointer.
 
-      {
-        markSpawnedWork(OffscreenLane);
+        actualDuration += child.actualDuration;
+        treeBaseDuration += child.treeBaseDuration;
+        child = child.sibling;
       }
 
-      workInProgress.lanes = workInProgress.childLanes = laneToLanes(
-        OffscreenLane
-      );
-      var _nextState = {
-        baseLanes: nextBaseLanes
-      };
-      workInProgress.memoizedState = _nextState; // We're about to bail out, but we need to push this to the stack anyway
-      // to avoid a push/pop misalignment.
-
-      pushRenderLanes(workInProgress, nextBaseLanes);
-      return null;
+      completedWork.actualDuration = actualDuration;
+      completedWork.treeBaseDuration = treeBaseDuration;
     } else {
-      // Rendering at offscreen, so we can clear the base lanes.
-      var _nextState2 = {
-        baseLanes: NoLanes
-      };
-      workInProgress.memoizedState = _nextState2; // Push the lanes that were skipped when we bailed out.
+      var _child = completedWork.child;
 
-      var subtreeRenderLanes =
-        prevState !== null ? prevState.baseLanes : renderLanes;
-      pushRenderLanes(workInProgress, subtreeRenderLanes);
+      while (_child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child.lanes, _child.childLanes)
+        );
+        subtreeFlags |= _child.subtreeFlags;
+        subtreeFlags |= _child.flags; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
+
+        _child.return = completedWork;
+        _child = _child.sibling;
+      }
     }
+
+    completedWork.subtreeFlags |= subtreeFlags;
   } else {
-    var _subtreeRenderLanes;
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var _treeBaseDuration = completedWork.selfBaseDuration;
+      var _child2 = completedWork.child;
+
+      while (_child2 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child2.lanes, _child2.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
+
+        subtreeFlags |= _child2.subtreeFlags & StaticMask;
+        subtreeFlags |= _child2.flags & StaticMask;
+        _treeBaseDuration += _child2.treeBaseDuration;
+        _child2 = _child2.sibling;
+      }
+
+      completedWork.treeBaseDuration = _treeBaseDuration;
+    } else {
+      var _child3 = completedWork.child;
 
-    if (prevState !== null) {
-      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes); // Since we're not hidden anymore, reset the state
+      while (_child3 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child3.lanes, _child3.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
 
-      workInProgress.memoizedState = null;
-    } else {
-      // We weren't previously hidden, and we still aren't, so there's nothing
-      // special to do. Need to push to the stack regardless, though, to avoid
-      // a push/pop misalignment.
-      _subtreeRenderLanes = renderLanes;
+        subtreeFlags |= _child3.subtreeFlags & StaticMask;
+        subtreeFlags |= _child3.flags & StaticMask; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
+
+        _child3.return = completedWork;
+        _child3 = _child3.sibling;
+      }
     }
 
-    pushRenderLanes(workInProgress, _subtreeRenderLanes);
+    completedWork.subtreeFlags |= subtreeFlags;
   }
 
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-} // Note: These happen to have identical begin phases, for now. We shouldn't hold
-// ourselves to this constraint, though. If the behavior diverges, we should
-// fork the function.
-
-var updateLegacyHiddenComponent = updateOffscreenComponent;
-
-function updateFragment(current, workInProgress, renderLanes) {
-  var nextChildren = workInProgress.pendingProps;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
 }
 
-function updateMode(current, workInProgress, renderLanes) {
-  var nextChildren = workInProgress.pendingProps.children;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-}
+function completeSuspendedOffscreenHostContainer(current, workInProgress) {
+  // This is a fork of the complete phase for HostComponent. We use it when
+  // a suspense tree is in its fallback state, because in that case the primary
+  // tree that includes the offscreen boundary is skipped over without a
+  // regular complete phase.
+  //
+  // We can optimize this path further by inlining the update logic for
+  // offscreen instances specifically, i.e. skipping the `prepareUpdate` call.
+  var rootContainerInstance = getRootHostContainer();
+  var type = workInProgress.type;
+  var newProps = workInProgress.memoizedProps;
 
-function updateProfiler(current, workInProgress, renderLanes) {
-  {
-    workInProgress.flags |= Update; // Reset effect durations for the next eventual effect phase.
-    // These are reset during render to allow the DevTools commit hook a chance to read them,
+  if (current !== null) {
+    updateHostComponent(
+      current,
+      workInProgress,
+      type,
+      newProps,
+      rootContainerInstance
+    );
+  } else {
+    var currentHostContext = getHostContext();
+    var instance = createInstance(
+      type,
+      newProps,
+      rootContainerInstance,
+      currentHostContext,
+      workInProgress
+    );
+    appendAllChildren(instance, workInProgress, false, false);
+    workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
 
-    var stateNode = workInProgress.stateNode;
-    stateNode.effectDuration = 0;
-    stateNode.passiveEffectDuration = 0;
+    if (workInProgress.ref !== null) {
+      // If there is a ref on a host node we need to schedule a callback
+      markRef(workInProgress);
+    }
   }
 
-  var nextProps = workInProgress.pendingProps;
-  var nextChildren = nextProps.children;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
+  bubbleProperties(workInProgress);
 }
 
-function markRef(current, workInProgress) {
-  var ref = workInProgress.ref;
+function completeWork(current, workInProgress, renderLanes) {
+  var newProps = workInProgress.pendingProps;
 
-  if (
-    (current === null && ref !== null) ||
-    (current !== null && current.ref !== ref)
-  ) {
-    // Schedule a Ref effect
-    workInProgress.flags |= Ref;
-  }
-}
+  switch (workInProgress.tag) {
+    case IndeterminateComponent:
+    case LazyComponent:
+    case SimpleMemoComponent:
+    case FunctionComponent:
+    case ForwardRef:
+    case Fragment:
+    case Mode:
+    case Profiler:
+    case ContextConsumer:
+    case MemoComponent:
+      bubbleProperties(workInProgress);
+      return null;
 
-function updateFunctionComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var innerPropTypes = Component.propTypes;
+    case ClassComponent: {
+      var Component = workInProgress.type;
 
-      if (innerPropTypes) {
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(Component)
-        );
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
       }
+
+      bubbleProperties(workInProgress);
+      return null;
     }
-  }
 
-  var context;
+    case HostRoot: {
+      var fiberRoot = workInProgress.stateNode;
 
-  {
-    var unmaskedContext = getUnmaskedContext(workInProgress, Component, true);
-    context = getMaskedContext(workInProgress, unmaskedContext);
-  }
+      popHostContainer(workInProgress);
+      popTopLevelContextObject(workInProgress);
+      resetWorkInProgressVersions();
 
-  var nextChildren;
-  prepareToReadContext(workInProgress, renderLanes);
+      if (fiberRoot.pendingContext) {
+        fiberRoot.context = fiberRoot.pendingContext;
+        fiberRoot.pendingContext = null;
+      }
 
-  {
-    ReactCurrentOwner$1.current = workInProgress;
-    setIsRendering(true);
-    nextChildren = renderWithHooks(
-      current,
-      workInProgress,
-      Component,
-      nextProps,
-      context,
-      renderLanes
-    );
+      if (current === null || current.child === null) {
+        // If we hydrated, pop so that we can delete any remaining children
+        // that weren't hydrated.
+        var wasHydrated = popHydrationState();
 
-    if (workInProgress.mode & StrictMode) {
-      disableLogs();
+        if (wasHydrated) {
+          // If we hydrated, then we'll need to schedule an update for
+          // the commit side-effects on the root.
+          markUpdate(workInProgress);
+        } else if (!fiberRoot.hydrate) {
+          // Schedule an effect to clear this container at the start of the next commit.
+          // This handles the case of React rendering into a container with previous children.
+          // It's also safe to do for updates too, because current.child would only be null
+          // if the previous render was null (so the the container would already be empty).
+          workInProgress.flags |= Snapshot;
+        }
+      }
 
-      try {
-        nextChildren = renderWithHooks(
+      updateHostContainer(current, workInProgress);
+      bubbleProperties(workInProgress);
+      return null;
+    }
+
+    case HostComponent: {
+      popHostContext(workInProgress);
+      var rootContainerInstance = getRootHostContainer();
+      var type = workInProgress.type;
+
+      if (current !== null && workInProgress.stateNode != null) {
+        updateHostComponent(
           current,
           workInProgress,
-          Component,
-          nextProps,
-          context,
-          renderLanes
+          type,
+          newProps,
+          rootContainerInstance
         );
-      } finally {
-        reenableLogs();
+
+        if (current.ref !== workInProgress.ref) {
+          markRef(workInProgress);
+        }
+      } else {
+        if (!newProps) {
+          if (!(workInProgress.stateNode !== null)) {
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          } // This can happen when we abort work.
+
+          bubbleProperties(workInProgress);
+          return null;
+        }
+
+        var currentHostContext = getHostContext(); // TODO: Move createInstance to beginWork and keep it on a context
+        // "stack" as the parent. Then append children as we go in beginWork
+        // or completeWork depending on whether we want to add them top->down or
+        // bottom->up. Top->down is faster in IE11.
+
+        var _wasHydrated = popHydrationState();
+
+        if (_wasHydrated) {
+          // TODO: Move this and createInstance step into the beginPhase
+          // to consolidate.
+          if (prepareToHydrateHostInstance()) {
+            // If changes to the hydrated node need to be applied at the
+            // commit-phase we mark this as such.
+            markUpdate(workInProgress);
+          }
+        } else {
+          var instance = createInstance(
+            type,
+            newProps,
+            rootContainerInstance,
+            currentHostContext,
+            workInProgress
+          );
+          appendAllChildren(instance, workInProgress, false, false);
+          workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
+        }
+
+        if (workInProgress.ref !== null) {
+          // If there is a ref on a host node we need to schedule a callback
+          markRef(workInProgress);
+        }
       }
+
+      bubbleProperties(workInProgress);
+      return null;
     }
 
-    setIsRendering(false);
-  }
+    case HostText: {
+      var newText = newProps;
 
-  if (current !== null && !didReceiveUpdate) {
-    bailoutHooks(current, workInProgress, renderLanes);
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  } // React DevTools reads this flag.
+      if (current && workInProgress.stateNode != null) {
+        var oldText = current.memoizedProps; // If we have an alternate, that means this is an update and we need
+        // to schedule a side-effect to do the updates.
 
-  workInProgress.flags |= PerformedWork;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-}
+        updateHostText(current, workInProgress, oldText, newText);
+      } else {
+        if (typeof newText !== "string") {
+          if (!(workInProgress.stateNode !== null)) {
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          } // This can happen when we abort work.
+        }
 
-function updateClassComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var innerPropTypes = Component.propTypes;
+        var _rootContainerInstance = getRootHostContainer();
 
-      if (innerPropTypes) {
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(Component)
-        );
+        var _currentHostContext = getHostContext();
+
+        var _wasHydrated2 = popHydrationState();
+
+        if (_wasHydrated2) {
+          if (prepareToHydrateHostTextInstance()) {
+            markUpdate(workInProgress);
+          }
+        } else {
+          workInProgress.stateNode = createTextInstance(
+            newText,
+            _rootContainerInstance,
+            _currentHostContext,
+            workInProgress
+          );
+        }
       }
+
+      bubbleProperties(workInProgress);
+      return null;
     }
-  } // Push context providers early to prevent context stack mismatches.
-  // During mounting we don't know the child context yet as the instance doesn't exist.
-  // We will invalidate the child context in finishClassComponent() right after rendering.
 
-  var hasContext;
+    case SuspenseComponent: {
+      popSuspenseContext(workInProgress);
+      var nextState = workInProgress.memoizedState;
 
-  if (isContextProvider(Component)) {
-    hasContext = true;
-    pushContextProvider(workInProgress);
-  } else {
-    hasContext = false;
-  }
+      if ((workInProgress.flags & DidCapture) !== NoFlags) {
+        // Something suspended. Re-render with the fallback children.
+        workInProgress.lanes = renderLanes; // Do not reset the effect list.
 
-  prepareToReadContext(workInProgress, renderLanes);
-  var instance = workInProgress.stateNode;
-  var shouldUpdate;
+        if ((workInProgress.mode & ProfileMode) !== NoMode) {
+          transferActualDuration(workInProgress);
+        } // Don't bubble properties in this case.
 
-  if (instance === null) {
-    if (current !== null) {
-      // A class component without an instance only mounts if it suspended
-      // inside a non-concurrent tree, in an inconsistent state. We want to
-      // treat it like a new mount, even though an empty version of it already
-      // committed. Disconnect the alternate pointers.
-      current.alternate = null;
-      workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
+        return workInProgress;
+      }
 
-      workInProgress.flags |= Placement;
-    } // In the initial pass we might need to construct the instance.
+      var nextDidTimeout = nextState !== null;
+      var prevDidTimeout = false;
 
-    constructClassInstance(workInProgress, Component, nextProps);
-    mountClassInstance(workInProgress, Component, nextProps, renderLanes);
-    shouldUpdate = true;
-  } else if (current === null) {
-    // In a resume, we'll already have an instance we can reuse.
-    shouldUpdate = resumeMountClassInstance(
-      workInProgress,
-      Component,
-      nextProps,
-      renderLanes
-    );
-  } else {
-    shouldUpdate = updateClassInstance(
-      current,
-      workInProgress,
-      Component,
-      nextProps,
-      renderLanes
-    );
-  }
+      if (current === null);
+      else {
+        var prevState = current.memoizedState;
+        prevDidTimeout = prevState !== null;
+      } // If the suspended state of the boundary changes, we need to schedule
+      // an effect to toggle the subtree's visibility. When we switch from
+      // fallback -> primary, the inner Offscreen fiber schedules this effect
+      // as part of its normal complete phase. But when we switch from
+      // primary -> fallback, the inner Offscreen fiber does not have a complete
+      // phase. So we need to schedule its effect here.
+      //
+      // We also use this flag to connect/disconnect the effects, but the same
+      // logic applies: when re-connecting, the Offscreen fiber's complete
+      // phase will handle scheduling the effect. It's only when the fallback
+      // is active that we have to do anything special.
 
-  var nextUnitOfWork = finishClassComponent(
-    current,
-    workInProgress,
-    Component,
-    shouldUpdate,
-    hasContext,
-    renderLanes
-  );
+      if (nextDidTimeout && !prevDidTimeout) {
+        var offscreenFiber = workInProgress.child;
+        offscreenFiber.flags |= Visibility; // TODO: This will still suspend a synchronous tree if anything
+        // in the concurrent tree already suspended during this render.
+        // This is a known bug.
 
-  {
-    var inst = workInProgress.stateNode;
+        if ((workInProgress.mode & ConcurrentMode) !== NoMode) {
+          // TODO: Move this back to throwException because this is too late
+          // if this is a large tree which is common for initial loads. We
+          // don't know if we should restart a render or not until we get
+          // this marker, and this is too late.
+          // If this render already had a ping or lower pri updates,
+          // and this is the first time we know we're going to suspend we
+          // should be able to immediately restart from within throwException.
+          var hasInvisibleChildContext =
+            current === null &&
+            workInProgress.memoizedProps.unstable_avoidThisFallback !== true;
 
-    if (shouldUpdate && inst.props !== nextProps) {
-      if (!didWarnAboutReassigningProps) {
-        error(
-          "It looks like %s is reassigning its own `this.props` while rendering. " +
-            "This is not supported and can lead to confusing bugs.",
-          getComponentName(workInProgress.type) || "a component"
-        );
+          if (
+            hasInvisibleChildContext ||
+            hasSuspenseContext(
+              suspenseStackCursor.current,
+              InvisibleParentSuspenseContext
+            )
+          ) {
+            // If this was in an invisible tree or a new render, then showing
+            // this boundary is ok.
+            renderDidSuspend();
+          } else {
+            // Otherwise, we're going to have to hide content so we should
+            // suspend for longer if possible.
+            renderDidSuspendDelayIfPossible();
+          }
+        }
       }
 
-      didWarnAboutReassigningProps = true;
-    }
-  }
+      var wakeables = workInProgress.updateQueue;
 
-  return nextUnitOfWork;
-}
+      if (wakeables !== null) {
+        // Schedule an effect to attach a retry listener to the promise.
+        // TODO: Move to passive phase
+        workInProgress.flags |= Update;
+      }
 
-function finishClassComponent(
-  current,
-  workInProgress,
-  Component,
-  shouldUpdate,
-  hasContext,
-  renderLanes
-) {
-  // Refs should update even if shouldComponentUpdate returns false
-  markRef(current, workInProgress);
-  var didCaptureError = (workInProgress.flags & DidCapture) !== NoFlags;
+      bubbleProperties(workInProgress);
 
-  if (!shouldUpdate && !didCaptureError) {
-    // Context providers should defer to sCU for rendering
-    if (hasContext) {
-      invalidateContextProvider(workInProgress, Component, false);
-    }
+      {
+        if ((workInProgress.mode & ProfileMode) !== NoMode) {
+          if (nextDidTimeout) {
+            // Don't count time spent in a timed out Suspense subtree as part of the base duration.
+            var _primaryChildFragment2 = workInProgress.child;
+
+            if (_primaryChildFragment2 !== null) {
+              // $FlowFixMe Flow doesn't support type casting in combination with the -= operator
+              workInProgress.treeBaseDuration -=
+                _primaryChildFragment2.treeBaseDuration;
+            }
+          }
+        }
+      }
 
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  }
+      return null;
+    }
 
-  var instance = workInProgress.stateNode; // Rerender
+    case HostPortal:
+      popHostContainer(workInProgress);
+      updateHostContainer(current, workInProgress);
 
-  ReactCurrentOwner$1.current = workInProgress;
-  var nextChildren;
+      if (current === null) {
+        preparePortalMount(workInProgress.stateNode.containerInfo);
+      }
 
-  if (
-    didCaptureError &&
-    typeof Component.getDerivedStateFromError !== "function"
-  ) {
-    // If we captured an error, but getDerivedStateFromError is not defined,
-    // unmount all the children. componentDidCatch will schedule an update to
-    // re-render a fallback. This is temporary until we migrate everyone to
-    // the new API.
-    // TODO: Warn in a future release.
-    nextChildren = null;
+      bubbleProperties(workInProgress);
+      return null;
 
-    {
-      stopProfilerTimerIfRunning();
-    }
-  } else {
-    {
-      setIsRendering(true);
-      nextChildren = instance.render();
+    case ContextProvider:
+      // Pop provider fiber
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
+      bubbleProperties(workInProgress);
+      return null;
 
-      if (workInProgress.mode & StrictMode) {
-        disableLogs();
+    case IncompleteClassComponent: {
+      // Same as class component case. I put it down here so that the tags are
+      // sequential to ensure this switch is compiled to a jump table.
+      var _Component = workInProgress.type;
 
-        try {
-          instance.render();
-        } finally {
-          reenableLogs();
-        }
+      if (isContextProvider(_Component)) {
+        popContext(workInProgress);
       }
 
-      setIsRendering(false);
+      bubbleProperties(workInProgress);
+      return null;
     }
-  } // React DevTools reads this flag.
 
-  workInProgress.flags |= PerformedWork;
+    case SuspenseListComponent: {
+      popSuspenseContext(workInProgress);
+      var renderState = workInProgress.memoizedState;
+
+      if (renderState === null) {
+        // We're running in the default, "independent" mode.
+        // We don't do anything in this mode.
+        bubbleProperties(workInProgress);
+        return null;
+      }
 
-  if (current !== null && didCaptureError) {
-    // If we're recovering from an error, reconcile without reusing any of
-    // the existing children. Conceptually, the normal children and the children
-    // that are shown on error are two different sets, so we shouldn't reuse
-    // normal children even if their identities match.
-    forceUnmountCurrentAndReconcile(
-      current,
-      workInProgress,
-      nextChildren,
-      renderLanes
-    );
-  } else {
-    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  } // Memoize state using the values we just used to render.
-  // TODO: Restructure so we never read values from the instance.
+      var didSuspendAlready = (workInProgress.flags & DidCapture) !== NoFlags;
+      var renderedTail = renderState.rendering;
 
-  workInProgress.memoizedState = instance.state; // The context might have changed so we need to recalculate it.
+      if (renderedTail === null) {
+        // We just rendered the head.
+        if (!didSuspendAlready) {
+          // This is the first pass. We need to figure out if anything is still
+          // suspended in the rendered set.
+          // If new content unsuspended, but there's still some content that
+          // didn't. Then we need to do a second pass that forces everything
+          // to keep showing their fallbacks.
+          // We might be suspended if something in this render pass suspended, or
+          // something in the previous committed pass suspended. Otherwise,
+          // there's no chance so we can skip the expensive call to
+          // findFirstSuspended.
+          var cannotBeSuspended =
+            renderHasNotSuspendedYet() &&
+            (current === null || (current.flags & DidCapture) === NoFlags);
 
-  if (hasContext) {
-    invalidateContextProvider(workInProgress, Component, true);
-  }
+          if (!cannotBeSuspended) {
+            var row = workInProgress.child;
 
-  return workInProgress.child;
-}
+            while (row !== null) {
+              var suspended = findFirstSuspended(row);
 
-function pushHostRootContext(workInProgress) {
-  var root = workInProgress.stateNode;
+              if (suspended !== null) {
+                didSuspendAlready = true;
+                workInProgress.flags |= DidCapture;
+                cutOffTailIfNeeded(renderState, false); // If this is a newly suspended tree, it might not get committed as
+                // part of the second pass. In that case nothing will subscribe to
+                // its thenables. Instead, we'll transfer its thenables to the
+                // SuspenseList so that it can retry if they resolve.
+                // There might be multiple of these in the list but since we're
+                // going to wait for all of them anyway, it doesn't really matter
+                // which ones gets to ping. In theory we could get clever and keep
+                // track of how many dependencies remain but it gets tricky because
+                // in the meantime, we can add/remove/change items and dependencies.
+                // We might bail out of the loop before finding any but that
+                // doesn't matter since that means that the other boundaries that
+                // we did find already has their listeners attached.
 
-  if (root.pendingContext) {
-    pushTopLevelContextObject(
-      workInProgress,
-      root.pendingContext,
-      root.pendingContext !== root.context
-    );
-  } else if (root.context) {
-    // Should always be set
-    pushTopLevelContextObject(workInProgress, root.context, false);
-  }
+                var newThenables = suspended.updateQueue;
 
-  pushHostContainer(workInProgress, root.containerInfo);
-}
+                if (newThenables !== null) {
+                  workInProgress.updateQueue = newThenables;
+                  workInProgress.flags |= Update;
+                } // Rerender the whole list, but this time, we'll force fallbacks
+                // to stay in place.
+                // Reset the effect flags before doing the second pass since that's now invalid.
+                // Reset the child fibers to their original state.
 
-function updateHostRoot(current, workInProgress, renderLanes) {
-  pushHostRootContext(workInProgress);
-  var updateQueue = workInProgress.updateQueue;
+                workInProgress.subtreeFlags = NoFlags;
+                resetChildFibers(workInProgress, renderLanes); // Set up the Suspense Context to force suspense and immediately
+                // rerender the children.
 
-  if (!(current !== null && updateQueue !== null)) {
-    throw Error(
-      "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
+                pushSuspenseContext(
+                  workInProgress,
+                  setShallowSuspenseContext(
+                    suspenseStackCursor.current,
+                    ForceSuspenseFallback
+                  )
+                ); // Don't bubble properties in this case.
 
-  var nextProps = workInProgress.pendingProps;
-  var prevState = workInProgress.memoizedState;
-  var prevChildren = prevState !== null ? prevState.element : null;
-  cloneUpdateQueue(current, workInProgress);
-  processUpdateQueue(workInProgress, nextProps, null, renderLanes);
-  var nextState = workInProgress.memoizedState; // Caution: React DevTools currently depends on this property
-  // being called "element".
+                return workInProgress.child;
+              }
 
-  var nextChildren = nextState.element;
+              row = row.sibling;
+            }
+          }
 
-  if (nextChildren === prevChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  }
+          if (renderState.tail !== null && now() > getRenderTargetTime()) {
+            // We have already passed our CPU deadline but we still have rows
+            // left in the tail. We'll just give up further attempts to render
+            // the main content and only render fallbacks.
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true;
+            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
+            // to get it started back up to attempt the next item. While in terms
+            // of priority this work has the same priority as this current render,
+            // it's not part of the same transition once the transition has
+            // committed. If it's sync, we still want to yield so that it can be
+            // painted. Conceptually, this is really the same as pinging.
+            // We can use any RetryLane even if it's the one currently rendering
+            // since we're leaving it behind on this node.
 
-  var root = workInProgress.stateNode;
+            workInProgress.lanes = SomeRetryLane;
+          }
+        } else {
+          cutOffTailIfNeeded(renderState, false);
+        } // Next we're going to render the tail.
+      } else {
+        // Append the rendered row to the child list.
+        if (!didSuspendAlready) {
+          var _suspended = findFirstSuspended(renderedTail);
 
-  if (root.hydrate && enterHydrationState()) {
-    var child = mountChildFibers(
-      workInProgress,
-      null,
-      nextChildren,
-      renderLanes
-    );
-    workInProgress.child = child;
-    var node = child;
+          if (_suspended !== null) {
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true; // Ensure we transfer the update queue to the parent so that it doesn't
+            // get lost if this row ends up dropped during a second pass.
 
-    while (node) {
-      // Mark each child as hydrating. This is a fast path to know whether this
-      // tree is part of a hydrating tree. This is used to determine if a child
-      // node has fully mounted yet, and for scheduling event replaying.
-      // Conceptually this is similar to Placement in that a new subtree is
-      // inserted into the React tree here. It just happens to not need DOM
-      // mutations because it already exists.
-      node.flags = (node.flags & ~Placement) | Hydrating;
-      node = node.sibling;
-    }
-  } else {
-    // Otherwise reset hydration state in case we aborted and resumed another
-    // root.
-    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  }
+            var _newThenables = _suspended.updateQueue;
 
-  return workInProgress.child;
-}
+            if (_newThenables !== null) {
+              workInProgress.updateQueue = _newThenables;
+              workInProgress.flags |= Update;
+            }
 
-function updateHostComponent(current, workInProgress, renderLanes) {
-  pushHostContext(workInProgress);
+            cutOffTailIfNeeded(renderState, true); // This might have been modified.
 
-  var type = workInProgress.type;
-  var nextProps = workInProgress.pendingProps;
-  var prevProps = current !== null ? current.memoizedProps : null;
-  var nextChildren = nextProps.children;
+            if (
+              renderState.tail === null &&
+              renderState.tailMode === "hidden" &&
+              !renderedTail.alternate &&
+              !getIsHydrating() // We don't cut it if we're hydrating.
+            ) {
+              // We're done.
+              bubbleProperties(workInProgress);
+              return null;
+            }
+          } else if (
+            // The time it took to render last row is greater than the remaining
+            // time we have to render. So rendering one more row would likely
+            // exceed it.
+            now() * 2 - renderState.renderingStartTime >
+              getRenderTargetTime() &&
+            renderLanes !== OffscreenLane
+          ) {
+            // We have now passed our CPU deadline and we'll just give up further
+            // attempts to render the main content and only render fallbacks.
+            // The assumption is that this is usually faster.
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true;
+            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
+            // to get it started back up to attempt the next item. While in terms
+            // of priority this work has the same priority as this current render,
+            // it's not part of the same transition once the transition has
+            // committed. If it's sync, we still want to yield so that it can be
+            // painted. Conceptually, this is really the same as pinging.
+            // We can use any RetryLane even if it's the one currently rendering
+            // since we're leaving it behind on this node.
 
-  if (prevProps !== null && shouldSetTextContent()) {
-    // If we're switching from a direct text child to a normal child, or to
-    // empty, we need to schedule the text content to be reset.
-    workInProgress.flags |= ContentReset;
-  }
+            workInProgress.lanes = SomeRetryLane;
+          }
+        }
 
-  markRef(current, workInProgress);
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-}
+        if (renderState.isBackwards) {
+          // The effect list of the backwards tail will have been added
+          // to the end. This breaks the guarantee that life-cycles fire in
+          // sibling order but that isn't a strong guarantee promised by React.
+          // Especially since these might also just pop in during future commits.
+          // Append to the beginning of the list.
+          renderedTail.sibling = workInProgress.child;
+          workInProgress.child = renderedTail;
+        } else {
+          var previousSibling = renderState.last;
 
-function updateHostText(current, workInProgress) {
-  // immediately after.
+          if (previousSibling !== null) {
+            previousSibling.sibling = renderedTail;
+          } else {
+            workInProgress.child = renderedTail;
+          }
 
-  return null;
-}
+          renderState.last = renderedTail;
+        }
+      }
 
-function mountLazyComponent(
-  _current,
-  workInProgress,
-  elementType,
-  updateLanes,
-  renderLanes
-) {
-  if (_current !== null) {
-    // A lazy component only mounts if it suspended inside a non-
-    // concurrent tree, in an inconsistent state. We want to treat it like
-    // a new mount, even though an empty version of it already committed.
-    // Disconnect the alternate pointers.
-    _current.alternate = null;
-    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
+      if (renderState.tail !== null) {
+        // We still have tail rows to render.
+        // Pop a row.
+        var next = renderState.tail;
+        renderState.rendering = next;
+        renderState.tail = next.sibling;
+        renderState.renderingStartTime = now();
+        next.sibling = null; // Restore the context.
+        // TODO: We can probably just avoid popping it instead and only
+        // setting it the first time we go from not suspended to suspended.
 
-    workInProgress.flags |= Placement;
-  }
+        var suspenseContext = suspenseStackCursor.current;
 
-  var props = workInProgress.pendingProps;
-  var lazyComponent = elementType;
-  var payload = lazyComponent._payload;
-  var init = lazyComponent._init;
-  var Component = init(payload); // Store the unwrapped component in the type.
+        if (didSuspendAlready) {
+          suspenseContext = setShallowSuspenseContext(
+            suspenseContext,
+            ForceSuspenseFallback
+          );
+        } else {
+          suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+        }
 
-  workInProgress.type = Component;
-  var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(Component));
-  var resolvedProps = resolveDefaultProps(Component, props);
-  var child;
+        pushSuspenseContext(workInProgress, suspenseContext); // Do a pass over the next row.
+        // Don't bubble properties in this case.
 
-  switch (resolvedTag) {
-    case FunctionComponent: {
-      {
-        validateFunctionComponentInDev(workInProgress, Component);
-        workInProgress.type = Component = resolveFunctionForHotReloading(
-          Component
-        );
+        return next;
       }
 
-      child = updateFunctionComponent(
-        null,
-        workInProgress,
-        Component,
-        resolvedProps,
-        renderLanes
-      );
-      return child;
+      bubbleProperties(workInProgress);
+      return null;
     }
 
-    case ClassComponent: {
-      {
-        workInProgress.type = Component = resolveClassForHotReloading(
-          Component
-        );
-      }
-
-      child = updateClassComponent(
-        null,
-        workInProgress,
-        Component,
-        resolvedProps,
-        renderLanes
-      );
-      return child;
+    case ScopeComponent: {
+      break;
     }
 
-    case ForwardRef: {
-      {
-        workInProgress.type = Component = resolveForwardRefForHotReloading(
-          Component
-        );
-      }
+    case OffscreenComponent:
+    case LegacyHiddenComponent: {
+      popRenderLanes(workInProgress);
+      var _nextState = workInProgress.memoizedState;
+      var nextIsHidden = _nextState !== null;
 
-      child = updateForwardRef(
-        null,
-        workInProgress,
-        Component,
-        resolvedProps,
-        renderLanes
-      );
-      return child;
-    }
+      if (current !== null) {
+        var _prevState = current.memoizedState;
+        var prevIsHidden = _prevState !== null;
 
-    case MemoComponent: {
-      {
-        if (workInProgress.type !== workInProgress.elementType) {
-          var outerPropTypes = Component.propTypes;
+        if (
+          prevIsHidden !== nextIsHidden &&
+          newProps.mode !== "unstable-defer-without-hiding" && // LegacyHidden doesn't do any hiding — it only pre-renders.
+          workInProgress.tag !== LegacyHiddenComponent
+        ) {
+          workInProgress.flags |= Visibility;
+        }
+      }
 
-          if (outerPropTypes) {
-            checkPropTypes(
-              outerPropTypes,
-              resolvedProps, // Resolved for outer only
-              "prop",
-              getComponentName(Component)
-            );
-          }
+      if (!nextIsHidden || (workInProgress.mode & ConcurrentMode) === NoMode) {
+        bubbleProperties(workInProgress);
+      } else {
+        // Don't bubble properties for hidden children unless we're rendering
+        // at offscreen priority.
+        if (includesSomeLane(subtreeRenderLanes, OffscreenLane)) {
+          bubbleProperties(workInProgress);
         }
       }
 
-      child = updateMemoComponent(
-        null,
-        workInProgress,
-        Component,
-        resolveDefaultProps(Component.type, resolvedProps), // The inner type can have defaults too
-        updateLanes,
-        renderLanes
-      );
-      return child;
+      return null;
     }
   }
 
-  var hint = "";
-
-  {
-    if (
-      Component !== null &&
-      typeof Component === "object" &&
-      Component.$$typeof === REACT_LAZY_TYPE
-    ) {
-      hint = " Did you wrap a component in React.lazy() more than once?";
-    }
-  } // This message intentionally doesn't mention ForwardRef or MemoComponent
-  // because the fact that it's a separate type of work is an
-  // implementation detail.
-
   {
     throw Error(
-      "Element type is invalid. Received a promise that resolves to: " +
-        Component +
-        ". Lazy element type must resolve to a class or function." +
-        hint
+      "Unknown unit of work tag (" +
+        workInProgress.tag +
+        "). This error is likely caused by a bug in React. Please file an issue."
     );
   }
 }
 
-function mountIncompleteClassComponent(
-  _current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  if (_current !== null) {
-    // An incomplete component only mounts if it suspended inside a non-
-    // concurrent tree, in an inconsistent state. We want to treat it like
-    // a new mount, even though an empty version of it already committed.
-    // Disconnect the alternate pointers.
-    _current.alternate = null;
-    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
-
-    workInProgress.flags |= Placement;
-  } // Promote the fiber to a class and try rendering again.
-
-  workInProgress.tag = ClassComponent; // The rest of this function is a fork of `updateClassComponent`
-  // Push context providers early to prevent context stack mismatches.
-  // During mounting we don't know the child context yet as the instance doesn't exist.
-  // We will invalidate the child context in finishClassComponent() right after rendering.
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
+var didReceiveUpdate = false;
+var didWarnAboutBadClass;
+var didWarnAboutModulePatternComponent;
+var didWarnAboutContextTypeOnFunctionComponent;
+var didWarnAboutGetDerivedStateOnFunctionComponent;
+var didWarnAboutFunctionRefs;
+var didWarnAboutReassigningProps;
+var didWarnAboutRevealOrder;
+var didWarnAboutTailOptions;
 
-  var hasContext;
+{
+  didWarnAboutBadClass = {};
+  didWarnAboutModulePatternComponent = {};
+  didWarnAboutContextTypeOnFunctionComponent = {};
+  didWarnAboutGetDerivedStateOnFunctionComponent = {};
+  didWarnAboutFunctionRefs = {};
+  didWarnAboutReassigningProps = false;
+  didWarnAboutRevealOrder = {};
+  didWarnAboutTailOptions = {};
+}
 
-  if (isContextProvider(Component)) {
-    hasContext = true;
-    pushContextProvider(workInProgress);
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  if (current === null) {
+    // If this is a fresh new component that hasn't been rendered yet, we
+    // won't update its child set by applying minimal side-effects. Instead,
+    // we will add them all to the child before it gets rendered. That means
+    // we can optimize this reconciliation pass by not tracking side-effects.
+    workInProgress.child = mountChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderLanes
+    );
   } else {
-    hasContext = false;
+    // If the current child is the same as the work in progress, it means that
+    // we haven't yet started any work on these children. Therefore, we use
+    // the clone algorithm to create a copy of all the current children.
+    // If we had any progressed work already, that is invalid at this point so
+    // let's throw it out.
+    workInProgress.child = reconcileChildFibers(
+      workInProgress,
+      current.child,
+      nextChildren,
+      renderLanes
+    );
   }
+}
 
-  prepareToReadContext(workInProgress, renderLanes);
-  constructClassInstance(workInProgress, Component, nextProps);
-  mountClassInstance(workInProgress, Component, nextProps, renderLanes);
-  return finishClassComponent(
+function forceUnmountCurrentAndReconcile(
+  current,
+  workInProgress,
+  nextChildren,
+  renderLanes
+) {
+  // This function is fork of reconcileChildren. It's used in cases where we
+  // want to reconcile without matching against the existing set. This has the
+  // effect of all current children being unmounted; even if the type and key
+  // are the same, the old child is unmounted and a new child is created.
+  //
+  // To do this, we're going to go through the reconcile algorithm twice. In
+  // the first pass, we schedule a deletion for all the current children by
+  // passing null.
+  workInProgress.child = reconcileChildFibers(
+    workInProgress,
+    current.child,
     null,
+    renderLanes
+  ); // In the second pass, we mount the new children. The trick here is that we
+  // pass null in place of where we usually pass the current child set. This has
+  // the effect of remounting all children regardless of whether their
+  // identities match.
+
+  workInProgress.child = reconcileChildFibers(
     workInProgress,
-    Component,
-    true,
-    hasContext,
+    null,
+    nextChildren,
     renderLanes
   );
 }
 
-function mountIndeterminateComponent(
-  _current,
+function updateForwardRef(
+  current,
   workInProgress,
   Component,
+  nextProps,
   renderLanes
-) {
-  if (_current !== null) {
-    // An indeterminate component only mounts if it suspended inside a non-
-    // concurrent tree, in an inconsistent state. We want to treat it like
-    // a new mount, even though an empty version of it already committed.
-    // Disconnect the alternate pointers.
-    _current.alternate = null;
-    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
-
-    workInProgress.flags |= Placement;
-  }
-
-  var props = workInProgress.pendingProps;
-  var context;
-
-  {
-    var unmaskedContext = getUnmaskedContext(workInProgress, Component, false);
-    context = getMaskedContext(workInProgress, unmaskedContext);
-  }
-
-  prepareToReadContext(workInProgress, renderLanes);
-  var value;
-
+) {
+  // TODO: current can be non-null here even if the component
+  // hasn't yet mounted. This happens after the first render suspends.
+  // We'll need to figure out if this is fine or can cause issues.
   {
-    if (
-      Component.prototype &&
-      typeof Component.prototype.render === "function"
-    ) {
-      var componentName = getComponentName(Component) || "Unknown";
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var innerPropTypes = Component.propTypes;
 
-      if (!didWarnAboutBadClass[componentName]) {
-        error(
-          "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
-            "This is likely to cause errors. Change %s to extend React.Component instead.",
-          componentName,
-          componentName
+      if (innerPropTypes) {
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(Component)
         );
-
-        didWarnAboutBadClass[componentName] = true;
       }
     }
+  }
 
-    if (workInProgress.mode & StrictMode) {
-      ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
-    }
+  var render = Component.render;
+  var ref = workInProgress.ref; // The rest is a fork of updateFunctionComponent
 
-    setIsRendering(true);
+  var nextChildren;
+  prepareToReadContext(workInProgress, renderLanes);
+
+  {
     ReactCurrentOwner$1.current = workInProgress;
-    value = renderWithHooks(
-      null,
+    setIsRendering(true);
+    nextChildren = renderWithHooks(
+      current,
       workInProgress,
-      Component,
-      props,
-      context,
+      render,
+      nextProps,
+      ref,
       renderLanes
     );
-    setIsRendering(false);
-  } // React DevTools reads this flag.
 
-  workInProgress.flags |= PerformedWork;
-
-  {
-    // Support for module components is deprecated and is removed behind a flag.
-    // Whether or not it would crash later, we want to show a good message in DEV first.
-    if (
-      typeof value === "object" &&
-      value !== null &&
-      typeof value.render === "function" &&
-      value.$$typeof === undefined
-    ) {
-      var _componentName = getComponentName(Component) || "Unknown";
+    if (workInProgress.mode & StrictLegacyMode) {
+      disableLogs();
 
-      if (!didWarnAboutModulePatternComponent[_componentName]) {
-        error(
-          "The <%s /> component appears to be a function component that returns a class instance. " +
-            "Change %s to a class that extends React.Component instead. " +
-            "If you can't use a class try assigning the prototype on the function as a workaround. " +
-            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
-            "cannot be called with `new` by React.",
-          _componentName,
-          _componentName,
-          _componentName
+      try {
+        nextChildren = renderWithHooks(
+          current,
+          workInProgress,
+          render,
+          nextProps,
+          ref,
+          renderLanes
         );
-
-        didWarnAboutModulePatternComponent[_componentName] = true;
+      } finally {
+        reenableLogs();
       }
     }
-  }
 
-  if (
-    // Run these checks in production only if the flag is off.
-    // Eventually we'll delete this branch altogether.
-    typeof value === "object" &&
-    value !== null &&
-    typeof value.render === "function" &&
-    value.$$typeof === undefined
-  ) {
-    {
-      var _componentName2 = getComponentName(Component) || "Unknown";
+    setIsRendering(false);
+  }
 
-      if (!didWarnAboutModulePatternComponent[_componentName2]) {
-        error(
-          "The <%s /> component appears to be a function component that returns a class instance. " +
-            "Change %s to a class that extends React.Component instead. " +
-            "If you can't use a class try assigning the prototype on the function as a workaround. " +
-            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
-            "cannot be called with `new` by React.",
-          _componentName2,
-          _componentName2,
-          _componentName2
-        );
+  if (current !== null && !didReceiveUpdate) {
+    bailoutHooks(current, workInProgress, renderLanes);
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  } // React DevTools reads this flag.
 
-        didWarnAboutModulePatternComponent[_componentName2] = true;
-      }
-    } // Proceed under the assumption that this is a class instance
+  workInProgress.flags |= PerformedWork;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
+}
 
-    workInProgress.tag = ClassComponent; // Throw out any hooks that were used.
+function updateMemoComponent(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  if (current === null) {
+    var type = Component.type;
 
-    workInProgress.memoizedState = null;
-    workInProgress.updateQueue = null; // Push context providers early to prevent context stack mismatches.
-    // During mounting we don't know the child context yet as the instance doesn't exist.
-    // We will invalidate the child context in finishClassComponent() right after rendering.
+    if (
+      isSimpleFunctionComponent(type) &&
+      Component.compare === null && // SimpleMemoComponent codepath doesn't resolve outer props either.
+      Component.defaultProps === undefined
+    ) {
+      var resolvedType = type;
 
-    var hasContext = false;
+      {
+        resolvedType = resolveFunctionForHotReloading(type);
+      } // If this is a plain function component without default props,
+      // and with only the default shallow comparison, we upgrade it
+      // to a SimpleMemoComponent to allow fast path updates.
 
-    if (isContextProvider(Component)) {
-      hasContext = true;
-      pushContextProvider(workInProgress);
-    } else {
-      hasContext = false;
-    }
+      workInProgress.tag = SimpleMemoComponent;
+      workInProgress.type = resolvedType;
 
-    workInProgress.memoizedState =
-      value.state !== null && value.state !== undefined ? value.state : null;
-    initializeUpdateQueue(workInProgress);
-    var getDerivedStateFromProps = Component.getDerivedStateFromProps;
+      {
+        validateFunctionComponentInDev(workInProgress, type);
+      }
 
-    if (typeof getDerivedStateFromProps === "function") {
-      applyDerivedStateFromProps(
+      return updateSimpleMemoComponent(
+        current,
         workInProgress,
-        Component,
-        getDerivedStateFromProps,
-        props
+        resolvedType,
+        nextProps,
+        renderLanes
       );
     }
 
-    adoptClassInstance(workInProgress, value);
-    mountClassInstance(workInProgress, Component, props, renderLanes);
-    return finishClassComponent(
-      null,
-      workInProgress,
-      Component,
-      true,
-      hasContext,
-      renderLanes
-    );
-  } else {
-    // Proceed under the assumption that this is a function component
-    workInProgress.tag = FunctionComponent;
-
     {
-      if (workInProgress.mode & StrictMode) {
-        disableLogs();
+      var innerPropTypes = type.propTypes;
 
-        try {
-          value = renderWithHooks(
-            null,
-            workInProgress,
-            Component,
-            props,
-            context,
-            renderLanes
-          );
-        } finally {
-          reenableLogs();
-        }
+      if (innerPropTypes) {
+        // Inner memo component props aren't currently validated in createElement.
+        // We could move it there, but we'd still need this for lazy code path.
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(type)
+        );
       }
     }
 
-    reconcileChildren(null, workInProgress, value, renderLanes);
-
-    {
-      validateFunctionComponentInDev(workInProgress, Component);
-    }
-
-    return workInProgress.child;
+    var child = createFiberFromTypeAndProps(
+      Component.type,
+      null,
+      nextProps,
+      workInProgress,
+      workInProgress.mode,
+      renderLanes
+    );
+    child.ref = workInProgress.ref;
+    child.return = workInProgress;
+    workInProgress.child = child;
+    return child;
   }
-}
 
-function validateFunctionComponentInDev(workInProgress, Component) {
   {
-    if (Component) {
-      if (Component.childContextTypes) {
-        error(
-          "%s(...): childContextTypes cannot be defined on a function component.",
-          Component.displayName || Component.name || "Component"
-        );
-      }
-    }
-
-    if (workInProgress.ref !== null) {
-      var info = "";
-      var ownerName = getCurrentFiberOwnerNameInDevOrNull();
-
-      if (ownerName) {
-        info += "\n\nCheck the render method of `" + ownerName + "`.";
-      }
-
-      var warningKey = ownerName || workInProgress._debugID || "";
-      var debugSource = workInProgress._debugSource;
-
-      if (debugSource) {
-        warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
-      }
-
-      if (!didWarnAboutFunctionRefs[warningKey]) {
-        didWarnAboutFunctionRefs[warningKey] = true;
+    var _type = Component.type;
+    var _innerPropTypes = _type.propTypes;
 
-        error(
-          "Function components cannot be given refs. " +
-            "Attempts to access this ref will fail. " +
-            "Did you mean to use React.forwardRef()?%s",
-          info
-        );
-      }
+    if (_innerPropTypes) {
+      // Inner memo component props aren't currently validated in createElement.
+      // We could move it there, but we'd still need this for lazy code path.
+      checkPropTypes(
+        _innerPropTypes,
+        nextProps, // Resolved props
+        "prop",
+        getComponentNameFromType(_type)
+      );
     }
+  }
 
-    if (typeof Component.getDerivedStateFromProps === "function") {
-      var _componentName3 = getComponentName(Component) || "Unknown";
-
-      if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3]) {
-        error(
-          "%s: Function components do not support getDerivedStateFromProps.",
-          _componentName3
-        );
+  var currentChild = current.child; // This is always exactly one child
 
-        didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3] = true;
-      }
-    }
+  var hasScheduledUpdateOrContext = checkScheduledUpdateOrContext(
+    current,
+    renderLanes
+  );
 
-    if (
-      typeof Component.contextType === "object" &&
-      Component.contextType !== null
-    ) {
-      var _componentName4 = getComponentName(Component) || "Unknown";
+  if (!hasScheduledUpdateOrContext) {
+    // This will be the props with resolved defaultProps,
+    // unlike current.memoizedProps which will be the unresolved ones.
+    var prevProps = currentChild.memoizedProps; // Default to shallow comparison
 
-      if (!didWarnAboutContextTypeOnFunctionComponent[_componentName4]) {
-        error(
-          "%s: Function components do not support contextType.",
-          _componentName4
-        );
+    var compare = Component.compare;
+    compare = compare !== null ? compare : shallowEqual;
 
-        didWarnAboutContextTypeOnFunctionComponent[_componentName4] = true;
-      }
+    if (compare(prevProps, nextProps) && current.ref === workInProgress.ref) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
     }
-  }
-}
-
-var SUSPENDED_MARKER = {
-  dehydrated: null,
-  retryLane: NoLane
-};
+  } // React DevTools reads this flag.
 
-function mountSuspenseOffscreenState(renderLanes) {
-  return {
-    baseLanes: renderLanes
-  };
+  workInProgress.flags |= PerformedWork;
+  var newChild = createWorkInProgress(currentChild, nextProps);
+  newChild.ref = workInProgress.ref;
+  newChild.return = workInProgress;
+  workInProgress.child = newChild;
+  return newChild;
 }
 
-function updateSuspenseOffscreenState(prevOffscreenState, renderLanes) {
-  return {
-    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes)
-  };
-} // TODO: Probably should inline this back
-
-function shouldRemainOnFallback(
-  suspenseContext,
+function updateSimpleMemoComponent(
   current,
   workInProgress,
+  Component,
+  nextProps,
   renderLanes
 ) {
-  // If we're already showing a fallback, there are cases where we need to
-  // remain on that fallback regardless of whether the content has resolved.
-  // For example, SuspenseList coordinates when nested content appears.
-  if (current !== null) {
-    var suspenseState = current.memoizedState;
-
-    if (suspenseState === null) {
-      // Currently showing content. Don't hide it, even if ForceSuspenseFallack
-      // is true. More precise name might be "ForceRemainSuspenseFallback".
-      // Note: This is a factoring smell. Can't remain on a fallback if there's
-      // no fallback to remain on.
-      return false;
-    }
-  } // Not currently showing content. Consult the Suspense context.
+  // TODO: current can be non-null here even if the component
+  // hasn't yet mounted. This happens when the inner render suspends.
+  // We'll need to figure out if this is fine or can cause issues.
+  {
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var outerMemoType = workInProgress.elementType;
 
-  return hasSuspenseContext(suspenseContext, ForceSuspenseFallback);
-}
+      if (outerMemoType.$$typeof === REACT_LAZY_TYPE) {
+        // We warn when you define propTypes on lazy()
+        // so let's just skip over it to find memo() outer wrapper.
+        // Inner props for memo are validated later.
+        var lazyComponent = outerMemoType;
+        var payload = lazyComponent._payload;
+        var init = lazyComponent._init;
 
-function getRemainingWorkInPrimaryTree(current, renderLanes) {
-  // TODO: Should not remove render lanes that were pinged during this render
-  return removeLanes(current.childLanes, renderLanes);
-}
+        try {
+          outerMemoType = init(payload);
+        } catch (x) {
+          outerMemoType = null;
+        } // Inner propTypes will be validated in the function component path.
 
-function updateSuspenseComponent(current, workInProgress, renderLanes) {
-  var nextProps = workInProgress.pendingProps; // This is used by DevTools to force a boundary to suspend.
+        var outerPropTypes = outerMemoType && outerMemoType.propTypes;
 
-  {
-    if (shouldSuspend(workInProgress)) {
-      workInProgress.flags |= DidCapture;
+        if (outerPropTypes) {
+          checkPropTypes(
+            outerPropTypes,
+            nextProps, // Resolved (SimpleMemoComponent has no defaultProps)
+            "prop",
+            getComponentNameFromType(outerMemoType)
+          );
+        }
+      }
     }
   }
 
-  var suspenseContext = suspenseStackCursor.current;
-  var showFallback = false;
-  var didSuspend = (workInProgress.flags & DidCapture) !== NoFlags;
+  if (current !== null) {
+    var prevProps = current.memoizedProps;
 
-  if (didSuspend || shouldRemainOnFallback(suspenseContext, current)) {
-    // Something in this boundary's subtree already suspended. Switch to
-    // rendering the fallback children.
-    showFallback = true;
-    workInProgress.flags &= ~DidCapture;
-  } else {
-    // Attempting the main content
-    if (current === null || current.memoizedState !== null) {
-      // This is a new mount or this boundary is already showing a fallback state.
-      // Mark this subtree context as having at least one invisible parent that could
-      // handle the fallback state.
-      // Boundaries without fallbacks or should be avoided are not considered since
-      // they cannot handle preferred fallback states.
-      if (
-        nextProps.fallback !== undefined &&
-        nextProps.unstable_avoidThisFallback !== true
-      ) {
-        suspenseContext = addSubtreeSuspenseContext(
-          suspenseContext,
-          InvisibleParentSuspenseContext
+    if (
+      shallowEqual(prevProps, nextProps) &&
+      current.ref === workInProgress.ref && // Prevent bailout if the implementation changed due to hot reload.
+      workInProgress.type === current.type
+    ) {
+      didReceiveUpdate = false;
+
+      if (!checkScheduledUpdateOrContext(current, renderLanes)) {
+        // The pending lanes were cleared at the beginning of beginWork. We're
+        // about to bail out, but there might be other lanes that weren't
+        // included in the current render. Usually, the priority level of the
+        // remaining updates is accumulated during the evaluation of the
+        // component (i.e. when processing the update queue). But since since
+        // we're bailing out early *without* evaluating the component, we need
+        // to account for it here, too. Reset to the value of the current fiber.
+        // NOTE: This only applies to SimpleMemoComponent, not MemoComponent,
+        // because a MemoComponent fiber does not have hooks or an update queue;
+        // rather, it wraps around an inner component, which may or may not
+        // contains hooks.
+        // TODO: Move the reset at in beginWork out of the common path so that
+        // this is no longer necessary.
+        workInProgress.lanes = current.lanes;
+        return bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
         );
+      } else if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
+        // This is a special case that only exists for legacy mode.
+        // See https://github.com/facebook/react/pull/19216.
+        didReceiveUpdate = true;
       }
     }
   }
 
-  suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
-  pushSuspenseContext(workInProgress, suspenseContext); // OK, the next part is confusing. We're about to reconcile the Suspense
-  // boundary's children. This involves some custom reconcilation logic. Two
-  // main reasons this is so complicated.
-  //
-  // First, Legacy Mode has different semantics for backwards compatibility. The
-  // primary tree will commit in an inconsistent state, so when we do the
-  // second pass to render the fallback, we do some exceedingly, uh, clever
-  // hacks to make that not totally break. Like transferring effects and
-  // deletions from hidden tree. In Concurrent Mode, it's much simpler,
-  // because we bailout on the primary tree completely and leave it in its old
-  // state, no effects. Same as what we do for Offscreen (except that
-  // Offscreen doesn't have the first render pass).
-  //
-  // Second is hydration. During hydration, the Suspense fiber has a slightly
-  // different layout, where the child points to a dehydrated fragment, which
-  // contains the DOM rendered by the server.
-  //
-  // Third, even if you set all that aside, Suspense is like error boundaries in
-  // that we first we try to render one tree, and if that fails, we render again
-  // and switch to a different tree. Like a try/catch block. So we have to track
-  // which branch we're currently rendering. Ideally we would model this using
-  // a stack.
+  return updateFunctionComponent(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    renderLanes
+  );
+}
 
-  if (current === null) {
-    // Initial mount
-    // If we're currently hydrating, try to hydrate this boundary.
-    // But only if this has a fallback.
-    if (nextProps.fallback !== undefined);
+function updateOffscreenComponent(current, workInProgress, renderLanes) {
+  var nextProps = workInProgress.pendingProps;
+  var nextChildren = nextProps.children;
+  var prevState = current !== null ? current.memoizedState : null; // If this is not null, this is a cache pool that was carried over from the
+  // previous render. We will push this to the cache pool context so that we can
+  // resume in-flight requests.
 
-    var nextPrimaryChildren = nextProps.children;
-    var nextFallbackChildren = nextProps.fallback;
+  var spawnedCachePool = null;
 
-    if (showFallback) {
-      var fallbackFragment = mountSuspenseFallbackChildren(
-        workInProgress,
-        nextPrimaryChildren,
-        nextFallbackChildren,
-        renderLanes
-      );
-      var primaryChildFragment = workInProgress.child;
-      primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
-        renderLanes
-      );
-      workInProgress.memoizedState = SUSPENDED_MARKER;
-      return fallbackFragment;
-    } else if (typeof nextProps.unstable_expectedLoadTime === "number") {
-      // This is a CPU-bound tree. Skip this tree and show a placeholder to
-      // unblock the surrounding content. Then immediately retry after the
-      // initial commit.
-      var _fallbackFragment = mountSuspenseFallbackChildren(
-        workInProgress,
-        nextPrimaryChildren,
-        nextFallbackChildren,
-        renderLanes
-      );
+  if (
+    nextProps.mode === "hidden" ||
+    nextProps.mode === "unstable-defer-without-hiding"
+  ) {
+    // Rendering a hidden tree.
+    if ((workInProgress.mode & ConcurrentMode) === NoMode) {
+      // In legacy sync mode, don't defer the subtree. Render it now.
+      var nextState = {
+        baseLanes: NoLanes,
+        cachePool: null
+      };
+      workInProgress.memoizedState = nextState;
+      pushRenderLanes(workInProgress, renderLanes);
+    } else if (!includesSomeLane(renderLanes, OffscreenLane)) {
+      // We're hidden, and we're not rendering at Offscreen. We will bail out
+      // and resume this tree later.
+      var nextBaseLanes;
 
-      var _primaryChildFragment = workInProgress.child;
-      _primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
-        renderLanes
-      );
-      workInProgress.memoizedState = SUSPENDED_MARKER; // Since nothing actually suspended, there will nothing to ping this to
-      // get it started back up to attempt the next item. While in terms of
-      // priority this work has the same priority as this current render, it's
-      // not part of the same transition once the transition has committed. If
-      // it's sync, we still want to yield so that it can be painted.
-      // Conceptually, this is really the same as pinging. We can use any
-      // RetryLane even if it's the one currently rendering since we're leaving
-      // it behind on this node.
+      if (prevState !== null) {
+        var prevBaseLanes = prevState.baseLanes;
+        nextBaseLanes = mergeLanes(prevBaseLanes, renderLanes);
+      } else {
+        nextBaseLanes = renderLanes;
+      } // Schedule this fiber to re-render at offscreen priority. Then bailout.
 
-      workInProgress.lanes = SomeRetryLane;
+      workInProgress.lanes = workInProgress.childLanes = laneToLanes(
+        OffscreenLane
+      );
+      var _nextState = {
+        baseLanes: nextBaseLanes,
+        cachePool: spawnedCachePool
+      };
+      workInProgress.memoizedState = _nextState;
+      workInProgress.updateQueue = null; // We're about to bail out, but we need to push this to the stack anyway
+      // to avoid a push/pop misalignment.
 
-      {
-        markSpawnedWork(SomeRetryLane);
-      }
+      pushRenderLanes(workInProgress, nextBaseLanes);
 
-      return _fallbackFragment;
+      return null;
     } else {
-      return mountSuspensePrimaryChildren(
-        workInProgress,
-        nextPrimaryChildren,
-        renderLanes
-      );
+      var _nextState2 = {
+        baseLanes: NoLanes,
+        cachePool: null
+      };
+      workInProgress.memoizedState = _nextState2; // Push the lanes that were skipped when we bailed out.
+
+      var subtreeRenderLanes =
+        prevState !== null ? prevState.baseLanes : renderLanes;
+      pushRenderLanes(workInProgress, subtreeRenderLanes);
     }
   } else {
-    // This is an update.
-    // If the current fiber has a SuspenseState, that means it's already showing
-    // a fallback.
-    var prevState = current.memoizedState;
+    // Rendering a visible tree.
+    var _subtreeRenderLanes;
 
     if (prevState !== null) {
-      if (showFallback) {
-        var _nextFallbackChildren2 = nextProps.fallback;
-        var _nextPrimaryChildren2 = nextProps.children;
+      // We're going from hidden -> visible.
+      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes);
 
-        var _fallbackChildFragment = updateSuspenseFallbackChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren2,
-          _nextFallbackChildren2,
-          renderLanes
-        );
+      workInProgress.memoizedState = null;
+    } else {
+      // We weren't previously hidden, and we still aren't, so there's nothing
+      // special to do. Need to push to the stack regardless, though, to avoid
+      // a push/pop misalignment.
+      _subtreeRenderLanes = renderLanes;
+    }
 
-        var _primaryChildFragment3 = workInProgress.child;
-        var prevOffscreenState = current.child.memoizedState;
-        _primaryChildFragment3.memoizedState =
-          prevOffscreenState === null
-            ? mountSuspenseOffscreenState(renderLanes)
-            : updateSuspenseOffscreenState(prevOffscreenState, renderLanes);
-        _primaryChildFragment3.childLanes = getRemainingWorkInPrimaryTree(
-          current,
-          renderLanes
-        );
-        workInProgress.memoizedState = SUSPENDED_MARKER;
-        return _fallbackChildFragment;
-      } else {
-        var _nextPrimaryChildren3 = nextProps.children;
+    pushRenderLanes(workInProgress, _subtreeRenderLanes);
+  }
 
-        var _primaryChildFragment4 = updateSuspensePrimaryChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren3,
-          renderLanes
-        );
+  if (enablePersistentOffscreenHostContainer && supportsPersistence) {
+    // In persistent mode, the offscreen children are wrapped in a host node.
+    // TODO: Optimize this to use the OffscreenComponent fiber instead of
+    // an extra HostComponent fiber. Need to make sure this doesn't break Fabric
+    // or some other infra that expects a HostComponent.
+    var isHidden =
+      nextProps.mode === "hidden" &&
+      workInProgress.tag !== LegacyHiddenComponent;
+    var offscreenContainer = reconcileOffscreenHostContainer(
+      current,
+      workInProgress,
+      isHidden,
+      nextChildren,
+      renderLanes
+    );
+    return offscreenContainer;
+  } else {
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+    return workInProgress.child;
+  }
+}
 
-        workInProgress.memoizedState = null;
-        return _primaryChildFragment4;
-      }
+function reconcileOffscreenHostContainer(
+  currentOffscreen,
+  offscreen,
+  isHidden,
+  children,
+  renderLanes
+) {
+  var containerProps = getOffscreenContainerProps(
+    isHidden ? "hidden" : "visible",
+    children
+  );
+  var hostContainer;
+
+  if (currentOffscreen === null) {
+    hostContainer = createOffscreenHostContainerFiber(
+      containerProps,
+      offscreen.mode,
+      renderLanes,
+      null
+    );
+  } else {
+    var currentHostContainer = currentOffscreen.child;
+
+    if (currentHostContainer === null) {
+      hostContainer = createOffscreenHostContainerFiber(
+        containerProps,
+        offscreen.mode,
+        renderLanes,
+        null
+      );
+      hostContainer.flags |= Placement;
     } else {
-      // The current tree is not already showing a fallback.
-      if (showFallback) {
-        // Timed out.
-        var _nextFallbackChildren3 = nextProps.fallback;
-        var _nextPrimaryChildren4 = nextProps.children;
+      hostContainer = createWorkInProgress(
+        currentHostContainer,
+        containerProps
+      );
+    }
+  }
 
-        var _fallbackChildFragment2 = updateSuspenseFallbackChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren4,
-          _nextFallbackChildren3,
-          renderLanes
-        );
+  hostContainer.return = offscreen;
+  offscreen.child = hostContainer;
+  return hostContainer;
+} // Note: These happen to have identical begin phases, for now. We shouldn't hold
+// ourselves to this constraint, though. If the behavior diverges, we should
+// fork the function.
 
-        var _primaryChildFragment5 = workInProgress.child;
-        var _prevOffscreenState = current.child.memoizedState;
-        _primaryChildFragment5.memoizedState =
-          _prevOffscreenState === null
-            ? mountSuspenseOffscreenState(renderLanes)
-            : updateSuspenseOffscreenState(_prevOffscreenState, renderLanes);
-        _primaryChildFragment5.childLanes = getRemainingWorkInPrimaryTree(
-          current,
-          renderLanes
-        ); // Skip the primary children, and continue working on the
-        // fallback children.
+var updateLegacyHiddenComponent = updateOffscreenComponent;
 
-        workInProgress.memoizedState = SUSPENDED_MARKER;
-        return _fallbackChildFragment2;
-      } else {
-        // Still haven't timed out. Continue rendering the children, like we
-        // normally do.
-        var _nextPrimaryChildren5 = nextProps.children;
+function updateFragment(current, workInProgress, renderLanes) {
+  var nextChildren = workInProgress.pendingProps;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
+}
 
-        var _primaryChildFragment6 = updateSuspensePrimaryChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren5,
-          renderLanes
-        );
+function updateMode(current, workInProgress, renderLanes) {
+  var nextChildren = workInProgress.pendingProps.children;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
+}
 
-        workInProgress.memoizedState = null;
-        return _primaryChildFragment6;
-      }
+function updateProfiler(current, workInProgress, renderLanes) {
+  {
+    workInProgress.flags |= Update;
+
+    {
+      // Reset effect durations for the next eventual effect phase.
+      // These are reset during render to allow the DevTools commit hook a chance to read them,
+      var stateNode = workInProgress.stateNode;
+      stateNode.effectDuration = 0;
+      stateNode.passiveEffectDuration = 0;
     }
   }
+
+  var nextProps = workInProgress.pendingProps;
+  var nextChildren = nextProps.children;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
 }
 
-function mountSuspensePrimaryChildren(
-  workInProgress,
-  primaryChildren,
-  renderLanes
-) {
-  var mode = workInProgress.mode;
-  var primaryChildProps = {
-    mode: "visible",
-    children: primaryChildren
-  };
-  var primaryChildFragment = createFiberFromOffscreen(
-    primaryChildProps,
-    mode,
-    renderLanes,
-    null
-  );
-  primaryChildFragment.return = workInProgress;
-  workInProgress.child = primaryChildFragment;
-  return primaryChildFragment;
+function markRef$1(current, workInProgress) {
+  var ref = workInProgress.ref;
+
+  if (
+    (current === null && ref !== null) ||
+    (current !== null && current.ref !== ref)
+  ) {
+    // Schedule a Ref effect
+    workInProgress.flags |= Ref;
+  }
 }
 
-function mountSuspenseFallbackChildren(
+function updateFunctionComponent(
+  current,
   workInProgress,
-  primaryChildren,
-  fallbackChildren,
+  Component,
+  nextProps,
   renderLanes
 ) {
-  var mode = workInProgress.mode;
-  var progressedPrimaryFragment = workInProgress.child;
-  var primaryChildProps = {
-    mode: "hidden",
-    children: primaryChildren
-  };
-  var primaryChildFragment;
-  var fallbackChildFragment;
-
-  if ((mode & BlockingMode) === NoMode && progressedPrimaryFragment !== null) {
-    // In legacy mode, we commit the primary tree as if it successfully
-    // completed, even though it's in an inconsistent state.
-    primaryChildFragment = progressedPrimaryFragment;
-    primaryChildFragment.childLanes = NoLanes;
-    primaryChildFragment.pendingProps = primaryChildProps;
+  {
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var innerPropTypes = Component.propTypes;
 
-    if (workInProgress.mode & ProfileMode) {
-      // Reset the durations from the first pass so they aren't included in the
-      // final amounts. This seems counterintuitive, since we're intentionally
-      // not measuring part of the render phase, but this makes it match what we
-      // do in Concurrent Mode.
-      primaryChildFragment.actualDuration = 0;
-      primaryChildFragment.actualStartTime = -1;
-      primaryChildFragment.selfBaseDuration = 0;
-      primaryChildFragment.treeBaseDuration = 0;
+      if (innerPropTypes) {
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(Component)
+        );
+      }
     }
+  }
 
-    fallbackChildFragment = createFiberFromFragment(
-      fallbackChildren,
-      mode,
-      renderLanes,
-      null
-    );
-  } else {
-    primaryChildFragment = createFiberFromOffscreen(
-      primaryChildProps,
-      mode,
-      NoLanes,
-      null
-    );
-    fallbackChildFragment = createFiberFromFragment(
-      fallbackChildren,
-      mode,
-      renderLanes,
-      null
+  var context;
+
+  {
+    var unmaskedContext = getUnmaskedContext(workInProgress, Component, true);
+    context = getMaskedContext(workInProgress, unmaskedContext);
+  }
+
+  var nextChildren;
+  prepareToReadContext(workInProgress, renderLanes);
+
+  {
+    ReactCurrentOwner$1.current = workInProgress;
+    setIsRendering(true);
+    nextChildren = renderWithHooks(
+      current,
+      workInProgress,
+      Component,
+      nextProps,
+      context,
+      renderLanes
     );
-  }
-
-  primaryChildFragment.return = workInProgress;
-  fallbackChildFragment.return = workInProgress;
-  primaryChildFragment.sibling = fallbackChildFragment;
-  workInProgress.child = primaryChildFragment;
-  return fallbackChildFragment;
-}
 
-function createWorkInProgressOffscreenFiber(current, offscreenProps) {
-  // The props argument to `createWorkInProgress` is `any` typed, so we use this
-  // wrapper function to constrain it.
-  return createWorkInProgress(current, offscreenProps);
-}
+    if (workInProgress.mode & StrictLegacyMode) {
+      disableLogs();
 
-function updateSuspensePrimaryChildren(
-  current,
-  workInProgress,
-  primaryChildren,
-  renderLanes
-) {
-  var currentPrimaryChildFragment = current.child;
-  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
-  var primaryChildFragment = createWorkInProgressOffscreenFiber(
-    currentPrimaryChildFragment,
-    {
-      mode: "visible",
-      children: primaryChildren
+      try {
+        nextChildren = renderWithHooks(
+          current,
+          workInProgress,
+          Component,
+          nextProps,
+          context,
+          renderLanes
+        );
+      } finally {
+        reenableLogs();
+      }
     }
-  );
 
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
-    primaryChildFragment.lanes = renderLanes;
+    setIsRendering(false);
   }
 
-  primaryChildFragment.return = workInProgress;
-  primaryChildFragment.sibling = null;
-
-  if (currentFallbackChildFragment !== null) {
-    // Delete the fallback child fragment
-    currentFallbackChildFragment.nextEffect = null;
-    currentFallbackChildFragment.flags = Deletion;
-    workInProgress.firstEffect = workInProgress.lastEffect = currentFallbackChildFragment;
-  }
+  if (current !== null && !didReceiveUpdate) {
+    bailoutHooks(current, workInProgress, renderLanes);
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  } // React DevTools reads this flag.
 
-  workInProgress.child = primaryChildFragment;
-  return primaryChildFragment;
+  workInProgress.flags |= PerformedWork;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
 }
 
-function updateSuspenseFallbackChildren(
+function updateClassComponent(
   current,
   workInProgress,
-  primaryChildren,
-  fallbackChildren,
+  Component,
+  nextProps,
   renderLanes
 ) {
-  var mode = workInProgress.mode;
-  var currentPrimaryChildFragment = current.child;
-  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = {
-    mode: "hidden",
-    children: primaryChildren
-  };
-  var primaryChildFragment;
+  {
+    // This is used by DevTools to force a boundary to error.
+    switch (shouldError(workInProgress)) {
+      case false: {
+        var _instance = workInProgress.stateNode;
+        var ctor = workInProgress.type; // TODO This way of resetting the error boundary state is a hack.
+        // Is there a better way to do this?
+
+        var tempInstance = new ctor(
+          workInProgress.memoizedProps,
+          _instance.context
+        );
+        var state = tempInstance.state;
 
-  if (
-    // In legacy mode, we commit the primary tree as if it successfully
-    // completed, even though it's in an inconsistent state.
-    (mode & BlockingMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
-    // already cloned. In legacy mode, the only case where this isn't true is
-    // when DevTools forces us to display a fallback; we skip the first render
-    // pass entirely and go straight to rendering the fallback. (In Concurrent
-    // Mode, SuspenseList can also trigger this scenario, but this is a legacy-
-    // only codepath.)
-    workInProgress.child !== currentPrimaryChildFragment
-  ) {
-    var progressedPrimaryFragment = workInProgress.child;
-    primaryChildFragment = progressedPrimaryFragment;
-    primaryChildFragment.childLanes = NoLanes;
-    primaryChildFragment.pendingProps = primaryChildProps;
+        _instance.updater.enqueueSetState(_instance, state, null);
 
-    if (workInProgress.mode & ProfileMode) {
-      // Reset the durations from the first pass so they aren't included in the
-      // final amounts. This seems counterintuitive, since we're intentionally
-      // not measuring part of the render phase, but this makes it match what we
-      // do in Concurrent Mode.
-      primaryChildFragment.actualDuration = 0;
-      primaryChildFragment.actualStartTime = -1;
-      primaryChildFragment.selfBaseDuration =
-        currentPrimaryChildFragment.selfBaseDuration;
-      primaryChildFragment.treeBaseDuration =
-        currentPrimaryChildFragment.treeBaseDuration;
-    } // The fallback fiber was added as a deletion effect during the first pass.
-    // However, since we're going to remain on the fallback, we no longer want
-    // to delete it. So we need to remove it from the list. Deletions are stored
-    // on the same list as effects. We want to keep the effects from the primary
-    // tree. So we copy the primary child fragment's effect list, which does not
-    // include the fallback deletion effect.
+        break;
+      }
 
-    var progressedLastEffect = primaryChildFragment.lastEffect;
+      case true: {
+        workInProgress.flags |= DidCapture;
+        workInProgress.flags |= ShouldCapture;
+        var error$1 = new Error("Simulated error coming from DevTools");
+        var lane = pickArbitraryLane(renderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane); // Schedule the error boundary to re-render using updated state
 
-    if (progressedLastEffect !== null) {
-      workInProgress.firstEffect = primaryChildFragment.firstEffect;
-      workInProgress.lastEffect = progressedLastEffect;
-      progressedLastEffect.nextEffect = null;
-    } else {
-      // TODO: Reset this somewhere else? Lol legacy mode is so weird.
-      workInProgress.firstEffect = workInProgress.lastEffect = null;
+        var update = createClassErrorUpdate(
+          workInProgress,
+          createCapturedValue(error$1, workInProgress),
+          lane
+        );
+        enqueueCapturedUpdate(workInProgress, update);
+        break;
+      }
     }
-  } else {
-    primaryChildFragment = createWorkInProgressOffscreenFiber(
-      currentPrimaryChildFragment,
-      primaryChildProps
-    );
-  }
 
-  var fallbackChildFragment;
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var innerPropTypes = Component.propTypes;
 
-  if (currentFallbackChildFragment !== null) {
-    fallbackChildFragment = createWorkInProgress(
-      currentFallbackChildFragment,
-      fallbackChildren
-    );
-  } else {
-    fallbackChildFragment = createFiberFromFragment(
-      fallbackChildren,
-      mode,
-      renderLanes,
-      null
-    ); // Needs a placement effect because the parent (the Suspense boundary) already
-    // mounted but this is a new fiber.
+      if (innerPropTypes) {
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(Component)
+        );
+      }
+    }
+  } // Push context providers early to prevent context stack mismatches.
+  // During mounting we don't know the child context yet as the instance doesn't exist.
+  // We will invalidate the child context in finishClassComponent() right after rendering.
 
-    fallbackChildFragment.flags |= Placement;
+  var hasContext;
+
+  if (isContextProvider(Component)) {
+    hasContext = true;
+    pushContextProvider(workInProgress);
+  } else {
+    hasContext = false;
   }
 
-  fallbackChildFragment.return = workInProgress;
-  primaryChildFragment.return = workInProgress;
-  primaryChildFragment.sibling = fallbackChildFragment;
-  workInProgress.child = primaryChildFragment;
-  return fallbackChildFragment;
-}
+  prepareToReadContext(workInProgress, renderLanes);
+  var instance = workInProgress.stateNode;
+  var shouldUpdate;
 
-function scheduleWorkOnFiber(fiber, renderLanes) {
-  fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
-  var alternate = fiber.alternate;
+  if (instance === null) {
+    if (current !== null) {
+      // A class component without an instance only mounts if it suspended
+      // inside a non-concurrent tree, in an inconsistent state. We want to
+      // treat it like a new mount, even though an empty version of it already
+      // committed. Disconnect the alternate pointers.
+      current.alternate = null;
+      workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
 
-  if (alternate !== null) {
-    alternate.lanes = mergeLanes(alternate.lanes, renderLanes);
-  }
+      workInProgress.flags |= Placement;
+    } // In the initial pass we might need to construct the instance.
 
-  scheduleWorkOnParentPath(fiber.return, renderLanes);
-}
+    constructClassInstance(workInProgress, Component, nextProps);
+    mountClassInstance(workInProgress, Component, nextProps, renderLanes);
+    shouldUpdate = true;
+  } else if (current === null) {
+    // In a resume, we'll already have an instance we can reuse.
+    shouldUpdate = resumeMountClassInstance(
+      workInProgress,
+      Component,
+      nextProps,
+      renderLanes
+    );
+  } else {
+    shouldUpdate = updateClassInstance(
+      current,
+      workInProgress,
+      Component,
+      nextProps,
+      renderLanes
+    );
+  }
 
-function propagateSuspenseContextChange(
-  workInProgress,
-  firstChild,
-  renderLanes
-) {
-  // Mark any Suspense boundaries with fallbacks as having work to do.
-  // If they were previously forced into fallbacks, they may now be able
-  // to unblock.
-  var node = firstChild;
+  var nextUnitOfWork = finishClassComponent(
+    current,
+    workInProgress,
+    Component,
+    shouldUpdate,
+    hasContext,
+    renderLanes
+  );
 
-  while (node !== null) {
-    if (node.tag === SuspenseComponent) {
-      var state = node.memoizedState;
+  {
+    var inst = workInProgress.stateNode;
 
-      if (state !== null) {
-        scheduleWorkOnFiber(node, renderLanes);
+    if (shouldUpdate && inst.props !== nextProps) {
+      if (!didWarnAboutReassigningProps) {
+        error(
+          "It looks like %s is reassigning its own `this.props` while rendering. " +
+            "This is not supported and can lead to confusing bugs.",
+          getComponentNameFromFiber(workInProgress) || "a component"
+        );
       }
-    } else if (node.tag === SuspenseListComponent) {
-      // If the tail is hidden there might not be an Suspense boundaries
-      // to schedule work on. In this case we have to schedule it on the
-      // list itself.
-      // We don't have to traverse to the children of the list since
-      // the list will propagate the change when it rerenders.
-      scheduleWorkOnFiber(node, renderLanes);
-    } else if (node.child !== null) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
 
-    if (node === workInProgress) {
-      return;
+      didWarnAboutReassigningProps = true;
     }
+  }
 
-    while (node.sibling === null) {
-      if (node.return === null || node.return === workInProgress) {
-        return;
-      }
+  return nextUnitOfWork;
+}
+
+function finishClassComponent(
+  current,
+  workInProgress,
+  Component,
+  shouldUpdate,
+  hasContext,
+  renderLanes
+) {
+  // Refs should update even if shouldComponentUpdate returns false
+  markRef$1(current, workInProgress);
+  var didCaptureError = (workInProgress.flags & DidCapture) !== NoFlags;
 
-      node = node.return;
+  if (!shouldUpdate && !didCaptureError) {
+    // Context providers should defer to sCU for rendering
+    if (hasContext) {
+      invalidateContextProvider(workInProgress, Component, false);
     }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
   }
-}
 
-function findLastContentRow(firstChild) {
-  // This is going to find the last row among these children that is already
-  // showing content on the screen, as opposed to being in fallback state or
-  // new. If a row has multiple Suspense boundaries, any of them being in the
-  // fallback state, counts as the whole row being in a fallback state.
-  // Note that the "rows" will be workInProgress, but any nested children
-  // will still be current since we haven't rendered them yet. The mounted
-  // order may not be the same as the new order. We use the new order.
-  var row = firstChild;
-  var lastContentRow = null;
+  var instance = workInProgress.stateNode; // Rerender
 
-  while (row !== null) {
-    var currentRow = row.alternate; // New rows can't be content rows.
+  ReactCurrentOwner$1.current = workInProgress;
+  var nextChildren;
 
-    if (currentRow !== null && findFirstSuspended(currentRow) === null) {
-      lastContentRow = row;
+  if (
+    didCaptureError &&
+    typeof Component.getDerivedStateFromError !== "function"
+  ) {
+    // If we captured an error, but getDerivedStateFromError is not defined,
+    // unmount all the children. componentDidCatch will schedule an update to
+    // re-render a fallback. This is temporary until we migrate everyone to
+    // the new API.
+    // TODO: Warn in a future release.
+    nextChildren = null;
+
+    {
+      stopProfilerTimerIfRunning();
     }
+  } else {
+    {
+      setIsRendering(true);
+      nextChildren = instance.render();
 
-    row = row.sibling;
-  }
+      if (workInProgress.mode & StrictLegacyMode) {
+        disableLogs();
 
-  return lastContentRow;
-}
+        try {
+          instance.render();
+        } finally {
+          reenableLogs();
+        }
+      }
 
-function validateRevealOrder(revealOrder) {
-  {
-    if (
-      revealOrder !== undefined &&
-      revealOrder !== "forwards" &&
-      revealOrder !== "backwards" &&
-      revealOrder !== "together" &&
-      !didWarnAboutRevealOrder[revealOrder]
-    ) {
-      didWarnAboutRevealOrder[revealOrder] = true;
+      setIsRendering(false);
+    }
+  } // React DevTools reads this flag.
 
-      if (typeof revealOrder === "string") {
-        switch (revealOrder.toLowerCase()) {
-          case "together":
-          case "forwards":
-          case "backwards": {
-            error(
-              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
-                'Use lowercase "%s" instead.',
-              revealOrder,
-              revealOrder.toLowerCase()
-            );
+  workInProgress.flags |= PerformedWork;
 
-            break;
-          }
+  if (current !== null && didCaptureError) {
+    // If we're recovering from an error, reconcile without reusing any of
+    // the existing children. Conceptually, the normal children and the children
+    // that are shown on error are two different sets, so we shouldn't reuse
+    // normal children even if their identities match.
+    forceUnmountCurrentAndReconcile(
+      current,
+      workInProgress,
+      nextChildren,
+      renderLanes
+    );
+  } else {
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  } // Memoize state using the values we just used to render.
+  // TODO: Restructure so we never read values from the instance.
 
-          case "forward":
-          case "backward": {
-            error(
-              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
-                'React uses the -s suffix in the spelling. Use "%ss" instead.',
-              revealOrder,
-              revealOrder.toLowerCase()
-            );
+  workInProgress.memoizedState = instance.state; // The context might have changed so we need to recalculate it.
 
-            break;
-          }
+  if (hasContext) {
+    invalidateContextProvider(workInProgress, Component, true);
+  }
 
-          default:
-            error(
-              '"%s" is not a supported revealOrder on <SuspenseList />. ' +
-                'Did you mean "together", "forwards" or "backwards"?',
-              revealOrder
-            );
+  return workInProgress.child;
+}
 
-            break;
-        }
-      } else {
-        error(
-          "%s is not a supported value for revealOrder on <SuspenseList />. " +
-            'Did you mean "together", "forwards" or "backwards"?',
-          revealOrder
-        );
-      }
-    }
+function pushHostRootContext(workInProgress) {
+  var root = workInProgress.stateNode;
+
+  if (root.pendingContext) {
+    pushTopLevelContextObject(
+      workInProgress,
+      root.pendingContext,
+      root.pendingContext !== root.context
+    );
+  } else if (root.context) {
+    // Should always be set
+    pushTopLevelContextObject(workInProgress, root.context, false);
   }
-}
 
-function validateTailOptions(tailMode, revealOrder) {
-  {
-    if (tailMode !== undefined && !didWarnAboutTailOptions[tailMode]) {
-      if (tailMode !== "collapsed" && tailMode !== "hidden") {
-        didWarnAboutTailOptions[tailMode] = true;
+  pushHostContainer(workInProgress, root.containerInfo);
+}
 
-        error(
-          '"%s" is not a supported value for tail on <SuspenseList />. ' +
-            'Did you mean "collapsed" or "hidden"?',
-          tailMode
-        );
-      } else if (revealOrder !== "forwards" && revealOrder !== "backwards") {
-        didWarnAboutTailOptions[tailMode] = true;
+function updateHostRoot(current, workInProgress, renderLanes) {
+  pushHostRootContext(workInProgress);
+  var updateQueue = workInProgress.updateQueue;
 
-        error(
-          '<SuspenseList tail="%s" /> is only valid if revealOrder is ' +
-            '"forwards" or "backwards". ' +
-            'Did you mean to specify revealOrder="forwards"?',
-          tailMode
-        );
-      }
-    }
+  if (!(current !== null && updateQueue !== null)) {
+    throw Error(
+      "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
+    );
   }
-}
 
-function validateSuspenseListNestedChild(childSlot, index) {
-  {
-    var isArray = Array.isArray(childSlot);
-    var isIterable = !isArray && typeof getIteratorFn(childSlot) === "function";
+  var nextProps = workInProgress.pendingProps;
+  var prevState = workInProgress.memoizedState;
+  var prevChildren = prevState.element;
+  cloneUpdateQueue(current, workInProgress);
+  processUpdateQueue(workInProgress, nextProps, null, renderLanes);
+  var nextState = workInProgress.memoizedState;
+  var root = workInProgress.stateNode;
+  // being called "element".
 
-    if (isArray || isIterable) {
-      var type = isArray ? "array" : "iterable";
+  var nextChildren = nextState.element;
 
-      error(
-        "A nested %s was passed to row #%s in <SuspenseList />. Wrap it in " +
-          "an additional SuspenseList to configure its revealOrder: " +
-          "<SuspenseList revealOrder=...> ... " +
-          "<SuspenseList revealOrder=...>{%s}</SuspenseList> ... " +
-          "</SuspenseList>",
-        type,
-        index,
-        type
-      );
+  if (nextChildren === prevChildren) {
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  }
 
-      return false;
+  if (root.hydrate && enterHydrationState()) {
+    var child = mountChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderLanes
+    );
+    workInProgress.child = child;
+    var node = child;
+
+    while (node) {
+      // Mark each child as hydrating. This is a fast path to know whether this
+      // tree is part of a hydrating tree. This is used to determine if a child
+      // node has fully mounted yet, and for scheduling event replaying.
+      // Conceptually this is similar to Placement in that a new subtree is
+      // inserted into the React tree here. It just happens to not need DOM
+      // mutations because it already exists.
+      node.flags = (node.flags & ~Placement) | Hydrating;
+      node = node.sibling;
     }
+  } else {
+    // Otherwise reset hydration state in case we aborted and resumed another
+    // root.
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   }
 
-  return true;
+  return workInProgress.child;
 }
 
-function validateSuspenseListChildren(children, revealOrder) {
-  {
-    if (
-      (revealOrder === "forwards" || revealOrder === "backwards") &&
-      children !== undefined &&
-      children !== null &&
-      children !== false
-    ) {
-      if (Array.isArray(children)) {
-        for (var i = 0; i < children.length; i++) {
-          if (!validateSuspenseListNestedChild(children[i], i)) {
-            return;
-          }
-        }
-      } else {
-        var iteratorFn = getIteratorFn(children);
+function updateHostComponent$1(current, workInProgress, renderLanes) {
+  pushHostContext(workInProgress);
 
-        if (typeof iteratorFn === "function") {
-          var childrenIterator = iteratorFn.call(children);
+  var type = workInProgress.type;
+  var nextProps = workInProgress.pendingProps;
+  var prevProps = current !== null ? current.memoizedProps : null;
+  var nextChildren = nextProps.children;
 
-          if (childrenIterator) {
-            var step = childrenIterator.next();
-            var _i = 0;
+  if (prevProps !== null && shouldSetTextContent()) {
+    // If we're switching from a direct text child to a normal child, or to
+    // empty, we need to schedule the text content to be reset.
+    workInProgress.flags |= ContentReset;
+  }
+
+  markRef$1(current, workInProgress);
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
+}
 
-            for (; !step.done; step = childrenIterator.next()) {
-              if (!validateSuspenseListNestedChild(step.value, _i)) {
-                return;
-              }
+function updateHostText$1(current, workInProgress) {
+  // immediately after.
 
-              _i++;
-            }
-          }
-        } else {
-          error(
-            'A single row was passed to a <SuspenseList revealOrder="%s" />. ' +
-              "This is not useful since it needs multiple rows. " +
-              "Did you mean to pass multiple children or an array?",
-            revealOrder
-          );
-        }
-      }
-    }
-  }
+  return null;
 }
 
-function initSuspenseListRenderState(
+function mountLazyComponent(
+  _current,
   workInProgress,
-  isBackwards,
-  tail,
-  lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  elementType,
+  renderLanes
 ) {
-  var renderState = workInProgress.memoizedState;
+  if (_current !== null) {
+    // A lazy component only mounts if it suspended inside a non-
+    // concurrent tree, in an inconsistent state. We want to treat it like
+    // a new mount, even though an empty version of it already committed.
+    // Disconnect the alternate pointers.
+    _current.alternate = null;
+    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
 
-  if (renderState === null) {
-    workInProgress.memoizedState = {
-      isBackwards: isBackwards,
-      rendering: null,
-      renderingStartTime: 0,
-      last: lastContentRow,
-      tail: tail,
-      tailMode: tailMode,
-      lastEffect: lastEffectBeforeRendering
-    };
-  } else {
-    // We can reuse the existing object from previous renders.
-    renderState.isBackwards = isBackwards;
-    renderState.rendering = null;
-    renderState.renderingStartTime = 0;
-    renderState.last = lastContentRow;
-    renderState.tail = tail;
-    renderState.tailMode = tailMode;
-    renderState.lastEffect = lastEffectBeforeRendering;
+    workInProgress.flags |= Placement;
   }
-} // This can end up rendering this component multiple passes.
-// The first pass splits the children fibers into two sets. A head and tail.
-// We first render the head. If anything is in fallback state, we do another
-// pass through beginWork to rerender all children (including the tail) with
-// the force suspend context. If the first render didn't have anything in
-// in fallback state. Then we render each row in the tail one-by-one.
-// That happens in the completeWork phase without going back to beginWork.
 
-function updateSuspenseListComponent(current, workInProgress, renderLanes) {
-  var nextProps = workInProgress.pendingProps;
-  var revealOrder = nextProps.revealOrder;
-  var tailMode = nextProps.tail;
-  var newChildren = nextProps.children;
-  validateRevealOrder(revealOrder);
-  validateTailOptions(tailMode, revealOrder);
-  validateSuspenseListChildren(newChildren, revealOrder);
-  reconcileChildren(current, workInProgress, newChildren, renderLanes);
-  var suspenseContext = suspenseStackCursor.current;
-  var shouldForceFallback = hasSuspenseContext(
-    suspenseContext,
-    ForceSuspenseFallback
-  );
+  var props = workInProgress.pendingProps;
+  var lazyComponent = elementType;
+  var payload = lazyComponent._payload;
+  var init = lazyComponent._init;
+  var Component = init(payload); // Store the unwrapped component in the type.
 
-  if (shouldForceFallback) {
-    suspenseContext = setShallowSuspenseContext(
-      suspenseContext,
-      ForceSuspenseFallback
-    );
-    workInProgress.flags |= DidCapture;
-  } else {
-    var didSuspendBefore =
-      current !== null && (current.flags & DidCapture) !== NoFlags;
+  workInProgress.type = Component;
+  var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(Component));
+  var resolvedProps = resolveDefaultProps(Component, props);
+  var child;
 
-    if (didSuspendBefore) {
-      // If we previously forced a fallback, we need to schedule work
-      // on any nested boundaries to let them know to try to render
-      // again. This is the same as context updating.
-      propagateSuspenseContextChange(
+  switch (resolvedTag) {
+    case FunctionComponent: {
+      {
+        validateFunctionComponentInDev(workInProgress, Component);
+        workInProgress.type = Component = resolveFunctionForHotReloading(
+          Component
+        );
+      }
+
+      child = updateFunctionComponent(
+        null,
         workInProgress,
-        workInProgress.child,
+        Component,
+        resolvedProps,
         renderLanes
       );
+      return child;
     }
 
-    suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
-  }
-
-  pushSuspenseContext(workInProgress, suspenseContext);
-
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
-    // In legacy mode, SuspenseList doesn't work so we just
-    // use make it a noop by treating it as the default revealOrder.
-    workInProgress.memoizedState = null;
-  } else {
-    switch (revealOrder) {
-      case "forwards": {
-        var lastContentRow = findLastContentRow(workInProgress.child);
-        var tail;
+    case ClassComponent: {
+      {
+        workInProgress.type = Component = resolveClassForHotReloading(
+          Component
+        );
+      }
 
-        if (lastContentRow === null) {
-          // The whole list is part of the tail.
-          // TODO: We could fast path by just rendering the tail now.
-          tail = workInProgress.child;
-          workInProgress.child = null;
-        } else {
-          // Disconnect the tail rows after the content row.
-          // We're going to render them separately later.
-          tail = lastContentRow.sibling;
-          lastContentRow.sibling = null;
-        }
+      child = updateClassComponent(
+        null,
+        workInProgress,
+        Component,
+        resolvedProps,
+        renderLanes
+      );
+      return child;
+    }
 
-        initSuspenseListRenderState(
-          workInProgress,
-          false, // isBackwards
-          tail,
-          lastContentRow,
-          tailMode,
-          workInProgress.lastEffect
+    case ForwardRef: {
+      {
+        workInProgress.type = Component = resolveForwardRefForHotReloading(
+          Component
         );
-        break;
       }
 
-      case "backwards": {
-        // We're going to find the first row that has existing content.
-        // At the same time we're going to reverse the list of everything
-        // we pass in the meantime. That's going to be our tail in reverse
-        // order.
-        var _tail = null;
-        var row = workInProgress.child;
-        workInProgress.child = null;
+      child = updateForwardRef(
+        null,
+        workInProgress,
+        Component,
+        resolvedProps,
+        renderLanes
+      );
+      return child;
+    }
 
-        while (row !== null) {
-          var currentRow = row.alternate; // New rows can't be content rows.
+    case MemoComponent: {
+      {
+        if (workInProgress.type !== workInProgress.elementType) {
+          var outerPropTypes = Component.propTypes;
 
-          if (currentRow !== null && findFirstSuspended(currentRow) === null) {
-            // This is the beginning of the main content.
-            workInProgress.child = row;
-            break;
+          if (outerPropTypes) {
+            checkPropTypes(
+              outerPropTypes,
+              resolvedProps, // Resolved for outer only
+              "prop",
+              getComponentNameFromType(Component)
+            );
           }
+        }
+      }
 
-          var nextRow = row.sibling;
-          row.sibling = _tail;
-          _tail = row;
-          row = nextRow;
-        } // TODO: If workInProgress.child is null, we can continue on the tail immediately.
+      child = updateMemoComponent(
+        null,
+        workInProgress,
+        Component,
+        resolveDefaultProps(Component.type, resolvedProps), // The inner type can have defaults too
+        renderLanes
+      );
+      return child;
+    }
+  }
 
-        initSuspenseListRenderState(
-          workInProgress,
-          true, // isBackwards
-          _tail,
-          null, // last
-          tailMode,
-          workInProgress.lastEffect
-        );
-        break;
-      }
+  var hint = "";
+
+  {
+    if (
+      Component !== null &&
+      typeof Component === "object" &&
+      Component.$$typeof === REACT_LAZY_TYPE
+    ) {
+      hint = " Did you wrap a component in React.lazy() more than once?";
+    }
+  } // This message intentionally doesn't mention ForwardRef or MemoComponent
+  // because the fact that it's a separate type of work is an
+  // implementation detail.
+
+  {
+    throw Error(
+      "Element type is invalid. Received a promise that resolves to: " +
+        Component +
+        ". Lazy element type must resolve to a class or function." +
+        hint
+    );
+  }
+}
+
+function mountIncompleteClassComponent(
+  _current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  if (_current !== null) {
+    // An incomplete component only mounts if it suspended inside a non-
+    // concurrent tree, in an inconsistent state. We want to treat it like
+    // a new mount, even though an empty version of it already committed.
+    // Disconnect the alternate pointers.
+    _current.alternate = null;
+    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
 
-      case "together": {
-        initSuspenseListRenderState(
-          workInProgress,
-          false, // isBackwards
-          null, // tail
-          null, // last
-          undefined,
-          workInProgress.lastEffect
-        );
-        break;
-      }
+    workInProgress.flags |= Placement;
+  } // Promote the fiber to a class and try rendering again.
 
-      default: {
-        // The default reveal order is the same as not having
-        // a boundary.
-        workInProgress.memoizedState = null;
-      }
-    }
+  workInProgress.tag = ClassComponent; // The rest of this function is a fork of `updateClassComponent`
+  // Push context providers early to prevent context stack mismatches.
+  // During mounting we don't know the child context yet as the instance doesn't exist.
+  // We will invalidate the child context in finishClassComponent() right after rendering.
+
+  var hasContext;
+
+  if (isContextProvider(Component)) {
+    hasContext = true;
+    pushContextProvider(workInProgress);
+  } else {
+    hasContext = false;
   }
 
-  return workInProgress.child;
+  prepareToReadContext(workInProgress, renderLanes);
+  constructClassInstance(workInProgress, Component, nextProps);
+  mountClassInstance(workInProgress, Component, nextProps, renderLanes);
+  return finishClassComponent(
+    null,
+    workInProgress,
+    Component,
+    true,
+    hasContext,
+    renderLanes
+  );
 }
 
-function updatePortalComponent(current, workInProgress, renderLanes) {
-  pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-  var nextChildren = workInProgress.pendingProps;
+function mountIndeterminateComponent(
+  _current,
+  workInProgress,
+  Component,
+  renderLanes
+) {
+  if (_current !== null) {
+    // An indeterminate component only mounts if it suspended inside a non-
+    // concurrent tree, in an inconsistent state. We want to treat it like
+    // a new mount, even though an empty version of it already committed.
+    // Disconnect the alternate pointers.
+    _current.alternate = null;
+    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
 
-  if (current === null) {
-    // Portals are special because we don't append the children during mount
-    // but at commit. Therefore we need to track insertions which the normal
-    // flow doesn't do during mount. This doesn't happen at the root because
-    // the root always starts with a "current" with a null child.
-    // TODO: Consider unifying this with how the root works.
-    workInProgress.child = reconcileChildFibers(
-      workInProgress,
-      null,
-      nextChildren,
-      renderLanes
-    );
-  } else {
-    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+    workInProgress.flags |= Placement;
   }
 
-  return workInProgress.child;
-}
+  var props = workInProgress.pendingProps;
+  var context;
 
-var hasWarnedAboutUsingNoValuePropOnContextProvider = false;
+  {
+    var unmaskedContext = getUnmaskedContext(workInProgress, Component, false);
+    context = getMaskedContext(workInProgress, unmaskedContext);
+  }
 
-function updateContextProvider(current, workInProgress, renderLanes) {
-  var providerType = workInProgress.type;
-  var context = providerType._context;
-  var newProps = workInProgress.pendingProps;
-  var oldProps = workInProgress.memoizedProps;
-  var newValue = newProps.value;
+  prepareToReadContext(workInProgress, renderLanes);
+  var value;
 
   {
-    if (!("value" in newProps)) {
-      if (!hasWarnedAboutUsingNoValuePropOnContextProvider) {
-        hasWarnedAboutUsingNoValuePropOnContextProvider = true;
+    if (
+      Component.prototype &&
+      typeof Component.prototype.render === "function"
+    ) {
+      var componentName = getComponentNameFromType(Component) || "Unknown";
 
+      if (!didWarnAboutBadClass[componentName]) {
         error(
-          "The `value` prop is required for the `<Context.Provider>`. Did you misspell it or forget to pass it?"
+          "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
+            "This is likely to cause errors. Change %s to extend React.Component instead.",
+          componentName,
+          componentName
         );
+
+        didWarnAboutBadClass[componentName] = true;
       }
     }
 
-    var providerPropTypes = workInProgress.type.propTypes;
-
-    if (providerPropTypes) {
-      checkPropTypes(providerPropTypes, newProps, "prop", "Context.Provider");
+    if (workInProgress.mode & StrictLegacyMode) {
+      ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
     }
+
+    setIsRendering(true);
+    ReactCurrentOwner$1.current = workInProgress;
+    value = renderWithHooks(
+      null,
+      workInProgress,
+      Component,
+      props,
+      context,
+      renderLanes
+    );
+    setIsRendering(false);
   }
 
-  pushProvider(workInProgress, newValue);
+  workInProgress.flags |= PerformedWork;
 
-  if (oldProps !== null) {
-    var oldValue = oldProps.value;
-    var changedBits = calculateChangedBits(context, newValue, oldValue);
+  {
+    // Support for module components is deprecated and is removed behind a flag.
+    // Whether or not it would crash later, we want to show a good message in DEV first.
+    if (
+      typeof value === "object" &&
+      value !== null &&
+      typeof value.render === "function" &&
+      value.$$typeof === undefined
+    ) {
+      var _componentName = getComponentNameFromType(Component) || "Unknown";
 
-    if (changedBits === 0) {
-      // No change. Bailout early if children are the same.
-      if (oldProps.children === newProps.children && !hasContextChanged()) {
-        return bailoutOnAlreadyFinishedWork(
-          current,
-          workInProgress,
-          renderLanes
+      if (!didWarnAboutModulePatternComponent[_componentName]) {
+        error(
+          "The <%s /> component appears to be a function component that returns a class instance. " +
+            "Change %s to a class that extends React.Component instead. " +
+            "If you can't use a class try assigning the prototype on the function as a workaround. " +
+            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
+            "cannot be called with `new` by React.",
+          _componentName,
+          _componentName,
+          _componentName
         );
+
+        didWarnAboutModulePatternComponent[_componentName] = true;
       }
-    } else {
-      // The context value changed. Search for matching consumers and schedule
-      // them to update.
-      propagateContextChange(workInProgress, context, changedBits, renderLanes);
     }
   }
 
-  var newChildren = newProps.children;
-  reconcileChildren(current, workInProgress, newChildren, renderLanes);
-  return workInProgress.child;
-}
-
-var hasWarnedAboutUsingContextAsConsumer = false;
-
-function updateContextConsumer(current, workInProgress, renderLanes) {
-  var context = workInProgress.type; // The logic below for Context differs depending on PROD or DEV mode. In
-  // DEV mode, we create a separate object for Context.Consumer that acts
-  // like a proxy to Context. This proxy object adds unnecessary code in PROD
-  // so we use the old behaviour (Context.Consumer references Context) to
-  // reduce size and overhead. The separate object references context via
-  // a property called "_context", which also gives us the ability to check
-  // in DEV mode if this property exists or not and warn if it does not.
+  if (
+    // Run these checks in production only if the flag is off.
+    // Eventually we'll delete this branch altogether.
+    typeof value === "object" &&
+    value !== null &&
+    typeof value.render === "function" &&
+    value.$$typeof === undefined
+  ) {
+    {
+      var _componentName2 = getComponentNameFromType(Component) || "Unknown";
 
-  {
-    if (context._context === undefined) {
-      // This may be because it's a Context (rather than a Consumer).
-      // Or it may be because it's older React where they're the same thing.
-      // We only want to warn if we're sure it's a new React.
-      if (context !== context.Consumer) {
-        if (!hasWarnedAboutUsingContextAsConsumer) {
-          hasWarnedAboutUsingContextAsConsumer = true;
+      if (!didWarnAboutModulePatternComponent[_componentName2]) {
+        error(
+          "The <%s /> component appears to be a function component that returns a class instance. " +
+            "Change %s to a class that extends React.Component instead. " +
+            "If you can't use a class try assigning the prototype on the function as a workaround. " +
+            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
+            "cannot be called with `new` by React.",
+          _componentName2,
+          _componentName2,
+          _componentName2
+        );
 
-          error(
-            "Rendering <Context> directly is not supported and will be removed in " +
-              "a future major release. Did you mean to render <Context.Consumer> instead?"
-          );
-        }
+        didWarnAboutModulePatternComponent[_componentName2] = true;
       }
-    } else {
-      context = context._context;
-    }
-  }
+    } // Proceed under the assumption that this is a class instance
 
-  var newProps = workInProgress.pendingProps;
-  var render = newProps.children;
+    workInProgress.tag = ClassComponent; // Throw out any hooks that were used.
 
-  {
-    if (typeof render !== "function") {
-      error(
-        "A context consumer was rendered with multiple children, or a child " +
-          "that isn't a function. A context consumer expects a single child " +
-          "that is a function. If you did pass a function, make sure there " +
-          "is no trailing or leading whitespace around it."
-      );
-    }
-  }
+    workInProgress.memoizedState = null;
+    workInProgress.updateQueue = null; // Push context providers early to prevent context stack mismatches.
+    // During mounting we don't know the child context yet as the instance doesn't exist.
+    // We will invalidate the child context in finishClassComponent() right after rendering.
 
-  prepareToReadContext(workInProgress, renderLanes);
-  var newValue = readContext(context, newProps.unstable_observedBits);
-  var newChildren;
+    var hasContext = false;
 
-  {
-    ReactCurrentOwner$1.current = workInProgress;
-    setIsRendering(true);
-    newChildren = render(newValue);
-    setIsRendering(false);
-  } // React DevTools reads this flag.
+    if (isContextProvider(Component)) {
+      hasContext = true;
+      pushContextProvider(workInProgress);
+    } else {
+      hasContext = false;
+    }
 
-  workInProgress.flags |= PerformedWork;
-  reconcileChildren(current, workInProgress, newChildren, renderLanes);
-  return workInProgress.child;
-}
+    workInProgress.memoizedState =
+      value.state !== null && value.state !== undefined ? value.state : null;
+    initializeUpdateQueue(workInProgress);
+    adoptClassInstance(workInProgress, value);
+    mountClassInstance(workInProgress, Component, props, renderLanes);
+    return finishClassComponent(
+      null,
+      workInProgress,
+      Component,
+      true,
+      hasContext,
+      renderLanes
+    );
+  } else {
+    // Proceed under the assumption that this is a function component
+    workInProgress.tag = FunctionComponent;
 
-function markWorkInProgressReceivedUpdate() {
-  didReceiveUpdate = true;
-}
+    {
+      if (workInProgress.mode & StrictLegacyMode) {
+        disableLogs();
 
-function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
-  if (current !== null) {
-    // Reuse previous dependencies
-    workInProgress.dependencies = current.dependencies;
-  }
+        try {
+          value = renderWithHooks(
+            null,
+            workInProgress,
+            Component,
+            props,
+            context,
+            renderLanes
+          );
+        } finally {
+          reenableLogs();
+        }
+      }
+    }
 
-  {
-    // Don't update "base" render times for bailouts.
-    stopProfilerTimerIfRunning();
-  }
+    reconcileChildren(null, workInProgress, value, renderLanes);
 
-  markSkippedUpdateLanes(workInProgress.lanes); // Check if the children have any pending work.
+    {
+      validateFunctionComponentInDev(workInProgress, Component);
+    }
 
-  if (!includesSomeLane(renderLanes, workInProgress.childLanes)) {
-    // The children don't have any work either. We can skip them.
-    // TODO: Once we add back resuming, we should check if the children are
-    // a work-in-progress set. If so, we need to transfer their effects.
-    return null;
-  } else {
-    // This fiber doesn't have work, but its subtree does. Clone the child
-    // fibers and continue.
-    cloneChildFibers(current, workInProgress);
     return workInProgress.child;
   }
 }
 
-function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
+function validateFunctionComponentInDev(workInProgress, Component) {
   {
-    var returnFiber = oldWorkInProgress.return;
-
-    if (returnFiber === null) {
-      throw new Error("Cannot swap the root fiber.");
-    } // Disconnect from the old current.
-    // It will get deleted.
+    if (Component) {
+      if (Component.childContextTypes) {
+        error(
+          "%s(...): childContextTypes cannot be defined on a function component.",
+          Component.displayName || Component.name || "Component"
+        );
+      }
+    }
 
-    current.alternate = null;
-    oldWorkInProgress.alternate = null; // Connect to the new tree.
+    if (workInProgress.ref !== null) {
+      var info = "";
+      var ownerName = getCurrentFiberOwnerNameInDevOrNull();
 
-    newWorkInProgress.index = oldWorkInProgress.index;
-    newWorkInProgress.sibling = oldWorkInProgress.sibling;
-    newWorkInProgress.return = oldWorkInProgress.return;
-    newWorkInProgress.ref = oldWorkInProgress.ref; // Replace the child/sibling pointers above it.
+      if (ownerName) {
+        info += "\n\nCheck the render method of `" + ownerName + "`.";
+      }
 
-    if (oldWorkInProgress === returnFiber.child) {
-      returnFiber.child = newWorkInProgress;
-    } else {
-      var prevSibling = returnFiber.child;
+      var warningKey = ownerName || "";
+      var debugSource = workInProgress._debugSource;
 
-      if (prevSibling === null) {
-        throw new Error("Expected parent to have a child.");
+      if (debugSource) {
+        warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
       }
 
-      while (prevSibling.sibling !== oldWorkInProgress) {
-        prevSibling = prevSibling.sibling;
+      if (!didWarnAboutFunctionRefs[warningKey]) {
+        didWarnAboutFunctionRefs[warningKey] = true;
 
-        if (prevSibling === null) {
-          throw new Error("Expected to find the previous sibling.");
-        }
+        error(
+          "Function components cannot be given refs. " +
+            "Attempts to access this ref will fail. " +
+            "Did you mean to use React.forwardRef()?%s",
+          info
+        );
       }
+    }
 
-      prevSibling.sibling = newWorkInProgress;
-    } // Delete the old fiber and place the new one.
-    // Since the old fiber is disconnected, we have to schedule it manually.
+    if (typeof Component.getDerivedStateFromProps === "function") {
+      var _componentName3 = getComponentNameFromType(Component) || "Unknown";
 
-    var last = returnFiber.lastEffect;
+      if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3]) {
+        error(
+          "%s: Function components do not support getDerivedStateFromProps.",
+          _componentName3
+        );
 
-    if (last !== null) {
-      last.nextEffect = current;
-      returnFiber.lastEffect = current;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = current;
+        didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3] = true;
+      }
     }
 
-    current.nextEffect = null;
-    current.flags = Deletion;
-    newWorkInProgress.flags |= Placement; // Restart work from the new fiber.
+    if (
+      typeof Component.contextType === "object" &&
+      Component.contextType !== null
+    ) {
+      var _componentName4 = getComponentNameFromType(Component) || "Unknown";
 
-    return newWorkInProgress;
+      if (!didWarnAboutContextTypeOnFunctionComponent[_componentName4]) {
+        error(
+          "%s: Function components do not support contextType.",
+          _componentName4
+        );
+
+        didWarnAboutContextTypeOnFunctionComponent[_componentName4] = true;
+      }
+    }
   }
 }
 
-function beginWork(current, workInProgress, renderLanes) {
-  var updateLanes = workInProgress.lanes;
+var SUSPENDED_MARKER = {
+  dehydrated: null,
+  retryLane: NoLane
+};
+
+function mountSuspenseOffscreenState(renderLanes) {
+  return {
+    baseLanes: renderLanes,
+    cachePool: getSuspendedCachePool()
+  };
+}
+
+function updateSuspenseOffscreenState(prevOffscreenState, renderLanes) {
+  var cachePool = null;
+
+  return {
+    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes),
+    cachePool: cachePool
+  };
+} // TODO: Probably should inline this back
+
+function shouldRemainOnFallback(
+  suspenseContext,
+  current,
+  workInProgress,
+  renderLanes
+) {
+  // If we're already showing a fallback, there are cases where we need to
+  // remain on that fallback regardless of whether the content has resolved.
+  // For example, SuspenseList coordinates when nested content appears.
+  if (current !== null) {
+    var suspenseState = current.memoizedState;
+
+    if (suspenseState === null) {
+      // Currently showing content. Don't hide it, even if ForceSuspenseFallback
+      // is true. More precise name might be "ForceRemainSuspenseFallback".
+      // Note: This is a factoring smell. Can't remain on a fallback if there's
+      // no fallback to remain on.
+      return false;
+    }
+  } // Not currently showing content. Consult the Suspense context.
+
+  return hasSuspenseContext(suspenseContext, ForceSuspenseFallback);
+}
+
+function getRemainingWorkInPrimaryTree(current, renderLanes) {
+  // TODO: Should not remove render lanes that were pinged during this render
+  return removeLanes(current.childLanes, renderLanes);
+}
+
+function updateSuspenseComponent(current, workInProgress, renderLanes) {
+  var nextProps = workInProgress.pendingProps; // This is used by DevTools to force a boundary to suspend.
 
   {
-    if (workInProgress._debugNeedsRemount && current !== null) {
-      // This will restart the begin phase with a new fiber.
-      return remountFiber(
-        current,
-        workInProgress,
-        createFiberFromTypeAndProps(
-          workInProgress.type,
-          workInProgress.key,
-          workInProgress.pendingProps,
-          workInProgress._debugOwner || null,
-          workInProgress.mode,
-          workInProgress.lanes
-        )
-      );
+    if (shouldSuspend(workInProgress)) {
+      workInProgress.flags |= DidCapture;
     }
   }
 
-  if (current !== null) {
-    var oldProps = current.memoizedProps;
-    var newProps = workInProgress.pendingProps;
-
-    if (
-      oldProps !== newProps ||
-      hasContextChanged() || // Force a re-render if the implementation changed due to hot reload:
-      workInProgress.type !== current.type
-    ) {
-      // If props or context changed, mark the fiber as having performed work.
-      // This may be unset if the props are determined to be equal later (memo).
-      didReceiveUpdate = true;
-    } else if (!includesSomeLane(renderLanes, updateLanes)) {
-      didReceiveUpdate = false; // This fiber does not have any pending work. Bailout without entering
-      // the begin phase. There's still some bookkeeping we that needs to be done
-      // in this optimized path, mostly pushing stuff onto the stack.
+  var suspenseContext = suspenseStackCursor.current;
+  var showFallback = false;
+  var didSuspend = (workInProgress.flags & DidCapture) !== NoFlags;
 
-      switch (workInProgress.tag) {
-        case HostRoot:
-          pushHostRootContext(workInProgress);
-          break;
+  if (didSuspend || shouldRemainOnFallback(suspenseContext, current)) {
+    // Something in this boundary's subtree already suspended. Switch to
+    // rendering the fallback children.
+    showFallback = true;
+    workInProgress.flags &= ~DidCapture;
+  } else {
+    // Attempting the main content
+    if (current === null || current.memoizedState !== null) {
+      // This is a new mount or this boundary is already showing a fallback state.
+      // Mark this subtree context as having at least one invisible parent that could
+      // handle the fallback state.
+      // Avoided boundaries are not considered since they cannot handle preferred fallback states.
+      if (nextProps.unstable_avoidThisFallback !== true) {
+        suspenseContext = addSubtreeSuspenseContext(
+          suspenseContext,
+          InvisibleParentSuspenseContext
+        );
+      }
+    }
+  }
 
-        case HostComponent:
-          pushHostContext(workInProgress);
-          break;
+  suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+  pushSuspenseContext(workInProgress, suspenseContext); // OK, the next part is confusing. We're about to reconcile the Suspense
+  // boundary's children. This involves some custom reconciliation logic. Two
+  // main reasons this is so complicated.
+  //
+  // First, Legacy Mode has different semantics for backwards compatibility. The
+  // primary tree will commit in an inconsistent state, so when we do the
+  // second pass to render the fallback, we do some exceedingly, uh, clever
+  // hacks to make that not totally break. Like transferring effects and
+  // deletions from hidden tree. In Concurrent Mode, it's much simpler,
+  // because we bailout on the primary tree completely and leave it in its old
+  // state, no effects. Same as what we do for Offscreen (except that
+  // Offscreen doesn't have the first render pass).
+  //
+  // Second is hydration. During hydration, the Suspense fiber has a slightly
+  // different layout, where the child points to a dehydrated fragment, which
+  // contains the DOM rendered by the server.
+  //
+  // Third, even if you set all that aside, Suspense is like error boundaries in
+  // that we first we try to render one tree, and if that fails, we render again
+  // and switch to a different tree. Like a try/catch block. So we have to track
+  // which branch we're currently rendering. Ideally we would model this using
+  // a stack.
 
-        case ClassComponent: {
-          var Component = workInProgress.type;
+  if (current === null) {
+    var nextPrimaryChildren = nextProps.children;
+    var nextFallbackChildren = nextProps.fallback;
 
-          if (isContextProvider(Component)) {
-            pushContextProvider(workInProgress);
-          }
+    if (showFallback) {
+      var fallbackFragment = mountSuspenseFallbackChildren(
+        workInProgress,
+        nextPrimaryChildren,
+        nextFallbackChildren,
+        renderLanes
+      );
+      var primaryChildFragment = workInProgress.child;
+      primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
+        renderLanes
+      );
+      workInProgress.memoizedState = SUSPENDED_MARKER;
+      return fallbackFragment;
+    } else if (typeof nextProps.unstable_expectedLoadTime === "number") {
+      // This is a CPU-bound tree. Skip this tree and show a placeholder to
+      // unblock the surrounding content. Then immediately retry after the
+      // initial commit.
+      var _fallbackFragment = mountSuspenseFallbackChildren(
+        workInProgress,
+        nextPrimaryChildren,
+        nextFallbackChildren,
+        renderLanes
+      );
 
-          break;
-        }
+      var _primaryChildFragment = workInProgress.child;
+      _primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
+        renderLanes
+      );
+      workInProgress.memoizedState = SUSPENDED_MARKER; // Since nothing actually suspended, there will nothing to ping this to
+      // get it started back up to attempt the next item. While in terms of
+      // priority this work has the same priority as this current render, it's
+      // not part of the same transition once the transition has committed. If
+      // it's sync, we still want to yield so that it can be painted.
+      // Conceptually, this is really the same as pinging. We can use any
+      // RetryLane even if it's the one currently rendering since we're leaving
+      // it behind on this node.
 
-        case HostPortal:
-          pushHostContainer(
-            workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
+      workInProgress.lanes = SomeRetryLane;
+      return _fallbackFragment;
+    } else {
+      return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren);
+    }
+  } else {
+    // This is an update.
+    // If the current fiber has a SuspenseState, that means it's already showing
+    // a fallback.
+    var prevState = current.memoizedState;
 
-        case ContextProvider: {
-          var newValue = workInProgress.memoizedProps.value;
-          pushProvider(workInProgress, newValue);
-          break;
-        }
+    if (prevState !== null) {
+      if (showFallback) {
+        var _nextFallbackChildren2 = nextProps.fallback;
+        var _nextPrimaryChildren2 = nextProps.children;
 
-        case Profiler:
-          {
-            // Profiler should only call onRender when one of its descendants actually rendered.
-            var hasChildWork = includesSomeLane(
-              renderLanes,
-              workInProgress.childLanes
-            );
+        var _fallbackChildFragment = updateSuspenseFallbackChildren(
+          current,
+          workInProgress,
+          _nextPrimaryChildren2,
+          _nextFallbackChildren2,
+          renderLanes
+        );
 
-            if (hasChildWork) {
-              workInProgress.flags |= Update;
-            } // Reset effect durations for the next eventual effect phase.
-            // These are reset during render to allow the DevTools commit hook a chance to read them,
+        var _primaryChildFragment3 = workInProgress.child;
+        var prevOffscreenState = current.child.memoizedState;
+        _primaryChildFragment3.memoizedState =
+          prevOffscreenState === null
+            ? mountSuspenseOffscreenState(renderLanes)
+            : updateSuspenseOffscreenState(prevOffscreenState, renderLanes);
+        _primaryChildFragment3.childLanes = getRemainingWorkInPrimaryTree(
+          current,
+          renderLanes
+        );
+        workInProgress.memoizedState = SUSPENDED_MARKER;
+        return _fallbackChildFragment;
+      } else {
+        var _nextPrimaryChildren3 = nextProps.children;
 
-            var stateNode = workInProgress.stateNode;
-            stateNode.effectDuration = 0;
-            stateNode.passiveEffectDuration = 0;
-          }
+        var _primaryChildFragment4 = updateSuspensePrimaryChildren(
+          current,
+          workInProgress,
+          _nextPrimaryChildren3,
+          renderLanes
+        );
 
-          break;
+        workInProgress.memoizedState = null;
+        return _primaryChildFragment4;
+      }
+    } else {
+      // The current tree is not already showing a fallback.
+      if (showFallback) {
+        // Timed out.
+        var _nextFallbackChildren3 = nextProps.fallback;
+        var _nextPrimaryChildren4 = nextProps.children;
 
-        case SuspenseComponent: {
-          var state = workInProgress.memoizedState;
+        var _fallbackChildFragment2 = updateSuspenseFallbackChildren(
+          current,
+          workInProgress,
+          _nextPrimaryChildren4,
+          _nextFallbackChildren3,
+          renderLanes
+        );
 
-          if (state !== null) {
-            // whether to retry the primary children, or to skip over it and
-            // go straight to the fallback. Check the priority of the primary
-            // child fragment.
+        var _primaryChildFragment5 = workInProgress.child;
+        var _prevOffscreenState = current.child.memoizedState;
+        _primaryChildFragment5.memoizedState =
+          _prevOffscreenState === null
+            ? mountSuspenseOffscreenState(renderLanes)
+            : updateSuspenseOffscreenState(_prevOffscreenState, renderLanes);
+        _primaryChildFragment5.childLanes = getRemainingWorkInPrimaryTree(
+          current,
+          renderLanes
+        ); // Skip the primary children, and continue working on the
+        // fallback children.
 
-            var primaryChildFragment = workInProgress.child;
-            var primaryChildLanes = primaryChildFragment.childLanes;
+        workInProgress.memoizedState = SUSPENDED_MARKER;
+        return _fallbackChildFragment2;
+      } else {
+        // Still haven't timed out. Continue rendering the children, like we
+        // normally do.
+        var _nextPrimaryChildren5 = nextProps.children;
 
-            if (includesSomeLane(renderLanes, primaryChildLanes)) {
-              // The primary children have pending work. Use the normal path
-              // to attempt to render the primary children again.
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            } else {
-              // The primary child fragment does not have pending work marked
-              // on it
-              pushSuspenseContext(
-                workInProgress,
-                setDefaultShallowSuspenseContext(suspenseStackCursor.current)
-              ); // The primary children do not have pending work with sufficient
-              // priority. Bailout.
-
-              var child = bailoutOnAlreadyFinishedWork(
-                current,
-                workInProgress,
-                renderLanes
-              );
+        var _primaryChildFragment6 = updateSuspensePrimaryChildren(
+          current,
+          workInProgress,
+          _nextPrimaryChildren5,
+          renderLanes
+        );
 
-              if (child !== null) {
-                // The fallback children have pending work. Skip over the
-                // primary children and work on the fallback.
-                return child.sibling;
-              } else {
-                return null;
-              }
-            }
-          } else {
-            pushSuspenseContext(
-              workInProgress,
-              setDefaultShallowSuspenseContext(suspenseStackCursor.current)
-            );
-          }
+        workInProgress.memoizedState = null;
+        return _primaryChildFragment6;
+      }
+    }
+  }
+}
 
-          break;
-        }
+function mountSuspensePrimaryChildren(
+  workInProgress,
+  primaryChildren,
+  renderLanes
+) {
+  var mode = workInProgress.mode;
+  var primaryChildProps = {
+    mode: "visible",
+    children: primaryChildren
+  };
+  var primaryChildFragment = mountWorkInProgressOffscreenFiber(
+    primaryChildProps,
+    mode
+  );
+  primaryChildFragment.return = workInProgress;
+  workInProgress.child = primaryChildFragment;
+  return primaryChildFragment;
+}
 
-        case SuspenseListComponent: {
-          var didSuspendBefore = (current.flags & DidCapture) !== NoFlags;
+function mountSuspenseFallbackChildren(
+  workInProgress,
+  primaryChildren,
+  fallbackChildren,
+  renderLanes
+) {
+  var mode = workInProgress.mode;
+  var progressedPrimaryFragment = workInProgress.child;
+  var primaryChildProps = {
+    mode: "hidden",
+    children: primaryChildren
+  };
+  var primaryChildFragment;
+  var fallbackChildFragment;
 
-          var _hasChildWork = includesSomeLane(
-            renderLanes,
-            workInProgress.childLanes
-          );
+  if (
+    (mode & ConcurrentMode) === NoMode &&
+    progressedPrimaryFragment !== null
+  ) {
+    // In legacy mode, we commit the primary tree as if it successfully
+    // completed, even though it's in an inconsistent state.
+    primaryChildFragment = progressedPrimaryFragment;
+    primaryChildFragment.childLanes = NoLanes;
+    primaryChildFragment.pendingProps = primaryChildProps;
 
-          if (didSuspendBefore) {
-            if (_hasChildWork) {
-              // If something was in fallback state last time, and we have all the
-              // same children then we're still in progressive loading state.
-              // Something might get unblocked by state updates or retries in the
-              // tree which will affect the tail. So we need to use the normal
-              // path to compute the correct tail.
-              return updateSuspenseListComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            } // If none of the children had any work, that means that none of
-            // them got retried so they'll still be blocked in the same way
-            // as before. We can fast bail out.
+    if (workInProgress.mode & ProfileMode) {
+      // Reset the durations from the first pass so they aren't included in the
+      // final amounts. This seems counterintuitive, since we're intentionally
+      // not measuring part of the render phase, but this makes it match what we
+      // do in Concurrent Mode.
+      primaryChildFragment.actualDuration = 0;
+      primaryChildFragment.actualStartTime = -1;
+      primaryChildFragment.selfBaseDuration = 0;
+      primaryChildFragment.treeBaseDuration = 0;
+    }
 
-            workInProgress.flags |= DidCapture;
-          } // If nothing suspended before and we're rendering the same children,
-          // then the tail doesn't matter. Anything new that suspends will work
-          // in the "together" mode, so we can continue from the state we had.
-
-          var renderState = workInProgress.memoizedState;
-
-          if (renderState !== null) {
-            // Reset to the "together" mode in case we've started a different
-            // update in the past but didn't complete it.
-            renderState.rendering = null;
-            renderState.tail = null;
-            renderState.lastEffect = null;
-          }
+    fallbackChildFragment = createFiberFromFragment(
+      fallbackChildren,
+      mode,
+      renderLanes,
+      null
+    );
+  } else {
+    primaryChildFragment = mountWorkInProgressOffscreenFiber(
+      primaryChildProps,
+      mode
+    );
+    fallbackChildFragment = createFiberFromFragment(
+      fallbackChildren,
+      mode,
+      renderLanes,
+      null
+    );
+  }
 
-          pushSuspenseContext(workInProgress, suspenseStackCursor.current);
+  primaryChildFragment.return = workInProgress;
+  fallbackChildFragment.return = workInProgress;
+  primaryChildFragment.sibling = fallbackChildFragment;
+  workInProgress.child = primaryChildFragment;
+  return fallbackChildFragment;
+}
 
-          if (_hasChildWork) {
-            break;
-          } else {
-            // If none of the children had any work, that means that none of
-            // them got retried so they'll still be blocked in the same way
-            // as before. We can fast bail out.
-            return null;
-          }
-        }
+function mountWorkInProgressOffscreenFiber(offscreenProps, mode, renderLanes) {
+  // The props argument to `createFiberFromOffscreen` is `any` typed, so we use
+  // this wrapper function to constrain it.
+  return createFiberFromOffscreen(offscreenProps, mode, NoLanes, null);
+}
 
-        case OffscreenComponent:
-        case LegacyHiddenComponent: {
-          // Need to check if the tree still needs to be deferred. This is
-          // almost identical to the logic used in the normal update path,
-          // so we'll just enter that. The only difference is we'll bail out
-          // at the next level instead of this one, because the child props
-          // have not changed. Which is fine.
-          // TODO: Probably should refactor `beginWork` to split the bailout
-          // path from the normal path. I'm tempted to do a labeled break here
-          // but I won't :)
-          workInProgress.lanes = NoLanes;
-          return updateOffscreenComponent(current, workInProgress, renderLanes);
-        }
-      }
+function updateWorkInProgressOffscreenFiber(current, offscreenProps) {
+  // The props argument to `createWorkInProgress` is `any` typed, so we use this
+  // wrapper function to constrain it.
+  return createWorkInProgress(current, offscreenProps);
+}
 
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-    } else {
-      if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
-        // This is a special case that only exists for legacy mode.
-        // See https://github.com/facebook/react/pull/19216.
-        didReceiveUpdate = true;
-      } else {
-        // An update was scheduled on this fiber, but there are no new props
-        // nor legacy context. Set this to false. If an update queue or context
-        // consumer produces a changed value, it will set this to true. Otherwise,
-        // the component will assume the children have not changed and bail out.
-        didReceiveUpdate = false;
-      }
+function updateSuspensePrimaryChildren(
+  current,
+  workInProgress,
+  primaryChildren,
+  renderLanes
+) {
+  var currentPrimaryChildFragment = current.child;
+  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
+  var primaryChildFragment = updateWorkInProgressOffscreenFiber(
+    currentPrimaryChildFragment,
+    {
+      mode: "visible",
+      children: primaryChildren
     }
-  } else {
-    didReceiveUpdate = false;
-  } // Before entering the begin phase, clear pending update priority.
-  // TODO: This assumes that we're about to evaluate the component and process
-  // the update queue. However, there's an exception: SimpleMemoComponent
-  // sometimes bails out later in the begin phase. This indicates that we should
-  // move this assignment out of the common path and into each branch.
+  );
+
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
+    primaryChildFragment.lanes = renderLanes;
+  }
 
-  workInProgress.lanes = NoLanes;
+  primaryChildFragment.return = workInProgress;
+  primaryChildFragment.sibling = null;
 
-  switch (workInProgress.tag) {
-    case IndeterminateComponent: {
-      return mountIndeterminateComponent(
-        current,
-        workInProgress,
-        workInProgress.type,
-        renderLanes
-      );
-    }
+  if (currentFallbackChildFragment !== null) {
+    // Delete the fallback child fragment
+    var deletions = workInProgress.deletions;
 
-    case LazyComponent: {
-      var elementType = workInProgress.elementType;
-      return mountLazyComponent(
-        current,
-        workInProgress,
-        elementType,
-        updateLanes,
-        renderLanes
-      );
+    if (deletions === null) {
+      workInProgress.deletions = [currentFallbackChildFragment];
+      workInProgress.flags |= ChildDeletion;
+    } else {
+      deletions.push(currentFallbackChildFragment);
     }
+  }
 
-    case FunctionComponent: {
-      var _Component = workInProgress.type;
-      var unresolvedProps = workInProgress.pendingProps;
-      var resolvedProps =
-        workInProgress.elementType === _Component
-          ? unresolvedProps
-          : resolveDefaultProps(_Component, unresolvedProps);
-      return updateFunctionComponent(
-        current,
-        workInProgress,
-        _Component,
-        resolvedProps,
-        renderLanes
-      );
-    }
+  workInProgress.child = primaryChildFragment;
+  return primaryChildFragment;
+}
 
-    case ClassComponent: {
-      var _Component2 = workInProgress.type;
-      var _unresolvedProps = workInProgress.pendingProps;
+function updateSuspenseFallbackChildren(
+  current,
+  workInProgress,
+  primaryChildren,
+  fallbackChildren,
+  renderLanes
+) {
+  var mode = workInProgress.mode;
+  var currentPrimaryChildFragment = current.child;
+  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
+  var primaryChildProps = {
+    mode: "hidden",
+    children: primaryChildren
+  };
+  var primaryChildFragment;
 
-      var _resolvedProps =
-        workInProgress.elementType === _Component2
-          ? _unresolvedProps
-          : resolveDefaultProps(_Component2, _unresolvedProps);
+  if (
+    // In legacy mode, we commit the primary tree as if it successfully
+    // completed, even though it's in an inconsistent state.
+    (mode & ConcurrentMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
+    // already cloned. In legacy mode, the only case where this isn't true is
+    // when DevTools forces us to display a fallback; we skip the first render
+    // pass entirely and go straight to rendering the fallback. (In Concurrent
+    // Mode, SuspenseList can also trigger this scenario, but this is a legacy-
+    // only codepath.)
+    workInProgress.child !== currentPrimaryChildFragment
+  ) {
+    var progressedPrimaryFragment = workInProgress.child;
+    primaryChildFragment = progressedPrimaryFragment;
+    primaryChildFragment.childLanes = NoLanes;
+    primaryChildFragment.pendingProps = primaryChildProps;
 
-      return updateClassComponent(
-        current,
-        workInProgress,
-        _Component2,
-        _resolvedProps,
-        renderLanes
-      );
+    if (workInProgress.mode & ProfileMode) {
+      // Reset the durations from the first pass so they aren't included in the
+      // final amounts. This seems counterintuitive, since we're intentionally
+      // not measuring part of the render phase, but this makes it match what we
+      // do in Concurrent Mode.
+      primaryChildFragment.actualDuration = 0;
+      primaryChildFragment.actualStartTime = -1;
+      primaryChildFragment.selfBaseDuration =
+        currentPrimaryChildFragment.selfBaseDuration;
+      primaryChildFragment.treeBaseDuration =
+        currentPrimaryChildFragment.treeBaseDuration;
     }
 
-    case HostRoot:
-      return updateHostRoot(current, workInProgress, renderLanes);
+    if (enablePersistentOffscreenHostContainer && supportsPersistence) {
+      // In persistent mode, the offscreen children are wrapped in a host node.
+      // We need to complete it now, because we're going to skip over its normal
+      // complete phase and go straight to rendering the fallback.
+      var currentOffscreenContainer = currentPrimaryChildFragment.child;
+      var offscreenContainer = primaryChildFragment.child;
+      var containerProps = getOffscreenContainerProps(
+        "hidden",
+        primaryChildren
+      );
+      offscreenContainer.pendingProps = containerProps;
+      offscreenContainer.memoizedProps = containerProps;
+      completeSuspendedOffscreenHostContainer(
+        currentOffscreenContainer,
+        offscreenContainer
+      );
+    } // The fallback fiber was added as a deletion during the first pass.
+    // However, since we're going to remain on the fallback, we no longer want
+    // to delete it.
 
-    case HostComponent:
-      return updateHostComponent(current, workInProgress, renderLanes);
+    workInProgress.deletions = null;
+  } else {
+    primaryChildFragment = updateWorkInProgressOffscreenFiber(
+      currentPrimaryChildFragment,
+      primaryChildProps
+    );
 
-    case HostText:
-      return updateHostText();
+    if (enablePersistentOffscreenHostContainer && supportsPersistence) {
+      // In persistent mode, the offscreen children are wrapped in a host node.
+      // We need to complete it now, because we're going to skip over its normal
+      // complete phase and go straight to rendering the fallback.
+      var _currentOffscreenContainer = currentPrimaryChildFragment.child;
 
-    case SuspenseComponent:
-      return updateSuspenseComponent(current, workInProgress, renderLanes);
+      if (_currentOffscreenContainer !== null) {
+        var isHidden = true;
 
-    case HostPortal:
-      return updatePortalComponent(current, workInProgress, renderLanes);
+        var _offscreenContainer = reconcileOffscreenHostContainer(
+          currentPrimaryChildFragment,
+          primaryChildFragment,
+          isHidden,
+          primaryChildren,
+          renderLanes
+        );
 
-    case ForwardRef: {
-      var type = workInProgress.type;
-      var _unresolvedProps2 = workInProgress.pendingProps;
+        _offscreenContainer.memoizedProps = _offscreenContainer.pendingProps;
+        completeSuspendedOffscreenHostContainer(
+          _currentOffscreenContainer,
+          _offscreenContainer
+        );
+      }
+    } // Since we're reusing a current tree, we need to reuse the flags, too.
+    // (We don't do this in legacy mode, because in legacy mode we don't re-use
+    // the current tree; see previous branch.)
 
-      var _resolvedProps2 =
-        workInProgress.elementType === type
-          ? _unresolvedProps2
-          : resolveDefaultProps(type, _unresolvedProps2);
+    primaryChildFragment.subtreeFlags =
+      currentPrimaryChildFragment.subtreeFlags & StaticMask;
+  }
 
-      return updateForwardRef(
-        current,
-        workInProgress,
-        type,
-        _resolvedProps2,
-        renderLanes
-      );
-    }
+  var fallbackChildFragment;
 
-    case Fragment:
-      return updateFragment(current, workInProgress, renderLanes);
+  if (currentFallbackChildFragment !== null) {
+    fallbackChildFragment = createWorkInProgress(
+      currentFallbackChildFragment,
+      fallbackChildren
+    );
+  } else {
+    fallbackChildFragment = createFiberFromFragment(
+      fallbackChildren,
+      mode,
+      renderLanes,
+      null
+    ); // Needs a placement effect because the parent (the Suspense boundary) already
+    // mounted but this is a new fiber.
 
-    case Mode:
-      return updateMode(current, workInProgress, renderLanes);
+    fallbackChildFragment.flags |= Placement;
+  }
 
-    case Profiler:
-      return updateProfiler(current, workInProgress, renderLanes);
+  fallbackChildFragment.return = workInProgress;
+  primaryChildFragment.return = workInProgress;
+  primaryChildFragment.sibling = fallbackChildFragment;
+  workInProgress.child = primaryChildFragment;
+  return fallbackChildFragment;
+}
 
-    case ContextProvider:
-      return updateContextProvider(current, workInProgress, renderLanes);
+function scheduleWorkOnFiber(fiber, renderLanes) {
+  fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
+  var alternate = fiber.alternate;
 
-    case ContextConsumer:
-      return updateContextConsumer(current, workInProgress, renderLanes);
+  if (alternate !== null) {
+    alternate.lanes = mergeLanes(alternate.lanes, renderLanes);
+  }
 
-    case MemoComponent: {
-      var _type2 = workInProgress.type;
-      var _unresolvedProps3 = workInProgress.pendingProps; // Resolve outer props first, then resolve inner props.
+  scheduleWorkOnParentPath(fiber.return, renderLanes);
+}
 
-      var _resolvedProps3 = resolveDefaultProps(_type2, _unresolvedProps3);
+function propagateSuspenseContextChange(
+  workInProgress,
+  firstChild,
+  renderLanes
+) {
+  // Mark any Suspense boundaries with fallbacks as having work to do.
+  // If they were previously forced into fallbacks, they may now be able
+  // to unblock.
+  var node = firstChild;
 
-      {
-        if (workInProgress.type !== workInProgress.elementType) {
-          var outerPropTypes = _type2.propTypes;
+  while (node !== null) {
+    if (node.tag === SuspenseComponent) {
+      var state = node.memoizedState;
 
-          if (outerPropTypes) {
-            checkPropTypes(
-              outerPropTypes,
-              _resolvedProps3, // Resolved for outer only
-              "prop",
-              getComponentName(_type2)
-            );
-          }
-        }
+      if (state !== null) {
+        scheduleWorkOnFiber(node, renderLanes);
       }
+    } else if (node.tag === SuspenseListComponent) {
+      // If the tail is hidden there might not be an Suspense boundaries
+      // to schedule work on. In this case we have to schedule it on the
+      // list itself.
+      // We don't have to traverse to the children of the list since
+      // the list will propagate the change when it rerenders.
+      scheduleWorkOnFiber(node, renderLanes);
+    } else if (node.child !== null) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
 
-      _resolvedProps3 = resolveDefaultProps(_type2.type, _resolvedProps3);
-      return updateMemoComponent(
-        current,
-        workInProgress,
-        _type2,
-        _resolvedProps3,
-        updateLanes,
-        renderLanes
-      );
+    if (node === workInProgress) {
+      return;
     }
 
-    case SimpleMemoComponent: {
-      return updateSimpleMemoComponent(
-        current,
-        workInProgress,
-        workInProgress.type,
-        workInProgress.pendingProps,
-        updateLanes,
-        renderLanes
-      );
+    while (node.sibling === null) {
+      if (node.return === null || node.return === workInProgress) {
+        return;
+      }
+
+      node = node.return;
+    }
+
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+}
+
+function findLastContentRow(firstChild) {
+  // This is going to find the last row among these children that is already
+  // showing content on the screen, as opposed to being in fallback state or
+  // new. If a row has multiple Suspense boundaries, any of them being in the
+  // fallback state, counts as the whole row being in a fallback state.
+  // Note that the "rows" will be workInProgress, but any nested children
+  // will still be current since we haven't rendered them yet. The mounted
+  // order may not be the same as the new order. We use the new order.
+  var row = firstChild;
+  var lastContentRow = null;
+
+  while (row !== null) {
+    var currentRow = row.alternate; // New rows can't be content rows.
+
+    if (currentRow !== null && findFirstSuspended(currentRow) === null) {
+      lastContentRow = row;
     }
 
-    case IncompleteClassComponent: {
-      var _Component3 = workInProgress.type;
-      var _unresolvedProps4 = workInProgress.pendingProps;
+    row = row.sibling;
+  }
 
-      var _resolvedProps4 =
-        workInProgress.elementType === _Component3
-          ? _unresolvedProps4
-          : resolveDefaultProps(_Component3, _unresolvedProps4);
+  return lastContentRow;
+}
 
-      return mountIncompleteClassComponent(
-        current,
-        workInProgress,
-        _Component3,
-        _resolvedProps4,
-        renderLanes
-      );
-    }
+function validateRevealOrder(revealOrder) {
+  {
+    if (
+      revealOrder !== undefined &&
+      revealOrder !== "forwards" &&
+      revealOrder !== "backwards" &&
+      revealOrder !== "together" &&
+      !didWarnAboutRevealOrder[revealOrder]
+    ) {
+      didWarnAboutRevealOrder[revealOrder] = true;
 
-    case SuspenseListComponent: {
-      return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    }
+      if (typeof revealOrder === "string") {
+        switch (revealOrder.toLowerCase()) {
+          case "together":
+          case "forwards":
+          case "backwards": {
+            error(
+              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
+                'Use lowercase "%s" instead.',
+              revealOrder,
+              revealOrder.toLowerCase()
+            );
 
-    case FundamentalComponent: {
-      break;
-    }
+            break;
+          }
 
-    case ScopeComponent: {
-      break;
-    }
+          case "forward":
+          case "backward": {
+            error(
+              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
+                'React uses the -s suffix in the spelling. Use "%ss" instead.',
+              revealOrder,
+              revealOrder.toLowerCase()
+            );
 
-    case Block: {
-      break;
-    }
+            break;
+          }
 
-    case OffscreenComponent: {
-      return updateOffscreenComponent(current, workInProgress, renderLanes);
-    }
+          default:
+            error(
+              '"%s" is not a supported revealOrder on <SuspenseList />. ' +
+                'Did you mean "together", "forwards" or "backwards"?',
+              revealOrder
+            );
 
-    case LegacyHiddenComponent: {
-      return updateLegacyHiddenComponent(current, workInProgress, renderLanes);
+            break;
+        }
+      } else {
+        error(
+          "%s is not a supported value for revealOrder on <SuspenseList />. " +
+            'Did you mean "together", "forwards" or "backwards"?',
+          revealOrder
+        );
+      }
     }
   }
+}
 
+function validateTailOptions(tailMode, revealOrder) {
   {
-    throw Error(
-      "Unknown unit of work tag (" +
-        workInProgress.tag +
-        "). This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-}
+    if (tailMode !== undefined && !didWarnAboutTailOptions[tailMode]) {
+      if (tailMode !== "collapsed" && tailMode !== "hidden") {
+        didWarnAboutTailOptions[tailMode] = true;
 
-function markUpdate(workInProgress) {
-  // Tag the fiber with an update effect. This turns a Placement into
-  // a PlacementAndUpdate.
-  workInProgress.flags |= Update;
-}
+        error(
+          '"%s" is not a supported value for tail on <SuspenseList />. ' +
+            'Did you mean "collapsed" or "hidden"?',
+          tailMode
+        );
+      } else if (revealOrder !== "forwards" && revealOrder !== "backwards") {
+        didWarnAboutTailOptions[tailMode] = true;
 
-function markRef$1(workInProgress) {
-  workInProgress.flags |= Ref;
+        error(
+          '<SuspenseList tail="%s" /> is only valid if revealOrder is ' +
+            '"forwards" or "backwards". ' +
+            'Did you mean to specify revealOrder="forwards"?',
+          tailMode
+        );
+      }
+    }
+  }
 }
 
-var appendAllChildren;
-var updateHostContainer;
-var updateHostComponent$1;
-var updateHostText$1;
+function validateSuspenseListNestedChild(childSlot, index) {
+  {
+    var isAnArray = isArray(childSlot);
+    var isIterable =
+      !isAnArray && typeof getIteratorFn(childSlot) === "function";
 
-{
-  // Persistent host tree mode
-  appendAllChildren = function(
-    parent,
-    workInProgress,
-    needsVisibilityToggle,
-    isHidden
-  ) {
-    // We only have the top Fiber that was created but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = workInProgress.child;
+    if (isAnArray || isIterable) {
+      var type = isAnArray ? "array" : "iterable";
 
-    while (node !== null) {
-      // eslint-disable-next-line no-labels
-      if (node.tag === HostComponent) {
-        var instance = node.stateNode;
+      error(
+        "A nested %s was passed to row #%s in <SuspenseList />. Wrap it in " +
+          "an additional SuspenseList to configure its revealOrder: " +
+          "<SuspenseList revealOrder=...> ... " +
+          "<SuspenseList revealOrder=...>{%s}</SuspenseList> ... " +
+          "</SuspenseList>",
+        type,
+        index,
+        type
+      );
 
-        if (needsVisibilityToggle && isHidden) {
-          // This child is inside a timed out tree. Hide it.
-          var props = node.memoizedProps;
-          var type = node.type;
-          instance = cloneHiddenInstance(instance);
-        }
+      return false;
+    }
+  }
 
-        appendInitialChild(parent, instance);
-      } else if (node.tag === HostText) {
-        var _instance = node.stateNode;
+  return true;
+}
 
-        if (needsVisibilityToggle && isHidden) {
-          // This child is inside a timed out tree. Hide it.
-          var text = node.memoizedProps;
-          _instance = cloneHiddenTextInstance();
+function validateSuspenseListChildren(children, revealOrder) {
+  {
+    if (
+      (revealOrder === "forwards" || revealOrder === "backwards") &&
+      children !== undefined &&
+      children !== null &&
+      children !== false
+    ) {
+      if (isArray(children)) {
+        for (var i = 0; i < children.length; i++) {
+          if (!validateSuspenseListNestedChild(children[i], i)) {
+            return;
+          }
         }
+      } else {
+        var iteratorFn = getIteratorFn(children);
 
-        appendInitialChild(parent, _instance);
-      } else if (node.tag === HostPortal);
-      else if (node.tag === SuspenseComponent) {
-        if ((node.flags & Update) !== NoFlags) {
-          // Need to toggle the visibility of the primary children.
-          var newIsHidden = node.memoizedState !== null;
-
-          if (newIsHidden) {
-            var primaryChildParent = node.child;
-
-            if (primaryChildParent !== null) {
-              if (primaryChildParent.child !== null) {
-                primaryChildParent.child.return = primaryChildParent;
-                appendAllChildren(
-                  parent,
-                  primaryChildParent,
-                  true,
-                  newIsHidden
-                );
-              }
+        if (typeof iteratorFn === "function") {
+          var childrenIterator = iteratorFn.call(children);
 
-              var fallbackChildParent = primaryChildParent.sibling;
+          if (childrenIterator) {
+            var step = childrenIterator.next();
+            var _i = 0;
 
-              if (fallbackChildParent !== null) {
-                fallbackChildParent.return = node;
-                node = fallbackChildParent;
-                continue;
+            for (; !step.done; step = childrenIterator.next()) {
+              if (!validateSuspenseListNestedChild(step.value, _i)) {
+                return;
               }
+
+              _i++;
             }
           }
+        } else {
+          error(
+            'A single row was passed to a <SuspenseList revealOrder="%s" />. ' +
+              "This is not useful since it needs multiple rows. " +
+              "Did you mean to pass multiple children or an array?",
+            revealOrder
+          );
         }
+      }
+    }
+  }
+}
 
-        if (node.child !== null) {
-          // Continue traversing like normal
-          node.child.return = node;
-          node = node.child;
-          continue;
-        }
-      } else if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      } // $FlowFixMe This is correct but Flow is confused by the labeled break.
-
-      node = node;
+function initSuspenseListRenderState(
+  workInProgress,
+  isBackwards,
+  tail,
+  lastContentRow,
+  tailMode
+) {
+  var renderState = workInProgress.memoizedState;
 
-      if (node === workInProgress) {
-        return;
-      }
+  if (renderState === null) {
+    workInProgress.memoizedState = {
+      isBackwards: isBackwards,
+      rendering: null,
+      renderingStartTime: 0,
+      last: lastContentRow,
+      tail: tail,
+      tailMode: tailMode
+    };
+  } else {
+    // We can reuse the existing object from previous renders.
+    renderState.isBackwards = isBackwards;
+    renderState.rendering = null;
+    renderState.renderingStartTime = 0;
+    renderState.last = lastContentRow;
+    renderState.tail = tail;
+    renderState.tailMode = tailMode;
+  }
+} // This can end up rendering this component multiple passes.
+// The first pass splits the children fibers into two sets. A head and tail.
+// We first render the head. If anything is in fallback state, we do another
+// pass through beginWork to rerender all children (including the tail) with
+// the force suspend context. If the first render didn't have anything in
+// in fallback state. Then we render each row in the tail one-by-one.
+// That happens in the completeWork phase without going back to beginWork.
 
-      while (node.sibling === null) {
-        if (node.return === null || node.return === workInProgress) {
-          return;
-        }
+function updateSuspenseListComponent(current, workInProgress, renderLanes) {
+  var nextProps = workInProgress.pendingProps;
+  var revealOrder = nextProps.revealOrder;
+  var tailMode = nextProps.tail;
+  var newChildren = nextProps.children;
+  validateRevealOrder(revealOrder);
+  validateTailOptions(tailMode, revealOrder);
+  validateSuspenseListChildren(newChildren, revealOrder);
+  reconcileChildren(current, workInProgress, newChildren, renderLanes);
+  var suspenseContext = suspenseStackCursor.current;
+  var shouldForceFallback = hasSuspenseContext(
+    suspenseContext,
+    ForceSuspenseFallback
+  );
 
-        node = node.return;
-      }
+  if (shouldForceFallback) {
+    suspenseContext = setShallowSuspenseContext(
+      suspenseContext,
+      ForceSuspenseFallback
+    );
+    workInProgress.flags |= DidCapture;
+  } else {
+    var didSuspendBefore =
+      current !== null && (current.flags & DidCapture) !== NoFlags;
 
-      node.sibling.return = node.return;
-      node = node.sibling;
+    if (didSuspendBefore) {
+      // If we previously forced a fallback, we need to schedule work
+      // on any nested boundaries to let them know to try to render
+      // again. This is the same as context updating.
+      propagateSuspenseContextChange(
+        workInProgress,
+        workInProgress.child,
+        renderLanes
+      );
     }
-  }; // An unfortunate fork of appendAllChildren because we have two different parent types.
-
-  var appendAllChildrenToContainer = function(
-    containerChildSet,
-    workInProgress,
-    needsVisibilityToggle,
-    isHidden
-  ) {
-    // We only have the top Fiber that was created but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = workInProgress.child;
 
-    while (node !== null) {
-      // eslint-disable-next-line no-labels
-      if (node.tag === HostComponent) {
-        var instance = node.stateNode;
+    suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+  }
 
-        if (needsVisibilityToggle && isHidden) {
-          // This child is inside a timed out tree. Hide it.
-          var props = node.memoizedProps;
-          var type = node.type;
-          instance = cloneHiddenInstance(instance);
-        }
+  pushSuspenseContext(workInProgress, suspenseContext);
 
-        appendChildToContainerChildSet(containerChildSet, instance);
-      } else if (node.tag === HostText) {
-        var _instance3 = node.stateNode;
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
+    // In legacy mode, SuspenseList doesn't work so we just
+    // use make it a noop by treating it as the default revealOrder.
+    workInProgress.memoizedState = null;
+  } else {
+    switch (revealOrder) {
+      case "forwards": {
+        var lastContentRow = findLastContentRow(workInProgress.child);
+        var tail;
 
-        if (needsVisibilityToggle && isHidden) {
-          // This child is inside a timed out tree. Hide it.
-          var text = node.memoizedProps;
-          _instance3 = cloneHiddenTextInstance();
+        if (lastContentRow === null) {
+          // The whole list is part of the tail.
+          // TODO: We could fast path by just rendering the tail now.
+          tail = workInProgress.child;
+          workInProgress.child = null;
+        } else {
+          // Disconnect the tail rows after the content row.
+          // We're going to render them separately later.
+          tail = lastContentRow.sibling;
+          lastContentRow.sibling = null;
         }
 
-        appendChildToContainerChildSet(containerChildSet, _instance3);
-      } else if (node.tag === HostPortal);
-      else if (node.tag === SuspenseComponent) {
-        if ((node.flags & Update) !== NoFlags) {
-          // Need to toggle the visibility of the primary children.
-          var newIsHidden = node.memoizedState !== null;
-
-          if (newIsHidden) {
-            var primaryChildParent = node.child;
-
-            if (primaryChildParent !== null) {
-              if (primaryChildParent.child !== null) {
-                primaryChildParent.child.return = primaryChildParent;
-                appendAllChildrenToContainer(
-                  containerChildSet,
-                  primaryChildParent,
-                  true,
-                  newIsHidden
-                );
-              }
+        initSuspenseListRenderState(
+          workInProgress,
+          false, // isBackwards
+          tail,
+          lastContentRow,
+          tailMode
+        );
+        break;
+      }
 
-              var fallbackChildParent = primaryChildParent.sibling;
+      case "backwards": {
+        // We're going to find the first row that has existing content.
+        // At the same time we're going to reverse the list of everything
+        // we pass in the meantime. That's going to be our tail in reverse
+        // order.
+        var _tail = null;
+        var row = workInProgress.child;
+        workInProgress.child = null;
 
-              if (fallbackChildParent !== null) {
-                fallbackChildParent.return = node;
-                node = fallbackChildParent;
-                continue;
-              }
-            }
-          }
-        }
+        while (row !== null) {
+          var currentRow = row.alternate; // New rows can't be content rows.
 
-        if (node.child !== null) {
-          // Continue traversing like normal
-          node.child.return = node;
-          node = node.child;
-          continue;
-        }
-      } else if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      } // $FlowFixMe This is correct but Flow is confused by the labeled break.
+          if (currentRow !== null && findFirstSuspended(currentRow) === null) {
+            // This is the beginning of the main content.
+            workInProgress.child = row;
+            break;
+          }
 
-      node = node;
+          var nextRow = row.sibling;
+          row.sibling = _tail;
+          _tail = row;
+          row = nextRow;
+        } // TODO: If workInProgress.child is null, we can continue on the tail immediately.
 
-      if (node === workInProgress) {
-        return;
+        initSuspenseListRenderState(
+          workInProgress,
+          true, // isBackwards
+          _tail,
+          null, // last
+          tailMode
+        );
+        break;
       }
 
-      while (node.sibling === null) {
-        if (node.return === null || node.return === workInProgress) {
-          return;
-        }
-
-        node = node.return;
+      case "together": {
+        initSuspenseListRenderState(
+          workInProgress,
+          false, // isBackwards
+          null, // tail
+          null, // last
+          undefined
+        );
+        break;
       }
 
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  };
-
-  updateHostContainer = function(workInProgress) {
-    var portalOrRoot = workInProgress.stateNode;
-    var childrenUnchanged = workInProgress.firstEffect === null;
-
-    if (childrenUnchanged);
-    else {
-      var container = portalOrRoot.containerInfo;
-      var newChildSet = createContainerChildSet(container); // If children might have changed, we have to add them all to the set.
-
-      appendAllChildrenToContainer(newChildSet, workInProgress, false, false);
-      portalOrRoot.pendingChildren = newChildSet; // Schedule an update on the container to swap out the container.
-
-      markUpdate(workInProgress);
-      finalizeContainerChildren(container, newChildSet);
-    }
-  };
-
-  updateHostComponent$1 = function(
-    current,
-    workInProgress,
-    type,
-    newProps,
-    rootContainerInstance
-  ) {
-    var currentInstance = current.stateNode;
-    var oldProps = current.memoizedProps; // If there are no effects associated with this node, then none of our children had any updates.
-    // This guarantees that we can reuse all of them.
-
-    var childrenUnchanged = workInProgress.firstEffect === null;
-
-    if (childrenUnchanged && oldProps === newProps) {
-      // No changes, just reuse the existing instance.
-      // Note that this might release a previous clone.
-      workInProgress.stateNode = currentInstance;
-      return;
+      default: {
+        // The default reveal order is the same as not having
+        // a boundary.
+        workInProgress.memoizedState = null;
+      }
     }
+  }
 
-    var recyclableInstance = workInProgress.stateNode;
-    var currentHostContext = getHostContext();
-    var updatePayload = null;
-
-    if (oldProps !== newProps) {
-      updatePayload = prepareUpdate(
-        recyclableInstance,
-        type,
-        oldProps,
-        newProps
-      );
-    }
+  return workInProgress.child;
+}
 
-    if (childrenUnchanged && updatePayload === null) {
-      // No changes, just reuse the existing instance.
-      // Note that this might release a previous clone.
-      workInProgress.stateNode = currentInstance;
-      return;
-    }
+function updatePortalComponent(current, workInProgress, renderLanes) {
+  pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+  var nextChildren = workInProgress.pendingProps;
 
-    var newInstance = cloneInstance(
-      currentInstance,
-      updatePayload,
-      type,
-      oldProps,
-      newProps,
+  if (current === null) {
+    // Portals are special because we don't append the children during mount
+    // but at commit. Therefore we need to track insertions which the normal
+    // flow doesn't do during mount. This doesn't happen at the root because
+    // the root always starts with a "current" with a null child.
+    // TODO: Consider unifying this with how the root works.
+    workInProgress.child = reconcileChildFibers(
       workInProgress,
-      childrenUnchanged
+      null,
+      nextChildren,
+      renderLanes
     );
+  } else {
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  }
 
-    workInProgress.stateNode = newInstance;
-
-    if (childrenUnchanged) {
-      // If there are no other effects in this tree, we need to flag this node as having one.
-      // Even though we're not going to use it for anything.
-      // Otherwise parents won't know that there are new children to propagate upwards.
-      markUpdate(workInProgress);
-    } else {
-      // If children might have changed, we have to add them all to the set.
-      appendAllChildren(newInstance, workInProgress, false, false);
-    }
-  };
-
-  updateHostText$1 = function(current, workInProgress, oldText, newText) {
-    if (oldText !== newText) {
-      // If the text content differs, we'll create a new text instance for it.
-      var rootContainerInstance = getRootHostContainer();
-      var currentHostContext = getHostContext();
-      workInProgress.stateNode = createTextInstance(
-        newText,
-        rootContainerInstance,
-        currentHostContext,
-        workInProgress
-      ); // We'll have to mark it as having an effect, even though we won't use the effect for anything.
-      // This lets the parents know that at least one of their children has changed.
-
-      markUpdate(workInProgress);
-    } else {
-      workInProgress.stateNode = current.stateNode;
-    }
-  };
+  return workInProgress.child;
 }
 
-function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
-  switch (renderState.tailMode) {
-    case "hidden": {
-      // Any insertions at the end of the tail list after this point
-      // should be invisible. If there are already mounted boundaries
-      // anything before them are not considered for collapsing.
-      // Therefore we need to go through the whole tail to find if
-      // there are any.
-      var tailNode = renderState.tail;
-      var lastTailNode = null;
+var hasWarnedAboutUsingNoValuePropOnContextProvider = false;
 
-      while (tailNode !== null) {
-        if (tailNode.alternate !== null) {
-          lastTailNode = tailNode;
-        }
+function updateContextProvider(current, workInProgress, renderLanes) {
+  var providerType = workInProgress.type;
+  var context = providerType._context;
+  var newProps = workInProgress.pendingProps;
+  var oldProps = workInProgress.memoizedProps;
+  var newValue = newProps.value;
 
-        tailNode = tailNode.sibling;
-      } // Next we're simply going to delete all insertions after the
-      // last rendered item.
+  {
+    if (!("value" in newProps)) {
+      if (!hasWarnedAboutUsingNoValuePropOnContextProvider) {
+        hasWarnedAboutUsingNoValuePropOnContextProvider = true;
 
-      if (lastTailNode === null) {
-        // All remaining items in the tail are insertions.
-        renderState.tail = null;
-      } else {
-        // Detach the insertion after the last node that was already
-        // inserted.
-        lastTailNode.sibling = null;
+        error(
+          "The `value` prop is required for the `<Context.Provider>`. Did you misspell it or forget to pass it?"
+        );
       }
-
-      break;
     }
 
-    case "collapsed": {
-      // Any insertions at the end of the tail list after this point
-      // should be invisible. If there are already mounted boundaries
-      // anything before them are not considered for collapsing.
-      // Therefore we need to go through the whole tail to find if
-      // there are any.
-      var _tailNode = renderState.tail;
-      var _lastTailNode = null;
+    var providerPropTypes = workInProgress.type.propTypes;
 
-      while (_tailNode !== null) {
-        if (_tailNode.alternate !== null) {
-          _lastTailNode = _tailNode;
-        }
+    if (providerPropTypes) {
+      checkPropTypes(providerPropTypes, newProps, "prop", "Context.Provider");
+    }
+  }
 
-        _tailNode = _tailNode.sibling;
-      } // Next we're simply going to delete all insertions after the
-      // last rendered item.
+  pushProvider(workInProgress, context, newValue);
 
-      if (_lastTailNode === null) {
-        // All remaining items in the tail are insertions.
-        if (!hasRenderedATailFallback && renderState.tail !== null) {
-          // We suspended during the head. We want to show at least one
-          // row at the tail. So we'll keep on and cut off the rest.
-          renderState.tail.sibling = null;
-        } else {
-          renderState.tail = null;
+  {
+    if (oldProps !== null) {
+      var oldValue = oldProps.value;
+
+      if (objectIs(oldValue, newValue)) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children && !hasContextChanged()) {
+          return bailoutOnAlreadyFinishedWork(
+            current,
+            workInProgress,
+            renderLanes
+          );
         }
       } else {
-        // Detach the insertion after the last node that was already
-        // inserted.
-        _lastTailNode.sibling = null;
+        // The context value changed. Search for matching consumers and schedule
+        // them to update.
+        propagateContextChange(workInProgress, context, renderLanes);
       }
-
-      break;
     }
   }
+
+  var newChildren = newProps.children;
+  reconcileChildren(current, workInProgress, newChildren, renderLanes);
+  return workInProgress.child;
 }
 
-function completeWork(current, workInProgress, renderLanes) {
-  var newProps = workInProgress.pendingProps;
+var hasWarnedAboutUsingContextAsConsumer = false;
 
-  switch (workInProgress.tag) {
-    case IndeterminateComponent:
-    case LazyComponent:
-    case SimpleMemoComponent:
-    case FunctionComponent:
-    case ForwardRef:
-    case Fragment:
-    case Mode:
-    case Profiler:
-    case ContextConsumer:
-    case MemoComponent:
-      return null;
+function updateContextConsumer(current, workInProgress, renderLanes) {
+  var context = workInProgress.type; // The logic below for Context differs depending on PROD or DEV mode. In
+  // DEV mode, we create a separate object for Context.Consumer that acts
+  // like a proxy to Context. This proxy object adds unnecessary code in PROD
+  // so we use the old behaviour (Context.Consumer references Context) to
+  // reduce size and overhead. The separate object references context via
+  // a property called "_context", which also gives us the ability to check
+  // in DEV mode if this property exists or not and warn if it does not.
 
-    case ClassComponent: {
-      var Component = workInProgress.type;
+  {
+    if (context._context === undefined) {
+      // This may be because it's a Context (rather than a Consumer).
+      // Or it may be because it's older React where they're the same thing.
+      // We only want to warn if we're sure it's a new React.
+      if (context !== context.Consumer) {
+        if (!hasWarnedAboutUsingContextAsConsumer) {
+          hasWarnedAboutUsingContextAsConsumer = true;
 
-      if (isContextProvider(Component)) {
-        popContext(workInProgress);
+          error(
+            "Rendering <Context> directly is not supported and will be removed in " +
+              "a future major release. Did you mean to render <Context.Consumer> instead?"
+          );
+        }
       }
+    } else {
+      context = context._context;
+    }
+  }
 
-      return null;
+  var newProps = workInProgress.pendingProps;
+  var render = newProps.children;
+
+  {
+    if (typeof render !== "function") {
+      error(
+        "A context consumer was rendered with multiple children, or a child " +
+          "that isn't a function. A context consumer expects a single child " +
+          "that is a function. If you did pass a function, make sure there " +
+          "is no trailing or leading whitespace around it."
+      );
     }
+  }
 
-    case HostRoot: {
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      resetWorkInProgressVersions();
-      var fiberRoot = workInProgress.stateNode;
+  prepareToReadContext(workInProgress, renderLanes);
+  var newValue = readContext(context);
 
-      if (fiberRoot.pendingContext) {
-        fiberRoot.context = fiberRoot.pendingContext;
-        fiberRoot.pendingContext = null;
-      }
+  var newChildren;
 
-      if (current === null || current.child === null) {
-        // If we hydrated, pop so that we can delete any remaining children
-        // that weren't hydrated.
-        var wasHydrated = popHydrationState();
+  {
+    ReactCurrentOwner$1.current = workInProgress;
+    setIsRendering(true);
+    newChildren = render(newValue);
+    setIsRendering(false);
+  }
 
-        if (wasHydrated) {
-          // If we hydrated, then we'll need to schedule an update for
-          // the commit side-effects on the root.
-          markUpdate(workInProgress);
-        } else if (!fiberRoot.hydrate) {
-          // Schedule an effect to clear this container at the start of the next commit.
-          // This handles the case of React rendering into a container with previous children.
-          // It's also safe to do for updates too, because current.child would only be null
-          // if the previous render was null (so the the container would already be empty).
-          workInProgress.flags |= Snapshot;
-        }
-      }
+  workInProgress.flags |= PerformedWork;
+  reconcileChildren(current, workInProgress, newChildren, renderLanes);
+  return workInProgress.child;
+}
 
-      updateHostContainer(workInProgress);
-      return null;
-    }
+function markWorkInProgressReceivedUpdate() {
+  didReceiveUpdate = true;
+}
 
-    case HostComponent: {
-      popHostContext(workInProgress);
-      var rootContainerInstance = getRootHostContainer();
-      var type = workInProgress.type;
+function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
+  if (current !== null) {
+    // Reuse previous dependencies
+    workInProgress.dependencies = current.dependencies;
+  }
 
-      if (current !== null && workInProgress.stateNode != null) {
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          type,
-          newProps,
-          rootContainerInstance
-        );
+  {
+    // Don't update "base" render times for bailouts.
+    stopProfilerTimerIfRunning();
+  }
 
-        if (current.ref !== workInProgress.ref) {
-          markRef$1(workInProgress);
-        }
-      } else {
-        if (!newProps) {
-          if (!(workInProgress.stateNode !== null)) {
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          } // This can happen when we abort work.
+  markSkippedUpdateLanes(workInProgress.lanes); // Check if the children have any pending work.
 
-          return null;
-        }
+  if (!includesSomeLane(renderLanes, workInProgress.childLanes)) {
+    // The children don't have any work either. We can skip them.
+    // TODO: Once we add back resuming, we should check if the children are
+    // a work-in-progress set. If so, we need to transfer their effects.
+    {
+      return null;
+    }
+  } // This fiber doesn't have work, but its subtree does. Clone the child
+  // fibers and continue.
 
-        var currentHostContext = getHostContext(); // TODO: Move createInstance to beginWork and keep it on a context
-        // "stack" as the parent. Then append children as we go in beginWork
-        // or completeWork depending on whether we want to add them top->down or
-        // bottom->up. Top->down is faster in IE11.
+  cloneChildFibers(current, workInProgress);
+  return workInProgress.child;
+}
 
-        var _wasHydrated = popHydrationState();
+function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
+  {
+    var returnFiber = oldWorkInProgress.return;
 
-        if (_wasHydrated) {
-          // TODO: Move this and createInstance step into the beginPhase
-          // to consolidate.
-          if (prepareToHydrateHostInstance()) {
-            // If changes to the hydrated node need to be applied at the
-            // commit-phase we mark this as such.
-            markUpdate(workInProgress);
-          }
-        } else {
-          var instance = createInstance(
-            type,
-            newProps,
-            rootContainerInstance,
-            currentHostContext,
-            workInProgress
-          );
-          appendAllChildren(instance, workInProgress, false, false);
-          workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
-        }
+    if (returnFiber === null) {
+      throw new Error("Cannot swap the root fiber.");
+    } // Disconnect from the old current.
+    // It will get deleted.
+
+    current.alternate = null;
+    oldWorkInProgress.alternate = null; // Connect to the new tree.
 
-        if (workInProgress.ref !== null) {
-          // If there is a ref on a host node we need to schedule a callback
-          markRef$1(workInProgress);
+    newWorkInProgress.index = oldWorkInProgress.index;
+    newWorkInProgress.sibling = oldWorkInProgress.sibling;
+    newWorkInProgress.return = oldWorkInProgress.return;
+    newWorkInProgress.ref = oldWorkInProgress.ref; // Replace the child/sibling pointers above it.
+
+    if (oldWorkInProgress === returnFiber.child) {
+      returnFiber.child = newWorkInProgress;
+    } else {
+      var prevSibling = returnFiber.child;
+
+      if (prevSibling === null) {
+        throw new Error("Expected parent to have a child.");
+      }
+
+      while (prevSibling.sibling !== oldWorkInProgress) {
+        prevSibling = prevSibling.sibling;
+
+        if (prevSibling === null) {
+          throw new Error("Expected to find the previous sibling.");
         }
       }
 
-      return null;
+      prevSibling.sibling = newWorkInProgress;
+    } // Delete the old fiber and place the new one.
+    // Since the old fiber is disconnected, we have to schedule it manually.
+
+    var deletions = returnFiber.deletions;
+
+    if (deletions === null) {
+      returnFiber.deletions = [current];
+      returnFiber.flags |= ChildDeletion;
+    } else {
+      deletions.push(current);
     }
 
-    case HostText: {
-      var newText = newProps;
+    newWorkInProgress.flags |= Placement; // Restart work from the new fiber.
 
-      if (current && workInProgress.stateNode != null) {
-        var oldText = current.memoizedProps; // If we have an alternate, that means this is an update and we need
-        // to schedule a side-effect to do the updates.
+    return newWorkInProgress;
+  }
+}
 
-        updateHostText$1(current, workInProgress, oldText, newText);
-      } else {
-        if (typeof newText !== "string") {
-          if (!(workInProgress.stateNode !== null)) {
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          } // This can happen when we abort work.
-        }
+function checkScheduledUpdateOrContext(current, renderLanes) {
+  // Before performing an early bailout, we must check if there are pending
+  // updates or context.
+  var updateLanes = current.lanes;
 
-        var _rootContainerInstance = getRootHostContainer();
+  if (includesSomeLane(updateLanes, renderLanes)) {
+    return true;
+  } // No pending update, but because context is propagated lazily, we need
 
-        var _currentHostContext = getHostContext();
+  return false;
+}
 
-        var _wasHydrated2 = popHydrationState();
+function attemptEarlyBailoutIfNoScheduledUpdate(
+  current,
+  workInProgress,
+  renderLanes
+) {
+  // This fiber does not have any pending work. Bailout without entering
+  // the begin phase. There's still some bookkeeping we that needs to be done
+  // in this optimized path, mostly pushing stuff onto the stack.
+  switch (workInProgress.tag) {
+    case HostRoot:
+      pushHostRootContext(workInProgress);
+      break;
 
-        if (_wasHydrated2) {
-          if (prepareToHydrateHostTextInstance()) {
-            markUpdate(workInProgress);
-          }
-        } else {
-          workInProgress.stateNode = createTextInstance(
-            newText,
-            _rootContainerInstance,
-            _currentHostContext,
-            workInProgress
-          );
-        }
+    case HostComponent:
+      pushHostContext(workInProgress);
+      break;
+
+    case ClassComponent: {
+      var Component = workInProgress.type;
+
+      if (isContextProvider(Component)) {
+        pushContextProvider(workInProgress);
       }
 
-      return null;
+      break;
     }
 
-    case SuspenseComponent: {
-      popSuspenseContext(workInProgress);
-      var nextState = workInProgress.memoizedState;
+    case HostPortal:
+      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+      break;
 
-      if ((workInProgress.flags & DidCapture) !== NoFlags) {
-        // Something suspended. Re-render with the fallback children.
-        workInProgress.lanes = renderLanes; // Do not reset the effect list.
+    case ContextProvider: {
+      var newValue = workInProgress.memoizedProps.value;
+      var context = workInProgress.type._context;
+      pushProvider(workInProgress, context, newValue);
+      break;
+    }
 
-        if ((workInProgress.mode & ProfileMode) !== NoMode) {
-          transferActualDuration(workInProgress);
+    case Profiler:
+      {
+        // Profiler should only call onRender when one of its descendants actually rendered.
+        var hasChildWork = includesSomeLane(
+          renderLanes,
+          workInProgress.childLanes
+        );
+
+        if (hasChildWork) {
+          workInProgress.flags |= Update;
         }
 
-        return workInProgress;
+        {
+          // Reset effect durations for the next eventual effect phase.
+          // These are reset during render to allow the DevTools commit hook a chance to read them,
+          var stateNode = workInProgress.stateNode;
+          stateNode.effectDuration = 0;
+          stateNode.passiveEffectDuration = 0;
+        }
       }
 
-      var nextDidTimeout = nextState !== null;
-      var prevDidTimeout = false;
+      break;
 
-      if (current === null) {
-        if (workInProgress.memoizedProps.fallback !== undefined);
-      } else {
-        var prevState = current.memoizedState;
-        prevDidTimeout = prevState !== null;
-      }
+    case SuspenseComponent: {
+      var state = workInProgress.memoizedState;
 
-      if (nextDidTimeout && !prevDidTimeout) {
-        // If this subtreee is running in blocking mode we can suspend,
-        // otherwise we won't suspend.
-        // TODO: This will still suspend a synchronous tree if anything
-        // in the concurrent tree already suspended during this render.
-        // This is a known bug.
-        if ((workInProgress.mode & BlockingMode) !== NoMode) {
-          // TODO: Move this back to throwException because this is too late
-          // if this is a large tree which is common for initial loads. We
-          // don't know if we should restart a render or not until we get
-          // this marker, and this is too late.
-          // If this render already had a ping or lower pri updates,
-          // and this is the first time we know we're going to suspend we
-          // should be able to immediately restart from within throwException.
-          var hasInvisibleChildContext =
-            current === null &&
-            workInProgress.memoizedProps.unstable_avoidThisFallback !== true;
+      if (state !== null) {
+        // whether to retry the primary children, or to skip over it and
+        // go straight to the fallback. Check the priority of the primary
+        // child fragment.
 
-          if (
-            hasInvisibleChildContext ||
-            hasSuspenseContext(
-              suspenseStackCursor.current,
-              InvisibleParentSuspenseContext
-            )
-          ) {
-            // If this was in an invisible tree or a new render, then showing
-            // this boundary is ok.
-            renderDidSuspend();
+        var primaryChildFragment = workInProgress.child;
+        var primaryChildLanes = primaryChildFragment.childLanes;
+
+        if (includesSomeLane(renderLanes, primaryChildLanes)) {
+          // The primary children have pending work. Use the normal path
+          // to attempt to render the primary children again.
+          return updateSuspenseComponent(current, workInProgress, renderLanes);
+        } else {
+          // The primary child fragment does not have pending work marked
+          // on it
+          pushSuspenseContext(
+            workInProgress,
+            setDefaultShallowSuspenseContext(suspenseStackCursor.current)
+          ); // The primary children do not have pending work with sufficient
+          // priority. Bailout.
+
+          var child = bailoutOnAlreadyFinishedWork(
+            current,
+            workInProgress,
+            renderLanes
+          );
+
+          if (child !== null) {
+            // The fallback children have pending work. Skip over the
+            // primary children and work on the fallback.
+            return child.sibling;
           } else {
-            // Otherwise, we're going to have to hide content so we should
-            // suspend for longer if possible.
-            renderDidSuspendDelayIfPossible();
+            // Note: We can return `null` here because we already checked
+            // whether there were nested context consumers, via the call to
+            // `bailoutOnAlreadyFinishedWork` above.
+            return null;
           }
         }
+      } else {
+        pushSuspenseContext(
+          workInProgress,
+          setDefaultShallowSuspenseContext(suspenseStackCursor.current)
+        );
       }
 
-      {
-        // TODO: Only schedule updates if not prevDidTimeout.
-        if (nextDidTimeout) {
-          // If this boundary just timed out, schedule an effect to attach a
-          // retry listener to the promise. This flag is also used to hide the
-          // primary children.
-          workInProgress.flags |= Update;
-        }
-      }
-
-      return null;
+      break;
     }
 
-    case HostPortal:
-      popHostContainer(workInProgress);
-      updateHostContainer(workInProgress);
+    case SuspenseListComponent: {
+      var didSuspendBefore = (current.flags & DidCapture) !== NoFlags;
 
-      if (current === null) {
-        preparePortalMount(workInProgress.stateNode.containerInfo);
-      }
+      var _hasChildWork = includesSomeLane(
+        renderLanes,
+        workInProgress.childLanes
+      );
 
-      return null;
+      if (didSuspendBefore) {
+        if (_hasChildWork) {
+          // If something was in fallback state last time, and we have all the
+          // same children then we're still in progressive loading state.
+          // Something might get unblocked by state updates or retries in the
+          // tree which will affect the tail. So we need to use the normal
+          // path to compute the correct tail.
+          return updateSuspenseListComponent(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        } // If none of the children had any work, that means that none of
+        // them got retried so they'll still be blocked in the same way
+        // as before. We can fast bail out.
 
-    case ContextProvider:
-      // Pop provider fiber
-      popProvider(workInProgress);
-      return null;
+        workInProgress.flags |= DidCapture;
+      } // If nothing suspended before and we're rendering the same children,
+      // then the tail doesn't matter. Anything new that suspends will work
+      // in the "together" mode, so we can continue from the state we had.
 
-    case IncompleteClassComponent: {
-      // Same as class component case. I put it down here so that the tags are
-      // sequential to ensure this switch is compiled to a jump table.
-      var _Component = workInProgress.type;
+      var renderState = workInProgress.memoizedState;
 
-      if (isContextProvider(_Component)) {
-        popContext(workInProgress);
+      if (renderState !== null) {
+        // Reset to the "together" mode in case we've started a different
+        // update in the past but didn't complete it.
+        renderState.rendering = null;
+        renderState.tail = null;
+        renderState.lastEffect = null;
       }
 
-      return null;
-    }
-
-    case SuspenseListComponent: {
-      popSuspenseContext(workInProgress);
-      var renderState = workInProgress.memoizedState;
+      pushSuspenseContext(workInProgress, suspenseStackCursor.current);
 
-      if (renderState === null) {
-        // We're running in the default, "independent" mode.
-        // We don't do anything in this mode.
+      if (_hasChildWork) {
+        break;
+      } else {
+        // If none of the children had any work, that means that none of
+        // them got retried so they'll still be blocked in the same way
+        // as before. We can fast bail out.
         return null;
       }
+    }
 
-      var didSuspendAlready = (workInProgress.flags & DidCapture) !== NoFlags;
-      var renderedTail = renderState.rendering;
+    case OffscreenComponent:
+    case LegacyHiddenComponent: {
+      // Need to check if the tree still needs to be deferred. This is
+      // almost identical to the logic used in the normal update path,
+      // so we'll just enter that. The only difference is we'll bail out
+      // at the next level instead of this one, because the child props
+      // have not changed. Which is fine.
+      // TODO: Probably should refactor `beginWork` to split the bailout
+      // path from the normal path. I'm tempted to do a labeled break here
+      // but I won't :)
+      workInProgress.lanes = NoLanes;
+      return updateOffscreenComponent(current, workInProgress, renderLanes);
+    }
+  }
 
-      if (renderedTail === null) {
-        // We just rendered the head.
-        if (!didSuspendAlready) {
-          // This is the first pass. We need to figure out if anything is still
-          // suspended in the rendered set.
-          // If new content unsuspended, but there's still some content that
-          // didn't. Then we need to do a second pass that forces everything
-          // to keep showing their fallbacks.
-          // We might be suspended if something in this render pass suspended, or
-          // something in the previous committed pass suspended. Otherwise,
-          // there's no chance so we can skip the expensive call to
-          // findFirstSuspended.
-          var cannotBeSuspended =
-            renderHasNotSuspendedYet() &&
-            (current === null || (current.flags & DidCapture) === NoFlags);
+  return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+}
+
+function beginWork(current, workInProgress, renderLanes) {
+  {
+    if (workInProgress._debugNeedsRemount && current !== null) {
+      // This will restart the begin phase with a new fiber.
+      return remountFiber(
+        current,
+        workInProgress,
+        createFiberFromTypeAndProps(
+          workInProgress.type,
+          workInProgress.key,
+          workInProgress.pendingProps,
+          workInProgress._debugOwner || null,
+          workInProgress.mode,
+          workInProgress.lanes
+        )
+      );
+    }
+  }
+
+  if (current !== null) {
+    var oldProps = current.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+
+    if (
+      oldProps !== newProps ||
+      hasContextChanged() || // Force a re-render if the implementation changed due to hot reload:
+      workInProgress.type !== current.type
+    ) {
+      // If props or context changed, mark the fiber as having performed work.
+      // This may be unset if the props are determined to be equal later (memo).
+      didReceiveUpdate = true;
+    } else {
+      // Neither props nor legacy context changes. Check if there's a pending
+      // update or context change.
+      var hasScheduledUpdateOrContext = checkScheduledUpdateOrContext(
+        current,
+        renderLanes
+      );
+
+      if (
+        !hasScheduledUpdateOrContext && // If this is the second pass of an error or suspense boundary, there
+        // may not be work scheduled on `current`, so we check for this flag.
+        (workInProgress.flags & DidCapture) === NoFlags
+      ) {
+        // No pending updates or context. Bail out now.
+        didReceiveUpdate = false;
+        return attemptEarlyBailoutIfNoScheduledUpdate(
+          current,
+          workInProgress,
+          renderLanes
+        );
+      }
 
-          if (!cannotBeSuspended) {
-            var row = workInProgress.child;
+      if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
+        // This is a special case that only exists for legacy mode.
+        // See https://github.com/facebook/react/pull/19216.
+        didReceiveUpdate = true;
+      } else {
+        // An update was scheduled on this fiber, but there are no new props
+        // nor legacy context. Set this to false. If an update queue or context
+        // consumer produces a changed value, it will set this to true. Otherwise,
+        // the component will assume the children have not changed and bail out.
+        didReceiveUpdate = false;
+      }
+    }
+  } else {
+    didReceiveUpdate = false;
+  } // Before entering the begin phase, clear pending update priority.
+  // TODO: This assumes that we're about to evaluate the component and process
+  // the update queue. However, there's an exception: SimpleMemoComponent
+  // sometimes bails out later in the begin phase. This indicates that we should
+  // move this assignment out of the common path and into each branch.
 
-            while (row !== null) {
-              var suspended = findFirstSuspended(row);
+  workInProgress.lanes = NoLanes;
 
-              if (suspended !== null) {
-                didSuspendAlready = true;
-                workInProgress.flags |= DidCapture;
-                cutOffTailIfNeeded(renderState, false); // If this is a newly suspended tree, it might not get committed as
-                // part of the second pass. In that case nothing will subscribe to
-                // its thennables. Instead, we'll transfer its thennables to the
-                // SuspenseList so that it can retry if they resolve.
-                // There might be multiple of these in the list but since we're
-                // going to wait for all of them anyway, it doesn't really matter
-                // which ones gets to ping. In theory we could get clever and keep
-                // track of how many dependencies remain but it gets tricky because
-                // in the meantime, we can add/remove/change items and dependencies.
-                // We might bail out of the loop before finding any but that
-                // doesn't matter since that means that the other boundaries that
-                // we did find already has their listeners attached.
+  switch (workInProgress.tag) {
+    case IndeterminateComponent: {
+      return mountIndeterminateComponent(
+        current,
+        workInProgress,
+        workInProgress.type,
+        renderLanes
+      );
+    }
 
-                var newThennables = suspended.updateQueue;
+    case LazyComponent: {
+      var elementType = workInProgress.elementType;
+      return mountLazyComponent(
+        current,
+        workInProgress,
+        elementType,
+        renderLanes
+      );
+    }
 
-                if (newThennables !== null) {
-                  workInProgress.updateQueue = newThennables;
-                  workInProgress.flags |= Update;
-                } // Rerender the whole list, but this time, we'll force fallbacks
-                // to stay in place.
-                // Reset the effect list before doing the second pass since that's now invalid.
+    case FunctionComponent: {
+      var Component = workInProgress.type;
+      var unresolvedProps = workInProgress.pendingProps;
+      var resolvedProps =
+        workInProgress.elementType === Component
+          ? unresolvedProps
+          : resolveDefaultProps(Component, unresolvedProps);
+      return updateFunctionComponent(
+        current,
+        workInProgress,
+        Component,
+        resolvedProps,
+        renderLanes
+      );
+    }
 
-                if (renderState.lastEffect === null) {
-                  workInProgress.firstEffect = null;
-                }
+    case ClassComponent: {
+      var _Component = workInProgress.type;
+      var _unresolvedProps = workInProgress.pendingProps;
 
-                workInProgress.lastEffect = renderState.lastEffect; // Reset the child fibers to their original state.
+      var _resolvedProps =
+        workInProgress.elementType === _Component
+          ? _unresolvedProps
+          : resolveDefaultProps(_Component, _unresolvedProps);
 
-                resetChildFibers(workInProgress, renderLanes); // Set up the Suspense Context to force suspense and immediately
-                // rerender the children.
+      return updateClassComponent(
+        current,
+        workInProgress,
+        _Component,
+        _resolvedProps,
+        renderLanes
+      );
+    }
 
-                pushSuspenseContext(
-                  workInProgress,
-                  setShallowSuspenseContext(
-                    suspenseStackCursor.current,
-                    ForceSuspenseFallback
-                  )
-                );
-                return workInProgress.child;
-              }
+    case HostRoot:
+      return updateHostRoot(current, workInProgress, renderLanes);
 
-              row = row.sibling;
-            }
-          }
+    case HostComponent:
+      return updateHostComponent$1(current, workInProgress, renderLanes);
 
-          if (renderState.tail !== null && now() > getRenderTargetTime()) {
-            // We have already passed our CPU deadline but we still have rows
-            // left in the tail. We'll just give up further attempts to render
-            // the main content and only render fallbacks.
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true;
-            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
-            // to get it started back up to attempt the next item. While in terms
-            // of priority this work has the same priority as this current render,
-            // it's not part of the same transition once the transition has
-            // committed. If it's sync, we still want to yield so that it can be
-            // painted. Conceptually, this is really the same as pinging.
-            // We can use any RetryLane even if it's the one currently rendering
-            // since we're leaving it behind on this node.
+    case HostText:
+      return updateHostText$1();
 
-            workInProgress.lanes = SomeRetryLane;
+    case SuspenseComponent:
+      return updateSuspenseComponent(current, workInProgress, renderLanes);
 
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
-          }
-        } else {
-          cutOffTailIfNeeded(renderState, false);
-        } // Next we're going to render the tail.
-      } else {
-        // Append the rendered row to the child list.
-        if (!didSuspendAlready) {
-          var _suspended = findFirstSuspended(renderedTail);
+    case HostPortal:
+      return updatePortalComponent(current, workInProgress, renderLanes);
 
-          if (_suspended !== null) {
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true; // Ensure we transfer the update queue to the parent so that it doesn't
-            // get lost if this row ends up dropped during a second pass.
+    case ForwardRef: {
+      var type = workInProgress.type;
+      var _unresolvedProps2 = workInProgress.pendingProps;
 
-            var _newThennables = _suspended.updateQueue;
+      var _resolvedProps2 =
+        workInProgress.elementType === type
+          ? _unresolvedProps2
+          : resolveDefaultProps(type, _unresolvedProps2);
 
-            if (_newThennables !== null) {
-              workInProgress.updateQueue = _newThennables;
-              workInProgress.flags |= Update;
-            }
+      return updateForwardRef(
+        current,
+        workInProgress,
+        type,
+        _resolvedProps2,
+        renderLanes
+      );
+    }
 
-            cutOffTailIfNeeded(renderState, true); // This might have been modified.
+    case Fragment:
+      return updateFragment(current, workInProgress, renderLanes);
 
-            if (
-              renderState.tail === null &&
-              renderState.tailMode === "hidden" &&
-              !renderedTail.alternate &&
-              !getIsHydrating() // We don't cut it if we're hydrating.
-            ) {
-              // We need to delete the row we just rendered.
-              // Reset the effect list to what it was before we rendered this
-              // child. The nested children have already appended themselves.
-              var lastEffect = (workInProgress.lastEffect =
-                renderState.lastEffect); // Remove any effects that were appended after this point.
+    case Mode:
+      return updateMode(current, workInProgress, renderLanes);
 
-              if (lastEffect !== null) {
-                lastEffect.nextEffect = null;
-              } // We're done.
+    case Profiler:
+      return updateProfiler(current, workInProgress, renderLanes);
 
-              return null;
-            }
-          } else if (
-            // The time it took to render last row is greater than the remaining
-            // time we have to render. So rendering one more row would likely
-            // exceed it.
-            now() * 2 - renderState.renderingStartTime >
-              getRenderTargetTime() &&
-            renderLanes !== OffscreenLane
-          ) {
-            // We have now passed our CPU deadline and we'll just give up further
-            // attempts to render the main content and only render fallbacks.
-            // The assumption is that this is usually faster.
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true;
-            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
-            // to get it started back up to attempt the next item. While in terms
-            // of priority this work has the same priority as this current render,
-            // it's not part of the same transition once the transition has
-            // committed. If it's sync, we still want to yield so that it can be
-            // painted. Conceptually, this is really the same as pinging.
-            // We can use any RetryLane even if it's the one currently rendering
-            // since we're leaving it behind on this node.
+    case ContextProvider:
+      return updateContextProvider(current, workInProgress, renderLanes);
 
-            workInProgress.lanes = SomeRetryLane;
+    case ContextConsumer:
+      return updateContextConsumer(current, workInProgress, renderLanes);
 
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
-          }
-        }
+    case MemoComponent: {
+      var _type2 = workInProgress.type;
+      var _unresolvedProps3 = workInProgress.pendingProps; // Resolve outer props first, then resolve inner props.
 
-        if (renderState.isBackwards) {
-          // The effect list of the backwards tail will have been added
-          // to the end. This breaks the guarantee that life-cycles fire in
-          // sibling order but that isn't a strong guarantee promised by React.
-          // Especially since these might also just pop in during future commits.
-          // Append to the beginning of the list.
-          renderedTail.sibling = workInProgress.child;
-          workInProgress.child = renderedTail;
-        } else {
-          var previousSibling = renderState.last;
+      var _resolvedProps3 = resolveDefaultProps(_type2, _unresolvedProps3);
 
-          if (previousSibling !== null) {
-            previousSibling.sibling = renderedTail;
-          } else {
-            workInProgress.child = renderedTail;
-          }
+      {
+        if (workInProgress.type !== workInProgress.elementType) {
+          var outerPropTypes = _type2.propTypes;
 
-          renderState.last = renderedTail;
+          if (outerPropTypes) {
+            checkPropTypes(
+              outerPropTypes,
+              _resolvedProps3, // Resolved for outer only
+              "prop",
+              getComponentNameFromType(_type2)
+            );
+          }
         }
       }
 
-      if (renderState.tail !== null) {
-        // We still have tail rows to render.
-        // Pop a row.
-        var next = renderState.tail;
-        renderState.rendering = next;
-        renderState.tail = next.sibling;
-        renderState.lastEffect = workInProgress.lastEffect;
-        renderState.renderingStartTime = now();
-        next.sibling = null; // Restore the context.
-        // TODO: We can probably just avoid popping it instead and only
-        // setting it the first time we go from not suspended to suspended.
-
-        var suspenseContext = suspenseStackCursor.current;
-
-        if (didSuspendAlready) {
-          suspenseContext = setShallowSuspenseContext(
-            suspenseContext,
-            ForceSuspenseFallback
-          );
-        } else {
-          suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
-        }
+      _resolvedProps3 = resolveDefaultProps(_type2.type, _resolvedProps3);
+      return updateMemoComponent(
+        current,
+        workInProgress,
+        _type2,
+        _resolvedProps3,
+        renderLanes
+      );
+    }
 
-        pushSuspenseContext(workInProgress, suspenseContext); // Do a pass over the next row.
+    case SimpleMemoComponent: {
+      return updateSimpleMemoComponent(
+        current,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderLanes
+      );
+    }
 
-        return next;
-      }
+    case IncompleteClassComponent: {
+      var _Component2 = workInProgress.type;
+      var _unresolvedProps4 = workInProgress.pendingProps;
 
-      return null;
+      var _resolvedProps4 =
+        workInProgress.elementType === _Component2
+          ? _unresolvedProps4
+          : resolveDefaultProps(_Component2, _unresolvedProps4);
+
+      return mountIncompleteClassComponent(
+        current,
+        workInProgress,
+        _Component2,
+        _resolvedProps4,
+        renderLanes
+      );
     }
 
-    case FundamentalComponent: {
-      break;
+    case SuspenseListComponent: {
+      return updateSuspenseListComponent(current, workInProgress, renderLanes);
     }
 
     case ScopeComponent: {
       break;
     }
 
-    case Block:
-      break;
+    case OffscreenComponent: {
+      return updateOffscreenComponent(current, workInProgress, renderLanes);
+    }
 
-    case OffscreenComponent:
     case LegacyHiddenComponent: {
-      popRenderLanes(workInProgress);
-
-      if (current !== null) {
-        var _nextState = workInProgress.memoizedState;
-        var _prevState = current.memoizedState;
-        var prevIsHidden = _prevState !== null;
-        var nextIsHidden = _nextState !== null;
-
-        if (
-          prevIsHidden !== nextIsHidden &&
-          newProps.mode !== "unstable-defer-without-hiding"
-        ) {
-          workInProgress.flags |= Update;
-        }
-      }
-
-      return null;
+      return updateLegacyHiddenComponent(current, workInProgress, renderLanes);
     }
   }
 
@@ -15771,12 +17086,17 @@ function unwindWork(workInProgress, renderLanes) {
       return null;
 
     case ContextProvider:
-      popProvider(workInProgress);
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
       return null;
 
     case OffscreenComponent:
     case LegacyHiddenComponent:
       popRenderLanes(workInProgress);
+
+      return null;
+
+    case CacheComponent:
       return null;
 
     default:
@@ -15784,7 +17104,7 @@ function unwindWork(workInProgress, renderLanes) {
   }
 }
 
-function unwindInterruptedWork(interruptedWork) {
+function unwindInterruptedWork(interruptedWork, renderLanes) {
   switch (interruptedWork.tag) {
     case ClassComponent: {
       var childContextTypes = interruptedWork.type.childContextTypes;
@@ -15821,1314 +17141,1758 @@ function unwindInterruptedWork(interruptedWork) {
       break;
 
     case ContextProvider:
-      popProvider(interruptedWork);
+      var context = interruptedWork.type._context;
+      popProvider(context, interruptedWork);
       break;
 
     case OffscreenComponent:
     case LegacyHiddenComponent:
       popRenderLanes(interruptedWork);
+
       break;
   }
 }
 
-function createCapturedValue(value, source) {
-  // If the value is an error, call this function immediately after it is thrown
-  // so the stack is accurate.
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+} // Used during the commit phase to track the state of the Offscreen component stack.
+var PossiblyWeakSet = typeof WeakSet === "function" ? WeakSet : Set;
+var nextEffect = null; // Used for Profiling builds to track updaters.
+
+var inProgressLanes = null;
+var inProgressRoot = null;
+
+function reportUncaughtErrorInDEV(error) {
+  // Wrapping each small part of the commit phase into a guarded
+  // callback is a bit too slow (https://github.com/facebook/react/pull/21666).
+  // But we rely on it to surface errors to DEV tools like overlays
+  // (https://github.com/facebook/react/issues/21712).
+  // As a compromise, rethrow only caught errors in a guard.
+  {
+    invokeGuardedCallback(null, function() {
+      throw error;
+    });
+    clearCaughtError();
+  }
 }
 
-if (
-  !(
-    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
-    "function"
-  )
+var callComponentWillUnmountWithTimer = function(current, instance) {
+  instance.props = current.memoizedProps;
+  instance.state = current.memoizedState;
+
+  if (current.mode & ProfileMode) {
+    try {
+      startLayoutEffectTimer();
+      instance.componentWillUnmount();
+    } finally {
+      recordLayoutEffectDuration(current);
+    }
+  } else {
+    instance.componentWillUnmount();
+  }
+}; // Capture errors so they don't interrupt mounting.
+
+function safelyCallComponentWillUnmount(
+  current,
+  nearestMountedAncestor,
+  instance
 ) {
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-}
+  try {
+    callComponentWillUnmountWithTimer(current, instance);
+  } catch (error) {
+    reportUncaughtErrorInDEV(error);
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
+  }
+} // Capture errors so they don't interrupt mounting.
 
-function showErrorDialog(boundary, errorInfo) {
-  var capturedError = {
-    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
-    error: errorInfo.value,
-    errorBoundary:
-      boundary !== null && boundary.tag === ClassComponent
-        ? boundary.stateNode
-        : null
-  };
-  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
-    capturedError
-  );
+function safelyDetachRef(current, nearestMountedAncestor) {
+  var ref = current.ref;
+
+  if (ref !== null) {
+    if (typeof ref === "function") {
+      try {
+        if (
+          enableProfilerTimer &&
+          enableProfilerCommitHooks &&
+          current.mode & ProfileMode
+        ) {
+          try {
+            startLayoutEffectTimer();
+            ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        } else {
+          ref(null);
+        }
+      } catch (error) {
+        reportUncaughtErrorInDEV(error);
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
+      }
+    } else {
+      ref.current = null;
+    }
+  }
 }
 
-function logCapturedError(boundary, errorInfo) {
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
   try {
-    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
-    // This enables renderers like ReactNative to better manage redbox behavior.
+    destroy();
+  } catch (error) {
+    reportUncaughtErrorInDEV(error);
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
+  }
+}
 
-    if (logError === false) {
+var focusedInstanceHandle = null;
+var shouldFireAfterActiveInstanceBlur = false;
+function commitBeforeMutationEffects(root, firstChild) {
+  focusedInstanceHandle = prepareForCommit(root.containerInfo);
+  nextEffect = firstChild;
+  commitBeforeMutationEffects_begin(); // We no longer need to track the active instance fiber
+
+  var shouldFire = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = false;
+  focusedInstanceHandle = null;
+  return shouldFire;
+}
+
+function commitBeforeMutationEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // This phase is only used for beforeActiveInstanceBlur.
+
+    var child = fiber.child;
+
+    if (
+      (fiber.subtreeFlags & BeforeMutationMask) !== NoFlags &&
+      child !== null
+    ) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitBeforeMutationEffects_complete();
+    }
+  }
+}
+
+function commitBeforeMutationEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
+
+    try {
+      commitBeforeMutationEffectsOnFiber(fiber);
+    } catch (error) {
+      reportUncaughtErrorInDEV(error);
+      captureCommitPhaseError(fiber, fiber.return, error);
+    }
+
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
       return;
     }
 
-    var error = errorInfo.value;
+    nextEffect = fiber.return;
+  }
+}
 
-    if (true) {
-      var source = errorInfo.source;
-      var stack = errorInfo.stack;
-      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
-      // `preventDefault()` in window `error` handler.
-      // We record this information as an expando on the error.
+function commitBeforeMutationEffectsOnFiber(finishedWork) {
+  var current = finishedWork.alternate;
+  var flags = finishedWork.flags;
 
-      if (error != null && error._suppressLogging) {
-        if (boundary.tag === ClassComponent) {
-          // The error is recoverable and was silenced.
-          // Ignore it and don't print the stack addendum.
-          // This is handy for testing error boundaries without noise.
-          return;
-        } // The error is fatal. Since the silencing might have
-        // been accidental, we'll surface it anyway.
-        // However, the browser would have silenced the original error
-        // so we'll print it first, and then print the stack addendum.
+  if ((flags & Snapshot) !== NoFlags) {
+    setCurrentFiber(finishedWork);
 
-        console["error"](error); // Don't transform to our wrapper
-        // For a more detailed description of this block, see:
-        // https://github.com/facebook/react/pull/13384
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        break;
       }
 
-      var componentName = source ? getComponentName(source.type) : null;
-      var componentNameMessage = componentName
-        ? "The above error occurred in the <" + componentName + "> component:"
-        : "The above error occurred in one of your React components:";
-      var errorBoundaryMessage;
-      var errorBoundaryName = getComponentName(boundary.type);
+      case ClassComponent: {
+        if (current !== null) {
+          var prevProps = current.memoizedProps;
+          var prevState = current.memoizedState;
+          var instance = finishedWork.stateNode; // We could update instance props and state here,
+          // but instead we rely on them being set during last render.
+          // TODO: revisit this when we implement resuming.
 
-      if (errorBoundaryName) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
+          {
+            if (
+              finishedWork.type === finishedWork.elementType &&
+              !didWarnAboutReassigningProps
+            ) {
+              if (instance.props !== finishedWork.memoizedProps) {
+                error(
+                  "Expected %s props to match memoized props before " +
+                    "getSnapshotBeforeUpdate. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.props`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+
+              if (instance.state !== finishedWork.memoizedState) {
+                error(
+                  "Expected %s state to match memoized state before " +
+                    "getSnapshotBeforeUpdate. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.state`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+            }
+          }
+
+          var snapshot = instance.getSnapshotBeforeUpdate(
+            finishedWork.elementType === finishedWork.type
+              ? prevProps
+              : resolveDefaultProps(finishedWork.type, prevProps),
+            prevState
+          );
+
+          {
+            var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+
+            if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
+              didWarnSet.add(finishedWork.type);
+
+              error(
+                "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                  "must be returned. You have returned undefined.",
+                getComponentNameFromFiber(finishedWork)
+              );
+            }
+          }
+
+          instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+        }
+
+        break;
       }
 
-      var combinedMessage =
-        componentNameMessage +
-        "\n" +
-        componentStack +
-        "\n\n" +
-        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
-      // We don't include the original error message and JS stack because the browser
-      // has already printed it. Even if the application swallows the error, it is still
-      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+      case HostRoot: {
+        break;
+      }
 
-      console["error"](combinedMessage); // Don't transform to our wrapper
-    } else {
-      // In production, we print the error directly.
-      // This will include the message, the JS stack, and anything the browser wants to show.
-      // We pass the error object instead of custom message so that the browser displays the error natively.
-      console["error"](error); // Don't transform to our wrapper
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+      case IncompleteClassComponent:
+        // Nothing to do for these component types
+        break;
+
+      default: {
+        {
+          throw Error(
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+        }
+      }
     }
-  } catch (e) {
-    // This method must not throw, or React internal state will get messed up.
-    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
-    // we want to report this error outside of the normal stack as a last resort.
-    // https://github.com/facebook/react/issues/13188
-    setTimeout(function() {
-      throw e;
-    });
+
+    resetCurrentFiber();
   }
 }
 
-var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
-
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
+  var updateQueue = finishedWork.updateQueue;
+  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
 
-  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
-  // being called "element".
+  if (lastEffect !== null) {
+    var firstEffect = lastEffect.next;
+    var effect = firstEffect;
 
-  update.payload = {
-    element: null
-  };
-  var error = errorInfo.value;
+    do {
+      if ((effect.tag & flags) === flags) {
+        // Unmount
+        var destroy = effect.destroy;
+        effect.destroy = undefined;
 
-  update.callback = function() {
-    onUncaughtError(error);
-    logCapturedError(fiber, errorInfo);
-  };
+        if (destroy !== undefined) {
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
+        }
+      }
 
-  return update;
+      effect = effect.next;
+    } while (effect !== firstEffect);
+  }
 }
 
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane);
-  update.tag = CaptureUpdate;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-
-  if (typeof getDerivedStateFromError === "function") {
-    var error$1 = errorInfo.value;
-
-    update.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error$1);
-    };
-  }
+function commitHookEffectListMount(tag, finishedWork) {
+  var updateQueue = finishedWork.updateQueue;
+  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
 
-  var inst = fiber.stateNode;
+  if (lastEffect !== null) {
+    var firstEffect = lastEffect.next;
+    var effect = firstEffect;
 
-  if (inst !== null && typeof inst.componentDidCatch === "function") {
-    update.callback = function callback() {
-      {
-        markFailedErrorBoundaryForHotReloading(fiber);
-      }
+    do {
+      if ((effect.tag & tag) === tag) {
+        // Mount
+        var create = effect.create;
+        effect.destroy = create();
 
-      if (typeof getDerivedStateFromError !== "function") {
-        // To preserve the preexisting retry behavior of error boundaries,
-        // we keep track of which ones already failed during this batch.
-        // This gets reset before we yield back to the browser.
-        // TODO: Warn in strict mode if getDerivedStateFromError is
-        // not defined.
-        markLegacyErrorBoundaryAsFailed(this); // Only log here if componentDidCatch is the only error boundary method defined
+        {
+          var destroy = effect.destroy;
 
-        logCapturedError(fiber, errorInfo);
-      }
+          if (destroy !== undefined && typeof destroy !== "function") {
+            var addendum = void 0;
 
-      var error$1 = errorInfo.value;
-      var stack = errorInfo.stack;
-      this.componentDidCatch(error$1, {
-        componentStack: stack !== null ? stack : ""
-      });
+            if (destroy === null) {
+              addendum =
+                " You returned null. If your effect does not require clean " +
+                "up, return undefined (or nothing).";
+            } else if (typeof destroy.then === "function") {
+              addendum =
+                "\n\nIt looks like you wrote useEffect(async () => ...) or returned a Promise. " +
+                "Instead, write the async function inside your effect " +
+                "and call it immediately:\n\n" +
+                "useEffect(() => {\n" +
+                "  async function fetchData() {\n" +
+                "    // You can await here\n" +
+                "    const response = await MyAPI.getData(someId);\n" +
+                "    // ...\n" +
+                "  }\n" +
+                "  fetchData();\n" +
+                "}, [someId]); // Or [] if effect doesn't need props or state\n\n" +
+                "Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching";
+            } else {
+              addendum = " You returned: " + destroy;
+            }
 
-      {
-        if (typeof getDerivedStateFromError !== "function") {
-          // If componentDidCatch is the only error boundary method defined,
-          // then it needs to call setState to recover from errors.
-          // If no state update is scheduled then the boundary will swallow the error.
-          if (!includesSomeLane(fiber.lanes, SyncLane)) {
             error(
-              "%s: Error boundaries should implement getDerivedStateFromError(). " +
-                "In that method, return a state update to display an error message or fallback UI.",
-              getComponentName(fiber.type) || "Unknown"
+              "An effect function must not return anything besides a function, " +
+                "which is used for clean-up.%s",
+              addendum
             );
           }
         }
       }
-    };
-  } else {
-    update.callback = function() {
-      markFailedErrorBoundaryForHotReloading(fiber);
-    };
-  }
 
-  return update;
+      effect = effect.next;
+    } while (effect !== firstEffect);
+  }
 }
 
-function attachPingListener(root, wakeable, lanes) {
-  // Attach a listener to the promise to "ping" the root and retry. But only if
-  // one does not already exist for the lanes we're currently rendering (which
-  // acts like a "thread ID" here).
-  var pingCache = root.pingCache;
-  var threadIDs;
+function commitPassiveEffectDurations(finishedRoot, finishedWork) {
+  {
+    // Only Profilers with work in their subtree will have an Update effect scheduled.
+    if ((finishedWork.flags & Update) !== NoFlags) {
+      switch (finishedWork.tag) {
+        case Profiler: {
+          var passiveEffectDuration =
+            finishedWork.stateNode.passiveEffectDuration;
+          var _finishedWork$memoize = finishedWork.memoizedProps,
+            id = _finishedWork$memoize.id,
+            onPostCommit = _finishedWork$memoize.onPostCommit; // This value will still reflect the previous commit phase.
+          // It does not get reset until the start of the next commit phase.
+
+          var commitTime = getCommitTime();
+          var phase = finishedWork.alternate === null ? "mount" : "update";
 
-  if (pingCache === null) {
-    pingCache = root.pingCache = new PossiblyWeakMap$1();
-    threadIDs = new Set();
-    pingCache.set(wakeable, threadIDs);
-  } else {
-    threadIDs = pingCache.get(wakeable);
+          {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
 
-    if (threadIDs === undefined) {
-      threadIDs = new Set();
-      pingCache.set(wakeable, threadIDs);
-    }
-  }
+          if (typeof onPostCommit === "function") {
+            onPostCommit(id, phase, passiveEffectDuration, commitTime);
+          } // Bubble times to the next nearest ancestor Profiler.
+          // After we process that Profiler, we'll bubble further up.
 
-  if (!threadIDs.has(lanes)) {
-    // Memoize using the thread ID to prevent redundant listeners.
-    threadIDs.add(lanes);
-    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
-    wakeable.then(ping, ping);
+          var parentFiber = finishedWork.return;
+
+          outer: while (parentFiber !== null) {
+            switch (parentFiber.tag) {
+              case HostRoot:
+                var root = parentFiber.stateNode;
+                root.passiveEffectDuration += passiveEffectDuration;
+                break outer;
+
+              case Profiler:
+                var parentStateNode = parentFiber.stateNode;
+                parentStateNode.passiveEffectDuration += passiveEffectDuration;
+                break outer;
+            }
+
+            parentFiber = parentFiber.return;
+          }
+
+          break;
+        }
+      }
+    }
   }
 }
 
-function throwException(
-  root,
-  returnFiber,
-  sourceFiber,
-  value,
-  rootRenderLanes
-) {
-  // The source fiber did not complete.
-  sourceFiber.flags |= Incomplete; // Its effect list is no longer valid.
+function commitLayoutEffectOnFiber(
+  finishedRoot,
+  current,
+  finishedWork,
+  committedLanes
+) {
+  if ((finishedWork.flags & LayoutMask) !== NoFlags) {
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        {
+          // At this point layout effects have already been destroyed (during mutation phase).
+          // This is done to prevent sibling component effects from interfering with each other,
+          // e.g. a destroy function in one component should never override a ref set
+          // by a create function in another component during the same commit.
+          if (finishedWork.mode & ProfileMode) {
+            try {
+              startLayoutEffectTimer();
+              commitHookEffectListMount(Layout | HasEffect, finishedWork);
+            } finally {
+              recordLayoutEffectDuration(finishedWork);
+            }
+          } else {
+            commitHookEffectListMount(Layout | HasEffect, finishedWork);
+          }
+        }
+
+        break;
+      }
+
+      case ClassComponent: {
+        var instance = finishedWork.stateNode;
+
+        if (finishedWork.flags & Update) {
+          {
+            if (current === null) {
+              // We could update instance props and state here,
+              // but instead we rely on them being set during last render.
+              // TODO: revisit this when we implement resuming.
+              {
+                if (
+                  finishedWork.type === finishedWork.elementType &&
+                  !didWarnAboutReassigningProps
+                ) {
+                  if (instance.props !== finishedWork.memoizedProps) {
+                    error(
+                      "Expected %s props to match memoized props before " +
+                        "componentDidMount. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.props`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
+
+                  if (instance.state !== finishedWork.memoizedState) {
+                    error(
+                      "Expected %s state to match memoized state before " +
+                        "componentDidMount. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.state`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
+                }
+              }
+
+              if (finishedWork.mode & ProfileMode) {
+                try {
+                  startLayoutEffectTimer();
+                  instance.componentDidMount();
+                } finally {
+                  recordLayoutEffectDuration(finishedWork);
+                }
+              } else {
+                instance.componentDidMount();
+              }
+            } else {
+              var prevProps =
+                finishedWork.elementType === finishedWork.type
+                  ? current.memoizedProps
+                  : resolveDefaultProps(
+                      finishedWork.type,
+                      current.memoizedProps
+                    );
+              var prevState = current.memoizedState; // We could update instance props and state here,
+              // but instead we rely on them being set during last render.
+              // TODO: revisit this when we implement resuming.
+
+              {
+                if (
+                  finishedWork.type === finishedWork.elementType &&
+                  !didWarnAboutReassigningProps
+                ) {
+                  if (instance.props !== finishedWork.memoizedProps) {
+                    error(
+                      "Expected %s props to match memoized props before " +
+                        "componentDidUpdate. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.props`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
+
+                  if (instance.state !== finishedWork.memoizedState) {
+                    error(
+                      "Expected %s state to match memoized state before " +
+                        "componentDidUpdate. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.state`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
+                }
+              }
+
+              if (finishedWork.mode & ProfileMode) {
+                try {
+                  startLayoutEffectTimer();
+                  instance.componentDidUpdate(
+                    prevProps,
+                    prevState,
+                    instance.__reactInternalSnapshotBeforeUpdate
+                  );
+                } finally {
+                  recordLayoutEffectDuration(finishedWork);
+                }
+              } else {
+                instance.componentDidUpdate(
+                  prevProps,
+                  prevState,
+                  instance.__reactInternalSnapshotBeforeUpdate
+                );
+              }
+            }
+          }
+        } // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
+
+        var updateQueue = finishedWork.updateQueue;
+
+        if (updateQueue !== null) {
+          {
+            if (
+              finishedWork.type === finishedWork.elementType &&
+              !didWarnAboutReassigningProps
+            ) {
+              if (instance.props !== finishedWork.memoizedProps) {
+                error(
+                  "Expected %s props to match memoized props before " +
+                    "processing the update queue. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.props`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+
+              if (instance.state !== finishedWork.memoizedState) {
+                error(
+                  "Expected %s state to match memoized state before " +
+                    "processing the update queue. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.state`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+            }
+          } // We could update instance props and state here,
+          // but instead we rely on them being set during last render.
+          // TODO: revisit this when we implement resuming.
+
+          commitUpdateQueue(finishedWork, updateQueue, instance);
+        }
 
-  sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        break;
+      }
 
-  if (
-    value !== null &&
-    typeof value === "object" &&
-    typeof value.then === "function"
-  ) {
-    // This is a wakeable.
-    var wakeable = value;
+      case HostRoot: {
+        // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
+        var _updateQueue = finishedWork.updateQueue;
+
+        if (_updateQueue !== null) {
+          var _instance = null;
+
+          if (finishedWork.child !== null) {
+            switch (finishedWork.child.tag) {
+              case HostComponent:
+                _instance = getPublicInstance(finishedWork.child.stateNode);
+                break;
+
+              case ClassComponent:
+                _instance = finishedWork.child.stateNode;
+                break;
+            }
+          }
 
-    if ((sourceFiber.mode & BlockingMode) === NoMode) {
-      // Reset the memoizedState to what it was before we attempted
-      // to render it.
-      var currentSource = sourceFiber.alternate;
+          commitUpdateQueue(finishedWork, _updateQueue, _instance);
+        }
 
-      if (currentSource) {
-        sourceFiber.updateQueue = currentSource.updateQueue;
-        sourceFiber.memoizedState = currentSource.memoizedState;
-        sourceFiber.lanes = currentSource.lanes;
-      } else {
-        sourceFiber.updateQueue = null;
-        sourceFiber.memoizedState = null;
+        break;
       }
-    }
 
-    var hasInvisibleParentBoundary = hasSuspenseContext(
-      suspenseStackCursor.current,
-      InvisibleParentSuspenseContext
-    ); // Schedule the nearest Suspense to re-render the timed out view.
+      case HostComponent: {
+        var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
+        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
+        // These effects should only be committed when components are first mounted,
+        // aka when there is no current/alternate.
 
-    var _workInProgress = returnFiber;
+        if (current === null && finishedWork.flags & Update) {
+          var type = finishedWork.type;
+          var props = finishedWork.memoizedProps;
+          commitMount();
+        }
 
-    do {
-      if (
-        _workInProgress.tag === SuspenseComponent &&
-        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
-      ) {
-        // Found the nearest boundary.
-        // Stash the promise on the boundary fiber. If the boundary times out, we'll
-        // attach another listener to flip the boundary back to its normal state.
-        var wakeables = _workInProgress.updateQueue;
+        break;
+      }
 
-        if (wakeables === null) {
-          var updateQueue = new Set();
-          updateQueue.add(wakeable);
-          _workInProgress.updateQueue = updateQueue;
-        } else {
-          wakeables.add(wakeable);
-        } // If the boundary is outside of blocking mode, we should *not*
-        // suspend the commit. Pretend as if the suspended component rendered
-        // null and keep rendering. In the commit phase, we'll schedule a
-        // subsequent synchronous update to re-render the Suspense.
-        //
-        // Note: It doesn't matter whether the component that suspended was
-        // inside a blocking mode tree. If the Suspense is outside of it, we
-        // should *not* suspend the commit.
+      case HostText: {
+        // We have no life-cycles associated with text.
+        break;
+      }
 
-        if ((_workInProgress.mode & BlockingMode) === NoMode) {
-          _workInProgress.flags |= DidCapture;
-          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
-          // But we shouldn't call any lifecycle methods or callbacks. Remove
-          // all lifecycle effect tags.
+      case HostPortal: {
+        // We have no life-cycles associated with portals.
+        break;
+      }
 
-          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+      case Profiler: {
+        {
+          var _finishedWork$memoize2 = finishedWork.memoizedProps,
+            onCommit = _finishedWork$memoize2.onCommit,
+            onRender = _finishedWork$memoize2.onRender;
+          var effectDuration = finishedWork.stateNode.effectDuration;
+          var commitTime = getCommitTime();
+          var phase = current === null ? "mount" : "update";
 
-          if (sourceFiber.tag === ClassComponent) {
-            var currentSourceFiber = sourceFiber.alternate;
+          {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
 
-            if (currentSourceFiber === null) {
-              // This is a new mount. Change the tag so it's not mistaken for a
-              // completed class component. For example, we should not call
-              // componentWillUnmount if it is deleted.
-              sourceFiber.tag = IncompleteClassComponent;
-            } else {
-              // When we try rendering again, we should not reuse the current fiber,
-              // since it's known to be in an inconsistent state. Use a force update to
-              // prevent a bail out.
-              var update = createUpdate(NoTimestamp, SyncLane);
-              update.tag = ForceUpdate;
-              enqueueUpdate(sourceFiber, update);
+          if (typeof onRender === "function") {
+            onRender(
+              finishedWork.memoizedProps.id,
+              phase,
+              finishedWork.actualDuration,
+              finishedWork.treeBaseDuration,
+              finishedWork.actualStartTime,
+              commitTime
+            );
+          }
+
+          {
+            if (typeof onCommit === "function") {
+              onCommit(
+                finishedWork.memoizedProps.id,
+                phase,
+                effectDuration,
+                commitTime
+              );
+            } // Schedule a passive effect for this Profiler to call onPostCommit hooks.
+            // This effect should be scheduled even if there is no onPostCommit callback for this Profiler,
+            // because the effect is also where times bubble to parent Profilers.
+
+            enqueuePendingPassiveProfilerEffect(finishedWork); // Propagate layout effect durations to the next nearest Profiler ancestor.
+            // Do not reset these values until the next render so DevTools has a chance to read them first.
+
+            var parentFiber = finishedWork.return;
+
+            outer: while (parentFiber !== null) {
+              switch (parentFiber.tag) {
+                case HostRoot:
+                  var root = parentFiber.stateNode;
+                  root.effectDuration += effectDuration;
+                  break outer;
+
+                case Profiler:
+                  var parentStateNode = parentFiber.stateNode;
+                  parentStateNode.effectDuration += effectDuration;
+                  break outer;
+              }
+
+              parentFiber = parentFiber.return;
             }
-          } // The source fiber did not complete. Mark it with Sync priority to
-          // indicate that it still has pending work.
+          }
+        }
 
-          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
+        break;
+      }
 
-          return;
-        } // Confirmed that the boundary is in a concurrent mode tree. Continue
-        // with the normal suspend path.
-        //
-        // After this we'll use a set of heuristics to determine whether this
-        // render pass will run to completion or restart or "suspend" the commit.
-        // The actual logic for this is spread out in different places.
-        //
-        // This first principle is that if we're going to suspend when we complete
-        // a root, then we should also restart if we get an update or ping that
-        // might unsuspend it, and vice versa. The only reason to suspend is
-        // because you think you might want to restart before committing. However,
-        // it doesn't make sense to restart only while in the period we're suspended.
-        //
-        // Restarting too aggressively is also not good because it starves out any
-        // intermediate loading state. So we use heuristics to determine when.
-        // Suspense Heuristics
-        //
-        // If nothing threw a Promise or all the same fallbacks are already showing,
-        // then don't suspend/restart.
-        //
-        // If this is an initial render of a new tree of Suspense boundaries and
-        // those trigger a fallback, then don't suspend/restart. We want to ensure
-        // that we can show the initial loading state as quickly as possible.
-        //
-        // If we hit a "Delayed" case, such as when we'd switch from content back into
-        // a fallback, then we should always suspend/restart. Transitions apply
-        // to this case. If none is defined, JND is used instead.
-        //
-        // If we're already showing a fallback and it gets "retried", allowing us to show
-        // another level, but there's still an inner boundary that would show a fallback,
-        // then we suspend/restart for 500ms since the last time we showed a fallback
-        // anywhere in the tree. This effectively throttles progressive loading into a
-        // consistent train of commits. This also gives us an opportunity to restart to
-        // get to the completed state slightly earlier.
-        //
-        // If there's ambiguity due to batching it's resolved in preference of:
-        // 1) "delayed", 2) "initial render", 3) "retry".
-        //
-        // We want to ensure that a "busy" state doesn't get force committed. We want to
-        // ensure that new initial loading states can commit as soon as possible.
+      case SuspenseComponent: {
+        break;
+      }
 
-        attachPingListener(root, wakeable, rootRenderLanes);
-        _workInProgress.flags |= ShouldCapture;
-        _workInProgress.lanes = rootRenderLanes;
-        return;
-      } // This boundary already captured during this render. Continue to the next
-      // boundary.
+      case SuspenseListComponent:
+      case IncompleteClassComponent:
+      case ScopeComponent:
+      case OffscreenComponent:
+      case LegacyHiddenComponent:
+        break;
 
-      _workInProgress = _workInProgress.return;
-    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
-    // TODO: Use invariant so the message is stripped in prod?
+      default: {
+        throw Error(
+          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+    }
+  }
 
-    value = new Error(
-      (getComponentName(sourceFiber.type) || "A React component") +
-        " suspended while rendering, but no fallback UI was specified.\n" +
-        "\n" +
-        "Add a <Suspense fallback=...> component higher in the tree to " +
-        "provide a loading indicator or placeholder to display."
-    );
-  } // We didn't find a boundary that could handle this type of exception. Start
-  // over and traverse parent path again, this time treating the exception
-  // as an error.
+  {
+    {
+      if (finishedWork.flags & Ref) {
+        commitAttachRef(finishedWork);
+      }
+    }
+  }
+}
 
-  renderDidError();
-  value = createCapturedValue(value, sourceFiber);
-  var workInProgress = returnFiber;
+function commitAttachRef(finishedWork) {
+  var ref = finishedWork.ref;
 
-  do {
-    switch (workInProgress.tag) {
-      case HostRoot: {
-        var _errorInfo = value;
-        workInProgress.flags |= ShouldCapture;
-        var lane = pickArbitraryLane(rootRenderLanes);
-        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
+  if (ref !== null) {
+    var instance = finishedWork.stateNode;
+    var instanceToUse;
 
-        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
+    switch (finishedWork.tag) {
+      case HostComponent:
+        instanceToUse = getPublicInstance(instance);
+        break;
 
-        enqueueCapturedUpdate(workInProgress, _update);
-        return;
+      default:
+        instanceToUse = instance;
+    } // Moved outside to ensure DCE works with this flag
+
+    if (typeof ref === "function") {
+      if (finishedWork.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          ref(instanceToUse);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
+        }
+      } else {
+        ref(instanceToUse);
+      }
+    } else {
+      {
+        if (!ref.hasOwnProperty("current")) {
+          error(
+            "Unexpected ref object provided for %s. " +
+              "Use either a ref-setter function or React.createRef().",
+            getComponentNameFromFiber(finishedWork)
+          );
+        }
       }
 
-      case ClassComponent:
-        // Capture and retry
-        var errorInfo = value;
-        var ctor = workInProgress.type;
-        var instance = workInProgress.stateNode;
+      ref.current = instanceToUse;
+    }
+  }
+}
+
+function commitDetachRef(current) {
+  var currentRef = current.ref;
+
+  if (currentRef !== null) {
+    if (typeof currentRef === "function") {
+      if (current.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          currentRef(null);
+        } finally {
+          recordLayoutEffectDuration(current);
+        }
+      } else {
+        currentRef(null);
+      }
+    } else {
+      currentRef.current = null;
+    }
+  }
+} // User-originating errors (lifecycles and refs) should not interrupt
+// deletion, so don't let them throw. Host-originating errors should
+// interrupt deletion, so it's okay
 
-        if (
-          (workInProgress.flags & DidCapture) === NoFlags &&
-          (typeof ctor.getDerivedStateFromError === "function" ||
-            (instance !== null &&
-              typeof instance.componentDidCatch === "function" &&
-              !isAlreadyFailedLegacyErrorBoundary(instance)))
-        ) {
-          workInProgress.flags |= ShouldCapture;
+function commitUnmount(finishedRoot, current, nearestMountedAncestor) {
+  onCommitUnmount(current);
 
-          var _lane = pickArbitraryLane(rootRenderLanes);
+  switch (current.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case MemoComponent:
+    case SimpleMemoComponent: {
+      var updateQueue = current.updateQueue;
 
-          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
+      if (updateQueue !== null) {
+        var lastEffect = updateQueue.lastEffect;
 
-          var _update2 = createClassErrorUpdate(
-            workInProgress,
-            errorInfo,
-            _lane
-          );
+        if (lastEffect !== null) {
+          var firstEffect = lastEffect.next;
+          var effect = firstEffect;
 
-          enqueueCapturedUpdate(workInProgress, _update2);
-          return;
+          do {
+            var _effect = effect,
+              destroy = _effect.destroy,
+              tag = _effect.tag;
+
+            if (destroy !== undefined) {
+              if ((tag & Layout) !== NoFlags$1) {
+                if (current.mode & ProfileMode) {
+                  startLayoutEffectTimer();
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
+                  recordLayoutEffectDuration(current);
+                } else {
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
+                }
+              }
+            }
+
+            effect = effect.next;
+          } while (effect !== firstEffect);
         }
+      }
 
-        break;
+      return;
     }
 
-    workInProgress = workInProgress.return;
-  } while (workInProgress !== null);
-}
+    case ClassComponent: {
+      safelyDetachRef(current, nearestMountedAncestor);
+      var instance = current.stateNode;
 
-var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+      if (typeof instance.componentWillUnmount === "function") {
+        safelyCallComponentWillUnmount(
+          current,
+          nearestMountedAncestor,
+          instance
+        );
+      }
 
-{
-  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
-}
+      return;
+    }
 
-var PossiblyWeakSet = typeof WeakSet === "function" ? WeakSet : Set;
+    case HostComponent: {
+      safelyDetachRef(current, nearestMountedAncestor);
+      return;
+    }
 
-var callComponentWillUnmountWithTimer = function(current, instance) {
-  instance.props = current.memoizedProps;
-  instance.state = current.memoizedState;
+    case HostPortal: {
+      // TODO: this is recursive.
+      // We are also not using this parent because
+      // the portal will get pushed immediately.
+      {
+        emptyPortalContainer(current);
+      }
 
-  {
-    instance.componentWillUnmount();
-  }
-}; // Capture errors so they don't interrupt unmounting.
+      return;
+    }
 
-function safelyCallComponentWillUnmount(current, instance) {
-  {
-    invokeGuardedCallback(
-      null,
-      callComponentWillUnmountWithTimer,
-      null,
-      current,
-      instance
-    );
+    case DehydratedFragment: {
+      return;
+    }
 
-    if (hasCaughtError()) {
-      var unmountError = clearCaughtError();
-      captureCommitPhaseError(current, unmountError);
+    case ScopeComponent: {
+      return;
     }
   }
 }
 
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function commitNestedUnmounts(finishedRoot, root, nearestMountedAncestor) {
+  // While we're inside a removed host node we don't want to call
+  // removeChild on the inner nodes because they're removed by the top
+  // call anyway. We also want to call componentWillUnmount on all
+  // composites before this host node is removed from the tree. Therefore
+  // we do an inner loop while we're still inside the host node.
+  var node = root;
 
-  if (ref !== null) {
-    if (typeof ref === "function") {
-      {
-        {
-          invokeGuardedCallback(null, ref, null, null);
-        }
+  while (true) {
+    commitUnmount(finishedRoot, node, nearestMountedAncestor); // Visit children because they may contain more composite or host nodes.
+    // Skip portals because commitUnmount() currently visits them recursively.
 
-        if (hasCaughtError()) {
-          var refError = clearCaughtError();
-          captureCommitPhaseError(current, refError);
-        }
-      }
-    } else {
-      ref.current = null;
+    if (
+      node.child !== null && // If we use mutation we drill down into portals using commitUnmount above.
+      // If we don't use mutation we drill down into portals here instead.
+      !supportsMutation
+    ) {
+      node.child.return = node;
+      node = node.child;
+      continue;
     }
-  }
-}
 
-function safelyCallDestroy(current, destroy) {
-  {
-    invokeGuardedCallback(null, destroy, null);
+    if (node === root) {
+      return;
+    }
+
+    while (node.sibling === null) {
+      if (node.return === null || node.return === root) {
+        return;
+      }
 
-    if (hasCaughtError()) {
-      var error = clearCaughtError();
-      captureCommitPhaseError(current, error);
+      node = node.return;
     }
+
+    node.sibling.return = node.return;
+    node = node.sibling;
   }
 }
 
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
-      return;
-    }
+function detachFiberMutation(fiber) {
+  // Cut off the return pointer to disconnect it from the tree.
+  // This enables us to detect and warn against state updates on an unmounted component.
+  // It also prevents events from bubbling from within disconnected components.
+  //
+  // Ideally, we should also clear the child pointer of the parent alternate to let this
+  // get GC:ed but we don't know which for sure which parent is the current
+  // one so we'll settle for GC:ing the subtree of this child.
+  // This child itself will be GC:ed when the parent updates the next time.
+  //
+  // Note that we can't clear child or sibling pointers yet.
+  // They're needed for passive effects and for findDOMNode.
+  // We defer those fields, and all other cleanup, to the passive phase (see detachFiberAfterEffects).
+  //
+  // Don't reset the alternate yet, either. We need that so we can detach the
+  // alternate's fields in the passive phase. Clearing the return pointer is
+  // sufficient for findDOMNode semantics.
+  var alternate = fiber.alternate;
 
-    case ClassComponent: {
-      if (finishedWork.flags & Snapshot) {
-        if (current !== null) {
-          var prevProps = current.memoizedProps;
-          var prevState = current.memoizedState;
-          var instance = finishedWork.stateNode; // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
+  if (alternate !== null) {
+    alternate.return = null;
+  }
 
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "getSnapshotBeforeUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+  fiber.return = null;
+}
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "getSnapshotBeforeUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
-            }
-          }
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
 
-          var snapshot = instance.getSnapshotBeforeUpdate(
-            finishedWork.elementType === finishedWork.type
-              ? prevProps
-              : resolveDefaultProps(finishedWork.type, prevProps),
-            prevState
-          );
+  if (alternate !== null) {
+    fiber.alternate = null;
+    detachFiberAfterEffects(alternate);
+  } // Note: Defensively using negation instead of < in case
+  // `deletedTreeCleanUpLevel` is undefined.
 
-          {
-            var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+  {
+    // Clear cyclical Fiber fields. This level alone is designed to roughly
+    // approximate the planned Fiber refactor. In that world, `setState` will be
+    // bound to a special "instance" object instead of a Fiber. The Instance
+    // object will not have any of these fields. It will only be connected to
+    // the fiber tree via a single link at the root. So if this level alone is
+    // sufficient to fix memory issues, that bodes well for our plans.
+    fiber.child = null;
+    fiber.deletions = null;
+    fiber.sibling = null; // The `stateNode` is cyclical because on host nodes it points to the host
+    // tree, which has its own pointers to children, parents, and siblings.
+    // The other host nodes also point back to fibers, so we should detach that
+    // one, too.
+
+    if (fiber.tag === HostComponent) {
+      var hostInstance = fiber.stateNode;
+    }
+
+    fiber.stateNode = null; // I'm intentionally not clearing the `return` field in this level. We
+    // already disconnect the `return` pointer at the root of the deleted
+    // subtree (in `detachFiberMutation`). Besides, `return` by itself is not
+    // cyclical — it's only cyclical when combined with `child`, `sibling`, and
+    // `alternate`. But we'll clear it in the next level anyway, just in case.
 
-            if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
-              didWarnSet.add(finishedWork.type);
+    {
+      fiber._debugOwner = null;
+    }
 
-              error(
-                "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
-                  "must be returned. You have returned undefined.",
-                getComponentName(finishedWork.type)
-              );
-            }
-          }
+    {
+      // Theoretically, nothing in here should be necessary, because we already
+      // disconnected the fiber from the tree. So even if something leaks this
+      // particular fiber, it won't leak anything else
+      //
+      // The purpose of this branch is to be super aggressive so we can measure
+      // if there's any difference in memory impact. If there is, that could
+      // indicate a React leak we don't know about.
+      fiber.return = null;
+      fiber.dependencies = null;
+      fiber.memoizedProps = null;
+      fiber.memoizedState = null;
+      fiber.pendingProps = null;
+      fiber.stateNode = null; // TODO: Move to `commitPassiveUnmountInsideDeletedTreeOnFiber` instead.
 
-          instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-        }
-      }
+      fiber.updateQueue = null;
+    }
+  }
+}
+
+function emptyPortalContainer(current) {
+  var portal = current.stateNode;
+  var containerInfo = portal.containerInfo;
+  var emptyChildSet = createContainerChildSet(containerInfo);
+}
 
+function commitContainer(finishedWork) {
+  switch (finishedWork.tag) {
+    case ClassComponent:
+    case HostComponent:
+    case HostText: {
       return;
     }
 
-    case HostRoot: {
+    case HostRoot:
+    case HostPortal: {
+      var portalOrRoot = finishedWork.stateNode;
+      var containerInfo = portalOrRoot.containerInfo,
+        pendingChildren = portalOrRoot.pendingChildren;
       return;
     }
+  }
 
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case IncompleteClassComponent:
-      // Nothing to do for these component types
-      return;
+  {
+    throw Error(
+      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+}
+
+function commitDeletion(finishedRoot, current, nearestMountedAncestor) {
+  {
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    commitNestedUnmounts(finishedRoot, current, nearestMountedAncestor);
   }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-}
+  detachFiberMutation(current);
+}
+
+function commitWork(current, finishedWork) {
+  {
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case MemoComponent:
+      case SimpleMemoComponent: {
+        // Layout effects are destroyed during the mutation phase so that all
+        // destroy functions for all fibers are called before any create functions.
+        // This prevents sibling component effects from interfering with each other,
+        // e.g. a destroy function in one component should never override a ref set
+        // by a create function in another component during the same commit.
+        // TODO: Check if we're inside an Offscreen subtree that disappeared
+        // during this commit. If so, we would have already unmounted its
+        // layout hooks. (However, since we null out the `destroy` function
+        // right before calling it, the behavior is already correct, so this
+        // would mostly be for modeling purposes.)
+        if (finishedWork.mode & ProfileMode) {
+          try {
+            startLayoutEffectTimer();
+            commitHookEffectListUnmount(
+              Layout | HasEffect,
+              finishedWork,
+              finishedWork.return
+            );
+          } finally {
+            recordLayoutEffectDuration(finishedWork);
+          }
+        } else {
+          commitHookEffectListUnmount(
+            Layout | HasEffect,
+            finishedWork,
+            finishedWork.return
+          );
+        }
+
+        return;
+      }
 
-function commitHookEffectListUnmount(tag, finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+      case Profiler: {
+        return;
+      }
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+      case SuspenseComponent: {
+        commitSuspenseCallback(finishedWork);
+        attachSuspenseRetryListeners(finishedWork);
+        return;
+      }
 
-    do {
-      if ((effect.tag & tag) === tag) {
-        // Unmount
-        var destroy = effect.destroy;
-        effect.destroy = undefined;
+      case SuspenseListComponent: {
+        attachSuspenseRetryListeners(finishedWork);
+        return;
+      }
 
-        if (destroy !== undefined) {
-          destroy();
-        }
+      case HostRoot: {
+        break;
       }
 
-      effect = effect.next;
-    } while (effect !== firstEffect);
+      case OffscreenComponent:
+      case LegacyHiddenComponent: {
+        return;
+      }
+    }
+
+    commitContainer(finishedWork);
+    return;
   }
 }
 
-function commitHookEffectListMount(tag, finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function commitSuspenseCallback(finishedWork) {
+  // TODO: Move this to passive phase
+  var newState = finishedWork.memoizedState;
+}
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+function attachSuspenseRetryListeners(finishedWork) {
+  // If this boundary just timed out, then it will have a set of wakeables.
+  // For each wakeable, attach a listener so that when it resolves, React
+  // attempts to re-render the boundary in the primary (pre-timeout) state.
+  var wakeables = finishedWork.updateQueue;
 
-    do {
-      if ((effect.tag & tag) === tag) {
-        // Mount
-        var create = effect.create;
-        effect.destroy = create();
+  if (wakeables !== null) {
+    finishedWork.updateQueue = null;
+    var retryCache = finishedWork.stateNode;
 
-        {
-          var destroy = effect.destroy;
+    if (retryCache === null) {
+      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
+    }
 
-          if (destroy !== undefined && typeof destroy !== "function") {
-            var addendum = void 0;
+    wakeables.forEach(function(wakeable) {
+      // Memoize using the boundary fiber to prevent redundant listeners.
+      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
 
-            if (destroy === null) {
-              addendum =
-                " You returned null. If your effect does not require clean " +
-                "up, return undefined (or nothing).";
-            } else if (typeof destroy.then === "function") {
-              addendum =
-                "\n\nIt looks like you wrote useEffect(async () => ...) or returned a Promise. " +
-                "Instead, write the async function inside your effect " +
-                "and call it immediately:\n\n" +
-                "useEffect(() => {\n" +
-                "  async function fetchData() {\n" +
-                "    // You can await here\n" +
-                "    const response = await MyAPI.getData(someId);\n" +
-                "    // ...\n" +
-                "  }\n" +
-                "  fetchData();\n" +
-                "}, [someId]); // Or [] if effect doesn't need props or state\n\n" +
-                "Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching";
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
+
+        {
+          if (isDevToolsPresent) {
+            if (inProgressLanes !== null && inProgressRoot !== null) {
+              // If we have pending work still, associate the original updaters with it.
+              restorePendingUpdaters(inProgressRoot, inProgressLanes);
             } else {
-              addendum = " You returned: " + destroy;
+              throw Error(
+                "Expected finished root and lanes to be set. This is a bug in React."
+              );
             }
-
-            error(
-              "An effect function must not return anything besides a function, " +
-                "which is used for clean-up.%s",
-              addendum
-            );
           }
         }
-      }
 
-      effect = effect.next;
-    } while (effect !== firstEffect);
+        wakeable.then(retry, retry);
+      }
+    });
   }
+} // This function detects when a Suspense boundary goes from visible to hidden.
+
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = firstChild;
+  commitMutationEffects_begin(root);
+  inProgressLanes = null;
+  inProgressRoot = null;
 }
 
-function schedulePassiveEffects(finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function commitMutationEffects_begin(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // TODO: Should wrap this in flags check, too, as optimization
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+    var deletions = fiber.deletions;
 
-    do {
-      var _effect = effect,
-        next = _effect.next,
-        tag = _effect.tag;
+    if (deletions !== null) {
+      for (var i = 0; i < deletions.length; i++) {
+        var childToDelete = deletions[i];
 
-      if ((tag & Passive$1) !== NoFlags$1 && (tag & HasEffect) !== NoFlags$1) {
-        enqueuePendingPassiveHookEffectUnmount(finishedWork, effect);
-        enqueuePendingPassiveHookEffectMount(finishedWork, effect);
+        try {
+          commitDeletion(root, childToDelete, fiber);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(childToDelete, fiber, error);
+        }
       }
+    }
 
-      effect = next;
-    } while (effect !== firstEffect);
+    var child = fiber.child;
+
+    if ((fiber.subtreeFlags & MutationMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitMutationEffects_complete(root);
+    }
   }
 }
 
-function commitLifeCycles(finishedRoot, current, finishedWork, committedLanes) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
-      // At this point layout effects have already been destroyed (during mutation phase).
-      // This is done to prevent sibling component effects from interfering with each other,
-      // e.g. a destroy function in one component should never override a ref set
-      // by a create function in another component during the same commit.
-      {
-        commitHookEffectListMount(Layout | HasEffect, finishedWork);
-      }
+function commitMutationEffects_complete(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
+
+    try {
+      commitMutationEffectsOnFiber(fiber, root);
+    } catch (error) {
+      reportUncaughtErrorInDEV(error);
+      captureCommitPhaseError(fiber, fiber.return, error);
+    }
 
-      schedulePassiveEffects(finishedWork);
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
       return;
     }
 
-    case ClassComponent: {
-      var instance = finishedWork.stateNode;
+    nextEffect = fiber.return;
+  }
+}
 
-      if (finishedWork.flags & Update) {
-        if (current === null) {
-          // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+function commitMutationEffectsOnFiber(finishedWork, root) {
+  // TODO: The factoring of this phase could probably be improved. Consider
+  // switching on the type of work before checking the flags. That's what
+  // we do in all the other phases. I think this one is only different
+  // because of the shared reconciliation logic below.
+  var flags = finishedWork.flags;
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
-            }
-          }
+  if (flags & Ref) {
+    var current = finishedWork.alternate;
 
-          {
-            instance.componentDidMount();
-          }
-        } else {
-          var prevProps =
-            finishedWork.elementType === finishedWork.type
-              ? current.memoizedProps
-              : resolveDefaultProps(finishedWork.type, current.memoizedProps);
-          var prevState = current.memoizedState; // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
+    if (current !== null) {
+      commitDetachRef(current);
+    }
+  }
 
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "componentDidUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+  if (flags & Visibility) {
+    switch (finishedWork.tag) {
+      case SuspenseComponent: {
+        var newState = finishedWork.memoizedState;
+        var isHidden = newState !== null;
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "componentDidUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
-            }
-          }
+        if (isHidden) {
+          var _current = finishedWork.alternate;
+          var wasHidden = _current !== null && _current.memoizedState !== null;
 
-          {
-            instance.componentDidUpdate(
-              prevProps,
-              prevState,
-              instance.__reactInternalSnapshotBeforeUpdate
-            );
+          if (!wasHidden) {
+            // TODO: Move to passive phase
+            markCommitTimeOfFallback();
           }
         }
-      } // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
 
-      var updateQueue = finishedWork.updateQueue;
+        break;
+      }
 
-      if (updateQueue !== null) {
-        {
-          if (
-            finishedWork.type === finishedWork.elementType &&
-            !didWarnAboutReassigningProps
-          ) {
-            if (instance.props !== finishedWork.memoizedProps) {
-              error(
-                "Expected %s props to match memoized props before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.props`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
-            }
+      case OffscreenComponent: {
+        var _newState = finishedWork.memoizedState;
 
-            if (instance.state !== finishedWork.memoizedState) {
-              error(
-                "Expected %s state to match memoized state before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.state`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
-            }
-          }
-        } // We could update instance props and state here,
-        // but instead we rely on them being set during last render.
-        // TODO: revisit this when we implement resuming.
+        var _current2 = finishedWork.alternate;
 
-        commitUpdateQueue(finishedWork, updateQueue, instance);
+        var _wasHidden = _current2 !== null && _current2.memoizedState !== null;
       }
+    }
+  } // The following switch statement is only concerned about placement,
+  // updates, and deletions. To avoid needing to add a case for every possible
+  // bitmap value, we remove the secondary effects from the effect tag and
+  // switch on that value.
 
-      return;
+  var primaryFlags = flags & (Placement | Update | Hydrating);
+
+  switch (primaryFlags) {
+    case Placement: {
+      // inserted, before any life-cycles like componentDidMount gets called.
+      // TODO: findDOMNode doesn't rely on this any more but isMounted does
+      // and isMounted is deprecated anyway so we should be able to kill this.
+
+      finishedWork.flags &= ~Placement;
+      break;
     }
 
-    case HostRoot: {
-      // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
-      var _updateQueue = finishedWork.updateQueue;
-
-      if (_updateQueue !== null) {
-        var _instance = null;
-
-        if (finishedWork.child !== null) {
-          switch (finishedWork.child.tag) {
-            case HostComponent:
-              _instance = getPublicInstance(finishedWork.child.stateNode);
-              break;
-
-            case ClassComponent:
-              _instance = finishedWork.child.stateNode;
-              break;
-          }
-        }
+    case PlacementAndUpdate: {
+      // inserted, before any life-cycles like componentDidMount gets called.
 
-        commitUpdateQueue(finishedWork, _updateQueue, _instance);
-      }
+      finishedWork.flags &= ~Placement; // Update
 
-      return;
+      var _current3 = finishedWork.alternate;
+      commitWork(_current3, finishedWork);
+      break;
     }
 
-    case HostComponent: {
-      var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
-      // (eg DOM renderer may schedule auto-focus for inputs and form controls).
-      // These effects should only be committed when components are first mounted,
-      // aka when there is no current/alternate.
+    case Hydrating: {
+      finishedWork.flags &= ~Hydrating;
+      break;
+    }
 
-      if (current === null && finishedWork.flags & Update) {
-        var type = finishedWork.type;
-        var props = finishedWork.memoizedProps;
-        commitMount();
-      }
+    case HydratingAndUpdate: {
+      finishedWork.flags &= ~Hydrating; // Update
 
-      return;
+      var _current4 = finishedWork.alternate;
+      commitWork(_current4, finishedWork);
+      break;
     }
 
-    case HostText: {
-      // We have no life-cycles associated with text.
-      return;
+    case Update: {
+      var _current5 = finishedWork.alternate;
+      commitWork(_current5, finishedWork);
+      break;
     }
+  }
+}
 
-    case HostPortal: {
-      // We have no life-cycles associated with portals.
-      return;
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = finishedWork;
+  commitLayoutEffects_begin(finishedWork, root, committedLanes);
+  inProgressLanes = null;
+  inProgressRoot = null;
+}
+
+function commitLayoutEffects_begin(subtreeRoot, root, committedLanes) {
+  // Suspense layout effects semantics don't change for legacy roots.
+  var isModernRoot = (subtreeRoot.mode & ConcurrentMode) !== NoMode;
+
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
+
+    if ((fiber.subtreeFlags & LayoutMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
+    } else {
+      commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes);
     }
+  }
+}
 
-    case Profiler: {
-      {
-        var _finishedWork$memoize2 = finishedWork.memoizedProps,
-          onCommit = _finishedWork$memoize2.onCommit,
-          onRender = _finishedWork$memoize2.onRender;
-        var effectDuration = finishedWork.stateNode.effectDuration;
-        var commitTime = getCommitTime();
+function commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+
+    if ((fiber.flags & LayoutMask) !== NoFlags) {
+      var current = fiber.alternate;
+      setCurrentFiber(fiber);
 
-        if (typeof onRender === "function") {
-          {
-            onRender(
-              finishedWork.memoizedProps.id,
-              current === null ? "mount" : "update",
-              finishedWork.actualDuration,
-              finishedWork.treeBaseDuration,
-              finishedWork.actualStartTime,
-              commitTime,
-              finishedRoot.memoizedInteractions
-            );
-          }
-        }
+      try {
+        commitLayoutEffectOnFiber(root, current, fiber, committedLanes);
+      } catch (error) {
+        reportUncaughtErrorInDEV(error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
 
-      return;
+      resetCurrentFiber();
     }
 
-    case SuspenseComponent: {
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
       return;
     }
 
-    case SuspenseListComponent:
-    case IncompleteClassComponent:
-    case FundamentalComponent:
-    case ScopeComponent:
-    case OffscreenComponent:
-    case LegacyHiddenComponent:
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
       return;
-  }
+    }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    nextEffect = fiber.return;
   }
 }
 
-function commitAttachRef(finishedWork) {
-  var ref = finishedWork.ref;
-
-  if (ref !== null) {
-    var instance = finishedWork.stateNode;
-    var instanceToUse;
-
-    switch (finishedWork.tag) {
-      case HostComponent:
-        instanceToUse = getPublicInstance(instance);
-        break;
+function commitPassiveMountEffects(root, finishedWork) {
+  nextEffect = finishedWork;
+  commitPassiveMountEffects_begin(finishedWork, root);
+}
 
-      default:
-        instanceToUse = instance;
-    } // Moved outside to ensure DCE works with this flag
+function commitPassiveMountEffects_begin(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
 
-    if (typeof ref === "function") {
-      {
-        ref(instanceToUse);
-      }
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
     } else {
-      {
-        if (!ref.hasOwnProperty("current")) {
-          error(
-            "Unexpected ref object provided for %s. " +
-              "Use either a ref-setter function or React.createRef().",
-            getComponentName(finishedWork.type)
-          );
-        }
-      }
-
-      ref.current = instanceToUse;
+      commitPassiveMountEffects_complete(subtreeRoot, root);
     }
   }
 }
 
-function commitDetachRef(current) {
-  var currentRef = current.ref;
+function commitPassiveMountEffects_complete(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
 
-  if (currentRef !== null) {
-    if (typeof currentRef === "function") {
-      {
-        currentRef(null);
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+
+      try {
+        commitPassiveMountOnFiber(root, fiber);
+      } catch (error) {
+        reportUncaughtErrorInDEV(error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
-    } else {
-      currentRef.current = null;
-    }
-  }
-} // User-originating errors (lifecycles and refs) should not interrupt
-// deletion, so don't let them throw. Host-originating errors should
-// interrupt deletion, so it's okay
 
-function commitUnmount(finishedRoot, current, renderPriorityLevel) {
-  onCommitUnmount(current);
+      resetCurrentFiber();
+    }
 
-  switch (current.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case MemoComponent:
-    case SimpleMemoComponent:
-    case Block: {
-      var updateQueue = current.updateQueue;
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
+      return;
+    }
 
-      if (updateQueue !== null) {
-        var lastEffect = updateQueue.lastEffect;
+    var sibling = fiber.sibling;
 
-        if (lastEffect !== null) {
-          var firstEffect = lastEffect.next;
-          var effect = firstEffect;
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
 
-          do {
-            var _effect2 = effect,
-              destroy = _effect2.destroy,
-              tag = _effect2.tag;
+    nextEffect = fiber.return;
+  }
+}
 
-            if (destroy !== undefined) {
-              if ((tag & Passive$1) !== NoFlags$1) {
-                enqueuePendingPassiveHookEffectUnmount(current, effect);
-              } else {
-                {
-                  safelyCallDestroy(current, destroy);
-                }
-              }
-            }
+function commitPassiveMountOnFiber(finishedRoot, finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
 
-            effect = effect.next;
-          } while (effect !== firstEffect);
+        try {
+          commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
+        } finally {
+          recordPassiveEffectDuration(finishedWork);
         }
+      } else {
+        commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
       }
 
-      return;
+      break;
     }
+  }
+}
 
-    case ClassComponent: {
-      safelyDetachRef(current);
-      var instance = current.stateNode;
-
-      if (typeof instance.componentWillUnmount === "function") {
-        safelyCallComponentWillUnmount(current, instance);
-      }
+function commitPassiveUnmountEffects(firstChild) {
+  nextEffect = firstChild;
+  commitPassiveUnmountEffects_begin();
+}
 
-      return;
-    }
+function commitPassiveUnmountEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var child = fiber.child;
+
+    if ((nextEffect.flags & ChildDeletion) !== NoFlags) {
+      var deletions = fiber.deletions;
+
+      if (deletions !== null) {
+        for (var i = 0; i < deletions.length; i++) {
+          var fiberToDelete = deletions[i];
+          nextEffect = fiberToDelete;
+          commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+            fiberToDelete,
+            fiber
+          );
+        }
 
-    case HostComponent: {
-      safelyDetachRef(current);
-      return;
-    }
+        {
+          // A fiber was deleted from this parent fiber, but it's still part of
+          // the previous (alternate) parent fiber's list of children. Because
+          // children are a linked list, an earlier sibling that's still alive
+          // will be connected to the deleted fiber via its `alternate`:
+          //
+          //   live fiber
+          //   --alternate--> previous live fiber
+          //   --sibling--> deleted fiber
+          //
+          // We can't disconnect `alternate` on nodes that haven't been deleted
+          // yet, but we can disconnect the `sibling` and `child` pointers.
+          var previousFiber = fiber.alternate;
 
-    case HostPortal: {
-      // TODO: this is recursive.
-      // We are also not using this parent because
-      // the portal will get pushed immediately.
-      {
-        emptyPortalContainer(current);
-      }
+          if (previousFiber !== null) {
+            var detachedChild = previousFiber.child;
 
-      return;
-    }
+            if (detachedChild !== null) {
+              previousFiber.child = null;
 
-    case FundamentalComponent: {
-      return;
-    }
+              do {
+                var detachedSibling = detachedChild.sibling;
+                detachedChild.sibling = null;
+                detachedChild = detachedSibling;
+              } while (detachedChild !== null);
+            }
+          }
+        }
 
-    case DehydratedFragment: {
-      return;
+        nextEffect = fiber;
+      }
     }
 
-    case ScopeComponent: {
-      return;
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffects_complete();
     }
   }
 }
 
-function commitNestedUnmounts(finishedRoot, root, renderPriorityLevel) {
-  // While we're inside a removed host node we don't want to call
-  // removeChild on the inner nodes because they're removed by the top
-  // call anyway. We also want to call componentWillUnmount on all
-  // composites before this host node is removed from the tree. Therefore
-  // we do an inner loop while we're still inside the host node.
-  var node = root;
-
-  while (true) {
-    commitUnmount(finishedRoot, node); // Visit children because they may contain more composite or host nodes.
-    // Skip portals because commitUnmount() currently visits them recursively.
+function commitPassiveUnmountEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
 
-    if (
-      node.child !== null && // If we use mutation we drill down into portals using commitUnmount above.
-      // If we don't use mutation we drill down into portals here instead.
-      !supportsMutation
-    ) {
-      node.child.return = node;
-      node = node.child;
-      continue;
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+      commitPassiveUnmountOnFiber(fiber);
+      resetCurrentFiber();
     }
 
-    if (node === root) {
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
       return;
     }
 
-    while (node.sibling === null) {
-      if (node.return === null || node.return === root) {
-        return;
+    nextEffect = fiber.return;
+  }
+}
+
+function commitPassiveUnmountOnFiber(finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
+        recordPassiveEffectDuration(finishedWork);
+      } else {
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
       }
 
-      node = node.return;
+      break;
     }
-
-    node.sibling.return = node.return;
-    node = node.sibling;
   }
 }
 
-function detachFiberMutation(fiber) {
-  // Cut off the return pointers to disconnect it from the tree. Ideally, we
-  // should clear the child pointer of the parent alternate to let this
-  // get GC:ed but we don't know which for sure which parent is the current
-  // one so we'll settle for GC:ing the subtree of this child. This child
-  // itself will be GC:ed when the parent updates the next time.
-  // Note: we cannot null out sibling here, otherwise it can cause issues
-  // with findDOMNode and how it requires the sibling field to carry out
-  // traversal in a later effect. See PR #16820. We now clear the sibling
-  // field after effects, see: detachFiberAfterEffects.
-  //
-  // Don't disconnect stateNode now; it will be detached in detachFiberAfterEffects.
-  // It may be required if the current component is an error boundary,
-  // and one of its descendants throws while unmounting a passive effect.
-  fiber.alternate = null;
-  fiber.child = null;
-  fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
-  fiber.memoizedProps = null;
-  fiber.memoizedState = null;
-  fiber.pendingProps = null;
-  fiber.return = null;
-  fiber.updateQueue = null;
+function commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+  deletedSubtreeRoot,
+  nearestMountedAncestor
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // Deletion effects fire in parent -> child order
+    // TODO: Check if fiber has a PassiveStatic flag
 
-  {
-    fiber._debugOwner = null;
+    setCurrentFiber(fiber);
+    commitPassiveUnmountInsideDeletedTreeOnFiber(fiber, nearestMountedAncestor);
+    resetCurrentFiber();
+    var child = fiber.child; // TODO: Only traverse subtree if it has a PassiveStatic flag. (But, if we
+    // do this, still need to handle `deletedTreeCleanUpLevel` correctly.)
+
+    if (child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+        deletedSubtreeRoot
+      );
+    }
   }
 }
 
-function emptyPortalContainer(current) {
-  var portal = current.stateNode;
-  var containerInfo = portal.containerInfo;
-  var emptyChildSet = createContainerChildSet(containerInfo);
-}
+function commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+  deletedSubtreeRoot
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var sibling = fiber.sibling;
+    var returnFiber = fiber.return;
 
-function commitContainer(finishedWork) {
-  switch (finishedWork.tag) {
-    case ClassComponent:
-    case HostComponent:
-    case HostText:
-    case FundamentalComponent: {
-      return;
+    {
+      // Recursively traverse the entire deleted tree and clean up fiber fields.
+      // This is more aggressive than ideal, and the long term goal is to only
+      // have to detach the deleted tree at the root.
+      detachFiberAfterEffects(fiber);
+
+      if (fiber === deletedSubtreeRoot) {
+        nextEffect = null;
+        return;
+      }
     }
 
-    case HostRoot:
-    case HostPortal: {
-      var portalOrRoot = finishedWork.stateNode;
-      var containerInfo = portalOrRoot.containerInfo,
-        pendingChildren = portalOrRoot.pendingChildren;
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, returnFiber);
+      nextEffect = sibling;
       return;
     }
-  }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    nextEffect = returnFiber;
   }
 }
 
-function commitDeletion(finishedRoot, current, renderPriorityLevel) {
-  {
-    // Detach refs and call componentWillUnmount() on the whole subtree.
-    commitNestedUnmounts(finishedRoot, current);
-  }
-
-  var alternate = current.alternate;
-  detachFiberMutation(current);
+function commitPassiveUnmountInsideDeletedTreeOnFiber(
+  current,
+  nearestMountedAncestor
+) {
+  switch (current.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (current.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+        recordPassiveEffectDuration(current);
+      } else {
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+      }
 
-  if (alternate !== null) {
-    detachFiberMutation(alternate);
+      break;
+    }
   }
 }
 
-function commitWork(current, finishedWork) {
+var didWarnWrongReturnPointer = false;
+
+function ensureCorrectReturnPointer(fiber, expectedReturnFiber) {
+  {
+    if (!didWarnWrongReturnPointer && fiber.return !== expectedReturnFiber) {
+      didWarnWrongReturnPointer = true;
+
+      error(
+        "Internal React error: Return pointer is inconsistent " + "with parent."
+      );
+    }
+  } // TODO: Remove this assignment once we're confident that it won't break
+  // anything, by checking the warning logs for the above invariant
+
+  fiber.return = expectedReturnFiber;
+} // TODO: Reuse reappearLayoutEffects traversal here?
+
+function invokeLayoutEffectMountInDEV(fiber) {
   {
-    switch (finishedWork.tag) {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
       case FunctionComponent:
       case ForwardRef:
-      case MemoComponent:
-      case SimpleMemoComponent:
-      case Block: {
-        // Layout effects are destroyed during the mutation phase so that all
-        // destroy functions for all fibers are called before any create functions.
-        // This prevents sibling component effects from interfering with each other,
-        // e.g. a destroy function in one component should never override a ref set
-        // by a create function in another component during the same commit.
-        {
-          commitHookEffectListUnmount(Layout | HasEffect, finishedWork);
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListMount(Layout | HasEffect, fiber);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
         }
 
-        return;
-      }
-
-      case Profiler: {
-        return;
+        break;
       }
 
-      case SuspenseComponent: {
-        commitSuspenseComponent(finishedWork);
-        attachSuspenseRetryListeners(finishedWork);
-        return;
-      }
+      case ClassComponent: {
+        var instance = fiber.stateNode;
 
-      case SuspenseListComponent: {
-        attachSuspenseRetryListeners(finishedWork);
-        return;
-      }
+        try {
+          instance.componentDidMount();
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
 
-      case HostRoot: {
         break;
       }
-
-      case OffscreenComponent:
-      case LegacyHiddenComponent: {
-        return;
-      }
     }
-
-    commitContainer(finishedWork);
-    return;
   }
 }
 
-function commitSuspenseComponent(finishedWork) {
-  var newState = finishedWork.memoizedState;
+function invokePassiveEffectMountInDEV(fiber) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListMount(Passive$1 | HasEffect, fiber);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
 
-  if (newState !== null) {
-    markCommitTimeOfFallback();
+        break;
+      }
+    }
   }
 }
 
-function attachSuspenseRetryListeners(finishedWork) {
-  // If this boundary just timed out, then it will have a set of wakeables.
-  // For each wakeable, attach a listener so that when it resolves, React
-  // attempts to re-render the boundary in the primary (pre-timeout) state.
-  var wakeables = finishedWork.updateQueue;
-
-  if (wakeables !== null) {
-    finishedWork.updateQueue = null;
-    var retryCache = finishedWork.stateNode;
+function invokeLayoutEffectUnmountInDEV(fiber) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListUnmount(Layout | HasEffect, fiber, fiber.return);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
 
-    if (retryCache === null) {
-      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
-    }
+        break;
+      }
 
-    wakeables.forEach(function(wakeable) {
-      // Memoize using the boundary fiber to prevent redundant listeners.
-      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
+      case ClassComponent: {
+        var instance = fiber.stateNode;
 
-      if (!retryCache.has(wakeable)) {
-        {
-          if (wakeable.__reactDoNotTraceInteractions !== true) {
-            retry = tracing.unstable_wrap(retry);
-          }
+        if (typeof instance.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(fiber, fiber.return, instance);
         }
 
-        retryCache.add(wakeable);
-        wakeable.then(retry, retry);
+        break;
       }
-    });
+    }
   }
-} // This function detects when a Suspense boundary goes from visible to hidden.
-// It returns false if the boundary is already hidden.
-// TODO: Use an effect tag.
-
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  if (current !== null) {
-    var oldState = current.memoizedState;
+}
 
-    if (oldState === null || oldState.dehydrated !== null) {
-      var newState = finishedWork.memoizedState;
-      return newState !== null && newState.dehydrated === null;
+function invokePassiveEffectUnmountInDEV(fiber) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListUnmount(
+            Passive$1 | HasEffect,
+            fiber,
+            fiber.return
+          );
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
+      }
     }
   }
-
-  return false;
 }
 
 var COMPONENT_TYPE = 0;
@@ -17149,28 +18913,23 @@ if (typeof Symbol === "function" && Symbol.for) {
 var ceil = Math.ceil;
 var ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
-  IsSomeRendererActing = ReactSharedInternals.IsSomeRendererActing;
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
+  ReactCurrentActQueue = ReactSharedInternals.ReactCurrentActQueue;
 var NoContext =
   /*             */
   0;
 var BatchedContext =
   /*               */
   1;
-var DiscreteEventContext =
-  /*         */
-  4;
-var LegacyUnbatchedContext =
-  /*       */
-  8;
 var RenderContext =
   /*                */
-  16;
+  2;
 var CommitContext =
   /*                */
-  32;
+  4;
 var RetryAfterError =
   /*       */
-  64;
+  8;
 var RootIncomplete = 0;
 var RootFatalErrored = 1;
 var RootErrored = 2;
@@ -17210,8 +18969,7 @@ var workInProgressRootSkippedLanes = NoLanes; // Lanes that were updated (in an
 
 var workInProgressRootUpdatedLanes = NoLanes; // Lanes that were pinged (in an interleaved event) during this render.
 
-var workInProgressRootPingedLanes = NoLanes;
-var mostRecentlyUpdatedRoot = null; // The most recent time we committed a fallback. This lets us ensure a train
+var workInProgressRootPingedLanes = NoLanes; // The most recent time we committed a fallback. This lets us ensure a train
 // model where we don't commit new loading states in too quick succession.
 
 var globalMostRecentFallbackTime = 0;
@@ -17230,40 +18988,24 @@ function resetRenderTimer() {
 function getRenderTargetTime() {
   return workInProgressRootRenderTargetTime;
 }
-var nextEffect = null;
 var hasUncaughtError = false;
 var firstUncaughtError = null;
-var legacyErrorBoundariesThatAlreadyFailed = null;
+var legacyErrorBoundariesThatAlreadyFailed = null; // Only used when enableProfilerNestedUpdateScheduledHook is true;
 var rootDoesHavePassiveEffects = false;
 var rootWithPendingPassiveEffects = null;
-var pendingPassiveEffectsRenderPriority = NoPriority$1;
 var pendingPassiveEffectsLanes = NoLanes;
-var pendingPassiveHookEffectsMount = [];
-var pendingPassiveHookEffectsUnmount = [];
-var rootsWithPendingDiscreteUpdates = null; // Use these to prevent an infinite loop of nested updates
+var pendingPassiveProfilerEffects = []; // Use these to prevent an infinite loop of nested updates
 
 var NESTED_UPDATE_LIMIT = 50;
 var nestedUpdateCount = 0;
 var rootWithNestedUpdates = null;
 var NESTED_PASSIVE_UPDATE_LIMIT = 50;
-var nestedPassiveUpdateCount = 0; // Marks the need to reschedule pending interactions at these lanes
-// during the commit phase. This enables them to be traced across components
-// that spawn new work during render. E.g. hidden boundaries, suspended SSR
-// hydration or SuspenseList.
-// TODO: Can use a bitmask instead of an array
-
-var spawnedWorkDuringRender = null; // If two updates are scheduled within the same event, we should treat their
+var nestedPassiveUpdateCount = 0; // If two updates are scheduled within the same event, we should treat their
 // event times as simultaneous, even if the actual clock time has advanced
 // between the first and second call.
 
 var currentEventTime = NoTimestamp;
-var currentEventWipLanes = NoLanes;
-var currentEventPendingLanes = NoLanes; // Dev only flag that tracks if passive effects are currently being flushed.
-// We warn about state updates for unmounted components differently in this case.
-
-var isFlushingPassiveEffects = false;
-var focusedInstanceHandle = null;
-var shouldFireAfterActiveInstanceBlur = false;
+var currentEventTransitionLane = NoLanes;
 function getWorkInProgressRoot() {
   return workInProgressRoot;
 }
@@ -17285,69 +19027,60 @@ function requestUpdateLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // The algorithm for assigning an update to a lane should be stable for all
-  // updates at the same priority within the same event. To do this, the inputs
-  // to the algorithm must be the same. For example, we use the `renderLanes`
-  // to avoid choosing a lane that is already in the middle of rendering.
-  //
-  // However, the "included" lanes could be mutated in between updates in the
-  // same event, like if you perform an update inside `flushSync`. Or any other
-  // code path that might call `prepareFreshStack`.
-  //
-  // The trick we use is to cache the first of each of these inputs within an
-  // event. Then reset the cached values once we can be sure the event is over.
-  // Our heuristic for that is whenever we enter a concurrent work loop.
-  //
-  // We'll do the same for `currentEventPendingLanes` below.
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
+  } else if (
+    (executionContext & RenderContext) !== NoContext &&
+    workInProgressRootRenderLanes !== NoLanes
+  ) {
+    // This is a render phase update. These are not officially supported. The
+    // old behavior is to give this the same "thread" (lanes) as
+    // whatever is currently rendering. So if you call `setState` on a component
+    // that happens later in the same render, it will flush. Ideally, we want to
+    // remove the special case and treat them as if they came from an
+    // interleaved event. Regardless, this pattern is not officially supported.
+    // This behavior is only a fallback. The flag only exists until we can roll
+    // out the setState warning, since existing code might accidentally rely on
+    // the current behavior.
+    return pickArbitraryLane(workInProgressRootRenderLanes);
   }
 
   var isTransition = requestCurrentTransition() !== NoTransition;
 
   if (isTransition) {
-    if (currentEventPendingLanes !== NoLanes) {
-      currentEventPendingLanes =
-        mostRecentlyUpdatedRoot !== null
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : NoLanes;
+    // The algorithm for assigning an update to a lane should be stable for all
+    // updates at the same priority within the same event. To do this, the
+    // inputs to the algorithm must be the same.
+    //
+    // The trick we use is to cache the first of each of these inputs within an
+    // event. Then reset the cached values once we can be sure the event is
+    // over. Our heuristic for that is whenever we enter a concurrent work loop.
+    if (currentEventTransitionLane === NoLane) {
+      // All transitions within the same event are assigned the same lane.
+      currentEventTransitionLane = claimNextTransitionLane();
     }
 
-    return findTransitionLane(currentEventWipLanes, currentEventPendingLanes);
-  } // TODO: Remove this dependency on the Scheduler priority.
-  // To do that, we're replacing it with an update lane priority.
-
-  var schedulerPriority = getCurrentPriorityLevel(); // The old behavior was using the priority level of the Scheduler.
-  // This couples React to the Scheduler internals, so we're replacing it
-  // with the currentUpdateLanePriority above. As an example of how this
-  // could be problematic, if we're not inside `Scheduler.runWithPriority`,
-  // then we'll get the priority of the current running Scheduler task,
-  // which is probably not what we want.
-
-  var lane;
+    return currentEventTransitionLane;
+  } // Updates originating inside certain React methods, like flushSync, have
+  // their priority set by tracking it with a context variable.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  if (
-    // TODO: Temporary. We're removing the concept of discrete updates.
-    (executionContext & DiscreteEventContext) !== NoContext &&
-    schedulerPriority === UserBlockingPriority$1
-  ) {
-    lane = findUpdateLane(InputDiscreteLanePriority, currentEventWipLanes);
-  } else {
-    var schedulerLanePriority = schedulerPriorityToLanePriority(
-      schedulerPriority
-    );
+  var updateLane = getCurrentUpdatePriority();
 
-    lane = findUpdateLane(schedulerLanePriority, currentEventWipLanes);
-  }
+  if (updateLane !== NoLane) {
+    return updateLane;
+  } // This update originated outside React. Ask the host environment for an
+  // appropriate priority, based on the type of event.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  return lane;
+  var eventLane = getCurrentEventPriority();
+  return eventLane;
 }
 
 function requestRetryLane(fiber) {
@@ -17357,19 +19090,11 @@ function requestRetryLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // See `requestUpdateLane` for explanation of `currentEventWipLanes`
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
   }
 
-  return findRetryLane(currentEventWipLanes);
+  return claimNextRetryLane();
 }
 
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -17378,8 +19103,13 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   var root = markUpdateLaneFromFiberToRoot(fiber, lane);
 
   if (root === null) {
-    warnAboutUpdateOnUnmountedFiberInDEV(fiber);
     return null;
+  }
+
+  {
+    if (isDevToolsPresent) {
+      addFiberToLanesMap(root, fiber, lane);
+    }
   } // Mark that the root has a pending update.
 
   markRootUpdated(root, lane, eventTime);
@@ -17390,7 +19120,7 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
     // phase update. In that case, we don't treat render phase updates as if
     // they were interleaved, for backwards compat reasons.
-    {
+    if ((executionContext & RenderContext) === NoContext) {
       workInProgressRootUpdatedLanes = mergeLanes(
         workInProgressRootUpdatedLanes,
         lane
@@ -17406,63 +19136,26 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       // already started rendering.
       markRootSuspended$1(root, workInProgressRootRenderLanes);
     }
-  } // TODO: requestUpdateLanePriority also reads the priority. Pass the
-  // priority as an argument to that function and this one.
-
-  var priorityLevel = getCurrentPriorityLevel();
-
-  if (lane === SyncLane) {
-    if (
-      // Check if we're inside unbatchedUpdates
-      (executionContext & LegacyUnbatchedContext) !== NoContext && // Check if we're not already rendering
-      (executionContext & (RenderContext | CommitContext)) === NoContext
-    ) {
-      // Register pending interactions on the root to avoid losing traced interaction data.
-      schedulePendingInteractions(root, lane); // This is a legacy edge case. The initial mount of a ReactDOM.render-ed
-      // root inside of batchedUpdates should be synchronous, but layout updates
-      // should be deferred until the end of the batch.
+  }
 
-      performSyncWorkOnRoot(root);
-    } else {
-      ensureRootIsScheduled(root, eventTime);
-      schedulePendingInteractions(root, lane);
+  ensureRootIsScheduled(root, eventTime);
 
-      if (executionContext === NoContext) {
-        // Flush the synchronous work now, unless we're already working or inside
-        // a batch. This is intentionally inside scheduleUpdateOnFiber instead of
-        // scheduleCallbackForFiber to preserve the ability to schedule a callback
-        // without immediately flushing it. We only do this for user-initiated
-        // updates, to preserve historical behavior of legacy mode.
-        resetRenderTimer();
-        flushSyncCallbackQueue();
-      }
-    }
-  } else {
-    // Schedule a discrete update but only if it's not Sync.
-    if (
-      (executionContext & DiscreteEventContext) !== NoContext && // Only updates at user-blocking priority or greater are considered
-      // discrete, even inside a discrete event.
-      (priorityLevel === UserBlockingPriority$1 ||
-        priorityLevel === ImmediatePriority$1)
-    ) {
-      // This is the result of a discrete event. Track the lowest priority
-      // discrete update per root so we can flush them early, if needed.
-      if (rootsWithPendingDiscreteUpdates === null) {
-        rootsWithPendingDiscreteUpdates = new Set([root]);
-      } else {
-        rootsWithPendingDiscreteUpdates.add(root);
-      }
-    } // Schedule other updates after in case the callback is sync.
+  if (
+    lane === SyncLane &&
+    executionContext === NoContext &&
+    (fiber.mode & ConcurrentMode) === NoMode && // Treat `act` as if it's inside `batchedUpdates`, even in legacy mode.
+    !ReactCurrentActQueue.isBatchingLegacy
+  ) {
+    // Flush the synchronous work now, unless we're already working or inside
+    // a batch. This is intentionally inside scheduleUpdateOnFiber instead of
+    // scheduleCallbackForFiber to preserve the ability to schedule a callback
+    // without immediately flushing it. We only do this for user-initiated
+    // updates, to preserve historical behavior of legacy mode.
+    resetRenderTimer();
+    flushSyncCallbacksOnlyInLegacyMode();
+  }
 
-    ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, lane);
-  } // We use this when assigning a lane for a transition inside
-  // `requestUpdateLane`. We assume it's the same as the root being updated,
-  // since in the common case of a single root app it probably is. If it's not
-  // the same root, then it's not a huge deal, we just might batch more stuff
-  // together more than necessary.
-
-  mostRecentlyUpdatedRoot = root;
+  return root;
 } // This is split into a separate function so we can mark a fiber with pending
 // work without treating it as a typical update that originates from an event;
 // e.g. retrying a Suspense boundary isn't an update, but it does schedule work
@@ -17484,7 +19177,7 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
     ) {
       warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
     }
-  } // Walk the parent path to the root and update the child expiration time.
+  } // Walk the parent path to the root and update the child lanes.
 
   var node = sourceFiber;
   var parent = sourceFiber.return;
@@ -17513,6 +19206,20 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   } else {
     return null;
   }
+}
+
+function isInterleavedUpdate(fiber, lane) {
+  return (
+    // TODO: Optimize slightly by comparing to root that fiber belongs to.
+    // Requires some refactoring. Not a big deal though since it's rare for
+    // concurrent apps to have more than a single root.
+    workInProgressRoot !== null &&
+    (fiber.mode & ConcurrentMode) !== NoMode && // If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),
+    // then don't treat this as an interleaved update. This pattern is
+    // accompanied by a warning but we haven't fully deprecated it yet. We can
+    // remove once the deferRenderPhaseUpdateToNextBatch flag is enabled.
+    (executionContext & RenderContext) === NoContext
+  );
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
 // of the existing task is the same as the priority of the next level that the
@@ -17528,51 +19235,101 @@ function ensureRootIsScheduled(root, currentTime) {
   var nextLanes = getNextLanes(
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : NoLanes
-  ); // This returns the priority level computed during the `getNextLanes` call.
-
-  var newCallbackPriority = returnNextLanesPriority();
+  );
 
   if (nextLanes === NoLanes) {
     // Special case: There's nothing to work on.
     if (existingCallbackNode !== null) {
-      cancelCallback(existingCallbackNode);
-      root.callbackNode = null;
-      root.callbackPriority = NoLanePriority;
+      cancelCallback$1(existingCallbackNode);
     }
 
+    root.callbackNode = null;
+    root.callbackPriority = NoLane;
     return;
-  } // Check if there's an existing task. We may be able to reuse it.
+  } // We use the highest priority lane to represent the priority of the callback.
 
-  if (existingCallbackNode !== null) {
-    var existingCallbackPriority = root.callbackPriority;
+  var newCallbackPriority = getHighestPriorityLane(nextLanes); // Check if there's an existing task. We may be able to reuse it.
 
-    if (existingCallbackPriority === newCallbackPriority) {
-      // The priority hasn't changed. We can reuse the existing task. Exit.
-      return;
-    } // The priority changed. Cancel the existing callback. We'll schedule a new
-    // one below.
+  var existingCallbackPriority = root.callbackPriority;
+
+  if (
+    existingCallbackPriority === newCallbackPriority && // Special case related to `act`. If the currently scheduled task is a
+    // Scheduler task, rather than an `act` task, cancel it and re-scheduled
+    // on the `act` queue.
+    !(
+      ReactCurrentActQueue.current !== null &&
+      existingCallbackNode !== fakeActCallbackNode
+    )
+  ) {
+    {
+      // If we're going to re-use an existing task, it needs to exist.
+      // Assume that discrete update microtasks are non-cancellable and null.
+      // TODO: Temporary until we confirm this warning is not fired.
+      if (
+        existingCallbackNode == null &&
+        existingCallbackPriority !== SyncLane
+      ) {
+        error(
+          "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+    } // The priority hasn't changed. We can reuse the existing task. Exit.
+
+    return;
+  }
 
-    cancelCallback(existingCallbackNode);
+  if (existingCallbackNode != null) {
+    // Cancel the existing callback. We'll schedule a new one below.
+    cancelCallback$1(existingCallbackNode);
   } // Schedule a new callback.
 
   var newCallbackNode;
 
-  if (newCallbackPriority === SyncLanePriority) {
+  if (newCallbackPriority === SyncLane) {
     // Special case: Sync React callbacks are scheduled on a special
     // internal queue
-    newCallbackNode = scheduleSyncCallback(
-      performSyncWorkOnRoot.bind(null, root)
-    );
-  } else if (newCallbackPriority === SyncBatchedLanePriority) {
-    newCallbackNode = scheduleCallback(
-      ImmediatePriority$1,
-      performSyncWorkOnRoot.bind(null, root)
-    );
+    if (root.tag === LegacyRoot) {
+      if (ReactCurrentActQueue.isBatchingLegacy !== null) {
+        ReactCurrentActQueue.didScheduleLegacyUpdate = true;
+      }
+
+      scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root));
+    } else {
+      scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root));
+    }
+
+    {
+      // Flush the queue in an Immediate task.
+      scheduleCallback$1(ImmediatePriority, flushSyncCallbacks);
+    }
+
+    newCallbackNode = null;
   } else {
-    var schedulerPriorityLevel = lanePriorityToSchedulerPriority(
-      newCallbackPriority
-    );
-    newCallbackNode = scheduleCallback(
+    var schedulerPriorityLevel;
+
+    switch (lanesToEventPriority(nextLanes)) {
+      case DiscreteEventPriority:
+        schedulerPriorityLevel = ImmediatePriority;
+        break;
+
+      case ContinuousEventPriority:
+        schedulerPriorityLevel = UserBlockingPriority;
+        break;
+
+      case DefaultEventPriority:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+
+      case IdleEventPriority:
+        schedulerPriorityLevel = IdlePriority;
+        break;
+
+      default:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+    }
+
+    newCallbackNode = scheduleCallback$1(
       schedulerPriorityLevel,
       performConcurrentWorkOnRoot.bind(null, root)
     );
@@ -17583,12 +19340,14 @@ function ensureRootIsScheduled(root, currentTime) {
 } // This is the entry point for every concurrent task, i.e. anything that
 // goes through Scheduler.
 
-function performConcurrentWorkOnRoot(root) {
-  // Since we know we're in a React event, we can clear the current
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  {
+    resetNestedUpdateFlag();
+  } // Since we know we're in a React event, we can clear the current
   // event time. The next update will compute a new event time.
+
   currentEventTime = NoTimestamp;
-  currentEventWipLanes = NoLanes;
-  currentEventPendingLanes = NoLanes;
+  currentEventTransitionLane = NoLanes;
 
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
@@ -17607,7 +19366,7 @@ function performConcurrentWorkOnRoot(root) {
       // there's a new task, or that there's no remaining work on this root.
       return null;
     }
-  } // Determine the next expiration time to work on, using the fields stored
+  } // Determine the next lanes to work on, using the fields stored
   // on the root.
 
   var lanes = getNextLanes(
@@ -17618,41 +19377,45 @@ function performConcurrentWorkOnRoot(root) {
   if (lanes === NoLanes) {
     // Defensive coding. This is never expected to happen.
     return null;
-  }
-
-  var exitStatus = renderRootConcurrent(root, lanes);
-
-  if (
-    includesSomeLane(
-      workInProgressRootIncludedLanes,
-      workInProgressRootUpdatedLanes
-    )
-  ) {
-    // The render included lanes that were updated during the render phase.
-    // For example, when unhiding a hidden tree, we include all the lanes
-    // that were previously skipped when the tree was hidden. That set of
-    // lanes is a superset of the lanes we started rendering with.
-    //
-    // So we'll throw out the current work and restart.
-    prepareFreshStack(root, NoLanes);
-  } else if (exitStatus !== RootIncomplete) {
+  } // We disable time-slicing in some cases: if the work has been CPU-bound
+  // for too long ("expired" work, to prevent starvation), or we're in
+  // sync-updates-by-default mode.
+  // TODO: We only check `didTimeout` defensively, to account for a Scheduler
+  // bug we're still investigating. Once the bug in Scheduler is fixed,
+  // we can remove this, since we track expiration ourselves.
+
+  var exitStatus =
+    shouldTimeSlice(root, lanes) && !didTimeout
+      ? renderRootConcurrent(root, lanes)
+      : renderRootSync(root, lanes);
+
+  if (exitStatus !== RootIncomplete) {
     if (exitStatus === RootErrored) {
+      var prevExecutionContext = executionContext;
       executionContext |= RetryAfterError; // If an error occurred during hydration,
       // discard server response and fall back to client side render.
 
       if (root.hydrate) {
         root.hydrate = false;
+
+        {
+          errorHydratingContainer(root.containerInfo);
+        }
+
         clearContainer(root.containerInfo);
       } // If something threw an error, try rendering one more time. We'll render
       // synchronously to block concurrent data mutations, and we'll includes
       // all pending updates are included. If it still fails after the second
       // attempt, we'll give up and commit the resulting tree.
 
-      lanes = getLanesToRetrySynchronouslyOnError(root);
+      var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-      if (lanes !== NoLanes) {
-        exitStatus = renderRootSync(root, lanes);
+      if (errorRetryLanes !== NoLanes) {
+        lanes = errorRetryLanes;
+        exitStatus = renderRootSync(root, errorRetryLanes);
       }
+
+      executionContext = prevExecutionContext;
     }
 
     if (exitStatus === RootFatalErrored) {
@@ -17811,62 +19574,51 @@ function markRootSuspended$1(root, suspendedLanes) {
 // through Scheduler
 
 function performSyncWorkOnRoot(root) {
+  {
+    syncNestedUpdateFlag();
+  }
+
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
   }
 
   flushPassiveEffects();
-  var lanes;
-  var exitStatus;
+  var lanes = getNextLanes(root, NoLanes);
 
-  if (
-    root === workInProgressRoot &&
-    includesSomeLane(root.expiredLanes, workInProgressRootRenderLanes)
-  ) {
-    // There's a partial tree, and at least one of its lanes has expired. Finish
-    // rendering it before rendering the rest of the expired work.
-    lanes = workInProgressRootRenderLanes;
-    exitStatus = renderRootSync(root, lanes);
-
-    if (
-      includesSomeLane(
-        workInProgressRootIncludedLanes,
-        workInProgressRootUpdatedLanes
-      )
-    ) {
-      // The render included lanes that were updated during the render phase.
-      // For example, when unhiding a hidden tree, we include all the lanes
-      // that were previously skipped when the tree was hidden. That set of
-      // lanes is a superset of the lanes we started rendering with.
-      //
-      // Note that this only happens when part of the tree is rendered
-      // concurrently. If the whole tree is rendered synchronously, then there
-      // are no interleaved events.
-      lanes = getNextLanes(root, lanes);
-      exitStatus = renderRootSync(root, lanes);
-    }
-  } else {
-    lanes = getNextLanes(root, NoLanes);
-    exitStatus = renderRootSync(root, lanes);
+  if (!includesSomeLane(lanes, SyncLane)) {
+    // There's no remaining sync work left.
+    ensureRootIsScheduled(root, now());
+    return null;
   }
 
+  var exitStatus = renderRootSync(root, lanes);
+
   if (root.tag !== LegacyRoot && exitStatus === RootErrored) {
+    var prevExecutionContext = executionContext;
     executionContext |= RetryAfterError; // If an error occurred during hydration,
     // discard server response and fall back to client side render.
 
     if (root.hydrate) {
       root.hydrate = false;
+
+      {
+        errorHydratingContainer(root.containerInfo);
+      }
+
       clearContainer(root.containerInfo);
     } // If something threw an error, try rendering one more time. We'll render
     // synchronously to block concurrent data mutations, and we'll includes
     // all pending updates are included. If it still fails after the second
     // attempt, we'll give up and commit the resulting tree.
 
-    lanes = getLanesToRetrySynchronouslyOnError(root);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-    if (lanes !== NoLanes) {
+    if (errorRetryLanes !== NoLanes) {
+      lanes = errorRetryLanes;
       exitStatus = renderRootSync(root, lanes);
     }
+
+    executionContext = prevExecutionContext;
   }
 
   if (exitStatus === RootFatalErrored) {
@@ -17887,55 +19639,80 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
+function batchedUpdates$1(fn, a) {
+  var prevExecutionContext = executionContext;
+  executionContext |= BatchedContext;
+
+  try {
+    return fn(a);
+  } finally {
+    executionContext = prevExecutionContext; // If there were legacy sync updates, flush them at the end of the outer
+    // most batchedUpdates-like method.
+
+    if (
+      executionContext === NoContext && // Treat `act` as if it's inside `batchedUpdates`, even in legacy mode.
+      !ReactCurrentActQueue.isBatchingLegacy
+    ) {
+      resetRenderTimer();
+      flushSyncCallbacksOnlyInLegacyMode();
+    }
+  }
+}
+// Warning, this opts-out of checking the function body.
+
+// eslint-disable-next-line no-redeclare
+function flushSyncWithoutWarningIfAlreadyRendering(fn) {
+  // In legacy mode, we flush pending passive effects at the beginning of the
+  // next event, not at the end of the previous one.
+  if (
+    rootWithPendingPassiveEffects !== null &&
+    rootWithPendingPassiveEffects.tag === LegacyRoot &&
+    (executionContext & (RenderContext | CommitContext)) === NoContext
+  ) {
+    flushPassiveEffects();
+  }
 
-function batchedUpdates$1(fn, a) {
   var prevExecutionContext = executionContext;
   executionContext |= BatchedContext;
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
+  var previousPriority = getCurrentUpdatePriority();
 
   try {
-    return fn(a);
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
+
+    if (fn) {
+      return fn();
+    } else {
+      return undefined;
+    }
   } finally {
-    executionContext = prevExecutionContext;
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
+    // Note that this will happen even if batchedUpdates is higher up
+    // the stack.
 
-    if (executionContext === NoContext) {
-      // Flush the immediate callbacks that were scheduled during this batch
-      resetRenderTimer();
-      flushSyncCallbackQueue();
+    if ((executionContext & (RenderContext | CommitContext)) === NoContext) {
+      flushSyncCallbacks();
     }
   }
-}
-function flushSync(fn, a) {
-  var prevExecutionContext = executionContext;
+} // Overload the definition to the two valid signatures.
+// Warning, this opts-out of checking the function body.
 
-  if ((prevExecutionContext & (RenderContext | CommitContext)) !== NoContext) {
-    {
+// eslint-disable-next-line no-redeclare
+function flushSync(fn) {
+  {
+    if ((executionContext & (RenderContext | CommitContext)) !== NoContext) {
       error(
         "flushSync was called from inside a lifecycle method. React cannot " +
           "flush when React is already rendering. Consider moving this call to " +
           "a scheduler task or micro task."
       );
     }
-
-    return fn(a);
   }
 
-  executionContext |= BatchedContext;
-
-  {
-    try {
-      if (fn) {
-        return runWithPriority(ImmediatePriority$1, fn.bind(null, a));
-      } else {
-        return undefined;
-      }
-    } finally {
-      executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
-      // Note that this will happen even if batchedUpdates is higher up
-      // the stack.
-
-      flushSyncCallbackQueue();
-    }
-  }
+  return flushSyncWithoutWarningIfAlreadyRendering(fn);
 }
 function pushRenderLanes(fiber, lanes) {
   push(subtreeRenderLanesCursor, subtreeRenderLanes, fiber);
@@ -17980,10 +19757,7 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootSkippedLanes = NoLanes;
   workInProgressRootUpdatedLanes = NoLanes;
   workInProgressRootPingedLanes = NoLanes;
-
-  {
-    spawnedWorkDuringRender = null;
-  }
+  enqueueInterleavedUpdates();
 
   {
     ReactStrictModeWarnings.discardPendingWarnings();
@@ -18073,20 +19847,6 @@ function popDispatcher(prevDispatcher) {
   ReactCurrentDispatcher$2.current = prevDispatcher;
 }
 
-function pushInteractions(root) {
-  {
-    var prevInteractions = tracing.__interactionsRef.current;
-    tracing.__interactionsRef.current = root.memoizedInteractions;
-    return prevInteractions;
-  }
-}
-
-function popInteractions(prevInteractions) {
-  {
-    tracing.__interactionsRef.current = prevInteractions;
-  }
-}
-
 function markCommitTimeOfFallback() {
   globalMostRecentFallbackTime = now();
 }
@@ -18145,12 +19905,25 @@ function renderRootSync(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopSync();
@@ -18161,11 +19934,6 @@ function renderRootSync(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   executionContext = prevExecutionContext;
   popDispatcher(prevDispatcher);
 
@@ -18199,13 +19967,26 @@ function renderRootConcurrent(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     resetRenderTimer();
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopConcurrent();
@@ -18216,11 +19997,6 @@ function renderRootConcurrent(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   popDispatcher(prevDispatcher);
   executionContext = prevExecutionContext;
 
@@ -18303,52 +20079,11 @@ function completeUnitOfWork(unitOfWork) {
         workInProgress = next;
         return;
       }
-
-      resetChildLanes(completedWork);
-
-      if (
-        returnFiber !== null && // Do not append effects to parents if a sibling failed to complete
-        (returnFiber.flags & Incomplete) === NoFlags
-      ) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = completedWork.firstEffect;
-        }
-
-        if (completedWork.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork.firstEffect;
-          }
-
-          returnFiber.lastEffect = completedWork.lastEffect;
-        } // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if needed,
-        // by doing multiple passes over the effect list. We don't want to
-        // schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-
-        var flags = completedWork.flags; // Skip both NoWork and PerformedWork tags when creating the effect
-        // list. PerformedWork effect is read by React DevTools but shouldn't be
-        // committed.
-
-        if (flags > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork;
-          } else {
-            returnFiber.firstEffect = completedWork;
-          }
-
-          returnFiber.lastEffect = completedWork;
-        }
-      }
     } else {
       // This fiber did not complete because something threw. Pop values off
       // the stack without entering the complete phase. If this is a boundary,
       // capture values if possible.
-      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its expiration time.
+      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its lanes.
 
       if (_next !== null) {
         // If completing this work spawned new work, do that next. We'll come
@@ -18376,9 +20111,10 @@ function completeUnitOfWork(unitOfWork) {
       }
 
       if (returnFiber !== null) {
-        // Mark the parent fiber as incomplete and clear its effect list.
-        returnFiber.firstEffect = returnFiber.lastEffect = null;
+        // Mark the parent fiber as incomplete and clear its subtree flags.
         returnFiber.flags |= Incomplete;
+        returnFiber.subtreeFlags = NoFlags;
+        returnFiber.deletions = null;
       }
     }
 
@@ -18400,90 +20136,21 @@ function completeUnitOfWork(unitOfWork) {
   }
 }
 
-function resetChildLanes(completedWork) {
-  if (
-    // TODO: Move this check out of the hot path by moving `resetChildLanes`
-    // to switch statement in `completeWork`.
-    (completedWork.tag === LegacyHiddenComponent ||
-      completedWork.tag === OffscreenComponent) &&
-    completedWork.memoizedState !== null &&
-    !includesSomeLane(subtreeRenderLanes, OffscreenLane) &&
-    (completedWork.mode & ConcurrentMode) !== NoLanes
-  ) {
-    // The children of this component are hidden. Don't bubble their
-    // expiration times.
-    return;
-  }
-
-  var newChildLanes = NoLanes; // Bubble up the earliest expiration time.
-
-  if ((completedWork.mode & ProfileMode) !== NoMode) {
-    // In profiling mode, resetChildExpirationTime is also used to reset
-    // profiler durations.
-    var actualDuration = completedWork.actualDuration;
-    var treeBaseDuration = completedWork.selfBaseDuration; // When a fiber is cloned, its actualDuration is reset to 0. This value will
-    // only be updated if work is done on the fiber (i.e. it doesn't bailout).
-    // When work is done, it should bubble to the parent's actualDuration. If
-    // the fiber has not been cloned though, (meaning no work was done), then
-    // this value will reflect the amount of time spent working on a previous
-    // render. In that case it should not bubble. We determine whether it was
-    // cloned by comparing the child pointer.
-
-    var shouldBubbleActualDurations =
-      completedWork.alternate === null ||
-      completedWork.child !== completedWork.alternate.child;
-    var child = completedWork.child;
-
-    while (child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(child.lanes, child.childLanes)
-      );
-
-      if (shouldBubbleActualDurations) {
-        actualDuration += child.actualDuration;
-      }
-
-      treeBaseDuration += child.treeBaseDuration;
-      child = child.sibling;
-    }
-
-    var isTimedOutSuspense =
-      completedWork.tag === SuspenseComponent &&
-      completedWork.memoizedState !== null;
-
-    if (isTimedOutSuspense) {
-      // Don't count time spent in a timed out Suspense subtree as part of the base duration.
-      var primaryChildFragment = completedWork.child;
-
-      if (primaryChildFragment !== null) {
-        treeBaseDuration -= primaryChildFragment.treeBaseDuration;
-      }
-    }
-
-    completedWork.actualDuration = actualDuration;
-    completedWork.treeBaseDuration = treeBaseDuration;
-  } else {
-    var _child = completedWork.child;
+function commitRoot(root) {
+  // TODO: This no longer makes any sense. We already wrap the mutation and
+  // layout phases. Should be able to remove.
+  var previousUpdateLanePriority = getCurrentUpdatePriority();
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
 
-    while (_child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(_child.lanes, _child.childLanes)
-      );
-      _child = _child.sibling;
-    }
+  try {
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
+    commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    setCurrentUpdatePriority(previousUpdateLanePriority);
   }
 
-  completedWork.childLanes = newChildLanes;
-}
-
-function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(
-    ImmediatePriority$1,
-    commitRootImpl.bind(null, root, renderPriorityLevel)
-  );
   return null;
 }
 
@@ -18509,6 +20176,15 @@ function commitRootImpl(root, renderPriorityLevel) {
 
   if (finishedWork === null) {
     return null;
+  } else {
+    {
+      if (lanes === NoLanes) {
+        error(
+          "root.finishedLanes should not be empty during a commit. This is a " +
+            "bug in React."
+        );
+      }
+    }
   }
 
   root.finishedWork = null;
@@ -18521,52 +20197,57 @@ function commitRootImpl(root, renderPriorityLevel) {
   } // commitRoot never returns a continuation; it always finishes synchronously.
   // So we can clear these now to allow a new callback to be scheduled.
 
-  root.callbackNode = null; // Update the first and last pending times on this root. The new first
+  root.callbackNode = null;
+  root.callbackPriority = NoLane; // Update the first and last pending times on this root. The new first
   // pending time is whatever is left on the root fiber.
 
   var remainingLanes = mergeLanes(finishedWork.lanes, finishedWork.childLanes);
-  markRootFinished(root, remainingLanes); // Clear already finished discrete updates in case that a later call of
-  // `flushDiscreteUpdates` starts a useless render pass which may cancels
-  // a scheduled timeout.
-
-  if (rootsWithPendingDiscreteUpdates !== null) {
-    if (
-      !hasDiscreteLanes(remainingLanes) &&
-      rootsWithPendingDiscreteUpdates.has(root)
-    ) {
-      rootsWithPendingDiscreteUpdates.delete(root);
-    }
-  }
+  markRootFinished(root, remainingLanes);
 
   if (root === workInProgressRoot) {
     // We can reset these now that they are finished.
     workInProgressRoot = null;
     workInProgress = null;
     workInProgressRootRenderLanes = NoLanes;
-  } // Get the list of effects.
-
-  var firstEffect;
-
-  if (finishedWork.flags > PerformedWork) {
-    // A fiber's effect list consists only of its children, not itself. So if
-    // the root has an effect, we need to add it to the end of the list. The
-    // resulting list is the set that would belong to the root's parent, if it
-    // had one; that is, all the effects in the tree including the root.
-    if (finishedWork.lastEffect !== null) {
-      finishedWork.lastEffect.nextEffect = finishedWork;
-      firstEffect = finishedWork.firstEffect;
-    } else {
-      firstEffect = finishedWork;
-    }
-  } else {
-    // There is no effect on the root.
-    firstEffect = finishedWork.firstEffect;
-  }
+  } // If there are pending passive effects, schedule a callback to process them.
+  // Do this as early as possible, so it is queued before anything else that
+  // might get scheduled in the commit phase. (See #16714.)
+  // TODO: Delete all other places that schedule the passive effect callback
+  // They're redundant.
 
-  if (firstEffect !== null) {
+  if (
+    (finishedWork.subtreeFlags & PassiveMask) !== NoFlags ||
+    (finishedWork.flags & PassiveMask) !== NoFlags
+  ) {
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback$1(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
+    }
+  } // Check if there are any effects in the whole tree.
+  // TODO: This is left over from the effect list implementation, where we had
+  // to check for the existence of `firstEffect` to satisfy Flow. I think the
+  // only other reason this optimization exists is because it affects profiling.
+  // Reconsider whether this is necessary.
+
+  var subtreeHasEffects =
+    (finishedWork.subtreeFlags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+  var rootHasEffect =
+    (finishedWork.flags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+
+  if (subtreeHasEffects || rootHasEffect) {
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = getCurrentUpdatePriority();
+    setCurrentUpdatePriority(DiscreteEventPriority);
     var prevExecutionContext = executionContext;
-    executionContext |= CommitContext;
-    var prevInteractions = pushInteractions(root); // Reset this to null before calling lifecycles
+    executionContext |= CommitContext; // Reset this to null before calling lifecycles
 
     ReactCurrentOwner$2.current = null; // The commit phase is broken into several sub-phases. We do a separate pass
     // of the effect list for each phase: all mutation effects come before all
@@ -18575,58 +20256,18 @@ function commitRootImpl(root, renderPriorityLevel) {
     // state of the host tree right before we mutate it. This is where
     // getSnapshotBeforeUpdate is called.
 
-    focusedInstanceHandle = prepareForCommit(root.containerInfo);
-    shouldFireAfterActiveInstanceBlur = false;
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitBeforeMutationEffects, null);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(nextEffect, error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null); // We no longer need to track the active instance fiber
-
-    focusedInstanceHandle = null;
+    var shouldFireAfterActiveInstanceBlur = commitBeforeMutationEffects(
+      root,
+      finishedWork
+    );
 
     {
       // Mark the current commit time to be shared by all Profilers in this
       // batch. This enables them to be grouped later.
       recordCommitTime();
-    } // The next phase is the mutation phase, where we mutate the host tree.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(
-          null,
-          commitMutationEffects,
-          null,
-          root,
-          renderPriorityLevel
-        );
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error = clearCaughtError();
+    }
 
-          captureCommitPhaseError(nextEffect, _error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
+    commitMutationEffects(root, finishedWork, lanes);
 
     resetAfterCommit(root.containerInfo); // The work-in-progress tree is now the current tree. This must come after
     // the mutation phase, so that the previous tree is still current during
@@ -18634,38 +20275,15 @@ function commitRootImpl(root, renderPriorityLevel) {
     // work is current during componentDidMount/Update.
 
     root.current = finishedWork; // The next phase is the layout phase, where we call effects that read
-    // the host tree after it's been mutated. The idiomatic use case for this is
-    // layout, but class component lifecycles also fire here for legacy reasons.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitLayoutEffects, null, root, lanes);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error2 = clearCaughtError();
-
-          captureCommitPhaseError(nextEffect, _error2);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
 
-    nextEffect = null; // Tell Scheduler to yield at the end of the frame, so the browser has an
+    commitLayoutEffects(finishedWork, root, lanes);
     // opportunity to paint.
 
     requestPaint();
+    executionContext = prevExecutionContext; // Reset the priority to the previous non-sync value.
 
-    {
-      popInteractions(prevInteractions);
-    }
-
-    executionContext = prevExecutionContext;
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
   } else {
     // No effects.
     root.current = finishedWork; // Measure these anyway so the flamegraph explicitly shows that there were
@@ -18683,286 +20301,114 @@ function commitRootImpl(root, renderPriorityLevel) {
     // This commit has passive effects. Stash a reference to them. But don't
     // schedule a callback until after flushing layout work.
     rootDoesHavePassiveEffects = false;
-    rootWithPendingPassiveEffects = root;
-    pendingPassiveEffectsLanes = lanes;
-    pendingPassiveEffectsRenderPriority = renderPriorityLevel;
-  } else {
-    // We are done with the effect chain at this point so let's clear the
-    // nextEffect pointers to assist with GC. If we have passive effects, we'll
-    // clear this in flushPassiveEffects.
-    nextEffect = firstEffect;
-
-    while (nextEffect !== null) {
-      var nextNextEffect = nextEffect.nextEffect;
-      nextEffect.nextEffect = null;
-
-      if (nextEffect.flags & Deletion) {
-        detachFiberAfterEffects(nextEffect);
-      }
-
-      nextEffect = nextNextEffect;
-    }
-  } // Read this again, since an effect might have updated it
-
-  remainingLanes = root.pendingLanes; // Check if there's remaining work on this root
-
-  if (remainingLanes !== NoLanes) {
-    {
-      if (spawnedWorkDuringRender !== null) {
-        var expirationTimes = spawnedWorkDuringRender;
-        spawnedWorkDuringRender = null;
-
-        for (var i = 0; i < expirationTimes.length; i++) {
-          scheduleInteractions(
-            root,
-            expirationTimes[i],
-            root.memoizedInteractions
-          );
-        }
-      }
-
-      schedulePendingInteractions(root, remainingLanes);
-    }
-  } else {
-    // If there's no remaining work, we can clear the set of already failed
-    // error boundaries.
-    legacyErrorBoundariesThatAlreadyFailed = null;
-  }
-
-  {
-    if (!rootDidHavePassiveEffects) {
-      // If there are no passive effects, then we can complete the pending interactions.
-      // Otherwise, we'll wait until after the passive effects are flushed.
-      // Wait to do this until after remaining work has been scheduled,
-      // so that we don't prematurely signal complete for interactions when there's e.g. hidden work.
-      finishPendingInteractions(root, lanes);
-    }
-  }
-
-  if (remainingLanes === SyncLane) {
-    // Count the number of times the root synchronously re-renders without
-    // finishing. If there are too many, it indicates an infinite update loop.
-    if (root === rootWithNestedUpdates) {
-      nestedUpdateCount++;
-    } else {
-      nestedUpdateCount = 0;
-      rootWithNestedUpdates = root;
-    }
-  } else {
-    nestedUpdateCount = 0;
-  }
-
-  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
-  // additional work on this root is scheduled.
-
-  ensureRootIsScheduled(root, now());
-
-  if (hasUncaughtError) {
-    hasUncaughtError = false;
-    var _error3 = firstUncaughtError;
-    firstUncaughtError = null;
-    throw _error3;
-  }
-
-  if ((executionContext & LegacyUnbatchedContext) !== NoContext) {
-    // a ReactDOM.render-ed root inside of batchedUpdates. The commit fired
-    // synchronously, but layout updates should be deferred until the end
-    // of the batch.
-
-    return null;
-  } // If layout work was scheduled, flush it now.
-
-  flushSyncCallbackQueue();
-
-  return null;
-}
-
-function commitBeforeMutationEffects() {
-  while (nextEffect !== null) {
-    var current = nextEffect.alternate;
-
-    if (!shouldFireAfterActiveInstanceBlur && focusedInstanceHandle !== null) {
-      if ((nextEffect.flags & Deletion) !== NoFlags) {
-        if (doesFiberContain(nextEffect, focusedInstanceHandle)) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      } else {
-        // TODO: Move this out of the hot path using a dedicated effect tag.
-        if (
-          nextEffect.tag === SuspenseComponent &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle)
-        ) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      }
-    }
-
-    var flags = nextEffect.flags;
-
-    if ((flags & Snapshot) !== NoFlags) {
-      setCurrentFiber(nextEffect);
-      commitBeforeMutationLifeCycles(current, nextEffect);
-      resetCurrentFiber();
-    }
-
-    if ((flags & Passive) !== NoFlags) {
-      // If there are passive effects, schedule a callback to flush at
-      // the earliest opportunity.
-      if (!rootDoesHavePassiveEffects) {
-        rootDoesHavePassiveEffects = true;
-        scheduleCallback(NormalPriority$1, function() {
-          flushPassiveEffects();
-          return null;
-        });
-      }
-    }
-
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function commitMutationEffects(root, renderPriorityLevel) {
-  // TODO: Should probably move the bulk of this function to commitWork.
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
-
-    if (flags & Ref) {
-      var current = nextEffect.alternate;
-
-      if (current !== null) {
-        commitDetachRef(current);
-      }
-    } // The following switch statement is only concerned about placement,
-    // updates, and deletions. To avoid needing to add a case for every possible
-    // bitmap value, we remove the secondary effects from the effect tag and
-    // switch on that value.
-
-    var primaryFlags = flags & (Placement | Update | Deletion | Hydrating);
-
-    switch (primaryFlags) {
-      case Placement: {
-        // inserted, before any life-cycles like componentDidMount gets called.
-        // TODO: findDOMNode doesn't rely on this any more but isMounted does
-        // and isMounted is deprecated anyway so we should be able to kill this.
-
-        nextEffect.flags &= ~Placement;
-        break;
-      }
-
-      case PlacementAndUpdate: {
-        // inserted, before any life-cycles like componentDidMount gets called.
+    rootWithPendingPassiveEffects = root;
+    pendingPassiveEffectsLanes = lanes;
+  } // Read this again, since an effect might have updated it
 
-        nextEffect.flags &= ~Placement; // Update
+  remainingLanes = root.pendingLanes; // Check if there's remaining work on this root
 
-        var _current = nextEffect.alternate;
-        commitWork(_current, nextEffect);
-        break;
-      }
+  if (remainingLanes === NoLanes) {
+    // If there's no remaining work, we can clear the set of already failed
+    // error boundaries.
+    legacyErrorBoundariesThatAlreadyFailed = null;
+  }
 
-      case Hydrating: {
-        nextEffect.flags &= ~Hydrating;
-        break;
-      }
+  {
+    if (!rootDidHavePassiveEffects) {
+      commitDoubleInvokeEffectsInDEV(root.current, false);
+    }
+  }
 
-      case HydratingAndUpdate: {
-        nextEffect.flags &= ~Hydrating; // Update
+  if (includesSomeLane(remainingLanes, SyncLane)) {
+    {
+      markNestedUpdateScheduled();
+    } // Count the number of times the root synchronously re-renders without
+    // finishing. If there are too many, it indicates an infinite update loop.
 
-        var _current2 = nextEffect.alternate;
-        commitWork(_current2, nextEffect);
-        break;
-      }
+    if (root === rootWithNestedUpdates) {
+      nestedUpdateCount++;
+    } else {
+      nestedUpdateCount = 0;
+      rootWithNestedUpdates = root;
+    }
+  } else {
+    nestedUpdateCount = 0;
+  }
 
-      case Update: {
-        var _current3 = nextEffect.alternate;
-        commitWork(_current3, nextEffect);
-        break;
-      }
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
 
-      case Deletion: {
-        commitDeletion(root, nextEffect);
-        break;
-      }
+  {
+    if (isDevToolsPresent) {
+      root.memoizedUpdaters.clear();
     }
-
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
   }
-}
+  // additional work on this root is scheduled.
 
-function commitLayoutEffects(root, committedLanes) {
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
+  ensureRootIsScheduled(root, now());
 
-    if (flags & (Update | Callback)) {
-      var current = nextEffect.alternate;
-      commitLifeCycles(root, current, nextEffect);
-    }
+  if (hasUncaughtError) {
+    hasUncaughtError = false;
+    var error$1 = firstUncaughtError;
+    firstUncaughtError = null;
+    throw error$1;
+  } // If the passive effects are the result of a discrete render, flush them
+  // synchronously at the end of the current task so that the result is
+  // immediately observable. Otherwise, we assume that they are not
+  // order-dependent and do not need to be observed by external systems, so we
+  // can wait until after paint.
+  // TODO: We can optimize this by not scheduling the callback earlier. Since we
+  // currently schedule the callback in multiple places, will wait until those
+  // are consolidated.
 
-    {
-      if (flags & Ref) {
-        commitAttachRef(nextEffect);
-      }
-    }
+  if (
+    includesSomeLane(pendingPassiveEffectsLanes, SyncLane) &&
+    root.tag !== LegacyRoot
+  ) {
+    flushPassiveEffects();
+  } // If layout work was scheduled, flush it now.
 
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
-  }
+  flushSyncCallbacks();
+
+  return null;
 }
 
 function flushPassiveEffects() {
   // Returns whether passive effects were flushed.
-  if (pendingPassiveEffectsRenderPriority !== NoPriority$1) {
-    var priorityLevel =
-      pendingPassiveEffectsRenderPriority > NormalPriority$1
-        ? NormalPriority$1
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = NoPriority$1;
+  // TODO: Combine this check with the one in flushPassiveEFfectsImpl. We should
+  // probably just combine the two functions. I believe they were only separate
+  // in the first place because we used to wrap it with
+  // `Scheduler.runWithPriority`, which accepts a function. But now we track the
+  // priority within React itself, so we can mutate the variable directly.
+  if (rootWithPendingPassiveEffects !== null) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes);
+    var priority = lowerEventPriority(DefaultEventPriority, renderPriority);
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    var previousPriority = getCurrentUpdatePriority();
 
-    {
-      return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      setCurrentUpdatePriority(priority);
+      return flushPassiveEffectsImpl();
+    } finally {
+      setCurrentUpdatePriority(previousPriority);
+      ReactCurrentBatchConfig$2.transition = prevTransition;
     }
   }
 
   return false;
 }
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-
+function enqueuePendingPassiveProfilerEffect(fiber) {
   {
-    fiber.flags |= PassiveUnmountPendingDev;
-    var alternate = fiber.alternate;
+    pendingPassiveProfilerEffects.push(fiber);
 
-    if (alternate !== null) {
-      alternate.flags |= PassiveUnmountPendingDev;
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback$1(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
     }
   }
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-
-function invokePassiveEffectCreate(effect) {
-  var create = effect.create;
-  effect.destroy = create();
 }
 
 function flushPassiveEffectsImpl() {
@@ -18971,127 +20417,50 @@ function flushPassiveEffectsImpl() {
   }
 
   var root = rootWithPendingPassiveEffects;
-  var lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
+  rootWithPendingPassiveEffects = null; // TODO: This is sometimes out of sync with rootWithPendingPassiveEffects.
+  // Figure out why and fix it. It's not causing any known issues (probably
+  // because it's only used for profiling), but it's a refactor hazard.
+
   pendingPassiveEffectsLanes = NoLanes;
 
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Cannot flush passive effects while already rendering.");
   }
 
-  {
-    isFlushingPassiveEffects = true;
-  }
-
   var prevExecutionContext = executionContext;
   executionContext |= CommitContext;
-  var prevInteractions = pushInteractions(root); // It's important that ALL pending passive effect destroy functions are called
-  // before ANY passive effect create functions are called.
-  // Otherwise effects in sibling components might interfere with each other.
-  // e.g. a destroy function in one component may unintentionally override a ref
-  // value set by a create function in another component.
-  // Layout effects have the same constraint.
-  // First pass: Destroy stale passive effects.
-
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var _effect = unmountEffects[i];
-    var fiber = unmountEffects[i + 1];
-    var destroy = _effect.destroy;
-    _effect.destroy = undefined;
-
-    {
-      fiber.flags &= ~PassiveUnmountPendingDev;
-      var alternate = fiber.alternate;
-
-      if (alternate !== null) {
-        alternate.flags &= ~PassiveUnmountPendingDev;
-      }
-    }
-
-    if (typeof destroy === "function") {
-      {
-        setCurrentFiber(fiber);
-
-        {
-          invokeGuardedCallback(null, destroy, null);
-        }
-
-        if (hasCaughtError()) {
-          if (!(fiber !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(fiber, error);
-        }
-
-        resetCurrentFiber();
-      }
-    }
-  } // Second pass: Create new passive effects.
-
-  var mountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-
-  for (var _i = 0; _i < mountEffects.length; _i += 2) {
-    var _effect2 = mountEffects[_i];
-    var _fiber = mountEffects[_i + 1];
-
-    {
-      setCurrentFiber(_fiber);
-
-      {
-        invokeGuardedCallback(null, invokePassiveEffectCreate, null, _effect2);
-      }
-
-      if (hasCaughtError()) {
-        if (!(_fiber !== null)) {
-          throw Error("Should be working on an effect.");
-        }
-
-        var _error4 = clearCaughtError();
-
-        captureCommitPhaseError(_fiber, _error4);
-      }
-
-      resetCurrentFiber();
-    }
-  } // Note: This currently assumes there are no passive effects on the root fiber
-  // because the root is not part of its own effect list.
-  // This could change in the future.
-
-  var effect = root.current.firstEffect;
-
-  while (effect !== null) {
-    var nextNextEffect = effect.nextEffect; // Remove nextEffect pointer to assist GC
+  commitPassiveUnmountEffects(root.current);
+  commitPassiveMountEffects(root, root.current); // TODO: Move to commitPassiveMountEffects
 
-    effect.nextEffect = null;
+  {
+    var profilerEffects = pendingPassiveProfilerEffects;
+    pendingPassiveProfilerEffects = [];
 
-    if (effect.flags & Deletion) {
-      detachFiberAfterEffects(effect);
+    for (var i = 0; i < profilerEffects.length; i++) {
+      var _fiber = profilerEffects[i];
+      commitPassiveEffectDurations(root, _fiber);
     }
-
-    effect = nextNextEffect;
-  }
-
-  {
-    popInteractions(prevInteractions);
-    finishPendingInteractions(root, lanes);
   }
 
   {
-    isFlushingPassiveEffects = false;
+    commitDoubleInvokeEffectsInDEV(root.current, true);
   }
 
   executionContext = prevExecutionContext;
-  flushSyncCallbackQueue(); // If additional passive effects were scheduled, increment a counter. If this
+  flushSyncCallbacks(); // If additional passive effects were scheduled, increment a counter. If this
   // exceeds the limit, we'll fire a warning.
 
   nestedPassiveUpdateCount =
-    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1;
+    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1; // TODO: Move to commitPassiveMountEffects
+
+  onPostCommitRoot(root);
+
+  {
+    var stateNode = root.current.stateNode;
+    stateNode.effectDuration = 0;
+    stateNode.passiveEffectDuration = 0;
+  }
+
   return true;
 }
 
@@ -19128,23 +20497,26 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   if (root !== null) {
     markRootUpdated(root, SyncLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, SyncLane);
   }
 }
 
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
   if (sourceFiber.tag === HostRoot) {
     // Error was thrown at the root. There is no parent, so the root
     // itself should capture it.
-    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
+    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error$1);
     return;
   }
 
-  var fiber = sourceFiber.return;
+  var fiber = null;
+
+  {
+    fiber = sourceFiber.return;
+  }
 
   while (fiber !== null) {
     if (fiber.tag === HostRoot) {
-      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error$1);
       return;
     } else if (fiber.tag === ClassComponent) {
       var ctor = fiber.type;
@@ -19155,7 +20527,7 @@ function captureCommitPhaseError(sourceFiber, error) {
         (typeof instance.componentDidCatch === "function" &&
           !isAlreadyFailedLegacyErrorBoundary(instance))
       ) {
-        var errorInfo = createCapturedValue(error, sourceFiber);
+        var errorInfo = createCapturedValue(error$1, sourceFiber);
         var update = createClassErrorUpdate(fiber, errorInfo, SyncLane);
         enqueueUpdate(fiber, update);
         var eventTime = requestEventTime();
@@ -19164,25 +20536,6 @@ function captureCommitPhaseError(sourceFiber, error) {
         if (root !== null) {
           markRootUpdated(root, SyncLane, eventTime);
           ensureRootIsScheduled(root, eventTime);
-          schedulePendingInteractions(root, SyncLane);
-        } else {
-          // This component has already been unmounted.
-          // We can't schedule any follow up work for the root because the fiber is already unmounted,
-          // but we can still call the log-only boundary so the error isn't swallowed.
-          //
-          // TODO This is only a temporary bandaid for the old reconciler fork.
-          // We can delete this special case once the new fork is merged.
-          if (
-            typeof instance.componentDidCatch === "function" &&
-            !isAlreadyFailedLegacyErrorBoundary(instance)
-          ) {
-            try {
-              instance.componentDidCatch(error, errorInfo);
-            } catch (errorToIgnore) {
-              // TODO Ignore this error? Rethrow it?
-              // This is kind of an edge case.
-            }
-          }
         }
 
         return;
@@ -19191,6 +20544,22 @@ function captureCommitPhaseError(sourceFiber, error) {
 
     fiber = fiber.return;
   }
+
+  {
+    // TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
+    // will fire for errors that are thrown by destroy functions inside deleted
+    // trees. What it should instead do is propagate the error to the parent of
+    // the deleted tree. In the meantime, do not add this warning to the
+    // allowlist; this is only for our internal use.
+    error(
+      "Internal React error: Attempted to capture a commit phase error " +
+        "inside a detached tree. This indicates a bug in React. Likely " +
+        "causes include deleting the same fiber more than once, committing an " +
+        "already-finished tree, or an inconsistent return pointer.\n\n" +
+        "Error message:\n\n%s",
+      error$1
+    );
+  }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
   var pingCache = root.pingCache;
@@ -19234,15 +20603,16 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
   }
 
   ensureRootIsScheduled(root, eventTime);
-  schedulePendingInteractions(root, pingedLanes);
 }
 
 function retryTimedOutBoundary(boundaryFiber, retryLane) {
   // The boundary fiber (a Suspense component or SuspenseList component)
   // previously was rendered in its fallback state. One of the promises that
   // suspended it has resolved, which means at least part of the tree was
-  // likely unblocked. Try rendering again, at a new expiration time.
+  // likely unblocked. Try rendering again, at a new lanes.
   if (retryLane === NoLane) {
+    // TODO: Assign this to `suspenseState.retryLane`? to avoid
+    // unnecessary entanglement?
     retryLane = requestRetryLane(boundaryFiber);
   } // TODO: Special case idle priority?
 
@@ -19252,7 +20622,6 @@ function retryTimedOutBoundary(boundaryFiber, retryLane) {
   if (root !== null) {
     markRootUpdated(root, retryLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, retryLane);
   }
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
@@ -19333,6 +20702,63 @@ function flushRenderPhaseStrictModeWarningsInDEV() {
   }
 }
 
+function commitDoubleInvokeEffectsInDEV(fiber, hasPassiveEffects) {
+  {
+    // TODO (StrictEffects) Should we set a marker on the root if it contains strict effects
+    // so we don't traverse unnecessarily? similar to subtreeFlags but just at the root level.
+    // Maybe not a big deal since this is DEV only behavior.
+    setCurrentFiber(fiber);
+    invokeEffectsInDev(fiber, MountLayoutDev, invokeLayoutEffectUnmountInDEV);
+
+    if (hasPassiveEffects) {
+      invokeEffectsInDev(
+        fiber,
+        MountPassiveDev,
+        invokePassiveEffectUnmountInDEV
+      );
+    }
+
+    invokeEffectsInDev(fiber, MountLayoutDev, invokeLayoutEffectMountInDEV);
+
+    if (hasPassiveEffects) {
+      invokeEffectsInDev(fiber, MountPassiveDev, invokePassiveEffectMountInDEV);
+    }
+
+    resetCurrentFiber();
+  }
+}
+
+function invokeEffectsInDev(firstChild, fiberFlags, invokeEffectFn) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    var current = firstChild;
+    var subtreeRoot = null;
+
+    while (current !== null) {
+      var primarySubtreeFlag = current.subtreeFlags & fiberFlags;
+
+      if (
+        current !== subtreeRoot &&
+        current.child !== null &&
+        primarySubtreeFlag !== NoFlags
+      ) {
+        current = current.child;
+      } else {
+        if ((current.flags & fiberFlags) !== NoFlags) {
+          invokeEffectFn(current);
+        }
+
+        if (current.sibling !== null) {
+          current = current.sibling;
+        } else {
+          current = subtreeRoot = current.return;
+        }
+      }
+    }
+  }
+}
+
 var didWarnStateUpdateForNotYetMountedComponent = null;
 
 function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
@@ -19342,7 +20768,7 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       return;
     }
 
-    if (!(fiber.mode & (BlockingMode | ConcurrentMode))) {
+    if (!(fiber.mode & ConcurrentMode)) {
       return;
     }
 
@@ -19355,15 +20781,14 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       tag !== FunctionComponent &&
       tag !== ForwardRef &&
       tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
+      tag !== SimpleMemoComponent
     ) {
       // Only warn for user-defined components, not internal ones like Suspense.
       return;
     } // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
 
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
+    var componentName = getComponentNameFromFiber(fiber) || "ReactComponent";
 
     if (didWarnStateUpdateForNotYetMountedComponent !== null) {
       if (didWarnStateUpdateForNotYetMountedComponent.has(componentName)) {
@@ -19396,69 +20821,6 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
   }
 }
 
-var didWarnStateUpdateForUnmountedComponent = null;
-
-function warnAboutUpdateOnUnmountedFiberInDEV(fiber) {
-  {
-    var tag = fiber.tag;
-
-    if (
-      tag !== HostRoot &&
-      tag !== ClassComponent &&
-      tag !== FunctionComponent &&
-      tag !== ForwardRef &&
-      tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
-    ) {
-      // Only warn for user-defined components, not internal ones like Suspense.
-      return;
-    } // If there are pending passive effects unmounts for this Fiber,
-    // we can assume that they would have prevented this update.
-
-    if ((fiber.flags & PassiveUnmountPendingDev) !== NoFlags) {
-      return;
-    } // We show the whole stack but dedupe on the top component's name because
-    // the problematic code almost always lies inside that component.
-
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
-
-    if (didWarnStateUpdateForUnmountedComponent !== null) {
-      if (didWarnStateUpdateForUnmountedComponent.has(componentName)) {
-        return;
-      }
-
-      didWarnStateUpdateForUnmountedComponent.add(componentName);
-    } else {
-      didWarnStateUpdateForUnmountedComponent = new Set([componentName]);
-    }
-
-    if (isFlushingPassiveEffects);
-    else {
-      var previousFiber = current;
-
-      try {
-        setCurrentFiber(fiber);
-
-        error(
-          "Can't perform a React state update on an unmounted component. This " +
-            "is a no-op, but it indicates a memory leak in your application. To " +
-            "fix, cancel all subscriptions and asynchronous tasks in %s.",
-          tag === ClassComponent
-            ? "the componentWillUnmount method"
-            : "a useEffect cleanup function"
-        );
-      } finally {
-        if (previousFiber) {
-          setCurrentFiber(fiber);
-        } else {
-          resetCurrentFiber();
-        }
-      }
-    }
-  }
-}
-
 var beginWork$1;
 
 {
@@ -19505,14 +20867,23 @@ var beginWork$1;
       invokeGuardedCallback(null, beginWork, null, current, unitOfWork, lanes);
 
       if (hasCaughtError()) {
-        var replayError = clearCaughtError(); // `invokeGuardedCallback` sometimes sets an expando `_suppressLogging`.
-        // Rethrow this error instead of the original one.
+        var replayError = clearCaughtError();
 
-        throw replayError;
-      } else {
-        // This branch is reachable if the render phase is impure.
-        throw originalError;
-      }
+        if (
+          typeof replayError === "object" &&
+          replayError !== null &&
+          replayError._suppressLogging &&
+          typeof originalError === "object" &&
+          originalError !== null &&
+          !originalError._suppressLogging
+        ) {
+          // If suppressed, let the flag carry over to the original error which is the one we'll rethrow.
+          originalError._suppressLogging = true;
+        }
+      } // We always throw the original error in case the second render pass is not idempotent.
+      // This can happen if a memoized function or CommonJS module doesn't throw after first invokation.
+
+      throw originalError;
     }
   };
 }
@@ -19536,7 +20907,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
         case ForwardRef:
         case SimpleMemoComponent: {
           var renderingComponentName =
-            (workInProgress && getComponentName(workInProgress.type)) ||
+            (workInProgress && getComponentNameFromFiber(workInProgress)) ||
             "Unknown"; // Dedupe by the rendering component because it's the one that needs to be fixed.
 
           var dedupeKey = renderingComponentName;
@@ -19544,7 +20915,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
           if (!didWarnAboutUpdateInRenderForAnotherComponent.has(dedupeKey)) {
             didWarnAboutUpdateInRenderForAnotherComponent.add(dedupeKey);
             var setStateComponentName =
-              getComponentName(fiber.type) || "Unknown";
+              getComponentNameFromFiber(fiber) || "Unknown";
 
             error(
               "Cannot update a component (`%s`) while rendering a " +
@@ -19567,203 +20938,56 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
                 "function of props and state."
             );
 
-            didWarnAboutUpdateInRender = true;
-          }
-
-          break;
-        }
-      }
-    }
-  }
-} // a 'shared' variable that changes when act() opens/closes in tests.
-
-var didWarnAboutUnmockedScheduler = false; // TODO Before we release concurrent mode, revisit this and decide whether a mocked
-// scheduler is the actual recommendation. The alternative could be a testing build,
-// a new lib, or whatever; we dunno just yet. This message is for early adopters
-// to get their tests right.
-
-function warnIfUnmockedScheduler(fiber) {
-  {
-    if (
-      didWarnAboutUnmockedScheduler === false &&
-      Scheduler.unstable_flushAllWithoutAsserting === undefined
-    ) {
-      if (fiber.mode & BlockingMode || fiber.mode & ConcurrentMode) {
-        didWarnAboutUnmockedScheduler = true;
-
-        error(
-          'In Concurrent or Sync modes, the "scheduler" module needs to be mocked ' +
-          "to guarantee consistent behaviour across tests and browsers. " +
-          "For example, with jest: \n" + // Break up requires to avoid accidentally parsing them as dependencies.
-            "jest.mock('scheduler', () => require" +
-            "('scheduler/unstable_mock'));\n\n" +
-            "For more info, visit https://reactjs.org/link/mock-scheduler"
-        );
-      } else {
-        didWarnAboutUnmockedScheduler = true;
-
-        error(
-          'Starting from React v18, the "scheduler" module will need to be mocked ' +
-          "to guarantee consistent behaviour across tests and browsers. " +
-          "For example, with jest: \n" + // Break up requires to avoid accidentally parsing them as dependencies.
-            "jest.mock('scheduler', () => require" +
-            "('scheduler/unstable_mock'));\n\n" +
-            "For more info, visit https://reactjs.org/link/mock-scheduler"
-        );
-      }
-    }
-  }
-}
-
-function computeThreadID(root, lane) {
-  // Interaction threads are unique per root and expiration time.
-  // NOTE: Intentionally unsound cast. All that matters is that it's a number
-  // and it represents a batch of work. Could make a helper function instead,
-  // but meh this is fine for now.
-  return lane * 1000 + root.interactionThreadID;
-}
-
-function markSpawnedWork(lane) {
-  if (spawnedWorkDuringRender === null) {
-    spawnedWorkDuringRender = [lane];
-  } else {
-    spawnedWorkDuringRender.push(lane);
-  }
-}
-
-function scheduleInteractions(root, lane, interactions) {
-  if (interactions.size > 0) {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    var pendingInteractions = pendingInteractionMap.get(lane);
-
-    if (pendingInteractions != null) {
-      interactions.forEach(function(interaction) {
-        if (!pendingInteractions.has(interaction)) {
-          // Update the pending async work count for previously unscheduled interaction.
-          interaction.__count++;
-        }
-
-        pendingInteractions.add(interaction);
-      });
-    } else {
-      pendingInteractionMap.set(lane, new Set(interactions)); // Update the pending async work count for the current interactions.
-
-      interactions.forEach(function(interaction) {
-        interaction.__count++;
-      });
-    }
-
-    var subscriber = tracing.__subscriberRef.current;
+            didWarnAboutUpdateInRender = true;
+          }
 
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lane);
-      subscriber.onWorkScheduled(interactions, threadID);
+          break;
+        }
+      }
     }
   }
 }
 
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-
-function startWorkOnPendingInteractions(root, lanes) {
-  // we can accurately attribute time spent working on it, And so that cascading
-  // work triggered during the render phase will be associated with it.
-
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    if (includesSomeLane(lanes, scheduledLane)) {
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
+function restorePendingUpdaters(root, lanes) {
+  {
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      memoizedUpdaters.forEach(function(schedulingFiber) {
+        addFiberToLanesMap(root, schedulingFiber, lanes);
+      }); // This function intentionally does not clear memoized updaters.
+      // Those may still be relevant to the current commit
+      // and a future one (e.g. Suspense).
     }
-  }); // Store the current set of interactions on the FiberRoot for a few reasons:
-  // We can re-use it in hot functions like performConcurrentWorkOnRoot()
-  // without having to recalculate it. We will also use it in commitWork() to
-  // pass to any Profiler onRender() hooks. This also provides DevTools with a
-  // way to access it when the onCommitRoot() hook is called.
-
-  root.memoizedInteractions = interactions;
-
-  if (interactions.size > 0) {
-    var subscriber = tracing.__subscriberRef.current;
+  }
+}
+var fakeActCallbackNode = {};
 
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lanes);
+function scheduleCallback$1(priorityLevel, callback) {
+  {
+    // If we're currently inside an `act` scope, bypass Scheduler and push to
+    // the `act` queue instead.
+    var actQueue = ReactCurrentActQueue.current;
 
-      try {
-        subscriber.onWorkStarted(interactions, threadID);
-      } catch (error) {
-        // If the subscriber throws, rethrow it in a separate task
-        scheduleCallback(ImmediatePriority$1, function() {
-          throw error;
-        });
-      }
+    if (actQueue !== null) {
+      actQueue.push(callback);
+      return fakeActCallbackNode;
+    } else {
+      return scheduleCallback(priorityLevel, callback);
     }
   }
 }
 
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  var subscriber;
-
-  try {
-    subscriber = tracing.__subscriberRef.current;
+function cancelCallback$1(callbackNode) {
+  if (callbackNode === fakeActCallbackNode) {
+    return;
+  } // In production, always call Scheduler. This function will be stripped out.
 
-    if (subscriber !== null && root.memoizedInteractions.size > 0) {
-      // FIXME: More than one lane can finish in a single commit.
-      var threadID = computeThreadID(root, committedLanes);
-      subscriber.onWorkStopped(root.memoizedInteractions, threadID);
-    }
-  } catch (error) {
-    // If the subscriber throws, rethrow it in a separate task
-    scheduleCallback(ImmediatePriority$1, function() {
-      throw error;
-    });
-  } finally {
-    // Clear completed interactions from the pending Map.
-    // Unless the render was suspended or cascading work was scheduled,
-    // In which case– leave pending interactions until the subsequent render.
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      // Only decrement the pending interaction count if we're done.
-      // If there's still work at the current priority,
-      // That indicates that we are waiting for suspense data.
-      if (!includesSomeLane(remainingLanesAfterCommit, lane)) {
-        pendingInteractionMap.delete(lane);
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-
-          if (subscriber !== null && interaction.__count === 0) {
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error) {
-              // If the subscriber throws, rethrow it in a separate task
-              scheduleCallback(ImmediatePriority$1, function() {
-                throw error;
-              });
-            }
-          }
-        });
-      }
-    });
-  }
-} // `act` testing API
+  return cancelCallback(callbackNode);
+}
 
 function shouldForceFlushFallbacksInDEV() {
   // Never force flush in production. This function should get stripped out.
-  return actingUpdatesScopeDepth > 0;
-}
-// so we can tell if any async act() calls try to run in parallel.
-
-var actingUpdatesScopeDepth = 0;
-
-function detachFiberAfterEffects(fiber) {
-  fiber.sibling = null;
-  fiber.stateNode = null;
+  return ReactCurrentActQueue.current !== null;
 }
 
 var resolveFamily = null; // $FlowFixMe Flow gets confused by a WeakSet feature check below.
@@ -20219,8 +21443,6 @@ var hasBadMapPolyfill;
   }
 }
 
-var debugCounter = 1;
-
 function FiberNode(tag, pendingProps, key, mode) {
   // Instance
   this.tag = tag;
@@ -20242,9 +21464,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.mode = mode; // Effects
 
   this.flags = NoFlags;
-  this.nextEffect = null;
-  this.firstEffect = null;
-  this.lastEffect = null;
+  this.subtreeFlags = NoFlags;
+  this.deletions = null;
   this.lanes = NoLanes;
   this.childLanes = NoLanes;
   this.alternate = null;
@@ -20277,7 +21498,6 @@ function FiberNode(tag, pendingProps, key, mode) {
 
   {
     // This isn't directly used but is handy for debugging internals:
-    this._debugID = debugCounter++;
     this._debugSource = null;
     this._debugOwner = null;
     this._debugNeedsRemount = false;
@@ -20357,7 +21577,6 @@ function createWorkInProgress(current, pendingProps) {
 
     {
       // DEV-only fields
-      workInProgress._debugID = current._debugID;
       workInProgress._debugSource = current._debugSource;
       workInProgress._debugOwner = current._debugOwner;
       workInProgress._debugHookTypes = current._debugHookTypes;
@@ -20371,11 +21590,10 @@ function createWorkInProgress(current, pendingProps) {
     workInProgress.type = current.type; // We already have an alternate.
     // Reset the effect tag.
 
-    workInProgress.flags = NoFlags; // The effect list is no longer valid.
+    workInProgress.flags = NoFlags; // The effects are no longer valid.
 
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
 
     {
       // We intentionally reset, rather than copy, actualDuration & actualStartTime.
@@ -20385,8 +21603,10 @@ function createWorkInProgress(current, pendingProps) {
       workInProgress.actualDuration = 0;
       workInProgress.actualStartTime = -1;
     }
-  }
+  } // Reset all effects except static ones.
+  // Static effects are not specific to a render.
 
+  workInProgress.flags = current.flags & StaticMask;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -20443,13 +21663,10 @@ function resetWorkInProgress(workInProgress, renderLanes) {
   // when they should be reading from current and writing to workInProgress.
   // We assume pendingProps, index, key, ref, return are still untouched to
   // avoid doing another reconciliation.
-  // Reset the effect tag but keep any Placement tags, since that's something
+  // Reset the effect flags but keep any Placement tags, since that's something
   // that child fiber is setting, not the reconciliation.
-  workInProgress.flags &= Placement; // The effect list is no longer valid.
+  workInProgress.flags &= StaticMask | Placement; // The effects are no longer valid.
 
-  workInProgress.nextEffect = null;
-  workInProgress.firstEffect = null;
-  workInProgress.lastEffect = null;
   var current = workInProgress.alternate;
 
   if (current === null) {
@@ -20457,6 +21674,7 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = NoLanes;
     workInProgress.lanes = renderLanes;
     workInProgress.child = null;
+    workInProgress.subtreeFlags = NoFlags;
     workInProgress.memoizedProps = null;
     workInProgress.memoizedState = null;
     workInProgress.updateQueue = null;
@@ -20474,6 +21692,8 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = current.childLanes;
     workInProgress.lanes = current.lanes;
     workInProgress.child = current.child;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
     workInProgress.memoizedProps = current.memoizedProps;
     workInProgress.memoizedState = current.memoizedState;
     workInProgress.updateQueue = current.updateQueue; // Needed because Blocks store data on type.
@@ -20500,13 +21720,32 @@ function resetWorkInProgress(workInProgress, renderLanes) {
 
   return workInProgress;
 }
-function createHostRootFiber(tag) {
+function createHostRootFiber(
+  tag,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var mode;
 
   if (tag === ConcurrentRoot) {
-    mode = ConcurrentMode | BlockingMode | StrictMode;
-  } else if (tag === BlockingRoot) {
-    mode = BlockingMode | StrictMode;
+    mode = ConcurrentMode;
+
+    if (isStrictMode === true) {
+      mode |= StrictLegacyMode;
+
+      {
+        mode |= StrictEffectsMode;
+      }
+    }
+
+    if (
+      // We only use this flag for our repo tests to check both behaviors.
+      // TODO: Flip this flag and rename it something like "forceConcurrentByDefaultForTesting"
+      // Only for internal experiments.
+      concurrentUpdatesByDefaultOverride
+    ) {
+      mode |= ConcurrentUpdatesByDefaultMode;
+    }
   } else {
     mode = NoMode;
   }
@@ -20558,7 +21797,13 @@ function createFiberFromTypeAndProps(
 
       case REACT_STRICT_MODE_TYPE:
         fiberTag = Mode;
-        mode |= StrictMode;
+        mode |= StrictLegacyMode;
+
+        if ((mode & ConcurrentMode) !== NoMode) {
+          // Strict effects should never run on legacy roots
+          mode |= StrictEffectsMode;
+        }
+
         break;
 
       case REACT_PROFILER_TYPE:
@@ -20580,6 +21825,10 @@ function createFiberFromTypeAndProps(
 
       // eslint-disable-next-line no-fallthrough
 
+      case REACT_CACHE_TYPE:
+
+      // eslint-disable-next-line no-fallthrough
+
       default: {
         if (typeof type === "object" && type !== null) {
           switch (type.$$typeof) {
@@ -20609,10 +21858,6 @@ function createFiberFromTypeAndProps(
               fiberTag = LazyComponent;
               resolvedType = null;
               break getTag;
-
-            case REACT_BLOCK_TYPE:
-              fiberTag = Block;
-              break getTag;
           }
         }
 
@@ -20631,7 +21876,7 @@ function createFiberFromTypeAndProps(
               "named imports.";
           }
 
-          var ownerName = owner ? getComponentName(owner.type) : null;
+          var ownerName = owner ? getComponentNameFromFiber(owner) : null;
 
           if (ownerName) {
             info += "\n\nCheck the render method of `" + ownerName + "`.";
@@ -20661,6 +21906,16 @@ function createFiberFromTypeAndProps(
 
   return fiber;
 }
+function createOffscreenHostContainerFiber(props, fiberMode, lanes, key) {
+  {
+    var type = getOffscreenContainerType();
+    var fiber = createFiber(HostComponent, props, key, fiberMode);
+    fiber.elementType = type;
+    fiber.type = type;
+    fiber.lanes = lanes;
+    return fiber;
+  }
+}
 function createFiberFromElement(element, mode, lanes) {
   var owner = null;
 
@@ -20696,14 +21951,15 @@ function createFiberFromFragment(elements, mode, lanes, key) {
 function createFiberFromProfiler(pendingProps, mode, lanes, key) {
   {
     if (typeof pendingProps.id !== "string") {
-      error('Profiler must specify an "id" as a prop');
+      error(
+        'Profiler must specify an "id" of type `string` as a prop. Received the type `%s` instead.',
+        typeof pendingProps.id
+      );
     }
   }
 
-  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode); // TODO: The Profiler fiber shouldn't have a type. It has a tag.
-
+  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
   fiber.elementType = REACT_PROFILER_TYPE;
-  fiber.type = REACT_PROFILER_TYPE;
   fiber.lanes = lanes;
 
   {
@@ -20717,51 +21973,25 @@ function createFiberFromProfiler(pendingProps, mode, lanes, key) {
 }
 
 function createFiberFromSuspense(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode); // TODO: The SuspenseComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  fiber.type = REACT_SUSPENSE_TYPE;
+  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode);
   fiber.elementType = REACT_SUSPENSE_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromSuspenseList(pendingProps, mode, lanes, key) {
   var fiber = createFiber(SuspenseListComponent, pendingProps, key, mode);
-
-  {
-    // TODO: The SuspenseListComponent fiber shouldn't have a type. It has a tag.
-    // This needs to be fixed in getComponentName so that it relies on the tag
-    // instead.
-    fiber.type = REACT_SUSPENSE_LIST_TYPE;
-  }
-
   fiber.elementType = REACT_SUSPENSE_LIST_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode); // TODO: The OffscreenComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_OFFSCREEN_TYPE;
-  }
-
+  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_OFFSCREEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromLegacyHidden(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode); // TODO: The LegacyHidden fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_LEGACY_HIDDEN_TYPE;
-  }
-
+  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_LEGACY_HIDDEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
@@ -20812,9 +22042,8 @@ function assignFiberPropertiesInDEV(target, source) {
   target.dependencies = source.dependencies;
   target.mode = source.mode;
   target.flags = source.flags;
-  target.nextEffect = source.nextEffect;
-  target.firstEffect = source.firstEffect;
-  target.lastEffect = source.lastEffect;
+  target.subtreeFlags = source.subtreeFlags;
+  target.deletions = source.deletions;
   target.lanes = source.lanes;
   target.childLanes = source.childLanes;
   target.alternate = source.alternate;
@@ -20826,7 +22055,6 @@ function assignFiberPropertiesInDEV(target, source) {
     target.treeBaseDuration = source.treeBaseDuration;
   }
 
-  target._debugID = source._debugID;
   target._debugSource = source._debugSource;
   target._debugOwner = source._debugOwner;
   target._debugNeedsRemount = source._debugNeedsRemount;
@@ -20846,7 +22074,7 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.pendingContext = null;
   this.hydrate = hydrate;
   this.callbackNode = null;
-  this.callbackPriority = NoLanePriority;
+  this.callbackPriority = NoLane;
   this.eventTimes = createLaneMap(NoLanes);
   this.expirationTimes = createLaneMap(NoTimestamp);
   this.pendingLanes = NoLanes;
@@ -20859,17 +22087,21 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.entanglements = createLaneMap(NoLanes);
 
   {
-    this.interactionThreadID = tracing.unstable_getThreadID();
-    this.memoizedInteractions = new Set();
-    this.pendingInteractionMap = new Map();
+    this.effectDuration = 0;
+    this.passiveEffectDuration = 0;
   }
 
   {
-    switch (tag) {
-      case BlockingRoot:
-        this._debugRootType = "createBlockingRoot()";
-        break;
+    this.memoizedUpdaters = new Set();
+    var pendingUpdatersLaneMap = (this.pendingUpdatersLaneMap = []);
+
+    for (var i = 0; i < TotalLanes; i++) {
+      pendingUpdatersLaneMap.push(new Set());
+    }
+  }
 
+  {
+    switch (tag) {
       case ConcurrentRoot:
         this._debugRootType = "createRoot()";
         break;
@@ -20881,13 +22113,32 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   }
 }
 
-function createFiberRoot(containerInfo, tag, hydrate, hydrationCallbacks) {
+function createFiberRoot(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var root = new FiberRootNode(containerInfo, tag, hydrate);
   // stateNode is any.
 
-  var uninitializedFiber = createHostRootFiber(tag);
+  var uninitializedFiber = createHostRootFiber(
+    tag,
+    isStrictMode,
+    concurrentUpdatesByDefaultOverride
+  );
   root.current = uninitializedFiber;
   uninitializedFiber.stateNode = root;
+
+  {
+    var _initialState = {
+      element: null
+    };
+    uninitializedFiber.memoizedState = _initialState;
+  }
+
   initializeUpdateQueue(uninitializedFiber);
   return root;
 }
@@ -20961,8 +22212,8 @@ function findHostInstanceWithWarning(component, methodName) {
       return null;
     }
 
-    if (hostFiber.mode & StrictMode) {
-      var componentName = getComponentName(fiber.type) || "Component";
+    if (hostFiber.mode & StrictLegacyMode) {
+      var componentName = getComponentNameFromFiber(fiber) || "Component";
 
       if (!didWarnAboutFindNodeInStrictMode[componentName]) {
         didWarnAboutFindNodeInStrictMode[componentName] = true;
@@ -20971,7 +22222,7 @@ function findHostInstanceWithWarning(component, methodName) {
         try {
           setCurrentFiber(hostFiber);
 
-          if (fiber.mode & StrictMode) {
+          if (fiber.mode & StrictLegacyMode) {
             error(
               "%s is deprecated in StrictMode. " +
                 "%s was passed an instance of %s which is inside StrictMode. " +
@@ -21010,8 +22261,22 @@ function findHostInstanceWithWarning(component, methodName) {
   }
 }
 
-function createContainer(containerInfo, tag, hydrate, hydrationCallbacks) {
-  return createFiberRoot(containerInfo, tag, hydrate);
+function createContainer(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
+  return createFiberRoot(
+    containerInfo,
+    tag,
+    hydrate,
+    hydrationCallbacks,
+    isStrictMode,
+    concurrentUpdatesByDefaultOverride
+  );
 }
 function updateContainer(element, container, parentComponent, callback) {
   {
@@ -21020,14 +22285,6 @@ function updateContainer(element, container, parentComponent, callback) {
 
   var current$1 = container.current;
   var eventTime = requestEventTime();
-
-  {
-    // $FlowExpectedError - jest isn't a global, and isn't recognized outside of tests
-    if ("undefined" !== typeof jest) {
-      warnIfUnmockedScheduler(current$1);
-    }
-  }
-
   var lane = requestUpdateLane(current$1);
 
   var context = getContextForSubtree(parentComponent);
@@ -21047,7 +22304,7 @@ function updateContainer(element, container, parentComponent, callback) {
           "triggering nested component updates from render is not allowed. " +
           "If necessary, trigger nested updates in componentDidUpdate.\n\n" +
           "Check the render method of %s.",
-        getComponentName(current.type) || "Unknown"
+        getComponentNameFromFiber(current) || "Unknown"
       );
     }
   }
@@ -21075,7 +22332,12 @@ function updateContainer(element, container, parentComponent, callback) {
   }
 
   enqueueUpdate(current$1, update);
-  scheduleUpdateOnFiber(current$1, lane, eventTime);
+  var root = scheduleUpdateOnFiber(current$1, lane, eventTime);
+
+  if (root !== null) {
+    entangleTransitions(root, current$1, lane);
+  }
+
   return lane;
 }
 function getPublicRootInstance(container) {
@@ -21094,6 +22356,14 @@ function getPublicRootInstance(container) {
   }
 }
 
+var shouldErrorImpl = function(fiber) {
+  return null;
+};
+
+function shouldError(fiber) {
+  return shouldErrorImpl(fiber);
+}
+
 var shouldSuspendImpl = function(fiber) {
   return false;
 };
@@ -21108,15 +22378,16 @@ var overrideProps = null;
 var overridePropsDeletePath = null;
 var overridePropsRenamePath = null;
 var scheduleUpdate = null;
+var setErrorHandler = null;
 var setSuspenseHandler = null;
 
 {
   var copyWithDeleteImpl = function(obj, path, index) {
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === path.length) {
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(key, 1);
       } else {
         delete updated[key];
@@ -21135,14 +22406,14 @@ var setSuspenseHandler = null;
 
   var copyWithRenameImpl = function(obj, oldPath, newPath, index) {
     var oldKey = oldPath[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === oldPath.length) {
       var newKey = newPath[index]; // $FlowFixMe number or string is fine here
 
       updated[newKey] = updated[oldKey];
 
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(oldKey, 1);
       } else {
         delete updated[oldKey];
@@ -21187,7 +22458,7 @@ var setSuspenseHandler = null;
     }
 
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
 
     updated[key] = copyWithSetImpl(obj[key], path, index + 1, value);
     return updated;
@@ -21295,6 +22566,10 @@ var setSuspenseHandler = null;
     scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
   };
 
+  setErrorHandler = function(newShouldErrorImpl) {
+    shouldErrorImpl = newShouldErrorImpl;
+  };
+
   setSuspenseHandler = function(newShouldSuspendImpl) {
     shouldSuspendImpl = newShouldSuspendImpl;
   };
@@ -21332,6 +22607,7 @@ function injectIntoDevTools(devToolsConfig) {
     overrideProps: overrideProps,
     overridePropsDeletePath: overridePropsDeletePath,
     overridePropsRenamePath: overridePropsRenamePath,
+    setErrorHandler: setErrorHandler,
     setSuspenseHandler: setSuspenseHandler,
     scheduleUpdate: scheduleUpdate,
     currentDispatcherRef: ReactCurrentDispatcher,
@@ -21344,7 +22620,10 @@ function injectIntoDevTools(devToolsConfig) {
     scheduleRoot: scheduleRoot,
     setRefreshHandler: setRefreshHandler,
     // Enables DevTools to append owner stacks to error messages in DEV mode.
-    getCurrentFiber: getCurrentFiberForDevTools
+    getCurrentFiber: getCurrentFiberForDevTools,
+    // Enables DevTools to detect reconciler version rather than renderer version
+    // which may not match for third party renderers.
+    reconcilerVersion: ReactVersion
   });
 }
 
@@ -21360,68 +22639,19 @@ var emptyObject$1 = {};
   Object.freeze(emptyObject$1);
 }
 
-var getInspectorDataForViewTag;
-var getInspectorDataForViewAtPoint;
-
-{
-  var traverseOwnerTreeUp = function(hierarchy, instance) {
-    if (instance) {
-      hierarchy.unshift(instance);
-      traverseOwnerTreeUp(hierarchy, instance._debugOwner);
-    }
-  };
-
-  var getOwnerHierarchy = function(instance) {
-    var hierarchy = [];
-    traverseOwnerTreeUp(hierarchy, instance);
-    return hierarchy;
-  };
-
-  var lastNonHostInstance = function(hierarchy) {
-    for (var i = hierarchy.length - 1; i > 1; i--) {
-      var instance = hierarchy[i];
-
-      if (instance.tag !== HostComponent) {
-        return instance;
-      }
-    }
-
-    return hierarchy[0];
-  };
-
-  var getHostProps = function(fiber) {
-    var host = findCurrentHostFiber(fiber);
-
-    if (host) {
-      return host.memoizedProps || emptyObject$1;
-    }
-
-    return emptyObject$1;
-  };
-
-  var getHostNode = function(fiber, findNodeHandle) {
-    var hostNode; // look for children first for the hostNode
-    // as composite fibers do not have a hostNode
-
-    while (fiber) {
-      if (fiber.stateNode !== null && fiber.tag === HostComponent) {
-        hostNode = findNodeHandle(fiber.stateNode);
-      }
-
-      if (hostNode) {
-        return hostNode;
-      }
-
-      fiber = fiber.child;
-    }
+var createHierarchy;
+var getHostNode;
+var getHostProps;
+var lastNonHostInstance;
 
-    return null;
-  };
+var getOwnerHierarchy;
+var traverseOwnerTreeUp;
 
-  var createHierarchy = function(fiberHierarchy) {
+{
+  createHierarchy = function(fiberHierarchy) {
     return fiberHierarchy.map(function(fiber) {
       return {
-        name: getComponentName(fiber.type),
+        name: getComponentNameFromType(fiber.type),
         getInspectorData: function(findNodeHandle) {
           return {
             props: getHostProps(fiber),
@@ -21449,7 +22679,36 @@ var getInspectorDataForViewAtPoint;
     });
   };
 
-  var getInspectorDataForInstance = function(closestInstance) {
+  getHostNode = function(fiber, findNodeHandle) {
+    var hostNode; // look for children first for the hostNode
+    // as composite fibers do not have a hostNode
+
+    while (fiber) {
+      if (fiber.stateNode !== null && fiber.tag === HostComponent) {
+        hostNode = findNodeHandle(fiber.stateNode);
+      }
+
+      if (hostNode) {
+        return hostNode;
+      }
+
+      fiber = fiber.child;
+    }
+
+    return null;
+  };
+
+  getHostProps = function(fiber) {
+    var host = findCurrentHostFiber(fiber);
+
+    if (host) {
+      return host.memoizedProps || emptyObject$1;
+    }
+
+    return emptyObject$1;
+  };
+
+  exports.getInspectorDataForInstance = function(closestInstance) {
     // Handle case where user clicks outside of ReactNative
     if (!closestInstance) {
       return {
@@ -21475,6 +22734,36 @@ var getInspectorDataForViewAtPoint;
     };
   };
 
+  getOwnerHierarchy = function(instance) {
+    var hierarchy = [];
+    traverseOwnerTreeUp(hierarchy, instance);
+    return hierarchy;
+  };
+
+  lastNonHostInstance = function(hierarchy) {
+    for (var i = hierarchy.length - 1; i > 1; i--) {
+      var instance = hierarchy[i];
+
+      if (instance.tag !== HostComponent) {
+        return instance;
+      }
+    }
+
+    return hierarchy[0];
+  };
+
+  traverseOwnerTreeUp = function(hierarchy, instance) {
+    if (instance) {
+      hierarchy.unshift(instance);
+      traverseOwnerTreeUp(hierarchy, instance._debugOwner);
+    }
+  };
+}
+
+var getInspectorDataForViewTag;
+var getInspectorDataForViewAtPoint;
+
+{
   getInspectorDataForViewTag = function(viewTag) {
     var closestInstance = getInstanceFromTag(viewTag); // Handle case where user clicks outside of ReactNative
 
@@ -21530,29 +22819,33 @@ var getInspectorDataForViewAtPoint;
                     height: 0
                   }
                 },
-                getInspectorDataForInstance(closestInstance)
+                exports.getInspectorDataForInstance(closestInstance)
               )
             );
           }
 
           closestInstance =
-            internalInstanceHandle.stateNode.canonical._internalInstanceHandle;
+            internalInstanceHandle.stateNode.canonical._internalInstanceHandle; // Note: this is deprecated and we want to remove it ASAP. Keeping it here for React DevTools compatibility for now.
+
+          var nativeViewTag =
+            internalInstanceHandle.stateNode.canonical._nativeTag;
           nativeFabricUIManager.measure(
             internalInstanceHandle.stateNode.node,
             function(x, y, width, height, pageX, pageY) {
+              var inspectorData = exports.getInspectorDataForInstance(
+                closestInstance
+              );
               callback(
-                Object.assign(
-                  {
-                    pointerY: locationY,
-                    frame: {
-                      left: pageX,
-                      top: pageY,
-                      width: width,
-                      height: height
-                    }
+                Object.assign({}, inspectorData, {
+                  pointerY: locationY,
+                  frame: {
+                    left: pageX,
+                    top: pageY,
+                    width: width,
+                    height: height
                   },
-                  getInspectorDataForInstance(closestInstance)
-                )
+                  touchedViewTag: nativeViewTag
+                })
               );
             }
           );
@@ -21564,7 +22857,7 @@ var getInspectorDataForViewAtPoint;
         findNodeHandle(inspectedView),
         [locationX, locationY],
         function(nativeViewTag, left, top, width, height) {
-          var inspectorData = getInspectorDataForInstance(
+          var inspectorData = exports.getInspectorDataForInstance(
             getInstanceFromTag(nativeViewTag)
           );
           callback(
@@ -21605,7 +22898,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -21615,13 +22908,15 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
 
   if (componentOrHandle == null) {
     return null;
-  }
+  } // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
 
   if (componentOrHandle._nativeTag) {
+    // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
     return componentOrHandle;
-  }
+  } // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
 
   if (componentOrHandle.canonical && componentOrHandle.canonical._nativeTag) {
+    // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
     return componentOrHandle.canonical;
   }
 
@@ -21641,7 +22936,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
   if (hostInstance.canonical) {
     // Fabric
     return hostInstance.canonical;
-  }
+  } // $FlowFixMe[incompatible-return]
 
   return hostInstance;
 }
@@ -21658,7 +22953,7 @@ function findNodeHandle(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -21717,12 +23012,12 @@ function dispatchCommand(handle, command, args) {
     return;
   }
 
-  if (handle._internalInstanceHandle) {
-    nativeFabricUIManager.dispatchCommand(
-      handle._internalInstanceHandle.stateNode.node,
-      command,
-      args
-    );
+  if (handle._internalInstanceHandle != null) {
+    var stateNode = handle._internalInstanceHandle.stateNode;
+
+    if (stateNode != null) {
+      nativeFabricUIManager.dispatchCommand(stateNode.node, command, args);
+    }
   } else {
     ReactNativePrivateInterface.UIManager.dispatchViewManagerCommand(
       handle._nativeTag,
@@ -21732,17 +23027,51 @@ function dispatchCommand(handle, command, args) {
   }
 }
 
-function render(element, containerTag, callback) {
+function sendAccessibilityEvent(handle, eventType) {
+  if (handle._nativeTag == null) {
+    {
+      error(
+        "sendAccessibilityEvent was called with a ref that isn't a " +
+          "native component. Use React.forwardRef to get access to the underlying native component"
+      );
+    }
+
+    return;
+  }
+
+  if (handle._internalInstanceHandle != null) {
+    var stateNode = handle._internalInstanceHandle.stateNode;
+
+    if (stateNode != null) {
+      nativeFabricUIManager.sendAccessibilityEvent(stateNode.node, eventType);
+    }
+  } else {
+    ReactNativePrivateInterface.legacySendAccessibilityEvent(
+      handle._nativeTag,
+      eventType
+    );
+  }
+}
+
+function render(element, containerTag, callback, concurrentRoot) {
   var root = roots.get(containerTag);
 
   if (!root) {
     // TODO (bvaughn): If we decide to keep the wrapper component,
     // We could create a wrapper for containerTag as well to reduce special casing.
-    root = createContainer(containerTag, LegacyRoot, false);
+    root = createContainer(
+      containerTag,
+      concurrentRoot ? ConcurrentRoot : LegacyRoot,
+      false,
+      null,
+      false,
+      null
+    );
     roots.set(containerTag, root);
   }
 
-  updateContainer(element, root, null, callback);
+  updateContainer(element, root, null, callback); // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
+
   return getPublicRootInstance(root);
 }
 
@@ -21788,6 +23117,7 @@ exports.dispatchCommand = dispatchCommand;
 exports.findHostInstance_DEPRECATED = findHostInstance_DEPRECATED;
 exports.findNodeHandle = findNodeHandle;
 exports.render = render;
+exports.sendAccessibilityEvent = sendAccessibilityEvent;
 exports.stopSurface = stopSurface;
 exports.unmountComponentAtNode = unmountComponentAtNode;
 
diff --git a/Libraries/Renderer/implementations/ReactFabric-dev.js b/Libraries/Renderer/implementations/ReactFabric-dev.js
index 07748f8a596994..c668e0af34777e 100644
--- a/Libraries/Renderer/implementations/ReactFabric-dev.js
+++ b/Libraries/Renderer/implementations/ReactFabric-dev.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactFabric-dev
  * @preventMunge
- * @generated
+ * @generated SignedSource<<d765063033b5d4fd4898d9f476c5c6e8>>
  */
 
 'use strict';
@@ -21,7 +21,6 @@ var React = require("react");
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface");
 var Scheduler = require("scheduler");
-var tracing = require("scheduler/tracing");
 
 var ReactSharedInternals =
   React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
@@ -381,6 +380,12 @@ function clearCaughtError() {
   }
 }
 
+var isArrayImpl = Array.isArray; // eslint-disable-next-line no-redeclare
+
+function isArray(a) {
+  return isArrayImpl(a);
+}
+
 var getFiberCurrentPropsFromNode = null;
 var getInstanceFromNode = null;
 var getNodeFromInstance = null;
@@ -408,13 +413,13 @@ var validateEventDispatches;
   validateEventDispatches = function(event) {
     var dispatchListeners = event._dispatchListeners;
     var dispatchInstances = event._dispatchInstances;
-    var listenersIsArr = Array.isArray(dispatchListeners);
+    var listenersIsArr = isArray(dispatchListeners);
     var listenersLen = listenersIsArr
       ? dispatchListeners.length
       : dispatchListeners
       ? 1
       : 0;
-    var instancesIsArr = Array.isArray(dispatchInstances);
+    var instancesIsArr = isArray(dispatchInstances);
     var instancesLen = instancesIsArr
       ? dispatchInstances.length
       : dispatchInstances
@@ -451,7 +456,7 @@ function executeDispatchesInOrder(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -482,7 +487,7 @@ function executeDispatchesInOrderStopAtTrueImpl(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -528,7 +533,7 @@ function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners;
   var dispatchInstance = event._dispatchInstances;
 
-  if (!!Array.isArray(dispatchListener)) {
+  if (!!isArray(dispatchListener)) {
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   }
 
@@ -1085,8 +1090,19 @@ function printTouchBank() {
   return printed;
 }
 
+var instrumentationCallback;
 var ResponderTouchHistoryStore = {
+  /**
+   * Registers a listener which can be used to instrument every touch event.
+   */
+  instrument: function(callback) {
+    instrumentationCallback = callback;
+  },
   recordTouchTrack: function(topLevelType, nativeEvent) {
+    if (instrumentationCallback != null) {
+      instrumentationCallback(topLevelType, nativeEvent);
+    }
+
     if (isMoveish(topLevelType)) {
       nativeEvent.changedTouches.forEach(recordTouchMove);
     } else if (isStartish(topLevelType)) {
@@ -1144,11 +1160,11 @@ function accumulate(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
+  if (isArray(current)) {
     return current.concat(next);
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     return [current].concat(next);
   }
 
@@ -1180,8 +1196,8 @@ function accumulateInto(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) {
+  if (isArray(current)) {
+    if (isArray(next)) {
       current.push.apply(current, next);
       return current;
     }
@@ -1190,7 +1206,7 @@ function accumulateInto(current, next) {
     return current;
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     // A bit too dangerous to mutate `next`.
     return [current].concat(next);
   }
@@ -1238,11 +1254,10 @@ var LazyComponent = 16;
 var IncompleteClassComponent = 17;
 var DehydratedFragment = 18;
 var SuspenseListComponent = 19;
-var FundamentalComponent = 20;
 var ScopeComponent = 21;
-var Block = 22;
-var OffscreenComponent = 23;
-var LegacyHiddenComponent = 24;
+var OffscreenComponent = 22;
+var LegacyHiddenComponent = 23;
+var CacheComponent = 24;
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -2495,14 +2510,40 @@ function getFiberCurrentPropsFromNode$1(inst) {
 // Module provided by RN:
 var ReactFabricGlobalResponderHandler = {
   onChange: function(from, to, blockNativeResponder) {
-    if (to !== null) {
-      var tag = to.stateNode.canonical._nativeTag;
-      ReactNativePrivateInterface.UIManager.setJSResponder(
-        tag,
-        blockNativeResponder
-      );
+    var fromOrTo = from || to;
+    var fromOrToStateNode = fromOrTo && fromOrTo.stateNode;
+    var isFabric = !!(
+      fromOrToStateNode && fromOrToStateNode.canonical._internalInstanceHandle
+    );
+
+    if (isFabric) {
+      if (from) {
+        // equivalent to clearJSResponder
+        nativeFabricUIManager.setIsJSResponder(
+          from.stateNode.node,
+          false,
+          blockNativeResponder || false
+        );
+      }
+
+      if (to) {
+        // equivalent to setJSResponder
+        nativeFabricUIManager.setIsJSResponder(
+          to.stateNode.node,
+          true,
+          blockNativeResponder || false
+        );
+      }
     } else {
-      ReactNativePrivateInterface.UIManager.clearJSResponder();
+      if (to !== null) {
+        var tag = to.stateNode.canonical._nativeTag;
+        ReactNativePrivateInterface.UIManager.setJSResponder(
+          tag,
+          blockNativeResponder
+        );
+      } else {
+        ReactNativePrivateInterface.UIManager.clearJSResponder();
+      }
     }
   }
 };
@@ -2549,14 +2590,12 @@ var REACT_SUSPENSE_TYPE = 0xead1;
 var REACT_SUSPENSE_LIST_TYPE = 0xead8;
 var REACT_MEMO_TYPE = 0xead3;
 var REACT_LAZY_TYPE = 0xead4;
-var REACT_BLOCK_TYPE = 0xead9;
-var REACT_SERVER_BLOCK_TYPE = 0xeada;
-var REACT_FUNDAMENTAL_TYPE = 0xead5;
 var REACT_SCOPE_TYPE = 0xead7;
 var REACT_OPAQUE_ID_TYPE = 0xeae0;
 var REACT_DEBUG_TRACING_MODE_TYPE = 0xeae1;
 var REACT_OFFSCREEN_TYPE = 0xeae2;
 var REACT_LEGACY_HIDDEN_TYPE = 0xeae3;
+var REACT_CACHE_TYPE = 0xeae4;
 
 if (typeof Symbol === "function" && Symbol.for) {
   var symbolFor = Symbol.for;
@@ -2572,14 +2611,12 @@ if (typeof Symbol === "function" && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
-  REACT_SERVER_BLOCK_TYPE = symbolFor("react.server.block");
-  REACT_FUNDAMENTAL_TYPE = symbolFor("react.fundamental");
   REACT_SCOPE_TYPE = symbolFor("react.scope");
   REACT_OPAQUE_ID_TYPE = symbolFor("react.opaque.id");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
@@ -2601,18 +2638,23 @@ function getIteratorFn(maybeIterable) {
 }
 
 function getWrappedName(outerType, innerType, wrapperName) {
+  var displayName = outerType.displayName;
+
+  if (displayName) {
+    return displayName;
+  }
+
   var functionName = innerType.displayName || innerType.name || "";
-  return (
-    outerType.displayName ||
-    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
-  );
-}
+  return functionName !== ""
+    ? wrapperName + "(" + functionName + ")"
+    : wrapperName;
+} // Keep in sync with react-reconciler/getComponentNameFromFiber
 
 function getContextName(type) {
   return type.displayName || "Context";
-}
+} // Note that the reconciler package should generally prefer to use getComponentNameFromFiber() instead.
 
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (type == null) {
     // Host root, text node or just invalid type.
     return null;
@@ -2621,7 +2663,7 @@ function getComponentName(type) {
   {
     if (typeof type.tag === "number") {
       error(
-        "Received an unexpected object in getComponentName(). " +
+        "Received an unexpected object in getComponentNameFromType(). " +
           "This is likely a bug in React. Please file an issue."
       );
     }
@@ -2653,6 +2695,9 @@ function getComponentName(type) {
 
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
 
   if (typeof type === "object") {
@@ -2669,10 +2714,13 @@ function getComponentName(type) {
         return getWrappedName(type, type.render, "ForwardRef");
 
       case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
+        var outerName = type.displayName || null;
+
+        if (outerName !== null) {
+          return outerName;
+        }
 
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
+        return getComponentNameFromType(type.type) || "Memo";
 
       case REACT_LAZY_TYPE: {
         var lazyComponent = type;
@@ -2680,7 +2728,7 @@ function getComponentName(type) {
         var init = lazyComponent._init;
 
         try {
-          return getComponentName(init(payload));
+          return getComponentNameFromType(init(payload));
         } catch (x) {
           return null;
         }
@@ -2691,9 +2739,113 @@ function getComponentName(type) {
   return null;
 }
 
+function getWrappedName$1(outerType, innerType, wrapperName) {
+  var functionName = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
+  );
+} // Keep in sync with shared/getComponentNameFromType
+
+function getContextName$1(type) {
+  return type.displayName || "Context";
+}
+
+function getComponentNameFromFiber(fiber) {
+  var tag = fiber.tag,
+    type = fiber.type;
+
+  switch (tag) {
+    case CacheComponent:
+      return "Cache";
+
+    case ContextConsumer:
+      var context = type;
+      return getContextName$1(context) + ".Consumer";
+
+    case ContextProvider:
+      var provider = type;
+      return getContextName$1(provider._context) + ".Provider";
+
+    case DehydratedFragment:
+      return "DehydratedFragment";
+
+    case ForwardRef:
+      return getWrappedName$1(type, type.render, "ForwardRef");
+
+    case Fragment:
+      return "Fragment";
+
+    case HostComponent:
+      // Host component type is the display name (e.g. "div", "View")
+      return type;
+
+    case HostPortal:
+      return "Portal";
+
+    case HostRoot:
+      return "Root";
+
+    case HostText:
+      return "Text";
+
+    case LazyComponent:
+      // Name comes from the type in this case; we don't have a tag.
+      return getComponentNameFromType(type);
+
+    case LegacyHiddenComponent:
+      return "LegacyHidden";
+
+    case Mode:
+      if (type === REACT_STRICT_MODE_TYPE) {
+        // Don't be less specific than shared/getComponentNameFromType
+        return "StrictMode";
+      }
+
+      return "Mode";
+
+    case OffscreenComponent:
+      return "Offscreen";
+
+    case Profiler:
+      return "Profiler";
+
+    case ScopeComponent:
+      return "Scope";
+
+    case SuspenseComponent:
+      return "Suspense";
+
+    case SuspenseListComponent:
+      return "SuspenseList";
+    // The display name for this tags come from the user-provided type:
+
+    case ClassComponent:
+    case FunctionComponent:
+    case IncompleteClassComponent:
+    case IndeterminateComponent:
+    case MemoComponent:
+    case SimpleMemoComponent:
+      if (typeof type === "function") {
+        return type.displayName || type.name || null;
+      }
+
+      if (typeof type === "string") {
+        return type;
+      }
+
+      break;
+  }
+
+  return null;
+}
+
 var enableProfilerTimer = true;
+var enableProfilerCommitHooks = true;
+var enableLazyElements = false;
 var warnAboutStringRefs = false;
 var enableNewReconciler = false;
+var enableLazyContextPropagation = false;
 
 // Don't change these two values. They're used by React Dev Tools.
 var NoFlags =
@@ -2711,53 +2863,86 @@ var Update =
   4;
 var PlacementAndUpdate =
   /*           */
-  6;
-var Deletion =
-  /*                     */
-  8;
+  Placement | Update;
+var ChildDeletion =
+  /*                */
+  16;
 var ContentReset =
   /*                 */
-  16;
+  32;
 var Callback =
   /*                     */
-  32;
+  64;
 var DidCapture =
   /*                   */
-  64;
+  128;
 var Ref =
   /*                          */
-  128;
+  256;
 var Snapshot =
   /*                     */
-  256;
+  512;
 var Passive =
   /*                      */
-  512;
+  1024;
 var Hydrating =
   /*                    */
-  1024;
+  2048;
 var HydratingAndUpdate =
   /*           */
-  1028;
+  Hydrating | Update;
+var Visibility =
+  /*                   */
+  4096;
 var LifecycleEffectMask = Passive | Update | Callback | Ref | Snapshot; // Union of all commit flags (flags with the lifetime of a particular commit)
 
 var HostEffectMask =
   /*               */
-  4095; // These are not really side effects, but we still reuse this field.
+  8191; // These are not really side effects, but we still reuse this field.
 
 var Incomplete =
   /*                   */
-  4096;
+  8192;
 var ShouldCapture =
   /*                */
-  8192; // TODO (effects) Remove this bit once the new reconciler is synced to the old.
-
-var PassiveUnmountPendingDev =
-  /*     */
   16384;
 var ForceUpdateForLegacySuspense =
   /* */
-  32768; // Static tags describe aspects of a fiber that are not specific to a render,
+  32768;
+// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
+// This enables us to defer more work in the unmount case,
+// since we can defer traversing the tree during layout to look for Passive effects,
+// and instead rely on the static flag as a signal that there may be cleanup work.
+
+var RefStatic =
+  /*                    */
+  262144;
+var LayoutStatic =
+  /*                 */
+  524288;
+var PassiveStatic =
+  /*                */
+  1048576; // These flags allow us to traverse to fibers that have effects on mount
+// don't contain effects, by checking subtreeFlags.
+
+var BeforeMutationMask = // TODO: Remove Update flag from before mutation phase by re-landing Visiblity
+  // flag logic (see #20043)
+  Update | Snapshot | 0;
+var MutationMask =
+  Placement |
+  Update |
+  ChildDeletion |
+  ContentReset |
+  Ref |
+  Hydrating |
+  Visibility;
+var LayoutMask = Update | Callback | Ref; // TODO: Split into PassiveMountMask and PassiveUnmountMask
+
+var PassiveMask = Passive | ChildDeletion; // Union of tags that don't get reset on clones.
+// This allows certain concepts to persist without recalculting them,
+// e.g. whether a subtree contains passive effects or portals.
+
+var StaticMask = LayoutStatic | PassiveStatic | RefStatic;
 
 var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 function getNearestMountedFiber(fiber) {
@@ -2814,7 +2999,7 @@ function isMounted(component) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(ownerFiber.type) || "A component"
+          getComponentNameFromFiber(ownerFiber) || "A component"
         );
       }
 
@@ -2997,54 +3182,30 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   var currentParent = findCurrentFiberUsingSlowPath(parent);
+  return currentParent !== null
+    ? findCurrentHostFiberImpl(currentParent)
+    : null;
+}
 
-  if (!currentParent) {
-    return null;
-  } // Next we'll drill down this component to find the first HostComponent/Text.
-
-  var node = currentParent;
-
-  while (true) {
-    if (node.tag === HostComponent || node.tag === HostText) {
-      return node;
-    } else if (node.child) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-
-    if (node === currentParent) {
-      return null;
-    }
-
-    while (!node.sibling) {
-      if (!node.return || node.return === currentParent) {
-        return null;
-      }
-
-      node = node.return;
-    }
+function findCurrentHostFiberImpl(node) {
+  // Next we'll drill down this component to find the first HostComponent/Text.
+  if (node.tag === HostComponent || node.tag === HostText) {
+    return node;
+  }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
-  } // Flow needs the return null here, but ESLint complains about it.
-  // eslint-disable-next-line no-unreachable
+  var child = node.child;
 
-  return null;
-}
-function doesFiberContain(parentFiber, childFiber) {
-  var node = childFiber;
-  var parentFiberAlternate = parentFiber.alternate;
+  while (child !== null) {
+    var match = findCurrentHostFiberImpl(child);
 
-  while (node !== null) {
-    if (node === parentFiber || node === parentFiberAlternate) {
-      return true;
+    if (match !== null) {
+      return match;
     }
 
-    node = node.return;
+    child = child.sibling;
   }
 
-  return false;
+  return null;
 }
 
 /**
@@ -3115,7 +3276,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node)) {
+  if (isArray(node)) {
     var i = node.length;
 
     while (i-- && removedKeyCount > 0) {
@@ -3240,12 +3401,12 @@ function diffNestedProperty(
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp)) {
+  if (!isArray(prevProp) && !isArray(nextProp)) {
     // Both are leaves, we can diff the leaves.
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
   }
 
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArray(prevProp) && isArray(nextProp)) {
     // Both are arrays, we can diff the arrays.
     return diffNestedArrayProperty(
       updatePayload,
@@ -3255,7 +3416,7 @@ function diffNestedProperty(
     );
   }
 
-  if (Array.isArray(prevProp)) {
+  if (isArray(prevProp)) {
     return diffProperties(
       updatePayload, // $FlowFixMe - We know that this is always an object when the input is.
       ReactNativePrivateInterface.flattenStyle(prevProp), // $FlowFixMe - We know that this isn't an array because of above flow.
@@ -3282,7 +3443,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(nextProp)) {
+  if (!isArray(nextProp)) {
     // Add each property of the leaf.
     return addProperties(updatePayload, nextProp, validAttributes);
   }
@@ -3308,7 +3469,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp)) {
+  if (!isArray(prevProp)) {
     // Add each property of the leaf.
     return clearProperties(updatePayload, prevProp, validAttributes);
   }
@@ -3563,7 +3724,6 @@ function batchedUpdates(fn, bookkeeping) {
 function setBatchingImplementation(
   _batchedUpdatesImpl,
   _discreteUpdatesImpl,
-  _flushDiscreteUpdatesImpl,
   _batchedEventUpdatesImpl
 ) {
   batchedUpdatesImpl = _batchedUpdatesImpl;
@@ -3697,1936 +3857,1891 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
   // where it would do it.
 }
 
-// can re-export everything from this module.
+// This module only exists as an ESM wrapper around the external CommonJS
+var scheduleCallback = Scheduler.unstable_scheduleCallback;
+var cancelCallback = Scheduler.unstable_cancelCallback;
+var shouldYield = Scheduler.unstable_shouldYield;
+var requestPaint = Scheduler.unstable_requestPaint;
+var now = Scheduler.unstable_now;
+var ImmediatePriority = Scheduler.unstable_ImmediatePriority;
+var UserBlockingPriority = Scheduler.unstable_UserBlockingPriority;
+var NormalPriority = Scheduler.unstable_NormalPriority;
+var IdlePriority = Scheduler.unstable_IdlePriority;
 
-function shim() {
-  {
-    throw Error(
-      "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
-    );
+var rendererID = null;
+var injectedHook = null;
+var hasLoggedError = false;
+var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
   }
-} // Mutation (when unsupported)
-
-var supportsMutation = false;
-var commitMount = shim;
-var clearContainer = shim;
 
-// can re-export everything from this module.
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
 
-function shim$1() {
-  {
-    throw Error(
-      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
-    );
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
   }
-} // Hydration (when unsupported)
-var isSuspenseInstancePending = shim$1;
-var isSuspenseInstanceFallback = shim$1;
-var hydrateTextInstance = shim$1;
-
-var _nativeFabricUIManage = nativeFabricUIManager,
-  createNode = _nativeFabricUIManage.createNode,
-  cloneNode = _nativeFabricUIManage.cloneNode,
-  cloneNodeWithNewChildren = _nativeFabricUIManage.cloneNodeWithNewChildren,
-  cloneNodeWithNewChildrenAndProps =
-    _nativeFabricUIManage.cloneNodeWithNewChildrenAndProps,
-  cloneNodeWithNewProps = _nativeFabricUIManage.cloneNodeWithNewProps,
-  createChildNodeSet = _nativeFabricUIManage.createChildSet,
-  appendChildNode = _nativeFabricUIManage.appendChild,
-  appendChildNodeToSet = _nativeFabricUIManage.appendChildToSet,
-  completeRoot = _nativeFabricUIManage.completeRoot,
-  registerEventHandler = _nativeFabricUIManage.registerEventHandler,
-  fabricMeasure = _nativeFabricUIManage.measure,
-  fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
-  fabricMeasureLayout = _nativeFabricUIManage.measureLayout;
-var getViewConfigForType =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
-// % 10 === 1 means it is a rootTag.
-// % 2 === 0 means it is a Fabric tag.
-// This means that they never overlap.
-
-var nextReactTag = 2;
 
-// TODO: Remove this conditional once all changes have propagated.
-if (registerEventHandler) {
-  /**
-   * Register the event emitter with the native bridge
-   */
-  registerEventHandler(dispatchEvent);
-}
-/**
- * This is used for refs on host components.
- */
+  if (!hook.supportsFiber) {
+    {
+      error(
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://reactjs.org/link/react-devtools"
+      );
+    } // DevTools exists, even though it doesn't support Fiber.
 
-var ReactFabricHostComponent = /*#__PURE__*/ (function() {
-  function ReactFabricHostComponent(
-    tag,
-    viewConfig,
-    props,
-    internalInstanceHandle
-  ) {
-    this._nativeTag = tag;
-    this.viewConfig = viewConfig;
-    this.currentProps = props;
-    this._internalInstanceHandle = internalInstanceHandle;
+    return true;
   }
 
-  var _proto = ReactFabricHostComponent.prototype;
+  try {
+    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
 
-  _proto.blur = function blur() {
-    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
-  };
+    injectedHook = hook;
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      error("React instrumentation encountered an error: %s.", err);
+    }
+  } // DevTools exists
 
-  _proto.focus = function focus() {
-    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
-  };
-
-  _proto.measure = function measure(callback) {
-    fabricMeasure(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-
-  _proto.measureInWindow = function measureInWindow(callback) {
-    fabricMeasureInWindow(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-
-  _proto.measureLayout = function measureLayout(
-    relativeToNativeNode,
-    onSuccess,
-    onFail
-  ) /* currently unused */
+  return true;
+}
+function onScheduleRoot(root, children) {
   {
     if (
-      typeof relativeToNativeNode === "number" ||
-      !(relativeToNativeNode instanceof ReactFabricHostComponent)
+      injectedHook &&
+      typeof injectedHook.onScheduleFiberRoot === "function"
     ) {
-      {
-        error(
-          "Warning: ref.measureLayout must be called with a ref to a native component."
-        );
-      }
+      try {
+        injectedHook.onScheduleFiberRoot(rendererID, root, children);
+      } catch (err) {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-      return;
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
     }
+  }
+}
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
+    try {
+      var didError = (root.current.flags & DidCapture) === DidCapture;
 
-    fabricMeasureLayout(
-      this._internalInstanceHandle.stateNode.node,
-      relativeToNativeNode._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-      mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
-    );
-  };
+      if (enableProfilerTimer) {
+        var schedulerPriority;
 
-  _proto.setNativeProps = function setNativeProps(nativeProps) {
-    {
-      error("Warning: setNativeProps is not currently supported in Fabric");
-    }
+        switch (eventPriority) {
+          case DiscreteEventPriority:
+            schedulerPriority = ImmediatePriority;
+            break;
 
-    return;
-  };
+          case ContinuousEventPriority:
+            schedulerPriority = UserBlockingPriority;
+            break;
 
-  return ReactFabricHostComponent;
-})(); // eslint-disable-next-line no-unused-expressions
-function appendInitialChild(parentInstance, child) {
-  appendChildNode(parentInstance.node, child.node);
-}
-function createInstance(
-  type,
-  props,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  var tag = nextReactTag;
-  nextReactTag += 2;
-  var viewConfig = getViewConfigForType(type);
+          case DefaultEventPriority:
+            schedulerPriority = NormalPriority;
+            break;
 
-  {
-    for (var key in viewConfig.validAttributes) {
-      if (props.hasOwnProperty(key)) {
-        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
-          props[key]
+          case IdleEventPriority:
+            schedulerPriority = IdlePriority;
+            break;
+
+          default:
+            schedulerPriority = NormalPriority;
+            break;
+        }
+
+        injectedHook.onCommitFiberRoot(
+          rendererID,
+          root,
+          schedulerPriority,
+          didError
         );
+      } else {
+        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
       }
-    }
-  }
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  var updatePayload = create(props, viewConfig.validAttributes);
-  var node = createNode(
-    tag, // reactTag
-    viewConfig.uiViewClassName, // viewName
-    rootContainerInstance, // rootTag
-    updatePayload, // props
-    internalInstanceHandle // internalInstanceHandle
-  );
-  var component = new ReactFabricHostComponent(
-    tag,
-    viewConfig,
-    props,
-    internalInstanceHandle
-  );
-  return {
-    node: node,
-    canonical: component
-  };
-}
-function createTextInstance(
-  text,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  if (!hostContext.isInAParentText) {
-    throw Error("Text strings must be rendered within a <Text> component.");
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
-
-  var tag = nextReactTag;
-  nextReactTag += 2;
-  var node = createNode(
-    tag, // reactTag
-    "RCTRawText", // viewName
-    rootContainerInstance, // rootTag
-    {
-      text: text
-    }, // props
-    internalInstanceHandle // instance handle
-  );
-  return {
-    node: node
-  };
-}
-function getRootHostContext(rootContainerInstance) {
-  return {
-    isInAParentText: false
-  };
 }
-function getChildHostContext(parentHostContext, type, rootContainerInstance) {
-  var prevIsInAParentText = parentHostContext.isInAParentText;
-  var isInAParentText =
-    type === "AndroidTextInput" || // Android
-    type === "RCTMultilineTextInputView" || // iOS
-    type === "RCTSinglelineTextInputView" || // iOS
-    type === "RCTText" ||
-    type === "RCTVirtualText";
+function onPostCommitRoot(root) {
+  if (
+    injectedHook &&
+    typeof injectedHook.onPostCommitFiberRoot === "function"
+  ) {
+    try {
+      injectedHook.onPostCommitFiberRoot(rendererID, root);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (prevIsInAParentText !== isInAParentText) {
-    return {
-      isInAParentText: isInAParentText
-    };
-  } else {
-    return parentHostContext;
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function getPublicInstance(instance) {
-  return instance.canonical;
-}
-function prepareForCommit(containerInfo) {
-  // Noop
-  return null;
-}
-function prepareUpdate(
-  instance,
-  type,
-  oldProps,
-  newProps,
-  rootContainerInstance,
-  hostContext
-) {
-  var viewConfig = instance.canonical.viewConfig;
-  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // TODO: If the event handlers have changed, we need to update the current props
-  // in the commit phase but there is no host config hook to do it yet.
-  // So instead we hack it by updating it in the render phase.
-
-  instance.canonical.currentProps = newProps;
-  return updatePayload;
-}
-function resetAfterCommit(containerInfo) {
-  // Noop
-}
-function shouldSetTextContent(type, props) {
-  // TODO (bvaughn) Revisit this decision.
-  // Always returning false simplifies the createInstance() implementation,
-  // But creates an additional child Fiber for raw text children.
-  // No additional native views are created though.
-  // It's not clear to me which is better so I'm deferring for now.
-  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
-  return false;
-} // The Fabric renderer is secondary to the existing React Native renderer.
-var scheduleTimeout = setTimeout;
-var cancelTimeout = clearTimeout;
-var noTimeout = -1; // -------------------
-function cloneInstance(
-  instance,
-  updatePayload,
-  type,
-  oldProps,
-  newProps,
-  internalInstanceHandle,
-  keepChildren,
-  recyclableInstance
-) {
-  var node = instance.node;
-  var clone;
+function onCommitUnmount(fiber) {
+  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
+    try {
+      injectedHook.onCommitFiberUnmount(rendererID, fiber);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (keepChildren) {
-    if (updatePayload !== null) {
-      clone = cloneNodeWithNewProps(node, updatePayload);
-    } else {
-      clone = cloneNode(node);
-    }
-  } else {
-    if (updatePayload !== null) {
-      clone = cloneNodeWithNewChildrenAndProps(node, updatePayload);
-    } else {
-      clone = cloneNodeWithNewChildren(node);
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
     }
   }
-
-  return {
-    node: clone,
-    canonical: instance.canonical
-  };
-}
-function cloneHiddenInstance(instance, type, props, internalInstanceHandle) {
-  var viewConfig = instance.canonical.viewConfig;
-  var node = instance.node;
-  var updatePayload = create(
-    {
-      style: {
-        display: "none"
-      }
-    },
-    viewConfig.validAttributes
-  );
-  return {
-    node: cloneNodeWithNewProps(node, updatePayload),
-    canonical: instance.canonical
-  };
-}
-function cloneHiddenTextInstance(instance, text, internalInstanceHandle) {
-  throw new Error("Not yet implemented.");
-}
-function createContainerChildSet(container) {
-  return createChildNodeSet(container);
-}
-function appendChildToContainerChildSet(childSet, child) {
-  appendChildNodeToSet(childSet, child.node);
-}
-function finalizeContainerChildren(container, newChildren) {
-  completeRoot(container, newChildren);
-}
-function makeClientIdInDEV(warnOnAccessInDEV) {
-  throw new Error("Not yet implemented");
-}
-function preparePortalMount(portalInstance) {
-  // noop
 }
 
-var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
-function describeBuiltInComponentFrame(name, source, ownerFn) {
-  {
-    var ownerName = null;
+var NoMode =
+  /*                         */
+  0; // TODO: Remove ConcurrentMode by reading from the root tag instead
 
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
+var ConcurrentMode =
+  /*                 */
+  1;
+var ProfileMode =
+  /*                    */
+  2;
+var DebugTracingMode =
+  /*               */
+  4;
+var StrictLegacyMode =
+  /*               */
+  8;
 
-    return describeComponentFrame(name, source, ownerName);
+// If those values are changed that package should be rebuilt and redeployed.
+
+var TotalLanes = 31;
+var NoLanes =
+  /*                        */
+  0;
+var NoLane =
+  /*                          */
+  0;
+var SyncLane =
+  /*                        */
+  1;
+var InputContinuousHydrationLane =
+  /*    */
+  2;
+var InputContinuousLane =
+  /*            */
+  4;
+var DefaultHydrationLane =
+  /*            */
+  8;
+var DefaultLane =
+  /*                    */
+  16;
+var TransitionHydrationLane =
+  /*                */
+  32;
+var TransitionLanes =
+  /*                       */
+  4194240;
+var TransitionLane1 =
+  /*                        */
+  64;
+var TransitionLane2 =
+  /*                        */
+  128;
+var TransitionLane3 =
+  /*                        */
+  256;
+var TransitionLane4 =
+  /*                        */
+  512;
+var TransitionLane5 =
+  /*                        */
+  1024;
+var TransitionLane6 =
+  /*                        */
+  2048;
+var TransitionLane7 =
+  /*                        */
+  4096;
+var TransitionLane8 =
+  /*                        */
+  8192;
+var TransitionLane9 =
+  /*                        */
+  16384;
+var TransitionLane10 =
+  /*                       */
+  32768;
+var TransitionLane11 =
+  /*                       */
+  65536;
+var TransitionLane12 =
+  /*                       */
+  131072;
+var TransitionLane13 =
+  /*                       */
+  262144;
+var TransitionLane14 =
+  /*                       */
+  524288;
+var TransitionLane15 =
+  /*                       */
+  1048576;
+var TransitionLane16 =
+  /*                       */
+  2097152;
+var RetryLanes =
+  /*                            */
+  130023424;
+var RetryLane1 =
+  /*                             */
+  4194304;
+var RetryLane2 =
+  /*                             */
+  8388608;
+var RetryLane3 =
+  /*                             */
+  16777216;
+var RetryLane4 =
+  /*                             */
+  33554432;
+var RetryLane5 =
+  /*                             */
+  67108864;
+var SomeRetryLane = RetryLane1;
+var SelectiveHydrationLane =
+  /*          */
+  134217728;
+var NonIdleLanes =
+  /*                                 */
+  268435455;
+var IdleHydrationLane =
+  /*               */
+  268435456;
+var IdleLane =
+  /*                       */
+  536870912;
+var OffscreenLane =
+  /*                   */
+  1073741824; // This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
+var NoTimestamp = -1;
+var nextTransitionLane = TransitionLane1;
+var nextRetryLane = RetryLane1;
+
+function getHighestPriorityLanes(lanes) {
+  switch (getHighestPriorityLane(lanes)) {
+    case SyncLane:
+      return SyncLane;
+
+    case InputContinuousHydrationLane:
+      return InputContinuousHydrationLane;
+
+    case InputContinuousLane:
+      return InputContinuousLane;
+
+    case DefaultHydrationLane:
+      return DefaultHydrationLane;
+
+    case DefaultLane:
+      return DefaultLane;
+
+    case TransitionHydrationLane:
+      return TransitionHydrationLane;
+
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return lanes & TransitionLanes;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      return lanes & RetryLanes;
+
+    case SelectiveHydrationLane:
+      return SelectiveHydrationLane;
+
+    case IdleHydrationLane:
+      return IdleHydrationLane;
+
+    case IdleLane:
+      return IdleLane;
+
+    case OffscreenLane:
+      return OffscreenLane;
+
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
+      } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
+
+      return lanes;
   }
 }
-var componentFrameCache;
 
-{
-  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
-  componentFrameCache = new PossiblyWeakMap();
-}
-var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+function getNextLanes(root, wipLanes) {
+  // Early bailout if there's no pending work left.
+  var pendingLanes = root.pendingLanes;
 
-function describeComponentFrame(name, source, ownerName) {
-  var sourceInfo = "";
+  if (pendingLanes === NoLanes) {
+    return NoLanes;
+  }
 
-  if (source) {
-    var path = source.fileName;
-    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
-    // prefer "folder/index.js" instead of just "index.js".
+  var nextLanes = NoLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes; // Do not work on any idle work until all the non-idle work has finished,
+  // even if the work is suspended.
 
-    if (/^index\./.test(fileName)) {
-      var match = path.match(BEFORE_SLASH_RE);
+  var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
 
-      if (match) {
-        var pathBeforeSlash = match[1];
+  if (nonIdlePendingLanes !== NoLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
 
-        if (pathBeforeSlash) {
-          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
-          fileName = folderName + "/" + fileName;
-        }
+    if (nonIdleUnblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
+    } else {
+      var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
+
+      if (nonIdlePingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
       }
     }
+  } else {
+    // The only remaining work is Idle.
+    var unblockedLanes = pendingLanes & ~suspendedLanes;
 
-    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
-  } else if (ownerName) {
-    sourceInfo = " (created by " + ownerName + ")";
+    if (unblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(unblockedLanes);
+    } else {
+      if (pingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(pingedLanes);
+      }
+    }
   }
 
-  return "\n    in " + (name || "Unknown") + sourceInfo;
-}
+  if (nextLanes === NoLanes) {
+    // This should only be reachable if we're suspended
+    // TODO: Consider warning in this path if a fallback timer is not scheduled.
+    return NoLanes;
+  } // If we're already in the middle of a render, switching lanes will interrupt
+  // it and we'll lose our progress. We should only do this if the new lanes are
+  // higher priority.
 
-function describeClassComponentFrame(ctor, source, ownerFn) {
-  {
-    return describeFunctionComponentFrame(ctor, source, ownerFn);
-  }
-}
-function describeFunctionComponentFrame(fn, source, ownerFn) {
-  {
-    if (!fn) {
-      return "";
+  if (
+    wipLanes !== NoLanes &&
+    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
+    // bother waiting until the root is complete.
+    (wipLanes & suspendedLanes) === NoLanes
+  ) {
+    var nextLane = getHighestPriorityLane(nextLanes);
+    var wipLane = getHighestPriorityLane(wipLanes);
+
+    if (
+      // Tests whether the next lane is equal or lower priority than the wip
+      // one. This works because the bits decrease in priority as you go left.
+      nextLane >= wipLane || // Default priority updates should not interrupt transition updates. The
+      // only difference between default updates and transition updates is that
+      // default updates do not support refresh transitions.
+      (nextLane === DefaultLane && (wipLane & TransitionLanes) !== NoLanes)
+    ) {
+      // Keep working on the existing in-progress tree. Do not interrupt.
+      return wipLanes;
     }
+  }
 
-    var name = fn.displayName || fn.name || null;
-    var ownerName = null;
+  if ((nextLanes & InputContinuousLane) !== NoLanes) {
+    // When updates are sync by default, we entangle continuous priority updates
+    // and default updates, so they render in the same batch. The only reason
+    // they use separate lanes is because continuous updates should interrupt
+    // transitions, but default updates should not.
+    nextLanes |= pendingLanes & DefaultLane;
+  } // Check for entangled lanes and add them to the batch.
+  //
+  // A lane is said to be entangled with another when it's not allowed to render
+  // in a batch that does not also include the other lane. Typically we do this
+  // when multiple updates have the same source, and we only want to respond to
+  // the most recent event from that source.
+  //
+  // Note that we apply entanglements *after* checking for partial work above.
+  // This means that if a lane is entangled during an interleaved event while
+  // it's already rendering, we won't interrupt it. This is intentional, since
+  // entanglement is usually "best effort": we'll try our best to render the
+  // lanes in the same batch, but it's not worth throwing out partially
+  // completed work in order to do it.
+  // TODO: Reconsider this. The counter-argument is that the partial work
+  // represents an intermediate state, which we don't want to show to the user.
+  // And by spending extra time finishing it, we're increasing the amount of
+  // time it takes to show the final state, which is what they are actually
+  // waiting for.
+  //
+  // For those exceptions where entanglement is semantically important, like
+  // useMutableSource, we should ensure that there is no partial work at the
+  // time we apply the entanglement.
 
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
+  var entangledLanes = root.entangledLanes;
 
-    return describeComponentFrame(name, source, ownerName);
+  if (entangledLanes !== NoLanes) {
+    var entanglements = root.entanglements;
+    var lanes = nextLanes & entangledLanes;
+
+    while (lanes > 0) {
+      var index = pickArbitraryLaneIndex(lanes);
+      var lane = 1 << index;
+      nextLanes |= entanglements[index];
+      lanes &= ~lane;
+    }
   }
+
+  return nextLanes;
 }
+function getMostRecentEventTime(root, lanes) {
+  var eventTimes = root.eventTimes;
+  var mostRecentEventTime = NoTimestamp;
 
-function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
-  if (type == null) {
-    return "";
-  }
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var eventTime = eventTimes[index];
 
-  if (typeof type === "function") {
-    {
-      return describeFunctionComponentFrame(type, source, ownerFn);
+    if (eventTime > mostRecentEventTime) {
+      mostRecentEventTime = eventTime;
     }
-  }
 
-  if (typeof type === "string") {
-    return describeBuiltInComponentFrame(type, source, ownerFn);
+    lanes &= ~lane;
   }
 
-  switch (type) {
-    case REACT_SUSPENSE_TYPE:
-      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
+  return mostRecentEventTime;
+}
 
-    case REACT_SUSPENSE_LIST_TYPE:
-      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
-  }
-
-  if (typeof type === "object") {
-    switch (type.$$typeof) {
-      case REACT_FORWARD_REF_TYPE:
-        return describeFunctionComponentFrame(type.render, source, ownerFn);
-
-      case REACT_MEMO_TYPE:
-        // Memo may contain any component type so we recursively resolve it.
-        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
-
-      case REACT_BLOCK_TYPE:
-        return describeFunctionComponentFrame(type._render, source, ownerFn);
-
-      case REACT_LAZY_TYPE: {
-        var lazyComponent = type;
-        var payload = lazyComponent._payload;
-        var init = lazyComponent._init;
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case SyncLane:
+    case InputContinuousHydrationLane:
+    case InputContinuousLane:
+      // User interactions should expire slightly more quickly.
+      //
+      // NOTE: This is set to the corresponding constant as in Scheduler.js.
+      // When we made it larger, a product metric in www regressed, suggesting
+      // there's a user interaction that's being starved by a series of
+      // synchronous updates. If that theory is correct, the proper solution is
+      // to fix the starvation. However, this scenario supports the idea that
+      // expiration times are an important safeguard when starvation
+      // does happen.
+      return currentTime + 250;
+
+    case DefaultHydrationLane:
+    case DefaultLane:
+    case TransitionHydrationLane:
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return currentTime + 5000;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      // TODO: Retries should be allowed to expire if they are CPU bound for
+      // too long, but when I made this change it caused a spike in browser
+      // crashes. There must be some other underlying bug; not super urgent but
+      // ideally should figure out why and fix it. Unfortunately we don't have
+      // a repro for the crashes, only detected via production metrics.
+      return NoTimestamp;
+
+    case SelectiveHydrationLane:
+    case IdleHydrationLane:
+    case IdleLane:
+    case OffscreenLane:
+      // Anything idle priority or lower should never expire.
+      return NoTimestamp;
 
-        try {
-          // Lazy may contain any component type so we recursively resolve it.
-          return describeUnknownElementTypeFrameInDEV(
-            init(payload),
-            source,
-            ownerFn
-          );
-        } catch (x) {}
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
       }
-    }
-  }
-
-  return "";
-}
 
-var loggedTypeFailures = {};
-var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
-
-function setCurrentlyValidatingElement(element) {
-  {
-    if (element) {
-      var owner = element._owner;
-      var stack = describeUnknownElementTypeFrameInDEV(
-        element.type,
-        element._source,
-        owner ? owner.type : null
-      );
-      ReactDebugCurrentFrame.setExtraStackFrame(stack);
-    } else {
-      ReactDebugCurrentFrame.setExtraStackFrame(null);
-    }
+      return NoTimestamp;
   }
 }
 
-function checkPropTypes(typeSpecs, values, location, componentName, element) {
-  {
-    // $FlowFixMe This is okay but Flow doesn't know it.
-    var has = Function.call.bind(Object.prototype.hasOwnProperty);
+function markStarvedLanesAsExpired(root, currentTime) {
+  // TODO: This gets called every time we yield. We can optimize by storing
+  // the earliest expiration time on the root. Then use that to quickly bail out
+  // of this function.
+  var pendingLanes = root.pendingLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes;
+  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
+  // expiration time. If so, we'll assume the update is being starved and mark
+  // it as expired to force it to finish.
 
-    for (var typeSpecName in typeSpecs) {
-      if (has(typeSpecs, typeSpecName)) {
-        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
-        // fail the render phase where it didn't fail before. So we log it.
-        // After these have been cleaned up, we'll let them throw.
+  var lanes = pendingLanes;
 
-        try {
-          // This is intentionally an invariant that gets caught. It's the same
-          // behavior as without this statement except with a better message.
-          if (typeof typeSpecs[typeSpecName] !== "function") {
-            var err = Error(
-              (componentName || "React class") +
-                ": " +
-                location +
-                " type `" +
-                typeSpecName +
-                "` is invalid; " +
-                "it must be a function, usually from the `prop-types` package, but received `" +
-                typeof typeSpecs[typeSpecName] +
-                "`." +
-                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
-            );
-            err.name = "Invariant Violation";
-            throw err;
-          }
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var expirationTime = expirationTimes[index];
 
-          error$1 = typeSpecs[typeSpecName](
-            values,
-            typeSpecName,
-            componentName,
-            location,
-            null,
-            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
-          );
-        } catch (ex) {
-          error$1 = ex;
-        }
+    if (expirationTime === NoTimestamp) {
+      // Found a pending lane with no expiration time. If it's not suspended, or
+      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
+      // using the current time.
+      if (
+        (lane & suspendedLanes) === NoLanes ||
+        (lane & pingedLanes) !== NoLanes
+      ) {
+        // Assumes timestamps are monotonically increasing.
+        expirationTimes[index] = computeExpirationTime(lane, currentTime);
+      }
+    } else if (expirationTime <= currentTime) {
+      // This lane expired
+      root.expiredLanes |= lane;
+    }
 
-        if (error$1 && !(error$1 instanceof Error)) {
-          setCurrentlyValidatingElement(element);
+    lanes &= ~lane;
+  }
+} // This returns the highest priority pending lanes regardless of whether they
+function getLanesToRetrySynchronouslyOnError(root) {
+  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
 
-          error(
-            "%s: type specification of %s" +
-              " `%s` is invalid; the type checker " +
-              "function must return `null` or an `Error` but returned a %s. " +
-              "You may have forgotten to pass an argument to the type checker " +
-              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
-              "shape all require an argument).",
-            componentName || "React class",
-            location,
-            typeSpecName,
-            typeof error$1
-          );
+  if (everythingButOffscreen !== NoLanes) {
+    return everythingButOffscreen;
+  }
 
-          setCurrentlyValidatingElement(null);
-        }
+  if (everythingButOffscreen & OffscreenLane) {
+    return OffscreenLane;
+  }
 
-        if (
-          error$1 instanceof Error &&
-          !(error$1.message in loggedTypeFailures)
-        ) {
-          // Only monitor this failure once because there tends to be a lot of the
-          // same error.
-          loggedTypeFailures[error$1.message] = true;
-          setCurrentlyValidatingElement(element);
+  return NoLanes;
+}
+function includesNonIdleWork(lanes) {
+  return (lanes & NonIdleLanes) !== NoLanes;
+}
+function includesOnlyRetries(lanes) {
+  return (lanes & RetryLanes) === lanes;
+}
+function includesOnlyTransitions(lanes) {
+  return (lanes & TransitionLanes) === lanes;
+}
+function shouldTimeSlice(root, lanes) {
+  if ((lanes & root.expiredLanes) !== NoLanes) {
+    // At least one of these lanes expired. To prevent additional starvation,
+    // finish rendering without yielding execution.
+    return false;
+  }
 
-          error("Failed %s type: %s", location, error$1.message);
+  var SyncDefaultLanes =
+    InputContinuousHydrationLane |
+    InputContinuousLane |
+    DefaultHydrationLane |
+    DefaultLane;
+  return (lanes & SyncDefaultLanes) === NoLanes;
+}
+function isTransitionLane(lane) {
+  return (lane & TransitionLanes) !== 0;
+}
+function claimNextTransitionLane() {
+  // Cycle through the lanes, assigning each new transition to the next lane.
+  // In most cases, this means every transition gets its own lane, until we
+  // run out of lanes and cycle back to the beginning.
+  var lane = nextTransitionLane;
+  nextTransitionLane <<= 1;
 
-          setCurrentlyValidatingElement(null);
-        }
-      }
-    }
+  if ((nextTransitionLane & TransitionLanes) === 0) {
+    nextTransitionLane = TransitionLane1;
   }
+
+  return lane;
 }
+function claimNextRetryLane() {
+  var lane = nextRetryLane;
+  nextRetryLane <<= 1;
 
-var valueStack = [];
-var fiberStack;
+  if ((nextRetryLane & RetryLanes) === 0) {
+    nextRetryLane = RetryLane1;
+  }
 
-{
-  fiberStack = [];
+  return lane;
+}
+function getHighestPriorityLane(lanes) {
+  return lanes & -lanes;
+}
+function pickArbitraryLane(lanes) {
+  // This wrapper function gets inlined. Only exists so to communicate that it
+  // doesn't matter which bit is selected; you can pick any bit without
+  // affecting the algorithms where its used. Here I'm using
+  // getHighestPriorityLane because it requires the fewest operations.
+  return getHighestPriorityLane(lanes);
 }
 
-var index = -1;
+function pickArbitraryLaneIndex(lanes) {
+  return 31 - clz32(lanes);
+}
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+function laneToIndex(lane) {
+  return pickArbitraryLaneIndex(lane);
 }
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      error("Unexpected pop.");
-    }
+function includesSomeLane(a, b) {
+  return (a & b) !== NoLanes;
+}
+function isSubsetOfLanes(set, subset) {
+  return (set & subset) === subset;
+}
+function mergeLanes(a, b) {
+  return a | b;
+}
+function removeLanes(set, subset) {
+  return set & ~subset;
+}
+function intersectLanes(a, b) {
+  return a & b;
+} // Seems redundant, but it changes the type from a single lane (used for
+// updates) to a group of lanes (used for flushing work).
 
-    return;
-  }
+function laneToLanes(lane) {
+  return lane;
+}
+function createLaneMap(initial) {
+  // Intentionally pushing one by one.
+  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
+  var laneMap = [];
 
-  {
-    if (fiber !== fiberStack[index]) {
-      error("Unexpected Fiber popped.");
-    }
+  for (var i = 0; i < TotalLanes; i++) {
+    laneMap.push(initial);
   }
 
-  cursor.current = valueStack[index];
-  valueStack[index] = null;
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane; // If there are any suspended transitions, it's possible this new update
+  // could unblock them. Clear the suspended lanes so that we can try rendering
+  // them again.
+  //
+  // TODO: We really only need to unsuspend only lanes that are in the
+  // `subtreeLanes` of the updated fiber, or the update lanes of the return
+  // path. This would exclude suspended updates in an unrelated sibling tree,
+  // since there's no way for this update to unblock it.
+  //
+  // We don't do this if the incoming update is idle, because we never process
+  // idle updates until after all the regular updates have finished; there's no
+  // way it could unblock a transition.
 
-  {
-    fiberStack[index] = null;
+  if (updateLane !== IdleLane) {
+    root.suspendedLanes = NoLanes;
+    root.pingedLanes = NoLanes;
   }
 
-  index--;
+  var eventTimes = root.eventTimes;
+  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
+  // recent event, and we assume time is monotonically increasing.
+
+  eventTimes[index] = eventTime;
 }
+function markRootSuspended(root, suspendedLanes) {
+  root.suspendedLanes |= suspendedLanes;
+  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
 
-function push(cursor, value, fiber) {
-  index++;
-  valueStack[index] = cursor.current;
+  var expirationTimes = root.expirationTimes;
+  var lanes = suspendedLanes;
 
-  {
-    fiberStack[index] = fiber;
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
   }
-
-  cursor.current = value;
 }
-
-var warnedAboutMissingGetChildContext;
-
-{
-  warnedAboutMissingGetChildContext = {};
+function markRootPinged(root, pingedLanes, eventTime) {
+  root.pingedLanes |= root.suspendedLanes & pingedLanes;
 }
+function markRootMutableRead(root, updateLane) {
+  root.mutableReadLanes |= updateLane & root.pendingLanes;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes; // Let's try everything again
 
-var emptyContextObject = {};
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
 
-{
-  Object.freeze(emptyContextObject);
-} // A cursor to the current merged context object on the stack.
+  var entanglements = root.entanglements;
+  var eventTimes = root.eventTimes;
+  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
 
-var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
+  var lanes = noLongerPendingLanes;
 
-var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    entanglements[index] = NoLanes;
+    eventTimes[index] = NoTimestamp;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  // In addition to entangling each of the given lanes with each other, we also
+  // have to consider _transitive_ entanglements. For each lane that is already
+  // entangled with *any* of the given lanes, that lane is now transitively
+  // entangled with *all* the given lanes.
+  //
+  // Translated: If C is entangled with A, then entangling A with B also
+  // entangles C with B.
+  //
+  // If this is hard to grasp, it might help to intentionally break this
+  // function and look at the tests that fail in ReactTransition-test.js. Try
+  // commenting out one of the conditions below.
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  var entanglements = root.entanglements;
+  var lanes = rootEntangledLanes;
 
-var previousContext = emptyContextObject;
+  while (lanes) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
 
-function getUnmaskedContext(
-  workInProgress,
-  Component,
-  didPushOwnContextIfProvider
-) {
-  {
-    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
-      // If the fiber is a context provider itself, when we read its context
-      // we may have already pushed its own child context on the stack. A context
-      // provider should not "see" its own child context. Therefore we read the
-      // previous (parent) context instead for a context provider.
-      return previousContext;
+    if (
+      // Is this one of the newly entangled lanes?
+      (lane & entangledLanes) | // Is this lane transitively entangled with the newly entangled lanes?
+      (entanglements[index] & entangledLanes)
+    ) {
+      entanglements[index] |= entangledLanes;
     }
 
-    return contextStackCursor.current;
+    lanes &= ~lane;
   }
 }
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (!isDevToolsPresent) {
+    return;
+  }
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  {
-    var instance = workInProgress.stateNode;
-    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
+
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
+    updaters.add(fiber);
+    lanes &= ~lane;
   }
 }
+function movePendingFibersToMemoized(root, lanes) {
+  if (!isDevToolsPresent) {
+    return;
+  }
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  {
-    var type = workInProgress.type;
-    var contextTypes = type.contextTypes;
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
+  var memoizedUpdaters = root.memoizedUpdaters;
 
-    if (!contextTypes) {
-      return emptyContextObject;
-    } // Avoid recreating masked context unless unmasked context has changed.
-    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
 
-    var instance = workInProgress.stateNode;
+    if (updaters.size > 0) {
+      updaters.forEach(function(fiber) {
+        var alternate = fiber.alternate;
 
-    if (
-      instance &&
-      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-    ) {
-      return instance.__reactInternalMemoizedMaskedChildContext;
+        if (alternate === null || !memoizedUpdaters.has(alternate)) {
+          memoizedUpdaters.add(fiber);
+        }
+      });
+      updaters.clear();
     }
 
-    var context = {};
+    lanes &= ~lane;
+  }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
+// Based on:
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
 
-    for (var key in contextTypes) {
-      context[key] = unmaskedContext[key];
-    }
+var log = Math.log;
+var LN2 = Math.LN2;
 
-    {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(contextTypes, context, "context", name);
-    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // Context is created before the class component is instantiated so check for instance.
+function clz32Fallback(lanes) {
+  if (lanes === 0) {
+    return 32;
+  }
 
-    if (instance) {
-      cacheContext(workInProgress, unmaskedContext, context);
-    }
+  return (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
 
-    return context;
-  }
+var DiscreteEventPriority = SyncLane;
+var ContinuousEventPriority = InputContinuousLane;
+var DefaultEventPriority = DefaultLane;
+var IdleEventPriority = IdleLane;
+var currentUpdatePriority = NoLane;
+function getCurrentUpdatePriority() {
+  return currentUpdatePriority;
+}
+function setCurrentUpdatePriority(newPriority) {
+  currentUpdatePriority = newPriority;
+}
+function higherEventPriority(a, b) {
+  return a !== 0 && a < b ? a : b;
 }
+function lowerEventPriority(a, b) {
+  return a === 0 || a > b ? a : b;
+}
+function isHigherEventPriority(a, b) {
+  return a !== 0 && a < b;
+}
+function lanesToEventPriority(lanes) {
+  var lane = getHighestPriorityLane(lanes);
 
-function hasContextChanged() {
-  {
-    return didPerformWorkStackCursor.current;
+  if (!isHigherEventPriority(DiscreteEventPriority, lane)) {
+    return DiscreteEventPriority;
   }
-}
 
-function isContextProvider(type) {
-  {
-    var childContextTypes = type.childContextTypes;
-    return childContextTypes !== null && childContextTypes !== undefined;
+  if (!isHigherEventPriority(ContinuousEventPriority, lane)) {
+    return ContinuousEventPriority;
   }
-}
 
-function popContext(fiber) {
-  {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+  if (includesNonIdleWork(lane)) {
+    return DefaultEventPriority;
   }
+
+  return IdleEventPriority;
 }
 
-function popTopLevelContextObject(fiber) {
+// can re-export everything from this module.
+
+function shim() {
   {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+    throw Error(
+      "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
+    );
   }
-}
+} // Mutation (when unsupported)
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  {
-    if (!(contextStackCursor.current === emptyContextObject)) {
-      throw Error(
-        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
+var supportsMutation = false;
+var commitMount = shim;
+var clearContainer = shim;
 
-    push(contextStackCursor, context, fiber);
-    push(didPerformWorkStackCursor, didChange, fiber);
-  }
-}
+// can re-export everything from this module.
 
-function processChildContext(fiber, type, parentContext) {
+function shim$1() {
   {
-    var instance = fiber.stateNode;
-    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-
-    if (typeof instance.getChildContext !== "function") {
-      {
-        var componentName = getComponentName(type) || "Unknown";
+    throw Error(
+      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+} // Hydration (when unsupported)
+var isSuspenseInstancePending = shim$1;
+var isSuspenseInstanceFallback = shim$1;
+var hydrateTextInstance = shim$1;
+var errorHydratingContainer = shim$1;
 
-        if (!warnedAboutMissingGetChildContext[componentName]) {
-          warnedAboutMissingGetChildContext[componentName] = true;
+var _nativeFabricUIManage = nativeFabricUIManager,
+  createNode = _nativeFabricUIManage.createNode,
+  cloneNode = _nativeFabricUIManage.cloneNode,
+  cloneNodeWithNewChildren = _nativeFabricUIManage.cloneNodeWithNewChildren,
+  cloneNodeWithNewChildrenAndProps =
+    _nativeFabricUIManage.cloneNodeWithNewChildrenAndProps,
+  cloneNodeWithNewProps = _nativeFabricUIManage.cloneNodeWithNewProps,
+  createChildNodeSet = _nativeFabricUIManage.createChildSet,
+  appendChildNode = _nativeFabricUIManage.appendChild,
+  appendChildNodeToSet = _nativeFabricUIManage.appendChildToSet,
+  completeRoot = _nativeFabricUIManage.completeRoot,
+  registerEventHandler = _nativeFabricUIManage.registerEventHandler,
+  fabricMeasure = _nativeFabricUIManage.measure,
+  fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
+  fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
+  FabricDefaultPriority = _nativeFabricUIManage.unstable_DefaultEventPriority,
+  FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
+  fabricGetCurrentEventPriority =
+    _nativeFabricUIManage.unstable_getCurrentEventPriority;
+var getViewConfigForType =
+  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get; // Counter for uniquely identifying views.
+// % 10 === 1 means it is a rootTag.
+// % 2 === 0 means it is a Fabric tag.
+// This means that they never overlap.
 
-          error(
-            "%s.childContextTypes is specified but there is no getChildContext() method " +
-              "on the instance. You can either define getChildContext() on %s or remove " +
-              "childContextTypes from it.",
-            componentName,
-            componentName
-          );
-        }
-      }
+var nextReactTag = 2;
 
-      return parentContext;
-    }
+// TODO: Remove this conditional once all changes have propagated.
+if (registerEventHandler) {
+  /**
+   * Register the event emitter with the native bridge
+   */
+  registerEventHandler(dispatchEvent);
+}
+/**
+ * This is used for refs on host components.
+ */
 
-    var childContext = instance.getChildContext();
+var ReactFabricHostComponent = /*#__PURE__*/ (function() {
+  function ReactFabricHostComponent(
+    tag,
+    viewConfig,
+    props,
+    internalInstanceHandle
+  ) {
+    this._nativeTag = tag;
+    this.viewConfig = viewConfig;
+    this.currentProps = props;
+    this._internalInstanceHandle = internalInstanceHandle;
+  }
 
-    for (var contextKey in childContext) {
-      if (!(contextKey in childContextTypes)) {
-        throw Error(
-          (getComponentName(type) || "Unknown") +
-            '.getChildContext(): key "' +
-            contextKey +
-            '" is not defined in childContextTypes.'
-        );
-      }
-    }
+  var _proto = ReactFabricHostComponent.prototype;
 
-    {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(childContextTypes, childContext, "child context", name);
-    }
-
-    return Object.assign({}, parentContext, childContext);
-  }
-}
+  _proto.blur = function blur() {
+    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
+  };
 
-function pushContextProvider(workInProgress) {
-  {
-    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
-    // If the instance does not exist yet, we will push null at first,
-    // and replace it on the stack later when invalidating the context.
+  _proto.focus = function focus() {
+    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
+  };
 
-    var memoizedMergedChildContext =
-      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-      emptyContextObject; // Remember the parent context so we can merge with it later.
-    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+  _proto.measure = function measure(callback) {
+    fabricMeasure(
+      this._internalInstanceHandle.stateNode.node,
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+    );
+  };
 
-    previousContext = contextStackCursor.current;
-    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-    push(
-      didPerformWorkStackCursor,
-      didPerformWorkStackCursor.current,
-      workInProgress
+  _proto.measureInWindow = function measureInWindow(callback) {
+    fabricMeasureInWindow(
+      this._internalInstanceHandle.stateNode.node,
+      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
     );
-    return true;
-  }
-}
+  };
 
-function invalidateContextProvider(workInProgress, type, didChange) {
+  _proto.measureLayout = function measureLayout(
+    relativeToNativeNode,
+    onSuccess,
+    onFail
+  ) /* currently unused */
   {
-    var instance = workInProgress.stateNode;
+    if (
+      typeof relativeToNativeNode === "number" ||
+      !(relativeToNativeNode instanceof ReactFabricHostComponent)
+    ) {
+      {
+        error(
+          "Warning: ref.measureLayout must be called with a ref to a native component."
+        );
+      }
 
-    if (!instance) {
-      throw Error(
-        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-      );
+      return;
     }
 
-    if (didChange) {
-      // Merge parent and own context.
-      // Skip this if we're not updating due to sCU.
-      // This avoids unnecessarily recomputing memoized values.
-      var mergedContext = processChildContext(
-        workInProgress,
-        type,
-        previousContext
-      );
-      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
-      // It is important to unwind the context in the reverse order.
-
-      pop(didPerformWorkStackCursor, workInProgress);
-      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
-
-      push(contextStackCursor, mergedContext, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    } else {
-      pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    }
-  }
-}
+    fabricMeasureLayout(
+      this._internalInstanceHandle.stateNode.node,
+      relativeToNativeNode._internalInstanceHandle.stateNode.node,
+      mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+      mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+    );
+  };
 
-function findCurrentUnmaskedContext(fiber) {
-  {
-    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-    // makes sense elsewhere
-    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
-      throw Error(
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-      );
+  _proto.setNativeProps = function setNativeProps(nativeProps) {
+    {
+      error("Warning: setNativeProps is not currently supported in Fabric");
     }
 
-    var node = fiber;
-
-    do {
-      switch (node.tag) {
-        case HostRoot:
-          return node.stateNode.context;
-
-        case ClassComponent: {
-          var Component = node.type;
+    return;
+  };
 
-          if (isContextProvider(Component)) {
-            return node.stateNode.__reactInternalMemoizedMergedChildContext;
-          }
+  return ReactFabricHostComponent;
+})(); // eslint-disable-next-line no-unused-expressions
+function appendInitialChild(parentInstance, child) {
+  appendChildNode(parentInstance.node, child.node);
+}
+function createInstance(
+  type,
+  props,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  var tag = nextReactTag;
+  nextReactTag += 2;
+  var viewConfig = getViewConfigForType(type);
 
-          break;
-        }
+  {
+    for (var key in viewConfig.validAttributes) {
+      if (props.hasOwnProperty(key)) {
+        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
+          props[key]
+        );
       }
-
-      node = node.return;
-    } while (node !== null);
-
-    {
-      throw Error(
-        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-      );
     }
   }
-}
-
-var LegacyRoot = 0;
-var BlockingRoot = 1;
-var ConcurrentRoot = 2;
-
-var rendererID = null;
-var injectedHook = null;
-var hasLoggedError = false;
-var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
 
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
+  var updatePayload = create(props, viewConfig.validAttributes);
+  var node = createNode(
+    tag, // reactTag
+    viewConfig.uiViewClassName, // viewName
+    rootContainerInstance, // rootTag
+    updatePayload, // props
+    internalInstanceHandle // internalInstanceHandle
+  );
+  var component = new ReactFabricHostComponent(
+    tag,
+    viewConfig,
+    props,
+    internalInstanceHandle
+  );
+  return {
+    node: node,
+    canonical: component
+  };
+}
+function createTextInstance(
+  text,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  if (!hostContext.isInAParentText) {
+    throw Error("Text strings must be rendered within a <Text> component.");
   }
 
-  if (!hook.supportsFiber) {
+  var tag = nextReactTag;
+  nextReactTag += 2;
+  var node = createNode(
+    tag, // reactTag
+    "RCTRawText", // viewName
+    rootContainerInstance, // rootTag
     {
-      error(
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://reactjs.org/link/react-devtools"
-      );
-    } // DevTools exists, even though it doesn't support Fiber.
+      text: text
+    }, // props
+    internalInstanceHandle // instance handle
+  );
+  return {
+    node: node
+  };
+}
+function getRootHostContext(rootContainerInstance) {
+  return {
+    isInAParentText: false
+  };
+}
+function getChildHostContext(parentHostContext, type, rootContainerInstance) {
+  var prevIsInAParentText = parentHostContext.isInAParentText;
+  var isInAParentText =
+    type === "AndroidTextInput" || // Android
+    type === "RCTMultilineTextInputView" || // iOS
+    type === "RCTSinglelineTextInputView" || // iOS
+    type === "RCTText" ||
+    type === "RCTVirtualText";
 
-    return true;
+  if (prevIsInAParentText !== isInAParentText) {
+    return {
+      isInAParentText: isInAParentText
+    };
+  } else {
+    return parentHostContext;
   }
-
-  try {
-    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
-
-    injectedHook = hook;
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      error("React instrumentation encountered an error: %s.", err);
-    }
-  } // DevTools exists
-
-  return true;
 }
-function onScheduleRoot(root, children) {
-  {
-    if (
-      injectedHook &&
-      typeof injectedHook.onScheduleFiberRoot === "function"
-    ) {
-      try {
-        injectedHook.onScheduleFiberRoot(rendererID, root, children);
-      } catch (err) {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
+function getPublicInstance(instance) {
+  return instance.canonical;
+}
+function prepareForCommit(containerInfo) {
+  // Noop
+  return null;
+}
+function prepareUpdate(
+  instance,
+  type,
+  oldProps,
+  newProps,
+  rootContainerInstance,
+  hostContext
+) {
+  var viewConfig = instance.canonical.viewConfig;
+  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // TODO: If the event handlers have changed, we need to update the current props
+  // in the commit phase but there is no host config hook to do it yet.
+  // So instead we hack it by updating it in the render phase.
 
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
-    }
-  }
+  instance.canonical.currentProps = newProps;
+  return updatePayload;
 }
-function onCommitRoot(root, priorityLevel) {
-  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
-    try {
-      var didError = (root.current.flags & DidCapture) === DidCapture;
+function resetAfterCommit(containerInfo) {
+  // Noop
+}
+function shouldSetTextContent(type, props) {
+  // TODO (bvaughn) Revisit this decision.
+  // Always returning false simplifies the createInstance() implementation,
+  // But creates an additional child Fiber for raw text children.
+  // No additional native views are created though.
+  // It's not clear to me which is better so I'm deferring for now.
+  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
+  return false;
+}
+function getCurrentEventPriority() {
+  var currentEventPriority = fabricGetCurrentEventPriority
+    ? fabricGetCurrentEventPriority()
+    : null;
 
-      if (enableProfilerTimer) {
-        injectedHook.onCommitFiberRoot(
-          rendererID,
-          root,
-          priorityLevel,
-          didError
-        );
-      } else {
-        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
-      }
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
+  if (currentEventPriority != null) {
+    switch (currentEventPriority) {
+      case FabricDiscretePriority:
+        return DiscreteEventPriority;
 
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
+      case FabricDefaultPriority:
+      default:
+        return DefaultEventPriority;
     }
   }
-}
-function onCommitUnmount(fiber) {
-  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
-    try {
-      injectedHook.onCommitFiberUnmount(rendererID, fiber);
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
 
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
+  return DefaultEventPriority;
+} // The Fabric renderer is secondary to the existing React Native renderer.
+var scheduleTimeout = setTimeout;
+var cancelTimeout = clearTimeout;
+var noTimeout = -1; // -------------------
+function cloneInstance(
+  instance,
+  updatePayload,
+  type,
+  oldProps,
+  newProps,
+  internalInstanceHandle,
+  keepChildren,
+  recyclableInstance
+) {
+  var node = instance.node;
+  var clone;
+
+  if (keepChildren) {
+    if (updatePayload !== null) {
+      clone = cloneNodeWithNewProps(node, updatePayload);
+    } else {
+      clone = cloneNode(node);
+    }
+  } else {
+    if (updatePayload !== null) {
+      clone = cloneNodeWithNewChildrenAndProps(node, updatePayload);
+    } else {
+      clone = cloneNodeWithNewChildren(node);
     }
   }
-}
-
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_now = Scheduler.unstable_now;
 
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-    );
-  }
+  return {
+    node: clone,
+    canonical: instance.canonical
+  };
+}
+function cloneHiddenInstance(instance, type, props, internalInstanceHandle) {
+  var viewConfig = instance.canonical.viewConfig;
+  var node = instance.node;
+  var updatePayload = create(
+    {
+      style: {
+        display: "none"
+      }
+    },
+    viewConfig.validAttributes
+  );
+  return {
+    node: cloneNodeWithNewProps(node, updatePayload),
+    canonical: instance.canonical
+  };
+}
+function cloneHiddenTextInstance(instance, text, internalInstanceHandle) {
+  throw new Error("Not yet implemented.");
+}
+function createContainerChildSet(container) {
+  return createChildNodeSet(container);
+}
+function appendChildToContainerChildSet(childSet, child) {
+  appendChildNodeToSet(childSet, child.node);
+}
+function finalizeContainerChildren(container, newChildren) {
+  completeRoot(container, newChildren);
+}
+function makeClientIdInDEV(warnOnAccessInDEV) {
+  throw new Error("Not yet implemented");
+}
+function preparePortalMount(portalInstance) {
+  // noop
 }
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
-
-var ImmediatePriority = 99;
-var UserBlockingPriority = 98;
-var NormalPriority = 97;
-var LowPriority = 96;
-var IdlePriority = 95; // NoPriority is the absence of priority. Also React-only.
-
-var NoPriority = 90;
-var initialTimeMs = Scheduler_now(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-
-var SyncLanePriority = 15;
-var SyncBatchedLanePriority = 14;
-var InputDiscreteHydrationLanePriority = 13;
-var InputDiscreteLanePriority = 12;
-var InputContinuousHydrationLanePriority = 11;
-var InputContinuousLanePriority = 10;
-var DefaultHydrationLanePriority = 9;
-var DefaultLanePriority = 8;
-var TransitionHydrationPriority = 7;
-var TransitionPriority = 6;
-var RetryLanePriority = 5;
-var SelectiveHydrationLanePriority = 4;
-var IdleHydrationLanePriority = 3;
-var IdleLanePriority = 2;
-var OffscreenLanePriority = 1;
-var NoLanePriority = 0;
-var TotalLanes = 31;
-var NoLanes =
-  /*                        */
-  0;
-var NoLane =
-  /*                          */
-  0;
-var SyncLane =
-  /*                        */
-  1;
-var SyncBatchedLane =
-  /*                 */
-  2;
-var InputDiscreteHydrationLane =
-  /*      */
-  4;
-var InputDiscreteLanes =
-  /*                    */
-  24;
-var InputContinuousHydrationLane =
-  /*           */
-  32;
-var InputContinuousLanes =
-  /*                  */
-  192;
-var DefaultHydrationLane =
-  /*            */
-  256;
-var DefaultLanes =
-  /*                   */
-  3584;
-var TransitionHydrationLane =
-  /*                */
-  4096;
-var TransitionLanes =
-  /*                       */
-  4186112;
-var RetryLanes =
-  /*                            */
-  62914560;
-var SomeRetryLane =
-  /*                  */
-  33554432;
-var SelectiveHydrationLane =
-  /*          */
-  67108864;
-var NonIdleLanes =
-  /*                                 */
-  134217727;
-var IdleHydrationLane =
-  /*               */
-  134217728;
-var IdleLanes =
-  /*                             */
-  805306368;
-var OffscreenLane =
-  /*                   */
-  1073741824;
-var NoTimestamp = -1;
-// Used by getHighestPriorityLanes and getNextLanes:
 
-var return_highestLanePriority = DefaultLanePriority;
+var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
+function describeBuiltInComponentFrame(name, source, ownerFn) {
+  {
+    var ownerName = null;
 
-function getHighestPriorityLanes(lanes) {
-  if ((SyncLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncLanePriority;
-    return SyncLane;
-  }
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
+    }
 
-  if ((SyncBatchedLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncBatchedLanePriority;
-    return SyncBatchedLane;
+    return describeComponentFrame(name, source, ownerName);
   }
+}
+var componentFrameCache;
 
-  if ((InputDiscreteHydrationLane & lanes) !== NoLanes) {
-    return_highestLanePriority = InputDiscreteHydrationLanePriority;
-    return InputDiscreteHydrationLane;
-  }
+{
+  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
+  componentFrameCache = new PossiblyWeakMap();
+}
+var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
 
-  var inputDiscreteLanes = InputDiscreteLanes & lanes;
+function describeComponentFrame(name, source, ownerName) {
+  var sourceInfo = "";
 
-  if (inputDiscreteLanes !== NoLanes) {
-    return_highestLanePriority = InputDiscreteLanePriority;
-    return inputDiscreteLanes;
-  }
+  if (source) {
+    var path = source.fileName;
+    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
+    // prefer "folder/index.js" instead of just "index.js".
 
-  if ((lanes & InputContinuousHydrationLane) !== NoLanes) {
-    return_highestLanePriority = InputContinuousHydrationLanePriority;
-    return InputContinuousHydrationLane;
-  }
+    if (/^index\./.test(fileName)) {
+      var match = path.match(BEFORE_SLASH_RE);
 
-  var inputContinuousLanes = InputContinuousLanes & lanes;
+      if (match) {
+        var pathBeforeSlash = match[1];
 
-  if (inputContinuousLanes !== NoLanes) {
-    return_highestLanePriority = InputContinuousLanePriority;
-    return inputContinuousLanes;
-  }
+        if (pathBeforeSlash) {
+          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
+          fileName = folderName + "/" + fileName;
+        }
+      }
+    }
 
-  if ((lanes & DefaultHydrationLane) !== NoLanes) {
-    return_highestLanePriority = DefaultHydrationLanePriority;
-    return DefaultHydrationLane;
+    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
+  } else if (ownerName) {
+    sourceInfo = " (created by " + ownerName + ")";
   }
 
-  var defaultLanes = DefaultLanes & lanes;
+  return "\n    in " + (name || "Unknown") + sourceInfo;
+}
 
-  if (defaultLanes !== NoLanes) {
-    return_highestLanePriority = DefaultLanePriority;
-    return defaultLanes;
+function describeClassComponentFrame(ctor, source, ownerFn) {
+  {
+    return describeFunctionComponentFrame(ctor, source, ownerFn);
   }
+}
+function describeFunctionComponentFrame(fn, source, ownerFn) {
+  {
+    if (!fn) {
+      return "";
+    }
 
-  if ((lanes & TransitionHydrationLane) !== NoLanes) {
-    return_highestLanePriority = TransitionHydrationPriority;
-    return TransitionHydrationLane;
-  }
+    var name = fn.displayName || fn.name || null;
+    var ownerName = null;
 
-  var transitionLanes = TransitionLanes & lanes;
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
+    }
 
-  if (transitionLanes !== NoLanes) {
-    return_highestLanePriority = TransitionPriority;
-    return transitionLanes;
+    return describeComponentFrame(name, source, ownerName);
   }
+}
 
-  var retryLanes = RetryLanes & lanes;
-
-  if (retryLanes !== NoLanes) {
-    return_highestLanePriority = RetryLanePriority;
-    return retryLanes;
+function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
+  if (type == null) {
+    return "";
   }
 
-  if (lanes & SelectiveHydrationLane) {
-    return_highestLanePriority = SelectiveHydrationLanePriority;
-    return SelectiveHydrationLane;
+  if (typeof type === "function") {
+    {
+      return describeFunctionComponentFrame(type, source, ownerFn);
+    }
   }
 
-  if ((lanes & IdleHydrationLane) !== NoLanes) {
-    return_highestLanePriority = IdleHydrationLanePriority;
-    return IdleHydrationLane;
+  if (typeof type === "string") {
+    return describeBuiltInComponentFrame(type, source, ownerFn);
   }
 
-  var idleLanes = IdleLanes & lanes;
-
-  if (idleLanes !== NoLanes) {
-    return_highestLanePriority = IdleLanePriority;
-    return idleLanes;
-  }
+  switch (type) {
+    case REACT_SUSPENSE_TYPE:
+      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
 
-  if ((OffscreenLane & lanes) !== NoLanes) {
-    return_highestLanePriority = OffscreenLanePriority;
-    return OffscreenLane;
+    case REACT_SUSPENSE_LIST_TYPE:
+      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
   }
 
-  {
-    error("Should have found matching lanes. This is a bug in React.");
-  } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
-
-  return_highestLanePriority = DefaultLanePriority;
-  return lanes;
-}
-
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case ImmediatePriority:
-      return SyncLanePriority;
-
-    case UserBlockingPriority:
-      return InputContinuousLanePriority;
+  if (typeof type === "object") {
+    switch (type.$$typeof) {
+      case REACT_FORWARD_REF_TYPE:
+        return describeFunctionComponentFrame(type.render, source, ownerFn);
 
-    case NormalPriority:
-    case LowPriority:
-      // TODO: Handle LowSchedulerPriority, somehow. Maybe the same lane as hydration.
-      return DefaultLanePriority;
+      case REACT_MEMO_TYPE:
+        // Memo may contain any component type so we recursively resolve it.
+        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
 
-    case IdlePriority:
-      return IdleLanePriority;
+      case REACT_LAZY_TYPE: {
+        var lazyComponent = type;
+        var payload = lazyComponent._payload;
+        var init = lazyComponent._init;
 
-    default:
-      return NoLanePriority;
+        try {
+          // Lazy may contain any component type so we recursively resolve it.
+          return describeUnknownElementTypeFrameInDEV(
+            init(payload),
+            source,
+            ownerFn
+          );
+        } catch (x) {}
+      }
+    }
   }
-}
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case SyncLanePriority:
-    case SyncBatchedLanePriority:
-      return ImmediatePriority;
 
-    case InputDiscreteHydrationLanePriority:
-    case InputDiscreteLanePriority:
-    case InputContinuousHydrationLanePriority:
-    case InputContinuousLanePriority:
-      return UserBlockingPriority;
-
-    case DefaultHydrationLanePriority:
-    case DefaultLanePriority:
-    case TransitionHydrationPriority:
-    case TransitionPriority:
-    case SelectiveHydrationLanePriority:
-    case RetryLanePriority:
-      return NormalPriority;
+  return "";
+}
 
-    case IdleHydrationLanePriority:
-    case IdleLanePriority:
-    case OffscreenLanePriority:
-      return IdlePriority;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 
-    case NoLanePriority:
-      return NoPriority;
+var loggedTypeFailures = {};
+var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
 
-    default: {
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
+function setCurrentlyValidatingElement(element) {
+  {
+    if (element) {
+      var owner = element._owner;
+      var stack = describeUnknownElementTypeFrameInDEV(
+        element.type,
+        element._source,
+        owner ? owner.type : null
       );
+      ReactDebugCurrentFrame.setExtraStackFrame(stack);
+    } else {
+      ReactDebugCurrentFrame.setExtraStackFrame(null);
     }
   }
 }
-function getNextLanes(root, wipLanes) {
-  // Early bailout if there's no pending work left.
-  var pendingLanes = root.pendingLanes;
 
-  if (pendingLanes === NoLanes) {
-    return_highestLanePriority = NoLanePriority;
-    return NoLanes;
-  }
+function checkPropTypes(typeSpecs, values, location, componentName, element) {
+  {
+    // $FlowFixMe This is okay but Flow doesn't know it.
+    var has = Function.call.bind(hasOwnProperty);
 
-  var nextLanes = NoLanes;
-  var nextLanePriority = NoLanePriority;
-  var expiredLanes = root.expiredLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes; // Check if any work has expired.
+    for (var typeSpecName in typeSpecs) {
+      if (has(typeSpecs, typeSpecName)) {
+        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
+        // fail the render phase where it didn't fail before. So we log it.
+        // After these have been cleaned up, we'll let them throw.
 
-  if (expiredLanes !== NoLanes) {
-    nextLanes = expiredLanes;
-    nextLanePriority = return_highestLanePriority = SyncLanePriority;
-  } else {
-    // Do not work on any idle work until all the non-idle work has finished,
-    // even if the work is suspended.
-    var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
+        try {
+          // This is intentionally an invariant that gets caught. It's the same
+          // behavior as without this statement except with a better message.
+          if (typeof typeSpecs[typeSpecName] !== "function") {
+            var err = Error(
+              (componentName || "React class") +
+                ": " +
+                location +
+                " type `" +
+                typeSpecName +
+                "` is invalid; " +
+                "it must be a function, usually from the `prop-types` package, but received `" +
+                typeof typeSpecs[typeSpecName] +
+                "`." +
+                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
+            );
+            err.name = "Invariant Violation";
+            throw err;
+          }
+
+          error$1 = typeSpecs[typeSpecName](
+            values,
+            typeSpecName,
+            componentName,
+            location,
+            null,
+            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
+          );
+        } catch (ex) {
+          error$1 = ex;
+        }
 
-    if (nonIdlePendingLanes !== NoLanes) {
-      var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+        if (error$1 && !(error$1 instanceof Error)) {
+          setCurrentlyValidatingElement(element);
 
-      if (nonIdleUnblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
+          error(
+            "%s: type specification of %s" +
+              " `%s` is invalid; the type checker " +
+              "function must return `null` or an `Error` but returned a %s. " +
+              "You may have forgotten to pass an argument to the type checker " +
+              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
+              "shape all require an argument).",
+            componentName || "React class",
+            location,
+            typeSpecName,
+            typeof error$1
+          );
 
-        if (nonIdlePingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
-          nextLanePriority = return_highestLanePriority;
+          setCurrentlyValidatingElement(null);
         }
-      }
-    } else {
-      // The only remaining work is Idle.
-      var unblockedLanes = pendingLanes & ~suspendedLanes;
 
-      if (unblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(unblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        if (pingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(pingedLanes);
-          nextLanePriority = return_highestLanePriority;
+        if (
+          error$1 instanceof Error &&
+          !(error$1.message in loggedTypeFailures)
+        ) {
+          // Only monitor this failure once because there tends to be a lot of the
+          // same error.
+          loggedTypeFailures[error$1.message] = true;
+          setCurrentlyValidatingElement(element);
+
+          error("Failed %s type: %s", location, error$1.message);
+
+          setCurrentlyValidatingElement(null);
         }
       }
     }
   }
+}
 
-  if (nextLanes === NoLanes) {
-    // This should only be reachable if we're suspended
-    // TODO: Consider warning in this path if a fallback timer is not scheduled.
-    return NoLanes;
-  } // If there are higher priority lanes, we'll include them even if they
-  // are suspended.
+var valueStack = [];
+var fiberStack;
 
-  nextLanes = pendingLanes & getEqualOrHigherPriorityLanes(nextLanes); // If we're already in the middle of a render, switching lanes will interrupt
-  // it and we'll lose our progress. We should only do this if the new lanes are
-  // higher priority.
+{
+  fiberStack = [];
+}
 
-  if (
-    wipLanes !== NoLanes &&
-    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
-    // bother waiting until the root is complete.
-    (wipLanes & suspendedLanes) === NoLanes
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    var wipLanePriority = return_highestLanePriority;
+var index = -1;
 
-    if (nextLanePriority <= wipLanePriority) {
-      return wipLanes;
-    } else {
-      return_highestLanePriority = nextLanePriority;
-    }
-  } // Check for entangled lanes and add them to the batch.
-  //
-  // A lane is said to be entangled with another when it's not allowed to render
-  // in a batch that does not also include the other lane. Typically we do this
-  // when multiple updates have the same source, and we only want to respond to
-  // the most recent event from that source.
-  //
-  // Note that we apply entanglements *after* checking for partial work above.
-  // This means that if a lane is entangled during an interleaved event while
-  // it's already rendering, we won't interrupt it. This is intentional, since
-  // entanglement is usually "best effort": we'll try our best to render the
-  // lanes in the same batch, but it's not worth throwing out partially
-  // completed work in order to do it.
-  //
-  // For those exceptions where entanglement is semantically important, like
-  // useMutableSource, we should ensure that there is no partial work at the
-  // time we apply the entanglement.
+function createCursor(defaultValue) {
+  return {
+    current: defaultValue
+  };
+}
 
-  var entangledLanes = root.entangledLanes;
+function pop(cursor, fiber) {
+  if (index < 0) {
+    {
+      error("Unexpected pop.");
+    }
 
-  if (entangledLanes !== NoLanes) {
-    var entanglements = root.entanglements;
-    var lanes = nextLanes & entangledLanes;
+    return;
+  }
 
-    while (lanes > 0) {
-      var index = pickArbitraryLaneIndex(lanes);
-      var lane = 1 << index;
-      nextLanes |= entanglements[index];
-      lanes &= ~lane;
+  {
+    if (fiber !== fiberStack[index]) {
+      error("Unexpected Fiber popped.");
     }
   }
 
-  return nextLanes;
-}
-function getMostRecentEventTime(root, lanes) {
-  var eventTimes = root.eventTimes;
-  var mostRecentEventTime = NoTimestamp;
-
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var eventTime = eventTimes[index];
-
-    if (eventTime > mostRecentEventTime) {
-      mostRecentEventTime = eventTime;
-    }
+  cursor.current = valueStack[index];
+  valueStack[index] = null;
 
-    lanes &= ~lane;
+  {
+    fiberStack[index] = null;
   }
 
-  return mostRecentEventTime;
+  index--;
 }
 
-function computeExpirationTime(lane, currentTime) {
-  // TODO: Expiration heuristic is constant per lane, so could use a map.
-  getHighestPriorityLanes(lane);
-  var priority = return_highestLanePriority;
+function push(cursor, value, fiber) {
+  index++;
+  valueStack[index] = cursor.current;
 
-  if (priority >= InputContinuousLanePriority) {
-    // User interactions should expire slightly more quickly.
-    //
-    // NOTE: This is set to the corresponding constant as in Scheduler.js. When
-    // we made it larger, a product metric in www regressed, suggesting there's
-    // a user interaction that's being starved by a series of synchronous
-    // updates. If that theory is correct, the proper solution is to fix the
-    // starvation. However, this scenario supports the idea that expiration
-    // times are an important safeguard when starvation does happen.
-    //
-    // Also note that, in the case of user input specifically, this will soon no
-    // longer be an issue because we plan to make user input synchronous by
-    // default (until you enter `startTransition`, of course.)
-    //
-    // If weren't planning to make these updates synchronous soon anyway, I
-    // would probably make this number a configurable parameter.
-    return currentTime + 250;
-  } else if (priority >= TransitionPriority) {
-    return currentTime + 5000;
-  } else {
-    // Anything idle priority or lower should never expire.
-    return NoTimestamp;
+  {
+    fiberStack[index] = fiber;
   }
+
+  cursor.current = value;
 }
 
-function markStarvedLanesAsExpired(root, currentTime) {
-  // TODO: This gets called every time we yield. We can optimize by storing
-  // the earliest expiration time on the root. Then use that to quickly bail out
-  // of this function.
-  var pendingLanes = root.pendingLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes;
-  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
-  // expiration time. If so, we'll assume the update is being starved and mark
-  // it as expired to force it to finish.
+var warnedAboutMissingGetChildContext;
 
-  var lanes = pendingLanes;
+{
+  warnedAboutMissingGetChildContext = {};
+}
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var expirationTime = expirationTimes[index];
+var emptyContextObject = {};
 
-    if (expirationTime === NoTimestamp) {
-      // Found a pending lane with no expiration time. If it's not suspended, or
-      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
-      // using the current time.
-      if (
-        (lane & suspendedLanes) === NoLanes ||
-        (lane & pingedLanes) !== NoLanes
-      ) {
-        // Assumes timestamps are monotonically increasing.
-        expirationTimes[index] = computeExpirationTime(lane, currentTime);
-      }
-    } else if (expirationTime <= currentTime) {
-      // This lane expired
-      root.expiredLanes |= lane;
+{
+  Object.freeze(emptyContextObject);
+} // A cursor to the current merged context object on the stack.
+
+var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
+
+var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
+// We use this to get access to the parent context after we have already
+// pushed the next context provider, and now need to merge their contexts.
+
+var previousContext = emptyContextObject;
+
+function getUnmaskedContext(
+  workInProgress,
+  Component,
+  didPushOwnContextIfProvider
+) {
+  {
+    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
+      // If the fiber is a context provider itself, when we read its context
+      // we may have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
     }
 
-    lanes &= ~lane;
+    return contextStackCursor.current;
   }
-} // This returns the highest priority pending lanes regardless of whether they
-function getLanesToRetrySynchronouslyOnError(root) {
-  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
+}
 
-  if (everythingButOffscreen !== NoLanes) {
-    return everythingButOffscreen;
+function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+  {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
   }
+}
 
-  if (everythingButOffscreen & OffscreenLane) {
-    return OffscreenLane;
-  }
+function getMaskedContext(workInProgress, unmaskedContext) {
+  {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
 
-  return NoLanes;
-}
-function returnNextLanesPriority() {
-  return return_highestLanePriority;
-}
-function includesNonIdleWork(lanes) {
-  return (lanes & NonIdleLanes) !== NoLanes;
-}
-function includesOnlyRetries(lanes) {
-  return (lanes & RetryLanes) === lanes;
-}
-function includesOnlyTransitions(lanes) {
-  return (lanes & TransitionLanes) === lanes;
-} // To ensure consistency across multiple updates in the same event, this should
-// be a pure function, so that it always returns the same lane for given inputs.
+    if (!contextTypes) {
+      return emptyContextObject;
+    } // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
 
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case NoLanePriority:
-      break;
+    var instance = workInProgress.stateNode;
 
-    case SyncLanePriority:
-      return SyncLane;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
 
-    case SyncBatchedLanePriority:
-      return SyncBatchedLane;
+    var context = {};
 
-    case InputDiscreteLanePriority: {
-      var _lane = pickArbitraryLane(InputDiscreteLanes & ~wipLanes);
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
 
-      if (_lane === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(InputContinuousLanePriority, wipLanes);
-      }
+    {
+      var name = getComponentNameFromFiber(workInProgress) || "Unknown";
+      checkPropTypes(contextTypes, context, "context", name);
+    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
 
-      return _lane;
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
     }
 
-    case InputContinuousLanePriority: {
-      var _lane2 = pickArbitraryLane(InputContinuousLanes & ~wipLanes);
+    return context;
+  }
+}
+
+function hasContextChanged() {
+  {
+    return didPerformWorkStackCursor.current;
+  }
+}
+
+function isContextProvider(type) {
+  {
+    var childContextTypes = type.childContextTypes;
+    return childContextTypes !== null && childContextTypes !== undefined;
+  }
+}
 
-      if (_lane2 === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(DefaultLanePriority, wipLanes);
-      }
+function popContext(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+}
+
+function popTopLevelContextObject(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+}
 
-      return _lane2;
+function pushTopLevelContextObject(fiber, context, didChange) {
+  {
+    if (!(contextStackCursor.current === emptyContextObject)) {
+      throw Error(
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
     }
 
-    case DefaultLanePriority: {
-      var _lane3 = pickArbitraryLane(DefaultLanes & ~wipLanes);
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
+  }
+}
+
+function processChildContext(fiber, type, parentContext) {
+  {
+    var instance = fiber.stateNode;
+    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentNameFromFiber(fiber) || "Unknown";
 
-      if (_lane3 === NoLane) {
-        // If all the default lanes are already being worked on, look for a
-        // lane in the transition range.
-        _lane3 = pickArbitraryLane(TransitionLanes & ~wipLanes);
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
 
-        if (_lane3 === NoLane) {
-          // All the transition lanes are taken, too. This should be very
-          // rare, but as a last resort, pick a default lane. This will have
-          // the effect of interrupting the current work-in-progress render.
-          _lane3 = pickArbitraryLane(DefaultLanes);
+          error(
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
         }
       }
 
-      return _lane3;
+      return parentContext;
     }
 
-    case TransitionPriority: // Should be handled by findTransitionLane instead
-
-    case RetryLanePriority:
-      // Should be handled by findRetryLane instead
-      break;
-
-    case IdleLanePriority:
-      var lane = pickArbitraryLane(IdleLanes & ~wipLanes);
+    var childContext = instance.getChildContext();
 
-      if (lane === NoLane) {
-        lane = pickArbitraryLane(IdleLanes);
+    for (var contextKey in childContext) {
+      if (!(contextKey in childContextTypes)) {
+        throw Error(
+          (getComponentNameFromFiber(fiber) || "Unknown") +
+            '.getChildContext(): key "' +
+            contextKey +
+            '" is not defined in childContextTypes.'
+        );
       }
+    }
+
+    {
+      var name = getComponentNameFromFiber(fiber) || "Unknown";
+      checkPropTypes(childContextTypes, childContext, "child context", name);
+    }
 
-      return lane;
+    return Object.assign({}, parentContext, childContext);
   }
+}
 
+function pushContextProvider(workInProgress) {
   {
-    throw Error(
-      "Invalid update priority: " + lanePriority + ". This is a bug in React."
+    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
+
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyContextObject; // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
     );
+    return true;
   }
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
-
-function findTransitionLane(wipLanes, pendingLanes) {
-  // First look for lanes that are completely unclaimed, i.e. have no
-  // pending work.
-  var lane = pickArbitraryLane(TransitionLanes & ~pendingLanes);
+}
 
-  if (lane === NoLane) {
-    // If all lanes have pending work, look for a lane that isn't currently
-    // being worked on.
-    lane = pickArbitraryLane(TransitionLanes & ~wipLanes);
+function invalidateContextProvider(workInProgress, type, didChange) {
+  {
+    var instance = workInProgress.stateNode;
 
-    if (lane === NoLane) {
-      // If everything is being worked on, pick any lane. This has the
-      // effect of interrupting the current work-in-progress.
-      lane = pickArbitraryLane(TransitionLanes);
+    if (!instance) {
+      throw Error(
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
     }
-  }
 
-  return lane;
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(
+        workInProgress,
+        type,
+        previousContext
+      );
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
 
-function findRetryLane(wipLanes) {
-  // This is a fork of `findUpdateLane` designed specifically for Suspense
-  // "retries" — a special update that attempts to flip a Suspense boundary
-  // from its placeholder state to its primary/resolved state.
-  var lane = pickArbitraryLane(RetryLanes & ~wipLanes);
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
 
-  if (lane === NoLane) {
-    lane = pickArbitraryLane(RetryLanes);
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    }
   }
-
-  return lane;
 }
 
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-
-function getLowestPriorityLane(lanes) {
-  // This finds the most significant non-zero bit.
-  var index = 31 - clz32(lanes);
-  return index < 0 ? NoLanes : 1 << index;
-}
+function findCurrentUnmaskedContext(fiber) {
+  {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
+      throw Error(
+        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-function getEqualOrHigherPriorityLanes(lanes) {
-  return (getLowestPriorityLane(lanes) << 1) - 1;
-}
+    var node = fiber;
 
-function pickArbitraryLane(lanes) {
-  // This wrapper function gets inlined. Only exists so to communicate that it
-  // doesn't matter which bit is selected; you can pick any bit without
-  // affecting the algorithms where its used. Here I'm using
-  // getHighestPriorityLane because it requires the fewest operations.
-  return getHighestPriorityLane(lanes);
-}
+    do {
+      switch (node.tag) {
+        case HostRoot:
+          return node.stateNode.context;
 
-function pickArbitraryLaneIndex(lanes) {
-  return 31 - clz32(lanes);
-}
+        case ClassComponent: {
+          var Component = node.type;
 
-function laneToIndex(lane) {
-  return pickArbitraryLaneIndex(lane);
-}
-
-function includesSomeLane(a, b) {
-  return (a & b) !== NoLanes;
-}
-function isSubsetOfLanes(set, subset) {
-  return (set & subset) === subset;
-}
-function mergeLanes(a, b) {
-  return a | b;
-}
-function removeLanes(set, subset) {
-  return set & ~subset;
-} // Seems redundant, but it changes the type from a single lane (used for
-// updates) to a group of lanes (used for flushing work).
-
-function laneToLanes(lane) {
-  return lane;
-}
-function createLaneMap(initial) {
-  // Intentionally pushing one by one.
-  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
-  var laneMap = [];
-
-  for (var i = 0; i < TotalLanes; i++) {
-    laneMap.push(initial);
-  }
-
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane; // TODO: Theoretically, any update to any lane can unblock any other lane. But
-  // it's not practical to try every single possible combination. We need a
-  // heuristic to decide which lanes to attempt to render, and in which batches.
-  // For now, we use the same heuristic as in the old ExpirationTimes model:
-  // retry any lane at equal or lower priority, but don't try updates at higher
-  // priority without also including the lower priority updates. This works well
-  // when considering updates across different priority levels, but isn't
-  // sufficient for updates within the same priority, since we want to treat
-  // those updates as parallel.
-  // Unsuspend any update at equal or lower priority.
-
-  var higherPriorityLanes = updateLane - 1; // Turns 0b1000 into 0b0111
-
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  var eventTimes = root.eventTimes;
-  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
-  // recent event, and we assume time is monotonically increasing.
-
-  eventTimes[index] = eventTime;
-}
-function markRootSuspended(root, suspendedLanes) {
-  root.suspendedLanes |= suspendedLanes;
-  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
-
-  var expirationTimes = root.expirationTimes;
-  var lanes = suspendedLanes;
-
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
-  }
-}
-function markRootPinged(root, pingedLanes, eventTime) {
-  root.pingedLanes |= root.suspendedLanes & pingedLanes;
-}
-function hasDiscreteLanes(lanes) {
-  return (lanes & InputDiscreteLanes) !== NoLanes;
-}
-function markRootMutableRead(root, updateLane) {
-  root.mutableReadLanes |= updateLane & root.pendingLanes;
-}
-function markRootFinished(root, remainingLanes) {
-  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
-  root.pendingLanes = remainingLanes; // Let's try everything again
-
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes;
-  root.mutableReadLanes &= remainingLanes;
-  root.entangledLanes &= remainingLanes;
-  var entanglements = root.entanglements;
-  var eventTimes = root.eventTimes;
-  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
-
-  var lanes = noLongerPendingLanes;
-
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] = NoLanes;
-    eventTimes[index] = NoTimestamp;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
-  }
-}
-function markRootEntangled(root, entangledLanes) {
-  root.entangledLanes |= entangledLanes;
-  var entanglements = root.entanglements;
-  var lanes = entangledLanes;
-
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] |= entangledLanes;
-    lanes &= ~lane;
-  }
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
-// Based on:
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
-
-var log = Math.log;
-var LN2 = Math.LN2;
-
-function clz32Fallback(lanes) {
-  if (lanes === 0) {
-    return 32;
-  }
+          if (isContextProvider(Component)) {
+            return node.stateNode.__reactInternalMemoizedMergedChildContext;
+          }
 
-  return (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
+          break;
+        }
+      }
 
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
+      node = node.return;
+    } while (node !== null);
 
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-    );
+    {
+      throw Error(
+        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
   }
 }
 
-var fakeCallbackNode = {}; // Except for NoPriority, these correspond to Scheduler priorities. We use
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
-
-var ImmediatePriority$1 = 99;
-var UserBlockingPriority$1 = 98;
-var NormalPriority$1 = 97;
-var LowPriority$1 = 96;
-var IdlePriority$1 = 95; // NoPriority is the absence of priority. Also React-only.
+var LegacyRoot = 0;
+var ConcurrentRoot = 1;
 
-var NoPriority$1 = 90;
-var shouldYield = Scheduler_shouldYield;
-var requestPaint = // Fall back gracefully if we're running an older version of Scheduler.
-  Scheduler_requestPaint !== undefined ? Scheduler_requestPaint : function() {};
 var syncQueue = null;
-var immediateQueueCallbackNode = null;
+var includesLegacySyncCallbacks = false;
 var isFlushingSyncQueue = false;
-var initialTimeMs$1 = Scheduler_now$1(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-// This will be the case for modern browsers that support `performance.now`. In
-// older browsers, Scheduler falls back to `Date.now`, which returns a Unix
-// timestamp. In that case, subtract the module initialization time to simulate
-// the behavior of performance.now and keep our times small enough to fit
-// within 32 bits.
-// TODO: Consider lifting this into Scheduler.
-
-var now =
-  initialTimeMs$1 < 10000
-    ? Scheduler_now$1
-    : function() {
-        return Scheduler_now$1() - initialTimeMs$1;
-      };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return ImmediatePriority$1;
-
-    case Scheduler_UserBlockingPriority:
-      return UserBlockingPriority$1;
-
-    case Scheduler_NormalPriority:
-      return NormalPriority$1;
-
-    case Scheduler_LowPriority:
-      return LowPriority$1;
-
-    case Scheduler_IdlePriority:
-      return IdlePriority$1;
-
-    default: {
-      throw Error("Unknown priority level.");
-    }
-  }
-}
-
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case ImmediatePriority$1:
-      return Scheduler_ImmediatePriority;
-
-    case UserBlockingPriority$1:
-      return Scheduler_UserBlockingPriority;
-
-    case NormalPriority$1:
-      return Scheduler_NormalPriority;
-
-    case LowPriority$1:
-      return Scheduler_LowPriority;
-
-    case IdlePriority$1:
-      return Scheduler_IdlePriority;
-
-    default: {
-      throw Error("Unknown priority level.");
-    }
-  }
-}
-
-function runWithPriority(reactPriorityLevel, fn) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(priorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(priorityLevel, callback, options);
-}
 function scheduleSyncCallback(callback) {
   // Push this callback into an internal queue. We'll flush these either in
   // the next tick, or earlier if something calls `flushSyncCallbackQueue`.
   if (syncQueue === null) {
-    syncQueue = [callback]; // Flush the queue in the next tick, at the earliest.
-
-    immediateQueueCallbackNode = Scheduler_scheduleCallback(
-      Scheduler_ImmediatePriority,
-      flushSyncCallbackQueueImpl
-    );
+    syncQueue = [callback];
   } else {
     // Push onto existing queue. Don't need to schedule a callback because
     // we already scheduled one when we created the queue.
     syncQueue.push(callback);
   }
-
-  return fakeCallbackNode;
 }
-function cancelCallback(callbackNode) {
-  if (callbackNode !== fakeCallbackNode) {
-    Scheduler_cancelCallback(callbackNode);
-  }
+function scheduleLegacySyncCallback(callback) {
+  includesLegacySyncCallbacks = true;
+  scheduleSyncCallback(callback);
 }
-function flushSyncCallbackQueue() {
-  if (immediateQueueCallbackNode !== null) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
+function flushSyncCallbacksOnlyInLegacyMode() {
+  // Only flushes the queue if there's a legacy sync callback scheduled.
+  // TODO: There's only a single type of callback: performSyncOnWorkOnRoot. So
+  // it might make more sense for the queue to be a list of roots instead of a
+  // list of generic callbacks. Then we can have two: one for legacy roots, one
+  // for concurrent roots. And this method would only flush the legacy ones.
+  if (includesLegacySyncCallbacks) {
+    flushSyncCallbacks();
   }
-
-  flushSyncCallbackQueueImpl();
 }
-
-function flushSyncCallbackQueueImpl() {
+function flushSyncCallbacks() {
   if (!isFlushingSyncQueue && syncQueue !== null) {
     // Prevent re-entrancy.
     isFlushingSyncQueue = true;
     var i = 0;
+    var previousUpdatePriority = getCurrentUpdatePriority();
 
-    {
-      try {
-        var _isSync2 = true;
-        var _queue = syncQueue;
-        runWithPriority(ImmediatePriority$1, function() {
-          for (; i < _queue.length; i++) {
-            var callback = _queue[i];
-
-            do {
-              callback = callback(_isSync2);
-            } while (callback !== null);
-          }
-        });
-        syncQueue = null;
-      } catch (error) {
-        // If something throws, leave the remaining callbacks on the queue.
-        if (syncQueue !== null) {
-          syncQueue = syncQueue.slice(i + 1);
-        } // Resume flushing in the next tick
-
-        Scheduler_scheduleCallback(
-          Scheduler_ImmediatePriority,
-          flushSyncCallbackQueue
-        );
-        throw error;
-      } finally {
-        isFlushingSyncQueue = false;
+    try {
+      var isSync = true;
+      var queue = syncQueue; // TODO: Is this necessary anymore? The only user code that runs in this
+      // queue is in the render or commit phases.
+
+      setCurrentUpdatePriority(DiscreteEventPriority);
+
+      for (; i < queue.length; i++) {
+        var callback = queue[i];
+
+        do {
+          callback = callback(isSync);
+        } while (callback !== null);
       }
+
+      syncQueue = null;
+      includesLegacySyncCallbacks = false;
+    } catch (error) {
+      // If something throws, leave the remaining callbacks on the queue.
+      if (syncQueue !== null) {
+        syncQueue = syncQueue.slice(i + 1);
+      } // Resume flushing in the next tick
+
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks);
+      throw error;
+    } finally {
+      setCurrentUpdatePriority(previousUpdatePriority);
+      isFlushingSyncQueue = false;
     }
   }
+
+  return null;
 }
 
-// TODO: this is special because it gets imported during build.
-var ReactVersion = "17.0.1-4e5d7faf5";
+var NoFlags$1 =
+  /*  */
+  0; // Represents whether effect should fire.
+
+var HasEffect =
+  /* */
+  1; // Represents the phase in which the effect (not the clean-up) fires.
 
-var NoMode = 0;
-var StrictMode = 1; // TODO: Remove BlockingMode and ConcurrentMode by reading from the root
-// tag instead
+var Layout =
+  /*    */
+  2;
+var Passive$1 =
+  /*   */
+  4;
 
-var BlockingMode = 2;
-var ConcurrentMode = 4;
-var ProfileMode = 8;
-var DebugTracingMode = 16;
+var ReactVersion = "18.0.0-568dc3532";
 
 var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
 var NoTransition = 0;
@@ -5646,7 +5761,6 @@ function is(x, y) {
 
 var objectIs = typeof Object.is === "function" ? Object.is : is;
 
-var hasOwnProperty = Object.prototype.hasOwnProperty;
 /**
  * Performs equality by iterating through keys on an object and returning false
  * when any key has values which are not strictly equal between the arguments.
@@ -5711,9 +5825,6 @@ function describeFiber(fiber) {
     case ForwardRef:
       return describeFunctionComponentFrame(fiber.type.render, source, owner);
 
-    case Block:
-      return describeFunctionComponentFrame(fiber.type._render, source, owner);
-
     case ClassComponent:
       return describeClassComponentFrame(fiber.type, source, owner);
 
@@ -5750,7 +5861,7 @@ function getCurrentFiberOwnerNameInDevOrNull() {
     var owner = current._debugOwner;
 
     if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner.type);
+      return getComponentNameFromFiber(owner);
     }
   }
 
@@ -5807,7 +5918,7 @@ var ReactStrictModeWarnings = {
     var node = fiber;
 
     while (node !== null) {
-      if (node.mode & StrictMode) {
+      if (node.mode & StrictLegacyMode) {
         maybeStrictRoot = node;
       }
 
@@ -5838,7 +5949,7 @@ var ReactStrictModeWarnings = {
     fiber,
     instance
   ) {
-    // Dedup strategy: Warn once per component.
+    // Dedupe strategy: Warn once per component.
     if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
       return;
     }
@@ -5851,7 +5962,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillMount === "function"
     ) {
       pendingUNSAFE_ComponentWillMountWarnings.push(fiber);
@@ -5865,7 +5976,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillReceiveProps === "function"
     ) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.push(fiber);
@@ -5879,7 +5990,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillUpdate === "function"
     ) {
       pendingUNSAFE_ComponentWillUpdateWarnings.push(fiber);
@@ -5893,7 +6004,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillMountWarnings.length > 0) {
       pendingComponentWillMountWarnings.forEach(function(fiber) {
         componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -5905,7 +6016,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillMountWarnings.length > 0) {
       pendingUNSAFE_ComponentWillMountWarnings.forEach(function(fiber) {
         UNSAFE_componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -5917,7 +6028,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillReceivePropsWarnings.length > 0) {
       pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
         componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -5929,7 +6040,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillReceivePropsWarnings.length > 0) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.forEach(function(fiber) {
         UNSAFE_componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -5941,7 +6052,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillUpdateWarnings.length > 0) {
       pendingComponentWillUpdateWarnings.forEach(function(fiber) {
         componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -5953,7 +6064,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillUpdateWarnings.length > 0) {
       pendingUNSAFE_ComponentWillUpdateWarnings.forEach(function(fiber) {
         UNSAFE_componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6108,7 +6219,7 @@ var ReactStrictModeWarnings = {
       var firstFiber = fiberArray[0];
       var uniqueNames = new Set();
       fiberArray.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber.type) || "Component");
+        uniqueNames.add(getComponentNameFromFiber(fiber) || "Component");
         didWarnAboutLegacyContext.add(fiber.type);
       });
       var sortedNames = setToSortedString(uniqueNames);
@@ -6159,11 +6270,6 @@ function resolveDefaultProps(Component, baseProps) {
   return baseProps;
 }
 
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
 var valueCursor = createCursor(null);
 var rendererSigil;
 
@@ -6174,14 +6280,14 @@ var rendererSigil;
 
 var currentlyRenderingFiber = null;
 var lastContextDependency = null;
-var lastContextWithAllBitsObserved = null;
+var lastFullyObservedContext = null;
 var isDisallowedContextReadInDEV = false;
 function resetContextDependencies() {
   // This is called right before React yields execution, to ensure `readContext`
   // cannot be called outside the render phase.
   currentlyRenderingFiber = null;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 
   {
     isDisallowedContextReadInDEV = false;
@@ -6197,9 +6303,7 @@ function exitDisallowedContextReadInDEV() {
     isDisallowedContextReadInDEV = false;
   }
 }
-function pushProvider(providerFiber, nextValue) {
-  var context = providerFiber.type._context;
-
+function pushProvider(providerFiber, context, nextValue) {
   {
     push(valueCursor, context._currentValue2, providerFiber);
     context._currentValue2 = nextValue;
@@ -6220,38 +6324,14 @@ function pushProvider(providerFiber, nextValue) {
     }
   }
 }
-function popProvider(providerFiber) {
+function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
   pop(valueCursor, providerFiber);
-  var context = providerFiber.type._context;
 
   {
     context._currentValue2 = currentValue;
   }
 }
-function calculateChangedBits(context, newValue, oldValue) {
-  if (objectIs(oldValue, newValue)) {
-    // No change
-    return 0;
-  } else {
-    var changedBits =
-      typeof context._calculateChangedBits === "function"
-        ? context._calculateChangedBits(oldValue, newValue)
-        : MAX_SIGNED_31_BIT_INT;
-
-    {
-      if ((changedBits & MAX_SIGNED_31_BIT_INT) !== changedBits) {
-        error(
-          "calculateChangedBits: Expected the return value to be a " +
-            "31-bit integer. Instead received: %s",
-          changedBits
-        );
-      }
-    }
-
-    return changedBits | 0;
-  }
-}
 function scheduleWorkOnParentPath(parent, renderLanes) {
   // Update the child lanes of all the ancestors, including the alternates.
   var node = parent;
@@ -6279,12 +6359,13 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
     node = node.return;
   }
 }
-function propagateContextChange(
-  workInProgress,
-  context,
-  changedBits,
-  renderLanes
-) {
+function propagateContextChange(workInProgress, context, renderLanes) {
+  {
+    propagateContextChange_eager(workInProgress, context, renderLanes);
+  }
+}
+
+function propagateContextChange_eager(workInProgress, context, renderLanes) {
   var fiber = workInProgress.child;
 
   if (fiber !== null) {
@@ -6303,23 +6384,35 @@ function propagateContextChange(
 
       while (dependency !== null) {
         // Check if the context matches.
-        if (
-          dependency.context === context &&
-          (dependency.observedBits & changedBits) !== 0
-        ) {
+        if (dependency.context === context) {
           // Match! Schedule an update on this fiber.
           if (fiber.tag === ClassComponent) {
             // Schedule a force update on the work-in-progress.
-            var update = createUpdate(
-              NoTimestamp,
-              pickArbitraryLane(renderLanes)
-            );
+            var lane = pickArbitraryLane(renderLanes);
+            var update = createUpdate(NoTimestamp, lane);
             update.tag = ForceUpdate; // TODO: Because we don't have a work-in-progress, this will add the
             // update to the current fiber, too, which means it will persist even if
             // this render is thrown away. Since it's a race condition, not sure it's
             // worth fixing.
+            // Inlined `enqueueUpdate` to remove interleaved update check
+
+            var updateQueue = fiber.updateQueue;
+
+            if (updateQueue === null);
+            else {
+              var sharedQueue = updateQueue.shared;
+              var pending = sharedQueue.pending;
+
+              if (pending === null) {
+                // This is the first update. Create a circular list.
+                update.next = update;
+              } else {
+                update.next = pending.next;
+                pending.next = update;
+              }
 
-            enqueueUpdate(fiber, update);
+              sharedQueue.pending = update;
+            }
           }
 
           fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
@@ -6380,23 +6473,25 @@ function propagateContextChange(
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
   var dependencies = workInProgress.dependencies;
 
   if (dependencies !== null) {
-    var firstContext = dependencies.firstContext;
+    {
+      var firstContext = dependencies.firstContext;
 
-    if (firstContext !== null) {
-      if (includesSomeLane(dependencies.lanes, renderLanes)) {
-        // Context list has a pending update. Mark that this fiber performed work.
-        markWorkInProgressReceivedUpdate();
-      } // Reset the work-in-progress list
+      if (firstContext !== null) {
+        if (includesSomeLane(dependencies.lanes, renderLanes)) {
+          // Context list has a pending update. Mark that this fiber performed work.
+          markWorkInProgressReceivedUpdate();
+        } // Reset the work-in-progress list
 
-      dependencies.firstContext = null;
+        dependencies.firstContext = null;
+      }
     }
   }
 }
-function readContext(context, observedBits) {
+function readContext(context) {
   {
     // This warning would fire if you read context inside a Hook like useMemo.
     // Unlike the class check below, it's not enforced in production for perf.
@@ -6410,25 +6505,13 @@ function readContext(context, observedBits) {
     }
   }
 
-  if (lastContextWithAllBitsObserved === context);
-  else if (observedBits === false || observedBits === 0);
-  else {
-    var resolvedObservedBits; // Avoid deopting on observable arguments or heterogeneous types.
-
-    if (
-      typeof observedBits !== "number" ||
-      observedBits === MAX_SIGNED_31_BIT_INT
-    ) {
-      // Observe all updates.
-      lastContextWithAllBitsObserved = context;
-      resolvedObservedBits = MAX_SIGNED_31_BIT_INT;
-    } else {
-      resolvedObservedBits = observedBits;
-    }
+  var value = context._currentValue2;
 
+  if (lastFullyObservedContext === context);
+  else {
     var contextItem = {
       context: context,
-      observedBits: resolvedObservedBits,
+      memoizedValue: value,
       next: null
     };
 
@@ -6442,8 +6525,7 @@ function readContext(context, observedBits) {
       lastContextDependency = contextItem;
       currentlyRenderingFiber.dependencies = {
         lanes: NoLanes,
-        firstContext: contextItem,
-        responders: null
+        firstContext: contextItem
       };
     } else {
       // Append a new context item.
@@ -6451,7 +6533,49 @@ function readContext(context, observedBits) {
     }
   }
 
-  return context._currentValue2;
+  return value;
+}
+
+// An array of all update queues that received updates during the current
+// render. When this render exits, either because it finishes or because it is
+// interrupted, the interleaved updates will be transfered onto the main part
+// of the queue.
+var interleavedQueues = null;
+function pushInterleavedQueue(queue) {
+  if (interleavedQueues === null) {
+    interleavedQueues = [queue];
+  } else {
+    interleavedQueues.push(queue);
+  }
+}
+function enqueueInterleavedUpdates() {
+  // Transfer the interleaved updates onto the main queue. Each queue has a
+  // `pending` field and an `interleaved` field. When they are not null, they
+  // point to the last node in a circular linked list. We need to append the
+  // interleaved list to the end of the pending list by joining them into a
+  // single, circular list.
+  if (interleavedQueues !== null) {
+    for (var i = 0; i < interleavedQueues.length; i++) {
+      var queue = interleavedQueues[i];
+      var lastInterleavedUpdate = queue.interleaved;
+
+      if (lastInterleavedUpdate !== null) {
+        queue.interleaved = null;
+        var firstInterleavedUpdate = lastInterleavedUpdate.next;
+        var lastPendingUpdate = queue.pending;
+
+        if (lastPendingUpdate !== null) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = firstInterleavedUpdate;
+          lastInterleavedUpdate.next = firstPendingUpdate;
+        }
+
+        queue.pending = lastInterleavedUpdate;
+      }
+    }
+
+    interleavedQueues = null;
+  }
 }
 
 var UpdateState = 0;
@@ -6476,7 +6600,9 @@ function initializeUpdateQueue(fiber) {
     firstBaseUpdate: null,
     lastBaseUpdate: null,
     shared: {
-      pending: null
+      pending: null,
+      interleaved: null,
+      lanes: NoLanes
     },
     effects: null
   };
@@ -6509,7 +6635,7 @@ function createUpdate(eventTime, lane) {
   };
   return update;
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
 
   if (updateQueue === null) {
@@ -6518,17 +6644,35 @@ function enqueueUpdate(fiber, update) {
   }
 
   var sharedQueue = updateQueue.shared;
-  var pending = sharedQueue.pending;
 
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
+  if (isInterleavedUpdate(fiber)) {
+    var interleaved = sharedQueue.interleaved;
+
+    if (interleaved === null) {
+      // This is the first update. Create a circular list.
+      update.next = update; // At the end of the current render, this queue's interleaved updates will
+      // be transfered to the pending queue.
+
+      pushInterleavedQueue(sharedQueue);
+    } else {
+      update.next = interleaved.next;
+      interleaved.next = update;
+    }
+
+    sharedQueue.interleaved = update;
   } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
+    var pending = sharedQueue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
 
-  sharedQueue.pending = update;
+    sharedQueue.pending = update;
+  }
 
   {
     if (
@@ -6546,16 +6690,43 @@ function enqueueUpdate(fiber, update) {
     }
   }
 }
-function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
-  // Captured updates are updates that are thrown by a child during the render
-  // phase. They should be discarded if the render is aborted. Therefore,
-  // we should only put them on the work-in-progress queue, not the current one.
-  var queue = workInProgress.updateQueue; // Check if the work-in-progress queue is a clone.
-
-  var current = workInProgress.alternate;
+function entangleTransitions(root, fiber, lane) {
+  var updateQueue = fiber.updateQueue;
 
-  if (current !== null) {
-    var currentQueue = current.updateQueue;
+  if (updateQueue === null) {
+    // Only occurs if the fiber has been unmounted.
+    return;
+  }
+
+  var sharedQueue = updateQueue.shared;
+
+  if (isTransitionLane(lane)) {
+    var queueLanes = sharedQueue.lanes; // If any entangled lanes are no longer pending on the root, then they must
+    // have finished. We can remove them from the shared queue, which represents
+    // a superset of the actually pending lanes. In some cases we may entangle
+    // more than we need to, but that's OK. In fact it's worse if we *don't*
+    // entangle when we should.
+
+    queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+    var newQueueLanes = mergeLanes(queueLanes, lane);
+    sharedQueue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+    // the lane finished since the last time we entangled it. So we need to
+    // entangle it again, just to be sure.
+
+    markRootEntangled(root, newQueueLanes);
+  }
+}
+function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
+  // Captured updates are updates that are thrown by a child during the render
+  // phase. They should be discarded if the render is aborted. Therefore,
+  // we should only put them on the work-in-progress queue, not the current one.
+  var queue = workInProgress.updateQueue; // Check if the work-in-progress queue is a clone.
+
+  var current = workInProgress.alternate;
+
+  if (current !== null) {
+    var currentQueue = current.updateQueue;
 
     if (queue === currentQueue) {
       // The work-in-progress queue is the same as current. This happens when
@@ -6815,7 +6986,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
         );
         var callback = update.callback;
 
-        if (callback !== null) {
+        if (
+          callback !== null && // If the update was already committed, we should not queue its
+          // callback again.
+          update.lane !== NoLane
+        ) {
           workInProgress.flags |= Callback;
           var effects = queue.effects;
 
@@ -6855,7 +7030,24 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
 
     queue.baseState = newBaseState;
     queue.firstBaseUpdate = newFirstBaseUpdate;
-    queue.lastBaseUpdate = newLastBaseUpdate; // Set the remaining expiration time to be whatever is remaining in the queue.
+    queue.lastBaseUpdate = newLastBaseUpdate; // Interleaved updates are stored on a separate queue. We aren't going to
+    // process them during this render, but we do need to track which lanes
+    // are remaining.
+
+    var lastInterleaved = queue.shared.interleaved;
+
+    if (lastInterleaved !== null) {
+      var interleaved = lastInterleaved;
+
+      do {
+        newLanes = mergeLanes(newLanes, interleaved.lane);
+        interleaved = interleaved.next;
+      } while (interleaved !== lastInterleaved);
+    } else if (firstBaseUpdate === null) {
+      // `queue.lanes` is used for entangling transitions. We can set it back to
+      // zero once the queue is empty.
+      queue.shared.lanes = NoLanes;
+    } // Set the remaining expiration time to be whatever is remaining in the queue.
     // This should be fine because the only two other things that contribute to
     // expiration time are props and context. We're already in the middle of the
     // begin phase by the time we start processing the queue, so we've already
@@ -6908,8 +7100,7 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   }
 }
 
-var fakeInternalInstance = {};
-var isArray = Array.isArray; // React.Component uses a shared frozen object by default.
+var fakeInternalInstance = {}; // React.Component uses a shared frozen object by default.
 // We'll use it to determine whether we need to initialize legacy refs.
 
 var emptyRefsObject = new React.Component().refs;
@@ -6956,7 +7147,7 @@ var didWarnAboutInvalidateContextType;
 
   warnOnUndefinedDerivedState = function(type, partialState) {
     if (partialState === undefined) {
-      var componentName = getComponentName(type) || "Component";
+      var componentName = getComponentNameFromType(type) || "Component";
 
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
@@ -7014,6 +7205,7 @@ function applyDerivedStateFromProps(
     updateQueue.baseState = memoizedState;
   }
 }
+
 var classComponentUpdater = {
   isMounted: isMounted,
   enqueueSetState: function(inst, payload, callback) {
@@ -7032,7 +7224,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueReplaceState: function(inst, payload, callback) {
     var fiber = get(inst);
@@ -7051,7 +7247,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueForceUpdate: function(inst, callback) {
     var fiber = get(inst);
@@ -7069,7 +7269,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   }
 };
 
@@ -7096,7 +7300,7 @@ function checkShouldComponentUpdate(
         error(
           "%s.shouldComponentUpdate(): Returned undefined instead of a " +
             "boolean value. Make sure to return true or false.",
-          getComponentName(ctor) || "Component"
+          getComponentNameFromType(ctor) || "Component"
         );
       }
     }
@@ -7117,7 +7321,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
   var instance = workInProgress.stateNode;
 
   {
-    var name = getComponentName(ctor) || "Component";
+    var name = getComponentNameFromType(ctor) || "Component";
     var renderPresent = instance.render;
 
     if (!renderPresent) {
@@ -7220,7 +7424,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
         "%s has a method called shouldComponentUpdate(). " +
           "shouldComponentUpdate should not be used when extending React.PureComponent. " +
           "Please extend React.Component if shouldComponentUpdate is used.",
-        getComponentName(ctor) || "A pure component"
+        getComponentNameFromType(ctor) || "A pure component"
       );
     }
 
@@ -7290,7 +7494,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
       error(
         "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
           "This component defines getSnapshotBeforeUpdate() only.",
-        getComponentName(ctor)
+        getComponentNameFromType(ctor)
       );
     }
 
@@ -7389,7 +7593,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         error(
           "%s defines an invalid contextType. " +
             "contextType should point to the Context object returned by React.createContext().%s",
-          getComponentName(ctor) || "Component",
+          getComponentNameFromType(ctor) || "Component",
           addendum
         );
       }
@@ -7417,7 +7621,7 @@ function constructClassInstance(workInProgress, ctor, props) {
 
   {
     if (typeof ctor.getDerivedStateFromProps === "function" && state === null) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
@@ -7478,7 +7682,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         foundWillReceivePropsName !== null ||
         foundWillUpdateName !== null
       ) {
-        var _componentName = getComponentName(ctor) || "Component";
+        var _componentName = getComponentNameFromType(ctor) || "Component";
 
         var newApiName =
           typeof ctor.getDerivedStateFromProps === "function"
@@ -7531,7 +7735,7 @@ function callComponentWillMount(workInProgress, instance) {
         "%s.componentWillMount(): Assigning directly to this.state is " +
           "deprecated (except inside a component's " +
           "constructor). Use setState instead.",
-        getComponentName(workInProgress.type) || "Component"
+        getComponentNameFromFiber(workInProgress) || "Component"
       );
     }
 
@@ -7557,7 +7761,8 @@ function callComponentWillReceiveProps(
 
   if (instance.state !== oldState) {
     {
-      var componentName = getComponentName(workInProgress.type) || "Component";
+      var componentName =
+        getComponentNameFromFiber(workInProgress) || "Component";
 
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
@@ -7596,7 +7801,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
 
   {
     if (instance.state === newProps) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutDirectlyAssigningPropsToState.has(componentName)) {
         didWarnAboutDirectlyAssigningPropsToState.add(componentName);
@@ -7610,7 +7815,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
       }
     }
 
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       ReactStrictModeWarnings.recordLegacyContextWarning(
         workInProgress,
         instance
@@ -7625,7 +7830,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
   }
 
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
 
@@ -7654,7 +7858,9 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   }
 
   if (typeof instance.componentDidMount === "function") {
-    workInProgress.flags |= Update;
+    var fiberFlags = Update;
+
+    workInProgress.flags |= fiberFlags;
   }
 }
 
@@ -7716,7 +7922,9 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var fiberFlags = Update;
+
+      workInProgress.flags |= fiberFlags;
     }
 
     return false;
@@ -7762,13 +7970,17 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
 
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags = Update;
+
+      workInProgress.flags |= _fiberFlags;
     }
   } else {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags2 = Update;
+
+      workInProgress.flags |= _fiberFlags2;
     } // If shouldComponentUpdate returned false, we should still update the
     // memoized state to indicate that this work can be reused.
 
@@ -7847,7 +8059,8 @@ function updateClassInstance(
     unresolvedOldProps === unresolvedNewProps &&
     oldState === newState &&
     !hasContextChanged() &&
-    !checkHasForceUpdateAfterProcessing()
+    !checkHasForceUpdateAfterProcessing() &&
+    !enableLazyContextPropagation
   ) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
@@ -7892,7 +8105,11 @@ function updateClassInstance(
       oldState,
       newState,
       nextContext
-    );
+    ) || // TODO: In some cases, we'll end up checking if context has changed twice,
+    // both before and after `shouldComponentUpdate` has been called. Not ideal,
+    // but I'm loath to refactor this function. This only happens for memoized
+    // components so it's not that common.
+    enableLazyContextPropagation;
 
   if (shouldUpdate) {
     // In order to support react-lifecycles-compat polyfilled components,
@@ -7988,7 +8205,7 @@ var warnForMissingKey = function(child, returnFiber) {};
     }
 
     child._store.validated = true;
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasKeyUseWarning[componentName]) {
       return;
@@ -8004,8 +8221,6 @@ var warnForMissingKey = function(child, returnFiber) {};
   };
 }
 
-var isArray$1 = Array.isArray;
-
 function coerceRef(returnFiber, current, element) {
   var mixedRef = element.ref;
 
@@ -8018,7 +8233,7 @@ function coerceRef(returnFiber, current, element) {
       // TODO: Clean this up once we turn on the string ref warning for
       // everyone, because the strict mode case will no longer be relevant
       if (
-        (returnFiber.mode & StrictMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
+        (returnFiber.mode & StrictLegacyMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
         // because these cannot be automatically converted to an arrow function
         // using a codemod. Therefore, we don't have to warn about string refs again.
         !(
@@ -8027,7 +8242,8 @@ function coerceRef(returnFiber, current, element) {
           element._owner.stateNode !== element._self
         )
       ) {
-        var componentName = getComponentName(returnFiber.type) || "Component";
+        var componentName =
+          getComponentNameFromFiber(returnFiber) || "Component";
 
         if (!didWarnAboutStringRefs[componentName]) {
           {
@@ -8119,22 +8335,22 @@ function coerceRef(returnFiber, current, element) {
 }
 
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if (returnFiber.type !== "textarea") {
-    {
-      throw Error(
-        "Objects are not valid as a React child (found: " +
-          (Object.prototype.toString.call(newChild) === "[object Object]"
-            ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-            : newChild) +
-          "). If you meant to render a collection of children, use an array instead."
-      );
-    }
+  var childString = Object.prototype.toString.call(newChild);
+
+  {
+    throw Error(
+      "Objects are not valid as a React child (found: " +
+        (childString === "[object Object]"
+          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+          : childString) +
+        "). If you meant to render a collection of children, use an array instead."
+    );
   }
 }
 
 function warnOnFunctionType(returnFiber) {
   {
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasFunctionTypeWarning[componentName]) {
       return;
@@ -8148,7 +8364,7 @@ function warnOnFunctionType(returnFiber) {
         "Or maybe you meant to call this function rather than return it."
     );
   }
-} // We avoid inlining this to avoid potential deopts from using try/catch.
+}
 // to be able to optimize each path individually by branching early. This needs
 // a compiler or we can do it manually. Helpers that don't need this branching
 // live outside of this function.
@@ -8158,23 +8374,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     if (!shouldTrackSideEffects) {
       // Noop.
       return;
-    } // Deletions are added in reversed order so we add it to the front.
-    // At this point, the return fiber's effect list is empty except for
-    // deletions, so we can just append the deletion to the list. The remaining
-    // effects aren't added until the complete phase. Once we implement
-    // resuming, this may not be true.
+    }
 
-    var last = returnFiber.lastEffect;
+    var deletions = returnFiber.deletions;
 
-    if (last !== null) {
-      last.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
+    if (deletions === null) {
+      returnFiber.deletions = [childToDelete];
+      returnFiber.flags |= ChildDeletion;
     } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+      deletions.push(childToDelete);
     }
-
-    childToDelete.nextEffect = null;
-    childToDelete.flags = Deletion;
   }
 
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -8238,7 +8447,7 @@ function ChildReconciler(shouldTrackSideEffects) {
 
       if (oldIndex < lastPlacedIndex) {
         // This is a move.
-        newFiber.flags = Placement;
+        newFiber.flags |= Placement;
         return lastPlacedIndex;
       } else {
         // This item can stay in place.
@@ -8246,7 +8455,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       }
     } else {
       // This is an insertion.
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
       return lastPlacedIndex;
     }
   }
@@ -8255,7 +8464,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     // This is simpler for the single child case. We only need to do a
     // placement for inserting new children.
     if (shouldTrackSideEffects && newFiber.alternate === null) {
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
     }
 
     return newFiber;
@@ -8276,10 +8485,26 @@ function ChildReconciler(shouldTrackSideEffects) {
   }
 
   function updateElement(returnFiber, current, element, lanes) {
+    var elementType = element.type;
+
+    if (elementType === REACT_FRAGMENT_TYPE) {
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    }
+
     if (current !== null) {
       if (
-        current.elementType === element.type || // Keep this check inline so it only runs on the false path:
-        isCompatibleFamilyForHotReloading(current, element)
+        current.elementType === elementType || // Keep this check inline so it only runs on the false path:
+        isCompatibleFamilyForHotReloading(current, element) || // Lazy types should reconcile their resolved type.
+        // We need to do this after the Hot Reloading check above,
+        // because hot reloading has different semantics than prod because
+        // it doesn't resuspend. So we can't let the call below suspend.
+        enableLazyElements
       ) {
         // Move based on index
         var existing = useFiber(current, element.props);
@@ -8375,7 +8600,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _created3 = createFiberFromFragment(
           newChild,
           returnFiber.mode,
@@ -8418,16 +8643,6 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE: {
           if (newChild.key === key) {
-            if (newChild.type === REACT_FRAGMENT_TYPE) {
-              return updateFragment(
-                returnFiber,
-                oldFiber,
-                newChild.props.children,
-                lanes,
-                key
-              );
-            }
-
             return updateElement(returnFiber, oldFiber, newChild, lanes);
           } else {
             return null;
@@ -8443,7 +8658,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         if (key !== null) {
           return null;
         }
@@ -8485,16 +8700,6 @@ function ChildReconciler(shouldTrackSideEffects) {
               newChild.key === null ? newIdx : newChild.key
             ) || null;
 
-          if (newChild.type === REACT_FRAGMENT_TYPE) {
-            return updateFragment(
-              returnFiber,
-              _matchedFiber,
-              newChild.props.children,
-              lanes,
-              newChild.key
-            );
-          }
-
           return updateElement(returnFiber, _matchedFiber, newChild, lanes);
         }
 
@@ -8508,7 +8713,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _matchedFiber3 = existingChildren.get(newIdx) || null;
 
         return updateFragment(
@@ -8988,50 +9193,43 @@ function ChildReconciler(shouldTrackSideEffects) {
       // TODO: If key === null and child.key === null, then this only applies to
       // the first item in the list.
       if (child.key === key) {
-        switch (child.tag) {
-          case Fragment: {
-            if (element.type === REACT_FRAGMENT_TYPE) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-              var existing = useFiber(child, element.props.children);
-              existing.return = returnFiber;
+        var elementType = element.type;
 
-              {
-                existing._debugSource = element._source;
-                existing._debugOwner = element._owner;
-              }
+        if (elementType === REACT_FRAGMENT_TYPE) {
+          if (child.tag === Fragment) {
+            deleteRemainingChildren(returnFiber, child.sibling);
+            var existing = useFiber(child, element.props.children);
+            existing.return = returnFiber;
 
-              return existing;
+            {
+              existing._debugSource = element._source;
+              existing._debugOwner = element._owner;
             }
 
-            break;
+            return existing;
           }
+        } else {
+          if (
+            child.elementType === elementType || // Keep this check inline so it only runs on the false path:
+            isCompatibleFamilyForHotReloading(child, element) || // Lazy types should reconcile their resolved type.
+            // We need to do this after the Hot Reloading check above,
+            // because hot reloading has different semantics than prod because
+            // it doesn't resuspend. So we can't let the call below suspend.
+            enableLazyElements
+          ) {
+            deleteRemainingChildren(returnFiber, child.sibling);
 
-          case Block:
-
-          // We intentionally fallthrough here if enableBlocksAPI is not on.
-          // eslint-disable-next-lined no-fallthrough
-
-          default: {
-            if (
-              child.elementType === element.type || // Keep this check inline so it only runs on the false path:
-              isCompatibleFamilyForHotReloading(child, element)
-            ) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-
-              var _existing3 = useFiber(child, element.props);
-
-              _existing3.ref = coerceRef(returnFiber, child, element);
-              _existing3.return = returnFiber;
+            var _existing = useFiber(child, element.props);
 
-              {
-                _existing3._debugSource = element._source;
-                _existing3._debugOwner = element._owner;
-              }
+            _existing.ref = coerceRef(returnFiber, child, element);
+            _existing.return = returnFiber;
 
-              return _existing3;
+            {
+              _existing._debugSource = element._source;
+              _existing._debugOwner = element._owner;
             }
 
-            break;
+            return _existing;
           }
         } // Didn't match.
 
@@ -9125,9 +9323,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild = newChild.props.children;
     } // Handle object types
 
-    var isObject = typeof newChild === "object" && newChild !== null;
-
-    if (isObject) {
+    if (typeof newChild === "object" && newChild !== null) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return placeSingleChild(
@@ -9149,6 +9345,26 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
+
+      if (isArray(newChild)) {
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      if (getIteratorFn(newChild)) {
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     if (typeof newChild === "string" || typeof newChild === "number") {
@@ -9162,28 +9378,6 @@ function ChildReconciler(shouldTrackSideEffects) {
       );
     }
 
-    if (isArray$1(newChild)) {
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (getIteratorFn(newChild)) {
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (isObject) {
-      throwOnInvalidObjectType(returnFiber, newChild);
-    }
-
     {
       if (typeof newChild === "function") {
         warnOnFunctionType(returnFiber);
@@ -9209,13 +9403,12 @@ function ChildReconciler(shouldTrackSideEffects) {
         // functions and classes
         // eslint-disable-next-lined no-fallthrough
 
-        case Block:
         case FunctionComponent:
         case ForwardRef:
         case SimpleMemoComponent: {
           {
             throw Error(
-              (getComponentName(returnFiber.type) || "Component") +
+              (getComponentNameFromFiber(returnFiber) || "Component") +
                 "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
             );
           }
@@ -9463,21 +9656,6 @@ function findFirstSuspended(row) {
   return null;
 }
 
-var NoFlags$1 =
-  /*  */
-  0; // Represents whether effect should fire.
-
-var HasEffect =
-  /* */
-  1; // Represents the phase in which the effect (not the clean-up) fires.
-
-var Layout =
-  /*    */
-  2;
-var Passive$1 =
-  /*   */
-  4;
-
 var isHydrating = false;
 
 function enterHydrationState(fiber) {
@@ -9573,6 +9751,12 @@ function warnAboutMultipleRenderersDEV(mutableSource) {
   }
 } // Eager reads the version of a mutable source and stores it on the root.
 
+function getSuspendedCachePool() {
+  {
+    return null;
+  } // We check the cache on the stack first, since that's the one any new Caches
+}
+
 var ReactCurrentDispatcher$1 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentBatchConfig$1 = ReactSharedInternals.ReactCurrentBatchConfig;
 var didWarnAboutMismatchedHooksForComponent;
@@ -9645,7 +9829,7 @@ function updateHookTypesDev() {
 
 function checkDepsAreArrayDev(deps) {
   {
-    if (deps !== undefined && deps !== null && !Array.isArray(deps)) {
+    if (deps !== undefined && deps !== null && !isArray(deps)) {
       // Verify deps, but only on mount to avoid extra checks.
       // It's unlikely their type would change as usually you define them inline.
       error(
@@ -9660,7 +9844,7 @@ function checkDepsAreArrayDev(deps) {
 
 function warnOnHookMismatchInDev(currentHookName) {
   {
-    var componentName = getComponentName(currentlyRenderingFiber$1.type);
+    var componentName = getComponentNameFromFiber(currentlyRenderingFiber$1);
 
     if (!didWarnAboutMismatchedHooksForComponent.has(componentName)) {
       didWarnAboutMismatchedHooksForComponent.add(componentName);
@@ -9858,7 +10042,25 @@ function renderWithHooks(
   {
     currentHookNameInDev = null;
     hookTypesDev = null;
-    hookTypesUpdateIndexDev = -1;
+    hookTypesUpdateIndexDev = -1; // Confirm that a static flag was not added or removed since the last
+    // render. If this fires, it suggests that we incorrectly reset the static
+    // flags in some other part of the codebase. This has happened before, for
+    // example, in the SuspenseList implementation.
+
+    if (
+      current !== null &&
+      (current.flags & StaticMask) !== (workInProgress.flags & StaticMask) && // Disable this warning in legacy mode, because legacy Suspense is weird
+      // and creates false positives. To make this work in legacy mode, we'd
+      // need to mark fibers that commit in an incomplete state, somehow. For
+      // now I'll disable the warning that most of the bugs that would trigger
+      // it are either exclusive to concurrent mode or exist in both.
+      (current.mode & ConcurrentMode) !== NoMode
+    ) {
+      error(
+        "Internal React error: Expected static flag was missing. Please " +
+          "notify the React team."
+      );
+    }
   }
 
   didScheduleRenderPhaseUpdate = false;
@@ -9872,8 +10074,13 @@ function renderWithHooks(
   return children;
 }
 function bailoutHooks(current, workInProgress, lanes) {
-  workInProgress.updateQueue = current.updateQueue;
-  workInProgress.flags &= ~(Passive | Update);
+  workInProgress.updateQueue = current.updateQueue; // TODO: Don't need to reset the flags here, because they're reset in the
+  // complete phase (bubbleProperties).
+
+  {
+    workInProgress.flags &= ~(Passive | Update);
+  }
+
   current.lanes = removeLanes(current.lanes, lanes);
 }
 function resetHooksAfterThrow() {
@@ -10024,6 +10231,8 @@ function mountReducer(reducer, initialArg, init) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: reducer,
     lastRenderedState: initialState
@@ -10161,6 +10370,28 @@ function updateReducer(reducer, initialArg, init) {
     hook.baseState = newBaseState;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = newState;
+  } // Interleaved updates are stored on a separate queue. We aren't going to
+  // process them during this render, but we do need to track which lanes
+  // are remaining.
+
+  var lastInterleaved = queue.interleaved;
+
+  if (lastInterleaved !== null) {
+    var interleaved = lastInterleaved;
+
+    do {
+      var interleavedLane = interleaved.lane;
+      currentlyRenderingFiber$1.lanes = mergeLanes(
+        currentlyRenderingFiber$1.lanes,
+        interleavedLane
+      );
+      markSkippedUpdateLanes(interleavedLane);
+      interleaved = interleaved.next;
+    } while (interleaved !== lastInterleaved);
+  } else if (baseQueue === null) {
+    // `queue.lanes` is used for entangling transitions. We can set it back to
+    // zero once the queue is empty.
+    queue.lanes = NoLanes;
   }
 
   var dispatch = queue.dispatch;
@@ -10288,11 +10519,50 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
     //
     // This can lead to tearing in the first renderer when it resumes,
     // but there's nothing we can do about that (short of throwing here and refusing to continue the render).
-    markSourceAsDirty(source);
+    markSourceAsDirty(source); // Intentioally throw an error to force React to retry synchronously. During
+    // the synchronous retry, it will block interleaved mutations, so we should
+    // get a consistent read. Therefore, the following error should never be
+    // visible to the user.
+    //
+    // If it were to become visible to the user, it suggests one of two things:
+    // a bug in React, or (more likely), a mutation during the render phase that
+    // caused the second re-render attempt to be different from the first.
+    //
+    // We know it's the second case if the logs are currently disabled. So in
+    // dev, we can present a more accurate error message.
+
+    {
+      // eslint-disable-next-line react-internal/no-production-logging
+      if (console.log.__reactDisabledLog) {
+        // If the logs are disabled, this is the dev-only double render. This is
+        // only reachable if there was a mutation during render. Show a helpful
+        // error message.
+        //
+        // Something interesting to note: because we only double render in
+        // development, this error will never happen during production. This is
+        // actually true of all errors that occur during a double render,
+        // because if the first render had thrown, we would have exited the
+        // begin phase without double rendering. We should consider suppressing
+        // any error from a double render (with a warning) to more closely match
+        // the production behavior.
+        var componentName = getComponentNameFromFiber(
+          currentlyRenderingFiber$1
+        );
+
+        {
+          throw Error(
+            "A mutable source was mutated while the " +
+              componentName +
+              " component was rendering. This is not supported. Move any mutations into event handlers or effects."
+          );
+        }
+      }
+    } // We expect this error not to be thrown during the synchronous retry,
+    // because we blocked interleaved mutations.
 
     {
       throw Error(
-        "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+        "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
       );
     }
   }
@@ -10428,6 +10698,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     // including any interleaving updates that occur.
     var newQueue = {
       pending: null,
+      interleaved: null,
+      lanes: NoLanes,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -10475,6 +10747,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -10568,7 +10842,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
       var prevDeps = prevEffect.deps;
 
       if (areHookInputsEqual(nextDeps, prevDeps)) {
-        pushEffect(hookFlags, create, destroy, nextDeps);
+        hook.memoizedState = pushEffect(hookFlags, create, destroy, nextDeps);
         return;
       }
     }
@@ -10584,15 +10858,19 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
 }
 
 function mountEffect(create, deps) {
-  return mountEffectImpl(Update | Passive, Passive$1, create, deps);
+  {
+    return mountEffectImpl(Passive | PassiveStatic, Passive$1, create, deps);
+  }
 }
 
 function updateEffect(create, deps) {
-  return updateEffectImpl(Update | Passive, Passive$1, create, deps);
+  return updateEffectImpl(Passive, Passive$1, create, deps);
 }
 
 function mountLayoutEffect(create, deps) {
-  return mountEffectImpl(Update, Layout, create, deps);
+  var fiberFlags = Update;
+
+  return mountEffectImpl(fiberFlags, Layout, create, deps);
 }
 
 function updateLayoutEffect(create, deps) {
@@ -10644,8 +10922,10 @@ function mountImperativeHandle(ref, create, deps) {
 
   var effectDeps =
     deps !== null && deps !== undefined ? deps.concat([ref]) : null;
+  var fiberFlags = Update;
+
   return mountEffectImpl(
-    Update,
+    fiberFlags,
     Layout,
     imperativeHandleEffect.bind(null, create, ref),
     effectDeps
@@ -10800,31 +11080,20 @@ function rerenderDeferredValue(value) {
 }
 
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-
-  {
-    runWithPriority(
-      priorityLevel < UserBlockingPriority$1
-        ? UserBlockingPriority$1
-        : priorityLevel,
-      function() {
-        setPending(true);
-      }
-    );
-    runWithPriority(
-      priorityLevel > NormalPriority$1 ? NormalPriority$1 : priorityLevel,
-      function() {
-        var prevTransition = ReactCurrentBatchConfig$1.transition;
-        ReactCurrentBatchConfig$1.transition = 1;
+  var previousPriority = getCurrentUpdatePriority();
+  setCurrentUpdatePriority(
+    higherEventPriority(previousPriority, ContinuousEventPriority)
+  );
+  setPending(true);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
 
-        try {
-          setPending(false);
-          callback();
-        } finally {
-          ReactCurrentBatchConfig$1.transition = prevTransition;
-        }
-      }
-    );
+  try {
+    setPending(false);
+    callback();
+  } finally {
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$1.transition = prevTransition;
   }
 }
 
@@ -10836,7 +11105,7 @@ function mountTransition() {
   var start = startTransition.bind(null, setPending);
   var hook = mountWorkInProgressHook();
   hook.memoizedState = start;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function updateTransition() {
@@ -10845,7 +11114,7 @@ function updateTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function rerenderTransition() {
@@ -10854,7 +11123,7 @@ function rerenderTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 var isUpdatingOpaqueValueInRenderPhase = false;
@@ -10867,7 +11136,7 @@ function getIsUpdatingOpaqueValueInRenderPhaseInDEV() {
 function warnOnOpaqueIdentifierAccessInDEV(fiber) {
   {
     // TODO: Should warn in effects and callbacks, too
-    var name = getComponentName(fiber.type) || "Unknown";
+    var name = getComponentNameFromFiber(fiber) || "Unknown";
 
     if (getIsRendering() && !didWarnAboutUseOpaqueIdentifier[name]) {
       error(
@@ -10924,19 +11193,7 @@ function dispatchAction(fiber, queue, action) {
     eagerReducer: null,
     eagerState: null,
     next: null
-  }; // Append the update to the end of the list.
-
-  var pending = queue.pending;
-
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
-  } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
-
-  queue.pending = update;
+  };
   var alternate = fiber.alternate;
 
   if (
@@ -10947,7 +11204,47 @@ function dispatchAction(fiber, queue, action) {
     // queue -> linked list of updates. After this render pass, we'll restart
     // and apply the stashed updates on top of the work-in-progress hook.
     didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = true;
+    var pending = queue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
+
+    queue.pending = update;
   } else {
+    if (isInterleavedUpdate(fiber)) {
+      var interleaved = queue.interleaved;
+
+      if (interleaved === null) {
+        // This is the first update. Create a circular list.
+        update.next = update; // At the end of the current render, this queue's interleaved updates will
+        // be transfered to the pending queue.
+
+        pushInterleavedQueue(queue);
+      } else {
+        update.next = interleaved.next;
+        interleaved.next = update;
+      }
+
+      queue.interleaved = update;
+    } else {
+      var _pending = queue.pending;
+
+      if (_pending === null) {
+        // This is the first update. Create a circular list.
+        update.next = update;
+      } else {
+        update.next = _pending.next;
+        _pending.next = update;
+      }
+
+      queue.pending = update;
+    }
+
     if (
       fiber.lanes === NoLanes &&
       (alternate === null || alternate.lanes === NoLanes)
@@ -10992,7 +11289,24 @@ function dispatchAction(fiber, queue, action) {
       }
     }
 
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (isTransitionLane(lane) && root !== null) {
+      var queueLanes = queue.lanes; // If any entangled lanes are no longer pending on the root, then they
+      // must have finished. We can remove them from the shared queue, which
+      // represents a superset of the actually pending lanes. In some cases we
+      // may entangle more than we need to, but that's OK. In fact it's worse if
+      // we *don't* entangle when we should.
+
+      queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+      var newQueueLanes = mergeLanes(queueLanes, lane);
+      queue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+      // the lane finished since the last time we entangled it. So we need to
+      // entangle it again, just to be sure.
+
+      markRootEntangled(root, newQueueLanes);
+    }
   }
 }
 
@@ -11014,6 +11328,7 @@ var ContextOnlyDispatcher = {
   useOpaqueIdentifier: throwInvalidHookError,
   unstable_isNewReconciler: enableNewReconciler
 };
+
 var HooksDispatcherOnMountInDEV = null;
 var HooksDispatcherOnMountWithHookTypesInDEV = null;
 var HooksDispatcherOnUpdateInDEV = null;
@@ -11042,8 +11357,8 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
   };
 
   HooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11051,10 +11366,10 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       checkDepsAreArrayDev(deps);
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11143,19 +11458,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnMountWithHookTypesInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11240,19 +11556,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11337,19 +11654,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11434,10 +11752,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11445,11 +11764,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       mountHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11546,10 +11865,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11557,11 +11877,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11658,10 +11978,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11669,11 +11990,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11774,51 +12095,634 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
 
 var now$1 = Scheduler.unstable_now;
 var commitTime = 0;
+var layoutEffectStartTime = -1;
 var profilerStartTime = -1;
+var passiveEffectStartTime = -1;
+/**
+ * Tracks whether the current update was a nested/cascading update (scheduled from a layout effect).
+ *
+ * The overall sequence is:
+ *   1. render
+ *   2. commit (and call `onRender`, `onCommit`)
+ *   3. check for nested updates
+ *   4. flush passive effects (and call `onPostCommit`)
+ *
+ * Nested updates are identified in step 3 above,
+ * but step 4 still applies to the work that was just committed.
+ * We use two flags to track nested updates then:
+ * one tracks whether the upcoming update is a nested update,
+ * and the other tracks whether the current update was a nested update.
+ * The first value gets synced to the second at the start of the render phase.
+ */
+
+var currentUpdateIsNested = false;
+var nestedUpdateScheduled = false;
+
+function isCurrentUpdateNested() {
+  return currentUpdateIsNested;
+}
+
+function markNestedUpdateScheduled() {
+  {
+    nestedUpdateScheduled = true;
+  }
+}
+
+function resetNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = false;
+    nestedUpdateScheduled = false;
+  }
+}
+
+function syncNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = nestedUpdateScheduled;
+    nestedUpdateScheduled = false;
+  }
+}
 
 function getCommitTime() {
   return commitTime;
 }
 
-function recordCommitTime() {
-  commitTime = now$1();
-}
+function recordCommitTime() {
+  commitTime = now$1();
+}
+
+function startProfilerTimer(fiber) {
+  profilerStartTime = now$1();
+
+  if (fiber.actualStartTime < 0) {
+    fiber.actualStartTime = now$1();
+  }
+}
+
+function stopProfilerTimerIfRunning(fiber) {
+  profilerStartTime = -1;
+}
+
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
+  if (profilerStartTime >= 0) {
+    var elapsedTime = now$1() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+
+    if (overrideBaseTime) {
+      fiber.selfBaseDuration = elapsedTime;
+    }
+
+    profilerStartTime = -1;
+  }
+}
+
+function recordLayoutEffectDuration(fiber) {
+  if (layoutEffectStartTime >= 0) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+          root.effectDuration += elapsedTime;
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+          parentStateNode.effectDuration += elapsedTime;
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function recordPassiveEffectDuration(fiber) {
+  if (passiveEffectStartTime >= 0) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+
+          if (root !== null) {
+            root.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+
+          if (parentStateNode !== null) {
+            // Detached fibers have their state node cleared out.
+            // In this case, the return pointer is also cleared out,
+            // so we won't be able to report the time spent in this Profiler's subtree.
+            parentStateNode.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
+
+function startPassiveEffectTimer() {
+  passiveEffectStartTime = now$1();
+}
+
+function transferActualDuration(fiber) {
+  // Transfer time spent rendering these children so we don't lose it
+  // after we rerender. This is used as a helper in special cases
+  // where we should count the work of multiple passes.
+  var child = fiber.child;
+
+  while (child) {
+    fiber.actualDuration += child.actualDuration;
+    child = child.sibling;
+  }
+}
+
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
+}
+
+if (
+  !(
+    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
+    "function"
+  )
+) {
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+}
+
+function showErrorDialog(boundary, errorInfo) {
+  var capturedError = {
+    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
+    error: errorInfo.value,
+    errorBoundary:
+      boundary !== null && boundary.tag === ClassComponent
+        ? boundary.stateNode
+        : null
+  };
+  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
+    capturedError
+  );
+}
+
+function logCapturedError(boundary, errorInfo) {
+  try {
+    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
+    // This enables renderers like ReactNative to better manage redbox behavior.
+
+    if (logError === false) {
+      return;
+    }
+
+    var error = errorInfo.value;
+
+    if (true) {
+      var source = errorInfo.source;
+      var stack = errorInfo.stack;
+      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
+      // `preventDefault()` in window `error` handler.
+      // We record this information as an expando on the error.
+
+      if (error != null && error._suppressLogging) {
+        if (boundary.tag === ClassComponent) {
+          // The error is recoverable and was silenced.
+          // Ignore it and don't print the stack addendum.
+          // This is handy for testing error boundaries without noise.
+          return;
+        } // The error is fatal. Since the silencing might have
+        // been accidental, we'll surface it anyway.
+        // However, the browser would have silenced the original error
+        // so we'll print it first, and then print the stack addendum.
+
+        console["error"](error); // Don't transform to our wrapper
+        // For a more detailed description of this block, see:
+        // https://github.com/facebook/react/pull/13384
+      }
+
+      var componentName = source ? getComponentNameFromFiber(source) : null;
+      var componentNameMessage = componentName
+        ? "The above error occurred in the <" + componentName + "> component:"
+        : "The above error occurred in one of your React components:";
+      var errorBoundaryMessage;
+
+      if (boundary.tag === HostRoot) {
+        errorBoundaryMessage =
+          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
+      } else {
+        var errorBoundaryName =
+          getComponentNameFromFiber(boundary) || "Anonymous";
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      }
+
+      var combinedMessage =
+        componentNameMessage +
+        "\n" +
+        componentStack +
+        "\n\n" +
+        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
+      // We don't include the original error message and JS stack because the browser
+      // has already printed it. Even if the application swallows the error, it is still
+      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+
+      console["error"](combinedMessage); // Don't transform to our wrapper
+    } else {
+      // In production, we print the error directly.
+      // This will include the message, the JS stack, and anything the browser wants to show.
+      // We pass the error object instead of custom message so that the browser displays the error natively.
+      console["error"](error); // Don't transform to our wrapper
+    }
+  } catch (e) {
+    // This method must not throw, or React internal state will get messed up.
+    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
+    // we want to report this error outside of the normal stack as a last resort.
+    // https://github.com/facebook/react/issues/13188
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+
+var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
+
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
+
+  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
+  // being called "element".
+
+  update.payload = {
+    element: null
+  };
+  var error = errorInfo.value;
+
+  update.callback = function() {
+    onUncaughtError(error);
+    logCapturedError(fiber, errorInfo);
+  };
+
+  return update;
+}
+
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane);
+  update.tag = CaptureUpdate;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+
+  if (typeof getDerivedStateFromError === "function") {
+    var error$1 = errorInfo.value;
+
+    update.payload = function() {
+      logCapturedError(fiber, errorInfo);
+      return getDerivedStateFromError(error$1);
+    };
+  }
+
+  var inst = fiber.stateNode;
+
+  if (inst !== null && typeof inst.componentDidCatch === "function") {
+    update.callback = function callback() {
+      {
+        markFailedErrorBoundaryForHotReloading(fiber);
+      }
+
+      if (typeof getDerivedStateFromError !== "function") {
+        // To preserve the preexisting retry behavior of error boundaries,
+        // we keep track of which ones already failed during this batch.
+        // This gets reset before we yield back to the browser.
+        // TODO: Warn in strict mode if getDerivedStateFromError is
+        // not defined.
+        markLegacyErrorBoundaryAsFailed(this); // Only log here if componentDidCatch is the only error boundary method defined
+
+        logCapturedError(fiber, errorInfo);
+      }
+
+      var error$1 = errorInfo.value;
+      var stack = errorInfo.stack;
+      this.componentDidCatch(error$1, {
+        componentStack: stack !== null ? stack : ""
+      });
+
+      {
+        if (typeof getDerivedStateFromError !== "function") {
+          // If componentDidCatch is the only error boundary method defined,
+          // then it needs to call setState to recover from errors.
+          // If no state update is scheduled then the boundary will swallow the error.
+          if (!includesSomeLane(fiber.lanes, SyncLane)) {
+            error(
+              "%s: Error boundaries should implement getDerivedStateFromError(). " +
+                "In that method, return a state update to display an error message or fallback UI.",
+              getComponentNameFromFiber(fiber) || "Unknown"
+            );
+          }
+        }
+      }
+    };
+  } else {
+    update.callback = function() {
+      markFailedErrorBoundaryForHotReloading(fiber);
+    };
+  }
+
+  return update;
+}
+
+function attachPingListener(root, wakeable, lanes) {
+  // Attach a listener to the promise to "ping" the root and retry. But only if
+  // one does not already exist for the lanes we're currently rendering (which
+  // acts like a "thread ID" here).
+  var pingCache = root.pingCache;
+  var threadIDs;
+
+  if (pingCache === null) {
+    pingCache = root.pingCache = new PossiblyWeakMap$1();
+    threadIDs = new Set();
+    pingCache.set(wakeable, threadIDs);
+  } else {
+    threadIDs = pingCache.get(wakeable);
+
+    if (threadIDs === undefined) {
+      threadIDs = new Set();
+      pingCache.set(wakeable, threadIDs);
+    }
+  }
+
+  if (!threadIDs.has(lanes)) {
+    // Memoize using the thread ID to prevent redundant listeners.
+    threadIDs.add(lanes);
+    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
+
+    {
+      if (isDevToolsPresent) {
+        // If we have pending work still, restore the original updaters
+        restorePendingUpdaters(root, lanes);
+      }
+    }
+
+    wakeable.then(ping, ping);
+  }
+}
+
+function throwException(
+  root,
+  returnFiber,
+  sourceFiber,
+  value,
+  rootRenderLanes
+) {
+  // The source fiber did not complete.
+  sourceFiber.flags |= Incomplete;
+
+  {
+    if (isDevToolsPresent) {
+      // If we have pending work still, restore the original updaters
+      restorePendingUpdaters(root, rootRenderLanes);
+    }
+  }
+
+  if (
+    value !== null &&
+    typeof value === "object" &&
+    typeof value.then === "function"
+  ) {
+    var wakeable = value;
+    // A legacy mode Suspense quirk, only relevant to hook components.
+
+    var tag = sourceFiber.tag;
+
+    if (
+      (sourceFiber.mode & ConcurrentMode) === NoMode &&
+      (tag === FunctionComponent ||
+        tag === ForwardRef ||
+        tag === SimpleMemoComponent)
+    ) {
+      var currentSource = sourceFiber.alternate;
+
+      if (currentSource) {
+        sourceFiber.updateQueue = currentSource.updateQueue;
+        sourceFiber.memoizedState = currentSource.memoizedState;
+        sourceFiber.lanes = currentSource.lanes;
+      } else {
+        sourceFiber.updateQueue = null;
+        sourceFiber.memoizedState = null;
+      }
+    }
+
+    var hasInvisibleParentBoundary = hasSuspenseContext(
+      suspenseStackCursor.current,
+      InvisibleParentSuspenseContext
+    ); // Schedule the nearest Suspense to re-render the timed out view.
+
+    var _workInProgress = returnFiber;
+
+    do {
+      if (
+        _workInProgress.tag === SuspenseComponent &&
+        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
+      ) {
+        // Found the nearest boundary.
+        // Stash the promise on the boundary fiber. If the boundary times out, we'll
+        // attach another listener to flip the boundary back to its normal state.
+        var wakeables = _workInProgress.updateQueue;
+
+        if (wakeables === null) {
+          var updateQueue = new Set();
+          updateQueue.add(wakeable);
+          _workInProgress.updateQueue = updateQueue;
+        } else {
+          wakeables.add(wakeable);
+        } // If the boundary is in legacy mode, we should *not*
+        // suspend the commit. Pretend as if the suspended component rendered
+        // null and keep rendering. In the commit phase, we'll schedule a
+        // subsequent synchronous update to re-render the Suspense.
+        //
+        // Note: It doesn't matter whether the component that suspended was
+        // inside a concurrent mode tree. If the Suspense is outside of it, we
+        // should *not* suspend the commit.
+        //
+        // If the suspense boundary suspended itself suspended, we don't have to
+        // do this trick because nothing was partially started. We can just
+        // directly do a second pass over the fallback in this render and
+        // pretend we meant to render that directly.
+
+        if (
+          (_workInProgress.mode & ConcurrentMode) === NoMode &&
+          _workInProgress !== returnFiber
+        ) {
+          _workInProgress.flags |= DidCapture;
+          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
+          // But we shouldn't call any lifecycle methods or callbacks. Remove
+          // all lifecycle effect tags.
+
+          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+
+          if (sourceFiber.tag === ClassComponent) {
+            var _currentSourceFiber = sourceFiber.alternate;
+
+            if (_currentSourceFiber === null) {
+              // This is a new mount. Change the tag so it's not mistaken for a
+              // completed class component. For example, we should not call
+              // componentWillUnmount if it is deleted.
+              sourceFiber.tag = IncompleteClassComponent;
+            } else {
+              // When we try rendering again, we should not reuse the current fiber,
+              // since it's known to be in an inconsistent state. Use a force update to
+              // prevent a bail out.
+              var update = createUpdate(NoTimestamp, SyncLane);
+              update.tag = ForceUpdate;
+              enqueueUpdate(sourceFiber, update);
+            }
+          } // The source fiber did not complete. Mark it with Sync priority to
+          // indicate that it still has pending work.
+
+          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
+
+          return;
+        } // Confirmed that the boundary is in a concurrent mode tree. Continue
+        // with the normal suspend path.
+        //
+        // After this we'll use a set of heuristics to determine whether this
+        // render pass will run to completion or restart or "suspend" the commit.
+        // The actual logic for this is spread out in different places.
+        //
+        // This first principle is that if we're going to suspend when we complete
+        // a root, then we should also restart if we get an update or ping that
+        // might unsuspend it, and vice versa. The only reason to suspend is
+        // because you think you might want to restart before committing. However,
+        // it doesn't make sense to restart only while in the period we're suspended.
+        //
+        // Restarting too aggressively is also not good because it starves out any
+        // intermediate loading state. So we use heuristics to determine when.
+        // Suspense Heuristics
+        //
+        // If nothing threw a Promise or all the same fallbacks are already showing,
+        // then don't suspend/restart.
+        //
+        // If this is an initial render of a new tree of Suspense boundaries and
+        // those trigger a fallback, then don't suspend/restart. We want to ensure
+        // that we can show the initial loading state as quickly as possible.
+        //
+        // If we hit a "Delayed" case, such as when we'd switch from content back into
+        // a fallback, then we should always suspend/restart. Transitions apply
+        // to this case. If none is defined, JND is used instead.
+        //
+        // If we're already showing a fallback and it gets "retried", allowing us to show
+        // another level, but there's still an inner boundary that would show a fallback,
+        // then we suspend/restart for 500ms since the last time we showed a fallback
+        // anywhere in the tree. This effectively throttles progressive loading into a
+        // consistent train of commits. This also gives us an opportunity to restart to
+        // get to the completed state slightly earlier.
+        //
+        // If there's ambiguity due to batching it's resolved in preference of:
+        // 1) "delayed", 2) "initial render", 3) "retry".
+        //
+        // We want to ensure that a "busy" state doesn't get force committed. We want to
+        // ensure that new initial loading states can commit as soon as possible.
+
+        attachPingListener(root, wakeable, rootRenderLanes);
+        _workInProgress.flags |= ShouldCapture;
+        _workInProgress.lanes = rootRenderLanes;
+        return;
+      } // This boundary already captured during this render. Continue to the next
+      // boundary.
+
+      _workInProgress = _workInProgress.return;
+    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
+    // TODO: Use invariant so the message is stripped in prod?
+
+    value = new Error(
+      (getComponentNameFromFiber(sourceFiber) || "A React component") +
+        " suspended while rendering, but no fallback UI was specified.\n" +
+        "\n" +
+        "Add a <Suspense fallback=...> component higher in the tree to " +
+        "provide a loading indicator or placeholder to display."
+    );
+  } // We didn't find a boundary that could handle this type of exception. Start
+  // over and traverse parent path again, this time treating the exception
+  // as an error.
+
+  renderDidError();
+  value = createCapturedValue(value, sourceFiber);
+  var workInProgress = returnFiber;
+
+  do {
+    switch (workInProgress.tag) {
+      case HostRoot: {
+        var _errorInfo = value;
+        workInProgress.flags |= ShouldCapture;
+        var lane = pickArbitraryLane(rootRenderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
+
+        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
 
-function startProfilerTimer(fiber) {
-  profilerStartTime = now$1();
+        enqueueCapturedUpdate(workInProgress, _update);
+        return;
+      }
 
-  if (fiber.actualStartTime < 0) {
-    fiber.actualStartTime = now$1();
-  }
-}
+      case ClassComponent:
+        // Capture and retry
+        var errorInfo = value;
+        var ctor = workInProgress.type;
+        var instance = workInProgress.stateNode;
 
-function stopProfilerTimerIfRunning(fiber) {
-  profilerStartTime = -1;
-}
+        if (
+          (workInProgress.flags & DidCapture) === NoFlags &&
+          (typeof ctor.getDerivedStateFromError === "function" ||
+            (instance !== null &&
+              typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance)))
+        ) {
+          workInProgress.flags |= ShouldCapture;
 
-function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
-  if (profilerStartTime >= 0) {
-    var elapsedTime = now$1() - profilerStartTime;
-    fiber.actualDuration += elapsedTime;
+          var _lane = pickArbitraryLane(rootRenderLanes);
 
-    if (overrideBaseTime) {
-      fiber.selfBaseDuration = elapsedTime;
-    }
+          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
 
-    profilerStartTime = -1;
-  }
-}
+          var _update2 = createClassErrorUpdate(
+            workInProgress,
+            errorInfo,
+            _lane
+          );
 
-function transferActualDuration(fiber) {
-  // Transfer time spent rendering these children so we don't lose it
-  // after we rerender. This is used as a helper in special cases
-  // where we should count the work of multiple passes.
-  var child = fiber.child;
+          enqueueCapturedUpdate(workInProgress, _update2);
+          return;
+        }
 
-  while (child) {
-    fiber.actualDuration += child.actualDuration;
-    child = child.sibling;
-  }
+        break;
+    }
+
+    workInProgress = workInProgress.return;
+  } while (workInProgress !== null);
 }
 
 var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
@@ -11923,7 +12827,7 @@ function updateForwardRef(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(Component)
+          getComponentNameFromType(Component)
         );
       }
     }
@@ -12011,7 +12915,7 @@ function updateMemoComponent(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(type)
+          getComponentNameFromType(type)
         );
       }
     }
@@ -12041,7 +12945,7 @@ function updateMemoComponent(
         _innerPropTypes,
         nextProps, // Resolved props
         "prop",
-        getComponentName(_type)
+        getComponentNameFromType(_type)
       );
     }
   }
@@ -12107,7 +13011,7 @@ function updateSimpleMemoComponent(
             outerPropTypes,
             nextProps, // Resolved (SimpleMemoComponent has no defaultProps)
             "prop",
-            getComponentName(outerMemoType)
+            getComponentNameFromType(outerMemoType)
           );
         }
       }
@@ -12128,7 +13032,7 @@ function updateSimpleMemoComponent(
         // The pending lanes were cleared at the beginning of beginWork. We're
         // about to bail out, but there might be other lanes that weren't
         // included in the current render. Usually, the priority level of the
-        // remaining updates is accumlated during the evaluation of the
+        // remaining updates is accumulated during the evaluation of the
         // component (i.e. when processing the update queue). But since since
         // we're bailing out early *without* evaluating the component, we need
         // to account for it here, too. Reset to the value of the current fiber.
@@ -12164,21 +13068,28 @@ function updateSimpleMemoComponent(
 function updateOffscreenComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps;
   var nextChildren = nextProps.children;
-  var prevState = current !== null ? current.memoizedState : null;
+  var prevState = current !== null ? current.memoizedState : null; // If this is not null, this is a cache pool that was carried over from the
+  // previous render. We will push this to the cache pool context so that we can
+  // resume in-flight requests.
+
+  var spawnedCachePool = null;
 
   if (
     nextProps.mode === "hidden" ||
     nextProps.mode === "unstable-defer-without-hiding"
   ) {
+    // Rendering a hidden tree.
     if ((workInProgress.mode & ConcurrentMode) === NoMode) {
       // In legacy sync mode, don't defer the subtree. Render it now.
-      // TODO: Figure out what we should do in Blocking mode.
       var nextState = {
-        baseLanes: NoLanes
+        baseLanes: NoLanes,
+        cachePool: null
       };
       workInProgress.memoizedState = nextState;
       pushRenderLanes(workInProgress, renderLanes);
     } else if (!includesSomeLane(renderLanes, OffscreenLane)) {
+      // We're hidden, and we're not rendering at Offscreen. We will bail out
+      // and resume this tree later.
       var nextBaseLanes;
 
       if (prevState !== null) {
@@ -12188,25 +13099,24 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
         nextBaseLanes = renderLanes;
       } // Schedule this fiber to re-render at offscreen priority. Then bailout.
 
-      {
-        markSpawnedWork(OffscreenLane);
-      }
-
       workInProgress.lanes = workInProgress.childLanes = laneToLanes(
         OffscreenLane
       );
       var _nextState = {
-        baseLanes: nextBaseLanes
+        baseLanes: nextBaseLanes,
+        cachePool: spawnedCachePool
       };
-      workInProgress.memoizedState = _nextState; // We're about to bail out, but we need to push this to the stack anyway
+      workInProgress.memoizedState = _nextState;
+      workInProgress.updateQueue = null; // We're about to bail out, but we need to push this to the stack anyway
       // to avoid a push/pop misalignment.
 
       pushRenderLanes(workInProgress, nextBaseLanes);
+
       return null;
     } else {
-      // Rendering at offscreen, so we can clear the base lanes.
       var _nextState2 = {
-        baseLanes: NoLanes
+        baseLanes: NoLanes,
+        cachePool: null
       };
       workInProgress.memoizedState = _nextState2; // Push the lanes that were skipped when we bailed out.
 
@@ -12215,10 +13125,12 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
       pushRenderLanes(workInProgress, subtreeRenderLanes);
     }
   } else {
+    // Rendering a visible tree.
     var _subtreeRenderLanes;
 
     if (prevState !== null) {
-      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes); // Since we're not hidden anymore, reset the state
+      // We're going from hidden -> visible.
+      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes);
 
       workInProgress.memoizedState = null;
     } else {
@@ -12253,12 +13165,15 @@ function updateMode(current, workInProgress, renderLanes) {
 
 function updateProfiler(current, workInProgress, renderLanes) {
   {
-    workInProgress.flags |= Update; // Reset effect durations for the next eventual effect phase.
-    // These are reset during render to allow the DevTools commit hook a chance to read them,
+    workInProgress.flags |= Update;
 
-    var stateNode = workInProgress.stateNode;
-    stateNode.effectDuration = 0;
-    stateNode.passiveEffectDuration = 0;
+    {
+      // Reset effect durations for the next eventual effect phase.
+      // These are reset during render to allow the DevTools commit hook a chance to read them,
+      var stateNode = workInProgress.stateNode;
+      stateNode.effectDuration = 0;
+      stateNode.passiveEffectDuration = 0;
+    }
   }
 
   var nextProps = workInProgress.pendingProps;
@@ -12297,7 +13212,7 @@ function updateFunctionComponent(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(Component)
+          getComponentNameFromType(Component)
         );
       }
     }
@@ -12346,6 +13261,41 @@ function updateClassComponent(
   renderLanes
 ) {
   {
+    // This is used by DevTools to force a boundary to error.
+    switch (shouldError(workInProgress)) {
+      case false: {
+        var _instance = workInProgress.stateNode;
+        var ctor = workInProgress.type; // TODO This way of resetting the error boundary state is a hack.
+        // Is there a better way to do this?
+
+        var tempInstance = new ctor(
+          workInProgress.memoizedProps,
+          _instance.context
+        );
+        var state = tempInstance.state;
+
+        _instance.updater.enqueueSetState(_instance, state, null);
+
+        break;
+      }
+
+      case true: {
+        workInProgress.flags |= DidCapture;
+        workInProgress.flags |= ShouldCapture;
+        var error$1 = new Error("Simulated error coming from DevTools");
+        var lane = pickArbitraryLane(renderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane); // Schedule the error boundary to re-render using updated state
+
+        var update = createClassErrorUpdate(
+          workInProgress,
+          createCapturedValue(error$1, workInProgress),
+          lane
+        );
+        enqueueCapturedUpdate(workInProgress, update);
+        break;
+      }
+    }
+
     if (workInProgress.type !== workInProgress.elementType) {
       // Lazy component props can't be validated in createElement
       // because they're only guaranteed to be resolved here.
@@ -12356,7 +13306,7 @@ function updateClassComponent(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(Component)
+          getComponentNameFromType(Component)
         );
       }
     }
@@ -12427,7 +13377,7 @@ function updateClassComponent(
         error(
           "It looks like %s is reassigning its own `this.props` while rendering. " +
             "This is not supported and can lead to confusing bugs.",
-          getComponentName(workInProgress.type) || "a component"
+          getComponentNameFromFiber(workInProgress) || "a component"
         );
       }
 
@@ -12543,10 +13493,11 @@ function updateHostRoot(current, workInProgress, renderLanes) {
 
   var nextProps = workInProgress.pendingProps;
   var prevState = workInProgress.memoizedState;
-  var prevChildren = prevState !== null ? prevState.element : null;
+  var prevChildren = prevState.element;
   cloneUpdateQueue(current, workInProgress);
   processUpdateQueue(workInProgress, nextProps, null, renderLanes);
-  var nextState = workInProgress.memoizedState; // Caution: React DevTools currently depends on this property
+  var nextState = workInProgress.memoizedState;
+  var root = workInProgress.stateNode;
   // being called "element".
 
   var nextChildren = nextState.element;
@@ -12555,8 +13506,6 @@ function updateHostRoot(current, workInProgress, renderLanes) {
     return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
   }
 
-  var root = workInProgress.stateNode;
-
   if (root.hydrate && enterHydrationState()) {
     var child = mountChildFibers(
       workInProgress,
@@ -12703,7 +13652,7 @@ function mountLazyComponent(
               outerPropTypes,
               resolvedProps, // Resolved for outer only
               "prop",
-              getComponentName(Component)
+              getComponentNameFromType(Component)
             );
           }
         }
@@ -12823,7 +13772,7 @@ function mountIndeterminateComponent(
       Component.prototype &&
       typeof Component.prototype.render === "function"
     ) {
-      var componentName = getComponentName(Component) || "Unknown";
+      var componentName = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutBadClass[componentName]) {
         error(
@@ -12837,7 +13786,7 @@ function mountIndeterminateComponent(
       }
     }
 
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
     }
 
@@ -12865,7 +13814,7 @@ function mountIndeterminateComponent(
       typeof value.render === "function" &&
       value.$$typeof === undefined
     ) {
-      var _componentName = getComponentName(Component) || "Unknown";
+      var _componentName = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutModulePatternComponent[_componentName]) {
         error(
@@ -12893,7 +13842,7 @@ function mountIndeterminateComponent(
     value.$$typeof === undefined
   ) {
     {
-      var _componentName2 = getComponentName(Component) || "Unknown";
+      var _componentName2 = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutModulePatternComponent[_componentName2]) {
         error(
@@ -12930,17 +13879,6 @@ function mountIndeterminateComponent(
     workInProgress.memoizedState =
       value.state !== null && value.state !== undefined ? value.state : null;
     initializeUpdateQueue(workInProgress);
-    var getDerivedStateFromProps = Component.getDerivedStateFromProps;
-
-    if (typeof getDerivedStateFromProps === "function") {
-      applyDerivedStateFromProps(
-        workInProgress,
-        Component,
-        getDerivedStateFromProps,
-        props
-      );
-    }
-
     adoptClassInstance(workInProgress, value);
     mountClassInstance(workInProgress, Component, props, renderLanes);
     return finishClassComponent(
@@ -12984,7 +13922,7 @@ function validateFunctionComponentInDev(workInProgress, Component) {
         info += "\n\nCheck the render method of `" + ownerName + "`.";
       }
 
-      var warningKey = ownerName || workInProgress._debugID || "";
+      var warningKey = ownerName || "";
       var debugSource = workInProgress._debugSource;
 
       if (debugSource) {
@@ -13004,7 +13942,7 @@ function validateFunctionComponentInDev(workInProgress, Component) {
     }
 
     if (typeof Component.getDerivedStateFromProps === "function") {
-      var _componentName3 = getComponentName(Component) || "Unknown";
+      var _componentName3 = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3]) {
         error(
@@ -13020,7 +13958,7 @@ function validateFunctionComponentInDev(workInProgress, Component) {
       typeof Component.contextType === "object" &&
       Component.contextType !== null
     ) {
-      var _componentName4 = getComponentName(Component) || "Unknown";
+      var _componentName4 = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutContextTypeOnFunctionComponent[_componentName4]) {
         error(
@@ -13041,13 +13979,17 @@ var SUSPENDED_MARKER = {
 
 function mountSuspenseOffscreenState(renderLanes) {
   return {
-    baseLanes: renderLanes
+    baseLanes: renderLanes,
+    cachePool: getSuspendedCachePool()
   };
 }
 
 function updateSuspenseOffscreenState(prevOffscreenState, renderLanes) {
+  var cachePool = null;
+
   return {
-    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes)
+    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes),
+    cachePool: cachePool
   };
 } // TODO: Probably should inline this back
 
@@ -13189,11 +14131,6 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       // it behind on this node.
 
       workInProgress.lanes = SomeRetryLane;
-
-      {
-        markSpawnedWork(SomeRetryLane);
-      }
-
       return _fallbackFragment;
     } else {
       return mountSuspensePrimaryChildren(
@@ -13330,7 +14267,10 @@ function mountSuspenseFallbackChildren(
   var primaryChildFragment;
   var fallbackChildFragment;
 
-  if ((mode & BlockingMode) === NoMode && progressedPrimaryFragment !== null) {
+  if (
+    (mode & ConcurrentMode) === NoMode &&
+    progressedPrimaryFragment !== null
+  ) {
     // In legacy mode, we commit the primary tree as if it successfully
     // completed, even though it's in an inconsistent state.
     primaryChildFragment = progressedPrimaryFragment;
@@ -13398,7 +14338,7 @@ function updateSuspensePrimaryChildren(
     }
   );
 
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
     primaryChildFragment.lanes = renderLanes;
   }
 
@@ -13407,9 +14347,14 @@ function updateSuspensePrimaryChildren(
 
   if (currentFallbackChildFragment !== null) {
     // Delete the fallback child fragment
-    currentFallbackChildFragment.nextEffect = null;
-    currentFallbackChildFragment.flags = Deletion;
-    workInProgress.firstEffect = workInProgress.lastEffect = currentFallbackChildFragment;
+    var deletions = workInProgress.deletions;
+
+    if (deletions === null) {
+      workInProgress.deletions = [currentFallbackChildFragment];
+      workInProgress.flags |= ChildDeletion;
+    } else {
+      deletions.push(currentFallbackChildFragment);
+    }
   }
 
   workInProgress.child = primaryChildFragment;
@@ -13435,7 +14380,7 @@ function updateSuspenseFallbackChildren(
   if (
     // In legacy mode, we commit the primary tree as if it successfully
     // completed, even though it's in an inconsistent state.
-    (mode & BlockingMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
+    (mode & ConcurrentMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
     // already cloned. In legacy mode, the only case where this isn't true is
     // when DevTools forces us to display a fallback; we skip the first render
     // pass entirely and go straight to rendering the fallback. (In Concurrent
@@ -13459,28 +14404,21 @@ function updateSuspenseFallbackChildren(
         currentPrimaryChildFragment.selfBaseDuration;
       primaryChildFragment.treeBaseDuration =
         currentPrimaryChildFragment.treeBaseDuration;
-    } // The fallback fiber was added as a deletion effect during the first pass.
+    } // The fallback fiber was added as a deletion during the first pass.
     // However, since we're going to remain on the fallback, we no longer want
-    // to delete it. So we need to remove it from the list. Deletions are stored
-    // on the same list as effects. We want to keep the effects from the primary
-    // tree. So we copy the primary child fragment's effect list, which does not
-    // include the fallback deletion effect.
+    // to delete it.
 
-    var progressedLastEffect = primaryChildFragment.lastEffect;
-
-    if (progressedLastEffect !== null) {
-      workInProgress.firstEffect = primaryChildFragment.firstEffect;
-      workInProgress.lastEffect = progressedLastEffect;
-      progressedLastEffect.nextEffect = null;
-    } else {
-      // TODO: Reset this somewhere else? Lol legacy mode is so weird.
-      workInProgress.firstEffect = workInProgress.lastEffect = null;
-    }
+    workInProgress.deletions = null;
   } else {
     primaryChildFragment = createWorkInProgressOffscreenFiber(
       currentPrimaryChildFragment,
       primaryChildProps
-    );
+    ); // Since we're reusing a current tree, we need to reuse the flags, too.
+    // (We don't do this in legacy mode, because in legacy mode we don't re-use
+    // the current tree; see previous branch.)
+
+    primaryChildFragment.subtreeFlags =
+      currentPrimaryChildFragment.subtreeFlags & StaticMask;
   }
 
   var fallbackChildFragment;
@@ -13676,11 +14614,12 @@ function validateTailOptions(tailMode, revealOrder) {
 
 function validateSuspenseListNestedChild(childSlot, index) {
   {
-    var isArray = Array.isArray(childSlot);
-    var isIterable = !isArray && typeof getIteratorFn(childSlot) === "function";
+    var isAnArray = isArray(childSlot);
+    var isIterable =
+      !isAnArray && typeof getIteratorFn(childSlot) === "function";
 
-    if (isArray || isIterable) {
-      var type = isArray ? "array" : "iterable";
+    if (isAnArray || isIterable) {
+      var type = isAnArray ? "array" : "iterable";
 
       error(
         "A nested %s was passed to row #%s in <SuspenseList />. Wrap it in " +
@@ -13708,7 +14647,7 @@ function validateSuspenseListChildren(children, revealOrder) {
       children !== null &&
       children !== false
     ) {
-      if (Array.isArray(children)) {
+      if (isArray(children)) {
         for (var i = 0; i < children.length; i++) {
           if (!validateSuspenseListNestedChild(children[i], i)) {
             return;
@@ -13750,8 +14689,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
 
@@ -13762,8 +14700,7 @@ function initSuspenseListRenderState(
       renderingStartTime: 0,
       last: lastContentRow,
       tail: tail,
-      tailMode: tailMode,
-      lastEffect: lastEffectBeforeRendering
+      tailMode: tailMode
     };
   } else {
     // We can reuse the existing object from previous renders.
@@ -13773,7 +14710,6 @@ function initSuspenseListRenderState(
     renderState.last = lastContentRow;
     renderState.tail = tail;
     renderState.tailMode = tailMode;
-    renderState.lastEffect = lastEffectBeforeRendering;
   }
 } // This can end up rendering this component multiple passes.
 // The first pass splits the children fibers into two sets. A head and tail.
@@ -13824,7 +14760,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
 
   pushSuspenseContext(workInProgress, suspenseContext);
 
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
     // In legacy mode, SuspenseList doesn't work so we just
     // use make it a noop by treating it as the default revealOrder.
     workInProgress.memoizedState = null;
@@ -13851,8 +14787,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           false, // isBackwards
           tail,
           lastContentRow,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       }
@@ -13886,8 +14821,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           true, // isBackwards
           _tail,
           null, // last
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       }
@@ -13898,8 +14832,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           false, // isBackwards
           null, // tail
           null, // last
-          undefined,
-          workInProgress.lastEffect
+          undefined
         );
         break;
       }
@@ -13965,25 +14898,26 @@ function updateContextProvider(current, workInProgress, renderLanes) {
     }
   }
 
-  pushProvider(workInProgress, newValue);
-
-  if (oldProps !== null) {
-    var oldValue = oldProps.value;
-    var changedBits = calculateChangedBits(context, newValue, oldValue);
+  pushProvider(workInProgress, context, newValue);
 
-    if (changedBits === 0) {
-      // No change. Bailout early if children are the same.
-      if (oldProps.children === newProps.children && !hasContextChanged()) {
-        return bailoutOnAlreadyFinishedWork(
-          current,
-          workInProgress,
-          renderLanes
-        );
+  {
+    if (oldProps !== null) {
+      var oldValue = oldProps.value;
+
+      if (objectIs(oldValue, newValue)) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children && !hasContextChanged()) {
+          return bailoutOnAlreadyFinishedWork(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        }
+      } else {
+        // The context value changed. Search for matching consumers and schedule
+        // them to update.
+        propagateContextChange(workInProgress, context, renderLanes);
       }
-    } else {
-      // The context value changed. Search for matching consumers and schedule
-      // them to update.
-      propagateContextChange(workInProgress, context, changedBits, renderLanes);
     }
   }
 
@@ -14038,7 +14972,7 @@ function updateContextConsumer(current, workInProgress, renderLanes) {
   }
 
   prepareToReadContext(workInProgress, renderLanes);
-  var newValue = readContext(context, newProps.unstable_observedBits);
+  var newValue = readContext(context);
   var newChildren;
 
   {
@@ -14074,13 +15008,14 @@ function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
     // The children don't have any work either. We can skip them.
     // TODO: Once we add back resuming, we should check if the children are
     // a work-in-progress set. If so, we need to transfer their effects.
-    return null;
-  } else {
-    // This fiber doesn't have work, but its subtree does. Clone the child
-    // fibers and continue.
-    cloneChildFibers(current, workInProgress);
-    return workInProgress.child;
-  }
+    {
+      return null;
+    }
+  } // This fiber doesn't have work, but its subtree does. Clone the child
+  // fibers and continue.
+
+  cloneChildFibers(current, workInProgress);
+  return workInProgress.child;
 }
 
 function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
@@ -14121,17 +15056,15 @@ function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
     } // Delete the old fiber and place the new one.
     // Since the old fiber is disconnected, we have to schedule it manually.
 
-    var last = returnFiber.lastEffect;
+    var deletions = returnFiber.deletions;
 
-    if (last !== null) {
-      last.nextEffect = current;
-      returnFiber.lastEffect = current;
+    if (deletions === null) {
+      returnFiber.deletions = [current];
+      returnFiber.flags |= ChildDeletion;
     } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = current;
+      deletions.push(current);
     }
 
-    current.nextEffect = null;
-    current.flags = Deletion;
     newWorkInProgress.flags |= Placement; // Restart work from the new fiber.
 
     return newWorkInProgress;
@@ -14204,7 +15137,8 @@ function beginWork(current, workInProgress, renderLanes) {
 
         case ContextProvider: {
           var newValue = workInProgress.memoizedProps.value;
-          pushProvider(workInProgress, newValue);
+          var context = workInProgress.type._context;
+          pushProvider(workInProgress, context, newValue);
           break;
         }
 
@@ -14218,12 +15152,15 @@ function beginWork(current, workInProgress, renderLanes) {
 
             if (hasChildWork) {
               workInProgress.flags |= Update;
-            } // Reset effect durations for the next eventual effect phase.
-            // These are reset during render to allow the DevTools commit hook a chance to read them,
+            }
 
-            var stateNode = workInProgress.stateNode;
-            stateNode.effectDuration = 0;
-            stateNode.passiveEffectDuration = 0;
+            {
+              // Reset effect durations for the next eventual effect phase.
+              // These are reset during render to allow the DevTools commit hook a chance to read them,
+              var stateNode = workInProgress.stateNode;
+              stateNode.effectDuration = 0;
+              stateNode.passiveEffectDuration = 0;
+            }
           }
 
           break;
@@ -14267,6 +15204,9 @@ function beginWork(current, workInProgress, renderLanes) {
                 // primary children and work on the fallback.
                 return child.sibling;
               } else {
+                // Note: We can return `null` here because we already checked
+                // whether there were nested context consumers, via the call to
+                // `bailoutOnAlreadyFinishedWork` above.
                 return null;
               }
             }
@@ -14488,7 +15428,7 @@ function beginWork(current, workInProgress, renderLanes) {
               outerPropTypes,
               _resolvedProps3, // Resolved for outer only
               "prop",
-              getComponentName(_type2)
+              getComponentNameFromType(_type2)
             );
           }
         }
@@ -14538,18 +15478,10 @@ function beginWork(current, workInProgress, renderLanes) {
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
     }
 
-    case FundamentalComponent: {
-      break;
-    }
-
     case ScopeComponent: {
       break;
     }
 
-    case Block: {
-      break;
-    }
-
     case OffscreenComponent: {
       return updateOffscreenComponent(current, workInProgress, renderLanes);
     }
@@ -14578,6 +15510,34 @@ function markRef$1(workInProgress) {
   workInProgress.flags |= Ref;
 }
 
+function hadNoMutationsEffects(current, completedWork) {
+  var didBailout = current !== null && current.child === completedWork.child;
+
+  if (didBailout) {
+    return true;
+  }
+
+  if ((completedWork.flags & ChildDeletion) !== NoFlags) {
+    return false;
+  } // TODO: If we move the `hadNoMutationsEffects` call after `bubbleProperties`
+  // then we only have to check the `completedWork.subtreeFlags`.
+
+  var child = completedWork.child;
+
+  while (child !== null) {
+    if (
+      (child.flags & MutationMask) !== NoFlags ||
+      (child.subtreeFlags & MutationMask) !== NoFlags
+    ) {
+      return false;
+    }
+
+    child = child.sibling;
+  }
+
+  return true;
+}
+
 var appendAllChildren;
 var updateHostContainer;
 var updateHostComponent$1;
@@ -14630,103 +15590,8 @@ var updateHostText$1;
             if (primaryChildParent !== null) {
               if (primaryChildParent.child !== null) {
                 primaryChildParent.child.return = primaryChildParent;
-                appendAllChildren(
-                  parent,
-                  primaryChildParent,
-                  true,
-                  newIsHidden
-                );
-              }
-
-              var fallbackChildParent = primaryChildParent.sibling;
-
-              if (fallbackChildParent !== null) {
-                fallbackChildParent.return = node;
-                node = fallbackChildParent;
-                continue;
-              }
-            }
-          }
-        }
-
-        if (node.child !== null) {
-          // Continue traversing like normal
-          node.child.return = node;
-          node = node.child;
-          continue;
-        }
-      } else if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      } // $FlowFixMe This is correct but Flow is confused by the labeled break.
-
-      node = node;
-
-      if (node === workInProgress) {
-        return;
-      }
-
-      while (node.sibling === null) {
-        if (node.return === null || node.return === workInProgress) {
-          return;
-        }
-
-        node = node.return;
-      }
-
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }; // An unfortunate fork of appendAllChildren because we have two different parent types.
-
-  var appendAllChildrenToContainer = function(
-    containerChildSet,
-    workInProgress,
-    needsVisibilityToggle,
-    isHidden
-  ) {
-    // We only have the top Fiber that was created but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = workInProgress.child;
-
-    while (node !== null) {
-      // eslint-disable-next-line no-labels
-      if (node.tag === HostComponent) {
-        var instance = node.stateNode;
-
-        if (needsVisibilityToggle && isHidden) {
-          // This child is inside a timed out tree. Hide it.
-          var props = node.memoizedProps;
-          var type = node.type;
-          instance = cloneHiddenInstance(instance);
-        }
-
-        appendChildToContainerChildSet(containerChildSet, instance);
-      } else if (node.tag === HostText) {
-        var _instance3 = node.stateNode;
-
-        if (needsVisibilityToggle && isHidden) {
-          // This child is inside a timed out tree. Hide it.
-          var text = node.memoizedProps;
-          _instance3 = cloneHiddenTextInstance();
-        }
-
-        appendChildToContainerChildSet(containerChildSet, _instance3);
-      } else if (node.tag === HostPortal);
-      else if (node.tag === SuspenseComponent) {
-        if ((node.flags & Update) !== NoFlags) {
-          // Need to toggle the visibility of the primary children.
-          var newIsHidden = node.memoizedState !== null;
-
-          if (newIsHidden) {
-            var primaryChildParent = node.child;
-
-            if (primaryChildParent !== null) {
-              if (primaryChildParent.child !== null) {
-                primaryChildParent.child.return = primaryChildParent;
-                appendAllChildrenToContainer(
-                  containerChildSet,
+                appendAllChildren(
+                  parent,
                   primaryChildParent,
                   true,
                   newIsHidden
@@ -14773,1363 +15638,1213 @@ var updateHostText$1;
       node.sibling.return = node.return;
       node = node.sibling;
     }
-  };
-
-  updateHostContainer = function(workInProgress) {
-    var portalOrRoot = workInProgress.stateNode;
-    var childrenUnchanged = workInProgress.firstEffect === null;
-
-    if (childrenUnchanged);
-    else {
-      var container = portalOrRoot.containerInfo;
-      var newChildSet = createContainerChildSet(container); // If children might have changed, we have to add them all to the set.
-
-      appendAllChildrenToContainer(newChildSet, workInProgress, false, false);
-      portalOrRoot.pendingChildren = newChildSet; // Schedule an update on the container to swap out the container.
-
-      markUpdate(workInProgress);
-      finalizeContainerChildren(container, newChildSet);
-    }
-  };
+  }; // An unfortunate fork of appendAllChildren because we have two different parent types.
 
-  updateHostComponent$1 = function(
-    current,
+  var appendAllChildrenToContainer = function(
+    containerChildSet,
     workInProgress,
-    type,
-    newProps,
-    rootContainerInstance
+    needsVisibilityToggle,
+    isHidden
   ) {
-    var currentInstance = current.stateNode;
-    var oldProps = current.memoizedProps; // If there are no effects associated with this node, then none of our children had any updates.
-    // This guarantees that we can reuse all of them.
-
-    var childrenUnchanged = workInProgress.firstEffect === null;
-
-    if (childrenUnchanged && oldProps === newProps) {
-      // No changes, just reuse the existing instance.
-      // Note that this might release a previous clone.
-      workInProgress.stateNode = currentInstance;
-      return;
-    }
-
-    var recyclableInstance = workInProgress.stateNode;
-    var currentHostContext = getHostContext();
-    var updatePayload = null;
-
-    if (oldProps !== newProps) {
-      updatePayload = prepareUpdate(
-        recyclableInstance,
-        type,
-        oldProps,
-        newProps
-      );
-    }
-
-    if (childrenUnchanged && updatePayload === null) {
-      // No changes, just reuse the existing instance.
-      // Note that this might release a previous clone.
-      workInProgress.stateNode = currentInstance;
-      return;
-    }
-
-    var newInstance = cloneInstance(
-      currentInstance,
-      updatePayload,
-      type,
-      oldProps,
-      newProps,
-      workInProgress,
-      childrenUnchanged
-    );
-
-    workInProgress.stateNode = newInstance;
-
-    if (childrenUnchanged) {
-      // If there are no other effects in this tree, we need to flag this node as having one.
-      // Even though we're not going to use it for anything.
-      // Otherwise parents won't know that there are new children to propagate upwards.
-      markUpdate(workInProgress);
-    } else {
-      // If children might have changed, we have to add them all to the set.
-      appendAllChildren(newInstance, workInProgress, false, false);
-    }
-  };
-
-  updateHostText$1 = function(current, workInProgress, oldText, newText) {
-    if (oldText !== newText) {
-      // If the text content differs, we'll create a new text instance for it.
-      var rootContainerInstance = getRootHostContainer();
-      var currentHostContext = getHostContext();
-      workInProgress.stateNode = createTextInstance(
-        newText,
-        rootContainerInstance,
-        currentHostContext,
-        workInProgress
-      ); // We'll have to mark it as having an effect, even though we won't use the effect for anything.
-      // This lets the parents know that at least one of their children has changed.
-
-      markUpdate(workInProgress);
-    } else {
-      workInProgress.stateNode = current.stateNode;
-    }
-  };
-}
-
-function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
-  switch (renderState.tailMode) {
-    case "hidden": {
-      // Any insertions at the end of the tail list after this point
-      // should be invisible. If there are already mounted boundaries
-      // anything before them are not considered for collapsing.
-      // Therefore we need to go through the whole tail to find if
-      // there are any.
-      var tailNode = renderState.tail;
-      var lastTailNode = null;
-
-      while (tailNode !== null) {
-        if (tailNode.alternate !== null) {
-          lastTailNode = tailNode;
-        }
-
-        tailNode = tailNode.sibling;
-      } // Next we're simply going to delete all insertions after the
-      // last rendered item.
-
-      if (lastTailNode === null) {
-        // All remaining items in the tail are insertions.
-        renderState.tail = null;
-      } else {
-        // Detach the insertion after the last node that was already
-        // inserted.
-        lastTailNode.sibling = null;
-      }
-
-      break;
-    }
-
-    case "collapsed": {
-      // Any insertions at the end of the tail list after this point
-      // should be invisible. If there are already mounted boundaries
-      // anything before them are not considered for collapsing.
-      // Therefore we need to go through the whole tail to find if
-      // there are any.
-      var _tailNode = renderState.tail;
-      var _lastTailNode = null;
-
-      while (_tailNode !== null) {
-        if (_tailNode.alternate !== null) {
-          _lastTailNode = _tailNode;
-        }
-
-        _tailNode = _tailNode.sibling;
-      } // Next we're simply going to delete all insertions after the
-      // last rendered item.
-
-      if (_lastTailNode === null) {
-        // All remaining items in the tail are insertions.
-        if (!hasRenderedATailFallback && renderState.tail !== null) {
-          // We suspended during the head. We want to show at least one
-          // row at the tail. So we'll keep on and cut off the rest.
-          renderState.tail.sibling = null;
-        } else {
-          renderState.tail = null;
-        }
-      } else {
-        // Detach the insertion after the last node that was already
-        // inserted.
-        _lastTailNode.sibling = null;
-      }
-
-      break;
-    }
-  }
-}
-
-function completeWork(current, workInProgress, renderLanes) {
-  var newProps = workInProgress.pendingProps;
-
-  switch (workInProgress.tag) {
-    case IndeterminateComponent:
-    case LazyComponent:
-    case SimpleMemoComponent:
-    case FunctionComponent:
-    case ForwardRef:
-    case Fragment:
-    case Mode:
-    case Profiler:
-    case ContextConsumer:
-    case MemoComponent:
-      return null;
-
-    case ClassComponent: {
-      var Component = workInProgress.type;
-
-      if (isContextProvider(Component)) {
-        popContext(workInProgress);
-      }
-
-      return null;
-    }
-
-    case HostRoot: {
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      resetWorkInProgressVersions();
-      var fiberRoot = workInProgress.stateNode;
-
-      if (fiberRoot.pendingContext) {
-        fiberRoot.context = fiberRoot.pendingContext;
-        fiberRoot.pendingContext = null;
-      }
+    // We only have the top Fiber that was created but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = workInProgress.child;
 
-      if (current === null || current.child === null) {
-        // If we hydrated, pop so that we can delete any remaining children
-        // that weren't hydrated.
-        var wasHydrated = popHydrationState();
+    while (node !== null) {
+      // eslint-disable-next-line no-labels
+      if (node.tag === HostComponent) {
+        var instance = node.stateNode;
 
-        if (wasHydrated) {
-          // If we hydrated, then we'll need to schedule an update for
-          // the commit side-effects on the root.
-          markUpdate(workInProgress);
-        } else if (!fiberRoot.hydrate) {
-          // Schedule an effect to clear this container at the start of the next commit.
-          // This handles the case of React rendering into a container with previous children.
-          // It's also safe to do for updates too, because current.child would only be null
-          // if the previous render was null (so the the container would already be empty).
-          workInProgress.flags |= Snapshot;
+        if (needsVisibilityToggle && isHidden) {
+          // This child is inside a timed out tree. Hide it.
+          var props = node.memoizedProps;
+          var type = node.type;
+          instance = cloneHiddenInstance(instance);
         }
-      }
-
-      updateHostContainer(workInProgress);
-      return null;
-    }
-
-    case HostComponent: {
-      popHostContext(workInProgress);
-      var rootContainerInstance = getRootHostContainer();
-      var type = workInProgress.type;
 
-      if (current !== null && workInProgress.stateNode != null) {
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          type,
-          newProps,
-          rootContainerInstance
-        );
+        appendChildToContainerChildSet(containerChildSet, instance);
+      } else if (node.tag === HostText) {
+        var _instance2 = node.stateNode;
 
-        if (current.ref !== workInProgress.ref) {
-          markRef$1(workInProgress);
+        if (needsVisibilityToggle && isHidden) {
+          // This child is inside a timed out tree. Hide it.
+          var text = node.memoizedProps;
+          _instance2 = cloneHiddenTextInstance();
         }
-      } else {
-        if (!newProps) {
-          if (!(workInProgress.stateNode !== null)) {
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          } // This can happen when we abort work.
 
-          return null;
-        }
+        appendChildToContainerChildSet(containerChildSet, _instance2);
+      } else if (node.tag === HostPortal);
+      else if (node.tag === SuspenseComponent) {
+        if ((node.flags & Update) !== NoFlags) {
+          // Need to toggle the visibility of the primary children.
+          var newIsHidden = node.memoizedState !== null;
 
-        var currentHostContext = getHostContext(); // TODO: Move createInstance to beginWork and keep it on a context
-        // "stack" as the parent. Then append children as we go in beginWork
-        // or completeWork depending on whether we want to add them top->down or
-        // bottom->up. Top->down is faster in IE11.
+          if (newIsHidden) {
+            var primaryChildParent = node.child;
 
-        var _wasHydrated = popHydrationState();
+            if (primaryChildParent !== null) {
+              if (primaryChildParent.child !== null) {
+                primaryChildParent.child.return = primaryChildParent;
+                appendAllChildrenToContainer(
+                  containerChildSet,
+                  primaryChildParent,
+                  true,
+                  newIsHidden
+                );
+              }
 
-        if (_wasHydrated) {
-          // TODO: Move this and createInstance step into the beginPhase
-          // to consolidate.
-          if (prepareToHydrateHostInstance()) {
-            // If changes to the hydrated node need to be applied at the
-            // commit-phase we mark this as such.
-            markUpdate(workInProgress);
+              var fallbackChildParent = primaryChildParent.sibling;
+
+              if (fallbackChildParent !== null) {
+                fallbackChildParent.return = node;
+                node = fallbackChildParent;
+                continue;
+              }
+            }
           }
-        } else {
-          var instance = createInstance(
-            type,
-            newProps,
-            rootContainerInstance,
-            currentHostContext,
-            workInProgress
-          );
-          appendAllChildren(instance, workInProgress, false, false);
-          workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
         }
 
-        if (workInProgress.ref !== null) {
-          // If there is a ref on a host node we need to schedule a callback
-          markRef$1(workInProgress);
+        if (node.child !== null) {
+          // Continue traversing like normal
+          node.child.return = node;
+          node = node.child;
+          continue;
         }
-      }
-
-      return null;
-    }
+      } else if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      } // $FlowFixMe This is correct but Flow is confused by the labeled break.
 
-    case HostText: {
-      var newText = newProps;
+      node = node;
 
-      if (current && workInProgress.stateNode != null) {
-        var oldText = current.memoizedProps; // If we have an alternate, that means this is an update and we need
-        // to schedule a side-effect to do the updates.
+      if (node === workInProgress) {
+        return;
+      }
 
-        updateHostText$1(current, workInProgress, oldText, newText);
-      } else {
-        if (typeof newText !== "string") {
-          if (!(workInProgress.stateNode !== null)) {
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          } // This can happen when we abort work.
+      while (node.sibling === null) {
+        if (node.return === null || node.return === workInProgress) {
+          return;
         }
 
-        var _rootContainerInstance = getRootHostContainer();
+        node = node.return;
+      }
 
-        var _currentHostContext = getHostContext();
+      node.sibling.return = node.return;
+      node = node.sibling;
+    }
+  };
 
-        var _wasHydrated2 = popHydrationState();
+  updateHostContainer = function(current, workInProgress) {
+    var portalOrRoot = workInProgress.stateNode;
+    var childrenUnchanged = hadNoMutationsEffects(current, workInProgress);
 
-        if (_wasHydrated2) {
-          if (prepareToHydrateHostTextInstance()) {
-            markUpdate(workInProgress);
-          }
-        } else {
-          workInProgress.stateNode = createTextInstance(
-            newText,
-            _rootContainerInstance,
-            _currentHostContext,
-            workInProgress
-          );
-        }
-      }
+    if (childrenUnchanged);
+    else {
+      var container = portalOrRoot.containerInfo;
+      var newChildSet = createContainerChildSet(container); // If children might have changed, we have to add them all to the set.
 
-      return null;
+      appendAllChildrenToContainer(newChildSet, workInProgress, false, false);
+      portalOrRoot.pendingChildren = newChildSet; // Schedule an update on the container to swap out the container.
+
+      markUpdate(workInProgress);
+      finalizeContainerChildren(container, newChildSet);
     }
+  };
 
-    case SuspenseComponent: {
-      popSuspenseContext(workInProgress);
-      var nextState = workInProgress.memoizedState;
+  updateHostComponent$1 = function(
+    current,
+    workInProgress,
+    type,
+    newProps,
+    rootContainerInstance
+  ) {
+    var currentInstance = current.stateNode;
+    var oldProps = current.memoizedProps; // If there are no effects associated with this node, then none of our children had any updates.
+    // This guarantees that we can reuse all of them.
 
-      if ((workInProgress.flags & DidCapture) !== NoFlags) {
-        // Something suspended. Re-render with the fallback children.
-        workInProgress.lanes = renderLanes; // Do not reset the effect list.
+    var childrenUnchanged = hadNoMutationsEffects(current, workInProgress);
 
-        if ((workInProgress.mode & ProfileMode) !== NoMode) {
-          transferActualDuration(workInProgress);
-        }
+    if (childrenUnchanged && oldProps === newProps) {
+      // No changes, just reuse the existing instance.
+      // Note that this might release a previous clone.
+      workInProgress.stateNode = currentInstance;
+      return;
+    }
 
-        return workInProgress;
-      }
+    var recyclableInstance = workInProgress.stateNode;
+    var currentHostContext = getHostContext();
+    var updatePayload = null;
 
-      var nextDidTimeout = nextState !== null;
-      var prevDidTimeout = false;
+    if (oldProps !== newProps) {
+      updatePayload = prepareUpdate(
+        recyclableInstance,
+        type,
+        oldProps,
+        newProps
+      );
+    }
 
-      if (current === null) {
-        if (workInProgress.memoizedProps.fallback !== undefined);
-      } else {
-        var prevState = current.memoizedState;
-        prevDidTimeout = prevState !== null;
-      }
+    if (childrenUnchanged && updatePayload === null) {
+      // No changes, just reuse the existing instance.
+      // Note that this might release a previous clone.
+      workInProgress.stateNode = currentInstance;
+      return;
+    }
 
-      if (nextDidTimeout && !prevDidTimeout) {
-        // If this subtreee is running in blocking mode we can suspend,
-        // otherwise we won't suspend.
-        // TODO: This will still suspend a synchronous tree if anything
-        // in the concurrent tree already suspended during this render.
-        // This is a known bug.
-        if ((workInProgress.mode & BlockingMode) !== NoMode) {
-          // TODO: Move this back to throwException because this is too late
-          // if this is a large tree which is common for initial loads. We
-          // don't know if we should restart a render or not until we get
-          // this marker, and this is too late.
-          // If this render already had a ping or lower pri updates,
-          // and this is the first time we know we're going to suspend we
-          // should be able to immediately restart from within throwException.
-          var hasInvisibleChildContext =
-            current === null &&
-            workInProgress.memoizedProps.unstable_avoidThisFallback !== true;
+    var newInstance = cloneInstance(
+      currentInstance,
+      updatePayload,
+      type,
+      oldProps,
+      newProps,
+      workInProgress,
+      childrenUnchanged
+    );
 
-          if (
-            hasInvisibleChildContext ||
-            hasSuspenseContext(
-              suspenseStackCursor.current,
-              InvisibleParentSuspenseContext
-            )
-          ) {
-            // If this was in an invisible tree or a new render, then showing
-            // this boundary is ok.
-            renderDidSuspend();
-          } else {
-            // Otherwise, we're going to have to hide content so we should
-            // suspend for longer if possible.
-            renderDidSuspendDelayIfPossible();
-          }
-        }
-      }
+    workInProgress.stateNode = newInstance;
 
-      {
-        // TODO: Only schedule updates if not prevDidTimeout.
-        if (nextDidTimeout) {
-          // If this boundary just timed out, schedule an effect to attach a
-          // retry listener to the promise. This flag is also used to hide the
-          // primary children.
-          workInProgress.flags |= Update;
-        }
-      }
+    if (childrenUnchanged) {
+      // If there are no other effects in this tree, we need to flag this node as having one.
+      // Even though we're not going to use it for anything.
+      // Otherwise parents won't know that there are new children to propagate upwards.
+      markUpdate(workInProgress);
+    } else {
+      // If children might have changed, we have to add them all to the set.
+      appendAllChildren(newInstance, workInProgress, false, false);
+    }
+  };
+
+  updateHostText$1 = function(current, workInProgress, oldText, newText) {
+    if (oldText !== newText) {
+      // If the text content differs, we'll create a new text instance for it.
+      var rootContainerInstance = getRootHostContainer();
+      var currentHostContext = getHostContext();
+      workInProgress.stateNode = createTextInstance(
+        newText,
+        rootContainerInstance,
+        currentHostContext,
+        workInProgress
+      ); // We'll have to mark it as having an effect, even though we won't use the effect for anything.
+      // This lets the parents know that at least one of their children has changed.
 
-      return null;
+      markUpdate(workInProgress);
+    } else {
+      workInProgress.stateNode = current.stateNode;
     }
+  };
+}
 
-    case HostPortal:
-      popHostContainer(workInProgress);
-      updateHostContainer(workInProgress);
-
-      if (current === null) {
-        preparePortalMount(workInProgress.stateNode.containerInfo);
-      }
-
-      return null;
+function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
+  switch (renderState.tailMode) {
+    case "hidden": {
+      // Any insertions at the end of the tail list after this point
+      // should be invisible. If there are already mounted boundaries
+      // anything before them are not considered for collapsing.
+      // Therefore we need to go through the whole tail to find if
+      // there are any.
+      var tailNode = renderState.tail;
+      var lastTailNode = null;
 
-    case ContextProvider:
-      // Pop provider fiber
-      popProvider(workInProgress);
-      return null;
+      while (tailNode !== null) {
+        if (tailNode.alternate !== null) {
+          lastTailNode = tailNode;
+        }
 
-    case IncompleteClassComponent: {
-      // Same as class component case. I put it down here so that the tags are
-      // sequential to ensure this switch is compiled to a jump table.
-      var _Component = workInProgress.type;
+        tailNode = tailNode.sibling;
+      } // Next we're simply going to delete all insertions after the
+      // last rendered item.
 
-      if (isContextProvider(_Component)) {
-        popContext(workInProgress);
+      if (lastTailNode === null) {
+        // All remaining items in the tail are insertions.
+        renderState.tail = null;
+      } else {
+        // Detach the insertion after the last node that was already
+        // inserted.
+        lastTailNode.sibling = null;
       }
 
-      return null;
+      break;
     }
 
-    case SuspenseListComponent: {
-      popSuspenseContext(workInProgress);
-      var renderState = workInProgress.memoizedState;
+    case "collapsed": {
+      // Any insertions at the end of the tail list after this point
+      // should be invisible. If there are already mounted boundaries
+      // anything before them are not considered for collapsing.
+      // Therefore we need to go through the whole tail to find if
+      // there are any.
+      var _tailNode = renderState.tail;
+      var _lastTailNode = null;
 
-      if (renderState === null) {
-        // We're running in the default, "independent" mode.
-        // We don't do anything in this mode.
-        return null;
+      while (_tailNode !== null) {
+        if (_tailNode.alternate !== null) {
+          _lastTailNode = _tailNode;
+        }
+
+        _tailNode = _tailNode.sibling;
+      } // Next we're simply going to delete all insertions after the
+      // last rendered item.
+
+      if (_lastTailNode === null) {
+        // All remaining items in the tail are insertions.
+        if (!hasRenderedATailFallback && renderState.tail !== null) {
+          // We suspended during the head. We want to show at least one
+          // row at the tail. So we'll keep on and cut off the rest.
+          renderState.tail.sibling = null;
+        } else {
+          renderState.tail = null;
+        }
+      } else {
+        // Detach the insertion after the last node that was already
+        // inserted.
+        _lastTailNode.sibling = null;
       }
 
-      var didSuspendAlready = (workInProgress.flags & DidCapture) !== NoFlags;
-      var renderedTail = renderState.rendering;
+      break;
+    }
+  }
+}
 
-      if (renderedTail === null) {
-        // We just rendered the head.
-        if (!didSuspendAlready) {
-          // This is the first pass. We need to figure out if anything is still
-          // suspended in the rendered set.
-          // If new content unsuspended, but there's still some content that
-          // didn't. Then we need to do a second pass that forces everything
-          // to keep showing their fallbacks.
-          // We might be suspended if something in this render pass suspended, or
-          // something in the previous committed pass suspended. Otherwise,
-          // there's no chance so we can skip the expensive call to
-          // findFirstSuspended.
-          var cannotBeSuspended =
-            renderHasNotSuspendedYet() &&
-            (current === null || (current.flags & DidCapture) === NoFlags);
+function bubbleProperties(completedWork) {
+  var didBailout =
+    completedWork.alternate !== null &&
+    completedWork.alternate.child === completedWork.child;
+  var newChildLanes = NoLanes;
+  var subtreeFlags = NoFlags;
 
-          if (!cannotBeSuspended) {
-            var row = workInProgress.child;
+  if (!didBailout) {
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var actualDuration = completedWork.actualDuration;
+      var treeBaseDuration = completedWork.selfBaseDuration;
+      var child = completedWork.child;
 
-            while (row !== null) {
-              var suspended = findFirstSuspended(row);
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes)
+        );
+        subtreeFlags |= child.subtreeFlags;
+        subtreeFlags |= child.flags; // When a fiber is cloned, its actualDuration is reset to 0. This value will
+        // only be updated if work is done on the fiber (i.e. it doesn't bailout).
+        // When work is done, it should bubble to the parent's actualDuration. If
+        // the fiber has not been cloned though, (meaning no work was done), then
+        // this value will reflect the amount of time spent working on a previous
+        // render. In that case it should not bubble. We determine whether it was
+        // cloned by comparing the child pointer.
 
-              if (suspended !== null) {
-                didSuspendAlready = true;
-                workInProgress.flags |= DidCapture;
-                cutOffTailIfNeeded(renderState, false); // If this is a newly suspended tree, it might not get committed as
-                // part of the second pass. In that case nothing will subscribe to
-                // its thennables. Instead, we'll transfer its thennables to the
-                // SuspenseList so that it can retry if they resolve.
-                // There might be multiple of these in the list but since we're
-                // going to wait for all of them anyway, it doesn't really matter
-                // which ones gets to ping. In theory we could get clever and keep
-                // track of how many dependencies remain but it gets tricky because
-                // in the meantime, we can add/remove/change items and dependencies.
-                // We might bail out of the loop before finding any but that
-                // doesn't matter since that means that the other boundaries that
-                // we did find already has their listeners attached.
+        actualDuration += child.actualDuration;
+        treeBaseDuration += child.treeBaseDuration;
+        child = child.sibling;
+      }
 
-                var newThennables = suspended.updateQueue;
+      completedWork.actualDuration = actualDuration;
+      completedWork.treeBaseDuration = treeBaseDuration;
+    } else {
+      var _child = completedWork.child;
 
-                if (newThennables !== null) {
-                  workInProgress.updateQueue = newThennables;
-                  workInProgress.flags |= Update;
-                } // Rerender the whole list, but this time, we'll force fallbacks
-                // to stay in place.
-                // Reset the effect list before doing the second pass since that's now invalid.
+      while (_child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child.lanes, _child.childLanes)
+        );
+        subtreeFlags |= _child.subtreeFlags;
+        subtreeFlags |= _child.flags; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
 
-                if (renderState.lastEffect === null) {
-                  workInProgress.firstEffect = null;
-                }
+        _child.return = completedWork;
+        _child = _child.sibling;
+      }
+    }
 
-                workInProgress.lastEffect = renderState.lastEffect; // Reset the child fibers to their original state.
+    completedWork.subtreeFlags |= subtreeFlags;
+  } else {
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var _treeBaseDuration = completedWork.selfBaseDuration;
+      var _child2 = completedWork.child;
+
+      while (_child2 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child2.lanes, _child2.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
+
+        subtreeFlags |= _child2.subtreeFlags & StaticMask;
+        subtreeFlags |= _child2.flags & StaticMask;
+        _treeBaseDuration += _child2.treeBaseDuration;
+        _child2 = _child2.sibling;
+      }
+
+      completedWork.treeBaseDuration = _treeBaseDuration;
+    } else {
+      var _child3 = completedWork.child;
 
-                resetChildFibers(workInProgress, renderLanes); // Set up the Suspense Context to force suspense and immediately
-                // rerender the children.
+      while (_child3 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child3.lanes, _child3.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
 
-                pushSuspenseContext(
-                  workInProgress,
-                  setShallowSuspenseContext(
-                    suspenseStackCursor.current,
-                    ForceSuspenseFallback
-                  )
-                );
-                return workInProgress.child;
-              }
+        subtreeFlags |= _child3.subtreeFlags & StaticMask;
+        subtreeFlags |= _child3.flags & StaticMask; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
 
-              row = row.sibling;
-            }
-          }
+        _child3.return = completedWork;
+        _child3 = _child3.sibling;
+      }
+    }
 
-          if (renderState.tail !== null && now() > getRenderTargetTime()) {
-            // We have already passed our CPU deadline but we still have rows
-            // left in the tail. We'll just give up further attempts to render
-            // the main content and only render fallbacks.
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true;
-            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
-            // to get it started back up to attempt the next item. While in terms
-            // of priority this work has the same priority as this current render,
-            // it's not part of the same transition once the transition has
-            // committed. If it's sync, we still want to yield so that it can be
-            // painted. Conceptually, this is really the same as pinging.
-            // We can use any RetryLane even if it's the one currently rendering
-            // since we're leaving it behind on this node.
+    completedWork.subtreeFlags |= subtreeFlags;
+  }
 
-            workInProgress.lanes = SomeRetryLane;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
 
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
-          }
-        } else {
-          cutOffTailIfNeeded(renderState, false);
-        } // Next we're going to render the tail.
-      } else {
-        // Append the rendered row to the child list.
-        if (!didSuspendAlready) {
-          var _suspended = findFirstSuspended(renderedTail);
+function completeWork(current, workInProgress, renderLanes) {
+  var newProps = workInProgress.pendingProps;
 
-          if (_suspended !== null) {
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true; // Ensure we transfer the update queue to the parent so that it doesn't
-            // get lost if this row ends up dropped during a second pass.
+  switch (workInProgress.tag) {
+    case IndeterminateComponent:
+    case LazyComponent:
+    case SimpleMemoComponent:
+    case FunctionComponent:
+    case ForwardRef:
+    case Fragment:
+    case Mode:
+    case Profiler:
+    case ContextConsumer:
+    case MemoComponent:
+      bubbleProperties(workInProgress);
+      return null;
 
-            var _newThennables = _suspended.updateQueue;
+    case ClassComponent: {
+      var Component = workInProgress.type;
 
-            if (_newThennables !== null) {
-              workInProgress.updateQueue = _newThennables;
-              workInProgress.flags |= Update;
-            }
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
+      }
 
-            cutOffTailIfNeeded(renderState, true); // This might have been modified.
+      bubbleProperties(workInProgress);
+      return null;
+    }
 
-            if (
-              renderState.tail === null &&
-              renderState.tailMode === "hidden" &&
-              !renderedTail.alternate &&
-              !getIsHydrating() // We don't cut it if we're hydrating.
-            ) {
-              // We need to delete the row we just rendered.
-              // Reset the effect list to what it was before we rendered this
-              // child. The nested children have already appended themselves.
-              var lastEffect = (workInProgress.lastEffect =
-                renderState.lastEffect); // Remove any effects that were appended after this point.
+    case HostRoot: {
+      var fiberRoot = workInProgress.stateNode;
 
-              if (lastEffect !== null) {
-                lastEffect.nextEffect = null;
-              } // We're done.
+      popHostContainer(workInProgress);
+      popTopLevelContextObject(workInProgress);
+      resetWorkInProgressVersions();
 
-              return null;
-            }
-          } else if (
-            // The time it took to render last row is greater than the remaining
-            // time we have to render. So rendering one more row would likely
-            // exceed it.
-            now() * 2 - renderState.renderingStartTime >
-              getRenderTargetTime() &&
-            renderLanes !== OffscreenLane
-          ) {
-            // We have now passed our CPU deadline and we'll just give up further
-            // attempts to render the main content and only render fallbacks.
-            // The assumption is that this is usually faster.
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true;
-            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
-            // to get it started back up to attempt the next item. While in terms
-            // of priority this work has the same priority as this current render,
-            // it's not part of the same transition once the transition has
-            // committed. If it's sync, we still want to yield so that it can be
-            // painted. Conceptually, this is really the same as pinging.
-            // We can use any RetryLane even if it's the one currently rendering
-            // since we're leaving it behind on this node.
+      if (fiberRoot.pendingContext) {
+        fiberRoot.context = fiberRoot.pendingContext;
+        fiberRoot.pendingContext = null;
+      }
 
-            workInProgress.lanes = SomeRetryLane;
+      if (current === null || current.child === null) {
+        // If we hydrated, pop so that we can delete any remaining children
+        // that weren't hydrated.
+        var wasHydrated = popHydrationState();
 
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
-          }
+        if (wasHydrated) {
+          // If we hydrated, then we'll need to schedule an update for
+          // the commit side-effects on the root.
+          markUpdate(workInProgress);
+        } else if (!fiberRoot.hydrate) {
+          // Schedule an effect to clear this container at the start of the next commit.
+          // This handles the case of React rendering into a container with previous children.
+          // It's also safe to do for updates too, because current.child would only be null
+          // if the previous render was null (so the the container would already be empty).
+          workInProgress.flags |= Snapshot;
         }
+      }
 
-        if (renderState.isBackwards) {
-          // The effect list of the backwards tail will have been added
-          // to the end. This breaks the guarantee that life-cycles fire in
-          // sibling order but that isn't a strong guarantee promised by React.
-          // Especially since these might also just pop in during future commits.
-          // Append to the beginning of the list.
-          renderedTail.sibling = workInProgress.child;
-          workInProgress.child = renderedTail;
-        } else {
-          var previousSibling = renderState.last;
+      updateHostContainer(current, workInProgress);
+      bubbleProperties(workInProgress);
+      return null;
+    }
 
-          if (previousSibling !== null) {
-            previousSibling.sibling = renderedTail;
-          } else {
-            workInProgress.child = renderedTail;
-          }
+    case HostComponent: {
+      popHostContext(workInProgress);
+      var rootContainerInstance = getRootHostContainer();
+      var type = workInProgress.type;
 
-          renderState.last = renderedTail;
+      if (current !== null && workInProgress.stateNode != null) {
+        updateHostComponent$1(
+          current,
+          workInProgress,
+          type,
+          newProps,
+          rootContainerInstance
+        );
+
+        if (current.ref !== workInProgress.ref) {
+          markRef$1(workInProgress);
         }
-      }
+      } else {
+        if (!newProps) {
+          if (!(workInProgress.stateNode !== null)) {
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          } // This can happen when we abort work.
 
-      if (renderState.tail !== null) {
-        // We still have tail rows to render.
-        // Pop a row.
-        var next = renderState.tail;
-        renderState.rendering = next;
-        renderState.tail = next.sibling;
-        renderState.lastEffect = workInProgress.lastEffect;
-        renderState.renderingStartTime = now();
-        next.sibling = null; // Restore the context.
-        // TODO: We can probably just avoid popping it instead and only
-        // setting it the first time we go from not suspended to suspended.
+          bubbleProperties(workInProgress);
+          return null;
+        }
 
-        var suspenseContext = suspenseStackCursor.current;
+        var currentHostContext = getHostContext(); // TODO: Move createInstance to beginWork and keep it on a context
+        // "stack" as the parent. Then append children as we go in beginWork
+        // or completeWork depending on whether we want to add them top->down or
+        // bottom->up. Top->down is faster in IE11.
 
-        if (didSuspendAlready) {
-          suspenseContext = setShallowSuspenseContext(
-            suspenseContext,
-            ForceSuspenseFallback
-          );
+        var _wasHydrated = popHydrationState();
+
+        if (_wasHydrated) {
+          // TODO: Move this and createInstance step into the beginPhase
+          // to consolidate.
+          if (prepareToHydrateHostInstance()) {
+            // If changes to the hydrated node need to be applied at the
+            // commit-phase we mark this as such.
+            markUpdate(workInProgress);
+          }
         } else {
-          suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+          var instance = createInstance(
+            type,
+            newProps,
+            rootContainerInstance,
+            currentHostContext,
+            workInProgress
+          );
+          appendAllChildren(instance, workInProgress, false, false);
+          workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
         }
 
-        pushSuspenseContext(workInProgress, suspenseContext); // Do a pass over the next row.
-
-        return next;
+        if (workInProgress.ref !== null) {
+          // If there is a ref on a host node we need to schedule a callback
+          markRef$1(workInProgress);
+        }
       }
 
+      bubbleProperties(workInProgress);
       return null;
     }
 
-    case FundamentalComponent: {
-      break;
-    }
+    case HostText: {
+      var newText = newProps;
 
-    case ScopeComponent: {
-      break;
-    }
+      if (current && workInProgress.stateNode != null) {
+        var oldText = current.memoizedProps; // If we have an alternate, that means this is an update and we need
+        // to schedule a side-effect to do the updates.
 
-    case Block:
-      break;
+        updateHostText$1(current, workInProgress, oldText, newText);
+      } else {
+        if (typeof newText !== "string") {
+          if (!(workInProgress.stateNode !== null)) {
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          } // This can happen when we abort work.
+        }
 
-    case OffscreenComponent:
-    case LegacyHiddenComponent: {
-      popRenderLanes(workInProgress);
+        var _rootContainerInstance = getRootHostContainer();
 
-      if (current !== null) {
-        var _nextState = workInProgress.memoizedState;
-        var _prevState = current.memoizedState;
-        var prevIsHidden = _prevState !== null;
-        var nextIsHidden = _nextState !== null;
+        var _currentHostContext = getHostContext();
 
-        if (
-          prevIsHidden !== nextIsHidden &&
-          newProps.mode !== "unstable-defer-without-hiding"
-        ) {
-          workInProgress.flags |= Update;
+        var _wasHydrated2 = popHydrationState();
+
+        if (_wasHydrated2) {
+          if (prepareToHydrateHostTextInstance()) {
+            markUpdate(workInProgress);
+          }
+        } else {
+          workInProgress.stateNode = createTextInstance(
+            newText,
+            _rootContainerInstance,
+            _currentHostContext,
+            workInProgress
+          );
         }
       }
 
+      bubbleProperties(workInProgress);
       return null;
     }
-  }
-
-  {
-    throw Error(
-      "Unknown unit of work tag (" +
-        workInProgress.tag +
-        "). This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-}
-
-function unwindWork(workInProgress, renderLanes) {
-  switch (workInProgress.tag) {
-    case ClassComponent: {
-      var Component = workInProgress.type;
-
-      if (isContextProvider(Component)) {
-        popContext(workInProgress);
-      }
 
-      var flags = workInProgress.flags;
+    case SuspenseComponent: {
+      popSuspenseContext(workInProgress);
+      var nextState = workInProgress.memoizedState;
 
-      if (flags & ShouldCapture) {
-        workInProgress.flags = (flags & ~ShouldCapture) | DidCapture;
+      if ((workInProgress.flags & DidCapture) !== NoFlags) {
+        // Something suspended. Re-render with the fallback children.
+        workInProgress.lanes = renderLanes; // Do not reset the effect list.
 
         if ((workInProgress.mode & ProfileMode) !== NoMode) {
           transferActualDuration(workInProgress);
-        }
+        } // Don't bubble properties in this case.
 
         return workInProgress;
       }
 
-      return null;
-    }
-
-    case HostRoot: {
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      resetWorkInProgressVersions();
-      var _flags = workInProgress.flags;
+      var nextDidTimeout = nextState !== null;
+      var prevDidTimeout = false;
 
-      if (!((_flags & DidCapture) === NoFlags)) {
-        throw Error(
-          "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
-        );
+      if (current === null) {
+        if (workInProgress.memoizedProps.fallback !== undefined);
+      } else {
+        var prevState = current.memoizedState;
+        prevDidTimeout = prevState !== null;
       }
 
-      workInProgress.flags = (_flags & ~ShouldCapture) | DidCapture;
-      return workInProgress;
-    }
-
-    case HostComponent: {
-      // TODO: popHydrationState
-      popHostContext(workInProgress);
-      return null;
-    }
+      if (nextDidTimeout && !prevDidTimeout) {
+        // TODO: This will still suspend a synchronous tree if anything
+        // in the concurrent tree already suspended during this render.
+        // This is a known bug.
+        if ((workInProgress.mode & ConcurrentMode) !== NoMode) {
+          // TODO: Move this back to throwException because this is too late
+          // if this is a large tree which is common for initial loads. We
+          // don't know if we should restart a render or not until we get
+          // this marker, and this is too late.
+          // If this render already had a ping or lower pri updates,
+          // and this is the first time we know we're going to suspend we
+          // should be able to immediately restart from within throwException.
+          var hasInvisibleChildContext =
+            current === null &&
+            workInProgress.memoizedProps.unstable_avoidThisFallback !== true;
 
-    case SuspenseComponent: {
-      popSuspenseContext(workInProgress);
+          if (
+            hasInvisibleChildContext ||
+            hasSuspenseContext(
+              suspenseStackCursor.current,
+              InvisibleParentSuspenseContext
+            )
+          ) {
+            // If this was in an invisible tree or a new render, then showing
+            // this boundary is ok.
+            renderDidSuspend();
+          } else {
+            // Otherwise, we're going to have to hide content so we should
+            // suspend for longer if possible.
+            renderDidSuspendDelayIfPossible();
+          }
+        }
+      }
 
-      var _flags2 = workInProgress.flags;
+      {
+        // TODO: Only schedule updates if not prevDidTimeout.
+        if (nextDidTimeout) {
+          // If this boundary just timed out, schedule an effect to attach a
+          // retry listener to the promise. This flag is also used to hide the
+          // primary children.
+          workInProgress.flags |= Update;
+        }
+      }
 
-      if (_flags2 & ShouldCapture) {
-        workInProgress.flags = (_flags2 & ~ShouldCapture) | DidCapture; // Captured a suspense effect. Re-render the boundary.
+      bubbleProperties(workInProgress);
 
+      {
         if ((workInProgress.mode & ProfileMode) !== NoMode) {
-          transferActualDuration(workInProgress);
+          if (nextDidTimeout) {
+            // Don't count time spent in a timed out Suspense subtree as part of the base duration.
+            var _primaryChildFragment2 = workInProgress.child;
+
+            if (_primaryChildFragment2 !== null) {
+              // $FlowFixMe Flow doesn't support type casting in combination with the -= operator
+              workInProgress.treeBaseDuration -=
+                _primaryChildFragment2.treeBaseDuration;
+            }
+          }
         }
-
-        return workInProgress;
       }
 
       return null;
     }
 
-    case SuspenseListComponent: {
-      popSuspenseContext(workInProgress); // SuspenseList doesn't actually catch anything. It should've been
-      // caught by a nested boundary. If not, it should bubble through.
-
-      return null;
-    }
-
     case HostPortal:
       popHostContainer(workInProgress);
-      return null;
+      updateHostContainer(current, workInProgress);
 
-    case ContextProvider:
-      popProvider(workInProgress);
-      return null;
+      if (current === null) {
+        preparePortalMount(workInProgress.stateNode.containerInfo);
+      }
 
-    case OffscreenComponent:
-    case LegacyHiddenComponent:
-      popRenderLanes(workInProgress);
+      bubbleProperties(workInProgress);
       return null;
 
-    default:
+    case ContextProvider:
+      // Pop provider fiber
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
+      bubbleProperties(workInProgress);
       return null;
-  }
-}
 
-function unwindInterruptedWork(interruptedWork) {
-  switch (interruptedWork.tag) {
-    case ClassComponent: {
-      var childContextTypes = interruptedWork.type.childContextTypes;
+    case IncompleteClassComponent: {
+      // Same as class component case. I put it down here so that the tags are
+      // sequential to ensure this switch is compiled to a jump table.
+      var _Component = workInProgress.type;
 
-      if (childContextTypes !== null && childContextTypes !== undefined) {
-        popContext(interruptedWork);
+      if (isContextProvider(_Component)) {
+        popContext(workInProgress);
       }
 
-      break;
-    }
-
-    case HostRoot: {
-      popHostContainer(interruptedWork);
-      popTopLevelContextObject(interruptedWork);
-      resetWorkInProgressVersions();
-      break;
-    }
-
-    case HostComponent: {
-      popHostContext(interruptedWork);
-      break;
+      bubbleProperties(workInProgress);
+      return null;
     }
 
-    case HostPortal:
-      popHostContainer(interruptedWork);
-      break;
-
-    case SuspenseComponent:
-      popSuspenseContext(interruptedWork);
-      break;
+    case SuspenseListComponent: {
+      popSuspenseContext(workInProgress);
+      var renderState = workInProgress.memoizedState;
 
-    case SuspenseListComponent:
-      popSuspenseContext(interruptedWork);
-      break;
+      if (renderState === null) {
+        // We're running in the default, "independent" mode.
+        // We don't do anything in this mode.
+        bubbleProperties(workInProgress);
+        return null;
+      }
 
-    case ContextProvider:
-      popProvider(interruptedWork);
-      break;
+      var didSuspendAlready = (workInProgress.flags & DidCapture) !== NoFlags;
+      var renderedTail = renderState.rendering;
 
-    case OffscreenComponent:
-    case LegacyHiddenComponent:
-      popRenderLanes(interruptedWork);
-      break;
-  }
-}
+      if (renderedTail === null) {
+        // We just rendered the head.
+        if (!didSuspendAlready) {
+          // This is the first pass. We need to figure out if anything is still
+          // suspended in the rendered set.
+          // If new content unsuspended, but there's still some content that
+          // didn't. Then we need to do a second pass that forces everything
+          // to keep showing their fallbacks.
+          // We might be suspended if something in this render pass suspended, or
+          // something in the previous committed pass suspended. Otherwise,
+          // there's no chance so we can skip the expensive call to
+          // findFirstSuspended.
+          var cannotBeSuspended =
+            renderHasNotSuspendedYet() &&
+            (current === null || (current.flags & DidCapture) === NoFlags);
 
-function createCapturedValue(value, source) {
-  // If the value is an error, call this function immediately after it is thrown
-  // so the stack is accurate.
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
-}
+          if (!cannotBeSuspended) {
+            var row = workInProgress.child;
 
-if (
-  !(
-    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
-    "function"
-  )
-) {
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-}
+            while (row !== null) {
+              var suspended = findFirstSuspended(row);
 
-function showErrorDialog(boundary, errorInfo) {
-  var capturedError = {
-    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
-    error: errorInfo.value,
-    errorBoundary:
-      boundary !== null && boundary.tag === ClassComponent
-        ? boundary.stateNode
-        : null
-  };
-  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
-    capturedError
-  );
-}
+              if (suspended !== null) {
+                didSuspendAlready = true;
+                workInProgress.flags |= DidCapture;
+                cutOffTailIfNeeded(renderState, false); // If this is a newly suspended tree, it might not get committed as
+                // part of the second pass. In that case nothing will subscribe to
+                // its thennables. Instead, we'll transfer its thennables to the
+                // SuspenseList so that it can retry if they resolve.
+                // There might be multiple of these in the list but since we're
+                // going to wait for all of them anyway, it doesn't really matter
+                // which ones gets to ping. In theory we could get clever and keep
+                // track of how many dependencies remain but it gets tricky because
+                // in the meantime, we can add/remove/change items and dependencies.
+                // We might bail out of the loop before finding any but that
+                // doesn't matter since that means that the other boundaries that
+                // we did find already has their listeners attached.
 
-function logCapturedError(boundary, errorInfo) {
-  try {
-    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
-    // This enables renderers like ReactNative to better manage redbox behavior.
+                var newThennables = suspended.updateQueue;
 
-    if (logError === false) {
-      return;
-    }
+                if (newThennables !== null) {
+                  workInProgress.updateQueue = newThennables;
+                  workInProgress.flags |= Update;
+                } // Rerender the whole list, but this time, we'll force fallbacks
+                // to stay in place.
+                // Reset the effect flags before doing the second pass since that's now invalid.
+                // Reset the child fibers to their original state.
 
-    var error = errorInfo.value;
+                workInProgress.subtreeFlags = NoFlags;
+                resetChildFibers(workInProgress, renderLanes); // Set up the Suspense Context to force suspense and immediately
+                // rerender the children.
 
-    if (true) {
-      var source = errorInfo.source;
-      var stack = errorInfo.stack;
-      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
-      // `preventDefault()` in window `error` handler.
-      // We record this information as an expando on the error.
+                pushSuspenseContext(
+                  workInProgress,
+                  setShallowSuspenseContext(
+                    suspenseStackCursor.current,
+                    ForceSuspenseFallback
+                  )
+                ); // Don't bubble properties in this case.
 
-      if (error != null && error._suppressLogging) {
-        if (boundary.tag === ClassComponent) {
-          // The error is recoverable and was silenced.
-          // Ignore it and don't print the stack addendum.
-          // This is handy for testing error boundaries without noise.
-          return;
-        } // The error is fatal. Since the silencing might have
-        // been accidental, we'll surface it anyway.
-        // However, the browser would have silenced the original error
-        // so we'll print it first, and then print the stack addendum.
+                return workInProgress.child;
+              }
 
-        console["error"](error); // Don't transform to our wrapper
-        // For a more detailed description of this block, see:
-        // https://github.com/facebook/react/pull/13384
-      }
+              row = row.sibling;
+            }
+          }
 
-      var componentName = source ? getComponentName(source.type) : null;
-      var componentNameMessage = componentName
-        ? "The above error occurred in the <" + componentName + "> component:"
-        : "The above error occurred in one of your React components:";
-      var errorBoundaryMessage;
-      var errorBoundaryName = getComponentName(boundary.type);
+          if (renderState.tail !== null && now() > getRenderTargetTime()) {
+            // We have already passed our CPU deadline but we still have rows
+            // left in the tail. We'll just give up further attempts to render
+            // the main content and only render fallbacks.
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true;
+            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
+            // to get it started back up to attempt the next item. While in terms
+            // of priority this work has the same priority as this current render,
+            // it's not part of the same transition once the transition has
+            // committed. If it's sync, we still want to yield so that it can be
+            // painted. Conceptually, this is really the same as pinging.
+            // We can use any RetryLane even if it's the one currently rendering
+            // since we're leaving it behind on this node.
 
-      if (errorBoundaryName) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
+            workInProgress.lanes = SomeRetryLane;
+          }
+        } else {
+          cutOffTailIfNeeded(renderState, false);
+        } // Next we're going to render the tail.
       } else {
-        errorBoundaryMessage =
-          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
-      }
-
-      var combinedMessage =
-        componentNameMessage +
-        "\n" +
-        componentStack +
-        "\n\n" +
-        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
-      // We don't include the original error message and JS stack because the browser
-      // has already printed it. Even if the application swallows the error, it is still
-      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+        // Append the rendered row to the child list.
+        if (!didSuspendAlready) {
+          var _suspended = findFirstSuspended(renderedTail);
 
-      console["error"](combinedMessage); // Don't transform to our wrapper
-    } else {
-      // In production, we print the error directly.
-      // This will include the message, the JS stack, and anything the browser wants to show.
-      // We pass the error object instead of custom message so that the browser displays the error natively.
-      console["error"](error); // Don't transform to our wrapper
-    }
-  } catch (e) {
-    // This method must not throw, or React internal state will get messed up.
-    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
-    // we want to report this error outside of the normal stack as a last resort.
-    // https://github.com/facebook/react/issues/13188
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
+          if (_suspended !== null) {
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true; // Ensure we transfer the update queue to the parent so that it doesn't
+            // get lost if this row ends up dropped during a second pass.
 
-var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
+            var _newThennables = _suspended.updateQueue;
 
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
+            if (_newThennables !== null) {
+              workInProgress.updateQueue = _newThennables;
+              workInProgress.flags |= Update;
+            }
 
-  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
-  // being called "element".
+            cutOffTailIfNeeded(renderState, true); // This might have been modified.
 
-  update.payload = {
-    element: null
-  };
-  var error = errorInfo.value;
+            if (
+              renderState.tail === null &&
+              renderState.tailMode === "hidden" &&
+              !renderedTail.alternate &&
+              !getIsHydrating() // We don't cut it if we're hydrating.
+            ) {
+              // We're done.
+              bubbleProperties(workInProgress);
+              return null;
+            }
+          } else if (
+            // The time it took to render last row is greater than the remaining
+            // time we have to render. So rendering one more row would likely
+            // exceed it.
+            now() * 2 - renderState.renderingStartTime >
+              getRenderTargetTime() &&
+            renderLanes !== OffscreenLane
+          ) {
+            // We have now passed our CPU deadline and we'll just give up further
+            // attempts to render the main content and only render fallbacks.
+            // The assumption is that this is usually faster.
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true;
+            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
+            // to get it started back up to attempt the next item. While in terms
+            // of priority this work has the same priority as this current render,
+            // it's not part of the same transition once the transition has
+            // committed. If it's sync, we still want to yield so that it can be
+            // painted. Conceptually, this is really the same as pinging.
+            // We can use any RetryLane even if it's the one currently rendering
+            // since we're leaving it behind on this node.
 
-  update.callback = function() {
-    onUncaughtError(error);
-    logCapturedError(fiber, errorInfo);
-  };
+            workInProgress.lanes = SomeRetryLane;
+          }
+        }
 
-  return update;
-}
+        if (renderState.isBackwards) {
+          // The effect list of the backwards tail will have been added
+          // to the end. This breaks the guarantee that life-cycles fire in
+          // sibling order but that isn't a strong guarantee promised by React.
+          // Especially since these might also just pop in during future commits.
+          // Append to the beginning of the list.
+          renderedTail.sibling = workInProgress.child;
+          workInProgress.child = renderedTail;
+        } else {
+          var previousSibling = renderState.last;
 
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane);
-  update.tag = CaptureUpdate;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+          if (previousSibling !== null) {
+            previousSibling.sibling = renderedTail;
+          } else {
+            workInProgress.child = renderedTail;
+          }
 
-  if (typeof getDerivedStateFromError === "function") {
-    var error$1 = errorInfo.value;
+          renderState.last = renderedTail;
+        }
+      }
 
-    update.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error$1);
-    };
-  }
+      if (renderState.tail !== null) {
+        // We still have tail rows to render.
+        // Pop a row.
+        var next = renderState.tail;
+        renderState.rendering = next;
+        renderState.tail = next.sibling;
+        renderState.renderingStartTime = now();
+        next.sibling = null; // Restore the context.
+        // TODO: We can probably just avoid popping it instead and only
+        // setting it the first time we go from not suspended to suspended.
 
-  var inst = fiber.stateNode;
+        var suspenseContext = suspenseStackCursor.current;
 
-  if (inst !== null && typeof inst.componentDidCatch === "function") {
-    update.callback = function callback() {
-      {
-        markFailedErrorBoundaryForHotReloading(fiber);
-      }
+        if (didSuspendAlready) {
+          suspenseContext = setShallowSuspenseContext(
+            suspenseContext,
+            ForceSuspenseFallback
+          );
+        } else {
+          suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+        }
 
-      if (typeof getDerivedStateFromError !== "function") {
-        // To preserve the preexisting retry behavior of error boundaries,
-        // we keep track of which ones already failed during this batch.
-        // This gets reset before we yield back to the browser.
-        // TODO: Warn in strict mode if getDerivedStateFromError is
-        // not defined.
-        markLegacyErrorBoundaryAsFailed(this); // Only log here if componentDidCatch is the only error boundary method defined
+        pushSuspenseContext(workInProgress, suspenseContext); // Do a pass over the next row.
+        // Don't bubble properties in this case.
 
-        logCapturedError(fiber, errorInfo);
+        return next;
       }
 
-      var error$1 = errorInfo.value;
-      var stack = errorInfo.stack;
-      this.componentDidCatch(error$1, {
-        componentStack: stack !== null ? stack : ""
-      });
+      bubbleProperties(workInProgress);
+      return null;
+    }
 
-      {
-        if (typeof getDerivedStateFromError !== "function") {
-          // If componentDidCatch is the only error boundary method defined,
-          // then it needs to call setState to recover from errors.
-          // If no state update is scheduled then the boundary will swallow the error.
-          if (!includesSomeLane(fiber.lanes, SyncLane)) {
-            error(
-              "%s: Error boundaries should implement getDerivedStateFromError(). " +
-                "In that method, return a state update to display an error message or fallback UI.",
-              getComponentName(fiber.type) || "Unknown"
-            );
-          }
-        }
-      }
-    };
-  } else {
-    update.callback = function() {
-      markFailedErrorBoundaryForHotReloading(fiber);
-    };
-  }
+    case ScopeComponent: {
+      break;
+    }
 
-  return update;
-}
+    case OffscreenComponent:
+    case LegacyHiddenComponent: {
+      popRenderLanes(workInProgress);
+      var _nextState = workInProgress.memoizedState;
+      var nextIsHidden = _nextState !== null;
 
-function attachPingListener(root, wakeable, lanes) {
-  // Attach a listener to the promise to "ping" the root and retry. But only if
-  // one does not already exist for the lanes we're currently rendering (which
-  // acts like a "thread ID" here).
-  var pingCache = root.pingCache;
-  var threadIDs;
+      if (current !== null) {
+        var _prevState = current.memoizedState;
+        var prevIsHidden = _prevState !== null;
 
-  if (pingCache === null) {
-    pingCache = root.pingCache = new PossiblyWeakMap$1();
-    threadIDs = new Set();
-    pingCache.set(wakeable, threadIDs);
-  } else {
-    threadIDs = pingCache.get(wakeable);
+        if (
+          prevIsHidden !== nextIsHidden &&
+          newProps.mode !== "unstable-defer-without-hiding"
+        ) {
+          workInProgress.flags |= Update;
+        }
+      } // Don't bubble properties for hidden children.
 
-    if (threadIDs === undefined) {
-      threadIDs = new Set();
-      pingCache.set(wakeable, threadIDs);
+      if (
+        !nextIsHidden ||
+        includesSomeLane(subtreeRenderLanes, OffscreenLane) ||
+        (workInProgress.mode & ConcurrentMode) === NoMode
+      ) {
+        bubbleProperties(workInProgress);
+      }
+
+      return null;
     }
   }
 
-  if (!threadIDs.has(lanes)) {
-    // Memoize using the thread ID to prevent redundant listeners.
-    threadIDs.add(lanes);
-    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
-    wakeable.then(ping, ping);
+  {
+    throw Error(
+      "Unknown unit of work tag (" +
+        workInProgress.tag +
+        "). This error is likely caused by a bug in React. Please file an issue."
+    );
   }
 }
 
-function throwException(
-  root,
-  returnFiber,
-  sourceFiber,
-  value,
-  rootRenderLanes
-) {
-  // The source fiber did not complete.
-  sourceFiber.flags |= Incomplete; // Its effect list is no longer valid.
+function unwindWork(workInProgress, renderLanes) {
+  switch (workInProgress.tag) {
+    case ClassComponent: {
+      var Component = workInProgress.type;
 
-  sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
+      }
 
-  if (
-    value !== null &&
-    typeof value === "object" &&
-    typeof value.then === "function"
-  ) {
-    // This is a wakeable.
-    var wakeable = value;
+      var flags = workInProgress.flags;
 
-    if ((sourceFiber.mode & BlockingMode) === NoMode) {
-      // Reset the memoizedState to what it was before we attempted
-      // to render it.
-      var currentSource = sourceFiber.alternate;
+      if (flags & ShouldCapture) {
+        workInProgress.flags = (flags & ~ShouldCapture) | DidCapture;
 
-      if (currentSource) {
-        sourceFiber.updateQueue = currentSource.updateQueue;
-        sourceFiber.memoizedState = currentSource.memoizedState;
-        sourceFiber.lanes = currentSource.lanes;
-      } else {
-        sourceFiber.updateQueue = null;
-        sourceFiber.memoizedState = null;
+        if ((workInProgress.mode & ProfileMode) !== NoMode) {
+          transferActualDuration(workInProgress);
+        }
+
+        return workInProgress;
       }
+
+      return null;
     }
 
-    var hasInvisibleParentBoundary = hasSuspenseContext(
-      suspenseStackCursor.current,
-      InvisibleParentSuspenseContext
-    ); // Schedule the nearest Suspense to re-render the timed out view.
+    case HostRoot: {
+      popHostContainer(workInProgress);
+      popTopLevelContextObject(workInProgress);
+      resetWorkInProgressVersions();
+      var _flags = workInProgress.flags;
+
+      if (!((_flags & DidCapture) === NoFlags)) {
+        throw Error(
+          "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
+        );
+      }
+
+      workInProgress.flags = (_flags & ~ShouldCapture) | DidCapture;
+      return workInProgress;
+    }
+
+    case HostComponent: {
+      // TODO: popHydrationState
+      popHostContext(workInProgress);
+      return null;
+    }
 
-    var _workInProgress = returnFiber;
+    case SuspenseComponent: {
+      popSuspenseContext(workInProgress);
 
-    do {
-      if (
-        _workInProgress.tag === SuspenseComponent &&
-        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
-      ) {
-        // Found the nearest boundary.
-        // Stash the promise on the boundary fiber. If the boundary times out, we'll
-        // attach another listener to flip the boundary back to its normal state.
-        var wakeables = _workInProgress.updateQueue;
+      var _flags2 = workInProgress.flags;
 
-        if (wakeables === null) {
-          var updateQueue = new Set();
-          updateQueue.add(wakeable);
-          _workInProgress.updateQueue = updateQueue;
-        } else {
-          wakeables.add(wakeable);
-        } // If the boundary is outside of blocking mode, we should *not*
-        // suspend the commit. Pretend as if the suspended component rendered
-        // null and keep rendering. In the commit phase, we'll schedule a
-        // subsequent synchronous update to re-render the Suspense.
-        //
-        // Note: It doesn't matter whether the component that suspended was
-        // inside a blocking mode tree. If the Suspense is outside of it, we
-        // should *not* suspend the commit.
+      if (_flags2 & ShouldCapture) {
+        workInProgress.flags = (_flags2 & ~ShouldCapture) | DidCapture; // Captured a suspense effect. Re-render the boundary.
 
-        if ((_workInProgress.mode & BlockingMode) === NoMode) {
-          _workInProgress.flags |= DidCapture;
-          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
-          // But we shouldn't call any lifecycle methods or callbacks. Remove
-          // all lifecycle effect tags.
+        if ((workInProgress.mode & ProfileMode) !== NoMode) {
+          transferActualDuration(workInProgress);
+        }
 
-          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+        return workInProgress;
+      }
 
-          if (sourceFiber.tag === ClassComponent) {
-            var currentSourceFiber = sourceFiber.alternate;
+      return null;
+    }
 
-            if (currentSourceFiber === null) {
-              // This is a new mount. Change the tag so it's not mistaken for a
-              // completed class component. For example, we should not call
-              // componentWillUnmount if it is deleted.
-              sourceFiber.tag = IncompleteClassComponent;
-            } else {
-              // When we try rendering again, we should not reuse the current fiber,
-              // since it's known to be in an inconsistent state. Use a force update to
-              // prevent a bail out.
-              var update = createUpdate(NoTimestamp, SyncLane);
-              update.tag = ForceUpdate;
-              enqueueUpdate(sourceFiber, update);
-            }
-          } // The source fiber did not complete. Mark it with Sync priority to
-          // indicate that it still has pending work.
+    case SuspenseListComponent: {
+      popSuspenseContext(workInProgress); // SuspenseList doesn't actually catch anything. It should've been
+      // caught by a nested boundary. If not, it should bubble through.
 
-          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
+      return null;
+    }
 
-          return;
-        } // Confirmed that the boundary is in a concurrent mode tree. Continue
-        // with the normal suspend path.
-        //
-        // After this we'll use a set of heuristics to determine whether this
-        // render pass will run to completion or restart or "suspend" the commit.
-        // The actual logic for this is spread out in different places.
-        //
-        // This first principle is that if we're going to suspend when we complete
-        // a root, then we should also restart if we get an update or ping that
-        // might unsuspend it, and vice versa. The only reason to suspend is
-        // because you think you might want to restart before committing. However,
-        // it doesn't make sense to restart only while in the period we're suspended.
-        //
-        // Restarting too aggressively is also not good because it starves out any
-        // intermediate loading state. So we use heuristics to determine when.
-        // Suspense Heuristics
-        //
-        // If nothing threw a Promise or all the same fallbacks are already showing,
-        // then don't suspend/restart.
-        //
-        // If this is an initial render of a new tree of Suspense boundaries and
-        // those trigger a fallback, then don't suspend/restart. We want to ensure
-        // that we can show the initial loading state as quickly as possible.
-        //
-        // If we hit a "Delayed" case, such as when we'd switch from content back into
-        // a fallback, then we should always suspend/restart. Transitions apply
-        // to this case. If none is defined, JND is used instead.
-        //
-        // If we're already showing a fallback and it gets "retried", allowing us to show
-        // another level, but there's still an inner boundary that would show a fallback,
-        // then we suspend/restart for 500ms since the last time we showed a fallback
-        // anywhere in the tree. This effectively throttles progressive loading into a
-        // consistent train of commits. This also gives us an opportunity to restart to
-        // get to the completed state slightly earlier.
-        //
-        // If there's ambiguity due to batching it's resolved in preference of:
-        // 1) "delayed", 2) "initial render", 3) "retry".
-        //
-        // We want to ensure that a "busy" state doesn't get force committed. We want to
-        // ensure that new initial loading states can commit as soon as possible.
+    case HostPortal:
+      popHostContainer(workInProgress);
+      return null;
 
-        attachPingListener(root, wakeable, rootRenderLanes);
-        _workInProgress.flags |= ShouldCapture;
-        _workInProgress.lanes = rootRenderLanes;
-        return;
-      } // This boundary already captured during this render. Continue to the next
-      // boundary.
+    case ContextProvider:
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
+      return null;
 
-      _workInProgress = _workInProgress.return;
-    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
-    // TODO: Use invariant so the message is stripped in prod?
+    case OffscreenComponent:
+    case LegacyHiddenComponent:
+      popRenderLanes(workInProgress);
 
-    value = new Error(
-      (getComponentName(sourceFiber.type) || "A React component") +
-        " suspended while rendering, but no fallback UI was specified.\n" +
-        "\n" +
-        "Add a <Suspense fallback=...> component higher in the tree to " +
-        "provide a loading indicator or placeholder to display."
-    );
-  } // We didn't find a boundary that could handle this type of exception. Start
-  // over and traverse parent path again, this time treating the exception
-  // as an error.
+      return null;
 
-  renderDidError();
-  value = createCapturedValue(value, sourceFiber);
-  var workInProgress = returnFiber;
+    case CacheComponent:
+      return null;
 
-  do {
-    switch (workInProgress.tag) {
-      case HostRoot: {
-        var _errorInfo = value;
-        workInProgress.flags |= ShouldCapture;
-        var lane = pickArbitraryLane(rootRenderLanes);
-        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
+    default:
+      return null;
+  }
+}
 
-        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
+function unwindInterruptedWork(interruptedWork, renderLanes) {
+  switch (interruptedWork.tag) {
+    case ClassComponent: {
+      var childContextTypes = interruptedWork.type.childContextTypes;
 
-        enqueueCapturedUpdate(workInProgress, _update);
-        return;
+      if (childContextTypes !== null && childContextTypes !== undefined) {
+        popContext(interruptedWork);
       }
 
-      case ClassComponent:
-        // Capture and retry
-        var errorInfo = value;
-        var ctor = workInProgress.type;
-        var instance = workInProgress.stateNode;
+      break;
+    }
 
-        if (
-          (workInProgress.flags & DidCapture) === NoFlags &&
-          (typeof ctor.getDerivedStateFromError === "function" ||
-            (instance !== null &&
-              typeof instance.componentDidCatch === "function" &&
-              !isAlreadyFailedLegacyErrorBoundary(instance)))
-        ) {
-          workInProgress.flags |= ShouldCapture;
+    case HostRoot: {
+      popHostContainer(interruptedWork);
+      popTopLevelContextObject(interruptedWork);
+      resetWorkInProgressVersions();
+      break;
+    }
 
-          var _lane = pickArbitraryLane(rootRenderLanes);
+    case HostComponent: {
+      popHostContext(interruptedWork);
+      break;
+    }
 
-          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
+    case HostPortal:
+      popHostContainer(interruptedWork);
+      break;
 
-          var _update2 = createClassErrorUpdate(
-            workInProgress,
-            errorInfo,
-            _lane
-          );
+    case SuspenseComponent:
+      popSuspenseContext(interruptedWork);
+      break;
 
-          enqueueCapturedUpdate(workInProgress, _update2);
-          return;
-        }
+    case SuspenseListComponent:
+      popSuspenseContext(interruptedWork);
+      break;
 
-        break;
-    }
+    case ContextProvider:
+      var context = interruptedWork.type._context;
+      popProvider(context, interruptedWork);
+      break;
 
-    workInProgress = workInProgress.return;
-  } while (workInProgress !== null);
+    case OffscreenComponent:
+    case LegacyHiddenComponent:
+      popRenderLanes(interruptedWork);
+
+      break;
+  }
 }
 
 var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
 
 {
   didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
-}
-
+} // Used during the commit phase to track the state of the Offscreen component stack.
 var PossiblyWeakSet = typeof WeakSet === "function" ? WeakSet : Set;
+var nextEffect = null; // Used for Profiling builds to track updaters.
+
+var inProgressLanes = null;
+var inProgressRoot = null;
 
 var callComponentWillUnmountWithTimer = function(current, instance) {
   instance.props = current.memoizedProps;
   instance.state = current.memoizedState;
 
-  {
+  if (current.mode & ProfileMode) {
+    try {
+      startLayoutEffectTimer();
+      instance.componentWillUnmount();
+    } finally {
+      recordLayoutEffectDuration(current);
+    }
+  } else {
     instance.componentWillUnmount();
   }
-}; // Capture errors so they don't interrupt unmounting.
-
-function safelyCallComponentWillUnmount(current, instance) {
-  {
-    invokeGuardedCallback(
-      null,
-      callComponentWillUnmountWithTimer,
-      null,
-      current,
-      instance
-    );
+}; // Capture errors so they don't interrupt mounting.
 
-    if (hasCaughtError()) {
-      var unmountError = clearCaughtError();
-      captureCommitPhaseError(current, unmountError);
-    }
+function safelyCallComponentWillUnmount(
+  current,
+  nearestMountedAncestor,
+  instance
+) {
+  try {
+    callComponentWillUnmountWithTimer(current, instance);
+  } catch (unmountError) {
+    captureCommitPhaseError(current, nearestMountedAncestor, unmountError);
   }
-}
+} // Capture errors so they don't interrupt mounting.
 
-function safelyDetachRef(current) {
+function safelyDetachRef(current, nearestMountedAncestor) {
   var ref = current.ref;
 
   if (ref !== null) {
     if (typeof ref === "function") {
-      {
-        {
-          invokeGuardedCallback(null, ref, null, null);
+      try {
+        if (
+          enableProfilerTimer &&
+          enableProfilerCommitHooks &&
+          current.mode & ProfileMode
+        ) {
+          try {
+            startLayoutEffectTimer();
+            ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        } else {
+          ref(null);
         }
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
+      }
+    } else {
+      ref.current = null;
+    }
+  }
+}
+
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
+  try {
+    destroy();
+  } catch (error) {
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
+  }
+}
+
+var focusedInstanceHandle = null;
+var shouldFireAfterActiveInstanceBlur = false;
+function commitBeforeMutationEffects(root, firstChild) {
+  focusedInstanceHandle = prepareForCommit(root.containerInfo);
+  nextEffect = firstChild;
+  commitBeforeMutationEffects_begin(); // We no longer need to track the active instance fiber
+
+  var shouldFire = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = false;
+  focusedInstanceHandle = null;
+  return shouldFire;
+}
+
+function commitBeforeMutationEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // This phase is only used for beforeActiveInstanceBlur.
 
-        if (hasCaughtError()) {
-          var refError = clearCaughtError();
-          captureCommitPhaseError(current, refError);
-        }
-      }
+    var child = fiber.child;
+
+    if (
+      (fiber.subtreeFlags & BeforeMutationMask) !== NoFlags &&
+      child !== null
+    ) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
     } else {
-      ref.current = null;
+      commitBeforeMutationEffects_complete();
     }
   }
 }
 
-function safelyCallDestroy(current, destroy) {
-  {
-    invokeGuardedCallback(null, destroy, null);
+function commitBeforeMutationEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
 
-    if (hasCaughtError()) {
-      var error = clearCaughtError();
-      captureCommitPhaseError(current, error);
+    try {
+      commitBeforeMutationEffectsOnFiber(fiber);
+    } catch (error) {
+      captureCommitPhaseError(fiber, fiber.return, error);
     }
-  }
-}
 
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
       return;
     }
 
-    case ClassComponent: {
-      if (finishedWork.flags & Snapshot) {
+    nextEffect = fiber.return;
+  }
+}
+
+function commitBeforeMutationEffectsOnFiber(finishedWork) {
+  var current = finishedWork.alternate;
+  var flags = finishedWork.flags;
+
+  if ((flags & Snapshot) !== NoFlags) {
+    setCurrentFiber(finishedWork);
+
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        break;
+      }
+
+      case ClassComponent: {
         if (current !== null) {
           var prevProps = current.memoizedProps;
           var prevState = current.memoizedState;
@@ -16149,7 +16864,7 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
                     "This might either be because of a bug in React, or because " +
                     "a component reassigns its own `this.props`. " +
                     "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
+                  getComponentNameFromFiber(finishedWork) || "instance"
                 );
               }
 
@@ -16160,7 +16875,7 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
                     "This might either be because of a bug in React, or because " +
                     "a component reassigns its own `this.state`. " +
                     "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
+                  getComponentNameFromFiber(finishedWork) || "instance"
                 );
               }
             }
@@ -16182,38 +16897,46 @@ function commitBeforeMutationLifeCycles(current, finishedWork) {
               error(
                 "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
                   "must be returned. You have returned undefined.",
-                getComponentName(finishedWork.type)
+                getComponentNameFromFiber(finishedWork)
               );
             }
           }
 
           instance.__reactInternalSnapshotBeforeUpdate = snapshot;
         }
+
+        break;
       }
 
-      return;
-    }
+      case HostRoot: {
+        break;
+      }
 
-    case HostRoot: {
-      return;
-    }
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+      case IncompleteClassComponent:
+        // Nothing to do for these component types
+        break;
 
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case IncompleteClassComponent:
-      // Nothing to do for these component types
-      return;
-  }
+      default: {
+        {
+          throw Error(
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+        }
+      }
+    }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    resetCurrentFiber();
   }
 }
 
-function commitHookEffectListUnmount(tag, finishedWork) {
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
   var updateQueue = finishedWork.updateQueue;
   var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
 
@@ -16222,13 +16945,13 @@ function commitHookEffectListUnmount(tag, finishedWork) {
     var effect = firstEffect;
 
     do {
-      if ((effect.tag & tag) === tag) {
+      if ((effect.tag & flags) === flags) {
         // Unmount
         var destroy = effect.destroy;
         effect.destroy = undefined;
 
         if (destroy !== undefined) {
-          destroy();
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
         }
       }
 
@@ -16293,96 +17016,197 @@ function commitHookEffectListMount(tag, finishedWork) {
   }
 }
 
-function schedulePassiveEffects(finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function commitPassiveEffectDurations(finishedRoot, finishedWork) {
+  {
+    // Only Profilers with work in their subtree will have an Update effect scheduled.
+    if ((finishedWork.flags & Update) !== NoFlags) {
+      switch (finishedWork.tag) {
+        case Profiler: {
+          var passiveEffectDuration =
+            finishedWork.stateNode.passiveEffectDuration;
+          var _finishedWork$memoize = finishedWork.memoizedProps,
+            id = _finishedWork$memoize.id,
+            onPostCommit = _finishedWork$memoize.onPostCommit; // This value will still reflect the previous commit phase.
+          // It does not get reset until the start of the next commit phase.
+
+          var commitTime = getCommitTime();
+          var phase = finishedWork.alternate === null ? "mount" : "update";
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+          {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
 
-    do {
-      var _effect = effect,
-        next = _effect.next,
-        tag = _effect.tag;
+          if (typeof onPostCommit === "function") {
+            onPostCommit(id, phase, passiveEffectDuration, commitTime);
+          } // Bubble times to the next nearest ancestor Profiler.
+          // After we process that Profiler, we'll bubble further up.
 
-      if ((tag & Passive$1) !== NoFlags$1 && (tag & HasEffect) !== NoFlags$1) {
-        enqueuePendingPassiveHookEffectUnmount(finishedWork, effect);
-        enqueuePendingPassiveHookEffectMount(finishedWork, effect);
-      }
+          var parentFiber = finishedWork.return;
 
-      effect = next;
-    } while (effect !== firstEffect);
+          outer: while (parentFiber !== null) {
+            switch (parentFiber.tag) {
+              case HostRoot:
+                var root = parentFiber.stateNode;
+                root.passiveEffectDuration += passiveEffectDuration;
+                break outer;
+
+              case Profiler:
+                var parentStateNode = parentFiber.stateNode;
+                parentStateNode.passiveEffectDuration += passiveEffectDuration;
+                break outer;
+            }
+
+            parentFiber = parentFiber.return;
+          }
+
+          break;
+        }
+      }
+    }
   }
 }
 
-function commitLifeCycles(finishedRoot, current, finishedWork, committedLanes) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
-      // At this point layout effects have already been destroyed (during mutation phase).
-      // This is done to prevent sibling component effects from interfering with each other,
-      // e.g. a destroy function in one component should never override a ref set
-      // by a create function in another component during the same commit.
-      {
-        commitHookEffectListMount(Layout | HasEffect, finishedWork);
+function commitLayoutEffectOnFiber(
+  finishedRoot,
+  current,
+  finishedWork,
+  committedLanes
+) {
+  if ((finishedWork.flags & (Update | Callback)) !== NoFlags) {
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        // At this point layout effects have already been destroyed (during mutation phase).
+        // This is done to prevent sibling component effects from interfering with each other,
+        // e.g. a destroy function in one component should never override a ref set
+        // by a create function in another component during the same commit.
+        if (finishedWork.mode & ProfileMode) {
+          try {
+            startLayoutEffectTimer();
+            commitHookEffectListMount(Layout | HasEffect, finishedWork);
+          } finally {
+            recordLayoutEffectDuration(finishedWork);
+          }
+        } else {
+          commitHookEffectListMount(Layout | HasEffect, finishedWork);
+        }
+
+        break;
       }
 
-      schedulePassiveEffects(finishedWork);
-      return;
-    }
+      case ClassComponent: {
+        var instance = finishedWork.stateNode;
 
-    case ClassComponent: {
-      var instance = finishedWork.stateNode;
+        if (finishedWork.flags & Update) {
+          if (current === null) {
+            // We could update instance props and state here,
+            // but instead we rely on them being set during last render.
+            // TODO: revisit this when we implement resuming.
+            {
+              if (
+                finishedWork.type === finishedWork.elementType &&
+                !didWarnAboutReassigningProps
+              ) {
+                if (instance.props !== finishedWork.memoizedProps) {
+                  error(
+                    "Expected %s props to match memoized props before " +
+                      "componentDidMount. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.props`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
 
-      if (finishedWork.flags & Update) {
-        if (current === null) {
-          // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
+                if (instance.state !== finishedWork.memoizedState) {
+                  error(
+                    "Expected %s state to match memoized state before " +
+                      "componentDidMount. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.state`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
               }
+            }
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
+            if (finishedWork.mode & ProfileMode) {
+              try {
+                startLayoutEffectTimer();
+                instance.componentDidMount();
+              } finally {
+                recordLayoutEffectDuration(finishedWork);
+              }
+            } else {
+              instance.componentDidMount();
+            }
+          } else {
+            var prevProps =
+              finishedWork.elementType === finishedWork.type
+                ? current.memoizedProps
+                : resolveDefaultProps(finishedWork.type, current.memoizedProps);
+            var prevState = current.memoizedState; // We could update instance props and state here,
+            // but instead we rely on them being set during last render.
+            // TODO: revisit this when we implement resuming.
+
+            {
+              if (
+                finishedWork.type === finishedWork.elementType &&
+                !didWarnAboutReassigningProps
+              ) {
+                if (instance.props !== finishedWork.memoizedProps) {
+                  error(
+                    "Expected %s props to match memoized props before " +
+                      "componentDidUpdate. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.props`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
+
+                if (instance.state !== finishedWork.memoizedState) {
+                  error(
+                    "Expected %s state to match memoized state before " +
+                      "componentDidUpdate. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.state`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
+              }
+            }
+
+            if (finishedWork.mode & ProfileMode) {
+              try {
+                startLayoutEffectTimer();
+                instance.componentDidUpdate(
+                  prevProps,
+                  prevState,
+                  instance.__reactInternalSnapshotBeforeUpdate
                 );
+              } finally {
+                recordLayoutEffectDuration(finishedWork);
               }
+            } else {
+              instance.componentDidUpdate(
+                prevProps,
+                prevState,
+                instance.__reactInternalSnapshotBeforeUpdate
+              );
             }
           }
+        } // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
 
-          {
-            instance.componentDidMount();
-          }
-        } else {
-          var prevProps =
-            finishedWork.elementType === finishedWork.type
-              ? current.memoizedProps
-              : resolveDefaultProps(finishedWork.type, current.memoizedProps);
-          var prevState = current.memoizedState; // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
+        var updateQueue = finishedWork.updateQueue;
 
+        if (updateQueue !== null) {
           {
             if (
               finishedWork.type === finishedWork.elementType &&
@@ -16391,172 +17215,173 @@ function commitLifeCycles(finishedRoot, current, finishedWork, committedLanes) {
               if (instance.props !== finishedWork.memoizedProps) {
                 error(
                   "Expected %s props to match memoized props before " +
-                    "componentDidUpdate. " +
+                    "processing the update queue. " +
                     "This might either be because of a bug in React, or because " +
                     "a component reassigns its own `this.props`. " +
                     "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
+                  getComponentNameFromFiber(finishedWork) || "instance"
                 );
               }
 
               if (instance.state !== finishedWork.memoizedState) {
                 error(
                   "Expected %s state to match memoized state before " +
-                    "componentDidUpdate. " +
+                    "processing the update queue. " +
                     "This might either be because of a bug in React, or because " +
                     "a component reassigns its own `this.state`. " +
                     "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
+                  getComponentNameFromFiber(finishedWork) || "instance"
                 );
               }
             }
-          }
+          } // We could update instance props and state here,
+          // but instead we rely on them being set during last render.
+          // TODO: revisit this when we implement resuming.
 
-          {
-            instance.componentDidUpdate(
-              prevProps,
-              prevState,
-              instance.__reactInternalSnapshotBeforeUpdate
-            );
-          }
+          commitUpdateQueue(finishedWork, updateQueue, instance);
         }
-      } // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
-
-      var updateQueue = finishedWork.updateQueue;
 
-      if (updateQueue !== null) {
-        {
-          if (
-            finishedWork.type === finishedWork.elementType &&
-            !didWarnAboutReassigningProps
-          ) {
-            if (instance.props !== finishedWork.memoizedProps) {
-              error(
-                "Expected %s props to match memoized props before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.props`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
-            }
+        break;
+      }
 
-            if (instance.state !== finishedWork.memoizedState) {
-              error(
-                "Expected %s state to match memoized state before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.state`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
+      case HostRoot: {
+        // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
+        var _updateQueue = finishedWork.updateQueue;
+
+        if (_updateQueue !== null) {
+          var _instance = null;
+
+          if (finishedWork.child !== null) {
+            switch (finishedWork.child.tag) {
+              case HostComponent:
+                _instance = getPublicInstance(finishedWork.child.stateNode);
+                break;
+
+              case ClassComponent:
+                _instance = finishedWork.child.stateNode;
+                break;
             }
           }
-        } // We could update instance props and state here,
-        // but instead we rely on them being set during last render.
-        // TODO: revisit this when we implement resuming.
-
-        commitUpdateQueue(finishedWork, updateQueue, instance);
-      }
-
-      return;
-    }
-
-    case HostRoot: {
-      // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
-      var _updateQueue = finishedWork.updateQueue;
-
-      if (_updateQueue !== null) {
-        var _instance = null;
-
-        if (finishedWork.child !== null) {
-          switch (finishedWork.child.tag) {
-            case HostComponent:
-              _instance = getPublicInstance(finishedWork.child.stateNode);
-              break;
 
-            case ClassComponent:
-              _instance = finishedWork.child.stateNode;
-              break;
-          }
+          commitUpdateQueue(finishedWork, _updateQueue, _instance);
         }
 
-        commitUpdateQueue(finishedWork, _updateQueue, _instance);
+        break;
       }
 
-      return;
-    }
+      case HostComponent: {
+        var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
+        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
+        // These effects should only be committed when components are first mounted,
+        // aka when there is no current/alternate.
 
-    case HostComponent: {
-      var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
-      // (eg DOM renderer may schedule auto-focus for inputs and form controls).
-      // These effects should only be committed when components are first mounted,
-      // aka when there is no current/alternate.
+        if (current === null && finishedWork.flags & Update) {
+          var type = finishedWork.type;
+          var props = finishedWork.memoizedProps;
+          commitMount();
+        }
 
-      if (current === null && finishedWork.flags & Update) {
-        var type = finishedWork.type;
-        var props = finishedWork.memoizedProps;
-        commitMount();
+        break;
       }
 
-      return;
-    }
-
-    case HostText: {
-      // We have no life-cycles associated with text.
-      return;
-    }
+      case HostText: {
+        // We have no life-cycles associated with text.
+        break;
+      }
 
-    case HostPortal: {
-      // We have no life-cycles associated with portals.
-      return;
-    }
+      case HostPortal: {
+        // We have no life-cycles associated with portals.
+        break;
+      }
 
-    case Profiler: {
-      {
-        var _finishedWork$memoize2 = finishedWork.memoizedProps,
-          onCommit = _finishedWork$memoize2.onCommit,
-          onRender = _finishedWork$memoize2.onRender;
-        var effectDuration = finishedWork.stateNode.effectDuration;
-        var commitTime = getCommitTime();
+      case Profiler: {
+        {
+          var _finishedWork$memoize2 = finishedWork.memoizedProps,
+            onCommit = _finishedWork$memoize2.onCommit,
+            onRender = _finishedWork$memoize2.onRender;
+          var effectDuration = finishedWork.stateNode.effectDuration;
+          var commitTime = getCommitTime();
+          var phase = current === null ? "mount" : "update";
 
-        if (typeof onRender === "function") {
           {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
+
+          if (typeof onRender === "function") {
             onRender(
               finishedWork.memoizedProps.id,
-              current === null ? "mount" : "update",
+              phase,
               finishedWork.actualDuration,
               finishedWork.treeBaseDuration,
               finishedWork.actualStartTime,
-              commitTime,
-              finishedRoot.memoizedInteractions
+              commitTime
             );
           }
+
+          {
+            if (typeof onCommit === "function") {
+              onCommit(
+                finishedWork.memoizedProps.id,
+                phase,
+                effectDuration,
+                commitTime
+              );
+            } // Schedule a passive effect for this Profiler to call onPostCommit hooks.
+            // This effect should be scheduled even if there is no onPostCommit callback for this Profiler,
+            // because the effect is also where times bubble to parent Profilers.
+
+            enqueuePendingPassiveProfilerEffect(finishedWork); // Propagate layout effect durations to the next nearest Profiler ancestor.
+            // Do not reset these values until the next render so DevTools has a chance to read them first.
+
+            var parentFiber = finishedWork.return;
+
+            outer: while (parentFiber !== null) {
+              switch (parentFiber.tag) {
+                case HostRoot:
+                  var root = parentFiber.stateNode;
+                  root.effectDuration += effectDuration;
+                  break outer;
+
+                case Profiler:
+                  var parentStateNode = parentFiber.stateNode;
+                  parentStateNode.effectDuration += effectDuration;
+                  break outer;
+              }
+
+              parentFiber = parentFiber.return;
+            }
+          }
         }
+
+        break;
       }
 
-      return;
-    }
+      case SuspenseComponent: {
+        break;
+      }
 
-    case SuspenseComponent: {
-      return;
-    }
+      case SuspenseListComponent:
+      case IncompleteClassComponent:
+      case ScopeComponent:
+      case OffscreenComponent:
+      case LegacyHiddenComponent:
+        break;
 
-    case SuspenseListComponent:
-    case IncompleteClassComponent:
-    case FundamentalComponent:
-    case ScopeComponent:
-    case OffscreenComponent:
-    case LegacyHiddenComponent:
-      return;
+      default: {
+        throw Error(
+          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+    }
   }
 
   {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    if (finishedWork.flags & Ref) {
+      commitAttachRef(finishedWork);
+    }
   }
 }
 
@@ -16577,7 +17402,14 @@ function commitAttachRef(finishedWork) {
     } // Moved outside to ensure DCE works with this flag
 
     if (typeof ref === "function") {
-      {
+      if (finishedWork.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          ref(instanceToUse);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
+        }
+      } else {
         ref(instanceToUse);
       }
     } else {
@@ -16586,7 +17418,7 @@ function commitAttachRef(finishedWork) {
           error(
             "Unexpected ref object provided for %s. " +
               "Use either a ref-setter function or React.createRef().",
-            getComponentName(finishedWork.type)
+            getComponentNameFromFiber(finishedWork)
           );
         }
       }
@@ -16601,7 +17433,14 @@ function commitDetachRef(current) {
 
   if (currentRef !== null) {
     if (typeof currentRef === "function") {
-      {
+      if (current.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          currentRef(null);
+        } finally {
+          recordLayoutEffectDuration(current);
+        }
+      } else {
         currentRef(null);
       }
     } else {
@@ -16612,15 +17451,14 @@ function commitDetachRef(current) {
 // deletion, so don't let them throw. Host-originating errors should
 // interrupt deletion, so it's okay
 
-function commitUnmount(finishedRoot, current, renderPriorityLevel) {
+function commitUnmount(finishedRoot, current, nearestMountedAncestor) {
   onCommitUnmount(current);
 
   switch (current.tag) {
     case FunctionComponent:
     case ForwardRef:
     case MemoComponent:
-    case SimpleMemoComponent:
-    case Block: {
+    case SimpleMemoComponent: {
       var updateQueue = current.updateQueue;
 
       if (updateQueue !== null) {
@@ -16631,16 +17469,18 @@ function commitUnmount(finishedRoot, current, renderPriorityLevel) {
           var effect = firstEffect;
 
           do {
-            var _effect2 = effect,
-              destroy = _effect2.destroy,
-              tag = _effect2.tag;
+            var _effect = effect,
+              destroy = _effect.destroy,
+              tag = _effect.tag;
 
             if (destroy !== undefined) {
-              if ((tag & Passive$1) !== NoFlags$1) {
-                enqueuePendingPassiveHookEffectUnmount(current, effect);
-              } else {
-                {
-                  safelyCallDestroy(current, destroy);
+              if ((tag & Layout) !== NoFlags$1) {
+                if (current.mode & ProfileMode) {
+                  startLayoutEffectTimer();
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
+                  recordLayoutEffectDuration(current);
+                } else {
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
                 }
               }
             }
@@ -16654,18 +17494,22 @@ function commitUnmount(finishedRoot, current, renderPriorityLevel) {
     }
 
     case ClassComponent: {
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor);
       var instance = current.stateNode;
 
       if (typeof instance.componentWillUnmount === "function") {
-        safelyCallComponentWillUnmount(current, instance);
+        safelyCallComponentWillUnmount(
+          current,
+          nearestMountedAncestor,
+          instance
+        );
       }
 
       return;
     }
 
     case HostComponent: {
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor);
       return;
     }
 
@@ -16680,10 +17524,6 @@ function commitUnmount(finishedRoot, current, renderPriorityLevel) {
       return;
     }
 
-    case FundamentalComponent: {
-      return;
-    }
-
     case DehydratedFragment: {
       return;
     }
@@ -16694,7 +17534,7 @@ function commitUnmount(finishedRoot, current, renderPriorityLevel) {
   }
 }
 
-function commitNestedUnmounts(finishedRoot, root, renderPriorityLevel) {
+function commitNestedUnmounts(finishedRoot, root, nearestMountedAncestor) {
   // While we're inside a removed host node we don't want to call
   // removeChild on the inner nodes because they're removed by the top
   // call anyway. We also want to call componentWillUnmount on all
@@ -16703,7 +17543,7 @@ function commitNestedUnmounts(finishedRoot, root, renderPriorityLevel) {
   var node = root;
 
   while (true) {
-    commitUnmount(finishedRoot, node); // Visit children because they may contain more composite or host nodes.
+    commitUnmount(finishedRoot, node, nearestMountedAncestor); // Visit children because they may contain more composite or host nodes.
     // Skip portals because commitUnmount() currently visits them recursively.
 
     if (
@@ -16734,32 +17574,85 @@ function commitNestedUnmounts(finishedRoot, root, renderPriorityLevel) {
 }
 
 function detachFiberMutation(fiber) {
-  // Cut off the return pointers to disconnect it from the tree. Ideally, we
-  // should clear the child pointer of the parent alternate to let this
+  // Cut off the return pointer to disconnect it from the tree.
+  // This enables us to detect and warn against state updates on an unmounted component.
+  // It also prevents events from bubbling from within disconnected components.
+  //
+  // Ideally, we should also clear the child pointer of the parent alternate to let this
   // get GC:ed but we don't know which for sure which parent is the current
-  // one so we'll settle for GC:ing the subtree of this child. This child
-  // itself will be GC:ed when the parent updates the next time.
-  // Note: we cannot null out sibling here, otherwise it can cause issues
-  // with findDOMNode and how it requires the sibling field to carry out
-  // traversal in a later effect. See PR #16820. We now clear the sibling
-  // field after effects, see: detachFiberAfterEffects.
+  // one so we'll settle for GC:ing the subtree of this child.
+  // This child itself will be GC:ed when the parent updates the next time.
   //
-  // Don't disconnect stateNode now; it will be detached in detachFiberAfterEffects.
-  // It may be required if the current component is an error boundary,
-  // and one of its descendants throws while unmounting a passive effect.
-  fiber.alternate = null;
-  fiber.child = null;
-  fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
-  fiber.memoizedProps = null;
-  fiber.memoizedState = null;
-  fiber.pendingProps = null;
+  // Note that we can't clear child or sibling pointers yet.
+  // They're needed for passive effects and for findDOMNode.
+  // We defer those fields, and all other cleanup, to the passive phase (see detachFiberAfterEffects).
+  //
+  // Don't reset the alternate yet, either. We need that so we can detach the
+  // alternate's fields in the passive phase. Clearing the return pointer is
+  // sufficient for findDOMNode semantics.
+  var alternate = fiber.alternate;
+
+  if (alternate !== null) {
+    alternate.return = null;
+  }
+
   fiber.return = null;
-  fiber.updateQueue = null;
+}
+
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+
+  if (alternate !== null) {
+    fiber.alternate = null;
+    detachFiberAfterEffects(alternate);
+  } // Note: Defensively using negation instead of < in case
+  // `deletedTreeCleanUpLevel` is undefined.
 
   {
-    fiber._debugOwner = null;
+    // Clear cyclical Fiber fields. This level alone is designed to roughly
+    // approximate the planned Fiber refactor. In that world, `setState` will be
+    // bound to a special "instance" object instead of a Fiber. The Instance
+    // object will not have any of these fields. It will only be connected to
+    // the fiber tree via a single link at the root. So if this level alone is
+    // sufficient to fix memory issues, that bodes well for our plans.
+    fiber.child = null;
+    fiber.deletions = null;
+    fiber.sibling = null; // The `stateNode` is cyclical because on host nodes it points to the host
+    // tree, which has its own pointers to children, parents, and siblings.
+    // The other host nodes also point back to fibers, so we should detach that
+    // one, too.
+
+    if (fiber.tag === HostComponent) {
+      var hostInstance = fiber.stateNode;
+    }
+
+    fiber.stateNode = null; // I'm intentionally not clearing the `return` field in this level. We
+    // already disconnect the `return` pointer at the root of the deleted
+    // subtree (in `detachFiberMutation`). Besides, `return` by itself is not
+    // cyclical — it's only cyclical when combined with `child`, `sibling`, and
+    // `alternate`. But we'll clear it in the next level anyway, just in case.
+
+    {
+      fiber._debugOwner = null;
+    }
+
+    {
+      // Theoretically, nothing in here should be necessary, because we already
+      // disconnected the fiber from the tree. So even if something leaks this
+      // particular fiber, it won't leak anything else
+      //
+      // The purpose of this branch is to be super aggressive so we can measure
+      // if there's any difference in memory impact. If there is, that could
+      // indicate a React leak we don't know about.
+      fiber.return = null;
+      fiber.dependencies = null;
+      fiber.memoizedProps = null;
+      fiber.memoizedState = null;
+      fiber.pendingProps = null;
+      fiber.stateNode = null; // TODO: Move to `commitPassiveUnmountInsideDeletedTreeOnFiber` instead.
+
+      fiber.updateQueue = null;
+    }
   }
 }
 
@@ -16773,8 +17666,7 @@ function commitContainer(finishedWork) {
   switch (finishedWork.tag) {
     case ClassComponent:
     case HostComponent:
-    case HostText:
-    case FundamentalComponent: {
+    case HostText: {
       return;
     }
 
@@ -16794,123 +17686,587 @@ function commitContainer(finishedWork) {
   }
 }
 
-function commitDeletion(finishedRoot, current, renderPriorityLevel) {
+function commitDeletion(finishedRoot, current, nearestMountedAncestor) {
   {
     // Detach refs and call componentWillUnmount() on the whole subtree.
-    commitNestedUnmounts(finishedRoot, current);
+    commitNestedUnmounts(finishedRoot, current, nearestMountedAncestor);
   }
 
-  var alternate = current.alternate;
   detachFiberMutation(current);
+}
+
+function commitWork(current, finishedWork) {
+  {
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case MemoComponent:
+      case SimpleMemoComponent: {
+        // Layout effects are destroyed during the mutation phase so that all
+        // destroy functions for all fibers are called before any create functions.
+        // This prevents sibling component effects from interfering with each other,
+        // e.g. a destroy function in one component should never override a ref set
+        // by a create function in another component during the same commit.
+        if (finishedWork.mode & ProfileMode) {
+          try {
+            startLayoutEffectTimer();
+            commitHookEffectListUnmount(
+              Layout | HasEffect,
+              finishedWork,
+              finishedWork.return
+            );
+          } finally {
+            recordLayoutEffectDuration(finishedWork);
+          }
+        } else {
+          commitHookEffectListUnmount(
+            Layout | HasEffect,
+            finishedWork,
+            finishedWork.return
+          );
+        }
+
+        return;
+      }
+
+      case Profiler: {
+        return;
+      }
+
+      case SuspenseComponent: {
+        commitSuspenseComponent(finishedWork);
+        attachSuspenseRetryListeners(finishedWork);
+        return;
+      }
+
+      case SuspenseListComponent: {
+        attachSuspenseRetryListeners(finishedWork);
+        return;
+      }
+
+      case HostRoot: {
+        break;
+      }
+
+      case OffscreenComponent:
+      case LegacyHiddenComponent: {
+        return;
+      }
+    }
+
+    commitContainer(finishedWork);
+    return;
+  }
+}
+
+function commitSuspenseComponent(finishedWork) {
+  var newState = finishedWork.memoizedState;
+
+  if (newState !== null) {
+    markCommitTimeOfFallback();
+  }
+}
+
+function attachSuspenseRetryListeners(finishedWork) {
+  // If this boundary just timed out, then it will have a set of wakeables.
+  // For each wakeable, attach a listener so that when it resolves, React
+  // attempts to re-render the boundary in the primary (pre-timeout) state.
+  var wakeables = finishedWork.updateQueue;
+
+  if (wakeables !== null) {
+    finishedWork.updateQueue = null;
+    var retryCache = finishedWork.stateNode;
+
+    if (retryCache === null) {
+      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
+    }
+
+    wakeables.forEach(function(wakeable) {
+      // Memoize using the boundary fiber to prevent redundant listeners.
+      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
+
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
+
+        {
+          if (isDevToolsPresent) {
+            if (inProgressLanes !== null && inProgressRoot !== null) {
+              // If we have pending work still, associate the original updaters with it.
+              restorePendingUpdaters(inProgressRoot, inProgressLanes);
+            } else {
+              throw Error(
+                "Expected finished root and lanes to be set. This is a bug in React."
+              );
+            }
+          }
+        }
+
+        wakeable.then(retry, retry);
+      }
+    });
+  }
+} // This function detects when a Suspense boundary goes from visible to hidden.
+
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = firstChild;
+  commitMutationEffects_begin(root);
+  inProgressLanes = null;
+  inProgressRoot = null;
+}
+
+function commitMutationEffects_begin(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // TODO: Should wrap this in flags check, too, as optimization
+
+    var deletions = fiber.deletions;
+
+    if (deletions !== null) {
+      for (var i = 0; i < deletions.length; i++) {
+        var childToDelete = deletions[i];
+
+        try {
+          commitDeletion(root, childToDelete, fiber);
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, fiber, error);
+        }
+      }
+    }
+
+    var child = fiber.child;
+
+    if ((fiber.subtreeFlags & MutationMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitMutationEffects_complete(root);
+    }
+  }
+}
+
+function commitMutationEffects_complete(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
+
+    try {
+      commitMutationEffectsOnFiber(fiber, root);
+    } catch (error) {
+      captureCommitPhaseError(fiber, fiber.return, error);
+    }
+
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
+
+    nextEffect = fiber.return;
+  }
+}
+
+function commitMutationEffectsOnFiber(finishedWork, root) {
+  var flags = finishedWork.flags;
+
+  if (flags & Ref) {
+    var current = finishedWork.alternate;
+
+    if (current !== null) {
+      commitDetachRef(current);
+    }
+  } // The following switch statement is only concerned about placement,
+  // updates, and deletions. To avoid needing to add a case for every possible
+  // bitmap value, we remove the secondary effects from the effect tag and
+  // switch on that value.
+
+  var primaryFlags = flags & (Placement | Update | Hydrating);
+
+  switch (primaryFlags) {
+    case Placement: {
+      // inserted, before any life-cycles like componentDidMount gets called.
+      // TODO: findDOMNode doesn't rely on this any more but isMounted does
+      // and isMounted is deprecated anyway so we should be able to kill this.
+
+      finishedWork.flags &= ~Placement;
+      break;
+    }
+
+    case PlacementAndUpdate: {
+      // inserted, before any life-cycles like componentDidMount gets called.
+
+      finishedWork.flags &= ~Placement; // Update
+
+      var _current = finishedWork.alternate;
+      commitWork(_current, finishedWork);
+      break;
+    }
+
+    case Hydrating: {
+      finishedWork.flags &= ~Hydrating;
+      break;
+    }
+
+    case HydratingAndUpdate: {
+      finishedWork.flags &= ~Hydrating; // Update
+
+      var _current2 = finishedWork.alternate;
+      commitWork(_current2, finishedWork);
+      break;
+    }
+
+    case Update: {
+      var _current3 = finishedWork.alternate;
+      commitWork(_current3, finishedWork);
+      break;
+    }
+  }
+}
+
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = finishedWork;
+  commitLayoutEffects_begin(finishedWork, root, committedLanes);
+  inProgressLanes = null;
+  inProgressRoot = null;
+}
+
+function commitLayoutEffects_begin(subtreeRoot, root, committedLanes) {
+  // Suspense layout effects semantics don't change for legacy roots.
+  var isModernRoot = (subtreeRoot.mode & ConcurrentMode) !== NoMode;
+
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
+
+    if ((fiber.subtreeFlags & LayoutMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
+    } else {
+      commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes);
+    }
+  }
+}
+
+function commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes) {
+  // Suspense layout effects semantics don't change for legacy roots.
+  var isModernRoot = (subtreeRoot.mode & ConcurrentMode) !== NoMode;
+
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+
+    if ((fiber.flags & LayoutMask) !== NoFlags) {
+      var current = fiber.alternate;
+      setCurrentFiber(fiber);
+
+      try {
+        commitLayoutEffectOnFiber(root, current, fiber, committedLanes);
+      } catch (error) {
+        captureCommitPhaseError(fiber, fiber.return, error);
+      }
+
+      resetCurrentFiber();
+    }
+
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
+      return;
+    }
+
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
+
+    nextEffect = fiber.return;
+  }
+}
+
+function commitPassiveMountEffects(root, finishedWork) {
+  nextEffect = finishedWork;
+  commitPassiveMountEffects_begin(finishedWork, root);
+}
+
+function commitPassiveMountEffects_begin(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
+
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
+    } else {
+      commitPassiveMountEffects_complete(subtreeRoot, root);
+    }
+  }
+}
+
+function commitPassiveMountEffects_complete(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+
+      try {
+        commitPassiveMountOnFiber(root, fiber);
+      } catch (error) {
+        captureCommitPhaseError(fiber, fiber.return, error);
+      }
+
+      resetCurrentFiber();
+    }
+
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
+      return;
+    }
+
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
+
+    nextEffect = fiber.return;
+  }
+}
+
+function commitPassiveMountOnFiber(finishedRoot, finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
+
+        try {
+          commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
+        } finally {
+          recordPassiveEffectDuration(finishedWork);
+        }
+      } else {
+        commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
+      }
 
-  if (alternate !== null) {
-    detachFiberMutation(alternate);
+      break;
+    }
   }
 }
 
-function commitWork(current, finishedWork) {
-  {
-    switch (finishedWork.tag) {
-      case FunctionComponent:
-      case ForwardRef:
-      case MemoComponent:
-      case SimpleMemoComponent:
-      case Block: {
-        // Layout effects are destroyed during the mutation phase so that all
-        // destroy functions for all fibers are called before any create functions.
-        // This prevents sibling component effects from interfering with each other,
-        // e.g. a destroy function in one component should never override a ref set
-        // by a create function in another component during the same commit.
+function commitPassiveUnmountEffects(firstChild) {
+  nextEffect = firstChild;
+  commitPassiveUnmountEffects_begin();
+}
+
+function commitPassiveUnmountEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var child = fiber.child;
+
+    if ((nextEffect.flags & ChildDeletion) !== NoFlags) {
+      var deletions = fiber.deletions;
+
+      if (deletions !== null) {
+        for (var i = 0; i < deletions.length; i++) {
+          var fiberToDelete = deletions[i];
+          nextEffect = fiberToDelete;
+          commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+            fiberToDelete,
+            fiber
+          );
+        }
+
         {
-          commitHookEffectListUnmount(Layout | HasEffect, finishedWork);
+          // A fiber was deleted from this parent fiber, but it's still part of
+          // the previous (alternate) parent fiber's list of children. Because
+          // children are a linked list, an earlier sibling that's still alive
+          // will be connected to the deleted fiber via its `alternate`:
+          //
+          //   live fiber
+          //   --alternate--> previous live fiber
+          //   --sibling--> deleted fiber
+          //
+          // We can't disconnect `alternate` on nodes that haven't been deleted
+          // yet, but we can disconnect the `sibling` and `child` pointers.
+          var previousFiber = fiber.alternate;
+
+          if (previousFiber !== null) {
+            var detachedChild = previousFiber.child;
+
+            if (detachedChild !== null) {
+              previousFiber.child = null;
+
+              do {
+                var detachedSibling = detachedChild.sibling;
+                detachedChild.sibling = null;
+                detachedChild = detachedSibling;
+              } while (detachedChild !== null);
+            }
+          }
         }
 
-        return;
+        nextEffect = fiber;
       }
+    }
 
-      case Profiler: {
-        return;
-      }
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffects_complete();
+    }
+  }
+}
 
-      case SuspenseComponent: {
-        commitSuspenseComponent(finishedWork);
-        attachSuspenseRetryListeners(finishedWork);
-        return;
-      }
+function commitPassiveUnmountEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
 
-      case SuspenseListComponent: {
-        attachSuspenseRetryListeners(finishedWork);
-        return;
-      }
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+      commitPassiveUnmountOnFiber(fiber);
+      resetCurrentFiber();
+    }
 
-      case HostRoot: {
-        break;
-      }
+    var sibling = fiber.sibling;
 
-      case OffscreenComponent:
-      case LegacyHiddenComponent: {
-        return;
-      }
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
     }
 
-    commitContainer(finishedWork);
-    return;
+    nextEffect = fiber.return;
   }
 }
 
-function commitSuspenseComponent(finishedWork) {
-  var newState = finishedWork.memoizedState;
+function commitPassiveUnmountOnFiber(finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
+        recordPassiveEffectDuration(finishedWork);
+      } else {
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
+      }
 
-  if (newState !== null) {
-    markCommitTimeOfFallback();
+      break;
+    }
   }
 }
 
-function attachSuspenseRetryListeners(finishedWork) {
-  // If this boundary just timed out, then it will have a set of wakeables.
-  // For each wakeable, attach a listener so that when it resolves, React
-  // attempts to re-render the boundary in the primary (pre-timeout) state.
-  var wakeables = finishedWork.updateQueue;
+function commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+  deletedSubtreeRoot,
+  nearestMountedAncestor
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // Deletion effects fire in parent -> child order
+    // TODO: Check if fiber has a PassiveStatic flag
 
-  if (wakeables !== null) {
-    finishedWork.updateQueue = null;
-    var retryCache = finishedWork.stateNode;
+    setCurrentFiber(fiber);
+    commitPassiveUnmountInsideDeletedTreeOnFiber(fiber, nearestMountedAncestor);
+    resetCurrentFiber();
+    var child = fiber.child; // TODO: Only traverse subtree if it has a PassiveStatic flag. (But, if we
+    // do this, still need to handle `deletedTreeCleanUpLevel` correctly.)
 
-    if (retryCache === null) {
-      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
+    if (child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+        deletedSubtreeRoot
+      );
     }
+  }
+}
 
-    wakeables.forEach(function(wakeable) {
-      // Memoize using the boundary fiber to prevent redundant listeners.
-      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
+function commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+  deletedSubtreeRoot
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var sibling = fiber.sibling;
+    var returnFiber = fiber.return;
 
-      if (!retryCache.has(wakeable)) {
-        {
-          if (wakeable.__reactDoNotTraceInteractions !== true) {
-            retry = tracing.unstable_wrap(retry);
-          }
-        }
+    {
+      // Recursively traverse the entire deleted tree and clean up fiber fields.
+      // This is more aggressive than ideal, and the long term goal is to only
+      // have to detach the deleted tree at the root.
+      detachFiberAfterEffects(fiber);
 
-        retryCache.add(wakeable);
-        wakeable.then(retry, retry);
+      if (fiber === deletedSubtreeRoot) {
+        nextEffect = null;
+        return;
       }
-    });
+    }
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, returnFiber);
+      nextEffect = sibling;
+      return;
+    }
+
+    nextEffect = returnFiber;
   }
-} // This function detects when a Suspense boundary goes from visible to hidden.
-// It returns false if the boundary is already hidden.
-// TODO: Use an effect tag.
+}
 
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  if (current !== null) {
-    var oldState = current.memoizedState;
+function commitPassiveUnmountInsideDeletedTreeOnFiber(
+  current,
+  nearestMountedAncestor
+) {
+  switch (current.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (current.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+        recordPassiveEffectDuration(current);
+      } else {
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+      }
 
-    if (oldState === null || oldState.dehydrated !== null) {
-      var newState = finishedWork.memoizedState;
-      return newState !== null && newState.dehydrated === null;
+      break;
     }
   }
+}
 
-  return false;
+var didWarnWrongReturnPointer = false;
+
+function ensureCorrectReturnPointer(fiber, expectedReturnFiber) {
+  {
+    if (!didWarnWrongReturnPointer && fiber.return !== expectedReturnFiber) {
+      didWarnWrongReturnPointer = true;
+
+      error(
+        "Internal React error: Return pointer is inconsistent " + "with parent."
+      );
+    }
+  } // TODO: Remove this assignment once we're confident that it won't break
+  // anything, by checking the warning logs for the above invariant
+
+  fiber.return = expectedReturnFiber;
 }
 
 var COMPONENT_TYPE = 0;
@@ -16931,6 +18287,7 @@ if (typeof Symbol === "function" && Symbol.for) {
 var ceil = Math.ceil;
 var ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   IsSomeRendererActing = ReactSharedInternals.IsSomeRendererActing;
 var NoContext =
   /*             */
@@ -16938,21 +18295,18 @@ var NoContext =
 var BatchedContext =
   /*               */
   1;
-var DiscreteEventContext =
-  /*         */
-  4;
 var LegacyUnbatchedContext =
   /*       */
-  8;
+  4;
 var RenderContext =
   /*                */
-  16;
+  8;
 var CommitContext =
   /*                */
-  32;
+  16;
 var RetryAfterError =
   /*       */
-  64;
+  32;
 var RootIncomplete = 0;
 var RootFatalErrored = 1;
 var RootErrored = 2;
@@ -16992,8 +18346,7 @@ var workInProgressRootSkippedLanes = NoLanes; // Lanes that were updated (in an
 
 var workInProgressRootUpdatedLanes = NoLanes; // Lanes that were pinged (in an interleaved event) during this render.
 
-var workInProgressRootPingedLanes = NoLanes;
-var mostRecentlyUpdatedRoot = null; // The most recent time we committed a fallback. This lets us ensure a train
+var workInProgressRootPingedLanes = NoLanes; // The most recent time we committed a fallback. This lets us ensure a train
 // model where we don't commit new loading states in too quick succession.
 
 var globalMostRecentFallbackTime = 0;
@@ -17012,40 +18365,27 @@ function resetRenderTimer() {
 function getRenderTargetTime() {
   return workInProgressRootRenderTargetTime;
 }
-var nextEffect = null;
 var hasUncaughtError = false;
 var firstUncaughtError = null;
-var legacyErrorBoundariesThatAlreadyFailed = null;
+var legacyErrorBoundariesThatAlreadyFailed = null; // Only used when enableProfilerNestedUpdateScheduledHook is true;
 var rootDoesHavePassiveEffects = false;
 var rootWithPendingPassiveEffects = null;
-var pendingPassiveEffectsRenderPriority = NoPriority$1;
 var pendingPassiveEffectsLanes = NoLanes;
-var pendingPassiveHookEffectsMount = [];
-var pendingPassiveHookEffectsUnmount = [];
-var rootsWithPendingDiscreteUpdates = null; // Use these to prevent an infinite loop of nested updates
+var pendingPassiveProfilerEffects = []; // Use these to prevent an infinite loop of nested updates
 
 var NESTED_UPDATE_LIMIT = 50;
 var nestedUpdateCount = 0;
 var rootWithNestedUpdates = null;
 var NESTED_PASSIVE_UPDATE_LIMIT = 50;
-var nestedPassiveUpdateCount = 0; // Marks the need to reschedule pending interactions at these lanes
-// during the commit phase. This enables them to be traced across components
-// that spawn new work during render. E.g. hidden boundaries, suspended SSR
-// hydration or SuspenseList.
-// TODO: Can use a bitmask instead of an array
-
-var spawnedWorkDuringRender = null; // If two updates are scheduled within the same event, we should treat their
+var nestedPassiveUpdateCount = 0; // If two updates are scheduled within the same event, we should treat their
 // event times as simultaneous, even if the actual clock time has advanced
 // between the first and second call.
 
 var currentEventTime = NoTimestamp;
-var currentEventWipLanes = NoLanes;
-var currentEventPendingLanes = NoLanes; // Dev only flag that tracks if passive effects are currently being flushed.
+var currentEventTransitionLane = NoLanes; // Dev only flag that tracks if passive effects are currently being flushed.
 // We warn about state updates for unmounted components differently in this case.
 
 var isFlushingPassiveEffects = false;
-var focusedInstanceHandle = null;
-var shouldFireAfterActiveInstanceBlur = false;
 function getWorkInProgressRoot() {
   return workInProgressRoot;
 }
@@ -17067,69 +18407,60 @@ function requestUpdateLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // The algorithm for assigning an update to a lane should be stable for all
-  // updates at the same priority within the same event. To do this, the inputs
-  // to the algorithm must be the same. For example, we use the `renderLanes`
-  // to avoid choosing a lane that is already in the middle of rendering.
-  //
-  // However, the "included" lanes could be mutated in between updates in the
-  // same event, like if you perform an update inside `flushSync`. Or any other
-  // code path that might call `prepareFreshStack`.
-  //
-  // The trick we use is to cache the first of each of these inputs within an
-  // event. Then reset the cached values once we can be sure the event is over.
-  // Our heuristic for that is whenever we enter a concurrent work loop.
-  //
-  // We'll do the same for `currentEventPendingLanes` below.
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
+  } else if (
+    (executionContext & RenderContext) !== NoContext &&
+    workInProgressRootRenderLanes !== NoLanes
+  ) {
+    // This is a render phase update. These are not officially supported. The
+    // old behavior is to give this the same "thread" (lanes) as
+    // whatever is currently rendering. So if you call `setState` on a component
+    // that happens later in the same render, it will flush. Ideally, we want to
+    // remove the special case and treat them as if they came from an
+    // interleaved event. Regardless, this pattern is not officially supported.
+    // This behavior is only a fallback. The flag only exists until we can roll
+    // out the setState warning, since existing code might accidentally rely on
+    // the current behavior.
+    return pickArbitraryLane(workInProgressRootRenderLanes);
   }
 
   var isTransition = requestCurrentTransition() !== NoTransition;
 
   if (isTransition) {
-    if (currentEventPendingLanes !== NoLanes) {
-      currentEventPendingLanes =
-        mostRecentlyUpdatedRoot !== null
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : NoLanes;
+    // The algorithm for assigning an update to a lane should be stable for all
+    // updates at the same priority within the same event. To do this, the
+    // inputs to the algorithm must be the same.
+    //
+    // The trick we use is to cache the first of each of these inputs within an
+    // event. Then reset the cached values once we can be sure the event is
+    // over. Our heuristic for that is whenever we enter a concurrent work loop.
+    if (currentEventTransitionLane === NoLane) {
+      // All transitions within the same event are assigned the same lane.
+      currentEventTransitionLane = claimNextTransitionLane();
     }
 
-    return findTransitionLane(currentEventWipLanes, currentEventPendingLanes);
-  } // TODO: Remove this dependency on the Scheduler priority.
-  // To do that, we're replacing it with an update lane priority.
-
-  var schedulerPriority = getCurrentPriorityLevel(); // The old behavior was using the priority level of the Scheduler.
-  // This couples React to the Scheduler internals, so we're replacing it
-  // with the currentUpdateLanePriority above. As an example of how this
-  // could be problematic, if we're not inside `Scheduler.runWithPriority`,
-  // then we'll get the priority of the current running Scheduler task,
-  // which is probably not what we want.
-
-  var lane;
+    return currentEventTransitionLane;
+  } // Updates originating inside certain React methods, like flushSync, have
+  // their priority set by tracking it with a context variable.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  if (
-    // TODO: Temporary. We're removing the concept of discrete updates.
-    (executionContext & DiscreteEventContext) !== NoContext &&
-    schedulerPriority === UserBlockingPriority$1
-  ) {
-    lane = findUpdateLane(InputDiscreteLanePriority, currentEventWipLanes);
-  } else {
-    var schedulerLanePriority = schedulerPriorityToLanePriority(
-      schedulerPriority
-    );
+  var updateLane = getCurrentUpdatePriority();
 
-    lane = findUpdateLane(schedulerLanePriority, currentEventWipLanes);
-  }
+  if (updateLane !== NoLane) {
+    return updateLane;
+  } // This update originated outside React. Ask the host environment for an
+  // appropriate priority, based on the type of event.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  return lane;
+  var eventLane = getCurrentEventPriority();
+  return eventLane;
 }
 
 function requestRetryLane(fiber) {
@@ -17139,19 +18470,11 @@ function requestRetryLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // See `requestUpdateLane` for explanation of `currentEventWipLanes`
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
   }
 
-  return findRetryLane(currentEventWipLanes);
+  return claimNextRetryLane();
 }
 
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -17162,6 +18485,12 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   if (root === null) {
     warnAboutUpdateOnUnmountedFiberInDEV(fiber);
     return null;
+  }
+
+  {
+    if (isDevToolsPresent) {
+      addFiberToLanesMap(root, fiber, lane);
+    }
   } // Mark that the root has a pending update.
 
   markRootUpdated(root, lane, eventTime);
@@ -17172,7 +18501,7 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
     // phase update. In that case, we don't treat render phase updates as if
     // they were interleaved, for backwards compat reasons.
-    {
+    if ((executionContext & RenderContext) === NoContext) {
       workInProgressRootUpdatedLanes = mergeLanes(
         workInProgressRootUpdatedLanes,
         lane
@@ -17188,10 +18517,7 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       // already started rendering.
       markRootSuspended$1(root, workInProgressRootRenderLanes);
     }
-  } // TODO: requestUpdateLanePriority also reads the priority. Pass the
-  // priority as an argument to that function and this one.
-
-  var priorityLevel = getCurrentPriorityLevel();
+  }
 
   if (lane === SyncLane) {
     if (
@@ -17199,52 +18525,32 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       (executionContext & LegacyUnbatchedContext) !== NoContext && // Check if we're not already rendering
       (executionContext & (RenderContext | CommitContext)) === NoContext
     ) {
-      // Register pending interactions on the root to avoid losing traced interaction data.
-      schedulePendingInteractions(root, lane); // This is a legacy edge case. The initial mount of a ReactDOM.render-ed
+      // This is a legacy edge case. The initial mount of a ReactDOM.render-ed
       // root inside of batchedUpdates should be synchronous, but layout updates
       // should be deferred until the end of the batch.
-
       performSyncWorkOnRoot(root);
     } else {
       ensureRootIsScheduled(root, eventTime);
-      schedulePendingInteractions(root, lane);
 
-      if (executionContext === NoContext) {
+      if (
+        executionContext === NoContext &&
+        (fiber.mode & ConcurrentMode) === NoMode
+      ) {
         // Flush the synchronous work now, unless we're already working or inside
         // a batch. This is intentionally inside scheduleUpdateOnFiber instead of
         // scheduleCallbackForFiber to preserve the ability to schedule a callback
         // without immediately flushing it. We only do this for user-initiated
         // updates, to preserve historical behavior of legacy mode.
         resetRenderTimer();
-        flushSyncCallbackQueue();
+        flushSyncCallbacksOnlyInLegacyMode();
       }
     }
   } else {
-    // Schedule a discrete update but only if it's not Sync.
-    if (
-      (executionContext & DiscreteEventContext) !== NoContext && // Only updates at user-blocking priority or greater are considered
-      // discrete, even inside a discrete event.
-      (priorityLevel === UserBlockingPriority$1 ||
-        priorityLevel === ImmediatePriority$1)
-    ) {
-      // This is the result of a discrete event. Track the lowest priority
-      // discrete update per root so we can flush them early, if needed.
-      if (rootsWithPendingDiscreteUpdates === null) {
-        rootsWithPendingDiscreteUpdates = new Set([root]);
-      } else {
-        rootsWithPendingDiscreteUpdates.add(root);
-      }
-    } // Schedule other updates after in case the callback is sync.
-
+    // Schedule other updates after in case the callback is sync.
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, lane);
-  } // We use this when assigning a lane for a transition inside
-  // `requestUpdateLane`. We assume it's the same as the root being updated,
-  // since in the common case of a single root app it probably is. If it's not
-  // the same root, then it's not a huge deal, we just might batch more stuff
-  // together more than necessary.
-
-  mostRecentlyUpdatedRoot = root;
+  }
+
+  return root;
 } // This is split into a separate function so we can mark a fiber with pending
 // work without treating it as a typical update that originates from an event;
 // e.g. retrying a Suspense boundary isn't an update, but it does schedule work
@@ -17266,7 +18572,7 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
     ) {
       warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
     }
-  } // Walk the parent path to the root and update the child expiration time.
+  } // Walk the parent path to the root and update the child lanes.
 
   var node = sourceFiber;
   var parent = sourceFiber.return;
@@ -17295,6 +18601,20 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   } else {
     return null;
   }
+}
+
+function isInterleavedUpdate(fiber, lane) {
+  return (
+    // TODO: Optimize slightly by comparing to root that fiber belongs to.
+    // Requires some refactoring. Not a big deal though since it's rare for
+    // concurrent apps to have more than a single root.
+    workInProgressRoot !== null &&
+    (fiber.mode & ConcurrentMode) !== NoMode && // If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),
+    // then don't treat this as an interleaved update. This pattern is
+    // accompanied by a warning but we haven't fully deprecated it yet. We can
+    // remove once the deferRenderPhaseUpdateToNextBatch flag is enabled.
+    (executionContext & RenderContext) === NoContext
+  );
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
 // of the existing task is the same as the priority of the next level that the
@@ -17310,50 +18630,88 @@ function ensureRootIsScheduled(root, currentTime) {
   var nextLanes = getNextLanes(
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : NoLanes
-  ); // This returns the priority level computed during the `getNextLanes` call.
-
-  var newCallbackPriority = returnNextLanesPriority();
+  );
 
   if (nextLanes === NoLanes) {
     // Special case: There's nothing to work on.
     if (existingCallbackNode !== null) {
       cancelCallback(existingCallbackNode);
-      root.callbackNode = null;
-      root.callbackPriority = NoLanePriority;
     }
 
+    root.callbackNode = null;
+    root.callbackPriority = NoLane;
     return;
-  } // Check if there's an existing task. We may be able to reuse it.
+  } // We use the highest priority lane to represent the priority of the callback.
 
-  if (existingCallbackNode !== null) {
-    var existingCallbackPriority = root.callbackPriority;
+  var newCallbackPriority = getHighestPriorityLane(nextLanes); // Check if there's an existing task. We may be able to reuse it.
 
-    if (existingCallbackPriority === newCallbackPriority) {
-      // The priority hasn't changed. We can reuse the existing task. Exit.
-      return;
-    } // The priority changed. Cancel the existing callback. We'll schedule a new
-    // one below.
+  var existingCallbackPriority = root.callbackPriority;
+
+  if (existingCallbackPriority === newCallbackPriority) {
+    {
+      // If we're going to re-use an existing task, it needs to exist.
+      // Assume that discrete update microtasks are non-cancellable and null.
+      // TODO: Temporary until we confirm this warning is not fired.
+      if (
+        existingCallbackNode == null &&
+        existingCallbackPriority !== SyncLane
+      ) {
+        error(
+          "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+    } // The priority hasn't changed. We can reuse the existing task. Exit.
+
+    return;
+  }
 
+  if (existingCallbackNode != null) {
+    // Cancel the existing callback. We'll schedule a new one below.
     cancelCallback(existingCallbackNode);
   } // Schedule a new callback.
 
   var newCallbackNode;
 
-  if (newCallbackPriority === SyncLanePriority) {
+  if (newCallbackPriority === SyncLane) {
     // Special case: Sync React callbacks are scheduled on a special
     // internal queue
-    newCallbackNode = scheduleSyncCallback(
-      performSyncWorkOnRoot.bind(null, root)
-    );
-  } else if (newCallbackPriority === SyncBatchedLanePriority) {
-    newCallbackNode = scheduleCallback(
-      ImmediatePriority$1,
-      performSyncWorkOnRoot.bind(null, root)
-    );
+    if (root.tag === LegacyRoot) {
+      scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root));
+    } else {
+      scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root));
+    }
+
+    {
+      // Flush the queue in an Immediate task.
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks);
+    }
+
+    newCallbackNode = null;
   } else {
-    var schedulerPriorityLevel = lanePriorityToSchedulerPriority(
-      newCallbackPriority
-    );
+    var schedulerPriorityLevel;
+
+    switch (lanesToEventPriority(nextLanes)) {
+      case DiscreteEventPriority:
+        schedulerPriorityLevel = ImmediatePriority;
+        break;
+
+      case ContinuousEventPriority:
+        schedulerPriorityLevel = UserBlockingPriority;
+        break;
+
+      case DefaultEventPriority:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+
+      case IdleEventPriority:
+        schedulerPriorityLevel = IdlePriority;
+        break;
+
+      default:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+    }
+
     newCallbackNode = scheduleCallback(
       schedulerPriorityLevel,
       performConcurrentWorkOnRoot.bind(null, root)
@@ -17365,12 +18723,14 @@ function ensureRootIsScheduled(root, currentTime) {
 } // This is the entry point for every concurrent task, i.e. anything that
 // goes through Scheduler.
 
-function performConcurrentWorkOnRoot(root) {
-  // Since we know we're in a React event, we can clear the current
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  {
+    resetNestedUpdateFlag();
+  } // Since we know we're in a React event, we can clear the current
   // event time. The next update will compute a new event time.
+
   currentEventTime = NoTimestamp;
-  currentEventWipLanes = NoLanes;
-  currentEventPendingLanes = NoLanes;
+  currentEventTransitionLane = NoLanes;
 
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
@@ -17389,7 +18749,7 @@ function performConcurrentWorkOnRoot(root) {
       // there's a new task, or that there's no remaining work on this root.
       return null;
     }
-  } // Determine the next expiration time to work on, using the fields stored
+  } // Determine the next lanes to work on, using the fields stored
   // on the root.
 
   var lanes = getNextLanes(
@@ -17400,40 +18760,41 @@ function performConcurrentWorkOnRoot(root) {
   if (lanes === NoLanes) {
     // Defensive coding. This is never expected to happen.
     return null;
-  }
-
-  var exitStatus = renderRootConcurrent(root, lanes);
-
-  if (
-    includesSomeLane(
-      workInProgressRootIncludedLanes,
-      workInProgressRootUpdatedLanes
-    )
-  ) {
-    // The render included lanes that were updated during the render phase.
-    // For example, when unhiding a hidden tree, we include all the lanes
-    // that were previously skipped when the tree was hidden. That set of
-    // lanes is a superset of the lanes we started rendering with.
-    //
-    // So we'll throw out the current work and restart.
-    prepareFreshStack(root, NoLanes);
-  } else if (exitStatus !== RootIncomplete) {
+  } // We disable time-slicing in some cases: if the work has been CPU-bound
+  // for too long ("expired" work, to prevent starvation), or we're in
+  // sync-updates-by-default mode.
+  // TODO: We only check `didTimeout` defensively, to account for a Scheduler
+  // bug we're still investigating. Once the bug in Scheduler is fixed,
+  // we can remove this, since we track expiration ourselves.
+
+  var exitStatus =
+    shouldTimeSlice(root, lanes) && !didTimeout
+      ? renderRootConcurrent(root, lanes)
+      : renderRootSync(root, lanes);
+
+  if (exitStatus !== RootIncomplete) {
     if (exitStatus === RootErrored) {
       executionContext |= RetryAfterError; // If an error occurred during hydration,
       // discard server response and fall back to client side render.
 
       if (root.hydrate) {
         root.hydrate = false;
+
+        {
+          errorHydratingContainer(root.containerInfo);
+        }
+
         clearContainer(root.containerInfo);
       } // If something threw an error, try rendering one more time. We'll render
       // synchronously to block concurrent data mutations, and we'll includes
       // all pending updates are included. If it still fails after the second
       // attempt, we'll give up and commit the resulting tree.
 
-      lanes = getLanesToRetrySynchronouslyOnError(root);
+      var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-      if (lanes !== NoLanes) {
-        exitStatus = renderRootSync(root, lanes);
+      if (errorRetryLanes !== NoLanes) {
+        lanes = errorRetryLanes;
+        exitStatus = renderRootSync(root, errorRetryLanes);
       }
     }
 
@@ -17593,60 +18954,46 @@ function markRootSuspended$1(root, suspendedLanes) {
 // through Scheduler
 
 function performSyncWorkOnRoot(root) {
+  {
+    syncNestedUpdateFlag();
+  }
+
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
   }
 
   flushPassiveEffects();
-  var lanes;
-  var exitStatus;
-
-  if (
-    root === workInProgressRoot &&
-    includesSomeLane(root.expiredLanes, workInProgressRootRenderLanes)
-  ) {
-    // There's a partial tree, and at least one of its lanes has expired. Finish
-    // rendering it before rendering the rest of the expired work.
-    lanes = workInProgressRootRenderLanes;
-    exitStatus = renderRootSync(root, lanes);
+  var lanes = getNextLanes(root, NoLanes);
 
-    if (
-      includesSomeLane(
-        workInProgressRootIncludedLanes,
-        workInProgressRootUpdatedLanes
-      )
-    ) {
-      // The render included lanes that were updated during the render phase.
-      // For example, when unhiding a hidden tree, we include all the lanes
-      // that were previously skipped when the tree was hidden. That set of
-      // lanes is a superset of the lanes we started rendering with.
-      //
-      // Note that this only happens when part of the tree is rendered
-      // concurrently. If the whole tree is rendered synchronously, then there
-      // are no interleaved events.
-      lanes = getNextLanes(root, lanes);
-      exitStatus = renderRootSync(root, lanes);
-    }
-  } else {
-    lanes = getNextLanes(root, NoLanes);
-    exitStatus = renderRootSync(root, lanes);
+  if (!includesSomeLane(lanes, SyncLane)) {
+    // There's no remaining sync work left.
+    ensureRootIsScheduled(root, now());
+    return null;
   }
 
+  var exitStatus = renderRootSync(root, lanes);
+
   if (root.tag !== LegacyRoot && exitStatus === RootErrored) {
     executionContext |= RetryAfterError; // If an error occurred during hydration,
     // discard server response and fall back to client side render.
 
-    if (root.hydrate) {
-      root.hydrate = false;
+    if (root.hydrate) {
+      root.hydrate = false;
+
+      {
+        errorHydratingContainer(root.containerInfo);
+      }
+
       clearContainer(root.containerInfo);
     } // If something threw an error, try rendering one more time. We'll render
     // synchronously to block concurrent data mutations, and we'll includes
     // all pending updates are included. If it still fails after the second
     // attempt, we'll give up and commit the resulting tree.
 
-    lanes = getLanesToRetrySynchronouslyOnError(root);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-    if (lanes !== NoLanes) {
+    if (errorRetryLanes !== NoLanes) {
+      lanes = errorRetryLanes;
       exitStatus = renderRootSync(root, lanes);
     }
   }
@@ -17669,7 +19016,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-
 function batchedUpdates$1(fn, a) {
   var prevExecutionContext = executionContext;
   executionContext |= BatchedContext;
@@ -17677,45 +19023,47 @@ function batchedUpdates$1(fn, a) {
   try {
     return fn(a);
   } finally {
-    executionContext = prevExecutionContext;
+    executionContext = prevExecutionContext; // If there were legacy sync updates, flush them at the end of the outer
+    // most batchedUpdates-like method.
 
     if (executionContext === NoContext) {
-      // Flush the immediate callbacks that were scheduled during this batch
       resetRenderTimer();
-      flushSyncCallbackQueue();
+      flushSyncCallbacksOnlyInLegacyMode();
     }
   }
 }
 function flushSync(fn, a) {
   var prevExecutionContext = executionContext;
-
-  if ((prevExecutionContext & (RenderContext | CommitContext)) !== NoContext) {
-    {
-      error(
-        "flushSync was called from inside a lifecycle method. React cannot " +
-          "flush when React is already rendering. Consider moving this call to " +
-          "a scheduler task or micro task."
-      );
-    }
-
-    return fn(a);
-  }
-
   executionContext |= BatchedContext;
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
+  var previousPriority = getCurrentUpdatePriority();
 
-  {
-    try {
-      if (fn) {
-        return runWithPriority(ImmediatePriority$1, fn.bind(null, a));
-      } else {
-        return undefined;
-      }
-    } finally {
-      executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
-      // Note that this will happen even if batchedUpdates is higher up
-      // the stack.
+  try {
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
 
-      flushSyncCallbackQueue();
+    if (fn) {
+      return fn(a);
+    } else {
+      return undefined;
+    }
+  } finally {
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
+    // Note that this will happen even if batchedUpdates is higher up
+    // the stack.
+
+    if ((executionContext & (RenderContext | CommitContext)) === NoContext) {
+      flushSyncCallbacks();
+    } else {
+      {
+        error(
+          "flushSync was called from inside a lifecycle method. React cannot " +
+            "flush when React is already rendering. Consider moving this call to " +
+            "a scheduler task or micro task."
+        );
+      }
     }
   }
 }
@@ -17762,10 +19110,7 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootSkippedLanes = NoLanes;
   workInProgressRootUpdatedLanes = NoLanes;
   workInProgressRootPingedLanes = NoLanes;
-
-  {
-    spawnedWorkDuringRender = null;
-  }
+  enqueueInterleavedUpdates();
 
   {
     ReactStrictModeWarnings.discardPendingWarnings();
@@ -17855,20 +19200,6 @@ function popDispatcher(prevDispatcher) {
   ReactCurrentDispatcher$2.current = prevDispatcher;
 }
 
-function pushInteractions(root) {
-  {
-    var prevInteractions = tracing.__interactionsRef.current;
-    tracing.__interactionsRef.current = root.memoizedInteractions;
-    return prevInteractions;
-  }
-}
-
-function popInteractions(prevInteractions) {
-  {
-    tracing.__interactionsRef.current = prevInteractions;
-  }
-}
-
 function markCommitTimeOfFallback() {
   globalMostRecentFallbackTime = now();
 }
@@ -17927,12 +19258,25 @@ function renderRootSync(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopSync();
@@ -17943,11 +19287,6 @@ function renderRootSync(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   executionContext = prevExecutionContext;
   popDispatcher(prevDispatcher);
 
@@ -17981,13 +19320,26 @@ function renderRootConcurrent(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     resetRenderTimer();
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopConcurrent();
@@ -17998,11 +19350,6 @@ function renderRootConcurrent(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   popDispatcher(prevDispatcher);
   executionContext = prevExecutionContext;
 
@@ -18085,52 +19432,11 @@ function completeUnitOfWork(unitOfWork) {
         workInProgress = next;
         return;
       }
-
-      resetChildLanes(completedWork);
-
-      if (
-        returnFiber !== null && // Do not append effects to parents if a sibling failed to complete
-        (returnFiber.flags & Incomplete) === NoFlags
-      ) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = completedWork.firstEffect;
-        }
-
-        if (completedWork.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork.firstEffect;
-          }
-
-          returnFiber.lastEffect = completedWork.lastEffect;
-        } // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if needed,
-        // by doing multiple passes over the effect list. We don't want to
-        // schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-
-        var flags = completedWork.flags; // Skip both NoWork and PerformedWork tags when creating the effect
-        // list. PerformedWork effect is read by React DevTools but shouldn't be
-        // committed.
-
-        if (flags > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork;
-          } else {
-            returnFiber.firstEffect = completedWork;
-          }
-
-          returnFiber.lastEffect = completedWork;
-        }
-      }
     } else {
       // This fiber did not complete because something threw. Pop values off
       // the stack without entering the complete phase. If this is a boundary,
       // capture values if possible.
-      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its expiration time.
+      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its lanes.
 
       if (_next !== null) {
         // If completing this work spawned new work, do that next. We'll come
@@ -18158,9 +19464,10 @@ function completeUnitOfWork(unitOfWork) {
       }
 
       if (returnFiber !== null) {
-        // Mark the parent fiber as incomplete and clear its effect list.
-        returnFiber.firstEffect = returnFiber.lastEffect = null;
+        // Mark the parent fiber as incomplete and clear its subtree flags.
         returnFiber.flags |= Incomplete;
+        returnFiber.subtreeFlags = NoFlags;
+        returnFiber.deletions = null;
       }
     }
 
@@ -18182,90 +19489,21 @@ function completeUnitOfWork(unitOfWork) {
   }
 }
 
-function resetChildLanes(completedWork) {
-  if (
-    // TODO: Move this check out of the hot path by moving `resetChildLanes`
-    // to switch statement in `completeWork`.
-    (completedWork.tag === LegacyHiddenComponent ||
-      completedWork.tag === OffscreenComponent) &&
-    completedWork.memoizedState !== null &&
-    !includesSomeLane(subtreeRenderLanes, OffscreenLane) &&
-    (completedWork.mode & ConcurrentMode) !== NoLanes
-  ) {
-    // The children of this component are hidden. Don't bubble their
-    // expiration times.
-    return;
-  }
-
-  var newChildLanes = NoLanes; // Bubble up the earliest expiration time.
-
-  if ((completedWork.mode & ProfileMode) !== NoMode) {
-    // In profiling mode, resetChildExpirationTime is also used to reset
-    // profiler durations.
-    var actualDuration = completedWork.actualDuration;
-    var treeBaseDuration = completedWork.selfBaseDuration; // When a fiber is cloned, its actualDuration is reset to 0. This value will
-    // only be updated if work is done on the fiber (i.e. it doesn't bailout).
-    // When work is done, it should bubble to the parent's actualDuration. If
-    // the fiber has not been cloned though, (meaning no work was done), then
-    // this value will reflect the amount of time spent working on a previous
-    // render. In that case it should not bubble. We determine whether it was
-    // cloned by comparing the child pointer.
-
-    var shouldBubbleActualDurations =
-      completedWork.alternate === null ||
-      completedWork.child !== completedWork.alternate.child;
-    var child = completedWork.child;
-
-    while (child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(child.lanes, child.childLanes)
-      );
-
-      if (shouldBubbleActualDurations) {
-        actualDuration += child.actualDuration;
-      }
-
-      treeBaseDuration += child.treeBaseDuration;
-      child = child.sibling;
-    }
-
-    var isTimedOutSuspense =
-      completedWork.tag === SuspenseComponent &&
-      completedWork.memoizedState !== null;
-
-    if (isTimedOutSuspense) {
-      // Don't count time spent in a timed out Suspense subtree as part of the base duration.
-      var primaryChildFragment = completedWork.child;
-
-      if (primaryChildFragment !== null) {
-        treeBaseDuration -= primaryChildFragment.treeBaseDuration;
-      }
-    }
-
-    completedWork.actualDuration = actualDuration;
-    completedWork.treeBaseDuration = treeBaseDuration;
-  } else {
-    var _child = completedWork.child;
+function commitRoot(root) {
+  // TODO: This no longer makes any sense. We already wrap the mutation and
+  // layout phases. Should be able to remove.
+  var previousUpdateLanePriority = getCurrentUpdatePriority();
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
 
-    while (_child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(_child.lanes, _child.childLanes)
-      );
-      _child = _child.sibling;
-    }
+  try {
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
+    commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    setCurrentUpdatePriority(previousUpdateLanePriority);
   }
 
-  completedWork.childLanes = newChildLanes;
-}
-
-function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(
-    ImmediatePriority$1,
-    commitRootImpl.bind(null, root, renderPriorityLevel)
-  );
   return null;
 }
 
@@ -18291,6 +19529,15 @@ function commitRootImpl(root, renderPriorityLevel) {
 
   if (finishedWork === null) {
     return null;
+  } else {
+    {
+      if (lanes === NoLanes) {
+        error(
+          "root.finishedLanes should not be empty during a commit. This is a " +
+            "bug in React."
+        );
+      }
+    }
   }
 
   root.finishedWork = null;
@@ -18303,52 +19550,57 @@ function commitRootImpl(root, renderPriorityLevel) {
   } // commitRoot never returns a continuation; it always finishes synchronously.
   // So we can clear these now to allow a new callback to be scheduled.
 
-  root.callbackNode = null; // Update the first and last pending times on this root. The new first
+  root.callbackNode = null;
+  root.callbackPriority = NoLane; // Update the first and last pending times on this root. The new first
   // pending time is whatever is left on the root fiber.
 
   var remainingLanes = mergeLanes(finishedWork.lanes, finishedWork.childLanes);
-  markRootFinished(root, remainingLanes); // Clear already finished discrete updates in case that a later call of
-  // `flushDiscreteUpdates` starts a useless render pass which may cancels
-  // a scheduled timeout.
-
-  if (rootsWithPendingDiscreteUpdates !== null) {
-    if (
-      !hasDiscreteLanes(remainingLanes) &&
-      rootsWithPendingDiscreteUpdates.has(root)
-    ) {
-      rootsWithPendingDiscreteUpdates.delete(root);
-    }
-  }
+  markRootFinished(root, remainingLanes);
 
   if (root === workInProgressRoot) {
     // We can reset these now that they are finished.
     workInProgressRoot = null;
     workInProgress = null;
     workInProgressRootRenderLanes = NoLanes;
-  } // Get the list of effects.
-
-  var firstEffect;
-
-  if (finishedWork.flags > PerformedWork) {
-    // A fiber's effect list consists only of its children, not itself. So if
-    // the root has an effect, we need to add it to the end of the list. The
-    // resulting list is the set that would belong to the root's parent, if it
-    // had one; that is, all the effects in the tree including the root.
-    if (finishedWork.lastEffect !== null) {
-      finishedWork.lastEffect.nextEffect = finishedWork;
-      firstEffect = finishedWork.firstEffect;
-    } else {
-      firstEffect = finishedWork;
-    }
-  } else {
-    // There is no effect on the root.
-    firstEffect = finishedWork.firstEffect;
-  }
+  } // If there are pending passive effects, schedule a callback to process them.
+  // Do this as early as possible, so it is queued before anything else that
+  // might get scheduled in the commit phase. (See #16714.)
+  // TODO: Delete all other places that schedule the passive effect callback
+  // They're redundant.
 
-  if (firstEffect !== null) {
+  if (
+    (finishedWork.subtreeFlags & PassiveMask) !== NoFlags ||
+    (finishedWork.flags & PassiveMask) !== NoFlags
+  ) {
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
+    }
+  } // Check if there are any effects in the whole tree.
+  // TODO: This is left over from the effect list implementation, where we had
+  // to check for the existence of `firstEffect` to satisfy Flow. I think the
+  // only other reason this optimization exists is because it affects profiling.
+  // Reconsider whether this is necessary.
+
+  var subtreeHasEffects =
+    (finishedWork.subtreeFlags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+  var rootHasEffect =
+    (finishedWork.flags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+
+  if (subtreeHasEffects || rootHasEffect) {
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = getCurrentUpdatePriority();
+    setCurrentUpdatePriority(DiscreteEventPriority);
     var prevExecutionContext = executionContext;
-    executionContext |= CommitContext;
-    var prevInteractions = pushInteractions(root); // Reset this to null before calling lifecycles
+    executionContext |= CommitContext; // Reset this to null before calling lifecycles
 
     ReactCurrentOwner$2.current = null; // The commit phase is broken into several sub-phases. We do a separate pass
     // of the effect list for each phase: all mutation effects come before all
@@ -18357,58 +19609,18 @@ function commitRootImpl(root, renderPriorityLevel) {
     // state of the host tree right before we mutate it. This is where
     // getSnapshotBeforeUpdate is called.
 
-    focusedInstanceHandle = prepareForCommit(root.containerInfo);
-    shouldFireAfterActiveInstanceBlur = false;
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitBeforeMutationEffects, null);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(nextEffect, error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null); // We no longer need to track the active instance fiber
-
-    focusedInstanceHandle = null;
+    var shouldFireAfterActiveInstanceBlur = commitBeforeMutationEffects(
+      root,
+      finishedWork
+    );
 
     {
       // Mark the current commit time to be shared by all Profilers in this
       // batch. This enables them to be grouped later.
       recordCommitTime();
-    } // The next phase is the mutation phase, where we mutate the host tree.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(
-          null,
-          commitMutationEffects,
-          null,
-          root,
-          renderPriorityLevel
-        );
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error = clearCaughtError();
+    }
 
-          captureCommitPhaseError(nextEffect, _error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
+    commitMutationEffects(root, finishedWork, lanes);
 
     resetAfterCommit(root.containerInfo); // The work-in-progress tree is now the current tree. This must come after
     // the mutation phase, so that the previous tree is still current during
@@ -18416,38 +19628,15 @@ function commitRootImpl(root, renderPriorityLevel) {
     // work is current during componentDidMount/Update.
 
     root.current = finishedWork; // The next phase is the layout phase, where we call effects that read
-    // the host tree after it's been mutated. The idiomatic use case for this is
-    // layout, but class component lifecycles also fire here for legacy reasons.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitLayoutEffects, null, root, lanes);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error2 = clearCaughtError();
 
-          captureCommitPhaseError(nextEffect, _error2);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
-
-    nextEffect = null; // Tell Scheduler to yield at the end of the frame, so the browser has an
+    commitLayoutEffects(finishedWork, root, lanes);
     // opportunity to paint.
 
     requestPaint();
+    executionContext = prevExecutionContext; // Reset the priority to the previous non-sync value.
 
-    {
-      popInteractions(prevInteractions);
-    }
-
-    executionContext = prevExecutionContext;
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
   } else {
     // No effects.
     root.current = finishedWork; // Measure these anyway so the flamegraph explicitly shows that there were
@@ -18459,71 +19648,28 @@ function commitRootImpl(root, renderPriorityLevel) {
     }
   }
 
-  var rootDidHavePassiveEffects = rootDoesHavePassiveEffects;
-
   if (rootDoesHavePassiveEffects) {
     // This commit has passive effects. Stash a reference to them. But don't
     // schedule a callback until after flushing layout work.
     rootDoesHavePassiveEffects = false;
     rootWithPendingPassiveEffects = root;
     pendingPassiveEffectsLanes = lanes;
-    pendingPassiveEffectsRenderPriority = renderPriorityLevel;
-  } else {
-    // We are done with the effect chain at this point so let's clear the
-    // nextEffect pointers to assist with GC. If we have passive effects, we'll
-    // clear this in flushPassiveEffects.
-    nextEffect = firstEffect;
-
-    while (nextEffect !== null) {
-      var nextNextEffect = nextEffect.nextEffect;
-      nextEffect.nextEffect = null;
-
-      if (nextEffect.flags & Deletion) {
-        detachFiberAfterEffects(nextEffect);
-      }
-
-      nextEffect = nextNextEffect;
-    }
   } // Read this again, since an effect might have updated it
 
   remainingLanes = root.pendingLanes; // Check if there's remaining work on this root
 
-  if (remainingLanes !== NoLanes) {
-    {
-      if (spawnedWorkDuringRender !== null) {
-        var expirationTimes = spawnedWorkDuringRender;
-        spawnedWorkDuringRender = null;
-
-        for (var i = 0; i < expirationTimes.length; i++) {
-          scheduleInteractions(
-            root,
-            expirationTimes[i],
-            root.memoizedInteractions
-          );
-        }
-      }
-
-      schedulePendingInteractions(root, remainingLanes);
-    }
-  } else {
+  if (remainingLanes === NoLanes) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
 
-  {
-    if (!rootDidHavePassiveEffects) {
-      // If there are no passive effects, then we can complete the pending interactions.
-      // Otherwise, we'll wait until after the passive effects are flushed.
-      // Wait to do this until after remaining work has been scheduled,
-      // so that we don't prematurely signal complete for interactions when there's e.g. hidden work.
-      finishPendingInteractions(root, lanes);
-    }
-  }
-
-  if (remainingLanes === SyncLane) {
-    // Count the number of times the root synchronously re-renders without
+  if (includesSomeLane(remainingLanes, SyncLane)) {
+    {
+      markNestedUpdateScheduled();
+    } // Count the number of times the root synchronously re-renders without
     // finishing. If there are too many, it indicates an infinite update loop.
+
     if (root === rootWithNestedUpdates) {
       nestedUpdateCount++;
     } else {
@@ -18535,15 +19681,21 @@ function commitRootImpl(root, renderPriorityLevel) {
   }
 
   onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
+
+  {
+    if (isDevToolsPresent) {
+      root.memoizedUpdaters.clear();
+    }
+  }
   // additional work on this root is scheduled.
 
   ensureRootIsScheduled(root, now());
 
   if (hasUncaughtError) {
     hasUncaughtError = false;
-    var _error3 = firstUncaughtError;
+    var error$1 = firstUncaughtError;
     firstUncaughtError = null;
-    throw _error3;
+    throw error$1;
   }
 
   if ((executionContext & LegacyUnbatchedContext) !== NoContext) {
@@ -18552,199 +19704,64 @@ function commitRootImpl(root, renderPriorityLevel) {
     // of the batch.
 
     return null;
-  } // If layout work was scheduled, flush it now.
-
-  flushSyncCallbackQueue();
-
-  return null;
-}
-
-function commitBeforeMutationEffects() {
-  while (nextEffect !== null) {
-    var current = nextEffect.alternate;
-
-    if (!shouldFireAfterActiveInstanceBlur && focusedInstanceHandle !== null) {
-      if ((nextEffect.flags & Deletion) !== NoFlags) {
-        if (doesFiberContain(nextEffect, focusedInstanceHandle)) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      } else {
-        // TODO: Move this out of the hot path using a dedicated effect tag.
-        if (
-          nextEffect.tag === SuspenseComponent &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle)
-        ) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      }
-    }
-
-    var flags = nextEffect.flags;
-
-    if ((flags & Snapshot) !== NoFlags) {
-      setCurrentFiber(nextEffect);
-      commitBeforeMutationLifeCycles(current, nextEffect);
-      resetCurrentFiber();
-    }
-
-    if ((flags & Passive) !== NoFlags) {
-      // If there are passive effects, schedule a callback to flush at
-      // the earliest opportunity.
-      if (!rootDoesHavePassiveEffects) {
-        rootDoesHavePassiveEffects = true;
-        scheduleCallback(NormalPriority$1, function() {
-          flushPassiveEffects();
-          return null;
-        });
-      }
-    }
-
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function commitMutationEffects(root, renderPriorityLevel) {
-  // TODO: Should probably move the bulk of this function to commitWork.
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
-
-    if (flags & Ref) {
-      var current = nextEffect.alternate;
-
-      if (current !== null) {
-        commitDetachRef(current);
-      }
-    } // The following switch statement is only concerned about placement,
-    // updates, and deletions. To avoid needing to add a case for every possible
-    // bitmap value, we remove the secondary effects from the effect tag and
-    // switch on that value.
-
-    var primaryFlags = flags & (Placement | Update | Deletion | Hydrating);
-
-    switch (primaryFlags) {
-      case Placement: {
-        // inserted, before any life-cycles like componentDidMount gets called.
-        // TODO: findDOMNode doesn't rely on this any more but isMounted does
-        // and isMounted is deprecated anyway so we should be able to kill this.
-
-        nextEffect.flags &= ~Placement;
-        break;
-      }
-
-      case PlacementAndUpdate: {
-        // inserted, before any life-cycles like componentDidMount gets called.
+  } // If the passive effects are the result of a discrete render, flush them
+  // synchronously at the end of the current task so that the result is
+  // immediately observable. Otherwise, we assume that they are not
+  // order-dependent and do not need to be observed by external systems, so we
+  // can wait until after paint.
+  // TODO: We can optimize this by not scheduling the callback earlier. Since we
+  // currently schedule the callback in multiple places, will wait until those
+  // are consolidated.
 
-        nextEffect.flags &= ~Placement; // Update
-
-        var _current = nextEffect.alternate;
-        commitWork(_current, nextEffect);
-        break;
-      }
-
-      case Hydrating: {
-        nextEffect.flags &= ~Hydrating;
-        break;
-      }
-
-      case HydratingAndUpdate: {
-        nextEffect.flags &= ~Hydrating; // Update
-
-        var _current2 = nextEffect.alternate;
-        commitWork(_current2, nextEffect);
-        break;
-      }
-
-      case Update: {
-        var _current3 = nextEffect.alternate;
-        commitWork(_current3, nextEffect);
-        break;
-      }
-
-      case Deletion: {
-        commitDeletion(root, nextEffect);
-        break;
-      }
-    }
-
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function commitLayoutEffects(root, committedLanes) {
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
-
-    if (flags & (Update | Callback)) {
-      var current = nextEffect.alternate;
-      commitLifeCycles(root, current, nextEffect);
-    }
+  if (
+    includesSomeLane(pendingPassiveEffectsLanes, SyncLane) &&
+    root.tag !== LegacyRoot
+  ) {
+    flushPassiveEffects();
+  } // If layout work was scheduled, flush it now.
 
-    {
-      if (flags & Ref) {
-        commitAttachRef(nextEffect);
-      }
-    }
+  flushSyncCallbacks();
 
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
-  }
+  return null;
 }
 
 function flushPassiveEffects() {
   // Returns whether passive effects were flushed.
-  if (pendingPassiveEffectsRenderPriority !== NoPriority$1) {
-    var priorityLevel =
-      pendingPassiveEffectsRenderPriority > NormalPriority$1
-        ? NormalPriority$1
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = NoPriority$1;
+  // TODO: Combine this check with the one in flushPassiveEFfectsImpl. We should
+  // probably just combine the two functions. I believe they were only separate
+  // in the first place because we used to wrap it with
+  // `Scheduler.runWithPriority`, which accepts a function. But now we track the
+  // priority within React itself, so we can mutate the variable directly.
+  if (rootWithPendingPassiveEffects !== null) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes);
+    var priority = lowerEventPriority(DefaultEventPriority, renderPriority);
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    var previousPriority = getCurrentUpdatePriority();
 
-    {
-      return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      setCurrentUpdatePriority(priority);
+      return flushPassiveEffectsImpl();
+    } finally {
+      setCurrentUpdatePriority(previousPriority);
+      ReactCurrentBatchConfig$2.transition = prevTransition;
     }
   }
 
   return false;
 }
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-
+function enqueuePendingPassiveProfilerEffect(fiber) {
   {
-    fiber.flags |= PassiveUnmountPendingDev;
-    var alternate = fiber.alternate;
+    pendingPassiveProfilerEffects.push(fiber);
 
-    if (alternate !== null) {
-      alternate.flags |= PassiveUnmountPendingDev;
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
     }
   }
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-
-function invokePassiveEffectCreate(effect) {
-  var create = effect.create;
-  effect.destroy = create();
 }
 
 function flushPassiveEffectsImpl() {
@@ -18753,8 +19770,10 @@ function flushPassiveEffectsImpl() {
   }
 
   var root = rootWithPendingPassiveEffects;
-  var lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
+  rootWithPendingPassiveEffects = null; // TODO: This is sometimes out of sync with rootWithPendingPassiveEffects.
+  // Figure out why and fix it. It's not causing any known issues (probably
+  // because it's only used for profiling), but it's a refactor hazard.
+
   pendingPassiveEffectsLanes = NoLanes;
 
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
@@ -18767,101 +19786,17 @@ function flushPassiveEffectsImpl() {
 
   var prevExecutionContext = executionContext;
   executionContext |= CommitContext;
-  var prevInteractions = pushInteractions(root); // It's important that ALL pending passive effect destroy functions are called
-  // before ANY passive effect create functions are called.
-  // Otherwise effects in sibling components might interfere with each other.
-  // e.g. a destroy function in one component may unintentionally override a ref
-  // value set by a create function in another component.
-  // Layout effects have the same constraint.
-  // First pass: Destroy stale passive effects.
-
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var _effect = unmountEffects[i];
-    var fiber = unmountEffects[i + 1];
-    var destroy = _effect.destroy;
-    _effect.destroy = undefined;
-
-    {
-      fiber.flags &= ~PassiveUnmountPendingDev;
-      var alternate = fiber.alternate;
-
-      if (alternate !== null) {
-        alternate.flags &= ~PassiveUnmountPendingDev;
-      }
-    }
-
-    if (typeof destroy === "function") {
-      {
-        setCurrentFiber(fiber);
-
-        {
-          invokeGuardedCallback(null, destroy, null);
-        }
-
-        if (hasCaughtError()) {
-          if (!(fiber !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(fiber, error);
-        }
-
-        resetCurrentFiber();
-      }
-    }
-  } // Second pass: Create new passive effects.
-
-  var mountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-
-  for (var _i = 0; _i < mountEffects.length; _i += 2) {
-    var _effect2 = mountEffects[_i];
-    var _fiber = mountEffects[_i + 1];
-
-    {
-      setCurrentFiber(_fiber);
-
-      {
-        invokeGuardedCallback(null, invokePassiveEffectCreate, null, _effect2);
-      }
-
-      if (hasCaughtError()) {
-        if (!(_fiber !== null)) {
-          throw Error("Should be working on an effect.");
-        }
-
-        var _error4 = clearCaughtError();
-
-        captureCommitPhaseError(_fiber, _error4);
-      }
-
-      resetCurrentFiber();
-    }
-  } // Note: This currently assumes there are no passive effects on the root fiber
-  // because the root is not part of its own effect list.
-  // This could change in the future.
-
-  var effect = root.current.firstEffect;
-
-  while (effect !== null) {
-    var nextNextEffect = effect.nextEffect; // Remove nextEffect pointer to assist GC
+  commitPassiveUnmountEffects(root.current);
+  commitPassiveMountEffects(root, root.current); // TODO: Move to commitPassiveMountEffects
 
-    effect.nextEffect = null;
+  {
+    var profilerEffects = pendingPassiveProfilerEffects;
+    pendingPassiveProfilerEffects = [];
 
-    if (effect.flags & Deletion) {
-      detachFiberAfterEffects(effect);
+    for (var i = 0; i < profilerEffects.length; i++) {
+      var _fiber = profilerEffects[i];
+      commitPassiveEffectDurations(root, _fiber);
     }
-
-    effect = nextNextEffect;
-  }
-
-  {
-    popInteractions(prevInteractions);
-    finishPendingInteractions(root, lanes);
   }
 
   {
@@ -18869,11 +19804,20 @@ function flushPassiveEffectsImpl() {
   }
 
   executionContext = prevExecutionContext;
-  flushSyncCallbackQueue(); // If additional passive effects were scheduled, increment a counter. If this
+  flushSyncCallbacks(); // If additional passive effects were scheduled, increment a counter. If this
   // exceeds the limit, we'll fire a warning.
 
   nestedPassiveUpdateCount =
-    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1;
+    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1; // TODO: Move to commitPassiveMountEffects
+
+  onPostCommitRoot(root);
+
+  {
+    var stateNode = root.current.stateNode;
+    stateNode.effectDuration = 0;
+    stateNode.passiveEffectDuration = 0;
+  }
+
   return true;
 }
 
@@ -18910,23 +19854,26 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   if (root !== null) {
     markRootUpdated(root, SyncLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, SyncLane);
   }
 }
 
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
   if (sourceFiber.tag === HostRoot) {
     // Error was thrown at the root. There is no parent, so the root
     // itself should capture it.
-    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
+    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error$1);
     return;
   }
 
-  var fiber = sourceFiber.return;
+  var fiber = null;
+
+  {
+    fiber = sourceFiber.return;
+  }
 
   while (fiber !== null) {
     if (fiber.tag === HostRoot) {
-      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error$1);
       return;
     } else if (fiber.tag === ClassComponent) {
       var ctor = fiber.type;
@@ -18937,7 +19884,7 @@ function captureCommitPhaseError(sourceFiber, error) {
         (typeof instance.componentDidCatch === "function" &&
           !isAlreadyFailedLegacyErrorBoundary(instance))
       ) {
-        var errorInfo = createCapturedValue(error, sourceFiber);
+        var errorInfo = createCapturedValue(error$1, sourceFiber);
         var update = createClassErrorUpdate(fiber, errorInfo, SyncLane);
         enqueueUpdate(fiber, update);
         var eventTime = requestEventTime();
@@ -18946,25 +19893,6 @@ function captureCommitPhaseError(sourceFiber, error) {
         if (root !== null) {
           markRootUpdated(root, SyncLane, eventTime);
           ensureRootIsScheduled(root, eventTime);
-          schedulePendingInteractions(root, SyncLane);
-        } else {
-          // This component has already been unmounted.
-          // We can't schedule any follow up work for the root because the fiber is already unmounted,
-          // but we can still call the log-only boundary so the error isn't swallowed.
-          //
-          // TODO This is only a temporary bandaid for the old reconciler fork.
-          // We can delete this special case once the new fork is merged.
-          if (
-            typeof instance.componentDidCatch === "function" &&
-            !isAlreadyFailedLegacyErrorBoundary(instance)
-          ) {
-            try {
-              instance.componentDidCatch(error, errorInfo);
-            } catch (errorToIgnore) {
-              // TODO Ignore this error? Rethrow it?
-              // This is kind of an edge case.
-            }
-          }
         }
 
         return;
@@ -18973,6 +19901,22 @@ function captureCommitPhaseError(sourceFiber, error) {
 
     fiber = fiber.return;
   }
+
+  {
+    // TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
+    // will fire for errors that are thrown by destroy functions inside deleted
+    // trees. What it should instead do is propagate the error to the parent of
+    // the deleted tree. In the meantime, do not add this warning to the
+    // allowlist; this is only for our internal use.
+    error(
+      "Internal React error: Attempted to capture a commit phase error " +
+        "inside a detached tree. This indicates a bug in React. Likely " +
+        "causes include deleting the same fiber more than once, committing an " +
+        "already-finished tree, or an inconsistent return pointer.\n\n" +
+        "Error message:\n\n%s",
+      error$1
+    );
+  }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
   var pingCache = root.pingCache;
@@ -19016,15 +19960,16 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
   }
 
   ensureRootIsScheduled(root, eventTime);
-  schedulePendingInteractions(root, pingedLanes);
 }
 
 function retryTimedOutBoundary(boundaryFiber, retryLane) {
   // The boundary fiber (a Suspense component or SuspenseList component)
   // previously was rendered in its fallback state. One of the promises that
   // suspended it has resolved, which means at least part of the tree was
-  // likely unblocked. Try rendering again, at a new expiration time.
+  // likely unblocked. Try rendering again, at a new lanes.
   if (retryLane === NoLane) {
+    // TODO: Assign this to `suspenseState.retryLane`? to avoid
+    // unnecessary entanglement?
     retryLane = requestRetryLane(boundaryFiber);
   } // TODO: Special case idle priority?
 
@@ -19034,7 +19979,6 @@ function retryTimedOutBoundary(boundaryFiber, retryLane) {
   if (root !== null) {
     markRootUpdated(root, retryLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, retryLane);
   }
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
@@ -19124,7 +20068,7 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       return;
     }
 
-    if (!(fiber.mode & (BlockingMode | ConcurrentMode))) {
+    if (!(fiber.mode & ConcurrentMode)) {
       return;
     }
 
@@ -19137,15 +20081,14 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       tag !== FunctionComponent &&
       tag !== ForwardRef &&
       tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
+      tag !== SimpleMemoComponent
     ) {
       // Only warn for user-defined components, not internal ones like Suspense.
       return;
     } // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
 
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
+    var componentName = getComponentNameFromFiber(fiber) || "ReactComponent";
 
     if (didWarnStateUpdateForNotYetMountedComponent !== null) {
       if (didWarnStateUpdateForNotYetMountedComponent.has(componentName)) {
@@ -19190,20 +20133,37 @@ function warnAboutUpdateOnUnmountedFiberInDEV(fiber) {
       tag !== FunctionComponent &&
       tag !== ForwardRef &&
       tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
+      tag !== SimpleMemoComponent
     ) {
       // Only warn for user-defined components, not internal ones like Suspense.
       return;
-    } // If there are pending passive effects unmounts for this Fiber,
-    // we can assume that they would have prevented this update.
+    }
 
-    if ((fiber.flags & PassiveUnmountPendingDev) !== NoFlags) {
-      return;
+    if ((fiber.flags & PassiveStatic) !== NoFlags) {
+      var updateQueue = fiber.updateQueue;
+
+      if (updateQueue !== null) {
+        var lastEffect = updateQueue.lastEffect;
+
+        if (lastEffect !== null) {
+          var firstEffect = lastEffect.next;
+          var effect = firstEffect;
+
+          do {
+            if (effect.destroy !== undefined) {
+              if ((effect.tag & Passive$1) !== NoFlags$1) {
+                return;
+              }
+            }
+
+            effect = effect.next;
+          } while (effect !== firstEffect);
+        }
+      }
     } // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
 
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
+    var componentName = getComponentNameFromFiber(fiber) || "ReactComponent";
 
     if (didWarnStateUpdateForUnmountedComponent !== null) {
       if (didWarnStateUpdateForUnmountedComponent.has(componentName)) {
@@ -19287,14 +20247,23 @@ var beginWork$1;
       invokeGuardedCallback(null, beginWork, null, current, unitOfWork, lanes);
 
       if (hasCaughtError()) {
-        var replayError = clearCaughtError(); // `invokeGuardedCallback` sometimes sets an expando `_suppressLogging`.
-        // Rethrow this error instead of the original one.
+        var replayError = clearCaughtError();
 
-        throw replayError;
-      } else {
-        // This branch is reachable if the render phase is impure.
-        throw originalError;
-      }
+        if (
+          typeof replayError === "object" &&
+          replayError !== null &&
+          replayError._suppressLogging &&
+          typeof originalError === "object" &&
+          originalError !== null &&
+          !originalError._suppressLogging
+        ) {
+          // If suppressed, let the flag carry over to the original error which is the one we'll rethrow.
+          originalError._suppressLogging = true;
+        }
+      } // We always throw the original error in case the second render pass is not idempotent.
+      // This can happen if a memoized function or CommonJS module doesn't throw after first invokation.
+
+      throw originalError;
     }
   };
 }
@@ -19318,7 +20287,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
         case ForwardRef:
         case SimpleMemoComponent: {
           var renderingComponentName =
-            (workInProgress && getComponentName(workInProgress.type)) ||
+            (workInProgress && getComponentNameFromFiber(workInProgress)) ||
             "Unknown"; // Dedupe by the rendering component because it's the one that needs to be fixed.
 
           var dedupeKey = renderingComponentName;
@@ -19326,7 +20295,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
           if (!didWarnAboutUpdateInRenderForAnotherComponent.has(dedupeKey)) {
             didWarnAboutUpdateInRenderForAnotherComponent.add(dedupeKey);
             var setStateComponentName =
-              getComponentName(fiber.type) || "Unknown";
+              getComponentNameFromFiber(fiber) || "Unknown";
 
             error(
               "Cannot update a component (`%s`) while rendering a " +
@@ -19358,6 +20327,18 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
     }
   }
 } // a 'shared' variable that changes when act() opens/closes in tests.
+function restorePendingUpdaters(root, lanes) {
+  {
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      memoizedUpdaters.forEach(function(schedulingFiber) {
+        addFiberToLanesMap(root, schedulingFiber, lanes);
+      }); // This function intentionally does not clear memoized updaters.
+      // Those may still be relevant to the current commit
+      // and a future one (e.g. Suspense).
+    }
+  }
+}
 
 var didWarnAboutUnmockedScheduler = false; // TODO Before we release concurrent mode, revisit this and decide whether a mocked
 // scheduler is the actual recommendation. The alternative could be a testing build,
@@ -19370,7 +20351,7 @@ function warnIfUnmockedScheduler(fiber) {
       didWarnAboutUnmockedScheduler === false &&
       Scheduler.unstable_flushAllWithoutAsserting === undefined
     ) {
-      if (fiber.mode & BlockingMode || fiber.mode & ConcurrentMode) {
+      if (fiber.mode & ConcurrentMode) {
         didWarnAboutUnmockedScheduler = true;
 
         error(
@@ -19384,144 +20365,6 @@ function warnIfUnmockedScheduler(fiber) {
       }
     }
   }
-}
-
-function computeThreadID(root, lane) {
-  // Interaction threads are unique per root and expiration time.
-  // NOTE: Intentionally unsound cast. All that matters is that it's a number
-  // and it represents a batch of work. Could make a helper function instead,
-  // but meh this is fine for now.
-  return lane * 1000 + root.interactionThreadID;
-}
-
-function markSpawnedWork(lane) {
-  if (spawnedWorkDuringRender === null) {
-    spawnedWorkDuringRender = [lane];
-  } else {
-    spawnedWorkDuringRender.push(lane);
-  }
-}
-
-function scheduleInteractions(root, lane, interactions) {
-  if (interactions.size > 0) {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    var pendingInteractions = pendingInteractionMap.get(lane);
-
-    if (pendingInteractions != null) {
-      interactions.forEach(function(interaction) {
-        if (!pendingInteractions.has(interaction)) {
-          // Update the pending async work count for previously unscheduled interaction.
-          interaction.__count++;
-        }
-
-        pendingInteractions.add(interaction);
-      });
-    } else {
-      pendingInteractionMap.set(lane, new Set(interactions)); // Update the pending async work count for the current interactions.
-
-      interactions.forEach(function(interaction) {
-        interaction.__count++;
-      });
-    }
-
-    var subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lane);
-      subscriber.onWorkScheduled(interactions, threadID);
-    }
-  }
-}
-
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-
-function startWorkOnPendingInteractions(root, lanes) {
-  // we can accurately attribute time spent working on it, And so that cascading
-  // work triggered during the render phase will be associated with it.
-
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    if (includesSomeLane(lanes, scheduledLane)) {
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
-    }
-  }); // Store the current set of interactions on the FiberRoot for a few reasons:
-  // We can re-use it in hot functions like performConcurrentWorkOnRoot()
-  // without having to recalculate it. We will also use it in commitWork() to
-  // pass to any Profiler onRender() hooks. This also provides DevTools with a
-  // way to access it when the onCommitRoot() hook is called.
-
-  root.memoizedInteractions = interactions;
-
-  if (interactions.size > 0) {
-    var subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lanes);
-
-      try {
-        subscriber.onWorkStarted(interactions, threadID);
-      } catch (error) {
-        // If the subscriber throws, rethrow it in a separate task
-        scheduleCallback(ImmediatePriority$1, function() {
-          throw error;
-        });
-      }
-    }
-  }
-}
-
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  var subscriber;
-
-  try {
-    subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null && root.memoizedInteractions.size > 0) {
-      // FIXME: More than one lane can finish in a single commit.
-      var threadID = computeThreadID(root, committedLanes);
-      subscriber.onWorkStopped(root.memoizedInteractions, threadID);
-    }
-  } catch (error) {
-    // If the subscriber throws, rethrow it in a separate task
-    scheduleCallback(ImmediatePriority$1, function() {
-      throw error;
-    });
-  } finally {
-    // Clear completed interactions from the pending Map.
-    // Unless the render was suspended or cascading work was scheduled,
-    // In which case– leave pending interactions until the subsequent render.
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      // Only decrement the pending interaction count if we're done.
-      // If there's still work at the current priority,
-      // That indicates that we are waiting for suspense data.
-      if (!includesSomeLane(remainingLanesAfterCommit, lane)) {
-        pendingInteractionMap.delete(lane);
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-
-          if (subscriber !== null && interaction.__count === 0) {
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error) {
-              // If the subscriber throws, rethrow it in a separate task
-              scheduleCallback(ImmediatePriority$1, function() {
-                throw error;
-              });
-            }
-          }
-        });
-      }
-    });
-  }
 } // `act` testing API
 
 function shouldForceFlushFallbacksInDEV() {
@@ -19532,11 +20375,6 @@ function shouldForceFlushFallbacksInDEV() {
 
 var actingUpdatesScopeDepth = 0;
 
-function detachFiberAfterEffects(fiber) {
-  fiber.sibling = null;
-  fiber.stateNode = null;
-}
-
 var resolveFamily = null; // $FlowFixMe Flow gets confused by a WeakSet feature check below.
 
 var failedBoundaries = null;
@@ -19990,8 +20828,6 @@ var hasBadMapPolyfill;
   }
 }
 
-var debugCounter = 1;
-
 function FiberNode(tag, pendingProps, key, mode) {
   // Instance
   this.tag = tag;
@@ -20013,9 +20849,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.mode = mode; // Effects
 
   this.flags = NoFlags;
-  this.nextEffect = null;
-  this.firstEffect = null;
-  this.lastEffect = null;
+  this.subtreeFlags = NoFlags;
+  this.deletions = null;
   this.lanes = NoLanes;
   this.childLanes = NoLanes;
   this.alternate = null;
@@ -20048,7 +20883,6 @@ function FiberNode(tag, pendingProps, key, mode) {
 
   {
     // This isn't directly used but is handy for debugging internals:
-    this._debugID = debugCounter++;
     this._debugSource = null;
     this._debugOwner = null;
     this._debugNeedsRemount = false;
@@ -20128,7 +20962,6 @@ function createWorkInProgress(current, pendingProps) {
 
     {
       // DEV-only fields
-      workInProgress._debugID = current._debugID;
       workInProgress._debugSource = current._debugSource;
       workInProgress._debugOwner = current._debugOwner;
       workInProgress._debugHookTypes = current._debugHookTypes;
@@ -20142,11 +20975,10 @@ function createWorkInProgress(current, pendingProps) {
     workInProgress.type = current.type; // We already have an alternate.
     // Reset the effect tag.
 
-    workInProgress.flags = NoFlags; // The effect list is no longer valid.
+    workInProgress.flags = NoFlags; // The effects are no longer valid.
 
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
 
     {
       // We intentionally reset, rather than copy, actualDuration & actualStartTime.
@@ -20156,8 +20988,10 @@ function createWorkInProgress(current, pendingProps) {
       workInProgress.actualDuration = 0;
       workInProgress.actualStartTime = -1;
     }
-  }
+  } // Reset all effects except static ones.
+  // Static effects are not specific to a render.
 
+  workInProgress.flags = current.flags & StaticMask;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -20214,13 +21048,10 @@ function resetWorkInProgress(workInProgress, renderLanes) {
   // when they should be reading from current and writing to workInProgress.
   // We assume pendingProps, index, key, ref, return are still untouched to
   // avoid doing another reconciliation.
-  // Reset the effect tag but keep any Placement tags, since that's something
+  // Reset the effect flags but keep any Placement tags, since that's something
   // that child fiber is setting, not the reconciliation.
-  workInProgress.flags &= Placement; // The effect list is no longer valid.
+  workInProgress.flags &= StaticMask | Placement; // The effects are no longer valid.
 
-  workInProgress.nextEffect = null;
-  workInProgress.firstEffect = null;
-  workInProgress.lastEffect = null;
   var current = workInProgress.alternate;
 
   if (current === null) {
@@ -20228,6 +21059,7 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = NoLanes;
     workInProgress.lanes = renderLanes;
     workInProgress.child = null;
+    workInProgress.subtreeFlags = NoFlags;
     workInProgress.memoizedProps = null;
     workInProgress.memoizedState = null;
     workInProgress.updateQueue = null;
@@ -20245,6 +21077,8 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = current.childLanes;
     workInProgress.lanes = current.lanes;
     workInProgress.child = current.child;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
     workInProgress.memoizedProps = current.memoizedProps;
     workInProgress.memoizedState = current.memoizedState;
     workInProgress.updateQueue = current.updateQueue; // Needed because Blocks store data on type.
@@ -20271,13 +21105,19 @@ function resetWorkInProgress(workInProgress, renderLanes) {
 
   return workInProgress;
 }
-function createHostRootFiber(tag) {
+function createHostRootFiber(
+  tag,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var mode;
 
   if (tag === ConcurrentRoot) {
-    mode = ConcurrentMode | BlockingMode | StrictMode;
-  } else if (tag === BlockingRoot) {
-    mode = BlockingMode | StrictMode;
+    mode = ConcurrentMode;
+
+    if (isStrictMode === true) {
+      mode |= StrictLegacyMode;
+    }
   } else {
     mode = NoMode;
   }
@@ -20329,7 +21169,8 @@ function createFiberFromTypeAndProps(
 
       case REACT_STRICT_MODE_TYPE:
         fiberTag = Mode;
-        mode |= StrictMode;
+        mode |= StrictLegacyMode;
+
         break;
 
       case REACT_PROFILER_TYPE:
@@ -20351,6 +21192,10 @@ function createFiberFromTypeAndProps(
 
       // eslint-disable-next-line no-fallthrough
 
+      case REACT_CACHE_TYPE:
+
+      // eslint-disable-next-line no-fallthrough
+
       default: {
         if (typeof type === "object" && type !== null) {
           switch (type.$$typeof) {
@@ -20380,10 +21225,6 @@ function createFiberFromTypeAndProps(
               fiberTag = LazyComponent;
               resolvedType = null;
               break getTag;
-
-            case REACT_BLOCK_TYPE:
-              fiberTag = Block;
-              break getTag;
           }
         }
 
@@ -20402,7 +21243,7 @@ function createFiberFromTypeAndProps(
               "named imports.";
           }
 
-          var ownerName = owner ? getComponentName(owner.type) : null;
+          var ownerName = owner ? getComponentNameFromFiber(owner) : null;
 
           if (ownerName) {
             info += "\n\nCheck the render method of `" + ownerName + "`.";
@@ -20467,14 +21308,15 @@ function createFiberFromFragment(elements, mode, lanes, key) {
 function createFiberFromProfiler(pendingProps, mode, lanes, key) {
   {
     if (typeof pendingProps.id !== "string") {
-      error('Profiler must specify an "id" as a prop');
+      error(
+        'Profiler must specify an "id" of type `string` as a prop. Received the type `%s` instead.',
+        typeof pendingProps.id
+      );
     }
   }
 
-  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode); // TODO: The Profiler fiber shouldn't have a type. It has a tag.
-
+  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
   fiber.elementType = REACT_PROFILER_TYPE;
-  fiber.type = REACT_PROFILER_TYPE;
   fiber.lanes = lanes;
 
   {
@@ -20488,51 +21330,25 @@ function createFiberFromProfiler(pendingProps, mode, lanes, key) {
 }
 
 function createFiberFromSuspense(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode); // TODO: The SuspenseComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  fiber.type = REACT_SUSPENSE_TYPE;
+  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode);
   fiber.elementType = REACT_SUSPENSE_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromSuspenseList(pendingProps, mode, lanes, key) {
   var fiber = createFiber(SuspenseListComponent, pendingProps, key, mode);
-
-  {
-    // TODO: The SuspenseListComponent fiber shouldn't have a type. It has a tag.
-    // This needs to be fixed in getComponentName so that it relies on the tag
-    // instead.
-    fiber.type = REACT_SUSPENSE_LIST_TYPE;
-  }
-
   fiber.elementType = REACT_SUSPENSE_LIST_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode); // TODO: The OffscreenComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_OFFSCREEN_TYPE;
-  }
-
+  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_OFFSCREEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromLegacyHidden(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode); // TODO: The LegacyHidden fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_LEGACY_HIDDEN_TYPE;
-  }
-
+  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_LEGACY_HIDDEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
@@ -20583,9 +21399,8 @@ function assignFiberPropertiesInDEV(target, source) {
   target.dependencies = source.dependencies;
   target.mode = source.mode;
   target.flags = source.flags;
-  target.nextEffect = source.nextEffect;
-  target.firstEffect = source.firstEffect;
-  target.lastEffect = source.lastEffect;
+  target.subtreeFlags = source.subtreeFlags;
+  target.deletions = source.deletions;
   target.lanes = source.lanes;
   target.childLanes = source.childLanes;
   target.alternate = source.alternate;
@@ -20597,7 +21412,6 @@ function assignFiberPropertiesInDEV(target, source) {
     target.treeBaseDuration = source.treeBaseDuration;
   }
 
-  target._debugID = source._debugID;
   target._debugSource = source._debugSource;
   target._debugOwner = source._debugOwner;
   target._debugNeedsRemount = source._debugNeedsRemount;
@@ -20617,7 +21431,7 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.pendingContext = null;
   this.hydrate = hydrate;
   this.callbackNode = null;
-  this.callbackPriority = NoLanePriority;
+  this.callbackPriority = NoLane;
   this.eventTimes = createLaneMap(NoLanes);
   this.expirationTimes = createLaneMap(NoTimestamp);
   this.pendingLanes = NoLanes;
@@ -20630,17 +21444,21 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.entanglements = createLaneMap(NoLanes);
 
   {
-    this.interactionThreadID = tracing.unstable_getThreadID();
-    this.memoizedInteractions = new Set();
-    this.pendingInteractionMap = new Map();
+    this.effectDuration = 0;
+    this.passiveEffectDuration = 0;
   }
 
   {
-    switch (tag) {
-      case BlockingRoot:
-        this._debugRootType = "createBlockingRoot()";
-        break;
+    this.memoizedUpdaters = new Set();
+    var pendingUpdatersLaneMap = (this.pendingUpdatersLaneMap = []);
+
+    for (var i = 0; i < TotalLanes; i++) {
+      pendingUpdatersLaneMap.push(new Set());
+    }
+  }
 
+  {
+    switch (tag) {
       case ConcurrentRoot:
         this._debugRootType = "createRoot()";
         break;
@@ -20652,13 +21470,28 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   }
 }
 
-function createFiberRoot(containerInfo, tag, hydrate, hydrationCallbacks) {
+function createFiberRoot(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var root = new FiberRootNode(containerInfo, tag, hydrate);
   // stateNode is any.
 
-  var uninitializedFiber = createHostRootFiber(tag);
+  var uninitializedFiber = createHostRootFiber(tag, isStrictMode);
   root.current = uninitializedFiber;
   uninitializedFiber.stateNode = root;
+
+  {
+    var _initialState = {
+      element: null
+    };
+    uninitializedFiber.memoizedState = _initialState;
+  }
+
   initializeUpdateQueue(uninitializedFiber);
   return root;
 }
@@ -20732,8 +21565,8 @@ function findHostInstanceWithWarning(component, methodName) {
       return null;
     }
 
-    if (hostFiber.mode & StrictMode) {
-      var componentName = getComponentName(fiber.type) || "Component";
+    if (hostFiber.mode & StrictLegacyMode) {
+      var componentName = getComponentNameFromFiber(fiber) || "Component";
 
       if (!didWarnAboutFindNodeInStrictMode[componentName]) {
         didWarnAboutFindNodeInStrictMode[componentName] = true;
@@ -20742,7 +21575,7 @@ function findHostInstanceWithWarning(component, methodName) {
         try {
           setCurrentFiber(hostFiber);
 
-          if (fiber.mode & StrictMode) {
+          if (fiber.mode & StrictLegacyMode) {
             error(
               "%s is deprecated in StrictMode. " +
                 "%s was passed an instance of %s which is inside StrictMode. " +
@@ -20781,8 +21614,21 @@ function findHostInstanceWithWarning(component, methodName) {
   }
 }
 
-function createContainer(containerInfo, tag, hydrate, hydrationCallbacks) {
-  return createFiberRoot(containerInfo, tag, hydrate);
+function createContainer(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
+  return createFiberRoot(
+    containerInfo,
+    tag,
+    hydrate,
+    hydrationCallbacks,
+    isStrictMode
+  );
 }
 function updateContainer(element, container, parentComponent, callback) {
   {
@@ -20818,7 +21664,7 @@ function updateContainer(element, container, parentComponent, callback) {
           "triggering nested component updates from render is not allowed. " +
           "If necessary, trigger nested updates in componentDidUpdate.\n\n" +
           "Check the render method of %s.",
-        getComponentName(current.type) || "Unknown"
+        getComponentNameFromFiber(current) || "Unknown"
       );
     }
   }
@@ -20846,7 +21692,12 @@ function updateContainer(element, container, parentComponent, callback) {
   }
 
   enqueueUpdate(current$1, update);
-  scheduleUpdateOnFiber(current$1, lane, eventTime);
+  var root = scheduleUpdateOnFiber(current$1, lane, eventTime);
+
+  if (root !== null) {
+    entangleTransitions(root, current$1, lane);
+  }
+
   return lane;
 }
 function getPublicRootInstance(container) {
@@ -20865,6 +21716,14 @@ function getPublicRootInstance(container) {
   }
 }
 
+var shouldErrorImpl = function(fiber) {
+  return null;
+};
+
+function shouldError(fiber) {
+  return shouldErrorImpl(fiber);
+}
+
 var shouldSuspendImpl = function(fiber) {
   return false;
 };
@@ -20879,15 +21738,16 @@ var overrideProps = null;
 var overridePropsDeletePath = null;
 var overridePropsRenamePath = null;
 var scheduleUpdate = null;
+var setErrorHandler = null;
 var setSuspenseHandler = null;
 
 {
   var copyWithDeleteImpl = function(obj, path, index) {
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === path.length) {
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(key, 1);
       } else {
         delete updated[key];
@@ -20906,14 +21766,14 @@ var setSuspenseHandler = null;
 
   var copyWithRenameImpl = function(obj, oldPath, newPath, index) {
     var oldKey = oldPath[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === oldPath.length) {
       var newKey = newPath[index]; // $FlowFixMe number or string is fine here
 
       updated[newKey] = updated[oldKey];
 
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(oldKey, 1);
       } else {
         delete updated[oldKey];
@@ -20958,7 +21818,7 @@ var setSuspenseHandler = null;
     }
 
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
 
     updated[key] = copyWithSetImpl(obj[key], path, index + 1, value);
     return updated;
@@ -21066,6 +21926,10 @@ var setSuspenseHandler = null;
     scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
   };
 
+  setErrorHandler = function(newShouldErrorImpl) {
+    shouldErrorImpl = newShouldErrorImpl;
+  };
+
   setSuspenseHandler = function(newShouldSuspendImpl) {
     shouldSuspendImpl = newShouldSuspendImpl;
   };
@@ -21103,6 +21967,7 @@ function injectIntoDevTools(devToolsConfig) {
     overrideProps: overrideProps,
     overridePropsDeletePath: overridePropsDeletePath,
     overridePropsRenamePath: overridePropsRenamePath,
+    setErrorHandler: setErrorHandler,
     setSuspenseHandler: setSuspenseHandler,
     scheduleUpdate: scheduleUpdate,
     currentDispatcherRef: ReactCurrentDispatcher,
@@ -21115,7 +21980,10 @@ function injectIntoDevTools(devToolsConfig) {
     scheduleRoot: scheduleRoot,
     setRefreshHandler: setRefreshHandler,
     // Enables DevTools to append owner stacks to error messages in DEV mode.
-    getCurrentFiber: getCurrentFiberForDevTools
+    getCurrentFiber: getCurrentFiberForDevTools,
+    // Enables DevTools to detect reconciler version rather than renderer version
+    // which may not match for third party renderers.
+    reconcilerVersion: ReactVersion
   });
 }
 
@@ -21192,7 +22060,7 @@ var getInspectorDataForViewAtPoint;
   var createHierarchy = function(fiberHierarchy) {
     return fiberHierarchy.map(function(fiber) {
       return {
-        name: getComponentName(fiber.type),
+        name: getComponentNameFromType(fiber.type),
         getInspectorData: function(findNodeHandle) {
           return {
             props: getHostProps(fiber),
@@ -21307,23 +22175,25 @@ var getInspectorDataForViewAtPoint;
           }
 
           closestInstance =
-            internalInstanceHandle.stateNode.canonical._internalInstanceHandle;
+            internalInstanceHandle.stateNode.canonical._internalInstanceHandle; // Note: this is deprecated and we want to remove it ASAP. Keeping it here for React DevTools compatibility for now.
+
+          var nativeViewTag =
+            internalInstanceHandle.stateNode.canonical._nativeTag;
           nativeFabricUIManager.measure(
             internalInstanceHandle.stateNode.node,
             function(x, y, width, height, pageX, pageY) {
+              var inspectorData = getInspectorDataForInstance(closestInstance);
               callback(
-                Object.assign(
-                  {
-                    pointerY: locationY,
-                    frame: {
-                      left: pageX,
-                      top: pageY,
-                      width: width,
-                      height: height
-                    }
+                Object.assign({}, inspectorData, {
+                  pointerY: locationY,
+                  frame: {
+                    left: pageX,
+                    top: pageY,
+                    width: width,
+                    height: height
                   },
-                  getInspectorDataForInstance(closestInstance)
-                )
+                  touchedViewTag: nativeViewTag
+                })
               );
             }
           );
@@ -21376,7 +22246,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -21386,13 +22256,15 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
 
   if (componentOrHandle == null) {
     return null;
-  }
+  } // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
 
   if (componentOrHandle._nativeTag) {
+    // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
     return componentOrHandle;
-  }
+  } // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
 
   if (componentOrHandle.canonical && componentOrHandle.canonical._nativeTag) {
+    // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
     return componentOrHandle.canonical;
   }
 
@@ -21412,7 +22284,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
   if (hostInstance.canonical) {
     // Fabric
     return hostInstance.canonical;
-  }
+  } // $FlowFixMe[incompatible-return]
 
   return hostInstance;
 }
@@ -21429,7 +22301,7 @@ function findNodeHandle(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -21503,17 +22375,49 @@ function dispatchCommand(handle, command, args) {
   }
 }
 
-function render(element, containerTag, callback) {
+function sendAccessibilityEvent(handle, eventType) {
+  if (handle._nativeTag == null) {
+    {
+      error(
+        "sendAccessibilityEvent was called with a ref that isn't a " +
+          "native component. Use React.forwardRef to get access to the underlying native component"
+      );
+    }
+
+    return;
+  }
+
+  if (handle._internalInstanceHandle) {
+    nativeFabricUIManager.sendAccessibilityEvent(
+      handle._internalInstanceHandle.stateNode.node,
+      eventType
+    );
+  } else {
+    ReactNativePrivateInterface.legacySendAccessibilityEvent(
+      handle._nativeTag,
+      eventType
+    );
+  }
+}
+
+function render(element, containerTag, callback, concurrentRoot) {
   var root = roots.get(containerTag);
 
   if (!root) {
     // TODO (bvaughn): If we decide to keep the wrapper component,
     // We could create a wrapper for containerTag as well to reduce special casing.
-    root = createContainer(containerTag, LegacyRoot, false);
+    root = createContainer(
+      containerTag,
+      concurrentRoot ? ConcurrentRoot : LegacyRoot,
+      false,
+      null,
+      false
+    );
     roots.set(containerTag, root);
   }
 
-  updateContainer(element, root, null, callback);
+  updateContainer(element, root, null, callback); // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
+
   return getPublicRootInstance(root);
 }
 
@@ -21559,6 +22463,7 @@ exports.dispatchCommand = dispatchCommand;
 exports.findHostInstance_DEPRECATED = findHostInstance_DEPRECATED;
 exports.findNodeHandle = findNodeHandle;
 exports.render = render;
+exports.sendAccessibilityEvent = sendAccessibilityEvent;
 exports.stopSurface = stopSurface;
 exports.unmountComponentAtNode = unmountComponentAtNode;
 
diff --git a/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
index f6394cfd93c547..1269db5791b921 100644
--- a/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
+++ b/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
@@ -7,13 +7,14 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated
+ * @generated SignedSource<<64b88a48c0e9e26ebfbee2286b912b78>>
  */
 
 "use strict";
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface"),
   React = require("react"),
+  dynamicFlags = require("ReactNativeInternalFeatureFlags"),
   Scheduler = require("scheduler");
 function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
@@ -62,7 +63,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -74,7 +76,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -288,36 +290,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -325,9 +337,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -337,12 +349,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -568,7 +580,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -919,7 +931,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_219 = {
+var injectedNamesToPlugins$jscomp$inline_221 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -954,34 +966,34 @@ var injectedNamesToPlugins$jscomp$inline_219 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_220 = !1,
-  pluginName$jscomp$inline_221;
-for (pluginName$jscomp$inline_221 in injectedNamesToPlugins$jscomp$inline_219)
+  isOrderingDirty$jscomp$inline_222 = !1,
+  pluginName$jscomp$inline_223;
+for (pluginName$jscomp$inline_223 in injectedNamesToPlugins$jscomp$inline_221)
   if (
-    injectedNamesToPlugins$jscomp$inline_219.hasOwnProperty(
-      pluginName$jscomp$inline_221
+    injectedNamesToPlugins$jscomp$inline_221.hasOwnProperty(
+      pluginName$jscomp$inline_223
     )
   ) {
-    var pluginModule$jscomp$inline_222 =
-      injectedNamesToPlugins$jscomp$inline_219[pluginName$jscomp$inline_221];
+    var pluginModule$jscomp$inline_224 =
+      injectedNamesToPlugins$jscomp$inline_221[pluginName$jscomp$inline_223];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_221) ||
-      namesToPlugins[pluginName$jscomp$inline_221] !==
-        pluginModule$jscomp$inline_222
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_223) ||
+      namesToPlugins[pluginName$jscomp$inline_223] !==
+        pluginModule$jscomp$inline_224
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_221])
+      if (namesToPlugins[pluginName$jscomp$inline_223])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_221 +
+            pluginName$jscomp$inline_223 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_221
-      ] = pluginModule$jscomp$inline_222;
-      isOrderingDirty$jscomp$inline_220 = !0;
+        pluginName$jscomp$inline_223
+      ] = pluginModule$jscomp$inline_224;
+      isOrderingDirty$jscomp$inline_222 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_220 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_222 && recomputePluginOrdering();
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
@@ -996,7 +1008,22 @@ getNodeFromInstance = function(inst) {
 };
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
-    null !== to
+    var fromOrTo = from || to;
+    (fromOrTo = fromOrTo && fromOrTo.stateNode) &&
+    fromOrTo.canonical._internalInstanceHandle
+      ? (from &&
+          nativeFabricUIManager.setIsJSResponder(
+            from.stateNode.node,
+            !1,
+            blockNativeResponder || !1
+          ),
+        to &&
+          nativeFabricUIManager.setIsJSResponder(
+            to.stateNode.node,
+            !0,
+            blockNativeResponder || !1
+          ))
+      : null !== to
       ? ReactNativePrivateInterface.UIManager.setJSResponder(
           to.stateNode.canonical._nativeTag,
           blockNativeResponder
@@ -1018,10 +1045,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1036,11 +1063,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1050,7 +1077,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1067,6 +1094,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1076,24 +1105,85 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
+var enablePersistentOffscreenHostContainer =
+  dynamicFlags.enablePersistentOffscreenHostContainer;
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1102,7 +1192,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1190,33 +1280,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
@@ -1245,7 +1318,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1291,9 +1364,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1318,7 +1391,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1334,7 +1407,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1351,7 +1424,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1469,7 +1542,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1529,6 +1602,225 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
     }
   });
 }
+var scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null;
+function onCommitRoot(root) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        void 0,
+        128 === (root.current.flags & 128)
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 === (root.current.mode & 32) &&
+    0 !== (nextLanes & 4) &&
+    (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$7 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$7;
+    remainingLanes[index$7] = 0;
+    eventTimes[index$7] = -1;
+    root[index$7] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$8 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$8;
+    (lane & entangledLanes) | (root[index$8] & entangledLanes) &&
+      (root[index$8] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
 function shim() {
   throw Error(
     "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
@@ -1554,6 +1846,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
   fabricMeasure = _nativeFabricUIManage.measure,
   fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
   fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
+  FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
+  fabricGetCurrentEventPriority =
+    _nativeFabricUIManage.unstable_getCurrentEventPriority,
   getViewConfigForType =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
   nextReactTag = 2;
@@ -1578,38 +1873,79 @@ var ReactFabricHostComponent = (function() {
     ReactNativePrivateInterface.TextInputState.focusTextInput(this);
   };
   _proto.measure = function(callback) {
-    fabricMeasure(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
+    var stateNode = this._internalInstanceHandle.stateNode;
+    null != stateNode &&
+      fabricMeasure(
+        stateNode.node,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+      );
   };
   _proto.measureInWindow = function(callback) {
-    fabricMeasureInWindow(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
+    var stateNode = this._internalInstanceHandle.stateNode;
+    null != stateNode &&
+      fabricMeasureInWindow(
+        stateNode.node,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+      );
   };
   _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
-    "number" !== typeof relativeToNativeNode &&
-      relativeToNativeNode instanceof ReactFabricHostComponent &&
-      fabricMeasureLayout(
-        this._internalInstanceHandle.stateNode.node,
-        relativeToNativeNode._internalInstanceHandle.stateNode.node,
-        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
-      );
+    if (
+      "number" !== typeof relativeToNativeNode &&
+      relativeToNativeNode instanceof ReactFabricHostComponent
+    ) {
+      var toStateNode = this._internalInstanceHandle.stateNode;
+      relativeToNativeNode =
+        relativeToNativeNode._internalInstanceHandle.stateNode;
+      null != toStateNode &&
+        null != relativeToNativeNode &&
+        fabricMeasureLayout(
+          toStateNode.node,
+          relativeToNativeNode.node,
+          mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+          mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        );
+    }
   };
   _proto.setNativeProps = function() {};
   return ReactFabricHostComponent;
 })();
+function createInstance(
+  type,
+  props,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  hostContext = nextReactTag;
+  nextReactTag += 2;
+  type = getViewConfigForType(type);
+  var updatePayload = diffProperties(
+    null,
+    emptyObject,
+    props,
+    type.validAttributes
+  );
+  rootContainerInstance = createNode(
+    hostContext,
+    type.uiViewClassName,
+    rootContainerInstance,
+    updatePayload,
+    internalInstanceHandle
+  );
+  props = new ReactFabricHostComponent(
+    hostContext,
+    type,
+    props,
+    internalInstanceHandle
+  );
+  return { node: rootContainerInstance, canonical: props };
+}
 function createTextInstance(
   text,
   rootContainerInstance,
   hostContext,
   internalInstanceHandle
 ) {
-  if (!hostContext.isInAParentText)
-    throw Error("Text strings must be rendered within a <Text> component.");
   hostContext = nextReactTag;
   nextReactTag += 2;
   return {
@@ -1624,6 +1960,11 @@ function createTextInstance(
 }
 var scheduleTimeout = setTimeout,
   cancelTimeout = clearTimeout;
+function getOffscreenContainerProps(mode, children) {
+  return "hidden" === mode
+    ? { children: children, style: { display: "none" } }
+    : { children: children, style: { flex: 1 } };
+}
 function cloneHiddenInstance(instance) {
   var node = instance.node;
   var JSCompiler_inline_result = diffProperties(
@@ -1647,7 +1988,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1701,13 +2043,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1743,346 +2085,79 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  Scheduler_now = Scheduler.unstable_now;
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
+  if (!isFlushingSyncQueue && null !== syncQueue) {
+    isFlushingSyncQueue = !0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
+    try {
+      var queue = syncQueue;
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
+      syncQueue = null;
+      includesLegacySyncCallbacks = !1;
+    } catch (error) {
+      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+      error);
+    } finally {
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
+    }
   }
+  return null;
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
+var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
+function is(x, y) {
+  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
+}
+var objectIs = "function" === typeof Object.is ? Object.is : is;
+function shallowEqual(objA, objB) {
+  if (objectIs(objA, objB)) return !0;
+  if (
+    "object" !== typeof objA ||
+    null === objA ||
+    "object" !== typeof objB ||
+    null === objB
+  )
+    return !1;
+  var keysA = Object.keys(objA),
+    keysB = Object.keys(objB);
+  if (keysA.length !== keysB.length) return !1;
+  for (keysB = 0; keysB < keysA.length; keysB++)
+    if (
+      !hasOwnProperty.call(objB, keysA[keysB]) ||
+      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
+    )
+      return !1;
+  return !0;
+}
+function describeFiber(fiber) {
+  switch (fiber.tag) {
     case 5:
-      return 97;
-    case 3:
+      return describeComponentFrame(fiber.type, null, null);
+    case 16:
+      return describeComponentFrame("Lazy", null, null);
+    case 13:
+      return describeComponentFrame("Suspense", null, null);
+    case 19:
+      return describeComponentFrame("SuspenseList", null, null);
+    case 0:
     case 2:
+    case 15:
+      return describeFunctionComponentFrame(fiber.type, null);
+    case 11:
+      return describeFunctionComponentFrame(fiber.type.render, null);
     case 1:
-      return 95;
-    case 0:
-      return 90;
+      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
-}
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority,
-  fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
-  if (!isFlushingSyncQueue && null !== syncQueue) {
-    isFlushingSyncQueue = !0;
-    var i = 0;
-    try {
-      var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
-      syncQueue = null;
-    } catch (error) {
-      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
-      error);
-    } finally {
-      isFlushingSyncQueue = !1;
-    }
-  }
-}
-var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
-function is(x, y) {
-  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
-}
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
-function shallowEqual(objA, objB) {
-  if (objectIs(objA, objB)) return !0;
-  if (
-    "object" !== typeof objA ||
-    null === objA ||
-    "object" !== typeof objB ||
-    null === objB
-  )
-    return !1;
-  var keysA = Object.keys(objA),
-    keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) return !1;
-  for (keysB = 0; keysB < keysA.length; keysB++)
-    if (
-      !hasOwnProperty.call(objB, keysA[keysB]) ||
-      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
-    )
-      return !1;
-  return !0;
-}
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case 5:
-      return describeComponentFrame(fiber.type, null, null);
-    case 16:
-      return describeComponentFrame("Lazy", null, null);
-    case 13:
-      return describeComponentFrame("Suspense", null, null);
-    case 19:
-      return describeComponentFrame("SuspenseList", null, null);
-    case 0:
-    case 2:
-    case 15:
-      return describeFunctionComponentFrame(fiber.type, null);
-    case 11:
-      return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
-    case 1:
-      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
-    default:
-      return "";
+      return "";
   }
 }
 function resolveDefaultProps(Component, baseProps) {
@@ -2099,14 +2174,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue2 = currentValue;
+  context._currentValue2 = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2126,44 +2201,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue2;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue2;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2189,14 +2260,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 2)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2265,111 +2356,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2425,7 +2516,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2436,7 +2528,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2446,7 +2539,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2518,7 +2612,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2540,7 +2633,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2593,25 +2685,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2643,16 +2732,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2667,7 +2756,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2756,7 +2854,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2781,22 +2879,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2824,15 +2914,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2843,7 +2925,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3020,66 +3102,49 @@ function ChildReconciler(shouldTrackSideEffects) {
     return iteratorFn;
   }
   return function(returnFiber, currentFirstChild, newChild, lanes) {
-    var isUnkeyedTopLevelFragment =
-      "object" === typeof newChild &&
+    "object" === typeof newChild &&
       null !== newChild &&
       newChild.type === REACT_FRAGMENT_TYPE &&
-      null === newChild.key;
-    isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+      null === newChild.key &&
+      (newChild = newChild.props.children);
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
             for (
-              isUnkeyedTopLevelFragment = currentFirstChild;
-              null !== isUnkeyedTopLevelFragment;
+              var key = newChild.key, child = currentFirstChild;
+              null !== child;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (child.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === child.tag) {
+                    deleteRemainingChildren(returnFiber, child.sibling);
+                    currentFirstChild = useFiber(
+                      child,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (child.elementType === key) {
+                  deleteRemainingChildren(returnFiber, child.sibling);
+                  currentFirstChild = useFiber(child, newChild.props);
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    child,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
-                deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
+                deleteRemainingChildren(returnFiber, child);
                 break;
-              } else deleteChild(returnFiber, isUnkeyedTopLevelFragment);
-              isUnkeyedTopLevelFragment = isUnkeyedTopLevelFragment.sibling;
+              } else deleteChild(returnFiber, child);
+              child = child.sibling;
             }
             newChild.type === REACT_FRAGMENT_TYPE
               ? ((currentFirstChild = createFiberFromFragment(
@@ -3109,12 +3174,8 @@ function ChildReconciler(shouldTrackSideEffects) {
           return placeSingleChild(returnFiber);
         case REACT_PORTAL_TYPE:
           a: {
-            for (
-              isUnkeyedTopLevelFragment = newChild.key;
-              null !== currentFirstChild;
-
-            ) {
-              if (currentFirstChild.key === isUnkeyedTopLevelFragment)
+            for (child = newChild.key; null !== currentFirstChild; ) {
+              if (currentFirstChild.key === child)
                 if (
                   4 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
@@ -3150,9 +3211,24 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
-    if ("string" === typeof newChild || "number" === typeof newChild)
-      return (
-        (newChild = "" + newChild),
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
+    return "string" === typeof newChild || "number" === typeof newChild
+      ? ((newChild = "" + newChild),
         null !== currentFirstChild && 6 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(currentFirstChild, newChild)),
@@ -3166,36 +3242,8 @@ function ChildReconciler(shouldTrackSideEffects) {
             )),
             (currentFirstChild.return = returnFiber),
             (returnFiber = currentFirstChild)),
-        placeSingleChild(returnFiber)
-      );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
-    if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
-      switch (returnFiber.tag) {
-        case 1:
-        case 22:
-        case 0:
-        case 11:
-        case 15:
-          throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
-              "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
-          );
-      }
-    return deleteRemainingChildren(returnFiber, currentFirstChild);
+        placeSingleChild(returnFiber))
+      : deleteRemainingChildren(returnFiber, currentFirstChild);
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
@@ -3253,7 +3301,7 @@ function findFirstSuspended(row) {
       if (null !== state && (null === state.dehydrated || shim$1() || shim$1()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3405,10 +3453,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3433,22 +3482,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3474,7 +3534,7 @@ function rerenderReducer(reducer) {
   }
   return [newState, dispatch];
 }
-function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
+function readFromUnsubscribedMutableSource(root, source, getSnapshot) {
   var getVersion = source._getVersion;
   getVersion = getVersion(source._source);
   var JSCompiler_inline_result = source._workInProgressVersionSecondary;
@@ -3488,7 +3548,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3501,7 +3561,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     version = getVersion(source._source),
     dispatcher = ReactCurrentDispatcher$1.current,
     _dispatcher$useState = dispatcher.useState(function() {
-      return readFromUnsubcribedMutableSource(root, source, getSnapshot);
+      return readFromUnsubscribedMutableSource(root, source, getSnapshot);
     }),
     setSnapshot = _dispatcher$useState[1],
     snapshot = _dispatcher$useState[0];
@@ -3518,25 +3578,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$11 = 31 - clz32(lanes),
-            lane = 1 << index$11;
-          entanglements[index$11] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3563,6 +3611,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3574,7 +3624,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     )),
     (_dispatcher$useState.queue = hook),
     (_dispatcher$useState.baseQueue = null),
-    (snapshot = readFromUnsubcribedMutableSource(root, source, getSnapshot)),
+    (snapshot = readFromUnsubscribedMutableSource(root, source, getSnapshot)),
     (_dispatcher$useState.memoizedState = _dispatcher$useState.baseState = snapshot));
   return snapshot;
 }
@@ -3588,6 +3638,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3636,7 +3688,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3644,10 +3696,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3708,19 +3760,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3732,33 +3783,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 2)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3815,6 +3892,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3856,7 +3935,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3905,8 +3984,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3947,50 +4027,651 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
       return rerenderReducer(basicStateReducer)[0];
     },
     unstable_isNewReconciler: !1
-  },
-  ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
-  didReceiveUpdate = !1;
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  workInProgress.child =
-    null === current
-      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
-      : reconcileChildFibers(
-          workInProgress,
-          current.child,
-          nextChildren,
-          renderLanes
-        );
+  };
+function createCapturedValue(value, source) {
+  try {
+    var info = "",
+      node = source;
+    do (info += describeFiber(node)), (node = node.return);
+    while (node);
+    var JSCompiler_inline_result = info;
+  } catch (x) {
+    JSCompiler_inline_result =
+      "\nError generating stack: " + x.message + "\n" + x.stack;
+  }
+  return { value: value, source: source, stack: JSCompiler_inline_result };
 }
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  Component = Component.render;
-  var ref = workInProgress.ref;
-  prepareToReadContext(workInProgress, renderLanes);
-  nextProps = renderWithHooks(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    ref,
-    renderLanes
-  );
-  if (null !== current && !didReceiveUpdate)
-    return (
-      (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      return getDerivedStateFromError(error);
+    };
+    lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
+function hadNoMutationsEffects(current, completedWork) {
+  if (null !== current && current.child === completedWork.child) return !0;
+  if (0 !== (completedWork.flags & 16)) return !1;
+  for (current = completedWork.child; null !== current; ) {
+    if (0 !== (current.flags & 6454) || 0 !== (current.subtreeFlags & 6454))
+      return !1;
+    current = current.sibling;
+  }
+  return !0;
+}
+var appendAllChildren, updateHostContainer, updateHostComponent, updateHostText;
+appendAllChildren = function(
+  parent,
+  workInProgress,
+  needsVisibilityToggle,
+  isHidden
+) {
+  for (var node = workInProgress.child; null !== node; ) {
+    if (5 === node.tag) {
+      var instance = node.stateNode;
+      needsVisibilityToggle &&
+        isHidden &&
+        (instance = cloneHiddenInstance(instance));
+      appendChildNode(parent.node, instance.node);
+    } else if (6 === node.tag) {
+      instance = node.stateNode;
+      if (needsVisibilityToggle && isHidden)
+        throw Error("Not yet implemented.");
+      appendChildNode(parent.node, instance.node);
+    } else if (4 !== node.tag)
+      if (22 === node.tag && null !== node.memoizedState)
+        (instance = node.child),
+          null !== instance && (instance.return = node),
+          enablePersistentOffscreenHostContainer
+            ? appendAllChildren(parent, node, !1, !1)
+            : appendAllChildren(parent, node, !0, !0);
+      else if (null !== node.child) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      }
+    if (node === workInProgress) break;
+    for (; null === node.sibling; ) {
+      if (null === node.return || node.return === workInProgress) return;
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+};
+function appendAllChildrenToContainer(
+  containerChildSet,
+  workInProgress,
+  needsVisibilityToggle,
+  isHidden
+) {
+  for (var node = workInProgress.child; null !== node; ) {
+    if (5 === node.tag) {
+      var instance = node.stateNode;
+      needsVisibilityToggle &&
+        isHidden &&
+        (instance = cloneHiddenInstance(instance));
+      appendChildNodeToSet(containerChildSet, instance.node);
+    } else if (6 === node.tag) {
+      instance = node.stateNode;
+      if (needsVisibilityToggle && isHidden)
+        throw Error("Not yet implemented.");
+      appendChildNodeToSet(containerChildSet, instance.node);
+    } else if (4 !== node.tag)
+      if (22 === node.tag && null !== node.memoizedState)
+        (instance = node.child),
+          null !== instance && (instance.return = node),
+          enablePersistentOffscreenHostContainer
+            ? appendAllChildrenToContainer(containerChildSet, node, !1, !1)
+            : appendAllChildrenToContainer(containerChildSet, node, !0, !0);
+      else if (null !== node.child) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      }
+    if (node === workInProgress) break;
+    for (; null === node.sibling; ) {
+      if (null === node.return || node.return === workInProgress) return;
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+}
+updateHostContainer = function(current, workInProgress) {
+  var portalOrRoot = workInProgress.stateNode;
+  if (!hadNoMutationsEffects(current, workInProgress)) {
+    current = portalOrRoot.containerInfo;
+    var newChildSet = createChildNodeSet(current);
+    appendAllChildrenToContainer(newChildSet, workInProgress, !1, !1);
+    portalOrRoot.pendingChildren = newChildSet;
+    workInProgress.flags |= 4;
+    completeRoot(current, newChildSet);
+  }
+};
+updateHostComponent = function(current, workInProgress, type, newProps) {
+  type = current.stateNode;
+  var oldProps = current.memoizedProps;
+  if (
+    (current = hadNoMutationsEffects(current, workInProgress)) &&
+    oldProps === newProps
+  )
+    workInProgress.stateNode = type;
+  else {
+    var recyclableInstance = workInProgress.stateNode;
+    requiredContext(contextStackCursor$1.current);
+    var updatePayload = null;
+    oldProps !== newProps &&
+      ((oldProps = diffProperties(
+        null,
+        oldProps,
+        newProps,
+        recyclableInstance.canonical.viewConfig.validAttributes
+      )),
+      (recyclableInstance.canonical.currentProps = newProps),
+      (updatePayload = oldProps));
+    current && null === updatePayload
+      ? (workInProgress.stateNode = type)
+      : ((newProps = updatePayload),
+        (oldProps = type.node),
+        (type = {
+          node: current
+            ? null !== newProps
+              ? cloneNodeWithNewProps(oldProps, newProps)
+              : cloneNode(oldProps)
+            : null !== newProps
+            ? cloneNodeWithNewChildrenAndProps(oldProps, newProps)
+            : cloneNodeWithNewChildren(oldProps),
+          canonical: type.canonical
+        }),
+        (workInProgress.stateNode = type),
+        current
+          ? (workInProgress.flags |= 4)
+          : appendAllChildren(type, workInProgress, !1, !1));
+  }
+};
+updateHostText = function(current, workInProgress, oldText, newText) {
+  oldText !== newText
+    ? ((current = requiredContext(rootInstanceStackCursor.current)),
+      (oldText = requiredContext(contextStackCursor$1.current)),
+      (workInProgress.stateNode = createTextInstance(
+        newText,
+        current,
+        oldText,
+        workInProgress
+      )),
+      (workInProgress.flags |= 4))
+    : (workInProgress.stateNode = current.stateNode);
+};
+function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
+  switch (renderState.tailMode) {
+    case "hidden":
+      hasRenderedATailFallback = renderState.tail;
+      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
+        null !== hasRenderedATailFallback.alternate &&
+          (lastTailNode = hasRenderedATailFallback),
+          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
+      null === lastTailNode
+        ? (renderState.tail = null)
+        : (lastTailNode.sibling = null);
+      break;
+    case "collapsed":
+      lastTailNode = renderState.tail;
+      for (var lastTailNode$38 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$38 = lastTailNode),
+          (lastTailNode = lastTailNode.sibling);
+      null === lastTailNode$38
+        ? hasRenderedATailFallback || null === renderState.tail
+          ? (renderState.tail = null)
+          : (renderState.tail.sibling = null)
+        : (lastTailNode$38.sibling = null);
+  }
+}
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    for (var child$39 = completedWork.child; null !== child$39; )
+      (newChildLanes |= child$39.lanes | child$39.childLanes),
+        (subtreeFlags |= child$39.subtreeFlags & 1835008),
+        (subtreeFlags |= child$39.flags & 1835008),
+        (child$39.return = completedWork),
+        (child$39 = child$39.sibling);
+  else
+    for (child$39 = completedWork.child; null !== child$39; )
+      (newChildLanes |= child$39.lanes | child$39.childLanes),
+        (subtreeFlags |= child$39.subtreeFlags),
+        (subtreeFlags |= child$39.flags),
+        (child$39.return = completedWork),
+        (child$39 = child$39.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
+function completeSuspendedOffscreenHostContainer(current, workInProgress) {
+  var rootContainerInstance = requiredContext(rootInstanceStackCursor.current),
+    type = workInProgress.type,
+    newProps = workInProgress.memoizedProps;
+  null !== current
+    ? updateHostComponent(
+        current,
+        workInProgress,
+        type,
+        newProps,
+        rootContainerInstance
+      )
+    : ((current = requiredContext(contextStackCursor$1.current)),
+      (rootContainerInstance = createInstance(
+        type,
+        newProps,
+        rootContainerInstance,
+        current,
+        workInProgress
+      )),
+      appendAllChildren(rootContainerInstance, workInProgress, !1, !1),
+      (workInProgress.stateNode = rootContainerInstance),
+      null !== workInProgress.ref && (workInProgress.flags |= 256));
+  bubbleProperties(workInProgress);
+}
+function completeWork(current, workInProgress, renderLanes) {
+  var newProps = workInProgress.pendingProps;
+  switch (workInProgress.tag) {
+    case 2:
+    case 16:
+    case 15:
+    case 0:
+    case 11:
+    case 7:
+    case 8:
+    case 12:
+    case 9:
+    case 14:
+      return bubbleProperties(workInProgress), null;
+    case 1:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 3:
+      return (
+        (newProps = workInProgress.stateNode),
+        popHostContainer(),
+        pop(didPerformWorkStackCursor),
+        pop(contextStackCursor),
+        resetWorkInProgressVersions(),
+        newProps.pendingContext &&
+          ((newProps.context = newProps.pendingContext),
+          (newProps.pendingContext = null)),
+        (null !== current && null !== current.child) ||
+          newProps.hydrate ||
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 5:
+      popHostContext(workInProgress);
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
+      if (null !== current && null != workInProgress.stateNode)
+        updateHostComponent(
+          current,
+          workInProgress,
+          type,
+          newProps,
+          renderLanes
+        ),
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
+      else {
+        if (!newProps) {
+          if (null === workInProgress.stateNode)
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          bubbleProperties(workInProgress);
+          return null;
+        }
+        current = requiredContext(contextStackCursor$1.current);
+        current = createInstance(
+          type,
+          newProps,
+          renderLanes,
+          current,
+          workInProgress
+        );
+        appendAllChildren(current, workInProgress, !1, !1);
+        workInProgress.stateNode = current;
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 6:
+      if (current && null != workInProgress.stateNode)
+        updateHostText(
+          current,
+          workInProgress,
+          current.memoizedProps,
+          newProps
+        );
+      else {
+        if ("string" !== typeof newProps && null === workInProgress.stateNode)
+          throw Error(
+            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+          );
+        current = requiredContext(rootInstanceStackCursor.current);
+        renderLanes = requiredContext(contextStackCursor$1.current);
+        workInProgress.stateNode = createTextInstance(
+          newProps,
+          current,
+          renderLanes,
+          workInProgress
+        );
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 13:
+      pop(suspenseStackCursor);
+      newProps = workInProgress.memoizedState;
+      if (0 !== (workInProgress.flags & 128))
+        return (workInProgress.lanes = renderLanes), workInProgress;
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (
+        null !== newProps &&
+        !renderLanes &&
+        ((workInProgress.child.flags |= 4096), 0 !== (workInProgress.mode & 1))
+      )
+        if (
+          (null === current &&
+            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
+          0 !== (suspenseStackCursor.current & 1)
+        )
+          0 === workInProgressRootExitStatus &&
+            (workInProgressRootExitStatus = 3);
+        else {
+          if (
+            0 === workInProgressRootExitStatus ||
+            3 === workInProgressRootExitStatus
+          )
+            workInProgressRootExitStatus = 4;
+          null === workInProgressRoot ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
+            markRootSuspended$1(
+              workInProgressRoot,
+              workInProgressRootRenderLanes
+            );
+        }
+      null !== workInProgress.updateQueue && (workInProgress.flags |= 4);
+      bubbleProperties(workInProgress);
+      return null;
+    case 4:
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 10:
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 17:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 19:
+      pop(suspenseStackCursor);
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      var renderedTail = type.rendering;
+      if (null === renderedTail)
+        if (newProps) cutOffTailIfNeeded(type, !1);
+        else {
+          if (
+            0 !== workInProgressRootExitStatus ||
+            (null !== current && 0 !== (current.flags & 128))
+          )
+            for (current = workInProgress.child; null !== current; ) {
+              renderedTail = findFirstSuspended(current);
+              if (null !== renderedTail) {
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
+                current = renderedTail.updateQueue;
+                null !== current &&
+                  ((workInProgress.updateQueue = current),
+                  (workInProgress.flags |= 4));
+                workInProgress.subtreeFlags = 0;
+                current = renderLanes;
+                for (newProps = workInProgress.child; null !== newProps; )
+                  (renderLanes = newProps),
+                    (type = current),
+                    (renderLanes.flags &= 1835010),
+                    (renderedTail = renderLanes.alternate),
+                    null === renderedTail
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = type),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null))
+                      : ((renderLanes.childLanes = renderedTail.childLanes),
+                        (renderLanes.lanes = renderedTail.lanes),
+                        (renderLanes.child = renderedTail.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps =
+                          renderedTail.memoizedProps),
+                        (renderLanes.memoizedState =
+                          renderedTail.memoizedState),
+                        (renderLanes.updateQueue = renderedTail.updateQueue),
+                        (renderLanes.type = renderedTail.type),
+                        (type = renderedTail.dependencies),
+                        (renderLanes.dependencies =
+                          null === type
+                            ? null
+                            : {
+                                lanes: type.lanes,
+                                firstContext: type.firstContext
+                              })),
+                    (newProps = newProps.sibling);
+                push(
+                  suspenseStackCursor,
+                  (suspenseStackCursor.current & 1) | 2
+                );
+                return workInProgress.child;
+              }
+              current = current.sibling;
+            }
+          null !== type.tail &&
+            now() > workInProgressRootRenderTargetTime &&
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
+        }
+      else {
+        if (!newProps)
+          if (
+            ((current = findFirstSuspended(renderedTail)), null !== current)
+          ) {
+            if (
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              (current = current.updateQueue),
+              null !== current &&
+                ((workInProgress.updateQueue = current),
+                (workInProgress.flags |= 4)),
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
+                !renderedTail.alternate)
+            )
+              return bubbleProperties(workInProgress), null;
+          } else
+            2 * now() - type.renderingStartTime >
+              workInProgressRootRenderTargetTime &&
+              1073741824 !== renderLanes &&
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
+          ? ((renderedTail.sibling = workInProgress.child),
+            (workInProgress.child = renderedTail))
+          : ((current = type.last),
+            null !== current
+              ? (current.sibling = renderedTail)
+              : (workInProgress.child = renderedTail),
+            (type.last = renderedTail));
+      }
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
+    case 23:
+      return (
+        popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
+        null !== current &&
+          (null !== current.memoizedState) !== renderLanes &&
+          "unstable-defer-without-hiding" !== newProps.mode &&
+          23 !== workInProgress.tag &&
+          (workInProgress.flags |= 4096),
+        renderLanes && 0 !== (workInProgress.mode & 1)
+          ? 0 !== (subtreeRenderLanes & 1073741824) &&
+            bubbleProperties(workInProgress)
+          : bubbleProperties(workInProgress),
+        null
+      );
+  }
+  throw Error(
+    "Unknown unit of work tag (" +
+      workInProgress.tag +
+      "). This error is likely caused by a bug in React. Please file an issue."
+  );
+}
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
+  didReceiveUpdate = !1;
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  workInProgress.child =
+    null === current
+      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
+      : reconcileChildFibers(
+          workInProgress,
+          current.child,
+          nextChildren,
+          renderLanes
+        );
+}
+function updateForwardRef(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  Component = Component.render;
+  var ref = workInProgress.ref;
+  prepareToReadContext(workInProgress, renderLanes);
+  nextProps = renderWithHooks(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    ref,
+    renderLanes
+  );
+  if (null !== current && !didReceiveUpdate)
+    return (
+      (workInProgress.updateQueue = current.updateQueue),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4003,7 +4684,6 @@ function updateMemoComponent(
   workInProgress,
   Component,
   nextProps,
-  updateLanes,
   renderLanes
 ) {
   if (null === current) {
@@ -4023,7 +4703,6 @@ function updateMemoComponent(
           workInProgress,
           type,
           nextProps,
-          updateLanes,
           renderLanes
         )
       );
@@ -4040,14 +4719,13 @@ function updateMemoComponent(
     return (workInProgress.child = current);
   }
   type = current.child;
-  if (
-    0 === (updateLanes & renderLanes) &&
-    ((updateLanes = type.memoizedProps),
-    (Component = Component.compare),
-    (Component = null !== Component ? Component : shallowEqual),
-    Component(updateLanes, nextProps) && current.ref === workInProgress.ref)
-  )
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  if (0 === (current.lanes & renderLanes)) {
+    var prevProps = type.memoizedProps;
+    Component = Component.compare;
+    Component = null !== Component ? Component : shallowEqual;
+    if (Component(prevProps, nextProps) && current.ref === workInProgress.ref)
+      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  }
   workInProgress.flags |= 1;
   current = createWorkInProgress(type, nextProps);
   current.ref = workInProgress.ref;
@@ -4059,7 +4737,6 @@ function updateSimpleMemoComponent(
   workInProgress,
   Component,
   nextProps,
-  updateLanes,
   renderLanes
 ) {
   if (
@@ -4067,7 +4744,7 @@ function updateSimpleMemoComponent(
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
   )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
+    if (((didReceiveUpdate = !1), 0 !== (current.lanes & renderLanes)))
       0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
     else
       return (
@@ -4090,40 +4767,88 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      prevState = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= prevState;
+    }
   else
     null !== prevState
-      ? ((nextProps = prevState.baseLanes | renderLanes),
+      ? ((prevState = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
-      : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      : (prevState = renderLanes),
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= prevState);
+  if (enablePersistentOffscreenHostContainer)
+    return reconcileOffscreenHostContainer(
+      current,
+      workInProgress,
+      "hidden" === nextProps.mode && 23 !== workInProgress.tag,
+      nextChildren,
+      renderLanes
+    );
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
-function markRef(current, workInProgress) {
+function reconcileOffscreenHostContainer(
+  currentOffscreen,
+  offscreen,
+  isHidden,
+  children,
+  renderLanes
+) {
+  isHidden = getOffscreenContainerProps(
+    isHidden ? "hidden" : "visible",
+    children
+  );
+  null === currentOffscreen
+    ? (renderLanes = createOffscreenHostContainerFiber(
+        isHidden,
+        offscreen.mode,
+        renderLanes,
+        null
+      ))
+    : ((currentOffscreen = currentOffscreen.child),
+      null === currentOffscreen
+        ? ((renderLanes = createOffscreenHostContainerFiber(
+            isHidden,
+            offscreen.mode,
+            renderLanes,
+            null
+          )),
+          (renderLanes.flags |= 2))
+        : (renderLanes = createWorkInProgress(currentOffscreen, isHidden)));
+  renderLanes.return = offscreen;
+  return (offscreen.child = renderLanes);
+}
+function markRef$1(current, workInProgress) {
   var ref = workInProgress.ref;
   if (
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4148,7 +4873,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4308,7 +5033,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4323,7 +5049,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4331,7 +5057,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4345,7 +5071,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4365,8 +5091,8 @@ function finishClassComponent(
   hasContext,
   renderLanes
 ) {
-  markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  markRef$1(current, workInProgress);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4410,20 +5136,22 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
-      void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
       (suspenseContext |= 1);
   push(suspenseStackCursor, suspenseContext & 1);
@@ -4438,7 +5166,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4450,15 +5180,17 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
       { mode: "visible", children: current },
       workInProgress.mode,
-      renderLanes,
+      0,
       null
     );
     renderLanes.return = workInProgress;
@@ -4478,8 +5210,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4506,8 +5241,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4530,7 +5268,7 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren))
     : (progressedPrimaryFragment = createFiberFromOffscreen(
@@ -4563,13 +5301,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4580,25 +5319,53 @@ function updateSuspenseFallbackChildren(
   renderLanes
 ) {
   var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
-    ? ((primaryChildren = workInProgress.child),
-      (primaryChildren.childLanes = 0),
-      (primaryChildren.pendingProps = primaryChildProps),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
+    currentPrimaryChildFragment = current.child,
+    currentFallbackChildFragment = currentPrimaryChildFragment.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== currentPrimaryChildFragment
+    ? ((current = workInProgress.child),
+      (current.childLanes = 0),
+      (current.pendingProps = primaryChildProps),
+      enablePersistentOffscreenHostContainer &&
+        ((currentPrimaryChildFragment = currentPrimaryChildFragment.child),
+        (primaryChildProps = current.child),
+        (primaryChildren = getOffscreenContainerProps(
+          "hidden",
+          primaryChildren
+        )),
+        (primaryChildProps.pendingProps = primaryChildren),
+        (primaryChildProps.memoizedProps = primaryChildren),
+        completeSuspendedOffscreenHostContainer(
+          currentPrimaryChildFragment,
+          primaryChildProps
+        )),
+      (workInProgress.deletions = null))
+    : ((current = createWorkInProgress(
         currentPrimaryChildFragment,
         primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+      )),
+      enablePersistentOffscreenHostContainer &&
+        ((primaryChildProps = currentPrimaryChildFragment.child),
+        null !== primaryChildProps &&
+          ((primaryChildren = reconcileOffscreenHostContainer(
+            currentPrimaryChildFragment,
+            current,
+            !0,
+            primaryChildren,
+            renderLanes
+          )),
+          (primaryChildren.memoizedProps = primaryChildren.pendingProps),
+          completeSuspendedOffscreenHostContainer(
+            primaryChildProps,
+            primaryChildren
+          ))),
+      (current.subtreeFlags =
+        currentPrimaryChildFragment.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4607,9 +5374,9 @@ function updateSuspenseFallbackChildren(
       )),
       (fallbackChildren.flags |= 2));
   fallbackChildren.return = workInProgress;
-  primaryChildren.return = workInProgress;
-  primaryChildren.sibling = fallbackChildren;
-  workInProgress.child = primaryChildren;
+  current.return = workInProgress;
+  current.sibling = fallbackChildren;
+  workInProgress.child = current;
   return fallbackChildren;
 }
 function scheduleWorkOnFiber(fiber, renderLanes) {
@@ -4623,8 +5390,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4634,16 +5400,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4652,9 +5416,9 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
@@ -4677,7 +5441,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
     nextProps &= 1;
   }
   push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
   else
     switch (revealOrder) {
       case "forwards":
@@ -4687,588 +5451,145 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
             null !== current &&
               null === findFirstSuspended(current) &&
               (revealOrder = renderLanes),
-            (renderLanes = renderLanes.sibling);
-        renderLanes = revealOrder;
-        null === renderLanes
-          ? ((revealOrder = workInProgress.child),
-            (workInProgress.child = null))
-          : ((revealOrder = renderLanes.sibling), (renderLanes.sibling = null));
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          revealOrder,
-          renderLanes,
-          tailMode,
-          workInProgress.lastEffect
-        );
-        break;
-      case "backwards":
-        renderLanes = null;
-        revealOrder = workInProgress.child;
-        for (workInProgress.child = null; null !== revealOrder; ) {
-          current = revealOrder.alternate;
-          if (null !== current && null === findFirstSuspended(current)) {
-            workInProgress.child = revealOrder;
-            break;
-          }
-          current = revealOrder.sibling;
-          revealOrder.sibling = renderLanes;
-          renderLanes = revealOrder;
-          revealOrder = current;
-        }
-        initSuspenseListRenderState(
-          workInProgress,
-          !0,
-          renderLanes,
-          null,
-          tailMode,
-          workInProgress.lastEffect
-        );
-        break;
-      case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
-        break;
-      default:
-        workInProgress.memoizedState = null;
-    }
-  return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
-  null !== current && (workInProgress.dependencies = current.dependencies);
-  workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
-  }
-  return null;
-}
-var appendAllChildren,
-  updateHostContainer,
-  updateHostComponent$1,
-  updateHostText$1;
-appendAllChildren = function(
-  parent,
-  workInProgress,
-  needsVisibilityToggle,
-  isHidden
-) {
-  for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag) {
-      var instance = node.stateNode;
-      needsVisibilityToggle &&
-        isHidden &&
-        (instance = cloneHiddenInstance(instance));
-      appendChildNode(parent.node, instance.node);
-    } else if (6 === node.tag) {
-      instance = node.stateNode;
-      if (needsVisibilityToggle && isHidden)
-        throw Error("Not yet implemented.");
-      appendChildNode(parent.node, instance.node);
-    } else if (4 !== node.tag) {
-      if (
-        13 === node.tag &&
-        0 !== (node.flags & 4) &&
-        (instance = null !== node.memoizedState)
-      ) {
-        var primaryChildParent = node.child;
-        if (
-          null !== primaryChildParent &&
-          (null !== primaryChildParent.child &&
-            ((primaryChildParent.child.return = primaryChildParent),
-            appendAllChildren(parent, primaryChildParent, !0, instance)),
-          (instance = primaryChildParent.sibling),
-          null !== instance)
-        ) {
-          instance.return = node;
-          node = instance;
-          continue;
-        }
-      }
-      if (null !== node.child) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-    }
-    if (node === workInProgress) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === workInProgress) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-};
-function appendAllChildrenToContainer(
-  containerChildSet,
-  workInProgress,
-  needsVisibilityToggle,
-  isHidden
-) {
-  for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag) {
-      var instance = node.stateNode;
-      needsVisibilityToggle &&
-        isHidden &&
-        (instance = cloneHiddenInstance(instance));
-      appendChildNodeToSet(containerChildSet, instance.node);
-    } else if (6 === node.tag) {
-      instance = node.stateNode;
-      if (needsVisibilityToggle && isHidden)
-        throw Error("Not yet implemented.");
-      appendChildNodeToSet(containerChildSet, instance.node);
-    } else if (4 !== node.tag) {
-      if (
-        13 === node.tag &&
-        0 !== (node.flags & 4) &&
-        (instance = null !== node.memoizedState)
-      ) {
-        var primaryChildParent = node.child;
-        if (
-          null !== primaryChildParent &&
-          (null !== primaryChildParent.child &&
-            ((primaryChildParent.child.return = primaryChildParent),
-            appendAllChildrenToContainer(
-              containerChildSet,
-              primaryChildParent,
-              !0,
-              instance
-            )),
-          (instance = primaryChildParent.sibling),
-          null !== instance)
-        ) {
-          instance.return = node;
-          node = instance;
-          continue;
-        }
-      }
-      if (null !== node.child) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-    }
-    if (node === workInProgress) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === workInProgress) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-}
-updateHostContainer = function(workInProgress) {
-  var portalOrRoot = workInProgress.stateNode;
-  if (null !== workInProgress.firstEffect) {
-    var container = portalOrRoot.containerInfo,
-      newChildSet = createChildNodeSet(container);
-    appendAllChildrenToContainer(newChildSet, workInProgress, !1, !1);
-    portalOrRoot.pendingChildren = newChildSet;
-    workInProgress.flags |= 4;
-    completeRoot(container, newChildSet);
-  }
-};
-updateHostComponent$1 = function(current, workInProgress, type, newProps) {
-  type = current.stateNode;
-  var oldProps = current.memoizedProps;
-  if ((current = null === workInProgress.firstEffect) && oldProps === newProps)
-    workInProgress.stateNode = type;
-  else {
-    var recyclableInstance = workInProgress.stateNode;
-    requiredContext(contextStackCursor$1.current);
-    var updatePayload = null;
-    oldProps !== newProps &&
-      ((oldProps = diffProperties(
-        null,
-        oldProps,
-        newProps,
-        recyclableInstance.canonical.viewConfig.validAttributes
-      )),
-      (recyclableInstance.canonical.currentProps = newProps),
-      (updatePayload = oldProps));
-    current && null === updatePayload
-      ? (workInProgress.stateNode = type)
-      : ((newProps = updatePayload),
-        (recyclableInstance = type.node),
-        (type = {
-          node: current
-            ? null !== newProps
-              ? cloneNodeWithNewProps(recyclableInstance, newProps)
-              : cloneNode(recyclableInstance)
-            : null !== newProps
-            ? cloneNodeWithNewChildrenAndProps(recyclableInstance, newProps)
-            : cloneNodeWithNewChildren(recyclableInstance),
-          canonical: type.canonical
-        }),
-        (workInProgress.stateNode = type),
-        current
-          ? (workInProgress.flags |= 4)
-          : appendAllChildren(type, workInProgress, !1, !1));
-  }
-};
-updateHostText$1 = function(current, workInProgress, oldText, newText) {
-  oldText !== newText
-    ? ((current = requiredContext(rootInstanceStackCursor.current)),
-      (oldText = requiredContext(contextStackCursor$1.current)),
-      (workInProgress.stateNode = createTextInstance(
-        newText,
-        current,
-        oldText,
-        workInProgress
-      )),
-      (workInProgress.flags |= 4))
-    : (workInProgress.stateNode = current.stateNode);
-};
-function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
-  switch (renderState.tailMode) {
-    case "hidden":
-      hasRenderedATailFallback = renderState.tail;
-      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
-        null !== hasRenderedATailFallback.alternate &&
-          (lastTailNode = hasRenderedATailFallback),
-          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
-      null === lastTailNode
-        ? (renderState.tail = null)
-        : (lastTailNode.sibling = null);
-      break;
-    case "collapsed":
-      lastTailNode = renderState.tail;
-      for (var lastTailNode$64 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$64 = lastTailNode),
-          (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$64
-        ? hasRenderedATailFallback || null === renderState.tail
-          ? (renderState.tail = null)
-          : (renderState.tail.sibling = null)
-        : (lastTailNode$64.sibling = null);
-  }
-}
-function completeWork(current, workInProgress, renderLanes) {
-  var newProps = workInProgress.pendingProps;
-  switch (workInProgress.tag) {
-    case 2:
-    case 16:
-    case 15:
-    case 0:
-    case 11:
-    case 7:
-    case 8:
-    case 12:
-    case 9:
-    case 14:
-      return null;
-    case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
-    case 3:
-      return (
-        popHostContainer(),
-        pop(didPerformWorkStackCursor),
-        pop(contextStackCursor),
-        resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
-        newProps.pendingContext &&
-          ((newProps.context = newProps.pendingContext),
-          (newProps.pendingContext = null)),
-        (null !== current && null !== current.child) ||
-          newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode)
-        updateHostComponent$1(
-          current,
+            (renderLanes = renderLanes.sibling);
+        renderLanes = revealOrder;
+        null === renderLanes
+          ? ((revealOrder = workInProgress.child),
+            (workInProgress.child = null))
+          : ((revealOrder = renderLanes.sibling), (renderLanes.sibling = null));
+        initSuspenseListRenderState(
           workInProgress,
+          !1,
+          revealOrder,
           renderLanes,
-          newProps,
-          rootContainerInstance
-        ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
-      else {
-        if (!newProps) {
-          if (null === workInProgress.stateNode)
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          return null;
+          tailMode
+        );
+        break;
+      case "backwards":
+        renderLanes = null;
+        revealOrder = workInProgress.child;
+        for (workInProgress.child = null; null !== revealOrder; ) {
+          current = revealOrder.alternate;
+          if (null !== current && null === findFirstSuspended(current)) {
+            workInProgress.child = revealOrder;
+            break;
+          }
+          current = revealOrder.sibling;
+          revealOrder.sibling = renderLanes;
+          renderLanes = revealOrder;
+          revealOrder = current;
         }
-        requiredContext(contextStackCursor$1.current);
-        current = nextReactTag;
-        nextReactTag += 2;
-        renderLanes = getViewConfigForType(renderLanes);
-        var updatePayload = diffProperties(
+        initSuspenseListRenderState(
+          workInProgress,
+          !0,
+          renderLanes,
           null,
-          emptyObject,
-          newProps,
-          renderLanes.validAttributes
-        );
-        rootContainerInstance = createNode(
-          current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
-          updatePayload,
-          workInProgress
+          tailMode
         );
-        current = new ReactFabricHostComponent(
+        break;
+      case "together":
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
+        break;
+      default:
+        workInProgress.memoizedState = null;
+    }
+  return workInProgress.child;
+}
+function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
+  null !== current && (workInProgress.dependencies = current.dependencies);
+  workInProgressRootSkippedLanes |= workInProgress.lanes;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
           current,
-          renderLanes,
-          newProps,
-          workInProgress
-        );
-        current = { node: rootContainerInstance, canonical: current };
-        appendAllChildren(current, workInProgress, !1, !1);
-        workInProgress.stateNode = current;
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
+  }
+  return workInProgress.child;
+}
+function attemptEarlyBailoutIfNoScheduledUpdate(
+  current,
+  workInProgress,
+  renderLanes
+) {
+  switch (workInProgress.tag) {
+    case 3:
+      pushHostRootContext(workInProgress);
+      break;
+    case 5:
+      pushHostContext(workInProgress);
+      break;
+    case 1:
+      isContextProvider(workInProgress.type) &&
+        pushContextProvider(workInProgress);
+      break;
+    case 4:
+      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+      break;
+    case 10:
+      var context = workInProgress.type._context,
+        nextValue = workInProgress.memoizedProps.value;
+      push(valueCursor, context._currentValue2);
+      context._currentValue2 = nextValue;
+      break;
+    case 13:
+      if (null !== workInProgress.memoizedState) {
+        if (0 !== (renderLanes & workInProgress.child.childLanes))
+          return updateSuspenseComponent(current, workInProgress, renderLanes);
+        push(suspenseStackCursor, suspenseStackCursor.current & 1);
+        current = bailoutOnAlreadyFinishedWork(
           current,
           workInProgress,
-          current.memoizedProps,
-          newProps
-        );
-      else {
-        if ("string" !== typeof newProps && null === workInProgress.stateNode)
-          throw Error(
-            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-          );
-        current = requiredContext(rootInstanceStackCursor.current);
-        rootContainerInstance = requiredContext(contextStackCursor$1.current);
-        workInProgress.stateNode = createTextInstance(
-          newProps,
-          current,
-          rootContainerInstance,
-          workInProgress
+          renderLanes
         );
+        return null !== current ? current.sibling : null;
       }
-      return null;
-    case 13:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
-        return (workInProgress.lanes = renderLanes), workInProgress;
-      newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
-        if (
-          (null === current &&
-            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
-          0 !== (suspenseStackCursor.current & 1)
-        )
-          0 === workInProgressRootExitStatus &&
-            (workInProgressRootExitStatus = 3);
-        else {
-          if (
-            0 === workInProgressRootExitStatus ||
-            3 === workInProgressRootExitStatus
-          )
-            workInProgressRootExitStatus = 4;
-          null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
-            markRootSuspended$1(
-              workInProgressRoot,
-              workInProgressRootRenderLanes
-            );
-        }
-      newProps && (workInProgress.flags |= 4);
-      return null;
-    case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
-    case 10:
-      return popProvider(workInProgress), null;
-    case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      push(suspenseStackCursor, suspenseStackCursor.current & 1);
+      break;
     case 19:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
-      if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
-        else {
-          if (
-            0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
-          )
-            for (current = workInProgress.child; null !== current; ) {
-              updatePayload = findFirstSuspended(current);
-              if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
-                current = updatePayload.updateQueue;
-                null !== current &&
-                  ((workInProgress.updateQueue = current),
-                  (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
-                current = renderLanes;
-                for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
-                    (renderLanes = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (updatePayload = rootContainerInstance.alternate),
-                    null === updatePayload
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = renderLanes),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null))
-                      : ((rootContainerInstance.childLanes =
-                          updatePayload.childLanes),
-                        (rootContainerInstance.lanes = updatePayload.lanes),
-                        (rootContainerInstance.child = updatePayload.child),
-                        (rootContainerInstance.memoizedProps =
-                          updatePayload.memoizedProps),
-                        (rootContainerInstance.memoizedState =
-                          updatePayload.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          updatePayload.updateQueue),
-                        (rootContainerInstance.type = updatePayload.type),
-                        (renderLanes = updatePayload.dependencies),
-                        (rootContainerInstance.dependencies =
-                          null === renderLanes
-                            ? null
-                            : {
-                                lanes: renderLanes.lanes,
-                                firstContext: renderLanes.firstContext
-                              })),
-                    (newProps = newProps.sibling);
-                push(
-                  suspenseStackCursor,
-                  (suspenseStackCursor.current & 1) | 2
-                );
-                return workInProgress.child;
-              }
-              current = current.sibling;
-            }
-          null !== newProps.tail &&
-            now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432));
-        }
-      else {
-        if (!rootContainerInstance)
-          if (
-            ((current = findFirstSuspended(updatePayload)), null !== current)
-          ) {
-            if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              (current = current.updateQueue),
-              null !== current &&
-                ((workInProgress.updateQueue = current),
-                (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
-                !updatePayload.alternate)
-            )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
-          } else
-            2 * now() - newProps.renderingStartTime >
-              workInProgressRootRenderTargetTime &&
-              1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432));
-        newProps.isBackwards
-          ? ((updatePayload.sibling = workInProgress.child),
-            (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
-            null !== current
-              ? (current.sibling = updatePayload)
-              : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+      context = 0 !== (renderLanes & workInProgress.childLanes);
+      if (0 !== (current.flags & 128)) {
+        if (context)
+          return updateSuspenseListComponent(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        workInProgress.flags |= 128;
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      nextValue = workInProgress.memoizedState;
+      null !== nextValue &&
+        ((nextValue.rendering = null),
+        (nextValue.tail = null),
+        (nextValue.lastEffect = null));
+      push(suspenseStackCursor, suspenseStackCursor.current);
+      if (context) break;
+      else return null;
+    case 22:
     case 23:
-    case 24:
       return (
-        popRenderLanes(),
-        null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
-          "unstable-defer-without-hiding" !== newProps.mode &&
-          (workInProgress.flags |= 4),
-        null
+        (workInProgress.lanes = 0),
+        updateOffscreenComponent(current, workInProgress, renderLanes)
       );
   }
-  throw Error(
-    "Unknown unit of work tag (" +
-      workInProgress.tag +
-      "). This error is likely caused by a bug in React. Please file an issue."
-  );
+  return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
 }
 function unwindWork(workInProgress) {
   switch (workInProgress.tag) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
         : null;
     case 3:
       popHostContainer();
@@ -5276,11 +5597,11 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
@@ -5288,245 +5609,154 @@ function unwindWork(workInProgress) {
       return (
         pop(suspenseStackCursor),
         (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
-          : null
-      );
-    case 19:
-      return pop(suspenseStackCursor), null;
-    case 4:
-      return popHostContainer(), null;
-    case 10:
-      return popProvider(workInProgress), null;
-    case 23:
-    case 24:
-      return popRenderLanes(), null;
-    default:
-      return null;
-  }
-}
-function createCapturedValue(value, source) {
-  try {
-    var info = "",
-      node = source;
-    do (info += describeFiber(node)), (node = node.return);
-    while (node);
-    var JSCompiler_inline_result = info;
-  } catch (x) {
-    JSCompiler_inline_result =
-      "\nError generating stack: " + x.message + "\n" + x.stack;
-  }
-  return { value: value, source: source, stack: JSCompiler_inline_result };
-}
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
+          : null
+      );
+    case 19:
+      return pop(suspenseStackCursor), null;
+    case 4:
+      return popHostContainer(), null;
+    case 10:
+      return popProvider(workInProgress.type._context), null;
+    case 22:
+    case 23:
+      return popRenderLanes(), null;
+    case 24:
+      return null;
+    default:
+      return null;
   }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
 }
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
   var ref = current.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
     else ref.current = null;
 }
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
       }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
-  }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
 }
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$81 = finishedRoot.create;
-            finishedRoot.destroy = create$81();
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor$jscomp$0
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        if (void 0 !== destroy) {
+          var current = finishedWork,
+            nearestMountedAncestor = nearestMountedAncestor$jscomp$0;
+          try {
+            destroy();
+          } catch (error) {
+            captureCommitPhaseError(current, nearestMountedAncestor, error);
           }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
-      }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$81 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$81;
-        } while (finishedRoot !== current);
+        }
       }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$81 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$81,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode.canonical;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
-          }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
+      effect = effect.next;
+    } while (effect !== updateQueue);
+  }
+}
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$83 = effect.create;
+        effect.destroy = create$83();
       }
-      return;
-    case 5:
-      null === current && finishedWork.flags & 4 && shim();
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      return;
-    case 13:
-      return;
-    case 19:
-    case 17:
-    case 20:
-    case 21:
-    case 23:
-    case 24:
-      return;
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function commitWork(current, finishedWork) {
@@ -5535,33 +5765,18 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedWork = current = current.next;
-        do {
-          if (3 === (finishedWork.tag & 3)) {
-            var destroy = finishedWork.destroy;
-            finishedWork.destroy = void 0;
-            void 0 !== destroy && destroy();
-          }
-          finishedWork = finishedWork.next;
-        } while (finishedWork !== current);
-      }
+      commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 12:
       return;
     case 13:
-      null !== finishedWork.memoizedState &&
-        (globalMostRecentFallbackTime = now());
       attachSuspenseRetryListeners(finishedWork);
       return;
     case 19:
       attachSuspenseRetryListeners(finishedWork);
       return;
+    case 22:
     case 23:
-    case 24:
       return;
   }
   a: {
@@ -5569,7 +5784,6 @@ function commitWork(current, finishedWork) {
       case 1:
       case 5:
       case 6:
-      case 20:
         break a;
       case 3:
       case 4:
@@ -5594,17 +5808,271 @@ function attachSuspenseRetryListeners(finishedWork) {
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    root = nextEffect;
+    firstChild = root.deletions;
+    if (null !== firstChild)
+      for (var i = 0; i < firstChild.length; i++) {
+        var childToDelete = firstChild[i];
+        try {
+          a: for (var node = childToDelete; ; ) {
+            var current = node;
+            if (
+              injectedHook &&
+              "function" === typeof injectedHook.onCommitFiberUnmount
+            )
+              try {
+                injectedHook.onCommitFiberUnmount(rendererID, current);
+              } catch (err) {}
+            switch (current.tag) {
+              case 0:
+              case 11:
+              case 14:
+              case 15:
+                var updateQueue = current.updateQueue;
+                if (null !== updateQueue) {
+                  var lastEffect = updateQueue.lastEffect;
+                  if (null !== lastEffect) {
+                    var firstEffect = lastEffect.next,
+                      effect = firstEffect;
+                    do {
+                      var _effect = effect,
+                        destroy = _effect.destroy,
+                        tag = _effect.tag;
+                      if (void 0 !== destroy && 0 !== (tag & 2)) {
+                        _effect = current;
+                        var nearestMountedAncestor = root;
+                        try {
+                          destroy();
+                        } catch (error) {
+                          captureCommitPhaseError(
+                            _effect,
+                            nearestMountedAncestor,
+                            error
+                          );
+                        }
+                      }
+                      effect = effect.next;
+                    } while (effect !== firstEffect);
+                  }
+                }
+                break;
+              case 1:
+                safelyDetachRef(current, root);
+                var instance = current.stateNode;
+                if ("function" === typeof instance.componentWillUnmount)
+                  try {
+                    (effect = current),
+                      (_effect = instance),
+                      (_effect.props = effect.memoizedProps),
+                      (_effect.state = effect.memoizedState),
+                      _effect.componentWillUnmount();
+                  } catch (error) {
+                    captureCommitPhaseError(current, root, error);
+                  }
+                break;
+              case 5:
+                safelyDetachRef(current, root);
+                break;
+              case 4:
+                createChildNodeSet(current.stateNode.containerInfo);
+            }
+            if (null !== node.child)
+              (node.child.return = node), (node = node.child);
+            else {
+              if (node === childToDelete) break;
+              for (; null === node.sibling; ) {
+                if (null === node.return || node.return === childToDelete)
+                  break a;
+                node = node.return;
+              }
+              node.sibling.return = node.return;
+              node = node.sibling;
+            }
+          }
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, root, error);
+        }
+      }
+    firstChild = root.child;
+    if (0 !== (root.subtreeFlags & 6454) && null !== firstChild)
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var flags = root.flags;
+          if (flags & 256) {
+            var current$jscomp$0 = root.alternate;
+            if (null !== current$jscomp$0) {
+              var currentRef = current$jscomp$0.ref;
+              null !== currentRef &&
+                ("function" === typeof currentRef
+                  ? currentRef(null)
+                  : (currentRef.current = null));
+            }
+          }
+          if (flags & 4096)
+            switch (root.tag) {
+              case 13:
+                if (null !== root.memoizedState) {
+                  var current$87 = root.alternate;
+                  if (null === current$87 || null === current$87.memoizedState)
+                    globalMostRecentFallbackTime = now();
+                }
+            }
+          switch (flags & 2054) {
+            case 2:
+              root.flags &= -3;
+              break;
+            case 6:
+              root.flags &= -3;
+              commitWork(root.alternate, root);
+              break;
+            case 2048:
+              root.flags &= -2049;
+              break;
+            case 2052:
+              root.flags &= -2049;
+              commitWork(root.alternate, root);
+              break;
+            case 4:
+              commitWork(root.alternate, root);
+          }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
+      }
+  }
+}
+function commitLayoutEffects(finishedWork) {
+  for (nextEffect = finishedWork; null !== nextEffect; ) {
+    var fiber = nextEffect,
+      firstChild = fiber.child;
+    if (0 !== (fiber.subtreeFlags & 4420) && null !== firstChild)
+      (firstChild.return = fiber), (nextEffect = firstChild);
+    else
+      for (fiber = finishedWork; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        if (0 !== (firstChild.flags & 4420)) {
+          var current = firstChild.alternate;
+          try {
+            if (0 !== (firstChild.flags & 4420))
+              switch (firstChild.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  commitHookEffectListMount(3, firstChild);
+                  break;
+                case 1:
+                  var instance = firstChild.stateNode;
+                  if (firstChild.flags & 4)
+                    if (null === current) instance.componentDidMount();
+                    else {
+                      var prevProps =
+                        firstChild.elementType === firstChild.type
+                          ? current.memoizedProps
+                          : resolveDefaultProps(
+                              firstChild.type,
+                              current.memoizedProps
+                            );
+                      instance.componentDidUpdate(
+                        prevProps,
+                        current.memoizedState,
+                        instance.__reactInternalSnapshotBeforeUpdate
+                      );
+                    }
+                  var updateQueue = firstChild.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(firstChild, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$84 = firstChild.updateQueue;
+                  if (null !== updateQueue$84) {
+                    current = null;
+                    if (null !== firstChild.child)
+                      switch (firstChild.child.tag) {
+                        case 5:
+                          current = firstChild.child.stateNode.canonical;
+                          break;
+                        case 1:
+                          current = firstChild.child.stateNode;
+                      }
+                    commitUpdateQueue(firstChild, updateQueue$84, current);
+                  }
+                  break;
+                case 5:
+                  null === current && firstChild.flags & 4 && shim();
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (firstChild.flags & 256) {
+              current = void 0;
+              var ref = firstChild.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = firstChild.stateNode;
+                switch (firstChild.tag) {
+                  case 5:
+                    current = instance$jscomp$0.canonical;
+                    break;
+                  default:
+                    current = instance$jscomp$0;
+                }
+                "function" === typeof ref
+                  ? ref(current)
+                  : (ref.current = current);
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(firstChild, firstChild.return, error);
+          }
+        }
+        if (firstChild === fiber) {
+          nextEffect = null;
+          break;
+        }
+        current = firstChild.sibling;
+        if (null !== current) {
+          current.return = firstChild.return;
+          nextEffect = current;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5613,63 +6081,55 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveEffectsLanes = 0,
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 6)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  if (0 === fiber)
+    a: {
+      fiber = fabricGetCurrentEventPriority
+        ? fabricGetCurrentEventPriority()
+        : null;
+      if (null != fiber)
+        switch (fiber) {
+          case FabricDiscretePriority:
+            fiber = 1;
+            break a;
+        }
+      fiber = 16;
+    }
   return fiber;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -5679,28 +6139,20 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 2) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
-  1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? performSyncWorkOnRoot(fiber)
-      : (ensureRootIsScheduled(fiber, eventTime),
-        0 === executionContext &&
-          ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime));
-  mostRecentlyUpdatedRoot = fiber;
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
+  ensureRootIsScheduled(root, eventTime);
+  1 === lane &&
+    0 === executionContext &&
+    0 === (fiber.mode & 1) &&
+    ((workInProgressRootRenderTargetTime = now() + 500),
+    includesLegacySyncCallbacks && flushSyncCallbacks());
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -5729,17 +6181,8 @@ function ensureRootIsScheduled(root, currentTime) {
       lane = 1 << index$5,
       expirationTime = expirationTimes[index$5];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$5] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$5] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -5747,47 +6190,58 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback$1(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
@@ -5797,41 +6251,51 @@ function performConcurrentWorkOnRoot(root) {
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
   if (0 === lanes) return null;
-  var exitStatus = lanes;
-  var prevExecutionContext = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== exitStatus
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, exitStatus);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
-    }
-  while (1);
-  resetContextDependencies();
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = prevExecutionContext;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes)
+      ? !1
+      : 0 !== (root.current.mode & 32)
+      ? !0
+      : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 2;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    )
+      (workInProgressRootRenderTargetTime = now() + 500),
+        prepareFreshStack(root, didTimeout);
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((JSCompiler_inline_result = executionContext),
+      (executionContext |= 8),
       root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (prevDispatcher = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== prevDispatcher &&
+        ((lanes = prevDispatcher),
+        (didTimeout = renderRootSync(root, prevDispatcher))),
+      (executionContext = JSCompiler_inline_result));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -5839,7 +6303,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -5849,20 +6313,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevExecutionContext = root.suspendedLanes;
-          if ((prevExecutionContext & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevExecutionContext;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -5870,16 +6334,17 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevExecutionContext = -1; 0 < lanes; ) {
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; ) {
           var index$4 = 31 - clz32(lanes);
           prevDispatcher = 1 << index$4;
-          index$4 = exitStatus[index$4];
-          index$4 > prevExecutionContext && (prevExecutionContext = index$4);
+          index$4 = didTimeout[index$4];
+          index$4 > JSCompiler_inline_result &&
+            (JSCompiler_inline_result = index$4);
           lanes &= ~prevDispatcher;
         }
-        lanes = prevExecutionContext;
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -5922,33 +6387,28 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$9 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$9;
-    root[index$9] = -1;
+    var index$6 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$6;
+    root[index$6] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    var prevExecutionContext = executionContext;
+    executionContext |= 8;
+    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo));
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+    executionContext = prevExecutionContext;
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -5961,11 +6421,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6005,20 +6460,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6054,15 +6528,18 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6073,36 +6550,51 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$76 = returnFiber;
+            workInProgress$30 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$76.tag)) {
-              var nextState = workInProgress$76.memoizedState;
-              if (null !== nextState)
-                JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
-              else {
-                var props = workInProgress$76.memoizedProps;
-                JSCompiler_temp =
-                  void 0 === props.fallback
-                    ? !1
-                    : !0 !== props.unstable_avoidThisFallback
+            if ((JSCompiler_temp = 13 === workInProgress$30.tag)) {
+              var nextState = workInProgress$30.memoizedState;
+              JSCompiler_temp =
+                null !== nextState
+                  ? null !== nextState.dehydrated
                     ? !0
-                    : hasInvisibleParentBoundary
-                    ? !1
-                    : !0;
-              }
+                    : !1
+                  : !0 !==
+                    workInProgress$30.memoizedProps.unstable_avoidThisFallback
+                  ? !0
+                  : hasInvisibleParentBoundary
+                  ? !1
+                  : !0;
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$76.updateQueue;
+              var wakeables = workInProgress$30.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$76.updateQueue = updateQueue;
+                workInProgress$30.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$76.mode & 2)) {
-                workInProgress$76.flags |= 64;
+              if (
+                0 === (workInProgress$30.mode & 1) &&
+                workInProgress$30 !== returnFiber
+              ) {
+                workInProgress$30.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
+                if (
+                  enablePersistentOffscreenHostContainer &&
+                  null === workInProgress$30.alternate
+                ) {
+                  var offscreenContainer = workInProgress$30.child.child;
+                  if (null !== offscreenContainer) {
+                    var containerProps = getOffscreenContainerProps(
+                      "hidden",
+                      offscreenContainer.memoizedProps.children
+                    );
+                    offscreenContainer.pendingProps = containerProps;
+                    offscreenContainer.memoizedProps = containerProps;
+                  }
+                }
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6133,61 +6625,61 @@ function handleError(root$jscomp$0, thrownValue) {
                 );
                 wakeable.then(ping, ping);
               }
-              workInProgress$76.flags |= 8192;
-              workInProgress$76.lanes = thrownValue;
+              workInProgress$30.flags |= 16384;
+              workInProgress$30.lanes = thrownValue;
               break a;
             }
-            workInProgress$76 = workInProgress$76.return;
-          } while (null !== workInProgress$76);
+            workInProgress$30 = workInProgress$30.return;
+          } while (null !== workInProgress$30);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$76 = returnFiber;
+        workInProgress$30 = returnFiber;
         do {
-          switch (workInProgress$76.tag) {
+          switch (workInProgress$30.tag) {
             case 3:
               root = value;
-              workInProgress$76.flags |= 8192;
+              workInProgress$30.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$76.lanes |= thrownValue;
-              var update$77 = createRootErrorUpdate(
-                workInProgress$76,
+              workInProgress$30.lanes |= thrownValue;
+              var update$31 = createRootErrorUpdate(
+                workInProgress$30,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$76, update$77);
+              enqueueCapturedUpdate(workInProgress$30, update$31);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$76.type,
-                instance = workInProgress$76.stateNode;
+              var ctor = workInProgress$30.type,
+                instance = workInProgress$30.stateNode;
               if (
-                0 === (workInProgress$76.flags & 64) &&
+                0 === (workInProgress$30.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$76.flags |= 8192;
+                workInProgress$30.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$76.lanes |= thrownValue;
-                var update$80 = createClassErrorUpdate(
-                  workInProgress$76,
+                workInProgress$30.lanes |= thrownValue;
+                var update$34 = createClassErrorUpdate(
+                  workInProgress$30,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$76, update$80);
+                enqueueCapturedUpdate(workInProgress$30, update$34);
                 break a;
               }
           }
-          workInProgress$76 = workInProgress$76.return;
-        } while (null !== workInProgress$76);
+          workInProgress$30 = workInProgress$30.return;
+        } while (null !== workInProgress$30);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6207,7 +6699,7 @@ function pushDispatcher() {
 }
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 2;
   var prevDispatcher = pushDispatcher();
   (workInProgressRoot === root && workInProgressRootRenderLanes === lanes) ||
     prepareFreshStack(root, lanes);
@@ -6234,7 +6726,7 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
@@ -6248,47 +6740,25 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      current = completeWork(current, completedWork, subtreeRenderLanes);
-      if (null !== current) {
-        workInProgress = current;
-        return;
-      }
-      current = completedWork;
+    if (0 === (completedWork.flags & 8192)) {
       if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
+        ((current = completeWork(current, completedWork, subtreeRenderLanes)),
+        null !== current)
       ) {
-        for (var newChildLanes = 0, child = current.child; null !== child; )
-          (newChildLanes |= child.lanes | child.childLanes),
-            (child = child.sibling);
-        current.childLanes = newChildLanes;
+        workInProgress = current;
+        return;
       }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
       null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
     }
     completedWork = completedWork.sibling;
     if (null !== completedWork) {
@@ -6300,16 +6770,25 @@ function completeUnitOfWork(unitOfWork) {
   0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
 }
 function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
   return null;
 }
 function commitRootImpl(root, renderPriorityLevel) {
   do flushPassiveEffects();
   while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
-  var finishedWork = root.finishedWork;
+  var finishedWork = root.finishedWork,
+    lanes = root.finishedLanes;
   if (null === finishedWork) return null;
   root.finishedWork = null;
   root.finishedLanes = 0;
@@ -6318,361 +6797,206 @@ function commitRootImpl(root, renderPriorityLevel) {
       "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
     );
   root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$10 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$10;
-    remainingLanes$jscomp$0[index$10] = 0;
-    eventTimes[index$10] = -1;
-    expirationTimes[index$10] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
   root === workInProgressRoot &&
     ((workInProgress = workInProgressRoot = null),
     (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              eventTimes = nextEffect;
-              a: for (noLongerPendingLanes = expirationTimes = eventTimes; ; ) {
-                index$10 = noLongerPendingLanes;
-                if (
-                  injectedHook &&
-                  "function" === typeof injectedHook.onCommitFiberUnmount
-                )
-                  try {
-                    injectedHook.onCommitFiberUnmount(rendererID, index$10);
-                  } catch (err) {}
-                switch (index$10.tag) {
-                  case 0:
-                  case 11:
-                  case 14:
-                  case 15:
-                  case 22:
-                    var updateQueue = index$10.updateQueue;
-                    if (null !== updateQueue) {
-                      var lastEffect = updateQueue.lastEffect;
-                      if (null !== lastEffect) {
-                        var firstEffect = lastEffect.next;
-                        lane = firstEffect;
-                        do {
-                          var _effect2 = lane,
-                            destroy = _effect2.destroy,
-                            tag = _effect2.tag;
-                          if (void 0 !== destroy)
-                            if (0 !== (tag & 4))
-                              enqueuePendingPassiveHookEffectUnmount(
-                                index$10,
-                                lane
-                              );
-                            else {
-                              _effect2 = index$10;
-                              try {
-                                destroy();
-                              } catch (error) {
-                                captureCommitPhaseError(_effect2, error);
-                              }
-                            }
-                          lane = lane.next;
-                        } while (lane !== firstEffect);
-                      }
-                    }
-                    break;
-                  case 1:
-                    safelyDetachRef(index$10);
-                    var instance = index$10.stateNode;
-                    if ("function" === typeof instance.componentWillUnmount)
-                      try {
-                        (lane = index$10),
-                          (_effect2 = instance),
-                          (_effect2.props = lane.memoizedProps),
-                          (_effect2.state = lane.memoizedState),
-                          _effect2.componentWillUnmount();
-                      } catch (unmountError) {
-                        captureCommitPhaseError(index$10, unmountError);
-                      }
-                    break;
-                  case 5:
-                    safelyDetachRef(index$10);
-                    break;
-                  case 4:
-                    createChildNodeSet(index$10.stateNode.containerInfo);
-                }
-                if (null !== noLongerPendingLanes.child)
-                  (noLongerPendingLanes.child.return = noLongerPendingLanes),
-                    (noLongerPendingLanes = noLongerPendingLanes.child);
-                else {
-                  if (noLongerPendingLanes === expirationTimes) break;
-                  for (; null === noLongerPendingLanes.sibling; ) {
-                    if (
-                      null === noLongerPendingLanes.return ||
-                      noLongerPendingLanes.return === expirationTimes
-                    )
-                      break a;
-                    noLongerPendingLanes = noLongerPendingLanes.return;
-                  }
-                  noLongerPendingLanes.sibling.return =
-                    noLongerPendingLanes.return;
-                  noLongerPendingLanes = noLongerPendingLanes.sibling;
-                }
-              }
-              var alternate = eventTimes.alternate;
-              detachFiberMutation(eventTimes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$87) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$87);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback$1(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 4;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
+    commitMutationEffects(root, finishedWork);
     root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance$jscomp$0 = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance$jscomp$0.canonical;
-                  break;
-                default:
-                  current = instance$jscomp$0;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$88) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$88);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    nextEffect = null;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else root.current = finishedWork;
-  if (rootDoesHavePassiveEffects)
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (renderPriorityLevel = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((flags$jscomp$0 = nextEffect),
-          (flags$jscomp$0.sibling = null),
-          (flags$jscomp$0.stateNode = null)),
-        (nextEffect = renderPriorityLevel);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
   0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
-  1 === remainingLanes
+  0 !== (remainingLanes & 1)
     ? root === rootWithNestedUpdates
       ? nestedUpdateCount++
       : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        void 0,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
-  }
-  return !1;
-}
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects;
-  rootWithPendingPassiveEffects = null;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$93 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$93.destroy;
-    effect$93.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$93 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
     try {
-      var create$97 = effect$93.create;
-      effect$93.destroy = create$97();
-    } catch (error$98) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$98);
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 6))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 4;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect;
+                  switch (fiber$jscomp$0.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListUnmount(4, fiber$jscomp$0, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (fiber.tag) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    commitHookEffectListUnmount(5, fiber, fiber.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (deletions.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListMount(5, deletions);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
     }
   }
-  for (create$97 = root.current.firstEffect; null !== create$97; )
-    (root = create$97.nextEffect),
-      (create$97.nextEffect = null),
-      create$97.flags & 8 &&
-        ((create$97.sibling = null), (create$97.stateNode = null)),
-      (create$97 = root);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
+  return !1;
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
@@ -6684,42 +7008,50 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -6731,7 +7063,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
@@ -6743,15 +7075,11 @@ function resolveRetryWakeable(boundaryFiber, wakeable) {
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
@@ -6760,102 +7088,46 @@ function resolveRetryWakeable(boundaryFiber, wakeable) {
 }
 var beginWork$1;
 beginWork$1 = function(current, workInProgress, renderLanes) {
-  var updateLanes = workInProgress.lanes;
   if (null !== current)
     if (
       current.memoizedProps !== workInProgress.pendingProps ||
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
+      if (
+        0 === (current.lanes & renderLanes) &&
+        0 === (workInProgress.flags & 128)
+      )
+        return (
+          (didReceiveUpdate = !1),
+          attemptEarlyBailoutIfNoScheduledUpdate(
+            current,
             workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue2);
-          context._currentValue2 = updateLanes;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
-              workInProgress,
-              renderLanes
-            );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
-      }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+            renderLanes
+          )
+        );
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
   switch (workInProgress.tag) {
     case 2:
-      updateLanes = workInProgress.type;
+      var Component = workInProgress.type;
       null !== current &&
         ((current.alternate = null),
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      var context = getMaskedContext(
+        workInProgress,
+        contextStackCursor.current
+      );
       prepareToReadContext(workInProgress, renderLanes);
       context = renderWithHooks(
         null,
         workInProgress,
-        updateLanes,
+        Component,
         current,
         context,
         renderLanes
@@ -6870,7 +7142,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
         workInProgress.updateQueue = null;
-        if (isContextProvider(updateLanes)) {
+        if (isContextProvider(Component)) {
           var hasContext = !0;
           pushContextProvider(workInProgress);
         } else hasContext = !1;
@@ -6879,22 +7151,14 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             ? context.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
         context.updater = classComponentUpdater;
         workInProgress.stateNode = context;
         context._reactInternals = workInProgress;
-        mountClassInstance(workInProgress, updateLanes, current, renderLanes);
+        mountClassInstance(workInProgress, Component, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           hasContext,
           renderLanes
@@ -6905,24 +7169,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      Component = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
-        switch (hasContext) {
+        context = Component._init;
+        Component = context(Component._payload);
+        workInProgress.type = Component;
+        context = workInProgress.tag = resolveLazyComponentTag(Component);
+        current = resolveDefaultProps(Component, current);
+        switch (context) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -6931,7 +7195,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -6940,7 +7204,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -6949,80 +7213,78 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
-              updateLanes,
+              Component,
+              resolveDefaultProps(Component.type, current),
               renderLanes
             );
             break a;
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            Component +
             ". Lazy element type must resolve to a class or function."
         );
       }
       return workInProgress;
     case 0:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateFunctionComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 1:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateClassComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 3:
       pushHostRootContext(workInProgress);
-      updateLanes = workInProgress.updateQueue;
-      if (null === current || null === updateLanes)
+      Component = workInProgress.updateQueue;
+      if (null === current || null === Component)
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
+      context = workInProgress.pendingProps;
+      Component = workInProgress.memoizedState.element;
       cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
-      updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      processUpdateQueue(workInProgress, context, null, renderLanes);
+      context = workInProgress.memoizedState.element;
+      context === Component
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, context, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
       return (
         pushHostContext(workInProgress),
-        (updateLanes = workInProgress.pendingProps.children),
-        markRef(current, workInProgress),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        (Component = workInProgress.pendingProps.children),
+        markRef$1(current, workInProgress),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 6:
@@ -7035,34 +7297,29 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (updateLanes = workInProgress.pendingProps),
+        (Component = workInProgress.pendingProps),
         null === current
           ? (workInProgress.child = reconcileChildFibers(
               workInProgress,
               null,
-              updateLanes,
+              Component,
               renderLanes
             ))
-          : reconcileChildren(
-              current,
-              workInProgress,
-              updateLanes,
-              renderLanes
-            ),
+          : reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 11:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateForwardRef(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
@@ -7099,28 +7356,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 10:
       a: {
-        updateLanes = workInProgress.type._context;
+        Component = workInProgress.type._context;
         context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue2);
-        context$jscomp$0._currentValue2 = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        hasContext = workInProgress.memoizedProps;
+        var newValue = context.value;
+        push(valueCursor, Component._currentValue2);
+        Component._currentValue2 = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === context.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7132,71 +7377,66 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === Component) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
@@ -7210,29 +7450,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 9:
       return (
         (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (Component = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (context = readContext(context)),
+        (Component = Component(context)),
         (workInProgress.flags |= 1),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
-        (hasContext = resolveDefaultProps(
-          context,
-          workInProgress.pendingProps
-        )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (Component = workInProgress.type),
+        (context = resolveDefaultProps(Component, workInProgress.pendingProps)),
+        (context = resolveDefaultProps(Component.type, context)),
         updateMemoComponent(
           current,
           workInProgress,
+          Component,
           context,
-          hasContext,
-          updateLanes,
           renderLanes
         )
       );
@@ -7242,32 +7477,31 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress,
         workInProgress.type,
         workInProgress.pendingProps,
-        updateLanes,
         renderLanes
       );
     case 17:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2)),
         (workInProgress.tag = 1),
-        isContextProvider(updateLanes)
+        isContextProvider(Component)
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, Component, context),
+        mountClassInstance(workInProgress, Component, context, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           current,
           renderLanes
@@ -7275,9 +7509,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7286,6 +7520,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       "). This error is likely caused by a bug in React. Please file an issue."
   );
 };
+function scheduleCallback$1(priorityLevel, callback) {
+  return scheduleCallback(priorityLevel, callback);
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -7295,8 +7532,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
 }
@@ -7334,9 +7571,9 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null));
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7371,24 +7608,22 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           type
         );
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7404,7 +7639,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7428,9 +7663,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7444,13 +7676,20 @@ function createFiberFromTypeAndProps(
   key.lanes = lanes;
   return key;
 }
+function createOffscreenHostContainerFiber(props, fiberMode, lanes, key) {
+  props = createFiber(5, props, key, fiberMode);
+  props.elementType = "RCTView";
+  props.type = "RCTView";
+  props.lanes = lanes;
+  return props;
+}
 function createFiberFromFragment(elements, mode, lanes, key) {
   elements = createFiber(7, elements, key, mode);
   elements.lanes = lanes;
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7569,12 +7808,102 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
   return null;
 }
+var emptyObject$1 = {},
+  createHierarchy,
+  getHostNode,
+  getHostProps,
+  lastNonHostInstance,
+  getOwnerHierarchy,
+  traverseOwnerTreeUp;
+createHierarchy = function(fiberHierarchy) {
+  return fiberHierarchy.map(function(fiber) {
+    return {
+      name: getComponentNameFromType(fiber.type),
+      getInspectorData: function(findNodeHandle) {
+        return {
+          props: getHostProps(fiber),
+          source: fiber._debugSource,
+          measure: function(callback) {
+            var hostFiber = findCurrentHostFiber(fiber);
+            if (
+              (hostFiber =
+                null != hostFiber &&
+                null !== hostFiber.stateNode &&
+                hostFiber.stateNode.node)
+            )
+              nativeFabricUIManager.measure(hostFiber, callback);
+            else
+              return ReactNativePrivateInterface.UIManager.measure(
+                getHostNode(fiber, findNodeHandle),
+                callback
+              );
+          }
+        };
+      }
+    };
+  });
+};
+getHostNode = function(fiber, findNodeHandle) {
+  for (var hostNode; fiber; ) {
+    null !== fiber.stateNode &&
+      5 === fiber.tag &&
+      (hostNode = findNodeHandle(fiber.stateNode));
+    if (hostNode) return hostNode;
+    fiber = fiber.child;
+  }
+  return null;
+};
+getHostProps = function(fiber) {
+  return (fiber = findCurrentHostFiber(fiber))
+    ? fiber.memoizedProps || emptyObject$1
+    : emptyObject$1;
+};
+exports.getInspectorDataForInstance = function(closestInstance) {
+  if (!closestInstance)
+    return {
+      hierarchy: [],
+      props: emptyObject$1,
+      selectedIndex: null,
+      source: null
+    };
+  closestInstance = findCurrentFiberUsingSlowPath(closestInstance);
+  var fiberHierarchy = getOwnerHierarchy(closestInstance),
+    instance = lastNonHostInstance(fiberHierarchy);
+  closestInstance = createHierarchy(fiberHierarchy);
+  var props = getHostProps(instance),
+    source = instance._debugSource;
+  fiberHierarchy = fiberHierarchy.indexOf(instance);
+  return {
+    hierarchy: closestInstance,
+    props: props,
+    selectedIndex: fiberHierarchy,
+    source: source
+  };
+};
+getOwnerHierarchy = function(instance) {
+  var hierarchy = [];
+  traverseOwnerTreeUp(hierarchy, instance);
+  return hierarchy;
+};
+lastNonHostInstance = function(hierarchy) {
+  for (var i = hierarchy.length - 1; 1 < i; i--) {
+    var instance = hierarchy[i];
+    if (5 !== instance.tag) return instance;
+  }
+  return hierarchy[0];
+};
+traverseOwnerTreeUp = function(hierarchy, instance) {
+  instance &&
+    (hierarchy.unshift(instance),
+    traverseOwnerTreeUp(hierarchy, instance._debugOwner));
+};
 function findNodeHandle(componentOrHandle) {
   if (null == componentOrHandle) return null;
   if ("number" === typeof componentOrHandle) return componentOrHandle;
@@ -7597,14 +7926,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_865 = {
+  devToolsConfig$jscomp$inline_948 = {
     findFiberByHostInstance: getInstanceFromInstance,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-bd5bf555e-20210823",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -7619,17 +7948,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1054 = {
-  bundleType: devToolsConfig$jscomp$inline_865.bundleType,
-  version: devToolsConfig$jscomp$inline_865.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_865.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_865.rendererConfig,
+var internals$jscomp$inline_1189 = {
+  bundleType: devToolsConfig$jscomp$inline_948.bundleType,
+  version: devToolsConfig$jscomp$inline_948.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_948.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_948.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -7638,25 +7968,26 @@ var internals$jscomp$inline_1054 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_865.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_948.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-bd5bf555e-20210823"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1055 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1190 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1055.isDisabled &&
-    hook$jscomp$inline_1055.supportsFiber
+    !hook$jscomp$inline_1190.isDisabled &&
+    hook$jscomp$inline_1190.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1055.inject(
-        internals$jscomp$inline_1054
+      (rendererID = hook$jscomp$inline_1190.inject(
+        internals$jscomp$inline_1189
       )),
-        (injectedHook = hook$jscomp$inline_1055);
+        (injectedHook = hook$jscomp$inline_1190);
     } catch (err) {}
 }
 exports.createPortal = function(children, containerTag) {
@@ -7669,12 +8000,10 @@ exports.createPortal = function(children, containerTag) {
 };
 exports.dispatchCommand = function(handle, command, args) {
   null != handle._nativeTag &&
-    (handle._internalInstanceHandle
-      ? nativeFabricUIManager.dispatchCommand(
-          handle._internalInstanceHandle.stateNode.node,
-          command,
-          args
-        )
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.dispatchCommand(handle.node, command, args))
       : ReactNativePrivateInterface.UIManager.dispatchViewManagerCommand(
           handle._nativeTag,
           command,
@@ -7694,16 +8023,18 @@ exports.findHostInstance_DEPRECATED = function(componentOrHandle) {
     : componentOrHandle;
 };
 exports.findNodeHandle = findNodeHandle;
-exports.render = function(element, containerTag, callback) {
+exports.render = function(element, containerTag, callback, concurrentRoot) {
   var root = roots.get(containerTag);
-  if (!root) {
-    root = new FiberRootNode(containerTag, 0, !1);
-    var uninitializedFiber = createFiber(3, null, null, 0);
-    root.current = uninitializedFiber;
-    uninitializedFiber.stateNode = root;
-    initializeUpdateQueue(uninitializedFiber);
-    roots.set(containerTag, root);
-  }
+  root ||
+    ((root = concurrentRoot ? 1 : 0),
+    (concurrentRoot = new FiberRootNode(containerTag, root, !1)),
+    (root = createFiber(3, null, null, 1 === root ? 1 : 0)),
+    (concurrentRoot.current = root),
+    (root.stateNode = concurrentRoot),
+    (root.memoizedState = { element: null }),
+    initializeUpdateQueue(root),
+    (root = concurrentRoot),
+    roots.set(containerTag, root));
   updateContainer(element, root, null, callback);
   a: if (((element = root.current), element.child))
     switch (element.child.tag) {
@@ -7716,6 +8047,17 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.sendAccessibilityEvent(handle.node, eventType))
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.stopSurface = function(containerTag) {
   var root = roots.get(containerTag);
   root &&
diff --git a/Libraries/Renderer/implementations/ReactFabric-prod.js b/Libraries/Renderer/implementations/ReactFabric-prod.js
index a5f870980f11a8..de7df01710c172 100644
--- a/Libraries/Renderer/implementations/ReactFabric-prod.js
+++ b/Libraries/Renderer/implementations/ReactFabric-prod.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactFabric-prod
  * @preventMunge
- * @generated
+ * @generated SignedSource<<5749c2b90feb6b0a0271a28ccf62b138>>
  */
 
 "use strict";
@@ -63,7 +63,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -75,7 +76,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -289,36 +290,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -326,9 +337,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -338,12 +349,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -569,7 +580,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -920,7 +931,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_219 = {
+var injectedNamesToPlugins$jscomp$inline_216 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -955,34 +966,34 @@ var injectedNamesToPlugins$jscomp$inline_219 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_220 = !1,
-  pluginName$jscomp$inline_221;
-for (pluginName$jscomp$inline_221 in injectedNamesToPlugins$jscomp$inline_219)
+  isOrderingDirty$jscomp$inline_217 = !1,
+  pluginName$jscomp$inline_218;
+for (pluginName$jscomp$inline_218 in injectedNamesToPlugins$jscomp$inline_216)
   if (
-    injectedNamesToPlugins$jscomp$inline_219.hasOwnProperty(
-      pluginName$jscomp$inline_221
+    injectedNamesToPlugins$jscomp$inline_216.hasOwnProperty(
+      pluginName$jscomp$inline_218
     )
   ) {
-    var pluginModule$jscomp$inline_222 =
-      injectedNamesToPlugins$jscomp$inline_219[pluginName$jscomp$inline_221];
+    var pluginModule$jscomp$inline_219 =
+      injectedNamesToPlugins$jscomp$inline_216[pluginName$jscomp$inline_218];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_221) ||
-      namesToPlugins[pluginName$jscomp$inline_221] !==
-        pluginModule$jscomp$inline_222
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_218) ||
+      namesToPlugins[pluginName$jscomp$inline_218] !==
+        pluginModule$jscomp$inline_219
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_221])
+      if (namesToPlugins[pluginName$jscomp$inline_218])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_221 +
+            pluginName$jscomp$inline_218 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_221
-      ] = pluginModule$jscomp$inline_222;
-      isOrderingDirty$jscomp$inline_220 = !0;
+        pluginName$jscomp$inline_218
+      ] = pluginModule$jscomp$inline_219;
+      isOrderingDirty$jscomp$inline_217 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_220 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_217 && recomputePluginOrdering();
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
@@ -997,7 +1008,22 @@ getNodeFromInstance = function(inst) {
 };
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
-    null !== to
+    var fromOrTo = from || to;
+    (fromOrTo = fromOrTo && fromOrTo.stateNode) &&
+    fromOrTo.canonical._internalInstanceHandle
+      ? (from &&
+          nativeFabricUIManager.setIsJSResponder(
+            from.stateNode.node,
+            !1,
+            blockNativeResponder || !1
+          ),
+        to &&
+          nativeFabricUIManager.setIsJSResponder(
+            to.stateNode.node,
+            !0,
+            blockNativeResponder || !1
+          ))
+      : null !== to
       ? ReactNativePrivateInterface.UIManager.setJSResponder(
           to.stateNode.canonical._nativeTag,
           blockNativeResponder
@@ -1019,10 +1045,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1037,11 +1063,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1051,7 +1077,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1068,6 +1094,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1077,24 +1105,83 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1103,7 +1190,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1191,33 +1278,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
@@ -1246,7 +1316,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1292,9 +1362,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1319,7 +1389,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1335,7 +1405,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1352,7 +1422,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1470,7 +1540,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1530,6 +1600,223 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
     }
   });
 }
+var scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null;
+function onCommitRoot(root) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        void 0,
+        128 === (root.current.flags & 128)
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 !== (nextLanes & 4) && (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$7 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$7;
+    remainingLanes[index$7] = 0;
+    eventTimes[index$7] = -1;
+    root[index$7] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$8 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$8;
+    (lane & entangledLanes) | (root[index$8] & entangledLanes) &&
+      (root[index$8] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
 function shim() {
   throw Error(
     "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
@@ -1555,6 +1842,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
   fabricMeasure = _nativeFabricUIManage.measure,
   fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
   fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
+  FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
+  fabricGetCurrentEventPriority =
+    _nativeFabricUIManage.unstable_getCurrentEventPriority,
   getViewConfigForType =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
   nextReactTag = 2;
@@ -1648,7 +1938,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1702,13 +1993,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1744,304 +2035,39 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  Scheduler_now = Scheduler.unstable_now;
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
-  }
-}
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
-    case 5:
-      return 97;
-    case 3:
-    case 2:
-    case 1:
-      return 95;
-    case 0:
-      return 90;
-    default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
-}
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority,
-  fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
   if (!isFlushingSyncQueue && null !== syncQueue) {
     isFlushingSyncQueue = !0;
-    var i = 0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
     try {
       var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
       syncQueue = null;
+      includesLegacySyncCallbacks = !1;
     } catch (error) {
       throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
       error);
     } finally {
-      isFlushingSyncQueue = !1;
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
     }
   }
+  return null;
 }
 var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
 function is(x, y) {
   return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
 }
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
+var objectIs = "function" === typeof Object.is ? Object.is : is;
 function shallowEqual(objA, objB) {
   if (objectIs(objA, objB)) return !0;
   if (
@@ -2078,8 +2104,6 @@ function describeFiber(fiber) {
       return describeFunctionComponentFrame(fiber.type, null);
     case 11:
       return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
     case 1:
       return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
@@ -2100,14 +2124,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue2 = currentValue;
+  context._currentValue2 = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2127,44 +2151,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue2;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue2;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2190,14 +2210,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 8)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2266,111 +2306,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2426,7 +2466,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2437,7 +2478,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2447,7 +2489,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2519,7 +2562,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2541,7 +2583,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2594,25 +2635,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2644,16 +2682,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2668,7 +2706,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2757,7 +2804,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2782,22 +2829,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2825,15 +2864,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2844,7 +2875,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3027,55 +3058,49 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild.type === REACT_FRAGMENT_TYPE &&
       null === newChild.key;
     isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
+            var key = newChild.key;
             for (
               isUnkeyedTopLevelFragment = currentFirstChild;
               null !== isUnkeyedTopLevelFragment;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (isUnkeyedTopLevelFragment.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === isUnkeyedTopLevelFragment.tag) {
+                    deleteRemainingChildren(
+                      returnFiber,
+                      isUnkeyedTopLevelFragment.sibling
+                    );
+                    currentFirstChild = useFiber(
+                      isUnkeyedTopLevelFragment,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (isUnkeyedTopLevelFragment.elementType === key) {
+                  deleteRemainingChildren(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment.sibling
+                  );
+                  currentFirstChild = useFiber(
+                    isUnkeyedTopLevelFragment,
+                    newChild.props
+                  );
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
                 deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
                 break;
@@ -3151,6 +3176,22 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
@@ -3169,30 +3210,14 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 1:
-        case 22:
         case 0:
         case 11:
         case 15:
           throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
+            (getComponentNameFromFiber(returnFiber) || "Component") +
               "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
           );
       }
@@ -3254,7 +3279,7 @@ function findFirstSuspended(row) {
       if (null !== state && (null === state.dehydrated || shim$1() || shim$1()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3406,10 +3431,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3434,22 +3460,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3489,7 +3526,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3519,25 +3556,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$11 = 31 - clz32(lanes),
-            lane = 1 << index$11;
-          entanglements[index$11] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3564,6 +3589,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3589,6 +3616,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3637,7 +3666,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3645,10 +3674,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3709,19 +3738,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3733,33 +3761,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 8)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3816,6 +3870,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3857,7 +3913,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3906,8 +3962,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3948,16 +4005,91 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
       return rerenderReducer(basicStateReducer)[0];
     },
     unstable_isNewReconciler: !1
-  },
-  ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
+  };
+function createCapturedValue(value, source) {
+  try {
+    var info = "",
+      node = source;
+    do (info += describeFiber(node)), (node = node.return);
+    while (node);
+    var JSCompiler_inline_result = info;
+  } catch (x) {
+    JSCompiler_inline_result =
+      "\nError generating stack: " + x.message + "\n" + x.stack;
+  }
+  return { value: value, source: source, stack: JSCompiler_inline_result };
+}
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      logCapturedError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logCapturedError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
   didReceiveUpdate = !1;
 function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
   workInProgress.child =
@@ -3991,7 +4123,7 @@ function updateForwardRef(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4067,14 +4199,15 @@ function updateSimpleMemoComponent(
     null !== current &&
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
-  )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
-      0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
-    else
+  ) {
+    didReceiveUpdate = !1;
+    if (0 === (renderLanes & updateLanes))
       return (
         (workInProgress.lanes = current.lanes),
         bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
       );
+    0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
+  }
   return updateFunctionComponent(
     current,
     workInProgress,
@@ -4091,30 +4224,39 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      nextProps = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= nextProps;
+    }
   else
     null !== prevState
       ? ((nextProps = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
       : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= nextProps);
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
@@ -4124,7 +4266,7 @@ function markRef(current, workInProgress) {
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4149,7 +4291,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4309,7 +4451,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4324,7 +4467,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4332,7 +4475,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4346,7 +4489,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4367,7 +4510,7 @@ function finishClassComponent(
   renderLanes
 ) {
   markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4411,18 +4554,21 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
       void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
@@ -4439,7 +4585,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4451,9 +4599,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
@@ -4479,8 +4629,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4507,8 +4660,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4531,7 +4687,7 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren))
     : (progressedPrimaryFragment = createFiberFromOffscreen(
@@ -4564,13 +4720,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4580,26 +4737,22 @@ function updateSuspenseFallbackChildren(
   fallbackChildren,
   renderLanes
 ) {
-  var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
+  var mode = workInProgress.mode;
+  current = current.child;
+  var currentFallbackChildFragment = current.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== current
     ? ((primaryChildren = workInProgress.child),
       (primaryChildren.childLanes = 0),
       (primaryChildren.pendingProps = primaryChildProps),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
-        currentPrimaryChildFragment,
-        primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+      (workInProgress.deletions = null))
+    : ((primaryChildren = createWorkInProgress(current, primaryChildProps)),
+      (primaryChildren.subtreeFlags = current.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4624,8 +4777,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4635,16 +4787,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4653,9 +4803,9 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
@@ -4678,7 +4828,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
     nextProps &= 1;
   }
   push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
   else
     switch (revealOrder) {
       case "forwards":
@@ -4699,8 +4849,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !1,
           revealOrder,
           renderLanes,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "backwards":
@@ -4722,19 +4871,11 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !0,
           renderLanes,
           null,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
         break;
       default:
         workInProgress.memoizedState = null;
@@ -4744,25 +4885,33 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
 function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
   null !== current && (workInProgress.dependencies = current.dependencies);
   workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
+          current,
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
   }
-  return null;
+  return workInProgress.child;
+}
+function hadNoMutationsEffects(current, completedWork) {
+  if (null !== current && current.child === completedWork.child) return !0;
+  if (0 !== (completedWork.flags & 16)) return !1;
+  for (current = completedWork.child; null !== current; ) {
+    if (0 !== (current.flags & 6454) || 0 !== (current.subtreeFlags & 6454))
+      return !1;
+    current = current.sibling;
+  }
+  return !0;
 }
 var appendAllChildren,
   updateHostContainer,
@@ -4879,21 +5028,24 @@ function appendAllChildrenToContainer(
     node = node.sibling;
   }
 }
-updateHostContainer = function(workInProgress) {
+updateHostContainer = function(current, workInProgress) {
   var portalOrRoot = workInProgress.stateNode;
-  if (null !== workInProgress.firstEffect) {
-    var container = portalOrRoot.containerInfo,
-      newChildSet = createChildNodeSet(container);
+  if (!hadNoMutationsEffects(current, workInProgress)) {
+    current = portalOrRoot.containerInfo;
+    var newChildSet = createChildNodeSet(current);
     appendAllChildrenToContainer(newChildSet, workInProgress, !1, !1);
     portalOrRoot.pendingChildren = newChildSet;
     workInProgress.flags |= 4;
-    completeRoot(container, newChildSet);
+    completeRoot(current, newChildSet);
   }
 };
 updateHostComponent$1 = function(current, workInProgress, type, newProps) {
   type = current.stateNode;
   var oldProps = current.memoizedProps;
-  if ((current = null === workInProgress.firstEffect) && oldProps === newProps)
+  if (
+    (current = hadNoMutationsEffects(current, workInProgress)) &&
+    oldProps === newProps
+  )
     workInProgress.stateNode = type;
   else {
     var recyclableInstance = workInProgress.stateNode;
@@ -4911,15 +5063,15 @@ updateHostComponent$1 = function(current, workInProgress, type, newProps) {
     current && null === updatePayload
       ? (workInProgress.stateNode = type)
       : ((newProps = updatePayload),
-        (recyclableInstance = type.node),
+        (oldProps = type.node),
         (type = {
           node: current
             ? null !== newProps
-              ? cloneNodeWithNewProps(recyclableInstance, newProps)
-              : cloneNode(recyclableInstance)
+              ? cloneNodeWithNewProps(oldProps, newProps)
+              : cloneNode(oldProps)
             : null !== newProps
-            ? cloneNodeWithNewChildrenAndProps(recyclableInstance, newProps)
-            : cloneNodeWithNewChildren(recyclableInstance),
+            ? cloneNodeWithNewChildrenAndProps(oldProps, newProps)
+            : cloneNodeWithNewChildren(oldProps),
           canonical: type.canonical
         }),
         (workInProgress.stateNode = type),
@@ -4955,16 +5107,40 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$64 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$64 = lastTailNode),
+      for (var lastTailNode$69 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$69 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$64
+      null === lastTailNode$69
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$64.sibling = null);
+        : (lastTailNode$69.sibling = null);
   }
 }
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    for (var child$70 = completedWork.child; null !== child$70; )
+      (newChildLanes |= child$70.lanes | child$70.childLanes),
+        (subtreeFlags |= child$70.subtreeFlags & 1835008),
+        (subtreeFlags |= child$70.flags & 1835008),
+        (child$70.return = completedWork),
+        (child$70 = child$70.sibling);
+  else
+    for (child$70 = completedWork.child; null !== child$70; )
+      (newChildLanes |= child$70.lanes | child$70.childLanes),
+        (subtreeFlags |= child$70.subtreeFlags),
+        (subtreeFlags |= child$70.flags),
+        (child$70.return = completedWork),
+        (child$70 = child$70.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
 function completeWork(current, workInProgress, renderLanes) {
   var newProps = workInProgress.pendingProps;
   switch (workInProgress.tag) {
@@ -4978,76 +5154,81 @@ function completeWork(current, workInProgress, renderLanes) {
     case 12:
     case 9:
     case 14:
-      return null;
+      return bubbleProperties(workInProgress), null;
     case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 3:
       return (
+        (newProps = workInProgress.stateNode),
         popHostContainer(),
         pop(didPerformWorkStackCursor),
         pop(contextStackCursor),
         resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
         newProps.pendingContext &&
           ((newProps.context = newProps.pendingContext),
           (newProps.pendingContext = null)),
         (null !== current && null !== current.child) ||
           newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
         null
       );
     case 5:
       popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
       if (null !== current && null != workInProgress.stateNode)
         updateHostComponent$1(
           current,
           workInProgress,
-          renderLanes,
+          type,
           newProps,
-          rootContainerInstance
+          renderLanes
         ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
       else {
         if (!newProps) {
           if (null === workInProgress.stateNode)
             throw Error(
               "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
             );
+          bubbleProperties(workInProgress);
           return null;
         }
         requiredContext(contextStackCursor$1.current);
         current = nextReactTag;
         nextReactTag += 2;
-        renderLanes = getViewConfigForType(renderLanes);
+        type = getViewConfigForType(type);
         var updatePayload = diffProperties(
           null,
           emptyObject,
           newProps,
-          renderLanes.validAttributes
+          type.validAttributes
         );
-        rootContainerInstance = createNode(
+        renderLanes = createNode(
           current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
+          type.uiViewClassName,
+          renderLanes,
           updatePayload,
           workInProgress
         );
         current = new ReactFabricHostComponent(
           current,
-          renderLanes,
+          type,
           newProps,
           workInProgress
         );
-        current = { node: rootContainerInstance, canonical: current };
+        current = { node: renderLanes, canonical: current };
         appendAllChildren(current, workInProgress, !1, !1);
         workInProgress.stateNode = current;
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
       }
+      bubbleProperties(workInProgress);
       return null;
     case 6:
       if (current && null != workInProgress.stateNode)
@@ -5063,25 +5244,25 @@ function completeWork(current, workInProgress, renderLanes) {
             "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
           );
         current = requiredContext(rootInstanceStackCursor.current);
-        rootContainerInstance = requiredContext(contextStackCursor$1.current);
+        renderLanes = requiredContext(contextStackCursor$1.current);
         workInProgress.stateNode = createTextInstance(
           newProps,
           current,
-          rootContainerInstance,
+          renderLanes,
           workInProgress
         );
       }
+      bubbleProperties(workInProgress);
       return null;
     case 13:
       pop(suspenseStackCursor);
       newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
+      if (0 !== (workInProgress.flags & 128))
         return (workInProgress.lanes = renderLanes), workInProgress;
       newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (newProps && !renderLanes && 0 !== (workInProgress.mode & 1))
         if (
           (null === current &&
             !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
@@ -5096,82 +5277,92 @@ function completeWork(current, workInProgress, renderLanes) {
           )
             workInProgressRootExitStatus = 4;
           null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
             markRootSuspended$1(
               workInProgressRoot,
               workInProgressRootRenderLanes
             );
         }
       newProps && (workInProgress.flags |= 4);
+      bubbleProperties(workInProgress);
       return null;
     case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 10:
-      return popProvider(workInProgress), null;
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 19:
       pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      updatePayload = type.rendering;
       if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
+        if (newProps) cutOffTailIfNeeded(type, !1);
         else {
           if (
             0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
+            (null !== current && 0 !== (current.flags & 128))
           )
             for (current = workInProgress.child; null !== current; ) {
               updatePayload = findFirstSuspended(current);
               if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
                 current = updatePayload.updateQueue;
                 null !== current &&
                   ((workInProgress.updateQueue = current),
                   (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
+                workInProgress.subtreeFlags = 0;
                 current = renderLanes;
                 for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
-                    (renderLanes = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (updatePayload = rootContainerInstance.alternate),
+                  (renderLanes = newProps),
+                    (type = current),
+                    (renderLanes.flags &= 1835010),
+                    (updatePayload = renderLanes.alternate),
                     null === updatePayload
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = renderLanes),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null))
-                      : ((rootContainerInstance.childLanes =
-                          updatePayload.childLanes),
-                        (rootContainerInstance.lanes = updatePayload.lanes),
-                        (rootContainerInstance.child = updatePayload.child),
-                        (rootContainerInstance.memoizedProps =
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = type),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null))
+                      : ((renderLanes.childLanes = updatePayload.childLanes),
+                        (renderLanes.lanes = updatePayload.lanes),
+                        (renderLanes.child = updatePayload.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps =
                           updatePayload.memoizedProps),
-                        (rootContainerInstance.memoizedState =
+                        (renderLanes.memoizedState =
                           updatePayload.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          updatePayload.updateQueue),
-                        (rootContainerInstance.type = updatePayload.type),
-                        (renderLanes = updatePayload.dependencies),
-                        (rootContainerInstance.dependencies =
-                          null === renderLanes
+                        (renderLanes.updateQueue = updatePayload.updateQueue),
+                        (renderLanes.type = updatePayload.type),
+                        (type = updatePayload.dependencies),
+                        (renderLanes.dependencies =
+                          null === type
                             ? null
                             : {
-                                lanes: renderLanes.lanes,
-                                firstContext: renderLanes.firstContext
+                                lanes: type.lanes,
+                                firstContext: type.firstContext
                               })),
                     (newProps = newProps.sibling);
                 push(
@@ -5182,78 +5373,74 @@ function completeWork(current, workInProgress, renderLanes) {
               }
               current = current.sibling;
             }
-          null !== newProps.tail &&
+          null !== type.tail &&
             now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432));
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
         }
       else {
-        if (!rootContainerInstance)
+        if (!newProps)
           if (
             ((current = findFirstSuspended(updatePayload)), null !== current)
           ) {
             if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
               (current = current.updateQueue),
               null !== current &&
                 ((workInProgress.updateQueue = current),
                 (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
                 !updatePayload.alternate)
             )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
+              return bubbleProperties(workInProgress), null;
           } else
-            2 * now() - newProps.renderingStartTime >
+            2 * now() - type.renderingStartTime >
               workInProgressRootRenderTargetTime &&
               1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432));
-        newProps.isBackwards
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
           ? ((updatePayload.sibling = workInProgress.child),
             (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
+          : ((current = type.last),
             null !== current
               ? (current.sibling = updatePayload)
               : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+            (type.last = updatePayload));
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
     case 23:
-    case 24:
       return (
         popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
         null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
+          (null !== current.memoizedState) !== renderLanes &&
           "unstable-defer-without-hiding" !== newProps.mode &&
           (workInProgress.flags |= 4),
+        (renderLanes &&
+          0 === (subtreeRenderLanes & 1073741824) &&
+          0 !== (workInProgress.mode & 1)) ||
+          bubbleProperties(workInProgress),
         null
       );
   }
@@ -5268,8 +5455,8 @@ function unwindWork(workInProgress) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
         : null;
     case 3:
       popHostContainer();
@@ -5277,11 +5464,11 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
@@ -5289,8 +5476,8 @@ function unwindWork(workInProgress) {
       return (
         pop(suspenseStackCursor),
         (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
           : null
       );
     case 19:
@@ -5298,236 +5485,145 @@ function unwindWork(workInProgress) {
     case 4:
       return popHostContainer(), null;
     case 10:
-      return popProvider(workInProgress), null;
+      return popProvider(workInProgress.type._context), null;
+    case 22:
     case 23:
-    case 24:
       return popRenderLanes(), null;
+    case 24:
+      return null;
     default:
       return null;
   }
 }
-function createCapturedValue(value, source) {
-  try {
-    var info = "",
-      node = source;
-    do (info += describeFiber(node)), (node = node.return);
-    while (node);
-    var JSCompiler_inline_result = info;
-  } catch (x) {
-    JSCompiler_inline_result =
-      "\nError generating stack: " + x.message + "\n" + x.stack;
-  }
-  return { value: value, source: source, stack: JSCompiler_inline_result };
-}
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
-  }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
-}
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
   var ref = current.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
     else ref.current = null;
 }
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
       }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
-  }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
 }
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$81 = finishedRoot.create;
-            finishedRoot.destroy = create$81();
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor$jscomp$0
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        if (void 0 !== destroy) {
+          var current = finishedWork,
+            nearestMountedAncestor = nearestMountedAncestor$jscomp$0;
+          try {
+            destroy();
+          } catch (error) {
+            captureCommitPhaseError(current, nearestMountedAncestor, error);
           }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
-      }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$81 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$81;
-        } while (finishedRoot !== current);
+        }
       }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$81 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$81,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode.canonical;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
-          }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
+      effect = effect.next;
+    } while (effect !== updateQueue);
+  }
+}
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$82 = effect.create;
+        effect.destroy = create$82();
       }
-      return;
-    case 5:
-      null === current && finishedWork.flags & 4 && shim();
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      return;
-    case 13:
-      return;
-    case 19:
-    case 17:
-    case 20:
-    case 21:
-    case 23:
-    case 24:
-      return;
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function commitWork(current, finishedWork) {
@@ -5536,20 +5632,7 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedWork = current = current.next;
-        do {
-          if (3 === (finishedWork.tag & 3)) {
-            var destroy = finishedWork.destroy;
-            finishedWork.destroy = void 0;
-            void 0 !== destroy && destroy();
-          }
-          finishedWork = finishedWork.next;
-        } while (finishedWork !== current);
-      }
+      commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 12:
       return;
@@ -5561,8 +5644,8 @@ function commitWork(current, finishedWork) {
     case 19:
       attachSuspenseRetryListeners(finishedWork);
       return;
+    case 22:
     case 23:
-    case 24:
       return;
   }
   a: {
@@ -5570,7 +5653,6 @@ function commitWork(current, finishedWork) {
       case 1:
       case 5:
       case 6:
-      case 20:
         break a;
       case 3:
       case 4:
@@ -5595,17 +5677,262 @@ function attachSuspenseRetryListeners(finishedWork) {
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    root = nextEffect;
+    firstChild = root.deletions;
+    if (null !== firstChild)
+      for (var i = 0; i < firstChild.length; i++) {
+        var childToDelete = firstChild[i];
+        try {
+          a: for (var node = childToDelete; ; ) {
+            var current = node;
+            if (
+              injectedHook &&
+              "function" === typeof injectedHook.onCommitFiberUnmount
+            )
+              try {
+                injectedHook.onCommitFiberUnmount(rendererID, current);
+              } catch (err) {}
+            switch (current.tag) {
+              case 0:
+              case 11:
+              case 14:
+              case 15:
+                var updateQueue = current.updateQueue;
+                if (null !== updateQueue) {
+                  var lastEffect = updateQueue.lastEffect;
+                  if (null !== lastEffect) {
+                    var firstEffect = lastEffect.next,
+                      effect = firstEffect;
+                    do {
+                      var _effect = effect,
+                        destroy = _effect.destroy,
+                        tag = _effect.tag;
+                      if (void 0 !== destroy && 0 !== (tag & 2)) {
+                        _effect = current;
+                        var nearestMountedAncestor = root;
+                        try {
+                          destroy();
+                        } catch (error) {
+                          captureCommitPhaseError(
+                            _effect,
+                            nearestMountedAncestor,
+                            error
+                          );
+                        }
+                      }
+                      effect = effect.next;
+                    } while (effect !== firstEffect);
+                  }
+                }
+                break;
+              case 1:
+                safelyDetachRef(current, root);
+                var instance = current.stateNode;
+                if ("function" === typeof instance.componentWillUnmount)
+                  try {
+                    (effect = current),
+                      (_effect = instance),
+                      (_effect.props = effect.memoizedProps),
+                      (_effect.state = effect.memoizedState),
+                      _effect.componentWillUnmount();
+                  } catch (unmountError) {
+                    captureCommitPhaseError(current, root, unmountError);
+                  }
+                break;
+              case 5:
+                safelyDetachRef(current, root);
+                break;
+              case 4:
+                createChildNodeSet(current.stateNode.containerInfo);
+            }
+            if (null !== node.child)
+              (node.child.return = node), (node = node.child);
+            else {
+              if (node === childToDelete) break;
+              for (; null === node.sibling; ) {
+                if (null === node.return || node.return === childToDelete)
+                  break a;
+                node = node.return;
+              }
+              node.sibling.return = node.return;
+              node = node.sibling;
+            }
+          }
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, root, error);
+        }
+      }
+    firstChild = root.child;
+    if (0 !== (root.subtreeFlags & 6454) && null !== firstChild)
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var flags = root.flags;
+          if (flags & 256) {
+            var current$jscomp$0 = root.alternate;
+            if (null !== current$jscomp$0) {
+              var currentRef = current$jscomp$0.ref;
+              null !== currentRef &&
+                ("function" === typeof currentRef
+                  ? currentRef(null)
+                  : (currentRef.current = null));
+            }
+          }
+          switch (flags & 2054) {
+            case 2:
+              root.flags &= -3;
+              break;
+            case 6:
+              root.flags &= -3;
+              commitWork(root.alternate, root);
+              break;
+            case 2048:
+              root.flags &= -2049;
+              break;
+            case 2052:
+              root.flags &= -2049;
+              commitWork(root.alternate, root);
+              break;
+            case 4:
+              commitWork(root.alternate, root);
+          }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
+      }
+  }
+}
+function commitLayoutEffects(finishedWork) {
+  for (nextEffect = finishedWork; null !== nextEffect; ) {
+    var fiber = nextEffect,
+      firstChild = fiber.child;
+    if (0 !== (fiber.subtreeFlags & 324) && null !== firstChild)
+      (firstChild.return = fiber), (nextEffect = firstChild);
+    else
+      for (fiber = finishedWork; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        if (0 !== (firstChild.flags & 324)) {
+          var current = firstChild.alternate;
+          try {
+            if (0 !== (firstChild.flags & 68))
+              switch (firstChild.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  commitHookEffectListMount(3, firstChild);
+                  break;
+                case 1:
+                  var instance = firstChild.stateNode;
+                  if (firstChild.flags & 4)
+                    if (null === current) instance.componentDidMount();
+                    else {
+                      var prevProps =
+                        firstChild.elementType === firstChild.type
+                          ? current.memoizedProps
+                          : resolveDefaultProps(
+                              firstChild.type,
+                              current.memoizedProps
+                            );
+                      instance.componentDidUpdate(
+                        prevProps,
+                        current.memoizedState,
+                        instance.__reactInternalSnapshotBeforeUpdate
+                      );
+                    }
+                  var updateQueue = firstChild.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(firstChild, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$83 = firstChild.updateQueue;
+                  if (null !== updateQueue$83) {
+                    current = null;
+                    if (null !== firstChild.child)
+                      switch (firstChild.child.tag) {
+                        case 5:
+                          current = firstChild.child.stateNode.canonical;
+                          break;
+                        case 1:
+                          current = firstChild.child.stateNode;
+                      }
+                    commitUpdateQueue(firstChild, updateQueue$83, current);
+                  }
+                  break;
+                case 5:
+                  null === current && firstChild.flags & 4 && shim();
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (firstChild.flags & 256) {
+              current = void 0;
+              var ref = firstChild.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = firstChild.stateNode;
+                switch (firstChild.tag) {
+                  case 5:
+                    current = instance$jscomp$0.canonical;
+                    break;
+                  default:
+                    current = instance$jscomp$0;
+                }
+                "function" === typeof ref
+                  ? ref(current)
+                  : (ref.current = current);
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(firstChild, firstChild.return, error);
+          }
+        }
+        if (firstChild === fiber) {
+          nextEffect = null;
+          break;
+        }
+        current = firstChild.sibling;
+        if (null !== current) {
+          current.return = firstChild.return;
+          nextEffect = current;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5614,63 +5941,55 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveEffectsLanes = 0,
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 24)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 8) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  if (0 === fiber)
+    a: {
+      fiber = fabricGetCurrentEventPriority
+        ? fabricGetCurrentEventPriority()
+        : null;
+      if (null != fiber)
+        switch (fiber) {
+          case FabricDiscretePriority:
+            fiber = 1;
+            break a;
+        }
+      fiber = 16;
+    }
   return fiber;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -5680,28 +5999,23 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 8) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
   1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? performSyncWorkOnRoot(fiber)
-      : (ensureRootIsScheduled(fiber, eventTime),
+    ? 0 !== (executionContext & 4) && 0 === (executionContext & 24)
+      ? performSyncWorkOnRoot(root)
+      : (ensureRootIsScheduled(root, eventTime),
         0 === executionContext &&
+          0 === (fiber.mode & 1) &&
           ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime));
-  mostRecentlyUpdatedRoot = fiber;
+          includesLegacySyncCallbacks && flushSyncCallbacks()))
+    : ensureRootIsScheduled(root, eventTime);
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -5730,17 +6044,8 @@ function ensureRootIsScheduled(root, currentTime) {
       lane = 1 << index$5,
       expirationTime = expirationTimes[index$5];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$5] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$5] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -5748,47 +6053,58 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
@@ -5798,41 +6114,45 @@ function performConcurrentWorkOnRoot(root) {
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
   if (0 === lanes) return null;
-  var exitStatus = lanes;
-  var prevExecutionContext = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== exitStatus
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, exitStatus);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
-    }
-  while (1);
-  resetContextDependencies();
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = prevExecutionContext;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes) ? !1 : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 8;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    )
+      (workInProgressRootRenderTargetTime = now() + 500),
+        prepareFreshStack(root, didTimeout);
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((executionContext |= 32),
       root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (JSCompiler_inline_result = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== JSCompiler_inline_result &&
+        ((lanes = JSCompiler_inline_result),
+        (didTimeout = renderRootSync(root, JSCompiler_inline_result))));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -5840,7 +6160,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -5850,20 +6170,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevExecutionContext = root.suspendedLanes;
-          if ((prevExecutionContext & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevExecutionContext;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -5871,16 +6191,17 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevExecutionContext = -1; 0 < lanes; ) {
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; ) {
           var index$4 = 31 - clz32(lanes);
           prevDispatcher = 1 << index$4;
-          index$4 = exitStatus[index$4];
-          index$4 > prevExecutionContext && (prevExecutionContext = index$4);
+          index$4 = didTimeout[index$4];
+          index$4 > JSCompiler_inline_result &&
+            (JSCompiler_inline_result = index$4);
           lanes &= ~prevDispatcher;
         }
-        lanes = prevExecutionContext;
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -5923,33 +6244,26 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$9 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$9;
-    root[index$9] = -1;
+    var index$6 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$6;
+    root[index$6] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    executionContext |= 32;
+    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo));
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -5962,11 +6276,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6006,20 +6315,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6055,15 +6383,18 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6074,15 +6405,15 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$76 = returnFiber;
+            workInProgress$30 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$76.tag)) {
-              var nextState = workInProgress$76.memoizedState;
+            if ((JSCompiler_temp = 13 === workInProgress$30.tag)) {
+              var nextState = workInProgress$30.memoizedState;
               if (null !== nextState)
                 JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
               else {
-                var props = workInProgress$76.memoizedProps;
+                var props = workInProgress$30.memoizedProps;
                 JSCompiler_temp =
                   void 0 === props.fallback
                     ? !1
@@ -6094,16 +6425,19 @@ function handleError(root$jscomp$0, thrownValue) {
               }
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$76.updateQueue;
+              var wakeables = workInProgress$30.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$76.updateQueue = updateQueue;
+                workInProgress$30.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$76.mode & 2)) {
-                workInProgress$76.flags |= 64;
+              if (
+                0 === (workInProgress$30.mode & 1) &&
+                workInProgress$30 !== returnFiber
+              ) {
+                workInProgress$30.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6134,61 +6468,61 @@ function handleError(root$jscomp$0, thrownValue) {
                 );
                 wakeable.then(ping, ping);
               }
-              workInProgress$76.flags |= 8192;
-              workInProgress$76.lanes = thrownValue;
+              workInProgress$30.flags |= 16384;
+              workInProgress$30.lanes = thrownValue;
               break a;
             }
-            workInProgress$76 = workInProgress$76.return;
-          } while (null !== workInProgress$76);
+            workInProgress$30 = workInProgress$30.return;
+          } while (null !== workInProgress$30);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$76 = returnFiber;
+        workInProgress$30 = returnFiber;
         do {
-          switch (workInProgress$76.tag) {
+          switch (workInProgress$30.tag) {
             case 3:
               root = value;
-              workInProgress$76.flags |= 8192;
+              workInProgress$30.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$76.lanes |= thrownValue;
-              var update$77 = createRootErrorUpdate(
-                workInProgress$76,
+              workInProgress$30.lanes |= thrownValue;
+              var update$31 = createRootErrorUpdate(
+                workInProgress$30,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$76, update$77);
+              enqueueCapturedUpdate(workInProgress$30, update$31);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$76.type,
-                instance = workInProgress$76.stateNode;
+              var ctor = workInProgress$30.type,
+                instance = workInProgress$30.stateNode;
               if (
-                0 === (workInProgress$76.flags & 64) &&
+                0 === (workInProgress$30.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$76.flags |= 8192;
+                workInProgress$30.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$76.lanes |= thrownValue;
-                var update$80 = createClassErrorUpdate(
-                  workInProgress$76,
+                workInProgress$30.lanes |= thrownValue;
+                var update$34 = createClassErrorUpdate(
+                  workInProgress$30,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$76, update$80);
+                enqueueCapturedUpdate(workInProgress$30, update$34);
                 break a;
               }
           }
-          workInProgress$76 = workInProgress$76.return;
-        } while (null !== workInProgress$76);
+          workInProgress$30 = workInProgress$30.return;
+        } while (null !== workInProgress$30);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6208,7 +6542,7 @@ function pushDispatcher() {
 }
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 8;
   var prevDispatcher = pushDispatcher();
   (workInProgressRoot === root && workInProgressRootRenderLanes === lanes) ||
     prepareFreshStack(root, lanes);
@@ -6235,7 +6569,7 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
@@ -6249,47 +6583,25 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      current = completeWork(current, completedWork, subtreeRenderLanes);
-      if (null !== current) {
-        workInProgress = current;
-        return;
-      }
-      current = completedWork;
+    if (0 === (completedWork.flags & 8192)) {
       if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
+        ((current = completeWork(current, completedWork, subtreeRenderLanes)),
+        null !== current)
       ) {
-        for (var newChildLanes = 0, child = current.child; null !== child; )
-          (newChildLanes |= child.lanes | child.childLanes),
-            (child = child.sibling);
-        current.childLanes = newChildLanes;
+        workInProgress = current;
+        return;
       }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
       null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
     }
     completedWork = completedWork.sibling;
     if (null !== completedWork) {
@@ -6301,16 +6613,25 @@ function completeUnitOfWork(unitOfWork) {
   0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
 }
 function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
   return null;
 }
 function commitRootImpl(root, renderPriorityLevel) {
   do flushPassiveEffects();
   while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
-  var finishedWork = root.finishedWork;
+  var finishedWork = root.finishedWork,
+    lanes = root.finishedLanes;
   if (null === finishedWork) return null;
   root.finishedWork = null;
   root.finishedLanes = 0;
@@ -6319,361 +6640,207 @@ function commitRootImpl(root, renderPriorityLevel) {
       "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
     );
   root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$10 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$10;
-    remainingLanes$jscomp$0[index$10] = 0;
-    eventTimes[index$10] = -1;
-    expirationTimes[index$10] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
   root === workInProgressRoot &&
     ((workInProgress = workInProgressRoot = null),
     (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              eventTimes = nextEffect;
-              a: for (noLongerPendingLanes = expirationTimes = eventTimes; ; ) {
-                index$10 = noLongerPendingLanes;
-                if (
-                  injectedHook &&
-                  "function" === typeof injectedHook.onCommitFiberUnmount
-                )
-                  try {
-                    injectedHook.onCommitFiberUnmount(rendererID, index$10);
-                  } catch (err) {}
-                switch (index$10.tag) {
-                  case 0:
-                  case 11:
-                  case 14:
-                  case 15:
-                  case 22:
-                    var updateQueue = index$10.updateQueue;
-                    if (null !== updateQueue) {
-                      var lastEffect = updateQueue.lastEffect;
-                      if (null !== lastEffect) {
-                        var firstEffect = lastEffect.next;
-                        lane = firstEffect;
-                        do {
-                          var _effect2 = lane,
-                            destroy = _effect2.destroy,
-                            tag = _effect2.tag;
-                          if (void 0 !== destroy)
-                            if (0 !== (tag & 4))
-                              enqueuePendingPassiveHookEffectUnmount(
-                                index$10,
-                                lane
-                              );
-                            else {
-                              _effect2 = index$10;
-                              try {
-                                destroy();
-                              } catch (error) {
-                                captureCommitPhaseError(_effect2, error);
-                              }
-                            }
-                          lane = lane.next;
-                        } while (lane !== firstEffect);
-                      }
-                    }
-                    break;
-                  case 1:
-                    safelyDetachRef(index$10);
-                    var instance = index$10.stateNode;
-                    if ("function" === typeof instance.componentWillUnmount)
-                      try {
-                        (lane = index$10),
-                          (_effect2 = instance),
-                          (_effect2.props = lane.memoizedProps),
-                          (_effect2.state = lane.memoizedState),
-                          _effect2.componentWillUnmount();
-                      } catch (unmountError) {
-                        captureCommitPhaseError(index$10, unmountError);
-                      }
-                    break;
-                  case 5:
-                    safelyDetachRef(index$10);
-                    break;
-                  case 4:
-                    createChildNodeSet(index$10.stateNode.containerInfo);
-                }
-                if (null !== noLongerPendingLanes.child)
-                  (noLongerPendingLanes.child.return = noLongerPendingLanes),
-                    (noLongerPendingLanes = noLongerPendingLanes.child);
-                else {
-                  if (noLongerPendingLanes === expirationTimes) break;
-                  for (; null === noLongerPendingLanes.sibling; ) {
-                    if (
-                      null === noLongerPendingLanes.return ||
-                      noLongerPendingLanes.return === expirationTimes
-                    )
-                      break a;
-                    noLongerPendingLanes = noLongerPendingLanes.return;
-                  }
-                  noLongerPendingLanes.sibling.return =
-                    noLongerPendingLanes.return;
-                  noLongerPendingLanes = noLongerPendingLanes.sibling;
-                }
-              }
-              var alternate = eventTimes.alternate;
-              detachFiberMutation(eventTimes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$87) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$87);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 16;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
+    commitMutationEffects(root, finishedWork);
     root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance$jscomp$0 = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance$jscomp$0.canonical;
-                  break;
-                default:
-                  current = instance$jscomp$0;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$88) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$88);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    nextEffect = null;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else root.current = finishedWork;
-  if (rootDoesHavePassiveEffects)
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (renderPriorityLevel = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((flags$jscomp$0 = nextEffect),
-          (flags$jscomp$0.sibling = null),
-          (flags$jscomp$0.stateNode = null)),
-        (nextEffect = renderPriorityLevel);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
   0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
-  1 === remainingLanes
+  0 !== (remainingLanes & 1)
     ? root === rootWithNestedUpdates
       ? nestedUpdateCount++
       : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        void 0,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  if (0 !== (executionContext & 4)) return null;
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
-  }
-  return !1;
-}
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects;
-  rootWithPendingPassiveEffects = null;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$93 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$93.destroy;
-    effect$93.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$93 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
     try {
-      var create$97 = effect$93.create;
-      effect$93.destroy = create$97();
-    } catch (error$98) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$98);
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 24))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 16;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect;
+                  switch (fiber$jscomp$0.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListUnmount(4, fiber$jscomp$0, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (fiber.tag) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    commitHookEffectListUnmount(5, fiber, fiber.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (deletions.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListMount(5, deletions);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
     }
   }
-  for (create$97 = root.current.firstEffect; null !== create$97; )
-    (root = create$97.nextEffect),
-      (create$97.nextEffect = null),
-      create$97.flags & 8 &&
-        ((create$97.sibling = null), (create$97.stateNode = null)),
-      (create$97 = root);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
+  return !1;
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
@@ -6685,42 +6852,50 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -6732,7 +6907,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
@@ -6744,15 +6919,11 @@ function resolveRetryWakeable(boundaryFiber, wakeable) {
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
@@ -6768,78 +6939,83 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
-            workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue2);
-          context._currentValue2 = updateLanes;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
+      if (0 === (renderLanes & updateLanes)) {
+        didReceiveUpdate = !1;
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 5:
+            pushHostContext(workInProgress);
+            break;
+          case 1:
+            isContextProvider(workInProgress.type) &&
+              pushContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
               workInProgress,
-              renderLanes
+              workInProgress.stateNode.containerInfo
             );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
+            break;
+          case 10:
+            updateLanes = workInProgress.type._context;
+            var nextValue = workInProgress.memoizedProps.value;
+            push(valueCursor, updateLanes._currentValue2);
+            updateLanes._currentValue2 = nextValue;
+            break;
+          case 13:
+            if (null !== workInProgress.memoizedState) {
+              if (0 !== (renderLanes & workInProgress.child.childLanes))
+                return updateSuspenseComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              push(suspenseStackCursor, suspenseStackCursor.current & 1);
+              workInProgress = bailoutOnAlreadyFinishedWork(
                 current,
                 workInProgress,
                 renderLanes
               );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
+              return null !== workInProgress ? workInProgress.sibling : null;
+            }
+            push(suspenseStackCursor, suspenseStackCursor.current & 1);
+            break;
+          case 19:
+            updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
+            if (0 !== (current.flags & 128)) {
+              if (updateLanes)
+                return updateSuspenseListComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              workInProgress.flags |= 128;
+            }
+            nextValue = workInProgress.memoizedState;
+            null !== nextValue &&
+              ((nextValue.rendering = null),
+              (nextValue.tail = null),
+              (nextValue.lastEffect = null));
+            push(suspenseStackCursor, suspenseStackCursor.current);
+            if (updateLanes) break;
+            else return null;
+          case 22:
+          case 23:
+            return (
+              (workInProgress.lanes = 0),
+              updateOffscreenComponent(current, workInProgress, renderLanes)
+            );
+        }
+        return bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
+        );
       }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
@@ -6851,22 +7027,22 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      nextValue = getMaskedContext(workInProgress, contextStackCursor.current);
       prepareToReadContext(workInProgress, renderLanes);
-      context = renderWithHooks(
+      nextValue = renderWithHooks(
         null,
         workInProgress,
         updateLanes,
         current,
-        context,
+        nextValue,
         renderLanes
       );
       workInProgress.flags |= 1;
       if (
-        "object" === typeof context &&
-        null !== context &&
-        "function" === typeof context.render &&
-        void 0 === context.$$typeof
+        "object" === typeof nextValue &&
+        null !== nextValue &&
+        "function" === typeof nextValue.render &&
+        void 0 === nextValue.$$typeof
       ) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
@@ -6876,21 +7052,13 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           pushContextProvider(workInProgress);
         } else hasContext = !1;
         workInProgress.memoizedState =
-          null !== context.state && void 0 !== context.state
-            ? context.state
+          null !== nextValue.state && void 0 !== nextValue.state
+            ? nextValue.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
-        context.updater = classComponentUpdater;
-        workInProgress.stateNode = context;
-        context._reactInternals = workInProgress;
+        nextValue.updater = classComponentUpdater;
+        workInProgress.stateNode = nextValue;
+        nextValue._reactInternals = workInProgress;
         mountClassInstance(workInProgress, updateLanes, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
@@ -6902,28 +7070,28 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         );
       } else
         (workInProgress.tag = 0),
-          reconcileChildren(null, workInProgress, context, renderLanes),
+          reconcileChildren(null, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      nextValue = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
+        hasContext = nextValue._init;
+        nextValue = hasContext(nextValue._payload);
+        workInProgress.type = nextValue;
+        hasContext = workInProgress.tag = resolveLazyComponentTag(nextValue);
+        current = resolveDefaultProps(nextValue, current);
         switch (hasContext) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -6932,7 +7100,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -6941,7 +7109,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -6950,8 +7118,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
+              nextValue,
+              resolveDefaultProps(nextValue.type, current),
               updateLanes,
               renderLanes
             );
@@ -6959,7 +7127,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            nextValue +
             ". Lazy element type must resolve to a class or function."
         );
       }
@@ -6967,32 +7135,32 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 0:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateFunctionComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
     case 1:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateClassComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7003,19 +7171,18 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
-      cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
+      nextValue = workInProgress.pendingProps;
       updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      cloneUpdateQueue(current, workInProgress);
+      processUpdateQueue(workInProgress, nextValue, null, renderLanes);
+      nextValue = workInProgress.memoizedState.element;
+      nextValue === updateLanes
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
@@ -7055,16 +7222,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 11:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateForwardRef(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7101,27 +7268,15 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 10:
       a: {
         updateLanes = workInProgress.type._context;
-        context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue2);
-        context$jscomp$0._currentValue2 = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        nextValue = workInProgress.pendingProps;
+        hasContext = workInProgress.memoizedProps;
+        var newValue = nextValue.value;
+        push(valueCursor, updateLanes._currentValue2);
+        updateLanes._currentValue2 = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === nextValue.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7133,76 +7288,71 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === updateLanes) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
           workInProgress,
-          context.children,
+          nextValue.children,
           renderLanes
         );
         workInProgress = workInProgress.child;
@@ -7210,28 +7360,27 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       return workInProgress;
     case 9:
       return (
-        (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (nextValue = workInProgress.type),
+        (updateLanes = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (nextValue = readContext(nextValue)),
+        (updateLanes = updateLanes(nextValue)),
         (workInProgress.flags |= 1),
         reconcileChildren(current, workInProgress, updateLanes, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
+        (nextValue = workInProgress.type),
         (hasContext = resolveDefaultProps(
-          context,
+          nextValue,
           workInProgress.pendingProps
         )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (hasContext = resolveDefaultProps(nextValue.type, hasContext)),
         updateMemoComponent(
           current,
           workInProgress,
-          context,
+          nextValue,
           hasContext,
           updateLanes,
           renderLanes
@@ -7249,11 +7398,11 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 17:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
@@ -7263,8 +7412,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, updateLanes, nextValue),
+        mountClassInstance(workInProgress, updateLanes, nextValue, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
@@ -7276,9 +7425,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7296,8 +7445,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
 }
@@ -7335,9 +7484,9 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null));
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7372,24 +7521,22 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           type
         );
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7405,7 +7552,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7429,9 +7576,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7451,7 +7595,7 @@ function createFiberFromFragment(elements, mode, lanes, key) {
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7570,7 +7714,8 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -7598,14 +7743,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_865 = {
+  devToolsConfig$jscomp$inline_939 = {
     findFiberByHostInstance: getInstanceFromInstance,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-experimental-568dc3532",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -7620,17 +7765,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1054 = {
-  bundleType: devToolsConfig$jscomp$inline_865.bundleType,
-  version: devToolsConfig$jscomp$inline_865.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_865.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_865.rendererConfig,
+var internals$jscomp$inline_1177 = {
+  bundleType: devToolsConfig$jscomp$inline_939.bundleType,
+  version: devToolsConfig$jscomp$inline_939.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_939.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_939.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -7639,25 +7785,26 @@ var internals$jscomp$inline_1054 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_865.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_939.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-experimental-568dc3532"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1055 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1178 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1055.isDisabled &&
-    hook$jscomp$inline_1055.supportsFiber
+    !hook$jscomp$inline_1178.isDisabled &&
+    hook$jscomp$inline_1178.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1055.inject(
-        internals$jscomp$inline_1054
+      (rendererID = hook$jscomp$inline_1178.inject(
+        internals$jscomp$inline_1177
       )),
-        (injectedHook = hook$jscomp$inline_1055);
+        (injectedHook = hook$jscomp$inline_1178);
     } catch (err) {}
 }
 exports.createPortal = function(children, containerTag) {
@@ -7695,16 +7842,18 @@ exports.findHostInstance_DEPRECATED = function(componentOrHandle) {
     : componentOrHandle;
 };
 exports.findNodeHandle = findNodeHandle;
-exports.render = function(element, containerTag, callback) {
+exports.render = function(element, containerTag, callback, concurrentRoot) {
   var root = roots.get(containerTag);
-  if (!root) {
-    root = new FiberRootNode(containerTag, 0, !1);
-    var uninitializedFiber = createFiber(3, null, null, 0);
-    root.current = uninitializedFiber;
-    uninitializedFiber.stateNode = root;
-    initializeUpdateQueue(uninitializedFiber);
-    roots.set(containerTag, root);
-  }
+  root ||
+    ((root = concurrentRoot ? 1 : 0),
+    (concurrentRoot = new FiberRootNode(containerTag, root, !1)),
+    (root = createFiber(3, null, null, 1 === root ? 1 : 0)),
+    (concurrentRoot.current = root),
+    (root.stateNode = concurrentRoot),
+    (root.memoizedState = { element: null }),
+    initializeUpdateQueue(root),
+    (root = concurrentRoot),
+    roots.set(containerTag, root));
   updateContainer(element, root, null, callback);
   a: if (((element = root.current), element.child))
     switch (element.child.tag) {
@@ -7717,6 +7866,18 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (handle._internalInstanceHandle
+      ? nativeFabricUIManager.sendAccessibilityEvent(
+          handle._internalInstanceHandle.stateNode.node,
+          eventType
+        )
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.stopSurface = function(containerTag) {
   var root = roots.get(containerTag);
   root &&
diff --git a/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
index 7f8d5d62270acd..9f9e059864013e 100644
--- a/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
+++ b/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
@@ -7,15 +7,15 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated
+ * @generated SignedSource<<f021bce2048d654b3e2e31276c91433c>>
  */
 
 "use strict";
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface"),
   React = require("react"),
-  Scheduler = require("scheduler"),
-  tracing = require("scheduler/tracing");
+  dynamicFlags = require("ReactNativeInternalFeatureFlags"),
+  Scheduler = require("scheduler");
 function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
@@ -63,7 +63,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -75,7 +76,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -289,36 +290,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -326,9 +337,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -338,12 +349,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -569,7 +580,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -920,7 +931,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_223 = {
+var injectedNamesToPlugins$jscomp$inline_229 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -955,34 +966,34 @@ var injectedNamesToPlugins$jscomp$inline_223 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_224 = !1,
-  pluginName$jscomp$inline_225;
-for (pluginName$jscomp$inline_225 in injectedNamesToPlugins$jscomp$inline_223)
+  isOrderingDirty$jscomp$inline_230 = !1,
+  pluginName$jscomp$inline_231;
+for (pluginName$jscomp$inline_231 in injectedNamesToPlugins$jscomp$inline_229)
   if (
-    injectedNamesToPlugins$jscomp$inline_223.hasOwnProperty(
-      pluginName$jscomp$inline_225
+    injectedNamesToPlugins$jscomp$inline_229.hasOwnProperty(
+      pluginName$jscomp$inline_231
     )
   ) {
-    var pluginModule$jscomp$inline_226 =
-      injectedNamesToPlugins$jscomp$inline_223[pluginName$jscomp$inline_225];
+    var pluginModule$jscomp$inline_232 =
+      injectedNamesToPlugins$jscomp$inline_229[pluginName$jscomp$inline_231];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_225) ||
-      namesToPlugins[pluginName$jscomp$inline_225] !==
-        pluginModule$jscomp$inline_226
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_231) ||
+      namesToPlugins[pluginName$jscomp$inline_231] !==
+        pluginModule$jscomp$inline_232
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_225])
+      if (namesToPlugins[pluginName$jscomp$inline_231])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_225 +
+            pluginName$jscomp$inline_231 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_225
-      ] = pluginModule$jscomp$inline_226;
-      isOrderingDirty$jscomp$inline_224 = !0;
+        pluginName$jscomp$inline_231
+      ] = pluginModule$jscomp$inline_232;
+      isOrderingDirty$jscomp$inline_230 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_224 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_230 && recomputePluginOrdering();
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
@@ -997,7 +1008,22 @@ getNodeFromInstance = function(inst) {
 };
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
-    null !== to
+    var fromOrTo = from || to;
+    (fromOrTo = fromOrTo && fromOrTo.stateNode) &&
+    fromOrTo.canonical._internalInstanceHandle
+      ? (from &&
+          nativeFabricUIManager.setIsJSResponder(
+            from.stateNode.node,
+            !1,
+            blockNativeResponder || !1
+          ),
+        to &&
+          nativeFabricUIManager.setIsJSResponder(
+            to.stateNode.node,
+            !0,
+            blockNativeResponder || !1
+          ))
+      : null !== to
       ? ReactNativePrivateInterface.UIManager.setJSResponder(
           to.stateNode.canonical._nativeTag,
           blockNativeResponder
@@ -1019,10 +1045,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1037,11 +1063,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1051,7 +1077,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1068,6 +1094,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1077,24 +1105,85 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
+var enablePersistentOffscreenHostContainer =
+  dynamicFlags.enablePersistentOffscreenHostContainer;
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1103,7 +1192,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1191,33 +1280,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
@@ -1246,7 +1318,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1292,9 +1364,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1319,7 +1391,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1335,7 +1407,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1352,7 +1424,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1470,7 +1542,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1530,6 +1602,273 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
     }
   });
 }
+var scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null,
+  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__;
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      var didError = 128 === (root.current.flags & 128);
+      switch (eventPriority) {
+        case 1:
+          var schedulerPriority = ImmediatePriority;
+          break;
+        case 4:
+          schedulerPriority = UserBlockingPriority;
+          break;
+        case 16:
+          schedulerPriority = NormalPriority;
+          break;
+        case 536870912:
+          schedulerPriority = IdlePriority;
+          break;
+        default:
+          schedulerPriority = NormalPriority;
+      }
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        schedulerPriority,
+        didError
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 === (root.current.mode & 32) &&
+    0 !== (nextLanes & 4) &&
+    (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$7 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$7;
+    remainingLanes[index$7] = 0;
+    eventTimes[index$7] = -1;
+    root[index$7] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$8 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$8;
+    (lane & entangledLanes) | (root[index$8] & entangledLanes) &&
+      (root[index$8] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (isDevToolsPresent)
+    for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) {
+      var index$9 = 31 - clz32(lanes),
+        lane = 1 << index$9;
+      root[index$9].add(fiber);
+      lanes &= ~lane;
+    }
+}
+function movePendingFibersToMemoized(root, lanes) {
+  if (isDevToolsPresent)
+    for (
+      var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap,
+        memoizedUpdaters = root.memoizedUpdaters;
+      0 < lanes;
+
+    ) {
+      var index$10 = 31 - clz32(lanes);
+      root = 1 << index$10;
+      index$10 = pendingUpdatersLaneMap[index$10];
+      0 < index$10.size &&
+        (index$10.forEach(function(fiber) {
+          var alternate = fiber.alternate;
+          (null !== alternate && memoizedUpdaters.has(alternate)) ||
+            memoizedUpdaters.add(fiber);
+        }),
+        index$10.clear());
+      lanes &= ~root;
+    }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
 function shim() {
   throw Error(
     "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
@@ -1555,6 +1894,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
   fabricMeasure = _nativeFabricUIManage.measure,
   fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
   fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
+  FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
+  fabricGetCurrentEventPriority =
+    _nativeFabricUIManage.unstable_getCurrentEventPriority,
   getViewConfigForType =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
   nextReactTag = 2;
@@ -1579,38 +1921,79 @@ var ReactFabricHostComponent = (function() {
     ReactNativePrivateInterface.TextInputState.focusTextInput(this);
   };
   _proto.measure = function(callback) {
-    fabricMeasure(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
+    var stateNode = this._internalInstanceHandle.stateNode;
+    null != stateNode &&
+      fabricMeasure(
+        stateNode.node,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+      );
   };
   _proto.measureInWindow = function(callback) {
-    fabricMeasureInWindow(
-      this._internalInstanceHandle.stateNode.node,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
+    var stateNode = this._internalInstanceHandle.stateNode;
+    null != stateNode &&
+      fabricMeasureInWindow(
+        stateNode.node,
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
+      );
   };
   _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
-    "number" !== typeof relativeToNativeNode &&
-      relativeToNativeNode instanceof ReactFabricHostComponent &&
-      fabricMeasureLayout(
-        this._internalInstanceHandle.stateNode.node,
-        relativeToNativeNode._internalInstanceHandle.stateNode.node,
-        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
-      );
+    if (
+      "number" !== typeof relativeToNativeNode &&
+      relativeToNativeNode instanceof ReactFabricHostComponent
+    ) {
+      var toStateNode = this._internalInstanceHandle.stateNode;
+      relativeToNativeNode =
+        relativeToNativeNode._internalInstanceHandle.stateNode;
+      null != toStateNode &&
+        null != relativeToNativeNode &&
+        fabricMeasureLayout(
+          toStateNode.node,
+          relativeToNativeNode.node,
+          mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+          mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        );
+    }
   };
   _proto.setNativeProps = function() {};
   return ReactFabricHostComponent;
 })();
+function createInstance(
+  type,
+  props,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  hostContext = nextReactTag;
+  nextReactTag += 2;
+  type = getViewConfigForType(type);
+  var updatePayload = diffProperties(
+    null,
+    emptyObject,
+    props,
+    type.validAttributes
+  );
+  rootContainerInstance = createNode(
+    hostContext,
+    type.uiViewClassName,
+    rootContainerInstance,
+    updatePayload,
+    internalInstanceHandle
+  );
+  props = new ReactFabricHostComponent(
+    hostContext,
+    type,
+    props,
+    internalInstanceHandle
+  );
+  return { node: rootContainerInstance, canonical: props };
+}
 function createTextInstance(
   text,
   rootContainerInstance,
   hostContext,
   internalInstanceHandle
 ) {
-  if (!hostContext.isInAParentText)
-    throw Error("Text strings must be rendered within a <Text> component.");
   hostContext = nextReactTag;
   nextReactTag += 2;
   return {
@@ -1625,6 +2008,11 @@ function createTextInstance(
 }
 var scheduleTimeout = setTimeout,
   cancelTimeout = clearTimeout;
+function getOffscreenContainerProps(mode, children) {
+  return "hidden" === mode
+    ? { children: children, style: { display: "none" } }
+    : { children: children, style: { flex: 1 } };
+}
 function cloneHiddenInstance(instance) {
   var node = instance.node;
   var JSCompiler_inline_result = diffProperties(
@@ -1648,7 +2036,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1702,13 +2091,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1744,321 +2133,41 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__,
-  Scheduler_now = Scheduler.unstable_now;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
+  if (!isFlushingSyncQueue && null !== syncQueue) {
+    isFlushingSyncQueue = !0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
+    try {
+      var queue = syncQueue;
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
+      syncQueue = null;
+      includesLegacySyncCallbacks = !1;
+    } catch (error) {
+      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+      error);
+    } finally {
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
+    }
   }
+  return null;
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
-    case 5:
-      return 97;
-    case 3:
-    case 2:
-    case 1:
-      return 95;
-    case 0:
-      return 90;
-    default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
+var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
+function is(x, y) {
+  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
 }
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-var fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
-  if (!isFlushingSyncQueue && null !== syncQueue) {
-    isFlushingSyncQueue = !0;
-    var i = 0;
-    try {
-      var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
-      syncQueue = null;
-    } catch (error) {
-      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
-      error);
-    } finally {
-      isFlushingSyncQueue = !1;
-    }
-  }
-}
-var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
-function is(x, y) {
-  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
-}
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
-function shallowEqual(objA, objB) {
-  if (objectIs(objA, objB)) return !0;
+var objectIs = "function" === typeof Object.is ? Object.is : is;
+function shallowEqual(objA, objB) {
+  if (objectIs(objA, objB)) return !0;
   if (
     "object" !== typeof objA ||
     null === objA ||
@@ -2093,8 +2202,6 @@ function describeFiber(fiber) {
       return describeFunctionComponentFrame(fiber.type, null);
     case 11:
       return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
     case 1:
       return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
@@ -2115,14 +2222,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue2 = currentValue;
+  context._currentValue2 = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2142,44 +2249,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue2;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue2;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2205,14 +2308,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 2)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2281,111 +2404,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2441,7 +2564,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2452,7 +2576,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2462,7 +2587,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2534,7 +2660,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2556,7 +2681,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2609,25 +2733,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2659,16 +2780,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2683,7 +2804,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2772,7 +2902,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2797,22 +2927,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2840,15 +2962,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2859,7 +2973,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3036,66 +3150,49 @@ function ChildReconciler(shouldTrackSideEffects) {
     return iteratorFn;
   }
   return function(returnFiber, currentFirstChild, newChild, lanes) {
-    var isUnkeyedTopLevelFragment =
-      "object" === typeof newChild &&
+    "object" === typeof newChild &&
       null !== newChild &&
       newChild.type === REACT_FRAGMENT_TYPE &&
-      null === newChild.key;
-    isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+      null === newChild.key &&
+      (newChild = newChild.props.children);
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
             for (
-              isUnkeyedTopLevelFragment = currentFirstChild;
-              null !== isUnkeyedTopLevelFragment;
+              var key = newChild.key, child = currentFirstChild;
+              null !== child;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (child.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === child.tag) {
+                    deleteRemainingChildren(returnFiber, child.sibling);
+                    currentFirstChild = useFiber(
+                      child,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (child.elementType === key) {
+                  deleteRemainingChildren(returnFiber, child.sibling);
+                  currentFirstChild = useFiber(child, newChild.props);
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    child,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
-                deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
+                deleteRemainingChildren(returnFiber, child);
                 break;
-              } else deleteChild(returnFiber, isUnkeyedTopLevelFragment);
-              isUnkeyedTopLevelFragment = isUnkeyedTopLevelFragment.sibling;
+              } else deleteChild(returnFiber, child);
+              child = child.sibling;
             }
             newChild.type === REACT_FRAGMENT_TYPE
               ? ((currentFirstChild = createFiberFromFragment(
@@ -3125,12 +3222,8 @@ function ChildReconciler(shouldTrackSideEffects) {
           return placeSingleChild(returnFiber);
         case REACT_PORTAL_TYPE:
           a: {
-            for (
-              isUnkeyedTopLevelFragment = newChild.key;
-              null !== currentFirstChild;
-
-            ) {
-              if (currentFirstChild.key === isUnkeyedTopLevelFragment)
+            for (child = newChild.key; null !== currentFirstChild; ) {
+              if (currentFirstChild.key === child)
                 if (
                   4 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
@@ -3166,9 +3259,24 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
-    if ("string" === typeof newChild || "number" === typeof newChild)
-      return (
-        (newChild = "" + newChild),
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
+    return "string" === typeof newChild || "number" === typeof newChild
+      ? ((newChild = "" + newChild),
         null !== currentFirstChild && 6 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(currentFirstChild, newChild)),
@@ -3182,36 +3290,8 @@ function ChildReconciler(shouldTrackSideEffects) {
             )),
             (currentFirstChild.return = returnFiber),
             (returnFiber = currentFirstChild)),
-        placeSingleChild(returnFiber)
-      );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
-    if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
-      switch (returnFiber.tag) {
-        case 1:
-        case 22:
-        case 0:
-        case 11:
-        case 15:
-          throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
-              "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
-          );
-      }
-    return deleteRemainingChildren(returnFiber, currentFirstChild);
+        placeSingleChild(returnFiber))
+      : deleteRemainingChildren(returnFiber, currentFirstChild);
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
@@ -3269,7 +3349,7 @@ function findFirstSuspended(row) {
       if (null !== state && (null === state.dehydrated || shim$1() || shim$1()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3421,10 +3501,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3449,22 +3530,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3490,7 +3582,7 @@ function rerenderReducer(reducer) {
   }
   return [newState, dispatch];
 }
-function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
+function readFromUnsubscribedMutableSource(root, source, getSnapshot) {
   var getVersion = source._getVersion;
   getVersion = getVersion(source._source);
   var JSCompiler_inline_result = source._workInProgressVersionSecondary;
@@ -3504,7 +3596,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3517,7 +3609,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     version = getVersion(source._source),
     dispatcher = ReactCurrentDispatcher$1.current,
     _dispatcher$useState = dispatcher.useState(function() {
-      return readFromUnsubcribedMutableSource(root, source, getSnapshot);
+      return readFromUnsubscribedMutableSource(root, source, getSnapshot);
     }),
     setSnapshot = _dispatcher$useState[1],
     snapshot = _dispatcher$useState[0];
@@ -3534,25 +3626,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$11 = 31 - clz32(lanes),
-            lane = 1 << index$11;
-          entanglements[index$11] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3579,6 +3659,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3590,7 +3672,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     )),
     (_dispatcher$useState.queue = hook),
     (_dispatcher$useState.baseQueue = null),
-    (snapshot = readFromUnsubcribedMutableSource(root, source, getSnapshot)),
+    (snapshot = readFromUnsubscribedMutableSource(root, source, getSnapshot)),
     (_dispatcher$useState.memoizedState = _dispatcher$useState.baseState = snapshot));
   return snapshot;
 }
@@ -3604,6 +3686,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3652,7 +3736,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3660,10 +3744,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3724,19 +3808,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3748,33 +3831,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 2)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3831,6 +3940,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3872,7 +3983,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3921,8 +4032,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3963,8 +4075,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3974,7 +4087,11 @@ var ContextOnlyDispatcher = {
   },
   now$1 = Scheduler.unstable_now,
   commitTime = 0,
-  profilerStartTime = -1;
+  layoutEffectStartTime = -1,
+  profilerStartTime = -1,
+  passiveEffectStartTime = -1,
+  currentUpdateIsNested = !1,
+  nestedUpdateScheduled = !1;
 function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
   if (0 <= profilerStartTime) {
     var elapsedTime = now$1() - profilerStartTime;
@@ -3983,62 +4100,749 @@ function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
     profilerStartTime = -1;
   }
 }
+function recordLayoutEffectDuration(fiber) {
+  if (0 <= layoutEffectStartTime) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+        case 12:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function recordPassiveEffectDuration(fiber) {
+  if (0 <= passiveEffectStartTime) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+        case 12:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
 function transferActualDuration(fiber) {
   for (var child = fiber.child; child; )
     (fiber.actualDuration += child.actualDuration), (child = child.sibling);
 }
-var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
-  didReceiveUpdate = !1;
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  workInProgress.child =
-    null === current
-      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
-      : reconcileChildFibers(
-          workInProgress,
-          current.child,
-          nextChildren,
-          renderLanes
-        );
+function createCapturedValue(value, source) {
+  try {
+    var info = "",
+      node = source;
+    do (info += describeFiber(node)), (node = node.return);
+    while (node);
+    var JSCompiler_inline_result = info;
+  } catch (x) {
+    JSCompiler_inline_result =
+      "\nError generating stack: " + x.message + "\n" + x.stack;
+  }
+  return { value: value, source: source, stack: JSCompiler_inline_result };
 }
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  Component = Component.render;
-  var ref = workInProgress.ref;
-  prepareToReadContext(workInProgress, renderLanes);
-  nextProps = renderWithHooks(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    ref,
-    renderLanes
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
   );
-  if (null !== current && !didReceiveUpdate)
-    return (
-      (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
-      (current.lanes &= ~renderLanes),
-      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
-    );
-  workInProgress.flags |= 1;
-  reconcileChildren(current, workInProgress, nextProps, renderLanes);
-  return workInProgress.child;
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
 }
-function updateMemoComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  updateLanes,
-  renderLanes
-) {
-  if (null === current) {
-    var type = Component.type;
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      return getDerivedStateFromError(error);
+    };
+    lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
+function hadNoMutationsEffects(current, completedWork) {
+  if (null !== current && current.child === completedWork.child) return !0;
+  if (0 !== (completedWork.flags & 16)) return !1;
+  for (current = completedWork.child; null !== current; ) {
+    if (0 !== (current.flags & 6454) || 0 !== (current.subtreeFlags & 6454))
+      return !1;
+    current = current.sibling;
+  }
+  return !0;
+}
+var appendAllChildren, updateHostContainer, updateHostComponent, updateHostText;
+appendAllChildren = function(
+  parent,
+  workInProgress,
+  needsVisibilityToggle,
+  isHidden
+) {
+  for (var node = workInProgress.child; null !== node; ) {
+    if (5 === node.tag) {
+      var instance = node.stateNode;
+      needsVisibilityToggle &&
+        isHidden &&
+        (instance = cloneHiddenInstance(instance));
+      appendChildNode(parent.node, instance.node);
+    } else if (6 === node.tag) {
+      instance = node.stateNode;
+      if (needsVisibilityToggle && isHidden)
+        throw Error("Not yet implemented.");
+      appendChildNode(parent.node, instance.node);
+    } else if (4 !== node.tag)
+      if (22 === node.tag && null !== node.memoizedState)
+        (instance = node.child),
+          null !== instance && (instance.return = node),
+          enablePersistentOffscreenHostContainer
+            ? appendAllChildren(parent, node, !1, !1)
+            : appendAllChildren(parent, node, !0, !0);
+      else if (null !== node.child) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      }
+    if (node === workInProgress) break;
+    for (; null === node.sibling; ) {
+      if (null === node.return || node.return === workInProgress) return;
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+};
+function appendAllChildrenToContainer(
+  containerChildSet,
+  workInProgress,
+  needsVisibilityToggle,
+  isHidden
+) {
+  for (var node = workInProgress.child; null !== node; ) {
+    if (5 === node.tag) {
+      var instance = node.stateNode;
+      needsVisibilityToggle &&
+        isHidden &&
+        (instance = cloneHiddenInstance(instance));
+      appendChildNodeToSet(containerChildSet, instance.node);
+    } else if (6 === node.tag) {
+      instance = node.stateNode;
+      if (needsVisibilityToggle && isHidden)
+        throw Error("Not yet implemented.");
+      appendChildNodeToSet(containerChildSet, instance.node);
+    } else if (4 !== node.tag)
+      if (22 === node.tag && null !== node.memoizedState)
+        (instance = node.child),
+          null !== instance && (instance.return = node),
+          enablePersistentOffscreenHostContainer
+            ? appendAllChildrenToContainer(containerChildSet, node, !1, !1)
+            : appendAllChildrenToContainer(containerChildSet, node, !0, !0);
+      else if (null !== node.child) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      }
+    if (node === workInProgress) break;
+    for (; null === node.sibling; ) {
+      if (null === node.return || node.return === workInProgress) return;
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+}
+updateHostContainer = function(current, workInProgress) {
+  var portalOrRoot = workInProgress.stateNode;
+  if (!hadNoMutationsEffects(current, workInProgress)) {
+    current = portalOrRoot.containerInfo;
+    var newChildSet = createChildNodeSet(current);
+    appendAllChildrenToContainer(newChildSet, workInProgress, !1, !1);
+    portalOrRoot.pendingChildren = newChildSet;
+    workInProgress.flags |= 4;
+    completeRoot(current, newChildSet);
+  }
+};
+updateHostComponent = function(current, workInProgress, type, newProps) {
+  type = current.stateNode;
+  var oldProps = current.memoizedProps;
+  if (
+    (current = hadNoMutationsEffects(current, workInProgress)) &&
+    oldProps === newProps
+  )
+    workInProgress.stateNode = type;
+  else {
+    var recyclableInstance = workInProgress.stateNode;
+    requiredContext(contextStackCursor$1.current);
+    var updatePayload = null;
+    oldProps !== newProps &&
+      ((oldProps = diffProperties(
+        null,
+        oldProps,
+        newProps,
+        recyclableInstance.canonical.viewConfig.validAttributes
+      )),
+      (recyclableInstance.canonical.currentProps = newProps),
+      (updatePayload = oldProps));
+    current && null === updatePayload
+      ? (workInProgress.stateNode = type)
+      : ((newProps = updatePayload),
+        (oldProps = type.node),
+        (type = {
+          node: current
+            ? null !== newProps
+              ? cloneNodeWithNewProps(oldProps, newProps)
+              : cloneNode(oldProps)
+            : null !== newProps
+            ? cloneNodeWithNewChildrenAndProps(oldProps, newProps)
+            : cloneNodeWithNewChildren(oldProps),
+          canonical: type.canonical
+        }),
+        (workInProgress.stateNode = type),
+        current
+          ? (workInProgress.flags |= 4)
+          : appendAllChildren(type, workInProgress, !1, !1));
+  }
+};
+updateHostText = function(current, workInProgress, oldText, newText) {
+  oldText !== newText
+    ? ((current = requiredContext(rootInstanceStackCursor.current)),
+      (oldText = requiredContext(contextStackCursor$1.current)),
+      (workInProgress.stateNode = createTextInstance(
+        newText,
+        current,
+        oldText,
+        workInProgress
+      )),
+      (workInProgress.flags |= 4))
+    : (workInProgress.stateNode = current.stateNode);
+};
+function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
+  switch (renderState.tailMode) {
+    case "hidden":
+      hasRenderedATailFallback = renderState.tail;
+      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
+        null !== hasRenderedATailFallback.alternate &&
+          (lastTailNode = hasRenderedATailFallback),
+          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
+      null === lastTailNode
+        ? (renderState.tail = null)
+        : (lastTailNode.sibling = null);
+      break;
+    case "collapsed":
+      lastTailNode = renderState.tail;
+      for (var lastTailNode$40 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$40 = lastTailNode),
+          (lastTailNode = lastTailNode.sibling);
+      null === lastTailNode$40
+        ? hasRenderedATailFallback || null === renderState.tail
+          ? (renderState.tail = null)
+          : (renderState.tail.sibling = null)
+        : (lastTailNode$40.sibling = null);
+  }
+}
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    if (0 !== (completedWork.mode & 2)) {
+      for (
+        var treeBaseDuration$42 = completedWork.selfBaseDuration,
+          child$43 = completedWork.child;
+        null !== child$43;
+
+      )
+        (newChildLanes |= child$43.lanes | child$43.childLanes),
+          (subtreeFlags |= child$43.subtreeFlags & 1835008),
+          (subtreeFlags |= child$43.flags & 1835008),
+          (treeBaseDuration$42 += child$43.treeBaseDuration),
+          (child$43 = child$43.sibling);
+      completedWork.treeBaseDuration = treeBaseDuration$42;
+    } else
+      for (
+        treeBaseDuration$42 = completedWork.child;
+        null !== treeBaseDuration$42;
+
+      )
+        (newChildLanes |=
+          treeBaseDuration$42.lanes | treeBaseDuration$42.childLanes),
+          (subtreeFlags |= treeBaseDuration$42.subtreeFlags & 1835008),
+          (subtreeFlags |= treeBaseDuration$42.flags & 1835008),
+          (treeBaseDuration$42.return = completedWork),
+          (treeBaseDuration$42 = treeBaseDuration$42.sibling);
+  else if (0 !== (completedWork.mode & 2)) {
+    treeBaseDuration$42 = completedWork.actualDuration;
+    child$43 = completedWork.selfBaseDuration;
+    for (var child = completedWork.child; null !== child; )
+      (newChildLanes |= child.lanes | child.childLanes),
+        (subtreeFlags |= child.subtreeFlags),
+        (subtreeFlags |= child.flags),
+        (treeBaseDuration$42 += child.actualDuration),
+        (child$43 += child.treeBaseDuration),
+        (child = child.sibling);
+    completedWork.actualDuration = treeBaseDuration$42;
+    completedWork.treeBaseDuration = child$43;
+  } else
+    for (
+      treeBaseDuration$42 = completedWork.child;
+      null !== treeBaseDuration$42;
+
+    )
+      (newChildLanes |=
+        treeBaseDuration$42.lanes | treeBaseDuration$42.childLanes),
+        (subtreeFlags |= treeBaseDuration$42.subtreeFlags),
+        (subtreeFlags |= treeBaseDuration$42.flags),
+        (treeBaseDuration$42.return = completedWork),
+        (treeBaseDuration$42 = treeBaseDuration$42.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
+function completeSuspendedOffscreenHostContainer(current, workInProgress) {
+  var rootContainerInstance = requiredContext(rootInstanceStackCursor.current),
+    type = workInProgress.type,
+    newProps = workInProgress.memoizedProps;
+  null !== current
+    ? updateHostComponent(
+        current,
+        workInProgress,
+        type,
+        newProps,
+        rootContainerInstance
+      )
+    : ((current = requiredContext(contextStackCursor$1.current)),
+      (rootContainerInstance = createInstance(
+        type,
+        newProps,
+        rootContainerInstance,
+        current,
+        workInProgress
+      )),
+      appendAllChildren(rootContainerInstance, workInProgress, !1, !1),
+      (workInProgress.stateNode = rootContainerInstance),
+      null !== workInProgress.ref && (workInProgress.flags |= 256));
+  bubbleProperties(workInProgress);
+}
+function completeWork(current, workInProgress, renderLanes) {
+  var newProps = workInProgress.pendingProps;
+  switch (workInProgress.tag) {
+    case 2:
+    case 16:
+    case 15:
+    case 0:
+    case 11:
+    case 7:
+    case 8:
+    case 12:
+    case 9:
+    case 14:
+      return bubbleProperties(workInProgress), null;
+    case 1:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 3:
+      return (
+        (newProps = workInProgress.stateNode),
+        popHostContainer(),
+        pop(didPerformWorkStackCursor),
+        pop(contextStackCursor),
+        resetWorkInProgressVersions(),
+        newProps.pendingContext &&
+          ((newProps.context = newProps.pendingContext),
+          (newProps.pendingContext = null)),
+        (null !== current && null !== current.child) ||
+          newProps.hydrate ||
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 5:
+      popHostContext(workInProgress);
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
+      if (null !== current && null != workInProgress.stateNode)
+        updateHostComponent(
+          current,
+          workInProgress,
+          type,
+          newProps,
+          renderLanes
+        ),
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
+      else {
+        if (!newProps) {
+          if (null === workInProgress.stateNode)
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          bubbleProperties(workInProgress);
+          return null;
+        }
+        current = requiredContext(contextStackCursor$1.current);
+        current = createInstance(
+          type,
+          newProps,
+          renderLanes,
+          current,
+          workInProgress
+        );
+        appendAllChildren(current, workInProgress, !1, !1);
+        workInProgress.stateNode = current;
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 6:
+      if (current && null != workInProgress.stateNode)
+        updateHostText(
+          current,
+          workInProgress,
+          current.memoizedProps,
+          newProps
+        );
+      else {
+        if ("string" !== typeof newProps && null === workInProgress.stateNode)
+          throw Error(
+            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+          );
+        current = requiredContext(rootInstanceStackCursor.current);
+        renderLanes = requiredContext(contextStackCursor$1.current);
+        workInProgress.stateNode = createTextInstance(
+          newProps,
+          current,
+          renderLanes,
+          workInProgress
+        );
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 13:
+      pop(suspenseStackCursor);
+      newProps = workInProgress.memoizedState;
+      if (0 !== (workInProgress.flags & 128))
+        return (
+          (workInProgress.lanes = renderLanes),
+          0 !== (workInProgress.mode & 2) &&
+            transferActualDuration(workInProgress),
+          workInProgress
+        );
+      newProps = null !== newProps;
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (
+        newProps &&
+        !renderLanes &&
+        ((workInProgress.child.flags |= 4096), 0 !== (workInProgress.mode & 1))
+      )
+        if (
+          (null === current &&
+            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
+          0 !== (suspenseStackCursor.current & 1)
+        )
+          0 === workInProgressRootExitStatus &&
+            (workInProgressRootExitStatus = 3);
+        else {
+          if (
+            0 === workInProgressRootExitStatus ||
+            3 === workInProgressRootExitStatus
+          )
+            workInProgressRootExitStatus = 4;
+          null === workInProgressRoot ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
+            markRootSuspended$1(
+              workInProgressRoot,
+              workInProgressRootRenderLanes
+            );
+        }
+      null !== workInProgress.updateQueue && (workInProgress.flags |= 4);
+      bubbleProperties(workInProgress);
+      0 !== (workInProgress.mode & 2) &&
+        newProps &&
+        ((current = workInProgress.child),
+        null !== current &&
+          (workInProgress.treeBaseDuration -= current.treeBaseDuration));
+      return null;
+    case 4:
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 10:
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 17:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 19:
+      pop(suspenseStackCursor);
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      var renderedTail = type.rendering;
+      if (null === renderedTail)
+        if (newProps) cutOffTailIfNeeded(type, !1);
+        else {
+          if (
+            0 !== workInProgressRootExitStatus ||
+            (null !== current && 0 !== (current.flags & 128))
+          )
+            for (current = workInProgress.child; null !== current; ) {
+              renderedTail = findFirstSuspended(current);
+              if (null !== renderedTail) {
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
+                current = renderedTail.updateQueue;
+                null !== current &&
+                  ((workInProgress.updateQueue = current),
+                  (workInProgress.flags |= 4));
+                workInProgress.subtreeFlags = 0;
+                current = renderLanes;
+                for (newProps = workInProgress.child; null !== newProps; )
+                  (renderLanes = newProps),
+                    (renderedTail = current),
+                    (renderLanes.flags &= 1835010),
+                    (type = renderLanes.alternate),
+                    null === type
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = renderedTail),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null),
+                        (renderLanes.selfBaseDuration = 0),
+                        (renderLanes.treeBaseDuration = 0))
+                      : ((renderLanes.childLanes = type.childLanes),
+                        (renderLanes.lanes = type.lanes),
+                        (renderLanes.child = type.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps = type.memoizedProps),
+                        (renderLanes.memoizedState = type.memoizedState),
+                        (renderLanes.updateQueue = type.updateQueue),
+                        (renderLanes.type = type.type),
+                        (renderedTail = type.dependencies),
+                        (renderLanes.dependencies =
+                          null === renderedTail
+                            ? null
+                            : {
+                                lanes: renderedTail.lanes,
+                                firstContext: renderedTail.firstContext
+                              }),
+                        (renderLanes.selfBaseDuration = type.selfBaseDuration),
+                        (renderLanes.treeBaseDuration = type.treeBaseDuration)),
+                    (newProps = newProps.sibling);
+                push(
+                  suspenseStackCursor,
+                  (suspenseStackCursor.current & 1) | 2
+                );
+                return workInProgress.child;
+              }
+              current = current.sibling;
+            }
+          null !== type.tail &&
+            now() > workInProgressRootRenderTargetTime &&
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
+        }
+      else {
+        if (!newProps)
+          if (
+            ((current = findFirstSuspended(renderedTail)), null !== current)
+          ) {
+            if (
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              (current = current.updateQueue),
+              null !== current &&
+                ((workInProgress.updateQueue = current),
+                (workInProgress.flags |= 4)),
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
+                !renderedTail.alternate)
+            )
+              return bubbleProperties(workInProgress), null;
+          } else
+            2 * now() - type.renderingStartTime >
+              workInProgressRootRenderTargetTime &&
+              1073741824 !== renderLanes &&
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
+          ? ((renderedTail.sibling = workInProgress.child),
+            (workInProgress.child = renderedTail))
+          : ((current = type.last),
+            null !== current
+              ? (current.sibling = renderedTail)
+              : (workInProgress.child = renderedTail),
+            (type.last = renderedTail));
+      }
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
+    case 23:
+      return (
+        popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
+        null !== current &&
+          (null !== current.memoizedState) !== renderLanes &&
+          "unstable-defer-without-hiding" !== newProps.mode &&
+          23 !== workInProgress.tag &&
+          (workInProgress.flags |= 4096),
+        renderLanes && 0 !== (workInProgress.mode & 1)
+          ? 0 !== (subtreeRenderLanes & 1073741824) &&
+            bubbleProperties(workInProgress)
+          : bubbleProperties(workInProgress),
+        null
+      );
+  }
+  throw Error(
+    "Unknown unit of work tag (" +
+      workInProgress.tag +
+      "). This error is likely caused by a bug in React. Please file an issue."
+  );
+}
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
+  didReceiveUpdate = !1;
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  workInProgress.child =
+    null === current
+      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
+      : reconcileChildFibers(
+          workInProgress,
+          current.child,
+          nextChildren,
+          renderLanes
+        );
+}
+function updateForwardRef(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  Component = Component.render;
+  var ref = workInProgress.ref;
+  prepareToReadContext(workInProgress, renderLanes);
+  nextProps = renderWithHooks(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    ref,
+    renderLanes
+  );
+  if (null !== current && !didReceiveUpdate)
+    return (
+      (workInProgress.updateQueue = current.updateQueue),
+      (workInProgress.flags &= -1029),
+      (current.lanes &= ~renderLanes),
+      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
+    );
+  workInProgress.flags |= 1;
+  reconcileChildren(current, workInProgress, nextProps, renderLanes);
+  return workInProgress.child;
+}
+function updateMemoComponent(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  if (null === current) {
+    var type = Component.type;
     if (
       "function" === typeof type &&
       !shouldConstruct(type) &&
@@ -4054,7 +4858,6 @@ function updateMemoComponent(
           workInProgress,
           type,
           nextProps,
-          updateLanes,
           renderLanes
         )
       );
@@ -4071,14 +4874,13 @@ function updateMemoComponent(
     return (workInProgress.child = current);
   }
   type = current.child;
-  if (
-    0 === (updateLanes & renderLanes) &&
-    ((updateLanes = type.memoizedProps),
-    (Component = Component.compare),
-    (Component = null !== Component ? Component : shallowEqual),
-    Component(updateLanes, nextProps) && current.ref === workInProgress.ref)
-  )
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  if (0 === (current.lanes & renderLanes)) {
+    var prevProps = type.memoizedProps;
+    Component = Component.compare;
+    Component = null !== Component ? Component : shallowEqual;
+    if (Component(prevProps, nextProps) && current.ref === workInProgress.ref)
+      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  }
   workInProgress.flags |= 1;
   current = createWorkInProgress(type, nextProps);
   current.ref = workInProgress.ref;
@@ -4090,7 +4892,6 @@ function updateSimpleMemoComponent(
   workInProgress,
   Component,
   nextProps,
-  updateLanes,
   renderLanes
 ) {
   if (
@@ -4098,7 +4899,7 @@ function updateSimpleMemoComponent(
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
   )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
+    if (((didReceiveUpdate = !1), 0 !== (current.lanes & renderLanes)))
       0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
     else
       return (
@@ -4121,41 +4922,88 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        markSpawnedWork(1073741824),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      prevState = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= prevState;
+    }
   else
     null !== prevState
-      ? ((nextProps = prevState.baseLanes | renderLanes),
+      ? ((prevState = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
-      : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      : (prevState = renderLanes),
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= prevState);
+  if (enablePersistentOffscreenHostContainer)
+    return reconcileOffscreenHostContainer(
+      current,
+      workInProgress,
+      "hidden" === nextProps.mode && 23 !== workInProgress.tag,
+      nextChildren,
+      renderLanes
+    );
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
-function markRef(current, workInProgress) {
+function reconcileOffscreenHostContainer(
+  currentOffscreen,
+  offscreen,
+  isHidden,
+  children,
+  renderLanes
+) {
+  isHidden = getOffscreenContainerProps(
+    isHidden ? "hidden" : "visible",
+    children
+  );
+  null === currentOffscreen
+    ? (renderLanes = createOffscreenHostContainerFiber(
+        isHidden,
+        offscreen.mode,
+        renderLanes,
+        null
+      ))
+    : ((currentOffscreen = currentOffscreen.child),
+      null === currentOffscreen
+        ? ((renderLanes = createOffscreenHostContainerFiber(
+            isHidden,
+            offscreen.mode,
+            renderLanes,
+            null
+          )),
+          (renderLanes.flags |= 2))
+        : (renderLanes = createWorkInProgress(currentOffscreen, isHidden)));
+  renderLanes.return = offscreen;
+  return (offscreen.child = renderLanes);
+}
+function markRef$1(current, workInProgress) {
   var ref = workInProgress.ref;
   if (
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4180,7 +5028,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4340,7 +5188,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4355,7 +5204,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4363,7 +5212,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4377,7 +5226,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4397,8 +5246,8 @@ function finishClassComponent(
   hasContext,
   renderLanes
 ) {
-  markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  markRef$1(current, workInProgress);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4446,20 +5295,22 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
-      void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
       (suspenseContext |= 1);
   push(suspenseStackCursor, suspenseContext & 1);
@@ -4474,7 +5325,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4486,16 +5339,17 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
-        markSpawnedWork(33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
       { mode: "visible", children: current },
       workInProgress.mode,
-      renderLanes,
+      0,
       null
     );
     renderLanes.return = workInProgress;
@@ -4515,8 +5369,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4543,8 +5400,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4567,10 +5427,10 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren),
-      workInProgress.mode & 8 &&
+      workInProgress.mode & 2 &&
         ((progressedPrimaryFragment.actualDuration = 0),
         (progressedPrimaryFragment.actualStartTime = -1),
         (progressedPrimaryFragment.selfBaseDuration = 0),
@@ -4605,13 +5465,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4622,32 +5483,60 @@ function updateSuspenseFallbackChildren(
   renderLanes
 ) {
   var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
-    ? ((primaryChildren = workInProgress.child),
-      (primaryChildren.childLanes = 0),
-      (primaryChildren.pendingProps = primaryChildProps),
-      workInProgress.mode & 8 &&
-        ((primaryChildren.actualDuration = 0),
-        (primaryChildren.actualStartTime = -1),
-        (primaryChildren.selfBaseDuration =
+    currentPrimaryChildFragment = current.child,
+    currentFallbackChildFragment = currentPrimaryChildFragment.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== currentPrimaryChildFragment
+    ? ((current = workInProgress.child),
+      (current.childLanes = 0),
+      (current.pendingProps = primaryChildProps),
+      workInProgress.mode & 2 &&
+        ((current.actualDuration = 0),
+        (current.actualStartTime = -1),
+        (current.selfBaseDuration =
           currentPrimaryChildFragment.selfBaseDuration),
-        (primaryChildren.treeBaseDuration =
+        (current.treeBaseDuration =
           currentPrimaryChildFragment.treeBaseDuration)),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
+      enablePersistentOffscreenHostContainer &&
+        ((currentPrimaryChildFragment = currentPrimaryChildFragment.child),
+        (primaryChildProps = current.child),
+        (primaryChildren = getOffscreenContainerProps(
+          "hidden",
+          primaryChildren
+        )),
+        (primaryChildProps.pendingProps = primaryChildren),
+        (primaryChildProps.memoizedProps = primaryChildren),
+        completeSuspendedOffscreenHostContainer(
+          currentPrimaryChildFragment,
+          primaryChildProps
+        )),
+      (workInProgress.deletions = null))
+    : ((current = createWorkInProgress(
         currentPrimaryChildFragment,
         primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+      )),
+      enablePersistentOffscreenHostContainer &&
+        ((primaryChildProps = currentPrimaryChildFragment.child),
+        null !== primaryChildProps &&
+          ((primaryChildren = reconcileOffscreenHostContainer(
+            currentPrimaryChildFragment,
+            current,
+            !0,
+            primaryChildren,
+            renderLanes
+          )),
+          (primaryChildren.memoizedProps = primaryChildren.pendingProps),
+          completeSuspendedOffscreenHostContainer(
+            primaryChildProps,
+            primaryChildren
+          ))),
+      (current.subtreeFlags =
+        currentPrimaryChildFragment.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4656,9 +5545,9 @@ function updateSuspenseFallbackChildren(
       )),
       (fallbackChildren.flags |= 2));
   fallbackChildren.return = workInProgress;
-  primaryChildren.return = workInProgress;
-  primaryChildren.sibling = fallbackChildren;
-  workInProgress.child = primaryChildren;
+  current.return = workInProgress;
+  current.sibling = fallbackChildren;
+  workInProgress.child = current;
   return fallbackChildren;
 }
 function scheduleWorkOnFiber(fiber, renderLanes) {
@@ -4672,8 +5561,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4683,16 +5571,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4701,638 +5587,189 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
             scheduleWorkOnFiber(current, renderLanes);
         else if (19 === current.tag) scheduleWorkOnFiber(current, renderLanes);
         else if (null !== current.child) {
-          current.child.return = current;
-          current = current.child;
-          continue;
-        }
-        if (current === workInProgress) break a;
-        for (; null === current.sibling; ) {
-          if (null === current.return || current.return === workInProgress)
-            break a;
-          current = current.return;
-        }
-        current.sibling.return = current.return;
-        current = current.sibling;
-      }
-    nextProps &= 1;
-  }
-  push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
-  else
-    switch (revealOrder) {
-      case "forwards":
-        renderLanes = workInProgress.child;
-        for (revealOrder = null; null !== renderLanes; )
-          (current = renderLanes.alternate),
-            null !== current &&
-              null === findFirstSuspended(current) &&
-              (revealOrder = renderLanes),
-            (renderLanes = renderLanes.sibling);
-        renderLanes = revealOrder;
-        null === renderLanes
-          ? ((revealOrder = workInProgress.child),
-            (workInProgress.child = null))
-          : ((revealOrder = renderLanes.sibling), (renderLanes.sibling = null));
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          revealOrder,
-          renderLanes,
-          tailMode,
-          workInProgress.lastEffect
-        );
-        break;
-      case "backwards":
-        renderLanes = null;
-        revealOrder = workInProgress.child;
-        for (workInProgress.child = null; null !== revealOrder; ) {
-          current = revealOrder.alternate;
-          if (null !== current && null === findFirstSuspended(current)) {
-            workInProgress.child = revealOrder;
-            break;
-          }
-          current = revealOrder.sibling;
-          revealOrder.sibling = renderLanes;
-          renderLanes = revealOrder;
-          revealOrder = current;
-        }
-        initSuspenseListRenderState(
-          workInProgress,
-          !0,
-          renderLanes,
-          null,
-          tailMode,
-          workInProgress.lastEffect
-        );
-        break;
-      case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
-        break;
-      default:
-        workInProgress.memoizedState = null;
-    }
-  return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
-  null !== current && (workInProgress.dependencies = current.dependencies);
-  profilerStartTime = -1;
-  workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
-  }
-  return null;
-}
-var appendAllChildren,
-  updateHostContainer,
-  updateHostComponent$1,
-  updateHostText$1;
-appendAllChildren = function(
-  parent,
-  workInProgress,
-  needsVisibilityToggle,
-  isHidden
-) {
-  for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag) {
-      var instance = node.stateNode;
-      needsVisibilityToggle &&
-        isHidden &&
-        (instance = cloneHiddenInstance(instance));
-      appendChildNode(parent.node, instance.node);
-    } else if (6 === node.tag) {
-      instance = node.stateNode;
-      if (needsVisibilityToggle && isHidden)
-        throw Error("Not yet implemented.");
-      appendChildNode(parent.node, instance.node);
-    } else if (4 !== node.tag) {
-      if (
-        13 === node.tag &&
-        0 !== (node.flags & 4) &&
-        (instance = null !== node.memoizedState)
-      ) {
-        var primaryChildParent = node.child;
-        if (
-          null !== primaryChildParent &&
-          (null !== primaryChildParent.child &&
-            ((primaryChildParent.child.return = primaryChildParent),
-            appendAllChildren(parent, primaryChildParent, !0, instance)),
-          (instance = primaryChildParent.sibling),
-          null !== instance)
-        ) {
-          instance.return = node;
-          node = instance;
-          continue;
-        }
-      }
-      if (null !== node.child) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-    }
-    if (node === workInProgress) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === workInProgress) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-};
-function appendAllChildrenToContainer(
-  containerChildSet,
-  workInProgress,
-  needsVisibilityToggle,
-  isHidden
-) {
-  for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag) {
-      var instance = node.stateNode;
-      needsVisibilityToggle &&
-        isHidden &&
-        (instance = cloneHiddenInstance(instance));
-      appendChildNodeToSet(containerChildSet, instance.node);
-    } else if (6 === node.tag) {
-      instance = node.stateNode;
-      if (needsVisibilityToggle && isHidden)
-        throw Error("Not yet implemented.");
-      appendChildNodeToSet(containerChildSet, instance.node);
-    } else if (4 !== node.tag) {
-      if (
-        13 === node.tag &&
-        0 !== (node.flags & 4) &&
-        (instance = null !== node.memoizedState)
-      ) {
-        var primaryChildParent = node.child;
-        if (
-          null !== primaryChildParent &&
-          (null !== primaryChildParent.child &&
-            ((primaryChildParent.child.return = primaryChildParent),
-            appendAllChildrenToContainer(
-              containerChildSet,
-              primaryChildParent,
-              !0,
-              instance
-            )),
-          (instance = primaryChildParent.sibling),
-          null !== instance)
-        ) {
-          instance.return = node;
-          node = instance;
+          current.child.return = current;
+          current = current.child;
           continue;
         }
+        if (current === workInProgress) break a;
+        for (; null === current.sibling; ) {
+          if (null === current.return || current.return === workInProgress)
+            break a;
+          current = current.return;
+        }
+        current.sibling.return = current.return;
+        current = current.sibling;
       }
-      if (null !== node.child) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-    }
-    if (node === workInProgress) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === workInProgress) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-}
-updateHostContainer = function(workInProgress) {
-  var portalOrRoot = workInProgress.stateNode;
-  if (null !== workInProgress.firstEffect) {
-    var container = portalOrRoot.containerInfo,
-      newChildSet = createChildNodeSet(container);
-    appendAllChildrenToContainer(newChildSet, workInProgress, !1, !1);
-    portalOrRoot.pendingChildren = newChildSet;
-    workInProgress.flags |= 4;
-    completeRoot(container, newChildSet);
-  }
-};
-updateHostComponent$1 = function(current, workInProgress, type, newProps) {
-  type = current.stateNode;
-  var oldProps = current.memoizedProps;
-  if ((current = null === workInProgress.firstEffect) && oldProps === newProps)
-    workInProgress.stateNode = type;
-  else {
-    var recyclableInstance = workInProgress.stateNode;
-    requiredContext(contextStackCursor$1.current);
-    var updatePayload = null;
-    oldProps !== newProps &&
-      ((oldProps = diffProperties(
-        null,
-        oldProps,
-        newProps,
-        recyclableInstance.canonical.viewConfig.validAttributes
-      )),
-      (recyclableInstance.canonical.currentProps = newProps),
-      (updatePayload = oldProps));
-    current && null === updatePayload
-      ? (workInProgress.stateNode = type)
-      : ((newProps = updatePayload),
-        (recyclableInstance = type.node),
-        (type = {
-          node: current
-            ? null !== newProps
-              ? cloneNodeWithNewProps(recyclableInstance, newProps)
-              : cloneNode(recyclableInstance)
-            : null !== newProps
-            ? cloneNodeWithNewChildrenAndProps(recyclableInstance, newProps)
-            : cloneNodeWithNewChildren(recyclableInstance),
-          canonical: type.canonical
-        }),
-        (workInProgress.stateNode = type),
-        current
-          ? (workInProgress.flags |= 4)
-          : appendAllChildren(type, workInProgress, !1, !1));
-  }
-};
-updateHostText$1 = function(current, workInProgress, oldText, newText) {
-  oldText !== newText
-    ? ((current = requiredContext(rootInstanceStackCursor.current)),
-      (oldText = requiredContext(contextStackCursor$1.current)),
-      (workInProgress.stateNode = createTextInstance(
-        newText,
-        current,
-        oldText,
-        workInProgress
-      )),
-      (workInProgress.flags |= 4))
-    : (workInProgress.stateNode = current.stateNode);
-};
-function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
-  switch (renderState.tailMode) {
-    case "hidden":
-      hasRenderedATailFallback = renderState.tail;
-      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
-        null !== hasRenderedATailFallback.alternate &&
-          (lastTailNode = hasRenderedATailFallback),
-          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
-      null === lastTailNode
-        ? (renderState.tail = null)
-        : (lastTailNode.sibling = null);
-      break;
-    case "collapsed":
-      lastTailNode = renderState.tail;
-      for (var lastTailNode$65 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$65 = lastTailNode),
-          (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$65
-        ? hasRenderedATailFallback || null === renderState.tail
-          ? (renderState.tail = null)
-          : (renderState.tail.sibling = null)
-        : (lastTailNode$65.sibling = null);
+    nextProps &= 1;
   }
-}
-function completeWork(current, workInProgress, renderLanes) {
-  var newProps = workInProgress.pendingProps;
-  switch (workInProgress.tag) {
-    case 2:
-    case 16:
-    case 15:
-    case 0:
-    case 11:
-    case 7:
-    case 8:
-    case 12:
-    case 9:
-    case 14:
-      return null;
-    case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
-    case 3:
-      return (
-        popHostContainer(),
-        pop(didPerformWorkStackCursor),
-        pop(contextStackCursor),
-        resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
-        newProps.pendingContext &&
-          ((newProps.context = newProps.pendingContext),
-          (newProps.pendingContext = null)),
-        (null !== current && null !== current.child) ||
-          newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode)
-        updateHostComponent$1(
-          current,
+  push(suspenseStackCursor, nextProps);
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
+  else
+    switch (revealOrder) {
+      case "forwards":
+        renderLanes = workInProgress.child;
+        for (revealOrder = null; null !== renderLanes; )
+          (current = renderLanes.alternate),
+            null !== current &&
+              null === findFirstSuspended(current) &&
+              (revealOrder = renderLanes),
+            (renderLanes = renderLanes.sibling);
+        renderLanes = revealOrder;
+        null === renderLanes
+          ? ((revealOrder = workInProgress.child),
+            (workInProgress.child = null))
+          : ((revealOrder = renderLanes.sibling), (renderLanes.sibling = null));
+        initSuspenseListRenderState(
           workInProgress,
+          !1,
+          revealOrder,
           renderLanes,
-          newProps,
-          rootContainerInstance
-        ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
-      else {
-        if (!newProps) {
-          if (null === workInProgress.stateNode)
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          return null;
-        }
-        requiredContext(contextStackCursor$1.current);
-        current = nextReactTag;
-        nextReactTag += 2;
-        renderLanes = getViewConfigForType(renderLanes);
-        var updatePayload = diffProperties(
-          null,
-          emptyObject,
-          newProps,
-          renderLanes.validAttributes
-        );
-        rootContainerInstance = createNode(
-          current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
-          updatePayload,
-          workInProgress
-        );
-        current = new ReactFabricHostComponent(
-          current,
-          renderLanes,
-          newProps,
-          workInProgress
+          tailMode
         );
-        current = { node: rootContainerInstance, canonical: current };
-        appendAllChildren(current, workInProgress, !1, !1);
-        workInProgress.stateNode = current;
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
-          current,
+        break;
+      case "backwards":
+        renderLanes = null;
+        revealOrder = workInProgress.child;
+        for (workInProgress.child = null; null !== revealOrder; ) {
+          current = revealOrder.alternate;
+          if (null !== current && null === findFirstSuspended(current)) {
+            workInProgress.child = revealOrder;
+            break;
+          }
+          current = revealOrder.sibling;
+          revealOrder.sibling = renderLanes;
+          renderLanes = revealOrder;
+          revealOrder = current;
+        }
+        initSuspenseListRenderState(
           workInProgress,
-          current.memoizedProps,
-          newProps
+          !0,
+          renderLanes,
+          null,
+          tailMode
         );
-      else {
-        if ("string" !== typeof newProps && null === workInProgress.stateNode)
-          throw Error(
-            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-          );
-        current = requiredContext(rootInstanceStackCursor.current);
-        rootContainerInstance = requiredContext(contextStackCursor$1.current);
-        workInProgress.stateNode = createTextInstance(
-          newProps,
+        break;
+      case "together":
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
+        break;
+      default:
+        workInProgress.memoizedState = null;
+    }
+  return workInProgress.child;
+}
+function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
+  null !== current && (workInProgress.dependencies = current.dependencies);
+  profilerStartTime = -1;
+  workInProgressRootSkippedLanes |= workInProgress.lanes;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
           current,
-          rootContainerInstance,
-          workInProgress
-        );
-      }
-      return null;
-    case 13:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
-        return (
-          (workInProgress.lanes = renderLanes),
-          0 !== (workInProgress.mode & 8) &&
-            transferActualDuration(workInProgress),
-          workInProgress
-        );
-      newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
-        if (
-          (null === current &&
-            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
-          0 !== (suspenseStackCursor.current & 1)
-        )
-          0 === workInProgressRootExitStatus &&
-            (workInProgressRootExitStatus = 3);
-        else {
-          if (
-            0 === workInProgressRootExitStatus ||
-            3 === workInProgressRootExitStatus
-          )
-            workInProgressRootExitStatus = 4;
-          null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
-            markRootSuspended$1(
-              workInProgressRoot,
-              workInProgressRootRenderLanes
-            );
-        }
-      newProps && (workInProgress.flags |= 4);
-      return null;
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
+  }
+  return workInProgress.child;
+}
+function attemptEarlyBailoutIfNoScheduledUpdate(
+  current,
+  workInProgress,
+  renderLanes
+) {
+  switch (workInProgress.tag) {
+    case 3:
+      pushHostRootContext(workInProgress);
+      break;
+    case 5:
+      pushHostContext(workInProgress);
+      break;
+    case 1:
+      isContextProvider(workInProgress.type) &&
+        pushContextProvider(workInProgress);
+      break;
     case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
+      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+      break;
     case 10:
-      return popProvider(workInProgress), null;
-    case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      var context = workInProgress.type._context,
+        nextValue = workInProgress.memoizedProps.value;
+      push(valueCursor, context._currentValue2);
+      context._currentValue2 = nextValue;
+      break;
+    case 12:
+      0 !== (renderLanes & workInProgress.childLanes) &&
+        (workInProgress.flags |= 4);
+      context = workInProgress.stateNode;
+      context.effectDuration = 0;
+      context.passiveEffectDuration = 0;
+      break;
+    case 13:
+      if (null !== workInProgress.memoizedState) {
+        if (0 !== (renderLanes & workInProgress.child.childLanes))
+          return updateSuspenseComponent(current, workInProgress, renderLanes);
+        push(suspenseStackCursor, suspenseStackCursor.current & 1);
+        current = bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
+        );
+        return null !== current ? current.sibling : null;
+      }
+      push(suspenseStackCursor, suspenseStackCursor.current & 1);
+      break;
     case 19:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
-      if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
-        else {
-          if (
-            0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
-          )
-            for (current = workInProgress.child; null !== current; ) {
-              updatePayload = findFirstSuspended(current);
-              if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
-                current = updatePayload.updateQueue;
-                null !== current &&
-                  ((workInProgress.updateQueue = current),
-                  (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
-                current = renderLanes;
-                for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
-                    (updatePayload = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (renderLanes = rootContainerInstance.alternate),
-                    null === renderLanes
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = updatePayload),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null),
-                        (rootContainerInstance.selfBaseDuration = 0),
-                        (rootContainerInstance.treeBaseDuration = 0))
-                      : ((rootContainerInstance.childLanes =
-                          renderLanes.childLanes),
-                        (rootContainerInstance.lanes = renderLanes.lanes),
-                        (rootContainerInstance.child = renderLanes.child),
-                        (rootContainerInstance.memoizedProps =
-                          renderLanes.memoizedProps),
-                        (rootContainerInstance.memoizedState =
-                          renderLanes.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          renderLanes.updateQueue),
-                        (rootContainerInstance.type = renderLanes.type),
-                        (updatePayload = renderLanes.dependencies),
-                        (rootContainerInstance.dependencies =
-                          null === updatePayload
-                            ? null
-                            : {
-                                lanes: updatePayload.lanes,
-                                firstContext: updatePayload.firstContext
-                              }),
-                        (rootContainerInstance.selfBaseDuration =
-                          renderLanes.selfBaseDuration),
-                        (rootContainerInstance.treeBaseDuration =
-                          renderLanes.treeBaseDuration)),
-                    (newProps = newProps.sibling);
-                push(
-                  suspenseStackCursor,
-                  (suspenseStackCursor.current & 1) | 2
-                );
-                return workInProgress.child;
-              }
-              current = current.sibling;
-            }
-          null !== newProps.tail &&
-            now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432),
-            markSpawnedWork(33554432));
-        }
-      else {
-        if (!rootContainerInstance)
-          if (
-            ((current = findFirstSuspended(updatePayload)), null !== current)
-          ) {
-            if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              (current = current.updateQueue),
-              null !== current &&
-                ((workInProgress.updateQueue = current),
-                (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
-                !updatePayload.alternate)
-            )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
-          } else
-            2 * now() - newProps.renderingStartTime >
-              workInProgressRootRenderTargetTime &&
-              1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432),
-              markSpawnedWork(33554432));
-        newProps.isBackwards
-          ? ((updatePayload.sibling = workInProgress.child),
-            (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
-            null !== current
-              ? (current.sibling = updatePayload)
-              : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+      context = 0 !== (renderLanes & workInProgress.childLanes);
+      if (0 !== (current.flags & 128)) {
+        if (context)
+          return updateSuspenseListComponent(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        workInProgress.flags |= 128;
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      nextValue = workInProgress.memoizedState;
+      null !== nextValue &&
+        ((nextValue.rendering = null),
+        (nextValue.tail = null),
+        (nextValue.lastEffect = null));
+      push(suspenseStackCursor, suspenseStackCursor.current);
+      if (context) break;
+      else return null;
+    case 22:
     case 23:
-    case 24:
       return (
-        popRenderLanes(),
-        null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
-          "unstable-defer-without-hiding" !== newProps.mode &&
-          (workInProgress.flags |= 4),
-        null
+        (workInProgress.lanes = 0),
+        updateOffscreenComponent(current, workInProgress, renderLanes)
       );
   }
-  throw Error(
-    "Unknown unit of work tag (" +
-      workInProgress.tag +
-      "). This error is likely caused by a bug in React. Please file an issue."
-  );
+  return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
 }
 function unwindWork(workInProgress) {
   switch (workInProgress.tag) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64),
-          0 !== (workInProgress.mode & 8) &&
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128),
+          0 !== (workInProgress.mode & 2) &&
             transferActualDuration(workInProgress),
           workInProgress)
         : null;
@@ -5342,11 +5779,11 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
@@ -5354,9 +5791,9 @@ function unwindWork(workInProgress) {
       return (
         pop(suspenseStackCursor),
         (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64),
-            0 !== (workInProgress.mode & 8) &&
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128),
+            0 !== (workInProgress.mode & 2) &&
               transferActualDuration(workInProgress),
             workInProgress)
           : null
@@ -5366,248 +5803,153 @@ function unwindWork(workInProgress) {
     case 4:
       return popHostContainer(), null;
     case 10:
-      return popProvider(workInProgress), null;
+      return popProvider(workInProgress.type._context), null;
+    case 22:
     case 23:
-    case 24:
       return popRenderLanes(), null;
+    case 24:
+      return null;
     default:
       return null;
   }
 }
-function createCapturedValue(value, source) {
-  try {
-    var info = "",
-      node = source;
-    do (info += describeFiber(node)), (node = node.return);
-    while (node);
-    var JSCompiler_inline_result = info;
-  } catch (x) {
-    JSCompiler_inline_result =
-      "\nError generating stack: " + x.message + "\n" + x.stack;
-  }
-  return { value: value, source: source, stack: JSCompiler_inline_result };
-}
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
-  }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
-}
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null,
+  inProgressLanes = null,
+  inProgressRoot = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
   var ref = current.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
-        ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
+        if (current.mode & 2)
+          try {
+            startLayoutEffectTimer(), ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        else ref(null);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
     else ref.current = null;
 }
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
-      }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
+  try {
+    destroy();
+  } catch (error) {
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$82 = finishedRoot.create;
-            finishedRoot.destroy = create$82();
-          }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
       }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$82 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$82;
-        } while (finishedRoot !== current);
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
+}
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        void 0 !== destroy &&
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
       }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$82 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$82,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode.canonical;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
-          }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
+      effect = effect.next;
+    } while (effect !== updateQueue);
+  }
+}
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$89 = effect.create;
+        effect.destroy = create$89();
       }
-      return;
-    case 5:
-      null === current && finishedWork.flags & 4 && shim();
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      create$82 = finishedWork.memoizedProps.onRender;
-      _effect = commitTime;
-      "function" === typeof create$82 &&
-        create$82(
-          finishedWork.memoizedProps.id,
-          null === current ? "mount" : "update",
-          finishedWork.actualDuration,
-          finishedWork.treeBaseDuration,
-          finishedWork.actualStartTime,
-          _effect,
-          finishedRoot.memoizedInteractions
-        );
-      return;
-    case 13:
-      return;
-    case 19:
-    case 17:
-    case 20:
-    case 21:
-    case 23:
-    case 24:
-      return;
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function commitWork(current, finishedWork) {
@@ -5616,33 +5958,25 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedWork = current = current.next;
-        do {
-          if (3 === (finishedWork.tag & 3)) {
-            var destroy = finishedWork.destroy;
-            finishedWork.destroy = void 0;
-            void 0 !== destroy && destroy();
-          }
-          finishedWork = finishedWork.next;
-        } while (finishedWork !== current);
-      }
+      if (finishedWork.mode & 2)
+        try {
+          startLayoutEffectTimer(),
+            commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
+        }
+      else commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 12:
       return;
     case 13:
-      null !== finishedWork.memoizedState &&
-        (globalMostRecentFallbackTime = now());
       attachSuspenseRetryListeners(finishedWork);
       return;
     case 19:
       attachSuspenseRetryListeners(finishedWork);
       return;
+    case 22:
     case 23:
-    case 24:
       return;
   }
   a: {
@@ -5650,7 +5984,6 @@ function commitWork(current, finishedWork) {
       case 1:
       case 5:
       case 6:
-      case 20:
         break a;
       case 3:
       case 4:
@@ -5670,25 +6003,386 @@ function attachSuspenseRetryListeners(finishedWork) {
       (retryCache = finishedWork.stateNode = new PossiblyWeakSet());
     wakeables.forEach(function(wakeable) {
       var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
-      retryCache.has(wakeable) ||
-        (!0 !== wakeable.__reactDoNotTraceInteractions &&
-          (retry = tracing.unstable_wrap(retry)),
-        retryCache.add(wakeable),
-        wakeable.then(retry, retry));
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
+        if (isDevToolsPresent)
+          if (null !== inProgressLanes && null !== inProgressRoot)
+            restorePendingUpdaters(inProgressRoot, inProgressLanes);
+          else
+            throw Error(
+              "Expected finished root and lanes to be set. This is a bug in React."
+            );
+        wakeable.then(retry, retry);
+      }
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    root = nextEffect;
+    firstChild = root.deletions;
+    if (null !== firstChild)
+      for (
+        committedLanes = 0;
+        committedLanes < firstChild.length;
+        committedLanes++
+      ) {
+        var childToDelete = firstChild[committedLanes];
+        try {
+          a: for (var node = childToDelete; ; ) {
+            var current = node;
+            if (
+              injectedHook &&
+              "function" === typeof injectedHook.onCommitFiberUnmount
+            )
+              try {
+                injectedHook.onCommitFiberUnmount(rendererID, current);
+              } catch (err) {}
+            switch (current.tag) {
+              case 0:
+              case 11:
+              case 14:
+              case 15:
+                var updateQueue = current.updateQueue;
+                if (null !== updateQueue) {
+                  var lastEffect = updateQueue.lastEffect;
+                  if (null !== lastEffect) {
+                    var firstEffect = lastEffect.next,
+                      effect = firstEffect;
+                    do {
+                      var _effect = effect,
+                        destroy = _effect.destroy,
+                        tag = _effect.tag;
+                      void 0 !== destroy &&
+                        0 !== (tag & 2) &&
+                        (current.mode & 2
+                          ? (startLayoutEffectTimer(),
+                            safelyCallDestroy(current, root, destroy),
+                            recordLayoutEffectDuration(current))
+                          : safelyCallDestroy(current, root, destroy));
+                      effect = effect.next;
+                    } while (effect !== firstEffect);
+                  }
+                }
+                break;
+              case 1:
+                safelyDetachRef(current, root);
+                var instance = current.stateNode;
+                if ("function" === typeof instance.componentWillUnmount)
+                  try {
+                    if (
+                      ((effect = current),
+                      (_effect = instance),
+                      (_effect.props = effect.memoizedProps),
+                      (_effect.state = effect.memoizedState),
+                      effect.mode & 2)
+                    )
+                      try {
+                        startLayoutEffectTimer(),
+                          _effect.componentWillUnmount();
+                      } finally {
+                        recordLayoutEffectDuration(effect);
+                      }
+                    else _effect.componentWillUnmount();
+                  } catch (error) {
+                    captureCommitPhaseError(current, root, error);
+                  }
+                break;
+              case 5:
+                safelyDetachRef(current, root);
+                break;
+              case 4:
+                createChildNodeSet(current.stateNode.containerInfo);
+            }
+            if (null !== node.child)
+              (node.child.return = node), (node = node.child);
+            else {
+              if (node === childToDelete) break;
+              for (; null === node.sibling; ) {
+                if (null === node.return || node.return === childToDelete)
+                  break a;
+                node = node.return;
+              }
+              node.sibling.return = node.return;
+              node = node.sibling;
+            }
+          }
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, root, error);
+        }
+      }
+    firstChild = root.child;
+    if (0 !== (root.subtreeFlags & 6454) && null !== firstChild)
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var flags = root.flags;
+          if (flags & 256) {
+            var current$jscomp$0 = root.alternate;
+            if (null !== current$jscomp$0) {
+              firstChild = current$jscomp$0;
+              var currentRef = firstChild.ref;
+              if (null !== currentRef)
+                if ("function" === typeof currentRef)
+                  if (firstChild.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), currentRef(null);
+                    } finally {
+                      recordLayoutEffectDuration(firstChild);
+                    }
+                  else currentRef(null);
+                else currentRef.current = null;
+            }
+          }
+          if (flags & 4096)
+            switch (root.tag) {
+              case 13:
+                if (null !== root.memoizedState) {
+                  var current$95 = root.alternate;
+                  if (null === current$95 || null === current$95.memoizedState)
+                    globalMostRecentFallbackTime = now();
+                }
+            }
+          switch (flags & 2054) {
+            case 2:
+              root.flags &= -3;
+              break;
+            case 6:
+              root.flags &= -3;
+              commitWork(root.alternate, root);
+              break;
+            case 2048:
+              root.flags &= -2049;
+              break;
+            case 2052:
+              root.flags &= -2049;
+              commitWork(root.alternate, root);
+              break;
+            case 4:
+              commitWork(root.alternate, root);
+          }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
+      }
+  }
+  inProgressRoot = inProgressLanes = null;
+}
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = finishedWork; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (committedLanes = root.child),
+      0 !== (root.subtreeFlags & 4420) && null !== committedLanes)
+    )
+      (committedLanes.return = root), (nextEffect = committedLanes);
+    else
+      for (root = finishedWork; null !== nextEffect; ) {
+        committedLanes = nextEffect;
+        if (0 !== (committedLanes.flags & 4420)) {
+          var current = committedLanes.alternate;
+          try {
+            if (0 !== (committedLanes.flags & 4420))
+              switch (committedLanes.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  if (committedLanes.mode & 2)
+                    try {
+                      startLayoutEffectTimer(),
+                        commitHookEffectListMount(3, committedLanes);
+                    } finally {
+                      recordLayoutEffectDuration(committedLanes);
+                    }
+                  else commitHookEffectListMount(3, committedLanes);
+                  break;
+                case 1:
+                  var instance = committedLanes.stateNode;
+                  if (committedLanes.flags & 4)
+                    if (null === current)
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidMount();
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else instance.componentDidMount();
+                    else {
+                      var prevProps =
+                          committedLanes.elementType === committedLanes.type
+                            ? current.memoizedProps
+                            : resolveDefaultProps(
+                                committedLanes.type,
+                                current.memoizedProps
+                              ),
+                        prevState = current.memoizedState;
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidUpdate(
+                              prevProps,
+                              prevState,
+                              instance.__reactInternalSnapshotBeforeUpdate
+                            );
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else
+                        instance.componentDidUpdate(
+                          prevProps,
+                          prevState,
+                          instance.__reactInternalSnapshotBeforeUpdate
+                        );
+                    }
+                  var updateQueue = committedLanes.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(committedLanes, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$91 = committedLanes.updateQueue;
+                  if (null !== updateQueue$91) {
+                    var instance$92 = null;
+                    if (null !== committedLanes.child)
+                      switch (committedLanes.child.tag) {
+                        case 5:
+                          instance$92 =
+                            committedLanes.child.stateNode.canonical;
+                          break;
+                        case 1:
+                          instance$92 = committedLanes.child.stateNode;
+                      }
+                    commitUpdateQueue(
+                      committedLanes,
+                      updateQueue$91,
+                      instance$92
+                    );
+                  }
+                  break;
+                case 5:
+                  null === current && committedLanes.flags & 4 && shim();
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  var _finishedWork$memoize2 = committedLanes.memoizedProps,
+                    onCommit = _finishedWork$memoize2.onCommit,
+                    onRender = _finishedWork$memoize2.onRender,
+                    effectDuration = committedLanes.stateNode.effectDuration;
+                  instance$92 = commitTime;
+                  current = null === current ? "mount" : "update";
+                  currentUpdateIsNested && (current = "nested-update");
+                  "function" === typeof onRender &&
+                    onRender(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      committedLanes.actualDuration,
+                      committedLanes.treeBaseDuration,
+                      committedLanes.actualStartTime,
+                      instance$92
+                    );
+                  "function" === typeof onCommit &&
+                    onCommit(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      effectDuration,
+                      instance$92
+                    );
+                  enqueuePendingPassiveProfilerEffect(committedLanes);
+                  var parentFiber = committedLanes.return;
+                  a: for (; null !== parentFiber; ) {
+                    switch (parentFiber.tag) {
+                      case 3:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                      case 12:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                    }
+                    parentFiber = parentFiber.return;
+                  }
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (committedLanes.flags & 256) {
+              instance$92 = void 0;
+              current = committedLanes;
+              var ref = current.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = current.stateNode;
+                switch (current.tag) {
+                  case 5:
+                    instance$92 = instance$jscomp$0.canonical;
+                    break;
+                  default:
+                    instance$92 = instance$jscomp$0;
+                }
+                if ("function" === typeof ref)
+                  if (current.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), ref(instance$92);
+                    } finally {
+                      recordLayoutEffectDuration(current);
+                    }
+                  else ref(instance$92);
+                else ref.current = instance$92;
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(
+              committedLanes,
+              committedLanes.return,
+              error
+            );
+          }
+        }
+        if (committedLanes === root) {
+          nextEffect = null;
+          break;
+        }
+        instance$92 = committedLanes.sibling;
+        if (null !== instance$92) {
+          instance$92.return = committedLanes.return;
+          nextEffect = instance$92;
+          break;
+        }
+        nextEffect = committedLanes.return;
+      }
+  inProgressRoot = inProgressLanes = null;
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5697,65 +6391,56 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
   pendingPassiveEffectsLanes = 0,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveProfilerEffects = [],
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
-  spawnedWorkDuringRender = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 6)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  if (0 === fiber)
+    a: {
+      fiber = fabricGetCurrentEventPriority
+        ? fabricGetCurrentEventPriority()
+        : null;
+      if (null != fiber)
+        switch (fiber) {
+          case FabricDiscretePriority:
+            fiber = 1;
+            break a;
+        }
+      fiber = 16;
+    }
   return fiber;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -5765,30 +6450,21 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  isDevToolsPresent && addFiberToLanesMap(root, fiber, lane);
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 2) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
-  1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? (schedulePendingInteractions(fiber, lane), performSyncWorkOnRoot(fiber))
-      : (ensureRootIsScheduled(fiber, eventTime),
-        schedulePendingInteractions(fiber, lane),
-        0 === executionContext &&
-          ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime),
-      schedulePendingInteractions(fiber, lane));
-  mostRecentlyUpdatedRoot = fiber;
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
+  ensureRootIsScheduled(root, eventTime);
+  1 === lane &&
+    0 === executionContext &&
+    0 === (fiber.mode & 1) &&
+    ((workInProgressRootRenderTargetTime = now() + 500),
+    includesLegacySyncCallbacks && flushSyncCallbacks());
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -5817,17 +6493,8 @@ function ensureRootIsScheduled(root, currentTime) {
       lane = 1 << index$5,
       expirationTime = expirationTimes[index$5];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$5] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$5] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -5835,47 +6502,59 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback$1(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  nestedUpdateScheduled = currentUpdateIsNested = !1;
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
@@ -5885,44 +6564,59 @@ function performConcurrentWorkOnRoot(root) {
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
   if (0 === lanes) return null;
-  var lanes$jscomp$0 = lanes;
-  var exitStatus = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== lanes$jscomp$0
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, lanes$jscomp$0),
-      startWorkOnPendingInteractions(root, lanes$jscomp$0);
-  lanes$jscomp$0 = pushInteractions(root);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes)
+      ? !1
+      : 0 !== (root.current.mode & 32)
+      ? !0
+      : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 2;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    ) {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+        0 < memoizedUpdaters.size &&
+          (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+          memoizedUpdaters.clear());
+        movePendingFibersToMemoized(root, didTimeout);
+      }
+      workInProgressRootRenderTargetTime = now() + 500;
+      prepareFreshStack(root, didTimeout);
     }
-  while (1);
-  resetContextDependencies();
-  tracing.__interactionsRef.current = lanes$jscomp$0;
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = exitStatus;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((JSCompiler_inline_result = executionContext),
+      (executionContext |= 8),
       root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (prevDispatcher = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== prevDispatcher &&
+        ((lanes = prevDispatcher),
+        (didTimeout = renderRootSync(root, prevDispatcher))),
+      (executionContext = JSCompiler_inline_result));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -5930,7 +6624,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -5940,20 +6634,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevDispatcher = root.suspendedLanes;
-          if ((prevDispatcher & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevDispatcher;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -5961,16 +6655,16 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevDispatcher = -1; 0 < lanes; ) {
-          var index$4 = 31 - clz32(lanes);
-          lanes$jscomp$0 = 1 << index$4;
-          index$4 = exitStatus[index$4];
-          index$4 > prevDispatcher && (prevDispatcher = index$4);
-          lanes &= ~lanes$jscomp$0;
-        }
-        lanes = prevDispatcher;
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; )
+          (memoizedUpdaters = 31 - clz32(lanes)),
+            (prevDispatcher = 1 << memoizedUpdaters),
+            (memoizedUpdaters = didTimeout[memoizedUpdaters]),
+            memoizedUpdaters > JSCompiler_inline_result &&
+              (JSCompiler_inline_result = memoizedUpdaters),
+            (lanes &= ~prevDispatcher);
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -6013,33 +6707,30 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$9 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$9;
-    root[index$9] = -1;
+    var index$6 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$6;
+    root[index$6] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  currentUpdateIsNested = nestedUpdateScheduled;
+  nestedUpdateScheduled = !1;
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    var prevExecutionContext = executionContext;
+    executionContext |= 8;
+    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo));
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+    executionContext = prevExecutionContext;
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -6052,11 +6743,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6096,21 +6782,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
-  spawnedWorkDuringRender = null;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6140,7 +6844,7 @@ function handleError(root$jscomp$0, thrownValue) {
         workInProgress = null;
         break;
       }
-      erroredWork.mode & 8 &&
+      erroredWork.mode & 2 &&
         stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0);
       a: {
         var root = root$jscomp$0,
@@ -6148,15 +6852,19 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
+        isDevToolsPresent && restorePendingUpdaters(root, thrownValue);
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6167,36 +6875,51 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$77 = returnFiber;
+            workInProgress$32 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$77.tag)) {
-              var nextState = workInProgress$77.memoizedState;
-              if (null !== nextState)
-                JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
-              else {
-                var props = workInProgress$77.memoizedProps;
-                JSCompiler_temp =
-                  void 0 === props.fallback
-                    ? !1
-                    : !0 !== props.unstable_avoidThisFallback
+            if ((JSCompiler_temp = 13 === workInProgress$32.tag)) {
+              var nextState = workInProgress$32.memoizedState;
+              JSCompiler_temp =
+                null !== nextState
+                  ? null !== nextState.dehydrated
                     ? !0
-                    : hasInvisibleParentBoundary
-                    ? !1
-                    : !0;
-              }
+                    : !1
+                  : !0 !==
+                    workInProgress$32.memoizedProps.unstable_avoidThisFallback
+                  ? !0
+                  : hasInvisibleParentBoundary
+                  ? !1
+                  : !0;
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$77.updateQueue;
+              var wakeables = workInProgress$32.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$77.updateQueue = updateQueue;
+                workInProgress$32.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$77.mode & 2)) {
-                workInProgress$77.flags |= 64;
+              if (
+                0 === (workInProgress$32.mode & 1) &&
+                workInProgress$32 !== returnFiber
+              ) {
+                workInProgress$32.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
+                if (
+                  enablePersistentOffscreenHostContainer &&
+                  null === workInProgress$32.alternate
+                ) {
+                  var offscreenContainer = workInProgress$32.child.child;
+                  if (null !== offscreenContainer) {
+                    var containerProps = getOffscreenContainerProps(
+                      "hidden",
+                      offscreenContainer.memoizedProps.children
+                    );
+                    offscreenContainer.pendingProps = containerProps;
+                    offscreenContainer.memoizedProps = containerProps;
+                  }
+                }
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6225,63 +6948,64 @@ function handleError(root$jscomp$0, thrownValue) {
                   wakeable,
                   sourceFiber
                 );
+                isDevToolsPresent && restorePendingUpdaters(root, sourceFiber);
                 wakeable.then(ping, ping);
               }
-              workInProgress$77.flags |= 8192;
-              workInProgress$77.lanes = thrownValue;
+              workInProgress$32.flags |= 16384;
+              workInProgress$32.lanes = thrownValue;
               break a;
             }
-            workInProgress$77 = workInProgress$77.return;
-          } while (null !== workInProgress$77);
+            workInProgress$32 = workInProgress$32.return;
+          } while (null !== workInProgress$32);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$77 = returnFiber;
+        workInProgress$32 = returnFiber;
         do {
-          switch (workInProgress$77.tag) {
+          switch (workInProgress$32.tag) {
             case 3:
               root = value;
-              workInProgress$77.flags |= 8192;
+              workInProgress$32.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$77.lanes |= thrownValue;
-              var update$78 = createRootErrorUpdate(
-                workInProgress$77,
+              workInProgress$32.lanes |= thrownValue;
+              var update$33 = createRootErrorUpdate(
+                workInProgress$32,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$77, update$78);
+              enqueueCapturedUpdate(workInProgress$32, update$33);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$77.type,
-                instance = workInProgress$77.stateNode;
+              var ctor = workInProgress$32.type,
+                instance = workInProgress$32.stateNode;
               if (
-                0 === (workInProgress$77.flags & 64) &&
+                0 === (workInProgress$32.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$77.flags |= 8192;
+                workInProgress$32.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$77.lanes |= thrownValue;
-                var update$81 = createClassErrorUpdate(
-                  workInProgress$77,
+                workInProgress$32.lanes |= thrownValue;
+                var update$36 = createClassErrorUpdate(
+                  workInProgress$32,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$77, update$81);
+                enqueueCapturedUpdate(workInProgress$32, update$36);
                 break a;
               }
           }
-          workInProgress$77 = workInProgress$77.return;
-        } while (null !== workInProgress$77);
+          workInProgress$32 = workInProgress$32.return;
+        } while (null !== workInProgress$32);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6299,18 +7023,20 @@ function pushDispatcher() {
   ReactCurrentDispatcher$2.current = ContextOnlyDispatcher;
   return null === prevDispatcher ? ContextOnlyDispatcher : prevDispatcher;
 }
-function pushInteractions(root) {
-  var prevInteractions = tracing.__interactionsRef.current;
-  tracing.__interactionsRef.current = root.memoizedInteractions;
-  return prevInteractions;
-}
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 2;
   var prevDispatcher = pushDispatcher();
-  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes)
-    prepareFreshStack(root, lanes), startWorkOnPendingInteractions(root, lanes);
-  lanes = pushInteractions(root);
+  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      0 < memoizedUpdaters.size &&
+        (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+        memoizedUpdaters.clear());
+      movePendingFibersToMemoized(root, lanes);
+    }
+    prepareFreshStack(root, lanes);
+  }
   do
     try {
       workLoopSync();
@@ -6320,7 +7046,6 @@ function renderRootSync(root, lanes) {
     }
   while (1);
   resetContextDependencies();
-  tracing.__interactionsRef.current = lanes;
   executionContext = prevExecutionContext;
   ReactCurrentDispatcher$2.current = prevDispatcher;
   if (null !== workInProgress)
@@ -6335,12 +7060,12 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
   var current = unitOfWork.alternate;
-  0 !== (unitOfWork.mode & 8)
+  0 !== (unitOfWork.mode & 2)
     ? ((profilerStartTime = now$1()),
       0 > unitOfWork.actualStartTime && (unitOfWork.actualStartTime = now$1()),
       (current = beginWork$1(current, unitOfWork, subtreeRenderLanes)),
@@ -6357,8 +7082,8 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      if (0 === (completedWork.mode & 8))
+    if (0 === (completedWork.flags & 8192)) {
+      if (0 === (completedWork.mode & 2))
         current = completeWork(current, completedWork, subtreeRenderLanes);
       else {
         var fiber = completedWork;
@@ -6371,484 +7096,331 @@ function completeUnitOfWork(unitOfWork) {
         workInProgress = current;
         return;
       }
-      current = completedWork;
-      if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
-      ) {
-        fiber = 0;
-        if (0 !== (current.mode & 8)) {
-          for (
-            var actualDuration = current.actualDuration,
-              treeBaseDuration = current.selfBaseDuration,
-              shouldBubbleActualDurations =
-                null === current.alternate ||
-                current.child !== current.alternate.child,
-              child = current.child;
-            null !== child;
-
-          )
-            (fiber |= child.lanes | child.childLanes),
-              shouldBubbleActualDurations &&
-                (actualDuration += child.actualDuration),
-              (treeBaseDuration += child.treeBaseDuration),
-              (child = child.sibling);
-          13 === current.tag &&
-            null !== current.memoizedState &&
-            ((shouldBubbleActualDurations = current.child),
-            null !== shouldBubbleActualDurations &&
-              (treeBaseDuration -=
-                shouldBubbleActualDurations.treeBaseDuration));
-          current.actualDuration = actualDuration;
-          current.treeBaseDuration = treeBaseDuration;
-        } else
-          for (actualDuration = current.child; null !== actualDuration; )
-            (fiber |= actualDuration.lanes | actualDuration.childLanes),
-              (actualDuration = actualDuration.sibling);
-        current.childLanes = fiber;
-      }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
-      if (0 !== (completedWork.mode & 8)) {
+      if (0 !== (completedWork.mode & 2)) {
         stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1);
         current = completedWork.actualDuration;
         for (fiber = completedWork.child; null !== fiber; )
-          (current += fiber.actualDuration), (fiber = fiber.sibling);
-        completedWork.actualDuration = current;
-      }
-      null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
-    }
-    completedWork = completedWork.sibling;
-    if (null !== completedWork) {
-      workInProgress = completedWork;
-      return;
-    }
-    workInProgress = completedWork = unitOfWork;
-  } while (null !== completedWork);
-  0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
-}
-function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
-  return null;
-}
-function commitRootImpl(root, renderPriorityLevel) {
-  do flushPassiveEffects();
-  while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
-    throw Error("Should not already be working.");
-  var finishedWork = root.finishedWork,
-    lanes = root.finishedLanes;
-  if (null === finishedWork) return null;
-  root.finishedWork = null;
-  root.finishedLanes = 0;
-  if (finishedWork === root.current)
-    throw Error(
-      "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
-    );
-  root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$10 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$10;
-    remainingLanes$jscomp$0[index$10] = 0;
-    eventTimes[index$10] = -1;
-    expirationTimes[index$10] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
-  root === workInProgressRoot &&
-    ((workInProgress = workInProgressRoot = null),
-    (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    eventTimes = pushInteractions(root);
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
-    commitTime = now$1();
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              expirationTimes = nextEffect;
-              a: for (index$10 = noLongerPendingLanes = expirationTimes; ; ) {
-                lane = index$10;
-                if (
-                  injectedHook &&
-                  "function" === typeof injectedHook.onCommitFiberUnmount
-                )
-                  try {
-                    injectedHook.onCommitFiberUnmount(rendererID, lane);
-                  } catch (err) {}
-                switch (lane.tag) {
-                  case 0:
-                  case 11:
-                  case 14:
-                  case 15:
-                  case 22:
-                    var updateQueue = lane.updateQueue;
-                    if (null !== updateQueue) {
-                      var lastEffect = updateQueue.lastEffect;
-                      if (null !== lastEffect) {
-                        var firstEffect = lastEffect.next,
-                          effect = firstEffect;
-                        do {
-                          var _effect2 = effect,
-                            destroy = _effect2.destroy,
-                            tag = _effect2.tag;
-                          if (void 0 !== destroy)
-                            if (0 !== (tag & 4))
-                              enqueuePendingPassiveHookEffectUnmount(
-                                lane,
-                                effect
-                              );
-                            else {
-                              _effect2 = lane;
-                              try {
-                                destroy();
-                              } catch (error) {
-                                captureCommitPhaseError(_effect2, error);
-                              }
-                            }
-                          effect = effect.next;
-                        } while (effect !== firstEffect);
-                      }
-                    }
-                    break;
-                  case 1:
-                    safelyDetachRef(lane);
-                    var instance = lane.stateNode;
-                    if ("function" === typeof instance.componentWillUnmount)
-                      try {
-                        (effect = lane),
-                          (_effect2 = instance),
-                          (_effect2.props = effect.memoizedProps),
-                          (_effect2.state = effect.memoizedState),
-                          _effect2.componentWillUnmount();
-                      } catch (unmountError) {
-                        captureCommitPhaseError(lane, unmountError);
-                      }
-                    break;
-                  case 5:
-                    safelyDetachRef(lane);
-                    break;
-                  case 4:
-                    createChildNodeSet(lane.stateNode.containerInfo);
-                }
-                if (null !== index$10.child)
-                  (index$10.child.return = index$10),
-                    (index$10 = index$10.child);
-                else {
-                  if (index$10 === noLongerPendingLanes) break;
-                  for (; null === index$10.sibling; ) {
-                    if (
-                      null === index$10.return ||
-                      index$10.return === noLongerPendingLanes
-                    )
-                      break a;
-                    index$10 = index$10.return;
-                  }
-                  index$10.sibling.return = index$10.return;
-                  index$10 = index$10.sibling;
-                }
-              }
-              var alternate = expirationTimes.alternate;
-              detachFiberMutation(expirationTimes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$90) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$90);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance$jscomp$0 = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance$jscomp$0.canonical;
-                  break;
-                default:
-                  current = instance$jscomp$0;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$91) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$91);
-        nextEffect = nextEffect.nextEffect;
+          (current += fiber.actualDuration), (fiber = fiber.sibling);
+        completedWork.actualDuration = current;
       }
-    while (null !== nextEffect);
-    nextEffect = null;
+      null !== unitOfWork &&
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
+    }
+    completedWork = completedWork.sibling;
+    if (null !== completedWork) {
+      workInProgress = completedWork;
+      return;
+    }
+    workInProgress = completedWork = unitOfWork;
+  } while (null !== completedWork);
+  0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
+}
+function commitRoot(root) {
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
+  return null;
+}
+function commitRootImpl(root, renderPriorityLevel) {
+  do flushPassiveEffects();
+  while (null !== rootWithPendingPassiveEffects);
+  if (0 !== (executionContext & 6))
+    throw Error("Should not already be working.");
+  var finishedWork = root.finishedWork,
+    lanes = root.finishedLanes;
+  if (null === finishedWork) return null;
+  root.finishedWork = null;
+  root.finishedLanes = 0;
+  if (finishedWork === root.current)
+    throw Error(
+      "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
+    );
+  root.callbackNode = null;
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
+  root === workInProgressRoot &&
+    ((workInProgress = workInProgressRoot = null),
+    (workInProgressRootRenderLanes = 0));
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback$1(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 4;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
+    commitTime = now$1();
+    commitMutationEffects(root, finishedWork, lanes);
+    root.current = finishedWork;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    tracing.__interactionsRef.current = eventTimes;
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else (root.current = finishedWork), (commitTime = now$1());
-  if ((flags$jscomp$0 = rootDoesHavePassiveEffects))
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsLanes = lanes),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (ref = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((instance$jscomp$0 = nextEffect),
-          (instance$jscomp$0.sibling = null),
-          (instance$jscomp$0.stateNode = null)),
-        (nextEffect = ref);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
-  if (0 !== remainingLanes) {
-    if (null !== spawnedWorkDuringRender)
-      for (
-        ref = spawnedWorkDuringRender,
-          spawnedWorkDuringRender = null,
-          instance$jscomp$0 = 0;
-        instance$jscomp$0 < ref.length;
-        instance$jscomp$0++
-      )
-        scheduleInteractions(
-          root,
-          ref[instance$jscomp$0],
-          root.memoizedInteractions
-        );
-    schedulePendingInteractions(root, remainingLanes);
-  } else legacyErrorBoundariesThatAlreadyFailed = null;
-  flags$jscomp$0 || finishPendingInteractions(root, lanes);
-  1 === remainingLanes
-    ? root === rootWithNestedUpdates
-      ? nestedUpdateCount++
-      : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
+  0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
+  0 !== (remainingLanes & 1)
+    ? ((nestedUpdateScheduled = !0),
+      root === rootWithNestedUpdates
+        ? nestedUpdateCount++
+        : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        renderPriorityLevel,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
+  isDevToolsPresent && root.memoizedUpdaters.clear();
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 6))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 4;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect,
+                    current = fiber$jscomp$0;
+                  switch (current.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      current.mode & 2
+                        ? ((passiveEffectStartTime = now$1()),
+                          commitHookEffectListUnmount(4, current, fiber),
+                          recordPassiveEffectDuration(current))
+                        : commitHookEffectListUnmount(4, current, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (((i = fiber), i.tag)) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    i.mode & 2
+                      ? ((passiveEffectStartTime = now$1()),
+                        commitHookEffectListUnmount(5, i, i.return),
+                        recordPassiveEffectDuration(i))
+                      : commitHookEffectListUnmount(5, i, i.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (((fiberToDelete = deletions), fiberToDelete.tag)) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      if (fiberToDelete.mode & 2) {
+                        passiveEffectStartTime = now$1();
+                        try {
+                          commitHookEffectListMount(5, fiberToDelete);
+                        } finally {
+                          recordPassiveEffectDuration(fiberToDelete);
+                        }
+                      } else commitHookEffectListMount(5, fiberToDelete);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        finishedWork = pendingPassiveProfilerEffects;
+        pendingPassiveProfilerEffects = [];
+        for (firstChild = 0; firstChild < finishedWork.length; firstChild++) {
+          var finishedWork$jscomp$0 = finishedWork[firstChild];
+          if (0 !== (finishedWork$jscomp$0.flags & 4))
+            switch (finishedWork$jscomp$0.tag) {
+              case 12:
+                var passiveEffectDuration =
+                    finishedWork$jscomp$0.stateNode.passiveEffectDuration,
+                  _finishedWork$memoize = finishedWork$jscomp$0.memoizedProps,
+                  id = _finishedWork$memoize.id,
+                  onPostCommit = _finishedWork$memoize.onPostCommit;
+                sibling$jscomp$1 = commitTime;
+                var phase =
+                  null === finishedWork$jscomp$0.alternate ? "mount" : "update";
+                currentUpdateIsNested && (phase = "nested-update");
+                "function" === typeof onPostCommit &&
+                  onPostCommit(
+                    id,
+                    phase,
+                    passiveEffectDuration,
+                    sibling$jscomp$1
+                  );
+                var parentFiber = finishedWork$jscomp$0.return;
+                b: for (; null !== parentFiber; ) {
+                  switch (parentFiber.tag) {
+                    case 3:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                    case 12:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                  }
+                  parentFiber = parentFiber.return;
+                }
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        var stateNode = renderPriority.current.stateNode;
+        stateNode.effectDuration = 0;
+        stateNode.passiveEffectDuration = 0;
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
+    }
   }
   return !1;
 }
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
+function enqueuePendingPassiveProfilerEffect(fiber) {
+  pendingPassiveProfilerEffects.push(fiber);
   rootDoesHavePassiveEffects ||
     ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
+    scheduleCallback$1(NormalPriority, function() {
       flushPassiveEffects();
       return null;
     }));
 }
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects,
-    lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
-  pendingPassiveEffectsLanes = 0;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var prevInteractions = pushInteractions(root),
-    unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$96 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$96.destroy;
-    effect$96.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$96 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
-    try {
-      var create$100 = effect$96.create;
-      effect$96.destroy = create$100();
-    } catch (error$101) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$101);
-    }
-  }
-  for (unmountEffects = root.current.firstEffect; null !== unmountEffects; )
-    (create$100 = unmountEffects.nextEffect),
-      (unmountEffects.nextEffect = null),
-      unmountEffects.flags & 8 &&
-        ((unmountEffects.sibling = null), (unmountEffects.stateNode = null)),
-      (unmountEffects = create$100);
-  tracing.__interactionsRef.current = prevInteractions;
-  finishPendingInteractions(root, lanes);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
-}
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
@@ -6857,46 +7429,52 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
-    ensureRootIsScheduled(rootFiber, sourceFiber),
-    schedulePendingInteractions(rootFiber, 1));
+    ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update),
-              schedulePendingInteractions(fiber, 1);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -6908,140 +7486,71 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
       : (workInProgressRootPingedLanes |= pingedLanes));
   ensureRootIsScheduled(root, wakeable);
-  schedulePendingInteractions(root, pingedLanes);
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
   var retryCache = boundaryFiber.stateNode;
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
     (markRootUpdated(boundaryFiber, wakeable, retryCache),
-    ensureRootIsScheduled(boundaryFiber, retryCache),
-    schedulePendingInteractions(boundaryFiber, wakeable));
+    ensureRootIsScheduled(boundaryFiber, retryCache));
 }
 var beginWork$1;
 beginWork$1 = function(current, workInProgress, renderLanes) {
-  var updateLanes = workInProgress.lanes;
   if (null !== current)
     if (
       current.memoizedProps !== workInProgress.pendingProps ||
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
+      if (
+        0 === (current.lanes & renderLanes) &&
+        0 === (workInProgress.flags & 128)
+      )
+        return (
+          (didReceiveUpdate = !1),
+          attemptEarlyBailoutIfNoScheduledUpdate(
+            current,
             workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue2);
-          context._currentValue2 = updateLanes;
-          break;
-        case 12:
-          0 !== (renderLanes & workInProgress.childLanes) &&
-            (workInProgress.flags |= 4);
-          updateLanes = workInProgress.stateNode;
-          updateLanes.effectDuration = 0;
-          updateLanes.passiveEffectDuration = 0;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
-              workInProgress,
-              renderLanes
-            );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
-      }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+            renderLanes
+          )
+        );
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
   switch (workInProgress.tag) {
     case 2:
-      updateLanes = workInProgress.type;
+      var Component = workInProgress.type;
       null !== current &&
         ((current.alternate = null),
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      var context = getMaskedContext(
+        workInProgress,
+        contextStackCursor.current
+      );
       prepareToReadContext(workInProgress, renderLanes);
       context = renderWithHooks(
         null,
         workInProgress,
-        updateLanes,
+        Component,
         current,
         context,
         renderLanes
@@ -7056,7 +7565,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
         workInProgress.updateQueue = null;
-        if (isContextProvider(updateLanes)) {
+        if (isContextProvider(Component)) {
           var hasContext = !0;
           pushContextProvider(workInProgress);
         } else hasContext = !1;
@@ -7065,22 +7574,14 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             ? context.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
         context.updater = classComponentUpdater;
         workInProgress.stateNode = context;
         context._reactInternals = workInProgress;
-        mountClassInstance(workInProgress, updateLanes, current, renderLanes);
+        mountClassInstance(workInProgress, Component, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           hasContext,
           renderLanes
@@ -7091,24 +7592,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      Component = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
-        switch (hasContext) {
+        context = Component._init;
+        Component = context(Component._payload);
+        workInProgress.type = Component;
+        context = workInProgress.tag = resolveLazyComponentTag(Component);
+        current = resolveDefaultProps(Component, current);
+        switch (context) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7117,7 +7618,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7126,7 +7627,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7135,80 +7636,78 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
-              updateLanes,
+              Component,
+              resolveDefaultProps(Component.type, current),
               renderLanes
             );
             break a;
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            Component +
             ". Lazy element type must resolve to a class or function."
         );
       }
       return workInProgress;
     case 0:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateFunctionComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 1:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateClassComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 3:
       pushHostRootContext(workInProgress);
-      updateLanes = workInProgress.updateQueue;
-      if (null === current || null === updateLanes)
+      Component = workInProgress.updateQueue;
+      if (null === current || null === Component)
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
+      context = workInProgress.pendingProps;
+      Component = workInProgress.memoizedState.element;
       cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
-      updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      processUpdateQueue(workInProgress, context, null, renderLanes);
+      context = workInProgress.memoizedState.element;
+      context === Component
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, context, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
       return (
         pushHostContext(workInProgress),
-        (updateLanes = workInProgress.pendingProps.children),
-        markRef(current, workInProgress),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        (Component = workInProgress.pendingProps.children),
+        markRef$1(current, workInProgress),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 6:
@@ -7221,34 +7720,29 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (updateLanes = workInProgress.pendingProps),
+        (Component = workInProgress.pendingProps),
         null === current
           ? (workInProgress.child = reconcileChildFibers(
               workInProgress,
               null,
-              updateLanes,
+              Component,
               renderLanes
             ))
-          : reconcileChildren(
-              current,
-              workInProgress,
-              updateLanes,
-              renderLanes
-            ),
+          : reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 11:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateForwardRef(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
@@ -7276,9 +7770,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 12:
       return (
         (workInProgress.flags |= 4),
-        (updateLanes = workInProgress.stateNode),
-        (updateLanes.effectDuration = 0),
-        (updateLanes.passiveEffectDuration = 0),
+        (Component = workInProgress.stateNode),
+        (Component.effectDuration = 0),
+        (Component.passiveEffectDuration = 0),
         reconcileChildren(
           current,
           workInProgress,
@@ -7289,28 +7783,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 10:
       a: {
-        updateLanes = workInProgress.type._context;
+        Component = workInProgress.type._context;
         context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue2);
-        context$jscomp$0._currentValue2 = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        hasContext = workInProgress.memoizedProps;
+        var newValue = context.value;
+        push(valueCursor, Component._currentValue2);
+        Component._currentValue2 = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === context.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7322,71 +7804,66 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === Component) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
@@ -7400,29 +7877,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 9:
       return (
         (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (Component = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (context = readContext(context)),
+        (Component = Component(context)),
         (workInProgress.flags |= 1),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
-        (hasContext = resolveDefaultProps(
-          context,
-          workInProgress.pendingProps
-        )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (Component = workInProgress.type),
+        (context = resolveDefaultProps(Component, workInProgress.pendingProps)),
+        (context = resolveDefaultProps(Component.type, context)),
         updateMemoComponent(
           current,
           workInProgress,
+          Component,
           context,
-          hasContext,
-          updateLanes,
           renderLanes
         )
       );
@@ -7432,32 +7904,31 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress,
         workInProgress.type,
         workInProgress.pendingProps,
-        updateLanes,
         renderLanes
       );
     case 17:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2)),
         (workInProgress.tag = 1),
-        isContextProvider(updateLanes)
+        isContextProvider(Component)
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, Component, context),
+        mountClassInstance(workInProgress, Component, context, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           current,
           renderLanes
@@ -7465,9 +7936,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7476,92 +7947,14 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       "). This error is likely caused by a bug in React. Please file an issue."
   );
 };
-function markSpawnedWork(lane) {
-  null === spawnedWorkDuringRender
-    ? (spawnedWorkDuringRender = [lane])
-    : spawnedWorkDuringRender.push(lane);
-}
-function scheduleInteractions(root, lane, interactions) {
-  if (0 < interactions.size) {
-    var pendingInteractionMap = root.pendingInteractionMap,
-      pendingInteractions = pendingInteractionMap.get(lane);
-    null != pendingInteractions
-      ? interactions.forEach(function(interaction) {
-          pendingInteractions.has(interaction) || interaction.__count++;
-          pendingInteractions.add(interaction);
-        })
-      : (pendingInteractionMap.set(lane, new Set(interactions)),
-        interactions.forEach(function(interaction) {
-          interaction.__count++;
-        }));
-    pendingInteractionMap = tracing.__subscriberRef.current;
-    if (null !== pendingInteractionMap)
-      pendingInteractionMap.onWorkScheduled(
-        interactions,
-        1e3 * lane + root.interactionThreadID
-      );
-  }
-}
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-function startWorkOnPendingInteractions(root, lanes) {
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    0 !== (lanes & scheduledLane) &&
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
-  });
-  root.memoizedInteractions = interactions;
-  if (0 < interactions.size) {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber) {
-      root = 1e3 * lanes + root.interactionThreadID;
-      try {
-        subscriber.onWorkStarted(interactions, root);
-      } catch (error) {
-        scheduleCallback(99, function() {
-          throw error;
-        });
-      }
-    }
-  }
-}
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  try {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber && 0 < root.memoizedInteractions.size)
-      subscriber.onWorkStopped(
-        root.memoizedInteractions,
-        1e3 * committedLanes + root.interactionThreadID
-      );
-  } catch (error) {
-    scheduleCallback(99, function() {
-      throw error;
+function restorePendingUpdaters(root, lanes) {
+  isDevToolsPresent &&
+    root.memoizedUpdaters.forEach(function(schedulingFiber) {
+      addFiberToLanesMap(root, schedulingFiber, lanes);
     });
-  } finally {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      0 === (remainingLanesAfterCommit & lane) &&
-        (pendingInteractionMap.delete(lane),
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-          if (null !== subscriber && 0 === interaction.__count)
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error$102) {
-              scheduleCallback(99, function() {
-                throw error$102;
-              });
-            }
-        }));
-    });
-  }
+}
+function scheduleCallback$1(priorityLevel, callback) {
+  return scheduleCallback(priorityLevel, callback);
 }
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
@@ -7572,8 +7965,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
   this.actualDuration = 0;
@@ -7614,11 +8007,11 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null),
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null),
       (workInProgress.actualDuration = 0),
       (workInProgress.actualStartTime = -1));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7655,17 +8048,16 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           (type.stateNode = { effectDuration: 0, passiveEffectDuration: 0 }),
           type
@@ -7673,7 +8065,6 @@ function createFiberFromTypeAndProps(
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7689,7 +8080,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7713,9 +8104,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7729,13 +8117,20 @@ function createFiberFromTypeAndProps(
   key.lanes = lanes;
   return key;
 }
+function createOffscreenHostContainerFiber(props, fiberMode, lanes, key) {
+  props = createFiber(5, props, key, fiberMode);
+  props.elementType = "RCTView";
+  props.type = "RCTView";
+  props.lanes = lanes;
+  return props;
+}
 function createFiberFromFragment(elements, mode, lanes, key) {
   elements = createFiber(7, elements, key, mode);
   elements.lanes = lanes;
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7773,9 +8168,10 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.expirationTimes = createLaneMap(-1);
   this.entangledLanes = this.finishedLanes = this.mutableReadLanes = this.expiredLanes = this.pingedLanes = this.suspendedLanes = this.pendingLanes = 0;
   this.entanglements = createLaneMap(0);
-  this.interactionThreadID = tracing.unstable_getThreadID();
-  this.memoizedInteractions = new Set();
-  this.pendingInteractionMap = new Map();
+  this.passiveEffectDuration = this.effectDuration = 0;
+  this.memoizedUpdaters = new Set();
+  containerInfo = this.pendingUpdatersLaneMap = [];
+  for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set());
 }
 function createPortal(children, containerInfo, implementation) {
   var key =
@@ -7857,12 +8253,102 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
   return null;
 }
+var emptyObject$1 = {},
+  createHierarchy,
+  getHostNode,
+  getHostProps,
+  lastNonHostInstance,
+  getOwnerHierarchy,
+  traverseOwnerTreeUp;
+createHierarchy = function(fiberHierarchy) {
+  return fiberHierarchy.map(function(fiber) {
+    return {
+      name: getComponentNameFromType(fiber.type),
+      getInspectorData: function(findNodeHandle) {
+        return {
+          props: getHostProps(fiber),
+          source: fiber._debugSource,
+          measure: function(callback) {
+            var hostFiber = findCurrentHostFiber(fiber);
+            if (
+              (hostFiber =
+                null != hostFiber &&
+                null !== hostFiber.stateNode &&
+                hostFiber.stateNode.node)
+            )
+              nativeFabricUIManager.measure(hostFiber, callback);
+            else
+              return ReactNativePrivateInterface.UIManager.measure(
+                getHostNode(fiber, findNodeHandle),
+                callback
+              );
+          }
+        };
+      }
+    };
+  });
+};
+getHostNode = function(fiber, findNodeHandle) {
+  for (var hostNode; fiber; ) {
+    null !== fiber.stateNode &&
+      5 === fiber.tag &&
+      (hostNode = findNodeHandle(fiber.stateNode));
+    if (hostNode) return hostNode;
+    fiber = fiber.child;
+  }
+  return null;
+};
+getHostProps = function(fiber) {
+  return (fiber = findCurrentHostFiber(fiber))
+    ? fiber.memoizedProps || emptyObject$1
+    : emptyObject$1;
+};
+exports.getInspectorDataForInstance = function(closestInstance) {
+  if (!closestInstance)
+    return {
+      hierarchy: [],
+      props: emptyObject$1,
+      selectedIndex: null,
+      source: null
+    };
+  closestInstance = findCurrentFiberUsingSlowPath(closestInstance);
+  var fiberHierarchy = getOwnerHierarchy(closestInstance),
+    instance = lastNonHostInstance(fiberHierarchy);
+  closestInstance = createHierarchy(fiberHierarchy);
+  var props = getHostProps(instance),
+    source = instance._debugSource;
+  fiberHierarchy = fiberHierarchy.indexOf(instance);
+  return {
+    hierarchy: closestInstance,
+    props: props,
+    selectedIndex: fiberHierarchy,
+    source: source
+  };
+};
+getOwnerHierarchy = function(instance) {
+  var hierarchy = [];
+  traverseOwnerTreeUp(hierarchy, instance);
+  return hierarchy;
+};
+lastNonHostInstance = function(hierarchy) {
+  for (var i = hierarchy.length - 1; 1 < i; i--) {
+    var instance = hierarchy[i];
+    if (5 !== instance.tag) return instance;
+  }
+  return hierarchy[0];
+};
+traverseOwnerTreeUp = function(hierarchy, instance) {
+  instance &&
+    (hierarchy.unshift(instance),
+    traverseOwnerTreeUp(hierarchy, instance._debugOwner));
+};
 function findNodeHandle(componentOrHandle) {
   if (null == componentOrHandle) return null;
   if ("number" === typeof componentOrHandle) return componentOrHandle;
@@ -7885,14 +8371,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_887 = {
+  devToolsConfig$jscomp$inline_978 = {
     findFiberByHostInstance: getInstanceFromInstance,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-bd5bf555e-20210823",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -7907,17 +8393,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1087 = {
-  bundleType: devToolsConfig$jscomp$inline_887.bundleType,
-  version: devToolsConfig$jscomp$inline_887.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_887.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_887.rendererConfig,
+var internals$jscomp$inline_1239 = {
+  bundleType: devToolsConfig$jscomp$inline_978.bundleType,
+  version: devToolsConfig$jscomp$inline_978.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_978.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_978.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -7926,25 +8413,26 @@ var internals$jscomp$inline_1087 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_887.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_978.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-bd5bf555e-20210823"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1088 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1240 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1088.isDisabled &&
-    hook$jscomp$inline_1088.supportsFiber
+    !hook$jscomp$inline_1240.isDisabled &&
+    hook$jscomp$inline_1240.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1088.inject(
-        internals$jscomp$inline_1087
+      (rendererID = hook$jscomp$inline_1240.inject(
+        internals$jscomp$inline_1239
       )),
-        (injectedHook = hook$jscomp$inline_1088);
+        (injectedHook = hook$jscomp$inline_1240);
     } catch (err) {}
 }
 exports.createPortal = function(children, containerTag) {
@@ -7957,12 +8445,10 @@ exports.createPortal = function(children, containerTag) {
 };
 exports.dispatchCommand = function(handle, command, args) {
   null != handle._nativeTag &&
-    (handle._internalInstanceHandle
-      ? nativeFabricUIManager.dispatchCommand(
-          handle._internalInstanceHandle.stateNode.node,
-          command,
-          args
-        )
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.dispatchCommand(handle.node, command, args))
       : ReactNativePrivateInterface.UIManager.dispatchViewManagerCommand(
           handle._nativeTag,
           command,
@@ -7982,23 +8468,20 @@ exports.findHostInstance_DEPRECATED = function(componentOrHandle) {
     : componentOrHandle;
 };
 exports.findNodeHandle = findNodeHandle;
-exports.render = function(element, containerTag, callback) {
+exports.render = function(element, containerTag, callback, concurrentRoot) {
   var root = roots.get(containerTag);
-  if (!root) {
-    root = new FiberRootNode(containerTag, 0, !1);
-    var JSCompiler_inline_result = 0;
-    isDevToolsPresent && (JSCompiler_inline_result |= 8);
-    JSCompiler_inline_result = createFiber(
-      3,
-      null,
-      null,
-      JSCompiler_inline_result
-    );
-    root.current = JSCompiler_inline_result;
-    JSCompiler_inline_result.stateNode = root;
-    initializeUpdateQueue(JSCompiler_inline_result);
-    roots.set(containerTag, root);
-  }
+  root ||
+    ((root = concurrentRoot ? 1 : 0),
+    (concurrentRoot = new FiberRootNode(containerTag, root, !1)),
+    (root = 1 === root ? 1 : 0),
+    isDevToolsPresent && (root |= 2),
+    (root = createFiber(3, null, null, root)),
+    (concurrentRoot.current = root),
+    (root.stateNode = concurrentRoot),
+    (root.memoizedState = { element: null }),
+    initializeUpdateQueue(root),
+    (root = concurrentRoot),
+    roots.set(containerTag, root));
   updateContainer(element, root, null, callback);
   a: if (((element = root.current), element.child))
     switch (element.child.tag) {
@@ -8011,6 +8494,17 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.sendAccessibilityEvent(handle.node, eventType))
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.stopSurface = function(containerTag) {
   var root = roots.get(containerTag);
   root &&
diff --git a/Libraries/Renderer/implementations/ReactFabric-profiling.js b/Libraries/Renderer/implementations/ReactFabric-profiling.js
index 995495a12c799f..487e23a55b8a53 100644
--- a/Libraries/Renderer/implementations/ReactFabric-profiling.js
+++ b/Libraries/Renderer/implementations/ReactFabric-profiling.js
@@ -8,15 +8,14 @@
  * @nolint
  * @providesModule ReactFabric-profiling
  * @preventMunge
- * @generated
+ * @generated SignedSource<<b7d175a73b252f248a6310a1b81619b4>>
  */
 
 "use strict";
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface"),
   React = require("react"),
-  Scheduler = require("scheduler"),
-  tracing = require("scheduler/tracing");
+  Scheduler = require("scheduler");
 function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
@@ -64,7 +63,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -76,7 +76,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -290,36 +290,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -327,9 +337,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -339,12 +349,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -570,7 +580,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -921,7 +931,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_223 = {
+var injectedNamesToPlugins$jscomp$inline_224 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -956,34 +966,34 @@ var injectedNamesToPlugins$jscomp$inline_223 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_224 = !1,
-  pluginName$jscomp$inline_225;
-for (pluginName$jscomp$inline_225 in injectedNamesToPlugins$jscomp$inline_223)
+  isOrderingDirty$jscomp$inline_225 = !1,
+  pluginName$jscomp$inline_226;
+for (pluginName$jscomp$inline_226 in injectedNamesToPlugins$jscomp$inline_224)
   if (
-    injectedNamesToPlugins$jscomp$inline_223.hasOwnProperty(
-      pluginName$jscomp$inline_225
+    injectedNamesToPlugins$jscomp$inline_224.hasOwnProperty(
+      pluginName$jscomp$inline_226
     )
   ) {
-    var pluginModule$jscomp$inline_226 =
-      injectedNamesToPlugins$jscomp$inline_223[pluginName$jscomp$inline_225];
+    var pluginModule$jscomp$inline_227 =
+      injectedNamesToPlugins$jscomp$inline_224[pluginName$jscomp$inline_226];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_225) ||
-      namesToPlugins[pluginName$jscomp$inline_225] !==
-        pluginModule$jscomp$inline_226
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_226) ||
+      namesToPlugins[pluginName$jscomp$inline_226] !==
+        pluginModule$jscomp$inline_227
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_225])
+      if (namesToPlugins[pluginName$jscomp$inline_226])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_225 +
+            pluginName$jscomp$inline_226 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_225
-      ] = pluginModule$jscomp$inline_226;
-      isOrderingDirty$jscomp$inline_224 = !0;
+        pluginName$jscomp$inline_226
+      ] = pluginModule$jscomp$inline_227;
+      isOrderingDirty$jscomp$inline_225 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_224 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_225 && recomputePluginOrdering();
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
@@ -998,7 +1008,22 @@ getNodeFromInstance = function(inst) {
 };
 ResponderEventPlugin.injection.injectGlobalResponderHandler({
   onChange: function(from, to, blockNativeResponder) {
-    null !== to
+    var fromOrTo = from || to;
+    (fromOrTo = fromOrTo && fromOrTo.stateNode) &&
+    fromOrTo.canonical._internalInstanceHandle
+      ? (from &&
+          nativeFabricUIManager.setIsJSResponder(
+            from.stateNode.node,
+            !1,
+            blockNativeResponder || !1
+          ),
+        to &&
+          nativeFabricUIManager.setIsJSResponder(
+            to.stateNode.node,
+            !0,
+            blockNativeResponder || !1
+          ))
+      : null !== to
       ? ReactNativePrivateInterface.UIManager.setJSResponder(
           to.stateNode.canonical._nativeTag,
           blockNativeResponder
@@ -1020,10 +1045,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1038,11 +1063,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1052,7 +1077,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1069,6 +1094,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1078,24 +1105,83 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1104,7 +1190,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1192,33 +1278,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   return function() {
@@ -1247,7 +1316,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1293,9 +1362,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1320,7 +1389,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1336,7 +1405,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1353,7 +1422,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1471,7 +1540,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1531,6 +1600,271 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
     }
   });
 }
+var scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null,
+  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__;
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      var didError = 128 === (root.current.flags & 128);
+      switch (eventPriority) {
+        case 1:
+          var schedulerPriority = ImmediatePriority;
+          break;
+        case 4:
+          schedulerPriority = UserBlockingPriority;
+          break;
+        case 16:
+          schedulerPriority = NormalPriority;
+          break;
+        case 536870912:
+          schedulerPriority = IdlePriority;
+          break;
+        default:
+          schedulerPriority = NormalPriority;
+      }
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        schedulerPriority,
+        didError
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 !== (nextLanes & 4) && (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$7 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$7;
+    remainingLanes[index$7] = 0;
+    eventTimes[index$7] = -1;
+    root[index$7] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$8 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$8;
+    (lane & entangledLanes) | (root[index$8] & entangledLanes) &&
+      (root[index$8] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (isDevToolsPresent)
+    for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) {
+      var index$9 = 31 - clz32(lanes),
+        lane = 1 << index$9;
+      root[index$9].add(fiber);
+      lanes &= ~lane;
+    }
+}
+function movePendingFibersToMemoized(root, lanes) {
+  if (isDevToolsPresent)
+    for (
+      var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap,
+        memoizedUpdaters = root.memoizedUpdaters;
+      0 < lanes;
+
+    ) {
+      var index$10 = 31 - clz32(lanes);
+      root = 1 << index$10;
+      index$10 = pendingUpdatersLaneMap[index$10];
+      0 < index$10.size &&
+        (index$10.forEach(function(fiber) {
+          var alternate = fiber.alternate;
+          (null !== alternate && memoizedUpdaters.has(alternate)) ||
+            memoizedUpdaters.add(fiber);
+        }),
+        index$10.clear());
+      lanes &= ~root;
+    }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
 function shim() {
   throw Error(
     "The current renderer does not support mutation. This error is likely caused by a bug in React. Please file an issue."
@@ -1556,6 +1890,9 @@ var _nativeFabricUIManage = nativeFabricUIManager,
   fabricMeasure = _nativeFabricUIManage.measure,
   fabricMeasureInWindow = _nativeFabricUIManage.measureInWindow,
   fabricMeasureLayout = _nativeFabricUIManage.measureLayout,
+  FabricDiscretePriority = _nativeFabricUIManage.unstable_DiscreteEventPriority,
+  fabricGetCurrentEventPriority =
+    _nativeFabricUIManage.unstable_getCurrentEventPriority,
   getViewConfigForType =
     ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get,
   nextReactTag = 2;
@@ -1649,7 +1986,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1703,13 +2041,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1745,361 +2083,79 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__,
-  Scheduler_now = Scheduler.unstable_now;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
+  if (!isFlushingSyncQueue && null !== syncQueue) {
+    isFlushingSyncQueue = !0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
+    try {
+      var queue = syncQueue;
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
+      syncQueue = null;
+      includesLegacySyncCallbacks = !1;
+    } catch (error) {
+      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+      error);
+    } finally {
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
+    }
   }
+  return null;
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
+var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
+function is(x, y) {
+  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
+}
+var objectIs = "function" === typeof Object.is ? Object.is : is;
+function shallowEqual(objA, objB) {
+  if (objectIs(objA, objB)) return !0;
+  if (
+    "object" !== typeof objA ||
+    null === objA ||
+    "object" !== typeof objB ||
+    null === objB
+  )
+    return !1;
+  var keysA = Object.keys(objA),
+    keysB = Object.keys(objB);
+  if (keysA.length !== keysB.length) return !1;
+  for (keysB = 0; keysB < keysA.length; keysB++)
+    if (
+      !hasOwnProperty.call(objB, keysA[keysB]) ||
+      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
+    )
+      return !1;
+  return !0;
+}
+function describeFiber(fiber) {
+  switch (fiber.tag) {
     case 5:
-      return 97;
-    case 3:
+      return describeComponentFrame(fiber.type, null, null);
+    case 16:
+      return describeComponentFrame("Lazy", null, null);
+    case 13:
+      return describeComponentFrame("Suspense", null, null);
+    case 19:
+      return describeComponentFrame("SuspenseList", null, null);
+    case 0:
     case 2:
+    case 15:
+      return describeFunctionComponentFrame(fiber.type, null);
+    case 11:
+      return describeFunctionComponentFrame(fiber.type.render, null);
     case 1:
-      return 95;
-    case 0:
-      return 90;
+      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
-}
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-var fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
-  if (!isFlushingSyncQueue && null !== syncQueue) {
-    isFlushingSyncQueue = !0;
-    var i = 0;
-    try {
-      var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
-      syncQueue = null;
-    } catch (error) {
-      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
-      error);
-    } finally {
-      isFlushingSyncQueue = !1;
-    }
-  }
-}
-var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
-function is(x, y) {
-  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
-}
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
-function shallowEqual(objA, objB) {
-  if (objectIs(objA, objB)) return !0;
-  if (
-    "object" !== typeof objA ||
-    null === objA ||
-    "object" !== typeof objB ||
-    null === objB
-  )
-    return !1;
-  var keysA = Object.keys(objA),
-    keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) return !1;
-  for (keysB = 0; keysB < keysA.length; keysB++)
-    if (
-      !hasOwnProperty.call(objB, keysA[keysB]) ||
-      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
-    )
-      return !1;
-  return !0;
-}
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case 5:
-      return describeComponentFrame(fiber.type, null, null);
-    case 16:
-      return describeComponentFrame("Lazy", null, null);
-    case 13:
-      return describeComponentFrame("Suspense", null, null);
-    case 19:
-      return describeComponentFrame("SuspenseList", null, null);
-    case 0:
-    case 2:
-    case 15:
-      return describeFunctionComponentFrame(fiber.type, null);
-    case 11:
-      return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
-    case 1:
-      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
-    default:
-      return "";
+      return "";
   }
 }
 function resolveDefaultProps(Component, baseProps) {
@@ -2116,14 +2172,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue2 = currentValue;
+  context._currentValue2 = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2143,44 +2199,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue2;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue2;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2206,14 +2258,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 8)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2282,111 +2354,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2442,7 +2514,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2453,7 +2526,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2463,7 +2537,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2535,7 +2610,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2557,7 +2631,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2610,25 +2683,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2660,16 +2730,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2684,7 +2754,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2773,7 +2852,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2798,22 +2877,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2841,15 +2912,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2860,7 +2923,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3043,55 +3106,49 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild.type === REACT_FRAGMENT_TYPE &&
       null === newChild.key;
     isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
+            var key = newChild.key;
             for (
               isUnkeyedTopLevelFragment = currentFirstChild;
               null !== isUnkeyedTopLevelFragment;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (isUnkeyedTopLevelFragment.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === isUnkeyedTopLevelFragment.tag) {
+                    deleteRemainingChildren(
+                      returnFiber,
+                      isUnkeyedTopLevelFragment.sibling
+                    );
+                    currentFirstChild = useFiber(
+                      isUnkeyedTopLevelFragment,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (isUnkeyedTopLevelFragment.elementType === key) {
+                  deleteRemainingChildren(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment.sibling
+                  );
+                  currentFirstChild = useFiber(
+                    isUnkeyedTopLevelFragment,
+                    newChild.props
+                  );
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
                 deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
                 break;
@@ -3167,6 +3224,22 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
@@ -3185,30 +3258,14 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 1:
-        case 22:
         case 0:
         case 11:
         case 15:
           throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
+            (getComponentNameFromFiber(returnFiber) || "Component") +
               "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
           );
       }
@@ -3270,7 +3327,7 @@ function findFirstSuspended(row) {
       if (null !== state && (null === state.dehydrated || shim$1() || shim$1()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3422,10 +3479,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3450,22 +3508,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3505,7 +3574,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3535,25 +3604,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$11 = 31 - clz32(lanes),
-            lane = 1 << index$11;
-          entanglements[index$11] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3580,6 +3637,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3605,6 +3664,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3653,7 +3714,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3661,10 +3722,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3725,19 +3786,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3749,33 +3809,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 8)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3832,6 +3918,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3873,7 +3961,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3922,8 +4010,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3964,8 +4053,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3975,7 +4065,11 @@ var ContextOnlyDispatcher = {
   },
   now$1 = Scheduler.unstable_now,
   commitTime = 0,
-  profilerStartTime = -1;
+  layoutEffectStartTime = -1,
+  profilerStartTime = -1,
+  passiveEffectStartTime = -1,
+  currentUpdateIsNested = !1,
+  nestedUpdateScheduled = !1;
 function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
   if (0 <= profilerStartTime) {
     var elapsedTime = now$1() - profilerStartTime;
@@ -3984,45 +4078,158 @@ function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
     profilerStartTime = -1;
   }
 }
+function recordLayoutEffectDuration(fiber) {
+  if (0 <= layoutEffectStartTime) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+        case 12:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function recordPassiveEffectDuration(fiber) {
+  if (0 <= passiveEffectStartTime) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+        case 12:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
 function transferActualDuration(fiber) {
   for (var child = fiber.child; child; )
     (fiber.actualDuration += child.actualDuration), (child = child.sibling);
 }
-var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
-  didReceiveUpdate = !1;
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  workInProgress.child =
-    null === current
-      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
-      : reconcileChildFibers(
-          workInProgress,
-          current.child,
-          nextChildren,
-          renderLanes
-        );
+function createCapturedValue(value, source) {
+  try {
+    var info = "",
+      node = source;
+    do (info += describeFiber(node)), (node = node.return);
+    while (node);
+    var JSCompiler_inline_result = info;
+  } catch (x) {
+    JSCompiler_inline_result =
+      "\nError generating stack: " + x.message + "\n" + x.stack;
+  }
+  return { value: value, source: source, stack: JSCompiler_inline_result };
 }
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  Component = Component.render;
-  var ref = workInProgress.ref;
-  prepareToReadContext(workInProgress, renderLanes);
-  nextProps = renderWithHooks(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    ref,
-    renderLanes
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      logCapturedError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logCapturedError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
+  didReceiveUpdate = !1;
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  workInProgress.child =
+    null === current
+      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
+      : reconcileChildFibers(
+          workInProgress,
+          current.child,
+          nextChildren,
+          renderLanes
+        );
+}
+function updateForwardRef(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  Component = Component.render;
+  var ref = workInProgress.ref;
+  prepareToReadContext(workInProgress, renderLanes);
+  nextProps = renderWithHooks(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    ref,
+    renderLanes
   );
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4098,14 +4305,15 @@ function updateSimpleMemoComponent(
     null !== current &&
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
-  )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
-      0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
-    else
+  ) {
+    didReceiveUpdate = !1;
+    if (0 === (renderLanes & updateLanes))
       return (
         (workInProgress.lanes = current.lanes),
         bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
       );
+    0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
+  }
   return updateFunctionComponent(
     current,
     workInProgress,
@@ -4122,31 +4330,39 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        markSpawnedWork(1073741824),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      nextProps = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= nextProps;
+    }
   else
     null !== prevState
       ? ((nextProps = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
       : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= nextProps);
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
@@ -4156,7 +4372,7 @@ function markRef(current, workInProgress) {
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4181,7 +4397,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4341,7 +4557,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4356,7 +4573,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4364,7 +4581,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4378,7 +4595,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4399,7 +4616,7 @@ function finishClassComponent(
   renderLanes
 ) {
   markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4447,18 +4664,21 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
       void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
@@ -4475,7 +4695,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4487,10 +4709,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
-        markSpawnedWork(33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
@@ -4516,8 +4739,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4544,8 +4770,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4568,10 +4797,10 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren),
-      workInProgress.mode & 8 &&
+      workInProgress.mode & 2 &&
         ((progressedPrimaryFragment.actualDuration = 0),
         (progressedPrimaryFragment.actualStartTime = -1),
         (progressedPrimaryFragment.selfBaseDuration = 0),
@@ -4606,13 +4835,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4622,33 +4852,27 @@ function updateSuspenseFallbackChildren(
   fallbackChildren,
   renderLanes
 ) {
-  var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
+  var mode = workInProgress.mode;
+  current = current.child;
+  var currentFallbackChildFragment = current.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== current
     ? ((primaryChildren = workInProgress.child),
       (primaryChildren.childLanes = 0),
       (primaryChildren.pendingProps = primaryChildProps),
-      workInProgress.mode & 8 &&
+      workInProgress.mode & 2 &&
         ((primaryChildren.actualDuration = 0),
         (primaryChildren.actualStartTime = -1),
-        (primaryChildren.selfBaseDuration =
-          currentPrimaryChildFragment.selfBaseDuration),
-        (primaryChildren.treeBaseDuration =
-          currentPrimaryChildFragment.treeBaseDuration)),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
-        currentPrimaryChildFragment,
-        primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+        (primaryChildren.selfBaseDuration = current.selfBaseDuration),
+        (primaryChildren.treeBaseDuration = current.treeBaseDuration)),
+      (workInProgress.deletions = null))
+    : ((primaryChildren = createWorkInProgress(current, primaryChildProps)),
+      (primaryChildren.subtreeFlags = current.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4673,8 +4897,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4684,16 +4907,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4702,9 +4923,9 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
@@ -4727,7 +4948,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
     nextProps &= 1;
   }
   push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
   else
     switch (revealOrder) {
       case "forwards":
@@ -4748,8 +4969,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !1,
           revealOrder,
           renderLanes,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "backwards":
@@ -4771,19 +4991,11 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !0,
           renderLanes,
           null,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
         break;
       default:
         workInProgress.memoizedState = null;
@@ -4794,25 +5006,33 @@ function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
   null !== current && (workInProgress.dependencies = current.dependencies);
   profilerStartTime = -1;
   workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
+          current,
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
   }
-  return null;
+  return workInProgress.child;
+}
+function hadNoMutationsEffects(current, completedWork) {
+  if (null !== current && current.child === completedWork.child) return !0;
+  if (0 !== (completedWork.flags & 16)) return !1;
+  for (current = completedWork.child; null !== current; ) {
+    if (0 !== (current.flags & 6454) || 0 !== (current.subtreeFlags & 6454))
+      return !1;
+    current = current.sibling;
+  }
+  return !0;
 }
 var appendAllChildren,
   updateHostContainer,
@@ -4929,21 +5149,24 @@ function appendAllChildrenToContainer(
     node = node.sibling;
   }
 }
-updateHostContainer = function(workInProgress) {
+updateHostContainer = function(current, workInProgress) {
   var portalOrRoot = workInProgress.stateNode;
-  if (null !== workInProgress.firstEffect) {
-    var container = portalOrRoot.containerInfo,
-      newChildSet = createChildNodeSet(container);
+  if (!hadNoMutationsEffects(current, workInProgress)) {
+    current = portalOrRoot.containerInfo;
+    var newChildSet = createChildNodeSet(current);
     appendAllChildrenToContainer(newChildSet, workInProgress, !1, !1);
     portalOrRoot.pendingChildren = newChildSet;
     workInProgress.flags |= 4;
-    completeRoot(container, newChildSet);
+    completeRoot(current, newChildSet);
   }
 };
 updateHostComponent$1 = function(current, workInProgress, type, newProps) {
   type = current.stateNode;
   var oldProps = current.memoizedProps;
-  if ((current = null === workInProgress.firstEffect) && oldProps === newProps)
+  if (
+    (current = hadNoMutationsEffects(current, workInProgress)) &&
+    oldProps === newProps
+  )
     workInProgress.stateNode = type;
   else {
     var recyclableInstance = workInProgress.stateNode;
@@ -4961,15 +5184,15 @@ updateHostComponent$1 = function(current, workInProgress, type, newProps) {
     current && null === updatePayload
       ? (workInProgress.stateNode = type)
       : ((newProps = updatePayload),
-        (recyclableInstance = type.node),
+        (oldProps = type.node),
         (type = {
           node: current
             ? null !== newProps
-              ? cloneNodeWithNewProps(recyclableInstance, newProps)
-              : cloneNode(recyclableInstance)
+              ? cloneNodeWithNewProps(oldProps, newProps)
+              : cloneNode(oldProps)
             : null !== newProps
-            ? cloneNodeWithNewChildrenAndProps(recyclableInstance, newProps)
-            : cloneNodeWithNewChildren(recyclableInstance),
+            ? cloneNodeWithNewChildrenAndProps(oldProps, newProps)
+            : cloneNodeWithNewChildren(oldProps),
           canonical: type.canonical
         }),
         (workInProgress.stateNode = type),
@@ -5005,16 +5228,76 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$65 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$65 = lastTailNode),
+      for (var lastTailNode$72 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$72 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$65
+      null === lastTailNode$72
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$65.sibling = null);
+        : (lastTailNode$72.sibling = null);
   }
 }
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    if (0 !== (completedWork.mode & 2)) {
+      for (
+        var treeBaseDuration$74 = completedWork.selfBaseDuration,
+          child$75 = completedWork.child;
+        null !== child$75;
+
+      )
+        (newChildLanes |= child$75.lanes | child$75.childLanes),
+          (subtreeFlags |= child$75.subtreeFlags & 1835008),
+          (subtreeFlags |= child$75.flags & 1835008),
+          (treeBaseDuration$74 += child$75.treeBaseDuration),
+          (child$75 = child$75.sibling);
+      completedWork.treeBaseDuration = treeBaseDuration$74;
+    } else
+      for (
+        treeBaseDuration$74 = completedWork.child;
+        null !== treeBaseDuration$74;
+
+      )
+        (newChildLanes |=
+          treeBaseDuration$74.lanes | treeBaseDuration$74.childLanes),
+          (subtreeFlags |= treeBaseDuration$74.subtreeFlags & 1835008),
+          (subtreeFlags |= treeBaseDuration$74.flags & 1835008),
+          (treeBaseDuration$74.return = completedWork),
+          (treeBaseDuration$74 = treeBaseDuration$74.sibling);
+  else if (0 !== (completedWork.mode & 2)) {
+    treeBaseDuration$74 = completedWork.actualDuration;
+    child$75 = completedWork.selfBaseDuration;
+    for (var child = completedWork.child; null !== child; )
+      (newChildLanes |= child.lanes | child.childLanes),
+        (subtreeFlags |= child.subtreeFlags),
+        (subtreeFlags |= child.flags),
+        (treeBaseDuration$74 += child.actualDuration),
+        (child$75 += child.treeBaseDuration),
+        (child = child.sibling);
+    completedWork.actualDuration = treeBaseDuration$74;
+    completedWork.treeBaseDuration = child$75;
+  } else
+    for (
+      treeBaseDuration$74 = completedWork.child;
+      null !== treeBaseDuration$74;
+
+    )
+      (newChildLanes |=
+        treeBaseDuration$74.lanes | treeBaseDuration$74.childLanes),
+        (subtreeFlags |= treeBaseDuration$74.subtreeFlags),
+        (subtreeFlags |= treeBaseDuration$74.flags),
+        (treeBaseDuration$74.return = completedWork),
+        (treeBaseDuration$74 = treeBaseDuration$74.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
 function completeWork(current, workInProgress, renderLanes) {
   var newProps = workInProgress.pendingProps;
   switch (workInProgress.tag) {
@@ -5028,76 +5311,81 @@ function completeWork(current, workInProgress, renderLanes) {
     case 12:
     case 9:
     case 14:
-      return null;
+      return bubbleProperties(workInProgress), null;
     case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 3:
       return (
+        (newProps = workInProgress.stateNode),
         popHostContainer(),
         pop(didPerformWorkStackCursor),
         pop(contextStackCursor),
         resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
         newProps.pendingContext &&
           ((newProps.context = newProps.pendingContext),
           (newProps.pendingContext = null)),
         (null !== current && null !== current.child) ||
           newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
         null
       );
     case 5:
       popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
       if (null !== current && null != workInProgress.stateNode)
         updateHostComponent$1(
           current,
           workInProgress,
-          renderLanes,
+          type,
           newProps,
-          rootContainerInstance
+          renderLanes
         ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
       else {
         if (!newProps) {
           if (null === workInProgress.stateNode)
             throw Error(
               "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
             );
+          bubbleProperties(workInProgress);
           return null;
         }
         requiredContext(contextStackCursor$1.current);
         current = nextReactTag;
         nextReactTag += 2;
-        renderLanes = getViewConfigForType(renderLanes);
+        type = getViewConfigForType(type);
         var updatePayload = diffProperties(
           null,
           emptyObject,
           newProps,
-          renderLanes.validAttributes
+          type.validAttributes
         );
-        rootContainerInstance = createNode(
+        renderLanes = createNode(
           current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
+          type.uiViewClassName,
+          renderLanes,
           updatePayload,
           workInProgress
         );
         current = new ReactFabricHostComponent(
           current,
-          renderLanes,
+          type,
           newProps,
           workInProgress
         );
-        current = { node: rootContainerInstance, canonical: current };
+        current = { node: renderLanes, canonical: current };
         appendAllChildren(current, workInProgress, !1, !1);
         workInProgress.stateNode = current;
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
       }
+      bubbleProperties(workInProgress);
       return null;
     case 6:
       if (current && null != workInProgress.stateNode)
@@ -5113,30 +5401,30 @@ function completeWork(current, workInProgress, renderLanes) {
             "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
           );
         current = requiredContext(rootInstanceStackCursor.current);
-        rootContainerInstance = requiredContext(contextStackCursor$1.current);
+        renderLanes = requiredContext(contextStackCursor$1.current);
         workInProgress.stateNode = createTextInstance(
           newProps,
           current,
-          rootContainerInstance,
+          renderLanes,
           workInProgress
         );
       }
+      bubbleProperties(workInProgress);
       return null;
     case 13:
       pop(suspenseStackCursor);
       newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
+      if (0 !== (workInProgress.flags & 128))
         return (
           (workInProgress.lanes = renderLanes),
-          0 !== (workInProgress.mode & 8) &&
+          0 !== (workInProgress.mode & 2) &&
             transferActualDuration(workInProgress),
           workInProgress
         );
       newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (newProps && !renderLanes && 0 !== (workInProgress.mode & 1))
         if (
           (null === current &&
             !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
@@ -5151,89 +5439,100 @@ function completeWork(current, workInProgress, renderLanes) {
           )
             workInProgressRootExitStatus = 4;
           null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
             markRootSuspended$1(
               workInProgressRoot,
               workInProgressRootRenderLanes
             );
         }
       newProps && (workInProgress.flags |= 4);
+      bubbleProperties(workInProgress);
+      0 !== (workInProgress.mode & 2) &&
+        newProps &&
+        ((current = workInProgress.child),
+        null !== current &&
+          (workInProgress.treeBaseDuration -= current.treeBaseDuration));
       return null;
     case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 10:
-      return popProvider(workInProgress), null;
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 19:
       pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      updatePayload = type.rendering;
       if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
+        if (newProps) cutOffTailIfNeeded(type, !1);
         else {
           if (
             0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
+            (null !== current && 0 !== (current.flags & 128))
           )
             for (current = workInProgress.child; null !== current; ) {
               updatePayload = findFirstSuspended(current);
               if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
                 current = updatePayload.updateQueue;
                 null !== current &&
                   ((workInProgress.updateQueue = current),
                   (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
+                workInProgress.subtreeFlags = 0;
                 current = renderLanes;
                 for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
+                  (renderLanes = newProps),
                     (updatePayload = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (renderLanes = rootContainerInstance.alternate),
-                    null === renderLanes
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = updatePayload),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null),
-                        (rootContainerInstance.selfBaseDuration = 0),
-                        (rootContainerInstance.treeBaseDuration = 0))
-                      : ((rootContainerInstance.childLanes =
-                          renderLanes.childLanes),
-                        (rootContainerInstance.lanes = renderLanes.lanes),
-                        (rootContainerInstance.child = renderLanes.child),
-                        (rootContainerInstance.memoizedProps =
-                          renderLanes.memoizedProps),
-                        (rootContainerInstance.memoizedState =
-                          renderLanes.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          renderLanes.updateQueue),
-                        (rootContainerInstance.type = renderLanes.type),
-                        (updatePayload = renderLanes.dependencies),
-                        (rootContainerInstance.dependencies =
+                    (renderLanes.flags &= 1835010),
+                    (type = renderLanes.alternate),
+                    null === type
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = updatePayload),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null),
+                        (renderLanes.selfBaseDuration = 0),
+                        (renderLanes.treeBaseDuration = 0))
+                      : ((renderLanes.childLanes = type.childLanes),
+                        (renderLanes.lanes = type.lanes),
+                        (renderLanes.child = type.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps = type.memoizedProps),
+                        (renderLanes.memoizedState = type.memoizedState),
+                        (renderLanes.updateQueue = type.updateQueue),
+                        (renderLanes.type = type.type),
+                        (updatePayload = type.dependencies),
+                        (renderLanes.dependencies =
                           null === updatePayload
                             ? null
                             : {
                                 lanes: updatePayload.lanes,
                                 firstContext: updatePayload.firstContext
                               }),
-                        (rootContainerInstance.selfBaseDuration =
-                          renderLanes.selfBaseDuration),
-                        (rootContainerInstance.treeBaseDuration =
-                          renderLanes.treeBaseDuration)),
+                        (renderLanes.selfBaseDuration = type.selfBaseDuration),
+                        (renderLanes.treeBaseDuration = type.treeBaseDuration)),
                     (newProps = newProps.sibling);
                 push(
                   suspenseStackCursor,
@@ -5243,80 +5542,74 @@ function completeWork(current, workInProgress, renderLanes) {
               }
               current = current.sibling;
             }
-          null !== newProps.tail &&
+          null !== type.tail &&
             now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432),
-            markSpawnedWork(33554432));
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
         }
       else {
-        if (!rootContainerInstance)
+        if (!newProps)
           if (
             ((current = findFirstSuspended(updatePayload)), null !== current)
           ) {
             if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
               (current = current.updateQueue),
               null !== current &&
                 ((workInProgress.updateQueue = current),
                 (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
                 !updatePayload.alternate)
             )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
+              return bubbleProperties(workInProgress), null;
           } else
-            2 * now() - newProps.renderingStartTime >
+            2 * now() - type.renderingStartTime >
               workInProgressRootRenderTargetTime &&
               1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432),
-              markSpawnedWork(33554432));
-        newProps.isBackwards
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
           ? ((updatePayload.sibling = workInProgress.child),
             (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
+          : ((current = type.last),
             null !== current
               ? (current.sibling = updatePayload)
               : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+            (type.last = updatePayload));
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
     case 23:
-    case 24:
       return (
         popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
         null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
+          (null !== current.memoizedState) !== renderLanes &&
           "unstable-defer-without-hiding" !== newProps.mode &&
           (workInProgress.flags |= 4),
+        (renderLanes &&
+          0 === (subtreeRenderLanes & 1073741824) &&
+          0 !== (workInProgress.mode & 1)) ||
+          bubbleProperties(workInProgress),
         null
       );
   }
@@ -5331,9 +5624,9 @@ function unwindWork(workInProgress) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64),
-          0 !== (workInProgress.mode & 8) &&
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128),
+          0 !== (workInProgress.mode & 2) &&
             transferActualDuration(workInProgress),
           workInProgress)
         : null;
@@ -5343,11 +5636,11 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
@@ -5355,9 +5648,9 @@ function unwindWork(workInProgress) {
       return (
         pop(suspenseStackCursor),
         (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64),
-            0 !== (workInProgress.mode & 8) &&
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128),
+            0 !== (workInProgress.mode & 2) &&
               transferActualDuration(workInProgress),
             workInProgress)
           : null
@@ -5367,248 +5660,153 @@ function unwindWork(workInProgress) {
     case 4:
       return popHostContainer(), null;
     case 10:
-      return popProvider(workInProgress), null;
+      return popProvider(workInProgress.type._context), null;
+    case 22:
     case 23:
-    case 24:
       return popRenderLanes(), null;
+    case 24:
+      return null;
     default:
       return null;
   }
 }
-function createCapturedValue(value, source) {
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null,
+  inProgressLanes = null,
+  inProgressRoot = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
+  var ref = current.ref;
+  if (null !== ref)
+    if ("function" === typeof ref)
+      try {
+        if (current.mode & 2)
+          try {
+            startLayoutEffectTimer(), ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        else ref(null);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
+      }
+    else ref.current = null;
+}
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
   try {
-    var info = "",
-      node = source;
-    do (info += describeFiber(node)), (node = node.return);
-    while (node);
-    var JSCompiler_inline_result = info;
-  } catch (x) {
-    JSCompiler_inline_result =
-      "\nError generating stack: " + x.message + "\n" + x.stack;
+    destroy();
+  } catch (error) {
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
   }
-  return { value: value, source: source, stack: JSCompiler_inline_result };
 }
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
+      }
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
+}
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        void 0 !== destroy &&
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
+      }
+      effect = effect.next;
+    } while (effect !== updateQueue);
   }
 }
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
-  }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
-}
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
-  var ref = current.ref;
-  if (null !== ref)
-    if ("function" === typeof ref)
-      try {
-        ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
-      }
-    else ref.current = null;
-}
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
-      }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
-  }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
-}
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$82 = finishedRoot.create;
-            finishedRoot.destroy = create$82();
-          }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
-      }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$82 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$82;
-        } while (finishedRoot !== current);
-      }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$82 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$82,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode.canonical;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
-          }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$88 = effect.create;
+        effect.destroy = create$88();
       }
-      return;
-    case 5:
-      null === current && finishedWork.flags & 4 && shim();
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      create$82 = finishedWork.memoizedProps.onRender;
-      _effect = commitTime;
-      "function" === typeof create$82 &&
-        create$82(
-          finishedWork.memoizedProps.id,
-          null === current ? "mount" : "update",
-          finishedWork.actualDuration,
-          finishedWork.treeBaseDuration,
-          finishedWork.actualStartTime,
-          _effect,
-          finishedRoot.memoizedInteractions
-        );
-      return;
-    case 13:
-      return;
-    case 19:
-    case 17:
-    case 20:
-    case 21:
-    case 23:
-    case 24:
-      return;
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function commitWork(current, finishedWork) {
@@ -5617,20 +5815,14 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedWork = current = current.next;
-        do {
-          if (3 === (finishedWork.tag & 3)) {
-            var destroy = finishedWork.destroy;
-            finishedWork.destroy = void 0;
-            void 0 !== destroy && destroy();
-          }
-          finishedWork = finishedWork.next;
-        } while (finishedWork !== current);
-      }
+      if (finishedWork.mode & 2)
+        try {
+          startLayoutEffectTimer(),
+            commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
+        }
+      else commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 12:
       return;
@@ -5642,8 +5834,8 @@ function commitWork(current, finishedWork) {
     case 19:
       attachSuspenseRetryListeners(finishedWork);
       return;
+    case 22:
     case 23:
-    case 24:
       return;
   }
   a: {
@@ -5651,7 +5843,6 @@ function commitWork(current, finishedWork) {
       case 1:
       case 5:
       case 6:
-      case 20:
         break a;
       case 3:
       case 4:
@@ -5671,25 +5862,377 @@ function attachSuspenseRetryListeners(finishedWork) {
       (retryCache = finishedWork.stateNode = new PossiblyWeakSet());
     wakeables.forEach(function(wakeable) {
       var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
-      retryCache.has(wakeable) ||
-        (!0 !== wakeable.__reactDoNotTraceInteractions &&
-          (retry = tracing.unstable_wrap(retry)),
-        retryCache.add(wakeable),
-        wakeable.then(retry, retry));
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
+        if (isDevToolsPresent)
+          if (null !== inProgressLanes && null !== inProgressRoot)
+            restorePendingUpdaters(inProgressRoot, inProgressLanes);
+          else
+            throw Error(
+              "Expected finished root and lanes to be set. This is a bug in React."
+            );
+        wakeable.then(retry, retry);
+      }
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    root = nextEffect;
+    firstChild = root.deletions;
+    if (null !== firstChild)
+      for (
+        committedLanes = 0;
+        committedLanes < firstChild.length;
+        committedLanes++
+      ) {
+        var childToDelete = firstChild[committedLanes];
+        try {
+          a: for (var node = childToDelete; ; ) {
+            var current = node;
+            if (
+              injectedHook &&
+              "function" === typeof injectedHook.onCommitFiberUnmount
+            )
+              try {
+                injectedHook.onCommitFiberUnmount(rendererID, current);
+              } catch (err) {}
+            switch (current.tag) {
+              case 0:
+              case 11:
+              case 14:
+              case 15:
+                var updateQueue = current.updateQueue;
+                if (null !== updateQueue) {
+                  var lastEffect = updateQueue.lastEffect;
+                  if (null !== lastEffect) {
+                    var firstEffect = lastEffect.next,
+                      effect = firstEffect;
+                    do {
+                      var _effect = effect,
+                        destroy = _effect.destroy,
+                        tag = _effect.tag;
+                      void 0 !== destroy &&
+                        0 !== (tag & 2) &&
+                        (current.mode & 2
+                          ? (startLayoutEffectTimer(),
+                            safelyCallDestroy(current, root, destroy),
+                            recordLayoutEffectDuration(current))
+                          : safelyCallDestroy(current, root, destroy));
+                      effect = effect.next;
+                    } while (effect !== firstEffect);
+                  }
+                }
+                break;
+              case 1:
+                safelyDetachRef(current, root);
+                var instance = current.stateNode;
+                if ("function" === typeof instance.componentWillUnmount)
+                  try {
+                    if (
+                      ((effect = current),
+                      (_effect = instance),
+                      (_effect.props = effect.memoizedProps),
+                      (_effect.state = effect.memoizedState),
+                      effect.mode & 2)
+                    )
+                      try {
+                        startLayoutEffectTimer(),
+                          _effect.componentWillUnmount();
+                      } finally {
+                        recordLayoutEffectDuration(effect);
+                      }
+                    else _effect.componentWillUnmount();
+                  } catch (unmountError) {
+                    captureCommitPhaseError(current, root, unmountError);
+                  }
+                break;
+              case 5:
+                safelyDetachRef(current, root);
+                break;
+              case 4:
+                createChildNodeSet(current.stateNode.containerInfo);
+            }
+            if (null !== node.child)
+              (node.child.return = node), (node = node.child);
+            else {
+              if (node === childToDelete) break;
+              for (; null === node.sibling; ) {
+                if (null === node.return || node.return === childToDelete)
+                  break a;
+                node = node.return;
+              }
+              node.sibling.return = node.return;
+              node = node.sibling;
+            }
+          }
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, root, error);
+        }
+      }
+    firstChild = root.child;
+    if (0 !== (root.subtreeFlags & 6454) && null !== firstChild)
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var flags = root.flags;
+          if (flags & 256) {
+            var current$jscomp$0 = root.alternate;
+            if (null !== current$jscomp$0) {
+              firstChild = current$jscomp$0;
+              var currentRef = firstChild.ref;
+              if (null !== currentRef)
+                if ("function" === typeof currentRef)
+                  if (firstChild.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), currentRef(null);
+                    } finally {
+                      recordLayoutEffectDuration(firstChild);
+                    }
+                  else currentRef(null);
+                else currentRef.current = null;
+            }
+          }
+          switch (flags & 2054) {
+            case 2:
+              root.flags &= -3;
+              break;
+            case 6:
+              root.flags &= -3;
+              commitWork(root.alternate, root);
+              break;
+            case 2048:
+              root.flags &= -2049;
+              break;
+            case 2052:
+              root.flags &= -2049;
+              commitWork(root.alternate, root);
+              break;
+            case 4:
+              commitWork(root.alternate, root);
+          }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
+      }
+  }
+  inProgressRoot = inProgressLanes = null;
+}
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = finishedWork; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (committedLanes = root.child),
+      0 !== (root.subtreeFlags & 324) && null !== committedLanes)
+    )
+      (committedLanes.return = root), (nextEffect = committedLanes);
+    else
+      for (root = finishedWork; null !== nextEffect; ) {
+        committedLanes = nextEffect;
+        if (0 !== (committedLanes.flags & 324)) {
+          var current = committedLanes.alternate;
+          try {
+            if (0 !== (committedLanes.flags & 68))
+              switch (committedLanes.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  if (committedLanes.mode & 2)
+                    try {
+                      startLayoutEffectTimer(),
+                        commitHookEffectListMount(3, committedLanes);
+                    } finally {
+                      recordLayoutEffectDuration(committedLanes);
+                    }
+                  else commitHookEffectListMount(3, committedLanes);
+                  break;
+                case 1:
+                  var instance = committedLanes.stateNode;
+                  if (committedLanes.flags & 4)
+                    if (null === current)
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidMount();
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else instance.componentDidMount();
+                    else {
+                      var prevProps =
+                          committedLanes.elementType === committedLanes.type
+                            ? current.memoizedProps
+                            : resolveDefaultProps(
+                                committedLanes.type,
+                                current.memoizedProps
+                              ),
+                        prevState = current.memoizedState;
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidUpdate(
+                              prevProps,
+                              prevState,
+                              instance.__reactInternalSnapshotBeforeUpdate
+                            );
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else
+                        instance.componentDidUpdate(
+                          prevProps,
+                          prevState,
+                          instance.__reactInternalSnapshotBeforeUpdate
+                        );
+                    }
+                  var updateQueue = committedLanes.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(committedLanes, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$90 = committedLanes.updateQueue;
+                  if (null !== updateQueue$90) {
+                    var instance$91 = null;
+                    if (null !== committedLanes.child)
+                      switch (committedLanes.child.tag) {
+                        case 5:
+                          instance$91 =
+                            committedLanes.child.stateNode.canonical;
+                          break;
+                        case 1:
+                          instance$91 = committedLanes.child.stateNode;
+                      }
+                    commitUpdateQueue(
+                      committedLanes,
+                      updateQueue$90,
+                      instance$91
+                    );
+                  }
+                  break;
+                case 5:
+                  null === current && committedLanes.flags & 4 && shim();
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  var _finishedWork$memoize2 = committedLanes.memoizedProps,
+                    onCommit = _finishedWork$memoize2.onCommit,
+                    onRender = _finishedWork$memoize2.onRender,
+                    effectDuration = committedLanes.stateNode.effectDuration;
+                  instance$91 = commitTime;
+                  current = null === current ? "mount" : "update";
+                  currentUpdateIsNested && (current = "nested-update");
+                  "function" === typeof onRender &&
+                    onRender(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      committedLanes.actualDuration,
+                      committedLanes.treeBaseDuration,
+                      committedLanes.actualStartTime,
+                      instance$91
+                    );
+                  "function" === typeof onCommit &&
+                    onCommit(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      effectDuration,
+                      instance$91
+                    );
+                  enqueuePendingPassiveProfilerEffect(committedLanes);
+                  var parentFiber = committedLanes.return;
+                  a: for (; null !== parentFiber; ) {
+                    switch (parentFiber.tag) {
+                      case 3:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                      case 12:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                    }
+                    parentFiber = parentFiber.return;
+                  }
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (committedLanes.flags & 256) {
+              instance$91 = void 0;
+              current = committedLanes;
+              var ref = current.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = current.stateNode;
+                switch (current.tag) {
+                  case 5:
+                    instance$91 = instance$jscomp$0.canonical;
+                    break;
+                  default:
+                    instance$91 = instance$jscomp$0;
+                }
+                if ("function" === typeof ref)
+                  if (current.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), ref(instance$91);
+                    } finally {
+                      recordLayoutEffectDuration(current);
+                    }
+                  else ref(instance$91);
+                else ref.current = instance$91;
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(
+              committedLanes,
+              committedLanes.return,
+              error
+            );
+          }
+        }
+        if (committedLanes === root) {
+          nextEffect = null;
+          break;
+        }
+        instance$91 = committedLanes.sibling;
+        if (null !== instance$91) {
+          instance$91.return = committedLanes.return;
+          nextEffect = instance$91;
+          break;
+        }
+        nextEffect = committedLanes.return;
+      }
+  inProgressRoot = inProgressLanes = null;
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5698,65 +6241,56 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
   pendingPassiveEffectsLanes = 0,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveProfilerEffects = [],
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
-  spawnedWorkDuringRender = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 24)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 8) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  if (0 === fiber)
+    a: {
+      fiber = fabricGetCurrentEventPriority
+        ? fabricGetCurrentEventPriority()
+        : null;
+      if (null != fiber)
+        switch (fiber) {
+          case FabricDiscretePriority:
+            fiber = 1;
+            break a;
+        }
+      fiber = 16;
+    }
   return fiber;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -5766,30 +6300,24 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  isDevToolsPresent && addFiberToLanesMap(root, fiber, lane);
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 8) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
   1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? (schedulePendingInteractions(fiber, lane), performSyncWorkOnRoot(fiber))
-      : (ensureRootIsScheduled(fiber, eventTime),
-        schedulePendingInteractions(fiber, lane),
+    ? 0 !== (executionContext & 4) && 0 === (executionContext & 24)
+      ? performSyncWorkOnRoot(root)
+      : (ensureRootIsScheduled(root, eventTime),
         0 === executionContext &&
+          0 === (fiber.mode & 1) &&
           ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime),
-      schedulePendingInteractions(fiber, lane));
-  mostRecentlyUpdatedRoot = fiber;
+          includesLegacySyncCallbacks && flushSyncCallbacks()))
+    : ensureRootIsScheduled(root, eventTime);
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -5818,17 +6346,8 @@ function ensureRootIsScheduled(root, currentTime) {
       lane = 1 << index$5,
       expirationTime = expirationTimes[index$5];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$5] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$5] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -5836,47 +6355,59 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  nestedUpdateScheduled = currentUpdateIsNested = !1;
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
@@ -5886,44 +6417,53 @@ function performConcurrentWorkOnRoot(root) {
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
   if (0 === lanes) return null;
-  var lanes$jscomp$0 = lanes;
-  var exitStatus = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== lanes$jscomp$0
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, lanes$jscomp$0),
-      startWorkOnPendingInteractions(root, lanes$jscomp$0);
-  lanes$jscomp$0 = pushInteractions(root);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes) ? !1 : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 8;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    ) {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+        0 < memoizedUpdaters.size &&
+          (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+          memoizedUpdaters.clear());
+        movePendingFibersToMemoized(root, didTimeout);
+      }
+      workInProgressRootRenderTargetTime = now() + 500;
+      prepareFreshStack(root, didTimeout);
     }
-  while (1);
-  resetContextDependencies();
-  tracing.__interactionsRef.current = lanes$jscomp$0;
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = exitStatus;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((executionContext |= 32),
       root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (JSCompiler_inline_result = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== JSCompiler_inline_result &&
+        ((lanes = JSCompiler_inline_result),
+        (didTimeout = renderRootSync(root, JSCompiler_inline_result))));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -5931,7 +6471,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -5941,20 +6481,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevDispatcher = root.suspendedLanes;
-          if ((prevDispatcher & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevDispatcher;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -5962,16 +6502,16 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevDispatcher = -1; 0 < lanes; ) {
-          var index$4 = 31 - clz32(lanes);
-          lanes$jscomp$0 = 1 << index$4;
-          index$4 = exitStatus[index$4];
-          index$4 > prevDispatcher && (prevDispatcher = index$4);
-          lanes &= ~lanes$jscomp$0;
-        }
-        lanes = prevDispatcher;
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; )
+          (memoizedUpdaters = 31 - clz32(lanes)),
+            (prevDispatcher = 1 << memoizedUpdaters),
+            (memoizedUpdaters = didTimeout[memoizedUpdaters]),
+            memoizedUpdaters > JSCompiler_inline_result &&
+              (JSCompiler_inline_result = memoizedUpdaters),
+            (lanes &= ~prevDispatcher);
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -6014,33 +6554,28 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$9 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$9;
-    root[index$9] = -1;
+    var index$6 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$6;
+    root[index$6] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  currentUpdateIsNested = nestedUpdateScheduled;
+  nestedUpdateScheduled = !1;
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo)),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    executionContext |= 32;
+    root.hydrate && ((root.hydrate = !1), shim(root.containerInfo));
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -6053,11 +6588,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6097,21 +6627,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
-  spawnedWorkDuringRender = null;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6141,7 +6689,7 @@ function handleError(root$jscomp$0, thrownValue) {
         workInProgress = null;
         break;
       }
-      erroredWork.mode & 8 &&
+      erroredWork.mode & 2 &&
         stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0);
       a: {
         var root = root$jscomp$0,
@@ -6149,15 +6697,19 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
+        isDevToolsPresent && restorePendingUpdaters(root, thrownValue);
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6168,15 +6720,15 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$77 = returnFiber;
+            workInProgress$32 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$77.tag)) {
-              var nextState = workInProgress$77.memoizedState;
+            if ((JSCompiler_temp = 13 === workInProgress$32.tag)) {
+              var nextState = workInProgress$32.memoizedState;
               if (null !== nextState)
                 JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
               else {
-                var props = workInProgress$77.memoizedProps;
+                var props = workInProgress$32.memoizedProps;
                 JSCompiler_temp =
                   void 0 === props.fallback
                     ? !1
@@ -6188,16 +6740,19 @@ function handleError(root$jscomp$0, thrownValue) {
               }
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$77.updateQueue;
+              var wakeables = workInProgress$32.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$77.updateQueue = updateQueue;
+                workInProgress$32.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$77.mode & 2)) {
-                workInProgress$77.flags |= 64;
+              if (
+                0 === (workInProgress$32.mode & 1) &&
+                workInProgress$32 !== returnFiber
+              ) {
+                workInProgress$32.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6226,63 +6781,64 @@ function handleError(root$jscomp$0, thrownValue) {
                   wakeable,
                   sourceFiber
                 );
+                isDevToolsPresent && restorePendingUpdaters(root, sourceFiber);
                 wakeable.then(ping, ping);
               }
-              workInProgress$77.flags |= 8192;
-              workInProgress$77.lanes = thrownValue;
+              workInProgress$32.flags |= 16384;
+              workInProgress$32.lanes = thrownValue;
               break a;
             }
-            workInProgress$77 = workInProgress$77.return;
-          } while (null !== workInProgress$77);
+            workInProgress$32 = workInProgress$32.return;
+          } while (null !== workInProgress$32);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$77 = returnFiber;
+        workInProgress$32 = returnFiber;
         do {
-          switch (workInProgress$77.tag) {
+          switch (workInProgress$32.tag) {
             case 3:
               root = value;
-              workInProgress$77.flags |= 8192;
+              workInProgress$32.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$77.lanes |= thrownValue;
-              var update$78 = createRootErrorUpdate(
-                workInProgress$77,
+              workInProgress$32.lanes |= thrownValue;
+              var update$33 = createRootErrorUpdate(
+                workInProgress$32,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$77, update$78);
+              enqueueCapturedUpdate(workInProgress$32, update$33);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$77.type,
-                instance = workInProgress$77.stateNode;
+              var ctor = workInProgress$32.type,
+                instance = workInProgress$32.stateNode;
               if (
-                0 === (workInProgress$77.flags & 64) &&
+                0 === (workInProgress$32.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$77.flags |= 8192;
+                workInProgress$32.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$77.lanes |= thrownValue;
-                var update$81 = createClassErrorUpdate(
-                  workInProgress$77,
+                workInProgress$32.lanes |= thrownValue;
+                var update$36 = createClassErrorUpdate(
+                  workInProgress$32,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$77, update$81);
+                enqueueCapturedUpdate(workInProgress$32, update$36);
                 break a;
               }
           }
-          workInProgress$77 = workInProgress$77.return;
-        } while (null !== workInProgress$77);
+          workInProgress$32 = workInProgress$32.return;
+        } while (null !== workInProgress$32);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6300,18 +6856,20 @@ function pushDispatcher() {
   ReactCurrentDispatcher$2.current = ContextOnlyDispatcher;
   return null === prevDispatcher ? ContextOnlyDispatcher : prevDispatcher;
 }
-function pushInteractions(root) {
-  var prevInteractions = tracing.__interactionsRef.current;
-  tracing.__interactionsRef.current = root.memoizedInteractions;
-  return prevInteractions;
-}
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 8;
   var prevDispatcher = pushDispatcher();
-  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes)
-    prepareFreshStack(root, lanes), startWorkOnPendingInteractions(root, lanes);
-  lanes = pushInteractions(root);
+  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      0 < memoizedUpdaters.size &&
+        (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+        memoizedUpdaters.clear());
+      movePendingFibersToMemoized(root, lanes);
+    }
+    prepareFreshStack(root, lanes);
+  }
   do
     try {
       workLoopSync();
@@ -6321,7 +6879,6 @@ function renderRootSync(root, lanes) {
     }
   while (1);
   resetContextDependencies();
-  tracing.__interactionsRef.current = lanes;
   executionContext = prevExecutionContext;
   ReactCurrentDispatcher$2.current = prevDispatcher;
   if (null !== workInProgress)
@@ -6336,12 +6893,12 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
   var current = unitOfWork.alternate;
-  0 !== (unitOfWork.mode & 8)
+  0 !== (unitOfWork.mode & 2)
     ? ((profilerStartTime = now$1()),
       0 > unitOfWork.actualStartTime && (unitOfWork.actualStartTime = now$1()),
       (current = beginWork$1(current, unitOfWork, subtreeRenderLanes)),
@@ -6358,8 +6915,8 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      if (0 === (completedWork.mode & 8))
+    if (0 === (completedWork.flags & 8192)) {
+      if (0 === (completedWork.mode & 2))
         current = completeWork(current, completedWork, subtreeRenderLanes);
       else {
         var fiber = completedWork;
@@ -6372,65 +6929,14 @@ function completeUnitOfWork(unitOfWork) {
         workInProgress = current;
         return;
       }
-      current = completedWork;
-      if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
-      ) {
-        fiber = 0;
-        if (0 !== (current.mode & 8)) {
-          for (
-            var actualDuration = current.actualDuration,
-              treeBaseDuration = current.selfBaseDuration,
-              shouldBubbleActualDurations =
-                null === current.alternate ||
-                current.child !== current.alternate.child,
-              child = current.child;
-            null !== child;
-
-          )
-            (fiber |= child.lanes | child.childLanes),
-              shouldBubbleActualDurations &&
-                (actualDuration += child.actualDuration),
-              (treeBaseDuration += child.treeBaseDuration),
-              (child = child.sibling);
-          13 === current.tag &&
-            null !== current.memoizedState &&
-            ((shouldBubbleActualDurations = current.child),
-            null !== shouldBubbleActualDurations &&
-              (treeBaseDuration -=
-                shouldBubbleActualDurations.treeBaseDuration));
-          current.actualDuration = actualDuration;
-          current.treeBaseDuration = treeBaseDuration;
-        } else
-          for (actualDuration = current.child; null !== actualDuration; )
-            (fiber |= actualDuration.lanes | actualDuration.childLanes),
-              (actualDuration = actualDuration.sibling);
-        current.childLanes = fiber;
-      }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
-      if (0 !== (completedWork.mode & 8)) {
+      if (0 !== (completedWork.mode & 2)) {
         stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1);
         current = completedWork.actualDuration;
         for (fiber = completedWork.child; null !== fiber; )
@@ -6438,8 +6944,9 @@ function completeUnitOfWork(unitOfWork) {
         completedWork.actualDuration = current;
       }
       null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
     }
     completedWork = completedWork.sibling;
     if (null !== completedWork) {
@@ -6451,14 +6958,22 @@ function completeUnitOfWork(unitOfWork) {
   0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
 }
 function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
   return null;
 }
 function commitRootImpl(root, renderPriorityLevel) {
   do flushPassiveEffects();
   while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   var finishedWork = root.finishedWork,
     lanes = root.finishedLanes;
@@ -6470,386 +6985,276 @@ function commitRootImpl(root, renderPriorityLevel) {
       "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
     );
   root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$10 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$10;
-    remainingLanes$jscomp$0[index$10] = 0;
-    eventTimes[index$10] = -1;
-    expirationTimes[index$10] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
   root === workInProgressRoot &&
     ((workInProgress = workInProgressRoot = null),
     (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    eventTimes = pushInteractions(root);
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 16;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
     commitTime = now$1();
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              expirationTimes = nextEffect;
-              a: for (index$10 = noLongerPendingLanes = expirationTimes; ; ) {
-                lane = index$10;
-                if (
-                  injectedHook &&
-                  "function" === typeof injectedHook.onCommitFiberUnmount
-                )
-                  try {
-                    injectedHook.onCommitFiberUnmount(rendererID, lane);
-                  } catch (err) {}
-                switch (lane.tag) {
-                  case 0:
-                  case 11:
-                  case 14:
-                  case 15:
-                  case 22:
-                    var updateQueue = lane.updateQueue;
-                    if (null !== updateQueue) {
-                      var lastEffect = updateQueue.lastEffect;
-                      if (null !== lastEffect) {
-                        var firstEffect = lastEffect.next,
-                          effect = firstEffect;
-                        do {
-                          var _effect2 = effect,
-                            destroy = _effect2.destroy,
-                            tag = _effect2.tag;
-                          if (void 0 !== destroy)
-                            if (0 !== (tag & 4))
-                              enqueuePendingPassiveHookEffectUnmount(
-                                lane,
-                                effect
-                              );
-                            else {
-                              _effect2 = lane;
-                              try {
-                                destroy();
-                              } catch (error) {
-                                captureCommitPhaseError(_effect2, error);
-                              }
-                            }
-                          effect = effect.next;
-                        } while (effect !== firstEffect);
-                      }
-                    }
-                    break;
-                  case 1:
-                    safelyDetachRef(lane);
-                    var instance = lane.stateNode;
-                    if ("function" === typeof instance.componentWillUnmount)
-                      try {
-                        (effect = lane),
-                          (_effect2 = instance),
-                          (_effect2.props = effect.memoizedProps),
-                          (_effect2.state = effect.memoizedState),
-                          _effect2.componentWillUnmount();
-                      } catch (unmountError) {
-                        captureCommitPhaseError(lane, unmountError);
-                      }
-                    break;
-                  case 5:
-                    safelyDetachRef(lane);
-                    break;
-                  case 4:
-                    createChildNodeSet(lane.stateNode.containerInfo);
-                }
-                if (null !== index$10.child)
-                  (index$10.child.return = index$10),
-                    (index$10 = index$10.child);
-                else {
-                  if (index$10 === noLongerPendingLanes) break;
-                  for (; null === index$10.sibling; ) {
-                    if (
-                      null === index$10.return ||
-                      index$10.return === noLongerPendingLanes
-                    )
-                      break a;
-                    index$10 = index$10.return;
-                  }
-                  index$10.sibling.return = index$10.return;
-                  index$10 = index$10.sibling;
-                }
-              }
-              var alternate = expirationTimes.alternate;
-              detachFiberMutation(expirationTimes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$90) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$90);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
+    commitMutationEffects(root, finishedWork, lanes);
     root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance$jscomp$0 = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance$jscomp$0.canonical;
-                  break;
-                default:
-                  current = instance$jscomp$0;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$91) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$91);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    nextEffect = null;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    tracing.__interactionsRef.current = eventTimes;
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else (root.current = finishedWork), (commitTime = now$1());
-  if ((flags$jscomp$0 = rootDoesHavePassiveEffects))
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsLanes = lanes),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (ref = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((instance$jscomp$0 = nextEffect),
-          (instance$jscomp$0.sibling = null),
-          (instance$jscomp$0.stateNode = null)),
-        (nextEffect = ref);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
-  if (0 !== remainingLanes) {
-    if (null !== spawnedWorkDuringRender)
-      for (
-        ref = spawnedWorkDuringRender,
-          spawnedWorkDuringRender = null,
-          instance$jscomp$0 = 0;
-        instance$jscomp$0 < ref.length;
-        instance$jscomp$0++
-      )
-        scheduleInteractions(
-          root,
-          ref[instance$jscomp$0],
-          root.memoizedInteractions
-        );
-    schedulePendingInteractions(root, remainingLanes);
-  } else legacyErrorBoundariesThatAlreadyFailed = null;
-  flags$jscomp$0 || finishPendingInteractions(root, lanes);
-  1 === remainingLanes
-    ? root === rootWithNestedUpdates
-      ? nestedUpdateCount++
-      : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
+  0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
+  0 !== (remainingLanes & 1)
+    ? ((nestedUpdateScheduled = !0),
+      root === rootWithNestedUpdates
+        ? nestedUpdateCount++
+        : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        renderPriorityLevel,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
+  isDevToolsPresent && root.memoizedUpdaters.clear();
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  if (0 !== (executionContext & 4)) return null;
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 24))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 16;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect,
+                    current = fiber$jscomp$0;
+                  switch (current.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      current.mode & 2
+                        ? ((passiveEffectStartTime = now$1()),
+                          commitHookEffectListUnmount(4, current, fiber),
+                          recordPassiveEffectDuration(current))
+                        : commitHookEffectListUnmount(4, current, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (((i = fiber), i.tag)) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    i.mode & 2
+                      ? ((passiveEffectStartTime = now$1()),
+                        commitHookEffectListUnmount(5, i, i.return),
+                        recordPassiveEffectDuration(i))
+                      : commitHookEffectListUnmount(5, i, i.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (((fiberToDelete = deletions), fiberToDelete.tag)) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      if (fiberToDelete.mode & 2) {
+                        passiveEffectStartTime = now$1();
+                        try {
+                          commitHookEffectListMount(5, fiberToDelete);
+                        } finally {
+                          recordPassiveEffectDuration(fiberToDelete);
+                        }
+                      } else commitHookEffectListMount(5, fiberToDelete);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        finishedWork = pendingPassiveProfilerEffects;
+        pendingPassiveProfilerEffects = [];
+        for (firstChild = 0; firstChild < finishedWork.length; firstChild++) {
+          var finishedWork$jscomp$0 = finishedWork[firstChild];
+          if (0 !== (finishedWork$jscomp$0.flags & 4))
+            switch (finishedWork$jscomp$0.tag) {
+              case 12:
+                var passiveEffectDuration =
+                    finishedWork$jscomp$0.stateNode.passiveEffectDuration,
+                  _finishedWork$memoize = finishedWork$jscomp$0.memoizedProps,
+                  id = _finishedWork$memoize.id,
+                  onPostCommit = _finishedWork$memoize.onPostCommit;
+                sibling$jscomp$1 = commitTime;
+                var phase =
+                  null === finishedWork$jscomp$0.alternate ? "mount" : "update";
+                currentUpdateIsNested && (phase = "nested-update");
+                "function" === typeof onPostCommit &&
+                  onPostCommit(
+                    id,
+                    phase,
+                    passiveEffectDuration,
+                    sibling$jscomp$1
+                  );
+                var parentFiber = finishedWork$jscomp$0.return;
+                b: for (; null !== parentFiber; ) {
+                  switch (parentFiber.tag) {
+                    case 3:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                    case 12:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                  }
+                  parentFiber = parentFiber.return;
+                }
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        var stateNode = renderPriority.current.stateNode;
+        stateNode.effectDuration = 0;
+        stateNode.passiveEffectDuration = 0;
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
+    }
   }
   return !1;
 }
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
+function enqueuePendingPassiveProfilerEffect(fiber) {
+  pendingPassiveProfilerEffects.push(fiber);
   rootDoesHavePassiveEffects ||
     ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
+    scheduleCallback(NormalPriority, function() {
       flushPassiveEffects();
       return null;
     }));
 }
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects,
-    lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
-  pendingPassiveEffectsLanes = 0;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var prevInteractions = pushInteractions(root),
-    unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$96 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$96.destroy;
-    effect$96.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$96 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
-    try {
-      var create$100 = effect$96.create;
-      effect$96.destroy = create$100();
-    } catch (error$101) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$101);
-    }
-  }
-  for (unmountEffects = root.current.firstEffect; null !== unmountEffects; )
-    (create$100 = unmountEffects.nextEffect),
-      (unmountEffects.nextEffect = null),
-      unmountEffects.flags & 8 &&
-        ((unmountEffects.sibling = null), (unmountEffects.stateNode = null)),
-      (unmountEffects = create$100);
-  tracing.__interactionsRef.current = prevInteractions;
-  finishPendingInteractions(root, lanes);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
-}
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
@@ -6858,46 +7263,52 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
-    ensureRootIsScheduled(rootFiber, sourceFiber),
-    schedulePendingInteractions(rootFiber, 1));
+    ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update),
-              schedulePendingInteractions(fiber, 1);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -6909,34 +7320,28 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
       : (workInProgressRootPingedLanes |= pingedLanes));
   ensureRootIsScheduled(root, wakeable);
-  schedulePendingInteractions(root, pingedLanes);
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
   var retryCache = boundaryFiber.stateNode;
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
     (markRootUpdated(boundaryFiber, wakeable, retryCache),
-    ensureRootIsScheduled(boundaryFiber, retryCache),
-    schedulePendingInteractions(boundaryFiber, wakeable));
+    ensureRootIsScheduled(boundaryFiber, retryCache));
 }
 var beginWork$1;
 beginWork$1 = function(current, workInProgress, renderLanes) {
@@ -6947,85 +7352,90 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
-            workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue2);
-          context._currentValue2 = updateLanes;
-          break;
-        case 12:
-          0 !== (renderLanes & workInProgress.childLanes) &&
-            (workInProgress.flags |= 4);
-          updateLanes = workInProgress.stateNode;
-          updateLanes.effectDuration = 0;
-          updateLanes.passiveEffectDuration = 0;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
+      if (0 === (renderLanes & updateLanes)) {
+        didReceiveUpdate = !1;
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 5:
+            pushHostContext(workInProgress);
+            break;
+          case 1:
+            isContextProvider(workInProgress.type) &&
+              pushContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
               workInProgress,
-              renderLanes
+              workInProgress.stateNode.containerInfo
             );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
+            break;
+          case 10:
+            updateLanes = workInProgress.type._context;
+            var nextValue = workInProgress.memoizedProps.value;
+            push(valueCursor, updateLanes._currentValue2);
+            updateLanes._currentValue2 = nextValue;
+            break;
+          case 12:
+            0 !== (renderLanes & workInProgress.childLanes) &&
+              (workInProgress.flags |= 4);
+            updateLanes = workInProgress.stateNode;
+            updateLanes.effectDuration = 0;
+            updateLanes.passiveEffectDuration = 0;
+            break;
+          case 13:
+            if (null !== workInProgress.memoizedState) {
+              if (0 !== (renderLanes & workInProgress.child.childLanes))
+                return updateSuspenseComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              push(suspenseStackCursor, suspenseStackCursor.current & 1);
+              workInProgress = bailoutOnAlreadyFinishedWork(
                 current,
                 workInProgress,
                 renderLanes
               );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
+              return null !== workInProgress ? workInProgress.sibling : null;
+            }
+            push(suspenseStackCursor, suspenseStackCursor.current & 1);
+            break;
+          case 19:
+            updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
+            if (0 !== (current.flags & 128)) {
+              if (updateLanes)
+                return updateSuspenseListComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              workInProgress.flags |= 128;
+            }
+            nextValue = workInProgress.memoizedState;
+            null !== nextValue &&
+              ((nextValue.rendering = null),
+              (nextValue.tail = null),
+              (nextValue.lastEffect = null));
+            push(suspenseStackCursor, suspenseStackCursor.current);
+            if (updateLanes) break;
+            else return null;
+          case 22:
+          case 23:
+            return (
+              (workInProgress.lanes = 0),
+              updateOffscreenComponent(current, workInProgress, renderLanes)
+            );
+        }
+        return bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
+        );
       }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
@@ -7037,22 +7447,22 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      nextValue = getMaskedContext(workInProgress, contextStackCursor.current);
       prepareToReadContext(workInProgress, renderLanes);
-      context = renderWithHooks(
+      nextValue = renderWithHooks(
         null,
         workInProgress,
         updateLanes,
         current,
-        context,
+        nextValue,
         renderLanes
       );
       workInProgress.flags |= 1;
       if (
-        "object" === typeof context &&
-        null !== context &&
-        "function" === typeof context.render &&
-        void 0 === context.$$typeof
+        "object" === typeof nextValue &&
+        null !== nextValue &&
+        "function" === typeof nextValue.render &&
+        void 0 === nextValue.$$typeof
       ) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
@@ -7062,21 +7472,13 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           pushContextProvider(workInProgress);
         } else hasContext = !1;
         workInProgress.memoizedState =
-          null !== context.state && void 0 !== context.state
-            ? context.state
+          null !== nextValue.state && void 0 !== nextValue.state
+            ? nextValue.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
-        context.updater = classComponentUpdater;
-        workInProgress.stateNode = context;
-        context._reactInternals = workInProgress;
+        nextValue.updater = classComponentUpdater;
+        workInProgress.stateNode = nextValue;
+        nextValue._reactInternals = workInProgress;
         mountClassInstance(workInProgress, updateLanes, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
@@ -7088,28 +7490,28 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         );
       } else
         (workInProgress.tag = 0),
-          reconcileChildren(null, workInProgress, context, renderLanes),
+          reconcileChildren(null, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      nextValue = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
+        hasContext = nextValue._init;
+        nextValue = hasContext(nextValue._payload);
+        workInProgress.type = nextValue;
+        hasContext = workInProgress.tag = resolveLazyComponentTag(nextValue);
+        current = resolveDefaultProps(nextValue, current);
         switch (hasContext) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7118,7 +7520,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7127,7 +7529,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7136,8 +7538,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
+              nextValue,
+              resolveDefaultProps(nextValue.type, current),
               updateLanes,
               renderLanes
             );
@@ -7145,7 +7547,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            nextValue +
             ". Lazy element type must resolve to a class or function."
         );
       }
@@ -7153,32 +7555,32 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 0:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateFunctionComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
     case 1:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateClassComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7189,19 +7591,18 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
-      cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
+      nextValue = workInProgress.pendingProps;
       updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      cloneUpdateQueue(current, workInProgress);
+      processUpdateQueue(workInProgress, nextValue, null, renderLanes);
+      nextValue = workInProgress.memoizedState.element;
+      nextValue === updateLanes
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
@@ -7241,16 +7642,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 11:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateForwardRef(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7291,27 +7692,15 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 10:
       a: {
         updateLanes = workInProgress.type._context;
-        context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue2);
-        context$jscomp$0._currentValue2 = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        nextValue = workInProgress.pendingProps;
+        hasContext = workInProgress.memoizedProps;
+        var newValue = nextValue.value;
+        push(valueCursor, updateLanes._currentValue2);
+        updateLanes._currentValue2 = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === nextValue.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7323,76 +7712,71 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === updateLanes) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
           workInProgress,
-          context.children,
+          nextValue.children,
           renderLanes
         );
         workInProgress = workInProgress.child;
@@ -7400,28 +7784,27 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       return workInProgress;
     case 9:
       return (
-        (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (nextValue = workInProgress.type),
+        (updateLanes = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (nextValue = readContext(nextValue)),
+        (updateLanes = updateLanes(nextValue)),
         (workInProgress.flags |= 1),
         reconcileChildren(current, workInProgress, updateLanes, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
+        (nextValue = workInProgress.type),
         (hasContext = resolveDefaultProps(
-          context,
+          nextValue,
           workInProgress.pendingProps
         )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (hasContext = resolveDefaultProps(nextValue.type, hasContext)),
         updateMemoComponent(
           current,
           workInProgress,
-          context,
+          nextValue,
           hasContext,
           updateLanes,
           renderLanes
@@ -7439,11 +7822,11 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 17:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
@@ -7453,8 +7836,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, updateLanes, nextValue),
+        mountClassInstance(workInProgress, updateLanes, nextValue, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
@@ -7466,9 +7849,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7477,92 +7860,11 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       "). This error is likely caused by a bug in React. Please file an issue."
   );
 };
-function markSpawnedWork(lane) {
-  null === spawnedWorkDuringRender
-    ? (spawnedWorkDuringRender = [lane])
-    : spawnedWorkDuringRender.push(lane);
-}
-function scheduleInteractions(root, lane, interactions) {
-  if (0 < interactions.size) {
-    var pendingInteractionMap = root.pendingInteractionMap,
-      pendingInteractions = pendingInteractionMap.get(lane);
-    null != pendingInteractions
-      ? interactions.forEach(function(interaction) {
-          pendingInteractions.has(interaction) || interaction.__count++;
-          pendingInteractions.add(interaction);
-        })
-      : (pendingInteractionMap.set(lane, new Set(interactions)),
-        interactions.forEach(function(interaction) {
-          interaction.__count++;
-        }));
-    pendingInteractionMap = tracing.__subscriberRef.current;
-    if (null !== pendingInteractionMap)
-      pendingInteractionMap.onWorkScheduled(
-        interactions,
-        1e3 * lane + root.interactionThreadID
-      );
-  }
-}
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-function startWorkOnPendingInteractions(root, lanes) {
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    0 !== (lanes & scheduledLane) &&
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
-  });
-  root.memoizedInteractions = interactions;
-  if (0 < interactions.size) {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber) {
-      root = 1e3 * lanes + root.interactionThreadID;
-      try {
-        subscriber.onWorkStarted(interactions, root);
-      } catch (error) {
-        scheduleCallback(99, function() {
-          throw error;
-        });
-      }
-    }
-  }
-}
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  try {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber && 0 < root.memoizedInteractions.size)
-      subscriber.onWorkStopped(
-        root.memoizedInteractions,
-        1e3 * committedLanes + root.interactionThreadID
-      );
-  } catch (error) {
-    scheduleCallback(99, function() {
-      throw error;
+function restorePendingUpdaters(root, lanes) {
+  isDevToolsPresent &&
+    root.memoizedUpdaters.forEach(function(schedulingFiber) {
+      addFiberToLanesMap(root, schedulingFiber, lanes);
     });
-  } finally {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      0 === (remainingLanesAfterCommit & lane) &&
-        (pendingInteractionMap.delete(lane),
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-          if (null !== subscriber && 0 === interaction.__count)
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error$102) {
-              scheduleCallback(99, function() {
-                throw error$102;
-              });
-            }
-        }));
-    });
-  }
 }
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
@@ -7573,8 +7875,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
   this.actualDuration = 0;
@@ -7615,11 +7917,11 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null),
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null),
       (workInProgress.actualDuration = 0),
       (workInProgress.actualStartTime = -1));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7656,17 +7958,16 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           (type.stateNode = { effectDuration: 0, passiveEffectDuration: 0 }),
           type
@@ -7674,7 +7975,6 @@ function createFiberFromTypeAndProps(
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7690,7 +7990,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7714,9 +8014,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7736,7 +8033,7 @@ function createFiberFromFragment(elements, mode, lanes, key) {
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7774,9 +8071,10 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.expirationTimes = createLaneMap(-1);
   this.entangledLanes = this.finishedLanes = this.mutableReadLanes = this.expiredLanes = this.pingedLanes = this.suspendedLanes = this.pendingLanes = 0;
   this.entanglements = createLaneMap(0);
-  this.interactionThreadID = tracing.unstable_getThreadID();
-  this.memoizedInteractions = new Set();
-  this.pendingInteractionMap = new Map();
+  this.passiveEffectDuration = this.effectDuration = 0;
+  this.memoizedUpdaters = new Set();
+  containerInfo = this.pendingUpdatersLaneMap = [];
+  for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set());
 }
 function createPortal(children, containerInfo, implementation) {
   var key =
@@ -7858,7 +8156,8 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -7886,14 +8185,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_887 = {
+  devToolsConfig$jscomp$inline_969 = {
     findFiberByHostInstance: getInstanceFromInstance,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-experimental-568dc3532",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -7908,17 +8207,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1087 = {
-  bundleType: devToolsConfig$jscomp$inline_887.bundleType,
-  version: devToolsConfig$jscomp$inline_887.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_887.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_887.rendererConfig,
+var internals$jscomp$inline_1227 = {
+  bundleType: devToolsConfig$jscomp$inline_969.bundleType,
+  version: devToolsConfig$jscomp$inline_969.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_969.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_969.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -7927,25 +8227,26 @@ var internals$jscomp$inline_1087 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_887.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_969.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-experimental-568dc3532"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1088 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1228 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1088.isDisabled &&
-    hook$jscomp$inline_1088.supportsFiber
+    !hook$jscomp$inline_1228.isDisabled &&
+    hook$jscomp$inline_1228.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1088.inject(
-        internals$jscomp$inline_1087
+      (rendererID = hook$jscomp$inline_1228.inject(
+        internals$jscomp$inline_1227
       )),
-        (injectedHook = hook$jscomp$inline_1088);
+        (injectedHook = hook$jscomp$inline_1228);
     } catch (err) {}
 }
 exports.createPortal = function(children, containerTag) {
@@ -7983,23 +8284,20 @@ exports.findHostInstance_DEPRECATED = function(componentOrHandle) {
     : componentOrHandle;
 };
 exports.findNodeHandle = findNodeHandle;
-exports.render = function(element, containerTag, callback) {
+exports.render = function(element, containerTag, callback, concurrentRoot) {
   var root = roots.get(containerTag);
-  if (!root) {
-    root = new FiberRootNode(containerTag, 0, !1);
-    var JSCompiler_inline_result = 0;
-    isDevToolsPresent && (JSCompiler_inline_result |= 8);
-    JSCompiler_inline_result = createFiber(
-      3,
-      null,
-      null,
-      JSCompiler_inline_result
-    );
-    root.current = JSCompiler_inline_result;
-    JSCompiler_inline_result.stateNode = root;
-    initializeUpdateQueue(JSCompiler_inline_result);
-    roots.set(containerTag, root);
-  }
+  root ||
+    ((root = concurrentRoot ? 1 : 0),
+    (concurrentRoot = new FiberRootNode(containerTag, root, !1)),
+    (root = 1 === root ? 1 : 0),
+    isDevToolsPresent && (root |= 2),
+    (root = createFiber(3, null, null, root)),
+    (concurrentRoot.current = root),
+    (root.stateNode = concurrentRoot),
+    (root.memoizedState = { element: null }),
+    initializeUpdateQueue(root),
+    (root = concurrentRoot),
+    roots.set(containerTag, root));
   updateContainer(element, root, null, callback);
   a: if (((element = root.current), element.child))
     switch (element.child.tag) {
@@ -8012,6 +8310,18 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (handle._internalInstanceHandle
+      ? nativeFabricUIManager.sendAccessibilityEvent(
+          handle._internalInstanceHandle.stateNode.node,
+          eventType
+        )
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.stopSurface = function(containerTag) {
   var root = roots.get(containerTag);
   root &&
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
index 3cbae57ed62639..65eb780282e50c 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
@@ -7,7 +7,7 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated
+ * @generated SignedSource<<121565373640523240f808b242fb487f>>
  */
 
 'use strict';
@@ -19,8 +19,8 @@ if (__DEV__) {
 var React = require("react");
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface");
+var dynamicFlags = require("ReactNativeInternalFeatureFlags");
 var Scheduler = require("scheduler");
-var tracing = require("scheduler/tracing");
 
 var ReactSharedInternals =
   React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
@@ -380,6 +380,12 @@ function clearCaughtError() {
   }
 }
 
+var isArrayImpl = Array.isArray; // eslint-disable-next-line no-redeclare
+
+function isArray(a) {
+  return isArrayImpl(a);
+}
+
 var getFiberCurrentPropsFromNode = null;
 var getInstanceFromNode = null;
 var getNodeFromInstance = null;
@@ -407,13 +413,13 @@ var validateEventDispatches;
   validateEventDispatches = function(event) {
     var dispatchListeners = event._dispatchListeners;
     var dispatchInstances = event._dispatchInstances;
-    var listenersIsArr = Array.isArray(dispatchListeners);
+    var listenersIsArr = isArray(dispatchListeners);
     var listenersLen = listenersIsArr
       ? dispatchListeners.length
       : dispatchListeners
       ? 1
       : 0;
-    var instancesIsArr = Array.isArray(dispatchInstances);
+    var instancesIsArr = isArray(dispatchInstances);
     var instancesLen = instancesIsArr
       ? dispatchInstances.length
       : dispatchInstances
@@ -450,7 +456,7 @@ function executeDispatchesInOrder(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -481,7 +487,7 @@ function executeDispatchesInOrderStopAtTrueImpl(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -527,7 +533,7 @@ function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners;
   var dispatchInstance = event._dispatchInstances;
 
-  if (!!Array.isArray(dispatchListener)) {
+  if (!!isArray(dispatchListener)) {
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   }
 
@@ -1084,8 +1090,19 @@ function printTouchBank() {
   return printed;
 }
 
+var instrumentationCallback;
 var ResponderTouchHistoryStore = {
+  /**
+   * Registers a listener which can be used to instrument every touch event.
+   */
+  instrument: function(callback) {
+    instrumentationCallback = callback;
+  },
   recordTouchTrack: function(topLevelType, nativeEvent) {
+    if (instrumentationCallback != null) {
+      instrumentationCallback(topLevelType, nativeEvent);
+    }
+
     if (isMoveish(topLevelType)) {
       nativeEvent.changedTouches.forEach(recordTouchMove);
     } else if (isStartish(topLevelType)) {
@@ -1143,11 +1160,11 @@ function accumulate(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
+  if (isArray(current)) {
     return current.concat(next);
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     return [current].concat(next);
   }
 
@@ -1179,8 +1196,8 @@ function accumulateInto(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) {
+  if (isArray(current)) {
+    if (isArray(next)) {
       current.push.apply(current, next);
       return current;
     }
@@ -1189,7 +1206,7 @@ function accumulateInto(current, next) {
     return current;
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     // A bit too dangerous to mutate `next`.
     return [current].concat(next);
   }
@@ -1237,11 +1254,10 @@ var LazyComponent = 16;
 var IncompleteClassComponent = 17;
 var DehydratedFragment = 18;
 var SuspenseListComponent = 19;
-var FundamentalComponent = 20;
 var ScopeComponent = 21;
-var Block = 22;
-var OffscreenComponent = 23;
-var LegacyHiddenComponent = 24;
+var OffscreenComponent = 22;
+var LegacyHiddenComponent = 23;
+var CacheComponent = 24;
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -2519,6 +2535,7 @@ function updateFiberProps(tag, props) {
 var batchedUpdatesImpl = function(fn, bookkeeping) {
   return fn(bookkeeping);
 };
+
 var isInsideEventHandler = false;
 function batchedUpdates(fn, bookkeeping) {
   if (isInsideEventHandler) {
@@ -2535,12 +2552,7 @@ function batchedUpdates(fn, bookkeeping) {
     isInsideEventHandler = false;
   }
 }
-function setBatchingImplementation(
-  _batchedUpdatesImpl,
-  _discreteUpdatesImpl,
-  _flushDiscreteUpdatesImpl,
-  _batchedEventUpdatesImpl
-) {
+function setBatchingImplementation(_batchedUpdatesImpl, _discreteUpdatesImpl) {
   batchedUpdatesImpl = _batchedUpdatesImpl;
 }
 
@@ -2865,14 +2877,12 @@ var REACT_SUSPENSE_TYPE = 0xead1;
 var REACT_SUSPENSE_LIST_TYPE = 0xead8;
 var REACT_MEMO_TYPE = 0xead3;
 var REACT_LAZY_TYPE = 0xead4;
-var REACT_BLOCK_TYPE = 0xead9;
-var REACT_SERVER_BLOCK_TYPE = 0xeada;
-var REACT_FUNDAMENTAL_TYPE = 0xead5;
 var REACT_SCOPE_TYPE = 0xead7;
 var REACT_OPAQUE_ID_TYPE = 0xeae0;
 var REACT_DEBUG_TRACING_MODE_TYPE = 0xeae1;
 var REACT_OFFSCREEN_TYPE = 0xeae2;
 var REACT_LEGACY_HIDDEN_TYPE = 0xeae3;
+var REACT_CACHE_TYPE = 0xeae4;
 
 if (typeof Symbol === "function" && Symbol.for) {
   var symbolFor = Symbol.for;
@@ -2888,14 +2898,12 @@ if (typeof Symbol === "function" && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
-  REACT_SERVER_BLOCK_TYPE = symbolFor("react.server.block");
-  REACT_FUNDAMENTAL_TYPE = symbolFor("react.fundamental");
   REACT_SCOPE_TYPE = symbolFor("react.scope");
   REACT_OPAQUE_ID_TYPE = symbolFor("react.opaque.id");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
@@ -2917,18 +2925,23 @@ function getIteratorFn(maybeIterable) {
 }
 
 function getWrappedName(outerType, innerType, wrapperName) {
+  var displayName = outerType.displayName;
+
+  if (displayName) {
+    return displayName;
+  }
+
   var functionName = innerType.displayName || innerType.name || "";
-  return (
-    outerType.displayName ||
-    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
-  );
-}
+  return functionName !== ""
+    ? wrapperName + "(" + functionName + ")"
+    : wrapperName;
+} // Keep in sync with react-reconciler/getComponentNameFromFiber
 
 function getContextName(type) {
   return type.displayName || "Context";
-}
+} // Note that the reconciler package should generally prefer to use getComponentNameFromFiber() instead.
 
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (type == null) {
     // Host root, text node or just invalid type.
     return null;
@@ -2937,7 +2950,7 @@ function getComponentName(type) {
   {
     if (typeof type.tag === "number") {
       error(
-        "Received an unexpected object in getComponentName(). " +
+        "Received an unexpected object in getComponentNameFromType(). " +
           "This is likely a bug in React. Please file an issue."
       );
     }
@@ -2969,6 +2982,9 @@ function getComponentName(type) {
 
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
 
   if (typeof type === "object") {
@@ -2985,10 +3001,13 @@ function getComponentName(type) {
         return getWrappedName(type, type.render, "ForwardRef");
 
       case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
+        var outerName = type.displayName || null;
 
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
+        if (outerName !== null) {
+          return outerName;
+        }
+
+        return getComponentNameFromType(type.type) || "Memo";
 
       case REACT_LAZY_TYPE: {
         var lazyComponent = type;
@@ -2996,7 +3015,7 @@ function getComponentName(type) {
         var init = lazyComponent._init;
 
         try {
-          return getComponentName(init(payload));
+          return getComponentNameFromType(init(payload));
         } catch (x) {
           return null;
         }
@@ -3007,11 +3026,118 @@ function getComponentName(type) {
   return null;
 }
 
-// The rest of the flags are static for better dead code elimination.
+function getWrappedName$1(outerType, innerType, wrapperName) {
+  var functionName = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
+  );
+} // Keep in sync with shared/getComponentNameFromType
+
+function getContextName$1(type) {
+  return type.displayName || "Context";
+}
+
+function getComponentNameFromFiber(fiber) {
+  var tag = fiber.tag,
+    type = fiber.type;
+
+  switch (tag) {
+    case CacheComponent:
+      return "Cache";
+
+    case ContextConsumer:
+      var context = type;
+      return getContextName$1(context) + ".Consumer";
+
+    case ContextProvider:
+      var provider = type;
+      return getContextName$1(provider._context) + ".Provider";
+
+    case DehydratedFragment:
+      return "DehydratedFragment";
+
+    case ForwardRef:
+      return getWrappedName$1(type, type.render, "ForwardRef");
+
+    case Fragment:
+      return "Fragment";
+
+    case HostComponent:
+      // Host component type is the display name (e.g. "div", "View")
+      return type;
+
+    case HostPortal:
+      return "Portal";
+
+    case HostRoot:
+      return "Root";
+
+    case HostText:
+      return "Text";
+
+    case LazyComponent:
+      // Name comes from the type in this case; we don't have a tag.
+      return getComponentNameFromType(type);
+
+    case LegacyHiddenComponent:
+      return "LegacyHidden";
+
+    case Mode:
+      if (type === REACT_STRICT_MODE_TYPE) {
+        // Don't be less specific than shared/getComponentNameFromType
+        return "StrictMode";
+      }
+
+      return "Mode";
+
+    case OffscreenComponent:
+      return "Offscreen";
+
+    case Profiler:
+      return "Profiler";
+
+    case ScopeComponent:
+      return "Scope";
+
+    case SuspenseComponent:
+      return "Suspense";
+
+    case SuspenseListComponent:
+      return "SuspenseList";
+    // The display name for this tags come from the user-provided type:
+
+    case ClassComponent:
+    case FunctionComponent:
+    case IncompleteClassComponent:
+    case IndeterminateComponent:
+    case MemoComponent:
+    case SimpleMemoComponent:
+      if (typeof type === "function") {
+        return type.displayName || type.name || null;
+      }
+
+      if (typeof type === "string") {
+        return type;
+      }
+
+      break;
+  }
+
+  return null;
+}
+
+// Re-export dynamic flags from the internal module. Intentionally using *
+// the exports object every time a flag is read.
+
+var enablePersistentOffscreenHostContainer =
+  dynamicFlags.enablePersistentOffscreenHostContainer; // The rest of the flags are static for better dead code elimination.
 var enableProfilerTimer = true;
-var enableFundamentalAPI = false;
+var enableProfilerCommitHooks = true;
+var enableLazyElements = false;
 var warnAboutStringRefs = false;
 var enableNewReconciler = false;
+var enableLazyContextPropagation = false;
 
 // Don't change these two values. They're used by React Dev Tools.
 var NoFlags =
@@ -3029,53 +3155,95 @@ var Update =
   4;
 var PlacementAndUpdate =
   /*           */
-  6;
-var Deletion =
-  /*                     */
-  8;
+  Placement | Update;
+var ChildDeletion =
+  /*                */
+  16;
 var ContentReset =
   /*                 */
-  16;
+  32;
 var Callback =
   /*                     */
-  32;
+  64;
 var DidCapture =
   /*                   */
-  64;
+  128;
 var Ref =
   /*                          */
-  128;
+  256;
 var Snapshot =
   /*                     */
-  256;
+  512;
 var Passive =
   /*                      */
-  512;
+  1024;
 var Hydrating =
   /*                    */
-  1024;
+  2048;
 var HydratingAndUpdate =
   /*           */
-  1028;
+  Hydrating | Update;
+var Visibility =
+  /*                   */
+  4096;
 var LifecycleEffectMask = Passive | Update | Callback | Ref | Snapshot; // Union of all commit flags (flags with the lifetime of a particular commit)
 
 var HostEffectMask =
   /*               */
-  4095; // These are not really side effects, but we still reuse this field.
+  8191; // These are not really side effects, but we still reuse this field.
 
 var Incomplete =
   /*                   */
-  4096;
+  8192;
 var ShouldCapture =
   /*                */
-  8192; // TODO (effects) Remove this bit once the new reconciler is synced to the old.
-
-var PassiveUnmountPendingDev =
-  /*     */
   16384;
 var ForceUpdateForLegacySuspense =
   /* */
-  32768; // Static tags describe aspects of a fiber that are not specific to a render,
+  32768;
+// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
+// This enables us to defer more work in the unmount case,
+// since we can defer traversing the tree during layout to look for Passive effects,
+// and instead rely on the static flag as a signal that there may be cleanup work.
+
+var RefStatic =
+  /*                    */
+  262144;
+var LayoutStatic =
+  /*                 */
+  524288;
+var PassiveStatic =
+  /*                */
+  1048576; // These flags allow us to traverse to fibers that have effects on mount
+// without traversing the entire tree after every commit for
+// double invoking
+
+var MountLayoutDev =
+  /*               */
+  2097152;
+var MountPassiveDev =
+  /*              */
+  4194304; // Groups of flags that are used in the commit phase to skip over trees that
+// don't contain effects, by checking subtreeFlags.
+
+var BeforeMutationMask = // TODO: Remove Update flag from before mutation phase by re-landing Visibility
+  // flag logic (see #20043)
+  Update | Snapshot | 0;
+var MutationMask =
+  Placement |
+  Update |
+  ChildDeletion |
+  ContentReset |
+  Ref |
+  Hydrating |
+  Visibility;
+var LayoutMask = Update | Callback | Ref | Visibility; // TODO: Split into PassiveMountMask and PassiveUnmountMask
+
+var PassiveMask = Passive | ChildDeletion; // Union of tags that don't get reset on clones.
+// This allows certain concepts to persist without recalculating them,
+// e.g. whether a subtree contains passive effects or portals.
+
+var StaticMask = LayoutStatic | PassiveStatic | RefStatic;
 
 var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 function getNearestMountedFiber(fiber) {
@@ -3132,7 +3300,7 @@ function isMounted(component) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(ownerFiber.type) || "A component"
+          getComponentNameFromFiber(ownerFiber) || "A component"
         );
       }
 
@@ -3315,54 +3483,30 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   var currentParent = findCurrentFiberUsingSlowPath(parent);
+  return currentParent !== null
+    ? findCurrentHostFiberImpl(currentParent)
+    : null;
+}
 
-  if (!currentParent) {
-    return null;
-  } // Next we'll drill down this component to find the first HostComponent/Text.
-
-  var node = currentParent;
-
-  while (true) {
-    if (node.tag === HostComponent || node.tag === HostText) {
-      return node;
-    } else if (node.child) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-
-    if (node === currentParent) {
-      return null;
-    }
-
-    while (!node.sibling) {
-      if (!node.return || node.return === currentParent) {
-        return null;
-      }
-
-      node = node.return;
-    }
+function findCurrentHostFiberImpl(node) {
+  // Next we'll drill down this component to find the first HostComponent/Text.
+  if (node.tag === HostComponent || node.tag === HostText) {
+    return node;
+  }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
-  } // Flow needs the return null here, but ESLint complains about it.
-  // eslint-disable-next-line no-unreachable
+  var child = node.child;
 
-  return null;
-}
-function doesFiberContain(parentFiber, childFiber) {
-  var node = childFiber;
-  var parentFiberAlternate = parentFiber.alternate;
+  while (child !== null) {
+    var match = findCurrentHostFiberImpl(child);
 
-  while (node !== null) {
-    if (node === parentFiber || node === parentFiberAlternate) {
-      return true;
+    if (match !== null) {
+      return match;
     }
 
-    node = node.return;
+    child = child.sibling;
   }
 
-  return false;
+  return null;
 }
 
 // Modules provided by RN:
@@ -3402,7 +3546,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node)) {
+  if (isArray(node)) {
     var i = node.length;
 
     while (i-- && removedKeyCount > 0) {
@@ -3527,12 +3671,12 @@ function diffNestedProperty(
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp)) {
+  if (!isArray(prevProp) && !isArray(nextProp)) {
     // Both are leaves, we can diff the leaves.
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
   }
 
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArray(prevProp) && isArray(nextProp)) {
     // Both are arrays, we can diff the arrays.
     return diffNestedArrayProperty(
       updatePayload,
@@ -3542,7 +3686,7 @@ function diffNestedProperty(
     );
   }
 
-  if (Array.isArray(prevProp)) {
+  if (isArray(prevProp)) {
     return diffProperties(
       updatePayload, // $FlowFixMe - We know that this is always an object when the input is.
       ReactNativePrivateInterface.flattenStyle(prevProp), // $FlowFixMe - We know that this isn't an array because of above flow.
@@ -3569,7 +3713,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(nextProp)) {
+  if (!isArray(nextProp)) {
     // Add each property of the leaf.
     return addProperties(updatePayload, nextProp, validAttributes);
   }
@@ -3595,7 +3739,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp)) {
+  if (!isArray(prevProp)) {
     // Add each property of the leaf.
     return clearProperties(updatePayload, prevProp, validAttributes);
   }
@@ -3967,2078 +4111,2030 @@ var ReactNativeFiberHostComponent = /*#__PURE__*/ (function() {
   return ReactNativeFiberHostComponent;
 })(); // eslint-disable-next-line no-unused-expressions
 
-// can re-export everything from this module.
+// This module only exists as an ESM wrapper around the external CommonJS
+var scheduleCallback = Scheduler.unstable_scheduleCallback;
+var cancelCallback = Scheduler.unstable_cancelCallback;
+var shouldYield = Scheduler.unstable_shouldYield;
+var requestPaint = Scheduler.unstable_requestPaint;
+var now = Scheduler.unstable_now;
+var ImmediatePriority = Scheduler.unstable_ImmediatePriority;
+var UserBlockingPriority = Scheduler.unstable_UserBlockingPriority;
+var NormalPriority = Scheduler.unstable_NormalPriority;
+var IdlePriority = Scheduler.unstable_IdlePriority;
 
-function shim() {
-  {
-    throw Error(
-      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
-    );
+var rendererID = null;
+var injectedHook = null;
+var hasLoggedError = false;
+var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
   }
-} // Hydration (when unsupported)
-var isSuspenseInstancePending = shim;
-var isSuspenseInstanceFallback = shim;
-var hydrateTextInstance = shim;
-
-var getViewConfigForType =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get;
-var UPDATE_SIGNAL = {};
 
-{
-  Object.freeze(UPDATE_SIGNAL);
-} // Counter for uniquely identifying views.
-// % 10 === 1 means it is a rootTag.
-// % 2 === 0 means it is a Fabric tag.
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
 
-var nextReactTag = 3;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
+  }
 
-function allocateTag() {
-  var tag = nextReactTag;
+  if (!hook.supportsFiber) {
+    {
+      error(
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://reactjs.org/link/react-devtools"
+      );
+    } // DevTools exists, even though it doesn't support Fiber.
 
-  if (tag % 10 === 1) {
-    tag += 2;
+    return true;
   }
 
-  nextReactTag = tag + 2;
-  return tag;
-}
+  try {
+    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
 
-function recursivelyUncacheFiberNode(node) {
-  if (typeof node === "number") {
-    // Leaf node (eg text)
-    uncacheFiberNode(node);
-  } else {
-    uncacheFiberNode(node._nativeTag);
+    injectedHook = hook;
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      error("React instrumentation encountered an error: %s.", err);
+    }
+  }
 
-    node._children.forEach(recursivelyUncacheFiberNode);
+  if (hook.checkDCE) {
+    // This is the real DevTools.
+    return true;
+  } else {
+    // This is likely a hook installed by Fast Refresh runtime.
+    return false;
   }
 }
-function appendInitialChild(parentInstance, child) {
-  parentInstance._children.push(child);
-}
-function createInstance(
-  type,
-  props,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  var tag = allocateTag();
-  var viewConfig = getViewConfigForType(type);
-
+function onScheduleRoot(root, children) {
   {
-    for (var key in viewConfig.validAttributes) {
-      if (props.hasOwnProperty(key)) {
-        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
-          props[key]
-        );
+    if (
+      injectedHook &&
+      typeof injectedHook.onScheduleFiberRoot === "function"
+    ) {
+      try {
+        injectedHook.onScheduleFiberRoot(rendererID, root, children);
+      } catch (err) {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
+
+          error("React instrumentation encountered an error: %s", err);
+        }
       }
     }
   }
+}
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
+    try {
+      var didError = (root.current.flags & DidCapture) === DidCapture;
 
-  var updatePayload = create(props, viewConfig.validAttributes);
-  ReactNativePrivateInterface.UIManager.createView(
-    tag, // reactTag
-    viewConfig.uiViewClassName, // viewName
-    rootContainerInstance, // rootTag
-    updatePayload // props
-  );
-  var component = new ReactNativeFiberHostComponent(
-    tag,
-    viewConfig,
-    internalInstanceHandle
-  );
-  precacheFiberNode(internalInstanceHandle, tag);
-  updateFiberProps(tag, props); // Not sure how to avoid this cast. Flow is okay if the component is defined
-  // in the same file but if it's external it can't see the types.
+      if (enableProfilerTimer) {
+        var schedulerPriority;
 
-  return component;
-}
-function createTextInstance(
-  text,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  if (!hostContext.isInAParentText) {
-    throw Error("Text strings must be rendered within a <Text> component.");
-  }
+        switch (eventPriority) {
+          case DiscreteEventPriority:
+            schedulerPriority = ImmediatePriority;
+            break;
 
-  var tag = allocateTag();
-  ReactNativePrivateInterface.UIManager.createView(
-    tag, // reactTag
-    "RCTRawText", // viewName
-    rootContainerInstance, // rootTag
-    {
-      text: text
-    } // props
-  );
-  precacheFiberNode(internalInstanceHandle, tag);
-  return tag;
-}
-function finalizeInitialChildren(
-  parentInstance,
-  type,
-  props,
-  rootContainerInstance,
-  hostContext
-) {
-  // Don't send a no-op message over the bridge.
-  if (parentInstance._children.length === 0) {
-    return false;
-  } // Map from child objects to native tags.
-  // Either way we need to pass a copy of the Array to prevent it from being frozen.
+          case ContinuousEventPriority:
+            schedulerPriority = UserBlockingPriority;
+            break;
 
-  var nativeTags = parentInstance._children.map(function(child) {
-    return typeof child === "number"
-      ? child // Leaf node (eg text)
-      : child._nativeTag;
-  });
+          case DefaultEventPriority:
+            schedulerPriority = NormalPriority;
+            break;
 
-  ReactNativePrivateInterface.UIManager.setChildren(
-    parentInstance._nativeTag, // containerTag
-    nativeTags // reactTags
-  );
-  return false;
-}
-function getRootHostContext(rootContainerInstance) {
-  return {
-    isInAParentText: false
-  };
-}
-function getChildHostContext(parentHostContext, type, rootContainerInstance) {
-  var prevIsInAParentText = parentHostContext.isInAParentText;
-  var isInAParentText =
-    type === "AndroidTextInput" || // Android
-    type === "RCTMultilineTextInputView" || // iOS
-    type === "RCTSinglelineTextInputView" || // iOS
-    type === "RCTText" ||
-    type === "RCTVirtualText";
+          case IdleEventPriority:
+            schedulerPriority = IdlePriority;
+            break;
 
-  if (prevIsInAParentText !== isInAParentText) {
-    return {
-      isInAParentText: isInAParentText
-    };
-  } else {
-    return parentHostContext;
+          default:
+            schedulerPriority = NormalPriority;
+            break;
+        }
+
+        injectedHook.onCommitFiberRoot(
+          rendererID,
+          root,
+          schedulerPriority,
+          didError
+        );
+      } else {
+        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
+      }
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
+
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function getPublicInstance(instance) {
-  return instance;
-}
-function prepareForCommit(containerInfo) {
-  // Noop
-  return null;
-}
-function prepareUpdate(
-  instance,
-  type,
-  oldProps,
-  newProps,
-  rootContainerInstance,
-  hostContext
-) {
-  return UPDATE_SIGNAL;
-}
-function resetAfterCommit(containerInfo) {
-  // Noop
-}
-var scheduleTimeout = setTimeout;
-var cancelTimeout = clearTimeout;
-var noTimeout = -1;
-function shouldSetTextContent(type, props) {
-  // TODO (bvaughn) Revisit this decision.
-  // Always returning false simplifies the createInstance() implementation,
-  // But creates an additional child Fiber for raw text children.
-  // No additional native views are created though.
-  // It's not clear to me which is better so I'm deferring for now.
-  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
-  return false;
-} // -------------------
-function appendChild(parentInstance, child) {
-  var childTag = typeof child === "number" ? child : child._nativeTag;
-  var children = parentInstance._children;
-  var index = children.indexOf(child);
+function onPostCommitRoot(root) {
+  if (
+    injectedHook &&
+    typeof injectedHook.onPostCommitFiberRoot === "function"
+  ) {
+    try {
+      injectedHook.onPostCommitFiberRoot(rendererID, root);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (index >= 0) {
-    children.splice(index, 1);
-    children.push(child);
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerTag
-      [index], // moveFromIndices
-      [children.length - 1], // moveToIndices
-      [], // addChildReactTags
-      [], // addAtIndices
-      [] // removeAtIndices
-    );
-  } else {
-    children.push(child);
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerTag
-      [], // moveFromIndices
-      [], // moveToIndices
-      [childTag], // addChildReactTags
-      [children.length - 1], // addAtIndices
-      [] // removeAtIndices
-    );
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function appendChildToContainer(parentInstance, child) {
-  var childTag = typeof child === "number" ? child : child._nativeTag;
-  ReactNativePrivateInterface.UIManager.setChildren(
-    parentInstance, // containerTag
-    [childTag] // reactTags
-  );
-}
-function commitTextUpdate(textInstance, oldText, newText) {
-  ReactNativePrivateInterface.UIManager.updateView(
-    textInstance, // reactTag
-    "RCTRawText", // viewName
-    {
-      text: newText
-    } // props
-  );
-}
-function commitUpdate(
-  instance,
-  updatePayloadTODO,
-  type,
-  oldProps,
-  newProps,
-  internalInstanceHandle
-) {
-  var viewConfig = instance.viewConfig;
-  updateFiberProps(instance._nativeTag, newProps);
-  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // Avoid the overhead of bridge calls if there's no update.
-  // This is an expensive no-op for Android, and causes an unnecessary
-  // view invalidation for certain components (eg RCTTextInput) on iOS.
+function onCommitUnmount(fiber) {
+  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
+    try {
+      injectedHook.onCommitFiberUnmount(rendererID, fiber);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (updatePayload != null) {
-    ReactNativePrivateInterface.UIManager.updateView(
-      instance._nativeTag, // reactTag
-      viewConfig.uiViewClassName, // viewName
-      updatePayload // props
-    );
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function insertBefore(parentInstance, child, beforeChild) {
-  var children = parentInstance._children;
-  var index = children.indexOf(child); // Move existing child or add new child?
 
-  if (index >= 0) {
-    children.splice(index, 1);
-    var beforeChildIndex = children.indexOf(beforeChild);
-    children.splice(beforeChildIndex, 0, child);
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerID
-      [index], // moveFromIndices
-      [beforeChildIndex], // moveToIndices
-      [], // addChildReactTags
-      [], // addAtIndices
-      [] // removeAtIndices
-    );
-  } else {
-    var _beforeChildIndex = children.indexOf(beforeChild);
+var NoMode =
+  /*                         */
+  0; // TODO: Remove ConcurrentMode by reading from the root tag instead
 
-    children.splice(_beforeChildIndex, 0, child);
-    var childTag = typeof child === "number" ? child : child._nativeTag;
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerID
-      [], // moveFromIndices
-      [], // moveToIndices
-      [childTag], // addChildReactTags
-      [_beforeChildIndex], // addAtIndices
-      [] // removeAtIndices
-    );
-  }
-}
-function insertInContainerBefore(parentInstance, child, beforeChild) {
-  // TODO (bvaughn): Remove this check when...
-  // We create a wrapper object for the container in ReactNative render()
-  // Or we refactor to remove wrapper objects entirely.
-  // For more info on pros/cons see PR #8560 description.
-  if (!(typeof parentInstance !== "number")) {
-    throw Error("Container does not support insertBefore operation");
-  }
-}
-function removeChild(parentInstance, child) {
-  recursivelyUncacheFiberNode(child);
-  var children = parentInstance._children;
-  var index = children.indexOf(child);
-  children.splice(index, 1);
-  ReactNativePrivateInterface.UIManager.manageChildren(
-    parentInstance._nativeTag, // containerID
-    [], // moveFromIndices
-    [], // moveToIndices
-    [], // addChildReactTags
-    [], // addAtIndices
-    [index] // removeAtIndices
-  );
-}
-function removeChildFromContainer(parentInstance, child) {
-  recursivelyUncacheFiberNode(child);
-  ReactNativePrivateInterface.UIManager.manageChildren(
-    parentInstance, // containerID
-    [], // moveFromIndices
-    [], // moveToIndices
-    [], // addChildReactTags
-    [], // addAtIndices
-    [0] // removeAtIndices
-  );
-}
-function resetTextContent(instance) {
-  // Noop
-}
-function hideInstance(instance) {
-  var viewConfig = instance.viewConfig;
-  var updatePayload = create(
-    {
-      style: {
-        display: "none"
-      }
-    },
-    viewConfig.validAttributes
-  );
-  ReactNativePrivateInterface.UIManager.updateView(
-    instance._nativeTag,
-    viewConfig.uiViewClassName,
-    updatePayload
-  );
-}
-function hideTextInstance(textInstance) {
-  throw new Error("Not yet implemented.");
-}
-function unhideInstance(instance, props) {
-  var viewConfig = instance.viewConfig;
-  var updatePayload = diff(
-    Object.assign({}, props, {
-      style: [
-        props.style,
-        {
-          display: "none"
-        }
-      ]
-    }),
-    props,
-    viewConfig.validAttributes
-  );
-  ReactNativePrivateInterface.UIManager.updateView(
-    instance._nativeTag,
-    viewConfig.uiViewClassName,
-    updatePayload
-  );
-}
-function clearContainer(container) {
-  // TODO Implement this for React Native
-  // UIManager does not expose a "remove all" type method.
-}
-function unhideTextInstance(textInstance, text) {
-  throw new Error("Not yet implemented.");
-}
-function makeClientIdInDEV(warnOnAccessInDEV) {
-  throw new Error("Not yet implemented");
-}
-function preparePortalMount(portalInstance) {
-  // noop
-}
-
-// Helpers to patch console.logs to avoid logging during side-effect free
-// replaying on render function. This currently only patches the object
-// lazily which won't cover if the log function was extracted eagerly.
-// We could also eagerly patch the method.
-var disabledDepth = 0;
-var prevLog;
-var prevInfo;
-var prevWarn;
-var prevError;
-var prevGroup;
-var prevGroupCollapsed;
-var prevGroupEnd;
-
-function disabledLog() {}
-
-disabledLog.__reactDisabledLog = true;
-function disableLogs() {
-  {
-    if (disabledDepth === 0) {
-      /* eslint-disable react-internal/no-production-logging */
-      prevLog = console.log;
-      prevInfo = console.info;
-      prevWarn = console.warn;
-      prevError = console.error;
-      prevGroup = console.group;
-      prevGroupCollapsed = console.groupCollapsed;
-      prevGroupEnd = console.groupEnd; // https://github.com/facebook/react/issues/19099
+var ConcurrentMode =
+  /*                 */
+  1;
+var ProfileMode =
+  /*                    */
+  2;
+var DebugTracingMode =
+  /*               */
+  4;
+var StrictLegacyMode =
+  /*               */
+  8;
+var StrictEffectsMode =
+  /*              */
+  16;
+var ConcurrentUpdatesByDefaultMode =
+  /* */
+  32;
 
-      var props = {
-        configurable: true,
-        enumerable: true,
-        value: disabledLog,
-        writable: true
-      }; // $FlowFixMe Flow thinks console is immutable.
+// If those values are changed that package should be rebuilt and redeployed.
 
-      Object.defineProperties(console, {
-        info: props,
-        log: props,
-        warn: props,
-        error: props,
-        group: props,
-        groupCollapsed: props,
-        groupEnd: props
-      });
-      /* eslint-enable react-internal/no-production-logging */
-    }
+var TotalLanes = 31;
+var NoLanes =
+  /*                        */
+  0;
+var NoLane =
+  /*                          */
+  0;
+var SyncLane =
+  /*                        */
+  1;
+var InputContinuousHydrationLane =
+  /*    */
+  2;
+var InputContinuousLane =
+  /*            */
+  4;
+var DefaultHydrationLane =
+  /*            */
+  8;
+var DefaultLane =
+  /*                    */
+  16;
+var TransitionHydrationLane =
+  /*                */
+  32;
+var TransitionLanes =
+  /*                       */
+  4194240;
+var TransitionLane1 =
+  /*                        */
+  64;
+var TransitionLane2 =
+  /*                        */
+  128;
+var TransitionLane3 =
+  /*                        */
+  256;
+var TransitionLane4 =
+  /*                        */
+  512;
+var TransitionLane5 =
+  /*                        */
+  1024;
+var TransitionLane6 =
+  /*                        */
+  2048;
+var TransitionLane7 =
+  /*                        */
+  4096;
+var TransitionLane8 =
+  /*                        */
+  8192;
+var TransitionLane9 =
+  /*                        */
+  16384;
+var TransitionLane10 =
+  /*                       */
+  32768;
+var TransitionLane11 =
+  /*                       */
+  65536;
+var TransitionLane12 =
+  /*                       */
+  131072;
+var TransitionLane13 =
+  /*                       */
+  262144;
+var TransitionLane14 =
+  /*                       */
+  524288;
+var TransitionLane15 =
+  /*                       */
+  1048576;
+var TransitionLane16 =
+  /*                       */
+  2097152;
+var RetryLanes =
+  /*                            */
+  130023424;
+var RetryLane1 =
+  /*                             */
+  4194304;
+var RetryLane2 =
+  /*                             */
+  8388608;
+var RetryLane3 =
+  /*                             */
+  16777216;
+var RetryLane4 =
+  /*                             */
+  33554432;
+var RetryLane5 =
+  /*                             */
+  67108864;
+var SomeRetryLane = RetryLane1;
+var SelectiveHydrationLane =
+  /*          */
+  134217728;
+var NonIdleLanes =
+  /*                                 */
+  268435455;
+var IdleHydrationLane =
+  /*               */
+  268435456;
+var IdleLane =
+  /*                       */
+  536870912;
+var OffscreenLane =
+  /*                   */
+  1073741824; // This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
+var NoTimestamp = -1;
+var nextTransitionLane = TransitionLane1;
+var nextRetryLane = RetryLane1;
 
-    disabledDepth++;
-  }
-}
-function reenableLogs() {
-  {
-    disabledDepth--;
+function getHighestPriorityLanes(lanes) {
+  switch (getHighestPriorityLane(lanes)) {
+    case SyncLane:
+      return SyncLane;
 
-    if (disabledDepth === 0) {
-      /* eslint-disable react-internal/no-production-logging */
-      var props = {
-        configurable: true,
-        enumerable: true,
-        writable: true
-      }; // $FlowFixMe Flow thinks console is immutable.
+    case InputContinuousHydrationLane:
+      return InputContinuousHydrationLane;
+
+    case InputContinuousLane:
+      return InputContinuousLane;
+
+    case DefaultHydrationLane:
+      return DefaultHydrationLane;
+
+    case DefaultLane:
+      return DefaultLane;
+
+    case TransitionHydrationLane:
+      return TransitionHydrationLane;
+
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return lanes & TransitionLanes;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      return lanes & RetryLanes;
+
+    case SelectiveHydrationLane:
+      return SelectiveHydrationLane;
+
+    case IdleHydrationLane:
+      return IdleHydrationLane;
+
+    case IdleLane:
+      return IdleLane;
+
+    case OffscreenLane:
+      return OffscreenLane;
 
-      Object.defineProperties(console, {
-        log: Object.assign({}, props, {
-          value: prevLog
-        }),
-        info: Object.assign({}, props, {
-          value: prevInfo
-        }),
-        warn: Object.assign({}, props, {
-          value: prevWarn
-        }),
-        error: Object.assign({}, props, {
-          value: prevError
-        }),
-        group: Object.assign({}, props, {
-          value: prevGroup
-        }),
-        groupCollapsed: Object.assign({}, props, {
-          value: prevGroupCollapsed
-        }),
-        groupEnd: Object.assign({}, props, {
-          value: prevGroupEnd
-        })
-      });
-      /* eslint-enable react-internal/no-production-logging */
-    }
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
+      } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
 
-    if (disabledDepth < 0) {
-      error(
-        "disabledDepth fell below zero. " +
-          "This is a bug in React. Please file an issue."
-      );
-    }
+      return lanes;
   }
 }
 
-var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
-function describeBuiltInComponentFrame(name, source, ownerFn) {
-  {
-    var ownerName = null;
-
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
+function getNextLanes(root, wipLanes) {
+  // Early bailout if there's no pending work left.
+  var pendingLanes = root.pendingLanes;
 
-    return describeComponentFrame(name, source, ownerName);
+  if (pendingLanes === NoLanes) {
+    return NoLanes;
   }
-}
-var componentFrameCache;
-
-{
-  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
-  componentFrameCache = new PossiblyWeakMap();
-}
-var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
 
-function describeComponentFrame(name, source, ownerName) {
-  var sourceInfo = "";
+  var nextLanes = NoLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes; // Do not work on any idle work until all the non-idle work has finished,
+  // even if the work is suspended.
 
-  if (source) {
-    var path = source.fileName;
-    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
-    // prefer "folder/index.js" instead of just "index.js".
+  var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
 
-    if (/^index\./.test(fileName)) {
-      var match = path.match(BEFORE_SLASH_RE);
+  if (nonIdlePendingLanes !== NoLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
 
-      if (match) {
-        var pathBeforeSlash = match[1];
+    if (nonIdleUnblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
+    } else {
+      var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
 
-        if (pathBeforeSlash) {
-          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
-          fileName = folderName + "/" + fileName;
-        }
+      if (nonIdlePingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
       }
     }
+  } else {
+    // The only remaining work is Idle.
+    var unblockedLanes = pendingLanes & ~suspendedLanes;
 
-    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
-  } else if (ownerName) {
-    sourceInfo = " (created by " + ownerName + ")";
-  }
-
-  return "\n    in " + (name || "Unknown") + sourceInfo;
-}
-
-function describeClassComponentFrame(ctor, source, ownerFn) {
-  {
-    return describeFunctionComponentFrame(ctor, source, ownerFn);
-  }
-}
-function describeFunctionComponentFrame(fn, source, ownerFn) {
-  {
-    if (!fn) {
-      return "";
-    }
-
-    var name = fn.displayName || fn.name || null;
-    var ownerName = null;
-
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
-
-    return describeComponentFrame(name, source, ownerName);
-  }
-}
-
-function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
-  if (type == null) {
-    return "";
-  }
-
-  if (typeof type === "function") {
-    {
-      return describeFunctionComponentFrame(type, source, ownerFn);
+    if (unblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(unblockedLanes);
+    } else {
+      if (pingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(pingedLanes);
+      }
     }
   }
 
-  if (typeof type === "string") {
-    return describeBuiltInComponentFrame(type, source, ownerFn);
-  }
+  if (nextLanes === NoLanes) {
+    // This should only be reachable if we're suspended
+    // TODO: Consider warning in this path if a fallback timer is not scheduled.
+    return NoLanes;
+  } // If we're already in the middle of a render, switching lanes will interrupt
+  // it and we'll lose our progress. We should only do this if the new lanes are
+  // higher priority.
 
-  switch (type) {
-    case REACT_SUSPENSE_TYPE:
-      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
+  if (
+    wipLanes !== NoLanes &&
+    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
+    // bother waiting until the root is complete.
+    (wipLanes & suspendedLanes) === NoLanes
+  ) {
+    var nextLane = getHighestPriorityLane(nextLanes);
+    var wipLane = getHighestPriorityLane(wipLanes);
 
-    case REACT_SUSPENSE_LIST_TYPE:
-      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
+    if (
+      // Tests whether the next lane is equal or lower priority than the wip
+      // one. This works because the bits decrease in priority as you go left.
+      nextLane >= wipLane || // Default priority updates should not interrupt transition updates. The
+      // only difference between default updates and transition updates is that
+      // default updates do not support refresh transitions.
+      (nextLane === DefaultLane && (wipLane & TransitionLanes) !== NoLanes)
+    ) {
+      // Keep working on the existing in-progress tree. Do not interrupt.
+      return wipLanes;
+    }
   }
 
-  if (typeof type === "object") {
-    switch (type.$$typeof) {
-      case REACT_FORWARD_REF_TYPE:
-        return describeFunctionComponentFrame(type.render, source, ownerFn);
-
-      case REACT_MEMO_TYPE:
-        // Memo may contain any component type so we recursively resolve it.
-        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
+  if ((root.current.mode & ConcurrentUpdatesByDefaultMode) !== NoMode);
+  else if ((nextLanes & InputContinuousLane) !== NoLanes) {
+    // When updates are sync by default, we entangle continuous priority updates
+    // and default updates, so they render in the same batch. The only reason
+    // they use separate lanes is because continuous updates should interrupt
+    // transitions, but default updates should not.
+    nextLanes |= pendingLanes & DefaultLane;
+  } // Check for entangled lanes and add them to the batch.
+  //
+  // A lane is said to be entangled with another when it's not allowed to render
+  // in a batch that does not also include the other lane. Typically we do this
+  // when multiple updates have the same source, and we only want to respond to
+  // the most recent event from that source.
+  //
+  // Note that we apply entanglements *after* checking for partial work above.
+  // This means that if a lane is entangled during an interleaved event while
+  // it's already rendering, we won't interrupt it. This is intentional, since
+  // entanglement is usually "best effort": we'll try our best to render the
+  // lanes in the same batch, but it's not worth throwing out partially
+  // completed work in order to do it.
+  // TODO: Reconsider this. The counter-argument is that the partial work
+  // represents an intermediate state, which we don't want to show to the user.
+  // And by spending extra time finishing it, we're increasing the amount of
+  // time it takes to show the final state, which is what they are actually
+  // waiting for.
+  //
+  // For those exceptions where entanglement is semantically important, like
+  // useMutableSource, we should ensure that there is no partial work at the
+  // time we apply the entanglement.
 
-      case REACT_BLOCK_TYPE:
-        return describeFunctionComponentFrame(type._render, source, ownerFn);
+  var entangledLanes = root.entangledLanes;
 
-      case REACT_LAZY_TYPE: {
-        var lazyComponent = type;
-        var payload = lazyComponent._payload;
-        var init = lazyComponent._init;
+  if (entangledLanes !== NoLanes) {
+    var entanglements = root.entanglements;
+    var lanes = nextLanes & entangledLanes;
 
-        try {
-          // Lazy may contain any component type so we recursively resolve it.
-          return describeUnknownElementTypeFrameInDEV(
-            init(payload),
-            source,
-            ownerFn
-          );
-        } catch (x) {}
-      }
+    while (lanes > 0) {
+      var index = pickArbitraryLaneIndex(lanes);
+      var lane = 1 << index;
+      nextLanes |= entanglements[index];
+      lanes &= ~lane;
     }
   }
 
-  return "";
+  return nextLanes;
 }
+function getMostRecentEventTime(root, lanes) {
+  var eventTimes = root.eventTimes;
+  var mostRecentEventTime = NoTimestamp;
 
-var loggedTypeFailures = {};
-var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var eventTime = eventTimes[index];
 
-function setCurrentlyValidatingElement(element) {
-  {
-    if (element) {
-      var owner = element._owner;
-      var stack = describeUnknownElementTypeFrameInDEV(
-        element.type,
-        element._source,
-        owner ? owner.type : null
-      );
-      ReactDebugCurrentFrame.setExtraStackFrame(stack);
-    } else {
-      ReactDebugCurrentFrame.setExtraStackFrame(null);
+    if (eventTime > mostRecentEventTime) {
+      mostRecentEventTime = eventTime;
     }
-  }
-}
 
-function checkPropTypes(typeSpecs, values, location, componentName, element) {
-  {
-    // $FlowFixMe This is okay but Flow doesn't know it.
-    var has = Function.call.bind(Object.prototype.hasOwnProperty);
-
-    for (var typeSpecName in typeSpecs) {
-      if (has(typeSpecs, typeSpecName)) {
-        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
-        // fail the render phase where it didn't fail before. So we log it.
-        // After these have been cleaned up, we'll let them throw.
-
-        try {
-          // This is intentionally an invariant that gets caught. It's the same
-          // behavior as without this statement except with a better message.
-          if (typeof typeSpecs[typeSpecName] !== "function") {
-            var err = Error(
-              (componentName || "React class") +
-                ": " +
-                location +
-                " type `" +
-                typeSpecName +
-                "` is invalid; " +
-                "it must be a function, usually from the `prop-types` package, but received `" +
-                typeof typeSpecs[typeSpecName] +
-                "`." +
-                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
-            );
-            err.name = "Invariant Violation";
-            throw err;
-          }
+    lanes &= ~lane;
+  }
 
-          error$1 = typeSpecs[typeSpecName](
-            values,
-            typeSpecName,
-            componentName,
-            location,
-            null,
-            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
-          );
-        } catch (ex) {
-          error$1 = ex;
-        }
+  return mostRecentEventTime;
+}
 
-        if (error$1 && !(error$1 instanceof Error)) {
-          setCurrentlyValidatingElement(element);
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case SyncLane:
+    case InputContinuousHydrationLane:
+    case InputContinuousLane:
+      // User interactions should expire slightly more quickly.
+      //
+      // NOTE: This is set to the corresponding constant as in Scheduler.js.
+      // When we made it larger, a product metric in www regressed, suggesting
+      // there's a user interaction that's being starved by a series of
+      // synchronous updates. If that theory is correct, the proper solution is
+      // to fix the starvation. However, this scenario supports the idea that
+      // expiration times are an important safeguard when starvation
+      // does happen.
+      return currentTime + 250;
+
+    case DefaultHydrationLane:
+    case DefaultLane:
+    case TransitionHydrationLane:
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return currentTime + 5000;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      // TODO: Retries should be allowed to expire if they are CPU bound for
+      // too long, but when I made this change it caused a spike in browser
+      // crashes. There must be some other underlying bug; not super urgent but
+      // ideally should figure out why and fix it. Unfortunately we don't have
+      // a repro for the crashes, only detected via production metrics.
+      return NoTimestamp;
+
+    case SelectiveHydrationLane:
+    case IdleHydrationLane:
+    case IdleLane:
+    case OffscreenLane:
+      // Anything idle priority or lower should never expire.
+      return NoTimestamp;
 
-          error(
-            "%s: type specification of %s" +
-              " `%s` is invalid; the type checker " +
-              "function must return `null` or an `Error` but returned a %s. " +
-              "You may have forgotten to pass an argument to the type checker " +
-              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
-              "shape all require an argument).",
-            componentName || "React class",
-            location,
-            typeSpecName,
-            typeof error$1
-          );
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
+      }
 
-          setCurrentlyValidatingElement(null);
-        }
+      return NoTimestamp;
+  }
+}
 
-        if (
-          error$1 instanceof Error &&
-          !(error$1.message in loggedTypeFailures)
-        ) {
-          // Only monitor this failure once because there tends to be a lot of the
-          // same error.
-          loggedTypeFailures[error$1.message] = true;
-          setCurrentlyValidatingElement(element);
+function markStarvedLanesAsExpired(root, currentTime) {
+  // TODO: This gets called every time we yield. We can optimize by storing
+  // the earliest expiration time on the root. Then use that to quickly bail out
+  // of this function.
+  var pendingLanes = root.pendingLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes;
+  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
+  // expiration time. If so, we'll assume the update is being starved and mark
+  // it as expired to force it to finish.
 
-          error("Failed %s type: %s", location, error$1.message);
+  var lanes = pendingLanes;
 
-          setCurrentlyValidatingElement(null);
-        }
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var expirationTime = expirationTimes[index];
+
+    if (expirationTime === NoTimestamp) {
+      // Found a pending lane with no expiration time. If it's not suspended, or
+      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
+      // using the current time.
+      if (
+        (lane & suspendedLanes) === NoLanes ||
+        (lane & pingedLanes) !== NoLanes
+      ) {
+        // Assumes timestamps are monotonically increasing.
+        expirationTimes[index] = computeExpirationTime(lane, currentTime);
       }
+    } else if (expirationTime <= currentTime) {
+      // This lane expired
+      root.expiredLanes |= lane;
     }
+
+    lanes &= ~lane;
   }
-}
+} // This returns the highest priority pending lanes regardless of whether they
+function getLanesToRetrySynchronouslyOnError(root) {
+  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
 
-var valueStack = [];
-var fiberStack;
+  if (everythingButOffscreen !== NoLanes) {
+    return everythingButOffscreen;
+  }
 
-{
-  fiberStack = [];
+  if (everythingButOffscreen & OffscreenLane) {
+    return OffscreenLane;
+  }
+
+  return NoLanes;
 }
+function includesNonIdleWork(lanes) {
+  return (lanes & NonIdleLanes) !== NoLanes;
+}
+function includesOnlyRetries(lanes) {
+  return (lanes & RetryLanes) === lanes;
+}
+function includesOnlyTransitions(lanes) {
+  return (lanes & TransitionLanes) === lanes;
+}
+function shouldTimeSlice(root, lanes) {
+  if ((lanes & root.expiredLanes) !== NoLanes) {
+    // At least one of these lanes expired. To prevent additional starvation,
+    // finish rendering without yielding execution.
+    return false;
+  }
 
-var index = -1;
+  if ((root.current.mode & ConcurrentUpdatesByDefaultMode) !== NoMode) {
+    // Concurrent updates by default always use time slicing.
+    return true;
+  }
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+  var SyncDefaultLanes =
+    InputContinuousHydrationLane |
+    InputContinuousLane |
+    DefaultHydrationLane |
+    DefaultLane;
+  return (lanes & SyncDefaultLanes) === NoLanes;
 }
+function isTransitionLane(lane) {
+  return (lane & TransitionLanes) !== 0;
+}
+function claimNextTransitionLane() {
+  // Cycle through the lanes, assigning each new transition to the next lane.
+  // In most cases, this means every transition gets its own lane, until we
+  // run out of lanes and cycle back to the beginning.
+  var lane = nextTransitionLane;
+  nextTransitionLane <<= 1;
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      error("Unexpected pop.");
-    }
-
-    return;
+  if ((nextTransitionLane & TransitionLanes) === 0) {
+    nextTransitionLane = TransitionLane1;
   }
 
-  {
-    if (fiber !== fiberStack[index]) {
-      error("Unexpected Fiber popped.");
-    }
+  return lane;
+}
+function claimNextRetryLane() {
+  var lane = nextRetryLane;
+  nextRetryLane <<= 1;
+
+  if ((nextRetryLane & RetryLanes) === 0) {
+    nextRetryLane = RetryLane1;
   }
 
-  cursor.current = valueStack[index];
-  valueStack[index] = null;
+  return lane;
+}
+function getHighestPriorityLane(lanes) {
+  return lanes & -lanes;
+}
+function pickArbitraryLane(lanes) {
+  // This wrapper function gets inlined. Only exists so to communicate that it
+  // doesn't matter which bit is selected; you can pick any bit without
+  // affecting the algorithms where its used. Here I'm using
+  // getHighestPriorityLane because it requires the fewest operations.
+  return getHighestPriorityLane(lanes);
+}
 
-  {
-    fiberStack[index] = null;
-  }
+function pickArbitraryLaneIndex(lanes) {
+  return 31 - clz32(lanes);
+}
 
-  index--;
+function laneToIndex(lane) {
+  return pickArbitraryLaneIndex(lane);
 }
 
-function push(cursor, value, fiber) {
-  index++;
-  valueStack[index] = cursor.current;
+function includesSomeLane(a, b) {
+  return (a & b) !== NoLanes;
+}
+function isSubsetOfLanes(set, subset) {
+  return (set & subset) === subset;
+}
+function mergeLanes(a, b) {
+  return a | b;
+}
+function removeLanes(set, subset) {
+  return set & ~subset;
+}
+function intersectLanes(a, b) {
+  return a & b;
+} // Seems redundant, but it changes the type from a single lane (used for
+// updates) to a group of lanes (used for flushing work).
 
-  {
-    fiberStack[index] = fiber;
+function laneToLanes(lane) {
+  return lane;
+}
+function createLaneMap(initial) {
+  // Intentionally pushing one by one.
+  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
+  var laneMap = [];
+
+  for (var i = 0; i < TotalLanes; i++) {
+    laneMap.push(initial);
   }
 
-  cursor.current = value;
+  return laneMap;
 }
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane; // If there are any suspended transitions, it's possible this new update
+  // could unblock them. Clear the suspended lanes so that we can try rendering
+  // them again.
+  //
+  // TODO: We really only need to unsuspend only lanes that are in the
+  // `subtreeLanes` of the updated fiber, or the update lanes of the return
+  // path. This would exclude suspended updates in an unrelated sibling tree,
+  // since there's no way for this update to unblock it.
+  //
+  // We don't do this if the incoming update is idle, because we never process
+  // idle updates until after all the regular updates have finished; there's no
+  // way it could unblock a transition.
 
-var warnedAboutMissingGetChildContext;
+  if (updateLane !== IdleLane) {
+    root.suspendedLanes = NoLanes;
+    root.pingedLanes = NoLanes;
+  }
 
-{
-  warnedAboutMissingGetChildContext = {};
+  var eventTimes = root.eventTimes;
+  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
+  // recent event, and we assume time is monotonically increasing.
+
+  eventTimes[index] = eventTime;
 }
+function markRootSuspended(root, suspendedLanes) {
+  root.suspendedLanes |= suspendedLanes;
+  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
 
-var emptyContextObject = {};
+  var expirationTimes = root.expirationTimes;
+  var lanes = suspendedLanes;
 
-{
-  Object.freeze(emptyContextObject);
-} // A cursor to the current merged context object on the stack.
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
+  }
+}
+function markRootPinged(root, pingedLanes, eventTime) {
+  root.pingedLanes |= root.suspendedLanes & pingedLanes;
+}
+function markRootMutableRead(root, updateLane) {
+  root.mutableReadLanes |= updateLane & root.pendingLanes;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes; // Let's try everything again
 
-var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
 
-var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
+  var entanglements = root.entanglements;
+  var eventTimes = root.eventTimes;
+  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
 
-var previousContext = emptyContextObject;
+  var lanes = noLongerPendingLanes;
 
-function getUnmaskedContext(
-  workInProgress,
-  Component,
-  didPushOwnContextIfProvider
-) {
-  {
-    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
-      // If the fiber is a context provider itself, when we read its context
-      // we may have already pushed its own child context on the stack. A context
-      // provider should not "see" its own child context. Therefore we read the
-      // previous (parent) context instead for a context provider.
-      return previousContext;
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    entanglements[index] = NoLanes;
+    eventTimes[index] = NoTimestamp;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  // In addition to entangling each of the given lanes with each other, we also
+  // have to consider _transitive_ entanglements. For each lane that is already
+  // entangled with *any* of the given lanes, that lane is now transitively
+  // entangled with *all* the given lanes.
+  //
+  // Translated: If C is entangled with A, then entangling A with B also
+  // entangles C with B.
+  //
+  // If this is hard to grasp, it might help to intentionally break this
+  // function and look at the tests that fail in ReactTransition-test.js. Try
+  // commenting out one of the conditions below.
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  var entanglements = root.entanglements;
+  var lanes = rootEntangledLanes;
+
+  while (lanes) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+
+    if (
+      // Is this one of the newly entangled lanes?
+      (lane & entangledLanes) | // Is this lane transitively entangled with the newly entangled lanes?
+      (entanglements[index] & entangledLanes)
+    ) {
+      entanglements[index] |= entangledLanes;
     }
 
-    return contextStackCursor.current;
+    lanes &= ~lane;
   }
 }
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (!isDevToolsPresent) {
+    return;
+  }
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  {
-    var instance = workInProgress.stateNode;
-    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
+
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
+    updaters.add(fiber);
+    lanes &= ~lane;
   }
 }
+function movePendingFibersToMemoized(root, lanes) {
+  if (!isDevToolsPresent) {
+    return;
+  }
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  {
-    var type = workInProgress.type;
-    var contextTypes = type.contextTypes;
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
+  var memoizedUpdaters = root.memoizedUpdaters;
 
-    if (!contextTypes) {
-      return emptyContextObject;
-    } // Avoid recreating masked context unless unmasked context has changed.
-    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
 
-    var instance = workInProgress.stateNode;
+    if (updaters.size > 0) {
+      updaters.forEach(function(fiber) {
+        var alternate = fiber.alternate;
 
-    if (
-      instance &&
-      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-    ) {
-      return instance.__reactInternalMemoizedMaskedChildContext;
+        if (alternate === null || !memoizedUpdaters.has(alternate)) {
+          memoizedUpdaters.add(fiber);
+        }
+      });
+      updaters.clear();
     }
 
-    var context = {};
+    lanes &= ~lane;
+  }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
+// Based on:
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
 
-    for (var key in contextTypes) {
-      context[key] = unmaskedContext[key];
-    }
+var log = Math.log;
+var LN2 = Math.LN2;
 
-    {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(contextTypes, context, "context", name);
-    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // Context is created before the class component is instantiated so check for instance.
+function clz32Fallback(lanes) {
+  if (lanes === 0) {
+    return 32;
+  }
 
-    if (instance) {
-      cacheContext(workInProgress, unmaskedContext, context);
-    }
+  return (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
 
-    return context;
-  }
+var DiscreteEventPriority = SyncLane;
+var ContinuousEventPriority = InputContinuousLane;
+var DefaultEventPriority = DefaultLane;
+var IdleEventPriority = IdleLane;
+var currentUpdatePriority = NoLane;
+function getCurrentUpdatePriority() {
+  return currentUpdatePriority;
+}
+function setCurrentUpdatePriority(newPriority) {
+  currentUpdatePriority = newPriority;
+}
+function higherEventPriority(a, b) {
+  return a !== 0 && a < b ? a : b;
 }
+function lowerEventPriority(a, b) {
+  return a === 0 || a > b ? a : b;
+}
+function isHigherEventPriority(a, b) {
+  return a !== 0 && a < b;
+}
+function lanesToEventPriority(lanes) {
+  var lane = getHighestPriorityLane(lanes);
 
-function hasContextChanged() {
-  {
-    return didPerformWorkStackCursor.current;
+  if (!isHigherEventPriority(DiscreteEventPriority, lane)) {
+    return DiscreteEventPriority;
   }
-}
 
-function isContextProvider(type) {
-  {
-    var childContextTypes = type.childContextTypes;
-    return childContextTypes !== null && childContextTypes !== undefined;
+  if (!isHigherEventPriority(ContinuousEventPriority, lane)) {
+    return ContinuousEventPriority;
   }
-}
 
-function popContext(fiber) {
-  {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+  if (includesNonIdleWork(lane)) {
+    return DefaultEventPriority;
   }
+
+  return IdleEventPriority;
 }
 
-function popTopLevelContextObject(fiber) {
+// can re-export everything from this module.
+
+function shim() {
   {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+    throw Error(
+      "The current renderer does not support persistence. This error is likely caused by a bug in React. Please file an issue."
+    );
   }
-}
+} // Persistence (when unsupported)
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  {
-    if (!(contextStackCursor.current === emptyContextObject)) {
-      throw Error(
-        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
+var supportsPersistence = false;
+var getOffscreenContainerProps = shim;
 
-    push(contextStackCursor, context, fiber);
-    push(didPerformWorkStackCursor, didChange, fiber);
-  }
-}
+// can re-export everything from this module.
 
-function processChildContext(fiber, type, parentContext) {
+function shim$1() {
   {
-    var instance = fiber.stateNode;
-    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+    throw Error(
+      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+} // Hydration (when unsupported)
+var isSuspenseInstancePending = shim$1;
+var isSuspenseInstanceFallback = shim$1;
+var hydrateTextInstance = shim$1;
+var errorHydratingContainer = shim$1;
 
-    if (typeof instance.getChildContext !== "function") {
-      {
-        var componentName = getComponentName(type) || "Unknown";
+var getViewConfigForType =
+  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get;
+var UPDATE_SIGNAL = {};
 
-        if (!warnedAboutMissingGetChildContext[componentName]) {
-          warnedAboutMissingGetChildContext[componentName] = true;
+{
+  Object.freeze(UPDATE_SIGNAL);
+} // Counter for uniquely identifying views.
+// % 10 === 1 means it is a rootTag.
+// % 2 === 0 means it is a Fabric tag.
 
-          error(
-            "%s.childContextTypes is specified but there is no getChildContext() method " +
-              "on the instance. You can either define getChildContext() on %s or remove " +
-              "childContextTypes from it.",
-            componentName,
-            componentName
-          );
-        }
-      }
+var nextReactTag = 3;
 
-      return parentContext;
-    }
+function allocateTag() {
+  var tag = nextReactTag;
 
-    var childContext = instance.getChildContext();
+  if (tag % 10 === 1) {
+    tag += 2;
+  }
 
-    for (var contextKey in childContext) {
-      if (!(contextKey in childContextTypes)) {
-        throw Error(
-          (getComponentName(type) || "Unknown") +
-            '.getChildContext(): key "' +
-            contextKey +
-            '" is not defined in childContextTypes.'
+  nextReactTag = tag + 2;
+  return tag;
+}
+
+function recursivelyUncacheFiberNode(node) {
+  if (typeof node === "number") {
+    // Leaf node (eg text)
+    uncacheFiberNode(node);
+  } else {
+    uncacheFiberNode(node._nativeTag);
+
+    node._children.forEach(recursivelyUncacheFiberNode);
+  }
+}
+function appendInitialChild(parentInstance, child) {
+  parentInstance._children.push(child);
+}
+function createInstance(
+  type,
+  props,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  var tag = allocateTag();
+  var viewConfig = getViewConfigForType(type);
+
+  {
+    for (var key in viewConfig.validAttributes) {
+      if (props.hasOwnProperty(key)) {
+        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
+          props[key]
         );
       }
     }
+  }
+
+  var updatePayload = create(props, viewConfig.validAttributes);
+  ReactNativePrivateInterface.UIManager.createView(
+    tag, // reactTag
+    viewConfig.uiViewClassName, // viewName
+    rootContainerInstance, // rootTag
+    updatePayload // props
+  );
+  var component = new ReactNativeFiberHostComponent(
+    tag,
+    viewConfig,
+    internalInstanceHandle
+  );
+  precacheFiberNode(internalInstanceHandle, tag);
+  updateFiberProps(tag, props); // Not sure how to avoid this cast. Flow is okay if the component is defined
+  // in the same file but if it's external it can't see the types.
+
+  return component;
+}
+function createTextInstance(
+  text,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  if (!hostContext.isInAParentText) {
+    throw Error("Text strings must be rendered within a <Text> component.");
+  }
 
+  var tag = allocateTag();
+  ReactNativePrivateInterface.UIManager.createView(
+    tag, // reactTag
+    "RCTRawText", // viewName
+    rootContainerInstance, // rootTag
     {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(childContextTypes, childContext, "child context", name);
-    }
+      text: text
+    } // props
+  );
+  precacheFiberNode(internalInstanceHandle, tag);
+  return tag;
+}
+function finalizeInitialChildren(
+  parentInstance,
+  type,
+  props,
+  rootContainerInstance,
+  hostContext
+) {
+  // Don't send a no-op message over the bridge.
+  if (parentInstance._children.length === 0) {
+    return false;
+  } // Map from child objects to native tags.
+  // Either way we need to pass a copy of the Array to prevent it from being frozen.
+
+  var nativeTags = parentInstance._children.map(function(child) {
+    return typeof child === "number"
+      ? child // Leaf node (eg text)
+      : child._nativeTag;
+  });
+
+  ReactNativePrivateInterface.UIManager.setChildren(
+    parentInstance._nativeTag, // containerTag
+    nativeTags // reactTags
+  );
+  return false;
+}
+function getRootHostContext(rootContainerInstance) {
+  return {
+    isInAParentText: false
+  };
+}
+function getChildHostContext(parentHostContext, type, rootContainerInstance) {
+  var prevIsInAParentText = parentHostContext.isInAParentText;
+  var isInAParentText =
+    type === "AndroidTextInput" || // Android
+    type === "RCTMultilineTextInputView" || // iOS
+    type === "RCTSinglelineTextInputView" || // iOS
+    type === "RCTText" ||
+    type === "RCTVirtualText";
 
-    return Object.assign({}, parentContext, childContext);
+  if (prevIsInAParentText !== isInAParentText) {
+    return {
+      isInAParentText: isInAParentText
+    };
+  } else {
+    return parentHostContext;
   }
 }
+function getPublicInstance(instance) {
+  return instance;
+}
+function prepareForCommit(containerInfo) {
+  // Noop
+  return null;
+}
+function prepareUpdate(
+  instance,
+  type,
+  oldProps,
+  newProps,
+  rootContainerInstance,
+  hostContext
+) {
+  return UPDATE_SIGNAL;
+}
+function resetAfterCommit(containerInfo) {
+  // Noop
+}
+var scheduleTimeout = setTimeout;
+var cancelTimeout = clearTimeout;
+var noTimeout = -1;
+function shouldSetTextContent(type, props) {
+  // TODO (bvaughn) Revisit this decision.
+  // Always returning false simplifies the createInstance() implementation,
+  // But creates an additional child Fiber for raw text children.
+  // No additional native views are created though.
+  // It's not clear to me which is better so I'm deferring for now.
+  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
+  return false;
+}
+function getCurrentEventPriority() {
+  return DefaultEventPriority;
+} // -------------------
+function appendChild(parentInstance, child) {
+  var childTag = typeof child === "number" ? child : child._nativeTag;
+  var children = parentInstance._children;
+  var index = children.indexOf(child);
 
-function pushContextProvider(workInProgress) {
-  {
-    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
-    // If the instance does not exist yet, we will push null at first,
-    // and replace it on the stack later when invalidating the context.
-
-    var memoizedMergedChildContext =
-      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-      emptyContextObject; // Remember the parent context so we can merge with it later.
-    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-
-    previousContext = contextStackCursor.current;
-    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-    push(
-      didPerformWorkStackCursor,
-      didPerformWorkStackCursor.current,
-      workInProgress
+  if (index >= 0) {
+    children.splice(index, 1);
+    children.push(child);
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerTag
+      [index], // moveFromIndices
+      [children.length - 1], // moveToIndices
+      [], // addChildReactTags
+      [], // addAtIndices
+      [] // removeAtIndices
+    );
+  } else {
+    children.push(child);
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerTag
+      [], // moveFromIndices
+      [], // moveToIndices
+      [childTag], // addChildReactTags
+      [children.length - 1], // addAtIndices
+      [] // removeAtIndices
     );
-    return true;
   }
 }
-
-function invalidateContextProvider(workInProgress, type, didChange) {
-  {
-    var instance = workInProgress.stateNode;
-
-    if (!instance) {
-      throw Error(
-        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
-
-    if (didChange) {
-      // Merge parent and own context.
-      // Skip this if we're not updating due to sCU.
-      // This avoids unnecessarily recomputing memoized values.
-      var mergedContext = processChildContext(
-        workInProgress,
-        type,
-        previousContext
-      );
-      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
-      // It is important to unwind the context in the reverse order.
-
-      pop(didPerformWorkStackCursor, workInProgress);
-      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
-
-      push(contextStackCursor, mergedContext, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    } else {
-      pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    }
-  }
+function appendChildToContainer(parentInstance, child) {
+  var childTag = typeof child === "number" ? child : child._nativeTag;
+  ReactNativePrivateInterface.UIManager.setChildren(
+    parentInstance, // containerTag
+    [childTag] // reactTags
+  );
 }
-
-function findCurrentUnmaskedContext(fiber) {
-  {
-    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-    // makes sense elsewhere
-    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
-      throw Error(
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
-
-    var node = fiber;
-
-    do {
-      switch (node.tag) {
-        case HostRoot:
-          return node.stateNode.context;
-
-        case ClassComponent: {
-          var Component = node.type;
-
-          if (isContextProvider(Component)) {
-            return node.stateNode.__reactInternalMemoizedMergedChildContext;
-          }
-
-          break;
-        }
-      }
-
-      node = node.return;
-    } while (node !== null);
-
+function commitTextUpdate(textInstance, oldText, newText) {
+  ReactNativePrivateInterface.UIManager.updateView(
+    textInstance, // reactTag
+    "RCTRawText", // viewName
     {
-      throw Error(
-        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
-  }
+      text: newText
+    } // props
+  );
 }
+function commitUpdate(
+  instance,
+  updatePayloadTODO,
+  type,
+  oldProps,
+  newProps,
+  internalInstanceHandle
+) {
+  var viewConfig = instance.viewConfig;
+  updateFiberProps(instance._nativeTag, newProps);
+  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // Avoid the overhead of bridge calls if there's no update.
+  // This is an expensive no-op for Android, and causes an unnecessary
+  // view invalidation for certain components (eg RCTTextInput) on iOS.
 
-var LegacyRoot = 0;
-var BlockingRoot = 1;
-var ConcurrentRoot = 2;
-
-var rendererID = null;
-var injectedHook = null;
-var hasLoggedError = false;
-var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
+  if (updatePayload != null) {
+    ReactNativePrivateInterface.UIManager.updateView(
+      instance._nativeTag, // reactTag
+      viewConfig.uiViewClassName, // viewName
+      updatePayload // props
+    );
   }
+}
+function insertBefore(parentInstance, child, beforeChild) {
+  var children = parentInstance._children;
+  var index = children.indexOf(child); // Move existing child or add new child?
 
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (index >= 0) {
+    children.splice(index, 1);
+    var beforeChildIndex = children.indexOf(beforeChild);
+    children.splice(beforeChildIndex, 0, child);
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerID
+      [index], // moveFromIndices
+      [beforeChildIndex], // moveToIndices
+      [], // addChildReactTags
+      [], // addAtIndices
+      [] // removeAtIndices
+    );
+  } else {
+    var _beforeChildIndex = children.indexOf(beforeChild);
 
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
+    children.splice(_beforeChildIndex, 0, child);
+    var childTag = typeof child === "number" ? child : child._nativeTag;
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerID
+      [], // moveFromIndices
+      [], // moveToIndices
+      [childTag], // addChildReactTags
+      [_beforeChildIndex], // addAtIndices
+      [] // removeAtIndices
+    );
   }
-
-  if (!hook.supportsFiber) {
-    {
-      error(
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://reactjs.org/link/react-devtools"
-      );
-    } // DevTools exists, even though it doesn't support Fiber.
-
-    return true;
+}
+function insertInContainerBefore(parentInstance, child, beforeChild) {
+  // TODO (bvaughn): Remove this check when...
+  // We create a wrapper object for the container in ReactNative render()
+  // Or we refactor to remove wrapper objects entirely.
+  // For more info on pros/cons see PR #8560 description.
+  if (!(typeof parentInstance !== "number")) {
+    throw Error("Container does not support insertBefore operation");
   }
-
-  try {
-    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
-
-    injectedHook = hook;
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
+}
+function removeChild(parentInstance, child) {
+  recursivelyUncacheFiberNode(child);
+  var children = parentInstance._children;
+  var index = children.indexOf(child);
+  children.splice(index, 1);
+  ReactNativePrivateInterface.UIManager.manageChildren(
+    parentInstance._nativeTag, // containerID
+    [], // moveFromIndices
+    [], // moveToIndices
+    [], // addChildReactTags
+    [], // addAtIndices
+    [index] // removeAtIndices
+  );
+}
+function removeChildFromContainer(parentInstance, child) {
+  recursivelyUncacheFiberNode(child);
+  ReactNativePrivateInterface.UIManager.manageChildren(
+    parentInstance, // containerID
+    [], // moveFromIndices
+    [], // moveToIndices
+    [], // addChildReactTags
+    [], // addAtIndices
+    [0] // removeAtIndices
+  );
+}
+function resetTextContent(instance) {
+  // Noop
+}
+function hideInstance(instance) {
+  var viewConfig = instance.viewConfig;
+  var updatePayload = create(
     {
-      error("React instrumentation encountered an error: %s.", err);
-    }
-  } // DevTools exists
-
-  return true;
+      style: {
+        display: "none"
+      }
+    },
+    viewConfig.validAttributes
+  );
+  ReactNativePrivateInterface.UIManager.updateView(
+    instance._nativeTag,
+    viewConfig.uiViewClassName,
+    updatePayload
+  );
 }
-function onScheduleRoot(root, children) {
-  {
-    if (
-      injectedHook &&
-      typeof injectedHook.onScheduleFiberRoot === "function"
-    ) {
-      try {
-        injectedHook.onScheduleFiberRoot(rendererID, root, children);
-      } catch (err) {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
-
-          error("React instrumentation encountered an error: %s", err);
+function hideTextInstance(textInstance) {
+  throw new Error("Not yet implemented.");
+}
+function unhideInstance(instance, props) {
+  var viewConfig = instance.viewConfig;
+  var updatePayload = diff(
+    Object.assign({}, props, {
+      style: [
+        props.style,
+        {
+          display: "none"
         }
-      }
-    }
-  }
+      ]
+    }),
+    props,
+    viewConfig.validAttributes
+  );
+  ReactNativePrivateInterface.UIManager.updateView(
+    instance._nativeTag,
+    viewConfig.uiViewClassName,
+    updatePayload
+  );
+}
+function clearContainer(container) {
+  // TODO Implement this for React Native
+  // UIManager does not expose a "remove all" type method.
+}
+function unhideTextInstance(textInstance, text) {
+  throw new Error("Not yet implemented.");
+}
+function makeClientIdInDEV(warnOnAccessInDEV) {
+  throw new Error("Not yet implemented");
+}
+function preparePortalMount(portalInstance) {
+  // noop
 }
-function onCommitRoot(root, priorityLevel) {
-  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
-    try {
-      var didError = (root.current.flags & DidCapture) === DidCapture;
 
-      if (enableProfilerTimer) {
-        injectedHook.onCommitFiberRoot(
-          rendererID,
-          root,
-          priorityLevel,
-          didError
-        );
-      } else {
-        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
-      }
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
+// Helpers to patch console.logs to avoid logging during side-effect free
+// replaying on render function. This currently only patches the object
+// lazily which won't cover if the log function was extracted eagerly.
+// We could also eagerly patch the method.
+var disabledDepth = 0;
+var prevLog;
+var prevInfo;
+var prevWarn;
+var prevError;
+var prevGroup;
+var prevGroupCollapsed;
+var prevGroupEnd;
 
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
-    }
-  }
-}
-function onCommitUnmount(fiber) {
-  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
-    try {
-      injectedHook.onCommitFiberUnmount(rendererID, fiber);
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
+function disabledLog() {}
 
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
-    }
-  }
-}
+disabledLog.__reactDisabledLog = true;
+function disableLogs() {
+  {
+    if (disabledDepth === 0) {
+      /* eslint-disable react-internal/no-production-logging */
+      prevLog = console.log;
+      prevInfo = console.info;
+      prevWarn = console.warn;
+      prevError = console.error;
+      prevGroup = console.group;
+      prevGroupCollapsed = console.groupCollapsed;
+      prevGroupEnd = console.groupEnd; // https://github.com/facebook/react/issues/19099
 
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_now = Scheduler.unstable_now;
+      var props = {
+        configurable: true,
+        enumerable: true,
+        value: disabledLog,
+        writable: true
+      }; // $FlowFixMe Flow thinks console is immutable.
 
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-    );
+      Object.defineProperties(console, {
+        info: props,
+        log: props,
+        warn: props,
+        error: props,
+        group: props,
+        groupCollapsed: props,
+        groupEnd: props
+      });
+      /* eslint-enable react-internal/no-production-logging */
+    }
+
+    disabledDepth++;
   }
 }
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
-
-var ImmediatePriority = 99;
-var UserBlockingPriority = 98;
-var NormalPriority = 97;
-var LowPriority = 96;
-var IdlePriority = 95; // NoPriority is the absence of priority. Also React-only.
-
-var NoPriority = 90;
-var initialTimeMs = Scheduler_now(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-
-var SyncLanePriority = 15;
-var SyncBatchedLanePriority = 14;
-var InputDiscreteHydrationLanePriority = 13;
-var InputDiscreteLanePriority = 12;
-var InputContinuousHydrationLanePriority = 11;
-var InputContinuousLanePriority = 10;
-var DefaultHydrationLanePriority = 9;
-var DefaultLanePriority = 8;
-var TransitionHydrationPriority = 7;
-var TransitionPriority = 6;
-var RetryLanePriority = 5;
-var SelectiveHydrationLanePriority = 4;
-var IdleHydrationLanePriority = 3;
-var IdleLanePriority = 2;
-var OffscreenLanePriority = 1;
-var NoLanePriority = 0;
-var TotalLanes = 31;
-var NoLanes =
-  /*                        */
-  0;
-var NoLane =
-  /*                          */
-  0;
-var SyncLane =
-  /*                        */
-  1;
-var SyncBatchedLane =
-  /*                 */
-  2;
-var InputDiscreteHydrationLane =
-  /*      */
-  4;
-var InputDiscreteLanes =
-  /*                    */
-  24;
-var InputContinuousHydrationLane =
-  /*           */
-  32;
-var InputContinuousLanes =
-  /*                  */
-  192;
-var DefaultHydrationLane =
-  /*            */
-  256;
-var DefaultLanes =
-  /*                   */
-  3584;
-var TransitionHydrationLane =
-  /*                */
-  4096;
-var TransitionLanes =
-  /*                       */
-  4186112;
-var RetryLanes =
-  /*                            */
-  62914560;
-var SomeRetryLane =
-  /*                  */
-  33554432;
-var SelectiveHydrationLane =
-  /*          */
-  67108864;
-var NonIdleLanes =
-  /*                                 */
-  134217727;
-var IdleHydrationLane =
-  /*               */
-  134217728;
-var IdleLanes =
-  /*                             */
-  805306368;
-var OffscreenLane =
-  /*                   */
-  1073741824;
-var NoTimestamp = -1;
-// Used by getHighestPriorityLanes and getNextLanes:
+function reenableLogs() {
+  {
+    disabledDepth--;
 
-var return_highestLanePriority = DefaultLanePriority;
+    if (disabledDepth === 0) {
+      /* eslint-disable react-internal/no-production-logging */
+      var props = {
+        configurable: true,
+        enumerable: true,
+        writable: true
+      }; // $FlowFixMe Flow thinks console is immutable.
 
-function getHighestPriorityLanes(lanes) {
-  if ((SyncLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncLanePriority;
-    return SyncLane;
-  }
+      Object.defineProperties(console, {
+        log: Object.assign({}, props, {
+          value: prevLog
+        }),
+        info: Object.assign({}, props, {
+          value: prevInfo
+        }),
+        warn: Object.assign({}, props, {
+          value: prevWarn
+        }),
+        error: Object.assign({}, props, {
+          value: prevError
+        }),
+        group: Object.assign({}, props, {
+          value: prevGroup
+        }),
+        groupCollapsed: Object.assign({}, props, {
+          value: prevGroupCollapsed
+        }),
+        groupEnd: Object.assign({}, props, {
+          value: prevGroupEnd
+        })
+      });
+      /* eslint-enable react-internal/no-production-logging */
+    }
 
-  if ((SyncBatchedLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncBatchedLanePriority;
-    return SyncBatchedLane;
+    if (disabledDepth < 0) {
+      error(
+        "disabledDepth fell below zero. " +
+          "This is a bug in React. Please file an issue."
+      );
+    }
   }
+}
 
-  if ((InputDiscreteHydrationLane & lanes) !== NoLanes) {
-    return_highestLanePriority = InputDiscreteHydrationLanePriority;
-    return InputDiscreteHydrationLane;
-  }
+var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
+function describeBuiltInComponentFrame(name, source, ownerFn) {
+  {
+    var ownerName = null;
 
-  var inputDiscreteLanes = InputDiscreteLanes & lanes;
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
+    }
 
-  if (inputDiscreteLanes !== NoLanes) {
-    return_highestLanePriority = InputDiscreteLanePriority;
-    return inputDiscreteLanes;
+    return describeComponentFrame(name, source, ownerName);
   }
+}
+var componentFrameCache;
 
-  if ((lanes & InputContinuousHydrationLane) !== NoLanes) {
-    return_highestLanePriority = InputContinuousHydrationLanePriority;
-    return InputContinuousHydrationLane;
-  }
+{
+  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
+  componentFrameCache = new PossiblyWeakMap();
+}
+var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
 
-  var inputContinuousLanes = InputContinuousLanes & lanes;
+function describeComponentFrame(name, source, ownerName) {
+  var sourceInfo = "";
 
-  if (inputContinuousLanes !== NoLanes) {
-    return_highestLanePriority = InputContinuousLanePriority;
-    return inputContinuousLanes;
-  }
+  if (source) {
+    var path = source.fileName;
+    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
+    // prefer "folder/index.js" instead of just "index.js".
 
-  if ((lanes & DefaultHydrationLane) !== NoLanes) {
-    return_highestLanePriority = DefaultHydrationLanePriority;
-    return DefaultHydrationLane;
-  }
+    if (/^index\./.test(fileName)) {
+      var match = path.match(BEFORE_SLASH_RE);
 
-  var defaultLanes = DefaultLanes & lanes;
+      if (match) {
+        var pathBeforeSlash = match[1];
 
-  if (defaultLanes !== NoLanes) {
-    return_highestLanePriority = DefaultLanePriority;
-    return defaultLanes;
-  }
+        if (pathBeforeSlash) {
+          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
+          fileName = folderName + "/" + fileName;
+        }
+      }
+    }
 
-  if ((lanes & TransitionHydrationLane) !== NoLanes) {
-    return_highestLanePriority = TransitionHydrationPriority;
-    return TransitionHydrationLane;
+    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
+  } else if (ownerName) {
+    sourceInfo = " (created by " + ownerName + ")";
   }
 
-  var transitionLanes = TransitionLanes & lanes;
+  return "\n    in " + (name || "Unknown") + sourceInfo;
+}
 
-  if (transitionLanes !== NoLanes) {
-    return_highestLanePriority = TransitionPriority;
-    return transitionLanes;
+function describeClassComponentFrame(ctor, source, ownerFn) {
+  {
+    return describeFunctionComponentFrame(ctor, source, ownerFn);
   }
+}
+function describeFunctionComponentFrame(fn, source, ownerFn) {
+  {
+    if (!fn) {
+      return "";
+    }
 
-  var retryLanes = RetryLanes & lanes;
+    var name = fn.displayName || fn.name || null;
+    var ownerName = null;
 
-  if (retryLanes !== NoLanes) {
-    return_highestLanePriority = RetryLanePriority;
-    return retryLanes;
-  }
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
+    }
 
-  if (lanes & SelectiveHydrationLane) {
-    return_highestLanePriority = SelectiveHydrationLanePriority;
-    return SelectiveHydrationLane;
+    return describeComponentFrame(name, source, ownerName);
   }
+}
 
-  if ((lanes & IdleHydrationLane) !== NoLanes) {
-    return_highestLanePriority = IdleHydrationLanePriority;
-    return IdleHydrationLane;
+function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
+  if (type == null) {
+    return "";
   }
 
-  var idleLanes = IdleLanes & lanes;
-
-  if (idleLanes !== NoLanes) {
-    return_highestLanePriority = IdleLanePriority;
-    return idleLanes;
+  if (typeof type === "function") {
+    {
+      return describeFunctionComponentFrame(type, source, ownerFn);
+    }
   }
 
-  if ((OffscreenLane & lanes) !== NoLanes) {
-    return_highestLanePriority = OffscreenLanePriority;
-    return OffscreenLane;
+  if (typeof type === "string") {
+    return describeBuiltInComponentFrame(type, source, ownerFn);
   }
 
-  {
-    error("Should have found matching lanes. This is a bug in React.");
-  } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
-
-  return_highestLanePriority = DefaultLanePriority;
-  return lanes;
-}
-
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case ImmediatePriority:
-      return SyncLanePriority;
-
-    case UserBlockingPriority:
-      return InputContinuousLanePriority;
-
-    case NormalPriority:
-    case LowPriority:
-      // TODO: Handle LowSchedulerPriority, somehow. Maybe the same lane as hydration.
-      return DefaultLanePriority;
-
-    case IdlePriority:
-      return IdleLanePriority;
+  switch (type) {
+    case REACT_SUSPENSE_TYPE:
+      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
 
-    default:
-      return NoLanePriority;
+    case REACT_SUSPENSE_LIST_TYPE:
+      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
   }
-}
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case SyncLanePriority:
-    case SyncBatchedLanePriority:
-      return ImmediatePriority;
-
-    case InputDiscreteHydrationLanePriority:
-    case InputDiscreteLanePriority:
-    case InputContinuousHydrationLanePriority:
-    case InputContinuousLanePriority:
-      return UserBlockingPriority;
 
-    case DefaultHydrationLanePriority:
-    case DefaultLanePriority:
-    case TransitionHydrationPriority:
-    case TransitionPriority:
-    case SelectiveHydrationLanePriority:
-    case RetryLanePriority:
-      return NormalPriority;
+  if (typeof type === "object") {
+    switch (type.$$typeof) {
+      case REACT_FORWARD_REF_TYPE:
+        return describeFunctionComponentFrame(type.render, source, ownerFn);
 
-    case IdleHydrationLanePriority:
-    case IdleLanePriority:
-    case OffscreenLanePriority:
-      return IdlePriority;
+      case REACT_MEMO_TYPE:
+        // Memo may contain any component type so we recursively resolve it.
+        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
 
-    case NoLanePriority:
-      return NoPriority;
+      case REACT_LAZY_TYPE: {
+        var lazyComponent = type;
+        var payload = lazyComponent._payload;
+        var init = lazyComponent._init;
 
-    default: {
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
+        try {
+          // Lazy may contain any component type so we recursively resolve it.
+          return describeUnknownElementTypeFrameInDEV(
+            init(payload),
+            source,
+            ownerFn
+          );
+        } catch (x) {}
+      }
     }
   }
-}
-function getNextLanes(root, wipLanes) {
-  // Early bailout if there's no pending work left.
-  var pendingLanes = root.pendingLanes;
-
-  if (pendingLanes === NoLanes) {
-    return_highestLanePriority = NoLanePriority;
-    return NoLanes;
-  }
-
-  var nextLanes = NoLanes;
-  var nextLanePriority = NoLanePriority;
-  var expiredLanes = root.expiredLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes; // Check if any work has expired.
 
-  if (expiredLanes !== NoLanes) {
-    nextLanes = expiredLanes;
-    nextLanePriority = return_highestLanePriority = SyncLanePriority;
-  } else {
-    // Do not work on any idle work until all the non-idle work has finished,
-    // even if the work is suspended.
-    var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
+  return "";
+}
 
-    if (nonIdlePendingLanes !== NoLanes) {
-      var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 
-      if (nonIdleUnblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
+var loggedTypeFailures = {};
+var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
 
-        if (nonIdlePingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
-          nextLanePriority = return_highestLanePriority;
-        }
-      }
+function setCurrentlyValidatingElement(element) {
+  {
+    if (element) {
+      var owner = element._owner;
+      var stack = describeUnknownElementTypeFrameInDEV(
+        element.type,
+        element._source,
+        owner ? owner.type : null
+      );
+      ReactDebugCurrentFrame.setExtraStackFrame(stack);
     } else {
-      // The only remaining work is Idle.
-      var unblockedLanes = pendingLanes & ~suspendedLanes;
-
-      if (unblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(unblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        if (pingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(pingedLanes);
-          nextLanePriority = return_highestLanePriority;
-        }
-      }
+      ReactDebugCurrentFrame.setExtraStackFrame(null);
     }
   }
+}
 
-  if (nextLanes === NoLanes) {
-    // This should only be reachable if we're suspended
-    // TODO: Consider warning in this path if a fallback timer is not scheduled.
-    return NoLanes;
-  } // If there are higher priority lanes, we'll include them even if they
-  // are suspended.
-
-  nextLanes = pendingLanes & getEqualOrHigherPriorityLanes(nextLanes); // If we're already in the middle of a render, switching lanes will interrupt
-  // it and we'll lose our progress. We should only do this if the new lanes are
-  // higher priority.
+function checkPropTypes(typeSpecs, values, location, componentName, element) {
+  {
+    // $FlowFixMe This is okay but Flow doesn't know it.
+    var has = Function.call.bind(hasOwnProperty);
 
-  if (
-    wipLanes !== NoLanes &&
-    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
-    // bother waiting until the root is complete.
-    (wipLanes & suspendedLanes) === NoLanes
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    var wipLanePriority = return_highestLanePriority;
+    for (var typeSpecName in typeSpecs) {
+      if (has(typeSpecs, typeSpecName)) {
+        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
+        // fail the render phase where it didn't fail before. So we log it.
+        // After these have been cleaned up, we'll let them throw.
 
-    if (nextLanePriority <= wipLanePriority) {
-      return wipLanes;
-    } else {
-      return_highestLanePriority = nextLanePriority;
-    }
-  } // Check for entangled lanes and add them to the batch.
-  //
-  // A lane is said to be entangled with another when it's not allowed to render
-  // in a batch that does not also include the other lane. Typically we do this
-  // when multiple updates have the same source, and we only want to respond to
-  // the most recent event from that source.
-  //
-  // Note that we apply entanglements *after* checking for partial work above.
-  // This means that if a lane is entangled during an interleaved event while
-  // it's already rendering, we won't interrupt it. This is intentional, since
-  // entanglement is usually "best effort": we'll try our best to render the
-  // lanes in the same batch, but it's not worth throwing out partially
-  // completed work in order to do it.
-  //
-  // For those exceptions where entanglement is semantically important, like
-  // useMutableSource, we should ensure that there is no partial work at the
-  // time we apply the entanglement.
+        try {
+          // This is intentionally an invariant that gets caught. It's the same
+          // behavior as without this statement except with a better message.
+          if (typeof typeSpecs[typeSpecName] !== "function") {
+            var err = Error(
+              (componentName || "React class") +
+                ": " +
+                location +
+                " type `" +
+                typeSpecName +
+                "` is invalid; " +
+                "it must be a function, usually from the `prop-types` package, but received `" +
+                typeof typeSpecs[typeSpecName] +
+                "`." +
+                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
+            );
+            err.name = "Invariant Violation";
+            throw err;
+          }
 
-  var entangledLanes = root.entangledLanes;
+          error$1 = typeSpecs[typeSpecName](
+            values,
+            typeSpecName,
+            componentName,
+            location,
+            null,
+            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
+          );
+        } catch (ex) {
+          error$1 = ex;
+        }
 
-  if (entangledLanes !== NoLanes) {
-    var entanglements = root.entanglements;
-    var lanes = nextLanes & entangledLanes;
+        if (error$1 && !(error$1 instanceof Error)) {
+          setCurrentlyValidatingElement(element);
 
-    while (lanes > 0) {
-      var index = pickArbitraryLaneIndex(lanes);
-      var lane = 1 << index;
-      nextLanes |= entanglements[index];
-      lanes &= ~lane;
-    }
-  }
+          error(
+            "%s: type specification of %s" +
+              " `%s` is invalid; the type checker " +
+              "function must return `null` or an `Error` but returned a %s. " +
+              "You may have forgotten to pass an argument to the type checker " +
+              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
+              "shape all require an argument).",
+            componentName || "React class",
+            location,
+            typeSpecName,
+            typeof error$1
+          );
 
-  return nextLanes;
-}
-function getMostRecentEventTime(root, lanes) {
-  var eventTimes = root.eventTimes;
-  var mostRecentEventTime = NoTimestamp;
+          setCurrentlyValidatingElement(null);
+        }
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var eventTime = eventTimes[index];
+        if (
+          error$1 instanceof Error &&
+          !(error$1.message in loggedTypeFailures)
+        ) {
+          // Only monitor this failure once because there tends to be a lot of the
+          // same error.
+          loggedTypeFailures[error$1.message] = true;
+          setCurrentlyValidatingElement(element);
 
-    if (eventTime > mostRecentEventTime) {
-      mostRecentEventTime = eventTime;
-    }
+          error("Failed %s type: %s", location, error$1.message);
 
-    lanes &= ~lane;
+          setCurrentlyValidatingElement(null);
+        }
+      }
+    }
   }
-
-  return mostRecentEventTime;
 }
 
-function computeExpirationTime(lane, currentTime) {
-  // TODO: Expiration heuristic is constant per lane, so could use a map.
-  getHighestPriorityLanes(lane);
-  var priority = return_highestLanePriority;
+var valueStack = [];
+var fiberStack;
 
-  if (priority >= InputContinuousLanePriority) {
-    // User interactions should expire slightly more quickly.
-    //
-    // NOTE: This is set to the corresponding constant as in Scheduler.js. When
-    // we made it larger, a product metric in www regressed, suggesting there's
-    // a user interaction that's being starved by a series of synchronous
-    // updates. If that theory is correct, the proper solution is to fix the
-    // starvation. However, this scenario supports the idea that expiration
-    // times are an important safeguard when starvation does happen.
-    //
-    // Also note that, in the case of user input specifically, this will soon no
-    // longer be an issue because we plan to make user input synchronous by
-    // default (until you enter `startTransition`, of course.)
-    //
-    // If weren't planning to make these updates synchronous soon anyway, I
-    // would probably make this number a configurable parameter.
-    return currentTime + 250;
-  } else if (priority >= TransitionPriority) {
-    return currentTime + 5000;
-  } else {
-    // Anything idle priority or lower should never expire.
-    return NoTimestamp;
-  }
+{
+  fiberStack = [];
 }
 
-function markStarvedLanesAsExpired(root, currentTime) {
-  // TODO: This gets called every time we yield. We can optimize by storing
-  // the earliest expiration time on the root. Then use that to quickly bail out
-  // of this function.
-  var pendingLanes = root.pendingLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes;
-  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
-  // expiration time. If so, we'll assume the update is being starved and mark
-  // it as expired to force it to finish.
-
-  var lanes = pendingLanes;
+var index = -1;
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var expirationTime = expirationTimes[index];
+function createCursor(defaultValue) {
+  return {
+    current: defaultValue
+  };
+}
 
-    if (expirationTime === NoTimestamp) {
-      // Found a pending lane with no expiration time. If it's not suspended, or
-      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
-      // using the current time.
-      if (
-        (lane & suspendedLanes) === NoLanes ||
-        (lane & pingedLanes) !== NoLanes
-      ) {
-        // Assumes timestamps are monotonically increasing.
-        expirationTimes[index] = computeExpirationTime(lane, currentTime);
-      }
-    } else if (expirationTime <= currentTime) {
-      // This lane expired
-      root.expiredLanes |= lane;
+function pop(cursor, fiber) {
+  if (index < 0) {
+    {
+      error("Unexpected pop.");
     }
 
-    lanes &= ~lane;
+    return;
   }
-} // This returns the highest priority pending lanes regardless of whether they
-function getLanesToRetrySynchronouslyOnError(root) {
-  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
 
-  if (everythingButOffscreen !== NoLanes) {
-    return everythingButOffscreen;
+  {
+    if (fiber !== fiberStack[index]) {
+      error("Unexpected Fiber popped.");
+    }
   }
 
-  if (everythingButOffscreen & OffscreenLane) {
-    return OffscreenLane;
+  cursor.current = valueStack[index];
+  valueStack[index] = null;
+
+  {
+    fiberStack[index] = null;
   }
 
-  return NoLanes;
-}
-function returnNextLanesPriority() {
-  return return_highestLanePriority;
-}
-function includesNonIdleWork(lanes) {
-  return (lanes & NonIdleLanes) !== NoLanes;
-}
-function includesOnlyRetries(lanes) {
-  return (lanes & RetryLanes) === lanes;
+  index--;
 }
-function includesOnlyTransitions(lanes) {
-  return (lanes & TransitionLanes) === lanes;
-} // To ensure consistency across multiple updates in the same event, this should
-// be a pure function, so that it always returns the same lane for given inputs.
-
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case NoLanePriority:
-      break;
 
-    case SyncLanePriority:
-      return SyncLane;
-
-    case SyncBatchedLanePriority:
-      return SyncBatchedLane;
+function push(cursor, value, fiber) {
+  index++;
+  valueStack[index] = cursor.current;
 
-    case InputDiscreteLanePriority: {
-      var _lane = pickArbitraryLane(InputDiscreteLanes & ~wipLanes);
+  {
+    fiberStack[index] = fiber;
+  }
 
-      if (_lane === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(InputContinuousLanePriority, wipLanes);
-      }
+  cursor.current = value;
+}
 
-      return _lane;
-    }
+var warnedAboutMissingGetChildContext;
 
-    case InputContinuousLanePriority: {
-      var _lane2 = pickArbitraryLane(InputContinuousLanes & ~wipLanes);
+{
+  warnedAboutMissingGetChildContext = {};
+}
 
-      if (_lane2 === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(DefaultLanePriority, wipLanes);
-      }
+var emptyContextObject = {};
 
-      return _lane2;
-    }
+{
+  Object.freeze(emptyContextObject);
+} // A cursor to the current merged context object on the stack.
 
-    case DefaultLanePriority: {
-      var _lane3 = pickArbitraryLane(DefaultLanes & ~wipLanes);
+var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
 
-      if (_lane3 === NoLane) {
-        // If all the default lanes are already being worked on, look for a
-        // lane in the transition range.
-        _lane3 = pickArbitraryLane(TransitionLanes & ~wipLanes);
+var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
+// We use this to get access to the parent context after we have already
+// pushed the next context provider, and now need to merge their contexts.
 
-        if (_lane3 === NoLane) {
-          // All the transition lanes are taken, too. This should be very
-          // rare, but as a last resort, pick a default lane. This will have
-          // the effect of interrupting the current work-in-progress render.
-          _lane3 = pickArbitraryLane(DefaultLanes);
-        }
-      }
+var previousContext = emptyContextObject;
 
-      return _lane3;
+function getUnmaskedContext(
+  workInProgress,
+  Component,
+  didPushOwnContextIfProvider
+) {
+  {
+    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
+      // If the fiber is a context provider itself, when we read its context
+      // we may have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
     }
 
-    case TransitionPriority: // Should be handled by findTransitionLane instead
-
-    case RetryLanePriority:
-      // Should be handled by findRetryLane instead
-      break;
-
-    case IdleLanePriority:
-      var lane = pickArbitraryLane(IdleLanes & ~wipLanes);
-
-      if (lane === NoLane) {
-        lane = pickArbitraryLane(IdleLanes);
-      }
-
-      return lane;
+    return contextStackCursor.current;
   }
+}
 
+function cacheContext(workInProgress, unmaskedContext, maskedContext) {
   {
-    throw Error(
-      "Invalid update priority: " + lanePriority + ". This is a bug in React."
-    );
-  }
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
-
-function findTransitionLane(wipLanes, pendingLanes) {
-  // First look for lanes that are completely unclaimed, i.e. have no
-  // pending work.
-  var lane = pickArbitraryLane(TransitionLanes & ~pendingLanes);
-
-  if (lane === NoLane) {
-    // If all lanes have pending work, look for a lane that isn't currently
-    // being worked on.
-    lane = pickArbitraryLane(TransitionLanes & ~wipLanes);
-
-    if (lane === NoLane) {
-      // If everything is being worked on, pick any lane. This has the
-      // effect of interrupting the current work-in-progress.
-      lane = pickArbitraryLane(TransitionLanes);
-    }
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
   }
+}
 
-  return lane;
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
-
-function findRetryLane(wipLanes) {
-  // This is a fork of `findUpdateLane` designed specifically for Suspense
-  // "retries" — a special update that attempts to flip a Suspense boundary
-  // from its placeholder state to its primary/resolved state.
-  var lane = pickArbitraryLane(RetryLanes & ~wipLanes);
-
-  if (lane === NoLane) {
-    lane = pickArbitraryLane(RetryLanes);
-  }
+function getMaskedContext(workInProgress, unmaskedContext) {
+  {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
 
-  return lane;
-}
+    if (!contextTypes) {
+      return emptyContextObject;
+    } // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
 
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
+    var instance = workInProgress.stateNode;
 
-function getLowestPriorityLane(lanes) {
-  // This finds the most significant non-zero bit.
-  var index = 31 - clz32(lanes);
-  return index < 0 ? NoLanes : 1 << index;
-}
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
 
-function getEqualOrHigherPriorityLanes(lanes) {
-  return (getLowestPriorityLane(lanes) << 1) - 1;
-}
+    var context = {};
 
-function pickArbitraryLane(lanes) {
-  // This wrapper function gets inlined. Only exists so to communicate that it
-  // doesn't matter which bit is selected; you can pick any bit without
-  // affecting the algorithms where its used. Here I'm using
-  // getHighestPriorityLane because it requires the fewest operations.
-  return getHighestPriorityLane(lanes);
-}
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
 
-function pickArbitraryLaneIndex(lanes) {
-  return 31 - clz32(lanes);
-}
+    {
+      var name = getComponentNameFromFiber(workInProgress) || "Unknown";
+      checkPropTypes(contextTypes, context, "context", name);
+    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
 
-function laneToIndex(lane) {
-  return pickArbitraryLaneIndex(lane);
-}
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
 
-function includesSomeLane(a, b) {
-  return (a & b) !== NoLanes;
-}
-function isSubsetOfLanes(set, subset) {
-  return (set & subset) === subset;
-}
-function mergeLanes(a, b) {
-  return a | b;
+    return context;
+  }
 }
-function removeLanes(set, subset) {
-  return set & ~subset;
-} // Seems redundant, but it changes the type from a single lane (used for
-// updates) to a group of lanes (used for flushing work).
 
-function laneToLanes(lane) {
-  return lane;
+function hasContextChanged() {
+  {
+    return didPerformWorkStackCursor.current;
+  }
 }
-function createLaneMap(initial) {
-  // Intentionally pushing one by one.
-  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
-  var laneMap = [];
 
-  for (var i = 0; i < TotalLanes; i++) {
-    laneMap.push(initial);
+function isContextProvider(type) {
+  {
+    var childContextTypes = type.childContextTypes;
+    return childContextTypes !== null && childContextTypes !== undefined;
   }
+}
 
-  return laneMap;
+function popContext(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
 }
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane; // TODO: Theoretically, any update to any lane can unblock any other lane. But
-  // it's not practical to try every single possible combination. We need a
-  // heuristic to decide which lanes to attempt to render, and in which batches.
-  // For now, we use the same heuristic as in the old ExpirationTimes model:
-  // retry any lane at equal or lower priority, but don't try updates at higher
-  // priority without also including the lower priority updates. This works well
-  // when considering updates across different priority levels, but isn't
-  // sufficient for updates within the same priority, since we want to treat
-  // those updates as parallel.
-  // Unsuspend any update at equal or lower priority.
-
-  var higherPriorityLanes = updateLane - 1; // Turns 0b1000 into 0b0111
-
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  var eventTimes = root.eventTimes;
-  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
-  // recent event, and we assume time is monotonically increasing.
 
-  eventTimes[index] = eventTime;
+function popTopLevelContextObject(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
 }
-function markRootSuspended(root, suspendedLanes) {
-  root.suspendedLanes |= suspendedLanes;
-  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
 
-  var expirationTimes = root.expirationTimes;
-  var lanes = suspendedLanes;
+function pushTopLevelContextObject(fiber, context, didChange) {
+  {
+    if (!(contextStackCursor.current === emptyContextObject)) {
+      throw Error(
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
   }
 }
-function markRootPinged(root, pingedLanes, eventTime) {
-  root.pingedLanes |= root.suspendedLanes & pingedLanes;
-}
-function hasDiscreteLanes(lanes) {
-  return (lanes & InputDiscreteLanes) !== NoLanes;
-}
-function markRootMutableRead(root, updateLane) {
-  root.mutableReadLanes |= updateLane & root.pendingLanes;
-}
-function markRootFinished(root, remainingLanes) {
-  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
-  root.pendingLanes = remainingLanes; // Let's try everything again
 
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes;
-  root.mutableReadLanes &= remainingLanes;
-  root.entangledLanes &= remainingLanes;
-  var entanglements = root.entanglements;
-  var eventTimes = root.eventTimes;
-  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
+function processChildContext(fiber, type, parentContext) {
+  {
+    var instance = fiber.stateNode;
+    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
 
-  var lanes = noLongerPendingLanes;
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentNameFromFiber(fiber) || "Unknown";
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] = NoLanes;
-    eventTimes[index] = NoTimestamp;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
-  }
-}
-function markRootEntangled(root, entangledLanes) {
-  root.entangledLanes |= entangledLanes;
-  var entanglements = root.entanglements;
-  var lanes = entangledLanes;
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] |= entangledLanes;
-    lanes &= ~lane;
-  }
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
-// Based on:
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
+          error(
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
 
-var log = Math.log;
-var LN2 = Math.LN2;
+      return parentContext;
+    }
 
-function clz32Fallback(lanes) {
-  if (lanes === 0) {
-    return 32;
-  }
+    var childContext = instance.getChildContext();
 
-  return (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
+    for (var contextKey in childContext) {
+      if (!(contextKey in childContextTypes)) {
+        throw Error(
+          (getComponentNameFromFiber(fiber) || "Unknown") +
+            '.getChildContext(): key "' +
+            contextKey +
+            '" is not defined in childContextTypes.'
+        );
+      }
+    }
 
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
+    {
+      var name = getComponentNameFromFiber(fiber) || "Unknown";
+      checkPropTypes(childContextTypes, childContext, "child context", name);
+    }
 
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-    );
+    return Object.assign({}, parentContext, childContext);
   }
 }
 
-var fakeCallbackNode = {}; // Except for NoPriority, these correspond to Scheduler priorities. We use
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
+function pushContextProvider(workInProgress) {
+  {
+    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
 
-var ImmediatePriority$1 = 99;
-var UserBlockingPriority$1 = 98;
-var NormalPriority$1 = 97;
-var LowPriority$1 = 96;
-var IdlePriority$1 = 95; // NoPriority is the absence of priority. Also React-only.
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyContextObject; // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
 
-var NoPriority$1 = 90;
-var shouldYield = Scheduler_shouldYield;
-var requestPaint = // Fall back gracefully if we're running an older version of Scheduler.
-  Scheduler_requestPaint !== undefined ? Scheduler_requestPaint : function() {};
-var syncQueue = null;
-var immediateQueueCallbackNode = null;
-var isFlushingSyncQueue = false;
-var initialTimeMs$1 = Scheduler_now$1(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-// This will be the case for modern browsers that support `performance.now`. In
-// older browsers, Scheduler falls back to `Date.now`, which returns a Unix
-// timestamp. In that case, subtract the module initialization time to simulate
-// the behavior of performance.now and keep our times small enough to fit
-// within 32 bits.
-// TODO: Consider lifting this into Scheduler.
-
-var now =
-  initialTimeMs$1 < 10000
-    ? Scheduler_now$1
-    : function() {
-        return Scheduler_now$1() - initialTimeMs$1;
-      };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return ImmediatePriority$1;
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
+    return true;
+  }
+}
 
-    case Scheduler_UserBlockingPriority:
-      return UserBlockingPriority$1;
+function invalidateContextProvider(workInProgress, type, didChange) {
+  {
+    var instance = workInProgress.stateNode;
 
-    case Scheduler_NormalPriority:
-      return NormalPriority$1;
+    if (!instance) {
+      throw Error(
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-    case Scheduler_LowPriority:
-      return LowPriority$1;
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(
+        workInProgress,
+        type,
+        previousContext
+      );
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
 
-    case Scheduler_IdlePriority:
-      return IdlePriority$1;
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
 
-    default: {
-      throw Error("Unknown priority level.");
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
     }
   }
 }
 
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case ImmediatePriority$1:
-      return Scheduler_ImmediatePriority;
+function findCurrentUnmaskedContext(fiber) {
+  {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
+      throw Error(
+        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
+
+    var node = fiber;
+
+    do {
+      switch (node.tag) {
+        case HostRoot:
+          return node.stateNode.context;
 
-    case UserBlockingPriority$1:
-      return Scheduler_UserBlockingPriority;
+        case ClassComponent: {
+          var Component = node.type;
 
-    case NormalPriority$1:
-      return Scheduler_NormalPriority;
+          if (isContextProvider(Component)) {
+            return node.stateNode.__reactInternalMemoizedMergedChildContext;
+          }
 
-    case LowPriority$1:
-      return Scheduler_LowPriority;
+          break;
+        }
+      }
 
-    case IdlePriority$1:
-      return Scheduler_IdlePriority;
+      node = node.return;
+    } while (node !== null);
 
-    default: {
-      throw Error("Unknown priority level.");
+    {
+      throw Error(
+        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+      );
     }
   }
 }
 
-function runWithPriority(reactPriorityLevel, fn) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(priorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(priorityLevel, callback, options);
-}
+var LegacyRoot = 0;
+var ConcurrentRoot = 1;
+
+var syncQueue = null;
+var includesLegacySyncCallbacks = false;
+var isFlushingSyncQueue = false;
 function scheduleSyncCallback(callback) {
   // Push this callback into an internal queue. We'll flush these either in
   // the next tick, or earlier if something calls `flushSyncCallbackQueue`.
   if (syncQueue === null) {
-    syncQueue = [callback]; // Flush the queue in the next tick, at the earliest.
-
-    immediateQueueCallbackNode = Scheduler_scheduleCallback(
-      Scheduler_ImmediatePriority,
-      flushSyncCallbackQueueImpl
-    );
+    syncQueue = [callback];
   } else {
     // Push onto existing queue. Don't need to schedule a callback because
     // we already scheduled one when we created the queue.
     syncQueue.push(callback);
   }
-
-  return fakeCallbackNode;
 }
-function cancelCallback(callbackNode) {
-  if (callbackNode !== fakeCallbackNode) {
-    Scheduler_cancelCallback(callbackNode);
-  }
+function scheduleLegacySyncCallback(callback) {
+  includesLegacySyncCallbacks = true;
+  scheduleSyncCallback(callback);
 }
-function flushSyncCallbackQueue() {
-  if (immediateQueueCallbackNode !== null) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
+function flushSyncCallbacksOnlyInLegacyMode() {
+  // Only flushes the queue if there's a legacy sync callback scheduled.
+  // TODO: There's only a single type of callback: performSyncOnWorkOnRoot. So
+  // it might make more sense for the queue to be a list of roots instead of a
+  // list of generic callbacks. Then we can have two: one for legacy roots, one
+  // for concurrent roots. And this method would only flush the legacy ones.
+  if (includesLegacySyncCallbacks) {
+    flushSyncCallbacks();
   }
-
-  flushSyncCallbackQueueImpl();
 }
-
-function flushSyncCallbackQueueImpl() {
+function flushSyncCallbacks() {
   if (!isFlushingSyncQueue && syncQueue !== null) {
-    // Prevent re-entrancy.
+    // Prevent re-entrance.
     isFlushingSyncQueue = true;
     var i = 0;
+    var previousUpdatePriority = getCurrentUpdatePriority();
 
-    {
-      try {
-        var _isSync2 = true;
-        var _queue = syncQueue;
-        runWithPriority(ImmediatePriority$1, function() {
-          for (; i < _queue.length; i++) {
-            var callback = _queue[i];
-
-            do {
-              callback = callback(_isSync2);
-            } while (callback !== null);
-          }
-        });
-        syncQueue = null;
-      } catch (error) {
-        // If something throws, leave the remaining callbacks on the queue.
-        if (syncQueue !== null) {
-          syncQueue = syncQueue.slice(i + 1);
-        } // Resume flushing in the next tick
-
-        Scheduler_scheduleCallback(
-          Scheduler_ImmediatePriority,
-          flushSyncCallbackQueue
-        );
-        throw error;
-      } finally {
-        isFlushingSyncQueue = false;
+    try {
+      var isSync = true;
+      var queue = syncQueue; // TODO: Is this necessary anymore? The only user code that runs in this
+      // queue is in the render or commit phases.
+
+      setCurrentUpdatePriority(DiscreteEventPriority);
+
+      for (; i < queue.length; i++) {
+        var callback = queue[i];
+
+        do {
+          callback = callback(isSync);
+        } while (callback !== null);
       }
+
+      syncQueue = null;
+      includesLegacySyncCallbacks = false;
+    } catch (error) {
+      // If something throws, leave the remaining callbacks on the queue.
+      if (syncQueue !== null) {
+        syncQueue = syncQueue.slice(i + 1);
+      } // Resume flushing in the next tick
+
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks);
+      throw error;
+    } finally {
+      setCurrentUpdatePriority(previousUpdatePriority);
+      isFlushingSyncQueue = false;
     }
   }
-}
 
-// TODO: this is special because it gets imported during build.
-var ReactVersion = "17.0.1-4e5d7faf5";
-
-var NoMode = 0;
-var StrictMode = 1; // TODO: Remove BlockingMode and ConcurrentMode by reading from the root
-// tag instead
+  return null;
+}
 
-var BlockingMode = 2;
-var ConcurrentMode = 4;
-var ProfileMode = 8;
-var DebugTracingMode = 16;
+var ReactVersion = "18.0.0-bd5bf555e-20210823";
 
 var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
 var NoTransition = 0;
@@ -6058,7 +6154,6 @@ function is(x, y) {
 
 var objectIs = typeof Object.is === "function" ? Object.is : is;
 
-var hasOwnProperty = Object.prototype.hasOwnProperty;
 /**
  * Performs equality by iterating through keys on an object and returning false
  * when any key has values which are not strictly equal between the arguments.
@@ -6123,9 +6218,6 @@ function describeFiber(fiber) {
     case ForwardRef:
       return describeFunctionComponentFrame(fiber.type.render, source, owner);
 
-    case Block:
-      return describeFunctionComponentFrame(fiber.type._render, source, owner);
-
     case ClassComponent:
       return describeClassComponentFrame(fiber.type, source, owner);
 
@@ -6162,7 +6254,7 @@ function getCurrentFiberOwnerNameInDevOrNull() {
     var owner = current._debugOwner;
 
     if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner.type);
+      return getComponentNameFromFiber(owner);
     }
   }
 
@@ -6219,7 +6311,7 @@ var ReactStrictModeWarnings = {
     var node = fiber;
 
     while (node !== null) {
-      if (node.mode & StrictMode) {
+      if (node.mode & StrictLegacyMode) {
         maybeStrictRoot = node;
       }
 
@@ -6250,7 +6342,7 @@ var ReactStrictModeWarnings = {
     fiber,
     instance
   ) {
-    // Dedup strategy: Warn once per component.
+    // Dedupe strategy: Warn once per component.
     if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
       return;
     }
@@ -6263,7 +6355,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillMount === "function"
     ) {
       pendingUNSAFE_ComponentWillMountWarnings.push(fiber);
@@ -6277,7 +6369,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillReceiveProps === "function"
     ) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.push(fiber);
@@ -6291,7 +6383,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillUpdate === "function"
     ) {
       pendingUNSAFE_ComponentWillUpdateWarnings.push(fiber);
@@ -6305,7 +6397,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillMountWarnings.length > 0) {
       pendingComponentWillMountWarnings.forEach(function(fiber) {
         componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6317,7 +6409,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillMountWarnings.length > 0) {
       pendingUNSAFE_ComponentWillMountWarnings.forEach(function(fiber) {
         UNSAFE_componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6329,7 +6421,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillReceivePropsWarnings.length > 0) {
       pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
         componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6341,7 +6433,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillReceivePropsWarnings.length > 0) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.forEach(function(fiber) {
         UNSAFE_componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6353,7 +6445,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillUpdateWarnings.length > 0) {
       pendingComponentWillUpdateWarnings.forEach(function(fiber) {
         componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6365,7 +6457,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillUpdateWarnings.length > 0) {
       pendingUNSAFE_ComponentWillUpdateWarnings.forEach(function(fiber) {
         UNSAFE_componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6520,7 +6612,7 @@ var ReactStrictModeWarnings = {
       var firstFiber = fiberArray[0];
       var uniqueNames = new Set();
       fiberArray.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber.type) || "Component");
+        uniqueNames.add(getComponentNameFromFiber(fiber) || "Component");
         didWarnAboutLegacyContext.add(fiber.type);
       });
       var sortedNames = setToSortedString(uniqueNames);
@@ -6571,11 +6663,6 @@ function resolveDefaultProps(Component, baseProps) {
   return baseProps;
 }
 
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
 var valueCursor = createCursor(null);
 var rendererSigil;
 
@@ -6586,14 +6673,14 @@ var rendererSigil;
 
 var currentlyRenderingFiber = null;
 var lastContextDependency = null;
-var lastContextWithAllBitsObserved = null;
+var lastFullyObservedContext = null;
 var isDisallowedContextReadInDEV = false;
 function resetContextDependencies() {
   // This is called right before React yields execution, to ensure `readContext`
   // cannot be called outside the render phase.
   currentlyRenderingFiber = null;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 
   {
     isDisallowedContextReadInDEV = false;
@@ -6609,9 +6696,7 @@ function exitDisallowedContextReadInDEV() {
     isDisallowedContextReadInDEV = false;
   }
 }
-function pushProvider(providerFiber, nextValue) {
-  var context = providerFiber.type._context;
-
+function pushProvider(providerFiber, context, nextValue) {
   {
     push(valueCursor, context._currentValue, providerFiber);
     context._currentValue = nextValue;
@@ -6632,36 +6717,12 @@ function pushProvider(providerFiber, nextValue) {
     }
   }
 }
-function popProvider(providerFiber) {
+function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
-  pop(valueCursor, providerFiber);
-  var context = providerFiber.type._context;
-
-  {
-    context._currentValue = currentValue;
-  }
-}
-function calculateChangedBits(context, newValue, oldValue) {
-  if (objectIs(oldValue, newValue)) {
-    // No change
-    return 0;
-  } else {
-    var changedBits =
-      typeof context._calculateChangedBits === "function"
-        ? context._calculateChangedBits(oldValue, newValue)
-        : MAX_SIGNED_31_BIT_INT;
-
-    {
-      if ((changedBits & MAX_SIGNED_31_BIT_INT) !== changedBits) {
-        error(
-          "calculateChangedBits: Expected the return value to be a " +
-            "31-bit integer. Instead received: %s",
-          changedBits
-        );
-      }
-    }
+  pop(valueCursor, providerFiber);
 
-    return changedBits | 0;
+  {
+    context._currentValue = currentValue;
   }
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
@@ -6691,12 +6752,13 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
     node = node.return;
   }
 }
-function propagateContextChange(
-  workInProgress,
-  context,
-  changedBits,
-  renderLanes
-) {
+function propagateContextChange(workInProgress, context, renderLanes) {
+  {
+    propagateContextChange_eager(workInProgress, context, renderLanes);
+  }
+}
+
+function propagateContextChange_eager(workInProgress, context, renderLanes) {
   var fiber = workInProgress.child;
 
   if (fiber !== null) {
@@ -6715,23 +6777,35 @@ function propagateContextChange(
 
       while (dependency !== null) {
         // Check if the context matches.
-        if (
-          dependency.context === context &&
-          (dependency.observedBits & changedBits) !== 0
-        ) {
+        if (dependency.context === context) {
           // Match! Schedule an update on this fiber.
           if (fiber.tag === ClassComponent) {
             // Schedule a force update on the work-in-progress.
-            var update = createUpdate(
-              NoTimestamp,
-              pickArbitraryLane(renderLanes)
-            );
+            var lane = pickArbitraryLane(renderLanes);
+            var update = createUpdate(NoTimestamp, lane);
             update.tag = ForceUpdate; // TODO: Because we don't have a work-in-progress, this will add the
             // update to the current fiber, too, which means it will persist even if
             // this render is thrown away. Since it's a race condition, not sure it's
             // worth fixing.
+            // Inlined `enqueueUpdate` to remove interleaved update check
+
+            var updateQueue = fiber.updateQueue;
+
+            if (updateQueue === null);
+            else {
+              var sharedQueue = updateQueue.shared;
+              var pending = sharedQueue.pending;
 
-            enqueueUpdate(fiber, update);
+              if (pending === null) {
+                // This is the first update. Create a circular list.
+                update.next = update;
+              } else {
+                update.next = pending.next;
+                pending.next = update;
+              }
+
+              sharedQueue.pending = update;
+            }
           }
 
           fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
@@ -6792,23 +6866,25 @@ function propagateContextChange(
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
   var dependencies = workInProgress.dependencies;
 
   if (dependencies !== null) {
-    var firstContext = dependencies.firstContext;
+    {
+      var firstContext = dependencies.firstContext;
 
-    if (firstContext !== null) {
-      if (includesSomeLane(dependencies.lanes, renderLanes)) {
-        // Context list has a pending update. Mark that this fiber performed work.
-        markWorkInProgressReceivedUpdate();
-      } // Reset the work-in-progress list
+      if (firstContext !== null) {
+        if (includesSomeLane(dependencies.lanes, renderLanes)) {
+          // Context list has a pending update. Mark that this fiber performed work.
+          markWorkInProgressReceivedUpdate();
+        } // Reset the work-in-progress list
 
-      dependencies.firstContext = null;
+        dependencies.firstContext = null;
+      }
     }
   }
 }
-function readContext(context, observedBits) {
+function readContext(context) {
   {
     // This warning would fire if you read context inside a Hook like useMemo.
     // Unlike the class check below, it's not enforced in production for perf.
@@ -6822,25 +6898,13 @@ function readContext(context, observedBits) {
     }
   }
 
-  if (lastContextWithAllBitsObserved === context);
-  else if (observedBits === false || observedBits === 0);
-  else {
-    var resolvedObservedBits; // Avoid deopting on observable arguments or heterogeneous types.
-
-    if (
-      typeof observedBits !== "number" ||
-      observedBits === MAX_SIGNED_31_BIT_INT
-    ) {
-      // Observe all updates.
-      lastContextWithAllBitsObserved = context;
-      resolvedObservedBits = MAX_SIGNED_31_BIT_INT;
-    } else {
-      resolvedObservedBits = observedBits;
-    }
+  var value = context._currentValue;
 
+  if (lastFullyObservedContext === context);
+  else {
     var contextItem = {
       context: context,
-      observedBits: resolvedObservedBits,
+      memoizedValue: value,
       next: null
     };
 
@@ -6854,8 +6918,7 @@ function readContext(context, observedBits) {
       lastContextDependency = contextItem;
       currentlyRenderingFiber.dependencies = {
         lanes: NoLanes,
-        firstContext: contextItem,
-        responders: null
+        firstContext: contextItem
       };
     } else {
       // Append a new context item.
@@ -6863,7 +6926,49 @@ function readContext(context, observedBits) {
     }
   }
 
-  return context._currentValue;
+  return value;
+}
+
+// An array of all update queues that received updates during the current
+// render. When this render exits, either because it finishes or because it is
+// interrupted, the interleaved updates will be transferred onto the main part
+// of the queue.
+var interleavedQueues = null;
+function pushInterleavedQueue(queue) {
+  if (interleavedQueues === null) {
+    interleavedQueues = [queue];
+  } else {
+    interleavedQueues.push(queue);
+  }
+}
+function enqueueInterleavedUpdates() {
+  // Transfer the interleaved updates onto the main queue. Each queue has a
+  // `pending` field and an `interleaved` field. When they are not null, they
+  // point to the last node in a circular linked list. We need to append the
+  // interleaved list to the end of the pending list by joining them into a
+  // single, circular list.
+  if (interleavedQueues !== null) {
+    for (var i = 0; i < interleavedQueues.length; i++) {
+      var queue = interleavedQueues[i];
+      var lastInterleavedUpdate = queue.interleaved;
+
+      if (lastInterleavedUpdate !== null) {
+        queue.interleaved = null;
+        var firstInterleavedUpdate = lastInterleavedUpdate.next;
+        var lastPendingUpdate = queue.pending;
+
+        if (lastPendingUpdate !== null) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = firstInterleavedUpdate;
+          lastInterleavedUpdate.next = firstPendingUpdate;
+        }
+
+        queue.pending = lastInterleavedUpdate;
+      }
+    }
+
+    interleavedQueues = null;
+  }
 }
 
 var UpdateState = 0;
@@ -6888,7 +6993,9 @@ function initializeUpdateQueue(fiber) {
     firstBaseUpdate: null,
     lastBaseUpdate: null,
     shared: {
-      pending: null
+      pending: null,
+      interleaved: null,
+      lanes: NoLanes
     },
     effects: null
   };
@@ -6921,7 +7028,7 @@ function createUpdate(eventTime, lane) {
   };
   return update;
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
 
   if (updateQueue === null) {
@@ -6930,17 +7037,35 @@ function enqueueUpdate(fiber, update) {
   }
 
   var sharedQueue = updateQueue.shared;
-  var pending = sharedQueue.pending;
 
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
+  if (isInterleavedUpdate(fiber)) {
+    var interleaved = sharedQueue.interleaved;
+
+    if (interleaved === null) {
+      // This is the first update. Create a circular list.
+      update.next = update; // At the end of the current render, this queue's interleaved updates will
+      // be transferred to the pending queue.
+
+      pushInterleavedQueue(sharedQueue);
+    } else {
+      update.next = interleaved.next;
+      interleaved.next = update;
+    }
+
+    sharedQueue.interleaved = update;
   } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
+    var pending = sharedQueue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
 
-  sharedQueue.pending = update;
+    sharedQueue.pending = update;
+  }
 
   {
     if (
@@ -6958,6 +7083,33 @@ function enqueueUpdate(fiber, update) {
     }
   }
 }
+function entangleTransitions(root, fiber, lane) {
+  var updateQueue = fiber.updateQueue;
+
+  if (updateQueue === null) {
+    // Only occurs if the fiber has been unmounted.
+    return;
+  }
+
+  var sharedQueue = updateQueue.shared;
+
+  if (isTransitionLane(lane)) {
+    var queueLanes = sharedQueue.lanes; // If any entangled lanes are no longer pending on the root, then they must
+    // have finished. We can remove them from the shared queue, which represents
+    // a superset of the actually pending lanes. In some cases we may entangle
+    // more than we need to, but that's OK. In fact it's worse if we *don't*
+    // entangle when we should.
+
+    queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+    var newQueueLanes = mergeLanes(queueLanes, lane);
+    sharedQueue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+    // the lane finished since the last time we entangled it. So we need to
+    // entangle it again, just to be sure.
+
+    markRootEntangled(root, newQueueLanes);
+  }
+}
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
   // Captured updates are updates that are thrown by a child during the render
   // phase. They should be discarded if the render is aborted. Therefore,
@@ -7059,7 +7211,7 @@ function getStateFromUpdate(
         var nextState = payload.call(instance, prevState, nextProps);
 
         {
-          if (workInProgress.mode & StrictMode) {
+          if (workInProgress.mode & StrictLegacyMode) {
             disableLogs();
 
             try {
@@ -7097,7 +7249,7 @@ function getStateFromUpdate(
         partialState = _payload.call(instance, prevState, nextProps);
 
         {
-          if (workInProgress.mode & StrictMode) {
+          if (workInProgress.mode & StrictLegacyMode) {
             disableLogs();
 
             try {
@@ -7247,7 +7399,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
         );
         var callback = update.callback;
 
-        if (callback !== null) {
+        if (
+          callback !== null && // If the update was already committed, we should not queue its
+          // callback again.
+          update.lane !== NoLane
+        ) {
           workInProgress.flags |= Callback;
           var effects = queue.effects;
 
@@ -7287,7 +7443,24 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
 
     queue.baseState = newBaseState;
     queue.firstBaseUpdate = newFirstBaseUpdate;
-    queue.lastBaseUpdate = newLastBaseUpdate; // Set the remaining expiration time to be whatever is remaining in the queue.
+    queue.lastBaseUpdate = newLastBaseUpdate; // Interleaved updates are stored on a separate queue. We aren't going to
+    // process them during this render, but we do need to track which lanes
+    // are remaining.
+
+    var lastInterleaved = queue.shared.interleaved;
+
+    if (lastInterleaved !== null) {
+      var interleaved = lastInterleaved;
+
+      do {
+        newLanes = mergeLanes(newLanes, interleaved.lane);
+        interleaved = interleaved.next;
+      } while (interleaved !== lastInterleaved);
+    } else if (firstBaseUpdate === null) {
+      // `queue.lanes` is used for entangling transitions. We can set it back to
+      // zero once the queue is empty.
+      queue.shared.lanes = NoLanes;
+    } // Set the remaining expiration time to be whatever is remaining in the queue.
     // This should be fine because the only two other things that contribute to
     // expiration time are props and context. We're already in the middle of the
     // begin phase by the time we start processing the queue, so we've already
@@ -7340,8 +7513,7 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   }
 }
 
-var fakeInternalInstance = {};
-var isArray = Array.isArray; // React.Component uses a shared frozen object by default.
+var fakeInternalInstance = {}; // React.Component uses a shared frozen object by default.
 // We'll use it to determine whether we need to initialize legacy refs.
 
 var emptyRefsObject = new React.Component().refs;
@@ -7388,7 +7560,7 @@ var didWarnAboutInvalidateContextType;
 
   warnOnUndefinedDerivedState = function(type, partialState) {
     if (partialState === undefined) {
-      var componentName = getComponentName(type) || "Component";
+      var componentName = getComponentNameFromType(type) || "Component";
 
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
@@ -7426,23 +7598,20 @@ function applyDerivedStateFromProps(
   nextProps
 ) {
   var prevState = workInProgress.memoizedState;
+  var partialState = getDerivedStateFromProps(nextProps, prevState);
 
   {
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       disableLogs();
 
       try {
         // Invoke the function an extra time to help detect side-effects.
-        getDerivedStateFromProps(nextProps, prevState);
+        partialState = getDerivedStateFromProps(nextProps, prevState);
       } finally {
         reenableLogs();
       }
     }
-  }
-
-  var partialState = getDerivedStateFromProps(nextProps, prevState);
 
-  {
     warnOnUndefinedDerivedState(ctor, partialState);
   } // Merge the partial state and the previous state.
 
@@ -7459,6 +7628,7 @@ function applyDerivedStateFromProps(
     updateQueue.baseState = memoizedState;
   }
 }
+
 var classComponentUpdater = {
   isMounted: isMounted,
   enqueueSetState: function(inst, payload, callback) {
@@ -7477,7 +7647,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueReplaceState: function(inst, payload, callback) {
     var fiber = get(inst);
@@ -7496,7 +7670,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueForceUpdate: function(inst, callback) {
     var fiber = get(inst);
@@ -7514,7 +7692,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   }
 };
 
@@ -7530,31 +7712,33 @@ function checkShouldComponentUpdate(
   var instance = workInProgress.stateNode;
 
   if (typeof instance.shouldComponentUpdate === "function") {
+    var shouldUpdate = instance.shouldComponentUpdate(
+      newProps,
+      newState,
+      nextContext
+    );
+
     {
-      if (workInProgress.mode & StrictMode) {
+      if (workInProgress.mode & StrictLegacyMode) {
         disableLogs();
 
         try {
           // Invoke the function an extra time to help detect side-effects.
-          instance.shouldComponentUpdate(newProps, newState, nextContext);
+          shouldUpdate = instance.shouldComponentUpdate(
+            newProps,
+            newState,
+            nextContext
+          );
         } finally {
           reenableLogs();
         }
       }
-    }
-
-    var shouldUpdate = instance.shouldComponentUpdate(
-      newProps,
-      newState,
-      nextContext
-    );
 
-    {
       if (shouldUpdate === undefined) {
         error(
           "%s.shouldComponentUpdate(): Returned undefined instead of a " +
             "boolean value. Make sure to return true or false.",
-          getComponentName(ctor) || "Component"
+          getComponentNameFromType(ctor) || "Component"
         );
       }
     }
@@ -7575,7 +7759,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
   var instance = workInProgress.stateNode;
 
   {
-    var name = getComponentName(ctor) || "Component";
+    var name = getComponentNameFromType(ctor) || "Component";
     var renderPresent = instance.render;
 
     if (!renderPresent) {
@@ -7678,7 +7862,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
         "%s has a method called shouldComponentUpdate(). " +
           "shouldComponentUpdate should not be used when extending React.PureComponent. " +
           "Please extend React.Component if shouldComponentUpdate is used.",
-        getComponentName(ctor) || "A pure component"
+        getComponentNameFromType(ctor) || "A pure component"
       );
     }
 
@@ -7748,7 +7932,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
       error(
         "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
           "This component defines getSnapshotBeforeUpdate() only.",
-        getComponentName(ctor)
+        getComponentNameFromType(ctor)
       );
     }
 
@@ -7847,7 +8031,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         error(
           "%s defines an invalid contextType. " +
             "contextType should point to the Context object returned by React.createContext().%s",
-          getComponentName(ctor) || "Component",
+          getComponentNameFromType(ctor) || "Component",
           addendum
         );
       }
@@ -7864,21 +8048,22 @@ function constructClassInstance(workInProgress, ctor, props) {
     context = isLegacyContextConsumer
       ? getMaskedContext(workInProgress, unmaskedContext)
       : emptyContextObject;
-  } // Instantiate twice to help detect side-effects.
+  }
+
+  var instance = new ctor(props, context); // Instantiate twice to help detect side-effects.
 
   {
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       disableLogs();
 
       try {
-        new ctor(props, context); // eslint-disable-line no-new
+        instance = new ctor(props, context); // eslint-disable-line no-new
       } finally {
         reenableLogs();
       }
     }
   }
 
-  var instance = new ctor(props, context);
   var state = (workInProgress.memoizedState =
     instance.state !== null && instance.state !== undefined
       ? instance.state
@@ -7887,7 +8072,7 @@ function constructClassInstance(workInProgress, ctor, props) {
 
   {
     if (typeof ctor.getDerivedStateFromProps === "function" && state === null) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
@@ -7948,7 +8133,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         foundWillReceivePropsName !== null ||
         foundWillUpdateName !== null
       ) {
-        var _componentName = getComponentName(ctor) || "Component";
+        var _componentName = getComponentNameFromType(ctor) || "Component";
 
         var newApiName =
           typeof ctor.getDerivedStateFromProps === "function"
@@ -8001,7 +8186,7 @@ function callComponentWillMount(workInProgress, instance) {
         "%s.componentWillMount(): Assigning directly to this.state is " +
           "deprecated (except inside a component's " +
           "constructor). Use setState instead.",
-        getComponentName(workInProgress.type) || "Component"
+        getComponentNameFromFiber(workInProgress) || "Component"
       );
     }
 
@@ -8027,7 +8212,8 @@ function callComponentWillReceiveProps(
 
   if (instance.state !== oldState) {
     {
-      var componentName = getComponentName(workInProgress.type) || "Component";
+      var componentName =
+        getComponentNameFromFiber(workInProgress) || "Component";
 
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
@@ -8066,7 +8252,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
 
   {
     if (instance.state === newProps) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutDirectlyAssigningPropsToState.has(componentName)) {
         didWarnAboutDirectlyAssigningPropsToState.add(componentName);
@@ -8080,7 +8266,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
       }
     }
 
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       ReactStrictModeWarnings.recordLegacyContextWarning(
         workInProgress,
         instance
@@ -8095,7 +8281,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
   }
 
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
 
@@ -8124,7 +8309,13 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   }
 
   if (typeof instance.componentDidMount === "function") {
-    workInProgress.flags |= Update;
+    var fiberFlags = Update;
+
+    if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+      fiberFlags |= MountLayoutDev;
+    }
+
+    workInProgress.flags |= fiberFlags;
   }
 }
 
@@ -8186,7 +8377,13 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var fiberFlags = Update;
+
+      if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+        fiberFlags |= MountLayoutDev;
+      }
+
+      workInProgress.flags |= fiberFlags;
     }
 
     return false;
@@ -8232,13 +8429,25 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
 
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags = Update;
+
+      if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+        _fiberFlags |= MountLayoutDev;
+      }
+
+      workInProgress.flags |= _fiberFlags;
     }
   } else {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags2 = Update;
+
+      if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+        _fiberFlags2 |= MountLayoutDev;
+      }
+
+      workInProgress.flags |= _fiberFlags2;
     } // If shouldComponentUpdate returned false, we should still update the
     // memoized state to indicate that this work can be reused.
 
@@ -8317,7 +8526,8 @@ function updateClassInstance(
     unresolvedOldProps === unresolvedNewProps &&
     oldState === newState &&
     !hasContextChanged() &&
-    !checkHasForceUpdateAfterProcessing()
+    !checkHasForceUpdateAfterProcessing() &&
+    !enableLazyContextPropagation
   ) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
@@ -8362,7 +8572,11 @@ function updateClassInstance(
       oldState,
       newState,
       nextContext
-    );
+    ) || // TODO: In some cases, we'll end up checking if context has changed twice,
+    // both before and after `shouldComponentUpdate` has been called. Not ideal,
+    // but I'm loath to refactor this function. This only happens for memoized
+    // components so it's not that common.
+    enableLazyContextPropagation;
 
   if (shouldUpdate) {
     // In order to support react-lifecycles-compat polyfilled components,
@@ -8458,7 +8672,7 @@ var warnForMissingKey = function(child, returnFiber) {};
     }
 
     child._store.validated = true;
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasKeyUseWarning[componentName]) {
       return;
@@ -8474,8 +8688,6 @@ var warnForMissingKey = function(child, returnFiber) {};
   };
 }
 
-var isArray$1 = Array.isArray;
-
 function coerceRef(returnFiber, current, element) {
   var mixedRef = element.ref;
 
@@ -8488,7 +8700,7 @@ function coerceRef(returnFiber, current, element) {
       // TODO: Clean this up once we turn on the string ref warning for
       // everyone, because the strict mode case will no longer be relevant
       if (
-        (returnFiber.mode & StrictMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
+        (returnFiber.mode & StrictLegacyMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
         // because these cannot be automatically converted to an arrow function
         // using a codemod. Therefore, we don't have to warn about string refs again.
         !(
@@ -8497,7 +8709,8 @@ function coerceRef(returnFiber, current, element) {
           element._owner.stateNode !== element._self
         )
       ) {
-        var componentName = getComponentName(returnFiber.type) || "Component";
+        var componentName =
+          getComponentNameFromFiber(returnFiber) || "Component";
 
         if (!didWarnAboutStringRefs[componentName]) {
           {
@@ -8589,22 +8802,22 @@ function coerceRef(returnFiber, current, element) {
 }
 
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if (returnFiber.type !== "textarea") {
-    {
-      throw Error(
-        "Objects are not valid as a React child (found: " +
-          (Object.prototype.toString.call(newChild) === "[object Object]"
-            ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-            : newChild) +
-          "). If you meant to render a collection of children, use an array instead."
-      );
-    }
+  var childString = Object.prototype.toString.call(newChild);
+
+  {
+    throw Error(
+      "Objects are not valid as a React child (found: " +
+        (childString === "[object Object]"
+          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+          : childString) +
+        "). If you meant to render a collection of children, use an array instead."
+    );
   }
 }
 
 function warnOnFunctionType(returnFiber) {
   {
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasFunctionTypeWarning[componentName]) {
       return;
@@ -8618,7 +8831,7 @@ function warnOnFunctionType(returnFiber) {
         "Or maybe you meant to call this function rather than return it."
     );
   }
-} // We avoid inlining this to avoid potential deopts from using try/catch.
+}
 // to be able to optimize each path individually by branching early. This needs
 // a compiler or we can do it manually. Helpers that don't need this branching
 // live outside of this function.
@@ -8628,23 +8841,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     if (!shouldTrackSideEffects) {
       // Noop.
       return;
-    } // Deletions are added in reversed order so we add it to the front.
-    // At this point, the return fiber's effect list is empty except for
-    // deletions, so we can just append the deletion to the list. The remaining
-    // effects aren't added until the complete phase. Once we implement
-    // resuming, this may not be true.
+    }
 
-    var last = returnFiber.lastEffect;
+    var deletions = returnFiber.deletions;
 
-    if (last !== null) {
-      last.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
+    if (deletions === null) {
+      returnFiber.deletions = [childToDelete];
+      returnFiber.flags |= ChildDeletion;
     } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+      deletions.push(childToDelete);
     }
-
-    childToDelete.nextEffect = null;
-    childToDelete.flags = Deletion;
   }
 
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -8708,7 +8914,7 @@ function ChildReconciler(shouldTrackSideEffects) {
 
       if (oldIndex < lastPlacedIndex) {
         // This is a move.
-        newFiber.flags = Placement;
+        newFiber.flags |= Placement;
         return lastPlacedIndex;
       } else {
         // This item can stay in place.
@@ -8716,7 +8922,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       }
     } else {
       // This is an insertion.
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
       return lastPlacedIndex;
     }
   }
@@ -8725,7 +8931,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     // This is simpler for the single child case. We only need to do a
     // placement for inserting new children.
     if (shouldTrackSideEffects && newFiber.alternate === null) {
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
     }
 
     return newFiber;
@@ -8746,10 +8952,26 @@ function ChildReconciler(shouldTrackSideEffects) {
   }
 
   function updateElement(returnFiber, current, element, lanes) {
+    var elementType = element.type;
+
+    if (elementType === REACT_FRAGMENT_TYPE) {
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    }
+
     if (current !== null) {
       if (
-        current.elementType === element.type || // Keep this check inline so it only runs on the false path:
-        isCompatibleFamilyForHotReloading(current, element)
+        current.elementType === elementType || // Keep this check inline so it only runs on the false path:
+        isCompatibleFamilyForHotReloading(current, element) || // Lazy types should reconcile their resolved type.
+        // We need to do this after the Hot Reloading check above,
+        // because hot reloading has different semantics than prod because
+        // it doesn't resuspend. So we can't let the call below suspend.
+        enableLazyElements
       ) {
         // Move based on index
         var existing = useFiber(current, element.props);
@@ -8845,7 +9067,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _created3 = createFiberFromFragment(
           newChild,
           returnFiber.mode,
@@ -8888,16 +9110,6 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE: {
           if (newChild.key === key) {
-            if (newChild.type === REACT_FRAGMENT_TYPE) {
-              return updateFragment(
-                returnFiber,
-                oldFiber,
-                newChild.props.children,
-                lanes,
-                key
-              );
-            }
-
             return updateElement(returnFiber, oldFiber, newChild, lanes);
           } else {
             return null;
@@ -8913,7 +9125,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         if (key !== null) {
           return null;
         }
@@ -8955,16 +9167,6 @@ function ChildReconciler(shouldTrackSideEffects) {
               newChild.key === null ? newIdx : newChild.key
             ) || null;
 
-          if (newChild.type === REACT_FRAGMENT_TYPE) {
-            return updateFragment(
-              returnFiber,
-              _matchedFiber,
-              newChild.props.children,
-              lanes,
-              newChild.key
-            );
-          }
-
           return updateElement(returnFiber, _matchedFiber, newChild, lanes);
         }
 
@@ -8978,7 +9180,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _matchedFiber3 = existingChildren.get(newIdx) || null;
 
         return updateFragment(
@@ -9458,50 +9660,43 @@ function ChildReconciler(shouldTrackSideEffects) {
       // TODO: If key === null and child.key === null, then this only applies to
       // the first item in the list.
       if (child.key === key) {
-        switch (child.tag) {
-          case Fragment: {
-            if (element.type === REACT_FRAGMENT_TYPE) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-              var existing = useFiber(child, element.props.children);
-              existing.return = returnFiber;
+        var elementType = element.type;
 
-              {
-                existing._debugSource = element._source;
-                existing._debugOwner = element._owner;
-              }
+        if (elementType === REACT_FRAGMENT_TYPE) {
+          if (child.tag === Fragment) {
+            deleteRemainingChildren(returnFiber, child.sibling);
+            var existing = useFiber(child, element.props.children);
+            existing.return = returnFiber;
 
-              return existing;
+            {
+              existing._debugSource = element._source;
+              existing._debugOwner = element._owner;
             }
 
-            break;
+            return existing;
           }
+        } else {
+          if (
+            child.elementType === elementType || // Keep this check inline so it only runs on the false path:
+            isCompatibleFamilyForHotReloading(child, element) || // Lazy types should reconcile their resolved type.
+            // We need to do this after the Hot Reloading check above,
+            // because hot reloading has different semantics than prod because
+            // it doesn't resuspend. So we can't let the call below suspend.
+            enableLazyElements
+          ) {
+            deleteRemainingChildren(returnFiber, child.sibling);
 
-          case Block:
-
-          // We intentionally fallthrough here if enableBlocksAPI is not on.
-          // eslint-disable-next-lined no-fallthrough
-
-          default: {
-            if (
-              child.elementType === element.type || // Keep this check inline so it only runs on the false path:
-              isCompatibleFamilyForHotReloading(child, element)
-            ) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-
-              var _existing3 = useFiber(child, element.props);
-
-              _existing3.ref = coerceRef(returnFiber, child, element);
-              _existing3.return = returnFiber;
+            var _existing = useFiber(child, element.props);
 
-              {
-                _existing3._debugSource = element._source;
-                _existing3._debugOwner = element._owner;
-              }
+            _existing.ref = coerceRef(returnFiber, child, element);
+            _existing.return = returnFiber;
 
-              return _existing3;
+            {
+              _existing._debugSource = element._source;
+              _existing._debugOwner = element._owner;
             }
 
-            break;
+            return _existing;
           }
         } // Didn't match.
 
@@ -9595,9 +9790,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild = newChild.props.children;
     } // Handle object types
 
-    var isObject = typeof newChild === "object" && newChild !== null;
-
-    if (isObject) {
+    if (typeof newChild === "object" && newChild !== null) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return placeSingleChild(
@@ -9619,6 +9812,26 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
+
+      if (isArray(newChild)) {
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      if (getIteratorFn(newChild)) {
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     if (typeof newChild === "string" || typeof newChild === "number") {
@@ -9632,65 +9845,10 @@ function ChildReconciler(shouldTrackSideEffects) {
       );
     }
 
-    if (isArray$1(newChild)) {
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (getIteratorFn(newChild)) {
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (isObject) {
-      throwOnInvalidObjectType(returnFiber, newChild);
-    }
-
     {
       if (typeof newChild === "function") {
         warnOnFunctionType(returnFiber);
       }
-    }
-
-    if (typeof newChild === "undefined" && !isUnkeyedTopLevelFragment) {
-      // If the new child is undefined, and the return fiber is a composite
-      // component, throw an error. If Fiber return types are disabled,
-      // we already threw above.
-      switch (returnFiber.tag) {
-        case ClassComponent: {
-          {
-            var instance = returnFiber.stateNode;
-
-            if (instance.render._isMockFunction) {
-              // We allow auto-mocks to proceed as if they're returning null.
-              break;
-            }
-          }
-        }
-        // Intentionally fall through to the next case, which handles both
-        // functions and classes
-        // eslint-disable-next-lined no-fallthrough
-
-        case Block:
-        case FunctionComponent:
-        case ForwardRef:
-        case SimpleMemoComponent: {
-          {
-            throw Error(
-              (getComponentName(returnFiber.type) || "Component") +
-                "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
-            );
-          }
-        }
-      }
     } // Remaining cases are all treated as empty.
 
     return deleteRemainingChildren(returnFiber, currentFirstChild);
@@ -9863,11 +10021,7 @@ function shouldCaptureSuspense(workInProgress, hasInvisibleParent) {
     return false;
   }
 
-  var props = workInProgress.memoizedProps; // In order to capture, the Suspense component must have a fallback prop.
-
-  if (props.fallback === undefined) {
-    return false;
-  } // Regular boundaries always capture.
+  var props = workInProgress.memoizedProps; // Regular boundaries always capture.
 
   if (props.unstable_avoidThisFallback !== true) {
     return true;
@@ -10043,6 +10197,12 @@ function warnAboutMultipleRenderersDEV(mutableSource) {
   }
 } // Eager reads the version of a mutable source and stores it on the root.
 
+function getSuspendedCachePool() {
+  {
+    return null;
+  } // We check the cache on the stack first, since that's the one any new Caches
+}
+
 var ReactCurrentDispatcher$1 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentBatchConfig$1 = ReactSharedInternals.ReactCurrentBatchConfig;
 var didWarnAboutMismatchedHooksForComponent;
@@ -10115,7 +10275,7 @@ function updateHookTypesDev() {
 
 function checkDepsAreArrayDev(deps) {
   {
-    if (deps !== undefined && deps !== null && !Array.isArray(deps)) {
+    if (deps !== undefined && deps !== null && !isArray(deps)) {
       // Verify deps, but only on mount to avoid extra checks.
       // It's unlikely their type would change as usually you define them inline.
       error(
@@ -10130,7 +10290,7 @@ function checkDepsAreArrayDev(deps) {
 
 function warnOnHookMismatchInDev(currentHookName) {
   {
-    var componentName = getComponentName(currentlyRenderingFiber$1.type);
+    var componentName = getComponentNameFromFiber(currentlyRenderingFiber$1);
 
     if (!didWarnAboutMismatchedHooksForComponent.has(componentName)) {
       didWarnAboutMismatchedHooksForComponent.add(componentName);
@@ -10310,7 +10470,7 @@ function renderWithHooks(
       children = Component(props, secondArg);
     } while (didScheduleRenderPhaseUpdateDuringThisPass);
   } // We can assume the previous dispatcher is always this one, since we set it
-  // at the beginning of the render phase and there's no re-entrancy.
+  // at the beginning of the render phase and there's no re-entrance.
 
   ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
 
@@ -10328,7 +10488,25 @@ function renderWithHooks(
   {
     currentHookNameInDev = null;
     hookTypesDev = null;
-    hookTypesUpdateIndexDev = -1;
+    hookTypesUpdateIndexDev = -1; // Confirm that a static flag was not added or removed since the last
+    // render. If this fires, it suggests that we incorrectly reset the static
+    // flags in some other part of the codebase. This has happened before, for
+    // example, in the SuspenseList implementation.
+
+    if (
+      current !== null &&
+      (current.flags & StaticMask) !== (workInProgress.flags & StaticMask) && // Disable this warning in legacy mode, because legacy Suspense is weird
+      // and creates false positives. To make this work in legacy mode, we'd
+      // need to mark fibers that commit in an incomplete state, somehow. For
+      // now I'll disable the warning that most of the bugs that would trigger
+      // it are either exclusive to concurrent mode or exist in both.
+      (current.mode & ConcurrentMode) !== NoMode
+    ) {
+      error(
+        "Internal React error: Expected static flag was missing. Please " +
+          "notify the React team."
+      );
+    }
   }
 
   didScheduleRenderPhaseUpdate = false;
@@ -10342,13 +10520,25 @@ function renderWithHooks(
   return children;
 }
 function bailoutHooks(current, workInProgress, lanes) {
-  workInProgress.updateQueue = current.updateQueue;
-  workInProgress.flags &= ~(Passive | Update);
+  workInProgress.updateQueue = current.updateQueue; // TODO: Don't need to reset the flags here, because they're reset in the
+  // complete phase (bubbleProperties).
+
+  if ((workInProgress.mode & StrictEffectsMode) !== NoMode) {
+    workInProgress.flags &= ~(
+      MountPassiveDev |
+      MountLayoutDev |
+      Passive |
+      Update
+    );
+  } else {
+    workInProgress.flags &= ~(Passive | Update);
+  }
+
   current.lanes = removeLanes(current.lanes, lanes);
 }
 function resetHooksAfterThrow() {
   // We can assume the previous dispatcher is always this one, since we set it
-  // at the beginning of the render phase and there's no re-entrancy.
+  // at the beginning of the render phase and there's no re-entrance.
   ReactCurrentDispatcher$1.current = ContextOnlyDispatcher;
 
   if (didScheduleRenderPhaseUpdate) {
@@ -10494,6 +10684,8 @@ function mountReducer(reducer, initialArg, init) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: reducer,
     lastRenderedState: initialState
@@ -10631,6 +10823,28 @@ function updateReducer(reducer, initialArg, init) {
     hook.baseState = newBaseState;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = newState;
+  } // Interleaved updates are stored on a separate queue. We aren't going to
+  // process them during this render, but we do need to track which lanes
+  // are remaining.
+
+  var lastInterleaved = queue.interleaved;
+
+  if (lastInterleaved !== null) {
+    var interleaved = lastInterleaved;
+
+    do {
+      var interleavedLane = interleaved.lane;
+      currentlyRenderingFiber$1.lanes = mergeLanes(
+        currentlyRenderingFiber$1.lanes,
+        interleavedLane
+      );
+      markSkippedUpdateLanes(interleavedLane);
+      interleaved = interleaved.next;
+    } while (interleaved !== lastInterleaved);
+  } else if (baseQueue === null) {
+    // `queue.lanes` is used for entangling transitions. We can set it back to
+    // zero once the queue is empty.
+    queue.lanes = NoLanes;
   }
 
   var dispatch = queue.dispatch;
@@ -10689,7 +10903,7 @@ function rerenderReducer(reducer, initialArg, init) {
   return [newState, dispatch];
 }
 
-function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
+function readFromUnsubscribedMutableSource(root, source, getSnapshot) {
   {
     warnAboutMultipleRenderersDEV(source);
   }
@@ -10758,11 +10972,50 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
     //
     // This can lead to tearing in the first renderer when it resumes,
     // but there's nothing we can do about that (short of throwing here and refusing to continue the render).
-    markSourceAsDirty(source);
+    markSourceAsDirty(source); // Intentioally throw an error to force React to retry synchronously. During
+    // the synchronous retry, it will block interleaved mutations, so we should
+    // get a consistent read. Therefore, the following error should never be
+    // visible to the user.
+    //
+    // If it were to become visible to the user, it suggests one of two things:
+    // a bug in React, or (more likely), a mutation during the render phase that
+    // caused the second re-render attempt to be different from the first.
+    //
+    // We know it's the second case if the logs are currently disabled. So in
+    // dev, we can present a more accurate error message.
+
+    {
+      // eslint-disable-next-line react-internal/no-production-logging
+      if (console.log.__reactDisabledLog) {
+        // If the logs are disabled, this is the dev-only double render. This is
+        // only reachable if there was a mutation during render. Show a helpful
+        // error message.
+        //
+        // Something interesting to note: because we only double render in
+        // development, this error will never happen during production. This is
+        // actually true of all errors that occur during a double render,
+        // because if the first render had thrown, we would have exited the
+        // begin phase without double rendering. We should consider suppressing
+        // any error from a double render (with a warning) to more closely match
+        // the production behavior.
+        var componentName = getComponentNameFromFiber(
+          currentlyRenderingFiber$1
+        );
+
+        {
+          throw Error(
+            "A mutable source was mutated while the " +
+              componentName +
+              " component was rendering. This is not supported. Move any mutations into event handlers or effects."
+          );
+        }
+      }
+    } // We expect this error not to be thrown during the synchronous retry,
+    // because we blocked interleaved mutations.
 
     {
       throw Error(
-        "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+        "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
       );
     }
   }
@@ -10782,7 +11035,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
   var dispatcher = ReactCurrentDispatcher$1.current; // eslint-disable-next-line prefer-const
 
   var _dispatcher$useState = dispatcher.useState(function() {
-      return readFromUnsubcribedMutableSource(root, source, getSnapshot);
+      return readFromUnsubscribedMutableSource(root, source, getSnapshot);
     }),
     currentSnapshot = _dispatcher$useState[0],
     setSnapshot = _dispatcher$useState[1];
@@ -10898,6 +11151,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     // including any interleaving updates that occur.
     var newQueue = {
       pending: null,
+      interleaved: null,
+      lanes: NoLanes,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -10909,7 +11164,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     );
     stateHook.queue = newQueue;
     stateHook.baseQueue = null;
-    snapshot = readFromUnsubcribedMutableSource(root, source, getSnapshot);
+    snapshot = readFromUnsubscribedMutableSource(root, source, getSnapshot);
     stateHook.memoizedState = stateHook.baseState = snapshot;
   }
 
@@ -10945,6 +11200,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -11038,7 +11295,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
       var prevDeps = prevEffect.deps;
 
       if (areHookInputsEqual(nextDeps, prevDeps)) {
-        pushEffect(hookFlags, create, destroy, nextDeps);
+        hook.memoizedState = pushEffect(hookFlags, create, destroy, nextDeps);
         return;
       }
     }
@@ -11061,7 +11318,16 @@ function mountEffect(create, deps) {
     }
   }
 
-  return mountEffectImpl(Update | Passive, Passive$1, create, deps);
+  if ((currentlyRenderingFiber$1.mode & StrictEffectsMode) !== NoMode) {
+    return mountEffectImpl(
+      MountPassiveDev | Passive | PassiveStatic,
+      Passive$1,
+      create,
+      deps
+    );
+  } else {
+    return mountEffectImpl(Passive | PassiveStatic, Passive$1, create, deps);
+  }
 }
 
 function updateEffect(create, deps) {
@@ -11072,11 +11338,17 @@ function updateEffect(create, deps) {
     }
   }
 
-  return updateEffectImpl(Update | Passive, Passive$1, create, deps);
+  return updateEffectImpl(Passive, Passive$1, create, deps);
 }
 
 function mountLayoutEffect(create, deps) {
-  return mountEffectImpl(Update, Layout, create, deps);
+  var fiberFlags = Update;
+
+  if ((currentlyRenderingFiber$1.mode & StrictEffectsMode) !== NoMode) {
+    fiberFlags |= MountLayoutDev;
+  }
+
+  return mountEffectImpl(fiberFlags, Layout, create, deps);
 }
 
 function updateLayoutEffect(create, deps) {
@@ -11128,8 +11400,14 @@ function mountImperativeHandle(ref, create, deps) {
 
   var effectDeps =
     deps !== null && deps !== undefined ? deps.concat([ref]) : null;
+  var fiberFlags = Update;
+
+  if ((currentlyRenderingFiber$1.mode & StrictEffectsMode) !== NoMode) {
+    fiberFlags |= MountLayoutDev;
+  }
+
   return mountEffectImpl(
-    Update,
+    fiberFlags,
     Layout,
     imperativeHandleEffect.bind(null, create, ref),
     effectDeps
@@ -11284,31 +11562,20 @@ function rerenderDeferredValue(value) {
 }
 
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-
-  {
-    runWithPriority(
-      priorityLevel < UserBlockingPriority$1
-        ? UserBlockingPriority$1
-        : priorityLevel,
-      function() {
-        setPending(true);
-      }
-    );
-    runWithPriority(
-      priorityLevel > NormalPriority$1 ? NormalPriority$1 : priorityLevel,
-      function() {
-        var prevTransition = ReactCurrentBatchConfig$1.transition;
-        ReactCurrentBatchConfig$1.transition = 1;
+  var previousPriority = getCurrentUpdatePriority();
+  setCurrentUpdatePriority(
+    higherEventPriority(previousPriority, ContinuousEventPriority)
+  );
+  setPending(true);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
 
-        try {
-          setPending(false);
-          callback();
-        } finally {
-          ReactCurrentBatchConfig$1.transition = prevTransition;
-        }
-      }
-    );
+  try {
+    setPending(false);
+    callback();
+  } finally {
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$1.transition = prevTransition;
   }
 }
 
@@ -11320,7 +11587,7 @@ function mountTransition() {
   var start = startTransition.bind(null, setPending);
   var hook = mountWorkInProgressHook();
   hook.memoizedState = start;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function updateTransition() {
@@ -11329,7 +11596,7 @@ function updateTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function rerenderTransition() {
@@ -11338,7 +11605,7 @@ function rerenderTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 var isUpdatingOpaqueValueInRenderPhase = false;
@@ -11351,7 +11618,7 @@ function getIsUpdatingOpaqueValueInRenderPhaseInDEV() {
 function warnOnOpaqueIdentifierAccessInDEV(fiber) {
   {
     // TODO: Should warn in effects and callbacks, too
-    var name = getComponentName(fiber.type) || "Unknown";
+    var name = getComponentNameFromFiber(fiber) || "Unknown";
 
     if (getIsRendering() && !didWarnAboutUseOpaqueIdentifier[name]) {
       error(
@@ -11408,19 +11675,7 @@ function dispatchAction(fiber, queue, action) {
     eagerReducer: null,
     eagerState: null,
     next: null
-  }; // Append the update to the end of the list.
-
-  var pending = queue.pending;
-
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
-  } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
-
-  queue.pending = update;
+  };
   var alternate = fiber.alternate;
 
   if (
@@ -11431,7 +11686,47 @@ function dispatchAction(fiber, queue, action) {
     // queue -> linked list of updates. After this render pass, we'll restart
     // and apply the stashed updates on top of the work-in-progress hook.
     didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = true;
+    var pending = queue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
+
+    queue.pending = update;
   } else {
+    if (isInterleavedUpdate(fiber)) {
+      var interleaved = queue.interleaved;
+
+      if (interleaved === null) {
+        // This is the first update. Create a circular list.
+        update.next = update; // At the end of the current render, this queue's interleaved updates will
+        // be transferred to the pending queue.
+
+        pushInterleavedQueue(queue);
+      } else {
+        update.next = interleaved.next;
+        interleaved.next = update;
+      }
+
+      queue.interleaved = update;
+    } else {
+      var _pending = queue.pending;
+
+      if (_pending === null) {
+        // This is the first update. Create a circular list.
+        update.next = update;
+      } else {
+        update.next = _pending.next;
+        _pending.next = update;
+      }
+
+      queue.pending = update;
+    }
+
     if (
       fiber.lanes === NoLanes &&
       (alternate === null || alternate.lanes === NoLanes)
@@ -11479,12 +11774,28 @@ function dispatchAction(fiber, queue, action) {
     {
       // $FlowExpectedError - jest isn't a global, and isn't recognized outside of tests
       if ("undefined" !== typeof jest) {
-        warnIfNotScopedWithMatchingAct(fiber);
         warnIfNotCurrentlyActingUpdatesInDev(fiber);
       }
     }
 
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (isTransitionLane(lane) && root !== null) {
+      var queueLanes = queue.lanes; // If any entangled lanes are no longer pending on the root, then they
+      // must have finished. We can remove them from the shared queue, which
+      // represents a superset of the actually pending lanes. In some cases we
+      // may entangle more than we need to, but that's OK. In fact it's worse if
+      // we *don't* entangle when we should.
+
+      queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+      var newQueueLanes = mergeLanes(queueLanes, lane);
+      queue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+      // the lane finished since the last time we entangled it. So we need to
+      // entangle it again, just to be sure.
+
+      markRootEntangled(root, newQueueLanes);
+    }
   }
 }
 
@@ -11506,6 +11817,7 @@ var ContextOnlyDispatcher = {
   useOpaqueIdentifier: throwInvalidHookError,
   unstable_isNewReconciler: enableNewReconciler
 };
+
 var HooksDispatcherOnMountInDEV = null;
 var HooksDispatcherOnMountWithHookTypesInDEV = null;
 var HooksDispatcherOnUpdateInDEV = null;
@@ -11534,8 +11846,8 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
   };
 
   HooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11543,10 +11855,10 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       checkDepsAreArrayDev(deps);
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11635,19 +11947,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnMountWithHookTypesInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11732,19 +12045,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11829,19 +12143,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11926,10 +12241,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11937,11 +12253,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       mountHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -12038,10 +12354,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -12049,11 +12366,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -12150,10 +12467,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -12161,11 +12479,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -12264,3564 +12582,4472 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
   };
 }
 
-var now$1 = Scheduler.unstable_now;
-var commitTime = 0;
-var profilerStartTime = -1;
+var now$1 = Scheduler.unstable_now;
+var commitTime = 0;
+var layoutEffectStartTime = -1;
+var profilerStartTime = -1;
+var passiveEffectStartTime = -1;
+/**
+ * Tracks whether the current update was a nested/cascading update (scheduled from a layout effect).
+ *
+ * The overall sequence is:
+ *   1. render
+ *   2. commit (and call `onRender`, `onCommit`)
+ *   3. check for nested updates
+ *   4. flush passive effects (and call `onPostCommit`)
+ *
+ * Nested updates are identified in step 3 above,
+ * but step 4 still applies to the work that was just committed.
+ * We use two flags to track nested updates then:
+ * one tracks whether the upcoming update is a nested update,
+ * and the other tracks whether the current update was a nested update.
+ * The first value gets synced to the second at the start of the render phase.
+ */
+
+var currentUpdateIsNested = false;
+var nestedUpdateScheduled = false;
+
+function isCurrentUpdateNested() {
+  return currentUpdateIsNested;
+}
+
+function markNestedUpdateScheduled() {
+  {
+    nestedUpdateScheduled = true;
+  }
+}
+
+function resetNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = false;
+    nestedUpdateScheduled = false;
+  }
+}
+
+function syncNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = nestedUpdateScheduled;
+    nestedUpdateScheduled = false;
+  }
+}
+
+function getCommitTime() {
+  return commitTime;
+}
+
+function recordCommitTime() {
+  commitTime = now$1();
+}
+
+function startProfilerTimer(fiber) {
+  profilerStartTime = now$1();
+
+  if (fiber.actualStartTime < 0) {
+    fiber.actualStartTime = now$1();
+  }
+}
+
+function stopProfilerTimerIfRunning(fiber) {
+  profilerStartTime = -1;
+}
+
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
+  if (profilerStartTime >= 0) {
+    var elapsedTime = now$1() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+
+    if (overrideBaseTime) {
+      fiber.selfBaseDuration = elapsedTime;
+    }
+
+    profilerStartTime = -1;
+  }
+}
+
+function recordLayoutEffectDuration(fiber) {
+  if (layoutEffectStartTime >= 0) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+          root.effectDuration += elapsedTime;
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+          parentStateNode.effectDuration += elapsedTime;
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function recordPassiveEffectDuration(fiber) {
+  if (passiveEffectStartTime >= 0) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+
+          if (root !== null) {
+            root.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+
+          if (parentStateNode !== null) {
+            // Detached fibers have their state node cleared out.
+            // In this case, the return pointer is also cleared out,
+            // so we won't be able to report the time spent in this Profiler's subtree.
+            parentStateNode.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
+
+function startPassiveEffectTimer() {
+  passiveEffectStartTime = now$1();
+}
+
+function transferActualDuration(fiber) {
+  // Transfer time spent rendering these children so we don't lose it
+  // after we rerender. This is used as a helper in special cases
+  // where we should count the work of multiple passes.
+  var child = fiber.child;
+
+  while (child) {
+    fiber.actualDuration += child.actualDuration;
+    child = child.sibling;
+  }
+}
+
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
+}
+
+if (
+  !(
+    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
+    "function"
+  )
+) {
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+}
+
+function showErrorDialog(boundary, errorInfo) {
+  var capturedError = {
+    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
+    error: errorInfo.value,
+    errorBoundary:
+      boundary !== null && boundary.tag === ClassComponent
+        ? boundary.stateNode
+        : null
+  };
+  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
+    capturedError
+  );
+}
+
+function logCapturedError(boundary, errorInfo) {
+  try {
+    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
+    // This enables renderers like ReactNative to better manage redbox behavior.
+
+    if (logError === false) {
+      return;
+    }
+
+    var error = errorInfo.value;
+
+    if (true) {
+      var source = errorInfo.source;
+      var stack = errorInfo.stack;
+      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
+      // `preventDefault()` in window `error` handler.
+      // We record this information as an expando on the error.
+
+      if (error != null && error._suppressLogging) {
+        if (boundary.tag === ClassComponent) {
+          // The error is recoverable and was silenced.
+          // Ignore it and don't print the stack addendum.
+          // This is handy for testing error boundaries without noise.
+          return;
+        } // The error is fatal. Since the silencing might have
+        // been accidental, we'll surface it anyway.
+        // However, the browser would have silenced the original error
+        // so we'll print it first, and then print the stack addendum.
+
+        console["error"](error); // Don't transform to our wrapper
+        // For a more detailed description of this block, see:
+        // https://github.com/facebook/react/pull/13384
+      }
+
+      var componentName = source ? getComponentNameFromFiber(source) : null;
+      var componentNameMessage = componentName
+        ? "The above error occurred in the <" + componentName + "> component:"
+        : "The above error occurred in one of your React components:";
+      var errorBoundaryMessage;
+
+      if (boundary.tag === HostRoot) {
+        errorBoundaryMessage =
+          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
+      } else {
+        var errorBoundaryName =
+          getComponentNameFromFiber(boundary) || "Anonymous";
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      }
+
+      var combinedMessage =
+        componentNameMessage +
+        "\n" +
+        componentStack +
+        "\n\n" +
+        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
+      // We don't include the original error message and JS stack because the browser
+      // has already printed it. Even if the application swallows the error, it is still
+      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+
+      console["error"](combinedMessage); // Don't transform to our wrapper
+    } else {
+      // In production, we print the error directly.
+      // This will include the message, the JS stack, and anything the browser wants to show.
+      // We pass the error object instead of custom message so that the browser displays the error natively.
+      console["error"](error); // Don't transform to our wrapper
+    }
+  } catch (e) {
+    // This method must not throw, or React internal state will get messed up.
+    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
+    // we want to report this error outside of the normal stack as a last resort.
+    // https://github.com/facebook/react/issues/13188
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+
+var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
 
-function getCommitTime() {
-  return commitTime;
-}
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
 
-function recordCommitTime() {
-  commitTime = now$1();
+  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
+  // being called "element".
+
+  update.payload = {
+    element: null
+  };
+  var error = errorInfo.value;
+
+  update.callback = function() {
+    onUncaughtError(error);
+    logCapturedError(fiber, errorInfo);
+  };
+
+  return update;
 }
 
-function startProfilerTimer(fiber) {
-  profilerStartTime = now$1();
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane);
+  update.tag = CaptureUpdate;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
 
-  if (fiber.actualStartTime < 0) {
-    fiber.actualStartTime = now$1();
+  if (typeof getDerivedStateFromError === "function") {
+    var error$1 = errorInfo.value;
+
+    update.payload = function() {
+      return getDerivedStateFromError(error$1);
+    };
+
+    update.callback = function() {
+      {
+        markFailedErrorBoundaryForHotReloading(fiber);
+      }
+
+      logCapturedError(fiber, errorInfo);
+    };
   }
-}
 
-function stopProfilerTimerIfRunning(fiber) {
-  profilerStartTime = -1;
+  var inst = fiber.stateNode;
+
+  if (inst !== null && typeof inst.componentDidCatch === "function") {
+    update.callback = function callback() {
+      {
+        markFailedErrorBoundaryForHotReloading(fiber);
+      }
+
+      logCapturedError(fiber, errorInfo);
+
+      if (typeof getDerivedStateFromError !== "function") {
+        // To preserve the preexisting retry behavior of error boundaries,
+        // we keep track of which ones already failed during this batch.
+        // This gets reset before we yield back to the browser.
+        // TODO: Warn in strict mode if getDerivedStateFromError is
+        // not defined.
+        markLegacyErrorBoundaryAsFailed(this);
+      }
+
+      var error$1 = errorInfo.value;
+      var stack = errorInfo.stack;
+      this.componentDidCatch(error$1, {
+        componentStack: stack !== null ? stack : ""
+      });
+
+      {
+        if (typeof getDerivedStateFromError !== "function") {
+          // If componentDidCatch is the only error boundary method defined,
+          // then it needs to call setState to recover from errors.
+          // If no state update is scheduled then the boundary will swallow the error.
+          if (!includesSomeLane(fiber.lanes, SyncLane)) {
+            error(
+              "%s: Error boundaries should implement getDerivedStateFromError(). " +
+                "In that method, return a state update to display an error message or fallback UI.",
+              getComponentNameFromFiber(fiber) || "Unknown"
+            );
+          }
+        }
+      }
+    };
+  }
+
+  return update;
 }
 
-function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
-  if (profilerStartTime >= 0) {
-    var elapsedTime = now$1() - profilerStartTime;
-    fiber.actualDuration += elapsedTime;
+function attachPingListener(root, wakeable, lanes) {
+  // Attach a listener to the promise to "ping" the root and retry. But only if
+  // one does not already exist for the lanes we're currently rendering (which
+  // acts like a "thread ID" here).
+  var pingCache = root.pingCache;
+  var threadIDs;
 
-    if (overrideBaseTime) {
-      fiber.selfBaseDuration = elapsedTime;
+  if (pingCache === null) {
+    pingCache = root.pingCache = new PossiblyWeakMap$1();
+    threadIDs = new Set();
+    pingCache.set(wakeable, threadIDs);
+  } else {
+    threadIDs = pingCache.get(wakeable);
+
+    if (threadIDs === undefined) {
+      threadIDs = new Set();
+      pingCache.set(wakeable, threadIDs);
     }
+  }
 
-    profilerStartTime = -1;
+  if (!threadIDs.has(lanes)) {
+    // Memoize using the thread ID to prevent redundant listeners.
+    threadIDs.add(lanes);
+    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
+
+    {
+      if (isDevToolsPresent) {
+        // If we have pending work still, restore the original updaters
+        restorePendingUpdaters(root, lanes);
+      }
+    }
+
+    wakeable.then(ping, ping);
   }
 }
 
-function transferActualDuration(fiber) {
-  // Transfer time spent rendering these children so we don't lose it
-  // after we rerender. This is used as a helper in special cases
-  // where we should count the work of multiple passes.
-  var child = fiber.child;
+function throwException(
+  root,
+  returnFiber,
+  sourceFiber,
+  value,
+  rootRenderLanes
+) {
+  // The source fiber did not complete.
+  sourceFiber.flags |= Incomplete;
+
+  {
+    if (isDevToolsPresent) {
+      // If we have pending work still, restore the original updaters
+      restorePendingUpdaters(root, rootRenderLanes);
+    }
+  }
+
+  if (
+    value !== null &&
+    typeof value === "object" &&
+    typeof value.then === "function"
+  ) {
+    var wakeable = value;
+    // A legacy mode Suspense quirk, only relevant to hook components.
+
+    var tag = sourceFiber.tag;
+
+    if (
+      (sourceFiber.mode & ConcurrentMode) === NoMode &&
+      (tag === FunctionComponent ||
+        tag === ForwardRef ||
+        tag === SimpleMemoComponent)
+    ) {
+      var currentSource = sourceFiber.alternate;
+
+      if (currentSource) {
+        sourceFiber.updateQueue = currentSource.updateQueue;
+        sourceFiber.memoizedState = currentSource.memoizedState;
+        sourceFiber.lanes = currentSource.lanes;
+      } else {
+        sourceFiber.updateQueue = null;
+        sourceFiber.memoizedState = null;
+      }
+    }
+
+    var hasInvisibleParentBoundary = hasSuspenseContext(
+      suspenseStackCursor.current,
+      InvisibleParentSuspenseContext
+    ); // Schedule the nearest Suspense to re-render the timed out view.
+
+    var _workInProgress = returnFiber;
+
+    do {
+      if (
+        _workInProgress.tag === SuspenseComponent &&
+        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
+      ) {
+        // Found the nearest boundary.
+        // Stash the promise on the boundary fiber. If the boundary times out, we'll
+        // attach another listener to flip the boundary back to its normal state.
+        var wakeables = _workInProgress.updateQueue;
+
+        if (wakeables === null) {
+          var updateQueue = new Set();
+          updateQueue.add(wakeable);
+          _workInProgress.updateQueue = updateQueue;
+        } else {
+          wakeables.add(wakeable);
+        } // If the boundary is in legacy mode, we should *not*
+        // suspend the commit. Pretend as if the suspended component rendered
+        // null and keep rendering. In the commit phase, we'll schedule a
+        // subsequent synchronous update to re-render the Suspense.
+        //
+        // Note: It doesn't matter whether the component that suspended was
+        // inside a concurrent mode tree. If the Suspense is outside of it, we
+        // should *not* suspend the commit.
+        //
+        // If the suspense boundary suspended itself suspended, we don't have to
+        // do this trick because nothing was partially started. We can just
+        // directly do a second pass over the fallback in this render and
+        // pretend we meant to render that directly.
+
+        if (
+          (_workInProgress.mode & ConcurrentMode) === NoMode &&
+          _workInProgress !== returnFiber
+        ) {
+          _workInProgress.flags |= DidCapture;
+          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
+          // But we shouldn't call any lifecycle methods or callbacks. Remove
+          // all lifecycle effect tags.
+
+          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+
+          if (sourceFiber.tag === ClassComponent) {
+            var _currentSourceFiber = sourceFiber.alternate;
+
+            if (_currentSourceFiber === null) {
+              // This is a new mount. Change the tag so it's not mistaken for a
+              // completed class component. For example, we should not call
+              // componentWillUnmount if it is deleted.
+              sourceFiber.tag = IncompleteClassComponent;
+            } else {
+              // When we try rendering again, we should not reuse the current fiber,
+              // since it's known to be in an inconsistent state. Use a force update to
+              // prevent a bail out.
+              var update = createUpdate(NoTimestamp, SyncLane);
+              update.tag = ForceUpdate;
+              enqueueUpdate(sourceFiber, update);
+            }
+          } // The source fiber did not complete. Mark it with Sync priority to
+          // indicate that it still has pending work.
+
+          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
+
+          return;
+        } // Confirmed that the boundary is in a concurrent mode tree. Continue
+        // with the normal suspend path.
+        //
+        // After this we'll use a set of heuristics to determine whether this
+        // render pass will run to completion or restart or "suspend" the commit.
+        // The actual logic for this is spread out in different places.
+        //
+        // This first principle is that if we're going to suspend when we complete
+        // a root, then we should also restart if we get an update or ping that
+        // might unsuspend it, and vice versa. The only reason to suspend is
+        // because you think you might want to restart before committing. However,
+        // it doesn't make sense to restart only while in the period we're suspended.
+        //
+        // Restarting too aggressively is also not good because it starves out any
+        // intermediate loading state. So we use heuristics to determine when.
+        // Suspense Heuristics
+        //
+        // If nothing threw a Promise or all the same fallbacks are already showing,
+        // then don't suspend/restart.
+        //
+        // If this is an initial render of a new tree of Suspense boundaries and
+        // those trigger a fallback, then don't suspend/restart. We want to ensure
+        // that we can show the initial loading state as quickly as possible.
+        //
+        // If we hit a "Delayed" case, such as when we'd switch from content back into
+        // a fallback, then we should always suspend/restart. Transitions apply
+        // to this case. If none is defined, JND is used instead.
+        //
+        // If we're already showing a fallback and it gets "retried", allowing us to show
+        // another level, but there's still an inner boundary that would show a fallback,
+        // then we suspend/restart for 500ms since the last time we showed a fallback
+        // anywhere in the tree. This effectively throttles progressive loading into a
+        // consistent train of commits. This also gives us an opportunity to restart to
+        // get to the completed state slightly earlier.
+        //
+        // If there's ambiguity due to batching it's resolved in preference of:
+        // 1) "delayed", 2) "initial render", 3) "retry".
+        //
+        // We want to ensure that a "busy" state doesn't get force committed. We want to
+        // ensure that new initial loading states can commit as soon as possible.
 
-  while (child) {
-    fiber.actualDuration += child.actualDuration;
-    child = child.sibling;
-  }
-}
+        attachPingListener(root, wakeable, rootRenderLanes);
+        _workInProgress.flags |= ShouldCapture; // TODO: I think we can remove this, since we now use `DidCapture` in
+        // the begin phase to prevent an early bailout.
 
-var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
-var didReceiveUpdate = false;
-var didWarnAboutBadClass;
-var didWarnAboutModulePatternComponent;
-var didWarnAboutContextTypeOnFunctionComponent;
-var didWarnAboutGetDerivedStateOnFunctionComponent;
-var didWarnAboutFunctionRefs;
-var didWarnAboutReassigningProps;
-var didWarnAboutRevealOrder;
-var didWarnAboutTailOptions;
+        _workInProgress.lanes = rootRenderLanes;
+        return;
+      } // This boundary already captured during this render. Continue to the next
+      // boundary.
 
-{
-  didWarnAboutBadClass = {};
-  didWarnAboutModulePatternComponent = {};
-  didWarnAboutContextTypeOnFunctionComponent = {};
-  didWarnAboutGetDerivedStateOnFunctionComponent = {};
-  didWarnAboutFunctionRefs = {};
-  didWarnAboutReassigningProps = false;
-  didWarnAboutRevealOrder = {};
-  didWarnAboutTailOptions = {};
-}
+      _workInProgress = _workInProgress.return;
+    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
+    // TODO: Use invariant so the message is stripped in prod?
 
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  if (current === null) {
-    // If this is a fresh new component that hasn't been rendered yet, we
-    // won't update its child set by applying minimal side-effects. Instead,
-    // we will add them all to the child before it gets rendered. That means
-    // we can optimize this reconciliation pass by not tracking side-effects.
-    workInProgress.child = mountChildFibers(
-      workInProgress,
-      null,
-      nextChildren,
-      renderLanes
-    );
-  } else {
-    // If the current child is the same as the work in progress, it means that
-    // we haven't yet started any work on these children. Therefore, we use
-    // the clone algorithm to create a copy of all the current children.
-    // If we had any progressed work already, that is invalid at this point so
-    // let's throw it out.
-    workInProgress.child = reconcileChildFibers(
-      workInProgress,
-      current.child,
-      nextChildren,
-      renderLanes
+    value = new Error(
+      (getComponentNameFromFiber(sourceFiber) || "A React component") +
+        " suspended while rendering, but no fallback UI was specified.\n" +
+        "\n" +
+        "Add a <Suspense fallback=...> component higher in the tree to " +
+        "provide a loading indicator or placeholder to display."
     );
-  }
-}
+  } // We didn't find a boundary that could handle this type of exception. Start
+  // over and traverse parent path again, this time treating the exception
+  // as an error.
 
-function forceUnmountCurrentAndReconcile(
-  current,
-  workInProgress,
-  nextChildren,
-  renderLanes
-) {
-  // This function is fork of reconcileChildren. It's used in cases where we
-  // want to reconcile without matching against the existing set. This has the
-  // effect of all current children being unmounted; even if the type and key
-  // are the same, the old child is unmounted and a new child is created.
-  //
-  // To do this, we're going to go through the reconcile algorithm twice. In
-  // the first pass, we schedule a deletion for all the current children by
-  // passing null.
-  workInProgress.child = reconcileChildFibers(
-    workInProgress,
-    current.child,
-    null,
-    renderLanes
-  ); // In the second pass, we mount the new children. The trick here is that we
-  // pass null in place of where we usually pass the current child set. This has
-  // the effect of remounting all children regardless of whether their
-  // identities match.
+  renderDidError();
+  value = createCapturedValue(value, sourceFiber);
+  var workInProgress = returnFiber;
 
-  workInProgress.child = reconcileChildFibers(
-    workInProgress,
-    null,
-    nextChildren,
-    renderLanes
-  );
-}
+  do {
+    switch (workInProgress.tag) {
+      case HostRoot: {
+        var _errorInfo = value;
+        workInProgress.flags |= ShouldCapture;
+        var lane = pickArbitraryLane(rootRenderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
 
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  // TODO: current can be non-null here even if the component
-  // hasn't yet mounted. This happens after the first render suspends.
-  // We'll need to figure out if this is fine or can cause issues.
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var innerPropTypes = Component.propTypes;
+        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
 
-      if (innerPropTypes) {
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(Component)
-        );
+        enqueueCapturedUpdate(workInProgress, _update);
+        return;
       }
-    }
-  }
 
-  var render = Component.render;
-  var ref = workInProgress.ref; // The rest is a fork of updateFunctionComponent
+      case ClassComponent:
+        // Capture and retry
+        var errorInfo = value;
+        var ctor = workInProgress.type;
+        var instance = workInProgress.stateNode;
 
-  var nextChildren;
-  prepareToReadContext(workInProgress, renderLanes);
+        if (
+          (workInProgress.flags & DidCapture) === NoFlags &&
+          (typeof ctor.getDerivedStateFromError === "function" ||
+            (instance !== null &&
+              typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance)))
+        ) {
+          workInProgress.flags |= ShouldCapture;
 
-  {
-    ReactCurrentOwner$1.current = workInProgress;
-    setIsRendering(true);
-    nextChildren = renderWithHooks(
-      current,
-      workInProgress,
-      render,
-      nextProps,
-      ref,
-      renderLanes
-    );
+          var _lane = pickArbitraryLane(rootRenderLanes);
 
-    if (workInProgress.mode & StrictMode) {
-      disableLogs();
+          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
 
-      try {
-        nextChildren = renderWithHooks(
-          current,
-          workInProgress,
-          render,
-          nextProps,
-          ref,
-          renderLanes
-        );
-      } finally {
-        reenableLogs();
-      }
-    }
+          var _update2 = createClassErrorUpdate(
+            workInProgress,
+            errorInfo,
+            _lane
+          );
 
-    setIsRendering(false);
-  }
+          enqueueCapturedUpdate(workInProgress, _update2);
+          return;
+        }
 
-  if (current !== null && !didReceiveUpdate) {
-    bailoutHooks(current, workInProgress, renderLanes);
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  } // React DevTools reads this flag.
+        break;
+    }
 
-  workInProgress.flags |= PerformedWork;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
+    workInProgress = workInProgress.return;
+  } while (workInProgress !== null);
 }
 
-function updateMemoComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  updateLanes,
-  renderLanes
-) {
-  if (current === null) {
-    var type = Component.type;
+function markUpdate(workInProgress) {
+  // Tag the fiber with an update effect. This turns a Placement into
+  // a PlacementAndUpdate.
+  workInProgress.flags |= Update;
+}
 
-    if (
-      isSimpleFunctionComponent(type) &&
-      Component.compare === null && // SimpleMemoComponent codepath doesn't resolve outer props either.
-      Component.defaultProps === undefined
-    ) {
-      var resolvedType = type;
+function markRef(workInProgress) {
+  workInProgress.flags |= Ref;
+}
 
-      {
-        resolvedType = resolveFunctionForHotReloading(type);
-      } // If this is a plain function component without default props,
-      // and with only the default shallow comparison, we upgrade it
-      // to a SimpleMemoComponent to allow fast path updates.
+var appendAllChildren;
+var updateHostContainer;
+var updateHostComponent;
+var updateHostText;
 
-      workInProgress.tag = SimpleMemoComponent;
-      workInProgress.type = resolvedType;
+{
+  // Mutation mode
+  appendAllChildren = function(
+    parent,
+    workInProgress,
+    needsVisibilityToggle,
+    isHidden
+  ) {
+    // We only have the top Fiber that was created but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = workInProgress.child;
 
-      {
-        validateFunctionComponentInDev(workInProgress, type);
+    while (node !== null) {
+      if (node.tag === HostComponent || node.tag === HostText) {
+        appendInitialChild(parent, node.stateNode);
+      } else if (node.tag === HostPortal);
+      else if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
       }
 
-      return updateSimpleMemoComponent(
-        current,
-        workInProgress,
-        resolvedType,
-        nextProps,
-        updateLanes,
-        renderLanes
-      );
-    }
+      if (node === workInProgress) {
+        return;
+      }
 
-    {
-      var innerPropTypes = type.propTypes;
+      while (node.sibling === null) {
+        if (node.return === null || node.return === workInProgress) {
+          return;
+        }
 
-      if (innerPropTypes) {
-        // Inner memo component props aren't currently validated in createElement.
-        // We could move it there, but we'd still need this for lazy code path.
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(type)
-        );
+        node = node.return;
       }
+
+      node.sibling.return = node.return;
+      node = node.sibling;
     }
+  };
 
-    var child = createFiberFromTypeAndProps(
-      Component.type,
-      null,
-      nextProps,
-      workInProgress,
-      workInProgress.mode,
-      renderLanes
-    );
-    child.ref = workInProgress.ref;
-    child.return = workInProgress;
-    workInProgress.child = child;
-    return child;
-  }
+  updateHostContainer = function(current, workInProgress) {
+    // Noop
+  };
 
-  {
-    var _type = Component.type;
-    var _innerPropTypes = _type.propTypes;
+  updateHostComponent = function(
+    current,
+    workInProgress,
+    type,
+    newProps,
+    rootContainerInstance
+  ) {
+    // If we have an alternate, that means this is an update and we need to
+    // schedule a side-effect to do the updates.
+    var oldProps = current.memoizedProps;
 
-    if (_innerPropTypes) {
-      // Inner memo component props aren't currently validated in createElement.
-      // We could move it there, but we'd still need this for lazy code path.
-      checkPropTypes(
-        _innerPropTypes,
-        nextProps, // Resolved props
-        "prop",
-        getComponentName(_type)
-      );
-    }
-  }
+    if (oldProps === newProps) {
+      // In mutation mode, this is sufficient for a bailout because
+      // we won't touch this node even if children changed.
+      return;
+    } // If we get updated because one of our children updated, we don't
+    // have newProps so we'll have to reuse them.
+    // TODO: Split the update API as separate for the props vs. children.
+    // Even better would be if children weren't special cased at all tho.
 
-  var currentChild = current.child; // This is always exactly one child
+    var instance = workInProgress.stateNode;
+    var currentHostContext = getHostContext(); // TODO: Experiencing an error where oldProps is null. Suggests a host
+    // component is hitting the resume path. Figure out why. Possibly
+    // related to `hidden`.
 
-  if (!includesSomeLane(updateLanes, renderLanes)) {
-    // This will be the props with resolved defaultProps,
-    // unlike current.memoizedProps which will be the unresolved ones.
-    var prevProps = currentChild.memoizedProps; // Default to shallow comparison
+    var updatePayload = prepareUpdate(); // TODO: Type this specific to this type of component.
 
-    var compare = Component.compare;
-    compare = compare !== null ? compare : shallowEqual;
+    workInProgress.updateQueue = updatePayload; // If the update payload indicates that there is a change or if there
+    // is a new ref we mark this as an update. All the work is done in commitWork.
 
-    if (compare(prevProps, nextProps) && current.ref === workInProgress.ref) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+    if (updatePayload) {
+      markUpdate(workInProgress);
     }
-  } // React DevTools reads this flag.
+  };
 
-  workInProgress.flags |= PerformedWork;
-  var newChild = createWorkInProgress(currentChild, nextProps);
-  newChild.ref = workInProgress.ref;
-  newChild.return = workInProgress;
-  workInProgress.child = newChild;
-  return newChild;
+  updateHostText = function(current, workInProgress, oldText, newText) {
+    // If the text differs, mark it as an update. All the work in done in commitWork.
+    if (oldText !== newText) {
+      markUpdate(workInProgress);
+    }
+  };
 }
 
-function updateSimpleMemoComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  updateLanes,
-  renderLanes
-) {
-  // TODO: current can be non-null here even if the component
-  // hasn't yet mounted. This happens when the inner render suspends.
-  // We'll need to figure out if this is fine or can cause issues.
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var outerMemoType = workInProgress.elementType;
-
-      if (outerMemoType.$$typeof === REACT_LAZY_TYPE) {
-        // We warn when you define propTypes on lazy()
-        // so let's just skip over it to find memo() outer wrapper.
-        // Inner props for memo are validated later.
-        var lazyComponent = outerMemoType;
-        var payload = lazyComponent._payload;
-        var init = lazyComponent._init;
+function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
+  switch (renderState.tailMode) {
+    case "hidden": {
+      // Any insertions at the end of the tail list after this point
+      // should be invisible. If there are already mounted boundaries
+      // anything before them are not considered for collapsing.
+      // Therefore we need to go through the whole tail to find if
+      // there are any.
+      var tailNode = renderState.tail;
+      var lastTailNode = null;
 
-        try {
-          outerMemoType = init(payload);
-        } catch (x) {
-          outerMemoType = null;
-        } // Inner propTypes will be validated in the function component path.
+      while (tailNode !== null) {
+        if (tailNode.alternate !== null) {
+          lastTailNode = tailNode;
+        }
 
-        var outerPropTypes = outerMemoType && outerMemoType.propTypes;
+        tailNode = tailNode.sibling;
+      } // Next we're simply going to delete all insertions after the
+      // last rendered item.
 
-        if (outerPropTypes) {
-          checkPropTypes(
-            outerPropTypes,
-            nextProps, // Resolved (SimpleMemoComponent has no defaultProps)
-            "prop",
-            getComponentName(outerMemoType)
-          );
-        }
+      if (lastTailNode === null) {
+        // All remaining items in the tail are insertions.
+        renderState.tail = null;
+      } else {
+        // Detach the insertion after the last node that was already
+        // inserted.
+        lastTailNode.sibling = null;
       }
+
+      break;
     }
-  }
 
-  if (current !== null) {
-    var prevProps = current.memoizedProps;
+    case "collapsed": {
+      // Any insertions at the end of the tail list after this point
+      // should be invisible. If there are already mounted boundaries
+      // anything before them are not considered for collapsing.
+      // Therefore we need to go through the whole tail to find if
+      // there are any.
+      var _tailNode = renderState.tail;
+      var _lastTailNode = null;
 
-    if (
-      shallowEqual(prevProps, nextProps) &&
-      current.ref === workInProgress.ref && // Prevent bailout if the implementation changed due to hot reload.
-      workInProgress.type === current.type
-    ) {
-      didReceiveUpdate = false;
+      while (_tailNode !== null) {
+        if (_tailNode.alternate !== null) {
+          _lastTailNode = _tailNode;
+        }
 
-      if (!includesSomeLane(renderLanes, updateLanes)) {
-        // The pending lanes were cleared at the beginning of beginWork. We're
-        // about to bail out, but there might be other lanes that weren't
-        // included in the current render. Usually, the priority level of the
-        // remaining updates is accumlated during the evaluation of the
-        // component (i.e. when processing the update queue). But since since
-        // we're bailing out early *without* evaluating the component, we need
-        // to account for it here, too. Reset to the value of the current fiber.
-        // NOTE: This only applies to SimpleMemoComponent, not MemoComponent,
-        // because a MemoComponent fiber does not have hooks or an update queue;
-        // rather, it wraps around an inner component, which may or may not
-        // contains hooks.
-        // TODO: Move the reset at in beginWork out of the common path so that
-        // this is no longer necessary.
-        workInProgress.lanes = current.lanes;
-        return bailoutOnAlreadyFinishedWork(
-          current,
-          workInProgress,
-          renderLanes
-        );
-      } else if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
-        // This is a special case that only exists for legacy mode.
-        // See https://github.com/facebook/react/pull/19216.
-        didReceiveUpdate = true;
+        _tailNode = _tailNode.sibling;
+      } // Next we're simply going to delete all insertions after the
+      // last rendered item.
+
+      if (_lastTailNode === null) {
+        // All remaining items in the tail are insertions.
+        if (!hasRenderedATailFallback && renderState.tail !== null) {
+          // We suspended during the head. We want to show at least one
+          // row at the tail. So we'll keep on and cut off the rest.
+          renderState.tail.sibling = null;
+        } else {
+          renderState.tail = null;
+        }
+      } else {
+        // Detach the insertion after the last node that was already
+        // inserted.
+        _lastTailNode.sibling = null;
       }
+
+      break;
     }
   }
-
-  return updateFunctionComponent(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    renderLanes
-  );
 }
 
-function updateOffscreenComponent(current, workInProgress, renderLanes) {
-  var nextProps = workInProgress.pendingProps;
-  var nextChildren = nextProps.children;
-  var prevState = current !== null ? current.memoizedState : null;
-
-  if (
-    nextProps.mode === "hidden" ||
-    nextProps.mode === "unstable-defer-without-hiding"
-  ) {
-    if ((workInProgress.mode & ConcurrentMode) === NoMode) {
-      // In legacy sync mode, don't defer the subtree. Render it now.
-      // TODO: Figure out what we should do in Blocking mode.
-      var nextState = {
-        baseLanes: NoLanes
-      };
-      workInProgress.memoizedState = nextState;
-      pushRenderLanes(workInProgress, renderLanes);
-    } else if (!includesSomeLane(renderLanes, OffscreenLane)) {
-      var nextBaseLanes;
+function bubbleProperties(completedWork) {
+  var didBailout =
+    completedWork.alternate !== null &&
+    completedWork.alternate.child === completedWork.child;
+  var newChildLanes = NoLanes;
+  var subtreeFlags = NoFlags;
 
-      if (prevState !== null) {
-        var prevBaseLanes = prevState.baseLanes;
-        nextBaseLanes = mergeLanes(prevBaseLanes, renderLanes);
-      } else {
-        nextBaseLanes = renderLanes;
-      } // Schedule this fiber to re-render at offscreen priority. Then bailout.
+  if (!didBailout) {
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var actualDuration = completedWork.actualDuration;
+      var treeBaseDuration = completedWork.selfBaseDuration;
+      var child = completedWork.child;
 
-      {
-        markSpawnedWork(OffscreenLane);
-      }
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes)
+        );
+        subtreeFlags |= child.subtreeFlags;
+        subtreeFlags |= child.flags; // When a fiber is cloned, its actualDuration is reset to 0. This value will
+        // only be updated if work is done on the fiber (i.e. it doesn't bailout).
+        // When work is done, it should bubble to the parent's actualDuration. If
+        // the fiber has not been cloned though, (meaning no work was done), then
+        // this value will reflect the amount of time spent working on a previous
+        // render. In that case it should not bubble. We determine whether it was
+        // cloned by comparing the child pointer.
 
-      workInProgress.lanes = workInProgress.childLanes = laneToLanes(
-        OffscreenLane
-      );
-      var _nextState = {
-        baseLanes: nextBaseLanes
-      };
-      workInProgress.memoizedState = _nextState; // We're about to bail out, but we need to push this to the stack anyway
-      // to avoid a push/pop misalignment.
+        actualDuration += child.actualDuration;
+        treeBaseDuration += child.treeBaseDuration;
+        child = child.sibling;
+      }
 
-      pushRenderLanes(workInProgress, nextBaseLanes);
-      return null;
+      completedWork.actualDuration = actualDuration;
+      completedWork.treeBaseDuration = treeBaseDuration;
     } else {
-      // Rendering at offscreen, so we can clear the base lanes.
-      var _nextState2 = {
-        baseLanes: NoLanes
-      };
-      workInProgress.memoizedState = _nextState2; // Push the lanes that were skipped when we bailed out.
+      var _child = completedWork.child;
 
-      var subtreeRenderLanes =
-        prevState !== null ? prevState.baseLanes : renderLanes;
-      pushRenderLanes(workInProgress, subtreeRenderLanes);
+      while (_child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child.lanes, _child.childLanes)
+        );
+        subtreeFlags |= _child.subtreeFlags;
+        subtreeFlags |= _child.flags; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
+
+        _child.return = completedWork;
+        _child = _child.sibling;
+      }
     }
+
+    completedWork.subtreeFlags |= subtreeFlags;
   } else {
-    var _subtreeRenderLanes;
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var _treeBaseDuration = completedWork.selfBaseDuration;
+      var _child2 = completedWork.child;
+
+      while (_child2 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child2.lanes, _child2.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
+
+        subtreeFlags |= _child2.subtreeFlags & StaticMask;
+        subtreeFlags |= _child2.flags & StaticMask;
+        _treeBaseDuration += _child2.treeBaseDuration;
+        _child2 = _child2.sibling;
+      }
+
+      completedWork.treeBaseDuration = _treeBaseDuration;
+    } else {
+      var _child3 = completedWork.child;
 
-    if (prevState !== null) {
-      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes); // Since we're not hidden anymore, reset the state
+      while (_child3 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child3.lanes, _child3.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
 
-      workInProgress.memoizedState = null;
-    } else {
-      // We weren't previously hidden, and we still aren't, so there's nothing
-      // special to do. Need to push to the stack regardless, though, to avoid
-      // a push/pop misalignment.
-      _subtreeRenderLanes = renderLanes;
+        subtreeFlags |= _child3.subtreeFlags & StaticMask;
+        subtreeFlags |= _child3.flags & StaticMask; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
+
+        _child3.return = completedWork;
+        _child3 = _child3.sibling;
+      }
     }
 
-    pushRenderLanes(workInProgress, _subtreeRenderLanes);
+    completedWork.subtreeFlags |= subtreeFlags;
   }
 
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-} // Note: These happen to have identical begin phases, for now. We shouldn't hold
-// ourselves to this constraint, though. If the behavior diverges, we should
-// fork the function.
-
-var updateLegacyHiddenComponent = updateOffscreenComponent;
-
-function updateFragment(current, workInProgress, renderLanes) {
-  var nextChildren = workInProgress.pendingProps;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
 }
 
-function updateMode(current, workInProgress, renderLanes) {
-  var nextChildren = workInProgress.pendingProps.children;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-}
+function completeSuspendedOffscreenHostContainer(current, workInProgress) {
+  // This is a fork of the complete phase for HostComponent. We use it when
+  // a suspense tree is in its fallback state, because in that case the primary
+  // tree that includes the offscreen boundary is skipped over without a
+  // regular complete phase.
+  //
+  // We can optimize this path further by inlining the update logic for
+  // offscreen instances specifically, i.e. skipping the `prepareUpdate` call.
+  var rootContainerInstance = getRootHostContainer();
+  var type = workInProgress.type;
+  var newProps = workInProgress.memoizedProps;
 
-function updateProfiler(current, workInProgress, renderLanes) {
-  {
-    workInProgress.flags |= Update; // Reset effect durations for the next eventual effect phase.
-    // These are reset during render to allow the DevTools commit hook a chance to read them,
+  if (current !== null) {
+    updateHostComponent(
+      current,
+      workInProgress,
+      type,
+      newProps,
+      rootContainerInstance
+    );
+  } else {
+    var currentHostContext = getHostContext();
+    var instance = createInstance(
+      type,
+      newProps,
+      rootContainerInstance,
+      currentHostContext,
+      workInProgress
+    );
+    appendAllChildren(instance, workInProgress, false, false);
+    workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
+    // (eg DOM renderer supports auto-focus for certain elements).
+    // Make sure such renderers get scheduled for later work.
 
-    var stateNode = workInProgress.stateNode;
-    stateNode.effectDuration = 0;
-    stateNode.passiveEffectDuration = 0;
+    if (finalizeInitialChildren(instance)) {
+      markUpdate(workInProgress);
+    }
+
+    if (workInProgress.ref !== null) {
+      // If there is a ref on a host node we need to schedule a callback
+      markRef(workInProgress);
+    }
   }
 
-  var nextProps = workInProgress.pendingProps;
-  var nextChildren = nextProps.children;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
+  bubbleProperties(workInProgress);
 }
 
-function markRef(current, workInProgress) {
-  var ref = workInProgress.ref;
+function completeWork(current, workInProgress, renderLanes) {
+  var newProps = workInProgress.pendingProps;
 
-  if (
-    (current === null && ref !== null) ||
-    (current !== null && current.ref !== ref)
-  ) {
-    // Schedule a Ref effect
-    workInProgress.flags |= Ref;
-  }
-}
+  switch (workInProgress.tag) {
+    case IndeterminateComponent:
+    case LazyComponent:
+    case SimpleMemoComponent:
+    case FunctionComponent:
+    case ForwardRef:
+    case Fragment:
+    case Mode:
+    case Profiler:
+    case ContextConsumer:
+    case MemoComponent:
+      bubbleProperties(workInProgress);
+      return null;
 
-function updateFunctionComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var innerPropTypes = Component.propTypes;
+    case ClassComponent: {
+      var Component = workInProgress.type;
 
-      if (innerPropTypes) {
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(Component)
-        );
+      if (isContextProvider(Component)) {
+        popContext(workInProgress);
       }
+
+      bubbleProperties(workInProgress);
+      return null;
     }
-  }
 
-  var context;
+    case HostRoot: {
+      var fiberRoot = workInProgress.stateNode;
 
-  {
-    var unmaskedContext = getUnmaskedContext(workInProgress, Component, true);
-    context = getMaskedContext(workInProgress, unmaskedContext);
-  }
+      popHostContainer(workInProgress);
+      popTopLevelContextObject(workInProgress);
+      resetWorkInProgressVersions();
 
-  var nextChildren;
-  prepareToReadContext(workInProgress, renderLanes);
+      if (fiberRoot.pendingContext) {
+        fiberRoot.context = fiberRoot.pendingContext;
+        fiberRoot.pendingContext = null;
+      }
 
-  {
-    ReactCurrentOwner$1.current = workInProgress;
-    setIsRendering(true);
-    nextChildren = renderWithHooks(
-      current,
-      workInProgress,
-      Component,
-      nextProps,
-      context,
-      renderLanes
-    );
+      if (current === null || current.child === null) {
+        // If we hydrated, pop so that we can delete any remaining children
+        // that weren't hydrated.
+        var wasHydrated = popHydrationState();
 
-    if (workInProgress.mode & StrictMode) {
-      disableLogs();
+        if (wasHydrated) {
+          // If we hydrated, then we'll need to schedule an update for
+          // the commit side-effects on the root.
+          markUpdate(workInProgress);
+        } else if (!fiberRoot.hydrate) {
+          // Schedule an effect to clear this container at the start of the next commit.
+          // This handles the case of React rendering into a container with previous children.
+          // It's also safe to do for updates too, because current.child would only be null
+          // if the previous render was null (so the the container would already be empty).
+          workInProgress.flags |= Snapshot;
+        }
+      }
 
-      try {
-        nextChildren = renderWithHooks(
+      updateHostContainer(current, workInProgress);
+      bubbleProperties(workInProgress);
+      return null;
+    }
+
+    case HostComponent: {
+      popHostContext(workInProgress);
+      var rootContainerInstance = getRootHostContainer();
+      var type = workInProgress.type;
+
+      if (current !== null && workInProgress.stateNode != null) {
+        updateHostComponent(
           current,
           workInProgress,
-          Component,
-          nextProps,
-          context,
-          renderLanes
+          type,
+          newProps,
+          rootContainerInstance
         );
-      } finally {
-        reenableLogs();
+
+        if (current.ref !== workInProgress.ref) {
+          markRef(workInProgress);
+        }
+      } else {
+        if (!newProps) {
+          if (!(workInProgress.stateNode !== null)) {
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          } // This can happen when we abort work.
+
+          bubbleProperties(workInProgress);
+          return null;
+        }
+
+        var currentHostContext = getHostContext(); // TODO: Move createInstance to beginWork and keep it on a context
+        // "stack" as the parent. Then append children as we go in beginWork
+        // or completeWork depending on whether we want to add them top->down or
+        // bottom->up. Top->down is faster in IE11.
+
+        var _wasHydrated = popHydrationState();
+
+        if (_wasHydrated) {
+          // TODO: Move this and createInstance step into the beginPhase
+          // to consolidate.
+          if (prepareToHydrateHostInstance()) {
+            // If changes to the hydrated node need to be applied at the
+            // commit-phase we mark this as such.
+            markUpdate(workInProgress);
+          }
+        } else {
+          var instance = createInstance(
+            type,
+            newProps,
+            rootContainerInstance,
+            currentHostContext,
+            workInProgress
+          );
+          appendAllChildren(instance, workInProgress, false, false);
+          workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
+          // (eg DOM renderer supports auto-focus for certain elements).
+          // Make sure such renderers get scheduled for later work.
+
+          if (finalizeInitialChildren(instance)) {
+            markUpdate(workInProgress);
+          }
+        }
+
+        if (workInProgress.ref !== null) {
+          // If there is a ref on a host node we need to schedule a callback
+          markRef(workInProgress);
+        }
       }
+
+      bubbleProperties(workInProgress);
+      return null;
     }
 
-    setIsRendering(false);
-  }
+    case HostText: {
+      var newText = newProps;
+
+      if (current && workInProgress.stateNode != null) {
+        var oldText = current.memoizedProps; // If we have an alternate, that means this is an update and we need
+        // to schedule a side-effect to do the updates.
+
+        updateHostText(current, workInProgress, oldText, newText);
+      } else {
+        if (typeof newText !== "string") {
+          if (!(workInProgress.stateNode !== null)) {
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          } // This can happen when we abort work.
+        }
 
-  if (current !== null && !didReceiveUpdate) {
-    bailoutHooks(current, workInProgress, renderLanes);
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  } // React DevTools reads this flag.
+        var _rootContainerInstance = getRootHostContainer();
 
-  workInProgress.flags |= PerformedWork;
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-}
+        var _currentHostContext = getHostContext();
 
-function updateClassComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  {
-    if (workInProgress.type !== workInProgress.elementType) {
-      // Lazy component props can't be validated in createElement
-      // because they're only guaranteed to be resolved here.
-      var innerPropTypes = Component.propTypes;
+        var _wasHydrated2 = popHydrationState();
 
-      if (innerPropTypes) {
-        checkPropTypes(
-          innerPropTypes,
-          nextProps, // Resolved props
-          "prop",
-          getComponentName(Component)
-        );
+        if (_wasHydrated2) {
+          if (prepareToHydrateHostTextInstance()) {
+            markUpdate(workInProgress);
+          }
+        } else {
+          workInProgress.stateNode = createTextInstance(
+            newText,
+            _rootContainerInstance,
+            _currentHostContext,
+            workInProgress
+          );
+        }
       }
+
+      bubbleProperties(workInProgress);
+      return null;
     }
-  } // Push context providers early to prevent context stack mismatches.
-  // During mounting we don't know the child context yet as the instance doesn't exist.
-  // We will invalidate the child context in finishClassComponent() right after rendering.
 
-  var hasContext;
+    case SuspenseComponent: {
+      popSuspenseContext(workInProgress);
+      var nextState = workInProgress.memoizedState;
 
-  if (isContextProvider(Component)) {
-    hasContext = true;
-    pushContextProvider(workInProgress);
-  } else {
-    hasContext = false;
-  }
+      if ((workInProgress.flags & DidCapture) !== NoFlags) {
+        // Something suspended. Re-render with the fallback children.
+        workInProgress.lanes = renderLanes; // Do not reset the effect list.
 
-  prepareToReadContext(workInProgress, renderLanes);
-  var instance = workInProgress.stateNode;
-  var shouldUpdate;
+        if ((workInProgress.mode & ProfileMode) !== NoMode) {
+          transferActualDuration(workInProgress);
+        } // Don't bubble properties in this case.
 
-  if (instance === null) {
-    if (current !== null) {
-      // A class component without an instance only mounts if it suspended
-      // inside a non-concurrent tree, in an inconsistent state. We want to
-      // treat it like a new mount, even though an empty version of it already
-      // committed. Disconnect the alternate pointers.
-      current.alternate = null;
-      workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
+        return workInProgress;
+      }
 
-      workInProgress.flags |= Placement;
-    } // In the initial pass we might need to construct the instance.
+      var nextDidTimeout = nextState !== null;
+      var prevDidTimeout = false;
 
-    constructClassInstance(workInProgress, Component, nextProps);
-    mountClassInstance(workInProgress, Component, nextProps, renderLanes);
-    shouldUpdate = true;
-  } else if (current === null) {
-    // In a resume, we'll already have an instance we can reuse.
-    shouldUpdate = resumeMountClassInstance(
-      workInProgress,
-      Component,
-      nextProps,
-      renderLanes
-    );
-  } else {
-    shouldUpdate = updateClassInstance(
-      current,
-      workInProgress,
-      Component,
-      nextProps,
-      renderLanes
-    );
-  }
+      if (current === null);
+      else {
+        var prevState = current.memoizedState;
+        prevDidTimeout = prevState !== null;
+      } // If the suspended state of the boundary changes, we need to schedule
+      // an effect to toggle the subtree's visibility. When we switch from
+      // fallback -> primary, the inner Offscreen fiber schedules this effect
+      // as part of its normal complete phase. But when we switch from
+      // primary -> fallback, the inner Offscreen fiber does not have a complete
+      // phase. So we need to schedule its effect here.
+      //
+      // We also use this flag to connect/disconnect the effects, but the same
+      // logic applies: when re-connecting, the Offscreen fiber's complete
+      // phase will handle scheduling the effect. It's only when the fallback
+      // is active that we have to do anything special.
 
-  var nextUnitOfWork = finishClassComponent(
-    current,
-    workInProgress,
-    Component,
-    shouldUpdate,
-    hasContext,
-    renderLanes
-  );
+      if (nextDidTimeout && !prevDidTimeout) {
+        var offscreenFiber = workInProgress.child;
+        offscreenFiber.flags |= Visibility; // TODO: This will still suspend a synchronous tree if anything
+        // in the concurrent tree already suspended during this render.
+        // This is a known bug.
 
-  {
-    var inst = workInProgress.stateNode;
+        if ((workInProgress.mode & ConcurrentMode) !== NoMode) {
+          // TODO: Move this back to throwException because this is too late
+          // if this is a large tree which is common for initial loads. We
+          // don't know if we should restart a render or not until we get
+          // this marker, and this is too late.
+          // If this render already had a ping or lower pri updates,
+          // and this is the first time we know we're going to suspend we
+          // should be able to immediately restart from within throwException.
+          var hasInvisibleChildContext =
+            current === null &&
+            workInProgress.memoizedProps.unstable_avoidThisFallback !== true;
 
-    if (shouldUpdate && inst.props !== nextProps) {
-      if (!didWarnAboutReassigningProps) {
-        error(
-          "It looks like %s is reassigning its own `this.props` while rendering. " +
-            "This is not supported and can lead to confusing bugs.",
-          getComponentName(workInProgress.type) || "a component"
-        );
+          if (
+            hasInvisibleChildContext ||
+            hasSuspenseContext(
+              suspenseStackCursor.current,
+              InvisibleParentSuspenseContext
+            )
+          ) {
+            // If this was in an invisible tree or a new render, then showing
+            // this boundary is ok.
+            renderDidSuspend();
+          } else {
+            // Otherwise, we're going to have to hide content so we should
+            // suspend for longer if possible.
+            renderDidSuspendDelayIfPossible();
+          }
+        }
       }
 
-      didWarnAboutReassigningProps = true;
-    }
-  }
+      var wakeables = workInProgress.updateQueue;
 
-  return nextUnitOfWork;
-}
+      if (wakeables !== null) {
+        // Schedule an effect to attach a retry listener to the promise.
+        // TODO: Move to passive phase
+        workInProgress.flags |= Update;
+      }
 
-function finishClassComponent(
-  current,
-  workInProgress,
-  Component,
-  shouldUpdate,
-  hasContext,
-  renderLanes
-) {
-  // Refs should update even if shouldComponentUpdate returns false
-  markRef(current, workInProgress);
-  var didCaptureError = (workInProgress.flags & DidCapture) !== NoFlags;
+      bubbleProperties(workInProgress);
 
-  if (!shouldUpdate && !didCaptureError) {
-    // Context providers should defer to sCU for rendering
-    if (hasContext) {
-      invalidateContextProvider(workInProgress, Component, false);
-    }
+      {
+        if ((workInProgress.mode & ProfileMode) !== NoMode) {
+          if (nextDidTimeout) {
+            // Don't count time spent in a timed out Suspense subtree as part of the base duration.
+            var _primaryChildFragment2 = workInProgress.child;
+
+            if (_primaryChildFragment2 !== null) {
+              // $FlowFixMe Flow doesn't support type casting in combination with the -= operator
+              workInProgress.treeBaseDuration -=
+                _primaryChildFragment2.treeBaseDuration;
+            }
+          }
+        }
+      }
 
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  }
+      return null;
+    }
 
-  var instance = workInProgress.stateNode; // Rerender
+    case HostPortal:
+      popHostContainer(workInProgress);
+      updateHostContainer(current, workInProgress);
 
-  ReactCurrentOwner$1.current = workInProgress;
-  var nextChildren;
+      if (current === null) {
+        preparePortalMount(workInProgress.stateNode.containerInfo);
+      }
 
-  if (
-    didCaptureError &&
-    typeof Component.getDerivedStateFromError !== "function"
-  ) {
-    // If we captured an error, but getDerivedStateFromError is not defined,
-    // unmount all the children. componentDidCatch will schedule an update to
-    // re-render a fallback. This is temporary until we migrate everyone to
-    // the new API.
-    // TODO: Warn in a future release.
-    nextChildren = null;
+      bubbleProperties(workInProgress);
+      return null;
 
-    {
-      stopProfilerTimerIfRunning();
-    }
-  } else {
-    {
-      setIsRendering(true);
-      nextChildren = instance.render();
+    case ContextProvider:
+      // Pop provider fiber
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
+      bubbleProperties(workInProgress);
+      return null;
 
-      if (workInProgress.mode & StrictMode) {
-        disableLogs();
+    case IncompleteClassComponent: {
+      // Same as class component case. I put it down here so that the tags are
+      // sequential to ensure this switch is compiled to a jump table.
+      var _Component = workInProgress.type;
 
-        try {
-          instance.render();
-        } finally {
-          reenableLogs();
-        }
+      if (isContextProvider(_Component)) {
+        popContext(workInProgress);
       }
 
-      setIsRendering(false);
+      bubbleProperties(workInProgress);
+      return null;
     }
-  } // React DevTools reads this flag.
 
-  workInProgress.flags |= PerformedWork;
+    case SuspenseListComponent: {
+      popSuspenseContext(workInProgress);
+      var renderState = workInProgress.memoizedState;
 
-  if (current !== null && didCaptureError) {
-    // If we're recovering from an error, reconcile without reusing any of
-    // the existing children. Conceptually, the normal children and the children
-    // that are shown on error are two different sets, so we shouldn't reuse
-    // normal children even if their identities match.
-    forceUnmountCurrentAndReconcile(
-      current,
-      workInProgress,
-      nextChildren,
-      renderLanes
-    );
-  } else {
-    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  } // Memoize state using the values we just used to render.
-  // TODO: Restructure so we never read values from the instance.
+      if (renderState === null) {
+        // We're running in the default, "independent" mode.
+        // We don't do anything in this mode.
+        bubbleProperties(workInProgress);
+        return null;
+      }
 
-  workInProgress.memoizedState = instance.state; // The context might have changed so we need to recalculate it.
+      var didSuspendAlready = (workInProgress.flags & DidCapture) !== NoFlags;
+      var renderedTail = renderState.rendering;
 
-  if (hasContext) {
-    invalidateContextProvider(workInProgress, Component, true);
-  }
+      if (renderedTail === null) {
+        // We just rendered the head.
+        if (!didSuspendAlready) {
+          // This is the first pass. We need to figure out if anything is still
+          // suspended in the rendered set.
+          // If new content unsuspended, but there's still some content that
+          // didn't. Then we need to do a second pass that forces everything
+          // to keep showing their fallbacks.
+          // We might be suspended if something in this render pass suspended, or
+          // something in the previous committed pass suspended. Otherwise,
+          // there's no chance so we can skip the expensive call to
+          // findFirstSuspended.
+          var cannotBeSuspended =
+            renderHasNotSuspendedYet() &&
+            (current === null || (current.flags & DidCapture) === NoFlags);
 
-  return workInProgress.child;
-}
+          if (!cannotBeSuspended) {
+            var row = workInProgress.child;
 
-function pushHostRootContext(workInProgress) {
-  var root = workInProgress.stateNode;
+            while (row !== null) {
+              var suspended = findFirstSuspended(row);
 
-  if (root.pendingContext) {
-    pushTopLevelContextObject(
-      workInProgress,
-      root.pendingContext,
-      root.pendingContext !== root.context
-    );
-  } else if (root.context) {
-    // Should always be set
-    pushTopLevelContextObject(workInProgress, root.context, false);
-  }
+              if (suspended !== null) {
+                didSuspendAlready = true;
+                workInProgress.flags |= DidCapture;
+                cutOffTailIfNeeded(renderState, false); // If this is a newly suspended tree, it might not get committed as
+                // part of the second pass. In that case nothing will subscribe to
+                // its thenables. Instead, we'll transfer its thenables to the
+                // SuspenseList so that it can retry if they resolve.
+                // There might be multiple of these in the list but since we're
+                // going to wait for all of them anyway, it doesn't really matter
+                // which ones gets to ping. In theory we could get clever and keep
+                // track of how many dependencies remain but it gets tricky because
+                // in the meantime, we can add/remove/change items and dependencies.
+                // We might bail out of the loop before finding any but that
+                // doesn't matter since that means that the other boundaries that
+                // we did find already has their listeners attached.
 
-  pushHostContainer(workInProgress, root.containerInfo);
-}
+                var newThenables = suspended.updateQueue;
 
-function updateHostRoot(current, workInProgress, renderLanes) {
-  pushHostRootContext(workInProgress);
-  var updateQueue = workInProgress.updateQueue;
+                if (newThenables !== null) {
+                  workInProgress.updateQueue = newThenables;
+                  workInProgress.flags |= Update;
+                } // Rerender the whole list, but this time, we'll force fallbacks
+                // to stay in place.
+                // Reset the effect flags before doing the second pass since that's now invalid.
+                // Reset the child fibers to their original state.
 
-  if (!(current !== null && updateQueue !== null)) {
-    throw Error(
-      "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
+                workInProgress.subtreeFlags = NoFlags;
+                resetChildFibers(workInProgress, renderLanes); // Set up the Suspense Context to force suspense and immediately
+                // rerender the children.
 
-  var nextProps = workInProgress.pendingProps;
-  var prevState = workInProgress.memoizedState;
-  var prevChildren = prevState !== null ? prevState.element : null;
-  cloneUpdateQueue(current, workInProgress);
-  processUpdateQueue(workInProgress, nextProps, null, renderLanes);
-  var nextState = workInProgress.memoizedState; // Caution: React DevTools currently depends on this property
-  // being called "element".
+                pushSuspenseContext(
+                  workInProgress,
+                  setShallowSuspenseContext(
+                    suspenseStackCursor.current,
+                    ForceSuspenseFallback
+                  )
+                ); // Don't bubble properties in this case.
 
-  var nextChildren = nextState.element;
+                return workInProgress.child;
+              }
 
-  if (nextChildren === prevChildren) {
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-  }
+              row = row.sibling;
+            }
+          }
 
-  var root = workInProgress.stateNode;
+          if (renderState.tail !== null && now() > getRenderTargetTime()) {
+            // We have already passed our CPU deadline but we still have rows
+            // left in the tail. We'll just give up further attempts to render
+            // the main content and only render fallbacks.
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true;
+            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
+            // to get it started back up to attempt the next item. While in terms
+            // of priority this work has the same priority as this current render,
+            // it's not part of the same transition once the transition has
+            // committed. If it's sync, we still want to yield so that it can be
+            // painted. Conceptually, this is really the same as pinging.
+            // We can use any RetryLane even if it's the one currently rendering
+            // since we're leaving it behind on this node.
 
-  if (root.hydrate && enterHydrationState()) {
-    var child = mountChildFibers(
-      workInProgress,
-      null,
-      nextChildren,
-      renderLanes
-    );
-    workInProgress.child = child;
-    var node = child;
+            workInProgress.lanes = SomeRetryLane;
+          }
+        } else {
+          cutOffTailIfNeeded(renderState, false);
+        } // Next we're going to render the tail.
+      } else {
+        // Append the rendered row to the child list.
+        if (!didSuspendAlready) {
+          var _suspended = findFirstSuspended(renderedTail);
 
-    while (node) {
-      // Mark each child as hydrating. This is a fast path to know whether this
-      // tree is part of a hydrating tree. This is used to determine if a child
-      // node has fully mounted yet, and for scheduling event replaying.
-      // Conceptually this is similar to Placement in that a new subtree is
-      // inserted into the React tree here. It just happens to not need DOM
-      // mutations because it already exists.
-      node.flags = (node.flags & ~Placement) | Hydrating;
-      node = node.sibling;
-    }
-  } else {
-    // Otherwise reset hydration state in case we aborted and resumed another
-    // root.
-    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  }
+          if (_suspended !== null) {
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true; // Ensure we transfer the update queue to the parent so that it doesn't
+            // get lost if this row ends up dropped during a second pass.
 
-  return workInProgress.child;
-}
+            var _newThenables = _suspended.updateQueue;
 
-function updateHostComponent(current, workInProgress, renderLanes) {
-  pushHostContext(workInProgress);
+            if (_newThenables !== null) {
+              workInProgress.updateQueue = _newThenables;
+              workInProgress.flags |= Update;
+            }
 
-  var type = workInProgress.type;
-  var nextProps = workInProgress.pendingProps;
-  var prevProps = current !== null ? current.memoizedProps : null;
-  var nextChildren = nextProps.children;
+            cutOffTailIfNeeded(renderState, true); // This might have been modified.
 
-  if (prevProps !== null && shouldSetTextContent()) {
-    // If we're switching from a direct text child to a normal child, or to
-    // empty, we need to schedule the text content to be reset.
-    workInProgress.flags |= ContentReset;
-  }
+            if (
+              renderState.tail === null &&
+              renderState.tailMode === "hidden" &&
+              !renderedTail.alternate &&
+              !getIsHydrating() // We don't cut it if we're hydrating.
+            ) {
+              // We're done.
+              bubbleProperties(workInProgress);
+              return null;
+            }
+          } else if (
+            // The time it took to render last row is greater than the remaining
+            // time we have to render. So rendering one more row would likely
+            // exceed it.
+            now() * 2 - renderState.renderingStartTime >
+              getRenderTargetTime() &&
+            renderLanes !== OffscreenLane
+          ) {
+            // We have now passed our CPU deadline and we'll just give up further
+            // attempts to render the main content and only render fallbacks.
+            // The assumption is that this is usually faster.
+            workInProgress.flags |= DidCapture;
+            didSuspendAlready = true;
+            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
+            // to get it started back up to attempt the next item. While in terms
+            // of priority this work has the same priority as this current render,
+            // it's not part of the same transition once the transition has
+            // committed. If it's sync, we still want to yield so that it can be
+            // painted. Conceptually, this is really the same as pinging.
+            // We can use any RetryLane even if it's the one currently rendering
+            // since we're leaving it behind on this node.
 
-  markRef(current, workInProgress);
-  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  return workInProgress.child;
-}
+            workInProgress.lanes = SomeRetryLane;
+          }
+        }
 
-function updateHostText(current, workInProgress) {
-  // immediately after.
+        if (renderState.isBackwards) {
+          // The effect list of the backwards tail will have been added
+          // to the end. This breaks the guarantee that life-cycles fire in
+          // sibling order but that isn't a strong guarantee promised by React.
+          // Especially since these might also just pop in during future commits.
+          // Append to the beginning of the list.
+          renderedTail.sibling = workInProgress.child;
+          workInProgress.child = renderedTail;
+        } else {
+          var previousSibling = renderState.last;
 
-  return null;
-}
+          if (previousSibling !== null) {
+            previousSibling.sibling = renderedTail;
+          } else {
+            workInProgress.child = renderedTail;
+          }
 
-function mountLazyComponent(
-  _current,
-  workInProgress,
-  elementType,
-  updateLanes,
-  renderLanes
-) {
-  if (_current !== null) {
-    // A lazy component only mounts if it suspended inside a non-
-    // concurrent tree, in an inconsistent state. We want to treat it like
-    // a new mount, even though an empty version of it already committed.
-    // Disconnect the alternate pointers.
-    _current.alternate = null;
-    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
+          renderState.last = renderedTail;
+        }
+      }
 
-    workInProgress.flags |= Placement;
-  }
+      if (renderState.tail !== null) {
+        // We still have tail rows to render.
+        // Pop a row.
+        var next = renderState.tail;
+        renderState.rendering = next;
+        renderState.tail = next.sibling;
+        renderState.renderingStartTime = now();
+        next.sibling = null; // Restore the context.
+        // TODO: We can probably just avoid popping it instead and only
+        // setting it the first time we go from not suspended to suspended.
 
-  var props = workInProgress.pendingProps;
-  var lazyComponent = elementType;
-  var payload = lazyComponent._payload;
-  var init = lazyComponent._init;
-  var Component = init(payload); // Store the unwrapped component in the type.
+        var suspenseContext = suspenseStackCursor.current;
 
-  workInProgress.type = Component;
-  var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(Component));
-  var resolvedProps = resolveDefaultProps(Component, props);
-  var child;
+        if (didSuspendAlready) {
+          suspenseContext = setShallowSuspenseContext(
+            suspenseContext,
+            ForceSuspenseFallback
+          );
+        } else {
+          suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+        }
+
+        pushSuspenseContext(workInProgress, suspenseContext); // Do a pass over the next row.
+        // Don't bubble properties in this case.
 
-  switch (resolvedTag) {
-    case FunctionComponent: {
-      {
-        validateFunctionComponentInDev(workInProgress, Component);
-        workInProgress.type = Component = resolveFunctionForHotReloading(
-          Component
-        );
+        return next;
       }
 
-      child = updateFunctionComponent(
-        null,
-        workInProgress,
-        Component,
-        resolvedProps,
-        renderLanes
-      );
-      return child;
+      bubbleProperties(workInProgress);
+      return null;
     }
 
-    case ClassComponent: {
-      {
-        workInProgress.type = Component = resolveClassForHotReloading(
-          Component
-        );
-      }
-
-      child = updateClassComponent(
-        null,
-        workInProgress,
-        Component,
-        resolvedProps,
-        renderLanes
-      );
-      return child;
+    case ScopeComponent: {
+      break;
     }
 
-    case ForwardRef: {
-      {
-        workInProgress.type = Component = resolveForwardRefForHotReloading(
-          Component
-        );
-      }
+    case OffscreenComponent:
+    case LegacyHiddenComponent: {
+      popRenderLanes(workInProgress);
+      var _nextState = workInProgress.memoizedState;
+      var nextIsHidden = _nextState !== null;
 
-      child = updateForwardRef(
-        null,
-        workInProgress,
-        Component,
-        resolvedProps,
-        renderLanes
-      );
-      return child;
-    }
+      if (current !== null) {
+        var _prevState = current.memoizedState;
+        var prevIsHidden = _prevState !== null;
 
-    case MemoComponent: {
-      {
-        if (workInProgress.type !== workInProgress.elementType) {
-          var outerPropTypes = Component.propTypes;
+        if (
+          prevIsHidden !== nextIsHidden &&
+          newProps.mode !== "unstable-defer-without-hiding" && // LegacyHidden doesn't do any hiding — it only pre-renders.
+          workInProgress.tag !== LegacyHiddenComponent
+        ) {
+          workInProgress.flags |= Visibility;
+        }
+      }
 
-          if (outerPropTypes) {
-            checkPropTypes(
-              outerPropTypes,
-              resolvedProps, // Resolved for outer only
-              "prop",
-              getComponentName(Component)
-            );
+      if (!nextIsHidden || (workInProgress.mode & ConcurrentMode) === NoMode) {
+        bubbleProperties(workInProgress);
+      } else {
+        // Don't bubble properties for hidden children unless we're rendering
+        // at offscreen priority.
+        if (includesSomeLane(subtreeRenderLanes, OffscreenLane)) {
+          bubbleProperties(workInProgress);
+
+          {
+            // Check if there was an insertion or update in the hidden subtree.
+            // If so, we need to hide those nodes in the commit phase, so
+            // schedule a visibility effect.
+            if (
+              workInProgress.tag !== LegacyHiddenComponent &&
+              workInProgress.subtreeFlags & (Placement | Update) &&
+              newProps.mode !== "unstable-defer-without-hiding"
+            ) {
+              workInProgress.flags |= Visibility;
+            }
           }
         }
       }
 
-      child = updateMemoComponent(
-        null,
-        workInProgress,
-        Component,
-        resolveDefaultProps(Component.type, resolvedProps), // The inner type can have defaults too
-        updateLanes,
-        renderLanes
-      );
-      return child;
+      return null;
     }
   }
 
-  var hint = "";
-
-  {
-    if (
-      Component !== null &&
-      typeof Component === "object" &&
-      Component.$$typeof === REACT_LAZY_TYPE
-    ) {
-      hint = " Did you wrap a component in React.lazy() more than once?";
-    }
-  } // This message intentionally doesn't mention ForwardRef or MemoComponent
-  // because the fact that it's a separate type of work is an
-  // implementation detail.
-
   {
     throw Error(
-      "Element type is invalid. Received a promise that resolves to: " +
-        Component +
-        ". Lazy element type must resolve to a class or function." +
-        hint
+      "Unknown unit of work tag (" +
+        workInProgress.tag +
+        "). This error is likely caused by a bug in React. Please file an issue."
     );
   }
 }
 
-function mountIncompleteClassComponent(
-  _current,
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
+var didReceiveUpdate = false;
+var didWarnAboutBadClass;
+var didWarnAboutModulePatternComponent;
+var didWarnAboutContextTypeOnFunctionComponent;
+var didWarnAboutGetDerivedStateOnFunctionComponent;
+var didWarnAboutFunctionRefs;
+var didWarnAboutReassigningProps;
+var didWarnAboutRevealOrder;
+var didWarnAboutTailOptions;
+
+{
+  didWarnAboutBadClass = {};
+  didWarnAboutModulePatternComponent = {};
+  didWarnAboutContextTypeOnFunctionComponent = {};
+  didWarnAboutGetDerivedStateOnFunctionComponent = {};
+  didWarnAboutFunctionRefs = {};
+  didWarnAboutReassigningProps = false;
+  didWarnAboutRevealOrder = {};
+  didWarnAboutTailOptions = {};
+}
+
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  if (current === null) {
+    // If this is a fresh new component that hasn't been rendered yet, we
+    // won't update its child set by applying minimal side-effects. Instead,
+    // we will add them all to the child before it gets rendered. That means
+    // we can optimize this reconciliation pass by not tracking side-effects.
+    workInProgress.child = mountChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderLanes
+    );
+  } else {
+    // If the current child is the same as the work in progress, it means that
+    // we haven't yet started any work on these children. Therefore, we use
+    // the clone algorithm to create a copy of all the current children.
+    // If we had any progressed work already, that is invalid at this point so
+    // let's throw it out.
+    workInProgress.child = reconcileChildFibers(
+      workInProgress,
+      current.child,
+      nextChildren,
+      renderLanes
+    );
+  }
+}
+
+function forceUnmountCurrentAndReconcile(
+  current,
+  workInProgress,
+  nextChildren,
+  renderLanes
+) {
+  // This function is fork of reconcileChildren. It's used in cases where we
+  // want to reconcile without matching against the existing set. This has the
+  // effect of all current children being unmounted; even if the type and key
+  // are the same, the old child is unmounted and a new child is created.
+  //
+  // To do this, we're going to go through the reconcile algorithm twice. In
+  // the first pass, we schedule a deletion for all the current children by
+  // passing null.
+  workInProgress.child = reconcileChildFibers(
+    workInProgress,
+    current.child,
+    null,
+    renderLanes
+  ); // In the second pass, we mount the new children. The trick here is that we
+  // pass null in place of where we usually pass the current child set. This has
+  // the effect of remounting all children regardless of whether their
+  // identities match.
+
+  workInProgress.child = reconcileChildFibers(
+    workInProgress,
+    null,
+    nextChildren,
+    renderLanes
+  );
+}
+
+function updateForwardRef(
+  current,
   workInProgress,
   Component,
   nextProps,
   renderLanes
 ) {
-  if (_current !== null) {
-    // An incomplete component only mounts if it suspended inside a non-
-    // concurrent tree, in an inconsistent state. We want to treat it like
-    // a new mount, even though an empty version of it already committed.
-    // Disconnect the alternate pointers.
-    _current.alternate = null;
-    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
+  // TODO: current can be non-null here even if the component
+  // hasn't yet mounted. This happens after the first render suspends.
+  // We'll need to figure out if this is fine or can cause issues.
+  {
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var innerPropTypes = Component.propTypes;
 
-    workInProgress.flags |= Placement;
-  } // Promote the fiber to a class and try rendering again.
+      if (innerPropTypes) {
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(Component)
+        );
+      }
+    }
+  }
 
-  workInProgress.tag = ClassComponent; // The rest of this function is a fork of `updateClassComponent`
-  // Push context providers early to prevent context stack mismatches.
-  // During mounting we don't know the child context yet as the instance doesn't exist.
-  // We will invalidate the child context in finishClassComponent() right after rendering.
+  var render = Component.render;
+  var ref = workInProgress.ref; // The rest is a fork of updateFunctionComponent
 
-  var hasContext;
+  var nextChildren;
+  prepareToReadContext(workInProgress, renderLanes);
 
-  if (isContextProvider(Component)) {
-    hasContext = true;
-    pushContextProvider(workInProgress);
-  } else {
-    hasContext = false;
+  {
+    ReactCurrentOwner$1.current = workInProgress;
+    setIsRendering(true);
+    nextChildren = renderWithHooks(
+      current,
+      workInProgress,
+      render,
+      nextProps,
+      ref,
+      renderLanes
+    );
+
+    if (workInProgress.mode & StrictLegacyMode) {
+      disableLogs();
+
+      try {
+        nextChildren = renderWithHooks(
+          current,
+          workInProgress,
+          render,
+          nextProps,
+          ref,
+          renderLanes
+        );
+      } finally {
+        reenableLogs();
+      }
+    }
+
+    setIsRendering(false);
   }
 
-  prepareToReadContext(workInProgress, renderLanes);
-  constructClassInstance(workInProgress, Component, nextProps);
-  mountClassInstance(workInProgress, Component, nextProps, renderLanes);
-  return finishClassComponent(
-    null,
-    workInProgress,
-    Component,
-    true,
-    hasContext,
-    renderLanes
-  );
+  if (current !== null && !didReceiveUpdate) {
+    bailoutHooks(current, workInProgress, renderLanes);
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  } // React DevTools reads this flag.
+
+  workInProgress.flags |= PerformedWork;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
 }
 
-function mountIndeterminateComponent(
-  _current,
+function updateMemoComponent(
+  current,
   workInProgress,
   Component,
+  nextProps,
   renderLanes
 ) {
-  if (_current !== null) {
-    // An indeterminate component only mounts if it suspended inside a non-
-    // concurrent tree, in an inconsistent state. We want to treat it like
-    // a new mount, even though an empty version of it already committed.
-    // Disconnect the alternate pointers.
-    _current.alternate = null;
-    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
-
-    workInProgress.flags |= Placement;
-  }
-
-  var props = workInProgress.pendingProps;
-  var context;
-
-  {
-    var unmaskedContext = getUnmaskedContext(workInProgress, Component, false);
-    context = getMaskedContext(workInProgress, unmaskedContext);
-  }
-
-  prepareToReadContext(workInProgress, renderLanes);
-  var value;
+  if (current === null) {
+    var type = Component.type;
 
-  {
     if (
-      Component.prototype &&
-      typeof Component.prototype.render === "function"
+      isSimpleFunctionComponent(type) &&
+      Component.compare === null && // SimpleMemoComponent codepath doesn't resolve outer props either.
+      Component.defaultProps === undefined
     ) {
-      var componentName = getComponentName(Component) || "Unknown";
+      var resolvedType = type;
 
-      if (!didWarnAboutBadClass[componentName]) {
-        error(
-          "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
-            "This is likely to cause errors. Change %s to extend React.Component instead.",
-          componentName,
-          componentName
-        );
+      {
+        resolvedType = resolveFunctionForHotReloading(type);
+      } // If this is a plain function component without default props,
+      // and with only the default shallow comparison, we upgrade it
+      // to a SimpleMemoComponent to allow fast path updates.
 
-        didWarnAboutBadClass[componentName] = true;
+      workInProgress.tag = SimpleMemoComponent;
+      workInProgress.type = resolvedType;
+
+      {
+        validateFunctionComponentInDev(workInProgress, type);
       }
+
+      return updateSimpleMemoComponent(
+        current,
+        workInProgress,
+        resolvedType,
+        nextProps,
+        renderLanes
+      );
     }
 
-    if (workInProgress.mode & StrictMode) {
-      ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
+    {
+      var innerPropTypes = type.propTypes;
+
+      if (innerPropTypes) {
+        // Inner memo component props aren't currently validated in createElement.
+        // We could move it there, but we'd still need this for lazy code path.
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(type)
+        );
+      }
     }
 
-    setIsRendering(true);
-    ReactCurrentOwner$1.current = workInProgress;
-    value = renderWithHooks(
+    var child = createFiberFromTypeAndProps(
+      Component.type,
       null,
+      nextProps,
       workInProgress,
-      Component,
-      props,
-      context,
+      workInProgress.mode,
       renderLanes
     );
-    setIsRendering(false);
+    child.ref = workInProgress.ref;
+    child.return = workInProgress;
+    workInProgress.child = child;
+    return child;
+  }
+
+  {
+    var _type = Component.type;
+    var _innerPropTypes = _type.propTypes;
+
+    if (_innerPropTypes) {
+      // Inner memo component props aren't currently validated in createElement.
+      // We could move it there, but we'd still need this for lazy code path.
+      checkPropTypes(
+        _innerPropTypes,
+        nextProps, // Resolved props
+        "prop",
+        getComponentNameFromType(_type)
+      );
+    }
+  }
+
+  var currentChild = current.child; // This is always exactly one child
+
+  var hasScheduledUpdateOrContext = checkScheduledUpdateOrContext(
+    current,
+    renderLanes
+  );
+
+  if (!hasScheduledUpdateOrContext) {
+    // This will be the props with resolved defaultProps,
+    // unlike current.memoizedProps which will be the unresolved ones.
+    var prevProps = currentChild.memoizedProps; // Default to shallow comparison
+
+    var compare = Component.compare;
+    compare = compare !== null ? compare : shallowEqual;
+
+    if (compare(prevProps, nextProps) && current.ref === workInProgress.ref) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+    }
   } // React DevTools reads this flag.
 
   workInProgress.flags |= PerformedWork;
+  var newChild = createWorkInProgress(currentChild, nextProps);
+  newChild.ref = workInProgress.ref;
+  newChild.return = workInProgress;
+  workInProgress.child = newChild;
+  return newChild;
+}
 
+function updateSimpleMemoComponent(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  // TODO: current can be non-null here even if the component
+  // hasn't yet mounted. This happens when the inner render suspends.
+  // We'll need to figure out if this is fine or can cause issues.
   {
-    // Support for module components is deprecated and is removed behind a flag.
-    // Whether or not it would crash later, we want to show a good message in DEV first.
-    if (
-      typeof value === "object" &&
-      value !== null &&
-      typeof value.render === "function" &&
-      value.$$typeof === undefined
-    ) {
-      var _componentName = getComponentName(Component) || "Unknown";
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var outerMemoType = workInProgress.elementType;
 
-      if (!didWarnAboutModulePatternComponent[_componentName]) {
-        error(
-          "The <%s /> component appears to be a function component that returns a class instance. " +
-            "Change %s to a class that extends React.Component instead. " +
-            "If you can't use a class try assigning the prototype on the function as a workaround. " +
-            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
-            "cannot be called with `new` by React.",
-          _componentName,
-          _componentName,
-          _componentName
-        );
+      if (outerMemoType.$$typeof === REACT_LAZY_TYPE) {
+        // We warn when you define propTypes on lazy()
+        // so let's just skip over it to find memo() outer wrapper.
+        // Inner props for memo are validated later.
+        var lazyComponent = outerMemoType;
+        var payload = lazyComponent._payload;
+        var init = lazyComponent._init;
 
-        didWarnAboutModulePatternComponent[_componentName] = true;
+        try {
+          outerMemoType = init(payload);
+        } catch (x) {
+          outerMemoType = null;
+        } // Inner propTypes will be validated in the function component path.
+
+        var outerPropTypes = outerMemoType && outerMemoType.propTypes;
+
+        if (outerPropTypes) {
+          checkPropTypes(
+            outerPropTypes,
+            nextProps, // Resolved (SimpleMemoComponent has no defaultProps)
+            "prop",
+            getComponentNameFromType(outerMemoType)
+          );
+        }
       }
     }
   }
 
-  if (
-    // Run these checks in production only if the flag is off.
-    // Eventually we'll delete this branch altogether.
-    typeof value === "object" &&
-    value !== null &&
-    typeof value.render === "function" &&
-    value.$$typeof === undefined
-  ) {
-    {
-      var _componentName2 = getComponentName(Component) || "Unknown";
+  if (current !== null) {
+    var prevProps = current.memoizedProps;
 
-      if (!didWarnAboutModulePatternComponent[_componentName2]) {
-        error(
-          "The <%s /> component appears to be a function component that returns a class instance. " +
-            "Change %s to a class that extends React.Component instead. " +
-            "If you can't use a class try assigning the prototype on the function as a workaround. " +
-            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
-            "cannot be called with `new` by React.",
-          _componentName2,
-          _componentName2,
-          _componentName2
-        );
+    if (
+      shallowEqual(prevProps, nextProps) &&
+      current.ref === workInProgress.ref && // Prevent bailout if the implementation changed due to hot reload.
+      workInProgress.type === current.type
+    ) {
+      didReceiveUpdate = false;
 
-        didWarnAboutModulePatternComponent[_componentName2] = true;
+      if (!checkScheduledUpdateOrContext(current, renderLanes)) {
+        // The pending lanes were cleared at the beginning of beginWork. We're
+        // about to bail out, but there might be other lanes that weren't
+        // included in the current render. Usually, the priority level of the
+        // remaining updates is accumulated during the evaluation of the
+        // component (i.e. when processing the update queue). But since since
+        // we're bailing out early *without* evaluating the component, we need
+        // to account for it here, too. Reset to the value of the current fiber.
+        // NOTE: This only applies to SimpleMemoComponent, not MemoComponent,
+        // because a MemoComponent fiber does not have hooks or an update queue;
+        // rather, it wraps around an inner component, which may or may not
+        // contains hooks.
+        // TODO: Move the reset at in beginWork out of the common path so that
+        // this is no longer necessary.
+        workInProgress.lanes = current.lanes;
+        return bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
+        );
+      } else if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
+        // This is a special case that only exists for legacy mode.
+        // See https://github.com/facebook/react/pull/19216.
+        didReceiveUpdate = true;
       }
-    } // Proceed under the assumption that this is a class instance
+    }
+  }
 
-    workInProgress.tag = ClassComponent; // Throw out any hooks that were used.
+  return updateFunctionComponent(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    renderLanes
+  );
+}
 
-    workInProgress.memoizedState = null;
-    workInProgress.updateQueue = null; // Push context providers early to prevent context stack mismatches.
-    // During mounting we don't know the child context yet as the instance doesn't exist.
-    // We will invalidate the child context in finishClassComponent() right after rendering.
+function updateOffscreenComponent(current, workInProgress, renderLanes) {
+  var nextProps = workInProgress.pendingProps;
+  var nextChildren = nextProps.children;
+  var prevState = current !== null ? current.memoizedState : null; // If this is not null, this is a cache pool that was carried over from the
+  // previous render. We will push this to the cache pool context so that we can
+  // resume in-flight requests.
 
-    var hasContext = false;
+  var spawnedCachePool = null;
 
-    if (isContextProvider(Component)) {
-      hasContext = true;
-      pushContextProvider(workInProgress);
-    } else {
-      hasContext = false;
-    }
+  if (
+    nextProps.mode === "hidden" ||
+    nextProps.mode === "unstable-defer-without-hiding"
+  ) {
+    // Rendering a hidden tree.
+    if ((workInProgress.mode & ConcurrentMode) === NoMode) {
+      // In legacy sync mode, don't defer the subtree. Render it now.
+      var nextState = {
+        baseLanes: NoLanes,
+        cachePool: null
+      };
+      workInProgress.memoizedState = nextState;
+      pushRenderLanes(workInProgress, renderLanes);
+    } else if (!includesSomeLane(renderLanes, OffscreenLane)) {
+      // We're hidden, and we're not rendering at Offscreen. We will bail out
+      // and resume this tree later.
+      var nextBaseLanes;
 
-    workInProgress.memoizedState =
-      value.state !== null && value.state !== undefined ? value.state : null;
-    initializeUpdateQueue(workInProgress);
-    var getDerivedStateFromProps = Component.getDerivedStateFromProps;
+      if (prevState !== null) {
+        var prevBaseLanes = prevState.baseLanes;
+        nextBaseLanes = mergeLanes(prevBaseLanes, renderLanes);
+      } else {
+        nextBaseLanes = renderLanes;
+      } // Schedule this fiber to re-render at offscreen priority. Then bailout.
 
-    if (typeof getDerivedStateFromProps === "function") {
-      applyDerivedStateFromProps(
-        workInProgress,
-        Component,
-        getDerivedStateFromProps,
-        props
+      workInProgress.lanes = workInProgress.childLanes = laneToLanes(
+        OffscreenLane
       );
-    }
+      var _nextState = {
+        baseLanes: nextBaseLanes,
+        cachePool: spawnedCachePool
+      };
+      workInProgress.memoizedState = _nextState;
+      workInProgress.updateQueue = null; // We're about to bail out, but we need to push this to the stack anyway
+      // to avoid a push/pop misalignment.
 
-    adoptClassInstance(workInProgress, value);
-    mountClassInstance(workInProgress, Component, props, renderLanes);
-    return finishClassComponent(
-      null,
-      workInProgress,
-      Component,
-      true,
-      hasContext,
-      renderLanes
-    );
-  } else {
-    // Proceed under the assumption that this is a function component
-    workInProgress.tag = FunctionComponent;
+      pushRenderLanes(workInProgress, nextBaseLanes);
 
-    {
-      if (workInProgress.mode & StrictMode) {
-        disableLogs();
+      return null;
+    } else {
+      var _nextState2 = {
+        baseLanes: NoLanes,
+        cachePool: null
+      };
+      workInProgress.memoizedState = _nextState2; // Push the lanes that were skipped when we bailed out.
 
-        try {
-          value = renderWithHooks(
-            null,
-            workInProgress,
-            Component,
-            props,
-            context,
-            renderLanes
-          );
-        } finally {
-          reenableLogs();
-        }
-      }
+      var subtreeRenderLanes =
+        prevState !== null ? prevState.baseLanes : renderLanes;
+      pushRenderLanes(workInProgress, subtreeRenderLanes);
     }
+  } else {
+    // Rendering a visible tree.
+    var _subtreeRenderLanes;
 
-    reconcileChildren(null, workInProgress, value, renderLanes);
+    if (prevState !== null) {
+      // We're going from hidden -> visible.
+      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes);
 
-    {
-      validateFunctionComponentInDev(workInProgress, Component);
+      workInProgress.memoizedState = null;
+    } else {
+      // We weren't previously hidden, and we still aren't, so there's nothing
+      // special to do. Need to push to the stack regardless, though, to avoid
+      // a push/pop misalignment.
+      _subtreeRenderLanes = renderLanes;
     }
 
+    pushRenderLanes(workInProgress, _subtreeRenderLanes);
+  }
+
+  if (enablePersistentOffscreenHostContainer && supportsPersistence) {
+    // In persistent mode, the offscreen children are wrapped in a host node.
+    // TODO: Optimize this to use the OffscreenComponent fiber instead of
+    // an extra HostComponent fiber. Need to make sure this doesn't break Fabric
+    // or some other infra that expects a HostComponent.
+    var isHidden =
+      nextProps.mode === "hidden" &&
+      workInProgress.tag !== LegacyHiddenComponent;
+    var offscreenContainer = reconcileOffscreenHostContainer(
+      current,
+      workInProgress
+    );
+    return offscreenContainer;
+  } else {
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
     return workInProgress.child;
   }
 }
 
-function validateFunctionComponentInDev(workInProgress, Component) {
-  {
-    if (Component) {
-      if (Component.childContextTypes) {
-        error(
-          "%s(...): childContextTypes cannot be defined on a function component.",
-          Component.displayName || Component.name || "Component"
-        );
-      }
-    }
-
-    if (workInProgress.ref !== null) {
-      var info = "";
-      var ownerName = getCurrentFiberOwnerNameInDevOrNull();
-
-      if (ownerName) {
-        info += "\n\nCheck the render method of `" + ownerName + "`.";
-      }
-
-      var warningKey = ownerName || workInProgress._debugID || "";
-      var debugSource = workInProgress._debugSource;
-
-      if (debugSource) {
-        warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
-      }
+function reconcileOffscreenHostContainer(
+  currentOffscreen,
+  offscreen,
+  isHidden,
+  children,
+  renderLanes
+) {
+  var containerProps = getOffscreenContainerProps();
+  var hostContainer;
 
-      if (!didWarnAboutFunctionRefs[warningKey]) {
-        didWarnAboutFunctionRefs[warningKey] = true;
+  if (currentOffscreen === null) {
+    hostContainer = createOffscreenHostContainerFiber(
+      containerProps,
+      offscreen.mode
+    );
+  } else {
+    var currentHostContainer = currentOffscreen.child;
 
-        error(
-          "Function components cannot be given refs. " +
-            "Attempts to access this ref will fail. " +
-            "Did you mean to use React.forwardRef()?%s",
-          info
-        );
-      }
+    if (currentHostContainer === null) {
+      hostContainer = createOffscreenHostContainerFiber(
+        containerProps,
+        offscreen.mode
+      );
+      hostContainer.flags |= Placement;
+    } else {
+      hostContainer = createWorkInProgress(
+        currentHostContainer,
+        containerProps
+      );
     }
+  }
 
-    if (typeof Component.getDerivedStateFromProps === "function") {
-      var _componentName3 = getComponentName(Component) || "Unknown";
+  hostContainer.return = offscreen;
+  offscreen.child = hostContainer;
+  return hostContainer;
+} // Note: These happen to have identical begin phases, for now. We shouldn't hold
+// ourselves to this constraint, though. If the behavior diverges, we should
+// fork the function.
 
-      if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3]) {
-        error(
-          "%s: Function components do not support getDerivedStateFromProps.",
-          _componentName3
-        );
+var updateLegacyHiddenComponent = updateOffscreenComponent;
 
-        didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3] = true;
-      }
-    }
+function updateFragment(current, workInProgress, renderLanes) {
+  var nextChildren = workInProgress.pendingProps;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
+}
 
-    if (
-      typeof Component.contextType === "object" &&
-      Component.contextType !== null
-    ) {
-      var _componentName4 = getComponentName(Component) || "Unknown";
+function updateMode(current, workInProgress, renderLanes) {
+  var nextChildren = workInProgress.pendingProps.children;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
+}
 
-      if (!didWarnAboutContextTypeOnFunctionComponent[_componentName4]) {
-        error(
-          "%s: Function components do not support contextType.",
-          _componentName4
-        );
+function updateProfiler(current, workInProgress, renderLanes) {
+  {
+    workInProgress.flags |= Update;
 
-        didWarnAboutContextTypeOnFunctionComponent[_componentName4] = true;
-      }
+    {
+      // Reset effect durations for the next eventual effect phase.
+      // These are reset during render to allow the DevTools commit hook a chance to read them,
+      var stateNode = workInProgress.stateNode;
+      stateNode.effectDuration = 0;
+      stateNode.passiveEffectDuration = 0;
     }
   }
+
+  var nextProps = workInProgress.pendingProps;
+  var nextChildren = nextProps.children;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
 }
 
-var SUSPENDED_MARKER = {
-  dehydrated: null,
-  retryLane: NoLane
-};
+function markRef$1(current, workInProgress) {
+  var ref = workInProgress.ref;
 
-function mountSuspenseOffscreenState(renderLanes) {
-  return {
-    baseLanes: renderLanes
-  };
+  if (
+    (current === null && ref !== null) ||
+    (current !== null && current.ref !== ref)
+  ) {
+    // Schedule a Ref effect
+    workInProgress.flags |= Ref;
+  }
 }
 
-function updateSuspenseOffscreenState(prevOffscreenState, renderLanes) {
-  return {
-    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes)
-  };
-} // TODO: Probably should inline this back
-
-function shouldRemainOnFallback(
-  suspenseContext,
+function updateFunctionComponent(
   current,
   workInProgress,
+  Component,
+  nextProps,
   renderLanes
 ) {
-  // If we're already showing a fallback, there are cases where we need to
-  // remain on that fallback regardless of whether the content has resolved.
-  // For example, SuspenseList coordinates when nested content appears.
-  if (current !== null) {
-    var suspenseState = current.memoizedState;
-
-    if (suspenseState === null) {
-      // Currently showing content. Don't hide it, even if ForceSuspenseFallack
-      // is true. More precise name might be "ForceRemainSuspenseFallback".
-      // Note: This is a factoring smell. Can't remain on a fallback if there's
-      // no fallback to remain on.
-      return false;
-    }
-  } // Not currently showing content. Consult the Suspense context.
-
-  return hasSuspenseContext(suspenseContext, ForceSuspenseFallback);
-}
+  {
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var innerPropTypes = Component.propTypes;
 
-function getRemainingWorkInPrimaryTree(current, renderLanes) {
-  // TODO: Should not remove render lanes that were pinged during this render
-  return removeLanes(current.childLanes, renderLanes);
-}
+      if (innerPropTypes) {
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(Component)
+        );
+      }
+    }
+  }
 
-function updateSuspenseComponent(current, workInProgress, renderLanes) {
-  var nextProps = workInProgress.pendingProps; // This is used by DevTools to force a boundary to suspend.
+  var context;
 
   {
-    if (shouldSuspend(workInProgress)) {
-      workInProgress.flags |= DidCapture;
-    }
+    var unmaskedContext = getUnmaskedContext(workInProgress, Component, true);
+    context = getMaskedContext(workInProgress, unmaskedContext);
   }
 
-  var suspenseContext = suspenseStackCursor.current;
-  var showFallback = false;
-  var didSuspend = (workInProgress.flags & DidCapture) !== NoFlags;
+  var nextChildren;
+  prepareToReadContext(workInProgress, renderLanes);
 
-  if (didSuspend || shouldRemainOnFallback(suspenseContext, current)) {
-    // Something in this boundary's subtree already suspended. Switch to
-    // rendering the fallback children.
-    showFallback = true;
-    workInProgress.flags &= ~DidCapture;
-  } else {
-    // Attempting the main content
-    if (current === null || current.memoizedState !== null) {
-      // This is a new mount or this boundary is already showing a fallback state.
-      // Mark this subtree context as having at least one invisible parent that could
-      // handle the fallback state.
-      // Boundaries without fallbacks or should be avoided are not considered since
-      // they cannot handle preferred fallback states.
-      if (
-        nextProps.fallback !== undefined &&
-        nextProps.unstable_avoidThisFallback !== true
-      ) {
-        suspenseContext = addSubtreeSuspenseContext(
-          suspenseContext,
-          InvisibleParentSuspenseContext
+  {
+    ReactCurrentOwner$1.current = workInProgress;
+    setIsRendering(true);
+    nextChildren = renderWithHooks(
+      current,
+      workInProgress,
+      Component,
+      nextProps,
+      context,
+      renderLanes
+    );
+
+    if (workInProgress.mode & StrictLegacyMode) {
+      disableLogs();
+
+      try {
+        nextChildren = renderWithHooks(
+          current,
+          workInProgress,
+          Component,
+          nextProps,
+          context,
+          renderLanes
         );
+      } finally {
+        reenableLogs();
       }
     }
+
+    setIsRendering(false);
   }
 
-  suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
-  pushSuspenseContext(workInProgress, suspenseContext); // OK, the next part is confusing. We're about to reconcile the Suspense
-  // boundary's children. This involves some custom reconcilation logic. Two
-  // main reasons this is so complicated.
-  //
-  // First, Legacy Mode has different semantics for backwards compatibility. The
-  // primary tree will commit in an inconsistent state, so when we do the
-  // second pass to render the fallback, we do some exceedingly, uh, clever
-  // hacks to make that not totally break. Like transferring effects and
-  // deletions from hidden tree. In Concurrent Mode, it's much simpler,
-  // because we bailout on the primary tree completely and leave it in its old
-  // state, no effects. Same as what we do for Offscreen (except that
-  // Offscreen doesn't have the first render pass).
-  //
-  // Second is hydration. During hydration, the Suspense fiber has a slightly
-  // different layout, where the child points to a dehydrated fragment, which
-  // contains the DOM rendered by the server.
-  //
-  // Third, even if you set all that aside, Suspense is like error boundaries in
-  // that we first we try to render one tree, and if that fails, we render again
-  // and switch to a different tree. Like a try/catch block. So we have to track
-  // which branch we're currently rendering. Ideally we would model this using
-  // a stack.
+  if (current !== null && !didReceiveUpdate) {
+    bailoutHooks(current, workInProgress, renderLanes);
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  } // React DevTools reads this flag.
 
-  if (current === null) {
-    // Initial mount
-    // If we're currently hydrating, try to hydrate this boundary.
-    // But only if this has a fallback.
-    if (nextProps.fallback !== undefined);
+  workInProgress.flags |= PerformedWork;
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
+}
 
-    var nextPrimaryChildren = nextProps.children;
-    var nextFallbackChildren = nextProps.fallback;
+function updateClassComponent(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  {
+    // This is used by DevTools to force a boundary to error.
+    switch (shouldError(workInProgress)) {
+      case false: {
+        var _instance = workInProgress.stateNode;
+        var ctor = workInProgress.type; // TODO This way of resetting the error boundary state is a hack.
+        // Is there a better way to do this?
+
+        var tempInstance = new ctor(
+          workInProgress.memoizedProps,
+          _instance.context
+        );
+        var state = tempInstance.state;
 
-    if (showFallback) {
-      var fallbackFragment = mountSuspenseFallbackChildren(
-        workInProgress,
-        nextPrimaryChildren,
-        nextFallbackChildren,
-        renderLanes
-      );
-      var primaryChildFragment = workInProgress.child;
-      primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
-        renderLanes
-      );
-      workInProgress.memoizedState = SUSPENDED_MARKER;
-      return fallbackFragment;
-    } else if (typeof nextProps.unstable_expectedLoadTime === "number") {
-      // This is a CPU-bound tree. Skip this tree and show a placeholder to
-      // unblock the surrounding content. Then immediately retry after the
-      // initial commit.
-      var _fallbackFragment = mountSuspenseFallbackChildren(
-        workInProgress,
-        nextPrimaryChildren,
-        nextFallbackChildren,
-        renderLanes
-      );
+        _instance.updater.enqueueSetState(_instance, state, null);
 
-      var _primaryChildFragment = workInProgress.child;
-      _primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
-        renderLanes
-      );
-      workInProgress.memoizedState = SUSPENDED_MARKER; // Since nothing actually suspended, there will nothing to ping this to
-      // get it started back up to attempt the next item. While in terms of
-      // priority this work has the same priority as this current render, it's
-      // not part of the same transition once the transition has committed. If
-      // it's sync, we still want to yield so that it can be painted.
-      // Conceptually, this is really the same as pinging. We can use any
-      // RetryLane even if it's the one currently rendering since we're leaving
-      // it behind on this node.
+        break;
+      }
 
-      workInProgress.lanes = SomeRetryLane;
+      case true: {
+        workInProgress.flags |= DidCapture;
+        workInProgress.flags |= ShouldCapture;
+        var error$1 = new Error("Simulated error coming from DevTools");
+        var lane = pickArbitraryLane(renderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane); // Schedule the error boundary to re-render using updated state
 
-      {
-        markSpawnedWork(SomeRetryLane);
+        var update = createClassErrorUpdate(
+          workInProgress,
+          createCapturedValue(error$1, workInProgress),
+          lane
+        );
+        enqueueCapturedUpdate(workInProgress, update);
+        break;
       }
-
-      return _fallbackFragment;
-    } else {
-      return mountSuspensePrimaryChildren(
-        workInProgress,
-        nextPrimaryChildren,
-        renderLanes
-      );
     }
-  } else {
-    // This is an update.
-    // If the current fiber has a SuspenseState, that means it's already showing
-    // a fallback.
-    var prevState = current.memoizedState;
 
-    if (prevState !== null) {
-      if (showFallback) {
-        var _nextFallbackChildren2 = nextProps.fallback;
-        var _nextPrimaryChildren2 = nextProps.children;
+    if (workInProgress.type !== workInProgress.elementType) {
+      // Lazy component props can't be validated in createElement
+      // because they're only guaranteed to be resolved here.
+      var innerPropTypes = Component.propTypes;
 
-        var _fallbackChildFragment = updateSuspenseFallbackChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren2,
-          _nextFallbackChildren2,
-          renderLanes
+      if (innerPropTypes) {
+        checkPropTypes(
+          innerPropTypes,
+          nextProps, // Resolved props
+          "prop",
+          getComponentNameFromType(Component)
         );
+      }
+    }
+  } // Push context providers early to prevent context stack mismatches.
+  // During mounting we don't know the child context yet as the instance doesn't exist.
+  // We will invalidate the child context in finishClassComponent() right after rendering.
 
-        var _primaryChildFragment3 = workInProgress.child;
-        var prevOffscreenState = current.child.memoizedState;
-        _primaryChildFragment3.memoizedState =
-          prevOffscreenState === null
-            ? mountSuspenseOffscreenState(renderLanes)
-            : updateSuspenseOffscreenState(prevOffscreenState, renderLanes);
-        _primaryChildFragment3.childLanes = getRemainingWorkInPrimaryTree(
-          current,
-          renderLanes
-        );
-        workInProgress.memoizedState = SUSPENDED_MARKER;
-        return _fallbackChildFragment;
-      } else {
-        var _nextPrimaryChildren3 = nextProps.children;
+  var hasContext;
 
-        var _primaryChildFragment4 = updateSuspensePrimaryChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren3,
-          renderLanes
-        );
+  if (isContextProvider(Component)) {
+    hasContext = true;
+    pushContextProvider(workInProgress);
+  } else {
+    hasContext = false;
+  }
 
-        workInProgress.memoizedState = null;
-        return _primaryChildFragment4;
-      }
-    } else {
-      // The current tree is not already showing a fallback.
-      if (showFallback) {
-        // Timed out.
-        var _nextFallbackChildren3 = nextProps.fallback;
-        var _nextPrimaryChildren4 = nextProps.children;
+  prepareToReadContext(workInProgress, renderLanes);
+  var instance = workInProgress.stateNode;
+  var shouldUpdate;
 
-        var _fallbackChildFragment2 = updateSuspenseFallbackChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren4,
-          _nextFallbackChildren3,
-          renderLanes
-        );
+  if (instance === null) {
+    if (current !== null) {
+      // A class component without an instance only mounts if it suspended
+      // inside a non-concurrent tree, in an inconsistent state. We want to
+      // treat it like a new mount, even though an empty version of it already
+      // committed. Disconnect the alternate pointers.
+      current.alternate = null;
+      workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
+
+      workInProgress.flags |= Placement;
+    } // In the initial pass we might need to construct the instance.
+
+    constructClassInstance(workInProgress, Component, nextProps);
+    mountClassInstance(workInProgress, Component, nextProps, renderLanes);
+    shouldUpdate = true;
+  } else if (current === null) {
+    // In a resume, we'll already have an instance we can reuse.
+    shouldUpdate = resumeMountClassInstance(
+      workInProgress,
+      Component,
+      nextProps,
+      renderLanes
+    );
+  } else {
+    shouldUpdate = updateClassInstance(
+      current,
+      workInProgress,
+      Component,
+      nextProps,
+      renderLanes
+    );
+  }
 
-        var _primaryChildFragment5 = workInProgress.child;
-        var _prevOffscreenState = current.child.memoizedState;
-        _primaryChildFragment5.memoizedState =
-          _prevOffscreenState === null
-            ? mountSuspenseOffscreenState(renderLanes)
-            : updateSuspenseOffscreenState(_prevOffscreenState, renderLanes);
-        _primaryChildFragment5.childLanes = getRemainingWorkInPrimaryTree(
-          current,
-          renderLanes
-        ); // Skip the primary children, and continue working on the
-        // fallback children.
+  var nextUnitOfWork = finishClassComponent(
+    current,
+    workInProgress,
+    Component,
+    shouldUpdate,
+    hasContext,
+    renderLanes
+  );
 
-        workInProgress.memoizedState = SUSPENDED_MARKER;
-        return _fallbackChildFragment2;
-      } else {
-        // Still haven't timed out. Continue rendering the children, like we
-        // normally do.
-        var _nextPrimaryChildren5 = nextProps.children;
+  {
+    var inst = workInProgress.stateNode;
 
-        var _primaryChildFragment6 = updateSuspensePrimaryChildren(
-          current,
-          workInProgress,
-          _nextPrimaryChildren5,
-          renderLanes
+    if (shouldUpdate && inst.props !== nextProps) {
+      if (!didWarnAboutReassigningProps) {
+        error(
+          "It looks like %s is reassigning its own `this.props` while rendering. " +
+            "This is not supported and can lead to confusing bugs.",
+          getComponentNameFromFiber(workInProgress) || "a component"
         );
-
-        workInProgress.memoizedState = null;
-        return _primaryChildFragment6;
       }
+
+      didWarnAboutReassigningProps = true;
     }
   }
-}
 
-function mountSuspensePrimaryChildren(
-  workInProgress,
-  primaryChildren,
-  renderLanes
-) {
-  var mode = workInProgress.mode;
-  var primaryChildProps = {
-    mode: "visible",
-    children: primaryChildren
-  };
-  var primaryChildFragment = createFiberFromOffscreen(
-    primaryChildProps,
-    mode,
-    renderLanes,
-    null
-  );
-  primaryChildFragment.return = workInProgress;
-  workInProgress.child = primaryChildFragment;
-  return primaryChildFragment;
+  return nextUnitOfWork;
 }
 
-function mountSuspenseFallbackChildren(
+function finishClassComponent(
+  current,
   workInProgress,
-  primaryChildren,
-  fallbackChildren,
+  Component,
+  shouldUpdate,
+  hasContext,
   renderLanes
 ) {
-  var mode = workInProgress.mode;
-  var progressedPrimaryFragment = workInProgress.child;
-  var primaryChildProps = {
-    mode: "hidden",
-    children: primaryChildren
-  };
-  var primaryChildFragment;
-  var fallbackChildFragment;
-
-  if ((mode & BlockingMode) === NoMode && progressedPrimaryFragment !== null) {
-    // In legacy mode, we commit the primary tree as if it successfully
-    // completed, even though it's in an inconsistent state.
-    primaryChildFragment = progressedPrimaryFragment;
-    primaryChildFragment.childLanes = NoLanes;
-    primaryChildFragment.pendingProps = primaryChildProps;
+  // Refs should update even if shouldComponentUpdate returns false
+  markRef$1(current, workInProgress);
+  var didCaptureError = (workInProgress.flags & DidCapture) !== NoFlags;
 
-    if (workInProgress.mode & ProfileMode) {
-      // Reset the durations from the first pass so they aren't included in the
-      // final amounts. This seems counterintuitive, since we're intentionally
-      // not measuring part of the render phase, but this makes it match what we
-      // do in Concurrent Mode.
-      primaryChildFragment.actualDuration = 0;
-      primaryChildFragment.actualStartTime = -1;
-      primaryChildFragment.selfBaseDuration = 0;
-      primaryChildFragment.treeBaseDuration = 0;
+  if (!shouldUpdate && !didCaptureError) {
+    // Context providers should defer to sCU for rendering
+    if (hasContext) {
+      invalidateContextProvider(workInProgress, Component, false);
     }
 
-    fallbackChildFragment = createFiberFromFragment(
-      fallbackChildren,
-      mode,
-      renderLanes,
-      null
-    );
-  } else {
-    primaryChildFragment = createFiberFromOffscreen(
-      primaryChildProps,
-      mode,
-      NoLanes,
-      null
-    );
-    fallbackChildFragment = createFiberFromFragment(
-      fallbackChildren,
-      mode,
-      renderLanes,
-      null
-    );
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
   }
 
-  primaryChildFragment.return = workInProgress;
-  fallbackChildFragment.return = workInProgress;
-  primaryChildFragment.sibling = fallbackChildFragment;
-  workInProgress.child = primaryChildFragment;
-  return fallbackChildFragment;
-}
+  var instance = workInProgress.stateNode; // Rerender
 
-function createWorkInProgressOffscreenFiber(current, offscreenProps) {
-  // The props argument to `createWorkInProgress` is `any` typed, so we use this
-  // wrapper function to constrain it.
-  return createWorkInProgress(current, offscreenProps);
-}
+  ReactCurrentOwner$1.current = workInProgress;
+  var nextChildren;
+
+  if (
+    didCaptureError &&
+    typeof Component.getDerivedStateFromError !== "function"
+  ) {
+    // If we captured an error, but getDerivedStateFromError is not defined,
+    // unmount all the children. componentDidCatch will schedule an update to
+    // re-render a fallback. This is temporary until we migrate everyone to
+    // the new API.
+    // TODO: Warn in a future release.
+    nextChildren = null;
 
-function updateSuspensePrimaryChildren(
-  current,
-  workInProgress,
-  primaryChildren,
-  renderLanes
-) {
-  var currentPrimaryChildFragment = current.child;
-  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
-  var primaryChildFragment = createWorkInProgressOffscreenFiber(
-    currentPrimaryChildFragment,
     {
-      mode: "visible",
-      children: primaryChildren
+      stopProfilerTimerIfRunning();
     }
-  );
+  } else {
+    {
+      setIsRendering(true);
+      nextChildren = instance.render();
 
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
-    primaryChildFragment.lanes = renderLanes;
-  }
+      if (workInProgress.mode & StrictLegacyMode) {
+        disableLogs();
 
-  primaryChildFragment.return = workInProgress;
-  primaryChildFragment.sibling = null;
+        try {
+          instance.render();
+        } finally {
+          reenableLogs();
+        }
+      }
 
-  if (currentFallbackChildFragment !== null) {
-    // Delete the fallback child fragment
-    currentFallbackChildFragment.nextEffect = null;
-    currentFallbackChildFragment.flags = Deletion;
-    workInProgress.firstEffect = workInProgress.lastEffect = currentFallbackChildFragment;
+      setIsRendering(false);
+    }
+  } // React DevTools reads this flag.
+
+  workInProgress.flags |= PerformedWork;
+
+  if (current !== null && didCaptureError) {
+    // If we're recovering from an error, reconcile without reusing any of
+    // the existing children. Conceptually, the normal children and the children
+    // that are shown on error are two different sets, so we shouldn't reuse
+    // normal children even if their identities match.
+    forceUnmountCurrentAndReconcile(
+      current,
+      workInProgress,
+      nextChildren,
+      renderLanes
+    );
+  } else {
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  } // Memoize state using the values we just used to render.
+  // TODO: Restructure so we never read values from the instance.
+
+  workInProgress.memoizedState = instance.state; // The context might have changed so we need to recalculate it.
+
+  if (hasContext) {
+    invalidateContextProvider(workInProgress, Component, true);
   }
 
-  workInProgress.child = primaryChildFragment;
-  return primaryChildFragment;
+  return workInProgress.child;
 }
 
-function updateSuspenseFallbackChildren(
-  current,
-  workInProgress,
-  primaryChildren,
-  fallbackChildren,
-  renderLanes
-) {
-  var mode = workInProgress.mode;
-  var currentPrimaryChildFragment = current.child;
-  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = {
-    mode: "hidden",
-    children: primaryChildren
-  };
-  var primaryChildFragment;
+function pushHostRootContext(workInProgress) {
+  var root = workInProgress.stateNode;
 
-  if (
-    // In legacy mode, we commit the primary tree as if it successfully
-    // completed, even though it's in an inconsistent state.
-    (mode & BlockingMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
-    // already cloned. In legacy mode, the only case where this isn't true is
-    // when DevTools forces us to display a fallback; we skip the first render
-    // pass entirely and go straight to rendering the fallback. (In Concurrent
-    // Mode, SuspenseList can also trigger this scenario, but this is a legacy-
-    // only codepath.)
-    workInProgress.child !== currentPrimaryChildFragment
-  ) {
-    var progressedPrimaryFragment = workInProgress.child;
-    primaryChildFragment = progressedPrimaryFragment;
-    primaryChildFragment.childLanes = NoLanes;
-    primaryChildFragment.pendingProps = primaryChildProps;
+  if (root.pendingContext) {
+    pushTopLevelContextObject(
+      workInProgress,
+      root.pendingContext,
+      root.pendingContext !== root.context
+    );
+  } else if (root.context) {
+    // Should always be set
+    pushTopLevelContextObject(workInProgress, root.context, false);
+  }
 
-    if (workInProgress.mode & ProfileMode) {
-      // Reset the durations from the first pass so they aren't included in the
-      // final amounts. This seems counterintuitive, since we're intentionally
-      // not measuring part of the render phase, but this makes it match what we
-      // do in Concurrent Mode.
-      primaryChildFragment.actualDuration = 0;
-      primaryChildFragment.actualStartTime = -1;
-      primaryChildFragment.selfBaseDuration =
-        currentPrimaryChildFragment.selfBaseDuration;
-      primaryChildFragment.treeBaseDuration =
-        currentPrimaryChildFragment.treeBaseDuration;
-    } // The fallback fiber was added as a deletion effect during the first pass.
-    // However, since we're going to remain on the fallback, we no longer want
-    // to delete it. So we need to remove it from the list. Deletions are stored
-    // on the same list as effects. We want to keep the effects from the primary
-    // tree. So we copy the primary child fragment's effect list, which does not
-    // include the fallback deletion effect.
+  pushHostContainer(workInProgress, root.containerInfo);
+}
 
-    var progressedLastEffect = primaryChildFragment.lastEffect;
+function updateHostRoot(current, workInProgress, renderLanes) {
+  pushHostRootContext(workInProgress);
+  var updateQueue = workInProgress.updateQueue;
 
-    if (progressedLastEffect !== null) {
-      workInProgress.firstEffect = primaryChildFragment.firstEffect;
-      workInProgress.lastEffect = progressedLastEffect;
-      progressedLastEffect.nextEffect = null;
-    } else {
-      // TODO: Reset this somewhere else? Lol legacy mode is so weird.
-      workInProgress.firstEffect = workInProgress.lastEffect = null;
-    }
-  } else {
-    primaryChildFragment = createWorkInProgressOffscreenFiber(
-      currentPrimaryChildFragment,
-      primaryChildProps
+  if (!(current !== null && updateQueue !== null)) {
+    throw Error(
+      "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
     );
   }
 
-  var fallbackChildFragment;
+  var nextProps = workInProgress.pendingProps;
+  var prevState = workInProgress.memoizedState;
+  var prevChildren = prevState.element;
+  cloneUpdateQueue(current, workInProgress);
+  processUpdateQueue(workInProgress, nextProps, null, renderLanes);
+  var nextState = workInProgress.memoizedState;
+  var root = workInProgress.stateNode;
+  // being called "element".
 
-  if (currentFallbackChildFragment !== null) {
-    fallbackChildFragment = createWorkInProgress(
-      currentFallbackChildFragment,
-      fallbackChildren
+  var nextChildren = nextState.element;
+
+  if (nextChildren === prevChildren) {
+    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  }
+
+  if (root.hydrate && enterHydrationState()) {
+    var child = mountChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderLanes
     );
-  } else {
-    fallbackChildFragment = createFiberFromFragment(
-      fallbackChildren,
-      mode,
-      renderLanes,
-      null
-    ); // Needs a placement effect because the parent (the Suspense boundary) already
-    // mounted but this is a new fiber.
+    workInProgress.child = child;
+    var node = child;
 
-    fallbackChildFragment.flags |= Placement;
+    while (node) {
+      // Mark each child as hydrating. This is a fast path to know whether this
+      // tree is part of a hydrating tree. This is used to determine if a child
+      // node has fully mounted yet, and for scheduling event replaying.
+      // Conceptually this is similar to Placement in that a new subtree is
+      // inserted into the React tree here. It just happens to not need DOM
+      // mutations because it already exists.
+      node.flags = (node.flags & ~Placement) | Hydrating;
+      node = node.sibling;
+    }
+  } else {
+    // Otherwise reset hydration state in case we aborted and resumed another
+    // root.
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   }
 
-  fallbackChildFragment.return = workInProgress;
-  primaryChildFragment.return = workInProgress;
-  primaryChildFragment.sibling = fallbackChildFragment;
-  workInProgress.child = primaryChildFragment;
-  return fallbackChildFragment;
+  return workInProgress.child;
 }
 
-function scheduleWorkOnFiber(fiber, renderLanes) {
-  fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
-  var alternate = fiber.alternate;
+function updateHostComponent$1(current, workInProgress, renderLanes) {
+  pushHostContext(workInProgress);
 
-  if (alternate !== null) {
-    alternate.lanes = mergeLanes(alternate.lanes, renderLanes);
+  var type = workInProgress.type;
+  var nextProps = workInProgress.pendingProps;
+  var prevProps = current !== null ? current.memoizedProps : null;
+  var nextChildren = nextProps.children;
+
+  if (prevProps !== null && shouldSetTextContent()) {
+    // If we're switching from a direct text child to a normal child, or to
+    // empty, we need to schedule the text content to be reset.
+    workInProgress.flags |= ContentReset;
   }
 
-  scheduleWorkOnParentPath(fiber.return, renderLanes);
+  markRef$1(current, workInProgress);
+  reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  return workInProgress.child;
 }
 
-function propagateSuspenseContextChange(
+function updateHostText$1(current, workInProgress) {
+  // immediately after.
+
+  return null;
+}
+
+function mountLazyComponent(
+  _current,
   workInProgress,
-  firstChild,
+  elementType,
   renderLanes
 ) {
-  // Mark any Suspense boundaries with fallbacks as having work to do.
-  // If they were previously forced into fallbacks, they may now be able
-  // to unblock.
-  var node = firstChild;
+  if (_current !== null) {
+    // A lazy component only mounts if it suspended inside a non-
+    // concurrent tree, in an inconsistent state. We want to treat it like
+    // a new mount, even though an empty version of it already committed.
+    // Disconnect the alternate pointers.
+    _current.alternate = null;
+    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
 
-  while (node !== null) {
-    if (node.tag === SuspenseComponent) {
-      var state = node.memoizedState;
+    workInProgress.flags |= Placement;
+  }
 
-      if (state !== null) {
-        scheduleWorkOnFiber(node, renderLanes);
+  var props = workInProgress.pendingProps;
+  var lazyComponent = elementType;
+  var payload = lazyComponent._payload;
+  var init = lazyComponent._init;
+  var Component = init(payload); // Store the unwrapped component in the type.
+
+  workInProgress.type = Component;
+  var resolvedTag = (workInProgress.tag = resolveLazyComponentTag(Component));
+  var resolvedProps = resolveDefaultProps(Component, props);
+  var child;
+
+  switch (resolvedTag) {
+    case FunctionComponent: {
+      {
+        validateFunctionComponentInDev(workInProgress, Component);
+        workInProgress.type = Component = resolveFunctionForHotReloading(
+          Component
+        );
       }
-    } else if (node.tag === SuspenseListComponent) {
-      // If the tail is hidden there might not be an Suspense boundaries
-      // to schedule work on. In this case we have to schedule it on the
-      // list itself.
-      // We don't have to traverse to the children of the list since
-      // the list will propagate the change when it rerenders.
-      scheduleWorkOnFiber(node, renderLanes);
-    } else if (node.child !== null) {
-      node.child.return = node;
-      node = node.child;
-      continue;
+
+      child = updateFunctionComponent(
+        null,
+        workInProgress,
+        Component,
+        resolvedProps,
+        renderLanes
+      );
+      return child;
     }
 
-    if (node === workInProgress) {
-      return;
+    case ClassComponent: {
+      {
+        workInProgress.type = Component = resolveClassForHotReloading(
+          Component
+        );
+      }
+
+      child = updateClassComponent(
+        null,
+        workInProgress,
+        Component,
+        resolvedProps,
+        renderLanes
+      );
+      return child;
     }
 
-    while (node.sibling === null) {
-      if (node.return === null || node.return === workInProgress) {
-        return;
+    case ForwardRef: {
+      {
+        workInProgress.type = Component = resolveForwardRefForHotReloading(
+          Component
+        );
       }
 
-      node = node.return;
+      child = updateForwardRef(
+        null,
+        workInProgress,
+        Component,
+        resolvedProps,
+        renderLanes
+      );
+      return child;
     }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
+    case MemoComponent: {
+      {
+        if (workInProgress.type !== workInProgress.elementType) {
+          var outerPropTypes = Component.propTypes;
+
+          if (outerPropTypes) {
+            checkPropTypes(
+              outerPropTypes,
+              resolvedProps, // Resolved for outer only
+              "prop",
+              getComponentNameFromType(Component)
+            );
+          }
+        }
+      }
+
+      child = updateMemoComponent(
+        null,
+        workInProgress,
+        Component,
+        resolveDefaultProps(Component.type, resolvedProps), // The inner type can have defaults too
+        renderLanes
+      );
+      return child;
+    }
+  }
+
+  var hint = "";
+
+  {
+    if (
+      Component !== null &&
+      typeof Component === "object" &&
+      Component.$$typeof === REACT_LAZY_TYPE
+    ) {
+      hint = " Did you wrap a component in React.lazy() more than once?";
+    }
+  } // This message intentionally doesn't mention ForwardRef or MemoComponent
+  // because the fact that it's a separate type of work is an
+  // implementation detail.
+
+  {
+    throw Error(
+      "Element type is invalid. Received a promise that resolves to: " +
+        Component +
+        ". Lazy element type must resolve to a class or function." +
+        hint
+    );
   }
 }
 
-function findLastContentRow(firstChild) {
-  // This is going to find the last row among these children that is already
-  // showing content on the screen, as opposed to being in fallback state or
-  // new. If a row has multiple Suspense boundaries, any of them being in the
-  // fallback state, counts as the whole row being in a fallback state.
-  // Note that the "rows" will be workInProgress, but any nested children
-  // will still be current since we haven't rendered them yet. The mounted
-  // order may not be the same as the new order. We use the new order.
-  var row = firstChild;
-  var lastContentRow = null;
+function mountIncompleteClassComponent(
+  _current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  if (_current !== null) {
+    // An incomplete component only mounts if it suspended inside a non-
+    // concurrent tree, in an inconsistent state. We want to treat it like
+    // a new mount, even though an empty version of it already committed.
+    // Disconnect the alternate pointers.
+    _current.alternate = null;
+    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
+
+    workInProgress.flags |= Placement;
+  } // Promote the fiber to a class and try rendering again.
 
-  while (row !== null) {
-    var currentRow = row.alternate; // New rows can't be content rows.
+  workInProgress.tag = ClassComponent; // The rest of this function is a fork of `updateClassComponent`
+  // Push context providers early to prevent context stack mismatches.
+  // During mounting we don't know the child context yet as the instance doesn't exist.
+  // We will invalidate the child context in finishClassComponent() right after rendering.
 
-    if (currentRow !== null && findFirstSuspended(currentRow) === null) {
-      lastContentRow = row;
-    }
+  var hasContext;
 
-    row = row.sibling;
+  if (isContextProvider(Component)) {
+    hasContext = true;
+    pushContextProvider(workInProgress);
+  } else {
+    hasContext = false;
   }
 
-  return lastContentRow;
+  prepareToReadContext(workInProgress, renderLanes);
+  constructClassInstance(workInProgress, Component, nextProps);
+  mountClassInstance(workInProgress, Component, nextProps, renderLanes);
+  return finishClassComponent(
+    null,
+    workInProgress,
+    Component,
+    true,
+    hasContext,
+    renderLanes
+  );
 }
 
-function validateRevealOrder(revealOrder) {
-  {
-    if (
-      revealOrder !== undefined &&
-      revealOrder !== "forwards" &&
-      revealOrder !== "backwards" &&
-      revealOrder !== "together" &&
-      !didWarnAboutRevealOrder[revealOrder]
-    ) {
-      didWarnAboutRevealOrder[revealOrder] = true;
-
-      if (typeof revealOrder === "string") {
-        switch (revealOrder.toLowerCase()) {
-          case "together":
-          case "forwards":
-          case "backwards": {
-            error(
-              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
-                'Use lowercase "%s" instead.',
-              revealOrder,
-              revealOrder.toLowerCase()
-            );
-
-            break;
-          }
-
-          case "forward":
-          case "backward": {
-            error(
-              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
-                'React uses the -s suffix in the spelling. Use "%ss" instead.',
-              revealOrder,
-              revealOrder.toLowerCase()
-            );
+function mountIndeterminateComponent(
+  _current,
+  workInProgress,
+  Component,
+  renderLanes
+) {
+  if (_current !== null) {
+    // An indeterminate component only mounts if it suspended inside a non-
+    // concurrent tree, in an inconsistent state. We want to treat it like
+    // a new mount, even though an empty version of it already committed.
+    // Disconnect the alternate pointers.
+    _current.alternate = null;
+    workInProgress.alternate = null; // Since this is conceptually a new fiber, schedule a Placement effect
 
-            break;
-          }
+    workInProgress.flags |= Placement;
+  }
 
-          default:
-            error(
-              '"%s" is not a supported revealOrder on <SuspenseList />. ' +
-                'Did you mean "together", "forwards" or "backwards"?',
-              revealOrder
-            );
+  var props = workInProgress.pendingProps;
+  var context;
 
-            break;
-        }
-      } else {
-        error(
-          "%s is not a supported value for revealOrder on <SuspenseList />. " +
-            'Did you mean "together", "forwards" or "backwards"?',
-          revealOrder
-        );
-      }
-    }
+  {
+    var unmaskedContext = getUnmaskedContext(workInProgress, Component, false);
+    context = getMaskedContext(workInProgress, unmaskedContext);
   }
-}
 
-function validateTailOptions(tailMode, revealOrder) {
+  prepareToReadContext(workInProgress, renderLanes);
+  var value;
+
   {
-    if (tailMode !== undefined && !didWarnAboutTailOptions[tailMode]) {
-      if (tailMode !== "collapsed" && tailMode !== "hidden") {
-        didWarnAboutTailOptions[tailMode] = true;
+    if (
+      Component.prototype &&
+      typeof Component.prototype.render === "function"
+    ) {
+      var componentName = getComponentNameFromType(Component) || "Unknown";
 
+      if (!didWarnAboutBadClass[componentName]) {
         error(
-          '"%s" is not a supported value for tail on <SuspenseList />. ' +
-            'Did you mean "collapsed" or "hidden"?',
-          tailMode
+          "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
+            "This is likely to cause errors. Change %s to extend React.Component instead.",
+          componentName,
+          componentName
         );
-      } else if (revealOrder !== "forwards" && revealOrder !== "backwards") {
-        didWarnAboutTailOptions[tailMode] = true;
 
-        error(
-          '<SuspenseList tail="%s" /> is only valid if revealOrder is ' +
-            '"forwards" or "backwards". ' +
-            'Did you mean to specify revealOrder="forwards"?',
-          tailMode
-        );
+        didWarnAboutBadClass[componentName] = true;
       }
     }
-  }
-}
-
-function validateSuspenseListNestedChild(childSlot, index) {
-  {
-    var isArray = Array.isArray(childSlot);
-    var isIterable = !isArray && typeof getIteratorFn(childSlot) === "function";
-
-    if (isArray || isIterable) {
-      var type = isArray ? "array" : "iterable";
-
-      error(
-        "A nested %s was passed to row #%s in <SuspenseList />. Wrap it in " +
-          "an additional SuspenseList to configure its revealOrder: " +
-          "<SuspenseList revealOrder=...> ... " +
-          "<SuspenseList revealOrder=...>{%s}</SuspenseList> ... " +
-          "</SuspenseList>",
-        type,
-        index,
-        type
-      );
 
-      return false;
+    if (workInProgress.mode & StrictLegacyMode) {
+      ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
     }
+
+    setIsRendering(true);
+    ReactCurrentOwner$1.current = workInProgress;
+    value = renderWithHooks(
+      null,
+      workInProgress,
+      Component,
+      props,
+      context,
+      renderLanes
+    );
+    setIsRendering(false);
   }
 
-  return true;
-}
+  workInProgress.flags |= PerformedWork;
 
-function validateSuspenseListChildren(children, revealOrder) {
   {
+    // Support for module components is deprecated and is removed behind a flag.
+    // Whether or not it would crash later, we want to show a good message in DEV first.
     if (
-      (revealOrder === "forwards" || revealOrder === "backwards") &&
-      children !== undefined &&
-      children !== null &&
-      children !== false
+      typeof value === "object" &&
+      value !== null &&
+      typeof value.render === "function" &&
+      value.$$typeof === undefined
     ) {
-      if (Array.isArray(children)) {
-        for (var i = 0; i < children.length; i++) {
-          if (!validateSuspenseListNestedChild(children[i], i)) {
-            return;
-          }
-        }
-      } else {
-        var iteratorFn = getIteratorFn(children);
-
-        if (typeof iteratorFn === "function") {
-          var childrenIterator = iteratorFn.call(children);
-
-          if (childrenIterator) {
-            var step = childrenIterator.next();
-            var _i = 0;
+      var _componentName = getComponentNameFromType(Component) || "Unknown";
 
-            for (; !step.done; step = childrenIterator.next()) {
-              if (!validateSuspenseListNestedChild(step.value, _i)) {
-                return;
-              }
+      if (!didWarnAboutModulePatternComponent[_componentName]) {
+        error(
+          "The <%s /> component appears to be a function component that returns a class instance. " +
+            "Change %s to a class that extends React.Component instead. " +
+            "If you can't use a class try assigning the prototype on the function as a workaround. " +
+            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
+            "cannot be called with `new` by React.",
+          _componentName,
+          _componentName,
+          _componentName
+        );
 
-              _i++;
-            }
-          }
-        } else {
-          error(
-            'A single row was passed to a <SuspenseList revealOrder="%s" />. ' +
-              "This is not useful since it needs multiple rows. " +
-              "Did you mean to pass multiple children or an array?",
-            revealOrder
-          );
-        }
+        didWarnAboutModulePatternComponent[_componentName] = true;
       }
     }
   }
-}
 
-function initSuspenseListRenderState(
-  workInProgress,
-  isBackwards,
-  tail,
-  lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
-) {
-  var renderState = workInProgress.memoizedState;
+  if (
+    // Run these checks in production only if the flag is off.
+    // Eventually we'll delete this branch altogether.
+    typeof value === "object" &&
+    value !== null &&
+    typeof value.render === "function" &&
+    value.$$typeof === undefined
+  ) {
+    {
+      var _componentName2 = getComponentNameFromType(Component) || "Unknown";
+
+      if (!didWarnAboutModulePatternComponent[_componentName2]) {
+        error(
+          "The <%s /> component appears to be a function component that returns a class instance. " +
+            "Change %s to a class that extends React.Component instead. " +
+            "If you can't use a class try assigning the prototype on the function as a workaround. " +
+            "`%s.prototype = React.Component.prototype`. Don't use an arrow function since it " +
+            "cannot be called with `new` by React.",
+          _componentName2,
+          _componentName2,
+          _componentName2
+        );
+
+        didWarnAboutModulePatternComponent[_componentName2] = true;
+      }
+    } // Proceed under the assumption that this is a class instance
+
+    workInProgress.tag = ClassComponent; // Throw out any hooks that were used.
+
+    workInProgress.memoizedState = null;
+    workInProgress.updateQueue = null; // Push context providers early to prevent context stack mismatches.
+    // During mounting we don't know the child context yet as the instance doesn't exist.
+    // We will invalidate the child context in finishClassComponent() right after rendering.
 
-  if (renderState === null) {
-    workInProgress.memoizedState = {
-      isBackwards: isBackwards,
-      rendering: null,
-      renderingStartTime: 0,
-      last: lastContentRow,
-      tail: tail,
-      tailMode: tailMode,
-      lastEffect: lastEffectBeforeRendering
-    };
-  } else {
-    // We can reuse the existing object from previous renders.
-    renderState.isBackwards = isBackwards;
-    renderState.rendering = null;
-    renderState.renderingStartTime = 0;
-    renderState.last = lastContentRow;
-    renderState.tail = tail;
-    renderState.tailMode = tailMode;
-    renderState.lastEffect = lastEffectBeforeRendering;
-  }
-} // This can end up rendering this component multiple passes.
-// The first pass splits the children fibers into two sets. A head and tail.
-// We first render the head. If anything is in fallback state, we do another
-// pass through beginWork to rerender all children (including the tail) with
-// the force suspend context. If the first render didn't have anything in
-// in fallback state. Then we render each row in the tail one-by-one.
-// That happens in the completeWork phase without going back to beginWork.
+    var hasContext = false;
 
-function updateSuspenseListComponent(current, workInProgress, renderLanes) {
-  var nextProps = workInProgress.pendingProps;
-  var revealOrder = nextProps.revealOrder;
-  var tailMode = nextProps.tail;
-  var newChildren = nextProps.children;
-  validateRevealOrder(revealOrder);
-  validateTailOptions(tailMode, revealOrder);
-  validateSuspenseListChildren(newChildren, revealOrder);
-  reconcileChildren(current, workInProgress, newChildren, renderLanes);
-  var suspenseContext = suspenseStackCursor.current;
-  var shouldForceFallback = hasSuspenseContext(
-    suspenseContext,
-    ForceSuspenseFallback
-  );
+    if (isContextProvider(Component)) {
+      hasContext = true;
+      pushContextProvider(workInProgress);
+    } else {
+      hasContext = false;
+    }
 
-  if (shouldForceFallback) {
-    suspenseContext = setShallowSuspenseContext(
-      suspenseContext,
-      ForceSuspenseFallback
+    workInProgress.memoizedState =
+      value.state !== null && value.state !== undefined ? value.state : null;
+    initializeUpdateQueue(workInProgress);
+    adoptClassInstance(workInProgress, value);
+    mountClassInstance(workInProgress, Component, props, renderLanes);
+    return finishClassComponent(
+      null,
+      workInProgress,
+      Component,
+      true,
+      hasContext,
+      renderLanes
     );
-    workInProgress.flags |= DidCapture;
   } else {
-    var didSuspendBefore =
-      current !== null && (current.flags & DidCapture) !== NoFlags;
+    // Proceed under the assumption that this is a function component
+    workInProgress.tag = FunctionComponent;
 
-    if (didSuspendBefore) {
-      // If we previously forced a fallback, we need to schedule work
-      // on any nested boundaries to let them know to try to render
-      // again. This is the same as context updating.
-      propagateSuspenseContextChange(
-        workInProgress,
-        workInProgress.child,
-        renderLanes
-      );
-    }
+    {
+      if (workInProgress.mode & StrictLegacyMode) {
+        disableLogs();
 
-    suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
-  }
+        try {
+          value = renderWithHooks(
+            null,
+            workInProgress,
+            Component,
+            props,
+            context,
+            renderLanes
+          );
+        } finally {
+          reenableLogs();
+        }
+      }
+    }
 
-  pushSuspenseContext(workInProgress, suspenseContext);
+    reconcileChildren(null, workInProgress, value, renderLanes);
 
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
-    // In legacy mode, SuspenseList doesn't work so we just
-    // use make it a noop by treating it as the default revealOrder.
-    workInProgress.memoizedState = null;
-  } else {
-    switch (revealOrder) {
-      case "forwards": {
-        var lastContentRow = findLastContentRow(workInProgress.child);
-        var tail;
+    {
+      validateFunctionComponentInDev(workInProgress, Component);
+    }
 
-        if (lastContentRow === null) {
-          // The whole list is part of the tail.
-          // TODO: We could fast path by just rendering the tail now.
-          tail = workInProgress.child;
-          workInProgress.child = null;
-        } else {
-          // Disconnect the tail rows after the content row.
-          // We're going to render them separately later.
-          tail = lastContentRow.sibling;
-          lastContentRow.sibling = null;
-        }
+    return workInProgress.child;
+  }
+}
 
-        initSuspenseListRenderState(
-          workInProgress,
-          false, // isBackwards
-          tail,
-          lastContentRow,
-          tailMode,
-          workInProgress.lastEffect
+function validateFunctionComponentInDev(workInProgress, Component) {
+  {
+    if (Component) {
+      if (Component.childContextTypes) {
+        error(
+          "%s(...): childContextTypes cannot be defined on a function component.",
+          Component.displayName || Component.name || "Component"
         );
-        break;
       }
+    }
 
-      case "backwards": {
-        // We're going to find the first row that has existing content.
-        // At the same time we're going to reverse the list of everything
-        // we pass in the meantime. That's going to be our tail in reverse
-        // order.
-        var _tail = null;
-        var row = workInProgress.child;
-        workInProgress.child = null;
+    if (workInProgress.ref !== null) {
+      var info = "";
+      var ownerName = getCurrentFiberOwnerNameInDevOrNull();
 
-        while (row !== null) {
-          var currentRow = row.alternate; // New rows can't be content rows.
+      if (ownerName) {
+        info += "\n\nCheck the render method of `" + ownerName + "`.";
+      }
 
-          if (currentRow !== null && findFirstSuspended(currentRow) === null) {
-            // This is the beginning of the main content.
-            workInProgress.child = row;
-            break;
-          }
+      var warningKey = ownerName || "";
+      var debugSource = workInProgress._debugSource;
 
-          var nextRow = row.sibling;
-          row.sibling = _tail;
-          _tail = row;
-          row = nextRow;
-        } // TODO: If workInProgress.child is null, we can continue on the tail immediately.
+      if (debugSource) {
+        warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
+      }
 
-        initSuspenseListRenderState(
-          workInProgress,
-          true, // isBackwards
-          _tail,
-          null, // last
-          tailMode,
-          workInProgress.lastEffect
+      if (!didWarnAboutFunctionRefs[warningKey]) {
+        didWarnAboutFunctionRefs[warningKey] = true;
+
+        error(
+          "Function components cannot be given refs. " +
+            "Attempts to access this ref will fail. " +
+            "Did you mean to use React.forwardRef()?%s",
+          info
         );
-        break;
       }
+    }
 
-      case "together": {
-        initSuspenseListRenderState(
-          workInProgress,
-          false, // isBackwards
-          null, // tail
-          null, // last
-          undefined,
-          workInProgress.lastEffect
+    if (typeof Component.getDerivedStateFromProps === "function") {
+      var _componentName3 = getComponentNameFromType(Component) || "Unknown";
+
+      if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3]) {
+        error(
+          "%s: Function components do not support getDerivedStateFromProps.",
+          _componentName3
         );
-        break;
+
+        didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3] = true;
       }
+    }
 
-      default: {
-        // The default reveal order is the same as not having
-        // a boundary.
-        workInProgress.memoizedState = null;
+    if (
+      typeof Component.contextType === "object" &&
+      Component.contextType !== null
+    ) {
+      var _componentName4 = getComponentNameFromType(Component) || "Unknown";
+
+      if (!didWarnAboutContextTypeOnFunctionComponent[_componentName4]) {
+        error(
+          "%s: Function components do not support contextType.",
+          _componentName4
+        );
+
+        didWarnAboutContextTypeOnFunctionComponent[_componentName4] = true;
       }
     }
   }
+}
 
-  return workInProgress.child;
+var SUSPENDED_MARKER = {
+  dehydrated: null,
+  retryLane: NoLane
+};
+
+function mountSuspenseOffscreenState(renderLanes) {
+  return {
+    baseLanes: renderLanes,
+    cachePool: getSuspendedCachePool()
+  };
 }
 
-function updatePortalComponent(current, workInProgress, renderLanes) {
-  pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-  var nextChildren = workInProgress.pendingProps;
+function updateSuspenseOffscreenState(prevOffscreenState, renderLanes) {
+  var cachePool = null;
 
-  if (current === null) {
-    // Portals are special because we don't append the children during mount
-    // but at commit. Therefore we need to track insertions which the normal
-    // flow doesn't do during mount. This doesn't happen at the root because
-    // the root always starts with a "current" with a null child.
-    // TODO: Consider unifying this with how the root works.
-    workInProgress.child = reconcileChildFibers(
-      workInProgress,
-      null,
-      nextChildren,
-      renderLanes
-    );
-  } else {
-    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
-  }
+  return {
+    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes),
+    cachePool: cachePool
+  };
+} // TODO: Probably should inline this back
+
+function shouldRemainOnFallback(
+  suspenseContext,
+  current,
+  workInProgress,
+  renderLanes
+) {
+  // If we're already showing a fallback, there are cases where we need to
+  // remain on that fallback regardless of whether the content has resolved.
+  // For example, SuspenseList coordinates when nested content appears.
+  if (current !== null) {
+    var suspenseState = current.memoizedState;
 
-  return workInProgress.child;
+    if (suspenseState === null) {
+      // Currently showing content. Don't hide it, even if ForceSuspenseFallback
+      // is true. More precise name might be "ForceRemainSuspenseFallback".
+      // Note: This is a factoring smell. Can't remain on a fallback if there's
+      // no fallback to remain on.
+      return false;
+    }
+  } // Not currently showing content. Consult the Suspense context.
+
+  return hasSuspenseContext(suspenseContext, ForceSuspenseFallback);
 }
 
-var hasWarnedAboutUsingNoValuePropOnContextProvider = false;
+function getRemainingWorkInPrimaryTree(current, renderLanes) {
+  // TODO: Should not remove render lanes that were pinged during this render
+  return removeLanes(current.childLanes, renderLanes);
+}
 
-function updateContextProvider(current, workInProgress, renderLanes) {
-  var providerType = workInProgress.type;
-  var context = providerType._context;
-  var newProps = workInProgress.pendingProps;
-  var oldProps = workInProgress.memoizedProps;
-  var newValue = newProps.value;
+function updateSuspenseComponent(current, workInProgress, renderLanes) {
+  var nextProps = workInProgress.pendingProps; // This is used by DevTools to force a boundary to suspend.
 
   {
-    if (!("value" in newProps)) {
-      if (!hasWarnedAboutUsingNoValuePropOnContextProvider) {
-        hasWarnedAboutUsingNoValuePropOnContextProvider = true;
+    if (shouldSuspend(workInProgress)) {
+      workInProgress.flags |= DidCapture;
+    }
+  }
 
-        error(
-          "The `value` prop is required for the `<Context.Provider>`. Did you misspell it or forget to pass it?"
+  var suspenseContext = suspenseStackCursor.current;
+  var showFallback = false;
+  var didSuspend = (workInProgress.flags & DidCapture) !== NoFlags;
+
+  if (didSuspend || shouldRemainOnFallback(suspenseContext, current)) {
+    // Something in this boundary's subtree already suspended. Switch to
+    // rendering the fallback children.
+    showFallback = true;
+    workInProgress.flags &= ~DidCapture;
+  } else {
+    // Attempting the main content
+    if (current === null || current.memoizedState !== null) {
+      // This is a new mount or this boundary is already showing a fallback state.
+      // Mark this subtree context as having at least one invisible parent that could
+      // handle the fallback state.
+      // Avoided boundaries are not considered since they cannot handle preferred fallback states.
+      if (nextProps.unstable_avoidThisFallback !== true) {
+        suspenseContext = addSubtreeSuspenseContext(
+          suspenseContext,
+          InvisibleParentSuspenseContext
         );
       }
     }
+  }
 
-    var providerPropTypes = workInProgress.type.propTypes;
+  suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+  pushSuspenseContext(workInProgress, suspenseContext); // OK, the next part is confusing. We're about to reconcile the Suspense
+  // boundary's children. This involves some custom reconciliation logic. Two
+  // main reasons this is so complicated.
+  //
+  // First, Legacy Mode has different semantics for backwards compatibility. The
+  // primary tree will commit in an inconsistent state, so when we do the
+  // second pass to render the fallback, we do some exceedingly, uh, clever
+  // hacks to make that not totally break. Like transferring effects and
+  // deletions from hidden tree. In Concurrent Mode, it's much simpler,
+  // because we bailout on the primary tree completely and leave it in its old
+  // state, no effects. Same as what we do for Offscreen (except that
+  // Offscreen doesn't have the first render pass).
+  //
+  // Second is hydration. During hydration, the Suspense fiber has a slightly
+  // different layout, where the child points to a dehydrated fragment, which
+  // contains the DOM rendered by the server.
+  //
+  // Third, even if you set all that aside, Suspense is like error boundaries in
+  // that we first we try to render one tree, and if that fails, we render again
+  // and switch to a different tree. Like a try/catch block. So we have to track
+  // which branch we're currently rendering. Ideally we would model this using
+  // a stack.
 
-    if (providerPropTypes) {
-      checkPropTypes(providerPropTypes, newProps, "prop", "Context.Provider");
+  if (current === null) {
+    var nextPrimaryChildren = nextProps.children;
+    var nextFallbackChildren = nextProps.fallback;
+
+    if (showFallback) {
+      var fallbackFragment = mountSuspenseFallbackChildren(
+        workInProgress,
+        nextPrimaryChildren,
+        nextFallbackChildren,
+        renderLanes
+      );
+      var primaryChildFragment = workInProgress.child;
+      primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
+        renderLanes
+      );
+      workInProgress.memoizedState = SUSPENDED_MARKER;
+      return fallbackFragment;
+    } else if (typeof nextProps.unstable_expectedLoadTime === "number") {
+      // This is a CPU-bound tree. Skip this tree and show a placeholder to
+      // unblock the surrounding content. Then immediately retry after the
+      // initial commit.
+      var _fallbackFragment = mountSuspenseFallbackChildren(
+        workInProgress,
+        nextPrimaryChildren,
+        nextFallbackChildren,
+        renderLanes
+      );
+
+      var _primaryChildFragment = workInProgress.child;
+      _primaryChildFragment.memoizedState = mountSuspenseOffscreenState(
+        renderLanes
+      );
+      workInProgress.memoizedState = SUSPENDED_MARKER; // Since nothing actually suspended, there will nothing to ping this to
+      // get it started back up to attempt the next item. While in terms of
+      // priority this work has the same priority as this current render, it's
+      // not part of the same transition once the transition has committed. If
+      // it's sync, we still want to yield so that it can be painted.
+      // Conceptually, this is really the same as pinging. We can use any
+      // RetryLane even if it's the one currently rendering since we're leaving
+      // it behind on this node.
+
+      workInProgress.lanes = SomeRetryLane;
+      return _fallbackFragment;
+    } else {
+      return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren);
     }
-  }
+  } else {
+    // This is an update.
+    // If the current fiber has a SuspenseState, that means it's already showing
+    // a fallback.
+    var prevState = current.memoizedState;
+
+    if (prevState !== null) {
+      if (showFallback) {
+        var _nextFallbackChildren2 = nextProps.fallback;
+        var _nextPrimaryChildren2 = nextProps.children;
 
-  pushProvider(workInProgress, newValue);
+        var _fallbackChildFragment = updateSuspenseFallbackChildren(
+          current,
+          workInProgress,
+          _nextPrimaryChildren2,
+          _nextFallbackChildren2,
+          renderLanes
+        );
 
-  if (oldProps !== null) {
-    var oldValue = oldProps.value;
-    var changedBits = calculateChangedBits(context, newValue, oldValue);
+        var _primaryChildFragment3 = workInProgress.child;
+        var prevOffscreenState = current.child.memoizedState;
+        _primaryChildFragment3.memoizedState =
+          prevOffscreenState === null
+            ? mountSuspenseOffscreenState(renderLanes)
+            : updateSuspenseOffscreenState(prevOffscreenState, renderLanes);
+        _primaryChildFragment3.childLanes = getRemainingWorkInPrimaryTree(
+          current,
+          renderLanes
+        );
+        workInProgress.memoizedState = SUSPENDED_MARKER;
+        return _fallbackChildFragment;
+      } else {
+        var _nextPrimaryChildren3 = nextProps.children;
 
-    if (changedBits === 0) {
-      // No change. Bailout early if children are the same.
-      if (oldProps.children === newProps.children && !hasContextChanged()) {
-        return bailoutOnAlreadyFinishedWork(
+        var _primaryChildFragment4 = updateSuspensePrimaryChildren(
           current,
           workInProgress,
+          _nextPrimaryChildren3,
           renderLanes
         );
+
+        workInProgress.memoizedState = null;
+        return _primaryChildFragment4;
       }
     } else {
-      // The context value changed. Search for matching consumers and schedule
-      // them to update.
-      propagateContextChange(workInProgress, context, changedBits, renderLanes);
-    }
-  }
+      // The current tree is not already showing a fallback.
+      if (showFallback) {
+        // Timed out.
+        var _nextFallbackChildren3 = nextProps.fallback;
+        var _nextPrimaryChildren4 = nextProps.children;
 
-  var newChildren = newProps.children;
-  reconcileChildren(current, workInProgress, newChildren, renderLanes);
-  return workInProgress.child;
-}
+        var _fallbackChildFragment2 = updateSuspenseFallbackChildren(
+          current,
+          workInProgress,
+          _nextPrimaryChildren4,
+          _nextFallbackChildren3,
+          renderLanes
+        );
 
-var hasWarnedAboutUsingContextAsConsumer = false;
+        var _primaryChildFragment5 = workInProgress.child;
+        var _prevOffscreenState = current.child.memoizedState;
+        _primaryChildFragment5.memoizedState =
+          _prevOffscreenState === null
+            ? mountSuspenseOffscreenState(renderLanes)
+            : updateSuspenseOffscreenState(_prevOffscreenState, renderLanes);
+        _primaryChildFragment5.childLanes = getRemainingWorkInPrimaryTree(
+          current,
+          renderLanes
+        ); // Skip the primary children, and continue working on the
+        // fallback children.
 
-function updateContextConsumer(current, workInProgress, renderLanes) {
-  var context = workInProgress.type; // The logic below for Context differs depending on PROD or DEV mode. In
-  // DEV mode, we create a separate object for Context.Consumer that acts
-  // like a proxy to Context. This proxy object adds unnecessary code in PROD
-  // so we use the old behaviour (Context.Consumer references Context) to
-  // reduce size and overhead. The separate object references context via
-  // a property called "_context", which also gives us the ability to check
-  // in DEV mode if this property exists or not and warn if it does not.
+        workInProgress.memoizedState = SUSPENDED_MARKER;
+        return _fallbackChildFragment2;
+      } else {
+        // Still haven't timed out. Continue rendering the children, like we
+        // normally do.
+        var _nextPrimaryChildren5 = nextProps.children;
 
-  {
-    if (context._context === undefined) {
-      // This may be because it's a Context (rather than a Consumer).
-      // Or it may be because it's older React where they're the same thing.
-      // We only want to warn if we're sure it's a new React.
-      if (context !== context.Consumer) {
-        if (!hasWarnedAboutUsingContextAsConsumer) {
-          hasWarnedAboutUsingContextAsConsumer = true;
+        var _primaryChildFragment6 = updateSuspensePrimaryChildren(
+          current,
+          workInProgress,
+          _nextPrimaryChildren5,
+          renderLanes
+        );
 
-          error(
-            "Rendering <Context> directly is not supported and will be removed in " +
-              "a future major release. Did you mean to render <Context.Consumer> instead?"
-          );
-        }
+        workInProgress.memoizedState = null;
+        return _primaryChildFragment6;
       }
-    } else {
-      context = context._context;
     }
   }
+}
+
+function mountSuspensePrimaryChildren(
+  workInProgress,
+  primaryChildren,
+  renderLanes
+) {
+  var mode = workInProgress.mode;
+  var primaryChildProps = {
+    mode: "visible",
+    children: primaryChildren
+  };
+  var primaryChildFragment = mountWorkInProgressOffscreenFiber(
+    primaryChildProps,
+    mode
+  );
+  primaryChildFragment.return = workInProgress;
+  workInProgress.child = primaryChildFragment;
+  return primaryChildFragment;
+}
+
+function mountSuspenseFallbackChildren(
+  workInProgress,
+  primaryChildren,
+  fallbackChildren,
+  renderLanes
+) {
+  var mode = workInProgress.mode;
+  var progressedPrimaryFragment = workInProgress.child;
+  var primaryChildProps = {
+    mode: "hidden",
+    children: primaryChildren
+  };
+  var primaryChildFragment;
+  var fallbackChildFragment;
 
-  var newProps = workInProgress.pendingProps;
-  var render = newProps.children;
+  if (
+    (mode & ConcurrentMode) === NoMode &&
+    progressedPrimaryFragment !== null
+  ) {
+    // In legacy mode, we commit the primary tree as if it successfully
+    // completed, even though it's in an inconsistent state.
+    primaryChildFragment = progressedPrimaryFragment;
+    primaryChildFragment.childLanes = NoLanes;
+    primaryChildFragment.pendingProps = primaryChildProps;
 
-  {
-    if (typeof render !== "function") {
-      error(
-        "A context consumer was rendered with multiple children, or a child " +
-          "that isn't a function. A context consumer expects a single child " +
-          "that is a function. If you did pass a function, make sure there " +
-          "is no trailing or leading whitespace around it."
-      );
+    if (workInProgress.mode & ProfileMode) {
+      // Reset the durations from the first pass so they aren't included in the
+      // final amounts. This seems counterintuitive, since we're intentionally
+      // not measuring part of the render phase, but this makes it match what we
+      // do in Concurrent Mode.
+      primaryChildFragment.actualDuration = 0;
+      primaryChildFragment.actualStartTime = -1;
+      primaryChildFragment.selfBaseDuration = 0;
+      primaryChildFragment.treeBaseDuration = 0;
     }
-  }
-
-  prepareToReadContext(workInProgress, renderLanes);
-  var newValue = readContext(context, newProps.unstable_observedBits);
-  var newChildren;
 
-  {
-    ReactCurrentOwner$1.current = workInProgress;
-    setIsRendering(true);
-    newChildren = render(newValue);
-    setIsRendering(false);
-  } // React DevTools reads this flag.
+    fallbackChildFragment = createFiberFromFragment(
+      fallbackChildren,
+      mode,
+      renderLanes,
+      null
+    );
+  } else {
+    primaryChildFragment = mountWorkInProgressOffscreenFiber(
+      primaryChildProps,
+      mode
+    );
+    fallbackChildFragment = createFiberFromFragment(
+      fallbackChildren,
+      mode,
+      renderLanes,
+      null
+    );
+  }
 
-  workInProgress.flags |= PerformedWork;
-  reconcileChildren(current, workInProgress, newChildren, renderLanes);
-  return workInProgress.child;
+  primaryChildFragment.return = workInProgress;
+  fallbackChildFragment.return = workInProgress;
+  primaryChildFragment.sibling = fallbackChildFragment;
+  workInProgress.child = primaryChildFragment;
+  return fallbackChildFragment;
 }
 
-function markWorkInProgressReceivedUpdate() {
-  didReceiveUpdate = true;
+function mountWorkInProgressOffscreenFiber(offscreenProps, mode, renderLanes) {
+  // The props argument to `createFiberFromOffscreen` is `any` typed, so we use
+  // this wrapper function to constrain it.
+  return createFiberFromOffscreen(offscreenProps, mode, NoLanes, null);
 }
 
-function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
-  if (current !== null) {
-    // Reuse previous dependencies
-    workInProgress.dependencies = current.dependencies;
-  }
-
-  {
-    // Don't update "base" render times for bailouts.
-    stopProfilerTimerIfRunning();
-  }
-
-  markSkippedUpdateLanes(workInProgress.lanes); // Check if the children have any pending work.
-
-  if (!includesSomeLane(renderLanes, workInProgress.childLanes)) {
-    // The children don't have any work either. We can skip them.
-    // TODO: Once we add back resuming, we should check if the children are
-    // a work-in-progress set. If so, we need to transfer their effects.
-    return null;
-  } else {
-    // This fiber doesn't have work, but its subtree does. Clone the child
-    // fibers and continue.
-    cloneChildFibers(current, workInProgress);
-    return workInProgress.child;
-  }
+function updateWorkInProgressOffscreenFiber(current, offscreenProps) {
+  // The props argument to `createWorkInProgress` is `any` typed, so we use this
+  // wrapper function to constrain it.
+  return createWorkInProgress(current, offscreenProps);
 }
 
-function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
-  {
-    var returnFiber = oldWorkInProgress.return;
+function updateSuspensePrimaryChildren(
+  current,
+  workInProgress,
+  primaryChildren,
+  renderLanes
+) {
+  var currentPrimaryChildFragment = current.child;
+  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
+  var primaryChildFragment = updateWorkInProgressOffscreenFiber(
+    currentPrimaryChildFragment,
+    {
+      mode: "visible",
+      children: primaryChildren
+    }
+  );
 
-    if (returnFiber === null) {
-      throw new Error("Cannot swap the root fiber.");
-    } // Disconnect from the old current.
-    // It will get deleted.
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
+    primaryChildFragment.lanes = renderLanes;
+  }
 
-    current.alternate = null;
-    oldWorkInProgress.alternate = null; // Connect to the new tree.
+  primaryChildFragment.return = workInProgress;
+  primaryChildFragment.sibling = null;
 
-    newWorkInProgress.index = oldWorkInProgress.index;
-    newWorkInProgress.sibling = oldWorkInProgress.sibling;
-    newWorkInProgress.return = oldWorkInProgress.return;
-    newWorkInProgress.ref = oldWorkInProgress.ref; // Replace the child/sibling pointers above it.
+  if (currentFallbackChildFragment !== null) {
+    // Delete the fallback child fragment
+    var deletions = workInProgress.deletions;
 
-    if (oldWorkInProgress === returnFiber.child) {
-      returnFiber.child = newWorkInProgress;
+    if (deletions === null) {
+      workInProgress.deletions = [currentFallbackChildFragment];
+      workInProgress.flags |= ChildDeletion;
     } else {
-      var prevSibling = returnFiber.child;
+      deletions.push(currentFallbackChildFragment);
+    }
+  }
 
-      if (prevSibling === null) {
-        throw new Error("Expected parent to have a child.");
-      }
+  workInProgress.child = primaryChildFragment;
+  return primaryChildFragment;
+}
 
-      while (prevSibling.sibling !== oldWorkInProgress) {
-        prevSibling = prevSibling.sibling;
+function updateSuspenseFallbackChildren(
+  current,
+  workInProgress,
+  primaryChildren,
+  fallbackChildren,
+  renderLanes
+) {
+  var mode = workInProgress.mode;
+  var currentPrimaryChildFragment = current.child;
+  var currentFallbackChildFragment = currentPrimaryChildFragment.sibling;
+  var primaryChildProps = {
+    mode: "hidden",
+    children: primaryChildren
+  };
+  var primaryChildFragment;
 
-        if (prevSibling === null) {
-          throw new Error("Expected to find the previous sibling.");
-        }
-      }
+  if (
+    // In legacy mode, we commit the primary tree as if it successfully
+    // completed, even though it's in an inconsistent state.
+    (mode & ConcurrentMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
+    // already cloned. In legacy mode, the only case where this isn't true is
+    // when DevTools forces us to display a fallback; we skip the first render
+    // pass entirely and go straight to rendering the fallback. (In Concurrent
+    // Mode, SuspenseList can also trigger this scenario, but this is a legacy-
+    // only codepath.)
+    workInProgress.child !== currentPrimaryChildFragment
+  ) {
+    var progressedPrimaryFragment = workInProgress.child;
+    primaryChildFragment = progressedPrimaryFragment;
+    primaryChildFragment.childLanes = NoLanes;
+    primaryChildFragment.pendingProps = primaryChildProps;
 
-      prevSibling.sibling = newWorkInProgress;
-    } // Delete the old fiber and place the new one.
-    // Since the old fiber is disconnected, we have to schedule it manually.
+    if (workInProgress.mode & ProfileMode) {
+      // Reset the durations from the first pass so they aren't included in the
+      // final amounts. This seems counterintuitive, since we're intentionally
+      // not measuring part of the render phase, but this makes it match what we
+      // do in Concurrent Mode.
+      primaryChildFragment.actualDuration = 0;
+      primaryChildFragment.actualStartTime = -1;
+      primaryChildFragment.selfBaseDuration =
+        currentPrimaryChildFragment.selfBaseDuration;
+      primaryChildFragment.treeBaseDuration =
+        currentPrimaryChildFragment.treeBaseDuration;
+    }
 
-    var last = returnFiber.lastEffect;
+    if (enablePersistentOffscreenHostContainer && supportsPersistence) {
+      // In persistent mode, the offscreen children are wrapped in a host node.
+      // We need to complete it now, because we're going to skip over its normal
+      // complete phase and go straight to rendering the fallback.
+      var currentOffscreenContainer = currentPrimaryChildFragment.child;
+      var offscreenContainer = primaryChildFragment.child;
+      var containerProps = getOffscreenContainerProps();
+      offscreenContainer.pendingProps = containerProps;
+      offscreenContainer.memoizedProps = containerProps;
+      completeSuspendedOffscreenHostContainer(
+        currentOffscreenContainer,
+        offscreenContainer
+      );
+    } // The fallback fiber was added as a deletion during the first pass.
+    // However, since we're going to remain on the fallback, we no longer want
+    // to delete it.
 
-    if (last !== null) {
-      last.nextEffect = current;
-      returnFiber.lastEffect = current;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = current;
-    }
+    workInProgress.deletions = null;
+  } else {
+    primaryChildFragment = updateWorkInProgressOffscreenFiber(
+      currentPrimaryChildFragment,
+      primaryChildProps
+    );
 
-    current.nextEffect = null;
-    current.flags = Deletion;
-    newWorkInProgress.flags |= Placement; // Restart work from the new fiber.
+    if (enablePersistentOffscreenHostContainer && supportsPersistence) {
+      // In persistent mode, the offscreen children are wrapped in a host node.
+      // We need to complete it now, because we're going to skip over its normal
+      // complete phase and go straight to rendering the fallback.
+      var _currentOffscreenContainer = currentPrimaryChildFragment.child;
 
-    return newWorkInProgress;
-  }
-}
+      if (_currentOffscreenContainer !== null) {
+        var _offscreenContainer = reconcileOffscreenHostContainer(
+          currentPrimaryChildFragment,
+          primaryChildFragment
+        );
 
-function beginWork(current, workInProgress, renderLanes) {
-  var updateLanes = workInProgress.lanes;
+        _offscreenContainer.memoizedProps = _offscreenContainer.pendingProps;
+        completeSuspendedOffscreenHostContainer(
+          _currentOffscreenContainer,
+          _offscreenContainer
+        );
+      }
+    } // Since we're reusing a current tree, we need to reuse the flags, too.
+    // (We don't do this in legacy mode, because in legacy mode we don't re-use
+    // the current tree; see previous branch.)
 
-  {
-    if (workInProgress._debugNeedsRemount && current !== null) {
-      // This will restart the begin phase with a new fiber.
-      return remountFiber(
-        current,
-        workInProgress,
-        createFiberFromTypeAndProps(
-          workInProgress.type,
-          workInProgress.key,
-          workInProgress.pendingProps,
-          workInProgress._debugOwner || null,
-          workInProgress.mode,
-          workInProgress.lanes
-        )
-      );
-    }
+    primaryChildFragment.subtreeFlags =
+      currentPrimaryChildFragment.subtreeFlags & StaticMask;
   }
 
-  if (current !== null) {
-    var oldProps = current.memoizedProps;
-    var newProps = workInProgress.pendingProps;
-
-    if (
-      oldProps !== newProps ||
-      hasContextChanged() || // Force a re-render if the implementation changed due to hot reload:
-      workInProgress.type !== current.type
-    ) {
-      // If props or context changed, mark the fiber as having performed work.
-      // This may be unset if the props are determined to be equal later (memo).
-      didReceiveUpdate = true;
-    } else if (!includesSomeLane(renderLanes, updateLanes)) {
-      didReceiveUpdate = false; // This fiber does not have any pending work. Bailout without entering
-      // the begin phase. There's still some bookkeeping we that needs to be done
-      // in this optimized path, mostly pushing stuff onto the stack.
+  var fallbackChildFragment;
 
-      switch (workInProgress.tag) {
-        case HostRoot:
-          pushHostRootContext(workInProgress);
-          break;
+  if (currentFallbackChildFragment !== null) {
+    fallbackChildFragment = createWorkInProgress(
+      currentFallbackChildFragment,
+      fallbackChildren
+    );
+  } else {
+    fallbackChildFragment = createFiberFromFragment(
+      fallbackChildren,
+      mode,
+      renderLanes,
+      null
+    ); // Needs a placement effect because the parent (the Suspense boundary) already
+    // mounted but this is a new fiber.
 
-        case HostComponent:
-          pushHostContext(workInProgress);
-          break;
+    fallbackChildFragment.flags |= Placement;
+  }
 
-        case ClassComponent: {
-          var Component = workInProgress.type;
+  fallbackChildFragment.return = workInProgress;
+  primaryChildFragment.return = workInProgress;
+  primaryChildFragment.sibling = fallbackChildFragment;
+  workInProgress.child = primaryChildFragment;
+  return fallbackChildFragment;
+}
 
-          if (isContextProvider(Component)) {
-            pushContextProvider(workInProgress);
-          }
+function scheduleWorkOnFiber(fiber, renderLanes) {
+  fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
+  var alternate = fiber.alternate;
 
-          break;
-        }
+  if (alternate !== null) {
+    alternate.lanes = mergeLanes(alternate.lanes, renderLanes);
+  }
 
-        case HostPortal:
-          pushHostContainer(
-            workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
+  scheduleWorkOnParentPath(fiber.return, renderLanes);
+}
 
-        case ContextProvider: {
-          var newValue = workInProgress.memoizedProps.value;
-          pushProvider(workInProgress, newValue);
-          break;
-        }
+function propagateSuspenseContextChange(
+  workInProgress,
+  firstChild,
+  renderLanes
+) {
+  // Mark any Suspense boundaries with fallbacks as having work to do.
+  // If they were previously forced into fallbacks, they may now be able
+  // to unblock.
+  var node = firstChild;
 
-        case Profiler:
-          {
-            // Profiler should only call onRender when one of its descendants actually rendered.
-            var hasChildWork = includesSomeLane(
-              renderLanes,
-              workInProgress.childLanes
-            );
+  while (node !== null) {
+    if (node.tag === SuspenseComponent) {
+      var state = node.memoizedState;
 
-            if (hasChildWork) {
-              workInProgress.flags |= Update;
-            } // Reset effect durations for the next eventual effect phase.
-            // These are reset during render to allow the DevTools commit hook a chance to read them,
+      if (state !== null) {
+        scheduleWorkOnFiber(node, renderLanes);
+      }
+    } else if (node.tag === SuspenseListComponent) {
+      // If the tail is hidden there might not be an Suspense boundaries
+      // to schedule work on. In this case we have to schedule it on the
+      // list itself.
+      // We don't have to traverse to the children of the list since
+      // the list will propagate the change when it rerenders.
+      scheduleWorkOnFiber(node, renderLanes);
+    } else if (node.child !== null) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
 
-            var stateNode = workInProgress.stateNode;
-            stateNode.effectDuration = 0;
-            stateNode.passiveEffectDuration = 0;
-          }
+    if (node === workInProgress) {
+      return;
+    }
 
-          break;
+    while (node.sibling === null) {
+      if (node.return === null || node.return === workInProgress) {
+        return;
+      }
 
-        case SuspenseComponent: {
-          var state = workInProgress.memoizedState;
+      node = node.return;
+    }
 
-          if (state !== null) {
-            // whether to retry the primary children, or to skip over it and
-            // go straight to the fallback. Check the priority of the primary
-            // child fragment.
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+}
 
-            var primaryChildFragment = workInProgress.child;
-            var primaryChildLanes = primaryChildFragment.childLanes;
+function findLastContentRow(firstChild) {
+  // This is going to find the last row among these children that is already
+  // showing content on the screen, as opposed to being in fallback state or
+  // new. If a row has multiple Suspense boundaries, any of them being in the
+  // fallback state, counts as the whole row being in a fallback state.
+  // Note that the "rows" will be workInProgress, but any nested children
+  // will still be current since we haven't rendered them yet. The mounted
+  // order may not be the same as the new order. We use the new order.
+  var row = firstChild;
+  var lastContentRow = null;
 
-            if (includesSomeLane(renderLanes, primaryChildLanes)) {
-              // The primary children have pending work. Use the normal path
-              // to attempt to render the primary children again.
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            } else {
-              // The primary child fragment does not have pending work marked
-              // on it
-              pushSuspenseContext(
-                workInProgress,
-                setDefaultShallowSuspenseContext(suspenseStackCursor.current)
-              ); // The primary children do not have pending work with sufficient
-              // priority. Bailout.
-
-              var child = bailoutOnAlreadyFinishedWork(
-                current,
-                workInProgress,
-                renderLanes
-              );
+  while (row !== null) {
+    var currentRow = row.alternate; // New rows can't be content rows.
 
-              if (child !== null) {
-                // The fallback children have pending work. Skip over the
-                // primary children and work on the fallback.
-                return child.sibling;
-              } else {
-                return null;
-              }
-            }
-          } else {
-            pushSuspenseContext(
-              workInProgress,
-              setDefaultShallowSuspenseContext(suspenseStackCursor.current)
-            );
-          }
+    if (currentRow !== null && findFirstSuspended(currentRow) === null) {
+      lastContentRow = row;
+    }
 
-          break;
-        }
+    row = row.sibling;
+  }
 
-        case SuspenseListComponent: {
-          var didSuspendBefore = (current.flags & DidCapture) !== NoFlags;
+  return lastContentRow;
+}
 
-          var _hasChildWork = includesSomeLane(
-            renderLanes,
-            workInProgress.childLanes
-          );
+function validateRevealOrder(revealOrder) {
+  {
+    if (
+      revealOrder !== undefined &&
+      revealOrder !== "forwards" &&
+      revealOrder !== "backwards" &&
+      revealOrder !== "together" &&
+      !didWarnAboutRevealOrder[revealOrder]
+    ) {
+      didWarnAboutRevealOrder[revealOrder] = true;
 
-          if (didSuspendBefore) {
-            if (_hasChildWork) {
-              // If something was in fallback state last time, and we have all the
-              // same children then we're still in progressive loading state.
-              // Something might get unblocked by state updates or retries in the
-              // tree which will affect the tail. So we need to use the normal
-              // path to compute the correct tail.
-              return updateSuspenseListComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            } // If none of the children had any work, that means that none of
-            // them got retried so they'll still be blocked in the same way
-            // as before. We can fast bail out.
+      if (typeof revealOrder === "string") {
+        switch (revealOrder.toLowerCase()) {
+          case "together":
+          case "forwards":
+          case "backwards": {
+            error(
+              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
+                'Use lowercase "%s" instead.',
+              revealOrder,
+              revealOrder.toLowerCase()
+            );
 
-            workInProgress.flags |= DidCapture;
-          } // If nothing suspended before and we're rendering the same children,
-          // then the tail doesn't matter. Anything new that suspends will work
-          // in the "together" mode, so we can continue from the state we had.
-
-          var renderState = workInProgress.memoizedState;
-
-          if (renderState !== null) {
-            // Reset to the "together" mode in case we've started a different
-            // update in the past but didn't complete it.
-            renderState.rendering = null;
-            renderState.tail = null;
-            renderState.lastEffect = null;
+            break;
           }
 
-          pushSuspenseContext(workInProgress, suspenseStackCursor.current);
+          case "forward":
+          case "backward": {
+            error(
+              '"%s" is not a valid value for revealOrder on <SuspenseList />. ' +
+                'React uses the -s suffix in the spelling. Use "%ss" instead.',
+              revealOrder,
+              revealOrder.toLowerCase()
+            );
 
-          if (_hasChildWork) {
             break;
-          } else {
-            // If none of the children had any work, that means that none of
-            // them got retried so they'll still be blocked in the same way
-            // as before. We can fast bail out.
-            return null;
           }
-        }
 
-        case OffscreenComponent:
-        case LegacyHiddenComponent: {
-          // Need to check if the tree still needs to be deferred. This is
-          // almost identical to the logic used in the normal update path,
-          // so we'll just enter that. The only difference is we'll bail out
-          // at the next level instead of this one, because the child props
-          // have not changed. Which is fine.
-          // TODO: Probably should refactor `beginWork` to split the bailout
-          // path from the normal path. I'm tempted to do a labeled break here
-          // but I won't :)
-          workInProgress.lanes = NoLanes;
-          return updateOffscreenComponent(current, workInProgress, renderLanes);
-        }
-      }
+          default:
+            error(
+              '"%s" is not a supported revealOrder on <SuspenseList />. ' +
+                'Did you mean "together", "forwards" or "backwards"?',
+              revealOrder
+            );
 
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
-    } else {
-      if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
-        // This is a special case that only exists for legacy mode.
-        // See https://github.com/facebook/react/pull/19216.
-        didReceiveUpdate = true;
+            break;
+        }
       } else {
-        // An update was scheduled on this fiber, but there are no new props
-        // nor legacy context. Set this to false. If an update queue or context
-        // consumer produces a changed value, it will set this to true. Otherwise,
-        // the component will assume the children have not changed and bail out.
-        didReceiveUpdate = false;
+        error(
+          "%s is not a supported value for revealOrder on <SuspenseList />. " +
+            'Did you mean "together", "forwards" or "backwards"?',
+          revealOrder
+        );
       }
     }
-  } else {
-    didReceiveUpdate = false;
-  } // Before entering the begin phase, clear pending update priority.
-  // TODO: This assumes that we're about to evaluate the component and process
-  // the update queue. However, there's an exception: SimpleMemoComponent
-  // sometimes bails out later in the begin phase. This indicates that we should
-  // move this assignment out of the common path and into each branch.
-
-  workInProgress.lanes = NoLanes;
+  }
+}
 
-  switch (workInProgress.tag) {
-    case IndeterminateComponent: {
-      return mountIndeterminateComponent(
-        current,
-        workInProgress,
-        workInProgress.type,
-        renderLanes
-      );
-    }
+function validateTailOptions(tailMode, revealOrder) {
+  {
+    if (tailMode !== undefined && !didWarnAboutTailOptions[tailMode]) {
+      if (tailMode !== "collapsed" && tailMode !== "hidden") {
+        didWarnAboutTailOptions[tailMode] = true;
 
-    case LazyComponent: {
-      var elementType = workInProgress.elementType;
-      return mountLazyComponent(
-        current,
-        workInProgress,
-        elementType,
-        updateLanes,
-        renderLanes
-      );
-    }
+        error(
+          '"%s" is not a supported value for tail on <SuspenseList />. ' +
+            'Did you mean "collapsed" or "hidden"?',
+          tailMode
+        );
+      } else if (revealOrder !== "forwards" && revealOrder !== "backwards") {
+        didWarnAboutTailOptions[tailMode] = true;
 
-    case FunctionComponent: {
-      var _Component = workInProgress.type;
-      var unresolvedProps = workInProgress.pendingProps;
-      var resolvedProps =
-        workInProgress.elementType === _Component
-          ? unresolvedProps
-          : resolveDefaultProps(_Component, unresolvedProps);
-      return updateFunctionComponent(
-        current,
-        workInProgress,
-        _Component,
-        resolvedProps,
-        renderLanes
-      );
+        error(
+          '<SuspenseList tail="%s" /> is only valid if revealOrder is ' +
+            '"forwards" or "backwards". ' +
+            'Did you mean to specify revealOrder="forwards"?',
+          tailMode
+        );
+      }
     }
+  }
+}
 
-    case ClassComponent: {
-      var _Component2 = workInProgress.type;
-      var _unresolvedProps = workInProgress.pendingProps;
+function validateSuspenseListNestedChild(childSlot, index) {
+  {
+    var isAnArray = isArray(childSlot);
+    var isIterable =
+      !isAnArray && typeof getIteratorFn(childSlot) === "function";
 
-      var _resolvedProps =
-        workInProgress.elementType === _Component2
-          ? _unresolvedProps
-          : resolveDefaultProps(_Component2, _unresolvedProps);
+    if (isAnArray || isIterable) {
+      var type = isAnArray ? "array" : "iterable";
 
-      return updateClassComponent(
-        current,
-        workInProgress,
-        _Component2,
-        _resolvedProps,
-        renderLanes
+      error(
+        "A nested %s was passed to row #%s in <SuspenseList />. Wrap it in " +
+          "an additional SuspenseList to configure its revealOrder: " +
+          "<SuspenseList revealOrder=...> ... " +
+          "<SuspenseList revealOrder=...>{%s}</SuspenseList> ... " +
+          "</SuspenseList>",
+        type,
+        index,
+        type
       );
+
+      return false;
     }
+  }
+
+  return true;
+}
+
+function validateSuspenseListChildren(children, revealOrder) {
+  {
+    if (
+      (revealOrder === "forwards" || revealOrder === "backwards") &&
+      children !== undefined &&
+      children !== null &&
+      children !== false
+    ) {
+      if (isArray(children)) {
+        for (var i = 0; i < children.length; i++) {
+          if (!validateSuspenseListNestedChild(children[i], i)) {
+            return;
+          }
+        }
+      } else {
+        var iteratorFn = getIteratorFn(children);
 
-    case HostRoot:
-      return updateHostRoot(current, workInProgress, renderLanes);
+        if (typeof iteratorFn === "function") {
+          var childrenIterator = iteratorFn.call(children);
 
-    case HostComponent:
-      return updateHostComponent(current, workInProgress, renderLanes);
+          if (childrenIterator) {
+            var step = childrenIterator.next();
+            var _i = 0;
 
-    case HostText:
-      return updateHostText();
+            for (; !step.done; step = childrenIterator.next()) {
+              if (!validateSuspenseListNestedChild(step.value, _i)) {
+                return;
+              }
 
-    case SuspenseComponent:
-      return updateSuspenseComponent(current, workInProgress, renderLanes);
+              _i++;
+            }
+          }
+        } else {
+          error(
+            'A single row was passed to a <SuspenseList revealOrder="%s" />. ' +
+              "This is not useful since it needs multiple rows. " +
+              "Did you mean to pass multiple children or an array?",
+            revealOrder
+          );
+        }
+      }
+    }
+  }
+}
 
-    case HostPortal:
-      return updatePortalComponent(current, workInProgress, renderLanes);
+function initSuspenseListRenderState(
+  workInProgress,
+  isBackwards,
+  tail,
+  lastContentRow,
+  tailMode
+) {
+  var renderState = workInProgress.memoizedState;
 
-    case ForwardRef: {
-      var type = workInProgress.type;
-      var _unresolvedProps2 = workInProgress.pendingProps;
+  if (renderState === null) {
+    workInProgress.memoizedState = {
+      isBackwards: isBackwards,
+      rendering: null,
+      renderingStartTime: 0,
+      last: lastContentRow,
+      tail: tail,
+      tailMode: tailMode
+    };
+  } else {
+    // We can reuse the existing object from previous renders.
+    renderState.isBackwards = isBackwards;
+    renderState.rendering = null;
+    renderState.renderingStartTime = 0;
+    renderState.last = lastContentRow;
+    renderState.tail = tail;
+    renderState.tailMode = tailMode;
+  }
+} // This can end up rendering this component multiple passes.
+// The first pass splits the children fibers into two sets. A head and tail.
+// We first render the head. If anything is in fallback state, we do another
+// pass through beginWork to rerender all children (including the tail) with
+// the force suspend context. If the first render didn't have anything in
+// in fallback state. Then we render each row in the tail one-by-one.
+// That happens in the completeWork phase without going back to beginWork.
 
-      var _resolvedProps2 =
-        workInProgress.elementType === type
-          ? _unresolvedProps2
-          : resolveDefaultProps(type, _unresolvedProps2);
+function updateSuspenseListComponent(current, workInProgress, renderLanes) {
+  var nextProps = workInProgress.pendingProps;
+  var revealOrder = nextProps.revealOrder;
+  var tailMode = nextProps.tail;
+  var newChildren = nextProps.children;
+  validateRevealOrder(revealOrder);
+  validateTailOptions(tailMode, revealOrder);
+  validateSuspenseListChildren(newChildren, revealOrder);
+  reconcileChildren(current, workInProgress, newChildren, renderLanes);
+  var suspenseContext = suspenseStackCursor.current;
+  var shouldForceFallback = hasSuspenseContext(
+    suspenseContext,
+    ForceSuspenseFallback
+  );
 
-      return updateForwardRef(
-        current,
+  if (shouldForceFallback) {
+    suspenseContext = setShallowSuspenseContext(
+      suspenseContext,
+      ForceSuspenseFallback
+    );
+    workInProgress.flags |= DidCapture;
+  } else {
+    var didSuspendBefore =
+      current !== null && (current.flags & DidCapture) !== NoFlags;
+
+    if (didSuspendBefore) {
+      // If we previously forced a fallback, we need to schedule work
+      // on any nested boundaries to let them know to try to render
+      // again. This is the same as context updating.
+      propagateSuspenseContextChange(
         workInProgress,
-        type,
-        _resolvedProps2,
+        workInProgress.child,
         renderLanes
       );
     }
 
-    case Fragment:
-      return updateFragment(current, workInProgress, renderLanes);
-
-    case Mode:
-      return updateMode(current, workInProgress, renderLanes);
+    suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
+  }
 
-    case Profiler:
-      return updateProfiler(current, workInProgress, renderLanes);
+  pushSuspenseContext(workInProgress, suspenseContext);
 
-    case ContextProvider:
-      return updateContextProvider(current, workInProgress, renderLanes);
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
+    // In legacy mode, SuspenseList doesn't work so we just
+    // use make it a noop by treating it as the default revealOrder.
+    workInProgress.memoizedState = null;
+  } else {
+    switch (revealOrder) {
+      case "forwards": {
+        var lastContentRow = findLastContentRow(workInProgress.child);
+        var tail;
 
-    case ContextConsumer:
-      return updateContextConsumer(current, workInProgress, renderLanes);
+        if (lastContentRow === null) {
+          // The whole list is part of the tail.
+          // TODO: We could fast path by just rendering the tail now.
+          tail = workInProgress.child;
+          workInProgress.child = null;
+        } else {
+          // Disconnect the tail rows after the content row.
+          // We're going to render them separately later.
+          tail = lastContentRow.sibling;
+          lastContentRow.sibling = null;
+        }
 
-    case MemoComponent: {
-      var _type2 = workInProgress.type;
-      var _unresolvedProps3 = workInProgress.pendingProps; // Resolve outer props first, then resolve inner props.
+        initSuspenseListRenderState(
+          workInProgress,
+          false, // isBackwards
+          tail,
+          lastContentRow,
+          tailMode
+        );
+        break;
+      }
 
-      var _resolvedProps3 = resolveDefaultProps(_type2, _unresolvedProps3);
+      case "backwards": {
+        // We're going to find the first row that has existing content.
+        // At the same time we're going to reverse the list of everything
+        // we pass in the meantime. That's going to be our tail in reverse
+        // order.
+        var _tail = null;
+        var row = workInProgress.child;
+        workInProgress.child = null;
 
-      {
-        if (workInProgress.type !== workInProgress.elementType) {
-          var outerPropTypes = _type2.propTypes;
+        while (row !== null) {
+          var currentRow = row.alternate; // New rows can't be content rows.
 
-          if (outerPropTypes) {
-            checkPropTypes(
-              outerPropTypes,
-              _resolvedProps3, // Resolved for outer only
-              "prop",
-              getComponentName(_type2)
-            );
+          if (currentRow !== null && findFirstSuspended(currentRow) === null) {
+            // This is the beginning of the main content.
+            workInProgress.child = row;
+            break;
           }
-        }
+
+          var nextRow = row.sibling;
+          row.sibling = _tail;
+          _tail = row;
+          row = nextRow;
+        } // TODO: If workInProgress.child is null, we can continue on the tail immediately.
+
+        initSuspenseListRenderState(
+          workInProgress,
+          true, // isBackwards
+          _tail,
+          null, // last
+          tailMode
+        );
+        break;
       }
 
-      _resolvedProps3 = resolveDefaultProps(_type2.type, _resolvedProps3);
-      return updateMemoComponent(
-        current,
-        workInProgress,
-        _type2,
-        _resolvedProps3,
-        updateLanes,
-        renderLanes
-      );
-    }
+      case "together": {
+        initSuspenseListRenderState(
+          workInProgress,
+          false, // isBackwards
+          null, // tail
+          null, // last
+          undefined
+        );
+        break;
+      }
 
-    case SimpleMemoComponent: {
-      return updateSimpleMemoComponent(
-        current,
-        workInProgress,
-        workInProgress.type,
-        workInProgress.pendingProps,
-        updateLanes,
-        renderLanes
-      );
+      default: {
+        // The default reveal order is the same as not having
+        // a boundary.
+        workInProgress.memoizedState = null;
+      }
     }
+  }
 
-    case IncompleteClassComponent: {
-      var _Component3 = workInProgress.type;
-      var _unresolvedProps4 = workInProgress.pendingProps;
+  return workInProgress.child;
+}
 
-      var _resolvedProps4 =
-        workInProgress.elementType === _Component3
-          ? _unresolvedProps4
-          : resolveDefaultProps(_Component3, _unresolvedProps4);
+function updatePortalComponent(current, workInProgress, renderLanes) {
+  pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+  var nextChildren = workInProgress.pendingProps;
 
-      return mountIncompleteClassComponent(
-        current,
-        workInProgress,
-        _Component3,
-        _resolvedProps4,
-        renderLanes
-      );
-    }
+  if (current === null) {
+    // Portals are special because we don't append the children during mount
+    // but at commit. Therefore we need to track insertions which the normal
+    // flow doesn't do during mount. This doesn't happen at the root because
+    // the root always starts with a "current" with a null child.
+    // TODO: Consider unifying this with how the root works.
+    workInProgress.child = reconcileChildFibers(
+      workInProgress,
+      null,
+      nextChildren,
+      renderLanes
+    );
+  } else {
+    reconcileChildren(current, workInProgress, nextChildren, renderLanes);
+  }
 
-    case SuspenseListComponent: {
-      return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    }
+  return workInProgress.child;
+}
 
-    case FundamentalComponent: {
-      break;
-    }
+var hasWarnedAboutUsingNoValuePropOnContextProvider = false;
 
-    case ScopeComponent: {
-      break;
-    }
+function updateContextProvider(current, workInProgress, renderLanes) {
+  var providerType = workInProgress.type;
+  var context = providerType._context;
+  var newProps = workInProgress.pendingProps;
+  var oldProps = workInProgress.memoizedProps;
+  var newValue = newProps.value;
 
-    case Block: {
-      break;
-    }
+  {
+    if (!("value" in newProps)) {
+      if (!hasWarnedAboutUsingNoValuePropOnContextProvider) {
+        hasWarnedAboutUsingNoValuePropOnContextProvider = true;
 
-    case OffscreenComponent: {
-      return updateOffscreenComponent(current, workInProgress, renderLanes);
+        error(
+          "The `value` prop is required for the `<Context.Provider>`. Did you misspell it or forget to pass it?"
+        );
+      }
     }
 
-    case LegacyHiddenComponent: {
-      return updateLegacyHiddenComponent(current, workInProgress, renderLanes);
+    var providerPropTypes = workInProgress.type.propTypes;
+
+    if (providerPropTypes) {
+      checkPropTypes(providerPropTypes, newProps, "prop", "Context.Provider");
     }
   }
 
+  pushProvider(workInProgress, context, newValue);
+
   {
-    throw Error(
-      "Unknown unit of work tag (" +
-        workInProgress.tag +
-        "). This error is likely caused by a bug in React. Please file an issue."
-    );
+    if (oldProps !== null) {
+      var oldValue = oldProps.value;
+
+      if (objectIs(oldValue, newValue)) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children && !hasContextChanged()) {
+          return bailoutOnAlreadyFinishedWork(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        }
+      } else {
+        // The context value changed. Search for matching consumers and schedule
+        // them to update.
+        propagateContextChange(workInProgress, context, renderLanes);
+      }
+    }
   }
-}
-
-function markUpdate(workInProgress) {
-  // Tag the fiber with an update effect. This turns a Placement into
-  // a PlacementAndUpdate.
-  workInProgress.flags |= Update;
-}
 
-function markRef$1(workInProgress) {
-  workInProgress.flags |= Ref;
+  var newChildren = newProps.children;
+  reconcileChildren(current, workInProgress, newChildren, renderLanes);
+  return workInProgress.child;
 }
 
-var appendAllChildren;
-var updateHostContainer;
-var updateHostComponent$1;
-var updateHostText$1;
-
-{
-  // Mutation mode
-  appendAllChildren = function(
-    parent,
-    workInProgress,
-    needsVisibilityToggle,
-    isHidden
-  ) {
-    // We only have the top Fiber that was created but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = workInProgress.child;
+var hasWarnedAboutUsingContextAsConsumer = false;
 
-    while (node !== null) {
-      if (node.tag === HostComponent || node.tag === HostText) {
-        appendInitialChild(parent, node.stateNode);
-      } else if (node.tag === HostPortal);
-      else if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
+function updateContextConsumer(current, workInProgress, renderLanes) {
+  var context = workInProgress.type; // The logic below for Context differs depending on PROD or DEV mode. In
+  // DEV mode, we create a separate object for Context.Consumer that acts
+  // like a proxy to Context. This proxy object adds unnecessary code in PROD
+  // so we use the old behaviour (Context.Consumer references Context) to
+  // reduce size and overhead. The separate object references context via
+  // a property called "_context", which also gives us the ability to check
+  // in DEV mode if this property exists or not and warn if it does not.
 
-      if (node === workInProgress) {
-        return;
-      }
+  {
+    if (context._context === undefined) {
+      // This may be because it's a Context (rather than a Consumer).
+      // Or it may be because it's older React where they're the same thing.
+      // We only want to warn if we're sure it's a new React.
+      if (context !== context.Consumer) {
+        if (!hasWarnedAboutUsingContextAsConsumer) {
+          hasWarnedAboutUsingContextAsConsumer = true;
 
-      while (node.sibling === null) {
-        if (node.return === null || node.return === workInProgress) {
-          return;
+          error(
+            "Rendering <Context> directly is not supported and will be removed in " +
+              "a future major release. Did you mean to render <Context.Consumer> instead?"
+          );
         }
-
-        node = node.return;
       }
-
-      node.sibling.return = node.return;
-      node = node.sibling;
+    } else {
+      context = context._context;
     }
-  };
-
-  updateHostContainer = function(workInProgress) {
-    // Noop
-  };
-
-  updateHostComponent$1 = function(
-    current,
-    workInProgress,
-    type,
-    newProps,
-    rootContainerInstance
-  ) {
-    // If we have an alternate, that means this is an update and we need to
-    // schedule a side-effect to do the updates.
-    var oldProps = current.memoizedProps;
-
-    if (oldProps === newProps) {
-      // In mutation mode, this is sufficient for a bailout because
-      // we won't touch this node even if children changed.
-      return;
-    } // If we get updated because one of our children updated, we don't
-    // have newProps so we'll have to reuse them.
-    // TODO: Split the update API as separate for the props vs. children.
-    // Even better would be if children weren't special cased at all tho.
-
-    var instance = workInProgress.stateNode;
-    var currentHostContext = getHostContext(); // TODO: Experiencing an error where oldProps is null. Suggests a host
-    // component is hitting the resume path. Figure out why. Possibly
-    // related to `hidden`.
-
-    var updatePayload = prepareUpdate(); // TODO: Type this specific to this type of component.
-
-    workInProgress.updateQueue = updatePayload; // If the update payload indicates that there is a change or if there
-    // is a new ref we mark this as an update. All the work is done in commitWork.
+  }
 
-    if (updatePayload) {
-      markUpdate(workInProgress);
-    }
-  };
+  var newProps = workInProgress.pendingProps;
+  var render = newProps.children;
 
-  updateHostText$1 = function(current, workInProgress, oldText, newText) {
-    // If the text differs, mark it as an update. All the work in done in commitWork.
-    if (oldText !== newText) {
-      markUpdate(workInProgress);
+  {
+    if (typeof render !== "function") {
+      error(
+        "A context consumer was rendered with multiple children, or a child " +
+          "that isn't a function. A context consumer expects a single child " +
+          "that is a function. If you did pass a function, make sure there " +
+          "is no trailing or leading whitespace around it."
+      );
     }
-  };
-}
-
-function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
-  switch (renderState.tailMode) {
-    case "hidden": {
-      // Any insertions at the end of the tail list after this point
-      // should be invisible. If there are already mounted boundaries
-      // anything before them are not considered for collapsing.
-      // Therefore we need to go through the whole tail to find if
-      // there are any.
-      var tailNode = renderState.tail;
-      var lastTailNode = null;
+  }
 
-      while (tailNode !== null) {
-        if (tailNode.alternate !== null) {
-          lastTailNode = tailNode;
-        }
+  prepareToReadContext(workInProgress, renderLanes);
+  var newValue = readContext(context);
 
-        tailNode = tailNode.sibling;
-      } // Next we're simply going to delete all insertions after the
-      // last rendered item.
+  var newChildren;
 
-      if (lastTailNode === null) {
-        // All remaining items in the tail are insertions.
-        renderState.tail = null;
-      } else {
-        // Detach the insertion after the last node that was already
-        // inserted.
-        lastTailNode.sibling = null;
-      }
+  {
+    ReactCurrentOwner$1.current = workInProgress;
+    setIsRendering(true);
+    newChildren = render(newValue);
+    setIsRendering(false);
+  }
 
-      break;
-    }
+  workInProgress.flags |= PerformedWork;
+  reconcileChildren(current, workInProgress, newChildren, renderLanes);
+  return workInProgress.child;
+}
 
-    case "collapsed": {
-      // Any insertions at the end of the tail list after this point
-      // should be invisible. If there are already mounted boundaries
-      // anything before them are not considered for collapsing.
-      // Therefore we need to go through the whole tail to find if
-      // there are any.
-      var _tailNode = renderState.tail;
-      var _lastTailNode = null;
+function markWorkInProgressReceivedUpdate() {
+  didReceiveUpdate = true;
+}
 
-      while (_tailNode !== null) {
-        if (_tailNode.alternate !== null) {
-          _lastTailNode = _tailNode;
-        }
+function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
+  if (current !== null) {
+    // Reuse previous dependencies
+    workInProgress.dependencies = current.dependencies;
+  }
 
-        _tailNode = _tailNode.sibling;
-      } // Next we're simply going to delete all insertions after the
-      // last rendered item.
+  {
+    // Don't update "base" render times for bailouts.
+    stopProfilerTimerIfRunning();
+  }
 
-      if (_lastTailNode === null) {
-        // All remaining items in the tail are insertions.
-        if (!hasRenderedATailFallback && renderState.tail !== null) {
-          // We suspended during the head. We want to show at least one
-          // row at the tail. So we'll keep on and cut off the rest.
-          renderState.tail.sibling = null;
-        } else {
-          renderState.tail = null;
-        }
-      } else {
-        // Detach the insertion after the last node that was already
-        // inserted.
-        _lastTailNode.sibling = null;
-      }
+  markSkippedUpdateLanes(workInProgress.lanes); // Check if the children have any pending work.
 
-      break;
+  if (!includesSomeLane(renderLanes, workInProgress.childLanes)) {
+    // The children don't have any work either. We can skip them.
+    // TODO: Once we add back resuming, we should check if the children are
+    // a work-in-progress set. If so, we need to transfer their effects.
+    {
+      return null;
     }
-  }
-}
+  } // This fiber doesn't have work, but its subtree does. Clone the child
+  // fibers and continue.
 
-function completeWork(current, workInProgress, renderLanes) {
-  var newProps = workInProgress.pendingProps;
+  cloneChildFibers(current, workInProgress);
+  return workInProgress.child;
+}
 
-  switch (workInProgress.tag) {
-    case IndeterminateComponent:
-    case LazyComponent:
-    case SimpleMemoComponent:
-    case FunctionComponent:
-    case ForwardRef:
-    case Fragment:
-    case Mode:
-    case Profiler:
-    case ContextConsumer:
-    case MemoComponent:
-      return null;
+function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
+  {
+    var returnFiber = oldWorkInProgress.return;
 
-    case ClassComponent: {
-      var Component = workInProgress.type;
+    if (returnFiber === null) {
+      throw new Error("Cannot swap the root fiber.");
+    } // Disconnect from the old current.
+    // It will get deleted.
 
-      if (isContextProvider(Component)) {
-        popContext(workInProgress);
-      }
+    current.alternate = null;
+    oldWorkInProgress.alternate = null; // Connect to the new tree.
 
-      return null;
-    }
+    newWorkInProgress.index = oldWorkInProgress.index;
+    newWorkInProgress.sibling = oldWorkInProgress.sibling;
+    newWorkInProgress.return = oldWorkInProgress.return;
+    newWorkInProgress.ref = oldWorkInProgress.ref; // Replace the child/sibling pointers above it.
 
-    case HostRoot: {
-      popHostContainer(workInProgress);
-      popTopLevelContextObject(workInProgress);
-      resetWorkInProgressVersions();
-      var fiberRoot = workInProgress.stateNode;
+    if (oldWorkInProgress === returnFiber.child) {
+      returnFiber.child = newWorkInProgress;
+    } else {
+      var prevSibling = returnFiber.child;
 
-      if (fiberRoot.pendingContext) {
-        fiberRoot.context = fiberRoot.pendingContext;
-        fiberRoot.pendingContext = null;
+      if (prevSibling === null) {
+        throw new Error("Expected parent to have a child.");
       }
 
-      if (current === null || current.child === null) {
-        // If we hydrated, pop so that we can delete any remaining children
-        // that weren't hydrated.
-        var wasHydrated = popHydrationState();
+      while (prevSibling.sibling !== oldWorkInProgress) {
+        prevSibling = prevSibling.sibling;
 
-        if (wasHydrated) {
-          // If we hydrated, then we'll need to schedule an update for
-          // the commit side-effects on the root.
-          markUpdate(workInProgress);
-        } else if (!fiberRoot.hydrate) {
-          // Schedule an effect to clear this container at the start of the next commit.
-          // This handles the case of React rendering into a container with previous children.
-          // It's also safe to do for updates too, because current.child would only be null
-          // if the previous render was null (so the the container would already be empty).
-          workInProgress.flags |= Snapshot;
+        if (prevSibling === null) {
+          throw new Error("Expected to find the previous sibling.");
         }
       }
 
-      updateHostContainer(workInProgress);
-      return null;
+      prevSibling.sibling = newWorkInProgress;
+    } // Delete the old fiber and place the new one.
+    // Since the old fiber is disconnected, we have to schedule it manually.
+
+    var deletions = returnFiber.deletions;
+
+    if (deletions === null) {
+      returnFiber.deletions = [current];
+      returnFiber.flags |= ChildDeletion;
+    } else {
+      deletions.push(current);
     }
 
-    case HostComponent: {
-      popHostContext(workInProgress);
-      var rootContainerInstance = getRootHostContainer();
-      var type = workInProgress.type;
+    newWorkInProgress.flags |= Placement; // Restart work from the new fiber.
 
-      if (current !== null && workInProgress.stateNode != null) {
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          type,
-          newProps,
-          rootContainerInstance
-        );
+    return newWorkInProgress;
+  }
+}
 
-        if (current.ref !== workInProgress.ref) {
-          markRef$1(workInProgress);
-        }
-      } else {
-        if (!newProps) {
-          if (!(workInProgress.stateNode !== null)) {
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          } // This can happen when we abort work.
+function checkScheduledUpdateOrContext(current, renderLanes) {
+  // Before performing an early bailout, we must check if there are pending
+  // updates or context.
+  var updateLanes = current.lanes;
 
-          return null;
-        }
+  if (includesSomeLane(updateLanes, renderLanes)) {
+    return true;
+  } // No pending update, but because context is propagated lazily, we need
 
-        var currentHostContext = getHostContext(); // TODO: Move createInstance to beginWork and keep it on a context
-        // "stack" as the parent. Then append children as we go in beginWork
-        // or completeWork depending on whether we want to add them top->down or
-        // bottom->up. Top->down is faster in IE11.
+  return false;
+}
 
-        var _wasHydrated = popHydrationState();
+function attemptEarlyBailoutIfNoScheduledUpdate(
+  current,
+  workInProgress,
+  renderLanes
+) {
+  // This fiber does not have any pending work. Bailout without entering
+  // the begin phase. There's still some bookkeeping we that needs to be done
+  // in this optimized path, mostly pushing stuff onto the stack.
+  switch (workInProgress.tag) {
+    case HostRoot:
+      pushHostRootContext(workInProgress);
+      break;
 
-        if (_wasHydrated) {
-          // TODO: Move this and createInstance step into the beginPhase
-          // to consolidate.
-          if (prepareToHydrateHostInstance()) {
-            // If changes to the hydrated node need to be applied at the
-            // commit-phase we mark this as such.
-            markUpdate(workInProgress);
-          }
-        } else {
-          var instance = createInstance(
-            type,
-            newProps,
-            rootContainerInstance,
-            currentHostContext,
-            workInProgress
-          );
-          appendAllChildren(instance, workInProgress, false, false);
-          workInProgress.stateNode = instance; // Certain renderers require commit-time effects for initial mount.
-          // (eg DOM renderer supports auto-focus for certain elements).
-          // Make sure such renderers get scheduled for later work.
+    case HostComponent:
+      pushHostContext(workInProgress);
+      break;
 
-          if (finalizeInitialChildren(instance)) {
-            markUpdate(workInProgress);
-          }
-        }
+    case ClassComponent: {
+      var Component = workInProgress.type;
 
-        if (workInProgress.ref !== null) {
-          // If there is a ref on a host node we need to schedule a callback
-          markRef$1(workInProgress);
-        }
+      if (isContextProvider(Component)) {
+        pushContextProvider(workInProgress);
       }
 
-      return null;
+      break;
     }
 
-    case HostText: {
-      var newText = newProps;
-
-      if (current && workInProgress.stateNode != null) {
-        var oldText = current.memoizedProps; // If we have an alternate, that means this is an update and we need
-        // to schedule a side-effect to do the updates.
-
-        updateHostText$1(current, workInProgress, oldText, newText);
-      } else {
-        if (typeof newText !== "string") {
-          if (!(workInProgress.stateNode !== null)) {
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          } // This can happen when we abort work.
-        }
+    case HostPortal:
+      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+      break;
 
-        var _rootContainerInstance = getRootHostContainer();
+    case ContextProvider: {
+      var newValue = workInProgress.memoizedProps.value;
+      var context = workInProgress.type._context;
+      pushProvider(workInProgress, context, newValue);
+      break;
+    }
 
-        var _currentHostContext = getHostContext();
+    case Profiler:
+      {
+        // Profiler should only call onRender when one of its descendants actually rendered.
+        var hasChildWork = includesSomeLane(
+          renderLanes,
+          workInProgress.childLanes
+        );
 
-        var _wasHydrated2 = popHydrationState();
+        if (hasChildWork) {
+          workInProgress.flags |= Update;
+        }
 
-        if (_wasHydrated2) {
-          if (prepareToHydrateHostTextInstance()) {
-            markUpdate(workInProgress);
-          }
-        } else {
-          workInProgress.stateNode = createTextInstance(
-            newText,
-            _rootContainerInstance,
-            _currentHostContext,
-            workInProgress
-          );
+        {
+          // Reset effect durations for the next eventual effect phase.
+          // These are reset during render to allow the DevTools commit hook a chance to read them,
+          var stateNode = workInProgress.stateNode;
+          stateNode.effectDuration = 0;
+          stateNode.passiveEffectDuration = 0;
         }
       }
 
-      return null;
-    }
+      break;
 
     case SuspenseComponent: {
-      popSuspenseContext(workInProgress);
-      var nextState = workInProgress.memoizedState;
-
-      if ((workInProgress.flags & DidCapture) !== NoFlags) {
-        // Something suspended. Re-render with the fallback children.
-        workInProgress.lanes = renderLanes; // Do not reset the effect list.
-
-        if ((workInProgress.mode & ProfileMode) !== NoMode) {
-          transferActualDuration(workInProgress);
-        }
+      var state = workInProgress.memoizedState;
 
-        return workInProgress;
-      }
+      if (state !== null) {
+        // whether to retry the primary children, or to skip over it and
+        // go straight to the fallback. Check the priority of the primary
+        // child fragment.
 
-      var nextDidTimeout = nextState !== null;
-      var prevDidTimeout = false;
+        var primaryChildFragment = workInProgress.child;
+        var primaryChildLanes = primaryChildFragment.childLanes;
 
-      if (current === null) {
-        if (workInProgress.memoizedProps.fallback !== undefined);
-      } else {
-        var prevState = current.memoizedState;
-        prevDidTimeout = prevState !== null;
-      }
+        if (includesSomeLane(renderLanes, primaryChildLanes)) {
+          // The primary children have pending work. Use the normal path
+          // to attempt to render the primary children again.
+          return updateSuspenseComponent(current, workInProgress, renderLanes);
+        } else {
+          // The primary child fragment does not have pending work marked
+          // on it
+          pushSuspenseContext(
+            workInProgress,
+            setDefaultShallowSuspenseContext(suspenseStackCursor.current)
+          ); // The primary children do not have pending work with sufficient
+          // priority. Bailout.
 
-      if (nextDidTimeout && !prevDidTimeout) {
-        // If this subtreee is running in blocking mode we can suspend,
-        // otherwise we won't suspend.
-        // TODO: This will still suspend a synchronous tree if anything
-        // in the concurrent tree already suspended during this render.
-        // This is a known bug.
-        if ((workInProgress.mode & BlockingMode) !== NoMode) {
-          // TODO: Move this back to throwException because this is too late
-          // if this is a large tree which is common for initial loads. We
-          // don't know if we should restart a render or not until we get
-          // this marker, and this is too late.
-          // If this render already had a ping or lower pri updates,
-          // and this is the first time we know we're going to suspend we
-          // should be able to immediately restart from within throwException.
-          var hasInvisibleChildContext =
-            current === null &&
-            workInProgress.memoizedProps.unstable_avoidThisFallback !== true;
+          var child = bailoutOnAlreadyFinishedWork(
+            current,
+            workInProgress,
+            renderLanes
+          );
 
-          if (
-            hasInvisibleChildContext ||
-            hasSuspenseContext(
-              suspenseStackCursor.current,
-              InvisibleParentSuspenseContext
-            )
-          ) {
-            // If this was in an invisible tree or a new render, then showing
-            // this boundary is ok.
-            renderDidSuspend();
+          if (child !== null) {
+            // The fallback children have pending work. Skip over the
+            // primary children and work on the fallback.
+            return child.sibling;
           } else {
-            // Otherwise, we're going to have to hide content so we should
-            // suspend for longer if possible.
-            renderDidSuspendDelayIfPossible();
+            // Note: We can return `null` here because we already checked
+            // whether there were nested context consumers, via the call to
+            // `bailoutOnAlreadyFinishedWork` above.
+            return null;
           }
         }
+      } else {
+        pushSuspenseContext(
+          workInProgress,
+          setDefaultShallowSuspenseContext(suspenseStackCursor.current)
+        );
       }
 
-      {
-        // TODO: Only schedule updates if these values are non equal, i.e. it changed.
-        if (nextDidTimeout || prevDidTimeout) {
-          // If this boundary just timed out, schedule an effect to attach a
-          // retry listener to the promise. This flag is also used to hide the
-          // primary children. In mutation mode, we also need the flag to
-          // *unhide* children that were previously hidden, so check if this
-          // is currently timed out, too.
-          workInProgress.flags |= Update;
-        }
-      }
-
-      return null;
+      break;
     }
 
-    case HostPortal:
-      popHostContainer(workInProgress);
-      updateHostContainer(workInProgress);
+    case SuspenseListComponent: {
+      var didSuspendBefore = (current.flags & DidCapture) !== NoFlags;
 
-      if (current === null) {
-        preparePortalMount(workInProgress.stateNode.containerInfo);
-      }
+      var _hasChildWork = includesSomeLane(
+        renderLanes,
+        workInProgress.childLanes
+      );
 
-      return null;
+      if (didSuspendBefore) {
+        if (_hasChildWork) {
+          // If something was in fallback state last time, and we have all the
+          // same children then we're still in progressive loading state.
+          // Something might get unblocked by state updates or retries in the
+          // tree which will affect the tail. So we need to use the normal
+          // path to compute the correct tail.
+          return updateSuspenseListComponent(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        } // If none of the children had any work, that means that none of
+        // them got retried so they'll still be blocked in the same way
+        // as before. We can fast bail out.
 
-    case ContextProvider:
-      // Pop provider fiber
-      popProvider(workInProgress);
-      return null;
+        workInProgress.flags |= DidCapture;
+      } // If nothing suspended before and we're rendering the same children,
+      // then the tail doesn't matter. Anything new that suspends will work
+      // in the "together" mode, so we can continue from the state we had.
 
-    case IncompleteClassComponent: {
-      // Same as class component case. I put it down here so that the tags are
-      // sequential to ensure this switch is compiled to a jump table.
-      var _Component = workInProgress.type;
+      var renderState = workInProgress.memoizedState;
 
-      if (isContextProvider(_Component)) {
-        popContext(workInProgress);
+      if (renderState !== null) {
+        // Reset to the "together" mode in case we've started a different
+        // update in the past but didn't complete it.
+        renderState.rendering = null;
+        renderState.tail = null;
+        renderState.lastEffect = null;
       }
 
-      return null;
-    }
-
-    case SuspenseListComponent: {
-      popSuspenseContext(workInProgress);
-      var renderState = workInProgress.memoizedState;
+      pushSuspenseContext(workInProgress, suspenseStackCursor.current);
 
-      if (renderState === null) {
-        // We're running in the default, "independent" mode.
-        // We don't do anything in this mode.
+      if (_hasChildWork) {
+        break;
+      } else {
+        // If none of the children had any work, that means that none of
+        // them got retried so they'll still be blocked in the same way
+        // as before. We can fast bail out.
         return null;
       }
+    }
 
-      var didSuspendAlready = (workInProgress.flags & DidCapture) !== NoFlags;
-      var renderedTail = renderState.rendering;
+    case OffscreenComponent:
+    case LegacyHiddenComponent: {
+      // Need to check if the tree still needs to be deferred. This is
+      // almost identical to the logic used in the normal update path,
+      // so we'll just enter that. The only difference is we'll bail out
+      // at the next level instead of this one, because the child props
+      // have not changed. Which is fine.
+      // TODO: Probably should refactor `beginWork` to split the bailout
+      // path from the normal path. I'm tempted to do a labeled break here
+      // but I won't :)
+      workInProgress.lanes = NoLanes;
+      return updateOffscreenComponent(current, workInProgress, renderLanes);
+    }
+  }
 
-      if (renderedTail === null) {
-        // We just rendered the head.
-        if (!didSuspendAlready) {
-          // This is the first pass. We need to figure out if anything is still
-          // suspended in the rendered set.
-          // If new content unsuspended, but there's still some content that
-          // didn't. Then we need to do a second pass that forces everything
-          // to keep showing their fallbacks.
-          // We might be suspended if something in this render pass suspended, or
-          // something in the previous committed pass suspended. Otherwise,
-          // there's no chance so we can skip the expensive call to
-          // findFirstSuspended.
-          var cannotBeSuspended =
-            renderHasNotSuspendedYet() &&
-            (current === null || (current.flags & DidCapture) === NoFlags);
+  return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+}
 
-          if (!cannotBeSuspended) {
-            var row = workInProgress.child;
+function beginWork(current, workInProgress, renderLanes) {
+  {
+    if (workInProgress._debugNeedsRemount && current !== null) {
+      // This will restart the begin phase with a new fiber.
+      return remountFiber(
+        current,
+        workInProgress,
+        createFiberFromTypeAndProps(
+          workInProgress.type,
+          workInProgress.key,
+          workInProgress.pendingProps,
+          workInProgress._debugOwner || null,
+          workInProgress.mode,
+          workInProgress.lanes
+        )
+      );
+    }
+  }
 
-            while (row !== null) {
-              var suspended = findFirstSuspended(row);
+  if (current !== null) {
+    var oldProps = current.memoizedProps;
+    var newProps = workInProgress.pendingProps;
 
-              if (suspended !== null) {
-                didSuspendAlready = true;
-                workInProgress.flags |= DidCapture;
-                cutOffTailIfNeeded(renderState, false); // If this is a newly suspended tree, it might not get committed as
-                // part of the second pass. In that case nothing will subscribe to
-                // its thennables. Instead, we'll transfer its thennables to the
-                // SuspenseList so that it can retry if they resolve.
-                // There might be multiple of these in the list but since we're
-                // going to wait for all of them anyway, it doesn't really matter
-                // which ones gets to ping. In theory we could get clever and keep
-                // track of how many dependencies remain but it gets tricky because
-                // in the meantime, we can add/remove/change items and dependencies.
-                // We might bail out of the loop before finding any but that
-                // doesn't matter since that means that the other boundaries that
-                // we did find already has their listeners attached.
+    if (
+      oldProps !== newProps ||
+      hasContextChanged() || // Force a re-render if the implementation changed due to hot reload:
+      workInProgress.type !== current.type
+    ) {
+      // If props or context changed, mark the fiber as having performed work.
+      // This may be unset if the props are determined to be equal later (memo).
+      didReceiveUpdate = true;
+    } else {
+      // Neither props nor legacy context changes. Check if there's a pending
+      // update or context change.
+      var hasScheduledUpdateOrContext = checkScheduledUpdateOrContext(
+        current,
+        renderLanes
+      );
 
-                var newThennables = suspended.updateQueue;
+      if (
+        !hasScheduledUpdateOrContext && // If this is the second pass of an error or suspense boundary, there
+        // may not be work scheduled on `current`, so we check for this flag.
+        (workInProgress.flags & DidCapture) === NoFlags
+      ) {
+        // No pending updates or context. Bail out now.
+        didReceiveUpdate = false;
+        return attemptEarlyBailoutIfNoScheduledUpdate(
+          current,
+          workInProgress,
+          renderLanes
+        );
+      }
 
-                if (newThennables !== null) {
-                  workInProgress.updateQueue = newThennables;
-                  workInProgress.flags |= Update;
-                } // Rerender the whole list, but this time, we'll force fallbacks
-                // to stay in place.
-                // Reset the effect list before doing the second pass since that's now invalid.
+      if ((current.flags & ForceUpdateForLegacySuspense) !== NoFlags) {
+        // This is a special case that only exists for legacy mode.
+        // See https://github.com/facebook/react/pull/19216.
+        didReceiveUpdate = true;
+      } else {
+        // An update was scheduled on this fiber, but there are no new props
+        // nor legacy context. Set this to false. If an update queue or context
+        // consumer produces a changed value, it will set this to true. Otherwise,
+        // the component will assume the children have not changed and bail out.
+        didReceiveUpdate = false;
+      }
+    }
+  } else {
+    didReceiveUpdate = false;
+  } // Before entering the begin phase, clear pending update priority.
+  // TODO: This assumes that we're about to evaluate the component and process
+  // the update queue. However, there's an exception: SimpleMemoComponent
+  // sometimes bails out later in the begin phase. This indicates that we should
+  // move this assignment out of the common path and into each branch.
 
-                if (renderState.lastEffect === null) {
-                  workInProgress.firstEffect = null;
-                }
+  workInProgress.lanes = NoLanes;
 
-                workInProgress.lastEffect = renderState.lastEffect; // Reset the child fibers to their original state.
+  switch (workInProgress.tag) {
+    case IndeterminateComponent: {
+      return mountIndeterminateComponent(
+        current,
+        workInProgress,
+        workInProgress.type,
+        renderLanes
+      );
+    }
 
-                resetChildFibers(workInProgress, renderLanes); // Set up the Suspense Context to force suspense and immediately
-                // rerender the children.
+    case LazyComponent: {
+      var elementType = workInProgress.elementType;
+      return mountLazyComponent(
+        current,
+        workInProgress,
+        elementType,
+        renderLanes
+      );
+    }
 
-                pushSuspenseContext(
-                  workInProgress,
-                  setShallowSuspenseContext(
-                    suspenseStackCursor.current,
-                    ForceSuspenseFallback
-                  )
-                );
-                return workInProgress.child;
-              }
+    case FunctionComponent: {
+      var Component = workInProgress.type;
+      var unresolvedProps = workInProgress.pendingProps;
+      var resolvedProps =
+        workInProgress.elementType === Component
+          ? unresolvedProps
+          : resolveDefaultProps(Component, unresolvedProps);
+      return updateFunctionComponent(
+        current,
+        workInProgress,
+        Component,
+        resolvedProps,
+        renderLanes
+      );
+    }
 
-              row = row.sibling;
-            }
-          }
+    case ClassComponent: {
+      var _Component = workInProgress.type;
+      var _unresolvedProps = workInProgress.pendingProps;
 
-          if (renderState.tail !== null && now() > getRenderTargetTime()) {
-            // We have already passed our CPU deadline but we still have rows
-            // left in the tail. We'll just give up further attempts to render
-            // the main content and only render fallbacks.
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true;
-            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
-            // to get it started back up to attempt the next item. While in terms
-            // of priority this work has the same priority as this current render,
-            // it's not part of the same transition once the transition has
-            // committed. If it's sync, we still want to yield so that it can be
-            // painted. Conceptually, this is really the same as pinging.
-            // We can use any RetryLane even if it's the one currently rendering
-            // since we're leaving it behind on this node.
+      var _resolvedProps =
+        workInProgress.elementType === _Component
+          ? _unresolvedProps
+          : resolveDefaultProps(_Component, _unresolvedProps);
 
-            workInProgress.lanes = SomeRetryLane;
+      return updateClassComponent(
+        current,
+        workInProgress,
+        _Component,
+        _resolvedProps,
+        renderLanes
+      );
+    }
 
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
-          }
-        } else {
-          cutOffTailIfNeeded(renderState, false);
-        } // Next we're going to render the tail.
-      } else {
-        // Append the rendered row to the child list.
-        if (!didSuspendAlready) {
-          var _suspended = findFirstSuspended(renderedTail);
+    case HostRoot:
+      return updateHostRoot(current, workInProgress, renderLanes);
 
-          if (_suspended !== null) {
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true; // Ensure we transfer the update queue to the parent so that it doesn't
-            // get lost if this row ends up dropped during a second pass.
+    case HostComponent:
+      return updateHostComponent$1(current, workInProgress, renderLanes);
+
+    case HostText:
+      return updateHostText$1();
+
+    case SuspenseComponent:
+      return updateSuspenseComponent(current, workInProgress, renderLanes);
 
-            var _newThennables = _suspended.updateQueue;
+    case HostPortal:
+      return updatePortalComponent(current, workInProgress, renderLanes);
+
+    case ForwardRef: {
+      var type = workInProgress.type;
+      var _unresolvedProps2 = workInProgress.pendingProps;
+
+      var _resolvedProps2 =
+        workInProgress.elementType === type
+          ? _unresolvedProps2
+          : resolveDefaultProps(type, _unresolvedProps2);
+
+      return updateForwardRef(
+        current,
+        workInProgress,
+        type,
+        _resolvedProps2,
+        renderLanes
+      );
+    }
 
-            if (_newThennables !== null) {
-              workInProgress.updateQueue = _newThennables;
-              workInProgress.flags |= Update;
-            }
+    case Fragment:
+      return updateFragment(current, workInProgress, renderLanes);
 
-            cutOffTailIfNeeded(renderState, true); // This might have been modified.
+    case Mode:
+      return updateMode(current, workInProgress, renderLanes);
 
-            if (
-              renderState.tail === null &&
-              renderState.tailMode === "hidden" &&
-              !renderedTail.alternate &&
-              !getIsHydrating() // We don't cut it if we're hydrating.
-            ) {
-              // We need to delete the row we just rendered.
-              // Reset the effect list to what it was before we rendered this
-              // child. The nested children have already appended themselves.
-              var lastEffect = (workInProgress.lastEffect =
-                renderState.lastEffect); // Remove any effects that were appended after this point.
+    case Profiler:
+      return updateProfiler(current, workInProgress, renderLanes);
 
-              if (lastEffect !== null) {
-                lastEffect.nextEffect = null;
-              } // We're done.
+    case ContextProvider:
+      return updateContextProvider(current, workInProgress, renderLanes);
 
-              return null;
-            }
-          } else if (
-            // The time it took to render last row is greater than the remaining
-            // time we have to render. So rendering one more row would likely
-            // exceed it.
-            now() * 2 - renderState.renderingStartTime >
-              getRenderTargetTime() &&
-            renderLanes !== OffscreenLane
-          ) {
-            // We have now passed our CPU deadline and we'll just give up further
-            // attempts to render the main content and only render fallbacks.
-            // The assumption is that this is usually faster.
-            workInProgress.flags |= DidCapture;
-            didSuspendAlready = true;
-            cutOffTailIfNeeded(renderState, false); // Since nothing actually suspended, there will nothing to ping this
-            // to get it started back up to attempt the next item. While in terms
-            // of priority this work has the same priority as this current render,
-            // it's not part of the same transition once the transition has
-            // committed. If it's sync, we still want to yield so that it can be
-            // painted. Conceptually, this is really the same as pinging.
-            // We can use any RetryLane even if it's the one currently rendering
-            // since we're leaving it behind on this node.
+    case ContextConsumer:
+      return updateContextConsumer(current, workInProgress, renderLanes);
 
-            workInProgress.lanes = SomeRetryLane;
+    case MemoComponent: {
+      var _type2 = workInProgress.type;
+      var _unresolvedProps3 = workInProgress.pendingProps; // Resolve outer props first, then resolve inner props.
 
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
-          }
-        }
+      var _resolvedProps3 = resolveDefaultProps(_type2, _unresolvedProps3);
 
-        if (renderState.isBackwards) {
-          // The effect list of the backwards tail will have been added
-          // to the end. This breaks the guarantee that life-cycles fire in
-          // sibling order but that isn't a strong guarantee promised by React.
-          // Especially since these might also just pop in during future commits.
-          // Append to the beginning of the list.
-          renderedTail.sibling = workInProgress.child;
-          workInProgress.child = renderedTail;
-        } else {
-          var previousSibling = renderState.last;
+      {
+        if (workInProgress.type !== workInProgress.elementType) {
+          var outerPropTypes = _type2.propTypes;
 
-          if (previousSibling !== null) {
-            previousSibling.sibling = renderedTail;
-          } else {
-            workInProgress.child = renderedTail;
+          if (outerPropTypes) {
+            checkPropTypes(
+              outerPropTypes,
+              _resolvedProps3, // Resolved for outer only
+              "prop",
+              getComponentNameFromType(_type2)
+            );
           }
-
-          renderState.last = renderedTail;
         }
       }
 
-      if (renderState.tail !== null) {
-        // We still have tail rows to render.
-        // Pop a row.
-        var next = renderState.tail;
-        renderState.rendering = next;
-        renderState.tail = next.sibling;
-        renderState.lastEffect = workInProgress.lastEffect;
-        renderState.renderingStartTime = now();
-        next.sibling = null; // Restore the context.
-        // TODO: We can probably just avoid popping it instead and only
-        // setting it the first time we go from not suspended to suspended.
-
-        var suspenseContext = suspenseStackCursor.current;
+      _resolvedProps3 = resolveDefaultProps(_type2.type, _resolvedProps3);
+      return updateMemoComponent(
+        current,
+        workInProgress,
+        _type2,
+        _resolvedProps3,
+        renderLanes
+      );
+    }
 
-        if (didSuspendAlready) {
-          suspenseContext = setShallowSuspenseContext(
-            suspenseContext,
-            ForceSuspenseFallback
-          );
-        } else {
-          suspenseContext = setDefaultShallowSuspenseContext(suspenseContext);
-        }
+    case SimpleMemoComponent: {
+      return updateSimpleMemoComponent(
+        current,
+        workInProgress,
+        workInProgress.type,
+        workInProgress.pendingProps,
+        renderLanes
+      );
+    }
 
-        pushSuspenseContext(workInProgress, suspenseContext); // Do a pass over the next row.
+    case IncompleteClassComponent: {
+      var _Component2 = workInProgress.type;
+      var _unresolvedProps4 = workInProgress.pendingProps;
 
-        return next;
-      }
+      var _resolvedProps4 =
+        workInProgress.elementType === _Component2
+          ? _unresolvedProps4
+          : resolveDefaultProps(_Component2, _unresolvedProps4);
 
-      return null;
+      return mountIncompleteClassComponent(
+        current,
+        workInProgress,
+        _Component2,
+        _resolvedProps4,
+        renderLanes
+      );
     }
 
-    case FundamentalComponent: {
-      break;
+    case SuspenseListComponent: {
+      return updateSuspenseListComponent(current, workInProgress, renderLanes);
     }
 
     case ScopeComponent: {
       break;
     }
 
-    case Block:
-      break;
+    case OffscreenComponent: {
+      return updateOffscreenComponent(current, workInProgress, renderLanes);
+    }
 
-    case OffscreenComponent:
     case LegacyHiddenComponent: {
-      popRenderLanes(workInProgress);
-
-      if (current !== null) {
-        var _nextState = workInProgress.memoizedState;
-        var _prevState = current.memoizedState;
-        var prevIsHidden = _prevState !== null;
-        var nextIsHidden = _nextState !== null;
-
-        if (
-          prevIsHidden !== nextIsHidden &&
-          newProps.mode !== "unstable-defer-without-hiding"
-        ) {
-          workInProgress.flags |= Update;
-        }
-      }
-
-      return null;
+      return updateLegacyHiddenComponent(current, workInProgress, renderLanes);
     }
   }
 
@@ -15910,1751 +17136,2194 @@ function unwindWork(workInProgress, renderLanes) {
       return null;
 
     case ContextProvider:
-      popProvider(workInProgress);
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
       return null;
 
     case OffscreenComponent:
     case LegacyHiddenComponent:
       popRenderLanes(workInProgress);
+
+      return null;
+
+    case CacheComponent:
+      return null;
+
+    default:
       return null;
+  }
+}
+
+function unwindInterruptedWork(interruptedWork, renderLanes) {
+  switch (interruptedWork.tag) {
+    case ClassComponent: {
+      var childContextTypes = interruptedWork.type.childContextTypes;
+
+      if (childContextTypes !== null && childContextTypes !== undefined) {
+        popContext(interruptedWork);
+      }
+
+      break;
+    }
+
+    case HostRoot: {
+      popHostContainer(interruptedWork);
+      popTopLevelContextObject(interruptedWork);
+      resetWorkInProgressVersions();
+      break;
+    }
+
+    case HostComponent: {
+      popHostContext(interruptedWork);
+      break;
+    }
+
+    case HostPortal:
+      popHostContainer(interruptedWork);
+      break;
+
+    case SuspenseComponent:
+      popSuspenseContext(interruptedWork);
+      break;
+
+    case SuspenseListComponent:
+      popSuspenseContext(interruptedWork);
+      break;
+
+    case ContextProvider:
+      var context = interruptedWork.type._context;
+      popProvider(context, interruptedWork);
+      break;
+
+    case OffscreenComponent:
+    case LegacyHiddenComponent:
+      popRenderLanes(interruptedWork);
+
+      break;
+  }
+}
+
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+} // Used during the commit phase to track the state of the Offscreen component stack.
+var PossiblyWeakSet = typeof WeakSet === "function" ? WeakSet : Set;
+var nextEffect = null; // Used for Profiling builds to track updaters.
+
+var inProgressLanes = null;
+var inProgressRoot = null;
+
+function reportUncaughtErrorInDEV(error) {
+  // Wrapping each small part of the commit phase into a guarded
+  // callback is a bit too slow (https://github.com/facebook/react/pull/21666).
+  // But we rely on it to surface errors to DEV tools like overlays
+  // (https://github.com/facebook/react/issues/21712).
+  // As a compromise, rethrow only caught errors in a guard.
+  {
+    invokeGuardedCallback(null, function() {
+      throw error;
+    });
+    clearCaughtError();
+  }
+}
+
+var callComponentWillUnmountWithTimer = function(current, instance) {
+  instance.props = current.memoizedProps;
+  instance.state = current.memoizedState;
+
+  if (current.mode & ProfileMode) {
+    try {
+      startLayoutEffectTimer();
+      instance.componentWillUnmount();
+    } finally {
+      recordLayoutEffectDuration(current);
+    }
+  } else {
+    instance.componentWillUnmount();
+  }
+}; // Capture errors so they don't interrupt mounting.
+
+function safelyCallComponentWillUnmount(
+  current,
+  nearestMountedAncestor,
+  instance
+) {
+  try {
+    callComponentWillUnmountWithTimer(current, instance);
+  } catch (error) {
+    reportUncaughtErrorInDEV(error);
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
+  }
+} // Capture errors so they don't interrupt mounting.
+
+function safelyDetachRef(current, nearestMountedAncestor) {
+  var ref = current.ref;
+
+  if (ref !== null) {
+    if (typeof ref === "function") {
+      try {
+        if (
+          enableProfilerTimer &&
+          enableProfilerCommitHooks &&
+          current.mode & ProfileMode
+        ) {
+          try {
+            startLayoutEffectTimer();
+            ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        } else {
+          ref(null);
+        }
+      } catch (error) {
+        reportUncaughtErrorInDEV(error);
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
+      }
+    } else {
+      ref.current = null;
+    }
+  }
+}
 
-    default:
-      return null;
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
+  try {
+    destroy();
+  } catch (error) {
+    reportUncaughtErrorInDEV(error);
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
   }
 }
 
-function unwindInterruptedWork(interruptedWork) {
-  switch (interruptedWork.tag) {
-    case ClassComponent: {
-      var childContextTypes = interruptedWork.type.childContextTypes;
+var focusedInstanceHandle = null;
+var shouldFireAfterActiveInstanceBlur = false;
+function commitBeforeMutationEffects(root, firstChild) {
+  focusedInstanceHandle = prepareForCommit(root.containerInfo);
+  nextEffect = firstChild;
+  commitBeforeMutationEffects_begin(); // We no longer need to track the active instance fiber
 
-      if (childContextTypes !== null && childContextTypes !== undefined) {
-        popContext(interruptedWork);
-      }
+  var shouldFire = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = false;
+  focusedInstanceHandle = null;
+  return shouldFire;
+}
 
-      break;
-    }
+function commitBeforeMutationEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // This phase is only used for beforeActiveInstanceBlur.
 
-    case HostRoot: {
-      popHostContainer(interruptedWork);
-      popTopLevelContextObject(interruptedWork);
-      resetWorkInProgressVersions();
-      break;
-    }
+    var child = fiber.child;
 
-    case HostComponent: {
-      popHostContext(interruptedWork);
-      break;
+    if (
+      (fiber.subtreeFlags & BeforeMutationMask) !== NoFlags &&
+      child !== null
+    ) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitBeforeMutationEffects_complete();
     }
+  }
+}
 
-    case HostPortal:
-      popHostContainer(interruptedWork);
-      break;
+function commitBeforeMutationEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
 
-    case SuspenseComponent:
-      popSuspenseContext(interruptedWork);
-      break;
+    try {
+      commitBeforeMutationEffectsOnFiber(fiber);
+    } catch (error) {
+      reportUncaughtErrorInDEV(error);
+      captureCommitPhaseError(fiber, fiber.return, error);
+    }
 
-    case SuspenseListComponent:
-      popSuspenseContext(interruptedWork);
-      break;
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
 
-    case ContextProvider:
-      popProvider(interruptedWork);
-      break;
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
 
-    case OffscreenComponent:
-    case LegacyHiddenComponent:
-      popRenderLanes(interruptedWork);
-      break;
+    nextEffect = fiber.return;
   }
 }
 
-function createCapturedValue(value, source) {
-  // If the value is an error, call this function immediately after it is thrown
-  // so the stack is accurate.
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
-}
+function commitBeforeMutationEffectsOnFiber(finishedWork) {
+  var current = finishedWork.alternate;
+  var flags = finishedWork.flags;
 
-if (
-  !(
-    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
-    "function"
-  )
-) {
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-}
+  if ((flags & Snapshot) !== NoFlags) {
+    setCurrentFiber(finishedWork);
 
-function showErrorDialog(boundary, errorInfo) {
-  var capturedError = {
-    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
-    error: errorInfo.value,
-    errorBoundary:
-      boundary !== null && boundary.tag === ClassComponent
-        ? boundary.stateNode
-        : null
-  };
-  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
-    capturedError
-  );
-}
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        break;
+      }
 
-function logCapturedError(boundary, errorInfo) {
-  try {
-    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
-    // This enables renderers like ReactNative to better manage redbox behavior.
+      case ClassComponent: {
+        if (current !== null) {
+          var prevProps = current.memoizedProps;
+          var prevState = current.memoizedState;
+          var instance = finishedWork.stateNode; // We could update instance props and state here,
+          // but instead we rely on them being set during last render.
+          // TODO: revisit this when we implement resuming.
 
-    if (logError === false) {
-      return;
-    }
+          {
+            if (
+              finishedWork.type === finishedWork.elementType &&
+              !didWarnAboutReassigningProps
+            ) {
+              if (instance.props !== finishedWork.memoizedProps) {
+                error(
+                  "Expected %s props to match memoized props before " +
+                    "getSnapshotBeforeUpdate. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.props`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
 
-    var error = errorInfo.value;
+              if (instance.state !== finishedWork.memoizedState) {
+                error(
+                  "Expected %s state to match memoized state before " +
+                    "getSnapshotBeforeUpdate. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.state`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+            }
+          }
 
-    if (true) {
-      var source = errorInfo.source;
-      var stack = errorInfo.stack;
-      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
-      // `preventDefault()` in window `error` handler.
-      // We record this information as an expando on the error.
+          var snapshot = instance.getSnapshotBeforeUpdate(
+            finishedWork.elementType === finishedWork.type
+              ? prevProps
+              : resolveDefaultProps(finishedWork.type, prevProps),
+            prevState
+          );
 
-      if (error != null && error._suppressLogging) {
-        if (boundary.tag === ClassComponent) {
-          // The error is recoverable and was silenced.
-          // Ignore it and don't print the stack addendum.
-          // This is handy for testing error boundaries without noise.
-          return;
-        } // The error is fatal. Since the silencing might have
-        // been accidental, we'll surface it anyway.
-        // However, the browser would have silenced the original error
-        // so we'll print it first, and then print the stack addendum.
+          {
+            var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
 
-        console["error"](error); // Don't transform to our wrapper
-        // For a more detailed description of this block, see:
-        // https://github.com/facebook/react/pull/13384
+            if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
+              didWarnSet.add(finishedWork.type);
+
+              error(
+                "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                  "must be returned. You have returned undefined.",
+                getComponentNameFromFiber(finishedWork)
+              );
+            }
+          }
+
+          instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+        }
+
+        break;
       }
 
-      var componentName = source ? getComponentName(source.type) : null;
-      var componentNameMessage = componentName
-        ? "The above error occurred in the <" + componentName + "> component:"
-        : "The above error occurred in one of your React components:";
-      var errorBoundaryMessage;
-      var errorBoundaryName = getComponentName(boundary.type);
+      case HostRoot: {
+        {
+          var root = finishedWork.stateNode;
+          clearContainer(root.containerInfo);
+        }
 
-      if (errorBoundaryName) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
+        break;
       }
 
-      var combinedMessage =
-        componentNameMessage +
-        "\n" +
-        componentStack +
-        "\n\n" +
-        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
-      // We don't include the original error message and JS stack because the browser
-      // has already printed it. Even if the application swallows the error, it is still
-      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+      case IncompleteClassComponent:
+        // Nothing to do for these component types
+        break;
 
-      console["error"](combinedMessage); // Don't transform to our wrapper
-    } else {
-      // In production, we print the error directly.
-      // This will include the message, the JS stack, and anything the browser wants to show.
-      // We pass the error object instead of custom message so that the browser displays the error natively.
-      console["error"](error); // Don't transform to our wrapper
+      default: {
+        {
+          throw Error(
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+        }
+      }
     }
-  } catch (e) {
-    // This method must not throw, or React internal state will get messed up.
-    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
-    // we want to report this error outside of the normal stack as a last resort.
-    // https://github.com/facebook/react/issues/13188
-    setTimeout(function() {
-      throw e;
-    });
+
+    resetCurrentFiber();
   }
 }
 
-var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
-
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
-
-  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
-  // being called "element".
-
-  update.payload = {
-    element: null
-  };
-  var error = errorInfo.value;
-
-  update.callback = function() {
-    onUncaughtError(error);
-    logCapturedError(fiber, errorInfo);
-  };
-
-  return update;
-}
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
+  var updateQueue = finishedWork.updateQueue;
+  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
 
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane);
-  update.tag = CaptureUpdate;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if (lastEffect !== null) {
+    var firstEffect = lastEffect.next;
+    var effect = firstEffect;
 
-  if (typeof getDerivedStateFromError === "function") {
-    var error$1 = errorInfo.value;
+    do {
+      if ((effect.tag & flags) === flags) {
+        // Unmount
+        var destroy = effect.destroy;
+        effect.destroy = undefined;
 
-    update.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error$1);
-    };
+        if (destroy !== undefined) {
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
+        }
+      }
+
+      effect = effect.next;
+    } while (effect !== firstEffect);
   }
+}
 
-  var inst = fiber.stateNode;
+function commitHookEffectListMount(tag, finishedWork) {
+  var updateQueue = finishedWork.updateQueue;
+  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
 
-  if (inst !== null && typeof inst.componentDidCatch === "function") {
-    update.callback = function callback() {
-      {
-        markFailedErrorBoundaryForHotReloading(fiber);
-      }
+  if (lastEffect !== null) {
+    var firstEffect = lastEffect.next;
+    var effect = firstEffect;
 
-      if (typeof getDerivedStateFromError !== "function") {
-        // To preserve the preexisting retry behavior of error boundaries,
-        // we keep track of which ones already failed during this batch.
-        // This gets reset before we yield back to the browser.
-        // TODO: Warn in strict mode if getDerivedStateFromError is
-        // not defined.
-        markLegacyErrorBoundaryAsFailed(this); // Only log here if componentDidCatch is the only error boundary method defined
+    do {
+      if ((effect.tag & tag) === tag) {
+        // Mount
+        var create = effect.create;
+        effect.destroy = create();
 
-        logCapturedError(fiber, errorInfo);
-      }
+        {
+          var destroy = effect.destroy;
 
-      var error$1 = errorInfo.value;
-      var stack = errorInfo.stack;
-      this.componentDidCatch(error$1, {
-        componentStack: stack !== null ? stack : ""
-      });
+          if (destroy !== undefined && typeof destroy !== "function") {
+            var addendum = void 0;
+
+            if (destroy === null) {
+              addendum =
+                " You returned null. If your effect does not require clean " +
+                "up, return undefined (or nothing).";
+            } else if (typeof destroy.then === "function") {
+              addendum =
+                "\n\nIt looks like you wrote useEffect(async () => ...) or returned a Promise. " +
+                "Instead, write the async function inside your effect " +
+                "and call it immediately:\n\n" +
+                "useEffect(() => {\n" +
+                "  async function fetchData() {\n" +
+                "    // You can await here\n" +
+                "    const response = await MyAPI.getData(someId);\n" +
+                "    // ...\n" +
+                "  }\n" +
+                "  fetchData();\n" +
+                "}, [someId]); // Or [] if effect doesn't need props or state\n\n" +
+                "Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching";
+            } else {
+              addendum = " You returned: " + destroy;
+            }
 
-      {
-        if (typeof getDerivedStateFromError !== "function") {
-          // If componentDidCatch is the only error boundary method defined,
-          // then it needs to call setState to recover from errors.
-          // If no state update is scheduled then the boundary will swallow the error.
-          if (!includesSomeLane(fiber.lanes, SyncLane)) {
             error(
-              "%s: Error boundaries should implement getDerivedStateFromError(). " +
-                "In that method, return a state update to display an error message or fallback UI.",
-              getComponentName(fiber.type) || "Unknown"
+              "An effect function must not return anything besides a function, " +
+                "which is used for clean-up.%s",
+              addendum
             );
           }
         }
       }
-    };
-  } else {
-    update.callback = function() {
-      markFailedErrorBoundaryForHotReloading(fiber);
-    };
-  }
 
-  return update;
+      effect = effect.next;
+    } while (effect !== firstEffect);
+  }
 }
 
-function attachPingListener(root, wakeable, lanes) {
-  // Attach a listener to the promise to "ping" the root and retry. But only if
-  // one does not already exist for the lanes we're currently rendering (which
-  // acts like a "thread ID" here).
-  var pingCache = root.pingCache;
-  var threadIDs;
+function commitPassiveEffectDurations(finishedRoot, finishedWork) {
+  {
+    // Only Profilers with work in their subtree will have an Update effect scheduled.
+    if ((finishedWork.flags & Update) !== NoFlags) {
+      switch (finishedWork.tag) {
+        case Profiler: {
+          var passiveEffectDuration =
+            finishedWork.stateNode.passiveEffectDuration;
+          var _finishedWork$memoize = finishedWork.memoizedProps,
+            id = _finishedWork$memoize.id,
+            onPostCommit = _finishedWork$memoize.onPostCommit; // This value will still reflect the previous commit phase.
+          // It does not get reset until the start of the next commit phase.
+
+          var commitTime = getCommitTime();
+          var phase = finishedWork.alternate === null ? "mount" : "update";
 
-  if (pingCache === null) {
-    pingCache = root.pingCache = new PossiblyWeakMap$1();
-    threadIDs = new Set();
-    pingCache.set(wakeable, threadIDs);
-  } else {
-    threadIDs = pingCache.get(wakeable);
+          {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
 
-    if (threadIDs === undefined) {
-      threadIDs = new Set();
-      pingCache.set(wakeable, threadIDs);
-    }
-  }
+          if (typeof onPostCommit === "function") {
+            onPostCommit(id, phase, passiveEffectDuration, commitTime);
+          } // Bubble times to the next nearest ancestor Profiler.
+          // After we process that Profiler, we'll bubble further up.
 
-  if (!threadIDs.has(lanes)) {
-    // Memoize using the thread ID to prevent redundant listeners.
-    threadIDs.add(lanes);
-    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
-    wakeable.then(ping, ping);
+          var parentFiber = finishedWork.return;
+
+          outer: while (parentFiber !== null) {
+            switch (parentFiber.tag) {
+              case HostRoot:
+                var root = parentFiber.stateNode;
+                root.passiveEffectDuration += passiveEffectDuration;
+                break outer;
+
+              case Profiler:
+                var parentStateNode = parentFiber.stateNode;
+                parentStateNode.passiveEffectDuration += passiveEffectDuration;
+                break outer;
+            }
+
+            parentFiber = parentFiber.return;
+          }
+
+          break;
+        }
+      }
+    }
   }
 }
 
-function throwException(
-  root,
-  returnFiber,
-  sourceFiber,
-  value,
-  rootRenderLanes
+function commitLayoutEffectOnFiber(
+  finishedRoot,
+  current,
+  finishedWork,
+  committedLanes
 ) {
-  // The source fiber did not complete.
-  sourceFiber.flags |= Incomplete; // Its effect list is no longer valid.
-
-  sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+  if ((finishedWork.flags & LayoutMask) !== NoFlags) {
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        {
+          // At this point layout effects have already been destroyed (during mutation phase).
+          // This is done to prevent sibling component effects from interfering with each other,
+          // e.g. a destroy function in one component should never override a ref set
+          // by a create function in another component during the same commit.
+          if (finishedWork.mode & ProfileMode) {
+            try {
+              startLayoutEffectTimer();
+              commitHookEffectListMount(Layout | HasEffect, finishedWork);
+            } finally {
+              recordLayoutEffectDuration(finishedWork);
+            }
+          } else {
+            commitHookEffectListMount(Layout | HasEffect, finishedWork);
+          }
+        }
 
-  if (
-    value !== null &&
-    typeof value === "object" &&
-    typeof value.then === "function"
-  ) {
-    // This is a wakeable.
-    var wakeable = value;
+        break;
+      }
 
-    if ((sourceFiber.mode & BlockingMode) === NoMode) {
-      // Reset the memoizedState to what it was before we attempted
-      // to render it.
-      var currentSource = sourceFiber.alternate;
+      case ClassComponent: {
+        var instance = finishedWork.stateNode;
 
-      if (currentSource) {
-        sourceFiber.updateQueue = currentSource.updateQueue;
-        sourceFiber.memoizedState = currentSource.memoizedState;
-        sourceFiber.lanes = currentSource.lanes;
-      } else {
-        sourceFiber.updateQueue = null;
-        sourceFiber.memoizedState = null;
-      }
-    }
+        if (finishedWork.flags & Update) {
+          {
+            if (current === null) {
+              // We could update instance props and state here,
+              // but instead we rely on them being set during last render.
+              // TODO: revisit this when we implement resuming.
+              {
+                if (
+                  finishedWork.type === finishedWork.elementType &&
+                  !didWarnAboutReassigningProps
+                ) {
+                  if (instance.props !== finishedWork.memoizedProps) {
+                    error(
+                      "Expected %s props to match memoized props before " +
+                        "componentDidMount. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.props`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
 
-    var hasInvisibleParentBoundary = hasSuspenseContext(
-      suspenseStackCursor.current,
-      InvisibleParentSuspenseContext
-    ); // Schedule the nearest Suspense to re-render the timed out view.
+                  if (instance.state !== finishedWork.memoizedState) {
+                    error(
+                      "Expected %s state to match memoized state before " +
+                        "componentDidMount. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.state`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
+                }
+              }
 
-    var _workInProgress = returnFiber;
+              if (finishedWork.mode & ProfileMode) {
+                try {
+                  startLayoutEffectTimer();
+                  instance.componentDidMount();
+                } finally {
+                  recordLayoutEffectDuration(finishedWork);
+                }
+              } else {
+                instance.componentDidMount();
+              }
+            } else {
+              var prevProps =
+                finishedWork.elementType === finishedWork.type
+                  ? current.memoizedProps
+                  : resolveDefaultProps(
+                      finishedWork.type,
+                      current.memoizedProps
+                    );
+              var prevState = current.memoizedState; // We could update instance props and state here,
+              // but instead we rely on them being set during last render.
+              // TODO: revisit this when we implement resuming.
 
-    do {
-      if (
-        _workInProgress.tag === SuspenseComponent &&
-        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
-      ) {
-        // Found the nearest boundary.
-        // Stash the promise on the boundary fiber. If the boundary times out, we'll
-        // attach another listener to flip the boundary back to its normal state.
-        var wakeables = _workInProgress.updateQueue;
+              {
+                if (
+                  finishedWork.type === finishedWork.elementType &&
+                  !didWarnAboutReassigningProps
+                ) {
+                  if (instance.props !== finishedWork.memoizedProps) {
+                    error(
+                      "Expected %s props to match memoized props before " +
+                        "componentDidUpdate. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.props`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
 
-        if (wakeables === null) {
-          var updateQueue = new Set();
-          updateQueue.add(wakeable);
-          _workInProgress.updateQueue = updateQueue;
-        } else {
-          wakeables.add(wakeable);
-        } // If the boundary is outside of blocking mode, we should *not*
-        // suspend the commit. Pretend as if the suspended component rendered
-        // null and keep rendering. In the commit phase, we'll schedule a
-        // subsequent synchronous update to re-render the Suspense.
-        //
-        // Note: It doesn't matter whether the component that suspended was
-        // inside a blocking mode tree. If the Suspense is outside of it, we
-        // should *not* suspend the commit.
+                  if (instance.state !== finishedWork.memoizedState) {
+                    error(
+                      "Expected %s state to match memoized state before " +
+                        "componentDidUpdate. " +
+                        "This might either be because of a bug in React, or because " +
+                        "a component reassigns its own `this.state`. " +
+                        "Please file an issue.",
+                      getComponentNameFromFiber(finishedWork) || "instance"
+                    );
+                  }
+                }
+              }
 
-        if ((_workInProgress.mode & BlockingMode) === NoMode) {
-          _workInProgress.flags |= DidCapture;
-          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
-          // But we shouldn't call any lifecycle methods or callbacks. Remove
-          // all lifecycle effect tags.
+              if (finishedWork.mode & ProfileMode) {
+                try {
+                  startLayoutEffectTimer();
+                  instance.componentDidUpdate(
+                    prevProps,
+                    prevState,
+                    instance.__reactInternalSnapshotBeforeUpdate
+                  );
+                } finally {
+                  recordLayoutEffectDuration(finishedWork);
+                }
+              } else {
+                instance.componentDidUpdate(
+                  prevProps,
+                  prevState,
+                  instance.__reactInternalSnapshotBeforeUpdate
+                );
+              }
+            }
+          }
+        } // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
 
-          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+        var updateQueue = finishedWork.updateQueue;
 
-          if (sourceFiber.tag === ClassComponent) {
-            var currentSourceFiber = sourceFiber.alternate;
+        if (updateQueue !== null) {
+          {
+            if (
+              finishedWork.type === finishedWork.elementType &&
+              !didWarnAboutReassigningProps
+            ) {
+              if (instance.props !== finishedWork.memoizedProps) {
+                error(
+                  "Expected %s props to match memoized props before " +
+                    "processing the update queue. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.props`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
 
-            if (currentSourceFiber === null) {
-              // This is a new mount. Change the tag so it's not mistaken for a
-              // completed class component. For example, we should not call
-              // componentWillUnmount if it is deleted.
-              sourceFiber.tag = IncompleteClassComponent;
-            } else {
-              // When we try rendering again, we should not reuse the current fiber,
-              // since it's known to be in an inconsistent state. Use a force update to
-              // prevent a bail out.
-              var update = createUpdate(NoTimestamp, SyncLane);
-              update.tag = ForceUpdate;
-              enqueueUpdate(sourceFiber, update);
+              if (instance.state !== finishedWork.memoizedState) {
+                error(
+                  "Expected %s state to match memoized state before " +
+                    "processing the update queue. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.state`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
             }
-          } // The source fiber did not complete. Mark it with Sync priority to
-          // indicate that it still has pending work.
+          } // We could update instance props and state here,
+          // but instead we rely on them being set during last render.
+          // TODO: revisit this when we implement resuming.
 
-          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
+          commitUpdateQueue(finishedWork, updateQueue, instance);
+        }
 
-          return;
-        } // Confirmed that the boundary is in a concurrent mode tree. Continue
-        // with the normal suspend path.
-        //
-        // After this we'll use a set of heuristics to determine whether this
-        // render pass will run to completion or restart or "suspend" the commit.
-        // The actual logic for this is spread out in different places.
-        //
-        // This first principle is that if we're going to suspend when we complete
-        // a root, then we should also restart if we get an update or ping that
-        // might unsuspend it, and vice versa. The only reason to suspend is
-        // because you think you might want to restart before committing. However,
-        // it doesn't make sense to restart only while in the period we're suspended.
-        //
-        // Restarting too aggressively is also not good because it starves out any
-        // intermediate loading state. So we use heuristics to determine when.
-        // Suspense Heuristics
-        //
-        // If nothing threw a Promise or all the same fallbacks are already showing,
-        // then don't suspend/restart.
-        //
-        // If this is an initial render of a new tree of Suspense boundaries and
-        // those trigger a fallback, then don't suspend/restart. We want to ensure
-        // that we can show the initial loading state as quickly as possible.
-        //
-        // If we hit a "Delayed" case, such as when we'd switch from content back into
-        // a fallback, then we should always suspend/restart. Transitions apply
-        // to this case. If none is defined, JND is used instead.
-        //
-        // If we're already showing a fallback and it gets "retried", allowing us to show
-        // another level, but there's still an inner boundary that would show a fallback,
-        // then we suspend/restart for 500ms since the last time we showed a fallback
-        // anywhere in the tree. This effectively throttles progressive loading into a
-        // consistent train of commits. This also gives us an opportunity to restart to
-        // get to the completed state slightly earlier.
-        //
-        // If there's ambiguity due to batching it's resolved in preference of:
-        // 1) "delayed", 2) "initial render", 3) "retry".
-        //
-        // We want to ensure that a "busy" state doesn't get force committed. We want to
-        // ensure that new initial loading states can commit as soon as possible.
+        break;
+      }
 
-        attachPingListener(root, wakeable, rootRenderLanes);
-        _workInProgress.flags |= ShouldCapture;
-        _workInProgress.lanes = rootRenderLanes;
-        return;
-      } // This boundary already captured during this render. Continue to the next
-      // boundary.
+      case HostRoot: {
+        // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
+        var _updateQueue = finishedWork.updateQueue;
+
+        if (_updateQueue !== null) {
+          var _instance = null;
+
+          if (finishedWork.child !== null) {
+            switch (finishedWork.child.tag) {
+              case HostComponent:
+                _instance = getPublicInstance(finishedWork.child.stateNode);
+                break;
+
+              case ClassComponent:
+                _instance = finishedWork.child.stateNode;
+                break;
+            }
+          }
 
-      _workInProgress = _workInProgress.return;
-    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
-    // TODO: Use invariant so the message is stripped in prod?
+          commitUpdateQueue(finishedWork, _updateQueue, _instance);
+        }
 
-    value = new Error(
-      (getComponentName(sourceFiber.type) || "A React component") +
-        " suspended while rendering, but no fallback UI was specified.\n" +
-        "\n" +
-        "Add a <Suspense fallback=...> component higher in the tree to " +
-        "provide a loading indicator or placeholder to display."
-    );
-  } // We didn't find a boundary that could handle this type of exception. Start
-  // over and traverse parent path again, this time treating the exception
-  // as an error.
+        break;
+      }
 
-  renderDidError();
-  value = createCapturedValue(value, sourceFiber);
-  var workInProgress = returnFiber;
+      case HostComponent: {
+        var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
+        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
+        // These effects should only be committed when components are first mounted,
+        // aka when there is no current/alternate.
 
-  do {
-    switch (workInProgress.tag) {
-      case HostRoot: {
-        var _errorInfo = value;
-        workInProgress.flags |= ShouldCapture;
-        var lane = pickArbitraryLane(rootRenderLanes);
-        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
+        if (current === null && finishedWork.flags & Update) {
+          var type = finishedWork.type;
+          var props = finishedWork.memoizedProps;
+        }
 
-        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
+        break;
+      }
 
-        enqueueCapturedUpdate(workInProgress, _update);
-        return;
+      case HostText: {
+        // We have no life-cycles associated with text.
+        break;
       }
 
-      case ClassComponent:
-        // Capture and retry
-        var errorInfo = value;
-        var ctor = workInProgress.type;
-        var instance = workInProgress.stateNode;
+      case HostPortal: {
+        // We have no life-cycles associated with portals.
+        break;
+      }
 
-        if (
-          (workInProgress.flags & DidCapture) === NoFlags &&
-          (typeof ctor.getDerivedStateFromError === "function" ||
-            (instance !== null &&
-              typeof instance.componentDidCatch === "function" &&
-              !isAlreadyFailedLegacyErrorBoundary(instance)))
-        ) {
-          workInProgress.flags |= ShouldCapture;
+      case Profiler: {
+        {
+          var _finishedWork$memoize2 = finishedWork.memoizedProps,
+            onCommit = _finishedWork$memoize2.onCommit,
+            onRender = _finishedWork$memoize2.onRender;
+          var effectDuration = finishedWork.stateNode.effectDuration;
+          var commitTime = getCommitTime();
+          var phase = current === null ? "mount" : "update";
 
-          var _lane = pickArbitraryLane(rootRenderLanes);
+          {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
 
-          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
+          if (typeof onRender === "function") {
+            onRender(
+              finishedWork.memoizedProps.id,
+              phase,
+              finishedWork.actualDuration,
+              finishedWork.treeBaseDuration,
+              finishedWork.actualStartTime,
+              commitTime
+            );
+          }
 
-          var _update2 = createClassErrorUpdate(
-            workInProgress,
-            errorInfo,
-            _lane
-          );
+          {
+            if (typeof onCommit === "function") {
+              onCommit(
+                finishedWork.memoizedProps.id,
+                phase,
+                effectDuration,
+                commitTime
+              );
+            } // Schedule a passive effect for this Profiler to call onPostCommit hooks.
+            // This effect should be scheduled even if there is no onPostCommit callback for this Profiler,
+            // because the effect is also where times bubble to parent Profilers.
+
+            enqueuePendingPassiveProfilerEffect(finishedWork); // Propagate layout effect durations to the next nearest Profiler ancestor.
+            // Do not reset these values until the next render so DevTools has a chance to read them first.
+
+            var parentFiber = finishedWork.return;
+
+            outer: while (parentFiber !== null) {
+              switch (parentFiber.tag) {
+                case HostRoot:
+                  var root = parentFiber.stateNode;
+                  root.effectDuration += effectDuration;
+                  break outer;
+
+                case Profiler:
+                  var parentStateNode = parentFiber.stateNode;
+                  parentStateNode.effectDuration += effectDuration;
+                  break outer;
+              }
 
-          enqueueCapturedUpdate(workInProgress, _update2);
-          return;
+              parentFiber = parentFiber.return;
+            }
+          }
         }
 
         break;
+      }
+
+      case SuspenseComponent: {
+        break;
+      }
+
+      case SuspenseListComponent:
+      case IncompleteClassComponent:
+      case ScopeComponent:
+      case OffscreenComponent:
+      case LegacyHiddenComponent:
+        break;
+
+      default: {
+        throw Error(
+          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
     }
+  }
 
-    workInProgress = workInProgress.return;
-  } while (workInProgress !== null);
+  {
+    {
+      if (finishedWork.flags & Ref) {
+        commitAttachRef(finishedWork);
+      }
+    }
+  }
 }
 
-var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+function hideOrUnhideAllChildren(finishedWork, isHidden) {
+  // Only hide or unhide the top-most host nodes.
+  var hostSubtreeRoot = null;
 
-{
-  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
-}
+  {
+    // We only have the top Fiber that was inserted but we need to recurse down its
+    // children to find all the terminal nodes.
+    var node = finishedWork;
 
-var PossiblyWeakSet = typeof WeakSet === "function" ? WeakSet : Set;
+    while (true) {
+      if (node.tag === HostComponent) {
+        if (hostSubtreeRoot === null) {
+          hostSubtreeRoot = node;
+          var instance = node.stateNode;
 
-var callComponentWillUnmountWithTimer = function(current, instance) {
-  instance.props = current.memoizedProps;
-  instance.state = current.memoizedState;
+          if (isHidden) {
+            hideInstance(instance);
+          } else {
+            unhideInstance(node.stateNode, node.memoizedProps);
+          }
+        }
+      } else if (node.tag === HostText) {
+        if (hostSubtreeRoot === null) {
+          var _instance3 = node.stateNode;
 
-  {
-    instance.componentWillUnmount();
-  }
-}; // Capture errors so they don't interrupt unmounting.
+          if (isHidden) {
+            hideTextInstance();
+          } else {
+            unhideTextInstance(_instance3, node.memoizedProps);
+          }
+        }
+      } else if (
+        (node.tag === OffscreenComponent ||
+          node.tag === LegacyHiddenComponent) &&
+        node.memoizedState !== null &&
+        node !== finishedWork
+      );
+      else if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      }
 
-function safelyCallComponentWillUnmount(current, instance) {
-  {
-    invokeGuardedCallback(
-      null,
-      callComponentWillUnmountWithTimer,
-      null,
-      current,
-      instance
-    );
+      if (node === finishedWork) {
+        return;
+      }
+
+      while (node.sibling === null) {
+        if (node.return === null || node.return === finishedWork) {
+          return;
+        }
+
+        if (hostSubtreeRoot === node) {
+          hostSubtreeRoot = null;
+        }
+
+        node = node.return;
+      }
+
+      if (hostSubtreeRoot === node) {
+        hostSubtreeRoot = null;
+      }
 
-    if (hasCaughtError()) {
-      var unmountError = clearCaughtError();
-      captureCommitPhaseError(current, unmountError);
+      node.sibling.return = node.return;
+      node = node.sibling;
     }
   }
 }
 
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function commitAttachRef(finishedWork) {
+  var ref = finishedWork.ref;
 
   if (ref !== null) {
-    if (typeof ref === "function") {
-      {
-        {
-          invokeGuardedCallback(null, ref, null, null);
-        }
+    var instance = finishedWork.stateNode;
+    var instanceToUse;
+
+    switch (finishedWork.tag) {
+      case HostComponent:
+        instanceToUse = getPublicInstance(instance);
+        break;
 
-        if (hasCaughtError()) {
-          var refError = clearCaughtError();
-          captureCommitPhaseError(current, refError);
+      default:
+        instanceToUse = instance;
+    } // Moved outside to ensure DCE works with this flag
+
+    if (typeof ref === "function") {
+      if (finishedWork.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          ref(instanceToUse);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
         }
+      } else {
+        ref(instanceToUse);
       }
     } else {
-      ref.current = null;
+      {
+        if (!ref.hasOwnProperty("current")) {
+          error(
+            "Unexpected ref object provided for %s. " +
+              "Use either a ref-setter function or React.createRef().",
+            getComponentNameFromFiber(finishedWork)
+          );
+        }
+      }
+
+      ref.current = instanceToUse;
     }
   }
 }
 
-function safelyCallDestroy(current, destroy) {
-  {
-    invokeGuardedCallback(null, destroy, null);
+function commitDetachRef(current) {
+  var currentRef = current.ref;
 
-    if (hasCaughtError()) {
-      var error = clearCaughtError();
-      captureCommitPhaseError(current, error);
+  if (currentRef !== null) {
+    if (typeof currentRef === "function") {
+      if (current.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          currentRef(null);
+        } finally {
+          recordLayoutEffectDuration(current);
+        }
+      } else {
+        currentRef(null);
+      }
+    } else {
+      currentRef.current = null;
     }
   }
-}
+} // User-originating errors (lifecycles and refs) should not interrupt
+// deletion, so don't let them throw. Host-originating errors should
+// interrupt deletion, so it's okay
 
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
+function commitUnmount(finishedRoot, current, nearestMountedAncestor) {
+  onCommitUnmount(current);
+
+  switch (current.tag) {
     case FunctionComponent:
     case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
-      return;
-    }
+    case MemoComponent:
+    case SimpleMemoComponent: {
+      var updateQueue = current.updateQueue;
 
-    case ClassComponent: {
-      if (finishedWork.flags & Snapshot) {
-        if (current !== null) {
-          var prevProps = current.memoizedProps;
-          var prevState = current.memoizedState;
-          var instance = finishedWork.stateNode; // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
+      if (updateQueue !== null) {
+        var lastEffect = updateQueue.lastEffect;
 
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "getSnapshotBeforeUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+        if (lastEffect !== null) {
+          var firstEffect = lastEffect.next;
+          var effect = firstEffect;
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "getSnapshotBeforeUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
+          do {
+            var _effect = effect,
+              destroy = _effect.destroy,
+              tag = _effect.tag;
+
+            if (destroy !== undefined) {
+              if ((tag & Layout) !== NoFlags$1) {
+                if (current.mode & ProfileMode) {
+                  startLayoutEffectTimer();
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
+                  recordLayoutEffectDuration(current);
+                } else {
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
+                }
               }
             }
-          }
-
-          var snapshot = instance.getSnapshotBeforeUpdate(
-            finishedWork.elementType === finishedWork.type
-              ? prevProps
-              : resolveDefaultProps(finishedWork.type, prevProps),
-            prevState
-          );
 
-          {
-            var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+            effect = effect.next;
+          } while (effect !== firstEffect);
+        }
+      }
 
-            if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
-              didWarnSet.add(finishedWork.type);
+      return;
+    }
 
-              error(
-                "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
-                  "must be returned. You have returned undefined.",
-                getComponentName(finishedWork.type)
-              );
-            }
-          }
+    case ClassComponent: {
+      safelyDetachRef(current, nearestMountedAncestor);
+      var instance = current.stateNode;
 
-          instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-        }
+      if (typeof instance.componentWillUnmount === "function") {
+        safelyCallComponentWillUnmount(
+          current,
+          nearestMountedAncestor,
+          instance
+        );
       }
 
       return;
     }
 
-    case HostRoot: {
+    case HostComponent: {
+      safelyDetachRef(current, nearestMountedAncestor);
+      return;
+    }
+
+    case HostPortal: {
+      // TODO: this is recursive.
+      // We are also not using this parent because
+      // the portal will get pushed immediately.
       {
-        if (finishedWork.flags & Snapshot) {
-          var root = finishedWork.stateNode;
-          clearContainer(root.containerInfo);
-        }
+        unmountHostComponents(finishedRoot, current, nearestMountedAncestor);
       }
 
       return;
     }
 
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case IncompleteClassComponent:
-      // Nothing to do for these component types
+    case DehydratedFragment: {
       return;
-  }
+    }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    case ScopeComponent: {
+      return;
+    }
   }
 }
 
-function commitHookEffectListUnmount(tag, finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function commitNestedUnmounts(finishedRoot, root, nearestMountedAncestor) {
+  // While we're inside a removed host node we don't want to call
+  // removeChild on the inner nodes because they're removed by the top
+  // call anyway. We also want to call componentWillUnmount on all
+  // composites before this host node is removed from the tree. Therefore
+  // we do an inner loop while we're still inside the host node.
+  var node = root;
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+  while (true) {
+    commitUnmount(finishedRoot, node, nearestMountedAncestor); // Visit children because they may contain more composite or host nodes.
+    // Skip portals because commitUnmount() currently visits them recursively.
 
-    do {
-      if ((effect.tag & tag) === tag) {
-        // Unmount
-        var destroy = effect.destroy;
-        effect.destroy = undefined;
+    if (
+      node.child !== null && // If we use mutation we drill down into portals using commitUnmount above.
+      // If we don't use mutation we drill down into portals here instead.
+      node.tag !== HostPortal
+    ) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
 
-        if (destroy !== undefined) {
-          destroy();
-        }
+    if (node === root) {
+      return;
+    }
+
+    while (node.sibling === null) {
+      if (node.return === null || node.return === root) {
+        return;
       }
 
-      effect = effect.next;
-    } while (effect !== firstEffect);
+      node = node.return;
+    }
+
+    node.sibling.return = node.return;
+    node = node.sibling;
   }
 }
 
-function commitHookEffectListMount(tag, finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function detachFiberMutation(fiber) {
+  // Cut off the return pointer to disconnect it from the tree.
+  // This enables us to detect and warn against state updates on an unmounted component.
+  // It also prevents events from bubbling from within disconnected components.
+  //
+  // Ideally, we should also clear the child pointer of the parent alternate to let this
+  // get GC:ed but we don't know which for sure which parent is the current
+  // one so we'll settle for GC:ing the subtree of this child.
+  // This child itself will be GC:ed when the parent updates the next time.
+  //
+  // Note that we can't clear child or sibling pointers yet.
+  // They're needed for passive effects and for findDOMNode.
+  // We defer those fields, and all other cleanup, to the passive phase (see detachFiberAfterEffects).
+  //
+  // Don't reset the alternate yet, either. We need that so we can detach the
+  // alternate's fields in the passive phase. Clearing the return pointer is
+  // sufficient for findDOMNode semantics.
+  var alternate = fiber.alternate;
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+  if (alternate !== null) {
+    alternate.return = null;
+  }
 
-    do {
-      if ((effect.tag & tag) === tag) {
-        // Mount
-        var create = effect.create;
-        effect.destroy = create();
+  fiber.return = null;
+}
 
-        {
-          var destroy = effect.destroy;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
 
-          if (destroy !== undefined && typeof destroy !== "function") {
-            var addendum = void 0;
+  if (alternate !== null) {
+    fiber.alternate = null;
+    detachFiberAfterEffects(alternate);
+  } // Note: Defensively using negation instead of < in case
+  // `deletedTreeCleanUpLevel` is undefined.
 
-            if (destroy === null) {
-              addendum =
-                " You returned null. If your effect does not require clean " +
-                "up, return undefined (or nothing).";
-            } else if (typeof destroy.then === "function") {
-              addendum =
-                "\n\nIt looks like you wrote useEffect(async () => ...) or returned a Promise. " +
-                "Instead, write the async function inside your effect " +
-                "and call it immediately:\n\n" +
-                "useEffect(() => {\n" +
-                "  async function fetchData() {\n" +
-                "    // You can await here\n" +
-                "    const response = await MyAPI.getData(someId);\n" +
-                "    // ...\n" +
-                "  }\n" +
-                "  fetchData();\n" +
-                "}, [someId]); // Or [] if effect doesn't need props or state\n\n" +
-                "Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching";
-            } else {
-              addendum = " You returned: " + destroy;
-            }
+  {
+    // Clear cyclical Fiber fields. This level alone is designed to roughly
+    // approximate the planned Fiber refactor. In that world, `setState` will be
+    // bound to a special "instance" object instead of a Fiber. The Instance
+    // object will not have any of these fields. It will only be connected to
+    // the fiber tree via a single link at the root. So if this level alone is
+    // sufficient to fix memory issues, that bodes well for our plans.
+    fiber.child = null;
+    fiber.deletions = null;
+    fiber.sibling = null; // The `stateNode` is cyclical because on host nodes it points to the host
+    // tree, which has its own pointers to children, parents, and siblings.
+    // The other host nodes also point back to fibers, so we should detach that
+    // one, too.
+
+    if (fiber.tag === HostComponent) {
+      var hostInstance = fiber.stateNode;
+    }
+
+    fiber.stateNode = null; // I'm intentionally not clearing the `return` field in this level. We
+    // already disconnect the `return` pointer at the root of the deleted
+    // subtree (in `detachFiberMutation`). Besides, `return` by itself is not
+    // cyclical — it's only cyclical when combined with `child`, `sibling`, and
+    // `alternate`. But we'll clear it in the next level anyway, just in case.
 
-            error(
-              "An effect function must not return anything besides a function, " +
-                "which is used for clean-up.%s",
-              addendum
-            );
-          }
-        }
-      }
+    {
+      fiber._debugOwner = null;
+    }
 
-      effect = effect.next;
-    } while (effect !== firstEffect);
+    {
+      // Theoretically, nothing in here should be necessary, because we already
+      // disconnected the fiber from the tree. So even if something leaks this
+      // particular fiber, it won't leak anything else
+      //
+      // The purpose of this branch is to be super aggressive so we can measure
+      // if there's any difference in memory impact. If there is, that could
+      // indicate a React leak we don't know about.
+      fiber.return = null;
+      fiber.dependencies = null;
+      fiber.memoizedProps = null;
+      fiber.memoizedState = null;
+      fiber.pendingProps = null;
+      fiber.stateNode = null; // TODO: Move to `commitPassiveUnmountInsideDeletedTreeOnFiber` instead.
+
+      fiber.updateQueue = null;
+    }
   }
 }
 
-function schedulePassiveEffects(finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function getHostParentFiber(fiber) {
+  var parent = fiber.return;
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+  while (parent !== null) {
+    if (isHostParent(parent)) {
+      return parent;
+    }
+
+    parent = parent.return;
+  }
+
+  {
+    throw Error(
+      "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+}
+
+function isHostParent(fiber) {
+  return (
+    fiber.tag === HostComponent ||
+    fiber.tag === HostRoot ||
+    fiber.tag === HostPortal
+  );
+}
+
+function getHostSibling(fiber) {
+  // We're going to search forward into the tree until we find a sibling host
+  // node. Unfortunately, if multiple insertions are done in a row we have to
+  // search past them. This leads to exponential search for the next sibling.
+  // TODO: Find a more efficient way to do this.
+  var node = fiber;
+
+  siblings: while (true) {
+    // If we didn't find anything, let's try the next sibling.
+    while (node.sibling === null) {
+      if (node.return === null || isHostParent(node.return)) {
+        // If we pop out of the root or hit the parent the fiber we are the
+        // last sibling.
+        return null;
+      }
 
-    do {
-      var _effect = effect,
-        next = _effect.next,
-        tag = _effect.tag;
+      node = node.return;
+    }
 
-      if ((tag & Passive$1) !== NoFlags$1 && (tag & HasEffect) !== NoFlags$1) {
-        enqueuePendingPassiveHookEffectUnmount(finishedWork, effect);
-        enqueuePendingPassiveHookEffectMount(finishedWork, effect);
-      }
+    node.sibling.return = node.return;
+    node = node.sibling;
 
-      effect = next;
-    } while (effect !== firstEffect);
-  }
-}
+    while (
+      node.tag !== HostComponent &&
+      node.tag !== HostText &&
+      node.tag !== DehydratedFragment
+    ) {
+      // If it is not host node and, we might have a host node inside it.
+      // Try to search down until we find one.
+      if (node.flags & Placement) {
+        // If we don't have a child, try the siblings instead.
+        continue siblings;
+      } // If we don't have a child, try the siblings instead.
+      // We also skip portals because they are not part of this host tree.
 
-function commitLifeCycles(finishedRoot, current, finishedWork, committedLanes) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
-      // At this point layout effects have already been destroyed (during mutation phase).
-      // This is done to prevent sibling component effects from interfering with each other,
-      // e.g. a destroy function in one component should never override a ref set
-      // by a create function in another component during the same commit.
-      {
-        commitHookEffectListMount(Layout | HasEffect, finishedWork);
+      if (node.child === null || node.tag === HostPortal) {
+        continue siblings;
+      } else {
+        node.child.return = node;
+        node = node.child;
       }
+    } // Check if this host node is stable or about to be placed.
 
-      schedulePassiveEffects(finishedWork);
-      return;
+    if (!(node.flags & Placement)) {
+      // Found it!
+      return node.stateNode;
     }
+  }
+}
 
-    case ClassComponent: {
-      var instance = finishedWork.stateNode;
+function commitPlacement(finishedWork) {
+  var parentFiber = getHostParentFiber(finishedWork); // Note: these two variables *must* always be updated together.
 
-      if (finishedWork.flags & Update) {
-        if (current === null) {
-          // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+  var parent;
+  var isContainer;
+  var parentStateNode = parentFiber.stateNode;
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
-            }
-          }
+  switch (parentFiber.tag) {
+    case HostComponent:
+      parent = parentStateNode;
+      isContainer = false;
+      break;
 
-          {
-            instance.componentDidMount();
-          }
-        } else {
-          var prevProps =
-            finishedWork.elementType === finishedWork.type
-              ? current.memoizedProps
-              : resolveDefaultProps(finishedWork.type, current.memoizedProps);
-          var prevState = current.memoizedState; // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
+    case HostRoot:
+      parent = parentStateNode.containerInfo;
+      isContainer = true;
+      break;
 
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "componentDidUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+    case HostPortal:
+      parent = parentStateNode.containerInfo;
+      isContainer = true;
+      break;
+    // eslint-disable-next-line-no-fallthrough
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "componentDidUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
-            }
-          }
+    default: {
+      throw Error(
+        "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
+  }
 
-          {
-            instance.componentDidUpdate(
-              prevProps,
-              prevState,
-              instance.__reactInternalSnapshotBeforeUpdate
-            );
-          }
-        }
-      } // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
+  if (parentFiber.flags & ContentReset) {
+    parentFiber.flags &= ~ContentReset;
+  }
 
-      var updateQueue = finishedWork.updateQueue;
+  var before = getHostSibling(finishedWork); // We only have the top Fiber that was inserted but we need to recurse down its
+  // children to find all the terminal nodes.
 
-      if (updateQueue !== null) {
-        {
-          if (
-            finishedWork.type === finishedWork.elementType &&
-            !didWarnAboutReassigningProps
-          ) {
-            if (instance.props !== finishedWork.memoizedProps) {
-              error(
-                "Expected %s props to match memoized props before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.props`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
-            }
+  if (isContainer) {
+    insertOrAppendPlacementNodeIntoContainer(finishedWork, before, parent);
+  } else {
+    insertOrAppendPlacementNode(finishedWork, before, parent);
+  }
+}
 
-            if (instance.state !== finishedWork.memoizedState) {
-              error(
-                "Expected %s state to match memoized state before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.state`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
-            }
-          }
-        } // We could update instance props and state here,
-        // but instead we rely on them being set during last render.
-        // TODO: revisit this when we implement resuming.
+function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
+  var tag = node.tag;
+  var isHost = tag === HostComponent || tag === HostText;
 
-        commitUpdateQueue(finishedWork, updateQueue, instance);
-      }
+  if (isHost) {
+    var stateNode = node.stateNode;
 
-      return;
+    if (before) {
+      insertInContainerBefore(parent);
+    } else {
+      appendChildToContainer(parent, stateNode);
     }
+  } else if (tag === HostPortal);
+  else {
+    var child = node.child;
 
-    case HostRoot: {
-      // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
-      var _updateQueue = finishedWork.updateQueue;
-
-      if (_updateQueue !== null) {
-        var _instance = null;
-
-        if (finishedWork.child !== null) {
-          switch (finishedWork.child.tag) {
-            case HostComponent:
-              _instance = getPublicInstance(finishedWork.child.stateNode);
-              break;
-
-            case ClassComponent:
-              _instance = finishedWork.child.stateNode;
-              break;
-          }
-        }
+    if (child !== null) {
+      insertOrAppendPlacementNodeIntoContainer(child, before, parent);
+      var sibling = child.sibling;
 
-        commitUpdateQueue(finishedWork, _updateQueue, _instance);
+      while (sibling !== null) {
+        insertOrAppendPlacementNodeIntoContainer(sibling, before, parent);
+        sibling = sibling.sibling;
       }
-
-      return;
     }
+  }
+}
 
-    case HostComponent: {
-      var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
-      // (eg DOM renderer may schedule auto-focus for inputs and form controls).
-      // These effects should only be committed when components are first mounted,
-      // aka when there is no current/alternate.
-
-      if (current === null && finishedWork.flags & Update) {
-        var type = finishedWork.type;
-        var props = finishedWork.memoizedProps;
-      }
-
-      return;
-    }
+function insertOrAppendPlacementNode(node, before, parent) {
+  var tag = node.tag;
+  var isHost = tag === HostComponent || tag === HostText;
 
-    case HostText: {
-      // We have no life-cycles associated with text.
-      return;
-    }
+  if (isHost) {
+    var stateNode = node.stateNode;
 
-    case HostPortal: {
-      // We have no life-cycles associated with portals.
-      return;
+    if (before) {
+      insertBefore(parent, stateNode, before);
+    } else {
+      appendChild(parent, stateNode);
     }
+  } else if (tag === HostPortal);
+  else {
+    var child = node.child;
 
-    case Profiler: {
-      {
-        var _finishedWork$memoize2 = finishedWork.memoizedProps,
-          onCommit = _finishedWork$memoize2.onCommit,
-          onRender = _finishedWork$memoize2.onRender;
-        var effectDuration = finishedWork.stateNode.effectDuration;
-        var commitTime = getCommitTime();
+    if (child !== null) {
+      insertOrAppendPlacementNode(child, before, parent);
+      var sibling = child.sibling;
 
-        if (typeof onRender === "function") {
-          {
-            onRender(
-              finishedWork.memoizedProps.id,
-              current === null ? "mount" : "update",
-              finishedWork.actualDuration,
-              finishedWork.treeBaseDuration,
-              finishedWork.actualStartTime,
-              commitTime,
-              finishedRoot.memoizedInteractions
-            );
-          }
-        }
+      while (sibling !== null) {
+        insertOrAppendPlacementNode(sibling, before, parent);
+        sibling = sibling.sibling;
       }
-
-      return;
-    }
-
-    case SuspenseComponent: {
-      return;
     }
-
-    case SuspenseListComponent:
-    case IncompleteClassComponent:
-    case FundamentalComponent:
-    case ScopeComponent:
-    case OffscreenComponent:
-    case LegacyHiddenComponent:
-      return;
-  }
-
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
   }
 }
 
-function hideOrUnhideAllChildren(finishedWork, isHidden) {
-  {
-    // We only have the top Fiber that was inserted but we need to recurse down its
-    // children to find all the terminal nodes.
-    var node = finishedWork;
+function unmountHostComponents(finishedRoot, current, nearestMountedAncestor) {
+  // We only have the top Fiber that was deleted but we need to recurse down its
+  // children to find all the terminal nodes.
+  var node = current; // Each iteration, currentParent is populated with node's host parent if not
+  // currentParentIsValid.
 
-    while (true) {
-      if (node.tag === HostComponent) {
-        var instance = node.stateNode;
+  var currentParentIsValid = false; // Note: these two variables *must* always be updated together.
 
-        if (isHidden) {
-          hideInstance(instance);
-        } else {
-          unhideInstance(node.stateNode, node.memoizedProps);
+  var currentParent;
+  var currentParentIsContainer;
+
+  while (true) {
+    if (!currentParentIsValid) {
+      var parent = node.return;
+
+      findParent: while (true) {
+        if (!(parent !== null)) {
+          throw Error(
+            "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
+          );
         }
-      } else if (node.tag === HostText) {
-        var _instance3 = node.stateNode;
 
-        if (isHidden) {
-          hideTextInstance();
-        } else {
-          unhideTextInstance(_instance3, node.memoizedProps);
-        }
-      } else if (
-        (node.tag === OffscreenComponent ||
-          node.tag === LegacyHiddenComponent) &&
-        node.memoizedState !== null &&
-        node !== finishedWork
-      );
-      else if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
+        var parentStateNode = parent.stateNode;
 
-      if (node === finishedWork) {
-        return;
-      }
+        switch (parent.tag) {
+          case HostComponent:
+            currentParent = parentStateNode;
+            currentParentIsContainer = false;
+            break findParent;
 
-      while (node.sibling === null) {
-        if (node.return === null || node.return === finishedWork) {
-          return;
+          case HostRoot:
+            currentParent = parentStateNode.containerInfo;
+            currentParentIsContainer = true;
+            break findParent;
+
+          case HostPortal:
+            currentParent = parentStateNode.containerInfo;
+            currentParentIsContainer = true;
+            break findParent;
         }
 
-        node = node.return;
+        parent = parent.return;
       }
 
-      node.sibling.return = node.return;
-      node = node.sibling;
+      currentParentIsValid = true;
     }
-  }
-}
-
-function commitAttachRef(finishedWork) {
-  var ref = finishedWork.ref;
-
-  if (ref !== null) {
-    var instance = finishedWork.stateNode;
-    var instanceToUse;
 
-    switch (finishedWork.tag) {
-      case HostComponent:
-        instanceToUse = getPublicInstance(instance);
-        break;
+    if (node.tag === HostComponent || node.tag === HostText) {
+      commitNestedUnmounts(finishedRoot, node, nearestMountedAncestor); // After all the children have unmounted, it is now safe to remove the
+      // node from the tree.
 
-      default:
-        instanceToUse = instance;
-    } // Moved outside to ensure DCE works with this flag
+      if (currentParentIsContainer) {
+        removeChildFromContainer(currentParent, node.stateNode);
+      } else {
+        removeChild(currentParent, node.stateNode);
+      } // Don't visit children because we already visited them.
+    } else if (node.tag === HostPortal) {
+      if (node.child !== null) {
+        // When we go into a portal, it becomes the parent to remove from.
+        // We will reassign it back when we pop the portal on the way up.
+        currentParent = node.stateNode.containerInfo;
+        currentParentIsContainer = true; // Visit children because portals might contain host components.
 
-    if (typeof ref === "function") {
-      {
-        ref(instanceToUse);
+        node.child.return = node;
+        node = node.child;
+        continue;
       }
     } else {
-      {
-        if (!ref.hasOwnProperty("current")) {
-          error(
-            "Unexpected ref object provided for %s. " +
-              "Use either a ref-setter function or React.createRef().",
-            getComponentName(finishedWork.type)
-          );
-        }
+      commitUnmount(finishedRoot, node, nearestMountedAncestor); // Visit children because we may find more host components below.
+
+      if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
       }
+    }
 
-      ref.current = instanceToUse;
+    if (node === current) {
+      return;
     }
-  }
-}
 
-function commitDetachRef(current) {
-  var currentRef = current.ref;
+    while (node.sibling === null) {
+      if (node.return === null || node.return === current) {
+        return;
+      }
 
-  if (currentRef !== null) {
-    if (typeof currentRef === "function") {
-      {
-        currentRef(null);
+      node = node.return;
+
+      if (node.tag === HostPortal) {
+        // When we go out of the portal, we need to restore the parent.
+        // Since we don't keep a stack of them, we will search for it.
+        currentParentIsValid = false;
       }
-    } else {
-      currentRef.current = null;
     }
+
+    node.sibling.return = node.return;
+    node = node.sibling;
   }
-} // User-originating errors (lifecycles and refs) should not interrupt
-// deletion, so don't let them throw. Host-originating errors should
-// interrupt deletion, so it's okay
+}
 
-function commitUnmount(finishedRoot, current, renderPriorityLevel) {
-  onCommitUnmount(current);
+function commitDeletion(finishedRoot, current, nearestMountedAncestor) {
+  {
+    // Recursively delete all host nodes from the parent.
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    unmountHostComponents(finishedRoot, current, nearestMountedAncestor);
+  }
 
-  switch (current.tag) {
+  detachFiberMutation(current);
+}
+
+function commitWork(current, finishedWork) {
+  switch (finishedWork.tag) {
     case FunctionComponent:
     case ForwardRef:
     case MemoComponent:
-    case SimpleMemoComponent:
-    case Block: {
-      var updateQueue = current.updateQueue;
-
-      if (updateQueue !== null) {
-        var lastEffect = updateQueue.lastEffect;
-
-        if (lastEffect !== null) {
-          var firstEffect = lastEffect.next;
-          var effect = firstEffect;
-
-          do {
-            var _effect2 = effect,
-              destroy = _effect2.destroy,
-              tag = _effect2.tag;
-
-            if (destroy !== undefined) {
-              if ((tag & Passive$1) !== NoFlags$1) {
-                enqueuePendingPassiveHookEffectUnmount(current, effect);
-              } else {
-                {
-                  safelyCallDestroy(current, destroy);
-                }
-              }
-            }
-
-            effect = effect.next;
-          } while (effect !== firstEffect);
+    case SimpleMemoComponent: {
+      // Layout effects are destroyed during the mutation phase so that all
+      // destroy functions for all fibers are called before any create functions.
+      // This prevents sibling component effects from interfering with each other,
+      // e.g. a destroy function in one component should never override a ref set
+      // by a create function in another component during the same commit.
+      if (finishedWork.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          commitHookEffectListUnmount(
+            Layout | HasEffect,
+            finishedWork,
+            finishedWork.return
+          );
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
         }
+      } else {
+        commitHookEffectListUnmount(
+          Layout | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
       }
 
       return;
     }
 
     case ClassComponent: {
-      safelyDetachRef(current);
-      var instance = current.stateNode;
-
-      if (typeof instance.componentWillUnmount === "function") {
-        safelyCallComponentWillUnmount(current, instance);
-      }
-
       return;
     }
 
     case HostComponent: {
-      safelyDetachRef(current);
-      return;
-    }
+      var instance = finishedWork.stateNode;
 
-    case HostPortal: {
-      // TODO: this is recursive.
-      // We are also not using this parent because
-      // the portal will get pushed immediately.
-      {
-        unmountHostComponents(finishedRoot, current);
-      }
+      if (instance != null) {
+        // Commit the work prepared earlier.
+        var newProps = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
+        // as the newProps. The updatePayload will contain the real change in
+        // this case.
 
-      return;
-    }
+        var oldProps = current !== null ? current.memoizedProps : newProps;
+        var type = finishedWork.type; // TODO: Type the updateQueue to be specific to host components.
 
-    case FundamentalComponent: {
-      return;
-    }
+        var updatePayload = finishedWork.updateQueue;
+        finishedWork.updateQueue = null;
 
-    case DehydratedFragment: {
-      return;
-    }
+        if (updatePayload !== null) {
+          commitUpdate(instance, updatePayload, type, oldProps, newProps);
+        }
+      }
 
-    case ScopeComponent: {
       return;
     }
-  }
-}
 
-function commitNestedUnmounts(finishedRoot, root, renderPriorityLevel) {
-  // While we're inside a removed host node we don't want to call
-  // removeChild on the inner nodes because they're removed by the top
-  // call anyway. We also want to call componentWillUnmount on all
-  // composites before this host node is removed from the tree. Therefore
-  // we do an inner loop while we're still inside the host node.
-  var node = root;
+    case HostText: {
+      if (!(finishedWork.stateNode !== null)) {
+        throw Error(
+          "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
 
-  while (true) {
-    commitUnmount(finishedRoot, node); // Visit children because they may contain more composite or host nodes.
-    // Skip portals because commitUnmount() currently visits them recursively.
+      var textInstance = finishedWork.stateNode;
+      var newText = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
+      // as the newProps. The updatePayload will contain the real change in
+      // this case.
 
-    if (
-      node.child !== null && // If we use mutation we drill down into portals using commitUnmount above.
-      // If we don't use mutation we drill down into portals here instead.
-      node.tag !== HostPortal
-    ) {
-      node.child.return = node;
-      node = node.child;
-      continue;
+      var oldText = current !== null ? current.memoizedProps : newText;
+      commitTextUpdate(textInstance, oldText, newText);
+      return;
     }
 
-    if (node === root) {
+    case HostRoot: {
       return;
     }
 
-    while (node.sibling === null) {
-      if (node.return === null || node.return === root) {
-        return;
-      }
-
-      node = node.return;
+    case Profiler: {
+      return;
     }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-}
-
-function detachFiberMutation(fiber) {
-  // Cut off the return pointers to disconnect it from the tree. Ideally, we
-  // should clear the child pointer of the parent alternate to let this
-  // get GC:ed but we don't know which for sure which parent is the current
-  // one so we'll settle for GC:ing the subtree of this child. This child
-  // itself will be GC:ed when the parent updates the next time.
-  // Note: we cannot null out sibling here, otherwise it can cause issues
-  // with findDOMNode and how it requires the sibling field to carry out
-  // traversal in a later effect. See PR #16820. We now clear the sibling
-  // field after effects, see: detachFiberAfterEffects.
-  //
-  // Don't disconnect stateNode now; it will be detached in detachFiberAfterEffects.
-  // It may be required if the current component is an error boundary,
-  // and one of its descendants throws while unmounting a passive effect.
-  fiber.alternate = null;
-  fiber.child = null;
-  fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
-  fiber.memoizedProps = null;
-  fiber.memoizedState = null;
-  fiber.pendingProps = null;
-  fiber.return = null;
-  fiber.updateQueue = null;
-
-  {
-    fiber._debugOwner = null;
-  }
-}
-
-function getHostParentFiber(fiber) {
-  var parent = fiber.return;
+    case SuspenseComponent: {
+      commitSuspenseCallback(finishedWork);
+      attachSuspenseRetryListeners(finishedWork);
+      return;
+    }
 
-  while (parent !== null) {
-    if (isHostParent(parent)) {
-      return parent;
+    case SuspenseListComponent: {
+      attachSuspenseRetryListeners(finishedWork);
+      return;
     }
 
-    parent = parent.return;
+    case IncompleteClassComponent: {
+      return;
+    }
   }
 
   {
     throw Error(
-      "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
+      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
     );
   }
 }
 
-function isHostParent(fiber) {
-  return (
-    fiber.tag === HostComponent ||
-    fiber.tag === HostRoot ||
-    fiber.tag === HostPortal
-  );
+function commitSuspenseCallback(finishedWork) {
+  // TODO: Move this to passive phase
+  var newState = finishedWork.memoizedState;
 }
 
-function getHostSibling(fiber) {
-  // We're going to search forward into the tree until we find a sibling host
-  // node. Unfortunately, if multiple insertions are done in a row we have to
-  // search past them. This leads to exponential search for the next sibling.
-  // TODO: Find a more efficient way to do this.
-  var node = fiber;
+function attachSuspenseRetryListeners(finishedWork) {
+  // If this boundary just timed out, then it will have a set of wakeables.
+  // For each wakeable, attach a listener so that when it resolves, React
+  // attempts to re-render the boundary in the primary (pre-timeout) state.
+  var wakeables = finishedWork.updateQueue;
 
-  siblings: while (true) {
-    // If we didn't find anything, let's try the next sibling.
-    while (node.sibling === null) {
-      if (node.return === null || isHostParent(node.return)) {
-        // If we pop out of the root or hit the parent the fiber we are the
-        // last sibling.
-        return null;
-      }
+  if (wakeables !== null) {
+    finishedWork.updateQueue = null;
+    var retryCache = finishedWork.stateNode;
 
-      node = node.return;
+    if (retryCache === null) {
+      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
     }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
+    wakeables.forEach(function(wakeable) {
+      // Memoize using the boundary fiber to prevent redundant listeners.
+      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
 
-    while (
-      node.tag !== HostComponent &&
-      node.tag !== HostText &&
-      node.tag !== DehydratedFragment
-    ) {
-      // If it is not host node and, we might have a host node inside it.
-      // Try to search down until we find one.
-      if (node.flags & Placement) {
-        // If we don't have a child, try the siblings instead.
-        continue siblings;
-      } // If we don't have a child, try the siblings instead.
-      // We also skip portals because they are not part of this host tree.
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
 
-      if (node.child === null || node.tag === HostPortal) {
-        continue siblings;
-      } else {
-        node.child.return = node;
-        node = node.child;
-      }
-    } // Check if this host node is stable or about to be placed.
+        {
+          if (isDevToolsPresent) {
+            if (inProgressLanes !== null && inProgressRoot !== null) {
+              // If we have pending work still, associate the original updaters with it.
+              restorePendingUpdaters(inProgressRoot, inProgressLanes);
+            } else {
+              throw Error(
+                "Expected finished root and lanes to be set. This is a bug in React."
+              );
+            }
+          }
+        }
 
-    if (!(node.flags & Placement)) {
-      // Found it!
-      return node.stateNode;
-    }
+        wakeable.then(retry, retry);
+      }
+    });
   }
-}
+} // This function detects when a Suspense boundary goes from visible to hidden.
 
-function commitPlacement(finishedWork) {
-  var parentFiber = getHostParentFiber(finishedWork); // Note: these two variables *must* always be updated together.
+function commitResetTextContent(current) {
+  resetTextContent(current.stateNode);
+}
 
-  var parent;
-  var isContainer;
-  var parentStateNode = parentFiber.stateNode;
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = firstChild;
+  commitMutationEffects_begin(root);
+  inProgressLanes = null;
+  inProgressRoot = null;
+}
 
-  switch (parentFiber.tag) {
-    case HostComponent:
-      parent = parentStateNode;
-      isContainer = false;
-      break;
+function commitMutationEffects_begin(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // TODO: Should wrap this in flags check, too, as optimization
 
-    case HostRoot:
-      parent = parentStateNode.containerInfo;
-      isContainer = true;
-      break;
+    var deletions = fiber.deletions;
 
-    case HostPortal:
-      parent = parentStateNode.containerInfo;
-      isContainer = true;
-      break;
+    if (deletions !== null) {
+      for (var i = 0; i < deletions.length; i++) {
+        var childToDelete = deletions[i];
 
-    case FundamentalComponent:
+        try {
+          commitDeletion(root, childToDelete, fiber);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(childToDelete, fiber, error);
+        }
+      }
+    }
 
-    // eslint-disable-next-line-no-fallthrough
+    var child = fiber.child;
 
-    default: {
-      throw Error(
-        "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
-      );
+    if ((fiber.subtreeFlags & MutationMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitMutationEffects_complete(root);
     }
   }
+}
 
-  if (parentFiber.flags & ContentReset) {
-    parentFiber.flags &= ~ContentReset;
-  }
+function commitMutationEffects_complete(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
 
-  var before = getHostSibling(finishedWork); // We only have the top Fiber that was inserted but we need to recurse down its
-  // children to find all the terminal nodes.
+    try {
+      commitMutationEffectsOnFiber(fiber, root);
+    } catch (error) {
+      reportUncaughtErrorInDEV(error);
+      captureCommitPhaseError(fiber, fiber.return, error);
+    }
 
-  if (isContainer) {
-    insertOrAppendPlacementNodeIntoContainer(finishedWork, before, parent);
-  } else {
-    insertOrAppendPlacementNode(finishedWork, before, parent);
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
+
+    nextEffect = fiber.return;
   }
 }
 
-function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
-  var tag = node.tag;
-  var isHost = tag === HostComponent || tag === HostText;
+function commitMutationEffectsOnFiber(finishedWork, root) {
+  // TODO: The factoring of this phase could probably be improved. Consider
+  // switching on the type of work before checking the flags. That's what
+  // we do in all the other phases. I think this one is only different
+  // because of the shared reconciliation logic below.
+  var flags = finishedWork.flags;
+
+  if (flags & ContentReset) {
+    commitResetTextContent(finishedWork);
+  }
 
-  if (isHost || enableFundamentalAPI) {
-    var stateNode = isHost ? node.stateNode : node.stateNode.instance;
+  if (flags & Ref) {
+    var current = finishedWork.alternate;
 
-    if (before) {
-      insertInContainerBefore(parent);
-    } else {
-      appendChildToContainer(parent, stateNode);
+    if (current !== null) {
+      commitDetachRef(current);
     }
-  } else if (tag === HostPortal);
-  else {
-    var child = node.child;
+  }
 
-    if (child !== null) {
-      insertOrAppendPlacementNodeIntoContainer(child, before, parent);
-      var sibling = child.sibling;
+  if (flags & Visibility) {
+    switch (finishedWork.tag) {
+      case SuspenseComponent: {
+        var newState = finishedWork.memoizedState;
+        var isHidden = newState !== null;
 
-      while (sibling !== null) {
-        insertOrAppendPlacementNodeIntoContainer(sibling, before, parent);
-        sibling = sibling.sibling;
+        if (isHidden) {
+          var _current = finishedWork.alternate;
+          var wasHidden = _current !== null && _current.memoizedState !== null;
+
+          if (!wasHidden) {
+            // TODO: Move to passive phase
+            markCommitTimeOfFallback();
+          }
+        }
+
+        break;
       }
-    }
-  }
-}
 
-function insertOrAppendPlacementNode(node, before, parent) {
-  var tag = node.tag;
-  var isHost = tag === HostComponent || tag === HostText;
+      case OffscreenComponent: {
+        var _newState = finishedWork.memoizedState;
 
-  if (isHost || enableFundamentalAPI) {
-    var stateNode = isHost ? node.stateNode : node.stateNode.instance;
+        var _isHidden = _newState !== null;
 
-    if (before) {
-      insertBefore(parent, stateNode, before);
-    } else {
-      appendChild(parent, stateNode);
-    }
-  } else if (tag === HostPortal);
-  else {
-    var child = node.child;
+        var _current2 = finishedWork.alternate;
 
-    if (child !== null) {
-      insertOrAppendPlacementNode(child, before, parent);
-      var sibling = child.sibling;
+        var _wasHidden = _current2 !== null && _current2.memoizedState !== null;
 
-      while (sibling !== null) {
-        insertOrAppendPlacementNode(sibling, before, parent);
-        sibling = sibling.sibling;
+        var offscreenBoundary = finishedWork;
+
+        {
+          // TODO: This needs to run whenever there's an insertion or update
+          // inside a hidden Offscreen tree.
+          hideOrUnhideAllChildren(offscreenBoundary, _isHidden);
+        }
       }
     }
-  }
-}
+  } // The following switch statement is only concerned about placement,
+  // updates, and deletions. To avoid needing to add a case for every possible
+  // bitmap value, we remove the secondary effects from the effect tag and
+  // switch on that value.
 
-function unmountHostComponents(finishedRoot, current, renderPriorityLevel) {
-  // We only have the top Fiber that was deleted but we need to recurse down its
-  // children to find all the terminal nodes.
-  var node = current; // Each iteration, currentParent is populated with node's host parent if not
-  // currentParentIsValid.
+  var primaryFlags = flags & (Placement | Update | Hydrating);
 
-  var currentParentIsValid = false; // Note: these two variables *must* always be updated together.
-
-  var currentParent;
-  var currentParentIsContainer;
+  switch (primaryFlags) {
+    case Placement: {
+      commitPlacement(finishedWork); // Clear the "placement" from effect tag so that we know that this is
+      // inserted, before any life-cycles like componentDidMount gets called.
+      // TODO: findDOMNode doesn't rely on this any more but isMounted does
+      // and isMounted is deprecated anyway so we should be able to kill this.
 
-  while (true) {
-    if (!currentParentIsValid) {
-      var parent = node.return;
+      finishedWork.flags &= ~Placement;
+      break;
+    }
 
-      findParent: while (true) {
-        if (!(parent !== null)) {
-          throw Error(
-            "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
+    case PlacementAndUpdate: {
+      // Placement
+      commitPlacement(finishedWork); // Clear the "placement" from effect tag so that we know that this is
+      // inserted, before any life-cycles like componentDidMount gets called.
 
-        var parentStateNode = parent.stateNode;
+      finishedWork.flags &= ~Placement; // Update
 
-        switch (parent.tag) {
-          case HostComponent:
-            currentParent = parentStateNode;
-            currentParentIsContainer = false;
-            break findParent;
+      var _current3 = finishedWork.alternate;
+      commitWork(_current3, finishedWork);
+      break;
+    }
 
-          case HostRoot:
-            currentParent = parentStateNode.containerInfo;
-            currentParentIsContainer = true;
-            break findParent;
+    case Hydrating: {
+      finishedWork.flags &= ~Hydrating;
+      break;
+    }
 
-          case HostPortal:
-            currentParent = parentStateNode.containerInfo;
-            currentParentIsContainer = true;
-            break findParent;
-        }
+    case HydratingAndUpdate: {
+      finishedWork.flags &= ~Hydrating; // Update
 
-        parent = parent.return;
-      }
+      var _current4 = finishedWork.alternate;
+      commitWork(_current4, finishedWork);
+      break;
+    }
 
-      currentParentIsValid = true;
+    case Update: {
+      var _current5 = finishedWork.alternate;
+      commitWork(_current5, finishedWork);
+      break;
     }
+  }
+}
 
-    if (node.tag === HostComponent || node.tag === HostText) {
-      commitNestedUnmounts(finishedRoot, node); // After all the children have unmounted, it is now safe to remove the
-      // node from the tree.
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = finishedWork;
+  commitLayoutEffects_begin(finishedWork, root, committedLanes);
+  inProgressLanes = null;
+  inProgressRoot = null;
+}
 
-      if (currentParentIsContainer) {
-        removeChildFromContainer(currentParent, node.stateNode);
-      } else {
-        removeChild(currentParent, node.stateNode);
-      } // Don't visit children because we already visited them.
-    } else if (node.tag === HostPortal) {
-      if (node.child !== null) {
-        // When we go into a portal, it becomes the parent to remove from.
-        // We will reassign it back when we pop the portal on the way up.
-        currentParent = node.stateNode.containerInfo;
-        currentParentIsContainer = true; // Visit children because portals might contain host components.
+function commitLayoutEffects_begin(subtreeRoot, root, committedLanes) {
+  // Suspense layout effects semantics don't change for legacy roots.
+  var isModernRoot = (subtreeRoot.mode & ConcurrentMode) !== NoMode;
 
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
+
+    if ((fiber.subtreeFlags & LayoutMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
     } else {
-      commitUnmount(finishedRoot, node); // Visit children because we may find more host components below.
+      commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes);
+    }
+  }
+}
 
-      if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
+function commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+
+    if ((fiber.flags & LayoutMask) !== NoFlags) {
+      var current = fiber.alternate;
+      setCurrentFiber(fiber);
+
+      try {
+        commitLayoutEffectOnFiber(root, current, fiber, committedLanes);
+      } catch (error) {
+        reportUncaughtErrorInDEV(error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
+
+      resetCurrentFiber();
     }
 
-    if (node === current) {
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
       return;
     }
 
-    while (node.sibling === null) {
-      if (node.return === null || node.return === current) {
-        return;
-      }
-
-      node = node.return;
+    var sibling = fiber.sibling;
 
-      if (node.tag === HostPortal) {
-        // When we go out of the portal, we need to restore the parent.
-        // Since we don't keep a stack of them, we will search for it.
-        currentParentIsValid = false;
-      }
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
     }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
+    nextEffect = fiber.return;
   }
 }
 
-function commitDeletion(finishedRoot, current, renderPriorityLevel) {
-  {
-    // Recursively delete all host nodes from the parent.
-    // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(finishedRoot, current);
-  }
+function commitPassiveMountEffects(root, finishedWork) {
+  nextEffect = finishedWork;
+  commitPassiveMountEffects_begin(finishedWork, root);
+}
 
-  var alternate = current.alternate;
-  detachFiberMutation(current);
+function commitPassiveMountEffects_begin(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
 
-  if (alternate !== null) {
-    detachFiberMutation(alternate);
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
+    } else {
+      commitPassiveMountEffects_complete(subtreeRoot, root);
+    }
   }
 }
 
-function commitWork(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case MemoComponent:
-    case SimpleMemoComponent:
-    case Block: {
-      // Layout effects are destroyed during the mutation phase so that all
-      // destroy functions for all fibers are called before any create functions.
-      // This prevents sibling component effects from interfering with each other,
-      // e.g. a destroy function in one component should never override a ref set
-      // by a create function in another component during the same commit.
-      {
-        commitHookEffectListUnmount(Layout | HasEffect, finishedWork);
+function commitPassiveMountEffects_complete(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+
+      try {
+        commitPassiveMountOnFiber(root, fiber);
+      } catch (error) {
+        reportUncaughtErrorInDEV(error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
 
-      return;
+      resetCurrentFiber();
     }
 
-    case ClassComponent: {
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
       return;
     }
 
-    case HostComponent: {
-      var instance = finishedWork.stateNode;
+    var sibling = fiber.sibling;
 
-      if (instance != null) {
-        // Commit the work prepared earlier.
-        var newProps = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
-        // as the newProps. The updatePayload will contain the real change in
-        // this case.
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
 
-        var oldProps = current !== null ? current.memoizedProps : newProps;
-        var type = finishedWork.type; // TODO: Type the updateQueue to be specific to host components.
+    nextEffect = fiber.return;
+  }
+}
 
-        var updatePayload = finishedWork.updateQueue;
-        finishedWork.updateQueue = null;
+function commitPassiveMountOnFiber(finishedRoot, finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
 
-        if (updatePayload !== null) {
-          commitUpdate(instance, updatePayload, type, oldProps, newProps);
+        try {
+          commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
+        } finally {
+          recordPassiveEffectDuration(finishedWork);
         }
+      } else {
+        commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
       }
 
-      return;
+      break;
     }
+  }
+}
 
-    case HostText: {
-      if (!(finishedWork.stateNode !== null)) {
-        throw Error(
-          "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
-        );
-      }
+function commitPassiveUnmountEffects(firstChild) {
+  nextEffect = firstChild;
+  commitPassiveUnmountEffects_begin();
+}
 
-      var textInstance = finishedWork.stateNode;
-      var newText = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
-      // as the newProps. The updatePayload will contain the real change in
-      // this case.
+function commitPassiveUnmountEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var child = fiber.child;
+
+    if ((nextEffect.flags & ChildDeletion) !== NoFlags) {
+      var deletions = fiber.deletions;
+
+      if (deletions !== null) {
+        for (var i = 0; i < deletions.length; i++) {
+          var fiberToDelete = deletions[i];
+          nextEffect = fiberToDelete;
+          commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+            fiberToDelete,
+            fiber
+          );
+        }
 
-      var oldText = current !== null ? current.memoizedProps : newText;
-      commitTextUpdate(textInstance, oldText, newText);
-      return;
-    }
+        {
+          // A fiber was deleted from this parent fiber, but it's still part of
+          // the previous (alternate) parent fiber's list of children. Because
+          // children are a linked list, an earlier sibling that's still alive
+          // will be connected to the deleted fiber via its `alternate`:
+          //
+          //   live fiber
+          //   --alternate--> previous live fiber
+          //   --sibling--> deleted fiber
+          //
+          // We can't disconnect `alternate` on nodes that haven't been deleted
+          // yet, but we can disconnect the `sibling` and `child` pointers.
+          var previousFiber = fiber.alternate;
 
-    case HostRoot: {
-      return;
-    }
+          if (previousFiber !== null) {
+            var detachedChild = previousFiber.child;
 
-    case Profiler: {
-      return;
+            if (detachedChild !== null) {
+              previousFiber.child = null;
+
+              do {
+                var detachedSibling = detachedChild.sibling;
+                detachedChild.sibling = null;
+                detachedChild = detachedSibling;
+              } while (detachedChild !== null);
+            }
+          }
+        }
+
+        nextEffect = fiber;
+      }
     }
 
-    case SuspenseComponent: {
-      commitSuspenseComponent(finishedWork);
-      attachSuspenseRetryListeners(finishedWork);
-      return;
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffects_complete();
     }
+  }
+}
 
-    case SuspenseListComponent: {
-      attachSuspenseRetryListeners(finishedWork);
-      return;
+function commitPassiveUnmountEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+      commitPassiveUnmountOnFiber(fiber);
+      resetCurrentFiber();
     }
 
-    case IncompleteClassComponent: {
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
       return;
     }
 
-    case FundamentalComponent: {
+    nextEffect = fiber.return;
+  }
+}
+
+function commitPassiveUnmountOnFiber(finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
+        recordPassiveEffectDuration(finishedWork);
+      } else {
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
+      }
+
       break;
     }
+  }
+}
 
-    case ScopeComponent: {
-      break;
+function commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+  deletedSubtreeRoot,
+  nearestMountedAncestor
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // Deletion effects fire in parent -> child order
+    // TODO: Check if fiber has a PassiveStatic flag
+
+    setCurrentFiber(fiber);
+    commitPassiveUnmountInsideDeletedTreeOnFiber(fiber, nearestMountedAncestor);
+    resetCurrentFiber();
+    var child = fiber.child; // TODO: Only traverse subtree if it has a PassiveStatic flag. (But, if we
+    // do this, still need to handle `deletedTreeCleanUpLevel` correctly.)
+
+    if (child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+        deletedSubtreeRoot
+      );
     }
+  }
+}
 
-    case OffscreenComponent:
-    case LegacyHiddenComponent: {
-      var newState = finishedWork.memoizedState;
-      var isHidden = newState !== null;
-      hideOrUnhideAllChildren(finishedWork, isHidden);
+function commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+  deletedSubtreeRoot
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var sibling = fiber.sibling;
+    var returnFiber = fiber.return;
+
+    {
+      // Recursively traverse the entire deleted tree and clean up fiber fields.
+      // This is more aggressive than ideal, and the long term goal is to only
+      // have to detach the deleted tree at the root.
+      detachFiberAfterEffects(fiber);
+
+      if (fiber === deletedSubtreeRoot) {
+        nextEffect = null;
+        return;
+      }
+    }
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, returnFiber);
+      nextEffect = sibling;
       return;
     }
-  }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    nextEffect = returnFiber;
   }
 }
 
-function commitSuspenseComponent(finishedWork) {
-  var newState = finishedWork.memoizedState;
-
-  if (newState !== null) {
-    markCommitTimeOfFallback();
+function commitPassiveUnmountInsideDeletedTreeOnFiber(
+  current,
+  nearestMountedAncestor
+) {
+  switch (current.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (current.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+        recordPassiveEffectDuration(current);
+      } else {
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+      }
 
-    {
-      // Hide the Offscreen component that contains the primary children. TODO:
-      // Ideally, this effect would have been scheduled on the Offscreen fiber
-      // itself. That's how unhiding works: the Offscreen component schedules an
-      // effect on itself. However, in this case, the component didn't complete,
-      // so the fiber was never added to the effect list in the normal path. We
-      // could have appended it to the effect list in the Suspense component's
-      // second pass, but doing it this way is less complicated. This would be
-      // simpler if we got rid of the effect list and traversed the tree, like
-      // we're planning to do.
-      var primaryChildParent = finishedWork.child;
-      hideOrUnhideAllChildren(primaryChildParent, true);
+      break;
     }
   }
 }
 
-function attachSuspenseRetryListeners(finishedWork) {
-  // If this boundary just timed out, then it will have a set of wakeables.
-  // For each wakeable, attach a listener so that when it resolves, React
-  // attempts to re-render the boundary in the primary (pre-timeout) state.
-  var wakeables = finishedWork.updateQueue;
+var didWarnWrongReturnPointer = false;
 
-  if (wakeables !== null) {
-    finishedWork.updateQueue = null;
-    var retryCache = finishedWork.stateNode;
+function ensureCorrectReturnPointer(fiber, expectedReturnFiber) {
+  {
+    if (!didWarnWrongReturnPointer && fiber.return !== expectedReturnFiber) {
+      didWarnWrongReturnPointer = true;
 
-    if (retryCache === null) {
-      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
+      error(
+        "Internal React error: Return pointer is inconsistent " + "with parent."
+      );
     }
+  } // TODO: Remove this assignment once we're confident that it won't break
+  // anything, by checking the warning logs for the above invariant
 
-    wakeables.forEach(function(wakeable) {
-      // Memoize using the boundary fiber to prevent redundant listeners.
-      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
+  fiber.return = expectedReturnFiber;
+} // TODO: Reuse reappearLayoutEffects traversal here?
 
-      if (!retryCache.has(wakeable)) {
-        {
-          if (wakeable.__reactDoNotTraceInteractions !== true) {
-            retry = tracing.unstable_wrap(retry);
-          }
+function invokeLayoutEffectMountInDEV(fiber) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListMount(Layout | HasEffect, fiber);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
+
+        break;
+      }
+
+      case ClassComponent: {
+        var instance = fiber.stateNode;
+
+        try {
+          instance.componentDidMount();
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
+
+        break;
+      }
+    }
+  }
+}
+
+function invokePassiveEffectMountInDEV(fiber) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListMount(Passive$1 | HasEffect, fiber);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
+
+        break;
+      }
+    }
+  }
+}
+
+function invokeLayoutEffectUnmountInDEV(fiber) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListUnmount(Layout | HasEffect, fiber, fiber.return);
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
         }
 
-        retryCache.add(wakeable);
-        wakeable.then(retry, retry);
+        break;
       }
-    });
-  }
-} // This function detects when a Suspense boundary goes from visible to hidden.
-// It returns false if the boundary is already hidden.
-// TODO: Use an effect tag.
 
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  if (current !== null) {
-    var oldState = current.memoizedState;
+      case ClassComponent: {
+        var instance = fiber.stateNode;
+
+        if (typeof instance.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(fiber, fiber.return, instance);
+        }
 
-    if (oldState === null || oldState.dehydrated !== null) {
-      var newState = finishedWork.memoizedState;
-      return newState !== null && newState.dehydrated === null;
+        break;
+      }
     }
   }
-
-  return false;
 }
 
-function commitResetTextContent(current) {
-  resetTextContent(current.stateNode);
+function invokePassiveEffectUnmountInDEV(fiber) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        try {
+          commitHookEffectListUnmount(
+            Passive$1 | HasEffect,
+            fiber,
+            fiber.return
+          );
+        } catch (error) {
+          reportUncaughtErrorInDEV(error);
+          captureCommitPhaseError(fiber, fiber.return, error);
+        }
+      }
+    }
+  }
 }
 
 var COMPONENT_TYPE = 0;
@@ -17675,28 +19344,23 @@ if (typeof Symbol === "function" && Symbol.for) {
 var ceil = Math.ceil;
 var ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
-  IsSomeRendererActing = ReactSharedInternals.IsSomeRendererActing;
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
+  ReactCurrentActQueue = ReactSharedInternals.ReactCurrentActQueue;
 var NoContext =
   /*             */
   0;
 var BatchedContext =
   /*               */
   1;
-var DiscreteEventContext =
-  /*         */
-  4;
-var LegacyUnbatchedContext =
-  /*       */
-  8;
 var RenderContext =
   /*                */
-  16;
+  2;
 var CommitContext =
   /*                */
-  32;
+  4;
 var RetryAfterError =
   /*       */
-  64;
+  8;
 var RootIncomplete = 0;
 var RootFatalErrored = 1;
 var RootErrored = 2;
@@ -17736,8 +19400,7 @@ var workInProgressRootSkippedLanes = NoLanes; // Lanes that were updated (in an
 
 var workInProgressRootUpdatedLanes = NoLanes; // Lanes that were pinged (in an interleaved event) during this render.
 
-var workInProgressRootPingedLanes = NoLanes;
-var mostRecentlyUpdatedRoot = null; // The most recent time we committed a fallback. This lets us ensure a train
+var workInProgressRootPingedLanes = NoLanes; // The most recent time we committed a fallback. This lets us ensure a train
 // model where we don't commit new loading states in too quick succession.
 
 var globalMostRecentFallbackTime = 0;
@@ -17756,40 +19419,24 @@ function resetRenderTimer() {
 function getRenderTargetTime() {
   return workInProgressRootRenderTargetTime;
 }
-var nextEffect = null;
 var hasUncaughtError = false;
 var firstUncaughtError = null;
-var legacyErrorBoundariesThatAlreadyFailed = null;
+var legacyErrorBoundariesThatAlreadyFailed = null; // Only used when enableProfilerNestedUpdateScheduledHook is true;
 var rootDoesHavePassiveEffects = false;
 var rootWithPendingPassiveEffects = null;
-var pendingPassiveEffectsRenderPriority = NoPriority$1;
 var pendingPassiveEffectsLanes = NoLanes;
-var pendingPassiveHookEffectsMount = [];
-var pendingPassiveHookEffectsUnmount = [];
-var rootsWithPendingDiscreteUpdates = null; // Use these to prevent an infinite loop of nested updates
+var pendingPassiveProfilerEffects = []; // Use these to prevent an infinite loop of nested updates
 
 var NESTED_UPDATE_LIMIT = 50;
 var nestedUpdateCount = 0;
 var rootWithNestedUpdates = null;
 var NESTED_PASSIVE_UPDATE_LIMIT = 50;
-var nestedPassiveUpdateCount = 0; // Marks the need to reschedule pending interactions at these lanes
-// during the commit phase. This enables them to be traced across components
-// that spawn new work during render. E.g. hidden boundaries, suspended SSR
-// hydration or SuspenseList.
-// TODO: Can use a bitmask instead of an array
-
-var spawnedWorkDuringRender = null; // If two updates are scheduled within the same event, we should treat their
+var nestedPassiveUpdateCount = 0; // If two updates are scheduled within the same event, we should treat their
 // event times as simultaneous, even if the actual clock time has advanced
 // between the first and second call.
 
 var currentEventTime = NoTimestamp;
-var currentEventWipLanes = NoLanes;
-var currentEventPendingLanes = NoLanes; // Dev only flag that tracks if passive effects are currently being flushed.
-// We warn about state updates for unmounted components differently in this case.
-
-var isFlushingPassiveEffects = false;
-var focusedInstanceHandle = null;
-var shouldFireAfterActiveInstanceBlur = false;
+var currentEventTransitionLane = NoLanes;
 function getWorkInProgressRoot() {
   return workInProgressRoot;
 }
@@ -17811,69 +19458,60 @@ function requestUpdateLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // The algorithm for assigning an update to a lane should be stable for all
-  // updates at the same priority within the same event. To do this, the inputs
-  // to the algorithm must be the same. For example, we use the `renderLanes`
-  // to avoid choosing a lane that is already in the middle of rendering.
-  //
-  // However, the "included" lanes could be mutated in between updates in the
-  // same event, like if you perform an update inside `flushSync`. Or any other
-  // code path that might call `prepareFreshStack`.
-  //
-  // The trick we use is to cache the first of each of these inputs within an
-  // event. Then reset the cached values once we can be sure the event is over.
-  // Our heuristic for that is whenever we enter a concurrent work loop.
-  //
-  // We'll do the same for `currentEventPendingLanes` below.
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
+  } else if (
+    (executionContext & RenderContext) !== NoContext &&
+    workInProgressRootRenderLanes !== NoLanes
+  ) {
+    // This is a render phase update. These are not officially supported. The
+    // old behavior is to give this the same "thread" (lanes) as
+    // whatever is currently rendering. So if you call `setState` on a component
+    // that happens later in the same render, it will flush. Ideally, we want to
+    // remove the special case and treat them as if they came from an
+    // interleaved event. Regardless, this pattern is not officially supported.
+    // This behavior is only a fallback. The flag only exists until we can roll
+    // out the setState warning, since existing code might accidentally rely on
+    // the current behavior.
+    return pickArbitraryLane(workInProgressRootRenderLanes);
   }
 
   var isTransition = requestCurrentTransition() !== NoTransition;
 
   if (isTransition) {
-    if (currentEventPendingLanes !== NoLanes) {
-      currentEventPendingLanes =
-        mostRecentlyUpdatedRoot !== null
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : NoLanes;
+    // The algorithm for assigning an update to a lane should be stable for all
+    // updates at the same priority within the same event. To do this, the
+    // inputs to the algorithm must be the same.
+    //
+    // The trick we use is to cache the first of each of these inputs within an
+    // event. Then reset the cached values once we can be sure the event is
+    // over. Our heuristic for that is whenever we enter a concurrent work loop.
+    if (currentEventTransitionLane === NoLane) {
+      // All transitions within the same event are assigned the same lane.
+      currentEventTransitionLane = claimNextTransitionLane();
     }
 
-    return findTransitionLane(currentEventWipLanes, currentEventPendingLanes);
-  } // TODO: Remove this dependency on the Scheduler priority.
-  // To do that, we're replacing it with an update lane priority.
-
-  var schedulerPriority = getCurrentPriorityLevel(); // The old behavior was using the priority level of the Scheduler.
-  // This couples React to the Scheduler internals, so we're replacing it
-  // with the currentUpdateLanePriority above. As an example of how this
-  // could be problematic, if we're not inside `Scheduler.runWithPriority`,
-  // then we'll get the priority of the current running Scheduler task,
-  // which is probably not what we want.
-
-  var lane;
+    return currentEventTransitionLane;
+  } // Updates originating inside certain React methods, like flushSync, have
+  // their priority set by tracking it with a context variable.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  if (
-    // TODO: Temporary. We're removing the concept of discrete updates.
-    (executionContext & DiscreteEventContext) !== NoContext &&
-    schedulerPriority === UserBlockingPriority$1
-  ) {
-    lane = findUpdateLane(InputDiscreteLanePriority, currentEventWipLanes);
-  } else {
-    var schedulerLanePriority = schedulerPriorityToLanePriority(
-      schedulerPriority
-    );
+  var updateLane = getCurrentUpdatePriority();
 
-    lane = findUpdateLane(schedulerLanePriority, currentEventWipLanes);
-  }
+  if (updateLane !== NoLane) {
+    return updateLane;
+  } // This update originated outside React. Ask the host environment for an
+  // appropriate priority, based on the type of event.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  return lane;
+  var eventLane = getCurrentEventPriority();
+  return eventLane;
 }
 
 function requestRetryLane(fiber) {
@@ -17883,19 +19521,11 @@ function requestRetryLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // See `requestUpdateLane` for explanation of `currentEventWipLanes`
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
   }
 
-  return findRetryLane(currentEventWipLanes);
+  return claimNextRetryLane();
 }
 
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -17904,8 +19534,13 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   var root = markUpdateLaneFromFiberToRoot(fiber, lane);
 
   if (root === null) {
-    warnAboutUpdateOnUnmountedFiberInDEV(fiber);
     return null;
+  }
+
+  {
+    if (isDevToolsPresent) {
+      addFiberToLanesMap(root, fiber, lane);
+    }
   } // Mark that the root has a pending update.
 
   markRootUpdated(root, lane, eventTime);
@@ -17916,7 +19551,7 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
     // phase update. In that case, we don't treat render phase updates as if
     // they were interleaved, for backwards compat reasons.
-    {
+    if ((executionContext & RenderContext) === NoContext) {
       workInProgressRootUpdatedLanes = mergeLanes(
         workInProgressRootUpdatedLanes,
         lane
@@ -17932,63 +19567,26 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       // already started rendering.
       markRootSuspended$1(root, workInProgressRootRenderLanes);
     }
-  } // TODO: requestUpdateLanePriority also reads the priority. Pass the
-  // priority as an argument to that function and this one.
-
-  var priorityLevel = getCurrentPriorityLevel();
-
-  if (lane === SyncLane) {
-    if (
-      // Check if we're inside unbatchedUpdates
-      (executionContext & LegacyUnbatchedContext) !== NoContext && // Check if we're not already rendering
-      (executionContext & (RenderContext | CommitContext)) === NoContext
-    ) {
-      // Register pending interactions on the root to avoid losing traced interaction data.
-      schedulePendingInteractions(root, lane); // This is a legacy edge case. The initial mount of a ReactDOM.render-ed
-      // root inside of batchedUpdates should be synchronous, but layout updates
-      // should be deferred until the end of the batch.
+  }
 
-      performSyncWorkOnRoot(root);
-    } else {
-      ensureRootIsScheduled(root, eventTime);
-      schedulePendingInteractions(root, lane);
+  ensureRootIsScheduled(root, eventTime);
 
-      if (executionContext === NoContext) {
-        // Flush the synchronous work now, unless we're already working or inside
-        // a batch. This is intentionally inside scheduleUpdateOnFiber instead of
-        // scheduleCallbackForFiber to preserve the ability to schedule a callback
-        // without immediately flushing it. We only do this for user-initiated
-        // updates, to preserve historical behavior of legacy mode.
-        resetRenderTimer();
-        flushSyncCallbackQueue();
-      }
-    }
-  } else {
-    // Schedule a discrete update but only if it's not Sync.
-    if (
-      (executionContext & DiscreteEventContext) !== NoContext && // Only updates at user-blocking priority or greater are considered
-      // discrete, even inside a discrete event.
-      (priorityLevel === UserBlockingPriority$1 ||
-        priorityLevel === ImmediatePriority$1)
-    ) {
-      // This is the result of a discrete event. Track the lowest priority
-      // discrete update per root so we can flush them early, if needed.
-      if (rootsWithPendingDiscreteUpdates === null) {
-        rootsWithPendingDiscreteUpdates = new Set([root]);
-      } else {
-        rootsWithPendingDiscreteUpdates.add(root);
-      }
-    } // Schedule other updates after in case the callback is sync.
+  if (
+    lane === SyncLane &&
+    executionContext === NoContext &&
+    (fiber.mode & ConcurrentMode) === NoMode && // Treat `act` as if it's inside `batchedUpdates`, even in legacy mode.
+    !ReactCurrentActQueue.isBatchingLegacy
+  ) {
+    // Flush the synchronous work now, unless we're already working or inside
+    // a batch. This is intentionally inside scheduleUpdateOnFiber instead of
+    // scheduleCallbackForFiber to preserve the ability to schedule a callback
+    // without immediately flushing it. We only do this for user-initiated
+    // updates, to preserve historical behavior of legacy mode.
+    resetRenderTimer();
+    flushSyncCallbacksOnlyInLegacyMode();
+  }
 
-    ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, lane);
-  } // We use this when assigning a lane for a transition inside
-  // `requestUpdateLane`. We assume it's the same as the root being updated,
-  // since in the common case of a single root app it probably is. If it's not
-  // the same root, then it's not a huge deal, we just might batch more stuff
-  // together more than necessary.
-
-  mostRecentlyUpdatedRoot = root;
+  return root;
 } // This is split into a separate function so we can mark a fiber with pending
 // work without treating it as a typical update that originates from an event;
 // e.g. retrying a Suspense boundary isn't an update, but it does schedule work
@@ -18010,7 +19608,7 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
     ) {
       warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
     }
-  } // Walk the parent path to the root and update the child expiration time.
+  } // Walk the parent path to the root and update the child lanes.
 
   var node = sourceFiber;
   var parent = sourceFiber.return;
@@ -18039,6 +19637,20 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   } else {
     return null;
   }
+}
+
+function isInterleavedUpdate(fiber, lane) {
+  return (
+    // TODO: Optimize slightly by comparing to root that fiber belongs to.
+    // Requires some refactoring. Not a big deal though since it's rare for
+    // concurrent apps to have more than a single root.
+    workInProgressRoot !== null &&
+    (fiber.mode & ConcurrentMode) !== NoMode && // If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),
+    // then don't treat this as an interleaved update. This pattern is
+    // accompanied by a warning but we haven't fully deprecated it yet. We can
+    // remove once the deferRenderPhaseUpdateToNextBatch flag is enabled.
+    (executionContext & RenderContext) === NoContext
+  );
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
 // of the existing task is the same as the priority of the next level that the
@@ -18054,51 +19666,101 @@ function ensureRootIsScheduled(root, currentTime) {
   var nextLanes = getNextLanes(
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : NoLanes
-  ); // This returns the priority level computed during the `getNextLanes` call.
-
-  var newCallbackPriority = returnNextLanesPriority();
+  );
 
   if (nextLanes === NoLanes) {
     // Special case: There's nothing to work on.
     if (existingCallbackNode !== null) {
-      cancelCallback(existingCallbackNode);
-      root.callbackNode = null;
-      root.callbackPriority = NoLanePriority;
+      cancelCallback$1(existingCallbackNode);
     }
 
+    root.callbackNode = null;
+    root.callbackPriority = NoLane;
     return;
-  } // Check if there's an existing task. We may be able to reuse it.
+  } // We use the highest priority lane to represent the priority of the callback.
 
-  if (existingCallbackNode !== null) {
-    var existingCallbackPriority = root.callbackPriority;
+  var newCallbackPriority = getHighestPriorityLane(nextLanes); // Check if there's an existing task. We may be able to reuse it.
 
-    if (existingCallbackPriority === newCallbackPriority) {
-      // The priority hasn't changed. We can reuse the existing task. Exit.
-      return;
-    } // The priority changed. Cancel the existing callback. We'll schedule a new
-    // one below.
+  var existingCallbackPriority = root.callbackPriority;
 
-    cancelCallback(existingCallbackNode);
+  if (
+    existingCallbackPriority === newCallbackPriority && // Special case related to `act`. If the currently scheduled task is a
+    // Scheduler task, rather than an `act` task, cancel it and re-scheduled
+    // on the `act` queue.
+    !(
+      ReactCurrentActQueue.current !== null &&
+      existingCallbackNode !== fakeActCallbackNode
+    )
+  ) {
+    {
+      // If we're going to re-use an existing task, it needs to exist.
+      // Assume that discrete update microtasks are non-cancellable and null.
+      // TODO: Temporary until we confirm this warning is not fired.
+      if (
+        existingCallbackNode == null &&
+        existingCallbackPriority !== SyncLane
+      ) {
+        error(
+          "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+    } // The priority hasn't changed. We can reuse the existing task. Exit.
+
+    return;
+  }
+
+  if (existingCallbackNode != null) {
+    // Cancel the existing callback. We'll schedule a new one below.
+    cancelCallback$1(existingCallbackNode);
   } // Schedule a new callback.
 
   var newCallbackNode;
 
-  if (newCallbackPriority === SyncLanePriority) {
+  if (newCallbackPriority === SyncLane) {
     // Special case: Sync React callbacks are scheduled on a special
     // internal queue
-    newCallbackNode = scheduleSyncCallback(
-      performSyncWorkOnRoot.bind(null, root)
-    );
-  } else if (newCallbackPriority === SyncBatchedLanePriority) {
-    newCallbackNode = scheduleCallback(
-      ImmediatePriority$1,
-      performSyncWorkOnRoot.bind(null, root)
-    );
+    if (root.tag === LegacyRoot) {
+      if (ReactCurrentActQueue.isBatchingLegacy !== null) {
+        ReactCurrentActQueue.didScheduleLegacyUpdate = true;
+      }
+
+      scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root));
+    } else {
+      scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root));
+    }
+
+    {
+      // Flush the queue in an Immediate task.
+      scheduleCallback$1(ImmediatePriority, flushSyncCallbacks);
+    }
+
+    newCallbackNode = null;
   } else {
-    var schedulerPriorityLevel = lanePriorityToSchedulerPriority(
-      newCallbackPriority
-    );
-    newCallbackNode = scheduleCallback(
+    var schedulerPriorityLevel;
+
+    switch (lanesToEventPriority(nextLanes)) {
+      case DiscreteEventPriority:
+        schedulerPriorityLevel = ImmediatePriority;
+        break;
+
+      case ContinuousEventPriority:
+        schedulerPriorityLevel = UserBlockingPriority;
+        break;
+
+      case DefaultEventPriority:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+
+      case IdleEventPriority:
+        schedulerPriorityLevel = IdlePriority;
+        break;
+
+      default:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+    }
+
+    newCallbackNode = scheduleCallback$1(
       schedulerPriorityLevel,
       performConcurrentWorkOnRoot.bind(null, root)
     );
@@ -18109,12 +19771,14 @@ function ensureRootIsScheduled(root, currentTime) {
 } // This is the entry point for every concurrent task, i.e. anything that
 // goes through Scheduler.
 
-function performConcurrentWorkOnRoot(root) {
-  // Since we know we're in a React event, we can clear the current
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  {
+    resetNestedUpdateFlag();
+  } // Since we know we're in a React event, we can clear the current
   // event time. The next update will compute a new event time.
+
   currentEventTime = NoTimestamp;
-  currentEventWipLanes = NoLanes;
-  currentEventPendingLanes = NoLanes;
+  currentEventTransitionLane = NoLanes;
 
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
@@ -18133,7 +19797,7 @@ function performConcurrentWorkOnRoot(root) {
       // there's a new task, or that there's no remaining work on this root.
       return null;
     }
-  } // Determine the next expiration time to work on, using the fields stored
+  } // Determine the next lanes to work on, using the fields stored
   // on the root.
 
   var lanes = getNextLanes(
@@ -18144,41 +19808,45 @@ function performConcurrentWorkOnRoot(root) {
   if (lanes === NoLanes) {
     // Defensive coding. This is never expected to happen.
     return null;
-  }
-
-  var exitStatus = renderRootConcurrent(root, lanes);
-
-  if (
-    includesSomeLane(
-      workInProgressRootIncludedLanes,
-      workInProgressRootUpdatedLanes
-    )
-  ) {
-    // The render included lanes that were updated during the render phase.
-    // For example, when unhiding a hidden tree, we include all the lanes
-    // that were previously skipped when the tree was hidden. That set of
-    // lanes is a superset of the lanes we started rendering with.
-    //
-    // So we'll throw out the current work and restart.
-    prepareFreshStack(root, NoLanes);
-  } else if (exitStatus !== RootIncomplete) {
+  } // We disable time-slicing in some cases: if the work has been CPU-bound
+  // for too long ("expired" work, to prevent starvation), or we're in
+  // sync-updates-by-default mode.
+  // TODO: We only check `didTimeout` defensively, to account for a Scheduler
+  // bug we're still investigating. Once the bug in Scheduler is fixed,
+  // we can remove this, since we track expiration ourselves.
+
+  var exitStatus =
+    shouldTimeSlice(root, lanes) && !didTimeout
+      ? renderRootConcurrent(root, lanes)
+      : renderRootSync(root, lanes);
+
+  if (exitStatus !== RootIncomplete) {
     if (exitStatus === RootErrored) {
+      var prevExecutionContext = executionContext;
       executionContext |= RetryAfterError; // If an error occurred during hydration,
       // discard server response and fall back to client side render.
 
       if (root.hydrate) {
         root.hydrate = false;
+
+        {
+          errorHydratingContainer(root.containerInfo);
+        }
+
         clearContainer(root.containerInfo);
       } // If something threw an error, try rendering one more time. We'll render
       // synchronously to block concurrent data mutations, and we'll includes
       // all pending updates are included. If it still fails after the second
       // attempt, we'll give up and commit the resulting tree.
 
-      lanes = getLanesToRetrySynchronouslyOnError(root);
+      var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-      if (lanes !== NoLanes) {
-        exitStatus = renderRootSync(root, lanes);
+      if (errorRetryLanes !== NoLanes) {
+        lanes = errorRetryLanes;
+        exitStatus = renderRootSync(root, errorRetryLanes);
       }
+
+      executionContext = prevExecutionContext;
     }
 
     if (exitStatus === RootFatalErrored) {
@@ -18337,62 +20005,51 @@ function markRootSuspended$1(root, suspendedLanes) {
 // through Scheduler
 
 function performSyncWorkOnRoot(root) {
+  {
+    syncNestedUpdateFlag();
+  }
+
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
   }
 
   flushPassiveEffects();
-  var lanes;
-  var exitStatus;
+  var lanes = getNextLanes(root, NoLanes);
 
-  if (
-    root === workInProgressRoot &&
-    includesSomeLane(root.expiredLanes, workInProgressRootRenderLanes)
-  ) {
-    // There's a partial tree, and at least one of its lanes has expired. Finish
-    // rendering it before rendering the rest of the expired work.
-    lanes = workInProgressRootRenderLanes;
-    exitStatus = renderRootSync(root, lanes);
-
-    if (
-      includesSomeLane(
-        workInProgressRootIncludedLanes,
-        workInProgressRootUpdatedLanes
-      )
-    ) {
-      // The render included lanes that were updated during the render phase.
-      // For example, when unhiding a hidden tree, we include all the lanes
-      // that were previously skipped when the tree was hidden. That set of
-      // lanes is a superset of the lanes we started rendering with.
-      //
-      // Note that this only happens when part of the tree is rendered
-      // concurrently. If the whole tree is rendered synchronously, then there
-      // are no interleaved events.
-      lanes = getNextLanes(root, lanes);
-      exitStatus = renderRootSync(root, lanes);
-    }
-  } else {
-    lanes = getNextLanes(root, NoLanes);
-    exitStatus = renderRootSync(root, lanes);
+  if (!includesSomeLane(lanes, SyncLane)) {
+    // There's no remaining sync work left.
+    ensureRootIsScheduled(root, now());
+    return null;
   }
 
+  var exitStatus = renderRootSync(root, lanes);
+
   if (root.tag !== LegacyRoot && exitStatus === RootErrored) {
+    var prevExecutionContext = executionContext;
     executionContext |= RetryAfterError; // If an error occurred during hydration,
     // discard server response and fall back to client side render.
 
     if (root.hydrate) {
       root.hydrate = false;
+
+      {
+        errorHydratingContainer(root.containerInfo);
+      }
+
       clearContainer(root.containerInfo);
     } // If something threw an error, try rendering one more time. We'll render
     // synchronously to block concurrent data mutations, and we'll includes
     // all pending updates are included. If it still fails after the second
     // attempt, we'll give up and commit the resulting tree.
 
-    lanes = getLanesToRetrySynchronouslyOnError(root);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-    if (lanes !== NoLanes) {
+    if (errorRetryLanes !== NoLanes) {
+      lanes = errorRetryLanes;
       exitStatus = renderRootSync(root, lanes);
     }
+
+    executionContext = prevExecutionContext;
   }
 
   if (exitStatus === RootFatalErrored) {
@@ -18413,7 +20070,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-
 function batchedUpdates$1(fn, a) {
   var prevExecutionContext = executionContext;
   executionContext |= BatchedContext;
@@ -18421,47 +20077,73 @@ function batchedUpdates$1(fn, a) {
   try {
     return fn(a);
   } finally {
-    executionContext = prevExecutionContext;
+    executionContext = prevExecutionContext; // If there were legacy sync updates, flush them at the end of the outer
+    // most batchedUpdates-like method.
 
-    if (executionContext === NoContext) {
-      // Flush the immediate callbacks that were scheduled during this batch
+    if (
+      executionContext === NoContext && // Treat `act` as if it's inside `batchedUpdates`, even in legacy mode.
+      !ReactCurrentActQueue.isBatchingLegacy
+    ) {
       resetRenderTimer();
-      flushSyncCallbackQueue();
+      flushSyncCallbacksOnlyInLegacyMode();
     }
   }
 }
-function flushSync(fn, a) {
+// Warning, this opts-out of checking the function body.
+
+// eslint-disable-next-line no-redeclare
+function flushSyncWithoutWarningIfAlreadyRendering(fn) {
+  // In legacy mode, we flush pending passive effects at the beginning of the
+  // next event, not at the end of the previous one.
+  if (
+    rootWithPendingPassiveEffects !== null &&
+    rootWithPendingPassiveEffects.tag === LegacyRoot &&
+    (executionContext & (RenderContext | CommitContext)) === NoContext
+  ) {
+    flushPassiveEffects();
+  }
+
   var prevExecutionContext = executionContext;
+  executionContext |= BatchedContext;
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
+  var previousPriority = getCurrentUpdatePriority();
 
-  if ((prevExecutionContext & (RenderContext | CommitContext)) !== NoContext) {
-    {
+  try {
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
+
+    if (fn) {
+      return fn();
+    } else {
+      return undefined;
+    }
+  } finally {
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
+    // Note that this will happen even if batchedUpdates is higher up
+    // the stack.
+
+    if ((executionContext & (RenderContext | CommitContext)) === NoContext) {
+      flushSyncCallbacks();
+    }
+  }
+} // Overload the definition to the two valid signatures.
+// Warning, this opts-out of checking the function body.
+
+// eslint-disable-next-line no-redeclare
+function flushSync(fn) {
+  {
+    if ((executionContext & (RenderContext | CommitContext)) !== NoContext) {
       error(
         "flushSync was called from inside a lifecycle method. React cannot " +
           "flush when React is already rendering. Consider moving this call to " +
           "a scheduler task or micro task."
       );
     }
-
-    return fn(a);
   }
 
-  executionContext |= BatchedContext;
-
-  {
-    try {
-      if (fn) {
-        return runWithPriority(ImmediatePriority$1, fn.bind(null, a));
-      } else {
-        return undefined;
-      }
-    } finally {
-      executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
-      // Note that this will happen even if batchedUpdates is higher up
-      // the stack.
-
-      flushSyncCallbackQueue();
-    }
-  }
+  return flushSyncWithoutWarningIfAlreadyRendering(fn);
 }
 function pushRenderLanes(fiber, lanes) {
   push(subtreeRenderLanesCursor, subtreeRenderLanes, fiber);
@@ -18506,10 +20188,7 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootSkippedLanes = NoLanes;
   workInProgressRootUpdatedLanes = NoLanes;
   workInProgressRootPingedLanes = NoLanes;
-
-  {
-    spawnedWorkDuringRender = null;
-  }
+  enqueueInterleavedUpdates();
 
   {
     ReactStrictModeWarnings.discardPendingWarnings();
@@ -18599,20 +20278,6 @@ function popDispatcher(prevDispatcher) {
   ReactCurrentDispatcher$2.current = prevDispatcher;
 }
 
-function pushInteractions(root) {
-  {
-    var prevInteractions = tracing.__interactionsRef.current;
-    tracing.__interactionsRef.current = root.memoizedInteractions;
-    return prevInteractions;
-  }
-}
-
-function popInteractions(prevInteractions) {
-  {
-    tracing.__interactionsRef.current = prevInteractions;
-  }
-}
-
 function markCommitTimeOfFallback() {
   globalMostRecentFallbackTime = now();
 }
@@ -18671,12 +20336,25 @@ function renderRootSync(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopSync();
@@ -18687,11 +20365,6 @@ function renderRootSync(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   executionContext = prevExecutionContext;
   popDispatcher(prevDispatcher);
 
@@ -18725,13 +20398,26 @@ function renderRootConcurrent(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     resetRenderTimer();
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopConcurrent();
@@ -18742,11 +20428,6 @@ function renderRootConcurrent(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   popDispatcher(prevDispatcher);
   executionContext = prevExecutionContext;
 
@@ -18825,56 +20506,15 @@ function completeUnitOfWork(unitOfWork) {
       resetCurrentFiber();
 
       if (next !== null) {
-        // Completing this fiber spawned new work. Work on that next.
-        workInProgress = next;
-        return;
-      }
-
-      resetChildLanes(completedWork);
-
-      if (
-        returnFiber !== null && // Do not append effects to parents if a sibling failed to complete
-        (returnFiber.flags & Incomplete) === NoFlags
-      ) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = completedWork.firstEffect;
-        }
-
-        if (completedWork.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork.firstEffect;
-          }
-
-          returnFiber.lastEffect = completedWork.lastEffect;
-        } // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if needed,
-        // by doing multiple passes over the effect list. We don't want to
-        // schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-
-        var flags = completedWork.flags; // Skip both NoWork and PerformedWork tags when creating the effect
-        // list. PerformedWork effect is read by React DevTools but shouldn't be
-        // committed.
-
-        if (flags > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork;
-          } else {
-            returnFiber.firstEffect = completedWork;
-          }
-
-          returnFiber.lastEffect = completedWork;
-        }
+        // Completing this fiber spawned new work. Work on that next.
+        workInProgress = next;
+        return;
       }
     } else {
       // This fiber did not complete because something threw. Pop values off
       // the stack without entering the complete phase. If this is a boundary,
       // capture values if possible.
-      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its expiration time.
+      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its lanes.
 
       if (_next !== null) {
         // If completing this work spawned new work, do that next. We'll come
@@ -18902,9 +20542,10 @@ function completeUnitOfWork(unitOfWork) {
       }
 
       if (returnFiber !== null) {
-        // Mark the parent fiber as incomplete and clear its effect list.
-        returnFiber.firstEffect = returnFiber.lastEffect = null;
+        // Mark the parent fiber as incomplete and clear its subtree flags.
         returnFiber.flags |= Incomplete;
+        returnFiber.subtreeFlags = NoFlags;
+        returnFiber.deletions = null;
       }
     }
 
@@ -18926,90 +20567,21 @@ function completeUnitOfWork(unitOfWork) {
   }
 }
 
-function resetChildLanes(completedWork) {
-  if (
-    // TODO: Move this check out of the hot path by moving `resetChildLanes`
-    // to switch statement in `completeWork`.
-    (completedWork.tag === LegacyHiddenComponent ||
-      completedWork.tag === OffscreenComponent) &&
-    completedWork.memoizedState !== null &&
-    !includesSomeLane(subtreeRenderLanes, OffscreenLane) &&
-    (completedWork.mode & ConcurrentMode) !== NoLanes
-  ) {
-    // The children of this component are hidden. Don't bubble their
-    // expiration times.
-    return;
-  }
-
-  var newChildLanes = NoLanes; // Bubble up the earliest expiration time.
-
-  if ((completedWork.mode & ProfileMode) !== NoMode) {
-    // In profiling mode, resetChildExpirationTime is also used to reset
-    // profiler durations.
-    var actualDuration = completedWork.actualDuration;
-    var treeBaseDuration = completedWork.selfBaseDuration; // When a fiber is cloned, its actualDuration is reset to 0. This value will
-    // only be updated if work is done on the fiber (i.e. it doesn't bailout).
-    // When work is done, it should bubble to the parent's actualDuration. If
-    // the fiber has not been cloned though, (meaning no work was done), then
-    // this value will reflect the amount of time spent working on a previous
-    // render. In that case it should not bubble. We determine whether it was
-    // cloned by comparing the child pointer.
-
-    var shouldBubbleActualDurations =
-      completedWork.alternate === null ||
-      completedWork.child !== completedWork.alternate.child;
-    var child = completedWork.child;
-
-    while (child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(child.lanes, child.childLanes)
-      );
-
-      if (shouldBubbleActualDurations) {
-        actualDuration += child.actualDuration;
-      }
-
-      treeBaseDuration += child.treeBaseDuration;
-      child = child.sibling;
-    }
-
-    var isTimedOutSuspense =
-      completedWork.tag === SuspenseComponent &&
-      completedWork.memoizedState !== null;
-
-    if (isTimedOutSuspense) {
-      // Don't count time spent in a timed out Suspense subtree as part of the base duration.
-      var primaryChildFragment = completedWork.child;
-
-      if (primaryChildFragment !== null) {
-        treeBaseDuration -= primaryChildFragment.treeBaseDuration;
-      }
-    }
-
-    completedWork.actualDuration = actualDuration;
-    completedWork.treeBaseDuration = treeBaseDuration;
-  } else {
-    var _child = completedWork.child;
+function commitRoot(root) {
+  // TODO: This no longer makes any sense. We already wrap the mutation and
+  // layout phases. Should be able to remove.
+  var previousUpdateLanePriority = getCurrentUpdatePriority();
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
 
-    while (_child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(_child.lanes, _child.childLanes)
-      );
-      _child = _child.sibling;
-    }
+  try {
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
+    commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    setCurrentUpdatePriority(previousUpdateLanePriority);
   }
 
-  completedWork.childLanes = newChildLanes;
-}
-
-function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(
-    ImmediatePriority$1,
-    commitRootImpl.bind(null, root, renderPriorityLevel)
-  );
   return null;
 }
 
@@ -19035,6 +20607,15 @@ function commitRootImpl(root, renderPriorityLevel) {
 
   if (finishedWork === null) {
     return null;
+  } else {
+    {
+      if (lanes === NoLanes) {
+        error(
+          "root.finishedLanes should not be empty during a commit. This is a " +
+            "bug in React."
+        );
+      }
+    }
   }
 
   root.finishedWork = null;
@@ -19047,52 +20628,57 @@ function commitRootImpl(root, renderPriorityLevel) {
   } // commitRoot never returns a continuation; it always finishes synchronously.
   // So we can clear these now to allow a new callback to be scheduled.
 
-  root.callbackNode = null; // Update the first and last pending times on this root. The new first
+  root.callbackNode = null;
+  root.callbackPriority = NoLane; // Update the first and last pending times on this root. The new first
   // pending time is whatever is left on the root fiber.
 
   var remainingLanes = mergeLanes(finishedWork.lanes, finishedWork.childLanes);
-  markRootFinished(root, remainingLanes); // Clear already finished discrete updates in case that a later call of
-  // `flushDiscreteUpdates` starts a useless render pass which may cancels
-  // a scheduled timeout.
-
-  if (rootsWithPendingDiscreteUpdates !== null) {
-    if (
-      !hasDiscreteLanes(remainingLanes) &&
-      rootsWithPendingDiscreteUpdates.has(root)
-    ) {
-      rootsWithPendingDiscreteUpdates.delete(root);
-    }
-  }
+  markRootFinished(root, remainingLanes);
 
   if (root === workInProgressRoot) {
     // We can reset these now that they are finished.
     workInProgressRoot = null;
     workInProgress = null;
     workInProgressRootRenderLanes = NoLanes;
-  } // Get the list of effects.
-
-  var firstEffect;
-
-  if (finishedWork.flags > PerformedWork) {
-    // A fiber's effect list consists only of its children, not itself. So if
-    // the root has an effect, we need to add it to the end of the list. The
-    // resulting list is the set that would belong to the root's parent, if it
-    // had one; that is, all the effects in the tree including the root.
-    if (finishedWork.lastEffect !== null) {
-      finishedWork.lastEffect.nextEffect = finishedWork;
-      firstEffect = finishedWork.firstEffect;
-    } else {
-      firstEffect = finishedWork;
-    }
-  } else {
-    // There is no effect on the root.
-    firstEffect = finishedWork.firstEffect;
-  }
+  } // If there are pending passive effects, schedule a callback to process them.
+  // Do this as early as possible, so it is queued before anything else that
+  // might get scheduled in the commit phase. (See #16714.)
+  // TODO: Delete all other places that schedule the passive effect callback
+  // They're redundant.
 
-  if (firstEffect !== null) {
+  if (
+    (finishedWork.subtreeFlags & PassiveMask) !== NoFlags ||
+    (finishedWork.flags & PassiveMask) !== NoFlags
+  ) {
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback$1(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
+    }
+  } // Check if there are any effects in the whole tree.
+  // TODO: This is left over from the effect list implementation, where we had
+  // to check for the existence of `firstEffect` to satisfy Flow. I think the
+  // only other reason this optimization exists is because it affects profiling.
+  // Reconsider whether this is necessary.
+
+  var subtreeHasEffects =
+    (finishedWork.subtreeFlags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+  var rootHasEffect =
+    (finishedWork.flags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+
+  if (subtreeHasEffects || rootHasEffect) {
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = getCurrentUpdatePriority();
+    setCurrentUpdatePriority(DiscreteEventPriority);
     var prevExecutionContext = executionContext;
-    executionContext |= CommitContext;
-    var prevInteractions = pushInteractions(root); // Reset this to null before calling lifecycles
+    executionContext |= CommitContext; // Reset this to null before calling lifecycles
 
     ReactCurrentOwner$2.current = null; // The commit phase is broken into several sub-phases. We do a separate pass
     // of the effect list for each phase: all mutation effects come before all
@@ -19101,58 +20687,18 @@ function commitRootImpl(root, renderPriorityLevel) {
     // state of the host tree right before we mutate it. This is where
     // getSnapshotBeforeUpdate is called.
 
-    focusedInstanceHandle = prepareForCommit(root.containerInfo);
-    shouldFireAfterActiveInstanceBlur = false;
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitBeforeMutationEffects, null);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(nextEffect, error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null); // We no longer need to track the active instance fiber
-
-    focusedInstanceHandle = null;
+    var shouldFireAfterActiveInstanceBlur = commitBeforeMutationEffects(
+      root,
+      finishedWork
+    );
 
     {
       // Mark the current commit time to be shared by all Profilers in this
       // batch. This enables them to be grouped later.
       recordCommitTime();
-    } // The next phase is the mutation phase, where we mutate the host tree.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(
-          null,
-          commitMutationEffects,
-          null,
-          root,
-          renderPriorityLevel
-        );
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error = clearCaughtError();
+    }
 
-          captureCommitPhaseError(nextEffect, _error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
+    commitMutationEffects(root, finishedWork, lanes);
 
     resetAfterCommit(root.containerInfo); // The work-in-progress tree is now the current tree. This must come after
     // the mutation phase, so that the previous tree is still current during
@@ -19160,38 +20706,15 @@ function commitRootImpl(root, renderPriorityLevel) {
     // work is current during componentDidMount/Update.
 
     root.current = finishedWork; // The next phase is the layout phase, where we call effects that read
-    // the host tree after it's been mutated. The idiomatic use case for this is
-    // layout, but class component lifecycles also fire here for legacy reasons.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitLayoutEffects, null, root, lanes);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error2 = clearCaughtError();
-
-          captureCommitPhaseError(nextEffect, _error2);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
 
-    nextEffect = null; // Tell Scheduler to yield at the end of the frame, so the browser has an
+    commitLayoutEffects(finishedWork, root, lanes);
     // opportunity to paint.
 
     requestPaint();
+    executionContext = prevExecutionContext; // Reset the priority to the previous non-sync value.
 
-    {
-      popInteractions(prevInteractions);
-    }
-
-    executionContext = prevExecutionContext;
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
   } else {
     // No effects.
     root.current = finishedWork; // Measure these anyway so the flamegraph explicitly shows that there were
@@ -19211,45 +20734,11 @@ function commitRootImpl(root, renderPriorityLevel) {
     rootDoesHavePassiveEffects = false;
     rootWithPendingPassiveEffects = root;
     pendingPassiveEffectsLanes = lanes;
-    pendingPassiveEffectsRenderPriority = renderPriorityLevel;
-  } else {
-    // We are done with the effect chain at this point so let's clear the
-    // nextEffect pointers to assist with GC. If we have passive effects, we'll
-    // clear this in flushPassiveEffects.
-    nextEffect = firstEffect;
-
-    while (nextEffect !== null) {
-      var nextNextEffect = nextEffect.nextEffect;
-      nextEffect.nextEffect = null;
-
-      if (nextEffect.flags & Deletion) {
-        detachFiberAfterEffects(nextEffect);
-      }
-
-      nextEffect = nextNextEffect;
-    }
   } // Read this again, since an effect might have updated it
 
   remainingLanes = root.pendingLanes; // Check if there's remaining work on this root
 
-  if (remainingLanes !== NoLanes) {
-    {
-      if (spawnedWorkDuringRender !== null) {
-        var expirationTimes = spawnedWorkDuringRender;
-        spawnedWorkDuringRender = null;
-
-        for (var i = 0; i < expirationTimes.length; i++) {
-          scheduleInteractions(
-            root,
-            expirationTimes[i],
-            root.memoizedInteractions
-          );
-        }
-      }
-
-      schedulePendingInteractions(root, remainingLanes);
-    }
-  } else {
+  if (remainingLanes === NoLanes) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
@@ -19257,17 +20746,16 @@ function commitRootImpl(root, renderPriorityLevel) {
 
   {
     if (!rootDidHavePassiveEffects) {
-      // If there are no passive effects, then we can complete the pending interactions.
-      // Otherwise, we'll wait until after the passive effects are flushed.
-      // Wait to do this until after remaining work has been scheduled,
-      // so that we don't prematurely signal complete for interactions when there's e.g. hidden work.
-      finishPendingInteractions(root, lanes);
+      commitDoubleInvokeEffectsInDEV(root.current, false);
     }
   }
 
-  if (remainingLanes === SyncLane) {
-    // Count the number of times the root synchronously re-renders without
+  if (includesSomeLane(remainingLanes, SyncLane)) {
+    {
+      markNestedUpdateScheduled();
+    } // Count the number of times the root synchronously re-renders without
     // finishing. If there are too many, it indicates an infinite update loop.
+
     if (root === rootWithNestedUpdates) {
       nestedUpdateCount++;
     } else {
@@ -19279,352 +20767,131 @@ function commitRootImpl(root, renderPriorityLevel) {
   }
 
   onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
+
+  {
+    if (isDevToolsPresent) {
+      root.memoizedUpdaters.clear();
+    }
+  }
   // additional work on this root is scheduled.
 
   ensureRootIsScheduled(root, now());
 
   if (hasUncaughtError) {
     hasUncaughtError = false;
-    var _error3 = firstUncaughtError;
+    var error$1 = firstUncaughtError;
     firstUncaughtError = null;
-    throw _error3;
-  }
-
-  if ((executionContext & LegacyUnbatchedContext) !== NoContext) {
-    // a ReactDOM.render-ed root inside of batchedUpdates. The commit fired
-    // synchronously, but layout updates should be deferred until the end
-    // of the batch.
-
-    return null;
-  } // If layout work was scheduled, flush it now.
-
-  flushSyncCallbackQueue();
-
-  return null;
-}
-
-function commitBeforeMutationEffects() {
-  while (nextEffect !== null) {
-    var current = nextEffect.alternate;
-
-    if (!shouldFireAfterActiveInstanceBlur && focusedInstanceHandle !== null) {
-      if ((nextEffect.flags & Deletion) !== NoFlags) {
-        if (doesFiberContain(nextEffect, focusedInstanceHandle)) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      } else {
-        // TODO: Move this out of the hot path using a dedicated effect tag.
-        if (
-          nextEffect.tag === SuspenseComponent &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle)
-        ) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      }
-    }
-
-    var flags = nextEffect.flags;
-
-    if ((flags & Snapshot) !== NoFlags) {
-      setCurrentFiber(nextEffect);
-      commitBeforeMutationLifeCycles(current, nextEffect);
-      resetCurrentFiber();
-    }
-
-    if ((flags & Passive) !== NoFlags) {
-      // If there are passive effects, schedule a callback to flush at
-      // the earliest opportunity.
-      if (!rootDoesHavePassiveEffects) {
-        rootDoesHavePassiveEffects = true;
-        scheduleCallback(NormalPriority$1, function() {
-          flushPassiveEffects();
-          return null;
-        });
-      }
-    }
-
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function commitMutationEffects(root, renderPriorityLevel) {
-  // TODO: Should probably move the bulk of this function to commitWork.
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
-
-    if (flags & ContentReset) {
-      commitResetTextContent(nextEffect);
-    }
-
-    if (flags & Ref) {
-      var current = nextEffect.alternate;
-
-      if (current !== null) {
-        commitDetachRef(current);
-      }
-    } // The following switch statement is only concerned about placement,
-    // updates, and deletions. To avoid needing to add a case for every possible
-    // bitmap value, we remove the secondary effects from the effect tag and
-    // switch on that value.
-
-    var primaryFlags = flags & (Placement | Update | Deletion | Hydrating);
-
-    switch (primaryFlags) {
-      case Placement: {
-        commitPlacement(nextEffect); // Clear the "placement" from effect tag so that we know that this is
-        // inserted, before any life-cycles like componentDidMount gets called.
-        // TODO: findDOMNode doesn't rely on this any more but isMounted does
-        // and isMounted is deprecated anyway so we should be able to kill this.
-
-        nextEffect.flags &= ~Placement;
-        break;
-      }
-
-      case PlacementAndUpdate: {
-        // Placement
-        commitPlacement(nextEffect); // Clear the "placement" from effect tag so that we know that this is
-        // inserted, before any life-cycles like componentDidMount gets called.
-
-        nextEffect.flags &= ~Placement; // Update
-
-        var _current = nextEffect.alternate;
-        commitWork(_current, nextEffect);
-        break;
-      }
-
-      case Hydrating: {
-        nextEffect.flags &= ~Hydrating;
-        break;
-      }
-
-      case HydratingAndUpdate: {
-        nextEffect.flags &= ~Hydrating; // Update
-
-        var _current2 = nextEffect.alternate;
-        commitWork(_current2, nextEffect);
-        break;
-      }
-
-      case Update: {
-        var _current3 = nextEffect.alternate;
-        commitWork(_current3, nextEffect);
-        break;
-      }
-
-      case Deletion: {
-        commitDeletion(root, nextEffect);
-        break;
-      }
-    }
-
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function commitLayoutEffects(root, committedLanes) {
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
-
-    if (flags & (Update | Callback)) {
-      var current = nextEffect.alternate;
-      commitLifeCycles(root, current, nextEffect);
-    }
-
-    {
-      if (flags & Ref) {
-        commitAttachRef(nextEffect);
-      }
-    }
-
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function flushPassiveEffects() {
-  // Returns whether passive effects were flushed.
-  if (pendingPassiveEffectsRenderPriority !== NoPriority$1) {
-    var priorityLevel =
-      pendingPassiveEffectsRenderPriority > NormalPriority$1
-        ? NormalPriority$1
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = NoPriority$1;
-
-    {
-      return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
-    }
-  }
-
-  return false;
-}
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-
-  {
-    fiber.flags |= PassiveUnmountPendingDev;
-    var alternate = fiber.alternate;
-
-    if (alternate !== null) {
-      alternate.flags |= PassiveUnmountPendingDev;
-    }
-  }
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-
-function invokePassiveEffectCreate(effect) {
-  var create = effect.create;
-  effect.destroy = create();
-}
-
-function flushPassiveEffectsImpl() {
-  if (rootWithPendingPassiveEffects === null) {
-    return false;
-  }
-
-  var root = rootWithPendingPassiveEffects;
-  var lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
-  pendingPassiveEffectsLanes = NoLanes;
-
-  if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
-    throw Error("Cannot flush passive effects while already rendering.");
-  }
-
-  {
-    isFlushingPassiveEffects = true;
-  }
-
-  var prevExecutionContext = executionContext;
-  executionContext |= CommitContext;
-  var prevInteractions = pushInteractions(root); // It's important that ALL pending passive effect destroy functions are called
-  // before ANY passive effect create functions are called.
-  // Otherwise effects in sibling components might interfere with each other.
-  // e.g. a destroy function in one component may unintentionally override a ref
-  // value set by a create function in another component.
-  // Layout effects have the same constraint.
-  // First pass: Destroy stale passive effects.
-
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var _effect = unmountEffects[i];
-    var fiber = unmountEffects[i + 1];
-    var destroy = _effect.destroy;
-    _effect.destroy = undefined;
-
-    {
-      fiber.flags &= ~PassiveUnmountPendingDev;
-      var alternate = fiber.alternate;
-
-      if (alternate !== null) {
-        alternate.flags &= ~PassiveUnmountPendingDev;
-      }
-    }
-
-    if (typeof destroy === "function") {
-      {
-        setCurrentFiber(fiber);
-
-        {
-          invokeGuardedCallback(null, destroy, null);
-        }
-
-        if (hasCaughtError()) {
-          if (!(fiber !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(fiber, error);
-        }
-
-        resetCurrentFiber();
-      }
-    }
-  } // Second pass: Create new passive effects.
-
-  var mountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
+    throw error$1;
+  } // If the passive effects are the result of a discrete render, flush them
+  // synchronously at the end of the current task so that the result is
+  // immediately observable. Otherwise, we assume that they are not
+  // order-dependent and do not need to be observed by external systems, so we
+  // can wait until after paint.
+  // TODO: We can optimize this by not scheduling the callback earlier. Since we
+  // currently schedule the callback in multiple places, will wait until those
+  // are consolidated.
 
-  for (var _i = 0; _i < mountEffects.length; _i += 2) {
-    var _effect2 = mountEffects[_i];
-    var _fiber = mountEffects[_i + 1];
+  if (
+    includesSomeLane(pendingPassiveEffectsLanes, SyncLane) &&
+    root.tag !== LegacyRoot
+  ) {
+    flushPassiveEffects();
+  } // If layout work was scheduled, flush it now.
 
-    {
-      setCurrentFiber(_fiber);
+  flushSyncCallbacks();
 
-      {
-        invokeGuardedCallback(null, invokePassiveEffectCreate, null, _effect2);
-      }
+  return null;
+}
 
-      if (hasCaughtError()) {
-        if (!(_fiber !== null)) {
-          throw Error("Should be working on an effect.");
-        }
+function flushPassiveEffects() {
+  // Returns whether passive effects were flushed.
+  // TODO: Combine this check with the one in flushPassiveEFfectsImpl. We should
+  // probably just combine the two functions. I believe they were only separate
+  // in the first place because we used to wrap it with
+  // `Scheduler.runWithPriority`, which accepts a function. But now we track the
+  // priority within React itself, so we can mutate the variable directly.
+  if (rootWithPendingPassiveEffects !== null) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes);
+    var priority = lowerEventPriority(DefaultEventPriority, renderPriority);
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    var previousPriority = getCurrentUpdatePriority();
 
-        var _error4 = clearCaughtError();
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      setCurrentUpdatePriority(priority);
+      return flushPassiveEffectsImpl();
+    } finally {
+      setCurrentUpdatePriority(previousPriority);
+      ReactCurrentBatchConfig$2.transition = prevTransition;
+    }
+  }
 
-        captureCommitPhaseError(_fiber, _error4);
-      }
+  return false;
+}
+function enqueuePendingPassiveProfilerEffect(fiber) {
+  {
+    pendingPassiveProfilerEffects.push(fiber);
 
-      resetCurrentFiber();
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback$1(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
     }
-  } // Note: This currently assumes there are no passive effects on the root fiber
-  // because the root is not part of its own effect list.
-  // This could change in the future.
-
-  var effect = root.current.firstEffect;
+  }
+}
 
-  while (effect !== null) {
-    var nextNextEffect = effect.nextEffect; // Remove nextEffect pointer to assist GC
+function flushPassiveEffectsImpl() {
+  if (rootWithPendingPassiveEffects === null) {
+    return false;
+  }
 
-    effect.nextEffect = null;
+  var root = rootWithPendingPassiveEffects;
+  rootWithPendingPassiveEffects = null; // TODO: This is sometimes out of sync with rootWithPendingPassiveEffects.
+  // Figure out why and fix it. It's not causing any known issues (probably
+  // because it's only used for profiling), but it's a refactor hazard.
 
-    if (effect.flags & Deletion) {
-      detachFiberAfterEffects(effect);
-    }
+  pendingPassiveEffectsLanes = NoLanes;
 
-    effect = nextNextEffect;
+  if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
+    throw Error("Cannot flush passive effects while already rendering.");
   }
 
+  var prevExecutionContext = executionContext;
+  executionContext |= CommitContext;
+  commitPassiveUnmountEffects(root.current);
+  commitPassiveMountEffects(root, root.current); // TODO: Move to commitPassiveMountEffects
+
   {
-    popInteractions(prevInteractions);
-    finishPendingInteractions(root, lanes);
+    var profilerEffects = pendingPassiveProfilerEffects;
+    pendingPassiveProfilerEffects = [];
+
+    for (var i = 0; i < profilerEffects.length; i++) {
+      var _fiber = profilerEffects[i];
+      commitPassiveEffectDurations(root, _fiber);
+    }
   }
 
   {
-    isFlushingPassiveEffects = false;
+    commitDoubleInvokeEffectsInDEV(root.current, true);
   }
 
   executionContext = prevExecutionContext;
-  flushSyncCallbackQueue(); // If additional passive effects were scheduled, increment a counter. If this
+  flushSyncCallbacks(); // If additional passive effects were scheduled, increment a counter. If this
   // exceeds the limit, we'll fire a warning.
 
   nestedPassiveUpdateCount =
-    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1;
+    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1; // TODO: Move to commitPassiveMountEffects
+
+  onPostCommitRoot(root);
+
+  {
+    var stateNode = root.current.stateNode;
+    stateNode.effectDuration = 0;
+    stateNode.passiveEffectDuration = 0;
+  }
+
   return true;
 }
 
@@ -19661,23 +20928,26 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   if (root !== null) {
     markRootUpdated(root, SyncLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, SyncLane);
   }
 }
 
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
   if (sourceFiber.tag === HostRoot) {
     // Error was thrown at the root. There is no parent, so the root
     // itself should capture it.
-    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
+    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error$1);
     return;
   }
 
-  var fiber = sourceFiber.return;
+  var fiber = null;
+
+  {
+    fiber = sourceFiber.return;
+  }
 
   while (fiber !== null) {
     if (fiber.tag === HostRoot) {
-      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error$1);
       return;
     } else if (fiber.tag === ClassComponent) {
       var ctor = fiber.type;
@@ -19688,7 +20958,7 @@ function captureCommitPhaseError(sourceFiber, error) {
         (typeof instance.componentDidCatch === "function" &&
           !isAlreadyFailedLegacyErrorBoundary(instance))
       ) {
-        var errorInfo = createCapturedValue(error, sourceFiber);
+        var errorInfo = createCapturedValue(error$1, sourceFiber);
         var update = createClassErrorUpdate(fiber, errorInfo, SyncLane);
         enqueueUpdate(fiber, update);
         var eventTime = requestEventTime();
@@ -19697,25 +20967,6 @@ function captureCommitPhaseError(sourceFiber, error) {
         if (root !== null) {
           markRootUpdated(root, SyncLane, eventTime);
           ensureRootIsScheduled(root, eventTime);
-          schedulePendingInteractions(root, SyncLane);
-        } else {
-          // This component has already been unmounted.
-          // We can't schedule any follow up work for the root because the fiber is already unmounted,
-          // but we can still call the log-only boundary so the error isn't swallowed.
-          //
-          // TODO This is only a temporary bandaid for the old reconciler fork.
-          // We can delete this special case once the new fork is merged.
-          if (
-            typeof instance.componentDidCatch === "function" &&
-            !isAlreadyFailedLegacyErrorBoundary(instance)
-          ) {
-            try {
-              instance.componentDidCatch(error, errorInfo);
-            } catch (errorToIgnore) {
-              // TODO Ignore this error? Rethrow it?
-              // This is kind of an edge case.
-            }
-          }
         }
 
         return;
@@ -19724,6 +20975,22 @@ function captureCommitPhaseError(sourceFiber, error) {
 
     fiber = fiber.return;
   }
+
+  {
+    // TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
+    // will fire for errors that are thrown by destroy functions inside deleted
+    // trees. What it should instead do is propagate the error to the parent of
+    // the deleted tree. In the meantime, do not add this warning to the
+    // allowlist; this is only for our internal use.
+    error(
+      "Internal React error: Attempted to capture a commit phase error " +
+        "inside a detached tree. This indicates a bug in React. Likely " +
+        "causes include deleting the same fiber more than once, committing an " +
+        "already-finished tree, or an inconsistent return pointer.\n\n" +
+        "Error message:\n\n%s",
+      error$1
+    );
+  }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
   var pingCache = root.pingCache;
@@ -19767,15 +21034,16 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
   }
 
   ensureRootIsScheduled(root, eventTime);
-  schedulePendingInteractions(root, pingedLanes);
 }
 
 function retryTimedOutBoundary(boundaryFiber, retryLane) {
   // The boundary fiber (a Suspense component or SuspenseList component)
   // previously was rendered in its fallback state. One of the promises that
   // suspended it has resolved, which means at least part of the tree was
-  // likely unblocked. Try rendering again, at a new expiration time.
+  // likely unblocked. Try rendering again, at a new lanes.
   if (retryLane === NoLane) {
+    // TODO: Assign this to `suspenseState.retryLane`? to avoid
+    // unnecessary entanglement?
     retryLane = requestRetryLane(boundaryFiber);
   } // TODO: Special case idle priority?
 
@@ -19785,7 +21053,6 @@ function retryTimedOutBoundary(boundaryFiber, retryLane) {
   if (root !== null) {
     markRootUpdated(root, retryLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, retryLane);
   }
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
@@ -19866,6 +21133,63 @@ function flushRenderPhaseStrictModeWarningsInDEV() {
   }
 }
 
+function commitDoubleInvokeEffectsInDEV(fiber, hasPassiveEffects) {
+  {
+    // TODO (StrictEffects) Should we set a marker on the root if it contains strict effects
+    // so we don't traverse unnecessarily? similar to subtreeFlags but just at the root level.
+    // Maybe not a big deal since this is DEV only behavior.
+    setCurrentFiber(fiber);
+    invokeEffectsInDev(fiber, MountLayoutDev, invokeLayoutEffectUnmountInDEV);
+
+    if (hasPassiveEffects) {
+      invokeEffectsInDev(
+        fiber,
+        MountPassiveDev,
+        invokePassiveEffectUnmountInDEV
+      );
+    }
+
+    invokeEffectsInDev(fiber, MountLayoutDev, invokeLayoutEffectMountInDEV);
+
+    if (hasPassiveEffects) {
+      invokeEffectsInDev(fiber, MountPassiveDev, invokePassiveEffectMountInDEV);
+    }
+
+    resetCurrentFiber();
+  }
+}
+
+function invokeEffectsInDev(firstChild, fiberFlags, invokeEffectFn) {
+  {
+    // We don't need to re-check StrictEffectsMode here.
+    // This function is only called if that check has already passed.
+    var current = firstChild;
+    var subtreeRoot = null;
+
+    while (current !== null) {
+      var primarySubtreeFlag = current.subtreeFlags & fiberFlags;
+
+      if (
+        current !== subtreeRoot &&
+        current.child !== null &&
+        primarySubtreeFlag !== NoFlags
+      ) {
+        current = current.child;
+      } else {
+        if ((current.flags & fiberFlags) !== NoFlags) {
+          invokeEffectFn(current);
+        }
+
+        if (current.sibling !== null) {
+          current = current.sibling;
+        } else {
+          current = subtreeRoot = current.return;
+        }
+      }
+    }
+  }
+}
+
 var didWarnStateUpdateForNotYetMountedComponent = null;
 
 function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
@@ -19875,7 +21199,7 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       return;
     }
 
-    if (!(fiber.mode & (BlockingMode | ConcurrentMode))) {
+    if (!(fiber.mode & ConcurrentMode)) {
       return;
     }
 
@@ -19888,15 +21212,14 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       tag !== FunctionComponent &&
       tag !== ForwardRef &&
       tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
+      tag !== SimpleMemoComponent
     ) {
       // Only warn for user-defined components, not internal ones like Suspense.
       return;
     } // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
 
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
+    var componentName = getComponentNameFromFiber(fiber) || "ReactComponent";
 
     if (didWarnStateUpdateForNotYetMountedComponent !== null) {
       if (didWarnStateUpdateForNotYetMountedComponent.has(componentName)) {
@@ -19929,69 +21252,6 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
   }
 }
 
-var didWarnStateUpdateForUnmountedComponent = null;
-
-function warnAboutUpdateOnUnmountedFiberInDEV(fiber) {
-  {
-    var tag = fiber.tag;
-
-    if (
-      tag !== HostRoot &&
-      tag !== ClassComponent &&
-      tag !== FunctionComponent &&
-      tag !== ForwardRef &&
-      tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
-    ) {
-      // Only warn for user-defined components, not internal ones like Suspense.
-      return;
-    } // If there are pending passive effects unmounts for this Fiber,
-    // we can assume that they would have prevented this update.
-
-    if ((fiber.flags & PassiveUnmountPendingDev) !== NoFlags) {
-      return;
-    } // We show the whole stack but dedupe on the top component's name because
-    // the problematic code almost always lies inside that component.
-
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
-
-    if (didWarnStateUpdateForUnmountedComponent !== null) {
-      if (didWarnStateUpdateForUnmountedComponent.has(componentName)) {
-        return;
-      }
-
-      didWarnStateUpdateForUnmountedComponent.add(componentName);
-    } else {
-      didWarnStateUpdateForUnmountedComponent = new Set([componentName]);
-    }
-
-    if (isFlushingPassiveEffects);
-    else {
-      var previousFiber = current;
-
-      try {
-        setCurrentFiber(fiber);
-
-        error(
-          "Can't perform a React state update on an unmounted component. This " +
-            "is a no-op, but it indicates a memory leak in your application. To " +
-            "fix, cancel all subscriptions and asynchronous tasks in %s.",
-          tag === ClassComponent
-            ? "the componentWillUnmount method"
-            : "a useEffect cleanup function"
-        );
-      } finally {
-        if (previousFiber) {
-          setCurrentFiber(fiber);
-        } else {
-          resetCurrentFiber();
-        }
-      }
-    }
-  }
-}
-
 var beginWork$1;
 
 {
@@ -20038,14 +21298,23 @@ var beginWork$1;
       invokeGuardedCallback(null, beginWork, null, current, unitOfWork, lanes);
 
       if (hasCaughtError()) {
-        var replayError = clearCaughtError(); // `invokeGuardedCallback` sometimes sets an expando `_suppressLogging`.
-        // Rethrow this error instead of the original one.
+        var replayError = clearCaughtError();
 
-        throw replayError;
-      } else {
-        // This branch is reachable if the render phase is impure.
-        throw originalError;
-      }
+        if (
+          typeof replayError === "object" &&
+          replayError !== null &&
+          replayError._suppressLogging &&
+          typeof originalError === "object" &&
+          originalError !== null &&
+          !originalError._suppressLogging
+        ) {
+          // If suppressed, let the flag carry over to the original error which is the one we'll rethrow.
+          originalError._suppressLogging = true;
+        }
+      } // We always throw the original error in case the second render pass is not idempotent.
+      // This can happen if a memoized function or CommonJS module doesn't throw after first invokation.
+
+      throw originalError;
     }
   };
 }
@@ -20069,7 +21338,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
         case ForwardRef:
         case SimpleMemoComponent: {
           var renderingComponentName =
-            (workInProgress && getComponentName(workInProgress.type)) ||
+            (workInProgress && getComponentNameFromFiber(workInProgress)) ||
             "Unknown"; // Dedupe by the rendering component because it's the one that needs to be fixed.
 
           var dedupeKey = renderingComponentName;
@@ -20077,7 +21346,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
           if (!didWarnAboutUpdateInRenderForAnotherComponent.has(dedupeKey)) {
             didWarnAboutUpdateInRenderForAnotherComponent.add(dedupeKey);
             var setStateComponentName =
-              getComponentName(fiber.type) || "Unknown";
+              getComponentNameFromFiber(fiber) || "Unknown";
 
             error(
               "Cannot update a component (`%s`) while rendering a " +
@@ -20108,53 +21377,60 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
       }
     }
   }
-} // a 'shared' variable that changes when act() opens/closes in tests.
+}
 
-var IsThisRendererActing = {
-  current: false
-};
-function warnIfNotScopedWithMatchingAct(fiber) {
+function restorePendingUpdaters(root, lanes) {
   {
-    if (
-      IsSomeRendererActing.current === true &&
-      IsThisRendererActing.current !== true
-    ) {
-      var previousFiber = current;
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      memoizedUpdaters.forEach(function(schedulingFiber) {
+        addFiberToLanesMap(root, schedulingFiber, lanes);
+      }); // This function intentionally does not clear memoized updaters.
+      // Those may still be relevant to the current commit
+      // and a future one (e.g. Suspense).
+    }
+  }
+}
+var fakeActCallbackNode = {};
 
-      try {
-        setCurrentFiber(fiber);
+function scheduleCallback$1(priorityLevel, callback) {
+  {
+    // If we're currently inside an `act` scope, bypass Scheduler and push to
+    // the `act` queue instead.
+    var actQueue = ReactCurrentActQueue.current;
 
-        error(
-          "It looks like you're using the wrong act() around your test interactions.\n" +
-          "Be sure to use the matching version of act() corresponding to your renderer:\n\n" +
-          "// for react-dom:\n" + // Break up imports to avoid accidentally parsing them as dependencies.
-          "import {act} fr" +
-          "om 'react-dom/test-utils';\n" +
-          "// ...\n" +
-          "act(() => ...);\n\n" +
-          "// for react-test-renderer:\n" + // Break up imports to avoid accidentally parsing them as dependencies.
-            "import TestRenderer fr" +
-            "om react-test-renderer';\n" +
-            "const {act} = TestRenderer;\n" +
-            "// ...\n" +
-            "act(() => ...);"
-        );
-      } finally {
-        if (previousFiber) {
-          setCurrentFiber(fiber);
-        } else {
-          resetCurrentFiber();
-        }
-      }
+    if (actQueue !== null) {
+      actQueue.push(callback);
+      return fakeActCallbackNode;
+    } else {
+      return scheduleCallback(priorityLevel, callback);
     }
   }
 }
+
+function cancelCallback$1(callbackNode) {
+  if (callbackNode === fakeActCallbackNode) {
+    return;
+  } // In production, always call Scheduler. This function will be stripped out.
+
+  return cancelCallback(callbackNode);
+}
+
+function shouldForceFlushFallbacksInDEV() {
+  // Never force flush in production. This function should get stripped out.
+  return ReactCurrentActQueue.current !== null;
+}
+
 function warnIfNotCurrentlyActingEffectsInDEV(fiber) {
   {
     if (
-      (fiber.mode & StrictMode) !== NoMode &&
-      IsSomeRendererActing.current === false &&
-      IsThisRendererActing.current === false
+      (fiber.mode & StrictLegacyMode) !== NoMode &&
+      ReactCurrentActQueue.current === null && // Our internal tests use a custom implementation of `act` that works by
+      // mocking the Scheduler package. Disable the `act` warning.
+      // TODO: Maybe the warning should be disabled by default, and then turned
+      // on at the testing frameworks layer? Instead of what we do now, which
+      // is check if a `jest` global is defined.
+      ReactCurrentActQueue.disableActWarning === false
     ) {
       error(
         "An update to %s ran an effect, but was not wrapped in act(...).\n\n" +
@@ -20167,238 +21443,53 @@ function warnIfNotCurrentlyActingEffectsInDEV(fiber) {
           "This ensures that you're testing the behavior the user would see " +
           "in the browser." +
           " Learn more at https://reactjs.org/link/wrap-tests-with-act",
-        getComponentName(fiber.type)
+        getComponentNameFromFiber(fiber)
       );
     }
   }
 }
 
-function warnIfNotCurrentlyActingUpdatesInDEV(fiber) {
-  {
-    if (
-      executionContext === NoContext &&
-      IsSomeRendererActing.current === false &&
-      IsThisRendererActing.current === false
-    ) {
-      var previousFiber = current;
-
-      try {
-        setCurrentFiber(fiber);
-
-        error(
-          "An update to %s inside a test was not wrapped in act(...).\n\n" +
-            "When testing, code that causes React state updates should be " +
-            "wrapped into act(...):\n\n" +
-            "act(() => {\n" +
-            "  /* fire events that update state */\n" +
-            "});\n" +
-            "/* assert on the output */\n\n" +
-            "This ensures that you're testing the behavior the user would see " +
-            "in the browser." +
-            " Learn more at https://reactjs.org/link/wrap-tests-with-act",
-          getComponentName(fiber.type)
-        );
-      } finally {
-        if (previousFiber) {
-          setCurrentFiber(fiber);
-        } else {
-          resetCurrentFiber();
-        }
-      }
-    }
-  }
-}
-
-var warnIfNotCurrentlyActingUpdatesInDev = warnIfNotCurrentlyActingUpdatesInDEV; // In tests, we want to enforce a mocked scheduler.
-
-var didWarnAboutUnmockedScheduler = false; // TODO Before we release concurrent mode, revisit this and decide whether a mocked
-// scheduler is the actual recommendation. The alternative could be a testing build,
-// a new lib, or whatever; we dunno just yet. This message is for early adopters
-// to get their tests right.
-
-function warnIfUnmockedScheduler(fiber) {
-  {
-    if (
-      didWarnAboutUnmockedScheduler === false &&
-      Scheduler.unstable_flushAllWithoutAsserting === undefined
-    ) {
-      if (fiber.mode & BlockingMode || fiber.mode & ConcurrentMode) {
-        didWarnAboutUnmockedScheduler = true;
-
-        error(
-          'In Concurrent or Sync modes, the "scheduler" module needs to be mocked ' +
-          "to guarantee consistent behaviour across tests and browsers. " +
-          "For example, with jest: \n" + // Break up requires to avoid accidentally parsing them as dependencies.
-            "jest.mock('scheduler', () => require" +
-            "('scheduler/unstable_mock'));\n\n" +
-            "For more info, visit https://reactjs.org/link/mock-scheduler"
-        );
-      } else {
-        didWarnAboutUnmockedScheduler = true;
-
-        error(
-          'Starting from React v18, the "scheduler" module will need to be mocked ' +
-          "to guarantee consistent behaviour across tests and browsers. " +
-          "For example, with jest: \n" + // Break up requires to avoid accidentally parsing them as dependencies.
-            "jest.mock('scheduler', () => require" +
-            "('scheduler/unstable_mock'));\n\n" +
-            "For more info, visit https://reactjs.org/link/mock-scheduler"
-        );
-      }
-    }
-  }
-}
-
-function computeThreadID(root, lane) {
-  // Interaction threads are unique per root and expiration time.
-  // NOTE: Intentionally unsound cast. All that matters is that it's a number
-  // and it represents a batch of work. Could make a helper function instead,
-  // but meh this is fine for now.
-  return lane * 1000 + root.interactionThreadID;
-}
-
-function markSpawnedWork(lane) {
-  if (spawnedWorkDuringRender === null) {
-    spawnedWorkDuringRender = [lane];
-  } else {
-    spawnedWorkDuringRender.push(lane);
-  }
-}
-
-function scheduleInteractions(root, lane, interactions) {
-  if (interactions.size > 0) {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    var pendingInteractions = pendingInteractionMap.get(lane);
-
-    if (pendingInteractions != null) {
-      interactions.forEach(function(interaction) {
-        if (!pendingInteractions.has(interaction)) {
-          // Update the pending async work count for previously unscheduled interaction.
-          interaction.__count++;
-        }
-
-        pendingInteractions.add(interaction);
-      });
-    } else {
-      pendingInteractionMap.set(lane, new Set(interactions)); // Update the pending async work count for the current interactions.
-
-      interactions.forEach(function(interaction) {
-        interaction.__count++;
-      });
-    }
-
-    var subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lane);
-      subscriber.onWorkScheduled(interactions, threadID);
-    }
-  }
-}
-
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-
-function startWorkOnPendingInteractions(root, lanes) {
-  // we can accurately attribute time spent working on it, And so that cascading
-  // work triggered during the render phase will be associated with it.
-
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    if (includesSomeLane(lanes, scheduledLane)) {
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
-    }
-  }); // Store the current set of interactions on the FiberRoot for a few reasons:
-  // We can re-use it in hot functions like performConcurrentWorkOnRoot()
-  // without having to recalculate it. We will also use it in commitWork() to
-  // pass to any Profiler onRender() hooks. This also provides DevTools with a
-  // way to access it when the onCommitRoot() hook is called.
-
-  root.memoizedInteractions = interactions;
-
-  if (interactions.size > 0) {
-    var subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lanes);
-
-      try {
-        subscriber.onWorkStarted(interactions, threadID);
-      } catch (error) {
-        // If the subscriber throws, rethrow it in a separate task
-        scheduleCallback(ImmediatePriority$1, function() {
-          throw error;
-        });
-      }
-    }
-  }
-}
-
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  var subscriber;
+function warnIfNotCurrentlyActingUpdatesInDEV(fiber) {
+  {
+    if (
+      executionContext === NoContext &&
+      ReactCurrentActQueue.current === null && // Our internal tests use a custom implementation of `act` that works by
+      // mocking the Scheduler package. Disable the `act` warning.
+      // TODO: Maybe the warning should be disabled by default, and then turned
+      // on at the testing frameworks layer? Instead of what we do now, which
+      // is check if a `jest` global is defined.
+      ReactCurrentActQueue.disableActWarning === false
+    ) {
+      var previousFiber = current;
 
-  try {
-    subscriber = tracing.__subscriberRef.current;
+      try {
+        setCurrentFiber(fiber);
 
-    if (subscriber !== null && root.memoizedInteractions.size > 0) {
-      // FIXME: More than one lane can finish in a single commit.
-      var threadID = computeThreadID(root, committedLanes);
-      subscriber.onWorkStopped(root.memoizedInteractions, threadID);
-    }
-  } catch (error) {
-    // If the subscriber throws, rethrow it in a separate task
-    scheduleCallback(ImmediatePriority$1, function() {
-      throw error;
-    });
-  } finally {
-    // Clear completed interactions from the pending Map.
-    // Unless the render was suspended or cascading work was scheduled,
-    // In which case– leave pending interactions until the subsequent render.
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      // Only decrement the pending interaction count if we're done.
-      // If there's still work at the current priority,
-      // That indicates that we are waiting for suspense data.
-      if (!includesSomeLane(remainingLanesAfterCommit, lane)) {
-        pendingInteractionMap.delete(lane);
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-
-          if (subscriber !== null && interaction.__count === 0) {
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error) {
-              // If the subscriber throws, rethrow it in a separate task
-              scheduleCallback(ImmediatePriority$1, function() {
-                throw error;
-              });
-            }
-          }
-        });
+        error(
+          "An update to %s inside a test was not wrapped in act(...).\n\n" +
+            "When testing, code that causes React state updates should be " +
+            "wrapped into act(...):\n\n" +
+            "act(() => {\n" +
+            "  /* fire events that update state */\n" +
+            "});\n" +
+            "/* assert on the output */\n\n" +
+            "This ensures that you're testing the behavior the user would see " +
+            "in the browser." +
+            " Learn more at https://reactjs.org/link/wrap-tests-with-act",
+          getComponentNameFromFiber(fiber)
+        );
+      } finally {
+        if (previousFiber) {
+          setCurrentFiber(fiber);
+        } else {
+          resetCurrentFiber();
+        }
       }
-    });
+    }
   }
-} // `act` testing API
-
-function shouldForceFlushFallbacksInDEV() {
-  // Never force flush in production. This function should get stripped out.
-  return actingUpdatesScopeDepth > 0;
 }
-// so we can tell if any async act() calls try to run in parallel.
 
-var actingUpdatesScopeDepth = 0;
-
-function detachFiberAfterEffects(fiber) {
-  fiber.sibling = null;
-  fiber.stateNode = null;
-}
+var warnIfNotCurrentlyActingUpdatesInDev = warnIfNotCurrentlyActingUpdatesInDEV;
 
 var resolveFamily = null; // $FlowFixMe Flow gets confused by a WeakSet feature check below.
 
@@ -20853,8 +21944,6 @@ var hasBadMapPolyfill;
   }
 }
 
-var debugCounter = 1;
-
 function FiberNode(tag, pendingProps, key, mode) {
   // Instance
   this.tag = tag;
@@ -20876,9 +21965,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.mode = mode; // Effects
 
   this.flags = NoFlags;
-  this.nextEffect = null;
-  this.firstEffect = null;
-  this.lastEffect = null;
+  this.subtreeFlags = NoFlags;
+  this.deletions = null;
   this.lanes = NoLanes;
   this.childLanes = NoLanes;
   this.alternate = null;
@@ -20911,7 +21999,6 @@ function FiberNode(tag, pendingProps, key, mode) {
 
   {
     // This isn't directly used but is handy for debugging internals:
-    this._debugID = debugCounter++;
     this._debugSource = null;
     this._debugOwner = null;
     this._debugNeedsRemount = false;
@@ -20991,7 +22078,6 @@ function createWorkInProgress(current, pendingProps) {
 
     {
       // DEV-only fields
-      workInProgress._debugID = current._debugID;
       workInProgress._debugSource = current._debugSource;
       workInProgress._debugOwner = current._debugOwner;
       workInProgress._debugHookTypes = current._debugHookTypes;
@@ -21005,11 +22091,10 @@ function createWorkInProgress(current, pendingProps) {
     workInProgress.type = current.type; // We already have an alternate.
     // Reset the effect tag.
 
-    workInProgress.flags = NoFlags; // The effect list is no longer valid.
+    workInProgress.flags = NoFlags; // The effects are no longer valid.
 
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
 
     {
       // We intentionally reset, rather than copy, actualDuration & actualStartTime.
@@ -21019,8 +22104,10 @@ function createWorkInProgress(current, pendingProps) {
       workInProgress.actualDuration = 0;
       workInProgress.actualStartTime = -1;
     }
-  }
+  } // Reset all effects except static ones.
+  // Static effects are not specific to a render.
 
+  workInProgress.flags = current.flags & StaticMask;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -21077,13 +22164,10 @@ function resetWorkInProgress(workInProgress, renderLanes) {
   // when they should be reading from current and writing to workInProgress.
   // We assume pendingProps, index, key, ref, return are still untouched to
   // avoid doing another reconciliation.
-  // Reset the effect tag but keep any Placement tags, since that's something
+  // Reset the effect flags but keep any Placement tags, since that's something
   // that child fiber is setting, not the reconciliation.
-  workInProgress.flags &= Placement; // The effect list is no longer valid.
+  workInProgress.flags &= StaticMask | Placement; // The effects are no longer valid.
 
-  workInProgress.nextEffect = null;
-  workInProgress.firstEffect = null;
-  workInProgress.lastEffect = null;
   var current = workInProgress.alternate;
 
   if (current === null) {
@@ -21091,6 +22175,7 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = NoLanes;
     workInProgress.lanes = renderLanes;
     workInProgress.child = null;
+    workInProgress.subtreeFlags = NoFlags;
     workInProgress.memoizedProps = null;
     workInProgress.memoizedState = null;
     workInProgress.updateQueue = null;
@@ -21108,6 +22193,8 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = current.childLanes;
     workInProgress.lanes = current.lanes;
     workInProgress.child = current.child;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
     workInProgress.memoizedProps = current.memoizedProps;
     workInProgress.memoizedState = current.memoizedState;
     workInProgress.updateQueue = current.updateQueue; // Needed because Blocks store data on type.
@@ -21134,13 +22221,32 @@ function resetWorkInProgress(workInProgress, renderLanes) {
 
   return workInProgress;
 }
-function createHostRootFiber(tag) {
+function createHostRootFiber(
+  tag,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var mode;
 
   if (tag === ConcurrentRoot) {
-    mode = ConcurrentMode | BlockingMode | StrictMode;
-  } else if (tag === BlockingRoot) {
-    mode = BlockingMode | StrictMode;
+    mode = ConcurrentMode;
+
+    if (isStrictMode === true) {
+      mode |= StrictLegacyMode;
+
+      {
+        mode |= StrictEffectsMode;
+      }
+    }
+
+    if (
+      // We only use this flag for our repo tests to check both behaviors.
+      // TODO: Flip this flag and rename it something like "forceConcurrentByDefaultForTesting"
+      // Only for internal experiments.
+      concurrentUpdatesByDefaultOverride
+    ) {
+      mode |= ConcurrentUpdatesByDefaultMode;
+    }
   } else {
     mode = NoMode;
   }
@@ -21192,7 +22298,13 @@ function createFiberFromTypeAndProps(
 
       case REACT_STRICT_MODE_TYPE:
         fiberTag = Mode;
-        mode |= StrictMode;
+        mode |= StrictLegacyMode;
+
+        if ((mode & ConcurrentMode) !== NoMode) {
+          // Strict effects should never run on legacy roots
+          mode |= StrictEffectsMode;
+        }
+
         break;
 
       case REACT_PROFILER_TYPE:
@@ -21214,6 +22326,10 @@ function createFiberFromTypeAndProps(
 
       // eslint-disable-next-line no-fallthrough
 
+      case REACT_CACHE_TYPE:
+
+      // eslint-disable-next-line no-fallthrough
+
       default: {
         if (typeof type === "object" && type !== null) {
           switch (type.$$typeof) {
@@ -21243,10 +22359,6 @@ function createFiberFromTypeAndProps(
               fiberTag = LazyComponent;
               resolvedType = null;
               break getTag;
-
-            case REACT_BLOCK_TYPE:
-              fiberTag = Block;
-              break getTag;
           }
         }
 
@@ -21265,7 +22377,7 @@ function createFiberFromTypeAndProps(
               "named imports.";
           }
 
-          var ownerName = owner ? getComponentName(owner.type) : null;
+          var ownerName = owner ? getComponentNameFromFiber(owner) : null;
 
           if (ownerName) {
             info += "\n\nCheck the render method of `" + ownerName + "`.";
@@ -21295,6 +22407,14 @@ function createFiberFromTypeAndProps(
 
   return fiber;
 }
+function createOffscreenHostContainerFiber(props, fiberMode, lanes, key) {
+  {
+    // Only implemented in persistent mode
+    {
+      throw Error("Not implemented.");
+    }
+  }
+}
 function createFiberFromElement(element, mode, lanes) {
   var owner = null;
 
@@ -21330,14 +22450,15 @@ function createFiberFromFragment(elements, mode, lanes, key) {
 function createFiberFromProfiler(pendingProps, mode, lanes, key) {
   {
     if (typeof pendingProps.id !== "string") {
-      error('Profiler must specify an "id" as a prop');
+      error(
+        'Profiler must specify an "id" of type `string` as a prop. Received the type `%s` instead.',
+        typeof pendingProps.id
+      );
     }
   }
 
-  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode); // TODO: The Profiler fiber shouldn't have a type. It has a tag.
-
+  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
   fiber.elementType = REACT_PROFILER_TYPE;
-  fiber.type = REACT_PROFILER_TYPE;
   fiber.lanes = lanes;
 
   {
@@ -21351,51 +22472,25 @@ function createFiberFromProfiler(pendingProps, mode, lanes, key) {
 }
 
 function createFiberFromSuspense(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode); // TODO: The SuspenseComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  fiber.type = REACT_SUSPENSE_TYPE;
+  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode);
   fiber.elementType = REACT_SUSPENSE_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromSuspenseList(pendingProps, mode, lanes, key) {
   var fiber = createFiber(SuspenseListComponent, pendingProps, key, mode);
-
-  {
-    // TODO: The SuspenseListComponent fiber shouldn't have a type. It has a tag.
-    // This needs to be fixed in getComponentName so that it relies on the tag
-    // instead.
-    fiber.type = REACT_SUSPENSE_LIST_TYPE;
-  }
-
   fiber.elementType = REACT_SUSPENSE_LIST_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode); // TODO: The OffscreenComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_OFFSCREEN_TYPE;
-  }
-
+  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_OFFSCREEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromLegacyHidden(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode); // TODO: The LegacyHidden fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_LEGACY_HIDDEN_TYPE;
-  }
-
+  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_LEGACY_HIDDEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
@@ -21446,9 +22541,8 @@ function assignFiberPropertiesInDEV(target, source) {
   target.dependencies = source.dependencies;
   target.mode = source.mode;
   target.flags = source.flags;
-  target.nextEffect = source.nextEffect;
-  target.firstEffect = source.firstEffect;
-  target.lastEffect = source.lastEffect;
+  target.subtreeFlags = source.subtreeFlags;
+  target.deletions = source.deletions;
   target.lanes = source.lanes;
   target.childLanes = source.childLanes;
   target.alternate = source.alternate;
@@ -21460,7 +22554,6 @@ function assignFiberPropertiesInDEV(target, source) {
     target.treeBaseDuration = source.treeBaseDuration;
   }
 
-  target._debugID = source._debugID;
   target._debugSource = source._debugSource;
   target._debugOwner = source._debugOwner;
   target._debugNeedsRemount = source._debugNeedsRemount;
@@ -21480,7 +22573,7 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.pendingContext = null;
   this.hydrate = hydrate;
   this.callbackNode = null;
-  this.callbackPriority = NoLanePriority;
+  this.callbackPriority = NoLane;
   this.eventTimes = createLaneMap(NoLanes);
   this.expirationTimes = createLaneMap(NoTimestamp);
   this.pendingLanes = NoLanes;
@@ -21493,17 +22586,21 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.entanglements = createLaneMap(NoLanes);
 
   {
-    this.interactionThreadID = tracing.unstable_getThreadID();
-    this.memoizedInteractions = new Set();
-    this.pendingInteractionMap = new Map();
+    this.effectDuration = 0;
+    this.passiveEffectDuration = 0;
   }
 
   {
-    switch (tag) {
-      case BlockingRoot:
-        this._debugRootType = "createBlockingRoot()";
-        break;
+    this.memoizedUpdaters = new Set();
+    var pendingUpdatersLaneMap = (this.pendingUpdatersLaneMap = []);
+
+    for (var i = 0; i < TotalLanes; i++) {
+      pendingUpdatersLaneMap.push(new Set());
+    }
+  }
 
+  {
+    switch (tag) {
       case ConcurrentRoot:
         this._debugRootType = "createRoot()";
         break;
@@ -21515,13 +22612,32 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   }
 }
 
-function createFiberRoot(containerInfo, tag, hydrate, hydrationCallbacks) {
+function createFiberRoot(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var root = new FiberRootNode(containerInfo, tag, hydrate);
   // stateNode is any.
 
-  var uninitializedFiber = createHostRootFiber(tag);
+  var uninitializedFiber = createHostRootFiber(
+    tag,
+    isStrictMode,
+    concurrentUpdatesByDefaultOverride
+  );
   root.current = uninitializedFiber;
   uninitializedFiber.stateNode = root;
+
+  {
+    var _initialState = {
+      element: null
+    };
+    uninitializedFiber.memoizedState = _initialState;
+  }
+
   initializeUpdateQueue(uninitializedFiber);
   return root;
 }
@@ -21595,8 +22711,8 @@ function findHostInstanceWithWarning(component, methodName) {
       return null;
     }
 
-    if (hostFiber.mode & StrictMode) {
-      var componentName = getComponentName(fiber.type) || "Component";
+    if (hostFiber.mode & StrictLegacyMode) {
+      var componentName = getComponentNameFromFiber(fiber) || "Component";
 
       if (!didWarnAboutFindNodeInStrictMode[componentName]) {
         didWarnAboutFindNodeInStrictMode[componentName] = true;
@@ -21605,7 +22721,7 @@ function findHostInstanceWithWarning(component, methodName) {
         try {
           setCurrentFiber(hostFiber);
 
-          if (fiber.mode & StrictMode) {
+          if (fiber.mode & StrictLegacyMode) {
             error(
               "%s is deprecated in StrictMode. " +
                 "%s was passed an instance of %s which is inside StrictMode. " +
@@ -21644,8 +22760,22 @@ function findHostInstanceWithWarning(component, methodName) {
   }
 }
 
-function createContainer(containerInfo, tag, hydrate, hydrationCallbacks) {
-  return createFiberRoot(containerInfo, tag, hydrate);
+function createContainer(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
+  return createFiberRoot(
+    containerInfo,
+    tag,
+    hydrate,
+    hydrationCallbacks,
+    isStrictMode,
+    concurrentUpdatesByDefaultOverride
+  );
 }
 function updateContainer(element, container, parentComponent, callback) {
   {
@@ -21654,15 +22784,6 @@ function updateContainer(element, container, parentComponent, callback) {
 
   var current$1 = container.current;
   var eventTime = requestEventTime();
-
-  {
-    // $FlowExpectedError - jest isn't a global, and isn't recognized outside of tests
-    if ("undefined" !== typeof jest) {
-      warnIfUnmockedScheduler(current$1);
-      warnIfNotScopedWithMatchingAct(current$1);
-    }
-  }
-
   var lane = requestUpdateLane(current$1);
 
   var context = getContextForSubtree(parentComponent);
@@ -21682,7 +22803,7 @@ function updateContainer(element, container, parentComponent, callback) {
           "triggering nested component updates from render is not allowed. " +
           "If necessary, trigger nested updates in componentDidUpdate.\n\n" +
           "Check the render method of %s.",
-        getComponentName(current.type) || "Unknown"
+        getComponentNameFromFiber(current) || "Unknown"
       );
     }
   }
@@ -21710,7 +22831,12 @@ function updateContainer(element, container, parentComponent, callback) {
   }
 
   enqueueUpdate(current$1, update);
-  scheduleUpdateOnFiber(current$1, lane, eventTime);
+  var root = scheduleUpdateOnFiber(current$1, lane, eventTime);
+
+  if (root !== null) {
+    entangleTransitions(root, current$1, lane);
+  }
+
   return lane;
 }
 function getPublicRootInstance(container) {
@@ -21729,6 +22855,14 @@ function getPublicRootInstance(container) {
   }
 }
 
+var shouldErrorImpl = function(fiber) {
+  return null;
+};
+
+function shouldError(fiber) {
+  return shouldErrorImpl(fiber);
+}
+
 var shouldSuspendImpl = function(fiber) {
   return false;
 };
@@ -21743,15 +22877,16 @@ var overrideProps = null;
 var overridePropsDeletePath = null;
 var overridePropsRenamePath = null;
 var scheduleUpdate = null;
+var setErrorHandler = null;
 var setSuspenseHandler = null;
 
 {
   var copyWithDeleteImpl = function(obj, path, index) {
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === path.length) {
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(key, 1);
       } else {
         delete updated[key];
@@ -21770,14 +22905,14 @@ var setSuspenseHandler = null;
 
   var copyWithRenameImpl = function(obj, oldPath, newPath, index) {
     var oldKey = oldPath[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === oldPath.length) {
       var newKey = newPath[index]; // $FlowFixMe number or string is fine here
 
       updated[newKey] = updated[oldKey];
 
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(oldKey, 1);
       } else {
         delete updated[oldKey];
@@ -21822,7 +22957,7 @@ var setSuspenseHandler = null;
     }
 
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
 
     updated[key] = copyWithSetImpl(obj[key], path, index + 1, value);
     return updated;
@@ -21930,6 +23065,10 @@ var setSuspenseHandler = null;
     scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
   };
 
+  setErrorHandler = function(newShouldErrorImpl) {
+    shouldErrorImpl = newShouldErrorImpl;
+  };
+
   setSuspenseHandler = function(newShouldSuspendImpl) {
     shouldSuspendImpl = newShouldSuspendImpl;
   };
@@ -21967,6 +23106,7 @@ function injectIntoDevTools(devToolsConfig) {
     overrideProps: overrideProps,
     overridePropsDeletePath: overridePropsDeletePath,
     overridePropsRenamePath: overridePropsRenamePath,
+    setErrorHandler: setErrorHandler,
     setSuspenseHandler: setSuspenseHandler,
     scheduleUpdate: scheduleUpdate,
     currentDispatcherRef: ReactCurrentDispatcher,
@@ -21979,7 +23119,10 @@ function injectIntoDevTools(devToolsConfig) {
     scheduleRoot: scheduleRoot,
     setRefreshHandler: setRefreshHandler,
     // Enables DevTools to append owner stacks to error messages in DEV mode.
-    getCurrentFiber: getCurrentFiberForDevTools
+    getCurrentFiber: getCurrentFiberForDevTools,
+    // Enables DevTools to detect reconciler version rather than renderer version
+    // which may not match for third party renderers.
+    reconcilerVersion: ReactVersion
   });
 }
 
@@ -21989,68 +23132,19 @@ var emptyObject$1 = {};
   Object.freeze(emptyObject$1);
 }
 
-var getInspectorDataForViewTag;
-var getInspectorDataForViewAtPoint;
-
-{
-  var traverseOwnerTreeUp = function(hierarchy, instance) {
-    if (instance) {
-      hierarchy.unshift(instance);
-      traverseOwnerTreeUp(hierarchy, instance._debugOwner);
-    }
-  };
-
-  var getOwnerHierarchy = function(instance) {
-    var hierarchy = [];
-    traverseOwnerTreeUp(hierarchy, instance);
-    return hierarchy;
-  };
-
-  var lastNonHostInstance = function(hierarchy) {
-    for (var i = hierarchy.length - 1; i > 1; i--) {
-      var instance = hierarchy[i];
-
-      if (instance.tag !== HostComponent) {
-        return instance;
-      }
-    }
-
-    return hierarchy[0];
-  };
-
-  var getHostProps = function(fiber) {
-    var host = findCurrentHostFiber(fiber);
-
-    if (host) {
-      return host.memoizedProps || emptyObject$1;
-    }
-
-    return emptyObject$1;
-  };
-
-  var getHostNode = function(fiber, findNodeHandle) {
-    var hostNode; // look for children first for the hostNode
-    // as composite fibers do not have a hostNode
-
-    while (fiber) {
-      if (fiber.stateNode !== null && fiber.tag === HostComponent) {
-        hostNode = findNodeHandle(fiber.stateNode);
-      }
-
-      if (hostNode) {
-        return hostNode;
-      }
-
-      fiber = fiber.child;
-    }
+var createHierarchy;
+var getHostNode;
+var getHostProps;
+var lastNonHostInstance;
 
-    return null;
-  };
+var getOwnerHierarchy;
+var traverseOwnerTreeUp;
 
-  var createHierarchy = function(fiberHierarchy) {
+{
+  createHierarchy = function(fiberHierarchy) {
     return fiberHierarchy.map(function(fiber) {
       return {
-        name: getComponentName(fiber.type),
+        name: getComponentNameFromType(fiber.type),
         getInspectorData: function(findNodeHandle) {
           return {
             props: getHostProps(fiber),
@@ -22078,7 +23172,36 @@ var getInspectorDataForViewAtPoint;
     });
   };
 
-  var getInspectorDataForInstance = function(closestInstance) {
+  getHostNode = function(fiber, findNodeHandle) {
+    var hostNode; // look for children first for the hostNode
+    // as composite fibers do not have a hostNode
+
+    while (fiber) {
+      if (fiber.stateNode !== null && fiber.tag === HostComponent) {
+        hostNode = findNodeHandle(fiber.stateNode);
+      }
+
+      if (hostNode) {
+        return hostNode;
+      }
+
+      fiber = fiber.child;
+    }
+
+    return null;
+  };
+
+  getHostProps = function(fiber) {
+    var host = findCurrentHostFiber(fiber);
+
+    if (host) {
+      return host.memoizedProps || emptyObject$1;
+    }
+
+    return emptyObject$1;
+  };
+
+  exports.getInspectorDataForInstance = function(closestInstance) {
     // Handle case where user clicks outside of ReactNative
     if (!closestInstance) {
       return {
@@ -22104,6 +23227,36 @@ var getInspectorDataForViewAtPoint;
     };
   };
 
+  getOwnerHierarchy = function(instance) {
+    var hierarchy = [];
+    traverseOwnerTreeUp(hierarchy, instance);
+    return hierarchy;
+  };
+
+  lastNonHostInstance = function(hierarchy) {
+    for (var i = hierarchy.length - 1; i > 1; i--) {
+      var instance = hierarchy[i];
+
+      if (instance.tag !== HostComponent) {
+        return instance;
+      }
+    }
+
+    return hierarchy[0];
+  };
+
+  traverseOwnerTreeUp = function(hierarchy, instance) {
+    if (instance) {
+      hierarchy.unshift(instance);
+      traverseOwnerTreeUp(hierarchy, instance._debugOwner);
+    }
+  };
+}
+
+var getInspectorDataForViewTag;
+var getInspectorDataForViewAtPoint;
+
+{
   getInspectorDataForViewTag = function(viewTag) {
     var closestInstance = getInstanceFromTag(viewTag); // Handle case where user clicks outside of ReactNative
 
@@ -22159,29 +23312,33 @@ var getInspectorDataForViewAtPoint;
                     height: 0
                   }
                 },
-                getInspectorDataForInstance(closestInstance)
+                exports.getInspectorDataForInstance(closestInstance)
               )
             );
           }
 
           closestInstance =
-            internalInstanceHandle.stateNode.canonical._internalInstanceHandle;
+            internalInstanceHandle.stateNode.canonical._internalInstanceHandle; // Note: this is deprecated and we want to remove it ASAP. Keeping it here for React DevTools compatibility for now.
+
+          var nativeViewTag =
+            internalInstanceHandle.stateNode.canonical._nativeTag;
           nativeFabricUIManager.measure(
             internalInstanceHandle.stateNode.node,
             function(x, y, width, height, pageX, pageY) {
+              var inspectorData = exports.getInspectorDataForInstance(
+                closestInstance
+              );
               callback(
-                Object.assign(
-                  {
-                    pointerY: locationY,
-                    frame: {
-                      left: pageX,
-                      top: pageY,
-                      width: width,
-                      height: height
-                    }
+                Object.assign({}, inspectorData, {
+                  pointerY: locationY,
+                  frame: {
+                    left: pageX,
+                    top: pageY,
+                    width: width,
+                    height: height
                   },
-                  getInspectorDataForInstance(closestInstance)
-                )
+                  touchedViewTag: nativeViewTag
+                })
               );
             }
           );
@@ -22193,7 +23350,7 @@ var getInspectorDataForViewAtPoint;
         findNodeHandle(inspectedView),
         [locationX, locationY],
         function(nativeViewTag, left, top, width, height) {
-          var inspectorData = getInspectorDataForInstance(
+          var inspectorData = exports.getInspectorDataForInstance(
             getInstanceFromTag(nativeViewTag)
           );
           callback(
@@ -22234,7 +23391,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -22270,7 +23427,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
   if (hostInstance.canonical) {
     // Fabric
     return hostInstance.canonical;
-  }
+  } // $FlowFixMe[incompatible-return]
 
   return hostInstance;
 }
@@ -22287,7 +23444,7 @@ function findNodeHandle(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -22345,12 +23502,12 @@ function dispatchCommand(handle, command, args) {
     return;
   }
 
-  if (handle._internalInstanceHandle) {
-    nativeFabricUIManager.dispatchCommand(
-      handle._internalInstanceHandle.stateNode.node,
-      command,
-      args
-    );
+  if (handle._internalInstanceHandle != null) {
+    var stateNode = handle._internalInstanceHandle.stateNode;
+
+    if (stateNode != null) {
+      nativeFabricUIManager.dispatchCommand(stateNode.node, command, args);
+    }
   } else {
     ReactNativePrivateInterface.UIManager.dispatchViewManagerCommand(
       handle._nativeTag,
@@ -22360,17 +23517,44 @@ function dispatchCommand(handle, command, args) {
   }
 }
 
+function sendAccessibilityEvent(handle, eventType) {
+  if (handle._nativeTag == null) {
+    {
+      error(
+        "sendAccessibilityEvent was called with a ref that isn't a " +
+          "native component. Use React.forwardRef to get access to the underlying native component"
+      );
+    }
+
+    return;
+  }
+
+  if (handle._internalInstanceHandle != null) {
+    var stateNode = handle._internalInstanceHandle.stateNode;
+
+    if (stateNode != null) {
+      nativeFabricUIManager.sendAccessibilityEvent(stateNode.node, eventType);
+    }
+  } else {
+    ReactNativePrivateInterface.legacySendAccessibilityEvent(
+      handle._nativeTag,
+      eventType
+    );
+  }
+}
+
 function render(element, containerTag, callback) {
   var root = roots.get(containerTag);
 
   if (!root) {
     // TODO (bvaughn): If we decide to keep the wrapper component,
     // We could create a wrapper for containerTag as well to reduce special casing.
-    root = createContainer(containerTag, LegacyRoot, false);
+    root = createContainer(containerTag, LegacyRoot, false, null, false, null);
     roots.set(containerTag, root);
   }
 
-  updateContainer(element, root, null, callback);
+  updateContainer(element, root, null, callback); // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
+
   return getPublicRootInstance(root);
 }
 
@@ -22433,6 +23617,7 @@ exports.dispatchCommand = dispatchCommand;
 exports.findHostInstance_DEPRECATED = findHostInstance_DEPRECATED;
 exports.findNodeHandle = findNodeHandle;
 exports.render = render;
+exports.sendAccessibilityEvent = sendAccessibilityEvent;
 exports.unmountComponentAtNode = unmountComponentAtNode;
 exports.unmountComponentAtNodeAndRemoveContainer = unmountComponentAtNodeAndRemoveContainer;
 exports.unstable_batchedUpdates = batchedUpdates;
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
index 773e112c1ff12c..557e1efd6dc47d 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactNativeRenderer-dev
  * @preventMunge
- * @generated
+ * @generated SignedSource<<2293994bcf1885347cabc2a323cb920e>>
  */
 
 'use strict';
@@ -21,7 +21,6 @@ var React = require("react");
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface");
 var Scheduler = require("scheduler");
-var tracing = require("scheduler/tracing");
 
 var ReactSharedInternals =
   React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
@@ -381,6 +380,12 @@ function clearCaughtError() {
   }
 }
 
+var isArrayImpl = Array.isArray; // eslint-disable-next-line no-redeclare
+
+function isArray(a) {
+  return isArrayImpl(a);
+}
+
 var getFiberCurrentPropsFromNode = null;
 var getInstanceFromNode = null;
 var getNodeFromInstance = null;
@@ -408,13 +413,13 @@ var validateEventDispatches;
   validateEventDispatches = function(event) {
     var dispatchListeners = event._dispatchListeners;
     var dispatchInstances = event._dispatchInstances;
-    var listenersIsArr = Array.isArray(dispatchListeners);
+    var listenersIsArr = isArray(dispatchListeners);
     var listenersLen = listenersIsArr
       ? dispatchListeners.length
       : dispatchListeners
       ? 1
       : 0;
-    var instancesIsArr = Array.isArray(dispatchInstances);
+    var instancesIsArr = isArray(dispatchInstances);
     var instancesLen = instancesIsArr
       ? dispatchInstances.length
       : dispatchInstances
@@ -451,7 +456,7 @@ function executeDispatchesInOrder(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -482,7 +487,7 @@ function executeDispatchesInOrderStopAtTrueImpl(event) {
     validateEventDispatches(event);
   }
 
-  if (Array.isArray(dispatchListeners)) {
+  if (isArray(dispatchListeners)) {
     for (var i = 0; i < dispatchListeners.length; i++) {
       if (event.isPropagationStopped()) {
         break;
@@ -528,7 +533,7 @@ function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners;
   var dispatchInstance = event._dispatchInstances;
 
-  if (!!Array.isArray(dispatchListener)) {
+  if (!!isArray(dispatchListener)) {
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   }
 
@@ -1085,8 +1090,19 @@ function printTouchBank() {
   return printed;
 }
 
+var instrumentationCallback;
 var ResponderTouchHistoryStore = {
+  /**
+   * Registers a listener which can be used to instrument every touch event.
+   */
+  instrument: function(callback) {
+    instrumentationCallback = callback;
+  },
   recordTouchTrack: function(topLevelType, nativeEvent) {
+    if (instrumentationCallback != null) {
+      instrumentationCallback(topLevelType, nativeEvent);
+    }
+
     if (isMoveish(topLevelType)) {
       nativeEvent.changedTouches.forEach(recordTouchMove);
     } else if (isStartish(topLevelType)) {
@@ -1144,11 +1160,11 @@ function accumulate(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
+  if (isArray(current)) {
     return current.concat(next);
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     return [current].concat(next);
   }
 
@@ -1180,8 +1196,8 @@ function accumulateInto(current, next) {
   } // Both are not empty. Warning: Never call x.concat(y) when you are not
   // certain that x is an Array (x could be a string with concat method).
 
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) {
+  if (isArray(current)) {
+    if (isArray(next)) {
       current.push.apply(current, next);
       return current;
     }
@@ -1190,7 +1206,7 @@ function accumulateInto(current, next) {
     return current;
   }
 
-  if (Array.isArray(next)) {
+  if (isArray(next)) {
     // A bit too dangerous to mutate `next`.
     return [current].concat(next);
   }
@@ -1238,11 +1254,10 @@ var LazyComponent = 16;
 var IncompleteClassComponent = 17;
 var DehydratedFragment = 18;
 var SuspenseListComponent = 19;
-var FundamentalComponent = 20;
 var ScopeComponent = 21;
-var Block = 22;
-var OffscreenComponent = 23;
-var LegacyHiddenComponent = 24;
+var OffscreenComponent = 22;
+var LegacyHiddenComponent = 23;
+var CacheComponent = 24;
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -2539,7 +2554,6 @@ function batchedUpdates(fn, bookkeeping) {
 function setBatchingImplementation(
   _batchedUpdatesImpl,
   _discreteUpdatesImpl,
-  _flushDiscreteUpdatesImpl,
   _batchedEventUpdatesImpl
 ) {
   batchedUpdatesImpl = _batchedUpdatesImpl;
@@ -2866,14 +2880,12 @@ var REACT_SUSPENSE_TYPE = 0xead1;
 var REACT_SUSPENSE_LIST_TYPE = 0xead8;
 var REACT_MEMO_TYPE = 0xead3;
 var REACT_LAZY_TYPE = 0xead4;
-var REACT_BLOCK_TYPE = 0xead9;
-var REACT_SERVER_BLOCK_TYPE = 0xeada;
-var REACT_FUNDAMENTAL_TYPE = 0xead5;
 var REACT_SCOPE_TYPE = 0xead7;
 var REACT_OPAQUE_ID_TYPE = 0xeae0;
 var REACT_DEBUG_TRACING_MODE_TYPE = 0xeae1;
 var REACT_OFFSCREEN_TYPE = 0xeae2;
 var REACT_LEGACY_HIDDEN_TYPE = 0xeae3;
+var REACT_CACHE_TYPE = 0xeae4;
 
 if (typeof Symbol === "function" && Symbol.for) {
   var symbolFor = Symbol.for;
@@ -2889,14 +2901,12 @@ if (typeof Symbol === "function" && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
-  REACT_SERVER_BLOCK_TYPE = symbolFor("react.server.block");
-  REACT_FUNDAMENTAL_TYPE = symbolFor("react.fundamental");
   REACT_SCOPE_TYPE = symbolFor("react.scope");
   REACT_OPAQUE_ID_TYPE = symbolFor("react.opaque.id");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
@@ -2918,18 +2928,23 @@ function getIteratorFn(maybeIterable) {
 }
 
 function getWrappedName(outerType, innerType, wrapperName) {
+  var displayName = outerType.displayName;
+
+  if (displayName) {
+    return displayName;
+  }
+
   var functionName = innerType.displayName || innerType.name || "";
-  return (
-    outerType.displayName ||
-    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
-  );
-}
+  return functionName !== ""
+    ? wrapperName + "(" + functionName + ")"
+    : wrapperName;
+} // Keep in sync with react-reconciler/getComponentNameFromFiber
 
 function getContextName(type) {
   return type.displayName || "Context";
-}
+} // Note that the reconciler package should generally prefer to use getComponentNameFromFiber() instead.
 
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (type == null) {
     // Host root, text node or just invalid type.
     return null;
@@ -2938,7 +2953,7 @@ function getComponentName(type) {
   {
     if (typeof type.tag === "number") {
       error(
-        "Received an unexpected object in getComponentName(). " +
+        "Received an unexpected object in getComponentNameFromType(). " +
           "This is likely a bug in React. Please file an issue."
       );
     }
@@ -2970,6 +2985,9 @@ function getComponentName(type) {
 
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
 
   if (typeof type === "object") {
@@ -2986,10 +3004,13 @@ function getComponentName(type) {
         return getWrappedName(type, type.render, "ForwardRef");
 
       case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
+        var outerName = type.displayName || null;
+
+        if (outerName !== null) {
+          return outerName;
+        }
 
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
+        return getComponentNameFromType(type.type) || "Memo";
 
       case REACT_LAZY_TYPE: {
         var lazyComponent = type;
@@ -2997,7 +3018,7 @@ function getComponentName(type) {
         var init = lazyComponent._init;
 
         try {
-          return getComponentName(init(payload));
+          return getComponentNameFromType(init(payload));
         } catch (x) {
           return null;
         }
@@ -3008,10 +3029,113 @@ function getComponentName(type) {
   return null;
 }
 
+function getWrappedName$1(outerType, innerType, wrapperName) {
+  var functionName = innerType.displayName || innerType.name || "";
+  return (
+    outerType.displayName ||
+    (functionName !== "" ? wrapperName + "(" + functionName + ")" : wrapperName)
+  );
+} // Keep in sync with shared/getComponentNameFromType
+
+function getContextName$1(type) {
+  return type.displayName || "Context";
+}
+
+function getComponentNameFromFiber(fiber) {
+  var tag = fiber.tag,
+    type = fiber.type;
+
+  switch (tag) {
+    case CacheComponent:
+      return "Cache";
+
+    case ContextConsumer:
+      var context = type;
+      return getContextName$1(context) + ".Consumer";
+
+    case ContextProvider:
+      var provider = type;
+      return getContextName$1(provider._context) + ".Provider";
+
+    case DehydratedFragment:
+      return "DehydratedFragment";
+
+    case ForwardRef:
+      return getWrappedName$1(type, type.render, "ForwardRef");
+
+    case Fragment:
+      return "Fragment";
+
+    case HostComponent:
+      // Host component type is the display name (e.g. "div", "View")
+      return type;
+
+    case HostPortal:
+      return "Portal";
+
+    case HostRoot:
+      return "Root";
+
+    case HostText:
+      return "Text";
+
+    case LazyComponent:
+      // Name comes from the type in this case; we don't have a tag.
+      return getComponentNameFromType(type);
+
+    case LegacyHiddenComponent:
+      return "LegacyHidden";
+
+    case Mode:
+      if (type === REACT_STRICT_MODE_TYPE) {
+        // Don't be less specific than shared/getComponentNameFromType
+        return "StrictMode";
+      }
+
+      return "Mode";
+
+    case OffscreenComponent:
+      return "Offscreen";
+
+    case Profiler:
+      return "Profiler";
+
+    case ScopeComponent:
+      return "Scope";
+
+    case SuspenseComponent:
+      return "Suspense";
+
+    case SuspenseListComponent:
+      return "SuspenseList";
+    // The display name for this tags come from the user-provided type:
+
+    case ClassComponent:
+    case FunctionComponent:
+    case IncompleteClassComponent:
+    case IndeterminateComponent:
+    case MemoComponent:
+    case SimpleMemoComponent:
+      if (typeof type === "function") {
+        return type.displayName || type.name || null;
+      }
+
+      if (typeof type === "string") {
+        return type;
+      }
+
+      break;
+  }
+
+  return null;
+}
+
 var enableProfilerTimer = true;
-var enableFundamentalAPI = false;
+var enableProfilerCommitHooks = true;
+var enableLazyElements = false;
 var warnAboutStringRefs = false;
 var enableNewReconciler = false;
+var enableLazyContextPropagation = false;
 
 // Don't change these two values. They're used by React Dev Tools.
 var NoFlags =
@@ -3029,53 +3153,86 @@ var Update =
   4;
 var PlacementAndUpdate =
   /*           */
-  6;
-var Deletion =
-  /*                     */
-  8;
+  Placement | Update;
+var ChildDeletion =
+  /*                */
+  16;
 var ContentReset =
   /*                 */
-  16;
+  32;
 var Callback =
   /*                     */
-  32;
+  64;
 var DidCapture =
   /*                   */
-  64;
+  128;
 var Ref =
   /*                          */
-  128;
+  256;
 var Snapshot =
   /*                     */
-  256;
+  512;
 var Passive =
   /*                      */
-  512;
+  1024;
 var Hydrating =
   /*                    */
-  1024;
+  2048;
 var HydratingAndUpdate =
   /*           */
-  1028;
+  Hydrating | Update;
+var Visibility =
+  /*                   */
+  4096;
 var LifecycleEffectMask = Passive | Update | Callback | Ref | Snapshot; // Union of all commit flags (flags with the lifetime of a particular commit)
 
 var HostEffectMask =
   /*               */
-  4095; // These are not really side effects, but we still reuse this field.
+  8191; // These are not really side effects, but we still reuse this field.
 
 var Incomplete =
   /*                   */
-  4096;
+  8192;
 var ShouldCapture =
   /*                */
-  8192; // TODO (effects) Remove this bit once the new reconciler is synced to the old.
-
-var PassiveUnmountPendingDev =
-  /*     */
   16384;
 var ForceUpdateForLegacySuspense =
   /* */
-  32768; // Static tags describe aspects of a fiber that are not specific to a render,
+  32768;
+// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
+// This enables us to defer more work in the unmount case,
+// since we can defer traversing the tree during layout to look for Passive effects,
+// and instead rely on the static flag as a signal that there may be cleanup work.
+
+var RefStatic =
+  /*                    */
+  262144;
+var LayoutStatic =
+  /*                 */
+  524288;
+var PassiveStatic =
+  /*                */
+  1048576; // These flags allow us to traverse to fibers that have effects on mount
+// don't contain effects, by checking subtreeFlags.
+
+var BeforeMutationMask = // TODO: Remove Update flag from before mutation phase by re-landing Visiblity
+  // flag logic (see #20043)
+  Update | Snapshot | 0;
+var MutationMask =
+  Placement |
+  Update |
+  ChildDeletion |
+  ContentReset |
+  Ref |
+  Hydrating |
+  Visibility;
+var LayoutMask = Update | Callback | Ref; // TODO: Split into PassiveMountMask and PassiveUnmountMask
+
+var PassiveMask = Passive | ChildDeletion; // Union of tags that don't get reset on clones.
+// This allows certain concepts to persist without recalculting them,
+// e.g. whether a subtree contains passive effects or portals.
+
+var StaticMask = LayoutStatic | PassiveStatic | RefStatic;
 
 var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 function getNearestMountedFiber(fiber) {
@@ -3132,7 +3289,7 @@ function isMounted(component) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(ownerFiber.type) || "A component"
+          getComponentNameFromFiber(ownerFiber) || "A component"
         );
       }
 
@@ -3315,54 +3472,30 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   var currentParent = findCurrentFiberUsingSlowPath(parent);
+  return currentParent !== null
+    ? findCurrentHostFiberImpl(currentParent)
+    : null;
+}
 
-  if (!currentParent) {
-    return null;
-  } // Next we'll drill down this component to find the first HostComponent/Text.
-
-  var node = currentParent;
-
-  while (true) {
-    if (node.tag === HostComponent || node.tag === HostText) {
-      return node;
-    } else if (node.child) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-
-    if (node === currentParent) {
-      return null;
-    }
-
-    while (!node.sibling) {
-      if (!node.return || node.return === currentParent) {
-        return null;
-      }
-
-      node = node.return;
-    }
+function findCurrentHostFiberImpl(node) {
+  // Next we'll drill down this component to find the first HostComponent/Text.
+  if (node.tag === HostComponent || node.tag === HostText) {
+    return node;
+  }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
-  } // Flow needs the return null here, but ESLint complains about it.
-  // eslint-disable-next-line no-unreachable
+  var child = node.child;
 
-  return null;
-}
-function doesFiberContain(parentFiber, childFiber) {
-  var node = childFiber;
-  var parentFiberAlternate = parentFiber.alternate;
+  while (child !== null) {
+    var match = findCurrentHostFiberImpl(child);
 
-  while (node !== null) {
-    if (node === parentFiber || node === parentFiberAlternate) {
-      return true;
+    if (match !== null) {
+      return match;
     }
 
-    node = node.return;
+    child = child.sibling;
   }
 
-  return false;
+  return null;
 }
 
 // Modules provided by RN:
@@ -3402,7 +3535,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node)) {
+  if (isArray(node)) {
     var i = node.length;
 
     while (i-- && removedKeyCount > 0) {
@@ -3527,12 +3660,12 @@ function diffNestedProperty(
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp)) {
+  if (!isArray(prevProp) && !isArray(nextProp)) {
     // Both are leaves, we can diff the leaves.
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
   }
 
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArray(prevProp) && isArray(nextProp)) {
     // Both are arrays, we can diff the arrays.
     return diffNestedArrayProperty(
       updatePayload,
@@ -3542,7 +3675,7 @@ function diffNestedProperty(
     );
   }
 
-  if (Array.isArray(prevProp)) {
+  if (isArray(prevProp)) {
     return diffProperties(
       updatePayload, // $FlowFixMe - We know that this is always an object when the input is.
       ReactNativePrivateInterface.flattenStyle(prevProp), // $FlowFixMe - We know that this isn't an array because of above flow.
@@ -3569,7 +3702,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(nextProp)) {
+  if (!isArray(nextProp)) {
     // Add each property of the leaf.
     return addProperties(updatePayload, nextProp, validAttributes);
   }
@@ -3595,7 +3728,7 @@ function clearNestedProperty(updatePayload, prevProp, validAttributes) {
     return updatePayload;
   }
 
-  if (!Array.isArray(prevProp)) {
+  if (!isArray(prevProp)) {
     // Add each property of the leaf.
     return clearProperties(updatePayload, prevProp, validAttributes);
   }
@@ -3967,1981 +4100,1917 @@ var ReactNativeFiberHostComponent = /*#__PURE__*/ (function() {
   return ReactNativeFiberHostComponent;
 })(); // eslint-disable-next-line no-unused-expressions
 
-// can re-export everything from this module.
+// This module only exists as an ESM wrapper around the external CommonJS
+var scheduleCallback = Scheduler.unstable_scheduleCallback;
+var cancelCallback = Scheduler.unstable_cancelCallback;
+var shouldYield = Scheduler.unstable_shouldYield;
+var requestPaint = Scheduler.unstable_requestPaint;
+var now = Scheduler.unstable_now;
+var ImmediatePriority = Scheduler.unstable_ImmediatePriority;
+var UserBlockingPriority = Scheduler.unstable_UserBlockingPriority;
+var NormalPriority = Scheduler.unstable_NormalPriority;
+var IdlePriority = Scheduler.unstable_IdlePriority;
 
-function shim() {
-  {
-    throw Error(
-      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
-    );
+var rendererID = null;
+var injectedHook = null;
+var hasLoggedError = false;
+var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
   }
-} // Hydration (when unsupported)
-var isSuspenseInstancePending = shim;
-var isSuspenseInstanceFallback = shim;
-var hydrateTextInstance = shim;
-
-var getViewConfigForType =
-  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get;
-var UPDATE_SIGNAL = {};
 
-{
-  Object.freeze(UPDATE_SIGNAL);
-} // Counter for uniquely identifying views.
-// % 10 === 1 means it is a rootTag.
-// % 2 === 0 means it is a Fabric tag.
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
 
-var nextReactTag = 3;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
+  }
 
-function allocateTag() {
-  var tag = nextReactTag;
+  if (!hook.supportsFiber) {
+    {
+      error(
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://reactjs.org/link/react-devtools"
+      );
+    } // DevTools exists, even though it doesn't support Fiber.
 
-  if (tag % 10 === 1) {
-    tag += 2;
+    return true;
   }
 
-  nextReactTag = tag + 2;
-  return tag;
-}
+  try {
+    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
 
-function recursivelyUncacheFiberNode(node) {
-  if (typeof node === "number") {
-    // Leaf node (eg text)
-    uncacheFiberNode(node);
-  } else {
-    uncacheFiberNode(node._nativeTag);
+    injectedHook = hook;
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      error("React instrumentation encountered an error: %s.", err);
+    }
+  } // DevTools exists
 
-    node._children.forEach(recursivelyUncacheFiberNode);
-  }
-}
-function appendInitialChild(parentInstance, child) {
-  parentInstance._children.push(child);
+  return true;
 }
-function createInstance(
-  type,
-  props,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  var tag = allocateTag();
-  var viewConfig = getViewConfigForType(type);
-
+function onScheduleRoot(root, children) {
   {
-    for (var key in viewConfig.validAttributes) {
-      if (props.hasOwnProperty(key)) {
-        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
-          props[key]
-        );
+    if (
+      injectedHook &&
+      typeof injectedHook.onScheduleFiberRoot === "function"
+    ) {
+      try {
+        injectedHook.onScheduleFiberRoot(rendererID, root, children);
+      } catch (err) {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
+
+          error("React instrumentation encountered an error: %s", err);
+        }
       }
     }
   }
+}
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
+    try {
+      var didError = (root.current.flags & DidCapture) === DidCapture;
 
-  var updatePayload = create(props, viewConfig.validAttributes);
-  ReactNativePrivateInterface.UIManager.createView(
-    tag, // reactTag
-    viewConfig.uiViewClassName, // viewName
-    rootContainerInstance, // rootTag
-    updatePayload // props
-  );
-  var component = new ReactNativeFiberHostComponent(
-    tag,
-    viewConfig,
-    internalInstanceHandle
-  );
-  precacheFiberNode(internalInstanceHandle, tag);
-  updateFiberProps(tag, props); // Not sure how to avoid this cast. Flow is okay if the component is defined
-  // in the same file but if it's external it can't see the types.
+      if (enableProfilerTimer) {
+        var schedulerPriority;
 
-  return component;
-}
-function createTextInstance(
-  text,
-  rootContainerInstance,
-  hostContext,
-  internalInstanceHandle
-) {
-  if (!hostContext.isInAParentText) {
-    throw Error("Text strings must be rendered within a <Text> component.");
-  }
+        switch (eventPriority) {
+          case DiscreteEventPriority:
+            schedulerPriority = ImmediatePriority;
+            break;
 
-  var tag = allocateTag();
-  ReactNativePrivateInterface.UIManager.createView(
-    tag, // reactTag
-    "RCTRawText", // viewName
-    rootContainerInstance, // rootTag
-    {
-      text: text
-    } // props
-  );
-  precacheFiberNode(internalInstanceHandle, tag);
-  return tag;
-}
-function finalizeInitialChildren(
-  parentInstance,
-  type,
-  props,
-  rootContainerInstance,
-  hostContext
-) {
-  // Don't send a no-op message over the bridge.
-  if (parentInstance._children.length === 0) {
-    return false;
-  } // Map from child objects to native tags.
-  // Either way we need to pass a copy of the Array to prevent it from being frozen.
+          case ContinuousEventPriority:
+            schedulerPriority = UserBlockingPriority;
+            break;
 
-  var nativeTags = parentInstance._children.map(function(child) {
-    return typeof child === "number"
-      ? child // Leaf node (eg text)
-      : child._nativeTag;
-  });
+          case DefaultEventPriority:
+            schedulerPriority = NormalPriority;
+            break;
 
-  ReactNativePrivateInterface.UIManager.setChildren(
-    parentInstance._nativeTag, // containerTag
-    nativeTags // reactTags
-  );
-  return false;
-}
-function getRootHostContext(rootContainerInstance) {
-  return {
-    isInAParentText: false
-  };
-}
-function getChildHostContext(parentHostContext, type, rootContainerInstance) {
-  var prevIsInAParentText = parentHostContext.isInAParentText;
-  var isInAParentText =
-    type === "AndroidTextInput" || // Android
-    type === "RCTMultilineTextInputView" || // iOS
-    type === "RCTSinglelineTextInputView" || // iOS
-    type === "RCTText" ||
-    type === "RCTVirtualText";
+          case IdleEventPriority:
+            schedulerPriority = IdlePriority;
+            break;
 
-  if (prevIsInAParentText !== isInAParentText) {
-    return {
-      isInAParentText: isInAParentText
-    };
-  } else {
-    return parentHostContext;
+          default:
+            schedulerPriority = NormalPriority;
+            break;
+        }
+
+        injectedHook.onCommitFiberRoot(
+          rendererID,
+          root,
+          schedulerPriority,
+          didError
+        );
+      } else {
+        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
+      }
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
+
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function getPublicInstance(instance) {
-  return instance;
-}
-function prepareForCommit(containerInfo) {
-  // Noop
-  return null;
-}
-function prepareUpdate(
-  instance,
-  type,
-  oldProps,
-  newProps,
-  rootContainerInstance,
-  hostContext
-) {
-  return UPDATE_SIGNAL;
-}
-function resetAfterCommit(containerInfo) {
-  // Noop
-}
-var scheduleTimeout = setTimeout;
-var cancelTimeout = clearTimeout;
-var noTimeout = -1;
-function shouldSetTextContent(type, props) {
-  // TODO (bvaughn) Revisit this decision.
-  // Always returning false simplifies the createInstance() implementation,
-  // But creates an additional child Fiber for raw text children.
-  // No additional native views are created though.
-  // It's not clear to me which is better so I'm deferring for now.
-  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
-  return false;
-} // -------------------
-function appendChild(parentInstance, child) {
-  var childTag = typeof child === "number" ? child : child._nativeTag;
-  var children = parentInstance._children;
-  var index = children.indexOf(child);
+function onPostCommitRoot(root) {
+  if (
+    injectedHook &&
+    typeof injectedHook.onPostCommitFiberRoot === "function"
+  ) {
+    try {
+      injectedHook.onPostCommitFiberRoot(rendererID, root);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (index >= 0) {
-    children.splice(index, 1);
-    children.push(child);
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerTag
-      [index], // moveFromIndices
-      [children.length - 1], // moveToIndices
-      [], // addChildReactTags
-      [], // addAtIndices
-      [] // removeAtIndices
-    );
-  } else {
-    children.push(child);
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerTag
-      [], // moveFromIndices
-      [], // moveToIndices
-      [childTag], // addChildReactTags
-      [children.length - 1], // addAtIndices
-      [] // removeAtIndices
-    );
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function appendChildToContainer(parentInstance, child) {
-  var childTag = typeof child === "number" ? child : child._nativeTag;
-  ReactNativePrivateInterface.UIManager.setChildren(
-    parentInstance, // containerTag
-    [childTag] // reactTags
-  );
-}
-function commitTextUpdate(textInstance, oldText, newText) {
-  ReactNativePrivateInterface.UIManager.updateView(
-    textInstance, // reactTag
-    "RCTRawText", // viewName
-    {
-      text: newText
-    } // props
-  );
-}
-function commitUpdate(
-  instance,
-  updatePayloadTODO,
-  type,
-  oldProps,
-  newProps,
-  internalInstanceHandle
-) {
-  var viewConfig = instance.viewConfig;
-  updateFiberProps(instance._nativeTag, newProps);
-  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // Avoid the overhead of bridge calls if there's no update.
-  // This is an expensive no-op for Android, and causes an unnecessary
-  // view invalidation for certain components (eg RCTTextInput) on iOS.
+function onCommitUnmount(fiber) {
+  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
+    try {
+      injectedHook.onCommitFiberUnmount(rendererID, fiber);
+    } catch (err) {
+      {
+        if (!hasLoggedError) {
+          hasLoggedError = true;
 
-  if (updatePayload != null) {
-    ReactNativePrivateInterface.UIManager.updateView(
-      instance._nativeTag, // reactTag
-      viewConfig.uiViewClassName, // viewName
-      updatePayload // props
-    );
+          error("React instrumentation encountered an error: %s", err);
+        }
+      }
+    }
   }
 }
-function insertBefore(parentInstance, child, beforeChild) {
-  var children = parentInstance._children;
-  var index = children.indexOf(child); // Move existing child or add new child?
 
-  if (index >= 0) {
-    children.splice(index, 1);
-    var beforeChildIndex = children.indexOf(beforeChild);
-    children.splice(beforeChildIndex, 0, child);
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerID
-      [index], // moveFromIndices
-      [beforeChildIndex], // moveToIndices
-      [], // addChildReactTags
-      [], // addAtIndices
-      [] // removeAtIndices
-    );
-  } else {
-    var _beforeChildIndex = children.indexOf(beforeChild);
+var NoMode =
+  /*                         */
+  0; // TODO: Remove ConcurrentMode by reading from the root tag instead
 
-    children.splice(_beforeChildIndex, 0, child);
-    var childTag = typeof child === "number" ? child : child._nativeTag;
-    ReactNativePrivateInterface.UIManager.manageChildren(
-      parentInstance._nativeTag, // containerID
-      [], // moveFromIndices
-      [], // moveToIndices
-      [childTag], // addChildReactTags
-      [_beforeChildIndex], // addAtIndices
-      [] // removeAtIndices
-    );
-  }
-}
-function insertInContainerBefore(parentInstance, child, beforeChild) {
-  // TODO (bvaughn): Remove this check when...
-  // We create a wrapper object for the container in ReactNative render()
-  // Or we refactor to remove wrapper objects entirely.
-  // For more info on pros/cons see PR #8560 description.
-  if (!(typeof parentInstance !== "number")) {
-    throw Error("Container does not support insertBefore operation");
-  }
-}
-function removeChild(parentInstance, child) {
-  recursivelyUncacheFiberNode(child);
-  var children = parentInstance._children;
-  var index = children.indexOf(child);
-  children.splice(index, 1);
-  ReactNativePrivateInterface.UIManager.manageChildren(
-    parentInstance._nativeTag, // containerID
-    [], // moveFromIndices
-    [], // moveToIndices
-    [], // addChildReactTags
-    [], // addAtIndices
-    [index] // removeAtIndices
-  );
-}
-function removeChildFromContainer(parentInstance, child) {
-  recursivelyUncacheFiberNode(child);
-  ReactNativePrivateInterface.UIManager.manageChildren(
-    parentInstance, // containerID
-    [], // moveFromIndices
-    [], // moveToIndices
-    [], // addChildReactTags
-    [], // addAtIndices
-    [0] // removeAtIndices
-  );
-}
-function resetTextContent(instance) {
-  // Noop
-}
-function hideInstance(instance) {
-  var viewConfig = instance.viewConfig;
-  var updatePayload = create(
-    {
-      style: {
-        display: "none"
-      }
-    },
-    viewConfig.validAttributes
-  );
-  ReactNativePrivateInterface.UIManager.updateView(
-    instance._nativeTag,
-    viewConfig.uiViewClassName,
-    updatePayload
-  );
-}
-function hideTextInstance(textInstance) {
-  throw new Error("Not yet implemented.");
-}
-function unhideInstance(instance, props) {
-  var viewConfig = instance.viewConfig;
-  var updatePayload = diff(
-    Object.assign({}, props, {
-      style: [
-        props.style,
-        {
-          display: "none"
-        }
-      ]
-    }),
-    props,
-    viewConfig.validAttributes
-  );
-  ReactNativePrivateInterface.UIManager.updateView(
-    instance._nativeTag,
-    viewConfig.uiViewClassName,
-    updatePayload
-  );
-}
-function clearContainer(container) {
-  // TODO Implement this for React Native
-  // UIManager does not expose a "remove all" type method.
-}
-function unhideTextInstance(textInstance, text) {
-  throw new Error("Not yet implemented.");
-}
-function makeClientIdInDEV(warnOnAccessInDEV) {
-  throw new Error("Not yet implemented");
-}
-function preparePortalMount(portalInstance) {
-  // noop
-}
-
-var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
-function describeBuiltInComponentFrame(name, source, ownerFn) {
-  {
-    var ownerName = null;
-
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
-
-    return describeComponentFrame(name, source, ownerName);
-  }
-}
-var componentFrameCache;
-
-{
-  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
-  componentFrameCache = new PossiblyWeakMap();
-}
-var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
+var ConcurrentMode =
+  /*                 */
+  1;
+var ProfileMode =
+  /*                    */
+  2;
+var DebugTracingMode =
+  /*               */
+  4;
+var StrictLegacyMode =
+  /*               */
+  8;
 
-function describeComponentFrame(name, source, ownerName) {
-  var sourceInfo = "";
+// If those values are changed that package should be rebuilt and redeployed.
 
-  if (source) {
-    var path = source.fileName;
-    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
-    // prefer "folder/index.js" instead of just "index.js".
+var TotalLanes = 31;
+var NoLanes =
+  /*                        */
+  0;
+var NoLane =
+  /*                          */
+  0;
+var SyncLane =
+  /*                        */
+  1;
+var InputContinuousHydrationLane =
+  /*    */
+  2;
+var InputContinuousLane =
+  /*            */
+  4;
+var DefaultHydrationLane =
+  /*            */
+  8;
+var DefaultLane =
+  /*                    */
+  16;
+var TransitionHydrationLane =
+  /*                */
+  32;
+var TransitionLanes =
+  /*                       */
+  4194240;
+var TransitionLane1 =
+  /*                        */
+  64;
+var TransitionLane2 =
+  /*                        */
+  128;
+var TransitionLane3 =
+  /*                        */
+  256;
+var TransitionLane4 =
+  /*                        */
+  512;
+var TransitionLane5 =
+  /*                        */
+  1024;
+var TransitionLane6 =
+  /*                        */
+  2048;
+var TransitionLane7 =
+  /*                        */
+  4096;
+var TransitionLane8 =
+  /*                        */
+  8192;
+var TransitionLane9 =
+  /*                        */
+  16384;
+var TransitionLane10 =
+  /*                       */
+  32768;
+var TransitionLane11 =
+  /*                       */
+  65536;
+var TransitionLane12 =
+  /*                       */
+  131072;
+var TransitionLane13 =
+  /*                       */
+  262144;
+var TransitionLane14 =
+  /*                       */
+  524288;
+var TransitionLane15 =
+  /*                       */
+  1048576;
+var TransitionLane16 =
+  /*                       */
+  2097152;
+var RetryLanes =
+  /*                            */
+  130023424;
+var RetryLane1 =
+  /*                             */
+  4194304;
+var RetryLane2 =
+  /*                             */
+  8388608;
+var RetryLane3 =
+  /*                             */
+  16777216;
+var RetryLane4 =
+  /*                             */
+  33554432;
+var RetryLane5 =
+  /*                             */
+  67108864;
+var SomeRetryLane = RetryLane1;
+var SelectiveHydrationLane =
+  /*          */
+  134217728;
+var NonIdleLanes =
+  /*                                 */
+  268435455;
+var IdleHydrationLane =
+  /*               */
+  268435456;
+var IdleLane =
+  /*                       */
+  536870912;
+var OffscreenLane =
+  /*                   */
+  1073741824; // This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
+var NoTimestamp = -1;
+var nextTransitionLane = TransitionLane1;
+var nextRetryLane = RetryLane1;
 
-    if (/^index\./.test(fileName)) {
-      var match = path.match(BEFORE_SLASH_RE);
+function getHighestPriorityLanes(lanes) {
+  switch (getHighestPriorityLane(lanes)) {
+    case SyncLane:
+      return SyncLane;
 
-      if (match) {
-        var pathBeforeSlash = match[1];
+    case InputContinuousHydrationLane:
+      return InputContinuousHydrationLane;
+
+    case InputContinuousLane:
+      return InputContinuousLane;
+
+    case DefaultHydrationLane:
+      return DefaultHydrationLane;
+
+    case DefaultLane:
+      return DefaultLane;
+
+    case TransitionHydrationLane:
+      return TransitionHydrationLane;
+
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return lanes & TransitionLanes;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      return lanes & RetryLanes;
+
+    case SelectiveHydrationLane:
+      return SelectiveHydrationLane;
+
+    case IdleHydrationLane:
+      return IdleHydrationLane;
+
+    case IdleLane:
+      return IdleLane;
+
+    case OffscreenLane:
+      return OffscreenLane;
 
-        if (pathBeforeSlash) {
-          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
-          fileName = folderName + "/" + fileName;
-        }
-      }
-    }
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
+      } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
 
-    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
-  } else if (ownerName) {
-    sourceInfo = " (created by " + ownerName + ")";
+      return lanes;
   }
-
-  return "\n    in " + (name || "Unknown") + sourceInfo;
 }
 
-function describeClassComponentFrame(ctor, source, ownerFn) {
-  {
-    return describeFunctionComponentFrame(ctor, source, ownerFn);
+function getNextLanes(root, wipLanes) {
+  // Early bailout if there's no pending work left.
+  var pendingLanes = root.pendingLanes;
+
+  if (pendingLanes === NoLanes) {
+    return NoLanes;
   }
-}
-function describeFunctionComponentFrame(fn, source, ownerFn) {
-  {
-    if (!fn) {
-      return "";
-    }
 
-    var name = fn.displayName || fn.name || null;
-    var ownerName = null;
+  var nextLanes = NoLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes; // Do not work on any idle work until all the non-idle work has finished,
+  // even if the work is suspended.
 
-    if (ownerFn) {
-      ownerName = ownerFn.displayName || ownerFn.name || null;
-    }
+  var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
 
-    return describeComponentFrame(name, source, ownerName);
-  }
-}
+  if (nonIdlePendingLanes !== NoLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
 
-function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
-  if (type == null) {
-    return "";
-  }
+    if (nonIdleUnblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
+    } else {
+      var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
 
-  if (typeof type === "function") {
-    {
-      return describeFunctionComponentFrame(type, source, ownerFn);
+      if (nonIdlePingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
+      }
     }
-  }
+  } else {
+    // The only remaining work is Idle.
+    var unblockedLanes = pendingLanes & ~suspendedLanes;
 
-  if (typeof type === "string") {
-    return describeBuiltInComponentFrame(type, source, ownerFn);
+    if (unblockedLanes !== NoLanes) {
+      nextLanes = getHighestPriorityLanes(unblockedLanes);
+    } else {
+      if (pingedLanes !== NoLanes) {
+        nextLanes = getHighestPriorityLanes(pingedLanes);
+      }
+    }
   }
 
-  switch (type) {
-    case REACT_SUSPENSE_TYPE:
-      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
+  if (nextLanes === NoLanes) {
+    // This should only be reachable if we're suspended
+    // TODO: Consider warning in this path if a fallback timer is not scheduled.
+    return NoLanes;
+  } // If we're already in the middle of a render, switching lanes will interrupt
+  // it and we'll lose our progress. We should only do this if the new lanes are
+  // higher priority.
 
-    case REACT_SUSPENSE_LIST_TYPE:
-      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
-  }
+  if (
+    wipLanes !== NoLanes &&
+    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
+    // bother waiting until the root is complete.
+    (wipLanes & suspendedLanes) === NoLanes
+  ) {
+    var nextLane = getHighestPriorityLane(nextLanes);
+    var wipLane = getHighestPriorityLane(wipLanes);
 
-  if (typeof type === "object") {
-    switch (type.$$typeof) {
-      case REACT_FORWARD_REF_TYPE:
-        return describeFunctionComponentFrame(type.render, source, ownerFn);
+    if (
+      // Tests whether the next lane is equal or lower priority than the wip
+      // one. This works because the bits decrease in priority as you go left.
+      nextLane >= wipLane || // Default priority updates should not interrupt transition updates. The
+      // only difference between default updates and transition updates is that
+      // default updates do not support refresh transitions.
+      (nextLane === DefaultLane && (wipLane & TransitionLanes) !== NoLanes)
+    ) {
+      // Keep working on the existing in-progress tree. Do not interrupt.
+      return wipLanes;
+    }
+  }
 
-      case REACT_MEMO_TYPE:
-        // Memo may contain any component type so we recursively resolve it.
-        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
+  if ((nextLanes & InputContinuousLane) !== NoLanes) {
+    // When updates are sync by default, we entangle continuous priority updates
+    // and default updates, so they render in the same batch. The only reason
+    // they use separate lanes is because continuous updates should interrupt
+    // transitions, but default updates should not.
+    nextLanes |= pendingLanes & DefaultLane;
+  } // Check for entangled lanes and add them to the batch.
+  //
+  // A lane is said to be entangled with another when it's not allowed to render
+  // in a batch that does not also include the other lane. Typically we do this
+  // when multiple updates have the same source, and we only want to respond to
+  // the most recent event from that source.
+  //
+  // Note that we apply entanglements *after* checking for partial work above.
+  // This means that if a lane is entangled during an interleaved event while
+  // it's already rendering, we won't interrupt it. This is intentional, since
+  // entanglement is usually "best effort": we'll try our best to render the
+  // lanes in the same batch, but it's not worth throwing out partially
+  // completed work in order to do it.
+  // TODO: Reconsider this. The counter-argument is that the partial work
+  // represents an intermediate state, which we don't want to show to the user.
+  // And by spending extra time finishing it, we're increasing the amount of
+  // time it takes to show the final state, which is what they are actually
+  // waiting for.
+  //
+  // For those exceptions where entanglement is semantically important, like
+  // useMutableSource, we should ensure that there is no partial work at the
+  // time we apply the entanglement.
 
-      case REACT_BLOCK_TYPE:
-        return describeFunctionComponentFrame(type._render, source, ownerFn);
+  var entangledLanes = root.entangledLanes;
 
-      case REACT_LAZY_TYPE: {
-        var lazyComponent = type;
-        var payload = lazyComponent._payload;
-        var init = lazyComponent._init;
+  if (entangledLanes !== NoLanes) {
+    var entanglements = root.entanglements;
+    var lanes = nextLanes & entangledLanes;
 
-        try {
-          // Lazy may contain any component type so we recursively resolve it.
-          return describeUnknownElementTypeFrameInDEV(
-            init(payload),
-            source,
-            ownerFn
-          );
-        } catch (x) {}
-      }
+    while (lanes > 0) {
+      var index = pickArbitraryLaneIndex(lanes);
+      var lane = 1 << index;
+      nextLanes |= entanglements[index];
+      lanes &= ~lane;
     }
   }
 
-  return "";
+  return nextLanes;
 }
+function getMostRecentEventTime(root, lanes) {
+  var eventTimes = root.eventTimes;
+  var mostRecentEventTime = NoTimestamp;
 
-var loggedTypeFailures = {};
-var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var eventTime = eventTimes[index];
 
-function setCurrentlyValidatingElement(element) {
-  {
-    if (element) {
-      var owner = element._owner;
-      var stack = describeUnknownElementTypeFrameInDEV(
-        element.type,
-        element._source,
-        owner ? owner.type : null
-      );
-      ReactDebugCurrentFrame.setExtraStackFrame(stack);
-    } else {
-      ReactDebugCurrentFrame.setExtraStackFrame(null);
+    if (eventTime > mostRecentEventTime) {
+      mostRecentEventTime = eventTime;
     }
-  }
-}
-
-function checkPropTypes(typeSpecs, values, location, componentName, element) {
-  {
-    // $FlowFixMe This is okay but Flow doesn't know it.
-    var has = Function.call.bind(Object.prototype.hasOwnProperty);
-
-    for (var typeSpecName in typeSpecs) {
-      if (has(typeSpecs, typeSpecName)) {
-        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
-        // fail the render phase where it didn't fail before. So we log it.
-        // After these have been cleaned up, we'll let them throw.
-
-        try {
-          // This is intentionally an invariant that gets caught. It's the same
-          // behavior as without this statement except with a better message.
-          if (typeof typeSpecs[typeSpecName] !== "function") {
-            var err = Error(
-              (componentName || "React class") +
-                ": " +
-                location +
-                " type `" +
-                typeSpecName +
-                "` is invalid; " +
-                "it must be a function, usually from the `prop-types` package, but received `" +
-                typeof typeSpecs[typeSpecName] +
-                "`." +
-                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
-            );
-            err.name = "Invariant Violation";
-            throw err;
-          }
-
-          error$1 = typeSpecs[typeSpecName](
-            values,
-            typeSpecName,
-            componentName,
-            location,
-            null,
-            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
-          );
-        } catch (ex) {
-          error$1 = ex;
-        }
-
-        if (error$1 && !(error$1 instanceof Error)) {
-          setCurrentlyValidatingElement(element);
-
-          error(
-            "%s: type specification of %s" +
-              " `%s` is invalid; the type checker " +
-              "function must return `null` or an `Error` but returned a %s. " +
-              "You may have forgotten to pass an argument to the type checker " +
-              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
-              "shape all require an argument).",
-            componentName || "React class",
-            location,
-            typeSpecName,
-            typeof error$1
-          );
 
-          setCurrentlyValidatingElement(null);
-        }
+    lanes &= ~lane;
+  }
 
-        if (
-          error$1 instanceof Error &&
-          !(error$1.message in loggedTypeFailures)
-        ) {
-          // Only monitor this failure once because there tends to be a lot of the
-          // same error.
-          loggedTypeFailures[error$1.message] = true;
-          setCurrentlyValidatingElement(element);
+  return mostRecentEventTime;
+}
 
-          error("Failed %s type: %s", location, error$1.message);
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case SyncLane:
+    case InputContinuousHydrationLane:
+    case InputContinuousLane:
+      // User interactions should expire slightly more quickly.
+      //
+      // NOTE: This is set to the corresponding constant as in Scheduler.js.
+      // When we made it larger, a product metric in www regressed, suggesting
+      // there's a user interaction that's being starved by a series of
+      // synchronous updates. If that theory is correct, the proper solution is
+      // to fix the starvation. However, this scenario supports the idea that
+      // expiration times are an important safeguard when starvation
+      // does happen.
+      return currentTime + 250;
+
+    case DefaultHydrationLane:
+    case DefaultLane:
+    case TransitionHydrationLane:
+    case TransitionLane1:
+    case TransitionLane2:
+    case TransitionLane3:
+    case TransitionLane4:
+    case TransitionLane5:
+    case TransitionLane6:
+    case TransitionLane7:
+    case TransitionLane8:
+    case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
+    case TransitionLane15:
+    case TransitionLane16:
+      return currentTime + 5000;
+
+    case RetryLane1:
+    case RetryLane2:
+    case RetryLane3:
+    case RetryLane4:
+    case RetryLane5:
+      // TODO: Retries should be allowed to expire if they are CPU bound for
+      // too long, but when I made this change it caused a spike in browser
+      // crashes. There must be some other underlying bug; not super urgent but
+      // ideally should figure out why and fix it. Unfortunately we don't have
+      // a repro for the crashes, only detected via production metrics.
+      return NoTimestamp;
+
+    case SelectiveHydrationLane:
+    case IdleHydrationLane:
+    case IdleLane:
+    case OffscreenLane:
+      // Anything idle priority or lower should never expire.
+      return NoTimestamp;
 
-          setCurrentlyValidatingElement(null);
-        }
+    default:
+      {
+        error("Should have found matching lanes. This is a bug in React.");
       }
-    }
+
+      return NoTimestamp;
   }
 }
 
-var valueStack = [];
-var fiberStack;
-
-{
-  fiberStack = [];
-}
+function markStarvedLanesAsExpired(root, currentTime) {
+  // TODO: This gets called every time we yield. We can optimize by storing
+  // the earliest expiration time on the root. Then use that to quickly bail out
+  // of this function.
+  var pendingLanes = root.pendingLanes;
+  var suspendedLanes = root.suspendedLanes;
+  var pingedLanes = root.pingedLanes;
+  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
+  // expiration time. If so, we'll assume the update is being starved and mark
+  // it as expired to force it to finish.
 
-var index = -1;
+  var lanes = pendingLanes;
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
-}
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    var expirationTime = expirationTimes[index];
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      error("Unexpected pop.");
+    if (expirationTime === NoTimestamp) {
+      // Found a pending lane with no expiration time. If it's not suspended, or
+      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
+      // using the current time.
+      if (
+        (lane & suspendedLanes) === NoLanes ||
+        (lane & pingedLanes) !== NoLanes
+      ) {
+        // Assumes timestamps are monotonically increasing.
+        expirationTimes[index] = computeExpirationTime(lane, currentTime);
+      }
+    } else if (expirationTime <= currentTime) {
+      // This lane expired
+      root.expiredLanes |= lane;
     }
 
-    return;
+    lanes &= ~lane;
   }
+} // This returns the highest priority pending lanes regardless of whether they
+function getLanesToRetrySynchronouslyOnError(root) {
+  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
 
-  {
-    if (fiber !== fiberStack[index]) {
-      error("Unexpected Fiber popped.");
-    }
+  if (everythingButOffscreen !== NoLanes) {
+    return everythingButOffscreen;
   }
 
-  cursor.current = valueStack[index];
-  valueStack[index] = null;
-
-  {
-    fiberStack[index] = null;
+  if (everythingButOffscreen & OffscreenLane) {
+    return OffscreenLane;
   }
 
-  index--;
+  return NoLanes;
 }
-
-function push(cursor, value, fiber) {
-  index++;
-  valueStack[index] = cursor.current;
-
-  {
-    fiberStack[index] = fiber;
+function includesNonIdleWork(lanes) {
+  return (lanes & NonIdleLanes) !== NoLanes;
+}
+function includesOnlyRetries(lanes) {
+  return (lanes & RetryLanes) === lanes;
+}
+function includesOnlyTransitions(lanes) {
+  return (lanes & TransitionLanes) === lanes;
+}
+function shouldTimeSlice(root, lanes) {
+  if ((lanes & root.expiredLanes) !== NoLanes) {
+    // At least one of these lanes expired. To prevent additional starvation,
+    // finish rendering without yielding execution.
+    return false;
   }
 
-  cursor.current = value;
+  var SyncDefaultLanes =
+    InputContinuousHydrationLane |
+    InputContinuousLane |
+    DefaultHydrationLane |
+    DefaultLane;
+  return (lanes & SyncDefaultLanes) === NoLanes;
 }
-
-var warnedAboutMissingGetChildContext;
-
-{
-  warnedAboutMissingGetChildContext = {};
+function isTransitionLane(lane) {
+  return (lane & TransitionLanes) !== 0;
 }
+function claimNextTransitionLane() {
+  // Cycle through the lanes, assigning each new transition to the next lane.
+  // In most cases, this means every transition gets its own lane, until we
+  // run out of lanes and cycle back to the beginning.
+  var lane = nextTransitionLane;
+  nextTransitionLane <<= 1;
 
-var emptyContextObject = {};
+  if ((nextTransitionLane & TransitionLanes) === 0) {
+    nextTransitionLane = TransitionLane1;
+  }
 
-{
-  Object.freeze(emptyContextObject);
-} // A cursor to the current merged context object on the stack.
+  return lane;
+}
+function claimNextRetryLane() {
+  var lane = nextRetryLane;
+  nextRetryLane <<= 1;
 
-var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
+  if ((nextRetryLane & RetryLanes) === 0) {
+    nextRetryLane = RetryLane1;
+  }
 
-var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
+  return lane;
+}
+function getHighestPriorityLane(lanes) {
+  return lanes & -lanes;
+}
+function pickArbitraryLane(lanes) {
+  // This wrapper function gets inlined. Only exists so to communicate that it
+  // doesn't matter which bit is selected; you can pick any bit without
+  // affecting the algorithms where its used. Here I'm using
+  // getHighestPriorityLane because it requires the fewest operations.
+  return getHighestPriorityLane(lanes);
+}
 
-var previousContext = emptyContextObject;
+function pickArbitraryLaneIndex(lanes) {
+  return 31 - clz32(lanes);
+}
 
-function getUnmaskedContext(
-  workInProgress,
-  Component,
-  didPushOwnContextIfProvider
-) {
-  {
-    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
-      // If the fiber is a context provider itself, when we read its context
-      // we may have already pushed its own child context on the stack. A context
-      // provider should not "see" its own child context. Therefore we read the
-      // previous (parent) context instead for a context provider.
-      return previousContext;
-    }
+function laneToIndex(lane) {
+  return pickArbitraryLaneIndex(lane);
+}
 
-    return contextStackCursor.current;
-  }
+function includesSomeLane(a, b) {
+  return (a & b) !== NoLanes;
+}
+function isSubsetOfLanes(set, subset) {
+  return (set & subset) === subset;
+}
+function mergeLanes(a, b) {
+  return a | b;
+}
+function removeLanes(set, subset) {
+  return set & ~subset;
 }
+function intersectLanes(a, b) {
+  return a & b;
+} // Seems redundant, but it changes the type from a single lane (used for
+// updates) to a group of lanes (used for flushing work).
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  {
-    var instance = workInProgress.stateNode;
-    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+function laneToLanes(lane) {
+  return lane;
+}
+function createLaneMap(initial) {
+  // Intentionally pushing one by one.
+  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
+  var laneMap = [];
+
+  for (var i = 0; i < TotalLanes; i++) {
+    laneMap.push(initial);
   }
+
+  return laneMap;
 }
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane; // If there are any suspended transitions, it's possible this new update
+  // could unblock them. Clear the suspended lanes so that we can try rendering
+  // them again.
+  //
+  // TODO: We really only need to unsuspend only lanes that are in the
+  // `subtreeLanes` of the updated fiber, or the update lanes of the return
+  // path. This would exclude suspended updates in an unrelated sibling tree,
+  // since there's no way for this update to unblock it.
+  //
+  // We don't do this if the incoming update is idle, because we never process
+  // idle updates until after all the regular updates have finished; there's no
+  // way it could unblock a transition.
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  {
-    var type = workInProgress.type;
-    var contextTypes = type.contextTypes;
+  if (updateLane !== IdleLane) {
+    root.suspendedLanes = NoLanes;
+    root.pingedLanes = NoLanes;
+  }
 
-    if (!contextTypes) {
-      return emptyContextObject;
-    } // Avoid recreating masked context unless unmasked context has changed.
-    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+  var eventTimes = root.eventTimes;
+  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
+  // recent event, and we assume time is monotonically increasing.
 
-    var instance = workInProgress.stateNode;
+  eventTimes[index] = eventTime;
+}
+function markRootSuspended(root, suspendedLanes) {
+  root.suspendedLanes |= suspendedLanes;
+  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
 
-    if (
-      instance &&
-      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-    ) {
-      return instance.__reactInternalMemoizedMaskedChildContext;
-    }
+  var expirationTimes = root.expirationTimes;
+  var lanes = suspendedLanes;
 
-    var context = {};
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
+  }
+}
+function markRootPinged(root, pingedLanes, eventTime) {
+  root.pingedLanes |= root.suspendedLanes & pingedLanes;
+}
+function markRootMutableRead(root, updateLane) {
+  root.mutableReadLanes |= updateLane & root.pendingLanes;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes; // Let's try everything again
 
-    for (var key in contextTypes) {
-      context[key] = unmaskedContext[key];
-    }
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
 
-    {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(contextTypes, context, "context", name);
-    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // Context is created before the class component is instantiated so check for instance.
+  var entanglements = root.entanglements;
+  var eventTimes = root.eventTimes;
+  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
 
-    if (instance) {
-      cacheContext(workInProgress, unmaskedContext, context);
-    }
+  var lanes = noLongerPendingLanes;
 
-    return context;
+  while (lanes > 0) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
+    entanglements[index] = NoLanes;
+    eventTimes[index] = NoTimestamp;
+    expirationTimes[index] = NoTimestamp;
+    lanes &= ~lane;
   }
 }
+function markRootEntangled(root, entangledLanes) {
+  // In addition to entangling each of the given lanes with each other, we also
+  // have to consider _transitive_ entanglements. For each lane that is already
+  // entangled with *any* of the given lanes, that lane is now transitively
+  // entangled with *all* the given lanes.
+  //
+  // Translated: If C is entangled with A, then entangling A with B also
+  // entangles C with B.
+  //
+  // If this is hard to grasp, it might help to intentionally break this
+  // function and look at the tests that fail in ReactTransition-test.js. Try
+  // commenting out one of the conditions below.
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  var entanglements = root.entanglements;
+  var lanes = rootEntangledLanes;
 
-function hasContextChanged() {
-  {
-    return didPerformWorkStackCursor.current;
-  }
-}
+  while (lanes) {
+    var index = pickArbitraryLaneIndex(lanes);
+    var lane = 1 << index;
 
-function isContextProvider(type) {
-  {
-    var childContextTypes = type.childContextTypes;
-    return childContextTypes !== null && childContextTypes !== undefined;
-  }
-}
+    if (
+      // Is this one of the newly entangled lanes?
+      (lane & entangledLanes) | // Is this lane transitively entangled with the newly entangled lanes?
+      (entanglements[index] & entangledLanes)
+    ) {
+      entanglements[index] |= entangledLanes;
+    }
 
-function popContext(fiber) {
-  {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+    lanes &= ~lane;
   }
 }
-
-function popTopLevelContextObject(fiber) {
-  {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (!isDevToolsPresent) {
+    return;
   }
-}
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  {
-    if (!(contextStackCursor.current === emptyContextObject)) {
-      throw Error(
-        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
 
-    push(contextStackCursor, context, fiber);
-    push(didPerformWorkStackCursor, didChange, fiber);
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
+    updaters.add(fiber);
+    lanes &= ~lane;
   }
 }
+function movePendingFibersToMemoized(root, lanes) {
+  if (!isDevToolsPresent) {
+    return;
+  }
 
-function processChildContext(fiber, type, parentContext) {
-  {
-    var instance = fiber.stateNode;
-    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+  var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap;
+  var memoizedUpdaters = root.memoizedUpdaters;
 
-    if (typeof instance.getChildContext !== "function") {
-      {
-        var componentName = getComponentName(type) || "Unknown";
+  while (lanes > 0) {
+    var index = laneToIndex(lanes);
+    var lane = 1 << index;
+    var updaters = pendingUpdatersLaneMap[index];
 
-        if (!warnedAboutMissingGetChildContext[componentName]) {
-          warnedAboutMissingGetChildContext[componentName] = true;
+    if (updaters.size > 0) {
+      updaters.forEach(function(fiber) {
+        var alternate = fiber.alternate;
 
-          error(
-            "%s.childContextTypes is specified but there is no getChildContext() method " +
-              "on the instance. You can either define getChildContext() on %s or remove " +
-              "childContextTypes from it.",
-            componentName,
-            componentName
-          );
+        if (alternate === null || !memoizedUpdaters.has(alternate)) {
+          memoizedUpdaters.add(fiber);
         }
-      }
-
-      return parentContext;
-    }
-
-    var childContext = instance.getChildContext();
-
-    for (var contextKey in childContext) {
-      if (!(contextKey in childContextTypes)) {
-        throw Error(
-          (getComponentName(type) || "Unknown") +
-            '.getChildContext(): key "' +
-            contextKey +
-            '" is not defined in childContextTypes.'
-        );
-      }
-    }
-
-    {
-      var name = getComponentName(type) || "Unknown";
-      checkPropTypes(childContextTypes, childContext, "child context", name);
+      });
+      updaters.clear();
     }
 
-    return Object.assign({}, parentContext, childContext);
+    lanes &= ~lane;
   }
 }
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
+// Based on:
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
 
-function pushContextProvider(workInProgress) {
-  {
-    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
-    // If the instance does not exist yet, we will push null at first,
-    // and replace it on the stack later when invalidating the context.
-
-    var memoizedMergedChildContext =
-      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-      emptyContextObject; // Remember the parent context so we can merge with it later.
-    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+var log = Math.log;
+var LN2 = Math.LN2;
 
-    previousContext = contextStackCursor.current;
-    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-    push(
-      didPerformWorkStackCursor,
-      didPerformWorkStackCursor.current,
-      workInProgress
-    );
-    return true;
+function clz32Fallback(lanes) {
+  if (lanes === 0) {
+    return 32;
   }
+
+  return (31 - ((log(lanes) / LN2) | 0)) | 0;
 }
 
-function invalidateContextProvider(workInProgress, type, didChange) {
-  {
-    var instance = workInProgress.stateNode;
-
-    if (!instance) {
-      throw Error(
-        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
+var DiscreteEventPriority = SyncLane;
+var ContinuousEventPriority = InputContinuousLane;
+var DefaultEventPriority = DefaultLane;
+var IdleEventPriority = IdleLane;
+var currentUpdatePriority = NoLane;
+function getCurrentUpdatePriority() {
+  return currentUpdatePriority;
+}
+function setCurrentUpdatePriority(newPriority) {
+  currentUpdatePriority = newPriority;
+}
+function higherEventPriority(a, b) {
+  return a !== 0 && a < b ? a : b;
+}
+function lowerEventPriority(a, b) {
+  return a === 0 || a > b ? a : b;
+}
+function isHigherEventPriority(a, b) {
+  return a !== 0 && a < b;
+}
+function lanesToEventPriority(lanes) {
+  var lane = getHighestPriorityLane(lanes);
 
-    if (didChange) {
-      // Merge parent and own context.
-      // Skip this if we're not updating due to sCU.
-      // This avoids unnecessarily recomputing memoized values.
-      var mergedContext = processChildContext(
-        workInProgress,
-        type,
-        previousContext
-      );
-      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
-      // It is important to unwind the context in the reverse order.
+  if (!isHigherEventPriority(DiscreteEventPriority, lane)) {
+    return DiscreteEventPriority;
+  }
 
-      pop(didPerformWorkStackCursor, workInProgress);
-      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
+  if (!isHigherEventPriority(ContinuousEventPriority, lane)) {
+    return ContinuousEventPriority;
+  }
 
-      push(contextStackCursor, mergedContext, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    } else {
-      pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    }
+  if (includesNonIdleWork(lane)) {
+    return DefaultEventPriority;
   }
-}
 
-function findCurrentUnmaskedContext(fiber) {
-  {
-    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-    // makes sense elsewhere
-    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
-      throw Error(
-        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
+  return IdleEventPriority;
+}
 
-    var node = fiber;
+// can re-export everything from this module.
 
-    do {
-      switch (node.tag) {
-        case HostRoot:
-          return node.stateNode.context;
+function shim() {
+  {
+    throw Error(
+      "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+} // Hydration (when unsupported)
+var isSuspenseInstancePending = shim;
+var isSuspenseInstanceFallback = shim;
+var hydrateTextInstance = shim;
+var errorHydratingContainer = shim;
 
-        case ClassComponent: {
-          var Component = node.type;
+var getViewConfigForType =
+  ReactNativePrivateInterface.ReactNativeViewConfigRegistry.get;
+var UPDATE_SIGNAL = {};
 
-          if (isContextProvider(Component)) {
-            return node.stateNode.__reactInternalMemoizedMergedChildContext;
-          }
+{
+  Object.freeze(UPDATE_SIGNAL);
+} // Counter for uniquely identifying views.
+// % 10 === 1 means it is a rootTag.
+// % 2 === 0 means it is a Fabric tag.
 
-          break;
-        }
-      }
+var nextReactTag = 3;
 
-      node = node.return;
-    } while (node !== null);
+function allocateTag() {
+  var tag = nextReactTag;
 
-    {
-      throw Error(
-        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-      );
-    }
+  if (tag % 10 === 1) {
+    tag += 2;
   }
+
+  nextReactTag = tag + 2;
+  return tag;
 }
 
-var LegacyRoot = 0;
-var BlockingRoot = 1;
-var ConcurrentRoot = 2;
+function recursivelyUncacheFiberNode(node) {
+  if (typeof node === "number") {
+    // Leaf node (eg text)
+    uncacheFiberNode(node);
+  } else {
+    uncacheFiberNode(node._nativeTag);
 
-var rendererID = null;
-var injectedHook = null;
-var hasLoggedError = false;
-var isDevToolsPresent = typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== "undefined";
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
+    node._children.forEach(recursivelyUncacheFiberNode);
   }
+}
+function appendInitialChild(parentInstance, child) {
+  parentInstance._children.push(child);
+}
+function createInstance(
+  type,
+  props,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  var tag = allocateTag();
+  var viewConfig = getViewConfigForType(type);
 
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
+  {
+    for (var key in viewConfig.validAttributes) {
+      if (props.hasOwnProperty(key)) {
+        ReactNativePrivateInterface.deepFreezeAndThrowOnMutationInDev(
+          props[key]
+        );
+      }
+    }
   }
 
-  if (!hook.supportsFiber) {
-    {
-      error(
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://reactjs.org/link/react-devtools"
-      );
-    } // DevTools exists, even though it doesn't support Fiber.
+  var updatePayload = create(props, viewConfig.validAttributes);
+  ReactNativePrivateInterface.UIManager.createView(
+    tag, // reactTag
+    viewConfig.uiViewClassName, // viewName
+    rootContainerInstance, // rootTag
+    updatePayload // props
+  );
+  var component = new ReactNativeFiberHostComponent(
+    tag,
+    viewConfig,
+    internalInstanceHandle
+  );
+  precacheFiberNode(internalInstanceHandle, tag);
+  updateFiberProps(tag, props); // Not sure how to avoid this cast. Flow is okay if the component is defined
+  // in the same file but if it's external it can't see the types.
 
-    return true;
+  return component;
+}
+function createTextInstance(
+  text,
+  rootContainerInstance,
+  hostContext,
+  internalInstanceHandle
+) {
+  if (!hostContext.isInAParentText) {
+    throw Error("Text strings must be rendered within a <Text> component.");
   }
 
-  try {
-    rendererID = hook.inject(internals); // We have successfully injected, so now it is safe to set up hooks.
-
-    injectedHook = hook;
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
+  var tag = allocateTag();
+  ReactNativePrivateInterface.UIManager.createView(
+    tag, // reactTag
+    "RCTRawText", // viewName
+    rootContainerInstance, // rootTag
     {
-      error("React instrumentation encountered an error: %s.", err);
-    }
-  } // DevTools exists
+      text: text
+    } // props
+  );
+  precacheFiberNode(internalInstanceHandle, tag);
+  return tag;
+}
+function finalizeInitialChildren(
+  parentInstance,
+  type,
+  props,
+  rootContainerInstance,
+  hostContext
+) {
+  // Don't send a no-op message over the bridge.
+  if (parentInstance._children.length === 0) {
+    return false;
+  } // Map from child objects to native tags.
+  // Either way we need to pass a copy of the Array to prevent it from being frozen.
 
-  return true;
+  var nativeTags = parentInstance._children.map(function(child) {
+    return typeof child === "number"
+      ? child // Leaf node (eg text)
+      : child._nativeTag;
+  });
+
+  ReactNativePrivateInterface.UIManager.setChildren(
+    parentInstance._nativeTag, // containerTag
+    nativeTags // reactTags
+  );
+  return false;
 }
-function onScheduleRoot(root, children) {
-  {
-    if (
-      injectedHook &&
-      typeof injectedHook.onScheduleFiberRoot === "function"
-    ) {
-      try {
-        injectedHook.onScheduleFiberRoot(rendererID, root, children);
-      } catch (err) {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
+function getRootHostContext(rootContainerInstance) {
+  return {
+    isInAParentText: false
+  };
+}
+function getChildHostContext(parentHostContext, type, rootContainerInstance) {
+  var prevIsInAParentText = parentHostContext.isInAParentText;
+  var isInAParentText =
+    type === "AndroidTextInput" || // Android
+    type === "RCTMultilineTextInputView" || // iOS
+    type === "RCTSinglelineTextInputView" || // iOS
+    type === "RCTText" ||
+    type === "RCTVirtualText";
 
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
-    }
+  if (prevIsInAParentText !== isInAParentText) {
+    return {
+      isInAParentText: isInAParentText
+    };
+  } else {
+    return parentHostContext;
   }
 }
-function onCommitRoot(root, priorityLevel) {
-  if (injectedHook && typeof injectedHook.onCommitFiberRoot === "function") {
-    try {
-      var didError = (root.current.flags & DidCapture) === DidCapture;
-
-      if (enableProfilerTimer) {
-        injectedHook.onCommitFiberRoot(
-          rendererID,
-          root,
-          priorityLevel,
-          didError
-        );
-      } else {
-        injectedHook.onCommitFiberRoot(rendererID, root, undefined, didError);
-      }
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
-
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
-    }
-  }
+function getPublicInstance(instance) {
+  return instance;
 }
-function onCommitUnmount(fiber) {
-  if (injectedHook && typeof injectedHook.onCommitFiberUnmount === "function") {
-    try {
-      injectedHook.onCommitFiberUnmount(rendererID, fiber);
-    } catch (err) {
-      {
-        if (!hasLoggedError) {
-          hasLoggedError = true;
-
-          error("React instrumentation encountered an error: %s", err);
-        }
-      }
-    }
-  }
+function prepareForCommit(containerInfo) {
+  // Noop
+  return null;
 }
+function prepareUpdate(
+  instance,
+  type,
+  oldProps,
+  newProps,
+  rootContainerInstance,
+  hostContext
+) {
+  return UPDATE_SIGNAL;
+}
+function resetAfterCommit(containerInfo) {
+  // Noop
+}
+var scheduleTimeout = setTimeout;
+var cancelTimeout = clearTimeout;
+var noTimeout = -1;
+function shouldSetTextContent(type, props) {
+  // TODO (bvaughn) Revisit this decision.
+  // Always returning false simplifies the createInstance() implementation,
+  // But creates an additional child Fiber for raw text children.
+  // No additional native views are created though.
+  // It's not clear to me which is better so I'm deferring for now.
+  // More context @ github.com/facebook/react/pull/8560#discussion_r92111303
+  return false;
+}
+function getCurrentEventPriority() {
+  return DefaultEventPriority;
+} // -------------------
+function appendChild(parentInstance, child) {
+  var childTag = typeof child === "number" ? child : child._nativeTag;
+  var children = parentInstance._children;
+  var index = children.indexOf(child);
 
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_now = Scheduler.unstable_now;
-
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
+  if (index >= 0) {
+    children.splice(index, 1);
+    children.push(child);
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerTag
+      [index], // moveFromIndices
+      [children.length - 1], // moveToIndices
+      [], // addChildReactTags
+      [], // addAtIndices
+      [] // removeAtIndices
+    );
+  } else {
+    children.push(child);
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerTag
+      [], // moveFromIndices
+      [], // moveToIndices
+      [childTag], // addChildReactTags
+      [children.length - 1], // addAtIndices
+      [] // removeAtIndices
     );
   }
 }
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
-
-var ImmediatePriority = 99;
-var UserBlockingPriority = 98;
-var NormalPriority = 97;
-var LowPriority = 96;
-var IdlePriority = 95; // NoPriority is the absence of priority. Also React-only.
-
-var NoPriority = 90;
-var initialTimeMs = Scheduler_now(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-
-var SyncLanePriority = 15;
-var SyncBatchedLanePriority = 14;
-var InputDiscreteHydrationLanePriority = 13;
-var InputDiscreteLanePriority = 12;
-var InputContinuousHydrationLanePriority = 11;
-var InputContinuousLanePriority = 10;
-var DefaultHydrationLanePriority = 9;
-var DefaultLanePriority = 8;
-var TransitionHydrationPriority = 7;
-var TransitionPriority = 6;
-var RetryLanePriority = 5;
-var SelectiveHydrationLanePriority = 4;
-var IdleHydrationLanePriority = 3;
-var IdleLanePriority = 2;
-var OffscreenLanePriority = 1;
-var NoLanePriority = 0;
-var TotalLanes = 31;
-var NoLanes =
-  /*                        */
-  0;
-var NoLane =
-  /*                          */
-  0;
-var SyncLane =
-  /*                        */
-  1;
-var SyncBatchedLane =
-  /*                 */
-  2;
-var InputDiscreteHydrationLane =
-  /*      */
-  4;
-var InputDiscreteLanes =
-  /*                    */
-  24;
-var InputContinuousHydrationLane =
-  /*           */
-  32;
-var InputContinuousLanes =
-  /*                  */
-  192;
-var DefaultHydrationLane =
-  /*            */
-  256;
-var DefaultLanes =
-  /*                   */
-  3584;
-var TransitionHydrationLane =
-  /*                */
-  4096;
-var TransitionLanes =
-  /*                       */
-  4186112;
-var RetryLanes =
-  /*                            */
-  62914560;
-var SomeRetryLane =
-  /*                  */
-  33554432;
-var SelectiveHydrationLane =
-  /*          */
-  67108864;
-var NonIdleLanes =
-  /*                                 */
-  134217727;
-var IdleHydrationLane =
-  /*               */
-  134217728;
-var IdleLanes =
-  /*                             */
-  805306368;
-var OffscreenLane =
-  /*                   */
-  1073741824;
-var NoTimestamp = -1;
-// Used by getHighestPriorityLanes and getNextLanes:
-
-var return_highestLanePriority = DefaultLanePriority;
-
-function getHighestPriorityLanes(lanes) {
-  if ((SyncLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncLanePriority;
-    return SyncLane;
-  }
-
-  if ((SyncBatchedLane & lanes) !== NoLanes) {
-    return_highestLanePriority = SyncBatchedLanePriority;
-    return SyncBatchedLane;
-  }
-
-  if ((InputDiscreteHydrationLane & lanes) !== NoLanes) {
-    return_highestLanePriority = InputDiscreteHydrationLanePriority;
-    return InputDiscreteHydrationLane;
-  }
-
-  var inputDiscreteLanes = InputDiscreteLanes & lanes;
-
-  if (inputDiscreteLanes !== NoLanes) {
-    return_highestLanePriority = InputDiscreteLanePriority;
-    return inputDiscreteLanes;
-  }
-
-  if ((lanes & InputContinuousHydrationLane) !== NoLanes) {
-    return_highestLanePriority = InputContinuousHydrationLanePriority;
-    return InputContinuousHydrationLane;
-  }
-
-  var inputContinuousLanes = InputContinuousLanes & lanes;
-
-  if (inputContinuousLanes !== NoLanes) {
-    return_highestLanePriority = InputContinuousLanePriority;
-    return inputContinuousLanes;
-  }
-
-  if ((lanes & DefaultHydrationLane) !== NoLanes) {
-    return_highestLanePriority = DefaultHydrationLanePriority;
-    return DefaultHydrationLane;
-  }
-
-  var defaultLanes = DefaultLanes & lanes;
-
-  if (defaultLanes !== NoLanes) {
-    return_highestLanePriority = DefaultLanePriority;
-    return defaultLanes;
-  }
-
-  if ((lanes & TransitionHydrationLane) !== NoLanes) {
-    return_highestLanePriority = TransitionHydrationPriority;
-    return TransitionHydrationLane;
-  }
-
-  var transitionLanes = TransitionLanes & lanes;
-
-  if (transitionLanes !== NoLanes) {
-    return_highestLanePriority = TransitionPriority;
-    return transitionLanes;
-  }
-
-  var retryLanes = RetryLanes & lanes;
-
-  if (retryLanes !== NoLanes) {
-    return_highestLanePriority = RetryLanePriority;
-    return retryLanes;
-  }
-
-  if (lanes & SelectiveHydrationLane) {
-    return_highestLanePriority = SelectiveHydrationLanePriority;
-    return SelectiveHydrationLane;
-  }
-
-  if ((lanes & IdleHydrationLane) !== NoLanes) {
-    return_highestLanePriority = IdleHydrationLanePriority;
-    return IdleHydrationLane;
-  }
-
-  var idleLanes = IdleLanes & lanes;
-
-  if (idleLanes !== NoLanes) {
-    return_highestLanePriority = IdleLanePriority;
-    return idleLanes;
-  }
+function appendChildToContainer(parentInstance, child) {
+  var childTag = typeof child === "number" ? child : child._nativeTag;
+  ReactNativePrivateInterface.UIManager.setChildren(
+    parentInstance, // containerTag
+    [childTag] // reactTags
+  );
+}
+function commitTextUpdate(textInstance, oldText, newText) {
+  ReactNativePrivateInterface.UIManager.updateView(
+    textInstance, // reactTag
+    "RCTRawText", // viewName
+    {
+      text: newText
+    } // props
+  );
+}
+function commitUpdate(
+  instance,
+  updatePayloadTODO,
+  type,
+  oldProps,
+  newProps,
+  internalInstanceHandle
+) {
+  var viewConfig = instance.viewConfig;
+  updateFiberProps(instance._nativeTag, newProps);
+  var updatePayload = diff(oldProps, newProps, viewConfig.validAttributes); // Avoid the overhead of bridge calls if there's no update.
+  // This is an expensive no-op for Android, and causes an unnecessary
+  // view invalidation for certain components (eg RCTTextInput) on iOS.
 
-  if ((OffscreenLane & lanes) !== NoLanes) {
-    return_highestLanePriority = OffscreenLanePriority;
-    return OffscreenLane;
+  if (updatePayload != null) {
+    ReactNativePrivateInterface.UIManager.updateView(
+      instance._nativeTag, // reactTag
+      viewConfig.uiViewClassName, // viewName
+      updatePayload // props
+    );
   }
-
-  {
-    error("Should have found matching lanes. This is a bug in React.");
-  } // This shouldn't be reachable, but as a fallback, return the entire bitmask.
-
-  return_highestLanePriority = DefaultLanePriority;
-  return lanes;
 }
+function insertBefore(parentInstance, child, beforeChild) {
+  var children = parentInstance._children;
+  var index = children.indexOf(child); // Move existing child or add new child?
 
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case ImmediatePriority:
-      return SyncLanePriority;
-
-    case UserBlockingPriority:
-      return InputContinuousLanePriority;
-
-    case NormalPriority:
-    case LowPriority:
-      // TODO: Handle LowSchedulerPriority, somehow. Maybe the same lane as hydration.
-      return DefaultLanePriority;
-
-    case IdlePriority:
-      return IdleLanePriority;
+  if (index >= 0) {
+    children.splice(index, 1);
+    var beforeChildIndex = children.indexOf(beforeChild);
+    children.splice(beforeChildIndex, 0, child);
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerID
+      [index], // moveFromIndices
+      [beforeChildIndex], // moveToIndices
+      [], // addChildReactTags
+      [], // addAtIndices
+      [] // removeAtIndices
+    );
+  } else {
+    var _beforeChildIndex = children.indexOf(beforeChild);
 
-    default:
-      return NoLanePriority;
+    children.splice(_beforeChildIndex, 0, child);
+    var childTag = typeof child === "number" ? child : child._nativeTag;
+    ReactNativePrivateInterface.UIManager.manageChildren(
+      parentInstance._nativeTag, // containerID
+      [], // moveFromIndices
+      [], // moveToIndices
+      [childTag], // addChildReactTags
+      [_beforeChildIndex], // addAtIndices
+      [] // removeAtIndices
+    );
   }
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case SyncLanePriority:
-    case SyncBatchedLanePriority:
-      return ImmediatePriority;
-
-    case InputDiscreteHydrationLanePriority:
-    case InputDiscreteLanePriority:
-    case InputContinuousHydrationLanePriority:
-    case InputContinuousLanePriority:
-      return UserBlockingPriority;
-
-    case DefaultHydrationLanePriority:
-    case DefaultLanePriority:
-    case TransitionHydrationPriority:
-    case TransitionPriority:
-    case SelectiveHydrationLanePriority:
-    case RetryLanePriority:
-      return NormalPriority;
-
-    case IdleHydrationLanePriority:
-    case IdleLanePriority:
-    case OffscreenLanePriority:
-      return IdlePriority;
-
-    case NoLanePriority:
-      return NoPriority;
-
-    default: {
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-    }
+function insertInContainerBefore(parentInstance, child, beforeChild) {
+  // TODO (bvaughn): Remove this check when...
+  // We create a wrapper object for the container in ReactNative render()
+  // Or we refactor to remove wrapper objects entirely.
+  // For more info on pros/cons see PR #8560 description.
+  if (!(typeof parentInstance !== "number")) {
+    throw Error("Container does not support insertBefore operation");
   }
 }
-function getNextLanes(root, wipLanes) {
-  // Early bailout if there's no pending work left.
-  var pendingLanes = root.pendingLanes;
+function removeChild(parentInstance, child) {
+  recursivelyUncacheFiberNode(child);
+  var children = parentInstance._children;
+  var index = children.indexOf(child);
+  children.splice(index, 1);
+  ReactNativePrivateInterface.UIManager.manageChildren(
+    parentInstance._nativeTag, // containerID
+    [], // moveFromIndices
+    [], // moveToIndices
+    [], // addChildReactTags
+    [], // addAtIndices
+    [index] // removeAtIndices
+  );
+}
+function removeChildFromContainer(parentInstance, child) {
+  recursivelyUncacheFiberNode(child);
+  ReactNativePrivateInterface.UIManager.manageChildren(
+    parentInstance, // containerID
+    [], // moveFromIndices
+    [], // moveToIndices
+    [], // addChildReactTags
+    [], // addAtIndices
+    [0] // removeAtIndices
+  );
+}
+function resetTextContent(instance) {
+  // Noop
+}
+function hideInstance(instance) {
+  var viewConfig = instance.viewConfig;
+  var updatePayload = create(
+    {
+      style: {
+        display: "none"
+      }
+    },
+    viewConfig.validAttributes
+  );
+  ReactNativePrivateInterface.UIManager.updateView(
+    instance._nativeTag,
+    viewConfig.uiViewClassName,
+    updatePayload
+  );
+}
+function hideTextInstance(textInstance) {
+  throw new Error("Not yet implemented.");
+}
+function unhideInstance(instance, props) {
+  var viewConfig = instance.viewConfig;
+  var updatePayload = diff(
+    Object.assign({}, props, {
+      style: [
+        props.style,
+        {
+          display: "none"
+        }
+      ]
+    }),
+    props,
+    viewConfig.validAttributes
+  );
+  ReactNativePrivateInterface.UIManager.updateView(
+    instance._nativeTag,
+    viewConfig.uiViewClassName,
+    updatePayload
+  );
+}
+function clearContainer(container) {
+  // TODO Implement this for React Native
+  // UIManager does not expose a "remove all" type method.
+}
+function unhideTextInstance(textInstance, text) {
+  throw new Error("Not yet implemented.");
+}
+function makeClientIdInDEV(warnOnAccessInDEV) {
+  throw new Error("Not yet implemented");
+}
+function preparePortalMount(portalInstance) {
+  // noop
+}
 
-  if (pendingLanes === NoLanes) {
-    return_highestLanePriority = NoLanePriority;
-    return NoLanes;
+var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
+function describeBuiltInComponentFrame(name, source, ownerFn) {
+  {
+    var ownerName = null;
+
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
+    }
+
+    return describeComponentFrame(name, source, ownerName);
   }
+}
+var componentFrameCache;
 
-  var nextLanes = NoLanes;
-  var nextLanePriority = NoLanePriority;
-  var expiredLanes = root.expiredLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes; // Check if any work has expired.
+{
+  var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map;
+  componentFrameCache = new PossiblyWeakMap();
+}
+var BEFORE_SLASH_RE = /^(.*)[\\\/]/;
 
-  if (expiredLanes !== NoLanes) {
-    nextLanes = expiredLanes;
-    nextLanePriority = return_highestLanePriority = SyncLanePriority;
-  } else {
-    // Do not work on any idle work until all the non-idle work has finished,
-    // even if the work is suspended.
-    var nonIdlePendingLanes = pendingLanes & NonIdleLanes;
+function describeComponentFrame(name, source, ownerName) {
+  var sourceInfo = "";
 
-    if (nonIdlePendingLanes !== NoLanes) {
-      var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+  if (source) {
+    var path = source.fileName;
+    var fileName = path.replace(BEFORE_SLASH_RE, ""); // In DEV, include code for a common special case:
+    // prefer "folder/index.js" instead of just "index.js".
 
-      if (nonIdleUnblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        var nonIdlePingedLanes = nonIdlePendingLanes & pingedLanes;
+    if (/^index\./.test(fileName)) {
+      var match = path.match(BEFORE_SLASH_RE);
 
-        if (nonIdlePingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(nonIdlePingedLanes);
-          nextLanePriority = return_highestLanePriority;
-        }
-      }
-    } else {
-      // The only remaining work is Idle.
-      var unblockedLanes = pendingLanes & ~suspendedLanes;
+      if (match) {
+        var pathBeforeSlash = match[1];
 
-      if (unblockedLanes !== NoLanes) {
-        nextLanes = getHighestPriorityLanes(unblockedLanes);
-        nextLanePriority = return_highestLanePriority;
-      } else {
-        if (pingedLanes !== NoLanes) {
-          nextLanes = getHighestPriorityLanes(pingedLanes);
-          nextLanePriority = return_highestLanePriority;
+        if (pathBeforeSlash) {
+          var folderName = pathBeforeSlash.replace(BEFORE_SLASH_RE, "");
+          fileName = folderName + "/" + fileName;
         }
       }
     }
+
+    sourceInfo = " (at " + fileName + ":" + source.lineNumber + ")";
+  } else if (ownerName) {
+    sourceInfo = " (created by " + ownerName + ")";
   }
 
-  if (nextLanes === NoLanes) {
-    // This should only be reachable if we're suspended
-    // TODO: Consider warning in this path if a fallback timer is not scheduled.
-    return NoLanes;
-  } // If there are higher priority lanes, we'll include them even if they
-  // are suspended.
+  return "\n    in " + (name || "Unknown") + sourceInfo;
+}
 
-  nextLanes = pendingLanes & getEqualOrHigherPriorityLanes(nextLanes); // If we're already in the middle of a render, switching lanes will interrupt
-  // it and we'll lose our progress. We should only do this if the new lanes are
-  // higher priority.
+function describeClassComponentFrame(ctor, source, ownerFn) {
+  {
+    return describeFunctionComponentFrame(ctor, source, ownerFn);
+  }
+}
+function describeFunctionComponentFrame(fn, source, ownerFn) {
+  {
+    if (!fn) {
+      return "";
+    }
 
-  if (
-    wipLanes !== NoLanes &&
-    wipLanes !== nextLanes && // If we already suspended with a delay, then interrupting is fine. Don't
-    // bother waiting until the root is complete.
-    (wipLanes & suspendedLanes) === NoLanes
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    var wipLanePriority = return_highestLanePriority;
+    var name = fn.displayName || fn.name || null;
+    var ownerName = null;
 
-    if (nextLanePriority <= wipLanePriority) {
-      return wipLanes;
-    } else {
-      return_highestLanePriority = nextLanePriority;
+    if (ownerFn) {
+      ownerName = ownerFn.displayName || ownerFn.name || null;
     }
-  } // Check for entangled lanes and add them to the batch.
-  //
-  // A lane is said to be entangled with another when it's not allowed to render
-  // in a batch that does not also include the other lane. Typically we do this
-  // when multiple updates have the same source, and we only want to respond to
-  // the most recent event from that source.
-  //
-  // Note that we apply entanglements *after* checking for partial work above.
-  // This means that if a lane is entangled during an interleaved event while
-  // it's already rendering, we won't interrupt it. This is intentional, since
-  // entanglement is usually "best effort": we'll try our best to render the
-  // lanes in the same batch, but it's not worth throwing out partially
-  // completed work in order to do it.
-  //
-  // For those exceptions where entanglement is semantically important, like
-  // useMutableSource, we should ensure that there is no partial work at the
-  // time we apply the entanglement.
 
-  var entangledLanes = root.entangledLanes;
+    return describeComponentFrame(name, source, ownerName);
+  }
+}
 
-  if (entangledLanes !== NoLanes) {
-    var entanglements = root.entanglements;
-    var lanes = nextLanes & entangledLanes;
+function describeUnknownElementTypeFrameInDEV(type, source, ownerFn) {
+  if (type == null) {
+    return "";
+  }
 
-    while (lanes > 0) {
-      var index = pickArbitraryLaneIndex(lanes);
-      var lane = 1 << index;
-      nextLanes |= entanglements[index];
-      lanes &= ~lane;
+  if (typeof type === "function") {
+    {
+      return describeFunctionComponentFrame(type, source, ownerFn);
     }
   }
 
-  return nextLanes;
-}
-function getMostRecentEventTime(root, lanes) {
-  var eventTimes = root.eventTimes;
-  var mostRecentEventTime = NoTimestamp;
-
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var eventTime = eventTimes[index];
+  if (typeof type === "string") {
+    return describeBuiltInComponentFrame(type, source, ownerFn);
+  }
 
-    if (eventTime > mostRecentEventTime) {
-      mostRecentEventTime = eventTime;
-    }
+  switch (type) {
+    case REACT_SUSPENSE_TYPE:
+      return describeBuiltInComponentFrame("Suspense", source, ownerFn);
 
-    lanes &= ~lane;
+    case REACT_SUSPENSE_LIST_TYPE:
+      return describeBuiltInComponentFrame("SuspenseList", source, ownerFn);
   }
 
-  return mostRecentEventTime;
-}
+  if (typeof type === "object") {
+    switch (type.$$typeof) {
+      case REACT_FORWARD_REF_TYPE:
+        return describeFunctionComponentFrame(type.render, source, ownerFn);
 
-function computeExpirationTime(lane, currentTime) {
-  // TODO: Expiration heuristic is constant per lane, so could use a map.
-  getHighestPriorityLanes(lane);
-  var priority = return_highestLanePriority;
+      case REACT_MEMO_TYPE:
+        // Memo may contain any component type so we recursively resolve it.
+        return describeUnknownElementTypeFrameInDEV(type.type, source, ownerFn);
 
-  if (priority >= InputContinuousLanePriority) {
-    // User interactions should expire slightly more quickly.
-    //
-    // NOTE: This is set to the corresponding constant as in Scheduler.js. When
-    // we made it larger, a product metric in www regressed, suggesting there's
-    // a user interaction that's being starved by a series of synchronous
-    // updates. If that theory is correct, the proper solution is to fix the
-    // starvation. However, this scenario supports the idea that expiration
-    // times are an important safeguard when starvation does happen.
-    //
-    // Also note that, in the case of user input specifically, this will soon no
-    // longer be an issue because we plan to make user input synchronous by
-    // default (until you enter `startTransition`, of course.)
-    //
-    // If weren't planning to make these updates synchronous soon anyway, I
-    // would probably make this number a configurable parameter.
-    return currentTime + 250;
-  } else if (priority >= TransitionPriority) {
-    return currentTime + 5000;
-  } else {
-    // Anything idle priority or lower should never expire.
-    return NoTimestamp;
+      case REACT_LAZY_TYPE: {
+        var lazyComponent = type;
+        var payload = lazyComponent._payload;
+        var init = lazyComponent._init;
+
+        try {
+          // Lazy may contain any component type so we recursively resolve it.
+          return describeUnknownElementTypeFrameInDEV(
+            init(payload),
+            source,
+            ownerFn
+          );
+        } catch (x) {}
+      }
+    }
   }
+
+  return "";
 }
 
-function markStarvedLanesAsExpired(root, currentTime) {
-  // TODO: This gets called every time we yield. We can optimize by storing
-  // the earliest expiration time on the root. Then use that to quickly bail out
-  // of this function.
-  var pendingLanes = root.pendingLanes;
-  var suspendedLanes = root.suspendedLanes;
-  var pingedLanes = root.pingedLanes;
-  var expirationTimes = root.expirationTimes; // Iterate through the pending lanes and check if we've reached their
-  // expiration time. If so, we'll assume the update is being starved and mark
-  // it as expired to force it to finish.
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 
-  var lanes = pendingLanes;
-
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    var expirationTime = expirationTimes[index];
+var loggedTypeFailures = {};
+var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
 
-    if (expirationTime === NoTimestamp) {
-      // Found a pending lane with no expiration time. If it's not suspended, or
-      // if it's pinged, assume it's CPU-bound. Compute a new expiration time
-      // using the current time.
-      if (
-        (lane & suspendedLanes) === NoLanes ||
-        (lane & pingedLanes) !== NoLanes
-      ) {
-        // Assumes timestamps are monotonically increasing.
-        expirationTimes[index] = computeExpirationTime(lane, currentTime);
-      }
-    } else if (expirationTime <= currentTime) {
-      // This lane expired
-      root.expiredLanes |= lane;
+function setCurrentlyValidatingElement(element) {
+  {
+    if (element) {
+      var owner = element._owner;
+      var stack = describeUnknownElementTypeFrameInDEV(
+        element.type,
+        element._source,
+        owner ? owner.type : null
+      );
+      ReactDebugCurrentFrame.setExtraStackFrame(stack);
+    } else {
+      ReactDebugCurrentFrame.setExtraStackFrame(null);
     }
-
-    lanes &= ~lane;
-  }
-} // This returns the highest priority pending lanes regardless of whether they
-function getLanesToRetrySynchronouslyOnError(root) {
-  var everythingButOffscreen = root.pendingLanes & ~OffscreenLane;
-
-  if (everythingButOffscreen !== NoLanes) {
-    return everythingButOffscreen;
-  }
-
-  if (everythingButOffscreen & OffscreenLane) {
-    return OffscreenLane;
   }
-
-  return NoLanes;
 }
-function returnNextLanesPriority() {
-  return return_highestLanePriority;
-}
-function includesNonIdleWork(lanes) {
-  return (lanes & NonIdleLanes) !== NoLanes;
-}
-function includesOnlyRetries(lanes) {
-  return (lanes & RetryLanes) === lanes;
-}
-function includesOnlyTransitions(lanes) {
-  return (lanes & TransitionLanes) === lanes;
-} // To ensure consistency across multiple updates in the same event, this should
-// be a pure function, so that it always returns the same lane for given inputs.
-
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case NoLanePriority:
-      break;
-
-    case SyncLanePriority:
-      return SyncLane;
 
-    case SyncBatchedLanePriority:
-      return SyncBatchedLane;
+function checkPropTypes(typeSpecs, values, location, componentName, element) {
+  {
+    // $FlowFixMe This is okay but Flow doesn't know it.
+    var has = Function.call.bind(hasOwnProperty);
 
-    case InputDiscreteLanePriority: {
-      var _lane = pickArbitraryLane(InputDiscreteLanes & ~wipLanes);
+    for (var typeSpecName in typeSpecs) {
+      if (has(typeSpecs, typeSpecName)) {
+        var error$1 = void 0; // Prop type validation may throw. In case they do, we don't want to
+        // fail the render phase where it didn't fail before. So we log it.
+        // After these have been cleaned up, we'll let them throw.
 
-      if (_lane === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(InputContinuousLanePriority, wipLanes);
-      }
+        try {
+          // This is intentionally an invariant that gets caught. It's the same
+          // behavior as without this statement except with a better message.
+          if (typeof typeSpecs[typeSpecName] !== "function") {
+            var err = Error(
+              (componentName || "React class") +
+                ": " +
+                location +
+                " type `" +
+                typeSpecName +
+                "` is invalid; " +
+                "it must be a function, usually from the `prop-types` package, but received `" +
+                typeof typeSpecs[typeSpecName] +
+                "`." +
+                "This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`."
+            );
+            err.name = "Invariant Violation";
+            throw err;
+          }
 
-      return _lane;
-    }
+          error$1 = typeSpecs[typeSpecName](
+            values,
+            typeSpecName,
+            componentName,
+            location,
+            null,
+            "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"
+          );
+        } catch (ex) {
+          error$1 = ex;
+        }
 
-    case InputContinuousLanePriority: {
-      var _lane2 = pickArbitraryLane(InputContinuousLanes & ~wipLanes);
+        if (error$1 && !(error$1 instanceof Error)) {
+          setCurrentlyValidatingElement(element);
 
-      if (_lane2 === NoLane) {
-        // Shift to the next priority level
-        return findUpdateLane(DefaultLanePriority, wipLanes);
-      }
+          error(
+            "%s: type specification of %s" +
+              " `%s` is invalid; the type checker " +
+              "function must return `null` or an `Error` but returned a %s. " +
+              "You may have forgotten to pass an argument to the type checker " +
+              "creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and " +
+              "shape all require an argument).",
+            componentName || "React class",
+            location,
+            typeSpecName,
+            typeof error$1
+          );
 
-      return _lane2;
-    }
+          setCurrentlyValidatingElement(null);
+        }
 
-    case DefaultLanePriority: {
-      var _lane3 = pickArbitraryLane(DefaultLanes & ~wipLanes);
+        if (
+          error$1 instanceof Error &&
+          !(error$1.message in loggedTypeFailures)
+        ) {
+          // Only monitor this failure once because there tends to be a lot of the
+          // same error.
+          loggedTypeFailures[error$1.message] = true;
+          setCurrentlyValidatingElement(element);
 
-      if (_lane3 === NoLane) {
-        // If all the default lanes are already being worked on, look for a
-        // lane in the transition range.
-        _lane3 = pickArbitraryLane(TransitionLanes & ~wipLanes);
+          error("Failed %s type: %s", location, error$1.message);
 
-        if (_lane3 === NoLane) {
-          // All the transition lanes are taken, too. This should be very
-          // rare, but as a last resort, pick a default lane. This will have
-          // the effect of interrupting the current work-in-progress render.
-          _lane3 = pickArbitraryLane(DefaultLanes);
+          setCurrentlyValidatingElement(null);
         }
       }
-
-      return _lane3;
     }
+  }
+}
 
-    case TransitionPriority: // Should be handled by findTransitionLane instead
+var valueStack = [];
+var fiberStack;
 
-    case RetryLanePriority:
-      // Should be handled by findRetryLane instead
-      break;
+{
+  fiberStack = [];
+}
 
-    case IdleLanePriority:
-      var lane = pickArbitraryLane(IdleLanes & ~wipLanes);
+var index = -1;
 
-      if (lane === NoLane) {
-        lane = pickArbitraryLane(IdleLanes);
-      }
+function createCursor(defaultValue) {
+  return {
+    current: defaultValue
+  };
+}
+
+function pop(cursor, fiber) {
+  if (index < 0) {
+    {
+      error("Unexpected pop.");
+    }
 
-      return lane;
+    return;
   }
 
   {
-    throw Error(
-      "Invalid update priority: " + lanePriority + ". This is a bug in React."
-    );
+    if (fiber !== fiberStack[index]) {
+      error("Unexpected Fiber popped.");
+    }
   }
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
-
-function findTransitionLane(wipLanes, pendingLanes) {
-  // First look for lanes that are completely unclaimed, i.e. have no
-  // pending work.
-  var lane = pickArbitraryLane(TransitionLanes & ~pendingLanes);
 
-  if (lane === NoLane) {
-    // If all lanes have pending work, look for a lane that isn't currently
-    // being worked on.
-    lane = pickArbitraryLane(TransitionLanes & ~wipLanes);
+  cursor.current = valueStack[index];
+  valueStack[index] = null;
 
-    if (lane === NoLane) {
-      // If everything is being worked on, pick any lane. This has the
-      // effect of interrupting the current work-in-progress.
-      lane = pickArbitraryLane(TransitionLanes);
-    }
+  {
+    fiberStack[index] = null;
   }
 
-  return lane;
-} // To ensure consistency across multiple updates in the same event, this should
-// be pure function, so that it always returns the same lane for given inputs.
+  index--;
+}
 
-function findRetryLane(wipLanes) {
-  // This is a fork of `findUpdateLane` designed specifically for Suspense
-  // "retries" — a special update that attempts to flip a Suspense boundary
-  // from its placeholder state to its primary/resolved state.
-  var lane = pickArbitraryLane(RetryLanes & ~wipLanes);
+function push(cursor, value, fiber) {
+  index++;
+  valueStack[index] = cursor.current;
 
-  if (lane === NoLane) {
-    lane = pickArbitraryLane(RetryLanes);
+  {
+    fiberStack[index] = fiber;
   }
 
-  return lane;
+  cursor.current = value;
 }
 
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
+var warnedAboutMissingGetChildContext;
 
-function getLowestPriorityLane(lanes) {
-  // This finds the most significant non-zero bit.
-  var index = 31 - clz32(lanes);
-  return index < 0 ? NoLanes : 1 << index;
+{
+  warnedAboutMissingGetChildContext = {};
 }
 
-function getEqualOrHigherPriorityLanes(lanes) {
-  return (getLowestPriorityLane(lanes) << 1) - 1;
-}
+var emptyContextObject = {};
 
-function pickArbitraryLane(lanes) {
-  // This wrapper function gets inlined. Only exists so to communicate that it
-  // doesn't matter which bit is selected; you can pick any bit without
-  // affecting the algorithms where its used. Here I'm using
-  // getHighestPriorityLane because it requires the fewest operations.
-  return getHighestPriorityLane(lanes);
-}
+{
+  Object.freeze(emptyContextObject);
+} // A cursor to the current merged context object on the stack.
 
-function pickArbitraryLaneIndex(lanes) {
-  return 31 - clz32(lanes);
-}
+var contextStackCursor = createCursor(emptyContextObject); // A cursor to a boolean indicating whether the context has changed.
 
-function laneToIndex(lane) {
-  return pickArbitraryLaneIndex(lane);
-}
+var didPerformWorkStackCursor = createCursor(false); // Keep track of the previous context object that was on the stack.
+// We use this to get access to the parent context after we have already
+// pushed the next context provider, and now need to merge their contexts.
 
-function includesSomeLane(a, b) {
-  return (a & b) !== NoLanes;
-}
-function isSubsetOfLanes(set, subset) {
-  return (set & subset) === subset;
-}
-function mergeLanes(a, b) {
-  return a | b;
-}
-function removeLanes(set, subset) {
-  return set & ~subset;
-} // Seems redundant, but it changes the type from a single lane (used for
-// updates) to a group of lanes (used for flushing work).
+var previousContext = emptyContextObject;
 
-function laneToLanes(lane) {
-  return lane;
-}
-function createLaneMap(initial) {
-  // Intentionally pushing one by one.
-  // https://v8.dev/blog/elements-kinds#avoid-creating-holes
-  var laneMap = [];
+function getUnmaskedContext(
+  workInProgress,
+  Component,
+  didPushOwnContextIfProvider
+) {
+  {
+    if (didPushOwnContextIfProvider && isContextProvider(Component)) {
+      // If the fiber is a context provider itself, when we read its context
+      // we may have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
+    }
 
-  for (var i = 0; i < TotalLanes; i++) {
-    laneMap.push(initial);
+    return contextStackCursor.current;
   }
-
-  return laneMap;
 }
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane; // TODO: Theoretically, any update to any lane can unblock any other lane. But
-  // it's not practical to try every single possible combination. We need a
-  // heuristic to decide which lanes to attempt to render, and in which batches.
-  // For now, we use the same heuristic as in the old ExpirationTimes model:
-  // retry any lane at equal or lower priority, but don't try updates at higher
-  // priority without also including the lower priority updates. This works well
-  // when considering updates across different priority levels, but isn't
-  // sufficient for updates within the same priority, since we want to treat
-  // those updates as parallel.
-  // Unsuspend any update at equal or lower priority.
-
-  var higherPriorityLanes = updateLane - 1; // Turns 0b1000 into 0b0111
-
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  var eventTimes = root.eventTimes;
-  var index = laneToIndex(updateLane); // We can always overwrite an existing timestamp because we prefer the most
-  // recent event, and we assume time is monotonically increasing.
 
-  eventTimes[index] = eventTime;
+function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+  {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
 }
-function markRootSuspended(root, suspendedLanes) {
-  root.suspendedLanes |= suspendedLanes;
-  root.pingedLanes &= ~suspendedLanes; // The suspended lanes are no longer CPU-bound. Clear their expiration times.
 
-  var expirationTimes = root.expirationTimes;
-  var lanes = suspendedLanes;
+function getMaskedContext(workInProgress, unmaskedContext) {
+  {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
-  }
-}
-function markRootPinged(root, pingedLanes, eventTime) {
-  root.pingedLanes |= root.suspendedLanes & pingedLanes;
-}
-function hasDiscreteLanes(lanes) {
-  return (lanes & InputDiscreteLanes) !== NoLanes;
-}
-function markRootMutableRead(root, updateLane) {
-  root.mutableReadLanes |= updateLane & root.pendingLanes;
-}
-function markRootFinished(root, remainingLanes) {
-  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
-  root.pendingLanes = remainingLanes; // Let's try everything again
+    if (!contextTypes) {
+      return emptyContextObject;
+    } // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
 
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes;
-  root.mutableReadLanes &= remainingLanes;
-  root.entangledLanes &= remainingLanes;
-  var entanglements = root.entanglements;
-  var eventTimes = root.eventTimes;
-  var expirationTimes = root.expirationTimes; // Clear the lanes that no longer have pending work
+    var instance = workInProgress.stateNode;
 
-  var lanes = noLongerPendingLanes;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] = NoLanes;
-    eventTimes[index] = NoTimestamp;
-    expirationTimes[index] = NoTimestamp;
-    lanes &= ~lane;
+    var context = {};
+
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
+
+    {
+      var name = getComponentNameFromFiber(workInProgress) || "Unknown";
+      checkPropTypes(contextTypes, context, "context", name);
+    } // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
+
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
+
+    return context;
   }
 }
-function markRootEntangled(root, entangledLanes) {
-  root.entangledLanes |= entangledLanes;
-  var entanglements = root.entanglements;
-  var lanes = entangledLanes;
 
-  while (lanes > 0) {
-    var index = pickArbitraryLaneIndex(lanes);
-    var lane = 1 << index;
-    entanglements[index] |= entangledLanes;
-    lanes &= ~lane;
+function hasContextChanged() {
+  {
+    return didPerformWorkStackCursor.current;
   }
 }
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback; // Count leading zeros. Only used on lanes, so assume input is an integer.
-// Based on:
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
 
-var log = Math.log;
-var LN2 = Math.LN2;
+function isContextProvider(type) {
+  {
+    var childContextTypes = type.childContextTypes;
+    return childContextTypes !== null && childContextTypes !== undefined;
+  }
+}
 
-function clz32Fallback(lanes) {
-  if (lanes === 0) {
-    return 32;
+function popContext(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
   }
+}
 
-  return (31 - ((log(lanes) / LN2) | 0)) | 0;
+function popTopLevelContextObject(fiber) {
+  {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
 }
 
-// Intentionally not named imports because Rollup would use dynamic dispatch for
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
+function pushTopLevelContextObject(fiber, context, didChange) {
+  {
+    if (!(contextStackCursor.current === emptyContextObject)) {
+      throw Error(
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-{
-  // Provide explicit error message when production+profiling bundle of e.g.
-  // react-dom is used with production (non-profiling) bundle of
-  // scheduler/tracing
-  if (
-    !(
-      tracing.__interactionsRef != null &&
-      tracing.__interactionsRef.current != null
-    )
-  ) {
-    throw Error(
-      "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-    );
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
   }
 }
 
-var fakeCallbackNode = {}; // Except for NoPriority, these correspond to Scheduler priorities. We use
-// ascending numbers so we can compare them like numbers. They start at 90 to
-// avoid clashing with Scheduler's priorities.
+function processChildContext(fiber, type, parentContext) {
+  {
+    var instance = fiber.stateNode;
+    var childContextTypes = type.childContextTypes; // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
 
-var ImmediatePriority$1 = 99;
-var UserBlockingPriority$1 = 98;
-var NormalPriority$1 = 97;
-var LowPriority$1 = 96;
-var IdlePriority$1 = 95; // NoPriority is the absence of priority. Also React-only.
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentNameFromFiber(fiber) || "Unknown";
 
-var NoPriority$1 = 90;
-var shouldYield = Scheduler_shouldYield;
-var requestPaint = // Fall back gracefully if we're running an older version of Scheduler.
-  Scheduler_requestPaint !== undefined ? Scheduler_requestPaint : function() {};
-var syncQueue = null;
-var immediateQueueCallbackNode = null;
-var isFlushingSyncQueue = false;
-var initialTimeMs$1 = Scheduler_now$1(); // If the initial timestamp is reasonably small, use Scheduler's `now` directly.
-// This will be the case for modern browsers that support `performance.now`. In
-// older browsers, Scheduler falls back to `Date.now`, which returns a Unix
-// timestamp. In that case, subtract the module initialization time to simulate
-// the behavior of performance.now and keep our times small enough to fit
-// within 32 bits.
-// TODO: Consider lifting this into Scheduler.
-
-var now =
-  initialTimeMs$1 < 10000
-    ? Scheduler_now$1
-    : function() {
-        return Scheduler_now$1() - initialTimeMs$1;
-      };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return ImmediatePriority$1;
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
 
-    case Scheduler_UserBlockingPriority:
-      return UserBlockingPriority$1;
+          error(
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
 
-    case Scheduler_NormalPriority:
-      return NormalPriority$1;
+      return parentContext;
+    }
 
-    case Scheduler_LowPriority:
-      return LowPriority$1;
+    var childContext = instance.getChildContext();
 
-    case Scheduler_IdlePriority:
-      return IdlePriority$1;
+    for (var contextKey in childContext) {
+      if (!(contextKey in childContextTypes)) {
+        throw Error(
+          (getComponentNameFromFiber(fiber) || "Unknown") +
+            '.getChildContext(): key "' +
+            contextKey +
+            '" is not defined in childContextTypes.'
+        );
+      }
+    }
 
-    default: {
-      throw Error("Unknown priority level.");
+    {
+      var name = getComponentNameFromFiber(fiber) || "Unknown";
+      checkPropTypes(childContextTypes, childContext, "child context", name);
     }
+
+    return Object.assign({}, parentContext, childContext);
   }
 }
 
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case ImmediatePriority$1:
-      return Scheduler_ImmediatePriority;
+function pushContextProvider(workInProgress) {
+  {
+    var instance = workInProgress.stateNode; // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
 
-    case UserBlockingPriority$1:
-      return Scheduler_UserBlockingPriority;
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyContextObject; // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
 
-    case NormalPriority$1:
-      return Scheduler_NormalPriority;
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
+    return true;
+  }
+}
 
-    case LowPriority$1:
-      return Scheduler_LowPriority;
+function invalidateContextProvider(workInProgress, type, didChange) {
+  {
+    var instance = workInProgress.stateNode;
 
-    case IdlePriority$1:
-      return Scheduler_IdlePriority;
+    if (!instance) {
+      throw Error(
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
 
-    default: {
-      throw Error("Unknown priority level.");
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(
+        workInProgress,
+        type,
+        previousContext
+      );
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext; // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
+
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress); // Now push the new context and mark that it has changed.
+
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
     }
   }
 }
 
-function runWithPriority(reactPriorityLevel, fn) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(priorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  var priorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(priorityLevel, callback, options);
+function findCurrentUnmaskedContext(fiber) {
+  {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    if (!(isFiberMounted(fiber) && fiber.tag === ClassComponent)) {
+      throw Error(
+        "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
+
+    var node = fiber;
+
+    do {
+      switch (node.tag) {
+        case HostRoot:
+          return node.stateNode.context;
+
+        case ClassComponent: {
+          var Component = node.type;
+
+          if (isContextProvider(Component)) {
+            return node.stateNode.__reactInternalMemoizedMergedChildContext;
+          }
+
+          break;
+        }
+      }
+
+      node = node.return;
+    } while (node !== null);
+
+    {
+      throw Error(
+        "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+      );
+    }
+  }
 }
+
+var LegacyRoot = 0;
+var ConcurrentRoot = 1;
+
+var syncQueue = null;
+var includesLegacySyncCallbacks = false;
+var isFlushingSyncQueue = false;
 function scheduleSyncCallback(callback) {
   // Push this callback into an internal queue. We'll flush these either in
   // the next tick, or earlier if something calls `flushSyncCallbackQueue`.
   if (syncQueue === null) {
-    syncQueue = [callback]; // Flush the queue in the next tick, at the earliest.
-
-    immediateQueueCallbackNode = Scheduler_scheduleCallback(
-      Scheduler_ImmediatePriority,
-      flushSyncCallbackQueueImpl
-    );
+    syncQueue = [callback];
   } else {
     // Push onto existing queue. Don't need to schedule a callback because
     // we already scheduled one when we created the queue.
     syncQueue.push(callback);
   }
-
-  return fakeCallbackNode;
 }
-function cancelCallback(callbackNode) {
-  if (callbackNode !== fakeCallbackNode) {
-    Scheduler_cancelCallback(callbackNode);
-  }
+function scheduleLegacySyncCallback(callback) {
+  includesLegacySyncCallbacks = true;
+  scheduleSyncCallback(callback);
 }
-function flushSyncCallbackQueue() {
-  if (immediateQueueCallbackNode !== null) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
+function flushSyncCallbacksOnlyInLegacyMode() {
+  // Only flushes the queue if there's a legacy sync callback scheduled.
+  // TODO: There's only a single type of callback: performSyncOnWorkOnRoot. So
+  // it might make more sense for the queue to be a list of roots instead of a
+  // list of generic callbacks. Then we can have two: one for legacy roots, one
+  // for concurrent roots. And this method would only flush the legacy ones.
+  if (includesLegacySyncCallbacks) {
+    flushSyncCallbacks();
   }
-
-  flushSyncCallbackQueueImpl();
 }
-
-function flushSyncCallbackQueueImpl() {
+function flushSyncCallbacks() {
   if (!isFlushingSyncQueue && syncQueue !== null) {
     // Prevent re-entrancy.
     isFlushingSyncQueue = true;
     var i = 0;
+    var previousUpdatePriority = getCurrentUpdatePriority();
 
-    {
-      try {
-        var _isSync2 = true;
-        var _queue = syncQueue;
-        runWithPriority(ImmediatePriority$1, function() {
-          for (; i < _queue.length; i++) {
-            var callback = _queue[i];
-
-            do {
-              callback = callback(_isSync2);
-            } while (callback !== null);
-          }
-        });
-        syncQueue = null;
-      } catch (error) {
-        // If something throws, leave the remaining callbacks on the queue.
-        if (syncQueue !== null) {
-          syncQueue = syncQueue.slice(i + 1);
-        } // Resume flushing in the next tick
-
-        Scheduler_scheduleCallback(
-          Scheduler_ImmediatePriority,
-          flushSyncCallbackQueue
-        );
-        throw error;
-      } finally {
-        isFlushingSyncQueue = false;
+    try {
+      var isSync = true;
+      var queue = syncQueue; // TODO: Is this necessary anymore? The only user code that runs in this
+      // queue is in the render or commit phases.
+
+      setCurrentUpdatePriority(DiscreteEventPriority);
+
+      for (; i < queue.length; i++) {
+        var callback = queue[i];
+
+        do {
+          callback = callback(isSync);
+        } while (callback !== null);
       }
+
+      syncQueue = null;
+      includesLegacySyncCallbacks = false;
+    } catch (error) {
+      // If something throws, leave the remaining callbacks on the queue.
+      if (syncQueue !== null) {
+        syncQueue = syncQueue.slice(i + 1);
+      } // Resume flushing in the next tick
+
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks);
+      throw error;
+    } finally {
+      setCurrentUpdatePriority(previousUpdatePriority);
+      isFlushingSyncQueue = false;
     }
   }
+
+  return null;
 }
 
-// TODO: this is special because it gets imported during build.
-var ReactVersion = "17.0.1-4e5d7faf5";
+var NoFlags$1 =
+  /*  */
+  0; // Represents whether effect should fire.
+
+var HasEffect =
+  /* */
+  1; // Represents the phase in which the effect (not the clean-up) fires.
 
-var NoMode = 0;
-var StrictMode = 1; // TODO: Remove BlockingMode and ConcurrentMode by reading from the root
-// tag instead
+var Layout =
+  /*    */
+  2;
+var Passive$1 =
+  /*   */
+  4;
 
-var BlockingMode = 2;
-var ConcurrentMode = 4;
-var ProfileMode = 8;
-var DebugTracingMode = 16;
+var ReactVersion = "18.0.0-experimental-568dc3532";
 
 var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
 var NoTransition = 0;
@@ -5961,7 +6030,6 @@ function is(x, y) {
 
 var objectIs = typeof Object.is === "function" ? Object.is : is;
 
-var hasOwnProperty = Object.prototype.hasOwnProperty;
 /**
  * Performs equality by iterating through keys on an object and returning false
  * when any key has values which are not strictly equal between the arguments.
@@ -6026,9 +6094,6 @@ function describeFiber(fiber) {
     case ForwardRef:
       return describeFunctionComponentFrame(fiber.type.render, source, owner);
 
-    case Block:
-      return describeFunctionComponentFrame(fiber.type._render, source, owner);
-
     case ClassComponent:
       return describeClassComponentFrame(fiber.type, source, owner);
 
@@ -6065,7 +6130,7 @@ function getCurrentFiberOwnerNameInDevOrNull() {
     var owner = current._debugOwner;
 
     if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner.type);
+      return getComponentNameFromFiber(owner);
     }
   }
 
@@ -6122,7 +6187,7 @@ var ReactStrictModeWarnings = {
     var node = fiber;
 
     while (node !== null) {
-      if (node.mode & StrictMode) {
+      if (node.mode & StrictLegacyMode) {
         maybeStrictRoot = node;
       }
 
@@ -6153,7 +6218,7 @@ var ReactStrictModeWarnings = {
     fiber,
     instance
   ) {
-    // Dedup strategy: Warn once per component.
+    // Dedupe strategy: Warn once per component.
     if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
       return;
     }
@@ -6166,7 +6231,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillMount === "function"
     ) {
       pendingUNSAFE_ComponentWillMountWarnings.push(fiber);
@@ -6180,7 +6245,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillReceiveProps === "function"
     ) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.push(fiber);
@@ -6194,7 +6259,7 @@ var ReactStrictModeWarnings = {
     }
 
     if (
-      fiber.mode & StrictMode &&
+      fiber.mode & StrictLegacyMode &&
       typeof instance.UNSAFE_componentWillUpdate === "function"
     ) {
       pendingUNSAFE_ComponentWillUpdateWarnings.push(fiber);
@@ -6208,7 +6273,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillMountWarnings.length > 0) {
       pendingComponentWillMountWarnings.forEach(function(fiber) {
         componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6220,7 +6285,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillMountWarnings.length > 0) {
       pendingUNSAFE_ComponentWillMountWarnings.forEach(function(fiber) {
         UNSAFE_componentWillMountUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6232,7 +6297,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillReceivePropsWarnings.length > 0) {
       pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
         componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6244,7 +6309,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillReceivePropsWarnings.length > 0) {
       pendingUNSAFE_ComponentWillReceivePropsWarnings.forEach(function(fiber) {
         UNSAFE_componentWillReceivePropsUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6256,7 +6321,7 @@ var ReactStrictModeWarnings = {
     if (pendingComponentWillUpdateWarnings.length > 0) {
       pendingComponentWillUpdateWarnings.forEach(function(fiber) {
         componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6268,7 +6333,7 @@ var ReactStrictModeWarnings = {
     if (pendingUNSAFE_ComponentWillUpdateWarnings.length > 0) {
       pendingUNSAFE_ComponentWillUpdateWarnings.forEach(function(fiber) {
         UNSAFE_componentWillUpdateUniqueNames.add(
-          getComponentName(fiber.type) || "Component"
+          getComponentNameFromFiber(fiber) || "Component"
         );
         didWarnAboutUnsafeLifecycles.add(fiber.type);
       });
@@ -6423,7 +6488,7 @@ var ReactStrictModeWarnings = {
       var firstFiber = fiberArray[0];
       var uniqueNames = new Set();
       fiberArray.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber.type) || "Component");
+        uniqueNames.add(getComponentNameFromFiber(fiber) || "Component");
         didWarnAboutLegacyContext.add(fiber.type);
       });
       var sortedNames = setToSortedString(uniqueNames);
@@ -6474,11 +6539,6 @@ function resolveDefaultProps(Component, baseProps) {
   return baseProps;
 }
 
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
 var valueCursor = createCursor(null);
 var rendererSigil;
 
@@ -6489,14 +6549,14 @@ var rendererSigil;
 
 var currentlyRenderingFiber = null;
 var lastContextDependency = null;
-var lastContextWithAllBitsObserved = null;
+var lastFullyObservedContext = null;
 var isDisallowedContextReadInDEV = false;
 function resetContextDependencies() {
   // This is called right before React yields execution, to ensure `readContext`
   // cannot be called outside the render phase.
   currentlyRenderingFiber = null;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 
   {
     isDisallowedContextReadInDEV = false;
@@ -6512,9 +6572,7 @@ function exitDisallowedContextReadInDEV() {
     isDisallowedContextReadInDEV = false;
   }
 }
-function pushProvider(providerFiber, nextValue) {
-  var context = providerFiber.type._context;
-
+function pushProvider(providerFiber, context, nextValue) {
   {
     push(valueCursor, context._currentValue, providerFiber);
     context._currentValue = nextValue;
@@ -6535,38 +6593,14 @@ function pushProvider(providerFiber, nextValue) {
     }
   }
 }
-function popProvider(providerFiber) {
+function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
   pop(valueCursor, providerFiber);
-  var context = providerFiber.type._context;
 
   {
     context._currentValue = currentValue;
   }
 }
-function calculateChangedBits(context, newValue, oldValue) {
-  if (objectIs(oldValue, newValue)) {
-    // No change
-    return 0;
-  } else {
-    var changedBits =
-      typeof context._calculateChangedBits === "function"
-        ? context._calculateChangedBits(oldValue, newValue)
-        : MAX_SIGNED_31_BIT_INT;
-
-    {
-      if ((changedBits & MAX_SIGNED_31_BIT_INT) !== changedBits) {
-        error(
-          "calculateChangedBits: Expected the return value to be a " +
-            "31-bit integer. Instead received: %s",
-          changedBits
-        );
-      }
-    }
-
-    return changedBits | 0;
-  }
-}
 function scheduleWorkOnParentPath(parent, renderLanes) {
   // Update the child lanes of all the ancestors, including the alternates.
   var node = parent;
@@ -6594,12 +6628,13 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
     node = node.return;
   }
 }
-function propagateContextChange(
-  workInProgress,
-  context,
-  changedBits,
-  renderLanes
-) {
+function propagateContextChange(workInProgress, context, renderLanes) {
+  {
+    propagateContextChange_eager(workInProgress, context, renderLanes);
+  }
+}
+
+function propagateContextChange_eager(workInProgress, context, renderLanes) {
   var fiber = workInProgress.child;
 
   if (fiber !== null) {
@@ -6618,23 +6653,35 @@ function propagateContextChange(
 
       while (dependency !== null) {
         // Check if the context matches.
-        if (
-          dependency.context === context &&
-          (dependency.observedBits & changedBits) !== 0
-        ) {
+        if (dependency.context === context) {
           // Match! Schedule an update on this fiber.
           if (fiber.tag === ClassComponent) {
             // Schedule a force update on the work-in-progress.
-            var update = createUpdate(
-              NoTimestamp,
-              pickArbitraryLane(renderLanes)
-            );
+            var lane = pickArbitraryLane(renderLanes);
+            var update = createUpdate(NoTimestamp, lane);
             update.tag = ForceUpdate; // TODO: Because we don't have a work-in-progress, this will add the
             // update to the current fiber, too, which means it will persist even if
             // this render is thrown away. Since it's a race condition, not sure it's
             // worth fixing.
+            // Inlined `enqueueUpdate` to remove interleaved update check
+
+            var updateQueue = fiber.updateQueue;
+
+            if (updateQueue === null);
+            else {
+              var sharedQueue = updateQueue.shared;
+              var pending = sharedQueue.pending;
 
-            enqueueUpdate(fiber, update);
+              if (pending === null) {
+                // This is the first update. Create a circular list.
+                update.next = update;
+              } else {
+                update.next = pending.next;
+                pending.next = update;
+              }
+
+              sharedQueue.pending = update;
+            }
           }
 
           fiber.lanes = mergeLanes(fiber.lanes, renderLanes);
@@ -6695,23 +6742,25 @@ function propagateContextChange(
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
   lastContextDependency = null;
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
   var dependencies = workInProgress.dependencies;
 
   if (dependencies !== null) {
-    var firstContext = dependencies.firstContext;
+    {
+      var firstContext = dependencies.firstContext;
 
-    if (firstContext !== null) {
-      if (includesSomeLane(dependencies.lanes, renderLanes)) {
-        // Context list has a pending update. Mark that this fiber performed work.
-        markWorkInProgressReceivedUpdate();
-      } // Reset the work-in-progress list
+      if (firstContext !== null) {
+        if (includesSomeLane(dependencies.lanes, renderLanes)) {
+          // Context list has a pending update. Mark that this fiber performed work.
+          markWorkInProgressReceivedUpdate();
+        } // Reset the work-in-progress list
 
-      dependencies.firstContext = null;
+        dependencies.firstContext = null;
+      }
     }
   }
 }
-function readContext(context, observedBits) {
+function readContext(context) {
   {
     // This warning would fire if you read context inside a Hook like useMemo.
     // Unlike the class check below, it's not enforced in production for perf.
@@ -6725,25 +6774,13 @@ function readContext(context, observedBits) {
     }
   }
 
-  if (lastContextWithAllBitsObserved === context);
-  else if (observedBits === false || observedBits === 0);
-  else {
-    var resolvedObservedBits; // Avoid deopting on observable arguments or heterogeneous types.
-
-    if (
-      typeof observedBits !== "number" ||
-      observedBits === MAX_SIGNED_31_BIT_INT
-    ) {
-      // Observe all updates.
-      lastContextWithAllBitsObserved = context;
-      resolvedObservedBits = MAX_SIGNED_31_BIT_INT;
-    } else {
-      resolvedObservedBits = observedBits;
-    }
+  var value = context._currentValue;
 
+  if (lastFullyObservedContext === context);
+  else {
     var contextItem = {
       context: context,
-      observedBits: resolvedObservedBits,
+      memoizedValue: value,
       next: null
     };
 
@@ -6757,8 +6794,7 @@ function readContext(context, observedBits) {
       lastContextDependency = contextItem;
       currentlyRenderingFiber.dependencies = {
         lanes: NoLanes,
-        firstContext: contextItem,
-        responders: null
+        firstContext: contextItem
       };
     } else {
       // Append a new context item.
@@ -6766,7 +6802,49 @@ function readContext(context, observedBits) {
     }
   }
 
-  return context._currentValue;
+  return value;
+}
+
+// An array of all update queues that received updates during the current
+// render. When this render exits, either because it finishes or because it is
+// interrupted, the interleaved updates will be transfered onto the main part
+// of the queue.
+var interleavedQueues = null;
+function pushInterleavedQueue(queue) {
+  if (interleavedQueues === null) {
+    interleavedQueues = [queue];
+  } else {
+    interleavedQueues.push(queue);
+  }
+}
+function enqueueInterleavedUpdates() {
+  // Transfer the interleaved updates onto the main queue. Each queue has a
+  // `pending` field and an `interleaved` field. When they are not null, they
+  // point to the last node in a circular linked list. We need to append the
+  // interleaved list to the end of the pending list by joining them into a
+  // single, circular list.
+  if (interleavedQueues !== null) {
+    for (var i = 0; i < interleavedQueues.length; i++) {
+      var queue = interleavedQueues[i];
+      var lastInterleavedUpdate = queue.interleaved;
+
+      if (lastInterleavedUpdate !== null) {
+        queue.interleaved = null;
+        var firstInterleavedUpdate = lastInterleavedUpdate.next;
+        var lastPendingUpdate = queue.pending;
+
+        if (lastPendingUpdate !== null) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = firstInterleavedUpdate;
+          lastInterleavedUpdate.next = firstPendingUpdate;
+        }
+
+        queue.pending = lastInterleavedUpdate;
+      }
+    }
+
+    interleavedQueues = null;
+  }
 }
 
 var UpdateState = 0;
@@ -6791,7 +6869,9 @@ function initializeUpdateQueue(fiber) {
     firstBaseUpdate: null,
     lastBaseUpdate: null,
     shared: {
-      pending: null
+      pending: null,
+      interleaved: null,
+      lanes: NoLanes
     },
     effects: null
   };
@@ -6824,7 +6904,7 @@ function createUpdate(eventTime, lane) {
   };
   return update;
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
 
   if (updateQueue === null) {
@@ -6833,17 +6913,35 @@ function enqueueUpdate(fiber, update) {
   }
 
   var sharedQueue = updateQueue.shared;
-  var pending = sharedQueue.pending;
 
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
+  if (isInterleavedUpdate(fiber)) {
+    var interleaved = sharedQueue.interleaved;
+
+    if (interleaved === null) {
+      // This is the first update. Create a circular list.
+      update.next = update; // At the end of the current render, this queue's interleaved updates will
+      // be transfered to the pending queue.
+
+      pushInterleavedQueue(sharedQueue);
+    } else {
+      update.next = interleaved.next;
+      interleaved.next = update;
+    }
+
+    sharedQueue.interleaved = update;
   } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
+    var pending = sharedQueue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
 
-  sharedQueue.pending = update;
+    sharedQueue.pending = update;
+  }
 
   {
     if (
@@ -6861,6 +6959,33 @@ function enqueueUpdate(fiber, update) {
     }
   }
 }
+function entangleTransitions(root, fiber, lane) {
+  var updateQueue = fiber.updateQueue;
+
+  if (updateQueue === null) {
+    // Only occurs if the fiber has been unmounted.
+    return;
+  }
+
+  var sharedQueue = updateQueue.shared;
+
+  if (isTransitionLane(lane)) {
+    var queueLanes = sharedQueue.lanes; // If any entangled lanes are no longer pending on the root, then they must
+    // have finished. We can remove them from the shared queue, which represents
+    // a superset of the actually pending lanes. In some cases we may entangle
+    // more than we need to, but that's OK. In fact it's worse if we *don't*
+    // entangle when we should.
+
+    queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+    var newQueueLanes = mergeLanes(queueLanes, lane);
+    sharedQueue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+    // the lane finished since the last time we entangled it. So we need to
+    // entangle it again, just to be sure.
+
+    markRootEntangled(root, newQueueLanes);
+  }
+}
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
   // Captured updates are updates that are thrown by a child during the render
   // phase. They should be discarded if the render is aborted. Therefore,
@@ -7130,7 +7255,11 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
         );
         var callback = update.callback;
 
-        if (callback !== null) {
+        if (
+          callback !== null && // If the update was already committed, we should not queue its
+          // callback again.
+          update.lane !== NoLane
+        ) {
           workInProgress.flags |= Callback;
           var effects = queue.effects;
 
@@ -7170,7 +7299,24 @@ function processUpdateQueue(workInProgress, props, instance, renderLanes) {
 
     queue.baseState = newBaseState;
     queue.firstBaseUpdate = newFirstBaseUpdate;
-    queue.lastBaseUpdate = newLastBaseUpdate; // Set the remaining expiration time to be whatever is remaining in the queue.
+    queue.lastBaseUpdate = newLastBaseUpdate; // Interleaved updates are stored on a separate queue. We aren't going to
+    // process them during this render, but we do need to track which lanes
+    // are remaining.
+
+    var lastInterleaved = queue.shared.interleaved;
+
+    if (lastInterleaved !== null) {
+      var interleaved = lastInterleaved;
+
+      do {
+        newLanes = mergeLanes(newLanes, interleaved.lane);
+        interleaved = interleaved.next;
+      } while (interleaved !== lastInterleaved);
+    } else if (firstBaseUpdate === null) {
+      // `queue.lanes` is used for entangling transitions. We can set it back to
+      // zero once the queue is empty.
+      queue.shared.lanes = NoLanes;
+    } // Set the remaining expiration time to be whatever is remaining in the queue.
     // This should be fine because the only two other things that contribute to
     // expiration time are props and context. We're already in the middle of the
     // begin phase by the time we start processing the queue, so we've already
@@ -7223,8 +7369,7 @@ function commitUpdateQueue(finishedWork, finishedQueue, instance) {
   }
 }
 
-var fakeInternalInstance = {};
-var isArray = Array.isArray; // React.Component uses a shared frozen object by default.
+var fakeInternalInstance = {}; // React.Component uses a shared frozen object by default.
 // We'll use it to determine whether we need to initialize legacy refs.
 
 var emptyRefsObject = new React.Component().refs;
@@ -7271,7 +7416,7 @@ var didWarnAboutInvalidateContextType;
 
   warnOnUndefinedDerivedState = function(type, partialState) {
     if (partialState === undefined) {
-      var componentName = getComponentName(type) || "Component";
+      var componentName = getComponentNameFromType(type) || "Component";
 
       if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
         didWarnAboutUndefinedDerivedState.add(componentName);
@@ -7329,6 +7474,7 @@ function applyDerivedStateFromProps(
     updateQueue.baseState = memoizedState;
   }
 }
+
 var classComponentUpdater = {
   isMounted: isMounted,
   enqueueSetState: function(inst, payload, callback) {
@@ -7347,7 +7493,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueReplaceState: function(inst, payload, callback) {
     var fiber = get(inst);
@@ -7366,7 +7516,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   },
   enqueueForceUpdate: function(inst, callback) {
     var fiber = get(inst);
@@ -7384,7 +7538,11 @@ var classComponentUpdater = {
     }
 
     enqueueUpdate(fiber, update);
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (root !== null) {
+      entangleTransitions(root, fiber, lane);
+    }
   }
 };
 
@@ -7411,7 +7569,7 @@ function checkShouldComponentUpdate(
         error(
           "%s.shouldComponentUpdate(): Returned undefined instead of a " +
             "boolean value. Make sure to return true or false.",
-          getComponentName(ctor) || "Component"
+          getComponentNameFromType(ctor) || "Component"
         );
       }
     }
@@ -7432,7 +7590,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
   var instance = workInProgress.stateNode;
 
   {
-    var name = getComponentName(ctor) || "Component";
+    var name = getComponentNameFromType(ctor) || "Component";
     var renderPresent = instance.render;
 
     if (!renderPresent) {
@@ -7535,7 +7693,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
         "%s has a method called shouldComponentUpdate(). " +
           "shouldComponentUpdate should not be used when extending React.PureComponent. " +
           "Please extend React.Component if shouldComponentUpdate is used.",
-        getComponentName(ctor) || "A pure component"
+        getComponentNameFromType(ctor) || "A pure component"
       );
     }
 
@@ -7605,7 +7763,7 @@ function checkClassInstance(workInProgress, ctor, newProps) {
       error(
         "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
           "This component defines getSnapshotBeforeUpdate() only.",
-        getComponentName(ctor)
+        getComponentNameFromType(ctor)
       );
     }
 
@@ -7704,7 +7862,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         error(
           "%s defines an invalid contextType. " +
             "contextType should point to the Context object returned by React.createContext().%s",
-          getComponentName(ctor) || "Component",
+          getComponentNameFromType(ctor) || "Component",
           addendum
         );
       }
@@ -7732,7 +7890,7 @@ function constructClassInstance(workInProgress, ctor, props) {
 
   {
     if (typeof ctor.getDerivedStateFromProps === "function" && state === null) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutUninitializedState.has(componentName)) {
         didWarnAboutUninitializedState.add(componentName);
@@ -7793,7 +7951,7 @@ function constructClassInstance(workInProgress, ctor, props) {
         foundWillReceivePropsName !== null ||
         foundWillUpdateName !== null
       ) {
-        var _componentName = getComponentName(ctor) || "Component";
+        var _componentName = getComponentNameFromType(ctor) || "Component";
 
         var newApiName =
           typeof ctor.getDerivedStateFromProps === "function"
@@ -7846,7 +8004,7 @@ function callComponentWillMount(workInProgress, instance) {
         "%s.componentWillMount(): Assigning directly to this.state is " +
           "deprecated (except inside a component's " +
           "constructor). Use setState instead.",
-        getComponentName(workInProgress.type) || "Component"
+        getComponentNameFromFiber(workInProgress) || "Component"
       );
     }
 
@@ -7872,7 +8030,8 @@ function callComponentWillReceiveProps(
 
   if (instance.state !== oldState) {
     {
-      var componentName = getComponentName(workInProgress.type) || "Component";
+      var componentName =
+        getComponentNameFromFiber(workInProgress) || "Component";
 
       if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
         didWarnAboutStateAssignmentForComponent.add(componentName);
@@ -7911,7 +8070,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
 
   {
     if (instance.state === newProps) {
-      var componentName = getComponentName(ctor) || "Component";
+      var componentName = getComponentNameFromType(ctor) || "Component";
 
       if (!didWarnAboutDirectlyAssigningPropsToState.has(componentName)) {
         didWarnAboutDirectlyAssigningPropsToState.add(componentName);
@@ -7925,7 +8084,7 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
       }
     }
 
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       ReactStrictModeWarnings.recordLegacyContextWarning(
         workInProgress,
         instance
@@ -7940,7 +8099,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
   }
 
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   var getDerivedStateFromProps = ctor.getDerivedStateFromProps;
 
@@ -7969,7 +8127,9 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   }
 
   if (typeof instance.componentDidMount === "function") {
-    workInProgress.flags |= Update;
+    var fiberFlags = Update;
+
+    workInProgress.flags |= fiberFlags;
   }
 }
 
@@ -8031,7 +8191,9 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var fiberFlags = Update;
+
+      workInProgress.flags |= fiberFlags;
     }
 
     return false;
@@ -8077,13 +8239,17 @@ function resumeMountClassInstance(workInProgress, ctor, newProps, renderLanes) {
     }
 
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags = Update;
+
+      workInProgress.flags |= _fiberFlags;
     }
   } else {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
     if (typeof instance.componentDidMount === "function") {
-      workInProgress.flags |= Update;
+      var _fiberFlags2 = Update;
+
+      workInProgress.flags |= _fiberFlags2;
     } // If shouldComponentUpdate returned false, we should still update the
     // memoized state to indicate that this work can be reused.
 
@@ -8162,7 +8328,8 @@ function updateClassInstance(
     unresolvedOldProps === unresolvedNewProps &&
     oldState === newState &&
     !hasContextChanged() &&
-    !checkHasForceUpdateAfterProcessing()
+    !checkHasForceUpdateAfterProcessing() &&
+    !enableLazyContextPropagation
   ) {
     // If an update was already in progress, we should schedule an Update
     // effect even though we're bailing out, so that cWU/cDU are called.
@@ -8207,7 +8374,11 @@ function updateClassInstance(
       oldState,
       newState,
       nextContext
-    );
+    ) || // TODO: In some cases, we'll end up checking if context has changed twice,
+    // both before and after `shouldComponentUpdate` has been called. Not ideal,
+    // but I'm loath to refactor this function. This only happens for memoized
+    // components so it's not that common.
+    enableLazyContextPropagation;
 
   if (shouldUpdate) {
     // In order to support react-lifecycles-compat polyfilled components,
@@ -8303,7 +8474,7 @@ var warnForMissingKey = function(child, returnFiber) {};
     }
 
     child._store.validated = true;
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasKeyUseWarning[componentName]) {
       return;
@@ -8319,8 +8490,6 @@ var warnForMissingKey = function(child, returnFiber) {};
   };
 }
 
-var isArray$1 = Array.isArray;
-
 function coerceRef(returnFiber, current, element) {
   var mixedRef = element.ref;
 
@@ -8333,7 +8502,7 @@ function coerceRef(returnFiber, current, element) {
       // TODO: Clean this up once we turn on the string ref warning for
       // everyone, because the strict mode case will no longer be relevant
       if (
-        (returnFiber.mode & StrictMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
+        (returnFiber.mode & StrictLegacyMode || warnAboutStringRefs) && // We warn in ReactElement.js if owner and self are equal for string refs
         // because these cannot be automatically converted to an arrow function
         // using a codemod. Therefore, we don't have to warn about string refs again.
         !(
@@ -8342,7 +8511,8 @@ function coerceRef(returnFiber, current, element) {
           element._owner.stateNode !== element._self
         )
       ) {
-        var componentName = getComponentName(returnFiber.type) || "Component";
+        var componentName =
+          getComponentNameFromFiber(returnFiber) || "Component";
 
         if (!didWarnAboutStringRefs[componentName]) {
           {
@@ -8434,22 +8604,22 @@ function coerceRef(returnFiber, current, element) {
 }
 
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if (returnFiber.type !== "textarea") {
-    {
-      throw Error(
-        "Objects are not valid as a React child (found: " +
-          (Object.prototype.toString.call(newChild) === "[object Object]"
-            ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-            : newChild) +
-          "). If you meant to render a collection of children, use an array instead."
-      );
-    }
+  var childString = Object.prototype.toString.call(newChild);
+
+  {
+    throw Error(
+      "Objects are not valid as a React child (found: " +
+        (childString === "[object Object]"
+          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+          : childString) +
+        "). If you meant to render a collection of children, use an array instead."
+    );
   }
 }
 
 function warnOnFunctionType(returnFiber) {
   {
-    var componentName = getComponentName(returnFiber.type) || "Component";
+    var componentName = getComponentNameFromFiber(returnFiber) || "Component";
 
     if (ownerHasFunctionTypeWarning[componentName]) {
       return;
@@ -8463,7 +8633,7 @@ function warnOnFunctionType(returnFiber) {
         "Or maybe you meant to call this function rather than return it."
     );
   }
-} // We avoid inlining this to avoid potential deopts from using try/catch.
+}
 // to be able to optimize each path individually by branching early. This needs
 // a compiler or we can do it manually. Helpers that don't need this branching
 // live outside of this function.
@@ -8473,23 +8643,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     if (!shouldTrackSideEffects) {
       // Noop.
       return;
-    } // Deletions are added in reversed order so we add it to the front.
-    // At this point, the return fiber's effect list is empty except for
-    // deletions, so we can just append the deletion to the list. The remaining
-    // effects aren't added until the complete phase. Once we implement
-    // resuming, this may not be true.
+    }
 
-    var last = returnFiber.lastEffect;
+    var deletions = returnFiber.deletions;
 
-    if (last !== null) {
-      last.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
+    if (deletions === null) {
+      returnFiber.deletions = [childToDelete];
+      returnFiber.flags |= ChildDeletion;
     } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+      deletions.push(childToDelete);
     }
-
-    childToDelete.nextEffect = null;
-    childToDelete.flags = Deletion;
   }
 
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -8553,7 +8716,7 @@ function ChildReconciler(shouldTrackSideEffects) {
 
       if (oldIndex < lastPlacedIndex) {
         // This is a move.
-        newFiber.flags = Placement;
+        newFiber.flags |= Placement;
         return lastPlacedIndex;
       } else {
         // This item can stay in place.
@@ -8561,7 +8724,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       }
     } else {
       // This is an insertion.
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
       return lastPlacedIndex;
     }
   }
@@ -8570,7 +8733,7 @@ function ChildReconciler(shouldTrackSideEffects) {
     // This is simpler for the single child case. We only need to do a
     // placement for inserting new children.
     if (shouldTrackSideEffects && newFiber.alternate === null) {
-      newFiber.flags = Placement;
+      newFiber.flags |= Placement;
     }
 
     return newFiber;
@@ -8591,10 +8754,26 @@ function ChildReconciler(shouldTrackSideEffects) {
   }
 
   function updateElement(returnFiber, current, element, lanes) {
+    var elementType = element.type;
+
+    if (elementType === REACT_FRAGMENT_TYPE) {
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    }
+
     if (current !== null) {
       if (
-        current.elementType === element.type || // Keep this check inline so it only runs on the false path:
-        isCompatibleFamilyForHotReloading(current, element)
+        current.elementType === elementType || // Keep this check inline so it only runs on the false path:
+        isCompatibleFamilyForHotReloading(current, element) || // Lazy types should reconcile their resolved type.
+        // We need to do this after the Hot Reloading check above,
+        // because hot reloading has different semantics than prod because
+        // it doesn't resuspend. So we can't let the call below suspend.
+        enableLazyElements
       ) {
         // Move based on index
         var existing = useFiber(current, element.props);
@@ -8690,7 +8869,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _created3 = createFiberFromFragment(
           newChild,
           returnFiber.mode,
@@ -8733,16 +8912,6 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE: {
           if (newChild.key === key) {
-            if (newChild.type === REACT_FRAGMENT_TYPE) {
-              return updateFragment(
-                returnFiber,
-                oldFiber,
-                newChild.props.children,
-                lanes,
-                key
-              );
-            }
-
             return updateElement(returnFiber, oldFiber, newChild, lanes);
           } else {
             return null;
@@ -8758,7 +8927,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         if (key !== null) {
           return null;
         }
@@ -8800,16 +8969,6 @@ function ChildReconciler(shouldTrackSideEffects) {
               newChild.key === null ? newIdx : newChild.key
             ) || null;
 
-          if (newChild.type === REACT_FRAGMENT_TYPE) {
-            return updateFragment(
-              returnFiber,
-              _matchedFiber,
-              newChild.props.children,
-              lanes,
-              newChild.key
-            );
-          }
-
           return updateElement(returnFiber, _matchedFiber, newChild, lanes);
         }
 
@@ -8823,7 +8982,7 @@ function ChildReconciler(shouldTrackSideEffects) {
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+      if (isArray(newChild) || getIteratorFn(newChild)) {
         var _matchedFiber3 = existingChildren.get(newIdx) || null;
 
         return updateFragment(
@@ -9303,50 +9462,43 @@ function ChildReconciler(shouldTrackSideEffects) {
       // TODO: If key === null and child.key === null, then this only applies to
       // the first item in the list.
       if (child.key === key) {
-        switch (child.tag) {
-          case Fragment: {
-            if (element.type === REACT_FRAGMENT_TYPE) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-              var existing = useFiber(child, element.props.children);
-              existing.return = returnFiber;
+        var elementType = element.type;
 
-              {
-                existing._debugSource = element._source;
-                existing._debugOwner = element._owner;
-              }
+        if (elementType === REACT_FRAGMENT_TYPE) {
+          if (child.tag === Fragment) {
+            deleteRemainingChildren(returnFiber, child.sibling);
+            var existing = useFiber(child, element.props.children);
+            existing.return = returnFiber;
 
-              return existing;
+            {
+              existing._debugSource = element._source;
+              existing._debugOwner = element._owner;
             }
 
-            break;
+            return existing;
           }
+        } else {
+          if (
+            child.elementType === elementType || // Keep this check inline so it only runs on the false path:
+            isCompatibleFamilyForHotReloading(child, element) || // Lazy types should reconcile their resolved type.
+            // We need to do this after the Hot Reloading check above,
+            // because hot reloading has different semantics than prod because
+            // it doesn't resuspend. So we can't let the call below suspend.
+            enableLazyElements
+          ) {
+            deleteRemainingChildren(returnFiber, child.sibling);
 
-          case Block:
-
-          // We intentionally fallthrough here if enableBlocksAPI is not on.
-          // eslint-disable-next-lined no-fallthrough
-
-          default: {
-            if (
-              child.elementType === element.type || // Keep this check inline so it only runs on the false path:
-              isCompatibleFamilyForHotReloading(child, element)
-            ) {
-              deleteRemainingChildren(returnFiber, child.sibling);
-
-              var _existing3 = useFiber(child, element.props);
-
-              _existing3.ref = coerceRef(returnFiber, child, element);
-              _existing3.return = returnFiber;
+            var _existing = useFiber(child, element.props);
 
-              {
-                _existing3._debugSource = element._source;
-                _existing3._debugOwner = element._owner;
-              }
+            _existing.ref = coerceRef(returnFiber, child, element);
+            _existing.return = returnFiber;
 
-              return _existing3;
+            {
+              _existing._debugSource = element._source;
+              _existing._debugOwner = element._owner;
             }
 
-            break;
+            return _existing;
           }
         } // Didn't match.
 
@@ -9440,9 +9592,7 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild = newChild.props.children;
     } // Handle object types
 
-    var isObject = typeof newChild === "object" && newChild !== null;
-
-    if (isObject) {
+    if (typeof newChild === "object" && newChild !== null) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return placeSingleChild(
@@ -9464,6 +9614,26 @@ function ChildReconciler(shouldTrackSideEffects) {
             )
           );
       }
+
+      if (isArray(newChild)) {
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      if (getIteratorFn(newChild)) {
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      }
+
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     if (typeof newChild === "string" || typeof newChild === "number") {
@@ -9477,28 +9647,6 @@ function ChildReconciler(shouldTrackSideEffects) {
       );
     }
 
-    if (isArray$1(newChild)) {
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (getIteratorFn(newChild)) {
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    }
-
-    if (isObject) {
-      throwOnInvalidObjectType(returnFiber, newChild);
-    }
-
     {
       if (typeof newChild === "function") {
         warnOnFunctionType(returnFiber);
@@ -9524,13 +9672,12 @@ function ChildReconciler(shouldTrackSideEffects) {
         // functions and classes
         // eslint-disable-next-lined no-fallthrough
 
-        case Block:
         case FunctionComponent:
         case ForwardRef:
         case SimpleMemoComponent: {
           {
             throw Error(
-              (getComponentName(returnFiber.type) || "Component") +
+              (getComponentNameFromFiber(returnFiber) || "Component") +
                 "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
             );
           }
@@ -9778,21 +9925,6 @@ function findFirstSuspended(row) {
   return null;
 }
 
-var NoFlags$1 =
-  /*  */
-  0; // Represents whether effect should fire.
-
-var HasEffect =
-  /* */
-  1; // Represents the phase in which the effect (not the clean-up) fires.
-
-var Layout =
-  /*    */
-  2;
-var Passive$1 =
-  /*   */
-  4;
-
 var isHydrating = false;
 
 function enterHydrationState(fiber) {
@@ -9888,6 +10020,12 @@ function warnAboutMultipleRenderersDEV(mutableSource) {
   }
 } // Eager reads the version of a mutable source and stores it on the root.
 
+function getSuspendedCachePool() {
+  {
+    return null;
+  } // We check the cache on the stack first, since that's the one any new Caches
+}
+
 var ReactCurrentDispatcher$1 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentBatchConfig$1 = ReactSharedInternals.ReactCurrentBatchConfig;
 var didWarnAboutMismatchedHooksForComponent;
@@ -9960,7 +10098,7 @@ function updateHookTypesDev() {
 
 function checkDepsAreArrayDev(deps) {
   {
-    if (deps !== undefined && deps !== null && !Array.isArray(deps)) {
+    if (deps !== undefined && deps !== null && !isArray(deps)) {
       // Verify deps, but only on mount to avoid extra checks.
       // It's unlikely their type would change as usually you define them inline.
       error(
@@ -9975,7 +10113,7 @@ function checkDepsAreArrayDev(deps) {
 
 function warnOnHookMismatchInDev(currentHookName) {
   {
-    var componentName = getComponentName(currentlyRenderingFiber$1.type);
+    var componentName = getComponentNameFromFiber(currentlyRenderingFiber$1);
 
     if (!didWarnAboutMismatchedHooksForComponent.has(componentName)) {
       didWarnAboutMismatchedHooksForComponent.add(componentName);
@@ -10173,7 +10311,25 @@ function renderWithHooks(
   {
     currentHookNameInDev = null;
     hookTypesDev = null;
-    hookTypesUpdateIndexDev = -1;
+    hookTypesUpdateIndexDev = -1; // Confirm that a static flag was not added or removed since the last
+    // render. If this fires, it suggests that we incorrectly reset the static
+    // flags in some other part of the codebase. This has happened before, for
+    // example, in the SuspenseList implementation.
+
+    if (
+      current !== null &&
+      (current.flags & StaticMask) !== (workInProgress.flags & StaticMask) && // Disable this warning in legacy mode, because legacy Suspense is weird
+      // and creates false positives. To make this work in legacy mode, we'd
+      // need to mark fibers that commit in an incomplete state, somehow. For
+      // now I'll disable the warning that most of the bugs that would trigger
+      // it are either exclusive to concurrent mode or exist in both.
+      (current.mode & ConcurrentMode) !== NoMode
+    ) {
+      error(
+        "Internal React error: Expected static flag was missing. Please " +
+          "notify the React team."
+      );
+    }
   }
 
   didScheduleRenderPhaseUpdate = false;
@@ -10187,8 +10343,13 @@ function renderWithHooks(
   return children;
 }
 function bailoutHooks(current, workInProgress, lanes) {
-  workInProgress.updateQueue = current.updateQueue;
-  workInProgress.flags &= ~(Passive | Update);
+  workInProgress.updateQueue = current.updateQueue; // TODO: Don't need to reset the flags here, because they're reset in the
+  // complete phase (bubbleProperties).
+
+  {
+    workInProgress.flags &= ~(Passive | Update);
+  }
+
   current.lanes = removeLanes(current.lanes, lanes);
 }
 function resetHooksAfterThrow() {
@@ -10339,6 +10500,8 @@ function mountReducer(reducer, initialArg, init) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: reducer,
     lastRenderedState: initialState
@@ -10476,6 +10639,28 @@ function updateReducer(reducer, initialArg, init) {
     hook.baseState = newBaseState;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = newState;
+  } // Interleaved updates are stored on a separate queue. We aren't going to
+  // process them during this render, but we do need to track which lanes
+  // are remaining.
+
+  var lastInterleaved = queue.interleaved;
+
+  if (lastInterleaved !== null) {
+    var interleaved = lastInterleaved;
+
+    do {
+      var interleavedLane = interleaved.lane;
+      currentlyRenderingFiber$1.lanes = mergeLanes(
+        currentlyRenderingFiber$1.lanes,
+        interleavedLane
+      );
+      markSkippedUpdateLanes(interleavedLane);
+      interleaved = interleaved.next;
+    } while (interleaved !== lastInterleaved);
+  } else if (baseQueue === null) {
+    // `queue.lanes` is used for entangling transitions. We can set it back to
+    // zero once the queue is empty.
+    queue.lanes = NoLanes;
   }
 
   var dispatch = queue.dispatch;
@@ -10603,11 +10788,50 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
     //
     // This can lead to tearing in the first renderer when it resumes,
     // but there's nothing we can do about that (short of throwing here and refusing to continue the render).
-    markSourceAsDirty(source);
+    markSourceAsDirty(source); // Intentioally throw an error to force React to retry synchronously. During
+    // the synchronous retry, it will block interleaved mutations, so we should
+    // get a consistent read. Therefore, the following error should never be
+    // visible to the user.
+    //
+    // If it were to become visible to the user, it suggests one of two things:
+    // a bug in React, or (more likely), a mutation during the render phase that
+    // caused the second re-render attempt to be different from the first.
+    //
+    // We know it's the second case if the logs are currently disabled. So in
+    // dev, we can present a more accurate error message.
+
+    {
+      // eslint-disable-next-line react-internal/no-production-logging
+      if (console.log.__reactDisabledLog) {
+        // If the logs are disabled, this is the dev-only double render. This is
+        // only reachable if there was a mutation during render. Show a helpful
+        // error message.
+        //
+        // Something interesting to note: because we only double render in
+        // development, this error will never happen during production. This is
+        // actually true of all errors that occur during a double render,
+        // because if the first render had thrown, we would have exited the
+        // begin phase without double rendering. We should consider suppressing
+        // any error from a double render (with a warning) to more closely match
+        // the production behavior.
+        var componentName = getComponentNameFromFiber(
+          currentlyRenderingFiber$1
+        );
+
+        {
+          throw Error(
+            "A mutable source was mutated while the " +
+              componentName +
+              " component was rendering. This is not supported. Move any mutations into event handlers or effects."
+          );
+        }
+      }
+    } // We expect this error not to be thrown during the synchronous retry,
+    // because we blocked interleaved mutations.
 
     {
       throw Error(
-        "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+        "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
       );
     }
   }
@@ -10743,6 +10967,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     // including any interleaving updates that occur.
     var newQueue = {
       pending: null,
+      interleaved: null,
+      lanes: NoLanes,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -10790,6 +11016,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   var queue = (hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: NoLanes,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -10883,7 +11111,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
       var prevDeps = prevEffect.deps;
 
       if (areHookInputsEqual(nextDeps, prevDeps)) {
-        pushEffect(hookFlags, create, destroy, nextDeps);
+        hook.memoizedState = pushEffect(hookFlags, create, destroy, nextDeps);
         return;
       }
     }
@@ -10906,7 +11134,9 @@ function mountEffect(create, deps) {
     }
   }
 
-  return mountEffectImpl(Update | Passive, Passive$1, create, deps);
+  {
+    return mountEffectImpl(Passive | PassiveStatic, Passive$1, create, deps);
+  }
 }
 
 function updateEffect(create, deps) {
@@ -10917,11 +11147,13 @@ function updateEffect(create, deps) {
     }
   }
 
-  return updateEffectImpl(Update | Passive, Passive$1, create, deps);
+  return updateEffectImpl(Passive, Passive$1, create, deps);
 }
 
 function mountLayoutEffect(create, deps) {
-  return mountEffectImpl(Update, Layout, create, deps);
+  var fiberFlags = Update;
+
+  return mountEffectImpl(fiberFlags, Layout, create, deps);
 }
 
 function updateLayoutEffect(create, deps) {
@@ -10973,8 +11205,10 @@ function mountImperativeHandle(ref, create, deps) {
 
   var effectDeps =
     deps !== null && deps !== undefined ? deps.concat([ref]) : null;
+  var fiberFlags = Update;
+
   return mountEffectImpl(
-    Update,
+    fiberFlags,
     Layout,
     imperativeHandleEffect.bind(null, create, ref),
     effectDeps
@@ -11129,33 +11363,22 @@ function rerenderDeferredValue(value) {
 }
 
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
+  var previousPriority = getCurrentUpdatePriority();
+  setCurrentUpdatePriority(
+    higherEventPriority(previousPriority, ContinuousEventPriority)
+  );
+  setPending(true);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
 
-  {
-    runWithPriority(
-      priorityLevel < UserBlockingPriority$1
-        ? UserBlockingPriority$1
-        : priorityLevel,
-      function() {
-        setPending(true);
-      }
-    );
-    runWithPriority(
-      priorityLevel > NormalPriority$1 ? NormalPriority$1 : priorityLevel,
-      function() {
-        var prevTransition = ReactCurrentBatchConfig$1.transition;
-        ReactCurrentBatchConfig$1.transition = 1;
-
-        try {
-          setPending(false);
-          callback();
-        } finally {
-          ReactCurrentBatchConfig$1.transition = prevTransition;
-        }
-      }
-    );
-  }
-}
+  try {
+    setPending(false);
+    callback();
+  } finally {
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$1.transition = prevTransition;
+  }
+}
 
 function mountTransition() {
   var _mountState2 = mountState(false),
@@ -11165,7 +11388,7 @@ function mountTransition() {
   var start = startTransition.bind(null, setPending);
   var hook = mountWorkInProgressHook();
   hook.memoizedState = start;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function updateTransition() {
@@ -11174,7 +11397,7 @@ function updateTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 function rerenderTransition() {
@@ -11183,7 +11406,7 @@ function rerenderTransition() {
 
   var hook = updateWorkInProgressHook();
   var start = hook.memoizedState;
-  return [start, isPending];
+  return [isPending, start];
 }
 
 var isUpdatingOpaqueValueInRenderPhase = false;
@@ -11196,7 +11419,7 @@ function getIsUpdatingOpaqueValueInRenderPhaseInDEV() {
 function warnOnOpaqueIdentifierAccessInDEV(fiber) {
   {
     // TODO: Should warn in effects and callbacks, too
-    var name = getComponentName(fiber.type) || "Unknown";
+    var name = getComponentNameFromFiber(fiber) || "Unknown";
 
     if (getIsRendering() && !didWarnAboutUseOpaqueIdentifier[name]) {
       error(
@@ -11253,19 +11476,7 @@ function dispatchAction(fiber, queue, action) {
     eagerReducer: null,
     eagerState: null,
     next: null
-  }; // Append the update to the end of the list.
-
-  var pending = queue.pending;
-
-  if (pending === null) {
-    // This is the first update. Create a circular list.
-    update.next = update;
-  } else {
-    update.next = pending.next;
-    pending.next = update;
-  }
-
-  queue.pending = update;
+  };
   var alternate = fiber.alternate;
 
   if (
@@ -11276,7 +11487,47 @@ function dispatchAction(fiber, queue, action) {
     // queue -> linked list of updates. After this render pass, we'll restart
     // and apply the stashed updates on top of the work-in-progress hook.
     didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = true;
+    var pending = queue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
+
+    queue.pending = update;
   } else {
+    if (isInterleavedUpdate(fiber)) {
+      var interleaved = queue.interleaved;
+
+      if (interleaved === null) {
+        // This is the first update. Create a circular list.
+        update.next = update; // At the end of the current render, this queue's interleaved updates will
+        // be transfered to the pending queue.
+
+        pushInterleavedQueue(queue);
+      } else {
+        update.next = interleaved.next;
+        interleaved.next = update;
+      }
+
+      queue.interleaved = update;
+    } else {
+      var _pending = queue.pending;
+
+      if (_pending === null) {
+        // This is the first update. Create a circular list.
+        update.next = update;
+      } else {
+        update.next = _pending.next;
+        _pending.next = update;
+      }
+
+      queue.pending = update;
+    }
+
     if (
       fiber.lanes === NoLanes &&
       (alternate === null || alternate.lanes === NoLanes)
@@ -11329,7 +11580,24 @@ function dispatchAction(fiber, queue, action) {
       }
     }
 
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+
+    if (isTransitionLane(lane) && root !== null) {
+      var queueLanes = queue.lanes; // If any entangled lanes are no longer pending on the root, then they
+      // must have finished. We can remove them from the shared queue, which
+      // represents a superset of the actually pending lanes. In some cases we
+      // may entangle more than we need to, but that's OK. In fact it's worse if
+      // we *don't* entangle when we should.
+
+      queueLanes = intersectLanes(queueLanes, root.pendingLanes); // Entangle the new transition lane with the other transition lanes.
+
+      var newQueueLanes = mergeLanes(queueLanes, lane);
+      queue.lanes = newQueueLanes; // Even if queue.lanes already include lane, we don't know for certain if
+      // the lane finished since the last time we entangled it. So we need to
+      // entangle it again, just to be sure.
+
+      markRootEntangled(root, newQueueLanes);
+    }
   }
 }
 
@@ -11351,6 +11619,7 @@ var ContextOnlyDispatcher = {
   useOpaqueIdentifier: throwInvalidHookError,
   unstable_isNewReconciler: enableNewReconciler
 };
+
 var HooksDispatcherOnMountInDEV = null;
 var HooksDispatcherOnMountWithHookTypesInDEV = null;
 var HooksDispatcherOnUpdateInDEV = null;
@@ -11379,8 +11648,8 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
   };
 
   HooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11388,10 +11657,10 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       checkDepsAreArrayDev(deps);
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11480,19 +11749,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnMountWithHookTypesInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11577,19 +11847,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11674,19 +11945,20 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   HooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
-      return readContext(context, observedBits);
+    readContext: function(context) {
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11771,10 +12043,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnMountInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11782,11 +12055,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       mountHookTypesDev();
       return mountCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       mountHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11883,10 +12156,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnUpdateInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -11894,11 +12168,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -11995,10 +12269,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
     },
     unstable_isNewReconciler: enableNewReconciler
   };
+
   InvalidNestedHooksDispatcherOnRerenderInDEV = {
-    readContext: function(context, observedBits) {
+    readContext: function(context) {
       warnInvalidContextAccess();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useCallback: function(callback, deps) {
       currentHookNameInDev = "useCallback";
@@ -12006,11 +12281,11 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       updateHookTypesDev();
       return updateCallback(callback, deps);
     },
-    useContext: function(context, observedBits) {
+    useContext: function(context) {
       currentHookNameInDev = "useContext";
       warnInvalidHookAccess();
       updateHookTypesDev();
-      return readContext(context, observedBits);
+      return readContext(context);
     },
     useEffect: function(create, deps) {
       currentHookNameInDev = "useEffect";
@@ -12037,125 +12312,708 @@ var InvalidNestedHooksDispatcherOnRerenderInDEV = null;
       var prevDispatcher = ReactCurrentDispatcher$1.current;
       ReactCurrentDispatcher$1.current = InvalidNestedHooksDispatcherOnUpdateInDEV;
 
-      try {
-        return updateMemo(create, deps);
-      } finally {
-        ReactCurrentDispatcher$1.current = prevDispatcher;
-      }
-    },
-    useReducer: function(reducer, initialArg, init) {
-      currentHookNameInDev = "useReducer";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      var prevDispatcher = ReactCurrentDispatcher$1.current;
-      ReactCurrentDispatcher$1.current = InvalidNestedHooksDispatcherOnUpdateInDEV;
+      try {
+        return updateMemo(create, deps);
+      } finally {
+        ReactCurrentDispatcher$1.current = prevDispatcher;
+      }
+    },
+    useReducer: function(reducer, initialArg, init) {
+      currentHookNameInDev = "useReducer";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      var prevDispatcher = ReactCurrentDispatcher$1.current;
+      ReactCurrentDispatcher$1.current = InvalidNestedHooksDispatcherOnUpdateInDEV;
+
+      try {
+        return rerenderReducer(reducer, initialArg, init);
+      } finally {
+        ReactCurrentDispatcher$1.current = prevDispatcher;
+      }
+    },
+    useRef: function(initialValue) {
+      currentHookNameInDev = "useRef";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      return updateRef();
+    },
+    useState: function(initialState) {
+      currentHookNameInDev = "useState";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      var prevDispatcher = ReactCurrentDispatcher$1.current;
+      ReactCurrentDispatcher$1.current = InvalidNestedHooksDispatcherOnUpdateInDEV;
+
+      try {
+        return rerenderState(initialState);
+      } finally {
+        ReactCurrentDispatcher$1.current = prevDispatcher;
+      }
+    },
+    useDebugValue: function(value, formatterFn) {
+      currentHookNameInDev = "useDebugValue";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      return updateDebugValue();
+    },
+    useDeferredValue: function(value) {
+      currentHookNameInDev = "useDeferredValue";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      return rerenderDeferredValue(value);
+    },
+    useTransition: function() {
+      currentHookNameInDev = "useTransition";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      return rerenderTransition();
+    },
+    useMutableSource: function(source, getSnapshot, subscribe) {
+      currentHookNameInDev = "useMutableSource";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      return updateMutableSource(source, getSnapshot, subscribe);
+    },
+    useOpaqueIdentifier: function() {
+      currentHookNameInDev = "useOpaqueIdentifier";
+      warnInvalidHookAccess();
+      updateHookTypesDev();
+      return rerenderOpaqueIdentifier();
+    },
+    unstable_isNewReconciler: enableNewReconciler
+  };
+}
+
+var now$1 = Scheduler.unstable_now;
+var commitTime = 0;
+var layoutEffectStartTime = -1;
+var profilerStartTime = -1;
+var passiveEffectStartTime = -1;
+/**
+ * Tracks whether the current update was a nested/cascading update (scheduled from a layout effect).
+ *
+ * The overall sequence is:
+ *   1. render
+ *   2. commit (and call `onRender`, `onCommit`)
+ *   3. check for nested updates
+ *   4. flush passive effects (and call `onPostCommit`)
+ *
+ * Nested updates are identified in step 3 above,
+ * but step 4 still applies to the work that was just committed.
+ * We use two flags to track nested updates then:
+ * one tracks whether the upcoming update is a nested update,
+ * and the other tracks whether the current update was a nested update.
+ * The first value gets synced to the second at the start of the render phase.
+ */
+
+var currentUpdateIsNested = false;
+var nestedUpdateScheduled = false;
+
+function isCurrentUpdateNested() {
+  return currentUpdateIsNested;
+}
+
+function markNestedUpdateScheduled() {
+  {
+    nestedUpdateScheduled = true;
+  }
+}
+
+function resetNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = false;
+    nestedUpdateScheduled = false;
+  }
+}
+
+function syncNestedUpdateFlag() {
+  {
+    currentUpdateIsNested = nestedUpdateScheduled;
+    nestedUpdateScheduled = false;
+  }
+}
+
+function getCommitTime() {
+  return commitTime;
+}
+
+function recordCommitTime() {
+  commitTime = now$1();
+}
+
+function startProfilerTimer(fiber) {
+  profilerStartTime = now$1();
+
+  if (fiber.actualStartTime < 0) {
+    fiber.actualStartTime = now$1();
+  }
+}
+
+function stopProfilerTimerIfRunning(fiber) {
+  profilerStartTime = -1;
+}
+
+function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
+  if (profilerStartTime >= 0) {
+    var elapsedTime = now$1() - profilerStartTime;
+    fiber.actualDuration += elapsedTime;
+
+    if (overrideBaseTime) {
+      fiber.selfBaseDuration = elapsedTime;
+    }
+
+    profilerStartTime = -1;
+  }
+}
+
+function recordLayoutEffectDuration(fiber) {
+  if (layoutEffectStartTime >= 0) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+          root.effectDuration += elapsedTime;
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+          parentStateNode.effectDuration += elapsedTime;
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function recordPassiveEffectDuration(fiber) {
+  if (passiveEffectStartTime >= 0) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1; // Store duration on the next nearest Profiler ancestor
+    // Or the root (for the DevTools Profiler to read)
+
+    var parentFiber = fiber.return;
+
+    while (parentFiber !== null) {
+      switch (parentFiber.tag) {
+        case HostRoot:
+          var root = parentFiber.stateNode;
+
+          if (root !== null) {
+            root.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+
+        case Profiler:
+          var parentStateNode = parentFiber.stateNode;
+
+          if (parentStateNode !== null) {
+            // Detached fibers have their state node cleared out.
+            // In this case, the return pointer is also cleared out,
+            // so we won't be able to report the time spent in this Profiler's subtree.
+            parentStateNode.passiveEffectDuration += elapsedTime;
+          }
+
+          return;
+      }
+
+      parentFiber = parentFiber.return;
+    }
+  }
+}
+
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
+
+function startPassiveEffectTimer() {
+  passiveEffectStartTime = now$1();
+}
+
+function transferActualDuration(fiber) {
+  // Transfer time spent rendering these children so we don't lose it
+  // after we rerender. This is used as a helper in special cases
+  // where we should count the work of multiple passes.
+  var child = fiber.child;
+
+  while (child) {
+    fiber.actualDuration += child.actualDuration;
+    child = child.sibling;
+  }
+}
+
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
+}
+
+if (
+  !(
+    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
+    "function"
+  )
+) {
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+}
+
+function showErrorDialog(boundary, errorInfo) {
+  var capturedError = {
+    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
+    error: errorInfo.value,
+    errorBoundary:
+      boundary !== null && boundary.tag === ClassComponent
+        ? boundary.stateNode
+        : null
+  };
+  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
+    capturedError
+  );
+}
+
+function logCapturedError(boundary, errorInfo) {
+  try {
+    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
+    // This enables renderers like ReactNative to better manage redbox behavior.
+
+    if (logError === false) {
+      return;
+    }
+
+    var error = errorInfo.value;
+
+    if (true) {
+      var source = errorInfo.source;
+      var stack = errorInfo.stack;
+      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
+      // `preventDefault()` in window `error` handler.
+      // We record this information as an expando on the error.
+
+      if (error != null && error._suppressLogging) {
+        if (boundary.tag === ClassComponent) {
+          // The error is recoverable and was silenced.
+          // Ignore it and don't print the stack addendum.
+          // This is handy for testing error boundaries without noise.
+          return;
+        } // The error is fatal. Since the silencing might have
+        // been accidental, we'll surface it anyway.
+        // However, the browser would have silenced the original error
+        // so we'll print it first, and then print the stack addendum.
+
+        console["error"](error); // Don't transform to our wrapper
+        // For a more detailed description of this block, see:
+        // https://github.com/facebook/react/pull/13384
+      }
+
+      var componentName = source ? getComponentNameFromFiber(source) : null;
+      var componentNameMessage = componentName
+        ? "The above error occurred in the <" + componentName + "> component:"
+        : "The above error occurred in one of your React components:";
+      var errorBoundaryMessage;
+
+      if (boundary.tag === HostRoot) {
+        errorBoundaryMessage =
+          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
+      } else {
+        var errorBoundaryName =
+          getComponentNameFromFiber(boundary) || "Anonymous";
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      }
+
+      var combinedMessage =
+        componentNameMessage +
+        "\n" +
+        componentStack +
+        "\n\n" +
+        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
+      // We don't include the original error message and JS stack because the browser
+      // has already printed it. Even if the application swallows the error, it is still
+      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+
+      console["error"](combinedMessage); // Don't transform to our wrapper
+    } else {
+      // In production, we print the error directly.
+      // This will include the message, the JS stack, and anything the browser wants to show.
+      // We pass the error object instead of custom message so that the browser displays the error natively.
+      console["error"](error); // Don't transform to our wrapper
+    }
+  } catch (e) {
+    // This method must not throw, or React internal state will get messed up.
+    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
+    // we want to report this error outside of the normal stack as a last resort.
+    // https://github.com/facebook/react/issues/13188
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+
+var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
+
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
+
+  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
+  // being called "element".
+
+  update.payload = {
+    element: null
+  };
+  var error = errorInfo.value;
+
+  update.callback = function() {
+    onUncaughtError(error);
+    logCapturedError(fiber, errorInfo);
+  };
+
+  return update;
+}
+
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  var update = createUpdate(NoTimestamp, lane);
+  update.tag = CaptureUpdate;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+
+  if (typeof getDerivedStateFromError === "function") {
+    var error$1 = errorInfo.value;
+
+    update.payload = function() {
+      logCapturedError(fiber, errorInfo);
+      return getDerivedStateFromError(error$1);
+    };
+  }
+
+  var inst = fiber.stateNode;
+
+  if (inst !== null && typeof inst.componentDidCatch === "function") {
+    update.callback = function callback() {
+      {
+        markFailedErrorBoundaryForHotReloading(fiber);
+      }
+
+      if (typeof getDerivedStateFromError !== "function") {
+        // To preserve the preexisting retry behavior of error boundaries,
+        // we keep track of which ones already failed during this batch.
+        // This gets reset before we yield back to the browser.
+        // TODO: Warn in strict mode if getDerivedStateFromError is
+        // not defined.
+        markLegacyErrorBoundaryAsFailed(this); // Only log here if componentDidCatch is the only error boundary method defined
+
+        logCapturedError(fiber, errorInfo);
+      }
+
+      var error$1 = errorInfo.value;
+      var stack = errorInfo.stack;
+      this.componentDidCatch(error$1, {
+        componentStack: stack !== null ? stack : ""
+      });
+
+      {
+        if (typeof getDerivedStateFromError !== "function") {
+          // If componentDidCatch is the only error boundary method defined,
+          // then it needs to call setState to recover from errors.
+          // If no state update is scheduled then the boundary will swallow the error.
+          if (!includesSomeLane(fiber.lanes, SyncLane)) {
+            error(
+              "%s: Error boundaries should implement getDerivedStateFromError(). " +
+                "In that method, return a state update to display an error message or fallback UI.",
+              getComponentNameFromFiber(fiber) || "Unknown"
+            );
+          }
+        }
+      }
+    };
+  } else {
+    update.callback = function() {
+      markFailedErrorBoundaryForHotReloading(fiber);
+    };
+  }
+
+  return update;
+}
+
+function attachPingListener(root, wakeable, lanes) {
+  // Attach a listener to the promise to "ping" the root and retry. But only if
+  // one does not already exist for the lanes we're currently rendering (which
+  // acts like a "thread ID" here).
+  var pingCache = root.pingCache;
+  var threadIDs;
+
+  if (pingCache === null) {
+    pingCache = root.pingCache = new PossiblyWeakMap$1();
+    threadIDs = new Set();
+    pingCache.set(wakeable, threadIDs);
+  } else {
+    threadIDs = pingCache.get(wakeable);
+
+    if (threadIDs === undefined) {
+      threadIDs = new Set();
+      pingCache.set(wakeable, threadIDs);
+    }
+  }
+
+  if (!threadIDs.has(lanes)) {
+    // Memoize using the thread ID to prevent redundant listeners.
+    threadIDs.add(lanes);
+    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
+
+    {
+      if (isDevToolsPresent) {
+        // If we have pending work still, restore the original updaters
+        restorePendingUpdaters(root, lanes);
+      }
+    }
+
+    wakeable.then(ping, ping);
+  }
+}
+
+function throwException(
+  root,
+  returnFiber,
+  sourceFiber,
+  value,
+  rootRenderLanes
+) {
+  // The source fiber did not complete.
+  sourceFiber.flags |= Incomplete;
+
+  {
+    if (isDevToolsPresent) {
+      // If we have pending work still, restore the original updaters
+      restorePendingUpdaters(root, rootRenderLanes);
+    }
+  }
+
+  if (
+    value !== null &&
+    typeof value === "object" &&
+    typeof value.then === "function"
+  ) {
+    var wakeable = value;
+    // A legacy mode Suspense quirk, only relevant to hook components.
+
+    var tag = sourceFiber.tag;
+
+    if (
+      (sourceFiber.mode & ConcurrentMode) === NoMode &&
+      (tag === FunctionComponent ||
+        tag === ForwardRef ||
+        tag === SimpleMemoComponent)
+    ) {
+      var currentSource = sourceFiber.alternate;
+
+      if (currentSource) {
+        sourceFiber.updateQueue = currentSource.updateQueue;
+        sourceFiber.memoizedState = currentSource.memoizedState;
+        sourceFiber.lanes = currentSource.lanes;
+      } else {
+        sourceFiber.updateQueue = null;
+        sourceFiber.memoizedState = null;
+      }
+    }
+
+    var hasInvisibleParentBoundary = hasSuspenseContext(
+      suspenseStackCursor.current,
+      InvisibleParentSuspenseContext
+    ); // Schedule the nearest Suspense to re-render the timed out view.
+
+    var _workInProgress = returnFiber;
+
+    do {
+      if (
+        _workInProgress.tag === SuspenseComponent &&
+        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
+      ) {
+        // Found the nearest boundary.
+        // Stash the promise on the boundary fiber. If the boundary times out, we'll
+        // attach another listener to flip the boundary back to its normal state.
+        var wakeables = _workInProgress.updateQueue;
+
+        if (wakeables === null) {
+          var updateQueue = new Set();
+          updateQueue.add(wakeable);
+          _workInProgress.updateQueue = updateQueue;
+        } else {
+          wakeables.add(wakeable);
+        } // If the boundary is in legacy mode, we should *not*
+        // suspend the commit. Pretend as if the suspended component rendered
+        // null and keep rendering. In the commit phase, we'll schedule a
+        // subsequent synchronous update to re-render the Suspense.
+        //
+        // Note: It doesn't matter whether the component that suspended was
+        // inside a concurrent mode tree. If the Suspense is outside of it, we
+        // should *not* suspend the commit.
+        //
+        // If the suspense boundary suspended itself suspended, we don't have to
+        // do this trick because nothing was partially started. We can just
+        // directly do a second pass over the fallback in this render and
+        // pretend we meant to render that directly.
+
+        if (
+          (_workInProgress.mode & ConcurrentMode) === NoMode &&
+          _workInProgress !== returnFiber
+        ) {
+          _workInProgress.flags |= DidCapture;
+          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
+          // But we shouldn't call any lifecycle methods or callbacks. Remove
+          // all lifecycle effect tags.
+
+          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+
+          if (sourceFiber.tag === ClassComponent) {
+            var _currentSourceFiber = sourceFiber.alternate;
+
+            if (_currentSourceFiber === null) {
+              // This is a new mount. Change the tag so it's not mistaken for a
+              // completed class component. For example, we should not call
+              // componentWillUnmount if it is deleted.
+              sourceFiber.tag = IncompleteClassComponent;
+            } else {
+              // When we try rendering again, we should not reuse the current fiber,
+              // since it's known to be in an inconsistent state. Use a force update to
+              // prevent a bail out.
+              var update = createUpdate(NoTimestamp, SyncLane);
+              update.tag = ForceUpdate;
+              enqueueUpdate(sourceFiber, update);
+            }
+          } // The source fiber did not complete. Mark it with Sync priority to
+          // indicate that it still has pending work.
 
-      try {
-        return rerenderReducer(reducer, initialArg, init);
-      } finally {
-        ReactCurrentDispatcher$1.current = prevDispatcher;
-      }
-    },
-    useRef: function(initialValue) {
-      currentHookNameInDev = "useRef";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      return updateRef();
-    },
-    useState: function(initialState) {
-      currentHookNameInDev = "useState";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      var prevDispatcher = ReactCurrentDispatcher$1.current;
-      ReactCurrentDispatcher$1.current = InvalidNestedHooksDispatcherOnUpdateInDEV;
+          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
 
-      try {
-        return rerenderState(initialState);
-      } finally {
-        ReactCurrentDispatcher$1.current = prevDispatcher;
-      }
-    },
-    useDebugValue: function(value, formatterFn) {
-      currentHookNameInDev = "useDebugValue";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      return updateDebugValue();
-    },
-    useDeferredValue: function(value) {
-      currentHookNameInDev = "useDeferredValue";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      return rerenderDeferredValue(value);
-    },
-    useTransition: function() {
-      currentHookNameInDev = "useTransition";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      return rerenderTransition();
-    },
-    useMutableSource: function(source, getSnapshot, subscribe) {
-      currentHookNameInDev = "useMutableSource";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      return updateMutableSource(source, getSnapshot, subscribe);
-    },
-    useOpaqueIdentifier: function() {
-      currentHookNameInDev = "useOpaqueIdentifier";
-      warnInvalidHookAccess();
-      updateHookTypesDev();
-      return rerenderOpaqueIdentifier();
-    },
-    unstable_isNewReconciler: enableNewReconciler
-  };
-}
+          return;
+        } // Confirmed that the boundary is in a concurrent mode tree. Continue
+        // with the normal suspend path.
+        //
+        // After this we'll use a set of heuristics to determine whether this
+        // render pass will run to completion or restart or "suspend" the commit.
+        // The actual logic for this is spread out in different places.
+        //
+        // This first principle is that if we're going to suspend when we complete
+        // a root, then we should also restart if we get an update or ping that
+        // might unsuspend it, and vice versa. The only reason to suspend is
+        // because you think you might want to restart before committing. However,
+        // it doesn't make sense to restart only while in the period we're suspended.
+        //
+        // Restarting too aggressively is also not good because it starves out any
+        // intermediate loading state. So we use heuristics to determine when.
+        // Suspense Heuristics
+        //
+        // If nothing threw a Promise or all the same fallbacks are already showing,
+        // then don't suspend/restart.
+        //
+        // If this is an initial render of a new tree of Suspense boundaries and
+        // those trigger a fallback, then don't suspend/restart. We want to ensure
+        // that we can show the initial loading state as quickly as possible.
+        //
+        // If we hit a "Delayed" case, such as when we'd switch from content back into
+        // a fallback, then we should always suspend/restart. Transitions apply
+        // to this case. If none is defined, JND is used instead.
+        //
+        // If we're already showing a fallback and it gets "retried", allowing us to show
+        // another level, but there's still an inner boundary that would show a fallback,
+        // then we suspend/restart for 500ms since the last time we showed a fallback
+        // anywhere in the tree. This effectively throttles progressive loading into a
+        // consistent train of commits. This also gives us an opportunity to restart to
+        // get to the completed state slightly earlier.
+        //
+        // If there's ambiguity due to batching it's resolved in preference of:
+        // 1) "delayed", 2) "initial render", 3) "retry".
+        //
+        // We want to ensure that a "busy" state doesn't get force committed. We want to
+        // ensure that new initial loading states can commit as soon as possible.
 
-var now$1 = Scheduler.unstable_now;
-var commitTime = 0;
-var profilerStartTime = -1;
+        attachPingListener(root, wakeable, rootRenderLanes);
+        _workInProgress.flags |= ShouldCapture;
+        _workInProgress.lanes = rootRenderLanes;
+        return;
+      } // This boundary already captured during this render. Continue to the next
+      // boundary.
 
-function getCommitTime() {
-  return commitTime;
-}
+      _workInProgress = _workInProgress.return;
+    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
+    // TODO: Use invariant so the message is stripped in prod?
 
-function recordCommitTime() {
-  commitTime = now$1();
-}
+    value = new Error(
+      (getComponentNameFromFiber(sourceFiber) || "A React component") +
+        " suspended while rendering, but no fallback UI was specified.\n" +
+        "\n" +
+        "Add a <Suspense fallback=...> component higher in the tree to " +
+        "provide a loading indicator or placeholder to display."
+    );
+  } // We didn't find a boundary that could handle this type of exception. Start
+  // over and traverse parent path again, this time treating the exception
+  // as an error.
 
-function startProfilerTimer(fiber) {
-  profilerStartTime = now$1();
+  renderDidError();
+  value = createCapturedValue(value, sourceFiber);
+  var workInProgress = returnFiber;
 
-  if (fiber.actualStartTime < 0) {
-    fiber.actualStartTime = now$1();
-  }
-}
+  do {
+    switch (workInProgress.tag) {
+      case HostRoot: {
+        var _errorInfo = value;
+        workInProgress.flags |= ShouldCapture;
+        var lane = pickArbitraryLane(rootRenderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
 
-function stopProfilerTimerIfRunning(fiber) {
-  profilerStartTime = -1;
-}
+        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
 
-function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
-  if (profilerStartTime >= 0) {
-    var elapsedTime = now$1() - profilerStartTime;
-    fiber.actualDuration += elapsedTime;
+        enqueueCapturedUpdate(workInProgress, _update);
+        return;
+      }
 
-    if (overrideBaseTime) {
-      fiber.selfBaseDuration = elapsedTime;
-    }
+      case ClassComponent:
+        // Capture and retry
+        var errorInfo = value;
+        var ctor = workInProgress.type;
+        var instance = workInProgress.stateNode;
 
-    profilerStartTime = -1;
-  }
-}
+        if (
+          (workInProgress.flags & DidCapture) === NoFlags &&
+          (typeof ctor.getDerivedStateFromError === "function" ||
+            (instance !== null &&
+              typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance)))
+        ) {
+          workInProgress.flags |= ShouldCapture;
 
-function transferActualDuration(fiber) {
-  // Transfer time spent rendering these children so we don't lose it
-  // after we rerender. This is used as a helper in special cases
-  // where we should count the work of multiple passes.
-  var child = fiber.child;
+          var _lane = pickArbitraryLane(rootRenderLanes);
 
-  while (child) {
-    fiber.actualDuration += child.actualDuration;
-    child = child.sibling;
-  }
+          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
+
+          var _update2 = createClassErrorUpdate(
+            workInProgress,
+            errorInfo,
+            _lane
+          );
+
+          enqueueCapturedUpdate(workInProgress, _update2);
+          return;
+        }
+
+        break;
+    }
+
+    workInProgress = workInProgress.return;
+  } while (workInProgress !== null);
 }
 
 var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner;
@@ -12260,7 +13118,7 @@ function updateForwardRef(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(Component)
+          getComponentNameFromType(Component)
         );
       }
     }
@@ -12348,7 +13206,7 @@ function updateMemoComponent(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(type)
+          getComponentNameFromType(type)
         );
       }
     }
@@ -12378,7 +13236,7 @@ function updateMemoComponent(
         _innerPropTypes,
         nextProps, // Resolved props
         "prop",
-        getComponentName(_type)
+        getComponentNameFromType(_type)
       );
     }
   }
@@ -12444,7 +13302,7 @@ function updateSimpleMemoComponent(
             outerPropTypes,
             nextProps, // Resolved (SimpleMemoComponent has no defaultProps)
             "prop",
-            getComponentName(outerMemoType)
+            getComponentNameFromType(outerMemoType)
           );
         }
       }
@@ -12465,7 +13323,7 @@ function updateSimpleMemoComponent(
         // The pending lanes were cleared at the beginning of beginWork. We're
         // about to bail out, but there might be other lanes that weren't
         // included in the current render. Usually, the priority level of the
-        // remaining updates is accumlated during the evaluation of the
+        // remaining updates is accumulated during the evaluation of the
         // component (i.e. when processing the update queue). But since since
         // we're bailing out early *without* evaluating the component, we need
         // to account for it here, too. Reset to the value of the current fiber.
@@ -12501,21 +13359,28 @@ function updateSimpleMemoComponent(
 function updateOffscreenComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps;
   var nextChildren = nextProps.children;
-  var prevState = current !== null ? current.memoizedState : null;
+  var prevState = current !== null ? current.memoizedState : null; // If this is not null, this is a cache pool that was carried over from the
+  // previous render. We will push this to the cache pool context so that we can
+  // resume in-flight requests.
+
+  var spawnedCachePool = null;
 
   if (
     nextProps.mode === "hidden" ||
     nextProps.mode === "unstable-defer-without-hiding"
   ) {
+    // Rendering a hidden tree.
     if ((workInProgress.mode & ConcurrentMode) === NoMode) {
       // In legacy sync mode, don't defer the subtree. Render it now.
-      // TODO: Figure out what we should do in Blocking mode.
       var nextState = {
-        baseLanes: NoLanes
+        baseLanes: NoLanes,
+        cachePool: null
       };
       workInProgress.memoizedState = nextState;
       pushRenderLanes(workInProgress, renderLanes);
     } else if (!includesSomeLane(renderLanes, OffscreenLane)) {
+      // We're hidden, and we're not rendering at Offscreen. We will bail out
+      // and resume this tree later.
       var nextBaseLanes;
 
       if (prevState !== null) {
@@ -12525,25 +13390,24 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
         nextBaseLanes = renderLanes;
       } // Schedule this fiber to re-render at offscreen priority. Then bailout.
 
-      {
-        markSpawnedWork(OffscreenLane);
-      }
-
       workInProgress.lanes = workInProgress.childLanes = laneToLanes(
         OffscreenLane
       );
       var _nextState = {
-        baseLanes: nextBaseLanes
+        baseLanes: nextBaseLanes,
+        cachePool: spawnedCachePool
       };
-      workInProgress.memoizedState = _nextState; // We're about to bail out, but we need to push this to the stack anyway
+      workInProgress.memoizedState = _nextState;
+      workInProgress.updateQueue = null; // We're about to bail out, but we need to push this to the stack anyway
       // to avoid a push/pop misalignment.
 
       pushRenderLanes(workInProgress, nextBaseLanes);
+
       return null;
     } else {
-      // Rendering at offscreen, so we can clear the base lanes.
       var _nextState2 = {
-        baseLanes: NoLanes
+        baseLanes: NoLanes,
+        cachePool: null
       };
       workInProgress.memoizedState = _nextState2; // Push the lanes that were skipped when we bailed out.
 
@@ -12552,10 +13416,12 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
       pushRenderLanes(workInProgress, subtreeRenderLanes);
     }
   } else {
+    // Rendering a visible tree.
     var _subtreeRenderLanes;
 
     if (prevState !== null) {
-      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes); // Since we're not hidden anymore, reset the state
+      // We're going from hidden -> visible.
+      _subtreeRenderLanes = mergeLanes(prevState.baseLanes, renderLanes);
 
       workInProgress.memoizedState = null;
     } else {
@@ -12590,12 +13456,15 @@ function updateMode(current, workInProgress, renderLanes) {
 
 function updateProfiler(current, workInProgress, renderLanes) {
   {
-    workInProgress.flags |= Update; // Reset effect durations for the next eventual effect phase.
-    // These are reset during render to allow the DevTools commit hook a chance to read them,
+    workInProgress.flags |= Update;
 
-    var stateNode = workInProgress.stateNode;
-    stateNode.effectDuration = 0;
-    stateNode.passiveEffectDuration = 0;
+    {
+      // Reset effect durations for the next eventual effect phase.
+      // These are reset during render to allow the DevTools commit hook a chance to read them,
+      var stateNode = workInProgress.stateNode;
+      stateNode.effectDuration = 0;
+      stateNode.passiveEffectDuration = 0;
+    }
   }
 
   var nextProps = workInProgress.pendingProps;
@@ -12634,7 +13503,7 @@ function updateFunctionComponent(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(Component)
+          getComponentNameFromType(Component)
         );
       }
     }
@@ -12675,14 +13544,49 @@ function updateFunctionComponent(
   return workInProgress.child;
 }
 
-function updateClassComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  {
+function updateClassComponent(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  {
+    // This is used by DevTools to force a boundary to error.
+    switch (shouldError(workInProgress)) {
+      case false: {
+        var _instance = workInProgress.stateNode;
+        var ctor = workInProgress.type; // TODO This way of resetting the error boundary state is a hack.
+        // Is there a better way to do this?
+
+        var tempInstance = new ctor(
+          workInProgress.memoizedProps,
+          _instance.context
+        );
+        var state = tempInstance.state;
+
+        _instance.updater.enqueueSetState(_instance, state, null);
+
+        break;
+      }
+
+      case true: {
+        workInProgress.flags |= DidCapture;
+        workInProgress.flags |= ShouldCapture;
+        var error$1 = new Error("Simulated error coming from DevTools");
+        var lane = pickArbitraryLane(renderLanes);
+        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane); // Schedule the error boundary to re-render using updated state
+
+        var update = createClassErrorUpdate(
+          workInProgress,
+          createCapturedValue(error$1, workInProgress),
+          lane
+        );
+        enqueueCapturedUpdate(workInProgress, update);
+        break;
+      }
+    }
+
     if (workInProgress.type !== workInProgress.elementType) {
       // Lazy component props can't be validated in createElement
       // because they're only guaranteed to be resolved here.
@@ -12693,7 +13597,7 @@ function updateClassComponent(
           innerPropTypes,
           nextProps, // Resolved props
           "prop",
-          getComponentName(Component)
+          getComponentNameFromType(Component)
         );
       }
     }
@@ -12764,7 +13668,7 @@ function updateClassComponent(
         error(
           "It looks like %s is reassigning its own `this.props` while rendering. " +
             "This is not supported and can lead to confusing bugs.",
-          getComponentName(workInProgress.type) || "a component"
+          getComponentNameFromFiber(workInProgress) || "a component"
         );
       }
 
@@ -12880,10 +13784,11 @@ function updateHostRoot(current, workInProgress, renderLanes) {
 
   var nextProps = workInProgress.pendingProps;
   var prevState = workInProgress.memoizedState;
-  var prevChildren = prevState !== null ? prevState.element : null;
+  var prevChildren = prevState.element;
   cloneUpdateQueue(current, workInProgress);
   processUpdateQueue(workInProgress, nextProps, null, renderLanes);
-  var nextState = workInProgress.memoizedState; // Caution: React DevTools currently depends on this property
+  var nextState = workInProgress.memoizedState;
+  var root = workInProgress.stateNode;
   // being called "element".
 
   var nextChildren = nextState.element;
@@ -12892,8 +13797,6 @@ function updateHostRoot(current, workInProgress, renderLanes) {
     return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
   }
 
-  var root = workInProgress.stateNode;
-
   if (root.hydrate && enterHydrationState()) {
     var child = mountChildFibers(
       workInProgress,
@@ -13040,7 +13943,7 @@ function mountLazyComponent(
               outerPropTypes,
               resolvedProps, // Resolved for outer only
               "prop",
-              getComponentName(Component)
+              getComponentNameFromType(Component)
             );
           }
         }
@@ -13160,7 +14063,7 @@ function mountIndeterminateComponent(
       Component.prototype &&
       typeof Component.prototype.render === "function"
     ) {
-      var componentName = getComponentName(Component) || "Unknown";
+      var componentName = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutBadClass[componentName]) {
         error(
@@ -13174,7 +14077,7 @@ function mountIndeterminateComponent(
       }
     }
 
-    if (workInProgress.mode & StrictMode) {
+    if (workInProgress.mode & StrictLegacyMode) {
       ReactStrictModeWarnings.recordLegacyContextWarning(workInProgress, null);
     }
 
@@ -13202,7 +14105,7 @@ function mountIndeterminateComponent(
       typeof value.render === "function" &&
       value.$$typeof === undefined
     ) {
-      var _componentName = getComponentName(Component) || "Unknown";
+      var _componentName = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutModulePatternComponent[_componentName]) {
         error(
@@ -13230,7 +14133,7 @@ function mountIndeterminateComponent(
     value.$$typeof === undefined
   ) {
     {
-      var _componentName2 = getComponentName(Component) || "Unknown";
+      var _componentName2 = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutModulePatternComponent[_componentName2]) {
         error(
@@ -13267,17 +14170,6 @@ function mountIndeterminateComponent(
     workInProgress.memoizedState =
       value.state !== null && value.state !== undefined ? value.state : null;
     initializeUpdateQueue(workInProgress);
-    var getDerivedStateFromProps = Component.getDerivedStateFromProps;
-
-    if (typeof getDerivedStateFromProps === "function") {
-      applyDerivedStateFromProps(
-        workInProgress,
-        Component,
-        getDerivedStateFromProps,
-        props
-      );
-    }
-
     adoptClassInstance(workInProgress, value);
     mountClassInstance(workInProgress, Component, props, renderLanes);
     return finishClassComponent(
@@ -13321,7 +14213,7 @@ function validateFunctionComponentInDev(workInProgress, Component) {
         info += "\n\nCheck the render method of `" + ownerName + "`.";
       }
 
-      var warningKey = ownerName || workInProgress._debugID || "";
+      var warningKey = ownerName || "";
       var debugSource = workInProgress._debugSource;
 
       if (debugSource) {
@@ -13341,7 +14233,7 @@ function validateFunctionComponentInDev(workInProgress, Component) {
     }
 
     if (typeof Component.getDerivedStateFromProps === "function") {
-      var _componentName3 = getComponentName(Component) || "Unknown";
+      var _componentName3 = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutGetDerivedStateOnFunctionComponent[_componentName3]) {
         error(
@@ -13357,7 +14249,7 @@ function validateFunctionComponentInDev(workInProgress, Component) {
       typeof Component.contextType === "object" &&
       Component.contextType !== null
     ) {
-      var _componentName4 = getComponentName(Component) || "Unknown";
+      var _componentName4 = getComponentNameFromType(Component) || "Unknown";
 
       if (!didWarnAboutContextTypeOnFunctionComponent[_componentName4]) {
         error(
@@ -13378,13 +14270,17 @@ var SUSPENDED_MARKER = {
 
 function mountSuspenseOffscreenState(renderLanes) {
   return {
-    baseLanes: renderLanes
+    baseLanes: renderLanes,
+    cachePool: getSuspendedCachePool()
   };
 }
 
 function updateSuspenseOffscreenState(prevOffscreenState, renderLanes) {
+  var cachePool = null;
+
   return {
-    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes)
+    baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes),
+    cachePool: cachePool
   };
 } // TODO: Probably should inline this back
 
@@ -13526,11 +14422,6 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       // it behind on this node.
 
       workInProgress.lanes = SomeRetryLane;
-
-      {
-        markSpawnedWork(SomeRetryLane);
-      }
-
       return _fallbackFragment;
     } else {
       return mountSuspensePrimaryChildren(
@@ -13667,7 +14558,10 @@ function mountSuspenseFallbackChildren(
   var primaryChildFragment;
   var fallbackChildFragment;
 
-  if ((mode & BlockingMode) === NoMode && progressedPrimaryFragment !== null) {
+  if (
+    (mode & ConcurrentMode) === NoMode &&
+    progressedPrimaryFragment !== null
+  ) {
     // In legacy mode, we commit the primary tree as if it successfully
     // completed, even though it's in an inconsistent state.
     primaryChildFragment = progressedPrimaryFragment;
@@ -13735,7 +14629,7 @@ function updateSuspensePrimaryChildren(
     }
   );
 
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
     primaryChildFragment.lanes = renderLanes;
   }
 
@@ -13744,9 +14638,14 @@ function updateSuspensePrimaryChildren(
 
   if (currentFallbackChildFragment !== null) {
     // Delete the fallback child fragment
-    currentFallbackChildFragment.nextEffect = null;
-    currentFallbackChildFragment.flags = Deletion;
-    workInProgress.firstEffect = workInProgress.lastEffect = currentFallbackChildFragment;
+    var deletions = workInProgress.deletions;
+
+    if (deletions === null) {
+      workInProgress.deletions = [currentFallbackChildFragment];
+      workInProgress.flags |= ChildDeletion;
+    } else {
+      deletions.push(currentFallbackChildFragment);
+    }
   }
 
   workInProgress.child = primaryChildFragment;
@@ -13772,7 +14671,7 @@ function updateSuspenseFallbackChildren(
   if (
     // In legacy mode, we commit the primary tree as if it successfully
     // completed, even though it's in an inconsistent state.
-    (mode & BlockingMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
+    (mode & ConcurrentMode) === NoMode && // Make sure we're on the second pass, i.e. the primary child fragment was
     // already cloned. In legacy mode, the only case where this isn't true is
     // when DevTools forces us to display a fallback; we skip the first render
     // pass entirely and go straight to rendering the fallback. (In Concurrent
@@ -13796,28 +14695,21 @@ function updateSuspenseFallbackChildren(
         currentPrimaryChildFragment.selfBaseDuration;
       primaryChildFragment.treeBaseDuration =
         currentPrimaryChildFragment.treeBaseDuration;
-    } // The fallback fiber was added as a deletion effect during the first pass.
+    } // The fallback fiber was added as a deletion during the first pass.
     // However, since we're going to remain on the fallback, we no longer want
-    // to delete it. So we need to remove it from the list. Deletions are stored
-    // on the same list as effects. We want to keep the effects from the primary
-    // tree. So we copy the primary child fragment's effect list, which does not
-    // include the fallback deletion effect.
+    // to delete it.
 
-    var progressedLastEffect = primaryChildFragment.lastEffect;
-
-    if (progressedLastEffect !== null) {
-      workInProgress.firstEffect = primaryChildFragment.firstEffect;
-      workInProgress.lastEffect = progressedLastEffect;
-      progressedLastEffect.nextEffect = null;
-    } else {
-      // TODO: Reset this somewhere else? Lol legacy mode is so weird.
-      workInProgress.firstEffect = workInProgress.lastEffect = null;
-    }
+    workInProgress.deletions = null;
   } else {
     primaryChildFragment = createWorkInProgressOffscreenFiber(
       currentPrimaryChildFragment,
       primaryChildProps
-    );
+    ); // Since we're reusing a current tree, we need to reuse the flags, too.
+    // (We don't do this in legacy mode, because in legacy mode we don't re-use
+    // the current tree; see previous branch.)
+
+    primaryChildFragment.subtreeFlags =
+      currentPrimaryChildFragment.subtreeFlags & StaticMask;
   }
 
   var fallbackChildFragment;
@@ -14013,11 +14905,12 @@ function validateTailOptions(tailMode, revealOrder) {
 
 function validateSuspenseListNestedChild(childSlot, index) {
   {
-    var isArray = Array.isArray(childSlot);
-    var isIterable = !isArray && typeof getIteratorFn(childSlot) === "function";
+    var isAnArray = isArray(childSlot);
+    var isIterable =
+      !isAnArray && typeof getIteratorFn(childSlot) === "function";
 
-    if (isArray || isIterable) {
-      var type = isArray ? "array" : "iterable";
+    if (isAnArray || isIterable) {
+      var type = isAnArray ? "array" : "iterable";
 
       error(
         "A nested %s was passed to row #%s in <SuspenseList />. Wrap it in " +
@@ -14045,7 +14938,7 @@ function validateSuspenseListChildren(children, revealOrder) {
       children !== null &&
       children !== false
     ) {
-      if (Array.isArray(children)) {
+      if (isArray(children)) {
         for (var i = 0; i < children.length; i++) {
           if (!validateSuspenseListNestedChild(children[i], i)) {
             return;
@@ -14087,8 +14980,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
 
@@ -14099,8 +14991,7 @@ function initSuspenseListRenderState(
       renderingStartTime: 0,
       last: lastContentRow,
       tail: tail,
-      tailMode: tailMode,
-      lastEffect: lastEffectBeforeRendering
+      tailMode: tailMode
     };
   } else {
     // We can reuse the existing object from previous renders.
@@ -14110,7 +15001,6 @@ function initSuspenseListRenderState(
     renderState.last = lastContentRow;
     renderState.tail = tail;
     renderState.tailMode = tailMode;
-    renderState.lastEffect = lastEffectBeforeRendering;
   }
 } // This can end up rendering this component multiple passes.
 // The first pass splits the children fibers into two sets. A head and tail.
@@ -14161,7 +15051,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
 
   pushSuspenseContext(workInProgress, suspenseContext);
 
-  if ((workInProgress.mode & BlockingMode) === NoMode) {
+  if ((workInProgress.mode & ConcurrentMode) === NoMode) {
     // In legacy mode, SuspenseList doesn't work so we just
     // use make it a noop by treating it as the default revealOrder.
     workInProgress.memoizedState = null;
@@ -14188,8 +15078,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           false, // isBackwards
           tail,
           lastContentRow,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       }
@@ -14223,8 +15112,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           true, // isBackwards
           _tail,
           null, // last
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       }
@@ -14235,8 +15123,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           false, // isBackwards
           null, // tail
           null, // last
-          undefined,
-          workInProgress.lastEffect
+          undefined
         );
         break;
       }
@@ -14302,25 +15189,26 @@ function updateContextProvider(current, workInProgress, renderLanes) {
     }
   }
 
-  pushProvider(workInProgress, newValue);
-
-  if (oldProps !== null) {
-    var oldValue = oldProps.value;
-    var changedBits = calculateChangedBits(context, newValue, oldValue);
+  pushProvider(workInProgress, context, newValue);
 
-    if (changedBits === 0) {
-      // No change. Bailout early if children are the same.
-      if (oldProps.children === newProps.children && !hasContextChanged()) {
-        return bailoutOnAlreadyFinishedWork(
-          current,
-          workInProgress,
-          renderLanes
-        );
+  {
+    if (oldProps !== null) {
+      var oldValue = oldProps.value;
+
+      if (objectIs(oldValue, newValue)) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children && !hasContextChanged()) {
+          return bailoutOnAlreadyFinishedWork(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        }
+      } else {
+        // The context value changed. Search for matching consumers and schedule
+        // them to update.
+        propagateContextChange(workInProgress, context, renderLanes);
       }
-    } else {
-      // The context value changed. Search for matching consumers and schedule
-      // them to update.
-      propagateContextChange(workInProgress, context, changedBits, renderLanes);
     }
   }
 
@@ -14375,7 +15263,7 @@ function updateContextConsumer(current, workInProgress, renderLanes) {
   }
 
   prepareToReadContext(workInProgress, renderLanes);
-  var newValue = readContext(context, newProps.unstable_observedBits);
+  var newValue = readContext(context);
   var newChildren;
 
   {
@@ -14411,13 +15299,14 @@ function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
     // The children don't have any work either. We can skip them.
     // TODO: Once we add back resuming, we should check if the children are
     // a work-in-progress set. If so, we need to transfer their effects.
-    return null;
-  } else {
-    // This fiber doesn't have work, but its subtree does. Clone the child
-    // fibers and continue.
-    cloneChildFibers(current, workInProgress);
-    return workInProgress.child;
-  }
+    {
+      return null;
+    }
+  } // This fiber doesn't have work, but its subtree does. Clone the child
+  // fibers and continue.
+
+  cloneChildFibers(current, workInProgress);
+  return workInProgress.child;
 }
 
 function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
@@ -14458,17 +15347,15 @@ function remountFiber(current, oldWorkInProgress, newWorkInProgress) {
     } // Delete the old fiber and place the new one.
     // Since the old fiber is disconnected, we have to schedule it manually.
 
-    var last = returnFiber.lastEffect;
+    var deletions = returnFiber.deletions;
 
-    if (last !== null) {
-      last.nextEffect = current;
-      returnFiber.lastEffect = current;
+    if (deletions === null) {
+      returnFiber.deletions = [current];
+      returnFiber.flags |= ChildDeletion;
     } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = current;
+      deletions.push(current);
     }
 
-    current.nextEffect = null;
-    current.flags = Deletion;
     newWorkInProgress.flags |= Placement; // Restart work from the new fiber.
 
     return newWorkInProgress;
@@ -14541,7 +15428,8 @@ function beginWork(current, workInProgress, renderLanes) {
 
         case ContextProvider: {
           var newValue = workInProgress.memoizedProps.value;
-          pushProvider(workInProgress, newValue);
+          var context = workInProgress.type._context;
+          pushProvider(workInProgress, context, newValue);
           break;
         }
 
@@ -14555,12 +15443,15 @@ function beginWork(current, workInProgress, renderLanes) {
 
             if (hasChildWork) {
               workInProgress.flags |= Update;
-            } // Reset effect durations for the next eventual effect phase.
-            // These are reset during render to allow the DevTools commit hook a chance to read them,
+            }
 
-            var stateNode = workInProgress.stateNode;
-            stateNode.effectDuration = 0;
-            stateNode.passiveEffectDuration = 0;
+            {
+              // Reset effect durations for the next eventual effect phase.
+              // These are reset during render to allow the DevTools commit hook a chance to read them,
+              var stateNode = workInProgress.stateNode;
+              stateNode.effectDuration = 0;
+              stateNode.passiveEffectDuration = 0;
+            }
           }
 
           break;
@@ -14604,6 +15495,9 @@ function beginWork(current, workInProgress, renderLanes) {
                 // primary children and work on the fallback.
                 return child.sibling;
               } else {
+                // Note: We can return `null` here because we already checked
+                // whether there were nested context consumers, via the call to
+                // `bailoutOnAlreadyFinishedWork` above.
                 return null;
               }
             }
@@ -14825,7 +15719,7 @@ function beginWork(current, workInProgress, renderLanes) {
               outerPropTypes,
               _resolvedProps3, // Resolved for outer only
               "prop",
-              getComponentName(_type2)
+              getComponentNameFromType(_type2)
             );
           }
         }
@@ -14875,18 +15769,10 @@ function beginWork(current, workInProgress, renderLanes) {
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
     }
 
-    case FundamentalComponent: {
-      break;
-    }
-
     case ScopeComponent: {
       break;
     }
 
-    case Block: {
-      break;
-    }
-
     case OffscreenComponent: {
       return updateOffscreenComponent(current, workInProgress, renderLanes);
     }
@@ -14959,7 +15845,7 @@ var updateHostText$1;
     }
   };
 
-  updateHostContainer = function(workInProgress) {
+  updateHostContainer = function(current, workInProgress) {
     // Noop
   };
 
@@ -15076,6 +15962,115 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
   }
 }
 
+function bubbleProperties(completedWork) {
+  var didBailout =
+    completedWork.alternate !== null &&
+    completedWork.alternate.child === completedWork.child;
+  var newChildLanes = NoLanes;
+  var subtreeFlags = NoFlags;
+
+  if (!didBailout) {
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var actualDuration = completedWork.actualDuration;
+      var treeBaseDuration = completedWork.selfBaseDuration;
+      var child = completedWork.child;
+
+      while (child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(child.lanes, child.childLanes)
+        );
+        subtreeFlags |= child.subtreeFlags;
+        subtreeFlags |= child.flags; // When a fiber is cloned, its actualDuration is reset to 0. This value will
+        // only be updated if work is done on the fiber (i.e. it doesn't bailout).
+        // When work is done, it should bubble to the parent's actualDuration. If
+        // the fiber has not been cloned though, (meaning no work was done), then
+        // this value will reflect the amount of time spent working on a previous
+        // render. In that case it should not bubble. We determine whether it was
+        // cloned by comparing the child pointer.
+
+        actualDuration += child.actualDuration;
+        treeBaseDuration += child.treeBaseDuration;
+        child = child.sibling;
+      }
+
+      completedWork.actualDuration = actualDuration;
+      completedWork.treeBaseDuration = treeBaseDuration;
+    } else {
+      var _child = completedWork.child;
+
+      while (_child !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child.lanes, _child.childLanes)
+        );
+        subtreeFlags |= _child.subtreeFlags;
+        subtreeFlags |= _child.flags; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
+
+        _child.return = completedWork;
+        _child = _child.sibling;
+      }
+    }
+
+    completedWork.subtreeFlags |= subtreeFlags;
+  } else {
+    // Bubble up the earliest expiration time.
+    if ((completedWork.mode & ProfileMode) !== NoMode) {
+      // In profiling mode, resetChildExpirationTime is also used to reset
+      // profiler durations.
+      var _treeBaseDuration = completedWork.selfBaseDuration;
+      var _child2 = completedWork.child;
+
+      while (_child2 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child2.lanes, _child2.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
+
+        subtreeFlags |= _child2.subtreeFlags & StaticMask;
+        subtreeFlags |= _child2.flags & StaticMask;
+        _treeBaseDuration += _child2.treeBaseDuration;
+        _child2 = _child2.sibling;
+      }
+
+      completedWork.treeBaseDuration = _treeBaseDuration;
+    } else {
+      var _child3 = completedWork.child;
+
+      while (_child3 !== null) {
+        newChildLanes = mergeLanes(
+          newChildLanes,
+          mergeLanes(_child3.lanes, _child3.childLanes)
+        ); // "Static" flags share the lifetime of the fiber/hook they belong to,
+        // so we should bubble those up even during a bailout. All the other
+        // flags have a lifetime only of a single render + commit, so we should
+        // ignore them.
+
+        subtreeFlags |= _child3.subtreeFlags & StaticMask;
+        subtreeFlags |= _child3.flags & StaticMask; // Update the return pointer so the tree is consistent. This is a code
+        // smell because it assumes the commit phase is never concurrent with
+        // the render phase. Will address during refactor to alternate model.
+
+        _child3.return = completedWork;
+        _child3 = _child3.sibling;
+      }
+    }
+
+    completedWork.subtreeFlags |= subtreeFlags;
+  }
+
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
+
 function completeWork(current, workInProgress, renderLanes) {
   var newProps = workInProgress.pendingProps;
 
@@ -15090,6 +16085,7 @@ function completeWork(current, workInProgress, renderLanes) {
     case Profiler:
     case ContextConsumer:
     case MemoComponent:
+      bubbleProperties(workInProgress);
       return null;
 
     case ClassComponent: {
@@ -15099,14 +16095,16 @@ function completeWork(current, workInProgress, renderLanes) {
         popContext(workInProgress);
       }
 
+      bubbleProperties(workInProgress);
       return null;
     }
 
     case HostRoot: {
+      var fiberRoot = workInProgress.stateNode;
+
       popHostContainer(workInProgress);
       popTopLevelContextObject(workInProgress);
       resetWorkInProgressVersions();
-      var fiberRoot = workInProgress.stateNode;
 
       if (fiberRoot.pendingContext) {
         fiberRoot.context = fiberRoot.pendingContext;
@@ -15131,7 +16129,8 @@ function completeWork(current, workInProgress, renderLanes) {
         }
       }
 
-      updateHostContainer(workInProgress);
+      updateHostContainer(current, workInProgress);
+      bubbleProperties(workInProgress);
       return null;
     }
 
@@ -15160,6 +16159,7 @@ function completeWork(current, workInProgress, renderLanes) {
             );
           } // This can happen when we abort work.
 
+          bubbleProperties(workInProgress);
           return null;
         }
 
@@ -15202,6 +16202,7 @@ function completeWork(current, workInProgress, renderLanes) {
         }
       }
 
+      bubbleProperties(workInProgress);
       return null;
     }
 
@@ -15242,6 +16243,7 @@ function completeWork(current, workInProgress, renderLanes) {
         }
       }
 
+      bubbleProperties(workInProgress);
       return null;
     }
 
@@ -15255,7 +16257,7 @@ function completeWork(current, workInProgress, renderLanes) {
 
         if ((workInProgress.mode & ProfileMode) !== NoMode) {
           transferActualDuration(workInProgress);
-        }
+        } // Don't bubble properties in this case.
 
         return workInProgress;
       }
@@ -15271,12 +16273,10 @@ function completeWork(current, workInProgress, renderLanes) {
       }
 
       if (nextDidTimeout && !prevDidTimeout) {
-        // If this subtreee is running in blocking mode we can suspend,
-        // otherwise we won't suspend.
         // TODO: This will still suspend a synchronous tree if anything
         // in the concurrent tree already suspended during this render.
         // This is a known bug.
-        if ((workInProgress.mode & BlockingMode) !== NoMode) {
+        if ((workInProgress.mode & ConcurrentMode) !== NoMode) {
           // TODO: Move this back to throwException because this is too late
           // if this is a large tree which is common for initial loads. We
           // don't know if we should restart a render or not until we get
@@ -15318,22 +16318,42 @@ function completeWork(current, workInProgress, renderLanes) {
         }
       }
 
+      bubbleProperties(workInProgress);
+
+      {
+        if ((workInProgress.mode & ProfileMode) !== NoMode) {
+          if (nextDidTimeout) {
+            // Don't count time spent in a timed out Suspense subtree as part of the base duration.
+            var _primaryChildFragment2 = workInProgress.child;
+
+            if (_primaryChildFragment2 !== null) {
+              // $FlowFixMe Flow doesn't support type casting in combination with the -= operator
+              workInProgress.treeBaseDuration -=
+                _primaryChildFragment2.treeBaseDuration;
+            }
+          }
+        }
+      }
+
       return null;
     }
 
     case HostPortal:
       popHostContainer(workInProgress);
-      updateHostContainer(workInProgress);
+      updateHostContainer(current, workInProgress);
 
       if (current === null) {
         preparePortalMount(workInProgress.stateNode.containerInfo);
       }
 
+      bubbleProperties(workInProgress);
       return null;
 
     case ContextProvider:
       // Pop provider fiber
-      popProvider(workInProgress);
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
+      bubbleProperties(workInProgress);
       return null;
 
     case IncompleteClassComponent: {
@@ -15345,6 +16365,7 @@ function completeWork(current, workInProgress, renderLanes) {
         popContext(workInProgress);
       }
 
+      bubbleProperties(workInProgress);
       return null;
     }
 
@@ -15355,6 +16376,7 @@ function completeWork(current, workInProgress, renderLanes) {
       if (renderState === null) {
         // We're running in the default, "independent" mode.
         // We don't do anything in this mode.
+        bubbleProperties(workInProgress);
         return null;
       }
 
@@ -15406,14 +16428,10 @@ function completeWork(current, workInProgress, renderLanes) {
                   workInProgress.flags |= Update;
                 } // Rerender the whole list, but this time, we'll force fallbacks
                 // to stay in place.
-                // Reset the effect list before doing the second pass since that's now invalid.
-
-                if (renderState.lastEffect === null) {
-                  workInProgress.firstEffect = null;
-                }
-
-                workInProgress.lastEffect = renderState.lastEffect; // Reset the child fibers to their original state.
+                // Reset the effect flags before doing the second pass since that's now invalid.
+                // Reset the child fibers to their original state.
 
+                workInProgress.subtreeFlags = NoFlags;
                 resetChildFibers(workInProgress, renderLanes); // Set up the Suspense Context to force suspense and immediately
                 // rerender the children.
 
@@ -15423,7 +16441,8 @@ function completeWork(current, workInProgress, renderLanes) {
                     suspenseStackCursor.current,
                     ForceSuspenseFallback
                   )
-                );
+                ); // Don't bubble properties in this case.
+
                 return workInProgress.child;
               }
 
@@ -15447,10 +16466,6 @@ function completeWork(current, workInProgress, renderLanes) {
             // since we're leaving it behind on this node.
 
             workInProgress.lanes = SomeRetryLane;
-
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
           }
         } else {
           cutOffTailIfNeeded(renderState, false);
@@ -15480,16 +16495,8 @@ function completeWork(current, workInProgress, renderLanes) {
               !renderedTail.alternate &&
               !getIsHydrating() // We don't cut it if we're hydrating.
             ) {
-              // We need to delete the row we just rendered.
-              // Reset the effect list to what it was before we rendered this
-              // child. The nested children have already appended themselves.
-              var lastEffect = (workInProgress.lastEffect =
-                renderState.lastEffect); // Remove any effects that were appended after this point.
-
-              if (lastEffect !== null) {
-                lastEffect.nextEffect = null;
-              } // We're done.
-
+              // We're done.
+              bubbleProperties(workInProgress);
               return null;
             }
           } else if (
@@ -15515,10 +16522,6 @@ function completeWork(current, workInProgress, renderLanes) {
             // since we're leaving it behind on this node.
 
             workInProgress.lanes = SomeRetryLane;
-
-            {
-              markSpawnedWork(SomeRetryLane);
-            }
           }
         }
 
@@ -15549,7 +16552,6 @@ function completeWork(current, workInProgress, renderLanes) {
         var next = renderState.tail;
         renderState.rendering = next;
         renderState.tail = next.sibling;
-        renderState.lastEffect = workInProgress.lastEffect;
         renderState.renderingStartTime = now();
         next.sibling = null; // Restore the context.
         // TODO: We can probably just avoid popping it instead and only
@@ -15567,33 +16569,28 @@ function completeWork(current, workInProgress, renderLanes) {
         }
 
         pushSuspenseContext(workInProgress, suspenseContext); // Do a pass over the next row.
+        // Don't bubble properties in this case.
 
         return next;
       }
 
+      bubbleProperties(workInProgress);
       return null;
     }
 
-    case FundamentalComponent: {
-      break;
-    }
-
     case ScopeComponent: {
       break;
     }
 
-    case Block:
-      break;
-
     case OffscreenComponent:
     case LegacyHiddenComponent: {
       popRenderLanes(workInProgress);
+      var _nextState = workInProgress.memoizedState;
+      var nextIsHidden = _nextState !== null;
 
       if (current !== null) {
-        var _nextState = workInProgress.memoizedState;
         var _prevState = current.memoizedState;
         var prevIsHidden = _prevState !== null;
-        var nextIsHidden = _nextState !== null;
 
         if (
           prevIsHidden !== nextIsHidden &&
@@ -15601,6 +16598,14 @@ function completeWork(current, workInProgress, renderLanes) {
         ) {
           workInProgress.flags |= Update;
         }
+      } // Don't bubble properties for hidden children.
+
+      if (
+        !nextIsHidden ||
+        includesSomeLane(subtreeRenderLanes, OffscreenLane) ||
+        (workInProgress.mode & ConcurrentMode) === NoMode
+      ) {
+        bubbleProperties(workInProgress);
       }
 
       return null;
@@ -15692,12 +16697,17 @@ function unwindWork(workInProgress, renderLanes) {
       return null;
 
     case ContextProvider:
-      popProvider(workInProgress);
+      var context = workInProgress.type._context;
+      popProvider(context, workInProgress);
       return null;
 
     case OffscreenComponent:
     case LegacyHiddenComponent:
       popRenderLanes(workInProgress);
+
+      return null;
+
+    case CacheComponent:
       return null;
 
     default:
@@ -15705,7 +16715,7 @@ function unwindWork(workInProgress, renderLanes) {
   }
 }
 
-function unwindInterruptedWork(interruptedWork) {
+function unwindInterruptedWork(interruptedWork, renderLanes) {
   switch (interruptedWork.tag) {
     case ClassComponent: {
       var childContextTypes = interruptedWork.type.childContextTypes;
@@ -15742,1701 +16752,1992 @@ function unwindInterruptedWork(interruptedWork) {
       break;
 
     case ContextProvider:
-      popProvider(interruptedWork);
+      var context = interruptedWork.type._context;
+      popProvider(context, interruptedWork);
       break;
 
     case OffscreenComponent:
     case LegacyHiddenComponent:
       popRenderLanes(interruptedWork);
+
       break;
   }
 }
 
-function createCapturedValue(value, source) {
-  // If the value is an error, call this function immediately after it is thrown
-  // so the stack is accurate.
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
-}
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
 
-if (
-  !(
-    typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog ===
-    "function"
-  )
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+} // Used during the commit phase to track the state of the Offscreen component stack.
+var PossiblyWeakSet = typeof WeakSet === "function" ? WeakSet : Set;
+var nextEffect = null; // Used for Profiling builds to track updaters.
+
+var inProgressLanes = null;
+var inProgressRoot = null;
+
+var callComponentWillUnmountWithTimer = function(current, instance) {
+  instance.props = current.memoizedProps;
+  instance.state = current.memoizedState;
+
+  if (current.mode & ProfileMode) {
+    try {
+      startLayoutEffectTimer();
+      instance.componentWillUnmount();
+    } finally {
+      recordLayoutEffectDuration(current);
+    }
+  } else {
+    instance.componentWillUnmount();
+  }
+}; // Capture errors so they don't interrupt mounting.
+
+function safelyCallComponentWillUnmount(
+  current,
+  nearestMountedAncestor,
+  instance
 ) {
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
+  try {
+    callComponentWillUnmountWithTimer(current, instance);
+  } catch (unmountError) {
+    captureCommitPhaseError(current, nearestMountedAncestor, unmountError);
+  }
+} // Capture errors so they don't interrupt mounting.
+
+function safelyDetachRef(current, nearestMountedAncestor) {
+  var ref = current.ref;
+
+  if (ref !== null) {
+    if (typeof ref === "function") {
+      try {
+        if (
+          enableProfilerTimer &&
+          enableProfilerCommitHooks &&
+          current.mode & ProfileMode
+        ) {
+          try {
+            startLayoutEffectTimer();
+            ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        } else {
+          ref(null);
+        }
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
+      }
+    } else {
+      ref.current = null;
+    }
+  }
 }
 
-function showErrorDialog(boundary, errorInfo) {
-  var capturedError = {
-    componentStack: errorInfo.stack !== null ? errorInfo.stack : "",
-    error: errorInfo.value,
-    errorBoundary:
-      boundary !== null && boundary.tag === ClassComponent
-        ? boundary.stateNode
-        : null
-  };
-  return ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog(
-    capturedError
-  );
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
+  try {
+    destroy();
+  } catch (error) {
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
+  }
+}
+
+var focusedInstanceHandle = null;
+var shouldFireAfterActiveInstanceBlur = false;
+function commitBeforeMutationEffects(root, firstChild) {
+  focusedInstanceHandle = prepareForCommit(root.containerInfo);
+  nextEffect = firstChild;
+  commitBeforeMutationEffects_begin(); // We no longer need to track the active instance fiber
+
+  var shouldFire = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = false;
+  focusedInstanceHandle = null;
+  return shouldFire;
+}
+
+function commitBeforeMutationEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // This phase is only used for beforeActiveInstanceBlur.
+
+    var child = fiber.child;
+
+    if (
+      (fiber.subtreeFlags & BeforeMutationMask) !== NoFlags &&
+      child !== null
+    ) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitBeforeMutationEffects_complete();
+    }
+  }
+}
+
+function commitBeforeMutationEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
+
+    try {
+      commitBeforeMutationEffectsOnFiber(fiber);
+    } catch (error) {
+      captureCommitPhaseError(fiber, fiber.return, error);
+    }
+
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
+
+    nextEffect = fiber.return;
+  }
 }
 
-function logCapturedError(boundary, errorInfo) {
-  try {
-    var logError = showErrorDialog(boundary, errorInfo); // Allow injected showErrorDialog() to prevent default console.error logging.
-    // This enables renderers like ReactNative to better manage redbox behavior.
+function commitBeforeMutationEffectsOnFiber(finishedWork) {
+  var current = finishedWork.alternate;
+  var flags = finishedWork.flags;
+
+  if ((flags & Snapshot) !== NoFlags) {
+    setCurrentFiber(finishedWork);
+
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        break;
+      }
+
+      case ClassComponent: {
+        if (current !== null) {
+          var prevProps = current.memoizedProps;
+          var prevState = current.memoizedState;
+          var instance = finishedWork.stateNode; // We could update instance props and state here,
+          // but instead we rely on them being set during last render.
+          // TODO: revisit this when we implement resuming.
+
+          {
+            if (
+              finishedWork.type === finishedWork.elementType &&
+              !didWarnAboutReassigningProps
+            ) {
+              if (instance.props !== finishedWork.memoizedProps) {
+                error(
+                  "Expected %s props to match memoized props before " +
+                    "getSnapshotBeforeUpdate. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.props`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+
+              if (instance.state !== finishedWork.memoizedState) {
+                error(
+                  "Expected %s state to match memoized state before " +
+                    "getSnapshotBeforeUpdate. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.state`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+            }
+          }
 
-    if (logError === false) {
-      return;
-    }
+          var snapshot = instance.getSnapshotBeforeUpdate(
+            finishedWork.elementType === finishedWork.type
+              ? prevProps
+              : resolveDefaultProps(finishedWork.type, prevProps),
+            prevState
+          );
 
-    var error = errorInfo.value;
+          {
+            var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
 
-    if (true) {
-      var source = errorInfo.source;
-      var stack = errorInfo.stack;
-      var componentStack = stack !== null ? stack : ""; // Browsers support silencing uncaught errors by calling
-      // `preventDefault()` in window `error` handler.
-      // We record this information as an expando on the error.
+            if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
+              didWarnSet.add(finishedWork.type);
 
-      if (error != null && error._suppressLogging) {
-        if (boundary.tag === ClassComponent) {
-          // The error is recoverable and was silenced.
-          // Ignore it and don't print the stack addendum.
-          // This is handy for testing error boundaries without noise.
-          return;
-        } // The error is fatal. Since the silencing might have
-        // been accidental, we'll surface it anyway.
-        // However, the browser would have silenced the original error
-        // so we'll print it first, and then print the stack addendum.
+              error(
+                "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                  "must be returned. You have returned undefined.",
+                getComponentNameFromFiber(finishedWork)
+              );
+            }
+          }
 
-        console["error"](error); // Don't transform to our wrapper
-        // For a more detailed description of this block, see:
-        // https://github.com/facebook/react/pull/13384
+          instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+        }
+
+        break;
       }
 
-      var componentName = source ? getComponentName(source.type) : null;
-      var componentNameMessage = componentName
-        ? "The above error occurred in the <" + componentName + "> component:"
-        : "The above error occurred in one of your React components:";
-      var errorBoundaryMessage;
-      var errorBoundaryName = getComponentName(boundary.type);
+      case HostRoot: {
+        {
+          var root = finishedWork.stateNode;
+          clearContainer(root.containerInfo);
+        }
 
-      if (errorBoundaryName) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-          "Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.";
+        break;
       }
 
-      var combinedMessage =
-        componentNameMessage +
-        "\n" +
-        componentStack +
-        "\n\n" +
-        ("" + errorBoundaryMessage); // In development, we provide our own message with just the component stack.
-      // We don't include the original error message and JS stack because the browser
-      // has already printed it. Even if the application swallows the error, it is still
-      // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+      case IncompleteClassComponent:
+        // Nothing to do for these component types
+        break;
 
-      console["error"](combinedMessage); // Don't transform to our wrapper
-    } else {
-      // In production, we print the error directly.
-      // This will include the message, the JS stack, and anything the browser wants to show.
-      // We pass the error object instead of custom message so that the browser displays the error natively.
-      console["error"](error); // Don't transform to our wrapper
+      default: {
+        {
+          throw Error(
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+        }
+      }
     }
-  } catch (e) {
-    // This method must not throw, or React internal state will get messed up.
-    // If console.error is overridden, or logCapturedError() shows a dialog that throws,
-    // we want to report this error outside of the normal stack as a last resort.
-    // https://github.com/facebook/react/issues/13188
-    setTimeout(function() {
-      throw e;
-    });
+
+    resetCurrentFiber();
   }
 }
 
-var PossiblyWeakMap$1 = typeof WeakMap === "function" ? WeakMap : Map;
-
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane); // Unmount the root by rendering null.
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
+  var updateQueue = finishedWork.updateQueue;
+  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
 
-  update.tag = CaptureUpdate; // Caution: React DevTools currently depends on this property
-  // being called "element".
+  if (lastEffect !== null) {
+    var firstEffect = lastEffect.next;
+    var effect = firstEffect;
 
-  update.payload = {
-    element: null
-  };
-  var error = errorInfo.value;
+    do {
+      if ((effect.tag & flags) === flags) {
+        // Unmount
+        var destroy = effect.destroy;
+        effect.destroy = undefined;
 
-  update.callback = function() {
-    onUncaughtError(error);
-    logCapturedError(fiber, errorInfo);
-  };
+        if (destroy !== undefined) {
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
+        }
+      }
 
-  return update;
+      effect = effect.next;
+    } while (effect !== firstEffect);
+  }
 }
 
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  var update = createUpdate(NoTimestamp, lane);
-  update.tag = CaptureUpdate;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-
-  if (typeof getDerivedStateFromError === "function") {
-    var error$1 = errorInfo.value;
-
-    update.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error$1);
-    };
-  }
+function commitHookEffectListMount(tag, finishedWork) {
+  var updateQueue = finishedWork.updateQueue;
+  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
 
-  var inst = fiber.stateNode;
+  if (lastEffect !== null) {
+    var firstEffect = lastEffect.next;
+    var effect = firstEffect;
 
-  if (inst !== null && typeof inst.componentDidCatch === "function") {
-    update.callback = function callback() {
-      {
-        markFailedErrorBoundaryForHotReloading(fiber);
-      }
+    do {
+      if ((effect.tag & tag) === tag) {
+        // Mount
+        var create = effect.create;
+        effect.destroy = create();
 
-      if (typeof getDerivedStateFromError !== "function") {
-        // To preserve the preexisting retry behavior of error boundaries,
-        // we keep track of which ones already failed during this batch.
-        // This gets reset before we yield back to the browser.
-        // TODO: Warn in strict mode if getDerivedStateFromError is
-        // not defined.
-        markLegacyErrorBoundaryAsFailed(this); // Only log here if componentDidCatch is the only error boundary method defined
+        {
+          var destroy = effect.destroy;
 
-        logCapturedError(fiber, errorInfo);
-      }
+          if (destroy !== undefined && typeof destroy !== "function") {
+            var addendum = void 0;
 
-      var error$1 = errorInfo.value;
-      var stack = errorInfo.stack;
-      this.componentDidCatch(error$1, {
-        componentStack: stack !== null ? stack : ""
-      });
+            if (destroy === null) {
+              addendum =
+                " You returned null. If your effect does not require clean " +
+                "up, return undefined (or nothing).";
+            } else if (typeof destroy.then === "function") {
+              addendum =
+                "\n\nIt looks like you wrote useEffect(async () => ...) or returned a Promise. " +
+                "Instead, write the async function inside your effect " +
+                "and call it immediately:\n\n" +
+                "useEffect(() => {\n" +
+                "  async function fetchData() {\n" +
+                "    // You can await here\n" +
+                "    const response = await MyAPI.getData(someId);\n" +
+                "    // ...\n" +
+                "  }\n" +
+                "  fetchData();\n" +
+                "}, [someId]); // Or [] if effect doesn't need props or state\n\n" +
+                "Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching";
+            } else {
+              addendum = " You returned: " + destroy;
+            }
 
-      {
-        if (typeof getDerivedStateFromError !== "function") {
-          // If componentDidCatch is the only error boundary method defined,
-          // then it needs to call setState to recover from errors.
-          // If no state update is scheduled then the boundary will swallow the error.
-          if (!includesSomeLane(fiber.lanes, SyncLane)) {
             error(
-              "%s: Error boundaries should implement getDerivedStateFromError(). " +
-                "In that method, return a state update to display an error message or fallback UI.",
-              getComponentName(fiber.type) || "Unknown"
+              "An effect function must not return anything besides a function, " +
+                "which is used for clean-up.%s",
+              addendum
             );
           }
         }
       }
-    };
-  } else {
-    update.callback = function() {
-      markFailedErrorBoundaryForHotReloading(fiber);
-    };
-  }
-
-  return update;
-}
-
-function attachPingListener(root, wakeable, lanes) {
-  // Attach a listener to the promise to "ping" the root and retry. But only if
-  // one does not already exist for the lanes we're currently rendering (which
-  // acts like a "thread ID" here).
-  var pingCache = root.pingCache;
-  var threadIDs;
-
-  if (pingCache === null) {
-    pingCache = root.pingCache = new PossiblyWeakMap$1();
-    threadIDs = new Set();
-    pingCache.set(wakeable, threadIDs);
-  } else {
-    threadIDs = pingCache.get(wakeable);
-
-    if (threadIDs === undefined) {
-      threadIDs = new Set();
-      pingCache.set(wakeable, threadIDs);
-    }
-  }
 
-  if (!threadIDs.has(lanes)) {
-    // Memoize using the thread ID to prevent redundant listeners.
-    threadIDs.add(lanes);
-    var ping = pingSuspendedRoot.bind(null, root, wakeable, lanes);
-    wakeable.then(ping, ping);
+      effect = effect.next;
+    } while (effect !== firstEffect);
   }
 }
 
-function throwException(
-  root,
-  returnFiber,
-  sourceFiber,
-  value,
-  rootRenderLanes
-) {
-  // The source fiber did not complete.
-  sourceFiber.flags |= Incomplete; // Its effect list is no longer valid.
+function commitPassiveEffectDurations(finishedRoot, finishedWork) {
+  {
+    // Only Profilers with work in their subtree will have an Update effect scheduled.
+    if ((finishedWork.flags & Update) !== NoFlags) {
+      switch (finishedWork.tag) {
+        case Profiler: {
+          var passiveEffectDuration =
+            finishedWork.stateNode.passiveEffectDuration;
+          var _finishedWork$memoize = finishedWork.memoizedProps,
+            id = _finishedWork$memoize.id,
+            onPostCommit = _finishedWork$memoize.onPostCommit; // This value will still reflect the previous commit phase.
+          // It does not get reset until the start of the next commit phase.
+
+          var commitTime = getCommitTime();
+          var phase = finishedWork.alternate === null ? "mount" : "update";
 
-  sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+          {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
 
-  if (
-    value !== null &&
-    typeof value === "object" &&
-    typeof value.then === "function"
-  ) {
-    // This is a wakeable.
-    var wakeable = value;
+          if (typeof onPostCommit === "function") {
+            onPostCommit(id, phase, passiveEffectDuration, commitTime);
+          } // Bubble times to the next nearest ancestor Profiler.
+          // After we process that Profiler, we'll bubble further up.
 
-    if ((sourceFiber.mode & BlockingMode) === NoMode) {
-      // Reset the memoizedState to what it was before we attempted
-      // to render it.
-      var currentSource = sourceFiber.alternate;
+          var parentFiber = finishedWork.return;
 
-      if (currentSource) {
-        sourceFiber.updateQueue = currentSource.updateQueue;
-        sourceFiber.memoizedState = currentSource.memoizedState;
-        sourceFiber.lanes = currentSource.lanes;
-      } else {
-        sourceFiber.updateQueue = null;
-        sourceFiber.memoizedState = null;
-      }
-    }
+          outer: while (parentFiber !== null) {
+            switch (parentFiber.tag) {
+              case HostRoot:
+                var root = parentFiber.stateNode;
+                root.passiveEffectDuration += passiveEffectDuration;
+                break outer;
 
-    var hasInvisibleParentBoundary = hasSuspenseContext(
-      suspenseStackCursor.current,
-      InvisibleParentSuspenseContext
-    ); // Schedule the nearest Suspense to re-render the timed out view.
+              case Profiler:
+                var parentStateNode = parentFiber.stateNode;
+                parentStateNode.passiveEffectDuration += passiveEffectDuration;
+                break outer;
+            }
 
-    var _workInProgress = returnFiber;
+            parentFiber = parentFiber.return;
+          }
 
-    do {
-      if (
-        _workInProgress.tag === SuspenseComponent &&
-        shouldCaptureSuspense(_workInProgress, hasInvisibleParentBoundary)
-      ) {
-        // Found the nearest boundary.
-        // Stash the promise on the boundary fiber. If the boundary times out, we'll
-        // attach another listener to flip the boundary back to its normal state.
-        var wakeables = _workInProgress.updateQueue;
+          break;
+        }
+      }
+    }
+  }
+}
 
-        if (wakeables === null) {
-          var updateQueue = new Set();
-          updateQueue.add(wakeable);
-          _workInProgress.updateQueue = updateQueue;
+function commitLayoutEffectOnFiber(
+  finishedRoot,
+  current,
+  finishedWork,
+  committedLanes
+) {
+  if ((finishedWork.flags & (Update | Callback)) !== NoFlags) {
+    switch (finishedWork.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent: {
+        // At this point layout effects have already been destroyed (during mutation phase).
+        // This is done to prevent sibling component effects from interfering with each other,
+        // e.g. a destroy function in one component should never override a ref set
+        // by a create function in another component during the same commit.
+        if (finishedWork.mode & ProfileMode) {
+          try {
+            startLayoutEffectTimer();
+            commitHookEffectListMount(Layout | HasEffect, finishedWork);
+          } finally {
+            recordLayoutEffectDuration(finishedWork);
+          }
         } else {
-          wakeables.add(wakeable);
-        } // If the boundary is outside of blocking mode, we should *not*
-        // suspend the commit. Pretend as if the suspended component rendered
-        // null and keep rendering. In the commit phase, we'll schedule a
-        // subsequent synchronous update to re-render the Suspense.
-        //
-        // Note: It doesn't matter whether the component that suspended was
-        // inside a blocking mode tree. If the Suspense is outside of it, we
-        // should *not* suspend the commit.
+          commitHookEffectListMount(Layout | HasEffect, finishedWork);
+        }
 
-        if ((_workInProgress.mode & BlockingMode) === NoMode) {
-          _workInProgress.flags |= DidCapture;
-          sourceFiber.flags |= ForceUpdateForLegacySuspense; // We're going to commit this fiber even though it didn't complete.
-          // But we shouldn't call any lifecycle methods or callbacks. Remove
-          // all lifecycle effect tags.
+        break;
+      }
 
-          sourceFiber.flags &= ~(LifecycleEffectMask | Incomplete);
+      case ClassComponent: {
+        var instance = finishedWork.stateNode;
 
-          if (sourceFiber.tag === ClassComponent) {
-            var currentSourceFiber = sourceFiber.alternate;
+        if (finishedWork.flags & Update) {
+          if (current === null) {
+            // We could update instance props and state here,
+            // but instead we rely on them being set during last render.
+            // TODO: revisit this when we implement resuming.
+            {
+              if (
+                finishedWork.type === finishedWork.elementType &&
+                !didWarnAboutReassigningProps
+              ) {
+                if (instance.props !== finishedWork.memoizedProps) {
+                  error(
+                    "Expected %s props to match memoized props before " +
+                      "componentDidMount. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.props`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
 
-            if (currentSourceFiber === null) {
-              // This is a new mount. Change the tag so it's not mistaken for a
-              // completed class component. For example, we should not call
-              // componentWillUnmount if it is deleted.
-              sourceFiber.tag = IncompleteClassComponent;
+                if (instance.state !== finishedWork.memoizedState) {
+                  error(
+                    "Expected %s state to match memoized state before " +
+                      "componentDidMount. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.state`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
+              }
+            }
+
+            if (finishedWork.mode & ProfileMode) {
+              try {
+                startLayoutEffectTimer();
+                instance.componentDidMount();
+              } finally {
+                recordLayoutEffectDuration(finishedWork);
+              }
             } else {
-              // When we try rendering again, we should not reuse the current fiber,
-              // since it's known to be in an inconsistent state. Use a force update to
-              // prevent a bail out.
-              var update = createUpdate(NoTimestamp, SyncLane);
-              update.tag = ForceUpdate;
-              enqueueUpdate(sourceFiber, update);
+              instance.componentDidMount();
             }
-          } // The source fiber did not complete. Mark it with Sync priority to
-          // indicate that it still has pending work.
+          } else {
+            var prevProps =
+              finishedWork.elementType === finishedWork.type
+                ? current.memoizedProps
+                : resolveDefaultProps(finishedWork.type, current.memoizedProps);
+            var prevState = current.memoizedState; // We could update instance props and state here,
+            // but instead we rely on them being set during last render.
+            // TODO: revisit this when we implement resuming.
 
-          sourceFiber.lanes = mergeLanes(sourceFiber.lanes, SyncLane); // Exit without suspending.
+            {
+              if (
+                finishedWork.type === finishedWork.elementType &&
+                !didWarnAboutReassigningProps
+              ) {
+                if (instance.props !== finishedWork.memoizedProps) {
+                  error(
+                    "Expected %s props to match memoized props before " +
+                      "componentDidUpdate. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.props`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
 
-          return;
-        } // Confirmed that the boundary is in a concurrent mode tree. Continue
-        // with the normal suspend path.
-        //
-        // After this we'll use a set of heuristics to determine whether this
-        // render pass will run to completion or restart or "suspend" the commit.
-        // The actual logic for this is spread out in different places.
-        //
-        // This first principle is that if we're going to suspend when we complete
-        // a root, then we should also restart if we get an update or ping that
-        // might unsuspend it, and vice versa. The only reason to suspend is
-        // because you think you might want to restart before committing. However,
-        // it doesn't make sense to restart only while in the period we're suspended.
-        //
-        // Restarting too aggressively is also not good because it starves out any
-        // intermediate loading state. So we use heuristics to determine when.
-        // Suspense Heuristics
-        //
-        // If nothing threw a Promise or all the same fallbacks are already showing,
-        // then don't suspend/restart.
-        //
-        // If this is an initial render of a new tree of Suspense boundaries and
-        // those trigger a fallback, then don't suspend/restart. We want to ensure
-        // that we can show the initial loading state as quickly as possible.
-        //
-        // If we hit a "Delayed" case, such as when we'd switch from content back into
-        // a fallback, then we should always suspend/restart. Transitions apply
-        // to this case. If none is defined, JND is used instead.
-        //
-        // If we're already showing a fallback and it gets "retried", allowing us to show
-        // another level, but there's still an inner boundary that would show a fallback,
-        // then we suspend/restart for 500ms since the last time we showed a fallback
-        // anywhere in the tree. This effectively throttles progressive loading into a
-        // consistent train of commits. This also gives us an opportunity to restart to
-        // get to the completed state slightly earlier.
-        //
-        // If there's ambiguity due to batching it's resolved in preference of:
-        // 1) "delayed", 2) "initial render", 3) "retry".
-        //
-        // We want to ensure that a "busy" state doesn't get force committed. We want to
-        // ensure that new initial loading states can commit as soon as possible.
+                if (instance.state !== finishedWork.memoizedState) {
+                  error(
+                    "Expected %s state to match memoized state before " +
+                      "componentDidUpdate. " +
+                      "This might either be because of a bug in React, or because " +
+                      "a component reassigns its own `this.state`. " +
+                      "Please file an issue.",
+                    getComponentNameFromFiber(finishedWork) || "instance"
+                  );
+                }
+              }
+            }
 
-        attachPingListener(root, wakeable, rootRenderLanes);
-        _workInProgress.flags |= ShouldCapture;
-        _workInProgress.lanes = rootRenderLanes;
-        return;
-      } // This boundary already captured during this render. Continue to the next
-      // boundary.
+            if (finishedWork.mode & ProfileMode) {
+              try {
+                startLayoutEffectTimer();
+                instance.componentDidUpdate(
+                  prevProps,
+                  prevState,
+                  instance.__reactInternalSnapshotBeforeUpdate
+                );
+              } finally {
+                recordLayoutEffectDuration(finishedWork);
+              }
+            } else {
+              instance.componentDidUpdate(
+                prevProps,
+                prevState,
+                instance.__reactInternalSnapshotBeforeUpdate
+              );
+            }
+          }
+        } // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
 
-      _workInProgress = _workInProgress.return;
-    } while (_workInProgress !== null); // No boundary was found. Fallthrough to error mode.
-    // TODO: Use invariant so the message is stripped in prod?
+        var updateQueue = finishedWork.updateQueue;
 
-    value = new Error(
-      (getComponentName(sourceFiber.type) || "A React component") +
-        " suspended while rendering, but no fallback UI was specified.\n" +
-        "\n" +
-        "Add a <Suspense fallback=...> component higher in the tree to " +
-        "provide a loading indicator or placeholder to display."
-    );
-  } // We didn't find a boundary that could handle this type of exception. Start
-  // over and traverse parent path again, this time treating the exception
-  // as an error.
+        if (updateQueue !== null) {
+          {
+            if (
+              finishedWork.type === finishedWork.elementType &&
+              !didWarnAboutReassigningProps
+            ) {
+              if (instance.props !== finishedWork.memoizedProps) {
+                error(
+                  "Expected %s props to match memoized props before " +
+                    "processing the update queue. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.props`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
 
-  renderDidError();
-  value = createCapturedValue(value, sourceFiber);
-  var workInProgress = returnFiber;
+              if (instance.state !== finishedWork.memoizedState) {
+                error(
+                  "Expected %s state to match memoized state before " +
+                    "processing the update queue. " +
+                    "This might either be because of a bug in React, or because " +
+                    "a component reassigns its own `this.state`. " +
+                    "Please file an issue.",
+                  getComponentNameFromFiber(finishedWork) || "instance"
+                );
+              }
+            }
+          } // We could update instance props and state here,
+          // but instead we rely on them being set during last render.
+          // TODO: revisit this when we implement resuming.
+
+          commitUpdateQueue(finishedWork, updateQueue, instance);
+        }
+
+        break;
+      }
 
-  do {
-    switch (workInProgress.tag) {
       case HostRoot: {
-        var _errorInfo = value;
-        workInProgress.flags |= ShouldCapture;
-        var lane = pickArbitraryLane(rootRenderLanes);
-        workInProgress.lanes = mergeLanes(workInProgress.lanes, lane);
+        // TODO: I think this is now always non-null by the time it reaches the
+        // commit phase. Consider removing the type check.
+        var _updateQueue = finishedWork.updateQueue;
+
+        if (_updateQueue !== null) {
+          var _instance = null;
+
+          if (finishedWork.child !== null) {
+            switch (finishedWork.child.tag) {
+              case HostComponent:
+                _instance = getPublicInstance(finishedWork.child.stateNode);
+                break;
+
+              case ClassComponent:
+                _instance = finishedWork.child.stateNode;
+                break;
+            }
+          }
 
-        var _update = createRootErrorUpdate(workInProgress, _errorInfo, lane);
+          commitUpdateQueue(finishedWork, _updateQueue, _instance);
+        }
 
-        enqueueCapturedUpdate(workInProgress, _update);
-        return;
+        break;
       }
 
-      case ClassComponent:
-        // Capture and retry
-        var errorInfo = value;
-        var ctor = workInProgress.type;
-        var instance = workInProgress.stateNode;
+      case HostComponent: {
+        var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
+        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
+        // These effects should only be committed when components are first mounted,
+        // aka when there is no current/alternate.
 
-        if (
-          (workInProgress.flags & DidCapture) === NoFlags &&
-          (typeof ctor.getDerivedStateFromError === "function" ||
-            (instance !== null &&
-              typeof instance.componentDidCatch === "function" &&
-              !isAlreadyFailedLegacyErrorBoundary(instance)))
-        ) {
-          workInProgress.flags |= ShouldCapture;
+        if (current === null && finishedWork.flags & Update) {
+          var type = finishedWork.type;
+          var props = finishedWork.memoizedProps;
+        }
+
+        break;
+      }
+
+      case HostText: {
+        // We have no life-cycles associated with text.
+        break;
+      }
+
+      case HostPortal: {
+        // We have no life-cycles associated with portals.
+        break;
+      }
+
+      case Profiler: {
+        {
+          var _finishedWork$memoize2 = finishedWork.memoizedProps,
+            onCommit = _finishedWork$memoize2.onCommit,
+            onRender = _finishedWork$memoize2.onRender;
+          var effectDuration = finishedWork.stateNode.effectDuration;
+          var commitTime = getCommitTime();
+          var phase = current === null ? "mount" : "update";
+
+          {
+            if (isCurrentUpdateNested()) {
+              phase = "nested-update";
+            }
+          }
+
+          if (typeof onRender === "function") {
+            onRender(
+              finishedWork.memoizedProps.id,
+              phase,
+              finishedWork.actualDuration,
+              finishedWork.treeBaseDuration,
+              finishedWork.actualStartTime,
+              commitTime
+            );
+          }
 
-          var _lane = pickArbitraryLane(rootRenderLanes);
+          {
+            if (typeof onCommit === "function") {
+              onCommit(
+                finishedWork.memoizedProps.id,
+                phase,
+                effectDuration,
+                commitTime
+              );
+            } // Schedule a passive effect for this Profiler to call onPostCommit hooks.
+            // This effect should be scheduled even if there is no onPostCommit callback for this Profiler,
+            // because the effect is also where times bubble to parent Profilers.
+
+            enqueuePendingPassiveProfilerEffect(finishedWork); // Propagate layout effect durations to the next nearest Profiler ancestor.
+            // Do not reset these values until the next render so DevTools has a chance to read them first.
+
+            var parentFiber = finishedWork.return;
+
+            outer: while (parentFiber !== null) {
+              switch (parentFiber.tag) {
+                case HostRoot:
+                  var root = parentFiber.stateNode;
+                  root.effectDuration += effectDuration;
+                  break outer;
+
+                case Profiler:
+                  var parentStateNode = parentFiber.stateNode;
+                  parentStateNode.effectDuration += effectDuration;
+                  break outer;
+              }
 
-          workInProgress.lanes = mergeLanes(workInProgress.lanes, _lane); // Schedule the error boundary to re-render using updated state
+              parentFiber = parentFiber.return;
+            }
+          }
+        }
 
-          var _update2 = createClassErrorUpdate(
-            workInProgress,
-            errorInfo,
-            _lane
-          );
+        break;
+      }
 
-          enqueueCapturedUpdate(workInProgress, _update2);
-          return;
-        }
+      case SuspenseComponent: {
+        break;
+      }
 
+      case SuspenseListComponent:
+      case IncompleteClassComponent:
+      case ScopeComponent:
+      case OffscreenComponent:
+      case LegacyHiddenComponent:
         break;
+
+      default: {
+        throw Error(
+          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
     }
+  }
 
-    workInProgress = workInProgress.return;
-  } while (workInProgress !== null);
+  {
+    if (finishedWork.flags & Ref) {
+      commitAttachRef(finishedWork);
+    }
+  }
 }
 
-var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+function hideOrUnhideAllChildren(finishedWork, isHidden) {
+  // Suspense layout effects semantics don't change for legacy roots.
+  var isModernRoot = (finishedWork.mode & ConcurrentMode) !== NoMode;
+  var current = finishedWork.alternate;
+  var wasHidden = current !== null && current.memoizedState !== null; // Only hide or unhide the top-most host nodes.
 
-{
-  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
-}
+  var hostSubtreeRoot = null;
 
-var PossiblyWeakSet = typeof WeakSet === "function" ? WeakSet : Set;
+  {
+    // We only have the top Fiber that was inserted but we need to recurse down its
+    // children to find all the terminal nodes.
+    var node = finishedWork;
 
-var callComponentWillUnmountWithTimer = function(current, instance) {
-  instance.props = current.memoizedProps;
-  instance.state = current.memoizedState;
+    while (true) {
+      if (node.tag === HostComponent) {
+        if (hostSubtreeRoot === null) {
+          hostSubtreeRoot = node;
+          var instance = node.stateNode;
 
-  {
-    instance.componentWillUnmount();
-  }
-}; // Capture errors so they don't interrupt unmounting.
+          if (isHidden) {
+            hideInstance(instance);
+          } else {
+            unhideInstance(node.stateNode, node.memoizedProps);
+          }
+        }
+      } else if (node.tag === HostText) {
+        if (hostSubtreeRoot === null) {
+          var _instance3 = node.stateNode;
 
-function safelyCallComponentWillUnmount(current, instance) {
-  {
-    invokeGuardedCallback(
-      null,
-      callComponentWillUnmountWithTimer,
-      null,
-      current,
-      instance
-    );
+          if (isHidden) {
+            hideTextInstance();
+          } else {
+            unhideTextInstance(_instance3, node.memoizedProps);
+          }
+        }
+      } else if (
+        (node.tag === OffscreenComponent ||
+          node.tag === LegacyHiddenComponent) &&
+        node.memoizedState !== null &&
+        node !== finishedWork
+      );
+      else if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
+      }
+
+      if (node === finishedWork) {
+        return;
+      }
+
+      while (node.sibling === null) {
+        if (node.return === null || node.return === finishedWork) {
+          return;
+        }
+
+        if (hostSubtreeRoot === node) {
+          hostSubtreeRoot = null;
+        }
+
+        node = node.return;
+      }
 
-    if (hasCaughtError()) {
-      var unmountError = clearCaughtError();
-      captureCommitPhaseError(current, unmountError);
+      if (hostSubtreeRoot === node) {
+        hostSubtreeRoot = null;
+      }
+
+      node.sibling.return = node.return;
+      node = node.sibling;
     }
   }
 }
 
-function safelyDetachRef(current) {
-  var ref = current.ref;
+function commitAttachRef(finishedWork) {
+  var ref = finishedWork.ref;
 
   if (ref !== null) {
-    if (typeof ref === "function") {
-      {
-        {
-          invokeGuardedCallback(null, ref, null, null);
-        }
+    var instance = finishedWork.stateNode;
+    var instanceToUse;
+
+    switch (finishedWork.tag) {
+      case HostComponent:
+        instanceToUse = getPublicInstance(instance);
+        break;
+
+      default:
+        instanceToUse = instance;
+    } // Moved outside to ensure DCE works with this flag
 
-        if (hasCaughtError()) {
-          var refError = clearCaughtError();
-          captureCommitPhaseError(current, refError);
+    if (typeof ref === "function") {
+      if (finishedWork.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          ref(instanceToUse);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
         }
+      } else {
+        ref(instanceToUse);
       }
     } else {
-      ref.current = null;
+      {
+        if (!ref.hasOwnProperty("current")) {
+          error(
+            "Unexpected ref object provided for %s. " +
+              "Use either a ref-setter function or React.createRef().",
+            getComponentNameFromFiber(finishedWork)
+          );
+        }
+      }
+
+      ref.current = instanceToUse;
     }
   }
 }
 
-function safelyCallDestroy(current, destroy) {
-  {
-    invokeGuardedCallback(null, destroy, null);
+function commitDetachRef(current) {
+  var currentRef = current.ref;
 
-    if (hasCaughtError()) {
-      var error = clearCaughtError();
-      captureCommitPhaseError(current, error);
+  if (currentRef !== null) {
+    if (typeof currentRef === "function") {
+      if (current.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          currentRef(null);
+        } finally {
+          recordLayoutEffectDuration(current);
+        }
+      } else {
+        currentRef(null);
+      }
+    } else {
+      currentRef.current = null;
     }
   }
-}
+} // User-originating errors (lifecycles and refs) should not interrupt
+// deletion, so don't let them throw. Host-originating errors should
+// interrupt deletion, so it's okay
 
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
+function commitUnmount(finishedRoot, current, nearestMountedAncestor) {
+  onCommitUnmount(current);
+
+  switch (current.tag) {
     case FunctionComponent:
     case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
-      return;
-    }
+    case MemoComponent:
+    case SimpleMemoComponent: {
+      var updateQueue = current.updateQueue;
 
-    case ClassComponent: {
-      if (finishedWork.flags & Snapshot) {
-        if (current !== null) {
-          var prevProps = current.memoizedProps;
-          var prevState = current.memoizedState;
-          var instance = finishedWork.stateNode; // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
+      if (updateQueue !== null) {
+        var lastEffect = updateQueue.lastEffect;
 
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "getSnapshotBeforeUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+        if (lastEffect !== null) {
+          var firstEffect = lastEffect.next;
+          var effect = firstEffect;
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "getSnapshotBeforeUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
+          do {
+            var _effect = effect,
+              destroy = _effect.destroy,
+              tag = _effect.tag;
+
+            if (destroy !== undefined) {
+              if ((tag & Layout) !== NoFlags$1) {
+                if (current.mode & ProfileMode) {
+                  startLayoutEffectTimer();
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
+                  recordLayoutEffectDuration(current);
+                } else {
+                  safelyCallDestroy(current, nearestMountedAncestor, destroy);
+                }
               }
             }
-          }
 
-          var snapshot = instance.getSnapshotBeforeUpdate(
-            finishedWork.elementType === finishedWork.type
-              ? prevProps
-              : resolveDefaultProps(finishedWork.type, prevProps),
-            prevState
-          );
-
-          {
-            var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+            effect = effect.next;
+          } while (effect !== firstEffect);
+        }
+      }
 
-            if (snapshot === undefined && !didWarnSet.has(finishedWork.type)) {
-              didWarnSet.add(finishedWork.type);
+      return;
+    }
 
-              error(
-                "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
-                  "must be returned. You have returned undefined.",
-                getComponentName(finishedWork.type)
-              );
-            }
-          }
+    case ClassComponent: {
+      safelyDetachRef(current, nearestMountedAncestor);
+      var instance = current.stateNode;
 
-          instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-        }
+      if (typeof instance.componentWillUnmount === "function") {
+        safelyCallComponentWillUnmount(
+          current,
+          nearestMountedAncestor,
+          instance
+        );
       }
 
       return;
     }
 
-    case HostRoot: {
+    case HostComponent: {
+      safelyDetachRef(current, nearestMountedAncestor);
+      return;
+    }
+
+    case HostPortal: {
+      // TODO: this is recursive.
+      // We are also not using this parent because
+      // the portal will get pushed immediately.
       {
-        if (finishedWork.flags & Snapshot) {
-          var root = finishedWork.stateNode;
-          clearContainer(root.containerInfo);
-        }
+        unmountHostComponents(finishedRoot, current, nearestMountedAncestor);
       }
 
       return;
     }
 
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case IncompleteClassComponent:
-      // Nothing to do for these component types
+    case DehydratedFragment: {
       return;
-  }
+    }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    case ScopeComponent: {
+      return;
+    }
   }
 }
 
-function commitHookEffectListUnmount(tag, finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function commitNestedUnmounts(finishedRoot, root, nearestMountedAncestor) {
+  // While we're inside a removed host node we don't want to call
+  // removeChild on the inner nodes because they're removed by the top
+  // call anyway. We also want to call componentWillUnmount on all
+  // composites before this host node is removed from the tree. Therefore
+  // we do an inner loop while we're still inside the host node.
+  var node = root;
+
+  while (true) {
+    commitUnmount(finishedRoot, node, nearestMountedAncestor); // Visit children because they may contain more composite or host nodes.
+    // Skip portals because commitUnmount() currently visits them recursively.
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+    if (
+      node.child !== null && // If we use mutation we drill down into portals using commitUnmount above.
+      // If we don't use mutation we drill down into portals here instead.
+      node.tag !== HostPortal
+    ) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
 
-    do {
-      if ((effect.tag & tag) === tag) {
-        // Unmount
-        var destroy = effect.destroy;
-        effect.destroy = undefined;
+    if (node === root) {
+      return;
+    }
 
-        if (destroy !== undefined) {
-          destroy();
-        }
+    while (node.sibling === null) {
+      if (node.return === null || node.return === root) {
+        return;
       }
 
-      effect = effect.next;
-    } while (effect !== firstEffect);
+      node = node.return;
+    }
+
+    node.sibling.return = node.return;
+    node = node.sibling;
   }
 }
 
-function commitHookEffectListMount(tag, finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
+function detachFiberMutation(fiber) {
+  // Cut off the return pointer to disconnect it from the tree.
+  // This enables us to detect and warn against state updates on an unmounted component.
+  // It also prevents events from bubbling from within disconnected components.
+  //
+  // Ideally, we should also clear the child pointer of the parent alternate to let this
+  // get GC:ed but we don't know which for sure which parent is the current
+  // one so we'll settle for GC:ing the subtree of this child.
+  // This child itself will be GC:ed when the parent updates the next time.
+  //
+  // Note that we can't clear child or sibling pointers yet.
+  // They're needed for passive effects and for findDOMNode.
+  // We defer those fields, and all other cleanup, to the passive phase (see detachFiberAfterEffects).
+  //
+  // Don't reset the alternate yet, either. We need that so we can detach the
+  // alternate's fields in the passive phase. Clearing the return pointer is
+  // sufficient for findDOMNode semantics.
+  var alternate = fiber.alternate;
 
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+  if (alternate !== null) {
+    alternate.return = null;
+  }
 
-    do {
-      if ((effect.tag & tag) === tag) {
-        // Mount
-        var create = effect.create;
-        effect.destroy = create();
+  fiber.return = null;
+}
 
-        {
-          var destroy = effect.destroy;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
 
-          if (destroy !== undefined && typeof destroy !== "function") {
-            var addendum = void 0;
+  if (alternate !== null) {
+    fiber.alternate = null;
+    detachFiberAfterEffects(alternate);
+  } // Note: Defensively using negation instead of < in case
+  // `deletedTreeCleanUpLevel` is undefined.
 
-            if (destroy === null) {
-              addendum =
-                " You returned null. If your effect does not require clean " +
-                "up, return undefined (or nothing).";
-            } else if (typeof destroy.then === "function") {
-              addendum =
-                "\n\nIt looks like you wrote useEffect(async () => ...) or returned a Promise. " +
-                "Instead, write the async function inside your effect " +
-                "and call it immediately:\n\n" +
-                "useEffect(() => {\n" +
-                "  async function fetchData() {\n" +
-                "    // You can await here\n" +
-                "    const response = await MyAPI.getData(someId);\n" +
-                "    // ...\n" +
-                "  }\n" +
-                "  fetchData();\n" +
-                "}, [someId]); // Or [] if effect doesn't need props or state\n\n" +
-                "Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching";
-            } else {
-              addendum = " You returned: " + destroy;
-            }
+  {
+    // Clear cyclical Fiber fields. This level alone is designed to roughly
+    // approximate the planned Fiber refactor. In that world, `setState` will be
+    // bound to a special "instance" object instead of a Fiber. The Instance
+    // object will not have any of these fields. It will only be connected to
+    // the fiber tree via a single link at the root. So if this level alone is
+    // sufficient to fix memory issues, that bodes well for our plans.
+    fiber.child = null;
+    fiber.deletions = null;
+    fiber.sibling = null; // The `stateNode` is cyclical because on host nodes it points to the host
+    // tree, which has its own pointers to children, parents, and siblings.
+    // The other host nodes also point back to fibers, so we should detach that
+    // one, too.
+
+    if (fiber.tag === HostComponent) {
+      var hostInstance = fiber.stateNode;
+    }
+
+    fiber.stateNode = null; // I'm intentionally not clearing the `return` field in this level. We
+    // already disconnect the `return` pointer at the root of the deleted
+    // subtree (in `detachFiberMutation`). Besides, `return` by itself is not
+    // cyclical — it's only cyclical when combined with `child`, `sibling`, and
+    // `alternate`. But we'll clear it in the next level anyway, just in case.
 
-            error(
-              "An effect function must not return anything besides a function, " +
-                "which is used for clean-up.%s",
-              addendum
-            );
-          }
-        }
-      }
+    {
+      fiber._debugOwner = null;
+    }
 
-      effect = effect.next;
-    } while (effect !== firstEffect);
+    {
+      // Theoretically, nothing in here should be necessary, because we already
+      // disconnected the fiber from the tree. So even if something leaks this
+      // particular fiber, it won't leak anything else
+      //
+      // The purpose of this branch is to be super aggressive so we can measure
+      // if there's any difference in memory impact. If there is, that could
+      // indicate a React leak we don't know about.
+      fiber.return = null;
+      fiber.dependencies = null;
+      fiber.memoizedProps = null;
+      fiber.memoizedState = null;
+      fiber.pendingProps = null;
+      fiber.stateNode = null; // TODO: Move to `commitPassiveUnmountInsideDeletedTreeOnFiber` instead.
+
+      fiber.updateQueue = null;
+    }
   }
 }
 
-function schedulePassiveEffects(finishedWork) {
-  var updateQueue = finishedWork.updateQueue;
-  var lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
-
-  if (lastEffect !== null) {
-    var firstEffect = lastEffect.next;
-    var effect = firstEffect;
+function getHostParentFiber(fiber) {
+  var parent = fiber.return;
 
-    do {
-      var _effect = effect,
-        next = _effect.next,
-        tag = _effect.tag;
+  while (parent !== null) {
+    if (isHostParent(parent)) {
+      return parent;
+    }
 
-      if ((tag & Passive$1) !== NoFlags$1 && (tag & HasEffect) !== NoFlags$1) {
-        enqueuePendingPassiveHookEffectUnmount(finishedWork, effect);
-        enqueuePendingPassiveHookEffectMount(finishedWork, effect);
-      }
+    parent = parent.return;
+  }
 
-      effect = next;
-    } while (effect !== firstEffect);
+  {
+    throw Error(
+      "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
+    );
   }
 }
 
-function commitLifeCycles(finishedRoot, current, finishedWork, committedLanes) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case SimpleMemoComponent:
-    case Block: {
-      // At this point layout effects have already been destroyed (during mutation phase).
-      // This is done to prevent sibling component effects from interfering with each other,
-      // e.g. a destroy function in one component should never override a ref set
-      // by a create function in another component during the same commit.
-      {
-        commitHookEffectListMount(Layout | HasEffect, finishedWork);
-      }
+function isHostParent(fiber) {
+  return (
+    fiber.tag === HostComponent ||
+    fiber.tag === HostRoot ||
+    fiber.tag === HostPortal
+  );
+}
 
-      schedulePassiveEffects(finishedWork);
-      return;
-    }
+function getHostSibling(fiber) {
+  // We're going to search forward into the tree until we find a sibling host
+  // node. Unfortunately, if multiple insertions are done in a row we have to
+  // search past them. This leads to exponential search for the next sibling.
+  // TODO: Find a more efficient way to do this.
+  var node = fiber;
 
-    case ClassComponent: {
-      var instance = finishedWork.stateNode;
+  siblings: while (true) {
+    // If we didn't find anything, let's try the next sibling.
+    while (node.sibling === null) {
+      if (node.return === null || isHostParent(node.return)) {
+        // If we pop out of the root or hit the parent the fiber we are the
+        // last sibling.
+        return null;
+      }
 
-      if (finishedWork.flags & Update) {
-        if (current === null) {
-          // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+      node = node.return;
+    }
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "componentDidMount. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
-            }
-          }
+    node.sibling.return = node.return;
+    node = node.sibling;
 
-          {
-            instance.componentDidMount();
-          }
-        } else {
-          var prevProps =
-            finishedWork.elementType === finishedWork.type
-              ? current.memoizedProps
-              : resolveDefaultProps(finishedWork.type, current.memoizedProps);
-          var prevState = current.memoizedState; // We could update instance props and state here,
-          // but instead we rely on them being set during last render.
-          // TODO: revisit this when we implement resuming.
+    while (
+      node.tag !== HostComponent &&
+      node.tag !== HostText &&
+      node.tag !== DehydratedFragment
+    ) {
+      // If it is not host node and, we might have a host node inside it.
+      // Try to search down until we find one.
+      if (node.flags & Placement) {
+        // If we don't have a child, try the siblings instead.
+        continue siblings;
+      } // If we don't have a child, try the siblings instead.
+      // We also skip portals because they are not part of this host tree.
 
-          {
-            if (
-              finishedWork.type === finishedWork.elementType &&
-              !didWarnAboutReassigningProps
-            ) {
-              if (instance.props !== finishedWork.memoizedProps) {
-                error(
-                  "Expected %s props to match memoized props before " +
-                    "componentDidUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.props`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
+      if (node.child === null || node.tag === HostPortal) {
+        continue siblings;
+      } else {
+        node.child.return = node;
+        node = node.child;
+      }
+    } // Check if this host node is stable or about to be placed.
 
-              if (instance.state !== finishedWork.memoizedState) {
-                error(
-                  "Expected %s state to match memoized state before " +
-                    "componentDidUpdate. " +
-                    "This might either be because of a bug in React, or because " +
-                    "a component reassigns its own `this.state`. " +
-                    "Please file an issue.",
-                  getComponentName(finishedWork.type) || "instance"
-                );
-              }
-            }
-          }
+    if (!(node.flags & Placement)) {
+      // Found it!
+      return node.stateNode;
+    }
+  }
+}
 
-          {
-            instance.componentDidUpdate(
-              prevProps,
-              prevState,
-              instance.__reactInternalSnapshotBeforeUpdate
-            );
-          }
-        }
-      } // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
+function commitPlacement(finishedWork) {
+  var parentFiber = getHostParentFiber(finishedWork); // Note: these two variables *must* always be updated together.
 
-      var updateQueue = finishedWork.updateQueue;
+  var parent;
+  var isContainer;
+  var parentStateNode = parentFiber.stateNode;
 
-      if (updateQueue !== null) {
-        {
-          if (
-            finishedWork.type === finishedWork.elementType &&
-            !didWarnAboutReassigningProps
-          ) {
-            if (instance.props !== finishedWork.memoizedProps) {
-              error(
-                "Expected %s props to match memoized props before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.props`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
-            }
+  switch (parentFiber.tag) {
+    case HostComponent:
+      parent = parentStateNode;
+      isContainer = false;
+      break;
 
-            if (instance.state !== finishedWork.memoizedState) {
-              error(
-                "Expected %s state to match memoized state before " +
-                  "processing the update queue. " +
-                  "This might either be because of a bug in React, or because " +
-                  "a component reassigns its own `this.state`. " +
-                  "Please file an issue.",
-                getComponentName(finishedWork.type) || "instance"
-              );
-            }
-          }
-        } // We could update instance props and state here,
-        // but instead we rely on them being set during last render.
-        // TODO: revisit this when we implement resuming.
+    case HostRoot:
+      parent = parentStateNode.containerInfo;
+      isContainer = true;
+      break;
 
-        commitUpdateQueue(finishedWork, updateQueue, instance);
-      }
+    case HostPortal:
+      parent = parentStateNode.containerInfo;
+      isContainer = true;
+      break;
+    // eslint-disable-next-line-no-fallthrough
 
-      return;
+    default: {
+      throw Error(
+        "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
+      );
     }
+  }
 
-    case HostRoot: {
-      // TODO: I think this is now always non-null by the time it reaches the
-      // commit phase. Consider removing the type check.
-      var _updateQueue = finishedWork.updateQueue;
+  if (parentFiber.flags & ContentReset) {
+    parentFiber.flags &= ~ContentReset;
+  }
 
-      if (_updateQueue !== null) {
-        var _instance = null;
+  var before = getHostSibling(finishedWork); // We only have the top Fiber that was inserted but we need to recurse down its
+  // children to find all the terminal nodes.
 
-        if (finishedWork.child !== null) {
-          switch (finishedWork.child.tag) {
-            case HostComponent:
-              _instance = getPublicInstance(finishedWork.child.stateNode);
-              break;
+  if (isContainer) {
+    insertOrAppendPlacementNodeIntoContainer(finishedWork, before, parent);
+  } else {
+    insertOrAppendPlacementNode(finishedWork, before, parent);
+  }
+}
 
-            case ClassComponent:
-              _instance = finishedWork.child.stateNode;
-              break;
-          }
-        }
+function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
+  var tag = node.tag;
+  var isHost = tag === HostComponent || tag === HostText;
 
-        commitUpdateQueue(finishedWork, _updateQueue, _instance);
-      }
+  if (isHost) {
+    var stateNode = node.stateNode;
 
-      return;
+    if (before) {
+      insertInContainerBefore(parent);
+    } else {
+      appendChildToContainer(parent, stateNode);
     }
+  } else if (tag === HostPortal);
+  else {
+    var child = node.child;
 
-    case HostComponent: {
-      var _instance2 = finishedWork.stateNode; // Renderers may schedule work to be done after host components are mounted
-      // (eg DOM renderer may schedule auto-focus for inputs and form controls).
-      // These effects should only be committed when components are first mounted,
-      // aka when there is no current/alternate.
+    if (child !== null) {
+      insertOrAppendPlacementNodeIntoContainer(child, before, parent);
+      var sibling = child.sibling;
 
-      if (current === null && finishedWork.flags & Update) {
-        var type = finishedWork.type;
-        var props = finishedWork.memoizedProps;
+      while (sibling !== null) {
+        insertOrAppendPlacementNodeIntoContainer(sibling, before, parent);
+        sibling = sibling.sibling;
       }
-
-      return;
     }
+  }
+}
 
-    case HostText: {
-      // We have no life-cycles associated with text.
-      return;
-    }
+function insertOrAppendPlacementNode(node, before, parent) {
+  var tag = node.tag;
+  var isHost = tag === HostComponent || tag === HostText;
 
-    case HostPortal: {
-      // We have no life-cycles associated with portals.
-      return;
+  if (isHost) {
+    var stateNode = node.stateNode;
+
+    if (before) {
+      insertBefore(parent, stateNode, before);
+    } else {
+      appendChild(parent, stateNode);
     }
+  } else if (tag === HostPortal);
+  else {
+    var child = node.child;
 
-    case Profiler: {
-      {
-        var _finishedWork$memoize2 = finishedWork.memoizedProps,
-          onCommit = _finishedWork$memoize2.onCommit,
-          onRender = _finishedWork$memoize2.onRender;
-        var effectDuration = finishedWork.stateNode.effectDuration;
-        var commitTime = getCommitTime();
+    if (child !== null) {
+      insertOrAppendPlacementNode(child, before, parent);
+      var sibling = child.sibling;
 
-        if (typeof onRender === "function") {
-          {
-            onRender(
-              finishedWork.memoizedProps.id,
-              current === null ? "mount" : "update",
-              finishedWork.actualDuration,
-              finishedWork.treeBaseDuration,
-              finishedWork.actualStartTime,
-              commitTime,
-              finishedRoot.memoizedInteractions
-            );
-          }
-        }
+      while (sibling !== null) {
+        insertOrAppendPlacementNode(sibling, before, parent);
+        sibling = sibling.sibling;
       }
-
-      return;
-    }
-
-    case SuspenseComponent: {
-      return;
     }
-
-    case SuspenseListComponent:
-    case IncompleteClassComponent:
-    case FundamentalComponent:
-    case ScopeComponent:
-    case OffscreenComponent:
-    case LegacyHiddenComponent:
-      return;
-  }
-
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
   }
 }
 
-function hideOrUnhideAllChildren(finishedWork, isHidden) {
-  {
-    // We only have the top Fiber that was inserted but we need to recurse down its
-    // children to find all the terminal nodes.
-    var node = finishedWork;
+function unmountHostComponents(finishedRoot, current, nearestMountedAncestor) {
+  // We only have the top Fiber that was deleted but we need to recurse down its
+  // children to find all the terminal nodes.
+  var node = current; // Each iteration, currentParent is populated with node's host parent if not
+  // currentParentIsValid.
 
-    while (true) {
-      if (node.tag === HostComponent) {
-        var instance = node.stateNode;
+  var currentParentIsValid = false; // Note: these two variables *must* always be updated together.
 
-        if (isHidden) {
-          hideInstance(instance);
-        } else {
-          unhideInstance(node.stateNode, node.memoizedProps);
+  var currentParent;
+  var currentParentIsContainer;
+
+  while (true) {
+    if (!currentParentIsValid) {
+      var parent = node.return;
+
+      findParent: while (true) {
+        if (!(parent !== null)) {
+          throw Error(
+            "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
+          );
         }
-      } else if (node.tag === HostText) {
-        var _instance3 = node.stateNode;
 
-        if (isHidden) {
-          hideTextInstance();
-        } else {
-          unhideTextInstance(_instance3, node.memoizedProps);
+        var parentStateNode = parent.stateNode;
+
+        switch (parent.tag) {
+          case HostComponent:
+            currentParent = parentStateNode;
+            currentParentIsContainer = false;
+            break findParent;
+
+          case HostRoot:
+            currentParent = parentStateNode.containerInfo;
+            currentParentIsContainer = true;
+            break findParent;
+
+          case HostPortal:
+            currentParent = parentStateNode.containerInfo;
+            currentParentIsContainer = true;
+            break findParent;
         }
-      } else if (
-        (node.tag === OffscreenComponent ||
-          node.tag === LegacyHiddenComponent) &&
-        node.memoizedState !== null &&
-        node !== finishedWork
-      );
-      else if (node.child !== null) {
+
+        parent = parent.return;
+      }
+
+      currentParentIsValid = true;
+    }
+
+    if (node.tag === HostComponent || node.tag === HostText) {
+      commitNestedUnmounts(finishedRoot, node, nearestMountedAncestor); // After all the children have unmounted, it is now safe to remove the
+      // node from the tree.
+
+      if (currentParentIsContainer) {
+        removeChildFromContainer(currentParent, node.stateNode);
+      } else {
+        removeChild(currentParent, node.stateNode);
+      } // Don't visit children because we already visited them.
+    } else if (node.tag === HostPortal) {
+      if (node.child !== null) {
+        // When we go into a portal, it becomes the parent to remove from.
+        // We will reassign it back when we pop the portal on the way up.
+        currentParent = node.stateNode.containerInfo;
+        currentParentIsContainer = true; // Visit children because portals might contain host components.
+
         node.child.return = node;
         node = node.child;
         continue;
       }
+    } else {
+      commitUnmount(finishedRoot, node, nearestMountedAncestor); // Visit children because we may find more host components below.
 
-      if (node === finishedWork) {
-        return;
+      if (node.child !== null) {
+        node.child.return = node;
+        node = node.child;
+        continue;
       }
+    }
 
-      while (node.sibling === null) {
-        if (node.return === null || node.return === finishedWork) {
-          return;
-        }
+    if (node === current) {
+      return;
+    }
 
-        node = node.return;
+    while (node.sibling === null) {
+      if (node.return === null || node.return === current) {
+        return;
       }
 
-      node.sibling.return = node.return;
-      node = node.sibling;
+      node = node.return;
+
+      if (node.tag === HostPortal) {
+        // When we go out of the portal, we need to restore the parent.
+        // Since we don't keep a stack of them, we will search for it.
+        currentParentIsValid = false;
+      }
     }
+
+    node.sibling.return = node.return;
+    node = node.sibling;
   }
 }
 
-function commitAttachRef(finishedWork) {
-  var ref = finishedWork.ref;
-
-  if (ref !== null) {
-    var instance = finishedWork.stateNode;
-    var instanceToUse;
-
-    switch (finishedWork.tag) {
-      case HostComponent:
-        instanceToUse = getPublicInstance(instance);
-        break;
+function commitDeletion(finishedRoot, current, nearestMountedAncestor) {
+  {
+    // Recursively delete all host nodes from the parent.
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    unmountHostComponents(finishedRoot, current, nearestMountedAncestor);
+  }
 
-      default:
-        instanceToUse = instance;
-    } // Moved outside to ensure DCE works with this flag
+  detachFiberMutation(current);
+}
 
-    if (typeof ref === "function") {
-      {
-        ref(instanceToUse);
-      }
-    } else {
-      {
-        if (!ref.hasOwnProperty("current")) {
-          error(
-            "Unexpected ref object provided for %s. " +
-              "Use either a ref-setter function or React.createRef().",
-            getComponentName(finishedWork.type)
+function commitWork(current, finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case MemoComponent:
+    case SimpleMemoComponent: {
+      // Layout effects are destroyed during the mutation phase so that all
+      // destroy functions for all fibers are called before any create functions.
+      // This prevents sibling component effects from interfering with each other,
+      // e.g. a destroy function in one component should never override a ref set
+      // by a create function in another component during the same commit.
+      if (finishedWork.mode & ProfileMode) {
+        try {
+          startLayoutEffectTimer();
+          commitHookEffectListUnmount(
+            Layout | HasEffect,
+            finishedWork,
+            finishedWork.return
           );
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
         }
+      } else {
+        commitHookEffectListUnmount(
+          Layout | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
       }
 
-      ref.current = instanceToUse;
+      return;
     }
-  }
-}
 
-function commitDetachRef(current) {
-  var currentRef = current.ref;
-
-  if (currentRef !== null) {
-    if (typeof currentRef === "function") {
-      {
-        currentRef(null);
-      }
-    } else {
-      currentRef.current = null;
+    case ClassComponent: {
+      return;
     }
-  }
-} // User-originating errors (lifecycles and refs) should not interrupt
-// deletion, so don't let them throw. Host-originating errors should
-// interrupt deletion, so it's okay
-
-function commitUnmount(finishedRoot, current, renderPriorityLevel) {
-  onCommitUnmount(current);
-
-  switch (current.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case MemoComponent:
-    case SimpleMemoComponent:
-    case Block: {
-      var updateQueue = current.updateQueue;
 
-      if (updateQueue !== null) {
-        var lastEffect = updateQueue.lastEffect;
+    case HostComponent: {
+      var instance = finishedWork.stateNode;
 
-        if (lastEffect !== null) {
-          var firstEffect = lastEffect.next;
-          var effect = firstEffect;
+      if (instance != null) {
+        // Commit the work prepared earlier.
+        var newProps = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
+        // as the newProps. The updatePayload will contain the real change in
+        // this case.
 
-          do {
-            var _effect2 = effect,
-              destroy = _effect2.destroy,
-              tag = _effect2.tag;
+        var oldProps = current !== null ? current.memoizedProps : newProps;
+        var type = finishedWork.type; // TODO: Type the updateQueue to be specific to host components.
 
-            if (destroy !== undefined) {
-              if ((tag & Passive$1) !== NoFlags$1) {
-                enqueuePendingPassiveHookEffectUnmount(current, effect);
-              } else {
-                {
-                  safelyCallDestroy(current, destroy);
-                }
-              }
-            }
+        var updatePayload = finishedWork.updateQueue;
+        finishedWork.updateQueue = null;
 
-            effect = effect.next;
-          } while (effect !== firstEffect);
+        if (updatePayload !== null) {
+          commitUpdate(instance, updatePayload, type, oldProps, newProps);
         }
       }
 
       return;
     }
 
-    case ClassComponent: {
-      safelyDetachRef(current);
-      var instance = current.stateNode;
-
-      if (typeof instance.componentWillUnmount === "function") {
-        safelyCallComponentWillUnmount(current, instance);
+    case HostText: {
+      if (!(finishedWork.stateNode !== null)) {
+        throw Error(
+          "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
+        );
       }
 
+      var textInstance = finishedWork.stateNode;
+      var newText = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
+      // as the newProps. The updatePayload will contain the real change in
+      // this case.
+
+      var oldText = current !== null ? current.memoizedProps : newText;
+      commitTextUpdate(textInstance, oldText, newText);
       return;
     }
 
-    case HostComponent: {
-      safelyDetachRef(current);
+    case HostRoot: {
       return;
     }
 
-    case HostPortal: {
-      // TODO: this is recursive.
-      // We are also not using this parent because
-      // the portal will get pushed immediately.
-      {
-        unmountHostComponents(finishedRoot, current);
-      }
-
+    case Profiler: {
       return;
     }
 
-    case FundamentalComponent: {
+    case SuspenseComponent: {
+      commitSuspenseComponent(finishedWork);
+      attachSuspenseRetryListeners(finishedWork);
       return;
     }
 
-    case DehydratedFragment: {
+    case SuspenseListComponent: {
+      attachSuspenseRetryListeners(finishedWork);
       return;
     }
 
-    case ScopeComponent: {
+    case IncompleteClassComponent: {
       return;
     }
-  }
-}
-
-function commitNestedUnmounts(finishedRoot, root, renderPriorityLevel) {
-  // While we're inside a removed host node we don't want to call
-  // removeChild on the inner nodes because they're removed by the top
-  // call anyway. We also want to call componentWillUnmount on all
-  // composites before this host node is removed from the tree. Therefore
-  // we do an inner loop while we're still inside the host node.
-  var node = root;
-
-  while (true) {
-    commitUnmount(finishedRoot, node); // Visit children because they may contain more composite or host nodes.
-    // Skip portals because commitUnmount() currently visits them recursively.
 
-    if (
-      node.child !== null && // If we use mutation we drill down into portals using commitUnmount above.
-      // If we don't use mutation we drill down into portals here instead.
-      node.tag !== HostPortal
-    ) {
-      node.child.return = node;
-      node = node.child;
-      continue;
+    case ScopeComponent: {
+      break;
     }
 
-    if (node === root) {
+    case OffscreenComponent:
+    case LegacyHiddenComponent: {
+      var newState = finishedWork.memoizedState;
+      var isHidden = newState !== null;
+      hideOrUnhideAllChildren(finishedWork, isHidden);
       return;
     }
-
-    while (node.sibling === null) {
-      if (node.return === null || node.return === root) {
-        return;
-      }
-
-      node = node.return;
-    }
-
-    node.sibling.return = node.return;
-    node = node.sibling;
   }
-}
-
-function detachFiberMutation(fiber) {
-  // Cut off the return pointers to disconnect it from the tree. Ideally, we
-  // should clear the child pointer of the parent alternate to let this
-  // get GC:ed but we don't know which for sure which parent is the current
-  // one so we'll settle for GC:ing the subtree of this child. This child
-  // itself will be GC:ed when the parent updates the next time.
-  // Note: we cannot null out sibling here, otherwise it can cause issues
-  // with findDOMNode and how it requires the sibling field to carry out
-  // traversal in a later effect. See PR #16820. We now clear the sibling
-  // field after effects, see: detachFiberAfterEffects.
-  //
-  // Don't disconnect stateNode now; it will be detached in detachFiberAfterEffects.
-  // It may be required if the current component is an error boundary,
-  // and one of its descendants throws while unmounting a passive effect.
-  fiber.alternate = null;
-  fiber.child = null;
-  fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
-  fiber.memoizedProps = null;
-  fiber.memoizedState = null;
-  fiber.pendingProps = null;
-  fiber.return = null;
-  fiber.updateQueue = null;
 
   {
-    fiber._debugOwner = null;
+    throw Error(
+      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+    );
   }
 }
 
-function getHostParentFiber(fiber) {
-  var parent = fiber.return;
-
-  while (parent !== null) {
-    if (isHostParent(parent)) {
-      return parent;
-    }
+function commitSuspenseComponent(finishedWork) {
+  var newState = finishedWork.memoizedState;
 
-    parent = parent.return;
-  }
+  if (newState !== null) {
+    markCommitTimeOfFallback();
 
-  {
-    throw Error(
-      "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
-    );
+    {
+      // Hide the Offscreen component that contains the primary children. TODO:
+      // Ideally, this effect would have been scheduled on the Offscreen fiber
+      // itself. That's how unhiding works: the Offscreen component schedules an
+      // effect on itself. However, in this case, the component didn't complete,
+      // so the fiber was never added to the effect list in the normal path. We
+      // could have appended it to the effect list in the Suspense component's
+      // second pass, but doing it this way is less complicated. This would be
+      // simpler if we got rid of the effect list and traversed the tree, like
+      // we're planning to do.
+      var primaryChildParent = finishedWork.child;
+      hideOrUnhideAllChildren(primaryChildParent, true);
+    }
   }
 }
 
-function isHostParent(fiber) {
-  return (
-    fiber.tag === HostComponent ||
-    fiber.tag === HostRoot ||
-    fiber.tag === HostPortal
-  );
-}
-
-function getHostSibling(fiber) {
-  // We're going to search forward into the tree until we find a sibling host
-  // node. Unfortunately, if multiple insertions are done in a row we have to
-  // search past them. This leads to exponential search for the next sibling.
-  // TODO: Find a more efficient way to do this.
-  var node = fiber;
+function attachSuspenseRetryListeners(finishedWork) {
+  // If this boundary just timed out, then it will have a set of wakeables.
+  // For each wakeable, attach a listener so that when it resolves, React
+  // attempts to re-render the boundary in the primary (pre-timeout) state.
+  var wakeables = finishedWork.updateQueue;
 
-  siblings: while (true) {
-    // If we didn't find anything, let's try the next sibling.
-    while (node.sibling === null) {
-      if (node.return === null || isHostParent(node.return)) {
-        // If we pop out of the root or hit the parent the fiber we are the
-        // last sibling.
-        return null;
-      }
+  if (wakeables !== null) {
+    finishedWork.updateQueue = null;
+    var retryCache = finishedWork.stateNode;
 
-      node = node.return;
+    if (retryCache === null) {
+      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
     }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
-
-    while (
-      node.tag !== HostComponent &&
-      node.tag !== HostText &&
-      node.tag !== DehydratedFragment
-    ) {
-      // If it is not host node and, we might have a host node inside it.
-      // Try to search down until we find one.
-      if (node.flags & Placement) {
-        // If we don't have a child, try the siblings instead.
-        continue siblings;
-      } // If we don't have a child, try the siblings instead.
-      // We also skip portals because they are not part of this host tree.
-
-      if (node.child === null || node.tag === HostPortal) {
-        continue siblings;
-      } else {
-        node.child.return = node;
-        node = node.child;
-      }
-    } // Check if this host node is stable or about to be placed.
+    wakeables.forEach(function(wakeable) {
+      // Memoize using the boundary fiber to prevent redundant listeners.
+      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
 
-    if (!(node.flags & Placement)) {
-      // Found it!
-      return node.stateNode;
-    }
-  }
-}
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
 
-function commitPlacement(finishedWork) {
-  var parentFiber = getHostParentFiber(finishedWork); // Note: these two variables *must* always be updated together.
+        {
+          if (isDevToolsPresent) {
+            if (inProgressLanes !== null && inProgressRoot !== null) {
+              // If we have pending work still, associate the original updaters with it.
+              restorePendingUpdaters(inProgressRoot, inProgressLanes);
+            } else {
+              throw Error(
+                "Expected finished root and lanes to be set. This is a bug in React."
+              );
+            }
+          }
+        }
 
-  var parent;
-  var isContainer;
-  var parentStateNode = parentFiber.stateNode;
+        wakeable.then(retry, retry);
+      }
+    });
+  }
+} // This function detects when a Suspense boundary goes from visible to hidden.
 
-  switch (parentFiber.tag) {
-    case HostComponent:
-      parent = parentStateNode;
-      isContainer = false;
-      break;
+function commitResetTextContent(current) {
+  resetTextContent(current.stateNode);
+}
 
-    case HostRoot:
-      parent = parentStateNode.containerInfo;
-      isContainer = true;
-      break;
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = firstChild;
+  commitMutationEffects_begin(root);
+  inProgressLanes = null;
+  inProgressRoot = null;
+}
 
-    case HostPortal:
-      parent = parentStateNode.containerInfo;
-      isContainer = true;
-      break;
+function commitMutationEffects_begin(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // TODO: Should wrap this in flags check, too, as optimization
 
-    case FundamentalComponent:
+    var deletions = fiber.deletions;
 
-    // eslint-disable-next-line-no-fallthrough
+    if (deletions !== null) {
+      for (var i = 0; i < deletions.length; i++) {
+        var childToDelete = deletions[i];
 
-    default: {
-      throw Error(
-        "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
-      );
+        try {
+          commitDeletion(root, childToDelete, fiber);
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, fiber, error);
+        }
+      }
     }
-  }
-
-  if (parentFiber.flags & ContentReset) {
-    parentFiber.flags &= ~ContentReset;
-  }
 
-  var before = getHostSibling(finishedWork); // We only have the top Fiber that was inserted but we need to recurse down its
-  // children to find all the terminal nodes.
+    var child = fiber.child;
 
-  if (isContainer) {
-    insertOrAppendPlacementNodeIntoContainer(finishedWork, before, parent);
-  } else {
-    insertOrAppendPlacementNode(finishedWork, before, parent);
+    if ((fiber.subtreeFlags & MutationMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitMutationEffects_complete(root);
+    }
   }
 }
 
-function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
-  var tag = node.tag;
-  var isHost = tag === HostComponent || tag === HostText;
-
-  if (isHost || enableFundamentalAPI) {
-    var stateNode = isHost ? node.stateNode : node.stateNode.instance;
+function commitMutationEffects_complete(root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    setCurrentFiber(fiber);
 
-    if (before) {
-      insertInContainerBefore(parent);
-    } else {
-      appendChildToContainer(parent, stateNode);
+    try {
+      commitMutationEffectsOnFiber(fiber, root);
+    } catch (error) {
+      captureCommitPhaseError(fiber, fiber.return, error);
     }
-  } else if (tag === HostPortal);
-  else {
-    var child = node.child;
 
-    if (child !== null) {
-      insertOrAppendPlacementNodeIntoContainer(child, before, parent);
-      var sibling = child.sibling;
+    resetCurrentFiber();
+    var sibling = fiber.sibling;
 
-      while (sibling !== null) {
-        insertOrAppendPlacementNodeIntoContainer(sibling, before, parent);
-        sibling = sibling.sibling;
-      }
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
     }
+
+    nextEffect = fiber.return;
   }
 }
 
-function insertOrAppendPlacementNode(node, before, parent) {
-  var tag = node.tag;
-  var isHost = tag === HostComponent || tag === HostText;
+function commitMutationEffectsOnFiber(finishedWork, root) {
+  var flags = finishedWork.flags;
 
-  if (isHost || enableFundamentalAPI) {
-    var stateNode = isHost ? node.stateNode : node.stateNode.instance;
+  if (flags & ContentReset) {
+    commitResetTextContent(finishedWork);
+  }
 
-    if (before) {
-      insertBefore(parent, stateNode, before);
-    } else {
-      appendChild(parent, stateNode);
+  if (flags & Ref) {
+    var current = finishedWork.alternate;
+
+    if (current !== null) {
+      commitDetachRef(current);
     }
-  } else if (tag === HostPortal);
-  else {
-    var child = node.child;
+  } // The following switch statement is only concerned about placement,
+  // updates, and deletions. To avoid needing to add a case for every possible
+  // bitmap value, we remove the secondary effects from the effect tag and
+  // switch on that value.
 
-    if (child !== null) {
-      insertOrAppendPlacementNode(child, before, parent);
-      var sibling = child.sibling;
+  var primaryFlags = flags & (Placement | Update | Hydrating);
 
-      while (sibling !== null) {
-        insertOrAppendPlacementNode(sibling, before, parent);
-        sibling = sibling.sibling;
-      }
+  switch (primaryFlags) {
+    case Placement: {
+      commitPlacement(finishedWork); // Clear the "placement" from effect tag so that we know that this is
+      // inserted, before any life-cycles like componentDidMount gets called.
+      // TODO: findDOMNode doesn't rely on this any more but isMounted does
+      // and isMounted is deprecated anyway so we should be able to kill this.
+
+      finishedWork.flags &= ~Placement;
+      break;
     }
-  }
-}
 
-function unmountHostComponents(finishedRoot, current, renderPriorityLevel) {
-  // We only have the top Fiber that was deleted but we need to recurse down its
-  // children to find all the terminal nodes.
-  var node = current; // Each iteration, currentParent is populated with node's host parent if not
-  // currentParentIsValid.
+    case PlacementAndUpdate: {
+      // Placement
+      commitPlacement(finishedWork); // Clear the "placement" from effect tag so that we know that this is
+      // inserted, before any life-cycles like componentDidMount gets called.
 
-  var currentParentIsValid = false; // Note: these two variables *must* always be updated together.
+      finishedWork.flags &= ~Placement; // Update
 
-  var currentParent;
-  var currentParentIsContainer;
+      var _current = finishedWork.alternate;
+      commitWork(_current, finishedWork);
+      break;
+    }
 
-  while (true) {
-    if (!currentParentIsValid) {
-      var parent = node.return;
+    case Hydrating: {
+      finishedWork.flags &= ~Hydrating;
+      break;
+    }
 
-      findParent: while (true) {
-        if (!(parent !== null)) {
-          throw Error(
-            "Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
+    case HydratingAndUpdate: {
+      finishedWork.flags &= ~Hydrating; // Update
 
-        var parentStateNode = parent.stateNode;
+      var _current2 = finishedWork.alternate;
+      commitWork(_current2, finishedWork);
+      break;
+    }
 
-        switch (parent.tag) {
-          case HostComponent:
-            currentParent = parentStateNode;
-            currentParentIsContainer = false;
-            break findParent;
+    case Update: {
+      var _current3 = finishedWork.alternate;
+      commitWork(_current3, finishedWork);
+      break;
+    }
+  }
+}
 
-          case HostRoot:
-            currentParent = parentStateNode.containerInfo;
-            currentParentIsContainer = true;
-            break findParent;
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  nextEffect = finishedWork;
+  commitLayoutEffects_begin(finishedWork, root, committedLanes);
+  inProgressLanes = null;
+  inProgressRoot = null;
+}
 
-          case HostPortal:
-            currentParent = parentStateNode.containerInfo;
-            currentParentIsContainer = true;
-            break findParent;
-        }
+function commitLayoutEffects_begin(subtreeRoot, root, committedLanes) {
+  // Suspense layout effects semantics don't change for legacy roots.
+  var isModernRoot = (subtreeRoot.mode & ConcurrentMode) !== NoMode;
 
-        parent = parent.return;
-      }
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
 
-      currentParentIsValid = true;
+    if ((fiber.subtreeFlags & LayoutMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
+    } else {
+      commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes);
     }
+  }
+}
 
-    if (node.tag === HostComponent || node.tag === HostText) {
-      commitNestedUnmounts(finishedRoot, node); // After all the children have unmounted, it is now safe to remove the
-      // node from the tree.
+function commitLayoutMountEffects_complete(subtreeRoot, root, committedLanes) {
+  // Suspense layout effects semantics don't change for legacy roots.
+  var isModernRoot = (subtreeRoot.mode & ConcurrentMode) !== NoMode;
 
-      if (currentParentIsContainer) {
-        removeChildFromContainer(currentParent, node.stateNode);
-      } else {
-        removeChild(currentParent, node.stateNode);
-      } // Don't visit children because we already visited them.
-    } else if (node.tag === HostPortal) {
-      if (node.child !== null) {
-        // When we go into a portal, it becomes the parent to remove from.
-        // We will reassign it back when we pop the portal on the way up.
-        currentParent = node.stateNode.containerInfo;
-        currentParentIsContainer = true; // Visit children because portals might contain host components.
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
 
-        node.child.return = node;
-        node = node.child;
-        continue;
-      }
-    } else {
-      commitUnmount(finishedRoot, node); // Visit children because we may find more host components below.
+    if ((fiber.flags & LayoutMask) !== NoFlags) {
+      var current = fiber.alternate;
+      setCurrentFiber(fiber);
 
-      if (node.child !== null) {
-        node.child.return = node;
-        node = node.child;
-        continue;
+      try {
+        commitLayoutEffectOnFiber(root, current, fiber, committedLanes);
+      } catch (error) {
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
+
+      resetCurrentFiber();
     }
 
-    if (node === current) {
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
       return;
     }
 
-    while (node.sibling === null) {
-      if (node.return === null || node.return === current) {
-        return;
-      }
-
-      node = node.return;
+    var sibling = fiber.sibling;
 
-      if (node.tag === HostPortal) {
-        // When we go out of the portal, we need to restore the parent.
-        // Since we don't keep a stack of them, we will search for it.
-        currentParentIsValid = false;
-      }
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
     }
 
-    node.sibling.return = node.return;
-    node = node.sibling;
+    nextEffect = fiber.return;
   }
 }
 
-function commitDeletion(finishedRoot, current, renderPriorityLevel) {
-  {
-    // Recursively delete all host nodes from the parent.
-    // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(finishedRoot, current);
-  }
+function commitPassiveMountEffects(root, finishedWork) {
+  nextEffect = finishedWork;
+  commitPassiveMountEffects_begin(finishedWork, root);
+}
 
-  var alternate = current.alternate;
-  detachFiberMutation(current);
+function commitPassiveMountEffects_begin(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var firstChild = fiber.child;
 
-  if (alternate !== null) {
-    detachFiberMutation(alternate);
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && firstChild !== null) {
+      ensureCorrectReturnPointer(firstChild, fiber);
+      nextEffect = firstChild;
+    } else {
+      commitPassiveMountEffects_complete(subtreeRoot, root);
+    }
   }
 }
 
-function commitWork(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case FunctionComponent:
-    case ForwardRef:
-    case MemoComponent:
-    case SimpleMemoComponent:
-    case Block: {
-      // Layout effects are destroyed during the mutation phase so that all
-      // destroy functions for all fibers are called before any create functions.
-      // This prevents sibling component effects from interfering with each other,
-      // e.g. a destroy function in one component should never override a ref set
-      // by a create function in another component during the same commit.
-      {
-        commitHookEffectListUnmount(Layout | HasEffect, finishedWork);
+function commitPassiveMountEffects_complete(subtreeRoot, root) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+
+      try {
+        commitPassiveMountOnFiber(root, fiber);
+      } catch (error) {
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
 
-      return;
+      resetCurrentFiber();
     }
 
-    case ClassComponent: {
+    if (fiber === subtreeRoot) {
+      nextEffect = null;
       return;
     }
 
-    case HostComponent: {
-      var instance = finishedWork.stateNode;
+    var sibling = fiber.sibling;
 
-      if (instance != null) {
-        // Commit the work prepared earlier.
-        var newProps = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
-        // as the newProps. The updatePayload will contain the real change in
-        // this case.
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
+      return;
+    }
 
-        var oldProps = current !== null ? current.memoizedProps : newProps;
-        var type = finishedWork.type; // TODO: Type the updateQueue to be specific to host components.
+    nextEffect = fiber.return;
+  }
+}
 
-        var updatePayload = finishedWork.updateQueue;
-        finishedWork.updateQueue = null;
+function commitPassiveMountOnFiber(finishedRoot, finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
 
-        if (updatePayload !== null) {
-          commitUpdate(instance, updatePayload, type, oldProps, newProps);
+        try {
+          commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
+        } finally {
+          recordPassiveEffectDuration(finishedWork);
         }
+      } else {
+        commitHookEffectListMount(Passive$1 | HasEffect, finishedWork);
       }
 
-      return;
+      break;
     }
+  }
+}
 
-    case HostText: {
-      if (!(finishedWork.stateNode !== null)) {
-        throw Error(
-          "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
-        );
-      }
+function commitPassiveUnmountEffects(firstChild) {
+  nextEffect = firstChild;
+  commitPassiveUnmountEffects_begin();
+}
 
-      var textInstance = finishedWork.stateNode;
-      var newText = finishedWork.memoizedProps; // For hydration we reuse the update path but we treat the oldProps
-      // as the newProps. The updatePayload will contain the real change in
-      // this case.
+function commitPassiveUnmountEffects_begin() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var child = fiber.child;
+
+    if ((nextEffect.flags & ChildDeletion) !== NoFlags) {
+      var deletions = fiber.deletions;
+
+      if (deletions !== null) {
+        for (var i = 0; i < deletions.length; i++) {
+          var fiberToDelete = deletions[i];
+          nextEffect = fiberToDelete;
+          commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+            fiberToDelete,
+            fiber
+          );
+        }
 
-      var oldText = current !== null ? current.memoizedProps : newText;
-      commitTextUpdate(textInstance, oldText, newText);
-      return;
-    }
+        {
+          // A fiber was deleted from this parent fiber, but it's still part of
+          // the previous (alternate) parent fiber's list of children. Because
+          // children are a linked list, an earlier sibling that's still alive
+          // will be connected to the deleted fiber via its `alternate`:
+          //
+          //   live fiber
+          //   --alternate--> previous live fiber
+          //   --sibling--> deleted fiber
+          //
+          // We can't disconnect `alternate` on nodes that haven't been deleted
+          // yet, but we can disconnect the `sibling` and `child` pointers.
+          var previousFiber = fiber.alternate;
 
-    case HostRoot: {
-      return;
-    }
+          if (previousFiber !== null) {
+            var detachedChild = previousFiber.child;
 
-    case Profiler: {
-      return;
-    }
+            if (detachedChild !== null) {
+              previousFiber.child = null;
 
-    case SuspenseComponent: {
-      commitSuspenseComponent(finishedWork);
-      attachSuspenseRetryListeners(finishedWork);
-      return;
-    }
+              do {
+                var detachedSibling = detachedChild.sibling;
+                detachedChild.sibling = null;
+                detachedChild = detachedSibling;
+              } while (detachedChild !== null);
+            }
+          }
+        }
 
-    case SuspenseListComponent: {
-      attachSuspenseRetryListeners(finishedWork);
-      return;
+        nextEffect = fiber;
+      }
     }
 
-    case IncompleteClassComponent: {
-      return;
+    if ((fiber.subtreeFlags & PassiveMask) !== NoFlags && child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffects_complete();
     }
+  }
+}
 
-    case FundamentalComponent: {
-      break;
-    }
+function commitPassiveUnmountEffects_complete() {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
 
-    case ScopeComponent: {
-      break;
+    if ((fiber.flags & Passive) !== NoFlags) {
+      setCurrentFiber(fiber);
+      commitPassiveUnmountOnFiber(fiber);
+      resetCurrentFiber();
     }
 
-    case OffscreenComponent:
-    case LegacyHiddenComponent: {
-      var newState = finishedWork.memoizedState;
-      var isHidden = newState !== null;
-      hideOrUnhideAllChildren(finishedWork, isHidden);
+    var sibling = fiber.sibling;
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, fiber.return);
+      nextEffect = sibling;
       return;
     }
-  }
 
-  {
-    throw Error(
-      "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-    );
+    nextEffect = fiber.return;
   }
 }
 
-function commitSuspenseComponent(finishedWork) {
-  var newState = finishedWork.memoizedState;
-
-  if (newState !== null) {
-    markCommitTimeOfFallback();
+function commitPassiveUnmountOnFiber(finishedWork) {
+  switch (finishedWork.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (finishedWork.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
+        recordPassiveEffectDuration(finishedWork);
+      } else {
+        commitHookEffectListUnmount(
+          Passive$1 | HasEffect,
+          finishedWork,
+          finishedWork.return
+        );
+      }
 
-    {
-      // Hide the Offscreen component that contains the primary children. TODO:
-      // Ideally, this effect would have been scheduled on the Offscreen fiber
-      // itself. That's how unhiding works: the Offscreen component schedules an
-      // effect on itself. However, in this case, the component didn't complete,
-      // so the fiber was never added to the effect list in the normal path. We
-      // could have appended it to the effect list in the Suspense component's
-      // second pass, but doing it this way is less complicated. This would be
-      // simpler if we got rid of the effect list and traversed the tree, like
-      // we're planning to do.
-      var primaryChildParent = finishedWork.child;
-      hideOrUnhideAllChildren(primaryChildParent, true);
+      break;
     }
   }
 }
 
-function attachSuspenseRetryListeners(finishedWork) {
-  // If this boundary just timed out, then it will have a set of wakeables.
-  // For each wakeable, attach a listener so that when it resolves, React
-  // attempts to re-render the boundary in the primary (pre-timeout) state.
-  var wakeables = finishedWork.updateQueue;
+function commitPassiveUnmountEffectsInsideOfDeletedTree_begin(
+  deletedSubtreeRoot,
+  nearestMountedAncestor
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect; // Deletion effects fire in parent -> child order
+    // TODO: Check if fiber has a PassiveStatic flag
 
-  if (wakeables !== null) {
-    finishedWork.updateQueue = null;
-    var retryCache = finishedWork.stateNode;
+    setCurrentFiber(fiber);
+    commitPassiveUnmountInsideDeletedTreeOnFiber(fiber, nearestMountedAncestor);
+    resetCurrentFiber();
+    var child = fiber.child; // TODO: Only traverse subtree if it has a PassiveStatic flag. (But, if we
+    // do this, still need to handle `deletedTreeCleanUpLevel` correctly.)
 
-    if (retryCache === null) {
-      retryCache = finishedWork.stateNode = new PossiblyWeakSet();
+    if (child !== null) {
+      ensureCorrectReturnPointer(child, fiber);
+      nextEffect = child;
+    } else {
+      commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+        deletedSubtreeRoot
+      );
     }
+  }
+}
 
-    wakeables.forEach(function(wakeable) {
-      // Memoize using the boundary fiber to prevent redundant listeners.
-      var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
+function commitPassiveUnmountEffectsInsideOfDeletedTree_complete(
+  deletedSubtreeRoot
+) {
+  while (nextEffect !== null) {
+    var fiber = nextEffect;
+    var sibling = fiber.sibling;
+    var returnFiber = fiber.return;
 
-      if (!retryCache.has(wakeable)) {
-        {
-          if (wakeable.__reactDoNotTraceInteractions !== true) {
-            retry = tracing.unstable_wrap(retry);
-          }
-        }
+    {
+      // Recursively traverse the entire deleted tree and clean up fiber fields.
+      // This is more aggressive than ideal, and the long term goal is to only
+      // have to detach the deleted tree at the root.
+      detachFiberAfterEffects(fiber);
 
-        retryCache.add(wakeable);
-        wakeable.then(retry, retry);
+      if (fiber === deletedSubtreeRoot) {
+        nextEffect = null;
+        return;
       }
-    });
+    }
+
+    if (sibling !== null) {
+      ensureCorrectReturnPointer(sibling, returnFiber);
+      nextEffect = sibling;
+      return;
+    }
+
+    nextEffect = returnFiber;
   }
-} // This function detects when a Suspense boundary goes from visible to hidden.
-// It returns false if the boundary is already hidden.
-// TODO: Use an effect tag.
+}
 
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  if (current !== null) {
-    var oldState = current.memoizedState;
+function commitPassiveUnmountInsideDeletedTreeOnFiber(
+  current,
+  nearestMountedAncestor
+) {
+  switch (current.tag) {
+    case FunctionComponent:
+    case ForwardRef:
+    case SimpleMemoComponent: {
+      if (current.mode & ProfileMode) {
+        startPassiveEffectTimer();
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+        recordPassiveEffectDuration(current);
+      } else {
+        commitHookEffectListUnmount(Passive$1, current, nearestMountedAncestor);
+      }
 
-    if (oldState === null || oldState.dehydrated !== null) {
-      var newState = finishedWork.memoizedState;
-      return newState !== null && newState.dehydrated === null;
+      break;
     }
   }
-
-  return false;
 }
 
-function commitResetTextContent(current) {
-  resetTextContent(current.stateNode);
+var didWarnWrongReturnPointer = false;
+
+function ensureCorrectReturnPointer(fiber, expectedReturnFiber) {
+  {
+    if (!didWarnWrongReturnPointer && fiber.return !== expectedReturnFiber) {
+      didWarnWrongReturnPointer = true;
+
+      error(
+        "Internal React error: Return pointer is inconsistent " + "with parent."
+      );
+    }
+  } // TODO: Remove this assignment once we're confident that it won't break
+  // anything, by checking the warning logs for the above invariant
+
+  fiber.return = expectedReturnFiber;
 }
 
 var COMPONENT_TYPE = 0;
@@ -17457,6 +18758,7 @@ if (typeof Symbol === "function" && Symbol.for) {
 var ceil = Math.ceil;
 var ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   IsSomeRendererActing = ReactSharedInternals.IsSomeRendererActing;
 var NoContext =
   /*             */
@@ -17464,21 +18766,18 @@ var NoContext =
 var BatchedContext =
   /*               */
   1;
-var DiscreteEventContext =
-  /*         */
-  4;
 var LegacyUnbatchedContext =
   /*       */
-  8;
+  4;
 var RenderContext =
   /*                */
-  16;
+  8;
 var CommitContext =
   /*                */
-  32;
+  16;
 var RetryAfterError =
   /*       */
-  64;
+  32;
 var RootIncomplete = 0;
 var RootFatalErrored = 1;
 var RootErrored = 2;
@@ -17518,8 +18817,7 @@ var workInProgressRootSkippedLanes = NoLanes; // Lanes that were updated (in an
 
 var workInProgressRootUpdatedLanes = NoLanes; // Lanes that were pinged (in an interleaved event) during this render.
 
-var workInProgressRootPingedLanes = NoLanes;
-var mostRecentlyUpdatedRoot = null; // The most recent time we committed a fallback. This lets us ensure a train
+var workInProgressRootPingedLanes = NoLanes; // The most recent time we committed a fallback. This lets us ensure a train
 // model where we don't commit new loading states in too quick succession.
 
 var globalMostRecentFallbackTime = 0;
@@ -17538,40 +18836,27 @@ function resetRenderTimer() {
 function getRenderTargetTime() {
   return workInProgressRootRenderTargetTime;
 }
-var nextEffect = null;
 var hasUncaughtError = false;
 var firstUncaughtError = null;
-var legacyErrorBoundariesThatAlreadyFailed = null;
+var legacyErrorBoundariesThatAlreadyFailed = null; // Only used when enableProfilerNestedUpdateScheduledHook is true;
 var rootDoesHavePassiveEffects = false;
 var rootWithPendingPassiveEffects = null;
-var pendingPassiveEffectsRenderPriority = NoPriority$1;
 var pendingPassiveEffectsLanes = NoLanes;
-var pendingPassiveHookEffectsMount = [];
-var pendingPassiveHookEffectsUnmount = [];
-var rootsWithPendingDiscreteUpdates = null; // Use these to prevent an infinite loop of nested updates
+var pendingPassiveProfilerEffects = []; // Use these to prevent an infinite loop of nested updates
 
 var NESTED_UPDATE_LIMIT = 50;
 var nestedUpdateCount = 0;
 var rootWithNestedUpdates = null;
 var NESTED_PASSIVE_UPDATE_LIMIT = 50;
-var nestedPassiveUpdateCount = 0; // Marks the need to reschedule pending interactions at these lanes
-// during the commit phase. This enables them to be traced across components
-// that spawn new work during render. E.g. hidden boundaries, suspended SSR
-// hydration or SuspenseList.
-// TODO: Can use a bitmask instead of an array
-
-var spawnedWorkDuringRender = null; // If two updates are scheduled within the same event, we should treat their
+var nestedPassiveUpdateCount = 0; // If two updates are scheduled within the same event, we should treat their
 // event times as simultaneous, even if the actual clock time has advanced
 // between the first and second call.
 
 var currentEventTime = NoTimestamp;
-var currentEventWipLanes = NoLanes;
-var currentEventPendingLanes = NoLanes; // Dev only flag that tracks if passive effects are currently being flushed.
+var currentEventTransitionLane = NoLanes; // Dev only flag that tracks if passive effects are currently being flushed.
 // We warn about state updates for unmounted components differently in this case.
 
 var isFlushingPassiveEffects = false;
-var focusedInstanceHandle = null;
-var shouldFireAfterActiveInstanceBlur = false;
 function getWorkInProgressRoot() {
   return workInProgressRoot;
 }
@@ -17593,69 +18878,60 @@ function requestUpdateLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // The algorithm for assigning an update to a lane should be stable for all
-  // updates at the same priority within the same event. To do this, the inputs
-  // to the algorithm must be the same. For example, we use the `renderLanes`
-  // to avoid choosing a lane that is already in the middle of rendering.
-  //
-  // However, the "included" lanes could be mutated in between updates in the
-  // same event, like if you perform an update inside `flushSync`. Or any other
-  // code path that might call `prepareFreshStack`.
-  //
-  // The trick we use is to cache the first of each of these inputs within an
-  // event. Then reset the cached values once we can be sure the event is over.
-  // Our heuristic for that is whenever we enter a concurrent work loop.
-  //
-  // We'll do the same for `currentEventPendingLanes` below.
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
+  } else if (
+    (executionContext & RenderContext) !== NoContext &&
+    workInProgressRootRenderLanes !== NoLanes
+  ) {
+    // This is a render phase update. These are not officially supported. The
+    // old behavior is to give this the same "thread" (lanes) as
+    // whatever is currently rendering. So if you call `setState` on a component
+    // that happens later in the same render, it will flush. Ideally, we want to
+    // remove the special case and treat them as if they came from an
+    // interleaved event. Regardless, this pattern is not officially supported.
+    // This behavior is only a fallback. The flag only exists until we can roll
+    // out the setState warning, since existing code might accidentally rely on
+    // the current behavior.
+    return pickArbitraryLane(workInProgressRootRenderLanes);
   }
 
   var isTransition = requestCurrentTransition() !== NoTransition;
 
   if (isTransition) {
-    if (currentEventPendingLanes !== NoLanes) {
-      currentEventPendingLanes =
-        mostRecentlyUpdatedRoot !== null
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : NoLanes;
+    // The algorithm for assigning an update to a lane should be stable for all
+    // updates at the same priority within the same event. To do this, the
+    // inputs to the algorithm must be the same.
+    //
+    // The trick we use is to cache the first of each of these inputs within an
+    // event. Then reset the cached values once we can be sure the event is
+    // over. Our heuristic for that is whenever we enter a concurrent work loop.
+    if (currentEventTransitionLane === NoLane) {
+      // All transitions within the same event are assigned the same lane.
+      currentEventTransitionLane = claimNextTransitionLane();
     }
 
-    return findTransitionLane(currentEventWipLanes, currentEventPendingLanes);
-  } // TODO: Remove this dependency on the Scheduler priority.
-  // To do that, we're replacing it with an update lane priority.
-
-  var schedulerPriority = getCurrentPriorityLevel(); // The old behavior was using the priority level of the Scheduler.
-  // This couples React to the Scheduler internals, so we're replacing it
-  // with the currentUpdateLanePriority above. As an example of how this
-  // could be problematic, if we're not inside `Scheduler.runWithPriority`,
-  // then we'll get the priority of the current running Scheduler task,
-  // which is probably not what we want.
-
-  var lane;
+    return currentEventTransitionLane;
+  } // Updates originating inside certain React methods, like flushSync, have
+  // their priority set by tracking it with a context variable.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  if (
-    // TODO: Temporary. We're removing the concept of discrete updates.
-    (executionContext & DiscreteEventContext) !== NoContext &&
-    schedulerPriority === UserBlockingPriority$1
-  ) {
-    lane = findUpdateLane(InputDiscreteLanePriority, currentEventWipLanes);
-  } else {
-    var schedulerLanePriority = schedulerPriorityToLanePriority(
-      schedulerPriority
-    );
+  var updateLane = getCurrentUpdatePriority();
 
-    lane = findUpdateLane(schedulerLanePriority, currentEventWipLanes);
-  }
+  if (updateLane !== NoLane) {
+    return updateLane;
+  } // This update originated outside React. Ask the host environment for an
+  // appropriate priority, based on the type of event.
+  //
+  // The opaque type returned by the host config is internally a lane, so we can
+  // use that directly.
+  // TODO: Move this type conversion to the event priority module.
 
-  return lane;
+  var eventLane = getCurrentEventPriority();
+  return eventLane;
 }
 
 function requestRetryLane(fiber) {
@@ -17665,19 +18941,11 @@ function requestRetryLane(fiber) {
   // Special cases
   var mode = fiber.mode;
 
-  if ((mode & BlockingMode) === NoMode) {
+  if ((mode & ConcurrentMode) === NoMode) {
     return SyncLane;
-  } else if ((mode & ConcurrentMode) === NoMode) {
-    return getCurrentPriorityLevel() === ImmediatePriority$1
-      ? SyncLane
-      : SyncBatchedLane;
-  } // See `requestUpdateLane` for explanation of `currentEventWipLanes`
-
-  if (currentEventWipLanes === NoLanes) {
-    currentEventWipLanes = workInProgressRootIncludedLanes;
   }
 
-  return findRetryLane(currentEventWipLanes);
+  return claimNextRetryLane();
 }
 
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
@@ -17688,6 +18956,12 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   if (root === null) {
     warnAboutUpdateOnUnmountedFiberInDEV(fiber);
     return null;
+  }
+
+  {
+    if (isDevToolsPresent) {
+      addFiberToLanesMap(root, fiber, lane);
+    }
   } // Mark that the root has a pending update.
 
   markRootUpdated(root, lane, eventTime);
@@ -17698,7 +18972,7 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
     // phase update. In that case, we don't treat render phase updates as if
     // they were interleaved, for backwards compat reasons.
-    {
+    if ((executionContext & RenderContext) === NoContext) {
       workInProgressRootUpdatedLanes = mergeLanes(
         workInProgressRootUpdatedLanes,
         lane
@@ -17714,10 +18988,7 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       // already started rendering.
       markRootSuspended$1(root, workInProgressRootRenderLanes);
     }
-  } // TODO: requestUpdateLanePriority also reads the priority. Pass the
-  // priority as an argument to that function and this one.
-
-  var priorityLevel = getCurrentPriorityLevel();
+  }
 
   if (lane === SyncLane) {
     if (
@@ -17725,52 +18996,32 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       (executionContext & LegacyUnbatchedContext) !== NoContext && // Check if we're not already rendering
       (executionContext & (RenderContext | CommitContext)) === NoContext
     ) {
-      // Register pending interactions on the root to avoid losing traced interaction data.
-      schedulePendingInteractions(root, lane); // This is a legacy edge case. The initial mount of a ReactDOM.render-ed
+      // This is a legacy edge case. The initial mount of a ReactDOM.render-ed
       // root inside of batchedUpdates should be synchronous, but layout updates
       // should be deferred until the end of the batch.
-
       performSyncWorkOnRoot(root);
     } else {
       ensureRootIsScheduled(root, eventTime);
-      schedulePendingInteractions(root, lane);
 
-      if (executionContext === NoContext) {
+      if (
+        executionContext === NoContext &&
+        (fiber.mode & ConcurrentMode) === NoMode
+      ) {
         // Flush the synchronous work now, unless we're already working or inside
         // a batch. This is intentionally inside scheduleUpdateOnFiber instead of
         // scheduleCallbackForFiber to preserve the ability to schedule a callback
         // without immediately flushing it. We only do this for user-initiated
         // updates, to preserve historical behavior of legacy mode.
         resetRenderTimer();
-        flushSyncCallbackQueue();
+        flushSyncCallbacksOnlyInLegacyMode();
       }
     }
   } else {
-    // Schedule a discrete update but only if it's not Sync.
-    if (
-      (executionContext & DiscreteEventContext) !== NoContext && // Only updates at user-blocking priority or greater are considered
-      // discrete, even inside a discrete event.
-      (priorityLevel === UserBlockingPriority$1 ||
-        priorityLevel === ImmediatePriority$1)
-    ) {
-      // This is the result of a discrete event. Track the lowest priority
-      // discrete update per root so we can flush them early, if needed.
-      if (rootsWithPendingDiscreteUpdates === null) {
-        rootsWithPendingDiscreteUpdates = new Set([root]);
-      } else {
-        rootsWithPendingDiscreteUpdates.add(root);
-      }
-    } // Schedule other updates after in case the callback is sync.
-
+    // Schedule other updates after in case the callback is sync.
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, lane);
-  } // We use this when assigning a lane for a transition inside
-  // `requestUpdateLane`. We assume it's the same as the root being updated,
-  // since in the common case of a single root app it probably is. If it's not
-  // the same root, then it's not a huge deal, we just might batch more stuff
-  // together more than necessary.
-
-  mostRecentlyUpdatedRoot = root;
+  }
+
+  return root;
 } // This is split into a separate function so we can mark a fiber with pending
 // work without treating it as a typical update that originates from an event;
 // e.g. retrying a Suspense boundary isn't an update, but it does schedule work
@@ -17792,7 +19043,7 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
     ) {
       warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
     }
-  } // Walk the parent path to the root and update the child expiration time.
+  } // Walk the parent path to the root and update the child lanes.
 
   var node = sourceFiber;
   var parent = sourceFiber.return;
@@ -17821,6 +19072,20 @@ function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   } else {
     return null;
   }
+}
+
+function isInterleavedUpdate(fiber, lane) {
+  return (
+    // TODO: Optimize slightly by comparing to root that fiber belongs to.
+    // Requires some refactoring. Not a big deal though since it's rare for
+    // concurrent apps to have more than a single root.
+    workInProgressRoot !== null &&
+    (fiber.mode & ConcurrentMode) !== NoMode && // If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),
+    // then don't treat this as an interleaved update. This pattern is
+    // accompanied by a warning but we haven't fully deprecated it yet. We can
+    // remove once the deferRenderPhaseUpdateToNextBatch flag is enabled.
+    (executionContext & RenderContext) === NoContext
+  );
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
 // of the existing task is the same as the priority of the next level that the
@@ -17836,50 +19101,88 @@ function ensureRootIsScheduled(root, currentTime) {
   var nextLanes = getNextLanes(
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : NoLanes
-  ); // This returns the priority level computed during the `getNextLanes` call.
-
-  var newCallbackPriority = returnNextLanesPriority();
+  );
 
   if (nextLanes === NoLanes) {
     // Special case: There's nothing to work on.
     if (existingCallbackNode !== null) {
       cancelCallback(existingCallbackNode);
-      root.callbackNode = null;
-      root.callbackPriority = NoLanePriority;
     }
 
+    root.callbackNode = null;
+    root.callbackPriority = NoLane;
     return;
-  } // Check if there's an existing task. We may be able to reuse it.
+  } // We use the highest priority lane to represent the priority of the callback.
 
-  if (existingCallbackNode !== null) {
-    var existingCallbackPriority = root.callbackPriority;
+  var newCallbackPriority = getHighestPriorityLane(nextLanes); // Check if there's an existing task. We may be able to reuse it.
 
-    if (existingCallbackPriority === newCallbackPriority) {
-      // The priority hasn't changed. We can reuse the existing task. Exit.
-      return;
-    } // The priority changed. Cancel the existing callback. We'll schedule a new
-    // one below.
+  var existingCallbackPriority = root.callbackPriority;
+
+  if (existingCallbackPriority === newCallbackPriority) {
+    {
+      // If we're going to re-use an existing task, it needs to exist.
+      // Assume that discrete update microtasks are non-cancellable and null.
+      // TODO: Temporary until we confirm this warning is not fired.
+      if (
+        existingCallbackNode == null &&
+        existingCallbackPriority !== SyncLane
+      ) {
+        error(
+          "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+    } // The priority hasn't changed. We can reuse the existing task. Exit.
+
+    return;
+  }
 
+  if (existingCallbackNode != null) {
+    // Cancel the existing callback. We'll schedule a new one below.
     cancelCallback(existingCallbackNode);
   } // Schedule a new callback.
 
   var newCallbackNode;
 
-  if (newCallbackPriority === SyncLanePriority) {
+  if (newCallbackPriority === SyncLane) {
     // Special case: Sync React callbacks are scheduled on a special
     // internal queue
-    newCallbackNode = scheduleSyncCallback(
-      performSyncWorkOnRoot.bind(null, root)
-    );
-  } else if (newCallbackPriority === SyncBatchedLanePriority) {
-    newCallbackNode = scheduleCallback(
-      ImmediatePriority$1,
-      performSyncWorkOnRoot.bind(null, root)
-    );
+    if (root.tag === LegacyRoot) {
+      scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root));
+    } else {
+      scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root));
+    }
+
+    {
+      // Flush the queue in an Immediate task.
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks);
+    }
+
+    newCallbackNode = null;
   } else {
-    var schedulerPriorityLevel = lanePriorityToSchedulerPriority(
-      newCallbackPriority
-    );
+    var schedulerPriorityLevel;
+
+    switch (lanesToEventPriority(nextLanes)) {
+      case DiscreteEventPriority:
+        schedulerPriorityLevel = ImmediatePriority;
+        break;
+
+      case ContinuousEventPriority:
+        schedulerPriorityLevel = UserBlockingPriority;
+        break;
+
+      case DefaultEventPriority:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+
+      case IdleEventPriority:
+        schedulerPriorityLevel = IdlePriority;
+        break;
+
+      default:
+        schedulerPriorityLevel = NormalPriority;
+        break;
+    }
+
     newCallbackNode = scheduleCallback(
       schedulerPriorityLevel,
       performConcurrentWorkOnRoot.bind(null, root)
@@ -17891,12 +19194,14 @@ function ensureRootIsScheduled(root, currentTime) {
 } // This is the entry point for every concurrent task, i.e. anything that
 // goes through Scheduler.
 
-function performConcurrentWorkOnRoot(root) {
-  // Since we know we're in a React event, we can clear the current
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  {
+    resetNestedUpdateFlag();
+  } // Since we know we're in a React event, we can clear the current
   // event time. The next update will compute a new event time.
+
   currentEventTime = NoTimestamp;
-  currentEventWipLanes = NoLanes;
-  currentEventPendingLanes = NoLanes;
+  currentEventTransitionLane = NoLanes;
 
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
@@ -17915,7 +19220,7 @@ function performConcurrentWorkOnRoot(root) {
       // there's a new task, or that there's no remaining work on this root.
       return null;
     }
-  } // Determine the next expiration time to work on, using the fields stored
+  } // Determine the next lanes to work on, using the fields stored
   // on the root.
 
   var lanes = getNextLanes(
@@ -17926,40 +19231,41 @@ function performConcurrentWorkOnRoot(root) {
   if (lanes === NoLanes) {
     // Defensive coding. This is never expected to happen.
     return null;
-  }
-
-  var exitStatus = renderRootConcurrent(root, lanes);
-
-  if (
-    includesSomeLane(
-      workInProgressRootIncludedLanes,
-      workInProgressRootUpdatedLanes
-    )
-  ) {
-    // The render included lanes that were updated during the render phase.
-    // For example, when unhiding a hidden tree, we include all the lanes
-    // that were previously skipped when the tree was hidden. That set of
-    // lanes is a superset of the lanes we started rendering with.
-    //
-    // So we'll throw out the current work and restart.
-    prepareFreshStack(root, NoLanes);
-  } else if (exitStatus !== RootIncomplete) {
+  } // We disable time-slicing in some cases: if the work has been CPU-bound
+  // for too long ("expired" work, to prevent starvation), or we're in
+  // sync-updates-by-default mode.
+  // TODO: We only check `didTimeout` defensively, to account for a Scheduler
+  // bug we're still investigating. Once the bug in Scheduler is fixed,
+  // we can remove this, since we track expiration ourselves.
+
+  var exitStatus =
+    shouldTimeSlice(root, lanes) && !didTimeout
+      ? renderRootConcurrent(root, lanes)
+      : renderRootSync(root, lanes);
+
+  if (exitStatus !== RootIncomplete) {
     if (exitStatus === RootErrored) {
       executionContext |= RetryAfterError; // If an error occurred during hydration,
       // discard server response and fall back to client side render.
 
       if (root.hydrate) {
         root.hydrate = false;
+
+        {
+          errorHydratingContainer(root.containerInfo);
+        }
+
         clearContainer(root.containerInfo);
       } // If something threw an error, try rendering one more time. We'll render
       // synchronously to block concurrent data mutations, and we'll includes
       // all pending updates are included. If it still fails after the second
       // attempt, we'll give up and commit the resulting tree.
 
-      lanes = getLanesToRetrySynchronouslyOnError(root);
+      var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-      if (lanes !== NoLanes) {
-        exitStatus = renderRootSync(root, lanes);
+      if (errorRetryLanes !== NoLanes) {
+        lanes = errorRetryLanes;
+        exitStatus = renderRootSync(root, errorRetryLanes);
       }
     }
 
@@ -18119,60 +19425,46 @@ function markRootSuspended$1(root, suspendedLanes) {
 // through Scheduler
 
 function performSyncWorkOnRoot(root) {
+  {
+    syncNestedUpdateFlag();
+  }
+
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
     throw Error("Should not already be working.");
   }
 
   flushPassiveEffects();
-  var lanes;
-  var exitStatus;
+  var lanes = getNextLanes(root, NoLanes);
 
-  if (
-    root === workInProgressRoot &&
-    includesSomeLane(root.expiredLanes, workInProgressRootRenderLanes)
-  ) {
-    // There's a partial tree, and at least one of its lanes has expired. Finish
-    // rendering it before rendering the rest of the expired work.
-    lanes = workInProgressRootRenderLanes;
-    exitStatus = renderRootSync(root, lanes);
-
-    if (
-      includesSomeLane(
-        workInProgressRootIncludedLanes,
-        workInProgressRootUpdatedLanes
-      )
-    ) {
-      // The render included lanes that were updated during the render phase.
-      // For example, when unhiding a hidden tree, we include all the lanes
-      // that were previously skipped when the tree was hidden. That set of
-      // lanes is a superset of the lanes we started rendering with.
-      //
-      // Note that this only happens when part of the tree is rendered
-      // concurrently. If the whole tree is rendered synchronously, then there
-      // are no interleaved events.
-      lanes = getNextLanes(root, lanes);
-      exitStatus = renderRootSync(root, lanes);
-    }
-  } else {
-    lanes = getNextLanes(root, NoLanes);
-    exitStatus = renderRootSync(root, lanes);
+  if (!includesSomeLane(lanes, SyncLane)) {
+    // There's no remaining sync work left.
+    ensureRootIsScheduled(root, now());
+    return null;
   }
 
+  var exitStatus = renderRootSync(root, lanes);
+
   if (root.tag !== LegacyRoot && exitStatus === RootErrored) {
     executionContext |= RetryAfterError; // If an error occurred during hydration,
     // discard server response and fall back to client side render.
 
     if (root.hydrate) {
       root.hydrate = false;
+
+      {
+        errorHydratingContainer(root.containerInfo);
+      }
+
       clearContainer(root.containerInfo);
     } // If something threw an error, try rendering one more time. We'll render
     // synchronously to block concurrent data mutations, and we'll includes
     // all pending updates are included. If it still fails after the second
     // attempt, we'll give up and commit the resulting tree.
 
-    lanes = getLanesToRetrySynchronouslyOnError(root);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
 
-    if (lanes !== NoLanes) {
+    if (errorRetryLanes !== NoLanes) {
+      lanes = errorRetryLanes;
       exitStatus = renderRootSync(root, lanes);
     }
   }
@@ -18195,7 +19487,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-
 function batchedUpdates$1(fn, a) {
   var prevExecutionContext = executionContext;
   executionContext |= BatchedContext;
@@ -18203,45 +19494,47 @@ function batchedUpdates$1(fn, a) {
   try {
     return fn(a);
   } finally {
-    executionContext = prevExecutionContext;
+    executionContext = prevExecutionContext; // If there were legacy sync updates, flush them at the end of the outer
+    // most batchedUpdates-like method.
 
     if (executionContext === NoContext) {
-      // Flush the immediate callbacks that were scheduled during this batch
       resetRenderTimer();
-      flushSyncCallbackQueue();
+      flushSyncCallbacksOnlyInLegacyMode();
     }
   }
 }
 function flushSync(fn, a) {
   var prevExecutionContext = executionContext;
-
-  if ((prevExecutionContext & (RenderContext | CommitContext)) !== NoContext) {
-    {
-      error(
-        "flushSync was called from inside a lifecycle method. React cannot " +
-          "flush when React is already rendering. Consider moving this call to " +
-          "a scheduler task or micro task."
-      );
-    }
-
-    return fn(a);
-  }
-
   executionContext |= BatchedContext;
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
+  var previousPriority = getCurrentUpdatePriority();
 
-  {
-    try {
-      if (fn) {
-        return runWithPriority(ImmediatePriority$1, fn.bind(null, a));
-      } else {
-        return undefined;
-      }
-    } finally {
-      executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
-      // Note that this will happen even if batchedUpdates is higher up
-      // the stack.
+  try {
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
 
-      flushSyncCallbackQueue();
+    if (fn) {
+      return fn(a);
+    } else {
+      return undefined;
+    }
+  } finally {
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    executionContext = prevExecutionContext; // Flush the immediate callbacks that were scheduled during this batch.
+    // Note that this will happen even if batchedUpdates is higher up
+    // the stack.
+
+    if ((executionContext & (RenderContext | CommitContext)) === NoContext) {
+      flushSyncCallbacks();
+    } else {
+      {
+        error(
+          "flushSync was called from inside a lifecycle method. React cannot " +
+            "flush when React is already rendering. Consider moving this call to " +
+            "a scheduler task or micro task."
+        );
+      }
     }
   }
 }
@@ -18288,10 +19581,7 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootSkippedLanes = NoLanes;
   workInProgressRootUpdatedLanes = NoLanes;
   workInProgressRootPingedLanes = NoLanes;
-
-  {
-    spawnedWorkDuringRender = null;
-  }
+  enqueueInterleavedUpdates();
 
   {
     ReactStrictModeWarnings.discardPendingWarnings();
@@ -18381,20 +19671,6 @@ function popDispatcher(prevDispatcher) {
   ReactCurrentDispatcher$2.current = prevDispatcher;
 }
 
-function pushInteractions(root) {
-  {
-    var prevInteractions = tracing.__interactionsRef.current;
-    tracing.__interactionsRef.current = root.memoizedInteractions;
-    return prevInteractions;
-  }
-}
-
-function popInteractions(prevInteractions) {
-  {
-    tracing.__interactionsRef.current = prevInteractions;
-  }
-}
-
 function markCommitTimeOfFallback() {
   globalMostRecentFallbackTime = now();
 }
@@ -18453,12 +19729,25 @@ function renderRootSync(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopSync();
@@ -18469,11 +19758,6 @@ function renderRootSync(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   executionContext = prevExecutionContext;
   popDispatcher(prevDispatcher);
 
@@ -18507,13 +19791,26 @@ function renderRootConcurrent(root, lanes) {
   // and prepare a fresh one. Otherwise we'll continue where we left off.
 
   if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+
+        if (memoizedUpdaters.size > 0) {
+          restorePendingUpdaters(root, workInProgressRootRenderLanes);
+          memoizedUpdaters.clear();
+        } // At this point, move Fibers that scheduled the upcoming work from the Map to the Set.
+        // If we bailout on this work, we'll move them back (like above).
+        // It's important to move them now in case the work spawns more work at the same priority with different updaters.
+        // That way we can keep the current update and future updates separate.
+
+        movePendingFibersToMemoized(root, lanes);
+      }
+    }
+
     resetRenderTimer();
     prepareFreshStack(root, lanes);
-    startWorkOnPendingInteractions(root, lanes);
   }
 
-  var prevInteractions = pushInteractions(root);
-
   do {
     try {
       workLoopConcurrent();
@@ -18524,11 +19821,6 @@ function renderRootConcurrent(root, lanes) {
   } while (true);
 
   resetContextDependencies();
-
-  {
-    popInteractions(prevInteractions);
-  }
-
   popDispatcher(prevDispatcher);
   executionContext = prevExecutionContext;
 
@@ -18611,52 +19903,11 @@ function completeUnitOfWork(unitOfWork) {
         workInProgress = next;
         return;
       }
-
-      resetChildLanes(completedWork);
-
-      if (
-        returnFiber !== null && // Do not append effects to parents if a sibling failed to complete
-        (returnFiber.flags & Incomplete) === NoFlags
-      ) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = completedWork.firstEffect;
-        }
-
-        if (completedWork.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork.firstEffect;
-          }
-
-          returnFiber.lastEffect = completedWork.lastEffect;
-        } // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if needed,
-        // by doing multiple passes over the effect list. We don't want to
-        // schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-
-        var flags = completedWork.flags; // Skip both NoWork and PerformedWork tags when creating the effect
-        // list. PerformedWork effect is read by React DevTools but shouldn't be
-        // committed.
-
-        if (flags > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = completedWork;
-          } else {
-            returnFiber.firstEffect = completedWork;
-          }
-
-          returnFiber.lastEffect = completedWork;
-        }
-      }
     } else {
       // This fiber did not complete because something threw. Pop values off
       // the stack without entering the complete phase. If this is a boundary,
       // capture values if possible.
-      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its expiration time.
+      var _next = unwindWork(completedWork); // Because this fiber did not complete, don't reset its lanes.
 
       if (_next !== null) {
         // If completing this work spawned new work, do that next. We'll come
@@ -18684,9 +19935,10 @@ function completeUnitOfWork(unitOfWork) {
       }
 
       if (returnFiber !== null) {
-        // Mark the parent fiber as incomplete and clear its effect list.
-        returnFiber.firstEffect = returnFiber.lastEffect = null;
+        // Mark the parent fiber as incomplete and clear its subtree flags.
         returnFiber.flags |= Incomplete;
+        returnFiber.subtreeFlags = NoFlags;
+        returnFiber.deletions = null;
       }
     }
 
@@ -18708,90 +19960,21 @@ function completeUnitOfWork(unitOfWork) {
   }
 }
 
-function resetChildLanes(completedWork) {
-  if (
-    // TODO: Move this check out of the hot path by moving `resetChildLanes`
-    // to switch statement in `completeWork`.
-    (completedWork.tag === LegacyHiddenComponent ||
-      completedWork.tag === OffscreenComponent) &&
-    completedWork.memoizedState !== null &&
-    !includesSomeLane(subtreeRenderLanes, OffscreenLane) &&
-    (completedWork.mode & ConcurrentMode) !== NoLanes
-  ) {
-    // The children of this component are hidden. Don't bubble their
-    // expiration times.
-    return;
-  }
-
-  var newChildLanes = NoLanes; // Bubble up the earliest expiration time.
-
-  if ((completedWork.mode & ProfileMode) !== NoMode) {
-    // In profiling mode, resetChildExpirationTime is also used to reset
-    // profiler durations.
-    var actualDuration = completedWork.actualDuration;
-    var treeBaseDuration = completedWork.selfBaseDuration; // When a fiber is cloned, its actualDuration is reset to 0. This value will
-    // only be updated if work is done on the fiber (i.e. it doesn't bailout).
-    // When work is done, it should bubble to the parent's actualDuration. If
-    // the fiber has not been cloned though, (meaning no work was done), then
-    // this value will reflect the amount of time spent working on a previous
-    // render. In that case it should not bubble. We determine whether it was
-    // cloned by comparing the child pointer.
-
-    var shouldBubbleActualDurations =
-      completedWork.alternate === null ||
-      completedWork.child !== completedWork.alternate.child;
-    var child = completedWork.child;
-
-    while (child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(child.lanes, child.childLanes)
-      );
-
-      if (shouldBubbleActualDurations) {
-        actualDuration += child.actualDuration;
-      }
-
-      treeBaseDuration += child.treeBaseDuration;
-      child = child.sibling;
-    }
-
-    var isTimedOutSuspense =
-      completedWork.tag === SuspenseComponent &&
-      completedWork.memoizedState !== null;
-
-    if (isTimedOutSuspense) {
-      // Don't count time spent in a timed out Suspense subtree as part of the base duration.
-      var primaryChildFragment = completedWork.child;
-
-      if (primaryChildFragment !== null) {
-        treeBaseDuration -= primaryChildFragment.treeBaseDuration;
-      }
-    }
-
-    completedWork.actualDuration = actualDuration;
-    completedWork.treeBaseDuration = treeBaseDuration;
-  } else {
-    var _child = completedWork.child;
+function commitRoot(root) {
+  // TODO: This no longer makes any sense. We already wrap the mutation and
+  // layout phases. Should be able to remove.
+  var previousUpdateLanePriority = getCurrentUpdatePriority();
+  var prevTransition = ReactCurrentBatchConfig$2.transition;
 
-    while (_child !== null) {
-      newChildLanes = mergeLanes(
-        newChildLanes,
-        mergeLanes(_child.lanes, _child.childLanes)
-      );
-      _child = _child.sibling;
-    }
+  try {
+    ReactCurrentBatchConfig$2.transition = 0;
+    setCurrentUpdatePriority(DiscreteEventPriority);
+    commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    ReactCurrentBatchConfig$2.transition = prevTransition;
+    setCurrentUpdatePriority(previousUpdateLanePriority);
   }
 
-  completedWork.childLanes = newChildLanes;
-}
-
-function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(
-    ImmediatePriority$1,
-    commitRootImpl.bind(null, root, renderPriorityLevel)
-  );
   return null;
 }
 
@@ -18817,6 +20000,15 @@ function commitRootImpl(root, renderPriorityLevel) {
 
   if (finishedWork === null) {
     return null;
+  } else {
+    {
+      if (lanes === NoLanes) {
+        error(
+          "root.finishedLanes should not be empty during a commit. This is a " +
+            "bug in React."
+        );
+      }
+    }
   }
 
   root.finishedWork = null;
@@ -18829,52 +20021,57 @@ function commitRootImpl(root, renderPriorityLevel) {
   } // commitRoot never returns a continuation; it always finishes synchronously.
   // So we can clear these now to allow a new callback to be scheduled.
 
-  root.callbackNode = null; // Update the first and last pending times on this root. The new first
+  root.callbackNode = null;
+  root.callbackPriority = NoLane; // Update the first and last pending times on this root. The new first
   // pending time is whatever is left on the root fiber.
 
   var remainingLanes = mergeLanes(finishedWork.lanes, finishedWork.childLanes);
-  markRootFinished(root, remainingLanes); // Clear already finished discrete updates in case that a later call of
-  // `flushDiscreteUpdates` starts a useless render pass which may cancels
-  // a scheduled timeout.
-
-  if (rootsWithPendingDiscreteUpdates !== null) {
-    if (
-      !hasDiscreteLanes(remainingLanes) &&
-      rootsWithPendingDiscreteUpdates.has(root)
-    ) {
-      rootsWithPendingDiscreteUpdates.delete(root);
-    }
-  }
+  markRootFinished(root, remainingLanes);
 
   if (root === workInProgressRoot) {
     // We can reset these now that they are finished.
     workInProgressRoot = null;
     workInProgress = null;
     workInProgressRootRenderLanes = NoLanes;
-  } // Get the list of effects.
-
-  var firstEffect;
-
-  if (finishedWork.flags > PerformedWork) {
-    // A fiber's effect list consists only of its children, not itself. So if
-    // the root has an effect, we need to add it to the end of the list. The
-    // resulting list is the set that would belong to the root's parent, if it
-    // had one; that is, all the effects in the tree including the root.
-    if (finishedWork.lastEffect !== null) {
-      finishedWork.lastEffect.nextEffect = finishedWork;
-      firstEffect = finishedWork.firstEffect;
-    } else {
-      firstEffect = finishedWork;
-    }
-  } else {
-    // There is no effect on the root.
-    firstEffect = finishedWork.firstEffect;
-  }
+  } // If there are pending passive effects, schedule a callback to process them.
+  // Do this as early as possible, so it is queued before anything else that
+  // might get scheduled in the commit phase. (See #16714.)
+  // TODO: Delete all other places that schedule the passive effect callback
+  // They're redundant.
 
-  if (firstEffect !== null) {
+  if (
+    (finishedWork.subtreeFlags & PassiveMask) !== NoFlags ||
+    (finishedWork.flags & PassiveMask) !== NoFlags
+  ) {
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
+    }
+  } // Check if there are any effects in the whole tree.
+  // TODO: This is left over from the effect list implementation, where we had
+  // to check for the existence of `firstEffect` to satisfy Flow. I think the
+  // only other reason this optimization exists is because it affects profiling.
+  // Reconsider whether this is necessary.
+
+  var subtreeHasEffects =
+    (finishedWork.subtreeFlags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+  var rootHasEffect =
+    (finishedWork.flags &
+      (BeforeMutationMask | MutationMask | LayoutMask | PassiveMask)) !==
+    NoFlags;
+
+  if (subtreeHasEffects || rootHasEffect) {
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = getCurrentUpdatePriority();
+    setCurrentUpdatePriority(DiscreteEventPriority);
     var prevExecutionContext = executionContext;
-    executionContext |= CommitContext;
-    var prevInteractions = pushInteractions(root); // Reset this to null before calling lifecycles
+    executionContext |= CommitContext; // Reset this to null before calling lifecycles
 
     ReactCurrentOwner$2.current = null; // The commit phase is broken into several sub-phases. We do a separate pass
     // of the effect list for each phase: all mutation effects come before all
@@ -18883,58 +20080,18 @@ function commitRootImpl(root, renderPriorityLevel) {
     // state of the host tree right before we mutate it. This is where
     // getSnapshotBeforeUpdate is called.
 
-    focusedInstanceHandle = prepareForCommit(root.containerInfo);
-    shouldFireAfterActiveInstanceBlur = false;
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitBeforeMutationEffects, null);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(nextEffect, error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null); // We no longer need to track the active instance fiber
-
-    focusedInstanceHandle = null;
+    var shouldFireAfterActiveInstanceBlur = commitBeforeMutationEffects(
+      root,
+      finishedWork
+    );
 
     {
       // Mark the current commit time to be shared by all Profilers in this
       // batch. This enables them to be grouped later.
       recordCommitTime();
-    } // The next phase is the mutation phase, where we mutate the host tree.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(
-          null,
-          commitMutationEffects,
-          null,
-          root,
-          renderPriorityLevel
-        );
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error = clearCaughtError();
+    }
 
-          captureCommitPhaseError(nextEffect, _error);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
+    commitMutationEffects(root, finishedWork, lanes);
 
     resetAfterCommit(root.containerInfo); // The work-in-progress tree is now the current tree. This must come after
     // the mutation phase, so that the previous tree is still current during
@@ -18942,38 +20099,15 @@ function commitRootImpl(root, renderPriorityLevel) {
     // work is current during componentDidMount/Update.
 
     root.current = finishedWork; // The next phase is the layout phase, where we call effects that read
-    // the host tree after it's been mutated. The idiomatic use case for this is
-    // layout, but class component lifecycles also fire here for legacy reasons.
-
-    nextEffect = firstEffect;
-
-    do {
-      {
-        invokeGuardedCallback(null, commitLayoutEffects, null, root, lanes);
-
-        if (hasCaughtError()) {
-          if (!(nextEffect !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var _error2 = clearCaughtError();
-
-          captureCommitPhaseError(nextEffect, _error2);
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    } while (nextEffect !== null);
 
-    nextEffect = null; // Tell Scheduler to yield at the end of the frame, so the browser has an
+    commitLayoutEffects(finishedWork, root, lanes);
     // opportunity to paint.
 
     requestPaint();
+    executionContext = prevExecutionContext; // Reset the priority to the previous non-sync value.
 
-    {
-      popInteractions(prevInteractions);
-    }
-
-    executionContext = prevExecutionContext;
+    setCurrentUpdatePriority(previousPriority);
+    ReactCurrentBatchConfig$2.transition = prevTransition;
   } else {
     // No effects.
     root.current = finishedWork; // Measure these anyway so the flamegraph explicitly shows that there were
@@ -18985,71 +20119,28 @@ function commitRootImpl(root, renderPriorityLevel) {
     }
   }
 
-  var rootDidHavePassiveEffects = rootDoesHavePassiveEffects;
-
   if (rootDoesHavePassiveEffects) {
     // This commit has passive effects. Stash a reference to them. But don't
     // schedule a callback until after flushing layout work.
     rootDoesHavePassiveEffects = false;
     rootWithPendingPassiveEffects = root;
     pendingPassiveEffectsLanes = lanes;
-    pendingPassiveEffectsRenderPriority = renderPriorityLevel;
-  } else {
-    // We are done with the effect chain at this point so let's clear the
-    // nextEffect pointers to assist with GC. If we have passive effects, we'll
-    // clear this in flushPassiveEffects.
-    nextEffect = firstEffect;
-
-    while (nextEffect !== null) {
-      var nextNextEffect = nextEffect.nextEffect;
-      nextEffect.nextEffect = null;
-
-      if (nextEffect.flags & Deletion) {
-        detachFiberAfterEffects(nextEffect);
-      }
-
-      nextEffect = nextNextEffect;
-    }
   } // Read this again, since an effect might have updated it
 
   remainingLanes = root.pendingLanes; // Check if there's remaining work on this root
 
-  if (remainingLanes !== NoLanes) {
-    {
-      if (spawnedWorkDuringRender !== null) {
-        var expirationTimes = spawnedWorkDuringRender;
-        spawnedWorkDuringRender = null;
-
-        for (var i = 0; i < expirationTimes.length; i++) {
-          scheduleInteractions(
-            root,
-            expirationTimes[i],
-            root.memoizedInteractions
-          );
-        }
-      }
-
-      schedulePendingInteractions(root, remainingLanes);
-    }
-  } else {
+  if (remainingLanes === NoLanes) {
     // If there's no remaining work, we can clear the set of already failed
     // error boundaries.
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
 
-  {
-    if (!rootDidHavePassiveEffects) {
-      // If there are no passive effects, then we can complete the pending interactions.
-      // Otherwise, we'll wait until after the passive effects are flushed.
-      // Wait to do this until after remaining work has been scheduled,
-      // so that we don't prematurely signal complete for interactions when there's e.g. hidden work.
-      finishPendingInteractions(root, lanes);
-    }
-  }
-
-  if (remainingLanes === SyncLane) {
-    // Count the number of times the root synchronously re-renders without
+  if (includesSomeLane(remainingLanes, SyncLane)) {
+    {
+      markNestedUpdateScheduled();
+    } // Count the number of times the root synchronously re-renders without
     // finishing. If there are too many, it indicates an infinite update loop.
+
     if (root === rootWithNestedUpdates) {
       nestedUpdateCount++;
     } else {
@@ -19061,15 +20152,21 @@ function commitRootImpl(root, renderPriorityLevel) {
   }
 
   onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
+
+  {
+    if (isDevToolsPresent) {
+      root.memoizedUpdaters.clear();
+    }
+  }
   // additional work on this root is scheduled.
 
   ensureRootIsScheduled(root, now());
 
   if (hasUncaughtError) {
     hasUncaughtError = false;
-    var _error3 = firstUncaughtError;
+    var error$1 = firstUncaughtError;
     firstUncaughtError = null;
-    throw _error3;
+    throw error$1;
   }
 
   if ((executionContext & LegacyUnbatchedContext) !== NoContext) {
@@ -19078,206 +20175,64 @@ function commitRootImpl(root, renderPriorityLevel) {
     // of the batch.
 
     return null;
-  } // If layout work was scheduled, flush it now.
-
-  flushSyncCallbackQueue();
-
-  return null;
-}
-
-function commitBeforeMutationEffects() {
-  while (nextEffect !== null) {
-    var current = nextEffect.alternate;
-
-    if (!shouldFireAfterActiveInstanceBlur && focusedInstanceHandle !== null) {
-      if ((nextEffect.flags & Deletion) !== NoFlags) {
-        if (doesFiberContain(nextEffect, focusedInstanceHandle)) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      } else {
-        // TODO: Move this out of the hot path using a dedicated effect tag.
-        if (
-          nextEffect.tag === SuspenseComponent &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle)
-        ) {
-          shouldFireAfterActiveInstanceBlur = true;
-        }
-      }
-    }
-
-    var flags = nextEffect.flags;
-
-    if ((flags & Snapshot) !== NoFlags) {
-      setCurrentFiber(nextEffect);
-      commitBeforeMutationLifeCycles(current, nextEffect);
-      resetCurrentFiber();
-    }
-
-    if ((flags & Passive) !== NoFlags) {
-      // If there are passive effects, schedule a callback to flush at
-      // the earliest opportunity.
-      if (!rootDoesHavePassiveEffects) {
-        rootDoesHavePassiveEffects = true;
-        scheduleCallback(NormalPriority$1, function() {
-          flushPassiveEffects();
-          return null;
-        });
-      }
-    }
-
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function commitMutationEffects(root, renderPriorityLevel) {
-  // TODO: Should probably move the bulk of this function to commitWork.
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
-
-    if (flags & ContentReset) {
-      commitResetTextContent(nextEffect);
-    }
-
-    if (flags & Ref) {
-      var current = nextEffect.alternate;
-
-      if (current !== null) {
-        commitDetachRef(current);
-      }
-    } // The following switch statement is only concerned about placement,
-    // updates, and deletions. To avoid needing to add a case for every possible
-    // bitmap value, we remove the secondary effects from the effect tag and
-    // switch on that value.
-
-    var primaryFlags = flags & (Placement | Update | Deletion | Hydrating);
-
-    switch (primaryFlags) {
-      case Placement: {
-        commitPlacement(nextEffect); // Clear the "placement" from effect tag so that we know that this is
-        // inserted, before any life-cycles like componentDidMount gets called.
-        // TODO: findDOMNode doesn't rely on this any more but isMounted does
-        // and isMounted is deprecated anyway so we should be able to kill this.
+  } // If the passive effects are the result of a discrete render, flush them
+  // synchronously at the end of the current task so that the result is
+  // immediately observable. Otherwise, we assume that they are not
+  // order-dependent and do not need to be observed by external systems, so we
+  // can wait until after paint.
+  // TODO: We can optimize this by not scheduling the callback earlier. Since we
+  // currently schedule the callback in multiple places, will wait until those
+  // are consolidated.
 
-        nextEffect.flags &= ~Placement;
-        break;
-      }
-
-      case PlacementAndUpdate: {
-        // Placement
-        commitPlacement(nextEffect); // Clear the "placement" from effect tag so that we know that this is
-        // inserted, before any life-cycles like componentDidMount gets called.
-
-        nextEffect.flags &= ~Placement; // Update
-
-        var _current = nextEffect.alternate;
-        commitWork(_current, nextEffect);
-        break;
-      }
-
-      case Hydrating: {
-        nextEffect.flags &= ~Hydrating;
-        break;
-      }
-
-      case HydratingAndUpdate: {
-        nextEffect.flags &= ~Hydrating; // Update
-
-        var _current2 = nextEffect.alternate;
-        commitWork(_current2, nextEffect);
-        break;
-      }
-
-      case Update: {
-        var _current3 = nextEffect.alternate;
-        commitWork(_current3, nextEffect);
-        break;
-      }
-
-      case Deletion: {
-        commitDeletion(root, nextEffect);
-        break;
-      }
-    }
-
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
-  }
-}
-
-function commitLayoutEffects(root, committedLanes) {
-  while (nextEffect !== null) {
-    setCurrentFiber(nextEffect);
-    var flags = nextEffect.flags;
-
-    if (flags & (Update | Callback)) {
-      var current = nextEffect.alternate;
-      commitLifeCycles(root, current, nextEffect);
-    }
+  if (
+    includesSomeLane(pendingPassiveEffectsLanes, SyncLane) &&
+    root.tag !== LegacyRoot
+  ) {
+    flushPassiveEffects();
+  } // If layout work was scheduled, flush it now.
 
-    {
-      if (flags & Ref) {
-        commitAttachRef(nextEffect);
-      }
-    }
+  flushSyncCallbacks();
 
-    resetCurrentFiber();
-    nextEffect = nextEffect.nextEffect;
-  }
+  return null;
 }
 
 function flushPassiveEffects() {
   // Returns whether passive effects were flushed.
-  if (pendingPassiveEffectsRenderPriority !== NoPriority$1) {
-    var priorityLevel =
-      pendingPassiveEffectsRenderPriority > NormalPriority$1
-        ? NormalPriority$1
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = NoPriority$1;
+  // TODO: Combine this check with the one in flushPassiveEFfectsImpl. We should
+  // probably just combine the two functions. I believe they were only separate
+  // in the first place because we used to wrap it with
+  // `Scheduler.runWithPriority`, which accepts a function. But now we track the
+  // priority within React itself, so we can mutate the variable directly.
+  if (rootWithPendingPassiveEffects !== null) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes);
+    var priority = lowerEventPriority(DefaultEventPriority, renderPriority);
+    var prevTransition = ReactCurrentBatchConfig$2.transition;
+    var previousPriority = getCurrentUpdatePriority();
 
-    {
-      return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      setCurrentUpdatePriority(priority);
+      return flushPassiveEffectsImpl();
+    } finally {
+      setCurrentUpdatePriority(previousPriority);
+      ReactCurrentBatchConfig$2.transition = prevTransition;
     }
   }
 
   return false;
 }
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-
+function enqueuePendingPassiveProfilerEffect(fiber) {
   {
-    fiber.flags |= PassiveUnmountPendingDev;
-    var alternate = fiber.alternate;
+    pendingPassiveProfilerEffects.push(fiber);
 
-    if (alternate !== null) {
-      alternate.flags |= PassiveUnmountPendingDev;
+    if (!rootDoesHavePassiveEffects) {
+      rootDoesHavePassiveEffects = true;
+      scheduleCallback(NormalPriority, function() {
+        flushPassiveEffects();
+        return null;
+      });
     }
   }
-
-  if (!rootDoesHavePassiveEffects) {
-    rootDoesHavePassiveEffects = true;
-    scheduleCallback(NormalPriority$1, function() {
-      flushPassiveEffects();
-      return null;
-    });
-  }
-}
-
-function invokePassiveEffectCreate(effect) {
-  var create = effect.create;
-  effect.destroy = create();
 }
 
 function flushPassiveEffectsImpl() {
@@ -19286,8 +20241,10 @@ function flushPassiveEffectsImpl() {
   }
 
   var root = rootWithPendingPassiveEffects;
-  var lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
+  rootWithPendingPassiveEffects = null; // TODO: This is sometimes out of sync with rootWithPendingPassiveEffects.
+  // Figure out why and fix it. It's not causing any known issues (probably
+  // because it's only used for profiling), but it's a refactor hazard.
+
   pendingPassiveEffectsLanes = NoLanes;
 
   if (!((executionContext & (RenderContext | CommitContext)) === NoContext)) {
@@ -19300,101 +20257,17 @@ function flushPassiveEffectsImpl() {
 
   var prevExecutionContext = executionContext;
   executionContext |= CommitContext;
-  var prevInteractions = pushInteractions(root); // It's important that ALL pending passive effect destroy functions are called
-  // before ANY passive effect create functions are called.
-  // Otherwise effects in sibling components might interfere with each other.
-  // e.g. a destroy function in one component may unintentionally override a ref
-  // value set by a create function in another component.
-  // Layout effects have the same constraint.
-  // First pass: Destroy stale passive effects.
-
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var _effect = unmountEffects[i];
-    var fiber = unmountEffects[i + 1];
-    var destroy = _effect.destroy;
-    _effect.destroy = undefined;
-
-    {
-      fiber.flags &= ~PassiveUnmountPendingDev;
-      var alternate = fiber.alternate;
-
-      if (alternate !== null) {
-        alternate.flags &= ~PassiveUnmountPendingDev;
-      }
-    }
-
-    if (typeof destroy === "function") {
-      {
-        setCurrentFiber(fiber);
-
-        {
-          invokeGuardedCallback(null, destroy, null);
-        }
-
-        if (hasCaughtError()) {
-          if (!(fiber !== null)) {
-            throw Error("Should be working on an effect.");
-          }
-
-          var error = clearCaughtError();
-          captureCommitPhaseError(fiber, error);
-        }
-
-        resetCurrentFiber();
-      }
-    }
-  } // Second pass: Create new passive effects.
-
-  var mountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-
-  for (var _i = 0; _i < mountEffects.length; _i += 2) {
-    var _effect2 = mountEffects[_i];
-    var _fiber = mountEffects[_i + 1];
-
-    {
-      setCurrentFiber(_fiber);
-
-      {
-        invokeGuardedCallback(null, invokePassiveEffectCreate, null, _effect2);
-      }
-
-      if (hasCaughtError()) {
-        if (!(_fiber !== null)) {
-          throw Error("Should be working on an effect.");
-        }
-
-        var _error4 = clearCaughtError();
-
-        captureCommitPhaseError(_fiber, _error4);
-      }
-
-      resetCurrentFiber();
-    }
-  } // Note: This currently assumes there are no passive effects on the root fiber
-  // because the root is not part of its own effect list.
-  // This could change in the future.
-
-  var effect = root.current.firstEffect;
-
-  while (effect !== null) {
-    var nextNextEffect = effect.nextEffect; // Remove nextEffect pointer to assist GC
+  commitPassiveUnmountEffects(root.current);
+  commitPassiveMountEffects(root, root.current); // TODO: Move to commitPassiveMountEffects
 
-    effect.nextEffect = null;
+  {
+    var profilerEffects = pendingPassiveProfilerEffects;
+    pendingPassiveProfilerEffects = [];
 
-    if (effect.flags & Deletion) {
-      detachFiberAfterEffects(effect);
+    for (var i = 0; i < profilerEffects.length; i++) {
+      var _fiber = profilerEffects[i];
+      commitPassiveEffectDurations(root, _fiber);
     }
-
-    effect = nextNextEffect;
-  }
-
-  {
-    popInteractions(prevInteractions);
-    finishPendingInteractions(root, lanes);
   }
 
   {
@@ -19402,11 +20275,20 @@ function flushPassiveEffectsImpl() {
   }
 
   executionContext = prevExecutionContext;
-  flushSyncCallbackQueue(); // If additional passive effects were scheduled, increment a counter. If this
+  flushSyncCallbacks(); // If additional passive effects were scheduled, increment a counter. If this
   // exceeds the limit, we'll fire a warning.
 
   nestedPassiveUpdateCount =
-    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1;
+    rootWithPendingPassiveEffects === null ? 0 : nestedPassiveUpdateCount + 1; // TODO: Move to commitPassiveMountEffects
+
+  onPostCommitRoot(root);
+
+  {
+    var stateNode = root.current.stateNode;
+    stateNode.effectDuration = 0;
+    stateNode.passiveEffectDuration = 0;
+  }
+
   return true;
 }
 
@@ -19443,23 +20325,26 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   if (root !== null) {
     markRootUpdated(root, SyncLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, SyncLane);
   }
 }
 
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
   if (sourceFiber.tag === HostRoot) {
     // Error was thrown at the root. There is no parent, so the root
     // itself should capture it.
-    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
+    captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error$1);
     return;
   }
 
-  var fiber = sourceFiber.return;
+  var fiber = null;
+
+  {
+    fiber = sourceFiber.return;
+  }
 
   while (fiber !== null) {
     if (fiber.tag === HostRoot) {
-      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error$1);
       return;
     } else if (fiber.tag === ClassComponent) {
       var ctor = fiber.type;
@@ -19470,7 +20355,7 @@ function captureCommitPhaseError(sourceFiber, error) {
         (typeof instance.componentDidCatch === "function" &&
           !isAlreadyFailedLegacyErrorBoundary(instance))
       ) {
-        var errorInfo = createCapturedValue(error, sourceFiber);
+        var errorInfo = createCapturedValue(error$1, sourceFiber);
         var update = createClassErrorUpdate(fiber, errorInfo, SyncLane);
         enqueueUpdate(fiber, update);
         var eventTime = requestEventTime();
@@ -19479,25 +20364,6 @@ function captureCommitPhaseError(sourceFiber, error) {
         if (root !== null) {
           markRootUpdated(root, SyncLane, eventTime);
           ensureRootIsScheduled(root, eventTime);
-          schedulePendingInteractions(root, SyncLane);
-        } else {
-          // This component has already been unmounted.
-          // We can't schedule any follow up work for the root because the fiber is already unmounted,
-          // but we can still call the log-only boundary so the error isn't swallowed.
-          //
-          // TODO This is only a temporary bandaid for the old reconciler fork.
-          // We can delete this special case once the new fork is merged.
-          if (
-            typeof instance.componentDidCatch === "function" &&
-            !isAlreadyFailedLegacyErrorBoundary(instance)
-          ) {
-            try {
-              instance.componentDidCatch(error, errorInfo);
-            } catch (errorToIgnore) {
-              // TODO Ignore this error? Rethrow it?
-              // This is kind of an edge case.
-            }
-          }
         }
 
         return;
@@ -19506,6 +20372,22 @@ function captureCommitPhaseError(sourceFiber, error) {
 
     fiber = fiber.return;
   }
+
+  {
+    // TODO: Until we re-land skipUnmountedBoundaries (see #20147), this warning
+    // will fire for errors that are thrown by destroy functions inside deleted
+    // trees. What it should instead do is propagate the error to the parent of
+    // the deleted tree. In the meantime, do not add this warning to the
+    // allowlist; this is only for our internal use.
+    error(
+      "Internal React error: Attempted to capture a commit phase error " +
+        "inside a detached tree. This indicates a bug in React. Likely " +
+        "causes include deleting the same fiber more than once, committing an " +
+        "already-finished tree, or an inconsistent return pointer.\n\n" +
+        "Error message:\n\n%s",
+      error$1
+    );
+  }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
   var pingCache = root.pingCache;
@@ -19549,15 +20431,16 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
   }
 
   ensureRootIsScheduled(root, eventTime);
-  schedulePendingInteractions(root, pingedLanes);
 }
 
 function retryTimedOutBoundary(boundaryFiber, retryLane) {
   // The boundary fiber (a Suspense component or SuspenseList component)
   // previously was rendered in its fallback state. One of the promises that
   // suspended it has resolved, which means at least part of the tree was
-  // likely unblocked. Try rendering again, at a new expiration time.
+  // likely unblocked. Try rendering again, at a new lanes.
   if (retryLane === NoLane) {
+    // TODO: Assign this to `suspenseState.retryLane`? to avoid
+    // unnecessary entanglement?
     retryLane = requestRetryLane(boundaryFiber);
   } // TODO: Special case idle priority?
 
@@ -19567,7 +20450,6 @@ function retryTimedOutBoundary(boundaryFiber, retryLane) {
   if (root !== null) {
     markRootUpdated(root, retryLane, eventTime);
     ensureRootIsScheduled(root, eventTime);
-    schedulePendingInteractions(root, retryLane);
   }
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
@@ -19657,7 +20539,7 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       return;
     }
 
-    if (!(fiber.mode & (BlockingMode | ConcurrentMode))) {
+    if (!(fiber.mode & ConcurrentMode)) {
       return;
     }
 
@@ -19670,15 +20552,14 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
       tag !== FunctionComponent &&
       tag !== ForwardRef &&
       tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
+      tag !== SimpleMemoComponent
     ) {
       // Only warn for user-defined components, not internal ones like Suspense.
       return;
     } // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
 
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
+    var componentName = getComponentNameFromFiber(fiber) || "ReactComponent";
 
     if (didWarnStateUpdateForNotYetMountedComponent !== null) {
       if (didWarnStateUpdateForNotYetMountedComponent.has(componentName)) {
@@ -19723,20 +20604,37 @@ function warnAboutUpdateOnUnmountedFiberInDEV(fiber) {
       tag !== FunctionComponent &&
       tag !== ForwardRef &&
       tag !== MemoComponent &&
-      tag !== SimpleMemoComponent &&
-      tag !== Block
+      tag !== SimpleMemoComponent
     ) {
       // Only warn for user-defined components, not internal ones like Suspense.
       return;
-    } // If there are pending passive effects unmounts for this Fiber,
-    // we can assume that they would have prevented this update.
+    }
 
-    if ((fiber.flags & PassiveUnmountPendingDev) !== NoFlags) {
-      return;
+    if ((fiber.flags & PassiveStatic) !== NoFlags) {
+      var updateQueue = fiber.updateQueue;
+
+      if (updateQueue !== null) {
+        var lastEffect = updateQueue.lastEffect;
+
+        if (lastEffect !== null) {
+          var firstEffect = lastEffect.next;
+          var effect = firstEffect;
+
+          do {
+            if (effect.destroy !== undefined) {
+              if ((effect.tag & Passive$1) !== NoFlags$1) {
+                return;
+              }
+            }
+
+            effect = effect.next;
+          } while (effect !== firstEffect);
+        }
+      }
     } // We show the whole stack but dedupe on the top component's name because
     // the problematic code almost always lies inside that component.
 
-    var componentName = getComponentName(fiber.type) || "ReactComponent";
+    var componentName = getComponentNameFromFiber(fiber) || "ReactComponent";
 
     if (didWarnStateUpdateForUnmountedComponent !== null) {
       if (didWarnStateUpdateForUnmountedComponent.has(componentName)) {
@@ -19820,14 +20718,23 @@ var beginWork$1;
       invokeGuardedCallback(null, beginWork, null, current, unitOfWork, lanes);
 
       if (hasCaughtError()) {
-        var replayError = clearCaughtError(); // `invokeGuardedCallback` sometimes sets an expando `_suppressLogging`.
-        // Rethrow this error instead of the original one.
+        var replayError = clearCaughtError();
 
-        throw replayError;
-      } else {
-        // This branch is reachable if the render phase is impure.
-        throw originalError;
-      }
+        if (
+          typeof replayError === "object" &&
+          replayError !== null &&
+          replayError._suppressLogging &&
+          typeof originalError === "object" &&
+          originalError !== null &&
+          !originalError._suppressLogging
+        ) {
+          // If suppressed, let the flag carry over to the original error which is the one we'll rethrow.
+          originalError._suppressLogging = true;
+        }
+      } // We always throw the original error in case the second render pass is not idempotent.
+      // This can happen if a memoized function or CommonJS module doesn't throw after first invokation.
+
+      throw originalError;
     }
   };
 }
@@ -19851,7 +20758,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
         case ForwardRef:
         case SimpleMemoComponent: {
           var renderingComponentName =
-            (workInProgress && getComponentName(workInProgress.type)) ||
+            (workInProgress && getComponentNameFromFiber(workInProgress)) ||
             "Unknown"; // Dedupe by the rendering component because it's the one that needs to be fixed.
 
           var dedupeKey = renderingComponentName;
@@ -19859,7 +20766,7 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
           if (!didWarnAboutUpdateInRenderForAnotherComponent.has(dedupeKey)) {
             didWarnAboutUpdateInRenderForAnotherComponent.add(dedupeKey);
             var setStateComponentName =
-              getComponentName(fiber.type) || "Unknown";
+              getComponentNameFromFiber(fiber) || "Unknown";
 
             error(
               "Cannot update a component (`%s`) while rendering a " +
@@ -19895,6 +20802,18 @@ function warnAboutRenderPhaseUpdatesInDEV(fiber) {
 var IsThisRendererActing = {
   current: false
 };
+function restorePendingUpdaters(root, lanes) {
+  {
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      memoizedUpdaters.forEach(function(schedulingFiber) {
+        addFiberToLanesMap(root, schedulingFiber, lanes);
+      }); // This function intentionally does not clear memoized updaters.
+      // Those may still be relevant to the current commit
+      // and a future one (e.g. Suspense).
+    }
+  }
+}
 function warnIfNotScopedWithMatchingAct(fiber) {
   {
     if (
@@ -19916,7 +20835,7 @@ function warnIfNotScopedWithMatchingAct(fiber) {
           "act(() => ...);\n\n" +
           "// for react-test-renderer:\n" + // Break up imports to avoid accidentally parsing them as dependencies.
             "import TestRenderer fr" +
-            "om react-test-renderer';\n" +
+            "om 'react-test-renderer';\n" +
             "const {act} = TestRenderer;\n" +
             "// ...\n" +
             "act(() => ...);"
@@ -19934,7 +20853,7 @@ function warnIfNotScopedWithMatchingAct(fiber) {
 function warnIfNotCurrentlyActingEffectsInDEV(fiber) {
   {
     if (
-      (fiber.mode & StrictMode) !== NoMode &&
+      (fiber.mode & StrictLegacyMode) !== NoMode &&
       IsSomeRendererActing.current === false &&
       IsThisRendererActing.current === false
     ) {
@@ -19949,7 +20868,7 @@ function warnIfNotCurrentlyActingEffectsInDEV(fiber) {
           "This ensures that you're testing the behavior the user would see " +
           "in the browser." +
           " Learn more at https://reactjs.org/link/wrap-tests-with-act",
-        getComponentName(fiber.type)
+        getComponentNameFromFiber(fiber)
       );
     }
   }
@@ -19978,7 +20897,7 @@ function warnIfNotCurrentlyActingUpdatesInDEV(fiber) {
             "This ensures that you're testing the behavior the user would see " +
             "in the browser." +
             " Learn more at https://reactjs.org/link/wrap-tests-with-act",
-          getComponentName(fiber.type)
+          getComponentNameFromFiber(fiber)
         );
       } finally {
         if (previousFiber) {
@@ -20004,7 +20923,7 @@ function warnIfUnmockedScheduler(fiber) {
       didWarnAboutUnmockedScheduler === false &&
       Scheduler.unstable_flushAllWithoutAsserting === undefined
     ) {
-      if (fiber.mode & BlockingMode || fiber.mode & ConcurrentMode) {
+      if (fiber.mode & ConcurrentMode) {
         didWarnAboutUnmockedScheduler = true;
 
         error(
@@ -20018,144 +20937,6 @@ function warnIfUnmockedScheduler(fiber) {
       }
     }
   }
-}
-
-function computeThreadID(root, lane) {
-  // Interaction threads are unique per root and expiration time.
-  // NOTE: Intentionally unsound cast. All that matters is that it's a number
-  // and it represents a batch of work. Could make a helper function instead,
-  // but meh this is fine for now.
-  return lane * 1000 + root.interactionThreadID;
-}
-
-function markSpawnedWork(lane) {
-  if (spawnedWorkDuringRender === null) {
-    spawnedWorkDuringRender = [lane];
-  } else {
-    spawnedWorkDuringRender.push(lane);
-  }
-}
-
-function scheduleInteractions(root, lane, interactions) {
-  if (interactions.size > 0) {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    var pendingInteractions = pendingInteractionMap.get(lane);
-
-    if (pendingInteractions != null) {
-      interactions.forEach(function(interaction) {
-        if (!pendingInteractions.has(interaction)) {
-          // Update the pending async work count for previously unscheduled interaction.
-          interaction.__count++;
-        }
-
-        pendingInteractions.add(interaction);
-      });
-    } else {
-      pendingInteractionMap.set(lane, new Set(interactions)); // Update the pending async work count for the current interactions.
-
-      interactions.forEach(function(interaction) {
-        interaction.__count++;
-      });
-    }
-
-    var subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lane);
-      subscriber.onWorkScheduled(interactions, threadID);
-    }
-  }
-}
-
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-
-function startWorkOnPendingInteractions(root, lanes) {
-  // we can accurately attribute time spent working on it, And so that cascading
-  // work triggered during the render phase will be associated with it.
-
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    if (includesSomeLane(lanes, scheduledLane)) {
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
-    }
-  }); // Store the current set of interactions on the FiberRoot for a few reasons:
-  // We can re-use it in hot functions like performConcurrentWorkOnRoot()
-  // without having to recalculate it. We will also use it in commitWork() to
-  // pass to any Profiler onRender() hooks. This also provides DevTools with a
-  // way to access it when the onCommitRoot() hook is called.
-
-  root.memoizedInteractions = interactions;
-
-  if (interactions.size > 0) {
-    var subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null) {
-      var threadID = computeThreadID(root, lanes);
-
-      try {
-        subscriber.onWorkStarted(interactions, threadID);
-      } catch (error) {
-        // If the subscriber throws, rethrow it in a separate task
-        scheduleCallback(ImmediatePriority$1, function() {
-          throw error;
-        });
-      }
-    }
-  }
-}
-
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  var subscriber;
-
-  try {
-    subscriber = tracing.__subscriberRef.current;
-
-    if (subscriber !== null && root.memoizedInteractions.size > 0) {
-      // FIXME: More than one lane can finish in a single commit.
-      var threadID = computeThreadID(root, committedLanes);
-      subscriber.onWorkStopped(root.memoizedInteractions, threadID);
-    }
-  } catch (error) {
-    // If the subscriber throws, rethrow it in a separate task
-    scheduleCallback(ImmediatePriority$1, function() {
-      throw error;
-    });
-  } finally {
-    // Clear completed interactions from the pending Map.
-    // Unless the render was suspended or cascading work was scheduled,
-    // In which case– leave pending interactions until the subsequent render.
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      // Only decrement the pending interaction count if we're done.
-      // If there's still work at the current priority,
-      // That indicates that we are waiting for suspense data.
-      if (!includesSomeLane(remainingLanesAfterCommit, lane)) {
-        pendingInteractionMap.delete(lane);
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-
-          if (subscriber !== null && interaction.__count === 0) {
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error) {
-              // If the subscriber throws, rethrow it in a separate task
-              scheduleCallback(ImmediatePriority$1, function() {
-                throw error;
-              });
-            }
-          }
-        });
-      }
-    });
-  }
 } // `act` testing API
 
 function shouldForceFlushFallbacksInDEV() {
@@ -20166,11 +20947,6 @@ function shouldForceFlushFallbacksInDEV() {
 
 var actingUpdatesScopeDepth = 0;
 
-function detachFiberAfterEffects(fiber) {
-  fiber.sibling = null;
-  fiber.stateNode = null;
-}
-
 var resolveFamily = null; // $FlowFixMe Flow gets confused by a WeakSet feature check below.
 
 var failedBoundaries = null;
@@ -20624,8 +21400,6 @@ var hasBadMapPolyfill;
   }
 }
 
-var debugCounter = 1;
-
 function FiberNode(tag, pendingProps, key, mode) {
   // Instance
   this.tag = tag;
@@ -20647,9 +21421,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.mode = mode; // Effects
 
   this.flags = NoFlags;
-  this.nextEffect = null;
-  this.firstEffect = null;
-  this.lastEffect = null;
+  this.subtreeFlags = NoFlags;
+  this.deletions = null;
   this.lanes = NoLanes;
   this.childLanes = NoLanes;
   this.alternate = null;
@@ -20682,7 +21455,6 @@ function FiberNode(tag, pendingProps, key, mode) {
 
   {
     // This isn't directly used but is handy for debugging internals:
-    this._debugID = debugCounter++;
     this._debugSource = null;
     this._debugOwner = null;
     this._debugNeedsRemount = false;
@@ -20762,7 +21534,6 @@ function createWorkInProgress(current, pendingProps) {
 
     {
       // DEV-only fields
-      workInProgress._debugID = current._debugID;
       workInProgress._debugSource = current._debugSource;
       workInProgress._debugOwner = current._debugOwner;
       workInProgress._debugHookTypes = current._debugHookTypes;
@@ -20776,11 +21547,10 @@ function createWorkInProgress(current, pendingProps) {
     workInProgress.type = current.type; // We already have an alternate.
     // Reset the effect tag.
 
-    workInProgress.flags = NoFlags; // The effect list is no longer valid.
+    workInProgress.flags = NoFlags; // The effects are no longer valid.
 
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
 
     {
       // We intentionally reset, rather than copy, actualDuration & actualStartTime.
@@ -20790,8 +21560,10 @@ function createWorkInProgress(current, pendingProps) {
       workInProgress.actualDuration = 0;
       workInProgress.actualStartTime = -1;
     }
-  }
+  } // Reset all effects except static ones.
+  // Static effects are not specific to a render.
 
+  workInProgress.flags = current.flags & StaticMask;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -20848,13 +21620,10 @@ function resetWorkInProgress(workInProgress, renderLanes) {
   // when they should be reading from current and writing to workInProgress.
   // We assume pendingProps, index, key, ref, return are still untouched to
   // avoid doing another reconciliation.
-  // Reset the effect tag but keep any Placement tags, since that's something
+  // Reset the effect flags but keep any Placement tags, since that's something
   // that child fiber is setting, not the reconciliation.
-  workInProgress.flags &= Placement; // The effect list is no longer valid.
+  workInProgress.flags &= StaticMask | Placement; // The effects are no longer valid.
 
-  workInProgress.nextEffect = null;
-  workInProgress.firstEffect = null;
-  workInProgress.lastEffect = null;
   var current = workInProgress.alternate;
 
   if (current === null) {
@@ -20862,6 +21631,7 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = NoLanes;
     workInProgress.lanes = renderLanes;
     workInProgress.child = null;
+    workInProgress.subtreeFlags = NoFlags;
     workInProgress.memoizedProps = null;
     workInProgress.memoizedState = null;
     workInProgress.updateQueue = null;
@@ -20879,6 +21649,8 @@ function resetWorkInProgress(workInProgress, renderLanes) {
     workInProgress.childLanes = current.childLanes;
     workInProgress.lanes = current.lanes;
     workInProgress.child = current.child;
+    workInProgress.subtreeFlags = NoFlags;
+    workInProgress.deletions = null;
     workInProgress.memoizedProps = current.memoizedProps;
     workInProgress.memoizedState = current.memoizedState;
     workInProgress.updateQueue = current.updateQueue; // Needed because Blocks store data on type.
@@ -20905,13 +21677,19 @@ function resetWorkInProgress(workInProgress, renderLanes) {
 
   return workInProgress;
 }
-function createHostRootFiber(tag) {
+function createHostRootFiber(
+  tag,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var mode;
 
   if (tag === ConcurrentRoot) {
-    mode = ConcurrentMode | BlockingMode | StrictMode;
-  } else if (tag === BlockingRoot) {
-    mode = BlockingMode | StrictMode;
+    mode = ConcurrentMode;
+
+    if (isStrictMode === true) {
+      mode |= StrictLegacyMode;
+    }
   } else {
     mode = NoMode;
   }
@@ -20963,7 +21741,8 @@ function createFiberFromTypeAndProps(
 
       case REACT_STRICT_MODE_TYPE:
         fiberTag = Mode;
-        mode |= StrictMode;
+        mode |= StrictLegacyMode;
+
         break;
 
       case REACT_PROFILER_TYPE:
@@ -20985,6 +21764,10 @@ function createFiberFromTypeAndProps(
 
       // eslint-disable-next-line no-fallthrough
 
+      case REACT_CACHE_TYPE:
+
+      // eslint-disable-next-line no-fallthrough
+
       default: {
         if (typeof type === "object" && type !== null) {
           switch (type.$$typeof) {
@@ -21014,10 +21797,6 @@ function createFiberFromTypeAndProps(
               fiberTag = LazyComponent;
               resolvedType = null;
               break getTag;
-
-            case REACT_BLOCK_TYPE:
-              fiberTag = Block;
-              break getTag;
           }
         }
 
@@ -21036,7 +21815,7 @@ function createFiberFromTypeAndProps(
               "named imports.";
           }
 
-          var ownerName = owner ? getComponentName(owner.type) : null;
+          var ownerName = owner ? getComponentNameFromFiber(owner) : null;
 
           if (ownerName) {
             info += "\n\nCheck the render method of `" + ownerName + "`.";
@@ -21101,14 +21880,15 @@ function createFiberFromFragment(elements, mode, lanes, key) {
 function createFiberFromProfiler(pendingProps, mode, lanes, key) {
   {
     if (typeof pendingProps.id !== "string") {
-      error('Profiler must specify an "id" as a prop');
+      error(
+        'Profiler must specify an "id" of type `string` as a prop. Received the type `%s` instead.',
+        typeof pendingProps.id
+      );
     }
   }
 
-  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode); // TODO: The Profiler fiber shouldn't have a type. It has a tag.
-
+  var fiber = createFiber(Profiler, pendingProps, key, mode | ProfileMode);
   fiber.elementType = REACT_PROFILER_TYPE;
-  fiber.type = REACT_PROFILER_TYPE;
   fiber.lanes = lanes;
 
   {
@@ -21122,51 +21902,25 @@ function createFiberFromProfiler(pendingProps, mode, lanes, key) {
 }
 
 function createFiberFromSuspense(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode); // TODO: The SuspenseComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  fiber.type = REACT_SUSPENSE_TYPE;
+  var fiber = createFiber(SuspenseComponent, pendingProps, key, mode);
   fiber.elementType = REACT_SUSPENSE_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromSuspenseList(pendingProps, mode, lanes, key) {
   var fiber = createFiber(SuspenseListComponent, pendingProps, key, mode);
-
-  {
-    // TODO: The SuspenseListComponent fiber shouldn't have a type. It has a tag.
-    // This needs to be fixed in getComponentName so that it relies on the tag
-    // instead.
-    fiber.type = REACT_SUSPENSE_LIST_TYPE;
-  }
-
   fiber.elementType = REACT_SUSPENSE_LIST_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode); // TODO: The OffscreenComponent fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_OFFSCREEN_TYPE;
-  }
-
+  var fiber = createFiber(OffscreenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_OFFSCREEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
 }
 function createFiberFromLegacyHidden(pendingProps, mode, lanes, key) {
-  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode); // TODO: The LegacyHidden fiber shouldn't have a type. It has a tag.
-  // This needs to be fixed in getComponentName so that it relies on the tag
-  // instead.
-
-  {
-    fiber.type = REACT_LEGACY_HIDDEN_TYPE;
-  }
-
+  var fiber = createFiber(LegacyHiddenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_LEGACY_HIDDEN_TYPE;
   fiber.lanes = lanes;
   return fiber;
@@ -21217,9 +21971,8 @@ function assignFiberPropertiesInDEV(target, source) {
   target.dependencies = source.dependencies;
   target.mode = source.mode;
   target.flags = source.flags;
-  target.nextEffect = source.nextEffect;
-  target.firstEffect = source.firstEffect;
-  target.lastEffect = source.lastEffect;
+  target.subtreeFlags = source.subtreeFlags;
+  target.deletions = source.deletions;
   target.lanes = source.lanes;
   target.childLanes = source.childLanes;
   target.alternate = source.alternate;
@@ -21231,7 +21984,6 @@ function assignFiberPropertiesInDEV(target, source) {
     target.treeBaseDuration = source.treeBaseDuration;
   }
 
-  target._debugID = source._debugID;
   target._debugSource = source._debugSource;
   target._debugOwner = source._debugOwner;
   target._debugNeedsRemount = source._debugNeedsRemount;
@@ -21251,7 +22003,7 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.pendingContext = null;
   this.hydrate = hydrate;
   this.callbackNode = null;
-  this.callbackPriority = NoLanePriority;
+  this.callbackPriority = NoLane;
   this.eventTimes = createLaneMap(NoLanes);
   this.expirationTimes = createLaneMap(NoTimestamp);
   this.pendingLanes = NoLanes;
@@ -21264,17 +22016,21 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.entanglements = createLaneMap(NoLanes);
 
   {
-    this.interactionThreadID = tracing.unstable_getThreadID();
-    this.memoizedInteractions = new Set();
-    this.pendingInteractionMap = new Map();
+    this.effectDuration = 0;
+    this.passiveEffectDuration = 0;
   }
 
   {
-    switch (tag) {
-      case BlockingRoot:
-        this._debugRootType = "createBlockingRoot()";
-        break;
+    this.memoizedUpdaters = new Set();
+    var pendingUpdatersLaneMap = (this.pendingUpdatersLaneMap = []);
+
+    for (var i = 0; i < TotalLanes; i++) {
+      pendingUpdatersLaneMap.push(new Set());
+    }
+  }
 
+  {
+    switch (tag) {
       case ConcurrentRoot:
         this._debugRootType = "createRoot()";
         break;
@@ -21286,13 +22042,28 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   }
 }
 
-function createFiberRoot(containerInfo, tag, hydrate, hydrationCallbacks) {
+function createFiberRoot(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
   var root = new FiberRootNode(containerInfo, tag, hydrate);
   // stateNode is any.
 
-  var uninitializedFiber = createHostRootFiber(tag);
+  var uninitializedFiber = createHostRootFiber(tag, isStrictMode);
   root.current = uninitializedFiber;
   uninitializedFiber.stateNode = root;
+
+  {
+    var _initialState = {
+      element: null
+    };
+    uninitializedFiber.memoizedState = _initialState;
+  }
+
   initializeUpdateQueue(uninitializedFiber);
   return root;
 }
@@ -21366,8 +22137,8 @@ function findHostInstanceWithWarning(component, methodName) {
       return null;
     }
 
-    if (hostFiber.mode & StrictMode) {
-      var componentName = getComponentName(fiber.type) || "Component";
+    if (hostFiber.mode & StrictLegacyMode) {
+      var componentName = getComponentNameFromFiber(fiber) || "Component";
 
       if (!didWarnAboutFindNodeInStrictMode[componentName]) {
         didWarnAboutFindNodeInStrictMode[componentName] = true;
@@ -21376,7 +22147,7 @@ function findHostInstanceWithWarning(component, methodName) {
         try {
           setCurrentFiber(hostFiber);
 
-          if (fiber.mode & StrictMode) {
+          if (fiber.mode & StrictLegacyMode) {
             error(
               "%s is deprecated in StrictMode. " +
                 "%s was passed an instance of %s which is inside StrictMode. " +
@@ -21415,8 +22186,21 @@ function findHostInstanceWithWarning(component, methodName) {
   }
 }
 
-function createContainer(containerInfo, tag, hydrate, hydrationCallbacks) {
-  return createFiberRoot(containerInfo, tag, hydrate);
+function createContainer(
+  containerInfo,
+  tag,
+  hydrate,
+  hydrationCallbacks,
+  isStrictMode,
+  concurrentUpdatesByDefaultOverride
+) {
+  return createFiberRoot(
+    containerInfo,
+    tag,
+    hydrate,
+    hydrationCallbacks,
+    isStrictMode
+  );
 }
 function updateContainer(element, container, parentComponent, callback) {
   {
@@ -21453,7 +22237,7 @@ function updateContainer(element, container, parentComponent, callback) {
           "triggering nested component updates from render is not allowed. " +
           "If necessary, trigger nested updates in componentDidUpdate.\n\n" +
           "Check the render method of %s.",
-        getComponentName(current.type) || "Unknown"
+        getComponentNameFromFiber(current) || "Unknown"
       );
     }
   }
@@ -21481,7 +22265,12 @@ function updateContainer(element, container, parentComponent, callback) {
   }
 
   enqueueUpdate(current$1, update);
-  scheduleUpdateOnFiber(current$1, lane, eventTime);
+  var root = scheduleUpdateOnFiber(current$1, lane, eventTime);
+
+  if (root !== null) {
+    entangleTransitions(root, current$1, lane);
+  }
+
   return lane;
 }
 function getPublicRootInstance(container) {
@@ -21500,6 +22289,14 @@ function getPublicRootInstance(container) {
   }
 }
 
+var shouldErrorImpl = function(fiber) {
+  return null;
+};
+
+function shouldError(fiber) {
+  return shouldErrorImpl(fiber);
+}
+
 var shouldSuspendImpl = function(fiber) {
   return false;
 };
@@ -21514,15 +22311,16 @@ var overrideProps = null;
 var overridePropsDeletePath = null;
 var overridePropsRenamePath = null;
 var scheduleUpdate = null;
+var setErrorHandler = null;
 var setSuspenseHandler = null;
 
 {
   var copyWithDeleteImpl = function(obj, path, index) {
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === path.length) {
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(key, 1);
       } else {
         delete updated[key];
@@ -21541,14 +22339,14 @@ var setSuspenseHandler = null;
 
   var copyWithRenameImpl = function(obj, oldPath, newPath, index) {
     var oldKey = oldPath[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj);
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj);
 
     if (index + 1 === oldPath.length) {
       var newKey = newPath[index]; // $FlowFixMe number or string is fine here
 
       updated[newKey] = updated[oldKey];
 
-      if (Array.isArray(updated)) {
+      if (isArray(updated)) {
         updated.splice(oldKey, 1);
       } else {
         delete updated[oldKey];
@@ -21593,7 +22391,7 @@ var setSuspenseHandler = null;
     }
 
     var key = path[index];
-    var updated = Array.isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
+    var updated = isArray(obj) ? obj.slice() : Object.assign({}, obj); // $FlowFixMe number or string is fine here
 
     updated[key] = copyWithSetImpl(obj[key], path, index + 1, value);
     return updated;
@@ -21701,6 +22499,10 @@ var setSuspenseHandler = null;
     scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
   };
 
+  setErrorHandler = function(newShouldErrorImpl) {
+    shouldErrorImpl = newShouldErrorImpl;
+  };
+
   setSuspenseHandler = function(newShouldSuspendImpl) {
     shouldSuspendImpl = newShouldSuspendImpl;
   };
@@ -21738,6 +22540,7 @@ function injectIntoDevTools(devToolsConfig) {
     overrideProps: overrideProps,
     overridePropsDeletePath: overridePropsDeletePath,
     overridePropsRenamePath: overridePropsRenamePath,
+    setErrorHandler: setErrorHandler,
     setSuspenseHandler: setSuspenseHandler,
     scheduleUpdate: scheduleUpdate,
     currentDispatcherRef: ReactCurrentDispatcher,
@@ -21750,7 +22553,10 @@ function injectIntoDevTools(devToolsConfig) {
     scheduleRoot: scheduleRoot,
     setRefreshHandler: setRefreshHandler,
     // Enables DevTools to append owner stacks to error messages in DEV mode.
-    getCurrentFiber: getCurrentFiberForDevTools
+    getCurrentFiber: getCurrentFiberForDevTools,
+    // Enables DevTools to detect reconciler version rather than renderer version
+    // which may not match for third party renderers.
+    reconcilerVersion: ReactVersion
   });
 }
 
@@ -21821,7 +22627,7 @@ var getInspectorDataForViewAtPoint;
   var createHierarchy = function(fiberHierarchy) {
     return fiberHierarchy.map(function(fiber) {
       return {
-        name: getComponentName(fiber.type),
+        name: getComponentNameFromType(fiber.type),
         getInspectorData: function(findNodeHandle) {
           return {
             props: getHostProps(fiber),
@@ -21936,23 +22742,25 @@ var getInspectorDataForViewAtPoint;
           }
 
           closestInstance =
-            internalInstanceHandle.stateNode.canonical._internalInstanceHandle;
+            internalInstanceHandle.stateNode.canonical._internalInstanceHandle; // Note: this is deprecated and we want to remove it ASAP. Keeping it here for React DevTools compatibility for now.
+
+          var nativeViewTag =
+            internalInstanceHandle.stateNode.canonical._nativeTag;
           nativeFabricUIManager.measure(
             internalInstanceHandle.stateNode.node,
             function(x, y, width, height, pageX, pageY) {
+              var inspectorData = getInspectorDataForInstance(closestInstance);
               callback(
-                Object.assign(
-                  {
-                    pointerY: locationY,
-                    frame: {
-                      left: pageX,
-                      top: pageY,
-                      width: width,
-                      height: height
-                    }
+                Object.assign({}, inspectorData, {
+                  pointerY: locationY,
+                  frame: {
+                    left: pageX,
+                    top: pageY,
+                    width: width,
+                    height: height
                   },
-                  getInspectorDataForInstance(closestInstance)
-                )
+                  touchedViewTag: nativeViewTag
+                })
               );
             }
           );
@@ -22005,7 +22813,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -22041,7 +22849,7 @@ function findHostInstance_DEPRECATED(componentOrHandle) {
   if (hostInstance.canonical) {
     // Fabric
     return hostInstance.canonical;
-  }
+  } // $FlowFixMe[incompatible-return]
 
   return hostInstance;
 }
@@ -22058,7 +22866,7 @@ function findNodeHandle(componentOrHandle) {
             "never access something that requires stale data from the previous " +
             "render, such as refs. Move this logic to componentDidMount and " +
             "componentDidUpdate instead.",
-          getComponentName(owner.type) || "A component"
+          getComponentNameFromType(owner.type) || "A component"
         );
       }
 
@@ -22131,17 +22939,43 @@ function dispatchCommand(handle, command, args) {
   }
 }
 
+function sendAccessibilityEvent(handle, eventType) {
+  if (handle._nativeTag == null) {
+    {
+      error(
+        "sendAccessibilityEvent was called with a ref that isn't a " +
+          "native component. Use React.forwardRef to get access to the underlying native component"
+      );
+    }
+
+    return;
+  }
+
+  if (handle._internalInstanceHandle) {
+    nativeFabricUIManager.sendAccessibilityEvent(
+      handle._internalInstanceHandle.stateNode.node,
+      eventType
+    );
+  } else {
+    ReactNativePrivateInterface.legacySendAccessibilityEvent(
+      handle._nativeTag,
+      eventType
+    );
+  }
+}
+
 function render(element, containerTag, callback) {
   var root = roots.get(containerTag);
 
   if (!root) {
     // TODO (bvaughn): If we decide to keep the wrapper component,
     // We could create a wrapper for containerTag as well to reduce special casing.
-    root = createContainer(containerTag, LegacyRoot, false);
+    root = createContainer(containerTag, LegacyRoot, false, null, false);
     roots.set(containerTag, root);
   }
 
-  updateContainer(element, root, null, callback);
+  updateContainer(element, root, null, callback); // $FlowIssue Flow has hardcoded values for React DOM that don't work with RN
+
   return getPublicRootInstance(root);
 }
 
@@ -22204,6 +23038,7 @@ exports.dispatchCommand = dispatchCommand;
 exports.findHostInstance_DEPRECATED = findHostInstance_DEPRECATED;
 exports.findNodeHandle = findNodeHandle;
 exports.render = render;
+exports.sendAccessibilityEvent = sendAccessibilityEvent;
 exports.unmountComponentAtNode = unmountComponentAtNode;
 exports.unmountComponentAtNodeAndRemoveContainer = unmountComponentAtNodeAndRemoveContainer;
 exports.unstable_batchedUpdates = batchedUpdates;
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
index b113a690434868..e4a6a9d53ff250 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
@@ -7,14 +7,14 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated
+ * @generated SignedSource<<4b2938a7eccbcb5ebcaad8eeb6f50cee>>
  */
 
 "use strict";
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface"),
-  React = require("react"),
-  Scheduler = require("scheduler");
+  React = require("react");
+var Scheduler = require("scheduler");
 function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
@@ -62,7 +62,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -74,7 +75,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -288,36 +289,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -325,9 +336,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -337,12 +348,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -568,7 +579,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -919,7 +930,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_222 = {
+var injectedNamesToPlugins$jscomp$inline_224 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -954,34 +965,34 @@ var injectedNamesToPlugins$jscomp$inline_222 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_223 = !1,
-  pluginName$jscomp$inline_224;
-for (pluginName$jscomp$inline_224 in injectedNamesToPlugins$jscomp$inline_222)
+  isOrderingDirty$jscomp$inline_225 = !1,
+  pluginName$jscomp$inline_226;
+for (pluginName$jscomp$inline_226 in injectedNamesToPlugins$jscomp$inline_224)
   if (
-    injectedNamesToPlugins$jscomp$inline_222.hasOwnProperty(
-      pluginName$jscomp$inline_224
+    injectedNamesToPlugins$jscomp$inline_224.hasOwnProperty(
+      pluginName$jscomp$inline_226
     )
   ) {
-    var pluginModule$jscomp$inline_225 =
-      injectedNamesToPlugins$jscomp$inline_222[pluginName$jscomp$inline_224];
+    var pluginModule$jscomp$inline_227 =
+      injectedNamesToPlugins$jscomp$inline_224[pluginName$jscomp$inline_226];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_224) ||
-      namesToPlugins[pluginName$jscomp$inline_224] !==
-        pluginModule$jscomp$inline_225
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_226) ||
+      namesToPlugins[pluginName$jscomp$inline_226] !==
+        pluginModule$jscomp$inline_227
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_224])
+      if (namesToPlugins[pluginName$jscomp$inline_226])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_224 +
+            pluginName$jscomp$inline_226 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_224
-      ] = pluginModule$jscomp$inline_225;
-      isOrderingDirty$jscomp$inline_223 = !0;
+        pluginName$jscomp$inline_226
+      ] = pluginModule$jscomp$inline_227;
+      isOrderingDirty$jscomp$inline_225 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_223 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_225 && recomputePluginOrdering();
 var instanceCache = new Map(),
   instanceProps = new Map();
 function getInstanceFromTag(tag) {
@@ -1005,7 +1016,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1137,10 +1148,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1155,11 +1166,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1169,7 +1180,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1186,6 +1197,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1195,24 +1208,83 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1221,7 +1293,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1309,33 +1381,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 var emptyObject = {},
   removedKeys = null,
@@ -1355,7 +1410,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1401,9 +1456,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1428,7 +1483,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1444,7 +1499,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1461,7 +1516,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1571,61 +1626,280 @@ function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   };
 }
 var ReactNativeFiberHostComponent = (function() {
-  function ReactNativeFiberHostComponent(tag, viewConfig) {
-    this._nativeTag = tag;
-    this._children = [];
-    this.viewConfig = viewConfig;
-  }
-  var _proto = ReactNativeFiberHostComponent.prototype;
-  _proto.blur = function() {
-    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
-  };
-  _proto.focus = function() {
-    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
-  };
-  _proto.measure = function(callback) {
-    ReactNativePrivateInterface.UIManager.measure(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureInWindow = function(callback) {
-    ReactNativePrivateInterface.UIManager.measureInWindow(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
-    if ("number" === typeof relativeToNativeNode)
-      var relativeNode = relativeToNativeNode;
-    else
-      relativeToNativeNode._nativeTag &&
-        (relativeNode = relativeToNativeNode._nativeTag);
-    null != relativeNode &&
-      ReactNativePrivateInterface.UIManager.measureLayout(
+    function ReactNativeFiberHostComponent(tag, viewConfig) {
+      this._nativeTag = tag;
+      this._children = [];
+      this.viewConfig = viewConfig;
+    }
+    var _proto = ReactNativeFiberHostComponent.prototype;
+    _proto.blur = function() {
+      ReactNativePrivateInterface.TextInputState.blurTextInput(this);
+    };
+    _proto.focus = function() {
+      ReactNativePrivateInterface.TextInputState.focusTextInput(this);
+    };
+    _proto.measure = function(callback) {
+      ReactNativePrivateInterface.UIManager.measure(
         this._nativeTag,
-        relativeNode,
-        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  _proto.setNativeProps = function(nativeProps) {
-    nativeProps = diffProperties(
-      null,
-      emptyObject,
-      nativeProps,
-      this.viewConfig.validAttributes
-    );
-    null != nativeProps &&
-      ReactNativePrivateInterface.UIManager.updateView(
+    };
+    _proto.measureInWindow = function(callback) {
+      ReactNativePrivateInterface.UIManager.measureInWindow(
         this._nativeTag,
-        this.viewConfig.uiViewClassName,
-        nativeProps
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  return ReactNativeFiberHostComponent;
-})();
-function shim() {
+    };
+    _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
+      if ("number" === typeof relativeToNativeNode)
+        var relativeNode = relativeToNativeNode;
+      else
+        relativeToNativeNode._nativeTag &&
+          (relativeNode = relativeToNativeNode._nativeTag);
+      null != relativeNode &&
+        ReactNativePrivateInterface.UIManager.measureLayout(
+          this._nativeTag,
+          relativeNode,
+          mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+          mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        );
+    };
+    _proto.setNativeProps = function(nativeProps) {
+      nativeProps = diffProperties(
+        null,
+        emptyObject,
+        nativeProps,
+        this.viewConfig.validAttributes
+      );
+      null != nativeProps &&
+        ReactNativePrivateInterface.UIManager.updateView(
+          this._nativeTag,
+          this.viewConfig.uiViewClassName,
+          nativeProps
+        );
+    };
+    return ReactNativeFiberHostComponent;
+  })(),
+  scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null;
+function onCommitRoot(root) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        void 0,
+        128 === (root.current.flags & 128)
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 === (root.current.mode & 32) &&
+    0 !== (nextLanes & 4) &&
+    (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$8 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$8;
+    remainingLanes[index$8] = 0;
+    eventTimes[index$8] = -1;
+    root[index$8] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$9 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$9;
+    (lane & entangledLanes) | (root[index$9] & entangledLanes) &&
+      (root[index$9] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
+function shim$1() {
   throw Error(
     "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
   );
@@ -1673,7 +1947,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1727,13 +2002,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1769,346 +2044,79 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  Scheduler_now = Scheduler.unstable_now;
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
+  if (!isFlushingSyncQueue && null !== syncQueue) {
+    isFlushingSyncQueue = !0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
+    try {
+      var queue = syncQueue;
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
+      syncQueue = null;
+      includesLegacySyncCallbacks = !1;
+    } catch (error) {
+      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+      error);
+    } finally {
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
+    }
   }
+  return null;
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
+var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
+function is(x, y) {
+  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
+}
+var objectIs = "function" === typeof Object.is ? Object.is : is;
+function shallowEqual(objA, objB) {
+  if (objectIs(objA, objB)) return !0;
+  if (
+    "object" !== typeof objA ||
+    null === objA ||
+    "object" !== typeof objB ||
+    null === objB
+  )
+    return !1;
+  var keysA = Object.keys(objA),
+    keysB = Object.keys(objB);
+  if (keysA.length !== keysB.length) return !1;
+  for (keysB = 0; keysB < keysA.length; keysB++)
+    if (
+      !hasOwnProperty.call(objB, keysA[keysB]) ||
+      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
+    )
+      return !1;
+  return !0;
+}
+function describeFiber(fiber) {
+  switch (fiber.tag) {
     case 5:
-      return 97;
-    case 3:
+      return describeComponentFrame(fiber.type, null, null);
+    case 16:
+      return describeComponentFrame("Lazy", null, null);
+    case 13:
+      return describeComponentFrame("Suspense", null, null);
+    case 19:
+      return describeComponentFrame("SuspenseList", null, null);
+    case 0:
     case 2:
+    case 15:
+      return describeFunctionComponentFrame(fiber.type, null);
+    case 11:
+      return describeFunctionComponentFrame(fiber.type.render, null);
     case 1:
-      return 95;
-    case 0:
-      return 90;
+      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
-}
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority,
-  fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
-  if (!isFlushingSyncQueue && null !== syncQueue) {
-    isFlushingSyncQueue = !0;
-    var i = 0;
-    try {
-      var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
-      syncQueue = null;
-    } catch (error) {
-      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
-      error);
-    } finally {
-      isFlushingSyncQueue = !1;
-    }
-  }
-}
-var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
-function is(x, y) {
-  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
-}
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
-function shallowEqual(objA, objB) {
-  if (objectIs(objA, objB)) return !0;
-  if (
-    "object" !== typeof objA ||
-    null === objA ||
-    "object" !== typeof objB ||
-    null === objB
-  )
-    return !1;
-  var keysA = Object.keys(objA),
-    keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) return !1;
-  for (keysB = 0; keysB < keysA.length; keysB++)
-    if (
-      !hasOwnProperty.call(objB, keysA[keysB]) ||
-      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
-    )
-      return !1;
-  return !0;
-}
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case 5:
-      return describeComponentFrame(fiber.type, null, null);
-    case 16:
-      return describeComponentFrame("Lazy", null, null);
-    case 13:
-      return describeComponentFrame("Suspense", null, null);
-    case 19:
-      return describeComponentFrame("SuspenseList", null, null);
-    case 0:
-    case 2:
-    case 15:
-      return describeFunctionComponentFrame(fiber.type, null);
-    case 11:
-      return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
-    case 1:
-      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
-    default:
-      return "";
+      return "";
   }
 }
 function getStackByFiberInDevAndProd(workInProgress) {
@@ -2137,14 +2145,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue = currentValue;
+  context._currentValue = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2164,44 +2172,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2227,14 +2231,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 2)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2303,111 +2327,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2463,7 +2487,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2474,7 +2499,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2484,7 +2510,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2556,7 +2583,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2578,7 +2604,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2631,25 +2656,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2681,16 +2703,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2705,7 +2727,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2794,7 +2825,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2819,22 +2850,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2862,15 +2885,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2881,7 +2896,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3058,66 +3073,49 @@ function ChildReconciler(shouldTrackSideEffects) {
     return iteratorFn;
   }
   return function(returnFiber, currentFirstChild, newChild, lanes) {
-    var isUnkeyedTopLevelFragment =
-      "object" === typeof newChild &&
+    "object" === typeof newChild &&
       null !== newChild &&
       newChild.type === REACT_FRAGMENT_TYPE &&
-      null === newChild.key;
-    isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+      null === newChild.key &&
+      (newChild = newChild.props.children);
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
             for (
-              isUnkeyedTopLevelFragment = currentFirstChild;
-              null !== isUnkeyedTopLevelFragment;
+              var key = newChild.key, child = currentFirstChild;
+              null !== child;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (child.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === child.tag) {
+                    deleteRemainingChildren(returnFiber, child.sibling);
+                    currentFirstChild = useFiber(
+                      child,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (child.elementType === key) {
+                  deleteRemainingChildren(returnFiber, child.sibling);
+                  currentFirstChild = useFiber(child, newChild.props);
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    child,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
-                deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
+                deleteRemainingChildren(returnFiber, child);
                 break;
-              } else deleteChild(returnFiber, isUnkeyedTopLevelFragment);
-              isUnkeyedTopLevelFragment = isUnkeyedTopLevelFragment.sibling;
+              } else deleteChild(returnFiber, child);
+              child = child.sibling;
             }
             newChild.type === REACT_FRAGMENT_TYPE
               ? ((currentFirstChild = createFiberFromFragment(
@@ -3147,12 +3145,8 @@ function ChildReconciler(shouldTrackSideEffects) {
           return placeSingleChild(returnFiber);
         case REACT_PORTAL_TYPE:
           a: {
-            for (
-              isUnkeyedTopLevelFragment = newChild.key;
-              null !== currentFirstChild;
-
-            ) {
-              if (currentFirstChild.key === isUnkeyedTopLevelFragment)
+            for (child = newChild.key; null !== currentFirstChild; ) {
+              if (currentFirstChild.key === child)
                 if (
                   4 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
@@ -3188,9 +3182,24 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
-    if ("string" === typeof newChild || "number" === typeof newChild)
-      return (
-        (newChild = "" + newChild),
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
+    return "string" === typeof newChild || "number" === typeof newChild
+      ? ((newChild = "" + newChild),
         null !== currentFirstChild && 6 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(currentFirstChild, newChild)),
@@ -3204,36 +3213,8 @@ function ChildReconciler(shouldTrackSideEffects) {
             )),
             (currentFirstChild.return = returnFiber),
             (returnFiber = currentFirstChild)),
-        placeSingleChild(returnFiber)
-      );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
-    if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
-      switch (returnFiber.tag) {
-        case 1:
-        case 22:
-        case 0:
-        case 11:
-        case 15:
-          throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
-              "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
-          );
-      }
-    return deleteRemainingChildren(returnFiber, currentFirstChild);
+        placeSingleChild(returnFiber))
+      : deleteRemainingChildren(returnFiber, currentFirstChild);
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
@@ -3288,10 +3269,10 @@ function findFirstSuspended(row) {
   for (var node = row; null !== node; ) {
     if (13 === node.tag) {
       var state = node.memoizedState;
-      if (null !== state && (null === state.dehydrated || shim() || shim()))
+      if (null !== state && (null === state.dehydrated || shim$1() || shim$1()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3443,10 +3424,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3471,22 +3453,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3512,7 +3505,7 @@ function rerenderReducer(reducer) {
   }
   return [newState, dispatch];
 }
-function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
+function readFromUnsubscribedMutableSource(root, source, getSnapshot) {
   var getVersion = source._getVersion;
   getVersion = getVersion(source._source);
   var JSCompiler_inline_result = source._workInProgressVersionPrimary;
@@ -3526,7 +3519,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3539,7 +3532,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     version = getVersion(source._source),
     dispatcher = ReactCurrentDispatcher$1.current,
     _dispatcher$useState = dispatcher.useState(function() {
-      return readFromUnsubcribedMutableSource(root, source, getSnapshot);
+      return readFromUnsubscribedMutableSource(root, source, getSnapshot);
     }),
     setSnapshot = _dispatcher$useState[1],
     snapshot = _dispatcher$useState[0];
@@ -3556,25 +3549,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$13 = 31 - clz32(lanes),
-            lane = 1 << index$13;
-          entanglements[index$13] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3601,6 +3582,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3612,7 +3595,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     )),
     (_dispatcher$useState.queue = hook),
     (_dispatcher$useState.baseQueue = null),
-    (snapshot = readFromUnsubcribedMutableSource(root, source, getSnapshot)),
+    (snapshot = readFromUnsubscribedMutableSource(root, source, getSnapshot)),
     (_dispatcher$useState.memoizedState = _dispatcher$useState.baseState = snapshot));
   return snapshot;
 }
@@ -3626,6 +3609,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3674,7 +3659,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3682,10 +3667,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3746,19 +3731,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3770,33 +3754,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 2)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3853,6 +3863,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3894,7 +3906,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3943,8 +3955,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3985,54 +3998,523 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
       return rerenderReducer(basicStateReducer)[0];
     },
     unstable_isNewReconciler: !1
-  },
-  ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
-  didReceiveUpdate = !1;
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  workInProgress.child =
-    null === current
-      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
-      : reconcileChildFibers(
-          workInProgress,
-          current.child,
-          nextChildren,
-          renderLanes
-        );
+  };
+function createCapturedValue(value, source) {
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
 }
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  Component = Component.render;
-  var ref = workInProgress.ref;
-  prepareToReadContext(workInProgress, renderLanes);
-  nextProps = renderWithHooks(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    ref,
-    renderLanes
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
   );
-  if (null !== current && !didReceiveUpdate)
-    return (
-      (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
-      (current.lanes &= ~renderLanes),
-      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
-    );
-  workInProgress.flags |= 1;
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      return getDerivedStateFromError(error);
+    };
+    lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
+var appendAllChildren, updateHostContainer, updateHostComponent, updateHostText;
+appendAllChildren = function(parent, workInProgress) {
+  for (var node = workInProgress.child; null !== node; ) {
+    if (5 === node.tag || 6 === node.tag) parent._children.push(node.stateNode);
+    else if (4 !== node.tag && null !== node.child) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
+    if (node === workInProgress) break;
+    for (; null === node.sibling; ) {
+      if (null === node.return || node.return === workInProgress) return;
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+};
+updateHostContainer = function() {};
+updateHostComponent = function(current, workInProgress, type, newProps) {
+  current.memoizedProps !== newProps &&
+    (requiredContext(contextStackCursor$1.current),
+    (workInProgress.updateQueue = UPDATE_SIGNAL)) &&
+    (workInProgress.flags |= 4);
+};
+updateHostText = function(current, workInProgress, oldText, newText) {
+  oldText !== newText && (workInProgress.flags |= 4);
+};
+function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
+  switch (renderState.tailMode) {
+    case "hidden":
+      hasRenderedATailFallback = renderState.tail;
+      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
+        null !== hasRenderedATailFallback.alternate &&
+          (lastTailNode = hasRenderedATailFallback),
+          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
+      null === lastTailNode
+        ? (renderState.tail = null)
+        : (lastTailNode.sibling = null);
+      break;
+    case "collapsed":
+      lastTailNode = renderState.tail;
+      for (var lastTailNode$38 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$38 = lastTailNode),
+          (lastTailNode = lastTailNode.sibling);
+      null === lastTailNode$38
+        ? hasRenderedATailFallback || null === renderState.tail
+          ? (renderState.tail = null)
+          : (renderState.tail.sibling = null)
+        : (lastTailNode$38.sibling = null);
+  }
+}
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    for (var child$39 = completedWork.child; null !== child$39; )
+      (newChildLanes |= child$39.lanes | child$39.childLanes),
+        (subtreeFlags |= child$39.subtreeFlags & 1835008),
+        (subtreeFlags |= child$39.flags & 1835008),
+        (child$39.return = completedWork),
+        (child$39 = child$39.sibling);
+  else
+    for (child$39 = completedWork.child; null !== child$39; )
+      (newChildLanes |= child$39.lanes | child$39.childLanes),
+        (subtreeFlags |= child$39.subtreeFlags),
+        (subtreeFlags |= child$39.flags),
+        (child$39.return = completedWork),
+        (child$39 = child$39.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
+function completeWork(current, workInProgress, renderLanes) {
+  var newProps = workInProgress.pendingProps;
+  switch (workInProgress.tag) {
+    case 2:
+    case 16:
+    case 15:
+    case 0:
+    case 11:
+    case 7:
+    case 8:
+    case 12:
+    case 9:
+    case 14:
+      return bubbleProperties(workInProgress), null;
+    case 1:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 3:
+      return (
+        (newProps = workInProgress.stateNode),
+        popHostContainer(),
+        pop(didPerformWorkStackCursor),
+        pop(contextStackCursor),
+        resetWorkInProgressVersions(),
+        newProps.pendingContext &&
+          ((newProps.context = newProps.pendingContext),
+          (newProps.pendingContext = null)),
+        (null !== current && null !== current.child) ||
+          newProps.hydrate ||
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 5:
+      popHostContext(workInProgress);
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
+      if (null !== current && null != workInProgress.stateNode)
+        updateHostComponent(
+          current,
+          workInProgress,
+          type,
+          newProps,
+          renderLanes
+        ),
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
+      else {
+        if (!newProps) {
+          if (null === workInProgress.stateNode)
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          bubbleProperties(workInProgress);
+          return null;
+        }
+        requiredContext(contextStackCursor$1.current);
+        current = allocateTag();
+        type = getViewConfigForType(type);
+        var updatePayload = diffProperties(
+          null,
+          emptyObject,
+          newProps,
+          type.validAttributes
+        );
+        ReactNativePrivateInterface.UIManager.createView(
+          current,
+          type.uiViewClassName,
+          renderLanes,
+          updatePayload
+        );
+        renderLanes = new ReactNativeFiberHostComponent(
+          current,
+          type,
+          workInProgress
+        );
+        instanceCache.set(current, workInProgress);
+        instanceProps.set(current, newProps);
+        appendAllChildren(renderLanes, workInProgress, !1, !1);
+        workInProgress.stateNode = renderLanes;
+        finalizeInitialChildren(renderLanes) && (workInProgress.flags |= 4);
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 6:
+      if (current && null != workInProgress.stateNode)
+        updateHostText(
+          current,
+          workInProgress,
+          current.memoizedProps,
+          newProps
+        );
+      else {
+        if ("string" !== typeof newProps && null === workInProgress.stateNode)
+          throw Error(
+            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+          );
+        current = requiredContext(rootInstanceStackCursor.current);
+        if (!requiredContext(contextStackCursor$1.current).isInAParentText)
+          throw Error(
+            "Text strings must be rendered within a <Text> component."
+          );
+        renderLanes = allocateTag();
+        ReactNativePrivateInterface.UIManager.createView(
+          renderLanes,
+          "RCTRawText",
+          current,
+          { text: newProps }
+        );
+        instanceCache.set(renderLanes, workInProgress);
+        workInProgress.stateNode = renderLanes;
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 13:
+      pop(suspenseStackCursor);
+      newProps = workInProgress.memoizedState;
+      if (0 !== (workInProgress.flags & 128))
+        return (workInProgress.lanes = renderLanes), workInProgress;
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (
+        null !== newProps &&
+        !renderLanes &&
+        ((workInProgress.child.flags |= 4096), 0 !== (workInProgress.mode & 1))
+      )
+        if (
+          (null === current &&
+            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
+          0 !== (suspenseStackCursor.current & 1)
+        )
+          0 === workInProgressRootExitStatus &&
+            (workInProgressRootExitStatus = 3);
+        else {
+          if (
+            0 === workInProgressRootExitStatus ||
+            3 === workInProgressRootExitStatus
+          )
+            workInProgressRootExitStatus = 4;
+          null === workInProgressRoot ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
+            markRootSuspended$1(
+              workInProgressRoot,
+              workInProgressRootRenderLanes
+            );
+        }
+      null !== workInProgress.updateQueue && (workInProgress.flags |= 4);
+      bubbleProperties(workInProgress);
+      return null;
+    case 4:
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 10:
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 17:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 19:
+      pop(suspenseStackCursor);
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      updatePayload = type.rendering;
+      if (null === updatePayload)
+        if (newProps) cutOffTailIfNeeded(type, !1);
+        else {
+          if (
+            0 !== workInProgressRootExitStatus ||
+            (null !== current && 0 !== (current.flags & 128))
+          )
+            for (current = workInProgress.child; null !== current; ) {
+              updatePayload = findFirstSuspended(current);
+              if (null !== updatePayload) {
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
+                current = updatePayload.updateQueue;
+                null !== current &&
+                  ((workInProgress.updateQueue = current),
+                  (workInProgress.flags |= 4));
+                workInProgress.subtreeFlags = 0;
+                current = renderLanes;
+                for (newProps = workInProgress.child; null !== newProps; )
+                  (renderLanes = newProps),
+                    (type = current),
+                    (renderLanes.flags &= 1835010),
+                    (updatePayload = renderLanes.alternate),
+                    null === updatePayload
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = type),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null))
+                      : ((renderLanes.childLanes = updatePayload.childLanes),
+                        (renderLanes.lanes = updatePayload.lanes),
+                        (renderLanes.child = updatePayload.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps =
+                          updatePayload.memoizedProps),
+                        (renderLanes.memoizedState =
+                          updatePayload.memoizedState),
+                        (renderLanes.updateQueue = updatePayload.updateQueue),
+                        (renderLanes.type = updatePayload.type),
+                        (type = updatePayload.dependencies),
+                        (renderLanes.dependencies =
+                          null === type
+                            ? null
+                            : {
+                                lanes: type.lanes,
+                                firstContext: type.firstContext
+                              })),
+                    (newProps = newProps.sibling);
+                push(
+                  suspenseStackCursor,
+                  (suspenseStackCursor.current & 1) | 2
+                );
+                return workInProgress.child;
+              }
+              current = current.sibling;
+            }
+          null !== type.tail &&
+            now() > workInProgressRootRenderTargetTime &&
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
+        }
+      else {
+        if (!newProps)
+          if (
+            ((current = findFirstSuspended(updatePayload)), null !== current)
+          ) {
+            if (
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              (current = current.updateQueue),
+              null !== current &&
+                ((workInProgress.updateQueue = current),
+                (workInProgress.flags |= 4)),
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
+                !updatePayload.alternate)
+            )
+              return bubbleProperties(workInProgress), null;
+          } else
+            2 * now() - type.renderingStartTime >
+              workInProgressRootRenderTargetTime &&
+              1073741824 !== renderLanes &&
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
+          ? ((updatePayload.sibling = workInProgress.child),
+            (workInProgress.child = updatePayload))
+          : ((current = type.last),
+            null !== current
+              ? (current.sibling = updatePayload)
+              : (workInProgress.child = updatePayload),
+            (type.last = updatePayload));
+      }
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
+    case 23:
+      return (
+        popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
+        null !== current &&
+          (null !== current.memoizedState) !== renderLanes &&
+          "unstable-defer-without-hiding" !== newProps.mode &&
+          23 !== workInProgress.tag &&
+          (workInProgress.flags |= 4096),
+        renderLanes && 0 !== (workInProgress.mode & 1)
+          ? 0 !== (subtreeRenderLanes & 1073741824) &&
+            (bubbleProperties(workInProgress),
+            23 !== workInProgress.tag &&
+              workInProgress.subtreeFlags & 6 &&
+              "unstable-defer-without-hiding" !== newProps.mode &&
+              (workInProgress.flags |= 4096))
+          : bubbleProperties(workInProgress),
+        null
+      );
+  }
+  throw Error(
+    "Unknown unit of work tag (" +
+      workInProgress.tag +
+      "). This error is likely caused by a bug in React. Please file an issue."
+  );
+}
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
+  didReceiveUpdate = !1;
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  workInProgress.child =
+    null === current
+      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
+      : reconcileChildFibers(
+          workInProgress,
+          current.child,
+          nextChildren,
+          renderLanes
+        );
+}
+function updateForwardRef(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  Component = Component.render;
+  var ref = workInProgress.ref;
+  prepareToReadContext(workInProgress, renderLanes);
+  nextProps = renderWithHooks(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    ref,
+    renderLanes
+  );
+  if (null !== current && !didReceiveUpdate)
+    return (
+      (workInProgress.updateQueue = current.updateQueue),
+      (workInProgress.flags &= -1029),
+      (current.lanes &= ~renderLanes),
+      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
+    );
+  workInProgress.flags |= 1;
   reconcileChildren(current, workInProgress, nextProps, renderLanes);
   return workInProgress.child;
 }
@@ -4041,7 +4523,6 @@ function updateMemoComponent(
   workInProgress,
   Component,
   nextProps,
-  updateLanes,
   renderLanes
 ) {
   if (null === current) {
@@ -4061,7 +4542,6 @@ function updateMemoComponent(
           workInProgress,
           type,
           nextProps,
-          updateLanes,
           renderLanes
         )
       );
@@ -4078,14 +4558,13 @@ function updateMemoComponent(
     return (workInProgress.child = current);
   }
   type = current.child;
-  if (
-    0 === (updateLanes & renderLanes) &&
-    ((updateLanes = type.memoizedProps),
-    (Component = Component.compare),
-    (Component = null !== Component ? Component : shallowEqual),
-    Component(updateLanes, nextProps) && current.ref === workInProgress.ref)
-  )
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  if (0 === (current.lanes & renderLanes)) {
+    var prevProps = type.memoizedProps;
+    Component = Component.compare;
+    Component = null !== Component ? Component : shallowEqual;
+    if (Component(prevProps, nextProps) && current.ref === workInProgress.ref)
+      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  }
   workInProgress.flags |= 1;
   current = createWorkInProgress(type, nextProps);
   current.ref = workInProgress.ref;
@@ -4097,7 +4576,6 @@ function updateSimpleMemoComponent(
   workInProgress,
   Component,
   nextProps,
-  updateLanes,
   renderLanes
 ) {
   if (
@@ -4105,7 +4583,7 @@ function updateSimpleMemoComponent(
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
   )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
+    if (((didReceiveUpdate = !1), 0 !== (current.lanes & renderLanes)))
       0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
     else
       return (
@@ -4128,40 +4606,49 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      nextProps = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= nextProps;
+    }
   else
     null !== prevState
       ? ((nextProps = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
       : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= nextProps);
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
-function markRef(current, workInProgress) {
+function markRef$1(current, workInProgress) {
   var ref = workInProgress.ref;
   if (
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4186,7 +4673,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4346,7 +4833,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4361,7 +4849,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4369,7 +4857,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4383,7 +4871,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4403,8 +4891,8 @@ function finishClassComponent(
   hasContext,
   renderLanes
 ) {
-  markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  markRef$1(current, workInProgress);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4448,20 +4936,22 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
-      void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
       (suspenseContext |= 1);
   push(suspenseStackCursor, suspenseContext & 1);
@@ -4476,7 +4966,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4488,15 +4980,17 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
       { mode: "visible", children: current },
       workInProgress.mode,
-      renderLanes,
+      0,
       null
     );
     renderLanes.return = workInProgress;
@@ -4516,8 +5010,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4544,8 +5041,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4568,7 +5068,7 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren))
     : (progressedPrimaryFragment = createFiberFromOffscreen(
@@ -4601,13 +5101,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4617,26 +5118,22 @@ function updateSuspenseFallbackChildren(
   fallbackChildren,
   renderLanes
 ) {
-  var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
+  var mode = workInProgress.mode;
+  current = current.child;
+  var currentFallbackChildFragment = current.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== current
     ? ((primaryChildren = workInProgress.child),
       (primaryChildren.childLanes = 0),
       (primaryChildren.pendingProps = primaryChildProps),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
-        currentPrimaryChildFragment,
-        primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+      (workInProgress.deletions = null))
+    : ((primaryChildren = createWorkInProgress(current, primaryChildProps)),
+      (primaryChildren.subtreeFlags = current.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4661,8 +5158,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4672,16 +5168,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4690,9 +5184,9 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
@@ -4715,7 +5209,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
     nextProps &= 1;
   }
   push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
   else
     switch (revealOrder) {
       case "forwards":
@@ -4736,8 +5230,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !1,
           revealOrder,
           renderLanes,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "backwards":
@@ -4752,421 +5245,119 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           current = revealOrder.sibling;
           revealOrder.sibling = renderLanes;
           renderLanes = revealOrder;
-          revealOrder = current;
-        }
-        initSuspenseListRenderState(
-          workInProgress,
-          !0,
-          renderLanes,
-          null,
-          tailMode,
-          workInProgress.lastEffect
-        );
-        break;
-      case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
-        break;
-      default:
-        workInProgress.memoizedState = null;
-    }
-  return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
-  null !== current && (workInProgress.dependencies = current.dependencies);
-  workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
-  }
-  return null;
-}
-var appendAllChildren,
-  updateHostContainer,
-  updateHostComponent$1,
-  updateHostText$1;
-appendAllChildren = function(parent, workInProgress) {
-  for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag || 6 === node.tag) parent._children.push(node.stateNode);
-    else if (4 !== node.tag && null !== node.child) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-    if (node === workInProgress) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === workInProgress) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-};
-updateHostContainer = function() {};
-updateHostComponent$1 = function(current, workInProgress, type, newProps) {
-  current.memoizedProps !== newProps &&
-    (requiredContext(contextStackCursor$1.current),
-    (workInProgress.updateQueue = UPDATE_SIGNAL)) &&
-    (workInProgress.flags |= 4);
-};
-updateHostText$1 = function(current, workInProgress, oldText, newText) {
-  oldText !== newText && (workInProgress.flags |= 4);
-};
-function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
-  switch (renderState.tailMode) {
-    case "hidden":
-      hasRenderedATailFallback = renderState.tail;
-      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
-        null !== hasRenderedATailFallback.alternate &&
-          (lastTailNode = hasRenderedATailFallback),
-          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
-      null === lastTailNode
-        ? (renderState.tail = null)
-        : (lastTailNode.sibling = null);
-      break;
-    case "collapsed":
-      lastTailNode = renderState.tail;
-      for (var lastTailNode$64 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$64 = lastTailNode),
-          (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$64
-        ? hasRenderedATailFallback || null === renderState.tail
-          ? (renderState.tail = null)
-          : (renderState.tail.sibling = null)
-        : (lastTailNode$64.sibling = null);
-  }
-}
-function completeWork(current, workInProgress, renderLanes) {
-  var newProps = workInProgress.pendingProps;
-  switch (workInProgress.tag) {
-    case 2:
-    case 16:
-    case 15:
-    case 0:
-    case 11:
-    case 7:
-    case 8:
-    case 12:
-    case 9:
-    case 14:
-      return null;
-    case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
-    case 3:
-      return (
-        popHostContainer(),
-        pop(didPerformWorkStackCursor),
-        pop(contextStackCursor),
-        resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
-        newProps.pendingContext &&
-          ((newProps.context = newProps.pendingContext),
-          (newProps.pendingContext = null)),
-        (null !== current && null !== current.child) ||
-          newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode)
-        updateHostComponent$1(
-          current,
+          revealOrder = current;
+        }
+        initSuspenseListRenderState(
           workInProgress,
+          !0,
           renderLanes,
-          newProps,
-          rootContainerInstance
-        ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
-      else {
-        if (!newProps) {
-          if (null === workInProgress.stateNode)
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          return null;
-        }
-        requiredContext(contextStackCursor$1.current);
-        current = allocateTag();
-        renderLanes = getViewConfigForType(renderLanes);
-        var updatePayload = diffProperties(
           null,
-          emptyObject,
-          newProps,
-          renderLanes.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.createView(
-          current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
-          updatePayload
+          tailMode
         );
-        rootContainerInstance = new ReactNativeFiberHostComponent(
+        break;
+      case "together":
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
+        break;
+      default:
+        workInProgress.memoizedState = null;
+    }
+  return workInProgress.child;
+}
+function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
+  null !== current && (workInProgress.dependencies = current.dependencies);
+  workInProgressRootSkippedLanes |= workInProgress.lanes;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
           current,
-          renderLanes,
-          workInProgress
-        );
-        instanceCache.set(current, workInProgress);
-        instanceProps.set(current, newProps);
-        appendAllChildren(rootContainerInstance, workInProgress, !1, !1);
-        workInProgress.stateNode = rootContainerInstance;
-        finalizeInitialChildren(rootContainerInstance) &&
-          (workInProgress.flags |= 4);
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
+  }
+  return workInProgress.child;
+}
+function attemptEarlyBailoutIfNoScheduledUpdate(
+  current,
+  workInProgress,
+  renderLanes
+) {
+  switch (workInProgress.tag) {
+    case 3:
+      pushHostRootContext(workInProgress);
+      break;
+    case 5:
+      pushHostContext(workInProgress);
+      break;
+    case 1:
+      isContextProvider(workInProgress.type) &&
+        pushContextProvider(workInProgress);
+      break;
+    case 4:
+      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+      break;
+    case 10:
+      var context = workInProgress.type._context,
+        nextValue = workInProgress.memoizedProps.value;
+      push(valueCursor, context._currentValue);
+      context._currentValue = nextValue;
+      break;
+    case 13:
+      if (null !== workInProgress.memoizedState) {
+        if (0 !== (renderLanes & workInProgress.child.childLanes))
+          return updateSuspenseComponent(current, workInProgress, renderLanes);
+        push(suspenseStackCursor, suspenseStackCursor.current & 1);
+        current = bailoutOnAlreadyFinishedWork(
           current,
           workInProgress,
-          current.memoizedProps,
-          newProps
-        );
-      else {
-        if ("string" !== typeof newProps && null === workInProgress.stateNode)
-          throw Error(
-            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-          );
-        current = requiredContext(rootInstanceStackCursor.current);
-        if (!requiredContext(contextStackCursor$1.current).isInAParentText)
-          throw Error(
-            "Text strings must be rendered within a <Text> component."
-          );
-        rootContainerInstance = allocateTag();
-        ReactNativePrivateInterface.UIManager.createView(
-          rootContainerInstance,
-          "RCTRawText",
-          current,
-          { text: newProps }
+          renderLanes
         );
-        instanceCache.set(rootContainerInstance, workInProgress);
-        workInProgress.stateNode = rootContainerInstance;
+        return null !== current ? current.sibling : null;
       }
-      return null;
-    case 13:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
-        return (workInProgress.lanes = renderLanes), workInProgress;
-      newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
-        if (
-          (null === current &&
-            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
-          0 !== (suspenseStackCursor.current & 1)
-        )
-          0 === workInProgressRootExitStatus &&
-            (workInProgressRootExitStatus = 3);
-        else {
-          if (
-            0 === workInProgressRootExitStatus ||
-            3 === workInProgressRootExitStatus
-          )
-            workInProgressRootExitStatus = 4;
-          null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
-            markRootSuspended$1(
-              workInProgressRoot,
-              workInProgressRootRenderLanes
-            );
-        }
-      if (newProps || rootContainerInstance) workInProgress.flags |= 4;
-      return null;
-    case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
-    case 10:
-      return popProvider(workInProgress), null;
-    case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      push(suspenseStackCursor, suspenseStackCursor.current & 1);
+      break;
     case 19:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
-      if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
-        else {
-          if (
-            0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
-          )
-            for (current = workInProgress.child; null !== current; ) {
-              updatePayload = findFirstSuspended(current);
-              if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
-                current = updatePayload.updateQueue;
-                null !== current &&
-                  ((workInProgress.updateQueue = current),
-                  (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
-                current = renderLanes;
-                for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
-                    (renderLanes = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (updatePayload = rootContainerInstance.alternate),
-                    null === updatePayload
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = renderLanes),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null))
-                      : ((rootContainerInstance.childLanes =
-                          updatePayload.childLanes),
-                        (rootContainerInstance.lanes = updatePayload.lanes),
-                        (rootContainerInstance.child = updatePayload.child),
-                        (rootContainerInstance.memoizedProps =
-                          updatePayload.memoizedProps),
-                        (rootContainerInstance.memoizedState =
-                          updatePayload.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          updatePayload.updateQueue),
-                        (rootContainerInstance.type = updatePayload.type),
-                        (renderLanes = updatePayload.dependencies),
-                        (rootContainerInstance.dependencies =
-                          null === renderLanes
-                            ? null
-                            : {
-                                lanes: renderLanes.lanes,
-                                firstContext: renderLanes.firstContext
-                              })),
-                    (newProps = newProps.sibling);
-                push(
-                  suspenseStackCursor,
-                  (suspenseStackCursor.current & 1) | 2
-                );
-                return workInProgress.child;
-              }
-              current = current.sibling;
-            }
-          null !== newProps.tail &&
-            now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432));
-        }
-      else {
-        if (!rootContainerInstance)
-          if (
-            ((current = findFirstSuspended(updatePayload)), null !== current)
-          ) {
-            if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              (current = current.updateQueue),
-              null !== current &&
-                ((workInProgress.updateQueue = current),
-                (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
-                !updatePayload.alternate)
-            )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
-          } else
-            2 * now() - newProps.renderingStartTime >
-              workInProgressRootRenderTargetTime &&
-              1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432));
-        newProps.isBackwards
-          ? ((updatePayload.sibling = workInProgress.child),
-            (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
-            null !== current
-              ? (current.sibling = updatePayload)
-              : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+      context = 0 !== (renderLanes & workInProgress.childLanes);
+      if (0 !== (current.flags & 128)) {
+        if (context)
+          return updateSuspenseListComponent(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        workInProgress.flags |= 128;
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      nextValue = workInProgress.memoizedState;
+      null !== nextValue &&
+        ((nextValue.rendering = null),
+        (nextValue.tail = null),
+        (nextValue.lastEffect = null));
+      push(suspenseStackCursor, suspenseStackCursor.current);
+      if (context) break;
+      else return null;
+    case 22:
     case 23:
-    case 24:
       return (
-        popRenderLanes(),
-        null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
-          "unstable-defer-without-hiding" !== newProps.mode &&
-          (workInProgress.flags |= 4),
-        null
+        (workInProgress.lanes = 0),
+        updateOffscreenComponent(current, workInProgress, renderLanes)
       );
   }
-  throw Error(
-    "Unknown unit of work tag (" +
-      workInProgress.tag +
-      "). This error is likely caused by a bug in React. Please file an issue."
-  );
+  return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
 }
 function unwindWork(workInProgress) {
   switch (workInProgress.tag) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
         : null;
     case 3:
       popHostContainer();
@@ -5174,11 +5365,11 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
@@ -5186,8 +5377,8 @@ function unwindWork(workInProgress) {
       return (
         pop(suspenseStackCursor),
         (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
           : null
       );
     case 19:
@@ -5195,278 +5386,132 @@ function unwindWork(workInProgress) {
     case 4:
       return popHostContainer(), null;
     case 10:
-      return popProvider(workInProgress), null;
-    case 23:
-    case 24:
-      return popRenderLanes(), null;
-    default:
-      return null;
-  }
-}
-function createCapturedValue(value, source) {
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
-}
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
-  }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
+      return popProvider(workInProgress.type._context), null;
+    case 22:
+    case 23:
+      return popRenderLanes(), null;
+    case 24:
+      return null;
+    default:
+      return null;
+  }
 }
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
   var ref = current.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
     else ref.current = null;
 }
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
       }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
-  }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
 }
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$81 = finishedRoot.create;
-            finishedRoot.destroy = create$81();
-          }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
-      }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$81 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$81;
-        } while (finishedRoot !== current);
-      }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$81 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$81,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor$jscomp$0
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        if (void 0 !== destroy) {
+          var current = finishedWork,
+            nearestMountedAncestor = nearestMountedAncestor$jscomp$0;
+          try {
+            destroy();
+          } catch (error) {
+            captureCommitPhaseError(current, nearestMountedAncestor, error);
           }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
+        }
       }
-      return;
-    case 5:
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      return;
-    case 13:
-      return;
-    case 19:
-    case 17:
-    case 20:
-    case 21:
-    case 23:
-    case 24:
-      return;
+      effect = effect.next;
+    } while (effect !== updateQueue);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function hideOrUnhideAllChildren(finishedWork, isHidden) {
-  for (var node = finishedWork; ; ) {
-    if (5 === node.tag) {
-      var instance = node.stateNode;
-      if (isHidden) {
-        var viewConfig = instance.viewConfig;
-        var updatePayload = diffProperties(
-          null,
-          emptyObject,
-          { style: { display: "none" } },
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
-      } else {
-        instance = node.stateNode;
-        updatePayload = node.memoizedProps;
-        viewConfig = instance.viewConfig;
-        var prevProps = Object.assign({}, updatePayload, {
-          style: [updatePayload.style, { display: "none" }]
-        });
-        updatePayload = diffProperties(
-          null,
-          prevProps,
-          updatePayload,
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
-      }
-    } else {
-      if (6 === node.tag) throw Error("Not yet implemented.");
-      if (
-        ((23 !== node.tag && 24 !== node.tag) ||
-          null === node.memoizedState ||
-          node === finishedWork) &&
-        null !== node.child
-      ) {
-        node.child.return = node;
-        node = node.child;
-        continue;
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$83 = effect.create;
+        effect.destroy = create$83();
       }
-    }
-    if (node === finishedWork) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === finishedWork) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
 }
-function commitUnmount(finishedRoot, current) {
+function commitUnmount(finishedRoot, current, nearestMountedAncestor$jscomp$0) {
   if (injectedHook && "function" === typeof injectedHook.onCommitFiberUnmount)
     try {
       injectedHook.onCommitFiberUnmount(rendererID, current);
@@ -5476,7 +5521,6 @@ function commitUnmount(finishedRoot, current) {
     case 11:
     case 14:
     case 15:
-    case 22:
       finishedRoot = current.updateQueue;
       if (
         null !== finishedRoot &&
@@ -5484,53 +5528,63 @@ function commitUnmount(finishedRoot, current) {
       ) {
         var effect = (finishedRoot = finishedRoot.next);
         do {
-          var _effect2 = effect,
-            destroy = _effect2.destroy;
-          _effect2 = _effect2.tag;
-          if (void 0 !== destroy)
-            if (0 !== (_effect2 & 4))
-              enqueuePendingPassiveHookEffectUnmount(current, effect);
-            else {
-              _effect2 = current;
-              try {
-                destroy();
-              } catch (error) {
-                captureCommitPhaseError(_effect2, error);
-              }
+          var _effect = effect,
+            destroy = _effect.destroy;
+          _effect = _effect.tag;
+          if (void 0 !== destroy && 0 !== (_effect & 2)) {
+            _effect = current;
+            var nearestMountedAncestor = nearestMountedAncestor$jscomp$0;
+            try {
+              destroy();
+            } catch (error) {
+              captureCommitPhaseError(_effect, nearestMountedAncestor, error);
             }
+          }
           effect = effect.next;
         } while (effect !== finishedRoot);
       }
       break;
     case 1:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor$jscomp$0);
       finishedRoot = current.stateNode;
       if ("function" === typeof finishedRoot.componentWillUnmount)
         try {
           (finishedRoot.props = current.memoizedProps),
             (finishedRoot.state = current.memoizedState),
             finishedRoot.componentWillUnmount();
-        } catch (unmountError) {
-          captureCommitPhaseError(current, unmountError);
+        } catch (error) {
+          captureCommitPhaseError(
+            current,
+            nearestMountedAncestor$jscomp$0,
+            error
+          );
         }
       break;
     case 5:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor$jscomp$0);
       break;
     case 4:
-      unmountHostComponents(finishedRoot, current);
+      unmountHostComponents(
+        finishedRoot,
+        current,
+        nearestMountedAncestor$jscomp$0
+      );
   }
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function isHostParent(fiber) {
@@ -5565,7 +5619,7 @@ function commitPlacement(finishedWork) {
         "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
       );
   }
-  parentFiber.flags & 16 && (parentFiber.flags &= -17);
+  parentFiber.flags & 32 && (parentFiber.flags &= -33);
   a: b: for (parentFiber = finishedWork; ; ) {
     for (; null === parentFiber.sibling; ) {
       if (null === parentFiber.return || isHostParent(parentFiber.return)) {
@@ -5600,10 +5654,9 @@ function commitPlacement(finishedWork) {
     : insertOrAppendPlacementNode(finishedWork, parentFiber, parent);
 }
 function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    if (((node = isHost ? node.stateNode : node.stateNode.instance), before)) {
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
       if ("number" === typeof parent)
         throw Error("Container does not support insertBefore operation");
     } else
@@ -5621,58 +5674,57 @@ function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
         (node = node.sibling);
 }
 function insertOrAppendPlacementNode(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    (node = isHost ? node.stateNode : node.stateNode.instance),
-      before
-        ? ((tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              (before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [before],
-                [],
-                [],
-                []
-              ))
-            : ((before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                ["number" === typeof node ? node : node._nativeTag],
-                [before],
-                []
-              )))
-        : ((before = "number" === typeof node ? node : node._nativeTag),
-          (tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [tag.length - 1],
-                [],
-                [],
-                []
-              ))
-            : (tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                [before],
-                [tag.length - 1],
-                []
-              )));
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
+      tag = parent._children;
+      var index = tag.indexOf(node);
+      0 <= index
+        ? (tag.splice(index, 1),
+          (before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [index],
+            [before],
+            [],
+            [],
+            []
+          ))
+        : ((before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [],
+            [],
+            ["number" === typeof node ? node : node._nativeTag],
+            [before],
+            []
+          ));
+    } else
+      (before = "number" === typeof node ? node : node._nativeTag),
+        (tag = parent._children),
+        (index = tag.indexOf(node)),
+        0 <= index
+          ? (tag.splice(index, 1),
+            tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [index],
+              [tag.length - 1],
+              [],
+              [],
+              []
+            ))
+          : (tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [],
+              [],
+              [before],
+              [tag.length - 1],
+              []
+            ));
   else if (4 !== tag && ((node = node.child), null !== node))
     for (
       insertOrAppendPlacementNode(node, before, parent), node = node.sibling;
@@ -5681,7 +5733,11 @@ function insertOrAppendPlacementNode(node, before, parent) {
     )
       insertOrAppendPlacementNode(node, before, parent), (node = node.sibling);
 }
-function unmountHostComponents(finishedRoot$jscomp$0, current) {
+function unmountHostComponents(
+  finishedRoot$jscomp$0,
+  current,
+  nearestMountedAncestor$jscomp$0
+) {
   for (
     var node = current,
       currentParentIsValid = !1,
@@ -5719,12 +5775,13 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
       a: for (
         var finishedRoot = finishedRoot$jscomp$0,
           root = node,
+          nearestMountedAncestor = nearestMountedAncestor$jscomp$0,
           node$jscomp$0 = root;
         ;
 
       )
         if (
-          (commitUnmount(finishedRoot, node$jscomp$0),
+          (commitUnmount(finishedRoot, node$jscomp$0, nearestMountedAncestor),
           null !== node$jscomp$0.child && 4 !== node$jscomp$0.tag)
         )
           (node$jscomp$0.child.return = node$jscomp$0),
@@ -5751,18 +5808,18 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
             [0]
           ))
         : ((finishedRoot = currentParent),
-          (node$jscomp$0 = node.stateNode),
-          recursivelyUncacheFiberNode(node$jscomp$0),
+          (nearestMountedAncestor = node.stateNode),
+          recursivelyUncacheFiberNode(nearestMountedAncestor),
           (root = finishedRoot._children),
-          (node$jscomp$0 = root.indexOf(node$jscomp$0)),
-          root.splice(node$jscomp$0, 1),
+          (nearestMountedAncestor = root.indexOf(nearestMountedAncestor)),
+          root.splice(nearestMountedAncestor, 1),
           ReactNativePrivateInterface.UIManager.manageChildren(
             finishedRoot._nativeTag,
             [],
             [],
             [],
             [],
-            [node$jscomp$0]
+            [nearestMountedAncestor]
           ));
     } else if (4 === node.tag) {
       if (null !== node.child) {
@@ -5773,7 +5830,12 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
         continue;
       }
     } else if (
-      (commitUnmount(finishedRoot$jscomp$0, node), null !== node.child)
+      (commitUnmount(
+        finishedRoot$jscomp$0,
+        node,
+        nearestMountedAncestor$jscomp$0
+      ),
+      null !== node.child)
     ) {
       node.child.return = node;
       node = node.child;
@@ -5795,43 +5857,31 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      var updateQueue = finishedWork.updateQueue;
-      updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
-      if (null !== updateQueue) {
-        var effect = (updateQueue = updateQueue.next);
-        do
-          3 === (effect.tag & 3) &&
-            ((finishedWork = effect.destroy),
-            (effect.destroy = void 0),
-            void 0 !== finishedWork && finishedWork()),
-            (effect = effect.next);
-        while (effect !== updateQueue);
-      }
+      commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 1:
       return;
     case 5:
-      updateQueue = finishedWork.stateNode;
-      if (null != updateQueue) {
-        effect = finishedWork.memoizedProps;
-        current = null !== current ? current.memoizedProps : effect;
+      var instance = finishedWork.stateNode;
+      if (null != instance) {
+        var newProps = finishedWork.memoizedProps;
+        current = null !== current ? current.memoizedProps : newProps;
         var updatePayload = finishedWork.updateQueue;
         finishedWork.updateQueue = null;
         null !== updatePayload &&
-          ((finishedWork = updateQueue.viewConfig),
-          instanceProps.set(updateQueue._nativeTag, effect),
-          (effect = diffProperties(
+          ((finishedWork = instance.viewConfig),
+          instanceProps.set(instance._nativeTag, newProps),
+          (newProps = diffProperties(
             null,
             current,
-            effect,
+            newProps,
             finishedWork.validAttributes
           )),
-          null != effect &&
+          null != newProps &&
             ReactNativePrivateInterface.UIManager.updateView(
-              updateQueue._nativeTag,
+              instance._nativeTag,
               finishedWork.uiViewClassName,
-              effect
+              newProps
             ));
       }
       return;
@@ -5851,9 +5901,6 @@ function commitWork(current, finishedWork) {
     case 12:
       return;
     case 13:
-      null !== finishedWork.memoizedState &&
-        ((globalMostRecentFallbackTime = now()),
-        hideOrUnhideAllChildren(finishedWork.child, !0));
       attachSuspenseRetryListeners(finishedWork);
       return;
     case 19:
@@ -5861,13 +5908,6 @@ function commitWork(current, finishedWork) {
       return;
     case 17:
       return;
-    case 23:
-    case 24:
-      hideOrUnhideAllChildren(
-        finishedWork,
-        null !== finishedWork.memoizedState
-      );
-      return;
   }
   throw Error(
     "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
@@ -5887,17 +5927,270 @@ function attachSuspenseRetryListeners(finishedWork) {
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    firstChild = nextEffect;
+    var deletions = firstChild.deletions;
+    if (null !== deletions)
+      for (var i = 0; i < deletions.length; i++) {
+        var childToDelete = deletions[i];
+        try {
+          unmountHostComponents(root, childToDelete, firstChild);
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, firstChild, error);
+        }
+      }
+    deletions = firstChild.child;
+    if (0 !== (firstChild.subtreeFlags & 6454) && null !== deletions)
+      (deletions.return = firstChild), (nextEffect = deletions);
+    else
+      for (; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        try {
+          var flags = firstChild.flags;
+          if (flags & 256) {
+            var current = firstChild.alternate;
+            if (null !== current) {
+              var currentRef = current.ref;
+              null !== currentRef &&
+                ("function" === typeof currentRef
+                  ? currentRef(null)
+                  : (currentRef.current = null));
+            }
+          }
+          if (flags & 4096)
+            switch (firstChild.tag) {
+              case 13:
+                if (null !== firstChild.memoizedState) {
+                  var current$88 = firstChild.alternate;
+                  if (null === current$88 || null === current$88.memoizedState)
+                    globalMostRecentFallbackTime = now();
+                }
+                break;
+              case 22:
+                a: {
+                  deletions = firstChild;
+                  var isHidden = null !== firstChild.memoizedState;
+                  i = null;
+                  for (childToDelete = deletions; ; ) {
+                    if (5 === childToDelete.tag) {
+                      if (null === i) {
+                        i = childToDelete;
+                        var instance = childToDelete.stateNode;
+                        if (isHidden) {
+                          var instance$jscomp$0 = instance,
+                            viewConfig = instance$jscomp$0.viewConfig;
+                          var updatePayload = diffProperties(
+                            null,
+                            emptyObject,
+                            { style: { display: "none" } },
+                            viewConfig.validAttributes
+                          );
+                          ReactNativePrivateInterface.UIManager.updateView(
+                            instance$jscomp$0._nativeTag,
+                            viewConfig.uiViewClassName,
+                            updatePayload
+                          );
+                        } else {
+                          var instance$jscomp$1 = childToDelete.stateNode,
+                            props = childToDelete.memoizedProps,
+                            viewConfig$jscomp$0 = instance$jscomp$1.viewConfig,
+                            prevProps = Object.assign({}, props, {
+                              style: [props.style, { display: "none" }]
+                            });
+                          var updatePayload$jscomp$0 = diffProperties(
+                            null,
+                            prevProps,
+                            props,
+                            viewConfig$jscomp$0.validAttributes
+                          );
+                          ReactNativePrivateInterface.UIManager.updateView(
+                            instance$jscomp$1._nativeTag,
+                            viewConfig$jscomp$0.uiViewClassName,
+                            updatePayload$jscomp$0
+                          );
+                        }
+                      }
+                    } else if (6 === childToDelete.tag) {
+                      if (null === i) throw Error("Not yet implemented.");
+                    } else if (
+                      ((22 !== childToDelete.tag && 23 !== childToDelete.tag) ||
+                        null === childToDelete.memoizedState ||
+                        childToDelete === deletions) &&
+                      null !== childToDelete.child
+                    ) {
+                      childToDelete.child.return = childToDelete;
+                      childToDelete = childToDelete.child;
+                      continue;
+                    }
+                    if (childToDelete === deletions) break;
+                    for (; null === childToDelete.sibling; ) {
+                      if (
+                        null === childToDelete.return ||
+                        childToDelete.return === deletions
+                      )
+                        break a;
+                      i === childToDelete && (i = null);
+                      childToDelete = childToDelete.return;
+                    }
+                    i === childToDelete && (i = null);
+                    childToDelete.sibling.return = childToDelete.return;
+                    childToDelete = childToDelete.sibling;
+                  }
+                }
+            }
+          switch (flags & 2054) {
+            case 2:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              break;
+            case 6:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 2048:
+              firstChild.flags &= -2049;
+              break;
+            case 2052:
+              firstChild.flags &= -2049;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 4:
+              commitWork(firstChild.alternate, firstChild);
+          }
+        } catch (error) {
+          captureCommitPhaseError(firstChild, firstChild.return, error);
+        }
+        deletions = firstChild.sibling;
+        if (null !== deletions) {
+          deletions.return = firstChild.return;
+          nextEffect = deletions;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
+}
+function commitLayoutEffects(finishedWork) {
+  for (nextEffect = finishedWork; null !== nextEffect; ) {
+    var fiber = nextEffect,
+      firstChild = fiber.child;
+    if (0 !== (fiber.subtreeFlags & 4420) && null !== firstChild)
+      (firstChild.return = fiber), (nextEffect = firstChild);
+    else
+      for (fiber = finishedWork; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        if (0 !== (firstChild.flags & 4420)) {
+          var current = firstChild.alternate;
+          try {
+            if (0 !== (firstChild.flags & 4420))
+              switch (firstChild.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  commitHookEffectListMount(3, firstChild);
+                  break;
+                case 1:
+                  var instance = firstChild.stateNode;
+                  if (firstChild.flags & 4)
+                    if (null === current) instance.componentDidMount();
+                    else {
+                      var prevProps =
+                        firstChild.elementType === firstChild.type
+                          ? current.memoizedProps
+                          : resolveDefaultProps(
+                              firstChild.type,
+                              current.memoizedProps
+                            );
+                      instance.componentDidUpdate(
+                        prevProps,
+                        current.memoizedState,
+                        instance.__reactInternalSnapshotBeforeUpdate
+                      );
+                    }
+                  var updateQueue = firstChild.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(firstChild, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$84 = firstChild.updateQueue;
+                  if (null !== updateQueue$84) {
+                    current = null;
+                    if (null !== firstChild.child)
+                      switch (firstChild.child.tag) {
+                        case 5:
+                          current = firstChild.child.stateNode;
+                          break;
+                        case 1:
+                          current = firstChild.child.stateNode;
+                      }
+                    commitUpdateQueue(firstChild, updateQueue$84, current);
+                  }
+                  break;
+                case 5:
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (firstChild.flags & 256) {
+              current = void 0;
+              var ref = firstChild.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = firstChild.stateNode;
+                switch (firstChild.tag) {
+                  case 5:
+                    current = instance$jscomp$0;
+                    break;
+                  default:
+                    current = instance$jscomp$0;
+                }
+                "function" === typeof ref
+                  ? ref(current)
+                  : (ref.current = current);
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(firstChild, firstChild.return, error);
+          }
+        }
+        if (firstChild === fiber) {
+          nextEffect = null;
+          break;
+        }
+        current = firstChild.sibling;
+        if (null !== current) {
+          current.return = firstChild.return;
+          nextEffect = current;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5906,64 +6199,43 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveEffectsLanes = 0,
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 6)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
-  return fiber;
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  return 0 !== fiber ? fiber : 16;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
@@ -5972,28 +6244,20 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 2) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
-  1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? performSyncWorkOnRoot(fiber)
-      : (ensureRootIsScheduled(fiber, eventTime),
-        0 === executionContext &&
-          ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime));
-  mostRecentlyUpdatedRoot = fiber;
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
+  ensureRootIsScheduled(root, eventTime);
+  1 === lane &&
+    0 === executionContext &&
+    0 === (fiber.mode & 1) &&
+    ((workInProgressRootRenderTargetTime = now() + 500),
+    includesLegacySyncCallbacks && flushSyncCallbacks());
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -6018,21 +6282,12 @@ function ensureRootIsScheduled(root, currentTime) {
     0 < lanes;
 
   ) {
-    var index$7 = 31 - clz32(lanes),
-      lane = 1 << index$7,
-      expirationTime = expirationTimes[index$7];
+    var index$6 = 31 - clz32(lanes),
+      lane = 1 << index$6,
+      expirationTime = expirationTimes[index$6];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$7] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$6] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -6040,91 +6295,112 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback$1(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
     return null;
   var lanes = getNextLanes(
-    root,
-    root === workInProgressRoot ? workInProgressRootRenderLanes : 0
-  );
-  if (0 === lanes) return null;
-  var exitStatus = lanes;
-  var prevExecutionContext = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== exitStatus
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, exitStatus);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
-    }
-  while (1);
-  resetContextDependencies();
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = prevExecutionContext;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+    root,
+    root === workInProgressRoot ? workInProgressRootRenderLanes : 0
+  );
+  if (0 === lanes) return null;
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes)
+      ? !1
+      : 0 !== (root.current.mode & 32)
+      ? !0
+      : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 2;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    )
+      (workInProgressRootRenderTargetTime = now() + 500),
+        prepareFreshStack(root, didTimeout);
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((JSCompiler_inline_result = executionContext),
+      (executionContext |= 8),
       root.hydrate && (root.hydrate = !1),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (prevDispatcher = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== prevDispatcher &&
+        ((lanes = prevDispatcher),
+        (didTimeout = renderRootSync(root, prevDispatcher))),
+      (executionContext = JSCompiler_inline_result));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -6132,7 +6408,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -6142,20 +6418,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevExecutionContext = root.suspendedLanes;
-          if ((prevExecutionContext & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevExecutionContext;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -6163,16 +6439,17 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevExecutionContext = -1; 0 < lanes; ) {
-          var index$6 = 31 - clz32(lanes);
-          prevDispatcher = 1 << index$6;
-          index$6 = exitStatus[index$6];
-          index$6 > prevExecutionContext && (prevExecutionContext = index$6);
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; ) {
+          var index$5 = 31 - clz32(lanes);
+          prevDispatcher = 1 << index$5;
+          index$5 = didTimeout[index$5];
+          index$5 > JSCompiler_inline_result &&
+            (JSCompiler_inline_result = index$5);
           lanes &= ~prevDispatcher;
         }
-        lanes = prevExecutionContext;
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -6215,33 +6492,28 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$11 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$11;
-    root[index$11] = -1;
+    var index$7 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$7;
+    root[index$7] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && (root.hydrate = !1),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    var prevExecutionContext = executionContext;
+    executionContext |= 8;
+    root.hydrate && (root.hydrate = !1);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+    executionContext = prevExecutionContext;
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -6254,11 +6526,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6298,20 +6565,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6347,15 +6633,18 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6366,36 +6655,37 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$76 = returnFiber;
+            workInProgress$32 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$76.tag)) {
-              var nextState = workInProgress$76.memoizedState;
-              if (null !== nextState)
-                JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
-              else {
-                var props = workInProgress$76.memoizedProps;
-                JSCompiler_temp =
-                  void 0 === props.fallback
-                    ? !1
-                    : !0 !== props.unstable_avoidThisFallback
+            if ((JSCompiler_temp = 13 === workInProgress$32.tag)) {
+              var nextState = workInProgress$32.memoizedState;
+              JSCompiler_temp =
+                null !== nextState
+                  ? null !== nextState.dehydrated
                     ? !0
-                    : hasInvisibleParentBoundary
-                    ? !1
-                    : !0;
-              }
+                    : !1
+                  : !0 !==
+                    workInProgress$32.memoizedProps.unstable_avoidThisFallback
+                  ? !0
+                  : hasInvisibleParentBoundary
+                  ? !1
+                  : !0;
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$76.updateQueue;
+              var wakeables = workInProgress$32.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$76.updateQueue = updateQueue;
+                workInProgress$32.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$76.mode & 2)) {
-                workInProgress$76.flags |= 64;
+              if (
+                0 === (workInProgress$32.mode & 1) &&
+                workInProgress$32 !== returnFiber
+              ) {
+                workInProgress$32.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6426,61 +6716,61 @@ function handleError(root$jscomp$0, thrownValue) {
                 );
                 wakeable.then(ping, ping);
               }
-              workInProgress$76.flags |= 8192;
-              workInProgress$76.lanes = thrownValue;
+              workInProgress$32.flags |= 16384;
+              workInProgress$32.lanes = thrownValue;
               break a;
             }
-            workInProgress$76 = workInProgress$76.return;
-          } while (null !== workInProgress$76);
+            workInProgress$32 = workInProgress$32.return;
+          } while (null !== workInProgress$32);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$76 = returnFiber;
+        workInProgress$32 = returnFiber;
         do {
-          switch (workInProgress$76.tag) {
+          switch (workInProgress$32.tag) {
             case 3:
               root = value;
-              workInProgress$76.flags |= 8192;
+              workInProgress$32.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$76.lanes |= thrownValue;
-              var update$77 = createRootErrorUpdate(
-                workInProgress$76,
+              workInProgress$32.lanes |= thrownValue;
+              var update$33 = createRootErrorUpdate(
+                workInProgress$32,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$76, update$77);
+              enqueueCapturedUpdate(workInProgress$32, update$33);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$76.type,
-                instance = workInProgress$76.stateNode;
+              var ctor = workInProgress$32.type,
+                instance = workInProgress$32.stateNode;
               if (
-                0 === (workInProgress$76.flags & 64) &&
+                0 === (workInProgress$32.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$76.flags |= 8192;
+                workInProgress$32.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$76.lanes |= thrownValue;
-                var update$80 = createClassErrorUpdate(
-                  workInProgress$76,
+                workInProgress$32.lanes |= thrownValue;
+                var update$36 = createClassErrorUpdate(
+                  workInProgress$32,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$76, update$80);
+                enqueueCapturedUpdate(workInProgress$32, update$36);
                 break a;
               }
           }
-          workInProgress$76 = workInProgress$76.return;
-        } while (null !== workInProgress$76);
+          workInProgress$32 = workInProgress$32.return;
+        } while (null !== workInProgress$32);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6500,7 +6790,7 @@ function pushDispatcher() {
 }
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 2;
   var prevDispatcher = pushDispatcher();
   (workInProgressRoot === root && workInProgressRootRenderLanes === lanes) ||
     prepareFreshStack(root, lanes);
@@ -6527,7 +6817,7 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
@@ -6541,47 +6831,25 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      current = completeWork(current, completedWork, subtreeRenderLanes);
-      if (null !== current) {
-        workInProgress = current;
-        return;
-      }
-      current = completedWork;
+    if (0 === (completedWork.flags & 8192)) {
       if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
+        ((current = completeWork(current, completedWork, subtreeRenderLanes)),
+        null !== current)
       ) {
-        for (var newChildLanes = 0, child = current.child; null !== child; )
-          (newChildLanes |= child.lanes | child.childLanes),
-            (child = child.sibling);
-        current.childLanes = newChildLanes;
+        workInProgress = current;
+        return;
       }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
       null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
     }
     completedWork = completedWork.sibling;
     if (null !== completedWork) {
@@ -6593,16 +6861,25 @@ function completeUnitOfWork(unitOfWork) {
   0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
 }
 function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
   return null;
 }
 function commitRootImpl(root, renderPriorityLevel) {
   do flushPassiveEffects();
   while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
-  var finishedWork = root.finishedWork;
+  var finishedWork = root.finishedWork,
+    lanes = root.finishedLanes;
   if (null === finishedWork) return null;
   root.finishedWork = null;
   root.finishedLanes = 0;
@@ -6611,282 +6888,206 @@ function commitRootImpl(root, renderPriorityLevel) {
       "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
     );
   root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$12 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$12;
-    remainingLanes$jscomp$0[index$12] = 0;
-    eventTimes[index$12] = -1;
-    expirationTimes[index$12] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
   root === workInProgressRoot &&
     ((workInProgress = workInProgressRoot = null),
     (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (eventTimes = root; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              expirationTimes = nextEffect;
-              unmountHostComponents(eventTimes, expirationTimes);
-              var alternate = expirationTimes.alternate;
-              detachFiberMutation(expirationTimes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$88) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$88);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback$1(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 4;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
+    commitMutationEffects(root, finishedWork);
     root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance;
-                  break;
-                default:
-                  current = instance;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$89) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$89);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    nextEffect = null;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else root.current = finishedWork;
-  if (rootDoesHavePassiveEffects)
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (renderPriorityLevel = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((flags$jscomp$0 = nextEffect),
-          (flags$jscomp$0.sibling = null),
-          (flags$jscomp$0.stateNode = null)),
-        (nextEffect = renderPriorityLevel);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
   0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
-  1 === remainingLanes
+  0 !== (remainingLanes & 1)
     ? root === rootWithNestedUpdates
       ? nestedUpdateCount++
       : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        void 0,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
-  }
-  return !1;
-}
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects;
-  rootWithPendingPassiveEffects = null;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$94 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$94.destroy;
-    effect$94.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$94 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
     try {
-      var create$98 = effect$94.create;
-      effect$94.destroy = create$98();
-    } catch (error$99) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$99);
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 6))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 4;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect;
+                  switch (fiber$jscomp$0.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListUnmount(4, fiber$jscomp$0, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (fiber.tag) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    commitHookEffectListUnmount(5, fiber, fiber.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (deletions.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListMount(5, deletions);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
     }
   }
-  for (create$98 = root.current.firstEffect; null !== create$98; )
-    (root = create$98.nextEffect),
-      (create$98.nextEffect = null),
-      create$98.flags & 8 &&
-        ((create$98.sibling = null), (create$98.stateNode = null)),
-      (create$98 = root);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
+  return !1;
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
@@ -6898,42 +7099,50 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -6945,7 +7154,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
@@ -6957,15 +7166,11 @@ function resolveRetryWakeable(boundaryFiber, wakeable) {
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
@@ -6974,102 +7179,46 @@ function resolveRetryWakeable(boundaryFiber, wakeable) {
 }
 var beginWork$1;
 beginWork$1 = function(current, workInProgress, renderLanes) {
-  var updateLanes = workInProgress.lanes;
   if (null !== current)
     if (
       current.memoizedProps !== workInProgress.pendingProps ||
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
+      if (
+        0 === (current.lanes & renderLanes) &&
+        0 === (workInProgress.flags & 128)
+      )
+        return (
+          (didReceiveUpdate = !1),
+          attemptEarlyBailoutIfNoScheduledUpdate(
+            current,
             workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue);
-          context._currentValue = updateLanes;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
-              workInProgress,
-              renderLanes
-            );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
-      }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+            renderLanes
+          )
+        );
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
   switch (workInProgress.tag) {
     case 2:
-      updateLanes = workInProgress.type;
+      var Component = workInProgress.type;
       null !== current &&
         ((current.alternate = null),
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      var context = getMaskedContext(
+        workInProgress,
+        contextStackCursor.current
+      );
       prepareToReadContext(workInProgress, renderLanes);
       context = renderWithHooks(
         null,
         workInProgress,
-        updateLanes,
+        Component,
         current,
         context,
         renderLanes
@@ -7084,7 +7233,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
         workInProgress.updateQueue = null;
-        if (isContextProvider(updateLanes)) {
+        if (isContextProvider(Component)) {
           var hasContext = !0;
           pushContextProvider(workInProgress);
         } else hasContext = !1;
@@ -7093,22 +7242,14 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             ? context.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
         context.updater = classComponentUpdater;
         workInProgress.stateNode = context;
         context._reactInternals = workInProgress;
-        mountClassInstance(workInProgress, updateLanes, current, renderLanes);
+        mountClassInstance(workInProgress, Component, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           hasContext,
           renderLanes
@@ -7119,24 +7260,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      Component = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
-        switch (hasContext) {
+        context = Component._init;
+        Component = context(Component._payload);
+        workInProgress.type = Component;
+        context = workInProgress.tag = resolveLazyComponentTag(Component);
+        current = resolveDefaultProps(Component, current);
+        switch (context) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7145,7 +7286,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7154,7 +7295,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7163,80 +7304,78 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
-              updateLanes,
+              Component,
+              resolveDefaultProps(Component.type, current),
               renderLanes
             );
             break a;
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            Component +
             ". Lazy element type must resolve to a class or function."
         );
       }
       return workInProgress;
     case 0:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateFunctionComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 1:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateClassComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 3:
       pushHostRootContext(workInProgress);
-      updateLanes = workInProgress.updateQueue;
-      if (null === current || null === updateLanes)
+      Component = workInProgress.updateQueue;
+      if (null === current || null === Component)
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
+      context = workInProgress.pendingProps;
+      Component = workInProgress.memoizedState.element;
       cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
-      updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      processUpdateQueue(workInProgress, context, null, renderLanes);
+      context = workInProgress.memoizedState.element;
+      context === Component
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, context, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
       return (
         pushHostContext(workInProgress),
-        (updateLanes = workInProgress.pendingProps.children),
-        markRef(current, workInProgress),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        (Component = workInProgress.pendingProps.children),
+        markRef$1(current, workInProgress),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 6:
@@ -7249,34 +7388,29 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (updateLanes = workInProgress.pendingProps),
+        (Component = workInProgress.pendingProps),
         null === current
           ? (workInProgress.child = reconcileChildFibers(
               workInProgress,
               null,
-              updateLanes,
+              Component,
               renderLanes
             ))
-          : reconcileChildren(
-              current,
-              workInProgress,
-              updateLanes,
-              renderLanes
-            ),
+          : reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 11:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateForwardRef(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
@@ -7313,28 +7447,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 10:
       a: {
-        updateLanes = workInProgress.type._context;
+        Component = workInProgress.type._context;
         context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue);
-        context$jscomp$0._currentValue = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        hasContext = workInProgress.memoizedProps;
+        var newValue = context.value;
+        push(valueCursor, Component._currentValue);
+        Component._currentValue = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === context.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7346,71 +7468,66 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === Component) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
@@ -7424,29 +7541,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 9:
       return (
         (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (Component = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (context = readContext(context)),
+        (Component = Component(context)),
         (workInProgress.flags |= 1),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
-        (hasContext = resolveDefaultProps(
-          context,
-          workInProgress.pendingProps
-        )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (Component = workInProgress.type),
+        (context = resolveDefaultProps(Component, workInProgress.pendingProps)),
+        (context = resolveDefaultProps(Component.type, context)),
         updateMemoComponent(
           current,
           workInProgress,
+          Component,
           context,
-          hasContext,
-          updateLanes,
           renderLanes
         )
       );
@@ -7456,32 +7568,31 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress,
         workInProgress.type,
         workInProgress.pendingProps,
-        updateLanes,
         renderLanes
       );
     case 17:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2)),
         (workInProgress.tag = 1),
-        isContextProvider(updateLanes)
+        isContextProvider(Component)
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, Component, context),
+        mountClassInstance(workInProgress, Component, context, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           current,
           renderLanes
@@ -7489,9 +7600,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7500,6 +7611,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       "). This error is likely caused by a bug in React. Please file an issue."
   );
 };
+function scheduleCallback$1(priorityLevel, callback) {
+  return scheduleCallback(priorityLevel, callback);
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -7509,8 +7623,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
 }
@@ -7548,9 +7662,9 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null));
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7585,24 +7699,22 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           type
         );
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7618,7 +7730,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7642,9 +7754,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7664,7 +7773,7 @@ function createFiberFromFragment(elements, mode, lanes, key) {
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7783,12 +7892,102 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
   return null;
 }
+var emptyObject$1 = {},
+  createHierarchy,
+  getHostNode,
+  getHostProps,
+  lastNonHostInstance,
+  getOwnerHierarchy,
+  traverseOwnerTreeUp;
+createHierarchy = function(fiberHierarchy) {
+  return fiberHierarchy.map(function(fiber) {
+    return {
+      name: getComponentNameFromType(fiber.type),
+      getInspectorData: function(findNodeHandle) {
+        return {
+          props: getHostProps(fiber),
+          source: fiber._debugSource,
+          measure: function(callback) {
+            var hostFiber = findCurrentHostFiber(fiber);
+            if (
+              (hostFiber =
+                null != hostFiber &&
+                null !== hostFiber.stateNode &&
+                hostFiber.stateNode.node)
+            )
+              nativeFabricUIManager.measure(hostFiber, callback);
+            else
+              return ReactNativePrivateInterface.UIManager.measure(
+                getHostNode(fiber, findNodeHandle),
+                callback
+              );
+          }
+        };
+      }
+    };
+  });
+};
+getHostNode = function(fiber, findNodeHandle) {
+  for (var hostNode; fiber; ) {
+    null !== fiber.stateNode &&
+      5 === fiber.tag &&
+      (hostNode = findNodeHandle(fiber.stateNode));
+    if (hostNode) return hostNode;
+    fiber = fiber.child;
+  }
+  return null;
+};
+getHostProps = function(fiber) {
+  return (fiber = findCurrentHostFiber(fiber))
+    ? fiber.memoizedProps || emptyObject$1
+    : emptyObject$1;
+};
+exports.getInspectorDataForInstance = function(closestInstance) {
+  if (!closestInstance)
+    return {
+      hierarchy: [],
+      props: emptyObject$1,
+      selectedIndex: null,
+      source: null
+    };
+  closestInstance = findCurrentFiberUsingSlowPath(closestInstance);
+  var fiberHierarchy = getOwnerHierarchy(closestInstance),
+    instance = lastNonHostInstance(fiberHierarchy);
+  closestInstance = createHierarchy(fiberHierarchy);
+  var props = getHostProps(instance),
+    source = instance._debugSource;
+  fiberHierarchy = fiberHierarchy.indexOf(instance);
+  return {
+    hierarchy: closestInstance,
+    props: props,
+    selectedIndex: fiberHierarchy,
+    source: source
+  };
+};
+getOwnerHierarchy = function(instance) {
+  var hierarchy = [];
+  traverseOwnerTreeUp(hierarchy, instance);
+  return hierarchy;
+};
+lastNonHostInstance = function(hierarchy) {
+  for (var i = hierarchy.length - 1; 1 < i; i--) {
+    var instance = hierarchy[i];
+    if (5 !== instance.tag) return instance;
+  }
+  return hierarchy[0];
+};
+traverseOwnerTreeUp = function(hierarchy, instance) {
+  instance &&
+    (hierarchy.unshift(instance),
+    traverseOwnerTreeUp(hierarchy, instance._debugOwner));
+};
 function findNodeHandle(componentOrHandle) {
   if (null == componentOrHandle) return null;
   if ("number" === typeof componentOrHandle) return componentOrHandle;
@@ -7818,14 +8017,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_908 = {
+  devToolsConfig$jscomp$inline_984 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-bd5bf555e-20210823",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -7840,17 +8039,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1115 = {
-  bundleType: devToolsConfig$jscomp$inline_908.bundleType,
-  version: devToolsConfig$jscomp$inline_908.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_908.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_908.rendererConfig,
+var internals$jscomp$inline_1237 = {
+  bundleType: devToolsConfig$jscomp$inline_984.bundleType,
+  version: devToolsConfig$jscomp$inline_984.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_984.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_984.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -7859,25 +8059,26 @@ var internals$jscomp$inline_1115 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_908.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_984.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-bd5bf555e-20210823"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1116 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1238 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1116.isDisabled &&
-    hook$jscomp$inline_1116.supportsFiber
+    !hook$jscomp$inline_1238.isDisabled &&
+    hook$jscomp$inline_1238.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1116.inject(
-        internals$jscomp$inline_1115
+      (rendererID = hook$jscomp$inline_1238.inject(
+        internals$jscomp$inline_1237
       )),
-        (injectedHook = hook$jscomp$inline_1116);
+        (injectedHook = hook$jscomp$inline_1238);
     } catch (err) {}
 }
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
@@ -7897,12 +8098,10 @@ exports.createPortal = function(children, containerTag) {
 };
 exports.dispatchCommand = function(handle, command, args) {
   null != handle._nativeTag &&
-    (handle._internalInstanceHandle
-      ? nativeFabricUIManager.dispatchCommand(
-          handle._internalInstanceHandle.stateNode.node,
-          command,
-          args
-        )
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.dispatchCommand(handle.node, command, args))
       : ReactNativePrivateInterface.UIManager.dispatchViewManagerCommand(
           handle._nativeTag,
           command,
@@ -7926,10 +8125,11 @@ exports.render = function(element, containerTag, callback) {
   var root = roots.get(containerTag);
   if (!root) {
     root = new FiberRootNode(containerTag, 0, !1);
-    var uninitializedFiber = createFiber(3, null, null, 0);
-    root.current = uninitializedFiber;
-    uninitializedFiber.stateNode = root;
-    initializeUpdateQueue(uninitializedFiber);
+    var JSCompiler_inline_result = createFiber(3, null, null, 0);
+    root.current = JSCompiler_inline_result;
+    JSCompiler_inline_result.stateNode = root;
+    JSCompiler_inline_result.memoizedState = { element: null };
+    initializeUpdateQueue(JSCompiler_inline_result);
     roots.set(containerTag, root);
   }
   updateContainer(element, root, null, callback);
@@ -7944,6 +8144,17 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.sendAccessibilityEvent(handle.node, eventType))
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.unmountComponentAtNode = unmountComponentAtNode;
 exports.unmountComponentAtNodeAndRemoveContainer = function(containerTag) {
   unmountComponentAtNode(containerTag);
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
index 0c2b0f6f04e58a..1d79146054d3bd 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactNativeRenderer-prod
  * @preventMunge
- * @generated
+ * @generated SignedSource<<c288080247bc17356dfdc8cf466cc543>>
  */
 
 "use strict";
@@ -63,7 +63,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -75,7 +76,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -289,36 +290,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -326,9 +337,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -338,12 +349,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -569,7 +580,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -920,7 +931,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_222 = {
+var injectedNamesToPlugins$jscomp$inline_219 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -955,34 +966,34 @@ var injectedNamesToPlugins$jscomp$inline_222 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_223 = !1,
-  pluginName$jscomp$inline_224;
-for (pluginName$jscomp$inline_224 in injectedNamesToPlugins$jscomp$inline_222)
+  isOrderingDirty$jscomp$inline_220 = !1,
+  pluginName$jscomp$inline_221;
+for (pluginName$jscomp$inline_221 in injectedNamesToPlugins$jscomp$inline_219)
   if (
-    injectedNamesToPlugins$jscomp$inline_222.hasOwnProperty(
-      pluginName$jscomp$inline_224
+    injectedNamesToPlugins$jscomp$inline_219.hasOwnProperty(
+      pluginName$jscomp$inline_221
     )
   ) {
-    var pluginModule$jscomp$inline_225 =
-      injectedNamesToPlugins$jscomp$inline_222[pluginName$jscomp$inline_224];
+    var pluginModule$jscomp$inline_222 =
+      injectedNamesToPlugins$jscomp$inline_219[pluginName$jscomp$inline_221];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_224) ||
-      namesToPlugins[pluginName$jscomp$inline_224] !==
-        pluginModule$jscomp$inline_225
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_221) ||
+      namesToPlugins[pluginName$jscomp$inline_221] !==
+        pluginModule$jscomp$inline_222
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_224])
+      if (namesToPlugins[pluginName$jscomp$inline_221])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_224 +
+            pluginName$jscomp$inline_221 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_224
-      ] = pluginModule$jscomp$inline_225;
-      isOrderingDirty$jscomp$inline_223 = !0;
+        pluginName$jscomp$inline_221
+      ] = pluginModule$jscomp$inline_222;
+      isOrderingDirty$jscomp$inline_220 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_223 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_220 && recomputePluginOrdering();
 var instanceCache = new Map(),
   instanceProps = new Map();
 function getInstanceFromTag(tag) {
@@ -1006,7 +1017,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1138,10 +1149,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1156,11 +1167,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1170,7 +1181,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1187,6 +1198,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1196,24 +1209,83 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1222,7 +1294,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1310,33 +1382,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 var emptyObject = {},
   removedKeys = null,
@@ -1356,7 +1411,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1402,9 +1457,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1429,7 +1484,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1445,7 +1500,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1462,7 +1517,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1572,60 +1627,277 @@ function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   };
 }
 var ReactNativeFiberHostComponent = (function() {
-  function ReactNativeFiberHostComponent(tag, viewConfig) {
-    this._nativeTag = tag;
-    this._children = [];
-    this.viewConfig = viewConfig;
-  }
-  var _proto = ReactNativeFiberHostComponent.prototype;
-  _proto.blur = function() {
-    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
-  };
-  _proto.focus = function() {
-    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
-  };
-  _proto.measure = function(callback) {
-    ReactNativePrivateInterface.UIManager.measure(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureInWindow = function(callback) {
-    ReactNativePrivateInterface.UIManager.measureInWindow(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
-    if ("number" === typeof relativeToNativeNode)
-      var relativeNode = relativeToNativeNode;
-    else
-      relativeToNativeNode._nativeTag &&
-        (relativeNode = relativeToNativeNode._nativeTag);
-    null != relativeNode &&
-      ReactNativePrivateInterface.UIManager.measureLayout(
+    function ReactNativeFiberHostComponent(tag, viewConfig) {
+      this._nativeTag = tag;
+      this._children = [];
+      this.viewConfig = viewConfig;
+    }
+    var _proto = ReactNativeFiberHostComponent.prototype;
+    _proto.blur = function() {
+      ReactNativePrivateInterface.TextInputState.blurTextInput(this);
+    };
+    _proto.focus = function() {
+      ReactNativePrivateInterface.TextInputState.focusTextInput(this);
+    };
+    _proto.measure = function(callback) {
+      ReactNativePrivateInterface.UIManager.measure(
         this._nativeTag,
-        relativeNode,
-        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  _proto.setNativeProps = function(nativeProps) {
-    nativeProps = diffProperties(
-      null,
-      emptyObject,
-      nativeProps,
-      this.viewConfig.validAttributes
-    );
-    null != nativeProps &&
-      ReactNativePrivateInterface.UIManager.updateView(
+    };
+    _proto.measureInWindow = function(callback) {
+      ReactNativePrivateInterface.UIManager.measureInWindow(
         this._nativeTag,
-        this.viewConfig.uiViewClassName,
-        nativeProps
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  return ReactNativeFiberHostComponent;
-})();
+    };
+    _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
+      if ("number" === typeof relativeToNativeNode)
+        var relativeNode = relativeToNativeNode;
+      else
+        relativeToNativeNode._nativeTag &&
+          (relativeNode = relativeToNativeNode._nativeTag);
+      null != relativeNode &&
+        ReactNativePrivateInterface.UIManager.measureLayout(
+          this._nativeTag,
+          relativeNode,
+          mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+          mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        );
+    };
+    _proto.setNativeProps = function(nativeProps) {
+      nativeProps = diffProperties(
+        null,
+        emptyObject,
+        nativeProps,
+        this.viewConfig.validAttributes
+      );
+      null != nativeProps &&
+        ReactNativePrivateInterface.UIManager.updateView(
+          this._nativeTag,
+          this.viewConfig.uiViewClassName,
+          nativeProps
+        );
+    };
+    return ReactNativeFiberHostComponent;
+  })(),
+  scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null;
+function onCommitRoot(root) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        void 0,
+        128 === (root.current.flags & 128)
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 !== (nextLanes & 4) && (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$8 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$8;
+    remainingLanes[index$8] = 0;
+    eventTimes[index$8] = -1;
+    root[index$8] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$9 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$9;
+    (lane & entangledLanes) | (root[index$9] & entangledLanes) &&
+      (root[index$9] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
 function shim() {
   throw Error(
     "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
@@ -1674,7 +1946,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1728,13 +2001,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1770,346 +2043,79 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  Scheduler_now = Scheduler.unstable_now;
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
+  if (!isFlushingSyncQueue && null !== syncQueue) {
+    isFlushingSyncQueue = !0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
+    try {
+      var queue = syncQueue;
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
+      syncQueue = null;
+      includesLegacySyncCallbacks = !1;
+    } catch (error) {
+      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+      error);
+    } finally {
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
+    }
   }
+  return null;
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
+var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
+function is(x, y) {
+  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
+}
+var objectIs = "function" === typeof Object.is ? Object.is : is;
+function shallowEqual(objA, objB) {
+  if (objectIs(objA, objB)) return !0;
+  if (
+    "object" !== typeof objA ||
+    null === objA ||
+    "object" !== typeof objB ||
+    null === objB
+  )
+    return !1;
+  var keysA = Object.keys(objA),
+    keysB = Object.keys(objB);
+  if (keysA.length !== keysB.length) return !1;
+  for (keysB = 0; keysB < keysA.length; keysB++)
+    if (
+      !hasOwnProperty.call(objB, keysA[keysB]) ||
+      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
+    )
+      return !1;
+  return !0;
+}
+function describeFiber(fiber) {
+  switch (fiber.tag) {
     case 5:
-      return 97;
-    case 3:
+      return describeComponentFrame(fiber.type, null, null);
+    case 16:
+      return describeComponentFrame("Lazy", null, null);
+    case 13:
+      return describeComponentFrame("Suspense", null, null);
+    case 19:
+      return describeComponentFrame("SuspenseList", null, null);
+    case 0:
     case 2:
+    case 15:
+      return describeFunctionComponentFrame(fiber.type, null);
+    case 11:
+      return describeFunctionComponentFrame(fiber.type.render, null);
     case 1:
-      return 95;
-    case 0:
-      return 90;
+      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
-}
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority,
-  fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
-  if (!isFlushingSyncQueue && null !== syncQueue) {
-    isFlushingSyncQueue = !0;
-    var i = 0;
-    try {
-      var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
-      syncQueue = null;
-    } catch (error) {
-      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
-      error);
-    } finally {
-      isFlushingSyncQueue = !1;
-    }
-  }
-}
-var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
-function is(x, y) {
-  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
-}
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
-function shallowEqual(objA, objB) {
-  if (objectIs(objA, objB)) return !0;
-  if (
-    "object" !== typeof objA ||
-    null === objA ||
-    "object" !== typeof objB ||
-    null === objB
-  )
-    return !1;
-  var keysA = Object.keys(objA),
-    keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) return !1;
-  for (keysB = 0; keysB < keysA.length; keysB++)
-    if (
-      !hasOwnProperty.call(objB, keysA[keysB]) ||
-      !objectIs(objA[keysA[keysB]], objB[keysA[keysB]])
-    )
-      return !1;
-  return !0;
-}
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case 5:
-      return describeComponentFrame(fiber.type, null, null);
-    case 16:
-      return describeComponentFrame("Lazy", null, null);
-    case 13:
-      return describeComponentFrame("Suspense", null, null);
-    case 19:
-      return describeComponentFrame("SuspenseList", null, null);
-    case 0:
-    case 2:
-    case 15:
-      return describeFunctionComponentFrame(fiber.type, null);
-    case 11:
-      return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
-    case 1:
-      return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
-    default:
-      return "";
+      return "";
   }
 }
 function getStackByFiberInDevAndProd(workInProgress) {
@@ -2138,14 +2144,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue = currentValue;
+  context._currentValue = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2165,44 +2171,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2228,14 +2230,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 8)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2304,111 +2326,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2464,7 +2486,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2475,7 +2498,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2485,7 +2509,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2557,7 +2582,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2579,7 +2603,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2632,25 +2655,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2682,16 +2702,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2706,7 +2726,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2795,7 +2824,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2820,22 +2849,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2863,15 +2884,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2882,7 +2895,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3065,55 +3078,49 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild.type === REACT_FRAGMENT_TYPE &&
       null === newChild.key;
     isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
+            var key = newChild.key;
             for (
               isUnkeyedTopLevelFragment = currentFirstChild;
               null !== isUnkeyedTopLevelFragment;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (isUnkeyedTopLevelFragment.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === isUnkeyedTopLevelFragment.tag) {
+                    deleteRemainingChildren(
+                      returnFiber,
+                      isUnkeyedTopLevelFragment.sibling
+                    );
+                    currentFirstChild = useFiber(
+                      isUnkeyedTopLevelFragment,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (isUnkeyedTopLevelFragment.elementType === key) {
+                  deleteRemainingChildren(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment.sibling
+                  );
+                  currentFirstChild = useFiber(
+                    isUnkeyedTopLevelFragment,
+                    newChild.props
+                  );
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
                 deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
                 break;
@@ -3189,6 +3196,22 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
@@ -3207,30 +3230,14 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 1:
-        case 22:
         case 0:
         case 11:
         case 15:
           throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
+            (getComponentNameFromFiber(returnFiber) || "Component") +
               "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
           );
       }
@@ -3292,7 +3299,7 @@ function findFirstSuspended(row) {
       if (null !== state && (null === state.dehydrated || shim() || shim()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3444,10 +3451,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3472,22 +3480,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3527,7 +3546,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3557,25 +3576,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$13 = 31 - clz32(lanes),
-            lane = 1 << index$13;
-          entanglements[index$13] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3602,6 +3609,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3627,6 +3636,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3675,7 +3686,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3683,10 +3694,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3747,19 +3758,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3771,33 +3781,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 8)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3854,6 +3890,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3895,7 +3933,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3944,8 +3982,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -3986,57 +4025,126 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
       return rerenderReducer(basicStateReducer)[0];
     },
     unstable_isNewReconciler: !1
-  },
-  ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
-  didReceiveUpdate = !1;
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  workInProgress.child =
-    null === current
-      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
-      : reconcileChildFibers(
-          workInProgress,
-          current.child,
-          nextChildren,
-          renderLanes
-        );
+  };
+function createCapturedValue(value, source) {
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
 }
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  Component = Component.render;
-  var ref = workInProgress.ref;
-  prepareToReadContext(workInProgress, renderLanes);
-  nextProps = renderWithHooks(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    ref,
-    renderLanes
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
   );
-  if (null !== current && !didReceiveUpdate)
-    return (
-      (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
-      (current.lanes &= ~renderLanes),
-      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
-    );
-  workInProgress.flags |= 1;
-  reconcileChildren(current, workInProgress, nextProps, renderLanes);
-  return workInProgress.child;
-}
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      logCapturedError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logCapturedError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
+  didReceiveUpdate = !1;
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  workInProgress.child =
+    null === current
+      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
+      : reconcileChildFibers(
+          workInProgress,
+          current.child,
+          nextChildren,
+          renderLanes
+        );
+}
+function updateForwardRef(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  Component = Component.render;
+  var ref = workInProgress.ref;
+  prepareToReadContext(workInProgress, renderLanes);
+  nextProps = renderWithHooks(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    ref,
+    renderLanes
+  );
+  if (null !== current && !didReceiveUpdate)
+    return (
+      (workInProgress.updateQueue = current.updateQueue),
+      (workInProgress.flags &= -1029),
+      (current.lanes &= ~renderLanes),
+      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
+    );
+  workInProgress.flags |= 1;
+  reconcileChildren(current, workInProgress, nextProps, renderLanes);
+  return workInProgress.child;
+}
 function updateMemoComponent(
   current,
   workInProgress,
@@ -4105,14 +4213,15 @@ function updateSimpleMemoComponent(
     null !== current &&
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
-  )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
-      0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
-    else
+  ) {
+    didReceiveUpdate = !1;
+    if (0 === (renderLanes & updateLanes))
       return (
         (workInProgress.lanes = current.lanes),
         bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
       );
+    0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
+  }
   return updateFunctionComponent(
     current,
     workInProgress,
@@ -4129,30 +4238,39 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      nextProps = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= nextProps;
+    }
   else
     null !== prevState
       ? ((nextProps = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
       : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= nextProps);
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
@@ -4162,7 +4280,7 @@ function markRef(current, workInProgress) {
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4187,7 +4305,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4347,7 +4465,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4362,7 +4481,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4370,7 +4489,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4384,7 +4503,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4405,7 +4524,7 @@ function finishClassComponent(
   renderLanes
 ) {
   markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4449,18 +4568,21 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
       void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
@@ -4477,7 +4599,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4489,9 +4613,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
@@ -4517,8 +4643,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4545,8 +4674,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4569,7 +4701,7 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren))
     : (progressedPrimaryFragment = createFiberFromOffscreen(
@@ -4602,13 +4734,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4618,26 +4751,22 @@ function updateSuspenseFallbackChildren(
   fallbackChildren,
   renderLanes
 ) {
-  var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
+  var mode = workInProgress.mode;
+  current = current.child;
+  var currentFallbackChildFragment = current.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== current
     ? ((primaryChildren = workInProgress.child),
       (primaryChildren.childLanes = 0),
       (primaryChildren.pendingProps = primaryChildProps),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
-        currentPrimaryChildFragment,
-        primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+      (workInProgress.deletions = null))
+    : ((primaryChildren = createWorkInProgress(current, primaryChildProps)),
+      (primaryChildren.subtreeFlags = current.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4662,8 +4791,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4673,16 +4801,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4691,9 +4817,9 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
@@ -4716,7 +4842,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
     nextProps &= 1;
   }
   push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
   else
     switch (revealOrder) {
       case "forwards":
@@ -4737,8 +4863,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !1,
           revealOrder,
           renderLanes,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "backwards":
@@ -4760,19 +4885,11 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !0,
           renderLanes,
           null,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
         break;
       default:
         workInProgress.memoizedState = null;
@@ -4782,25 +4899,23 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
 function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
   null !== current && (workInProgress.dependencies = current.dependencies);
   workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
+          current,
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
   }
-  return null;
+  return workInProgress.child;
 }
 var appendAllChildren,
   updateHostContainer,
@@ -4847,16 +4962,40 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$64 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$64 = lastTailNode),
+      for (var lastTailNode$69 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$69 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$64
+      null === lastTailNode$69
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$64.sibling = null);
+        : (lastTailNode$69.sibling = null);
   }
 }
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    for (var child$70 = completedWork.child; null !== child$70; )
+      (newChildLanes |= child$70.lanes | child$70.childLanes),
+        (subtreeFlags |= child$70.subtreeFlags & 1835008),
+        (subtreeFlags |= child$70.flags & 1835008),
+        (child$70.return = completedWork),
+        (child$70 = child$70.sibling);
+  else
+    for (child$70 = completedWork.child; null !== child$70; )
+      (newChildLanes |= child$70.lanes | child$70.childLanes),
+        (subtreeFlags |= child$70.subtreeFlags),
+        (subtreeFlags |= child$70.flags),
+        (child$70.return = completedWork),
+        (child$70 = child$70.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
 function completeWork(current, workInProgress, renderLanes) {
   var newProps = workInProgress.pendingProps;
   switch (workInProgress.tag) {
@@ -4870,76 +5009,80 @@ function completeWork(current, workInProgress, renderLanes) {
     case 12:
     case 9:
     case 14:
-      return null;
+      return bubbleProperties(workInProgress), null;
     case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 3:
       return (
+        (newProps = workInProgress.stateNode),
         popHostContainer(),
         pop(didPerformWorkStackCursor),
         pop(contextStackCursor),
         resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
         newProps.pendingContext &&
           ((newProps.context = newProps.pendingContext),
           (newProps.pendingContext = null)),
         (null !== current && null !== current.child) ||
           newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
         null
       );
     case 5:
       popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
       if (null !== current && null != workInProgress.stateNode)
         updateHostComponent$1(
           current,
           workInProgress,
-          renderLanes,
+          type,
           newProps,
-          rootContainerInstance
+          renderLanes
         ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
       else {
         if (!newProps) {
           if (null === workInProgress.stateNode)
             throw Error(
               "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
             );
+          bubbleProperties(workInProgress);
           return null;
         }
         requiredContext(contextStackCursor$1.current);
         current = allocateTag();
-        renderLanes = getViewConfigForType(renderLanes);
+        type = getViewConfigForType(type);
         var updatePayload = diffProperties(
           null,
           emptyObject,
           newProps,
-          renderLanes.validAttributes
+          type.validAttributes
         );
         ReactNativePrivateInterface.UIManager.createView(
           current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
+          type.uiViewClassName,
+          renderLanes,
           updatePayload
         );
-        rootContainerInstance = new ReactNativeFiberHostComponent(
+        renderLanes = new ReactNativeFiberHostComponent(
           current,
-          renderLanes,
+          type,
           workInProgress
         );
         instanceCache.set(current, workInProgress);
         instanceProps.set(current, newProps);
-        appendAllChildren(rootContainerInstance, workInProgress, !1, !1);
-        workInProgress.stateNode = rootContainerInstance;
-        finalizeInitialChildren(rootContainerInstance) &&
-          (workInProgress.flags |= 4);
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
+        appendAllChildren(renderLanes, workInProgress, !1, !1);
+        workInProgress.stateNode = renderLanes;
+        finalizeInitialChildren(renderLanes) && (workInProgress.flags |= 4);
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
       }
+      bubbleProperties(workInProgress);
       return null;
     case 6:
       if (current && null != workInProgress.stateNode)
@@ -4959,27 +5102,27 @@ function completeWork(current, workInProgress, renderLanes) {
           throw Error(
             "Text strings must be rendered within a <Text> component."
           );
-        rootContainerInstance = allocateTag();
+        renderLanes = allocateTag();
         ReactNativePrivateInterface.UIManager.createView(
-          rootContainerInstance,
+          renderLanes,
           "RCTRawText",
           current,
           { text: newProps }
         );
-        instanceCache.set(rootContainerInstance, workInProgress);
-        workInProgress.stateNode = rootContainerInstance;
+        instanceCache.set(renderLanes, workInProgress);
+        workInProgress.stateNode = renderLanes;
       }
+      bubbleProperties(workInProgress);
       return null;
     case 13:
       pop(suspenseStackCursor);
       newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
+      if (0 !== (workInProgress.flags & 128))
         return (workInProgress.lanes = renderLanes), workInProgress;
       newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (newProps && !renderLanes && 0 !== (workInProgress.mode & 1))
         if (
           (null === current &&
             !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
@@ -4994,82 +5137,92 @@ function completeWork(current, workInProgress, renderLanes) {
           )
             workInProgressRootExitStatus = 4;
           null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
             markRootSuspended$1(
               workInProgressRoot,
               workInProgressRootRenderLanes
             );
         }
-      if (newProps || rootContainerInstance) workInProgress.flags |= 4;
+      if (newProps || renderLanes) workInProgress.flags |= 4;
+      bubbleProperties(workInProgress);
       return null;
     case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 10:
-      return popProvider(workInProgress), null;
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 19:
       pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      updatePayload = type.rendering;
       if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
+        if (newProps) cutOffTailIfNeeded(type, !1);
         else {
           if (
             0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
+            (null !== current && 0 !== (current.flags & 128))
           )
             for (current = workInProgress.child; null !== current; ) {
               updatePayload = findFirstSuspended(current);
               if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
                 current = updatePayload.updateQueue;
                 null !== current &&
                   ((workInProgress.updateQueue = current),
                   (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
+                workInProgress.subtreeFlags = 0;
                 current = renderLanes;
                 for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
-                    (renderLanes = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (updatePayload = rootContainerInstance.alternate),
+                  (renderLanes = newProps),
+                    (type = current),
+                    (renderLanes.flags &= 1835010),
+                    (updatePayload = renderLanes.alternate),
                     null === updatePayload
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = renderLanes),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null))
-                      : ((rootContainerInstance.childLanes =
-                          updatePayload.childLanes),
-                        (rootContainerInstance.lanes = updatePayload.lanes),
-                        (rootContainerInstance.child = updatePayload.child),
-                        (rootContainerInstance.memoizedProps =
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = type),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null))
+                      : ((renderLanes.childLanes = updatePayload.childLanes),
+                        (renderLanes.lanes = updatePayload.lanes),
+                        (renderLanes.child = updatePayload.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps =
                           updatePayload.memoizedProps),
-                        (rootContainerInstance.memoizedState =
+                        (renderLanes.memoizedState =
                           updatePayload.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          updatePayload.updateQueue),
-                        (rootContainerInstance.type = updatePayload.type),
-                        (renderLanes = updatePayload.dependencies),
-                        (rootContainerInstance.dependencies =
-                          null === renderLanes
+                        (renderLanes.updateQueue = updatePayload.updateQueue),
+                        (renderLanes.type = updatePayload.type),
+                        (type = updatePayload.dependencies),
+                        (renderLanes.dependencies =
+                          null === type
                             ? null
                             : {
-                                lanes: renderLanes.lanes,
-                                firstContext: renderLanes.firstContext
+                                lanes: type.lanes,
+                                firstContext: type.firstContext
                               })),
                     (newProps = newProps.sibling);
                 push(
@@ -5080,78 +5233,74 @@ function completeWork(current, workInProgress, renderLanes) {
               }
               current = current.sibling;
             }
-          null !== newProps.tail &&
+          null !== type.tail &&
             now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432));
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
         }
       else {
-        if (!rootContainerInstance)
+        if (!newProps)
           if (
             ((current = findFirstSuspended(updatePayload)), null !== current)
           ) {
             if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
               (current = current.updateQueue),
               null !== current &&
                 ((workInProgress.updateQueue = current),
                 (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
                 !updatePayload.alternate)
             )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
+              return bubbleProperties(workInProgress), null;
           } else
-            2 * now() - newProps.renderingStartTime >
+            2 * now() - type.renderingStartTime >
               workInProgressRootRenderTargetTime &&
               1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432));
-        newProps.isBackwards
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
           ? ((updatePayload.sibling = workInProgress.child),
             (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
+          : ((current = type.last),
             null !== current
               ? (current.sibling = updatePayload)
               : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+            (type.last = updatePayload));
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
     case 23:
-    case 24:
       return (
         popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
         null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
+          (null !== current.memoizedState) !== renderLanes &&
           "unstable-defer-without-hiding" !== newProps.mode &&
           (workInProgress.flags |= 4),
+        (renderLanes &&
+          0 === (subtreeRenderLanes & 1073741824) &&
+          0 !== (workInProgress.mode & 1)) ||
+          bubbleProperties(workInProgress),
         null
       );
   }
@@ -5166,8 +5315,8 @@ function unwindWork(workInProgress) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
         : null;
     case 3:
       popHostContainer();
@@ -5175,11 +5324,11 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
@@ -5187,8 +5336,8 @@ function unwindWork(workInProgress) {
       return (
         pop(suspenseStackCursor),
         (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64), workInProgress)
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128), workInProgress)
           : null
       );
     case 19:
@@ -5196,278 +5345,194 @@ function unwindWork(workInProgress) {
     case 4:
       return popHostContainer(), null;
     case 10:
-      return popProvider(workInProgress), null;
+      return popProvider(workInProgress.type._context), null;
+    case 22:
     case 23:
-    case 24:
       return popRenderLanes(), null;
+    case 24:
+      return null;
     default:
       return null;
   }
 }
-function createCapturedValue(value, source) {
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
-}
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
-  }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
-}
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
   var ref = current.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
         ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
     else ref.current = null;
 }
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
       }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
-  }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
 }
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$81 = finishedRoot.create;
-            finishedRoot.destroy = create$81();
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor$jscomp$0
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        if (void 0 !== destroy) {
+          var current = finishedWork,
+            nearestMountedAncestor = nearestMountedAncestor$jscomp$0;
+          try {
+            destroy();
+          } catch (error) {
+            captureCommitPhaseError(current, nearestMountedAncestor, error);
           }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
-      }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$81 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$81;
-        } while (finishedRoot !== current);
+        }
       }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$81 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$81,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
-          }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
+      effect = effect.next;
+    } while (effect !== updateQueue);
+  }
+}
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$82 = effect.create;
+        effect.destroy = create$82();
       }
-      return;
-    case 5:
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      return;
-    case 13:
-      return;
-    case 19:
-    case 17:
-    case 20:
-    case 21:
-    case 23:
-    case 24:
-      return;
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
 function hideOrUnhideAllChildren(finishedWork, isHidden) {
-  for (var node = finishedWork; ; ) {
+  for (var hostSubtreeRoot = null, node = finishedWork; ; ) {
     if (5 === node.tag) {
-      var instance = node.stateNode;
-      if (isHidden) {
-        var viewConfig = instance.viewConfig;
-        var updatePayload = diffProperties(
-          null,
-          emptyObject,
-          { style: { display: "none" } },
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
-      } else {
-        instance = node.stateNode;
-        updatePayload = node.memoizedProps;
-        viewConfig = instance.viewConfig;
-        var prevProps = Object.assign({}, updatePayload, {
-          style: [updatePayload.style, { display: "none" }]
-        });
-        updatePayload = diffProperties(
-          null,
-          prevProps,
-          updatePayload,
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
-      }
-    } else {
-      if (6 === node.tag) throw Error("Not yet implemented.");
-      if (
-        ((23 !== node.tag && 24 !== node.tag) ||
-          null === node.memoizedState ||
-          node === finishedWork) &&
-        null !== node.child
-      ) {
-        node.child.return = node;
-        node = node.child;
-        continue;
+      if (null === hostSubtreeRoot) {
+        hostSubtreeRoot = node;
+        var instance = node.stateNode;
+        if (isHidden) {
+          var viewConfig = instance.viewConfig;
+          var updatePayload = diffProperties(
+            null,
+            emptyObject,
+            { style: { display: "none" } },
+            viewConfig.validAttributes
+          );
+          ReactNativePrivateInterface.UIManager.updateView(
+            instance._nativeTag,
+            viewConfig.uiViewClassName,
+            updatePayload
+          );
+        } else {
+          instance = node.stateNode;
+          updatePayload = node.memoizedProps;
+          viewConfig = instance.viewConfig;
+          var prevProps = Object.assign({}, updatePayload, {
+            style: [updatePayload.style, { display: "none" }]
+          });
+          updatePayload = diffProperties(
+            null,
+            prevProps,
+            updatePayload,
+            viewConfig.validAttributes
+          );
+          ReactNativePrivateInterface.UIManager.updateView(
+            instance._nativeTag,
+            viewConfig.uiViewClassName,
+            updatePayload
+          );
+        }
       }
+    } else if (6 === node.tag) {
+      if (null === hostSubtreeRoot) throw Error("Not yet implemented.");
+    } else if (
+      ((22 !== node.tag && 23 !== node.tag) ||
+        null === node.memoizedState ||
+        node === finishedWork) &&
+      null !== node.child
+    ) {
+      node.child.return = node;
+      node = node.child;
+      continue;
     }
     if (node === finishedWork) break;
     for (; null === node.sibling; ) {
       if (null === node.return || node.return === finishedWork) return;
+      hostSubtreeRoot === node && (hostSubtreeRoot = null);
       node = node.return;
     }
+    hostSubtreeRoot === node && (hostSubtreeRoot = null);
     node.sibling.return = node.return;
     node = node.sibling;
   }
 }
-function commitUnmount(finishedRoot, current) {
+function commitUnmount(finishedRoot, current, nearestMountedAncestor$jscomp$0) {
   if (injectedHook && "function" === typeof injectedHook.onCommitFiberUnmount)
     try {
       injectedHook.onCommitFiberUnmount(rendererID, current);
@@ -5477,7 +5542,6 @@ function commitUnmount(finishedRoot, current) {
     case 11:
     case 14:
     case 15:
-    case 22:
       finishedRoot = current.updateQueue;
       if (
         null !== finishedRoot &&
@@ -5485,26 +5549,24 @@ function commitUnmount(finishedRoot, current) {
       ) {
         var effect = (finishedRoot = finishedRoot.next);
         do {
-          var _effect2 = effect,
-            destroy = _effect2.destroy;
-          _effect2 = _effect2.tag;
-          if (void 0 !== destroy)
-            if (0 !== (_effect2 & 4))
-              enqueuePendingPassiveHookEffectUnmount(current, effect);
-            else {
-              _effect2 = current;
-              try {
-                destroy();
-              } catch (error) {
-                captureCommitPhaseError(_effect2, error);
-              }
+          var _effect = effect,
+            destroy = _effect.destroy;
+          _effect = _effect.tag;
+          if (void 0 !== destroy && 0 !== (_effect & 2)) {
+            _effect = current;
+            var nearestMountedAncestor = nearestMountedAncestor$jscomp$0;
+            try {
+              destroy();
+            } catch (error) {
+              captureCommitPhaseError(_effect, nearestMountedAncestor, error);
             }
+          }
           effect = effect.next;
         } while (effect !== finishedRoot);
       }
       break;
     case 1:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor$jscomp$0);
       finishedRoot = current.stateNode;
       if ("function" === typeof finishedRoot.componentWillUnmount)
         try {
@@ -5512,26 +5574,38 @@ function commitUnmount(finishedRoot, current) {
             (finishedRoot.state = current.memoizedState),
             finishedRoot.componentWillUnmount();
         } catch (unmountError) {
-          captureCommitPhaseError(current, unmountError);
+          captureCommitPhaseError(
+            current,
+            nearestMountedAncestor$jscomp$0,
+            unmountError
+          );
         }
       break;
     case 5:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor$jscomp$0);
       break;
     case 4:
-      unmountHostComponents(finishedRoot, current);
+      unmountHostComponents(
+        finishedRoot,
+        current,
+        nearestMountedAncestor$jscomp$0
+      );
   }
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function isHostParent(fiber) {
@@ -5566,7 +5640,7 @@ function commitPlacement(finishedWork) {
         "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
       );
   }
-  parentFiber.flags & 16 && (parentFiber.flags &= -17);
+  parentFiber.flags & 32 && (parentFiber.flags &= -33);
   a: b: for (parentFiber = finishedWork; ; ) {
     for (; null === parentFiber.sibling; ) {
       if (null === parentFiber.return || isHostParent(parentFiber.return)) {
@@ -5601,10 +5675,9 @@ function commitPlacement(finishedWork) {
     : insertOrAppendPlacementNode(finishedWork, parentFiber, parent);
 }
 function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    if (((node = isHost ? node.stateNode : node.stateNode.instance), before)) {
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
       if ("number" === typeof parent)
         throw Error("Container does not support insertBefore operation");
     } else
@@ -5622,58 +5695,57 @@ function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
         (node = node.sibling);
 }
 function insertOrAppendPlacementNode(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    (node = isHost ? node.stateNode : node.stateNode.instance),
-      before
-        ? ((tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              (before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [before],
-                [],
-                [],
-                []
-              ))
-            : ((before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                ["number" === typeof node ? node : node._nativeTag],
-                [before],
-                []
-              )))
-        : ((before = "number" === typeof node ? node : node._nativeTag),
-          (tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [tag.length - 1],
-                [],
-                [],
-                []
-              ))
-            : (tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                [before],
-                [tag.length - 1],
-                []
-              )));
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
+      tag = parent._children;
+      var index = tag.indexOf(node);
+      0 <= index
+        ? (tag.splice(index, 1),
+          (before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [index],
+            [before],
+            [],
+            [],
+            []
+          ))
+        : ((before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [],
+            [],
+            ["number" === typeof node ? node : node._nativeTag],
+            [before],
+            []
+          ));
+    } else
+      (before = "number" === typeof node ? node : node._nativeTag),
+        (tag = parent._children),
+        (index = tag.indexOf(node)),
+        0 <= index
+          ? (tag.splice(index, 1),
+            tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [index],
+              [tag.length - 1],
+              [],
+              [],
+              []
+            ))
+          : (tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [],
+              [],
+              [before],
+              [tag.length - 1],
+              []
+            ));
   else if (4 !== tag && ((node = node.child), null !== node))
     for (
       insertOrAppendPlacementNode(node, before, parent), node = node.sibling;
@@ -5682,7 +5754,11 @@ function insertOrAppendPlacementNode(node, before, parent) {
     )
       insertOrAppendPlacementNode(node, before, parent), (node = node.sibling);
 }
-function unmountHostComponents(finishedRoot$jscomp$0, current) {
+function unmountHostComponents(
+  finishedRoot$jscomp$0,
+  current,
+  nearestMountedAncestor$jscomp$0
+) {
   for (
     var node = current,
       currentParentIsValid = !1,
@@ -5720,12 +5796,13 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
       a: for (
         var finishedRoot = finishedRoot$jscomp$0,
           root = node,
+          nearestMountedAncestor = nearestMountedAncestor$jscomp$0,
           node$jscomp$0 = root;
         ;
 
       )
         if (
-          (commitUnmount(finishedRoot, node$jscomp$0),
+          (commitUnmount(finishedRoot, node$jscomp$0, nearestMountedAncestor),
           null !== node$jscomp$0.child && 4 !== node$jscomp$0.tag)
         )
           (node$jscomp$0.child.return = node$jscomp$0),
@@ -5752,18 +5829,18 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
             [0]
           ))
         : ((finishedRoot = currentParent),
-          (node$jscomp$0 = node.stateNode),
-          recursivelyUncacheFiberNode(node$jscomp$0),
+          (nearestMountedAncestor = node.stateNode),
+          recursivelyUncacheFiberNode(nearestMountedAncestor),
           (root = finishedRoot._children),
-          (node$jscomp$0 = root.indexOf(node$jscomp$0)),
-          root.splice(node$jscomp$0, 1),
+          (nearestMountedAncestor = root.indexOf(nearestMountedAncestor)),
+          root.splice(nearestMountedAncestor, 1),
           ReactNativePrivateInterface.UIManager.manageChildren(
             finishedRoot._nativeTag,
             [],
             [],
             [],
             [],
-            [node$jscomp$0]
+            [nearestMountedAncestor]
           ));
     } else if (4 === node.tag) {
       if (null !== node.child) {
@@ -5774,7 +5851,12 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
         continue;
       }
     } else if (
-      (commitUnmount(finishedRoot$jscomp$0, node), null !== node.child)
+      (commitUnmount(
+        finishedRoot$jscomp$0,
+        node,
+        nearestMountedAncestor$jscomp$0
+      ),
+      null !== node.child)
     ) {
       node.child.return = node;
       node = node.child;
@@ -5796,43 +5878,31 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      var updateQueue = finishedWork.updateQueue;
-      updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
-      if (null !== updateQueue) {
-        var effect = (updateQueue = updateQueue.next);
-        do
-          3 === (effect.tag & 3) &&
-            ((finishedWork = effect.destroy),
-            (effect.destroy = void 0),
-            void 0 !== finishedWork && finishedWork()),
-            (effect = effect.next);
-        while (effect !== updateQueue);
-      }
+      commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 1:
       return;
     case 5:
-      updateQueue = finishedWork.stateNode;
-      if (null != updateQueue) {
-        effect = finishedWork.memoizedProps;
-        current = null !== current ? current.memoizedProps : effect;
+      var instance = finishedWork.stateNode;
+      if (null != instance) {
+        var newProps = finishedWork.memoizedProps;
+        current = null !== current ? current.memoizedProps : newProps;
         var updatePayload = finishedWork.updateQueue;
         finishedWork.updateQueue = null;
         null !== updatePayload &&
-          ((finishedWork = updateQueue.viewConfig),
-          instanceProps.set(updateQueue._nativeTag, effect),
-          (effect = diffProperties(
+          ((finishedWork = instance.viewConfig),
+          instanceProps.set(instance._nativeTag, newProps),
+          (newProps = diffProperties(
             null,
             current,
-            effect,
+            newProps,
             finishedWork.validAttributes
           )),
-          null != effect &&
+          null != newProps &&
             ReactNativePrivateInterface.UIManager.updateView(
-              updateQueue._nativeTag,
+              instance._nativeTag,
               finishedWork.uiViewClassName,
-              effect
+              newProps
             ));
       }
       return;
@@ -5862,8 +5932,8 @@ function commitWork(current, finishedWork) {
       return;
     case 17:
       return;
+    case 22:
     case 23:
-    case 24:
       hideOrUnhideAllChildren(
         finishedWork,
         null !== finishedWork.memoizedState
@@ -5888,17 +5958,189 @@ function attachSuspenseRetryListeners(finishedWork) {
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    firstChild = nextEffect;
+    var deletions = firstChild.deletions;
+    if (null !== deletions)
+      for (var i = 0; i < deletions.length; i++) {
+        var childToDelete = deletions[i];
+        try {
+          unmountHostComponents(root, childToDelete, firstChild);
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, firstChild, error);
+        }
+      }
+    deletions = firstChild.child;
+    if (0 !== (firstChild.subtreeFlags & 6454) && null !== deletions)
+      (deletions.return = firstChild), (nextEffect = deletions);
+    else
+      for (; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        try {
+          var flags = firstChild.flags;
+          if (flags & 256) {
+            var current = firstChild.alternate;
+            if (null !== current) {
+              var currentRef = current.ref;
+              null !== currentRef &&
+                ("function" === typeof currentRef
+                  ? currentRef(null)
+                  : (currentRef.current = null));
+            }
+          }
+          switch (flags & 2054) {
+            case 2:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              break;
+            case 6:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 2048:
+              firstChild.flags &= -2049;
+              break;
+            case 2052:
+              firstChild.flags &= -2049;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 4:
+              commitWork(firstChild.alternate, firstChild);
+          }
+        } catch (error) {
+          captureCommitPhaseError(firstChild, firstChild.return, error);
+        }
+        deletions = firstChild.sibling;
+        if (null !== deletions) {
+          deletions.return = firstChild.return;
+          nextEffect = deletions;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
+}
+function commitLayoutEffects(finishedWork) {
+  for (nextEffect = finishedWork; null !== nextEffect; ) {
+    var fiber = nextEffect,
+      firstChild = fiber.child;
+    if (0 !== (fiber.subtreeFlags & 324) && null !== firstChild)
+      (firstChild.return = fiber), (nextEffect = firstChild);
+    else
+      for (fiber = finishedWork; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        if (0 !== (firstChild.flags & 324)) {
+          var current = firstChild.alternate;
+          try {
+            if (0 !== (firstChild.flags & 68))
+              switch (firstChild.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  commitHookEffectListMount(3, firstChild);
+                  break;
+                case 1:
+                  var instance = firstChild.stateNode;
+                  if (firstChild.flags & 4)
+                    if (null === current) instance.componentDidMount();
+                    else {
+                      var prevProps =
+                        firstChild.elementType === firstChild.type
+                          ? current.memoizedProps
+                          : resolveDefaultProps(
+                              firstChild.type,
+                              current.memoizedProps
+                            );
+                      instance.componentDidUpdate(
+                        prevProps,
+                        current.memoizedState,
+                        instance.__reactInternalSnapshotBeforeUpdate
+                      );
+                    }
+                  var updateQueue = firstChild.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(firstChild, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$83 = firstChild.updateQueue;
+                  if (null !== updateQueue$83) {
+                    current = null;
+                    if (null !== firstChild.child)
+                      switch (firstChild.child.tag) {
+                        case 5:
+                          current = firstChild.child.stateNode;
+                          break;
+                        case 1:
+                          current = firstChild.child.stateNode;
+                      }
+                    commitUpdateQueue(firstChild, updateQueue$83, current);
+                  }
+                  break;
+                case 5:
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (firstChild.flags & 256) {
+              current = void 0;
+              var ref = firstChild.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = firstChild.stateNode;
+                switch (firstChild.tag) {
+                  case 5:
+                    current = instance$jscomp$0;
+                    break;
+                  default:
+                    current = instance$jscomp$0;
+                }
+                "function" === typeof ref
+                  ? ref(current)
+                  : (ref.current = current);
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(firstChild, firstChild.return, error);
+          }
+        }
+        if (firstChild === fiber) {
+          nextEffect = null;
+          break;
+        }
+        current = firstChild.sibling;
+        if (null !== current) {
+          current.return = firstChild.return;
+          nextEffect = current;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5907,64 +6149,43 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveEffectsLanes = 0,
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 24)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
-  return fiber;
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 8) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  return 0 !== fiber ? fiber : 16;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
@@ -5973,28 +6194,23 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 8) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
   1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? performSyncWorkOnRoot(fiber)
-      : (ensureRootIsScheduled(fiber, eventTime),
+    ? 0 !== (executionContext & 4) && 0 === (executionContext & 24)
+      ? performSyncWorkOnRoot(root)
+      : (ensureRootIsScheduled(root, eventTime),
         0 === executionContext &&
+          0 === (fiber.mode & 1) &&
           ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime));
-  mostRecentlyUpdatedRoot = fiber;
+          includesLegacySyncCallbacks && flushSyncCallbacks()))
+    : ensureRootIsScheduled(root, eventTime);
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -6019,21 +6235,12 @@ function ensureRootIsScheduled(root, currentTime) {
     0 < lanes;
 
   ) {
-    var index$7 = 31 - clz32(lanes),
-      lane = 1 << index$7,
-      expirationTime = expirationTimes[index$7];
+    var index$6 = 31 - clz32(lanes),
+      lane = 1 << index$6,
+      expirationTime = expirationTimes[index$6];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$7] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$6] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -6041,47 +6248,58 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
@@ -6091,41 +6309,45 @@ function performConcurrentWorkOnRoot(root) {
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
   if (0 === lanes) return null;
-  var exitStatus = lanes;
-  var prevExecutionContext = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== exitStatus
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, exitStatus);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
-    }
-  while (1);
-  resetContextDependencies();
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = prevExecutionContext;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes) ? !1 : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 8;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    )
+      (workInProgressRootRenderTargetTime = now() + 500),
+        prepareFreshStack(root, didTimeout);
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((executionContext |= 32),
       root.hydrate && (root.hydrate = !1),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (JSCompiler_inline_result = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== JSCompiler_inline_result &&
+        ((lanes = JSCompiler_inline_result),
+        (didTimeout = renderRootSync(root, JSCompiler_inline_result))));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -6133,7 +6355,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -6143,20 +6365,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevExecutionContext = root.suspendedLanes;
-          if ((prevExecutionContext & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevExecutionContext;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -6164,16 +6386,17 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevExecutionContext = -1; 0 < lanes; ) {
-          var index$6 = 31 - clz32(lanes);
-          prevDispatcher = 1 << index$6;
-          index$6 = exitStatus[index$6];
-          index$6 > prevExecutionContext && (prevExecutionContext = index$6);
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; ) {
+          var index$5 = 31 - clz32(lanes);
+          prevDispatcher = 1 << index$5;
+          index$5 = didTimeout[index$5];
+          index$5 > JSCompiler_inline_result &&
+            (JSCompiler_inline_result = index$5);
           lanes &= ~prevDispatcher;
         }
-        lanes = prevExecutionContext;
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -6216,33 +6439,26 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$11 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$11;
-    root[index$11] = -1;
+    var index$7 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$7;
+    root[index$7] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && (root.hydrate = !1),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    executionContext |= 32;
+    root.hydrate && (root.hydrate = !1);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -6255,11 +6471,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6299,20 +6510,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6348,15 +6578,18 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6367,15 +6600,15 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$76 = returnFiber;
+            workInProgress$32 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$76.tag)) {
-              var nextState = workInProgress$76.memoizedState;
+            if ((JSCompiler_temp = 13 === workInProgress$32.tag)) {
+              var nextState = workInProgress$32.memoizedState;
               if (null !== nextState)
                 JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
               else {
-                var props = workInProgress$76.memoizedProps;
+                var props = workInProgress$32.memoizedProps;
                 JSCompiler_temp =
                   void 0 === props.fallback
                     ? !1
@@ -6387,16 +6620,19 @@ function handleError(root$jscomp$0, thrownValue) {
               }
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$76.updateQueue;
+              var wakeables = workInProgress$32.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$76.updateQueue = updateQueue;
+                workInProgress$32.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$76.mode & 2)) {
-                workInProgress$76.flags |= 64;
+              if (
+                0 === (workInProgress$32.mode & 1) &&
+                workInProgress$32 !== returnFiber
+              ) {
+                workInProgress$32.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6427,61 +6663,61 @@ function handleError(root$jscomp$0, thrownValue) {
                 );
                 wakeable.then(ping, ping);
               }
-              workInProgress$76.flags |= 8192;
-              workInProgress$76.lanes = thrownValue;
+              workInProgress$32.flags |= 16384;
+              workInProgress$32.lanes = thrownValue;
               break a;
             }
-            workInProgress$76 = workInProgress$76.return;
-          } while (null !== workInProgress$76);
+            workInProgress$32 = workInProgress$32.return;
+          } while (null !== workInProgress$32);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$76 = returnFiber;
+        workInProgress$32 = returnFiber;
         do {
-          switch (workInProgress$76.tag) {
+          switch (workInProgress$32.tag) {
             case 3:
               root = value;
-              workInProgress$76.flags |= 8192;
+              workInProgress$32.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$76.lanes |= thrownValue;
-              var update$77 = createRootErrorUpdate(
-                workInProgress$76,
+              workInProgress$32.lanes |= thrownValue;
+              var update$33 = createRootErrorUpdate(
+                workInProgress$32,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$76, update$77);
+              enqueueCapturedUpdate(workInProgress$32, update$33);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$76.type,
-                instance = workInProgress$76.stateNode;
+              var ctor = workInProgress$32.type,
+                instance = workInProgress$32.stateNode;
               if (
-                0 === (workInProgress$76.flags & 64) &&
+                0 === (workInProgress$32.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$76.flags |= 8192;
+                workInProgress$32.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$76.lanes |= thrownValue;
-                var update$80 = createClassErrorUpdate(
-                  workInProgress$76,
+                workInProgress$32.lanes |= thrownValue;
+                var update$36 = createClassErrorUpdate(
+                  workInProgress$32,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$76, update$80);
+                enqueueCapturedUpdate(workInProgress$32, update$36);
                 break a;
               }
           }
-          workInProgress$76 = workInProgress$76.return;
-        } while (null !== workInProgress$76);
+          workInProgress$32 = workInProgress$32.return;
+        } while (null !== workInProgress$32);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6501,7 +6737,7 @@ function pushDispatcher() {
 }
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 8;
   var prevDispatcher = pushDispatcher();
   (workInProgressRoot === root && workInProgressRootRenderLanes === lanes) ||
     prepareFreshStack(root, lanes);
@@ -6528,7 +6764,7 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
@@ -6542,47 +6778,25 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      current = completeWork(current, completedWork, subtreeRenderLanes);
-      if (null !== current) {
-        workInProgress = current;
-        return;
-      }
-      current = completedWork;
+    if (0 === (completedWork.flags & 8192)) {
       if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
+        ((current = completeWork(current, completedWork, subtreeRenderLanes)),
+        null !== current)
       ) {
-        for (var newChildLanes = 0, child = current.child; null !== child; )
-          (newChildLanes |= child.lanes | child.childLanes),
-            (child = child.sibling);
-        current.childLanes = newChildLanes;
+        workInProgress = current;
+        return;
       }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
       null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
     }
     completedWork = completedWork.sibling;
     if (null !== completedWork) {
@@ -6594,16 +6808,25 @@ function completeUnitOfWork(unitOfWork) {
   0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
 }
 function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
   return null;
 }
 function commitRootImpl(root, renderPriorityLevel) {
   do flushPassiveEffects();
   while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
-  var finishedWork = root.finishedWork;
+  var finishedWork = root.finishedWork,
+    lanes = root.finishedLanes;
   if (null === finishedWork) return null;
   root.finishedWork = null;
   root.finishedLanes = 0;
@@ -6612,282 +6835,207 @@ function commitRootImpl(root, renderPriorityLevel) {
       "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
     );
   root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$12 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$12;
-    remainingLanes$jscomp$0[index$12] = 0;
-    eventTimes[index$12] = -1;
-    expirationTimes[index$12] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
   root === workInProgressRoot &&
     ((workInProgress = workInProgressRoot = null),
     (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (eventTimes = root; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              expirationTimes = nextEffect;
-              unmountHostComponents(eventTimes, expirationTimes);
-              var alternate = expirationTimes.alternate;
-              detachFiberMutation(expirationTimes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$88) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$88);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 16;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
+    commitMutationEffects(root, finishedWork);
     root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance;
-                  break;
-                default:
-                  current = instance;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$89) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$89);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    nextEffect = null;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else root.current = finishedWork;
-  if (rootDoesHavePassiveEffects)
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (renderPriorityLevel = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((flags$jscomp$0 = nextEffect),
-          (flags$jscomp$0.sibling = null),
-          (flags$jscomp$0.stateNode = null)),
-        (nextEffect = renderPriorityLevel);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
   0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
-  1 === remainingLanes
+  0 !== (remainingLanes & 1)
     ? root === rootWithNestedUpdates
       ? nestedUpdateCount++
       : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        void 0,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  if (0 !== (executionContext & 4)) return null;
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
-  }
-  return !1;
-}
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects;
-  rootWithPendingPassiveEffects = null;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$94 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$94.destroy;
-    effect$94.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$94 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
     try {
-      var create$98 = effect$94.create;
-      effect$94.destroy = create$98();
-    } catch (error$99) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$99);
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 24))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 16;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect;
+                  switch (fiber$jscomp$0.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListUnmount(4, fiber$jscomp$0, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (fiber.tag) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    commitHookEffectListUnmount(5, fiber, fiber.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (deletions.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      commitHookEffectListMount(5, deletions);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
     }
   }
-  for (create$98 = root.current.firstEffect; null !== create$98; )
-    (root = create$98.nextEffect),
-      (create$98.nextEffect = null),
-      create$98.flags & 8 &&
-        ((create$98.sibling = null), (create$98.stateNode = null)),
-      (create$98 = root);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
+  return !1;
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
@@ -6899,42 +7047,50 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -6946,7 +7102,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
@@ -6958,15 +7114,11 @@ function resolveRetryWakeable(boundaryFiber, wakeable) {
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
@@ -6982,78 +7134,83 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
-            workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue);
-          context._currentValue = updateLanes;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
+      if (0 === (renderLanes & updateLanes)) {
+        didReceiveUpdate = !1;
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 5:
+            pushHostContext(workInProgress);
+            break;
+          case 1:
+            isContextProvider(workInProgress.type) &&
+              pushContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
               workInProgress,
-              renderLanes
+              workInProgress.stateNode.containerInfo
             );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
+            break;
+          case 10:
+            updateLanes = workInProgress.type._context;
+            var nextValue = workInProgress.memoizedProps.value;
+            push(valueCursor, updateLanes._currentValue);
+            updateLanes._currentValue = nextValue;
+            break;
+          case 13:
+            if (null !== workInProgress.memoizedState) {
+              if (0 !== (renderLanes & workInProgress.child.childLanes))
+                return updateSuspenseComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              push(suspenseStackCursor, suspenseStackCursor.current & 1);
+              workInProgress = bailoutOnAlreadyFinishedWork(
                 current,
                 workInProgress,
                 renderLanes
               );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
+              return null !== workInProgress ? workInProgress.sibling : null;
+            }
+            push(suspenseStackCursor, suspenseStackCursor.current & 1);
+            break;
+          case 19:
+            updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
+            if (0 !== (current.flags & 128)) {
+              if (updateLanes)
+                return updateSuspenseListComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              workInProgress.flags |= 128;
+            }
+            nextValue = workInProgress.memoizedState;
+            null !== nextValue &&
+              ((nextValue.rendering = null),
+              (nextValue.tail = null),
+              (nextValue.lastEffect = null));
+            push(suspenseStackCursor, suspenseStackCursor.current);
+            if (updateLanes) break;
+            else return null;
+          case 22:
+          case 23:
+            return (
+              (workInProgress.lanes = 0),
+              updateOffscreenComponent(current, workInProgress, renderLanes)
+            );
+        }
+        return bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
+        );
       }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
@@ -7065,22 +7222,22 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      nextValue = getMaskedContext(workInProgress, contextStackCursor.current);
       prepareToReadContext(workInProgress, renderLanes);
-      context = renderWithHooks(
+      nextValue = renderWithHooks(
         null,
         workInProgress,
         updateLanes,
         current,
-        context,
+        nextValue,
         renderLanes
       );
       workInProgress.flags |= 1;
       if (
-        "object" === typeof context &&
-        null !== context &&
-        "function" === typeof context.render &&
-        void 0 === context.$$typeof
+        "object" === typeof nextValue &&
+        null !== nextValue &&
+        "function" === typeof nextValue.render &&
+        void 0 === nextValue.$$typeof
       ) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
@@ -7090,21 +7247,13 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           pushContextProvider(workInProgress);
         } else hasContext = !1;
         workInProgress.memoizedState =
-          null !== context.state && void 0 !== context.state
-            ? context.state
+          null !== nextValue.state && void 0 !== nextValue.state
+            ? nextValue.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
-        context.updater = classComponentUpdater;
-        workInProgress.stateNode = context;
-        context._reactInternals = workInProgress;
+        nextValue.updater = classComponentUpdater;
+        workInProgress.stateNode = nextValue;
+        nextValue._reactInternals = workInProgress;
         mountClassInstance(workInProgress, updateLanes, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
@@ -7116,28 +7265,28 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         );
       } else
         (workInProgress.tag = 0),
-          reconcileChildren(null, workInProgress, context, renderLanes),
+          reconcileChildren(null, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      nextValue = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
+        hasContext = nextValue._init;
+        nextValue = hasContext(nextValue._payload);
+        workInProgress.type = nextValue;
+        hasContext = workInProgress.tag = resolveLazyComponentTag(nextValue);
+        current = resolveDefaultProps(nextValue, current);
         switch (hasContext) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7146,7 +7295,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7155,7 +7304,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7164,8 +7313,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
+              nextValue,
+              resolveDefaultProps(nextValue.type, current),
               updateLanes,
               renderLanes
             );
@@ -7173,7 +7322,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            nextValue +
             ". Lazy element type must resolve to a class or function."
         );
       }
@@ -7181,32 +7330,32 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 0:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateFunctionComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
     case 1:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateClassComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7217,19 +7366,18 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
-      cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
+      nextValue = workInProgress.pendingProps;
       updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      cloneUpdateQueue(current, workInProgress);
+      processUpdateQueue(workInProgress, nextValue, null, renderLanes);
+      nextValue = workInProgress.memoizedState.element;
+      nextValue === updateLanes
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
@@ -7269,16 +7417,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 11:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateForwardRef(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7315,27 +7463,15 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 10:
       a: {
         updateLanes = workInProgress.type._context;
-        context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue);
-        context$jscomp$0._currentValue = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        nextValue = workInProgress.pendingProps;
+        hasContext = workInProgress.memoizedProps;
+        var newValue = nextValue.value;
+        push(valueCursor, updateLanes._currentValue);
+        updateLanes._currentValue = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === nextValue.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7347,76 +7483,71 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === updateLanes) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
           workInProgress,
-          context.children,
+          nextValue.children,
           renderLanes
         );
         workInProgress = workInProgress.child;
@@ -7424,28 +7555,27 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       return workInProgress;
     case 9:
       return (
-        (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (nextValue = workInProgress.type),
+        (updateLanes = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (nextValue = readContext(nextValue)),
+        (updateLanes = updateLanes(nextValue)),
         (workInProgress.flags |= 1),
         reconcileChildren(current, workInProgress, updateLanes, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
+        (nextValue = workInProgress.type),
         (hasContext = resolveDefaultProps(
-          context,
+          nextValue,
           workInProgress.pendingProps
         )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (hasContext = resolveDefaultProps(nextValue.type, hasContext)),
         updateMemoComponent(
           current,
           workInProgress,
-          context,
+          nextValue,
           hasContext,
           updateLanes,
           renderLanes
@@ -7463,11 +7593,11 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 17:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
@@ -7477,8 +7607,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, updateLanes, nextValue),
+        mountClassInstance(workInProgress, updateLanes, nextValue, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
@@ -7490,9 +7620,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7510,8 +7640,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
 }
@@ -7549,9 +7679,9 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null));
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7586,24 +7716,22 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           type
         );
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7619,7 +7747,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7643,9 +7771,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7665,7 +7790,7 @@ function createFiberFromFragment(elements, mode, lanes, key) {
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7784,7 +7909,8 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -7819,14 +7945,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_908 = {
+  devToolsConfig$jscomp$inline_983 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-experimental-568dc3532",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -7841,17 +7967,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1115 = {
-  bundleType: devToolsConfig$jscomp$inline_908.bundleType,
-  version: devToolsConfig$jscomp$inline_908.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_908.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_908.rendererConfig,
+var internals$jscomp$inline_1237 = {
+  bundleType: devToolsConfig$jscomp$inline_983.bundleType,
+  version: devToolsConfig$jscomp$inline_983.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_983.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_983.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -7860,25 +7987,26 @@ var internals$jscomp$inline_1115 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_908.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_983.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-experimental-568dc3532"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1116 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1238 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1116.isDisabled &&
-    hook$jscomp$inline_1116.supportsFiber
+    !hook$jscomp$inline_1238.isDisabled &&
+    hook$jscomp$inline_1238.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1116.inject(
-        internals$jscomp$inline_1115
+      (rendererID = hook$jscomp$inline_1238.inject(
+        internals$jscomp$inline_1237
       )),
-        (injectedHook = hook$jscomp$inline_1116);
+        (injectedHook = hook$jscomp$inline_1238);
     } catch (err) {}
 }
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
@@ -7927,10 +8055,11 @@ exports.render = function(element, containerTag, callback) {
   var root = roots.get(containerTag);
   if (!root) {
     root = new FiberRootNode(containerTag, 0, !1);
-    var uninitializedFiber = createFiber(3, null, null, 0);
-    root.current = uninitializedFiber;
-    uninitializedFiber.stateNode = root;
-    initializeUpdateQueue(uninitializedFiber);
+    var JSCompiler_inline_result = createFiber(3, null, null, 0);
+    root.current = JSCompiler_inline_result;
+    JSCompiler_inline_result.stateNode = root;
+    JSCompiler_inline_result.memoizedState = { element: null };
+    initializeUpdateQueue(JSCompiler_inline_result);
     roots.set(containerTag, root);
   }
   updateContainer(element, root, null, callback);
@@ -7945,6 +8074,18 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (handle._internalInstanceHandle
+      ? nativeFabricUIManager.sendAccessibilityEvent(
+          handle._internalInstanceHandle.stateNode.node,
+          eventType
+        )
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.unmountComponentAtNode = unmountComponentAtNode;
 exports.unmountComponentAtNodeAndRemoveContainer = function(containerTag) {
   unmountComponentAtNode(containerTag);
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
index 9beda430185462..285eb62ebf971d 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
@@ -7,15 +7,14 @@
  * @noflow
  * @nolint
  * @preventMunge
- * @generated
+ * @generated SignedSource<<0c9b6f8df4fa2dc914b10ed49e47e8c7>>
  */
 
 "use strict";
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface"),
-  React = require("react"),
-  Scheduler = require("scheduler"),
-  tracing = require("scheduler/tracing");
+  React = require("react");
+var Scheduler = require("scheduler");
 function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
@@ -63,7 +62,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -75,7 +75,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -289,36 +289,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -326,9 +336,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -338,12 +348,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -569,7 +579,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -920,7 +930,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_226 = {
+var injectedNamesToPlugins$jscomp$inline_232 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -955,34 +965,34 @@ var injectedNamesToPlugins$jscomp$inline_226 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_227 = !1,
-  pluginName$jscomp$inline_228;
-for (pluginName$jscomp$inline_228 in injectedNamesToPlugins$jscomp$inline_226)
+  isOrderingDirty$jscomp$inline_233 = !1,
+  pluginName$jscomp$inline_234;
+for (pluginName$jscomp$inline_234 in injectedNamesToPlugins$jscomp$inline_232)
   if (
-    injectedNamesToPlugins$jscomp$inline_226.hasOwnProperty(
-      pluginName$jscomp$inline_228
+    injectedNamesToPlugins$jscomp$inline_232.hasOwnProperty(
+      pluginName$jscomp$inline_234
     )
   ) {
-    var pluginModule$jscomp$inline_229 =
-      injectedNamesToPlugins$jscomp$inline_226[pluginName$jscomp$inline_228];
+    var pluginModule$jscomp$inline_235 =
+      injectedNamesToPlugins$jscomp$inline_232[pluginName$jscomp$inline_234];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_228) ||
-      namesToPlugins[pluginName$jscomp$inline_228] !==
-        pluginModule$jscomp$inline_229
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_234) ||
+      namesToPlugins[pluginName$jscomp$inline_234] !==
+        pluginModule$jscomp$inline_235
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_228])
+      if (namesToPlugins[pluginName$jscomp$inline_234])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_228 +
+            pluginName$jscomp$inline_234 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_228
-      ] = pluginModule$jscomp$inline_229;
-      isOrderingDirty$jscomp$inline_227 = !0;
+        pluginName$jscomp$inline_234
+      ] = pluginModule$jscomp$inline_235;
+      isOrderingDirty$jscomp$inline_233 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_227 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_233 && recomputePluginOrdering();
 var instanceCache = new Map(),
   instanceProps = new Map();
 function getInstanceFromTag(tag) {
@@ -1006,7 +1016,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1138,10 +1148,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1156,11 +1166,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1170,7 +1180,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1187,6 +1197,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1196,24 +1208,83 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1222,7 +1293,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1310,33 +1381,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 var emptyObject = {},
   removedKeys = null,
@@ -1356,7 +1410,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1402,9 +1456,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1429,7 +1483,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1445,7 +1499,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1462,7 +1516,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1572,61 +1626,328 @@ function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   };
 }
 var ReactNativeFiberHostComponent = (function() {
-  function ReactNativeFiberHostComponent(tag, viewConfig) {
-    this._nativeTag = tag;
-    this._children = [];
-    this.viewConfig = viewConfig;
-  }
-  var _proto = ReactNativeFiberHostComponent.prototype;
-  _proto.blur = function() {
-    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
-  };
-  _proto.focus = function() {
-    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
-  };
-  _proto.measure = function(callback) {
-    ReactNativePrivateInterface.UIManager.measure(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureInWindow = function(callback) {
-    ReactNativePrivateInterface.UIManager.measureInWindow(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
-    if ("number" === typeof relativeToNativeNode)
-      var relativeNode = relativeToNativeNode;
-    else
-      relativeToNativeNode._nativeTag &&
-        (relativeNode = relativeToNativeNode._nativeTag);
-    null != relativeNode &&
-      ReactNativePrivateInterface.UIManager.measureLayout(
+    function ReactNativeFiberHostComponent(tag, viewConfig) {
+      this._nativeTag = tag;
+      this._children = [];
+      this.viewConfig = viewConfig;
+    }
+    var _proto = ReactNativeFiberHostComponent.prototype;
+    _proto.blur = function() {
+      ReactNativePrivateInterface.TextInputState.blurTextInput(this);
+    };
+    _proto.focus = function() {
+      ReactNativePrivateInterface.TextInputState.focusTextInput(this);
+    };
+    _proto.measure = function(callback) {
+      ReactNativePrivateInterface.UIManager.measure(
         this._nativeTag,
-        relativeNode,
-        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  _proto.setNativeProps = function(nativeProps) {
-    nativeProps = diffProperties(
-      null,
-      emptyObject,
-      nativeProps,
-      this.viewConfig.validAttributes
-    );
-    null != nativeProps &&
-      ReactNativePrivateInterface.UIManager.updateView(
+    };
+    _proto.measureInWindow = function(callback) {
+      ReactNativePrivateInterface.UIManager.measureInWindow(
         this._nativeTag,
-        this.viewConfig.uiViewClassName,
-        nativeProps
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  return ReactNativeFiberHostComponent;
-})();
-function shim() {
+    };
+    _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
+      if ("number" === typeof relativeToNativeNode)
+        var relativeNode = relativeToNativeNode;
+      else
+        relativeToNativeNode._nativeTag &&
+          (relativeNode = relativeToNativeNode._nativeTag);
+      null != relativeNode &&
+        ReactNativePrivateInterface.UIManager.measureLayout(
+          this._nativeTag,
+          relativeNode,
+          mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+          mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        );
+    };
+    _proto.setNativeProps = function(nativeProps) {
+      nativeProps = diffProperties(
+        null,
+        emptyObject,
+        nativeProps,
+        this.viewConfig.validAttributes
+      );
+      null != nativeProps &&
+        ReactNativePrivateInterface.UIManager.updateView(
+          this._nativeTag,
+          this.viewConfig.uiViewClassName,
+          nativeProps
+        );
+    };
+    return ReactNativeFiberHostComponent;
+  })(),
+  scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null,
+  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__;
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      var didError = 128 === (root.current.flags & 128);
+      switch (eventPriority) {
+        case 1:
+          var schedulerPriority = ImmediatePriority;
+          break;
+        case 4:
+          schedulerPriority = UserBlockingPriority;
+          break;
+        case 16:
+          schedulerPriority = NormalPriority;
+          break;
+        case 536870912:
+          schedulerPriority = IdlePriority;
+          break;
+        default:
+          schedulerPriority = NormalPriority;
+      }
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        schedulerPriority,
+        didError
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 === (root.current.mode & 32) &&
+    0 !== (nextLanes & 4) &&
+    (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$8 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$8;
+    remainingLanes[index$8] = 0;
+    eventTimes[index$8] = -1;
+    root[index$8] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$9 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$9;
+    (lane & entangledLanes) | (root[index$9] & entangledLanes) &&
+      (root[index$9] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (isDevToolsPresent)
+    for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) {
+      var index$10 = 31 - clz32(lanes),
+        lane = 1 << index$10;
+      root[index$10].add(fiber);
+      lanes &= ~lane;
+    }
+}
+function movePendingFibersToMemoized(root, lanes) {
+  if (isDevToolsPresent)
+    for (
+      var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap,
+        memoizedUpdaters = root.memoizedUpdaters;
+      0 < lanes;
+
+    ) {
+      var index$11 = 31 - clz32(lanes);
+      root = 1 << index$11;
+      index$11 = pendingUpdatersLaneMap[index$11];
+      0 < index$11.size &&
+        (index$11.forEach(function(fiber) {
+          var alternate = fiber.alternate;
+          (null !== alternate && memoizedUpdaters.has(alternate)) ||
+            memoizedUpdaters.add(fiber);
+        }),
+        index$11.clear());
+      lanes &= ~root;
+    }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
+function shim$1() {
   throw Error(
     "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
   );
@@ -1674,7 +1995,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1728,13 +2050,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1770,321 +2092,41 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__,
-  Scheduler_now = Scheduler.unstable_now;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
+  if (!isFlushingSyncQueue && null !== syncQueue) {
+    isFlushingSyncQueue = !0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
+    try {
+      var queue = syncQueue;
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
+      syncQueue = null;
+      includesLegacySyncCallbacks = !1;
+    } catch (error) {
+      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+      error);
+    } finally {
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
+    }
   }
+  return null;
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
-    case 5:
-      return 97;
-    case 3:
-    case 2:
-    case 1:
-      return 95;
-    case 0:
-      return 90;
-    default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
+var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
+function is(x, y) {
+  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
 }
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-var fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
-  if (!isFlushingSyncQueue && null !== syncQueue) {
-    isFlushingSyncQueue = !0;
-    var i = 0;
-    try {
-      var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
-      syncQueue = null;
-    } catch (error) {
-      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
-      error);
-    } finally {
-      isFlushingSyncQueue = !1;
-    }
-  }
-}
-var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
-function is(x, y) {
-  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
-}
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
-function shallowEqual(objA, objB) {
-  if (objectIs(objA, objB)) return !0;
+var objectIs = "function" === typeof Object.is ? Object.is : is;
+function shallowEqual(objA, objB) {
+  if (objectIs(objA, objB)) return !0;
   if (
     "object" !== typeof objA ||
     null === objA ||
@@ -2119,8 +2161,6 @@ function describeFiber(fiber) {
       return describeFunctionComponentFrame(fiber.type, null);
     case 11:
       return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
     case 1:
       return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
@@ -2153,14 +2193,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue = currentValue;
+  context._currentValue = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2180,44 +2220,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2243,14 +2279,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 2)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2319,111 +2375,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2479,7 +2535,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2490,7 +2547,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2500,7 +2558,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2572,7 +2631,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2594,7 +2652,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2647,25 +2704,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2697,16 +2751,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2721,7 +2775,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2810,7 +2873,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2835,22 +2898,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2878,15 +2933,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2897,7 +2944,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3074,66 +3121,49 @@ function ChildReconciler(shouldTrackSideEffects) {
     return iteratorFn;
   }
   return function(returnFiber, currentFirstChild, newChild, lanes) {
-    var isUnkeyedTopLevelFragment =
-      "object" === typeof newChild &&
+    "object" === typeof newChild &&
       null !== newChild &&
       newChild.type === REACT_FRAGMENT_TYPE &&
-      null === newChild.key;
-    isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+      null === newChild.key &&
+      (newChild = newChild.props.children);
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
             for (
-              isUnkeyedTopLevelFragment = currentFirstChild;
-              null !== isUnkeyedTopLevelFragment;
+              var key = newChild.key, child = currentFirstChild;
+              null !== child;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (child.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === child.tag) {
+                    deleteRemainingChildren(returnFiber, child.sibling);
+                    currentFirstChild = useFiber(
+                      child,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (child.elementType === key) {
+                  deleteRemainingChildren(returnFiber, child.sibling);
+                  currentFirstChild = useFiber(child, newChild.props);
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    child,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
-                deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
+                deleteRemainingChildren(returnFiber, child);
                 break;
-              } else deleteChild(returnFiber, isUnkeyedTopLevelFragment);
-              isUnkeyedTopLevelFragment = isUnkeyedTopLevelFragment.sibling;
+              } else deleteChild(returnFiber, child);
+              child = child.sibling;
             }
             newChild.type === REACT_FRAGMENT_TYPE
               ? ((currentFirstChild = createFiberFromFragment(
@@ -3163,12 +3193,8 @@ function ChildReconciler(shouldTrackSideEffects) {
           return placeSingleChild(returnFiber);
         case REACT_PORTAL_TYPE:
           a: {
-            for (
-              isUnkeyedTopLevelFragment = newChild.key;
-              null !== currentFirstChild;
-
-            ) {
-              if (currentFirstChild.key === isUnkeyedTopLevelFragment)
+            for (child = newChild.key; null !== currentFirstChild; ) {
+              if (currentFirstChild.key === child)
                 if (
                   4 === currentFirstChild.tag &&
                   currentFirstChild.stateNode.containerInfo ===
@@ -3204,9 +3230,24 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
-    if ("string" === typeof newChild || "number" === typeof newChild)
-      return (
-        (newChild = "" + newChild),
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
+    return "string" === typeof newChild || "number" === typeof newChild
+      ? ((newChild = "" + newChild),
         null !== currentFirstChild && 6 === currentFirstChild.tag
           ? (deleteRemainingChildren(returnFiber, currentFirstChild.sibling),
             (currentFirstChild = useFiber(currentFirstChild, newChild)),
@@ -3220,36 +3261,8 @@ function ChildReconciler(shouldTrackSideEffects) {
             )),
             (currentFirstChild.return = returnFiber),
             (returnFiber = currentFirstChild)),
-        placeSingleChild(returnFiber)
-      );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
-    if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
-      switch (returnFiber.tag) {
-        case 1:
-        case 22:
-        case 0:
-        case 11:
-        case 15:
-          throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
-              "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
-          );
-      }
-    return deleteRemainingChildren(returnFiber, currentFirstChild);
+        placeSingleChild(returnFiber))
+      : deleteRemainingChildren(returnFiber, currentFirstChild);
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
@@ -3304,10 +3317,10 @@ function findFirstSuspended(row) {
   for (var node = row; null !== node; ) {
     if (13 === node.tag) {
       var state = node.memoizedState;
-      if (null !== state && (null === state.dehydrated || shim() || shim()))
+      if (null !== state && (null === state.dehydrated || shim$1() || shim$1()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3459,10 +3472,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3487,22 +3501,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3528,7 +3553,7 @@ function rerenderReducer(reducer) {
   }
   return [newState, dispatch];
 }
-function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
+function readFromUnsubscribedMutableSource(root, source, getSnapshot) {
   var getVersion = source._getVersion;
   getVersion = getVersion(source._source);
   var JSCompiler_inline_result = source._workInProgressVersionPrimary;
@@ -3542,7 +3567,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3555,7 +3580,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     version = getVersion(source._source),
     dispatcher = ReactCurrentDispatcher$1.current,
     _dispatcher$useState = dispatcher.useState(function() {
-      return readFromUnsubcribedMutableSource(root, source, getSnapshot);
+      return readFromUnsubscribedMutableSource(root, source, getSnapshot);
     }),
     setSnapshot = _dispatcher$useState[1],
     snapshot = _dispatcher$useState[0];
@@ -3572,25 +3597,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$13 = 31 - clz32(lanes),
-            lane = 1 << index$13;
-          entanglements[index$13] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3617,6 +3630,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3628,7 +3643,7 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     )),
     (_dispatcher$useState.queue = hook),
     (_dispatcher$useState.baseQueue = null),
-    (snapshot = readFromUnsubcribedMutableSource(root, source, getSnapshot)),
+    (snapshot = readFromUnsubscribedMutableSource(root, source, getSnapshot)),
     (_dispatcher$useState.memoizedState = _dispatcher$useState.baseState = snapshot));
   return snapshot;
 }
@@ -3642,6 +3657,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3690,7 +3707,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3698,10 +3715,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3762,19 +3779,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3786,33 +3802,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 2)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3869,6 +3911,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3910,7 +3954,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3959,8 +4003,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -4001,8 +4046,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -4012,7 +4058,11 @@ var ContextOnlyDispatcher = {
   },
   now$1 = Scheduler.unstable_now,
   commitTime = 0,
-  profilerStartTime = -1;
+  layoutEffectStartTime = -1,
+  profilerStartTime = -1,
+  passiveEffectStartTime = -1,
+  currentUpdateIsNested = !1,
+  nestedUpdateScheduled = !1;
 function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
   if (0 <= profilerStartTime) {
     var elapsedTime = now$1() - profilerStartTime;
@@ -4021,78 +4071,632 @@ function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
     profilerStartTime = -1;
   }
 }
+function recordLayoutEffectDuration(fiber) {
+  if (0 <= layoutEffectStartTime) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+        case 12:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function recordPassiveEffectDuration(fiber) {
+  if (0 <= passiveEffectStartTime) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+        case 12:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
 function transferActualDuration(fiber) {
   for (var child = fiber.child; child; )
     (fiber.actualDuration += child.actualDuration), (child = child.sibling);
 }
-var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
-  didReceiveUpdate = !1;
-function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
-  workInProgress.child =
-    null === current
-      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
-      : reconcileChildFibers(
-          workInProgress,
-          current.child,
-          nextChildren,
-          renderLanes
-        );
+function createCapturedValue(value, source) {
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
 }
-function updateForwardRef(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  renderLanes
-) {
-  Component = Component.render;
-  var ref = workInProgress.ref;
-  prepareToReadContext(workInProgress, renderLanes);
-  nextProps = renderWithHooks(
-    current,
-    workInProgress,
-    Component,
-    nextProps,
-    ref,
-    renderLanes
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
   );
-  if (null !== current && !didReceiveUpdate)
-    return (
-      (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
-      (current.lanes &= ~renderLanes),
-      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
-    );
-  workInProgress.flags |= 1;
-  reconcileChildren(current, workInProgress, nextProps, renderLanes);
-  return workInProgress.child;
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
 }
-function updateMemoComponent(
-  current,
-  workInProgress,
-  Component,
-  nextProps,
-  updateLanes,
-  renderLanes
-) {
-  if (null === current) {
-    var type = Component.type;
-    if (
-      "function" === typeof type &&
-      !shouldConstruct(type) &&
-      void 0 === type.defaultProps &&
-      null === Component.compare &&
-      void 0 === Component.defaultProps
-    )
-      return (
-        (workInProgress.tag = 15),
-        (workInProgress.type = type),
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      return getDerivedStateFromError(error);
+    };
+    lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      logCapturedError(fiber, errorInfo);
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
+var appendAllChildren, updateHostContainer, updateHostComponent, updateHostText;
+appendAllChildren = function(parent, workInProgress) {
+  for (var node = workInProgress.child; null !== node; ) {
+    if (5 === node.tag || 6 === node.tag) parent._children.push(node.stateNode);
+    else if (4 !== node.tag && null !== node.child) {
+      node.child.return = node;
+      node = node.child;
+      continue;
+    }
+    if (node === workInProgress) break;
+    for (; null === node.sibling; ) {
+      if (null === node.return || node.return === workInProgress) return;
+      node = node.return;
+    }
+    node.sibling.return = node.return;
+    node = node.sibling;
+  }
+};
+updateHostContainer = function() {};
+updateHostComponent = function(current, workInProgress, type, newProps) {
+  current.memoizedProps !== newProps &&
+    (requiredContext(contextStackCursor$1.current),
+    (workInProgress.updateQueue = UPDATE_SIGNAL)) &&
+    (workInProgress.flags |= 4);
+};
+updateHostText = function(current, workInProgress, oldText, newText) {
+  oldText !== newText && (workInProgress.flags |= 4);
+};
+function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
+  switch (renderState.tailMode) {
+    case "hidden":
+      hasRenderedATailFallback = renderState.tail;
+      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
+        null !== hasRenderedATailFallback.alternate &&
+          (lastTailNode = hasRenderedATailFallback),
+          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
+      null === lastTailNode
+        ? (renderState.tail = null)
+        : (lastTailNode.sibling = null);
+      break;
+    case "collapsed":
+      lastTailNode = renderState.tail;
+      for (var lastTailNode$40 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$40 = lastTailNode),
+          (lastTailNode = lastTailNode.sibling);
+      null === lastTailNode$40
+        ? hasRenderedATailFallback || null === renderState.tail
+          ? (renderState.tail = null)
+          : (renderState.tail.sibling = null)
+        : (lastTailNode$40.sibling = null);
+  }
+}
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    if (0 !== (completedWork.mode & 2)) {
+      for (
+        var treeBaseDuration$42 = completedWork.selfBaseDuration,
+          child$43 = completedWork.child;
+        null !== child$43;
+
+      )
+        (newChildLanes |= child$43.lanes | child$43.childLanes),
+          (subtreeFlags |= child$43.subtreeFlags & 1835008),
+          (subtreeFlags |= child$43.flags & 1835008),
+          (treeBaseDuration$42 += child$43.treeBaseDuration),
+          (child$43 = child$43.sibling);
+      completedWork.treeBaseDuration = treeBaseDuration$42;
+    } else
+      for (
+        treeBaseDuration$42 = completedWork.child;
+        null !== treeBaseDuration$42;
+
+      )
+        (newChildLanes |=
+          treeBaseDuration$42.lanes | treeBaseDuration$42.childLanes),
+          (subtreeFlags |= treeBaseDuration$42.subtreeFlags & 1835008),
+          (subtreeFlags |= treeBaseDuration$42.flags & 1835008),
+          (treeBaseDuration$42.return = completedWork),
+          (treeBaseDuration$42 = treeBaseDuration$42.sibling);
+  else if (0 !== (completedWork.mode & 2)) {
+    treeBaseDuration$42 = completedWork.actualDuration;
+    child$43 = completedWork.selfBaseDuration;
+    for (var child = completedWork.child; null !== child; )
+      (newChildLanes |= child.lanes | child.childLanes),
+        (subtreeFlags |= child.subtreeFlags),
+        (subtreeFlags |= child.flags),
+        (treeBaseDuration$42 += child.actualDuration),
+        (child$43 += child.treeBaseDuration),
+        (child = child.sibling);
+    completedWork.actualDuration = treeBaseDuration$42;
+    completedWork.treeBaseDuration = child$43;
+  } else
+    for (
+      treeBaseDuration$42 = completedWork.child;
+      null !== treeBaseDuration$42;
+
+    )
+      (newChildLanes |=
+        treeBaseDuration$42.lanes | treeBaseDuration$42.childLanes),
+        (subtreeFlags |= treeBaseDuration$42.subtreeFlags),
+        (subtreeFlags |= treeBaseDuration$42.flags),
+        (treeBaseDuration$42.return = completedWork),
+        (treeBaseDuration$42 = treeBaseDuration$42.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
+function completeWork(current, workInProgress, renderLanes) {
+  var newProps = workInProgress.pendingProps;
+  switch (workInProgress.tag) {
+    case 2:
+    case 16:
+    case 15:
+    case 0:
+    case 11:
+    case 7:
+    case 8:
+    case 12:
+    case 9:
+    case 14:
+      return bubbleProperties(workInProgress), null;
+    case 1:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 3:
+      return (
+        (newProps = workInProgress.stateNode),
+        popHostContainer(),
+        pop(didPerformWorkStackCursor),
+        pop(contextStackCursor),
+        resetWorkInProgressVersions(),
+        newProps.pendingContext &&
+          ((newProps.context = newProps.pendingContext),
+          (newProps.pendingContext = null)),
+        (null !== current && null !== current.child) ||
+          newProps.hydrate ||
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 5:
+      popHostContext(workInProgress);
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
+      if (null !== current && null != workInProgress.stateNode)
+        updateHostComponent(
+          current,
+          workInProgress,
+          type,
+          newProps,
+          renderLanes
+        ),
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
+      else {
+        if (!newProps) {
+          if (null === workInProgress.stateNode)
+            throw Error(
+              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+            );
+          bubbleProperties(workInProgress);
+          return null;
+        }
+        requiredContext(contextStackCursor$1.current);
+        current = allocateTag();
+        type = getViewConfigForType(type);
+        var updatePayload = diffProperties(
+          null,
+          emptyObject,
+          newProps,
+          type.validAttributes
+        );
+        ReactNativePrivateInterface.UIManager.createView(
+          current,
+          type.uiViewClassName,
+          renderLanes,
+          updatePayload
+        );
+        renderLanes = new ReactNativeFiberHostComponent(
+          current,
+          type,
+          workInProgress
+        );
+        instanceCache.set(current, workInProgress);
+        instanceProps.set(current, newProps);
+        appendAllChildren(renderLanes, workInProgress, !1, !1);
+        workInProgress.stateNode = renderLanes;
+        finalizeInitialChildren(renderLanes) && (workInProgress.flags |= 4);
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 6:
+      if (current && null != workInProgress.stateNode)
+        updateHostText(
+          current,
+          workInProgress,
+          current.memoizedProps,
+          newProps
+        );
+      else {
+        if ("string" !== typeof newProps && null === workInProgress.stateNode)
+          throw Error(
+            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
+          );
+        current = requiredContext(rootInstanceStackCursor.current);
+        if (!requiredContext(contextStackCursor$1.current).isInAParentText)
+          throw Error(
+            "Text strings must be rendered within a <Text> component."
+          );
+        renderLanes = allocateTag();
+        ReactNativePrivateInterface.UIManager.createView(
+          renderLanes,
+          "RCTRawText",
+          current,
+          { text: newProps }
+        );
+        instanceCache.set(renderLanes, workInProgress);
+        workInProgress.stateNode = renderLanes;
+      }
+      bubbleProperties(workInProgress);
+      return null;
+    case 13:
+      pop(suspenseStackCursor);
+      newProps = workInProgress.memoizedState;
+      if (0 !== (workInProgress.flags & 128))
+        return (
+          (workInProgress.lanes = renderLanes),
+          0 !== (workInProgress.mode & 2) &&
+            transferActualDuration(workInProgress),
+          workInProgress
+        );
+      newProps = null !== newProps;
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (
+        newProps &&
+        !renderLanes &&
+        ((workInProgress.child.flags |= 4096), 0 !== (workInProgress.mode & 1))
+      )
+        if (
+          (null === current &&
+            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
+          0 !== (suspenseStackCursor.current & 1)
+        )
+          0 === workInProgressRootExitStatus &&
+            (workInProgressRootExitStatus = 3);
+        else {
+          if (
+            0 === workInProgressRootExitStatus ||
+            3 === workInProgressRootExitStatus
+          )
+            workInProgressRootExitStatus = 4;
+          null === workInProgressRoot ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
+            markRootSuspended$1(
+              workInProgressRoot,
+              workInProgressRootRenderLanes
+            );
+        }
+      null !== workInProgress.updateQueue && (workInProgress.flags |= 4);
+      bubbleProperties(workInProgress);
+      0 !== (workInProgress.mode & 2) &&
+        newProps &&
+        ((current = workInProgress.child),
+        null !== current &&
+          (workInProgress.treeBaseDuration -= current.treeBaseDuration));
+      return null;
+    case 4:
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 10:
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 17:
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
+    case 19:
+      pop(suspenseStackCursor);
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      updatePayload = type.rendering;
+      if (null === updatePayload)
+        if (newProps) cutOffTailIfNeeded(type, !1);
+        else {
+          if (
+            0 !== workInProgressRootExitStatus ||
+            (null !== current && 0 !== (current.flags & 128))
+          )
+            for (current = workInProgress.child; null !== current; ) {
+              updatePayload = findFirstSuspended(current);
+              if (null !== updatePayload) {
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
+                current = updatePayload.updateQueue;
+                null !== current &&
+                  ((workInProgress.updateQueue = current),
+                  (workInProgress.flags |= 4));
+                workInProgress.subtreeFlags = 0;
+                current = renderLanes;
+                for (newProps = workInProgress.child; null !== newProps; )
+                  (renderLanes = newProps),
+                    (updatePayload = current),
+                    (renderLanes.flags &= 1835010),
+                    (type = renderLanes.alternate),
+                    null === type
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = updatePayload),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null),
+                        (renderLanes.selfBaseDuration = 0),
+                        (renderLanes.treeBaseDuration = 0))
+                      : ((renderLanes.childLanes = type.childLanes),
+                        (renderLanes.lanes = type.lanes),
+                        (renderLanes.child = type.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps = type.memoizedProps),
+                        (renderLanes.memoizedState = type.memoizedState),
+                        (renderLanes.updateQueue = type.updateQueue),
+                        (renderLanes.type = type.type),
+                        (updatePayload = type.dependencies),
+                        (renderLanes.dependencies =
+                          null === updatePayload
+                            ? null
+                            : {
+                                lanes: updatePayload.lanes,
+                                firstContext: updatePayload.firstContext
+                              }),
+                        (renderLanes.selfBaseDuration = type.selfBaseDuration),
+                        (renderLanes.treeBaseDuration = type.treeBaseDuration)),
+                    (newProps = newProps.sibling);
+                push(
+                  suspenseStackCursor,
+                  (suspenseStackCursor.current & 1) | 2
+                );
+                return workInProgress.child;
+              }
+              current = current.sibling;
+            }
+          null !== type.tail &&
+            now() > workInProgressRootRenderTargetTime &&
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
+        }
+      else {
+        if (!newProps)
+          if (
+            ((current = findFirstSuspended(updatePayload)), null !== current)
+          ) {
+            if (
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              (current = current.updateQueue),
+              null !== current &&
+                ((workInProgress.updateQueue = current),
+                (workInProgress.flags |= 4)),
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
+                !updatePayload.alternate)
+            )
+              return bubbleProperties(workInProgress), null;
+          } else
+            2 * now() - type.renderingStartTime >
+              workInProgressRootRenderTargetTime &&
+              1073741824 !== renderLanes &&
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
+          ? ((updatePayload.sibling = workInProgress.child),
+            (workInProgress.child = updatePayload))
+          : ((current = type.last),
+            null !== current
+              ? (current.sibling = updatePayload)
+              : (workInProgress.child = updatePayload),
+            (type.last = updatePayload));
+      }
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
+    case 23:
+      return (
+        popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
+        null !== current &&
+          (null !== current.memoizedState) !== renderLanes &&
+          "unstable-defer-without-hiding" !== newProps.mode &&
+          23 !== workInProgress.tag &&
+          (workInProgress.flags |= 4096),
+        renderLanes && 0 !== (workInProgress.mode & 1)
+          ? 0 !== (subtreeRenderLanes & 1073741824) &&
+            (bubbleProperties(workInProgress),
+            23 !== workInProgress.tag &&
+              workInProgress.subtreeFlags & 6 &&
+              "unstable-defer-without-hiding" !== newProps.mode &&
+              (workInProgress.flags |= 4096))
+          : bubbleProperties(workInProgress),
+        null
+      );
+  }
+  throw Error(
+    "Unknown unit of work tag (" +
+      workInProgress.tag +
+      "). This error is likely caused by a bug in React. Please file an issue."
+  );
+}
+var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
+  didReceiveUpdate = !1;
+function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
+  workInProgress.child =
+    null === current
+      ? mountChildFibers(workInProgress, null, nextChildren, renderLanes)
+      : reconcileChildFibers(
+          workInProgress,
+          current.child,
+          nextChildren,
+          renderLanes
+        );
+}
+function updateForwardRef(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  Component = Component.render;
+  var ref = workInProgress.ref;
+  prepareToReadContext(workInProgress, renderLanes);
+  nextProps = renderWithHooks(
+    current,
+    workInProgress,
+    Component,
+    nextProps,
+    ref,
+    renderLanes
+  );
+  if (null !== current && !didReceiveUpdate)
+    return (
+      (workInProgress.updateQueue = current.updateQueue),
+      (workInProgress.flags &= -1029),
+      (current.lanes &= ~renderLanes),
+      bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
+    );
+  workInProgress.flags |= 1;
+  reconcileChildren(current, workInProgress, nextProps, renderLanes);
+  return workInProgress.child;
+}
+function updateMemoComponent(
+  current,
+  workInProgress,
+  Component,
+  nextProps,
+  renderLanes
+) {
+  if (null === current) {
+    var type = Component.type;
+    if (
+      "function" === typeof type &&
+      !shouldConstruct(type) &&
+      void 0 === type.defaultProps &&
+      null === Component.compare &&
+      void 0 === Component.defaultProps
+    )
+      return (
+        (workInProgress.tag = 15),
+        (workInProgress.type = type),
         updateSimpleMemoComponent(
           current,
           workInProgress,
           type,
           nextProps,
-          updateLanes,
           renderLanes
         )
       );
@@ -4109,14 +4713,13 @@ function updateMemoComponent(
     return (workInProgress.child = current);
   }
   type = current.child;
-  if (
-    0 === (updateLanes & renderLanes) &&
-    ((updateLanes = type.memoizedProps),
-    (Component = Component.compare),
-    (Component = null !== Component ? Component : shallowEqual),
-    Component(updateLanes, nextProps) && current.ref === workInProgress.ref)
-  )
-    return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  if (0 === (current.lanes & renderLanes)) {
+    var prevProps = type.memoizedProps;
+    Component = Component.compare;
+    Component = null !== Component ? Component : shallowEqual;
+    if (Component(prevProps, nextProps) && current.ref === workInProgress.ref)
+      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+  }
   workInProgress.flags |= 1;
   current = createWorkInProgress(type, nextProps);
   current.ref = workInProgress.ref;
@@ -4128,7 +4731,6 @@ function updateSimpleMemoComponent(
   workInProgress,
   Component,
   nextProps,
-  updateLanes,
   renderLanes
 ) {
   if (
@@ -4136,7 +4738,7 @@ function updateSimpleMemoComponent(
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
   )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
+    if (((didReceiveUpdate = !1), 0 !== (current.lanes & renderLanes)))
       0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
     else
       return (
@@ -4159,41 +4761,49 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        markSpawnedWork(1073741824),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      nextProps = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= nextProps;
+    }
   else
     null !== prevState
       ? ((nextProps = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
       : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= nextProps);
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
-function markRef(current, workInProgress) {
+function markRef$1(current, workInProgress) {
   var ref = workInProgress.ref;
   if (
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4218,7 +4828,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4378,7 +4988,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4393,7 +5004,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4401,7 +5012,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4415,7 +5026,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4435,8 +5046,8 @@ function finishClassComponent(
   hasContext,
   renderLanes
 ) {
-  markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  markRef$1(current, workInProgress);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4484,20 +5095,22 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
-      void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
       (suspenseContext |= 1);
   push(suspenseStackCursor, suspenseContext & 1);
@@ -4512,7 +5125,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4524,16 +5139,17 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
-        markSpawnedWork(33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
       { mode: "visible", children: current },
       workInProgress.mode,
-      renderLanes,
+      0,
       null
     );
     renderLanes.return = workInProgress;
@@ -4553,8 +5169,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4581,8 +5200,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4605,10 +5227,10 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren),
-      workInProgress.mode & 8 &&
+      workInProgress.mode & 2 &&
         ((progressedPrimaryFragment.actualDuration = 0),
         (progressedPrimaryFragment.actualStartTime = -1),
         (progressedPrimaryFragment.selfBaseDuration = 0),
@@ -4643,13 +5265,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4659,33 +5282,27 @@ function updateSuspenseFallbackChildren(
   fallbackChildren,
   renderLanes
 ) {
-  var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
+  var mode = workInProgress.mode;
+  current = current.child;
+  var currentFallbackChildFragment = current.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== current
     ? ((primaryChildren = workInProgress.child),
       (primaryChildren.childLanes = 0),
       (primaryChildren.pendingProps = primaryChildProps),
-      workInProgress.mode & 8 &&
+      workInProgress.mode & 2 &&
         ((primaryChildren.actualDuration = 0),
         (primaryChildren.actualStartTime = -1),
-        (primaryChildren.selfBaseDuration =
-          currentPrimaryChildFragment.selfBaseDuration),
-        (primaryChildren.treeBaseDuration =
-          currentPrimaryChildFragment.treeBaseDuration)),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
-        currentPrimaryChildFragment,
-        primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+        (primaryChildren.selfBaseDuration = current.selfBaseDuration),
+        (primaryChildren.treeBaseDuration = current.treeBaseDuration)),
+      (workInProgress.deletions = null))
+    : ((primaryChildren = createWorkInProgress(current, primaryChildProps)),
+      (primaryChildren.subtreeFlags = current.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4710,8 +5327,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4721,16 +5337,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4739,9 +5353,9 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
@@ -4764,7 +5378,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
     nextProps &= 1;
   }
   push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
   else
     switch (revealOrder) {
       case "forwards":
@@ -4785,8 +5399,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !1,
           revealOrder,
           renderLanes,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "backwards":
@@ -4808,429 +5421,121 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !0,
           renderLanes,
           null,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
         break;
       default:
         workInProgress.memoizedState = null;
     }
   return workInProgress.child;
-}
-function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
-  null !== current && (workInProgress.dependencies = current.dependencies);
-  profilerStartTime = -1;
-  workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
-  }
-  return null;
-}
-var appendAllChildren,
-  updateHostContainer,
-  updateHostComponent$1,
-  updateHostText$1;
-appendAllChildren = function(parent, workInProgress) {
-  for (var node = workInProgress.child; null !== node; ) {
-    if (5 === node.tag || 6 === node.tag) parent._children.push(node.stateNode);
-    else if (4 !== node.tag && null !== node.child) {
-      node.child.return = node;
-      node = node.child;
-      continue;
-    }
-    if (node === workInProgress) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === workInProgress) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
-  }
-};
-updateHostContainer = function() {};
-updateHostComponent$1 = function(current, workInProgress, type, newProps) {
-  current.memoizedProps !== newProps &&
-    (requiredContext(contextStackCursor$1.current),
-    (workInProgress.updateQueue = UPDATE_SIGNAL)) &&
-    (workInProgress.flags |= 4);
-};
-updateHostText$1 = function(current, workInProgress, oldText, newText) {
-  oldText !== newText && (workInProgress.flags |= 4);
-};
-function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
-  switch (renderState.tailMode) {
-    case "hidden":
-      hasRenderedATailFallback = renderState.tail;
-      for (var lastTailNode = null; null !== hasRenderedATailFallback; )
-        null !== hasRenderedATailFallback.alternate &&
-          (lastTailNode = hasRenderedATailFallback),
-          (hasRenderedATailFallback = hasRenderedATailFallback.sibling);
-      null === lastTailNode
-        ? (renderState.tail = null)
-        : (lastTailNode.sibling = null);
-      break;
-    case "collapsed":
-      lastTailNode = renderState.tail;
-      for (var lastTailNode$65 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$65 = lastTailNode),
-          (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$65
-        ? hasRenderedATailFallback || null === renderState.tail
-          ? (renderState.tail = null)
-          : (renderState.tail.sibling = null)
-        : (lastTailNode$65.sibling = null);
-  }
-}
-function completeWork(current, workInProgress, renderLanes) {
-  var newProps = workInProgress.pendingProps;
-  switch (workInProgress.tag) {
-    case 2:
-    case 16:
-    case 15:
-    case 0:
-    case 11:
-    case 7:
-    case 8:
-    case 12:
-    case 9:
-    case 14:
-      return null;
-    case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
-    case 3:
-      return (
-        popHostContainer(),
-        pop(didPerformWorkStackCursor),
-        pop(contextStackCursor),
-        resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
-        newProps.pendingContext &&
-          ((newProps.context = newProps.pendingContext),
-          (newProps.pendingContext = null)),
-        (null !== current && null !== current.child) ||
-          newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
-        null
-      );
-    case 5:
-      popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
-      if (null !== current && null != workInProgress.stateNode)
-        updateHostComponent$1(
-          current,
-          workInProgress,
-          renderLanes,
-          newProps,
-          rootContainerInstance
-        ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
-      else {
-        if (!newProps) {
-          if (null === workInProgress.stateNode)
-            throw Error(
-              "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-            );
-          return null;
-        }
-        requiredContext(contextStackCursor$1.current);
-        current = allocateTag();
-        renderLanes = getViewConfigForType(renderLanes);
-        var updatePayload = diffProperties(
-          null,
-          emptyObject,
-          newProps,
-          renderLanes.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.createView(
-          current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
-          updatePayload
-        );
-        rootContainerInstance = new ReactNativeFiberHostComponent(
-          current,
-          renderLanes,
-          workInProgress
-        );
-        instanceCache.set(current, workInProgress);
-        instanceProps.set(current, newProps);
-        appendAllChildren(rootContainerInstance, workInProgress, !1, !1);
-        workInProgress.stateNode = rootContainerInstance;
-        finalizeInitialChildren(rootContainerInstance) &&
-          (workInProgress.flags |= 4);
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
-      }
-      return null;
-    case 6:
-      if (current && null != workInProgress.stateNode)
-        updateHostText$1(
-          current,
-          workInProgress,
-          current.memoizedProps,
-          newProps
-        );
-      else {
-        if ("string" !== typeof newProps && null === workInProgress.stateNode)
-          throw Error(
-            "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
-          );
-        current = requiredContext(rootInstanceStackCursor.current);
-        if (!requiredContext(contextStackCursor$1.current).isInAParentText)
-          throw Error(
-            "Text strings must be rendered within a <Text> component."
-          );
-        rootContainerInstance = allocateTag();
-        ReactNativePrivateInterface.UIManager.createView(
-          rootContainerInstance,
-          "RCTRawText",
-          current,
-          { text: newProps }
-        );
-        instanceCache.set(rootContainerInstance, workInProgress);
-        workInProgress.stateNode = rootContainerInstance;
-      }
-      return null;
-    case 13:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
-        return (
-          (workInProgress.lanes = renderLanes),
-          0 !== (workInProgress.mode & 8) &&
-            transferActualDuration(workInProgress),
-          workInProgress
-        );
-      newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
-        if (
-          (null === current &&
-            !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
-          0 !== (suspenseStackCursor.current & 1)
-        )
-          0 === workInProgressRootExitStatus &&
-            (workInProgressRootExitStatus = 3);
-        else {
-          if (
-            0 === workInProgressRootExitStatus ||
-            3 === workInProgressRootExitStatus
-          )
-            workInProgressRootExitStatus = 4;
-          null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
-            markRootSuspended$1(
-              workInProgressRoot,
-              workInProgressRootRenderLanes
-            );
-        }
-      if (newProps || rootContainerInstance) workInProgress.flags |= 4;
-      return null;
+}
+function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
+  null !== current && (workInProgress.dependencies = current.dependencies);
+  profilerStartTime = -1;
+  workInProgressRootSkippedLanes |= workInProgress.lanes;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
+          current,
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
+  }
+  return workInProgress.child;
+}
+function attemptEarlyBailoutIfNoScheduledUpdate(
+  current,
+  workInProgress,
+  renderLanes
+) {
+  switch (workInProgress.tag) {
+    case 3:
+      pushHostRootContext(workInProgress);
+      break;
+    case 5:
+      pushHostContext(workInProgress);
+      break;
+    case 1:
+      isContextProvider(workInProgress.type) &&
+        pushContextProvider(workInProgress);
+      break;
     case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
+      pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+      break;
     case 10:
-      return popProvider(workInProgress), null;
-    case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      var context = workInProgress.type._context,
+        nextValue = workInProgress.memoizedProps.value;
+      push(valueCursor, context._currentValue);
+      context._currentValue = nextValue;
+      break;
+    case 12:
+      0 !== (renderLanes & workInProgress.childLanes) &&
+        (workInProgress.flags |= 4);
+      context = workInProgress.stateNode;
+      context.effectDuration = 0;
+      context.passiveEffectDuration = 0;
+      break;
+    case 13:
+      if (null !== workInProgress.memoizedState) {
+        if (0 !== (renderLanes & workInProgress.child.childLanes))
+          return updateSuspenseComponent(current, workInProgress, renderLanes);
+        push(suspenseStackCursor, suspenseStackCursor.current & 1);
+        current = bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
+        );
+        return null !== current ? current.sibling : null;
+      }
+      push(suspenseStackCursor, suspenseStackCursor.current & 1);
+      break;
     case 19:
-      pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
-      if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
-        else {
-          if (
-            0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
-          )
-            for (current = workInProgress.child; null !== current; ) {
-              updatePayload = findFirstSuspended(current);
-              if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
-                current = updatePayload.updateQueue;
-                null !== current &&
-                  ((workInProgress.updateQueue = current),
-                  (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
-                current = renderLanes;
-                for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
-                    (updatePayload = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (renderLanes = rootContainerInstance.alternate),
-                    null === renderLanes
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = updatePayload),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null),
-                        (rootContainerInstance.selfBaseDuration = 0),
-                        (rootContainerInstance.treeBaseDuration = 0))
-                      : ((rootContainerInstance.childLanes =
-                          renderLanes.childLanes),
-                        (rootContainerInstance.lanes = renderLanes.lanes),
-                        (rootContainerInstance.child = renderLanes.child),
-                        (rootContainerInstance.memoizedProps =
-                          renderLanes.memoizedProps),
-                        (rootContainerInstance.memoizedState =
-                          renderLanes.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          renderLanes.updateQueue),
-                        (rootContainerInstance.type = renderLanes.type),
-                        (updatePayload = renderLanes.dependencies),
-                        (rootContainerInstance.dependencies =
-                          null === updatePayload
-                            ? null
-                            : {
-                                lanes: updatePayload.lanes,
-                                firstContext: updatePayload.firstContext
-                              }),
-                        (rootContainerInstance.selfBaseDuration =
-                          renderLanes.selfBaseDuration),
-                        (rootContainerInstance.treeBaseDuration =
-                          renderLanes.treeBaseDuration)),
-                    (newProps = newProps.sibling);
-                push(
-                  suspenseStackCursor,
-                  (suspenseStackCursor.current & 1) | 2
-                );
-                return workInProgress.child;
-              }
-              current = current.sibling;
-            }
-          null !== newProps.tail &&
-            now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432),
-            markSpawnedWork(33554432));
-        }
-      else {
-        if (!rootContainerInstance)
-          if (
-            ((current = findFirstSuspended(updatePayload)), null !== current)
-          ) {
-            if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              (current = current.updateQueue),
-              null !== current &&
-                ((workInProgress.updateQueue = current),
-                (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
-                !updatePayload.alternate)
-            )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
-          } else
-            2 * now() - newProps.renderingStartTime >
-              workInProgressRootRenderTargetTime &&
-              1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432),
-              markSpawnedWork(33554432));
-        newProps.isBackwards
-          ? ((updatePayload.sibling = workInProgress.child),
-            (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
-            null !== current
-              ? (current.sibling = updatePayload)
-              : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+      context = 0 !== (renderLanes & workInProgress.childLanes);
+      if (0 !== (current.flags & 128)) {
+        if (context)
+          return updateSuspenseListComponent(
+            current,
+            workInProgress,
+            renderLanes
+          );
+        workInProgress.flags |= 128;
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      nextValue = workInProgress.memoizedState;
+      null !== nextValue &&
+        ((nextValue.rendering = null),
+        (nextValue.tail = null),
+        (nextValue.lastEffect = null));
+      push(suspenseStackCursor, suspenseStackCursor.current);
+      if (context) break;
+      else return null;
+    case 22:
     case 23:
-    case 24:
       return (
-        popRenderLanes(),
-        null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
-          "unstable-defer-without-hiding" !== newProps.mode &&
-          (workInProgress.flags |= 4),
-        null
+        (workInProgress.lanes = 0),
+        updateOffscreenComponent(current, workInProgress, renderLanes)
       );
   }
-  throw Error(
-    "Unknown unit of work tag (" +
-      workInProgress.tag +
-      "). This error is likely caused by a bug in React. Please file an issue."
-  );
+  return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
 }
 function unwindWork(workInProgress) {
   switch (workInProgress.tag) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64),
-          0 !== (workInProgress.mode & 8) &&
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128),
+          0 !== (workInProgress.mode & 2) &&
             transferActualDuration(workInProgress),
           workInProgress)
         : null;
@@ -5240,314 +5545,164 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
     case 13:
-      return (
-        pop(suspenseStackCursor),
-        (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64),
-            0 !== (workInProgress.mode & 8) &&
-              transferActualDuration(workInProgress),
-            workInProgress)
-          : null
-      );
-    case 19:
-      return pop(suspenseStackCursor), null;
-    case 4:
-      return popHostContainer(), null;
-    case 10:
-      return popProvider(workInProgress), null;
-    case 23:
-    case 24:
-      return popRenderLanes(), null;
-    default:
-      return null;
-  }
-}
-function createCapturedValue(value, source) {
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
-}
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
-  }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
-}
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
-  var ref = current.ref;
-  if (null !== ref)
-    if ("function" === typeof ref)
-      try {
-        ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
-      }
-    else ref.current = null;
-}
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
-      }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
-  }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
-}
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$82 = finishedRoot.create;
-            finishedRoot.destroy = create$82();
-          }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
-      }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$82 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$82;
-        } while (finishedRoot !== current);
-      }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$82 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$82,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
-          }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      }
-      return;
-    case 5:
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      create$82 = finishedWork.memoizedProps.onRender;
-      _effect = commitTime;
-      "function" === typeof create$82 &&
-        create$82(
-          finishedWork.memoizedProps.id,
-          null === current ? "mount" : "update",
-          finishedWork.actualDuration,
-          finishedWork.treeBaseDuration,
-          finishedWork.actualStartTime,
-          _effect,
-          finishedRoot.memoizedInteractions
-        );
-      return;
-    case 13:
-      return;
+      return (
+        pop(suspenseStackCursor),
+        (flags = workInProgress.flags),
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128),
+            0 !== (workInProgress.mode & 2) &&
+              transferActualDuration(workInProgress),
+            workInProgress)
+          : null
+      );
     case 19:
-    case 17:
-    case 20:
-    case 21:
+      return pop(suspenseStackCursor), null;
+    case 4:
+      return popHostContainer(), null;
+    case 10:
+      return popProvider(workInProgress.type._context), null;
+    case 22:
     case 23:
+      return popRenderLanes(), null;
     case 24:
-      return;
+      return null;
+    default:
+      return null;
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function hideOrUnhideAllChildren(finishedWork, isHidden) {
-  for (var node = finishedWork; ; ) {
-    if (5 === node.tag) {
-      var instance = node.stateNode;
-      if (isHidden) {
-        var viewConfig = instance.viewConfig;
-        var updatePayload = diffProperties(
-          null,
-          emptyObject,
-          { style: { display: "none" } },
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
-      } else {
-        instance = node.stateNode;
-        updatePayload = node.memoizedProps;
-        viewConfig = instance.viewConfig;
-        var prevProps = Object.assign({}, updatePayload, {
-          style: [updatePayload.style, { display: "none" }]
-        });
-        updatePayload = diffProperties(
-          null,
-          prevProps,
-          updatePayload,
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null,
+  inProgressLanes = null,
+  inProgressRoot = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
+  var ref = current.ref;
+  if (null !== ref)
+    if ("function" === typeof ref)
+      try {
+        if (current.mode & 2)
+          try {
+            startLayoutEffectTimer(), ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        else ref(null);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
-    } else {
-      if (6 === node.tag) throw Error("Not yet implemented.");
-      if (
-        ((23 !== node.tag && 24 !== node.tag) ||
-          null === node.memoizedState ||
-          node === finishedWork) &&
-        null !== node.child
-      ) {
-        node.child.return = node;
-        node = node.child;
-        continue;
+    else ref.current = null;
+}
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
+  try {
+    destroy();
+  } catch (error) {
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
+  }
+}
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
       }
-    }
-    if (node === finishedWork) break;
-    for (; null === node.sibling; ) {
-      if (null === node.return || node.return === finishedWork) return;
-      node = node.return;
-    }
-    node.sibling.return = node.return;
-    node = node.sibling;
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
+}
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        void 0 !== destroy &&
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
+      }
+      effect = effect.next;
+    } while (effect !== updateQueue);
+  }
+}
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$89 = effect.create;
+        effect.destroy = create$89();
+      }
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
 }
-function commitUnmount(finishedRoot, current) {
+function commitUnmount(finishedRoot, current, nearestMountedAncestor) {
   if (injectedHook && "function" === typeof injectedHook.onCommitFiberUnmount)
     try {
       injectedHook.onCommitFiberUnmount(rendererID, current);
@@ -5557,7 +5712,6 @@ function commitUnmount(finishedRoot, current) {
     case 11:
     case 14:
     case 15:
-    case 22:
       finishedRoot = current.updateQueue;
       if (
         null !== finishedRoot &&
@@ -5565,53 +5719,61 @@ function commitUnmount(finishedRoot, current) {
       ) {
         var effect = (finishedRoot = finishedRoot.next);
         do {
-          var _effect2 = effect,
-            destroy = _effect2.destroy;
-          _effect2 = _effect2.tag;
-          if (void 0 !== destroy)
-            if (0 !== (_effect2 & 4))
-              enqueuePendingPassiveHookEffectUnmount(current, effect);
-            else {
-              _effect2 = current;
-              try {
-                destroy();
-              } catch (error) {
-                captureCommitPhaseError(_effect2, error);
-              }
-            }
+          var _effect = effect,
+            destroy = _effect.destroy;
+          _effect = _effect.tag;
+          void 0 !== destroy &&
+            0 !== (_effect & 2) &&
+            (current.mode & 2
+              ? (startLayoutEffectTimer(),
+                safelyCallDestroy(current, nearestMountedAncestor, destroy),
+                recordLayoutEffectDuration(current))
+              : safelyCallDestroy(current, nearestMountedAncestor, destroy));
           effect = effect.next;
         } while (effect !== finishedRoot);
       }
       break;
     case 1:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor);
       finishedRoot = current.stateNode;
       if ("function" === typeof finishedRoot.componentWillUnmount)
         try {
-          (finishedRoot.props = current.memoizedProps),
+          if (
+            ((finishedRoot.props = current.memoizedProps),
             (finishedRoot.state = current.memoizedState),
-            finishedRoot.componentWillUnmount();
-        } catch (unmountError) {
-          captureCommitPhaseError(current, unmountError);
+            current.mode & 2)
+          )
+            try {
+              startLayoutEffectTimer(), finishedRoot.componentWillUnmount();
+            } finally {
+              recordLayoutEffectDuration(current);
+            }
+          else finishedRoot.componentWillUnmount();
+        } catch (error) {
+          captureCommitPhaseError(current, nearestMountedAncestor, error);
         }
       break;
     case 5:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor);
       break;
     case 4:
-      unmountHostComponents(finishedRoot, current);
+      unmountHostComponents(finishedRoot, current, nearestMountedAncestor);
   }
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function isHostParent(fiber) {
@@ -5646,7 +5808,7 @@ function commitPlacement(finishedWork) {
         "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
       );
   }
-  parentFiber.flags & 16 && (parentFiber.flags &= -17);
+  parentFiber.flags & 32 && (parentFiber.flags &= -33);
   a: b: for (parentFiber = finishedWork; ; ) {
     for (; null === parentFiber.sibling; ) {
       if (null === parentFiber.return || isHostParent(parentFiber.return)) {
@@ -5681,10 +5843,9 @@ function commitPlacement(finishedWork) {
     : insertOrAppendPlacementNode(finishedWork, parentFiber, parent);
 }
 function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    if (((node = isHost ? node.stateNode : node.stateNode.instance), before)) {
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
       if ("number" === typeof parent)
         throw Error("Container does not support insertBefore operation");
     } else
@@ -5702,58 +5863,57 @@ function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
         (node = node.sibling);
 }
 function insertOrAppendPlacementNode(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    (node = isHost ? node.stateNode : node.stateNode.instance),
-      before
-        ? ((tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              (before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [before],
-                [],
-                [],
-                []
-              ))
-            : ((before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                ["number" === typeof node ? node : node._nativeTag],
-                [before],
-                []
-              )))
-        : ((before = "number" === typeof node ? node : node._nativeTag),
-          (tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [tag.length - 1],
-                [],
-                [],
-                []
-              ))
-            : (tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                [before],
-                [tag.length - 1],
-                []
-              )));
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
+      tag = parent._children;
+      var index = tag.indexOf(node);
+      0 <= index
+        ? (tag.splice(index, 1),
+          (before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [index],
+            [before],
+            [],
+            [],
+            []
+          ))
+        : ((before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [],
+            [],
+            ["number" === typeof node ? node : node._nativeTag],
+            [before],
+            []
+          ));
+    } else
+      (before = "number" === typeof node ? node : node._nativeTag),
+        (tag = parent._children),
+        (index = tag.indexOf(node)),
+        0 <= index
+          ? (tag.splice(index, 1),
+            tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [index],
+              [tag.length - 1],
+              [],
+              [],
+              []
+            ))
+          : (tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [],
+              [],
+              [before],
+              [tag.length - 1],
+              []
+            ));
   else if (4 !== tag && ((node = node.child), null !== node))
     for (
       insertOrAppendPlacementNode(node, before, parent), node = node.sibling;
@@ -5762,7 +5922,11 @@ function insertOrAppendPlacementNode(node, before, parent) {
     )
       insertOrAppendPlacementNode(node, before, parent), (node = node.sibling);
 }
-function unmountHostComponents(finishedRoot$jscomp$0, current) {
+function unmountHostComponents(
+  finishedRoot$jscomp$0,
+  current,
+  nearestMountedAncestor$jscomp$0
+) {
   for (
     var node = current,
       currentParentIsValid = !1,
@@ -5800,12 +5964,13 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
       a: for (
         var finishedRoot = finishedRoot$jscomp$0,
           root = node,
+          nearestMountedAncestor = nearestMountedAncestor$jscomp$0,
           node$jscomp$0 = root;
         ;
 
       )
         if (
-          (commitUnmount(finishedRoot, node$jscomp$0),
+          (commitUnmount(finishedRoot, node$jscomp$0, nearestMountedAncestor),
           null !== node$jscomp$0.child && 4 !== node$jscomp$0.tag)
         )
           (node$jscomp$0.child.return = node$jscomp$0),
@@ -5832,18 +5997,18 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
             [0]
           ))
         : ((finishedRoot = currentParent),
-          (node$jscomp$0 = node.stateNode),
-          recursivelyUncacheFiberNode(node$jscomp$0),
+          (nearestMountedAncestor = node.stateNode),
+          recursivelyUncacheFiberNode(nearestMountedAncestor),
           (root = finishedRoot._children),
-          (node$jscomp$0 = root.indexOf(node$jscomp$0)),
-          root.splice(node$jscomp$0, 1),
+          (nearestMountedAncestor = root.indexOf(nearestMountedAncestor)),
+          root.splice(nearestMountedAncestor, 1),
           ReactNativePrivateInterface.UIManager.manageChildren(
             finishedRoot._nativeTag,
             [],
             [],
             [],
             [],
-            [node$jscomp$0]
+            [nearestMountedAncestor]
           ));
     } else if (4 === node.tag) {
       if (null !== node.child) {
@@ -5854,7 +6019,12 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
         continue;
       }
     } else if (
-      (commitUnmount(finishedRoot$jscomp$0, node), null !== node.child)
+      (commitUnmount(
+        finishedRoot$jscomp$0,
+        node,
+        nearestMountedAncestor$jscomp$0
+      ),
+      null !== node.child)
     ) {
       node.child.return = node;
       node = node.child;
@@ -5876,43 +6046,38 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      var updateQueue = finishedWork.updateQueue;
-      updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
-      if (null !== updateQueue) {
-        var effect = (updateQueue = updateQueue.next);
-        do
-          3 === (effect.tag & 3) &&
-            ((finishedWork = effect.destroy),
-            (effect.destroy = void 0),
-            void 0 !== finishedWork && finishedWork()),
-            (effect = effect.next);
-        while (effect !== updateQueue);
-      }
+      if (finishedWork.mode & 2)
+        try {
+          startLayoutEffectTimer(),
+            commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
+        }
+      else commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 1:
       return;
     case 5:
-      updateQueue = finishedWork.stateNode;
-      if (null != updateQueue) {
-        effect = finishedWork.memoizedProps;
-        current = null !== current ? current.memoizedProps : effect;
+      var instance = finishedWork.stateNode;
+      if (null != instance) {
+        var newProps = finishedWork.memoizedProps;
+        current = null !== current ? current.memoizedProps : newProps;
         var updatePayload = finishedWork.updateQueue;
         finishedWork.updateQueue = null;
         null !== updatePayload &&
-          ((finishedWork = updateQueue.viewConfig),
-          instanceProps.set(updateQueue._nativeTag, effect),
-          (effect = diffProperties(
+          ((finishedWork = instance.viewConfig),
+          instanceProps.set(instance._nativeTag, newProps),
+          (newProps = diffProperties(
             null,
             current,
-            effect,
+            newProps,
             finishedWork.validAttributes
           )),
-          null != effect &&
+          null != newProps &&
             ReactNativePrivateInterface.UIManager.updateView(
-              updateQueue._nativeTag,
+              instance._nativeTag,
               finishedWork.uiViewClassName,
-              effect
+              newProps
             ));
       }
       return;
@@ -5932,9 +6097,6 @@ function commitWork(current, finishedWork) {
     case 12:
       return;
     case 13:
-      null !== finishedWork.memoizedState &&
-        ((globalMostRecentFallbackTime = now()),
-        hideOrUnhideAllChildren(finishedWork.child, !0));
       attachSuspenseRetryListeners(finishedWork);
       return;
     case 19:
@@ -5942,13 +6104,6 @@ function commitWork(current, finishedWork) {
       return;
     case 17:
       return;
-    case 23:
-    case 24:
-      hideOrUnhideAllChildren(
-        finishedWork,
-        null !== finishedWork.memoizedState
-      );
-      return;
   }
   throw Error(
     "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
@@ -5963,25 +6118,377 @@ function attachSuspenseRetryListeners(finishedWork) {
       (retryCache = finishedWork.stateNode = new PossiblyWeakSet());
     wakeables.forEach(function(wakeable) {
       var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
-      retryCache.has(wakeable) ||
-        (!0 !== wakeable.__reactDoNotTraceInteractions &&
-          (retry = tracing.unstable_wrap(retry)),
-        retryCache.add(wakeable),
-        wakeable.then(retry, retry));
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
+        if (isDevToolsPresent)
+          if (null !== inProgressLanes && null !== inProgressRoot)
+            restorePendingUpdaters(inProgressRoot, inProgressLanes);
+          else
+            throw Error(
+              "Expected finished root and lanes to be set. This is a bug in React."
+            );
+        wakeable.then(retry, retry);
+      }
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    firstChild = nextEffect;
+    committedLanes = firstChild.deletions;
+    if (null !== committedLanes)
+      for (var i = 0; i < committedLanes.length; i++) {
+        var childToDelete = committedLanes[i];
+        try {
+          unmountHostComponents(root, childToDelete, firstChild);
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, firstChild, error);
+        }
+      }
+    committedLanes = firstChild.child;
+    if (0 !== (firstChild.subtreeFlags & 6454) && null !== committedLanes)
+      (committedLanes.return = firstChild), (nextEffect = committedLanes);
+    else
+      for (; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        try {
+          var flags = firstChild.flags;
+          if (flags & 256) {
+            var current = firstChild.alternate;
+            if (null !== current) {
+              committedLanes = current;
+              var currentRef = committedLanes.ref;
+              if (null !== currentRef)
+                if ("function" === typeof currentRef)
+                  if (committedLanes.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), currentRef(null);
+                    } finally {
+                      recordLayoutEffectDuration(committedLanes);
+                    }
+                  else currentRef(null);
+                else currentRef.current = null;
+            }
+          }
+          if (flags & 4096)
+            switch (firstChild.tag) {
+              case 13:
+                if (null !== firstChild.memoizedState) {
+                  var current$96 = firstChild.alternate;
+                  if (null === current$96 || null === current$96.memoizedState)
+                    globalMostRecentFallbackTime = now();
+                }
+                break;
+              case 22:
+                a: {
+                  committedLanes = firstChild;
+                  var isHidden = null !== firstChild.memoizedState;
+                  i = null;
+                  for (childToDelete = committedLanes; ; ) {
+                    if (5 === childToDelete.tag) {
+                      if (null === i) {
+                        i = childToDelete;
+                        var instance = childToDelete.stateNode;
+                        if (isHidden) {
+                          var instance$jscomp$0 = instance,
+                            viewConfig = instance$jscomp$0.viewConfig;
+                          var updatePayload = diffProperties(
+                            null,
+                            emptyObject,
+                            { style: { display: "none" } },
+                            viewConfig.validAttributes
+                          );
+                          ReactNativePrivateInterface.UIManager.updateView(
+                            instance$jscomp$0._nativeTag,
+                            viewConfig.uiViewClassName,
+                            updatePayload
+                          );
+                        } else {
+                          var instance$jscomp$1 = childToDelete.stateNode,
+                            props = childToDelete.memoizedProps,
+                            viewConfig$jscomp$0 = instance$jscomp$1.viewConfig,
+                            prevProps = Object.assign({}, props, {
+                              style: [props.style, { display: "none" }]
+                            });
+                          var updatePayload$jscomp$0 = diffProperties(
+                            null,
+                            prevProps,
+                            props,
+                            viewConfig$jscomp$0.validAttributes
+                          );
+                          ReactNativePrivateInterface.UIManager.updateView(
+                            instance$jscomp$1._nativeTag,
+                            viewConfig$jscomp$0.uiViewClassName,
+                            updatePayload$jscomp$0
+                          );
+                        }
+                      }
+                    } else if (6 === childToDelete.tag) {
+                      if (null === i) throw Error("Not yet implemented.");
+                    } else if (
+                      ((22 !== childToDelete.tag && 23 !== childToDelete.tag) ||
+                        null === childToDelete.memoizedState ||
+                        childToDelete === committedLanes) &&
+                      null !== childToDelete.child
+                    ) {
+                      childToDelete.child.return = childToDelete;
+                      childToDelete = childToDelete.child;
+                      continue;
+                    }
+                    if (childToDelete === committedLanes) break;
+                    for (; null === childToDelete.sibling; ) {
+                      if (
+                        null === childToDelete.return ||
+                        childToDelete.return === committedLanes
+                      )
+                        break a;
+                      i === childToDelete && (i = null);
+                      childToDelete = childToDelete.return;
+                    }
+                    i === childToDelete && (i = null);
+                    childToDelete.sibling.return = childToDelete.return;
+                    childToDelete = childToDelete.sibling;
+                  }
+                }
+            }
+          switch (flags & 2054) {
+            case 2:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              break;
+            case 6:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 2048:
+              firstChild.flags &= -2049;
+              break;
+            case 2052:
+              firstChild.flags &= -2049;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 4:
+              commitWork(firstChild.alternate, firstChild);
+          }
+        } catch (error) {
+          captureCommitPhaseError(firstChild, firstChild.return, error);
+        }
+        committedLanes = firstChild.sibling;
+        if (null !== committedLanes) {
+          committedLanes.return = firstChild.return;
+          nextEffect = committedLanes;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
+  inProgressRoot = inProgressLanes = null;
+}
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = finishedWork; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (committedLanes = root.child),
+      0 !== (root.subtreeFlags & 4420) && null !== committedLanes)
+    )
+      (committedLanes.return = root), (nextEffect = committedLanes);
+    else
+      for (root = finishedWork; null !== nextEffect; ) {
+        committedLanes = nextEffect;
+        if (0 !== (committedLanes.flags & 4420)) {
+          var current = committedLanes.alternate;
+          try {
+            if (0 !== (committedLanes.flags & 4420))
+              switch (committedLanes.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  if (committedLanes.mode & 2)
+                    try {
+                      startLayoutEffectTimer(),
+                        commitHookEffectListMount(3, committedLanes);
+                    } finally {
+                      recordLayoutEffectDuration(committedLanes);
+                    }
+                  else commitHookEffectListMount(3, committedLanes);
+                  break;
+                case 1:
+                  var instance = committedLanes.stateNode;
+                  if (committedLanes.flags & 4)
+                    if (null === current)
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidMount();
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else instance.componentDidMount();
+                    else {
+                      var prevProps =
+                          committedLanes.elementType === committedLanes.type
+                            ? current.memoizedProps
+                            : resolveDefaultProps(
+                                committedLanes.type,
+                                current.memoizedProps
+                              ),
+                        prevState = current.memoizedState;
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidUpdate(
+                              prevProps,
+                              prevState,
+                              instance.__reactInternalSnapshotBeforeUpdate
+                            );
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else
+                        instance.componentDidUpdate(
+                          prevProps,
+                          prevState,
+                          instance.__reactInternalSnapshotBeforeUpdate
+                        );
+                    }
+                  var updateQueue = committedLanes.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(committedLanes, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$91 = committedLanes.updateQueue;
+                  if (null !== updateQueue$91) {
+                    var instance$92 = null;
+                    if (null !== committedLanes.child)
+                      switch (committedLanes.child.tag) {
+                        case 5:
+                          instance$92 = committedLanes.child.stateNode;
+                          break;
+                        case 1:
+                          instance$92 = committedLanes.child.stateNode;
+                      }
+                    commitUpdateQueue(
+                      committedLanes,
+                      updateQueue$91,
+                      instance$92
+                    );
+                  }
+                  break;
+                case 5:
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  var _finishedWork$memoize2 = committedLanes.memoizedProps,
+                    onCommit = _finishedWork$memoize2.onCommit,
+                    onRender = _finishedWork$memoize2.onRender,
+                    effectDuration = committedLanes.stateNode.effectDuration;
+                  instance$92 = commitTime;
+                  current = null === current ? "mount" : "update";
+                  currentUpdateIsNested && (current = "nested-update");
+                  "function" === typeof onRender &&
+                    onRender(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      committedLanes.actualDuration,
+                      committedLanes.treeBaseDuration,
+                      committedLanes.actualStartTime,
+                      instance$92
+                    );
+                  "function" === typeof onCommit &&
+                    onCommit(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      effectDuration,
+                      instance$92
+                    );
+                  enqueuePendingPassiveProfilerEffect(committedLanes);
+                  var parentFiber = committedLanes.return;
+                  a: for (; null !== parentFiber; ) {
+                    switch (parentFiber.tag) {
+                      case 3:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                      case 12:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                    }
+                    parentFiber = parentFiber.return;
+                  }
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (committedLanes.flags & 256) {
+              instance$92 = void 0;
+              current = committedLanes;
+              var ref = current.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = current.stateNode;
+                switch (current.tag) {
+                  case 5:
+                    instance$92 = instance$jscomp$0;
+                    break;
+                  default:
+                    instance$92 = instance$jscomp$0;
+                }
+                if ("function" === typeof ref)
+                  if (current.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), ref(instance$92);
+                    } finally {
+                      recordLayoutEffectDuration(current);
+                    }
+                  else ref(instance$92);
+                else ref.current = instance$92;
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(
+              committedLanes,
+              committedLanes.return,
+              error
+            );
+          }
+        }
+        if (committedLanes === root) {
+          nextEffect = null;
+          break;
+        }
+        instance$92 = committedLanes.sibling;
+        if (null !== instance$92) {
+          instance$92.return = committedLanes.return;
+          nextEffect = instance$92;
+          break;
+        }
+        nextEffect = committedLanes.return;
+      }
+  inProgressRoot = inProgressLanes = null;
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5990,66 +6497,44 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
   pendingPassiveEffectsLanes = 0,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveProfilerEffects = [],
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
-  spawnedWorkDuringRender = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 6)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
-  return fiber;
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  return 0 !== fiber ? fiber : 16;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
@@ -6058,30 +6543,21 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  isDevToolsPresent && addFiberToLanesMap(root, fiber, lane);
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 2) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
-  1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? (schedulePendingInteractions(fiber, lane), performSyncWorkOnRoot(fiber))
-      : (ensureRootIsScheduled(fiber, eventTime),
-        schedulePendingInteractions(fiber, lane),
-        0 === executionContext &&
-          ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime),
-      schedulePendingInteractions(fiber, lane));
-  mostRecentlyUpdatedRoot = fiber;
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
+  ensureRootIsScheduled(root, eventTime);
+  1 === lane &&
+    0 === executionContext &&
+    0 === (fiber.mode & 1) &&
+    ((workInProgressRootRenderTargetTime = now() + 500),
+    includesLegacySyncCallbacks && flushSyncCallbacks());
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -6106,21 +6582,12 @@ function ensureRootIsScheduled(root, currentTime) {
     0 < lanes;
 
   ) {
-    var index$7 = 31 - clz32(lanes),
-      lane = 1 << index$7,
-      expirationTime = expirationTimes[index$7];
+    var index$6 = 31 - clz32(lanes),
+      lane = 1 << index$6,
+      expirationTime = expirationTimes[index$6];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$7] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$6] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -6128,47 +6595,59 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback$1(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  nestedUpdateScheduled = currentUpdateIsNested = !1;
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
@@ -6178,44 +6657,59 @@ function performConcurrentWorkOnRoot(root) {
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
   if (0 === lanes) return null;
-  var lanes$jscomp$0 = lanes;
-  var exitStatus = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== lanes$jscomp$0
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, lanes$jscomp$0),
-      startWorkOnPendingInteractions(root, lanes$jscomp$0);
-  lanes$jscomp$0 = pushInteractions(root);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes)
+      ? !1
+      : 0 !== (root.current.mode & 32)
+      ? !0
+      : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 2;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    ) {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+        0 < memoizedUpdaters.size &&
+          (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+          memoizedUpdaters.clear());
+        movePendingFibersToMemoized(root, didTimeout);
+      }
+      workInProgressRootRenderTargetTime = now() + 500;
+      prepareFreshStack(root, didTimeout);
     }
-  while (1);
-  resetContextDependencies();
-  tracing.__interactionsRef.current = lanes$jscomp$0;
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = exitStatus;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((JSCompiler_inline_result = executionContext),
+      (executionContext |= 8),
       root.hydrate && (root.hydrate = !1),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (prevDispatcher = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== prevDispatcher &&
+        ((lanes = prevDispatcher),
+        (didTimeout = renderRootSync(root, prevDispatcher))),
+      (executionContext = JSCompiler_inline_result));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -6223,7 +6717,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -6233,20 +6727,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevDispatcher = root.suspendedLanes;
-          if ((prevDispatcher & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevDispatcher;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -6254,16 +6748,16 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevDispatcher = -1; 0 < lanes; ) {
-          var index$6 = 31 - clz32(lanes);
-          lanes$jscomp$0 = 1 << index$6;
-          index$6 = exitStatus[index$6];
-          index$6 > prevDispatcher && (prevDispatcher = index$6);
-          lanes &= ~lanes$jscomp$0;
-        }
-        lanes = prevDispatcher;
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; )
+          (memoizedUpdaters = 31 - clz32(lanes)),
+            (prevDispatcher = 1 << memoizedUpdaters),
+            (memoizedUpdaters = didTimeout[memoizedUpdaters]),
+            memoizedUpdaters > JSCompiler_inline_result &&
+              (JSCompiler_inline_result = memoizedUpdaters),
+            (lanes &= ~prevDispatcher);
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -6306,33 +6800,30 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$11 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$11;
-    root[index$11] = -1;
+    var index$7 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$7;
+    root[index$7] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  currentUpdateIsNested = nestedUpdateScheduled;
+  nestedUpdateScheduled = !1;
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && (root.hydrate = !1),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    var prevExecutionContext = executionContext;
+    executionContext |= 8;
+    root.hydrate && (root.hydrate = !1);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+    executionContext = prevExecutionContext;
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -6345,11 +6836,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6389,21 +6875,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
-  spawnedWorkDuringRender = null;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6433,7 +6937,7 @@ function handleError(root$jscomp$0, thrownValue) {
         workInProgress = null;
         break;
       }
-      erroredWork.mode & 8 &&
+      erroredWork.mode & 2 &&
         stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0);
       a: {
         var root = root$jscomp$0,
@@ -6441,15 +6945,19 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
+        isDevToolsPresent && restorePendingUpdaters(root, thrownValue);
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6460,36 +6968,37 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$77 = returnFiber;
+            workInProgress$34 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$77.tag)) {
-              var nextState = workInProgress$77.memoizedState;
-              if (null !== nextState)
-                JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
-              else {
-                var props = workInProgress$77.memoizedProps;
-                JSCompiler_temp =
-                  void 0 === props.fallback
-                    ? !1
-                    : !0 !== props.unstable_avoidThisFallback
+            if ((JSCompiler_temp = 13 === workInProgress$34.tag)) {
+              var nextState = workInProgress$34.memoizedState;
+              JSCompiler_temp =
+                null !== nextState
+                  ? null !== nextState.dehydrated
                     ? !0
-                    : hasInvisibleParentBoundary
-                    ? !1
-                    : !0;
-              }
+                    : !1
+                  : !0 !==
+                    workInProgress$34.memoizedProps.unstable_avoidThisFallback
+                  ? !0
+                  : hasInvisibleParentBoundary
+                  ? !1
+                  : !0;
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$77.updateQueue;
+              var wakeables = workInProgress$34.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$77.updateQueue = updateQueue;
+                workInProgress$34.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$77.mode & 2)) {
-                workInProgress$77.flags |= 64;
+              if (
+                0 === (workInProgress$34.mode & 1) &&
+                workInProgress$34 !== returnFiber
+              ) {
+                workInProgress$34.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6518,63 +7027,64 @@ function handleError(root$jscomp$0, thrownValue) {
                   wakeable,
                   sourceFiber
                 );
+                isDevToolsPresent && restorePendingUpdaters(root, sourceFiber);
                 wakeable.then(ping, ping);
               }
-              workInProgress$77.flags |= 8192;
-              workInProgress$77.lanes = thrownValue;
+              workInProgress$34.flags |= 16384;
+              workInProgress$34.lanes = thrownValue;
               break a;
             }
-            workInProgress$77 = workInProgress$77.return;
-          } while (null !== workInProgress$77);
+            workInProgress$34 = workInProgress$34.return;
+          } while (null !== workInProgress$34);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$77 = returnFiber;
+        workInProgress$34 = returnFiber;
         do {
-          switch (workInProgress$77.tag) {
+          switch (workInProgress$34.tag) {
             case 3:
               root = value;
-              workInProgress$77.flags |= 8192;
+              workInProgress$34.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$77.lanes |= thrownValue;
-              var update$78 = createRootErrorUpdate(
-                workInProgress$77,
+              workInProgress$34.lanes |= thrownValue;
+              var update$35 = createRootErrorUpdate(
+                workInProgress$34,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$77, update$78);
+              enqueueCapturedUpdate(workInProgress$34, update$35);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$77.type,
-                instance = workInProgress$77.stateNode;
+              var ctor = workInProgress$34.type,
+                instance = workInProgress$34.stateNode;
               if (
-                0 === (workInProgress$77.flags & 64) &&
+                0 === (workInProgress$34.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$77.flags |= 8192;
+                workInProgress$34.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$77.lanes |= thrownValue;
-                var update$81 = createClassErrorUpdate(
-                  workInProgress$77,
+                workInProgress$34.lanes |= thrownValue;
+                var update$38 = createClassErrorUpdate(
+                  workInProgress$34,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$77, update$81);
+                enqueueCapturedUpdate(workInProgress$34, update$38);
                 break a;
               }
           }
-          workInProgress$77 = workInProgress$77.return;
-        } while (null !== workInProgress$77);
+          workInProgress$34 = workInProgress$34.return;
+        } while (null !== workInProgress$34);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6592,18 +7102,20 @@ function pushDispatcher() {
   ReactCurrentDispatcher$2.current = ContextOnlyDispatcher;
   return null === prevDispatcher ? ContextOnlyDispatcher : prevDispatcher;
 }
-function pushInteractions(root) {
-  var prevInteractions = tracing.__interactionsRef.current;
-  tracing.__interactionsRef.current = root.memoizedInteractions;
-  return prevInteractions;
-}
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 2;
   var prevDispatcher = pushDispatcher();
-  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes)
-    prepareFreshStack(root, lanes), startWorkOnPendingInteractions(root, lanes);
-  lanes = pushInteractions(root);
+  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      0 < memoizedUpdaters.size &&
+        (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+        memoizedUpdaters.clear());
+      movePendingFibersToMemoized(root, lanes);
+    }
+    prepareFreshStack(root, lanes);
+  }
   do
     try {
       workLoopSync();
@@ -6613,7 +7125,6 @@ function renderRootSync(root, lanes) {
     }
   while (1);
   resetContextDependencies();
-  tracing.__interactionsRef.current = lanes;
   executionContext = prevExecutionContext;
   ReactCurrentDispatcher$2.current = prevDispatcher;
   if (null !== workInProgress)
@@ -6628,12 +7139,12 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
   var current = unitOfWork.alternate;
-  0 !== (unitOfWork.mode & 8)
+  0 !== (unitOfWork.mode & 2)
     ? ((profilerStartTime = now$1()),
       0 > unitOfWork.actualStartTime && (unitOfWork.actualStartTime = now$1()),
       (current = beginWork$1(current, unitOfWork, subtreeRenderLanes)),
@@ -6650,8 +7161,8 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      if (0 === (completedWork.mode & 8))
+    if (0 === (completedWork.flags & 8192)) {
+      if (0 === (completedWork.mode & 2))
         current = completeWork(current, completedWork, subtreeRenderLanes);
       else {
         var fiber = completedWork;
@@ -6664,65 +7175,14 @@ function completeUnitOfWork(unitOfWork) {
         workInProgress = current;
         return;
       }
-      current = completedWork;
-      if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
-      ) {
-        fiber = 0;
-        if (0 !== (current.mode & 8)) {
-          for (
-            var actualDuration = current.actualDuration,
-              treeBaseDuration = current.selfBaseDuration,
-              shouldBubbleActualDurations =
-                null === current.alternate ||
-                current.child !== current.alternate.child,
-              child = current.child;
-            null !== child;
-
-          )
-            (fiber |= child.lanes | child.childLanes),
-              shouldBubbleActualDurations &&
-                (actualDuration += child.actualDuration),
-              (treeBaseDuration += child.treeBaseDuration),
-              (child = child.sibling);
-          13 === current.tag &&
-            null !== current.memoizedState &&
-            ((shouldBubbleActualDurations = current.child),
-            null !== shouldBubbleActualDurations &&
-              (treeBaseDuration -=
-                shouldBubbleActualDurations.treeBaseDuration));
-          current.actualDuration = actualDuration;
-          current.treeBaseDuration = treeBaseDuration;
-        } else
-          for (actualDuration = current.child; null !== actualDuration; )
-            (fiber |= actualDuration.lanes | actualDuration.childLanes),
-              (actualDuration = actualDuration.sibling);
-        current.childLanes = fiber;
-      }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
-      if (0 !== (completedWork.mode & 8)) {
+      if (0 !== (completedWork.mode & 2)) {
         stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1);
         current = completedWork.actualDuration;
         for (fiber = completedWork.child; null !== fiber; )
@@ -6730,8 +7190,9 @@ function completeUnitOfWork(unitOfWork) {
         completedWork.actualDuration = current;
       }
       null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
     }
     completedWork = completedWork.sibling;
     if (null !== completedWork) {
@@ -6743,14 +7204,22 @@ function completeUnitOfWork(unitOfWork) {
   0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
 }
 function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
   return null;
 }
 function commitRootImpl(root, renderPriorityLevel) {
   do flushPassiveEffects();
   while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 6))
     throw Error("Should not already be working.");
   var finishedWork = root.finishedWork,
     lanes = root.finishedLanes;
@@ -6762,304 +7231,275 @@ function commitRootImpl(root, renderPriorityLevel) {
       "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
     );
   root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$12 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$12;
-    remainingLanes$jscomp$0[index$12] = 0;
-    eventTimes[index$12] = -1;
-    expirationTimes[index$12] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
   root === workInProgressRoot &&
     ((workInProgress = workInProgressRoot = null),
     (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    eventTimes = pushInteractions(root);
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback$1(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 4;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
     commitTime = now$1();
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (expirationTimes = root; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              noLongerPendingLanes = nextEffect;
-              unmountHostComponents(expirationTimes, noLongerPendingLanes);
-              var alternate = noLongerPendingLanes.alternate;
-              detachFiberMutation(noLongerPendingLanes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$91) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$91);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
+    commitMutationEffects(root, finishedWork, lanes);
     root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance;
-                  break;
-                default:
-                  current = instance;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$92) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$92);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    nextEffect = null;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    tracing.__interactionsRef.current = eventTimes;
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else (root.current = finishedWork), (commitTime = now$1());
-  if ((flags$jscomp$0 = rootDoesHavePassiveEffects))
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsLanes = lanes),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (ref = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((instance = nextEffect),
-          (instance.sibling = null),
-          (instance.stateNode = null)),
-        (nextEffect = ref);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
-  if (0 !== remainingLanes) {
-    if (null !== spawnedWorkDuringRender)
-      for (
-        ref = spawnedWorkDuringRender,
-          spawnedWorkDuringRender = null,
-          instance = 0;
-        instance < ref.length;
-        instance++
-      )
-        scheduleInteractions(root, ref[instance], root.memoizedInteractions);
-    schedulePendingInteractions(root, remainingLanes);
-  } else legacyErrorBoundariesThatAlreadyFailed = null;
-  flags$jscomp$0 || finishPendingInteractions(root, lanes);
-  1 === remainingLanes
-    ? root === rootWithNestedUpdates
-      ? nestedUpdateCount++
-      : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
+  0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
+  0 !== (remainingLanes & 1)
+    ? ((nestedUpdateScheduled = !0),
+      root === rootWithNestedUpdates
+        ? nestedUpdateCount++
+        : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        renderPriorityLevel,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
+  isDevToolsPresent && root.memoizedUpdaters.clear();
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 6))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 4;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect,
+                    current = fiber$jscomp$0;
+                  switch (current.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      current.mode & 2
+                        ? ((passiveEffectStartTime = now$1()),
+                          commitHookEffectListUnmount(4, current, fiber),
+                          recordPassiveEffectDuration(current))
+                        : commitHookEffectListUnmount(4, current, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (((i = fiber), i.tag)) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    i.mode & 2
+                      ? ((passiveEffectStartTime = now$1()),
+                        commitHookEffectListUnmount(5, i, i.return),
+                        recordPassiveEffectDuration(i))
+                      : commitHookEffectListUnmount(5, i, i.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (((fiberToDelete = deletions), fiberToDelete.tag)) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      if (fiberToDelete.mode & 2) {
+                        passiveEffectStartTime = now$1();
+                        try {
+                          commitHookEffectListMount(5, fiberToDelete);
+                        } finally {
+                          recordPassiveEffectDuration(fiberToDelete);
+                        }
+                      } else commitHookEffectListMount(5, fiberToDelete);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        finishedWork = pendingPassiveProfilerEffects;
+        pendingPassiveProfilerEffects = [];
+        for (firstChild = 0; firstChild < finishedWork.length; firstChild++) {
+          var finishedWork$jscomp$0 = finishedWork[firstChild];
+          if (0 !== (finishedWork$jscomp$0.flags & 4))
+            switch (finishedWork$jscomp$0.tag) {
+              case 12:
+                var passiveEffectDuration =
+                    finishedWork$jscomp$0.stateNode.passiveEffectDuration,
+                  _finishedWork$memoize = finishedWork$jscomp$0.memoizedProps,
+                  id = _finishedWork$memoize.id,
+                  onPostCommit = _finishedWork$memoize.onPostCommit;
+                sibling$jscomp$1 = commitTime;
+                var phase =
+                  null === finishedWork$jscomp$0.alternate ? "mount" : "update";
+                currentUpdateIsNested && (phase = "nested-update");
+                "function" === typeof onPostCommit &&
+                  onPostCommit(
+                    id,
+                    phase,
+                    passiveEffectDuration,
+                    sibling$jscomp$1
+                  );
+                var parentFiber = finishedWork$jscomp$0.return;
+                b: for (; null !== parentFiber; ) {
+                  switch (parentFiber.tag) {
+                    case 3:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                    case 12:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                  }
+                  parentFiber = parentFiber.return;
+                }
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        var stateNode = renderPriority.current.stateNode;
+        stateNode.effectDuration = 0;
+        stateNode.passiveEffectDuration = 0;
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
+    }
   }
   return !1;
 }
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
+function enqueuePendingPassiveProfilerEffect(fiber) {
+  pendingPassiveProfilerEffects.push(fiber);
   rootDoesHavePassiveEffects ||
     ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
+    scheduleCallback$1(NormalPriority, function() {
       flushPassiveEffects();
       return null;
     }));
 }
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects,
-    lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
-  pendingPassiveEffectsLanes = 0;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var prevInteractions = pushInteractions(root),
-    unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$97 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$97.destroy;
-    effect$97.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$97 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
-    try {
-      var create$101 = effect$97.create;
-      effect$97.destroy = create$101();
-    } catch (error$102) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$102);
-    }
-  }
-  for (unmountEffects = root.current.firstEffect; null !== unmountEffects; )
-    (create$101 = unmountEffects.nextEffect),
-      (unmountEffects.nextEffect = null),
-      unmountEffects.flags & 8 &&
-        ((unmountEffects.sibling = null), (unmountEffects.stateNode = null)),
-      (unmountEffects = create$101);
-  tracing.__interactionsRef.current = prevInteractions;
-  finishPendingInteractions(root, lanes);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
-}
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
@@ -7068,46 +7508,52 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
-    ensureRootIsScheduled(rootFiber, sourceFiber),
-    schedulePendingInteractions(rootFiber, 1));
+    ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update),
-              schedulePendingInteractions(fiber, 1);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -7119,140 +7565,71 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
       : (workInProgressRootPingedLanes |= pingedLanes));
   ensureRootIsScheduled(root, wakeable);
-  schedulePendingInteractions(root, pingedLanes);
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
   var retryCache = boundaryFiber.stateNode;
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
     (markRootUpdated(boundaryFiber, wakeable, retryCache),
-    ensureRootIsScheduled(boundaryFiber, retryCache),
-    schedulePendingInteractions(boundaryFiber, wakeable));
+    ensureRootIsScheduled(boundaryFiber, retryCache));
 }
 var beginWork$1;
 beginWork$1 = function(current, workInProgress, renderLanes) {
-  var updateLanes = workInProgress.lanes;
   if (null !== current)
     if (
       current.memoizedProps !== workInProgress.pendingProps ||
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
+      if (
+        0 === (current.lanes & renderLanes) &&
+        0 === (workInProgress.flags & 128)
+      )
+        return (
+          (didReceiveUpdate = !1),
+          attemptEarlyBailoutIfNoScheduledUpdate(
+            current,
             workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue);
-          context._currentValue = updateLanes;
-          break;
-        case 12:
-          0 !== (renderLanes & workInProgress.childLanes) &&
-            (workInProgress.flags |= 4);
-          updateLanes = workInProgress.stateNode;
-          updateLanes.effectDuration = 0;
-          updateLanes.passiveEffectDuration = 0;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
-              workInProgress,
-              renderLanes
-            );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
-      }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+            renderLanes
+          )
+        );
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
   switch (workInProgress.tag) {
     case 2:
-      updateLanes = workInProgress.type;
+      var Component = workInProgress.type;
       null !== current &&
         ((current.alternate = null),
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      var context = getMaskedContext(
+        workInProgress,
+        contextStackCursor.current
+      );
       prepareToReadContext(workInProgress, renderLanes);
       context = renderWithHooks(
         null,
         workInProgress,
-        updateLanes,
+        Component,
         current,
         context,
         renderLanes
@@ -7267,7 +7644,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
         workInProgress.updateQueue = null;
-        if (isContextProvider(updateLanes)) {
+        if (isContextProvider(Component)) {
           var hasContext = !0;
           pushContextProvider(workInProgress);
         } else hasContext = !1;
@@ -7276,22 +7653,14 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             ? context.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
         context.updater = classComponentUpdater;
         workInProgress.stateNode = context;
         context._reactInternals = workInProgress;
-        mountClassInstance(workInProgress, updateLanes, current, renderLanes);
+        mountClassInstance(workInProgress, Component, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           hasContext,
           renderLanes
@@ -7302,24 +7671,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      Component = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
-        switch (hasContext) {
+        context = Component._init;
+        Component = context(Component._payload);
+        workInProgress.type = Component;
+        context = workInProgress.tag = resolveLazyComponentTag(Component);
+        current = resolveDefaultProps(Component, current);
+        switch (context) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7328,7 +7697,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7337,7 +7706,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              Component,
               current,
               renderLanes
             );
@@ -7346,80 +7715,78 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
-              updateLanes,
+              Component,
+              resolveDefaultProps(Component.type, current),
               renderLanes
             );
             break a;
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            Component +
             ". Lazy element type must resolve to a class or function."
         );
       }
       return workInProgress;
     case 0:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateFunctionComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 1:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateClassComponent(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
       );
     case 3:
       pushHostRootContext(workInProgress);
-      updateLanes = workInProgress.updateQueue;
-      if (null === current || null === updateLanes)
+      Component = workInProgress.updateQueue;
+      if (null === current || null === Component)
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
+      context = workInProgress.pendingProps;
+      Component = workInProgress.memoizedState.element;
       cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
-      updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      processUpdateQueue(workInProgress, context, null, renderLanes);
+      context = workInProgress.memoizedState.element;
+      context === Component
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, context, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
       return (
         pushHostContext(workInProgress),
-        (updateLanes = workInProgress.pendingProps.children),
-        markRef(current, workInProgress),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        (Component = workInProgress.pendingProps.children),
+        markRef$1(current, workInProgress),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 6:
@@ -7432,34 +7799,29 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           workInProgress,
           workInProgress.stateNode.containerInfo
         ),
-        (updateLanes = workInProgress.pendingProps),
+        (Component = workInProgress.pendingProps),
         null === current
           ? (workInProgress.child = reconcileChildFibers(
               workInProgress,
               null,
-              updateLanes,
+              Component,
               renderLanes
             ))
-          : reconcileChildren(
-              current,
-              workInProgress,
-              updateLanes,
-              renderLanes
-            ),
+          : reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 11:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         updateForwardRef(
           current,
           workInProgress,
-          updateLanes,
+          Component,
           context,
           renderLanes
         )
@@ -7487,9 +7849,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 12:
       return (
         (workInProgress.flags |= 4),
-        (updateLanes = workInProgress.stateNode),
-        (updateLanes.effectDuration = 0),
-        (updateLanes.passiveEffectDuration = 0),
+        (Component = workInProgress.stateNode),
+        (Component.effectDuration = 0),
+        (Component.passiveEffectDuration = 0),
         reconcileChildren(
           current,
           workInProgress,
@@ -7500,28 +7862,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 10:
       a: {
-        updateLanes = workInProgress.type._context;
+        Component = workInProgress.type._context;
         context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue);
-        context$jscomp$0._currentValue = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        hasContext = workInProgress.memoizedProps;
+        var newValue = context.value;
+        push(valueCursor, Component._currentValue);
+        Component._currentValue = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === context.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7533,71 +7883,66 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === Component) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
@@ -7611,29 +7956,24 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 9:
       return (
         (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (Component = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (context = readContext(context)),
+        (Component = Component(context)),
         (workInProgress.flags |= 1),
-        reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        reconcileChildren(current, workInProgress, Component, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
-        (hasContext = resolveDefaultProps(
-          context,
-          workInProgress.pendingProps
-        )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (Component = workInProgress.type),
+        (context = resolveDefaultProps(Component, workInProgress.pendingProps)),
+        (context = resolveDefaultProps(Component.type, context)),
         updateMemoComponent(
           current,
           workInProgress,
+          Component,
           context,
-          hasContext,
-          updateLanes,
           renderLanes
         )
       );
@@ -7643,32 +7983,31 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         workInProgress,
         workInProgress.type,
         workInProgress.pendingProps,
-        updateLanes,
         renderLanes
       );
     case 17:
       return (
-        (updateLanes = workInProgress.type),
+        (Component = workInProgress.type),
         (context = workInProgress.pendingProps),
         (context =
-          workInProgress.elementType === updateLanes
+          workInProgress.elementType === Component
             ? context
-            : resolveDefaultProps(updateLanes, context)),
+            : resolveDefaultProps(Component, context)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2)),
         (workInProgress.tag = 1),
-        isContextProvider(updateLanes)
+        isContextProvider(Component)
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, Component, context),
+        mountClassInstance(workInProgress, Component, context, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
-          updateLanes,
+          Component,
           !0,
           current,
           renderLanes
@@ -7676,9 +8015,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7687,92 +8026,14 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       "). This error is likely caused by a bug in React. Please file an issue."
   );
 };
-function markSpawnedWork(lane) {
-  null === spawnedWorkDuringRender
-    ? (spawnedWorkDuringRender = [lane])
-    : spawnedWorkDuringRender.push(lane);
-}
-function scheduleInteractions(root, lane, interactions) {
-  if (0 < interactions.size) {
-    var pendingInteractionMap = root.pendingInteractionMap,
-      pendingInteractions = pendingInteractionMap.get(lane);
-    null != pendingInteractions
-      ? interactions.forEach(function(interaction) {
-          pendingInteractions.has(interaction) || interaction.__count++;
-          pendingInteractions.add(interaction);
-        })
-      : (pendingInteractionMap.set(lane, new Set(interactions)),
-        interactions.forEach(function(interaction) {
-          interaction.__count++;
-        }));
-    pendingInteractionMap = tracing.__subscriberRef.current;
-    if (null !== pendingInteractionMap)
-      pendingInteractionMap.onWorkScheduled(
-        interactions,
-        1e3 * lane + root.interactionThreadID
-      );
-  }
-}
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-function startWorkOnPendingInteractions(root, lanes) {
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    0 !== (lanes & scheduledLane) &&
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
-  });
-  root.memoizedInteractions = interactions;
-  if (0 < interactions.size) {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber) {
-      root = 1e3 * lanes + root.interactionThreadID;
-      try {
-        subscriber.onWorkStarted(interactions, root);
-      } catch (error) {
-        scheduleCallback(99, function() {
-          throw error;
-        });
-      }
-    }
-  }
-}
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  try {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber && 0 < root.memoizedInteractions.size)
-      subscriber.onWorkStopped(
-        root.memoizedInteractions,
-        1e3 * committedLanes + root.interactionThreadID
-      );
-  } catch (error) {
-    scheduleCallback(99, function() {
-      throw error;
-    });
-  } finally {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      0 === (remainingLanesAfterCommit & lane) &&
-        (pendingInteractionMap.delete(lane),
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-          if (null !== subscriber && 0 === interaction.__count)
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error$103) {
-              scheduleCallback(99, function() {
-                throw error$103;
-              });
-            }
-        }));
+function restorePendingUpdaters(root, lanes) {
+  isDevToolsPresent &&
+    root.memoizedUpdaters.forEach(function(schedulingFiber) {
+      addFiberToLanesMap(root, schedulingFiber, lanes);
     });
-  }
+}
+function scheduleCallback$1(priorityLevel, callback) {
+  return scheduleCallback(priorityLevel, callback);
 }
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
@@ -7783,8 +8044,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
   this.actualDuration = 0;
@@ -7825,11 +8086,11 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null),
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null),
       (workInProgress.actualDuration = 0),
       (workInProgress.actualStartTime = -1));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7866,17 +8127,16 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           (type.stateNode = { effectDuration: 0, passiveEffectDuration: 0 }),
           type
@@ -7884,7 +8144,6 @@ function createFiberFromTypeAndProps(
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7900,7 +8159,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7924,9 +8183,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7946,7 +8202,7 @@ function createFiberFromFragment(elements, mode, lanes, key) {
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7984,9 +8240,10 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.expirationTimes = createLaneMap(-1);
   this.entangledLanes = this.finishedLanes = this.mutableReadLanes = this.expiredLanes = this.pingedLanes = this.suspendedLanes = this.pendingLanes = 0;
   this.entanglements = createLaneMap(0);
-  this.interactionThreadID = tracing.unstable_getThreadID();
-  this.memoizedInteractions = new Set();
-  this.pendingInteractionMap = new Map();
+  this.passiveEffectDuration = this.effectDuration = 0;
+  this.memoizedUpdaters = new Set();
+  containerInfo = this.pendingUpdatersLaneMap = [];
+  for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set());
 }
 function createPortal(children, containerInfo, implementation) {
   var key =
@@ -8068,12 +8325,102 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
   return null;
 }
+var emptyObject$1 = {},
+  createHierarchy,
+  getHostNode,
+  getHostProps,
+  lastNonHostInstance,
+  getOwnerHierarchy,
+  traverseOwnerTreeUp;
+createHierarchy = function(fiberHierarchy) {
+  return fiberHierarchy.map(function(fiber) {
+    return {
+      name: getComponentNameFromType(fiber.type),
+      getInspectorData: function(findNodeHandle) {
+        return {
+          props: getHostProps(fiber),
+          source: fiber._debugSource,
+          measure: function(callback) {
+            var hostFiber = findCurrentHostFiber(fiber);
+            if (
+              (hostFiber =
+                null != hostFiber &&
+                null !== hostFiber.stateNode &&
+                hostFiber.stateNode.node)
+            )
+              nativeFabricUIManager.measure(hostFiber, callback);
+            else
+              return ReactNativePrivateInterface.UIManager.measure(
+                getHostNode(fiber, findNodeHandle),
+                callback
+              );
+          }
+        };
+      }
+    };
+  });
+};
+getHostNode = function(fiber, findNodeHandle) {
+  for (var hostNode; fiber; ) {
+    null !== fiber.stateNode &&
+      5 === fiber.tag &&
+      (hostNode = findNodeHandle(fiber.stateNode));
+    if (hostNode) return hostNode;
+    fiber = fiber.child;
+  }
+  return null;
+};
+getHostProps = function(fiber) {
+  return (fiber = findCurrentHostFiber(fiber))
+    ? fiber.memoizedProps || emptyObject$1
+    : emptyObject$1;
+};
+exports.getInspectorDataForInstance = function(closestInstance) {
+  if (!closestInstance)
+    return {
+      hierarchy: [],
+      props: emptyObject$1,
+      selectedIndex: null,
+      source: null
+    };
+  closestInstance = findCurrentFiberUsingSlowPath(closestInstance);
+  var fiberHierarchy = getOwnerHierarchy(closestInstance),
+    instance = lastNonHostInstance(fiberHierarchy);
+  closestInstance = createHierarchy(fiberHierarchy);
+  var props = getHostProps(instance),
+    source = instance._debugSource;
+  fiberHierarchy = fiberHierarchy.indexOf(instance);
+  return {
+    hierarchy: closestInstance,
+    props: props,
+    selectedIndex: fiberHierarchy,
+    source: source
+  };
+};
+getOwnerHierarchy = function(instance) {
+  var hierarchy = [];
+  traverseOwnerTreeUp(hierarchy, instance);
+  return hierarchy;
+};
+lastNonHostInstance = function(hierarchy) {
+  for (var i = hierarchy.length - 1; 1 < i; i--) {
+    var instance = hierarchy[i];
+    if (5 !== instance.tag) return instance;
+  }
+  return hierarchy[0];
+};
+traverseOwnerTreeUp = function(hierarchy, instance) {
+  instance &&
+    (hierarchy.unshift(instance),
+    traverseOwnerTreeUp(hierarchy, instance._debugOwner));
+};
 function findNodeHandle(componentOrHandle) {
   if (null == componentOrHandle) return null;
   if ("number" === typeof componentOrHandle) return componentOrHandle;
@@ -8103,14 +8450,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_930 = {
+  devToolsConfig$jscomp$inline_1014 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-bd5bf555e-20210823",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -8125,17 +8472,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1148 = {
-  bundleType: devToolsConfig$jscomp$inline_930.bundleType,
-  version: devToolsConfig$jscomp$inline_930.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_930.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_930.rendererConfig,
+var internals$jscomp$inline_1287 = {
+  bundleType: devToolsConfig$jscomp$inline_1014.bundleType,
+  version: devToolsConfig$jscomp$inline_1014.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_1014.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_1014.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -8144,25 +8492,26 @@ var internals$jscomp$inline_1148 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_930.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_1014.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-bd5bf555e-20210823"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1149 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1288 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1149.isDisabled &&
-    hook$jscomp$inline_1149.supportsFiber
+    !hook$jscomp$inline_1288.isDisabled &&
+    hook$jscomp$inline_1288.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1149.inject(
-        internals$jscomp$inline_1148
+      (rendererID = hook$jscomp$inline_1288.inject(
+        internals$jscomp$inline_1287
       )),
-        (injectedHook = hook$jscomp$inline_1149);
+        (injectedHook = hook$jscomp$inline_1288);
     } catch (err) {}
 }
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
@@ -8182,12 +8531,10 @@ exports.createPortal = function(children, containerTag) {
 };
 exports.dispatchCommand = function(handle, command, args) {
   null != handle._nativeTag &&
-    (handle._internalInstanceHandle
-      ? nativeFabricUIManager.dispatchCommand(
-          handle._internalInstanceHandle.stateNode.node,
-          command,
-          args
-        )
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.dispatchCommand(handle.node, command, args))
       : ReactNativePrivateInterface.UIManager.dispatchViewManagerCommand(
           handle._nativeTag,
           command,
@@ -8212,7 +8559,7 @@ exports.render = function(element, containerTag, callback) {
   if (!root) {
     root = new FiberRootNode(containerTag, 0, !1);
     var JSCompiler_inline_result = 0;
-    isDevToolsPresent && (JSCompiler_inline_result |= 8);
+    isDevToolsPresent && (JSCompiler_inline_result |= 2);
     JSCompiler_inline_result = createFiber(
       3,
       null,
@@ -8221,6 +8568,7 @@ exports.render = function(element, containerTag, callback) {
     );
     root.current = JSCompiler_inline_result;
     JSCompiler_inline_result.stateNode = root;
+    JSCompiler_inline_result.memoizedState = { element: null };
     initializeUpdateQueue(JSCompiler_inline_result);
     roots.set(containerTag, root);
   }
@@ -8236,6 +8584,17 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (null != handle._internalInstanceHandle
+      ? ((handle = handle._internalInstanceHandle.stateNode),
+        null != handle &&
+          nativeFabricUIManager.sendAccessibilityEvent(handle.node, eventType))
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.unmountComponentAtNode = unmountComponentAtNode;
 exports.unmountComponentAtNodeAndRemoveContainer = function(containerTag) {
   unmountComponentAtNode(containerTag);
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
index 3f75533f6cc439..1406e7227ad6cb 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
@@ -8,15 +8,14 @@
  * @nolint
  * @providesModule ReactNativeRenderer-profiling
  * @preventMunge
- * @generated
+ * @generated SignedSource<<e309b1b38209da9f75a51da45c8c373c>>
  */
 
 "use strict";
 require("react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore");
 var ReactNativePrivateInterface = require("react-native/Libraries/ReactPrivate/ReactNativePrivateInterface"),
   React = require("react"),
-  Scheduler = require("scheduler"),
-  tracing = require("scheduler/tracing");
+  Scheduler = require("scheduler");
 function invokeGuardedCallbackImpl(name, func, context, a, b, c, d, e, f) {
   var funcArgs = Array.prototype.slice.call(arguments, 3);
   try {
@@ -64,7 +63,8 @@ function invokeGuardedCallbackAndCatchFirstError(
     hasRethrowError || ((hasRethrowError = !0), (rethrowError = error));
   }
 }
-var getFiberCurrentPropsFromNode = null,
+var isArrayImpl = Array.isArray,
+  getFiberCurrentPropsFromNode = null,
   getInstanceFromNode = null,
   getNodeFromInstance = null;
 function executeDispatch(event, listener, inst) {
@@ -76,7 +76,7 @@ function executeDispatch(event, listener, inst) {
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
-  if (Array.isArray(dispatchListener))
+  if (isArrayImpl(dispatchListener))
     throw Error("executeDirectDispatch(...): Invalid `event`.");
   event.currentTarget = dispatchListener
     ? getNodeFromInstance(dispatchInstance)
@@ -290,36 +290,46 @@ function recordTouchEnd(touch) {
     (touchRecord.currentTimeStamp = timestampForTouch(touch)),
     (touchHistory.mostRecentTimeStamp = timestampForTouch(touch)));
 }
-var ResponderTouchHistoryStore = {
-  recordTouchTrack: function(topLevelType, nativeEvent) {
-    if (isMoveish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchMove);
-    else if (isStartish(topLevelType))
-      nativeEvent.changedTouches.forEach(recordTouchStart),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches &&
-          (touchHistory.indexOfSingleActiveTouch =
-            nativeEvent.touches[0].identifier);
-    else if (
-      "topTouchEnd" === topLevelType ||
-      "topTouchCancel" === topLevelType
-    )
-      if (
-        (nativeEvent.changedTouches.forEach(recordTouchEnd),
-        (touchHistory.numberActiveTouches = nativeEvent.touches.length),
-        1 === touchHistory.numberActiveTouches)
+var instrumentationCallback,
+  ResponderTouchHistoryStore = {
+    instrument: function(callback) {
+      instrumentationCallback = callback;
+    },
+    recordTouchTrack: function(topLevelType, nativeEvent) {
+      null != instrumentationCallback &&
+        instrumentationCallback(topLevelType, nativeEvent);
+      if (isMoveish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchMove);
+      else if (isStartish(topLevelType))
+        nativeEvent.changedTouches.forEach(recordTouchStart),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches &&
+            (touchHistory.indexOfSingleActiveTouch =
+              nativeEvent.touches[0].identifier);
+      else if (
+        "topTouchEnd" === topLevelType ||
+        "topTouchCancel" === topLevelType
       )
-        for (topLevelType = 0; topLevelType < touchBank.length; topLevelType++)
-          if (
-            ((nativeEvent = touchBank[topLevelType]),
-            null != nativeEvent && nativeEvent.touchActive)
-          ) {
-            touchHistory.indexOfSingleActiveTouch = topLevelType;
-            break;
-          }
-  },
-  touchHistory: touchHistory
-};
+        if (
+          (nativeEvent.changedTouches.forEach(recordTouchEnd),
+          (touchHistory.numberActiveTouches = nativeEvent.touches.length),
+          1 === touchHistory.numberActiveTouches)
+        )
+          for (
+            topLevelType = 0;
+            topLevelType < touchBank.length;
+            topLevelType++
+          )
+            if (
+              ((nativeEvent = touchBank[topLevelType]),
+              null != nativeEvent && nativeEvent.touchActive)
+            ) {
+              touchHistory.indexOfSingleActiveTouch = topLevelType;
+              break;
+            }
+    },
+    touchHistory: touchHistory
+  };
 function accumulate(current, next) {
   if (null == next)
     throw Error(
@@ -327,9 +337,9 @@ function accumulate(current, next) {
     );
   return null == current
     ? next
-    : Array.isArray(current)
+    : isArrayImpl(current)
     ? current.concat(next)
-    : Array.isArray(next)
+    : isArrayImpl(next)
     ? [current].concat(next)
     : [current, next];
 }
@@ -339,12 +349,12 @@ function accumulateInto(current, next) {
       "accumulateInto(...): Accumulated items must not be null or undefined."
     );
   if (null == current) return next;
-  if (Array.isArray(current)) {
-    if (Array.isArray(next)) return current.push.apply(current, next), current;
+  if (isArrayImpl(current)) {
+    if (isArrayImpl(next)) return current.push.apply(current, next), current;
     current.push(next);
     return current;
   }
-  return Array.isArray(next) ? [current].concat(next) : [current, next];
+  return isArrayImpl(next) ? [current].concat(next) : [current, next];
 }
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
@@ -570,7 +580,7 @@ var ResponderEventPlugin = {
         b: {
           JSCompiler_temp = shouldSetEventType._dispatchListeners;
           targetInst = shouldSetEventType._dispatchInstances;
-          if (Array.isArray(JSCompiler_temp))
+          if (isArrayImpl(JSCompiler_temp))
             for (
               depthA = 0;
               depthA < JSCompiler_temp.length &&
@@ -921,7 +931,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_226 = {
+var injectedNamesToPlugins$jscomp$inline_227 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -956,34 +966,34 @@ var injectedNamesToPlugins$jscomp$inline_226 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_227 = !1,
-  pluginName$jscomp$inline_228;
-for (pluginName$jscomp$inline_228 in injectedNamesToPlugins$jscomp$inline_226)
+  isOrderingDirty$jscomp$inline_228 = !1,
+  pluginName$jscomp$inline_229;
+for (pluginName$jscomp$inline_229 in injectedNamesToPlugins$jscomp$inline_227)
   if (
-    injectedNamesToPlugins$jscomp$inline_226.hasOwnProperty(
-      pluginName$jscomp$inline_228
+    injectedNamesToPlugins$jscomp$inline_227.hasOwnProperty(
+      pluginName$jscomp$inline_229
     )
   ) {
-    var pluginModule$jscomp$inline_229 =
-      injectedNamesToPlugins$jscomp$inline_226[pluginName$jscomp$inline_228];
+    var pluginModule$jscomp$inline_230 =
+      injectedNamesToPlugins$jscomp$inline_227[pluginName$jscomp$inline_229];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_228) ||
-      namesToPlugins[pluginName$jscomp$inline_228] !==
-        pluginModule$jscomp$inline_229
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_229) ||
+      namesToPlugins[pluginName$jscomp$inline_229] !==
+        pluginModule$jscomp$inline_230
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_228])
+      if (namesToPlugins[pluginName$jscomp$inline_229])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            pluginName$jscomp$inline_228 +
+            pluginName$jscomp$inline_229 +
             "`."
         );
       namesToPlugins[
-        pluginName$jscomp$inline_228
-      ] = pluginModule$jscomp$inline_229;
-      isOrderingDirty$jscomp$inline_227 = !0;
+        pluginName$jscomp$inline_229
+      ] = pluginModule$jscomp$inline_230;
+      isOrderingDirty$jscomp$inline_228 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_227 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_228 && recomputePluginOrdering();
 var instanceCache = new Map(),
   instanceProps = new Map();
 function getInstanceFromTag(tag) {
@@ -1007,7 +1017,7 @@ function executeDispatchesAndReleaseTopLevel(e) {
   if (e) {
     var dispatchListeners = e._dispatchListeners,
       dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
+    if (isArrayImpl(dispatchListeners))
       for (
         var i = 0;
         i < dispatchListeners.length && !e.isPropagationStopped();
@@ -1139,10 +1149,10 @@ var ReactSharedInternals =
   REACT_SUSPENSE_LIST_TYPE = 60120,
   REACT_MEMO_TYPE = 60115,
   REACT_LAZY_TYPE = 60116,
-  REACT_BLOCK_TYPE = 60121,
   REACT_DEBUG_TRACING_MODE_TYPE = 60129,
   REACT_OFFSCREEN_TYPE = 60130,
-  REACT_LEGACY_HIDDEN_TYPE = 60131;
+  REACT_LEGACY_HIDDEN_TYPE = 60131,
+  REACT_CACHE_TYPE = 60132;
 if ("function" === typeof Symbol && Symbol.for) {
   var symbolFor = Symbol.for;
   REACT_ELEMENT_TYPE = symbolFor("react.element");
@@ -1157,11 +1167,11 @@ if ("function" === typeof Symbol && Symbol.for) {
   REACT_SUSPENSE_LIST_TYPE = symbolFor("react.suspense_list");
   REACT_MEMO_TYPE = symbolFor("react.memo");
   REACT_LAZY_TYPE = symbolFor("react.lazy");
-  REACT_BLOCK_TYPE = symbolFor("react.block");
   symbolFor("react.scope");
   REACT_DEBUG_TRACING_MODE_TYPE = symbolFor("react.debug_trace_mode");
   REACT_OFFSCREEN_TYPE = symbolFor("react.offscreen");
   REACT_LEGACY_HIDDEN_TYPE = symbolFor("react.legacy_hidden");
+  REACT_CACHE_TYPE = symbolFor("react.cache");
 }
 var MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
@@ -1171,7 +1181,7 @@ function getIteratorFn(maybeIterable) {
     maybeIterable["@@iterator"];
   return "function" === typeof maybeIterable ? maybeIterable : null;
 }
-function getComponentName(type) {
+function getComponentNameFromType(type) {
   if (null == type) return null;
   if ("function" === typeof type) return type.displayName || type.name || null;
   if ("string" === typeof type) return type;
@@ -1188,6 +1198,8 @@ function getComponentName(type) {
       return "Suspense";
     case REACT_SUSPENSE_LIST_TYPE:
       return "SuspenseList";
+    case REACT_CACHE_TYPE:
+      return "Cache";
   }
   if ("object" === typeof type)
     switch (type.$$typeof) {
@@ -1197,24 +1209,83 @@ function getComponentName(type) {
         return (type._context.displayName || "Context") + ".Provider";
       case REACT_FORWARD_REF_TYPE:
         var innerType = type.render;
-        innerType = innerType.displayName || innerType.name || "";
+        type = type.displayName;
+        type ||
+          ((type = innerType.displayName || innerType.name || ""),
+          (type = "" !== type ? "ForwardRef(" + type + ")" : "ForwardRef"));
+        return type;
+      case REACT_MEMO_TYPE:
         return (
-          type.displayName ||
-          ("" !== innerType ? "ForwardRef(" + innerType + ")" : "ForwardRef")
+          (innerType = type.displayName || null),
+          null !== innerType
+            ? innerType
+            : getComponentNameFromType(type.type) || "Memo"
         );
-      case REACT_MEMO_TYPE:
-        return getComponentName(type.type);
-      case REACT_BLOCK_TYPE:
-        return getComponentName(type._render);
       case REACT_LAZY_TYPE:
         innerType = type._payload;
         type = type._init;
         try {
-          return getComponentName(type(innerType));
+          return getComponentNameFromType(type(innerType));
         } catch (x) {}
     }
   return null;
 }
+function getComponentNameFromFiber(fiber) {
+  var type = fiber.type;
+  switch (fiber.tag) {
+    case 24:
+      return "Cache";
+    case 9:
+      return (type.displayName || "Context") + ".Consumer";
+    case 10:
+      return (type._context.displayName || "Context") + ".Provider";
+    case 18:
+      return "DehydratedFragment";
+    case 11:
+      return (
+        (fiber = type.render),
+        (fiber = fiber.displayName || fiber.name || ""),
+        type.displayName ||
+          ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef")
+      );
+    case 7:
+      return "Fragment";
+    case 5:
+      return type;
+    case 4:
+      return "Portal";
+    case 3:
+      return "Root";
+    case 6:
+      return "Text";
+    case 16:
+      return getComponentNameFromType(type);
+    case 23:
+      return "LegacyHidden";
+    case 8:
+      return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode";
+    case 22:
+      return "Offscreen";
+    case 12:
+      return "Profiler";
+    case 21:
+      return "Scope";
+    case 13:
+      return "Suspense";
+    case 19:
+      return "SuspenseList";
+    case 1:
+    case 0:
+    case 17:
+    case 2:
+    case 14:
+    case 15:
+      if ("function" === typeof type)
+        return type.displayName || type.name || null;
+      if ("string" === typeof type) return type;
+  }
+  return null;
+}
 function getNearestMountedFiber(fiber) {
   var node = fiber,
     nearestMounted = fiber;
@@ -1223,7 +1294,7 @@ function getNearestMountedFiber(fiber) {
     fiber = node;
     do
       (node = fiber),
-        0 !== (node.flags & 1026) && (nearestMounted = node.return),
+        0 !== (node.flags & 2050) && (nearestMounted = node.return),
         (fiber = node.return);
     while (fiber);
   }
@@ -1311,33 +1382,16 @@ function findCurrentFiberUsingSlowPath(fiber) {
 }
 function findCurrentHostFiber(parent) {
   parent = findCurrentFiberUsingSlowPath(parent);
-  if (!parent) return null;
-  for (var node = parent; ; ) {
-    if (5 === node.tag || 6 === node.tag) return node;
-    if (node.child) (node.child.return = node), (node = node.child);
-    else {
-      if (node === parent) break;
-      for (; !node.sibling; ) {
-        if (!node.return || node.return === parent) return null;
-        node = node.return;
-      }
-      node.sibling.return = node.return;
-      node = node.sibling;
-    }
-  }
-  return null;
+  return null !== parent ? findCurrentHostFiberImpl(parent) : null;
 }
-function doesFiberContain(parentFiber, childFiber) {
-  for (
-    var parentFiberAlternate = parentFiber.alternate;
-    null !== childFiber;
-
-  ) {
-    if (childFiber === parentFiber || childFiber === parentFiberAlternate)
-      return !0;
-    childFiber = childFiber.return;
+function findCurrentHostFiberImpl(node) {
+  if (5 === node.tag || 6 === node.tag) return node;
+  for (node = node.child; null !== node; ) {
+    var match = findCurrentHostFiberImpl(node);
+    if (null !== match) return match;
+    node = node.sibling;
   }
-  return !1;
+  return null;
 }
 var emptyObject = {},
   removedKeys = null,
@@ -1357,7 +1411,7 @@ function restoreDeletedValuesInNestedArray(
   node,
   validAttributes
 ) {
-  if (Array.isArray(node))
+  if (isArrayImpl(node))
     for (var i = node.length; i-- && 0 < removedKeyCount; )
       restoreDeletedValuesInNestedArray(
         updatePayload,
@@ -1403,9 +1457,9 @@ function diffNestedProperty(
       : prevProp
       ? clearNestedProperty(updatePayload, prevProp, validAttributes)
       : updatePayload;
-  if (!Array.isArray(prevProp) && !Array.isArray(nextProp))
+  if (!isArrayImpl(prevProp) && !isArrayImpl(nextProp))
     return diffProperties(updatePayload, prevProp, nextProp, validAttributes);
-  if (Array.isArray(prevProp) && Array.isArray(nextProp)) {
+  if (isArrayImpl(prevProp) && isArrayImpl(nextProp)) {
     var minLength =
         prevProp.length < nextProp.length ? prevProp.length : nextProp.length,
       i;
@@ -1430,7 +1484,7 @@ function diffNestedProperty(
       );
     return updatePayload;
   }
-  return Array.isArray(prevProp)
+  return isArrayImpl(prevProp)
     ? diffProperties(
         updatePayload,
         ReactNativePrivateInterface.flattenStyle(prevProp),
@@ -1446,7 +1500,7 @@ function diffNestedProperty(
 }
 function addNestedProperty(updatePayload, nextProp, validAttributes) {
   if (!nextProp) return updatePayload;
-  if (!Array.isArray(nextProp))
+  if (!isArrayImpl(nextProp))
     return diffProperties(
       updatePayload,
       emptyObject,
@@ -1463,7 +1517,7 @@ function addNestedProperty(updatePayload, nextProp, validAttributes) {
 }
 function clearNestedProperty(updatePayload, prevProp, validAttributes) {
   if (!prevProp) return updatePayload;
-  if (!Array.isArray(prevProp))
+  if (!isArrayImpl(prevProp))
     return diffProperties(
       updatePayload,
       prevProp,
@@ -1573,60 +1627,325 @@ function mountSafeCallback_NOT_REALLY_SAFE(context, callback) {
   };
 }
 var ReactNativeFiberHostComponent = (function() {
-  function ReactNativeFiberHostComponent(tag, viewConfig) {
-    this._nativeTag = tag;
-    this._children = [];
-    this.viewConfig = viewConfig;
-  }
-  var _proto = ReactNativeFiberHostComponent.prototype;
-  _proto.blur = function() {
-    ReactNativePrivateInterface.TextInputState.blurTextInput(this);
-  };
-  _proto.focus = function() {
-    ReactNativePrivateInterface.TextInputState.focusTextInput(this);
-  };
-  _proto.measure = function(callback) {
-    ReactNativePrivateInterface.UIManager.measure(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureInWindow = function(callback) {
-    ReactNativePrivateInterface.UIManager.measureInWindow(
-      this._nativeTag,
-      mountSafeCallback_NOT_REALLY_SAFE(this, callback)
-    );
-  };
-  _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
-    if ("number" === typeof relativeToNativeNode)
-      var relativeNode = relativeToNativeNode;
-    else
-      relativeToNativeNode._nativeTag &&
-        (relativeNode = relativeToNativeNode._nativeTag);
-    null != relativeNode &&
-      ReactNativePrivateInterface.UIManager.measureLayout(
+    function ReactNativeFiberHostComponent(tag, viewConfig) {
+      this._nativeTag = tag;
+      this._children = [];
+      this.viewConfig = viewConfig;
+    }
+    var _proto = ReactNativeFiberHostComponent.prototype;
+    _proto.blur = function() {
+      ReactNativePrivateInterface.TextInputState.blurTextInput(this);
+    };
+    _proto.focus = function() {
+      ReactNativePrivateInterface.TextInputState.focusTextInput(this);
+    };
+    _proto.measure = function(callback) {
+      ReactNativePrivateInterface.UIManager.measure(
         this._nativeTag,
-        relativeNode,
-        mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
-        mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  _proto.setNativeProps = function(nativeProps) {
-    nativeProps = diffProperties(
-      null,
-      emptyObject,
-      nativeProps,
-      this.viewConfig.validAttributes
-    );
-    null != nativeProps &&
-      ReactNativePrivateInterface.UIManager.updateView(
+    };
+    _proto.measureInWindow = function(callback) {
+      ReactNativePrivateInterface.UIManager.measureInWindow(
         this._nativeTag,
-        this.viewConfig.uiViewClassName,
-        nativeProps
+        mountSafeCallback_NOT_REALLY_SAFE(this, callback)
       );
-  };
-  return ReactNativeFiberHostComponent;
-})();
+    };
+    _proto.measureLayout = function(relativeToNativeNode, onSuccess, onFail) {
+      if ("number" === typeof relativeToNativeNode)
+        var relativeNode = relativeToNativeNode;
+      else
+        relativeToNativeNode._nativeTag &&
+          (relativeNode = relativeToNativeNode._nativeTag);
+      null != relativeNode &&
+        ReactNativePrivateInterface.UIManager.measureLayout(
+          this._nativeTag,
+          relativeNode,
+          mountSafeCallback_NOT_REALLY_SAFE(this, onFail),
+          mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess)
+        );
+    };
+    _proto.setNativeProps = function(nativeProps) {
+      nativeProps = diffProperties(
+        null,
+        emptyObject,
+        nativeProps,
+        this.viewConfig.validAttributes
+      );
+      null != nativeProps &&
+        ReactNativePrivateInterface.UIManager.updateView(
+          this._nativeTag,
+          this.viewConfig.uiViewClassName,
+          nativeProps
+        );
+    };
+    return ReactNativeFiberHostComponent;
+  })(),
+  scheduleCallback = Scheduler.unstable_scheduleCallback,
+  cancelCallback = Scheduler.unstable_cancelCallback,
+  shouldYield = Scheduler.unstable_shouldYield,
+  requestPaint = Scheduler.unstable_requestPaint,
+  now = Scheduler.unstable_now,
+  ImmediatePriority = Scheduler.unstable_ImmediatePriority,
+  UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
+  NormalPriority = Scheduler.unstable_NormalPriority,
+  IdlePriority = Scheduler.unstable_IdlePriority,
+  rendererID = null,
+  injectedHook = null,
+  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__;
+function onCommitRoot(root, eventPriority) {
+  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
+    try {
+      var didError = 128 === (root.current.flags & 128);
+      switch (eventPriority) {
+        case 1:
+          var schedulerPriority = ImmediatePriority;
+          break;
+        case 4:
+          schedulerPriority = UserBlockingPriority;
+          break;
+        case 16:
+          schedulerPriority = NormalPriority;
+          break;
+        case 536870912:
+          schedulerPriority = IdlePriority;
+          break;
+        default:
+          schedulerPriority = NormalPriority;
+      }
+      injectedHook.onCommitFiberRoot(
+        rendererID,
+        root,
+        schedulerPriority,
+        didError
+      );
+    } catch (err) {}
+}
+var nextTransitionLane = 64,
+  nextRetryLane = 4194304;
+function getHighestPriorityLanes(lanes) {
+  switch (lanes & -lanes) {
+    case 1:
+      return 1;
+    case 2:
+      return 2;
+    case 4:
+      return 4;
+    case 8:
+      return 8;
+    case 16:
+      return 16;
+    case 32:
+      return 32;
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return lanes & 4194240;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return lanes & 130023424;
+    case 134217728:
+      return 134217728;
+    case 268435456:
+      return 268435456;
+    case 536870912:
+      return 536870912;
+    case 1073741824:
+      return 1073741824;
+    default:
+      return lanes;
+  }
+}
+function getNextLanes(root, wipLanes) {
+  var pendingLanes = root.pendingLanes;
+  if (0 === pendingLanes) return 0;
+  var nextLanes = 0,
+    suspendedLanes = root.suspendedLanes,
+    pingedLanes = root.pingedLanes,
+    nonIdlePendingLanes = pendingLanes & 268435455;
+  if (0 !== nonIdlePendingLanes) {
+    var nonIdleUnblockedLanes = nonIdlePendingLanes & ~suspendedLanes;
+    0 !== nonIdleUnblockedLanes
+      ? (nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes))
+      : ((pingedLanes &= nonIdlePendingLanes),
+        0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes)));
+  } else
+    (nonIdlePendingLanes = pendingLanes & ~suspendedLanes),
+      0 !== nonIdlePendingLanes
+        ? (nextLanes = getHighestPriorityLanes(nonIdlePendingLanes))
+        : 0 !== pingedLanes &&
+          (nextLanes = getHighestPriorityLanes(pingedLanes));
+  if (0 === nextLanes) return 0;
+  if (
+    0 !== wipLanes &&
+    wipLanes !== nextLanes &&
+    0 === (wipLanes & suspendedLanes) &&
+    ((suspendedLanes = nextLanes & -nextLanes),
+    (pingedLanes = wipLanes & -wipLanes),
+    suspendedLanes >= pingedLanes ||
+      (16 === suspendedLanes && 0 !== (pingedLanes & 4194240)))
+  )
+    return wipLanes;
+  0 !== (nextLanes & 4) && (nextLanes |= pendingLanes & 16);
+  wipLanes = root.entangledLanes;
+  if (0 !== wipLanes)
+    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
+      (pendingLanes = 31 - clz32(wipLanes)),
+        (suspendedLanes = 1 << pendingLanes),
+        (nextLanes |= root[pendingLanes]),
+        (wipLanes &= ~suspendedLanes);
+  return nextLanes;
+}
+function computeExpirationTime(lane, currentTime) {
+  switch (lane) {
+    case 1:
+    case 2:
+    case 4:
+      return currentTime + 250;
+    case 8:
+    case 16:
+    case 32:
+    case 64:
+    case 128:
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+    case 32768:
+    case 65536:
+    case 131072:
+    case 262144:
+    case 524288:
+    case 1048576:
+    case 2097152:
+      return currentTime + 5e3;
+    case 4194304:
+    case 8388608:
+    case 16777216:
+    case 33554432:
+    case 67108864:
+      return -1;
+    case 134217728:
+    case 268435456:
+    case 536870912:
+    case 1073741824:
+      return -1;
+    default:
+      return -1;
+  }
+}
+function getLanesToRetrySynchronouslyOnError(root) {
+  root = root.pendingLanes & -1073741825;
+  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
+}
+function createLaneMap(initial) {
+  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
+  return laneMap;
+}
+function markRootUpdated(root, updateLane, eventTime) {
+  root.pendingLanes |= updateLane;
+  536870912 !== updateLane &&
+    ((root.suspendedLanes = 0), (root.pingedLanes = 0));
+  root = root.eventTimes;
+  updateLane = 31 - clz32(updateLane);
+  root[updateLane] = eventTime;
+}
+function markRootFinished(root, remainingLanes) {
+  var noLongerPendingLanes = root.pendingLanes & ~remainingLanes;
+  root.pendingLanes = remainingLanes;
+  root.suspendedLanes = 0;
+  root.pingedLanes = 0;
+  root.expiredLanes &= remainingLanes;
+  root.mutableReadLanes &= remainingLanes;
+  root.entangledLanes &= remainingLanes;
+  remainingLanes = root.entanglements;
+  var eventTimes = root.eventTimes;
+  for (root = root.expirationTimes; 0 < noLongerPendingLanes; ) {
+    var index$8 = 31 - clz32(noLongerPendingLanes),
+      lane = 1 << index$8;
+    remainingLanes[index$8] = 0;
+    eventTimes[index$8] = -1;
+    root[index$8] = -1;
+    noLongerPendingLanes &= ~lane;
+  }
+}
+function markRootEntangled(root, entangledLanes) {
+  var rootEntangledLanes = (root.entangledLanes |= entangledLanes);
+  for (root = root.entanglements; rootEntangledLanes; ) {
+    var index$9 = 31 - clz32(rootEntangledLanes),
+      lane = 1 << index$9;
+    (lane & entangledLanes) | (root[index$9] & entangledLanes) &&
+      (root[index$9] |= entangledLanes);
+    rootEntangledLanes &= ~lane;
+  }
+}
+function addFiberToLanesMap(root, fiber, lanes) {
+  if (isDevToolsPresent)
+    for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) {
+      var index$10 = 31 - clz32(lanes),
+        lane = 1 << index$10;
+      root[index$10].add(fiber);
+      lanes &= ~lane;
+    }
+}
+function movePendingFibersToMemoized(root, lanes) {
+  if (isDevToolsPresent)
+    for (
+      var pendingUpdatersLaneMap = root.pendingUpdatersLaneMap,
+        memoizedUpdaters = root.memoizedUpdaters;
+      0 < lanes;
+
+    ) {
+      var index$11 = 31 - clz32(lanes);
+      root = 1 << index$11;
+      index$11 = pendingUpdatersLaneMap[index$11];
+      0 < index$11.size &&
+        (index$11.forEach(function(fiber) {
+          var alternate = fiber.alternate;
+          (null !== alternate && memoizedUpdaters.has(alternate)) ||
+            memoizedUpdaters.add(fiber);
+        }),
+        index$11.clear());
+      lanes &= ~root;
+    }
+}
+var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
+  log = Math.log,
+  LN2 = Math.LN2;
+function clz32Fallback(lanes) {
+  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
+}
+var currentUpdatePriority = 0;
+function lanesToEventPriority(lanes) {
+  lanes &= -lanes;
+  return 1 < lanes
+    ? 4 < lanes
+      ? 0 !== (lanes & 268435455)
+        ? 16
+        : 536870912
+      : 4
+    : 1;
+}
 function shim() {
   throw Error(
     "The current renderer does not support hydration. This error is likely caused by a bug in React. Please file an issue."
@@ -1675,7 +1994,8 @@ function describeFunctionComponentFrame(fn, source) {
     ? describeComponentFrame(fn.displayName || fn.name || null, source, null)
     : "";
 }
-var valueStack = [],
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+  valueStack = [],
   index = -1;
 function createCursor(defaultValue) {
   return { current: defaultValue };
@@ -1729,13 +2049,13 @@ function pushTopLevelContextObject(fiber, context, didChange) {
 }
 function processChildContext(fiber, type, parentContext) {
   var instance = fiber.stateNode;
-  fiber = type.childContextTypes;
+  type = type.childContextTypes;
   if ("function" !== typeof instance.getChildContext) return parentContext;
   instance = instance.getChildContext();
   for (var contextKey in instance)
-    if (!(contextKey in fiber))
+    if (!(contextKey in type))
       throw Error(
-        (getComponentName(type) || "Unknown") +
+        (getComponentNameFromFiber(fiber) || "Unknown") +
           '.getChildContext(): key "' +
           contextKey +
           '" is not defined in childContextTypes.'
@@ -1771,321 +2091,41 @@ function invalidateContextProvider(workInProgress, type, didChange) {
     : pop(didPerformWorkStackCursor);
   push(didPerformWorkStackCursor, didChange);
 }
-var rendererID = null,
-  injectedHook = null,
-  isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__,
-  Scheduler_now = Scheduler.unstable_now;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-Scheduler_now();
-var return_highestLanePriority = 8;
-function getHighestPriorityLanes(lanes) {
-  if (0 !== (1 & lanes)) return (return_highestLanePriority = 15), 1;
-  if (0 !== (2 & lanes)) return (return_highestLanePriority = 14), 2;
-  if (0 !== (4 & lanes)) return (return_highestLanePriority = 13), 4;
-  var inputDiscreteLanes = 24 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 12), inputDiscreteLanes;
-  if (0 !== (lanes & 32)) return (return_highestLanePriority = 11), 32;
-  inputDiscreteLanes = 192 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 10), inputDiscreteLanes;
-  if (0 !== (lanes & 256)) return (return_highestLanePriority = 9), 256;
-  inputDiscreteLanes = 3584 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 8), inputDiscreteLanes;
-  if (0 !== (lanes & 4096)) return (return_highestLanePriority = 7), 4096;
-  inputDiscreteLanes = 4186112 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 6), inputDiscreteLanes;
-  inputDiscreteLanes = 62914560 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 5), inputDiscreteLanes;
-  if (lanes & 67108864) return (return_highestLanePriority = 4), 67108864;
-  if (0 !== (lanes & 134217728))
-    return (return_highestLanePriority = 3), 134217728;
-  inputDiscreteLanes = 805306368 & lanes;
-  if (0 !== inputDiscreteLanes)
-    return (return_highestLanePriority = 2), inputDiscreteLanes;
-  if (0 !== (1073741824 & lanes))
-    return (return_highestLanePriority = 1), 1073741824;
-  return_highestLanePriority = 8;
-  return lanes;
-}
-function schedulerPriorityToLanePriority(schedulerPriorityLevel) {
-  switch (schedulerPriorityLevel) {
-    case 99:
-      return 15;
-    case 98:
-      return 10;
-    case 97:
-    case 96:
-      return 8;
-    case 95:
-      return 2;
-    default:
-      return 0;
+var syncQueue = null,
+  includesLegacySyncCallbacks = !1,
+  isFlushingSyncQueue = !1;
+function flushSyncCallbacks() {
+  if (!isFlushingSyncQueue && null !== syncQueue) {
+    isFlushingSyncQueue = !0;
+    var i = 0,
+      previousUpdatePriority = currentUpdatePriority;
+    try {
+      var queue = syncQueue;
+      for (currentUpdatePriority = 1; i < queue.length; i++) {
+        var callback = queue[i];
+        do callback = callback(!0);
+        while (null !== callback);
+      }
+      syncQueue = null;
+      includesLegacySyncCallbacks = !1;
+    } catch (error) {
+      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
+      scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+      error);
+    } finally {
+      (currentUpdatePriority = previousUpdatePriority),
+        (isFlushingSyncQueue = !1);
+    }
   }
+  return null;
 }
-function lanePriorityToSchedulerPriority(lanePriority) {
-  switch (lanePriority) {
-    case 15:
-    case 14:
-      return 99;
-    case 13:
-    case 12:
-    case 11:
-    case 10:
-      return 98;
-    case 9:
-    case 8:
-    case 7:
-    case 6:
-    case 4:
-    case 5:
-      return 97;
-    case 3:
-    case 2:
-    case 1:
-      return 95;
-    case 0:
-      return 90;
-    default:
-      throw Error(
-        "Invalid update priority: " + lanePriority + ". This is a bug in React."
-      );
-  }
+var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
+function is(x, y) {
+  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
 }
-function getNextLanes(root, wipLanes) {
-  var pendingLanes = root.pendingLanes;
-  if (0 === pendingLanes) return (return_highestLanePriority = 0);
-  var nextLanes = 0,
-    nextLanePriority = 0,
-    expiredLanes = root.expiredLanes,
-    suspendedLanes = root.suspendedLanes,
-    pingedLanes = root.pingedLanes;
-  if (0 !== expiredLanes)
-    (nextLanes = expiredLanes),
-      (nextLanePriority = return_highestLanePriority = 15);
-  else if (((expiredLanes = pendingLanes & 134217727), 0 !== expiredLanes)) {
-    var nonIdleUnblockedLanes = expiredLanes & ~suspendedLanes;
-    0 !== nonIdleUnblockedLanes
-      ? ((nextLanes = getHighestPriorityLanes(nonIdleUnblockedLanes)),
-        (nextLanePriority = return_highestLanePriority))
-      : ((pingedLanes &= expiredLanes),
-        0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority)));
-  } else
-    (expiredLanes = pendingLanes & ~suspendedLanes),
-      0 !== expiredLanes
-        ? ((nextLanes = getHighestPriorityLanes(expiredLanes)),
-          (nextLanePriority = return_highestLanePriority))
-        : 0 !== pingedLanes &&
-          ((nextLanes = getHighestPriorityLanes(pingedLanes)),
-          (nextLanePriority = return_highestLanePriority));
-  if (0 === nextLanes) return 0;
-  nextLanes = 31 - clz32(nextLanes);
-  nextLanes = pendingLanes & (((0 > nextLanes ? 0 : 1 << nextLanes) << 1) - 1);
-  if (
-    0 !== wipLanes &&
-    wipLanes !== nextLanes &&
-    0 === (wipLanes & suspendedLanes)
-  ) {
-    getHighestPriorityLanes(wipLanes);
-    if (nextLanePriority <= return_highestLanePriority) return wipLanes;
-    return_highestLanePriority = nextLanePriority;
-  }
-  wipLanes = root.entangledLanes;
-  if (0 !== wipLanes)
-    for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; )
-      (pendingLanes = 31 - clz32(wipLanes)),
-        (nextLanePriority = 1 << pendingLanes),
-        (nextLanes |= root[pendingLanes]),
-        (wipLanes &= ~nextLanePriority);
-  return nextLanes;
-}
-function getLanesToRetrySynchronouslyOnError(root) {
-  root = root.pendingLanes & -1073741825;
-  return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0;
-}
-function findUpdateLane(lanePriority, wipLanes) {
-  switch (lanePriority) {
-    case 15:
-      return 1;
-    case 14:
-      return 2;
-    case 12:
-      return (
-        (lanePriority = getHighestPriorityLane(24 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(10, wipLanes) : lanePriority
-      );
-    case 10:
-      return (
-        (lanePriority = getHighestPriorityLane(192 & ~wipLanes)),
-        0 === lanePriority ? findUpdateLane(8, wipLanes) : lanePriority
-      );
-    case 8:
-      return (
-        (lanePriority = getHighestPriorityLane(3584 & ~wipLanes)),
-        0 === lanePriority &&
-          ((lanePriority = getHighestPriorityLane(4186112 & ~wipLanes)),
-          0 === lanePriority && (lanePriority = 512)),
-        lanePriority
-      );
-    case 2:
-      return (
-        (wipLanes = getHighestPriorityLane(805306368 & ~wipLanes)),
-        0 === wipLanes && (wipLanes = 268435456),
-        wipLanes
-      );
-  }
-  throw Error(
-    "Invalid update priority: " + lanePriority + ". This is a bug in React."
-  );
-}
-function getHighestPriorityLane(lanes) {
-  return lanes & -lanes;
-}
-function createLaneMap(initial) {
-  for (var laneMap = [], i = 0; 31 > i; i++) laneMap.push(initial);
-  return laneMap;
-}
-function markRootUpdated(root, updateLane, eventTime) {
-  root.pendingLanes |= updateLane;
-  var higherPriorityLanes = updateLane - 1;
-  root.suspendedLanes &= higherPriorityLanes;
-  root.pingedLanes &= higherPriorityLanes;
-  root = root.eventTimes;
-  updateLane = 31 - clz32(updateLane);
-  root[updateLane] = eventTime;
-}
-var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback,
-  log = Math.log,
-  LN2 = Math.LN2;
-function clz32Fallback(lanes) {
-  return 0 === lanes ? 32 : (31 - ((log(lanes) / LN2) | 0)) | 0;
-}
-var Scheduler_runWithPriority = Scheduler.unstable_runWithPriority,
-  Scheduler_scheduleCallback = Scheduler.unstable_scheduleCallback,
-  Scheduler_cancelCallback = Scheduler.unstable_cancelCallback,
-  Scheduler_shouldYield = Scheduler.unstable_shouldYield,
-  Scheduler_requestPaint = Scheduler.unstable_requestPaint,
-  Scheduler_now$1 = Scheduler.unstable_now,
-  Scheduler_getCurrentPriorityLevel =
-    Scheduler.unstable_getCurrentPriorityLevel,
-  Scheduler_ImmediatePriority = Scheduler.unstable_ImmediatePriority,
-  Scheduler_UserBlockingPriority = Scheduler.unstable_UserBlockingPriority,
-  Scheduler_NormalPriority = Scheduler.unstable_NormalPriority,
-  Scheduler_LowPriority = Scheduler.unstable_LowPriority,
-  Scheduler_IdlePriority = Scheduler.unstable_IdlePriority;
-if (
-  null == tracing.__interactionsRef ||
-  null == tracing.__interactionsRef.current
-)
-  throw Error(
-    "It is not supported to run the profiling version of a renderer (for example, `react-dom/profiling`) without also replacing the `scheduler/tracing` module with `scheduler/tracing-profiling`. Your bundler might have a setting for aliasing both modules. Learn more at https://reactjs.org/link/profiling"
-  );
-var fakeCallbackNode = {},
-  requestPaint =
-    void 0 !== Scheduler_requestPaint ? Scheduler_requestPaint : function() {},
-  syncQueue = null,
-  immediateQueueCallbackNode = null,
-  isFlushingSyncQueue = !1,
-  initialTimeMs$1 = Scheduler_now$1(),
-  now =
-    1e4 > initialTimeMs$1
-      ? Scheduler_now$1
-      : function() {
-          return Scheduler_now$1() - initialTimeMs$1;
-        };
-function getCurrentPriorityLevel() {
-  switch (Scheduler_getCurrentPriorityLevel()) {
-    case Scheduler_ImmediatePriority:
-      return 99;
-    case Scheduler_UserBlockingPriority:
-      return 98;
-    case Scheduler_NormalPriority:
-      return 97;
-    case Scheduler_LowPriority:
-      return 96;
-    case Scheduler_IdlePriority:
-      return 95;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function reactPriorityToSchedulerPriority(reactPriorityLevel) {
-  switch (reactPriorityLevel) {
-    case 99:
-      return Scheduler_ImmediatePriority;
-    case 98:
-      return Scheduler_UserBlockingPriority;
-    case 97:
-      return Scheduler_NormalPriority;
-    case 96:
-      return Scheduler_LowPriority;
-    case 95:
-      return Scheduler_IdlePriority;
-    default:
-      throw Error("Unknown priority level.");
-  }
-}
-function runWithPriority(reactPriorityLevel, fn) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_runWithPriority(reactPriorityLevel, fn);
-}
-function scheduleCallback(reactPriorityLevel, callback, options) {
-  reactPriorityLevel = reactPriorityToSchedulerPriority(reactPriorityLevel);
-  return Scheduler_scheduleCallback(reactPriorityLevel, callback, options);
-}
-function flushSyncCallbackQueue() {
-  if (null !== immediateQueueCallbackNode) {
-    var node = immediateQueueCallbackNode;
-    immediateQueueCallbackNode = null;
-    Scheduler_cancelCallback(node);
-  }
-  flushSyncCallbackQueueImpl();
-}
-function flushSyncCallbackQueueImpl() {
-  if (!isFlushingSyncQueue && null !== syncQueue) {
-    isFlushingSyncQueue = !0;
-    var i = 0;
-    try {
-      var queue = syncQueue;
-      runWithPriority(99, function() {
-        for (; i < queue.length; i++) {
-          var callback = queue[i];
-          do callback = callback(!0);
-          while (null !== callback);
-        }
-      });
-      syncQueue = null;
-    } catch (error) {
-      throw (null !== syncQueue && (syncQueue = syncQueue.slice(i + 1)),
-      Scheduler_scheduleCallback(
-        Scheduler_ImmediatePriority,
-        flushSyncCallbackQueue
-      ),
-      error);
-    } finally {
-      isFlushingSyncQueue = !1;
-    }
-  }
-}
-var ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig;
-function is(x, y) {
-  return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
-}
-var objectIs = "function" === typeof Object.is ? Object.is : is,
-  hasOwnProperty = Object.prototype.hasOwnProperty;
-function shallowEqual(objA, objB) {
-  if (objectIs(objA, objB)) return !0;
+var objectIs = "function" === typeof Object.is ? Object.is : is;
+function shallowEqual(objA, objB) {
+  if (objectIs(objA, objB)) return !0;
   if (
     "object" !== typeof objA ||
     null === objA ||
@@ -2120,8 +2160,6 @@ function describeFiber(fiber) {
       return describeFunctionComponentFrame(fiber.type, null);
     case 11:
       return describeFunctionComponentFrame(fiber.type.render, null);
-    case 22:
-      return describeFunctionComponentFrame(fiber.type._render, null);
     case 1:
       return (fiber = describeFunctionComponentFrame(fiber.type, null)), fiber;
     default:
@@ -2154,14 +2192,14 @@ function resolveDefaultProps(Component, baseProps) {
 var valueCursor = createCursor(null),
   currentlyRenderingFiber = null,
   lastContextDependency = null,
-  lastContextWithAllBitsObserved = null;
+  lastFullyObservedContext = null;
 function resetContextDependencies() {
-  lastContextWithAllBitsObserved = lastContextDependency = currentlyRenderingFiber = null;
+  lastFullyObservedContext = lastContextDependency = currentlyRenderingFiber = null;
 }
-function popProvider(providerFiber) {
+function popProvider(context) {
   var currentValue = valueCursor.current;
   pop(valueCursor);
-  providerFiber.type._context._currentValue = currentValue;
+  context._currentValue = currentValue;
 }
 function scheduleWorkOnParentPath(parent, renderLanes) {
   for (; null !== parent; ) {
@@ -2181,44 +2219,40 @@ function scheduleWorkOnParentPath(parent, renderLanes) {
 }
 function prepareToReadContext(workInProgress, renderLanes) {
   currentlyRenderingFiber = workInProgress;
-  lastContextWithAllBitsObserved = lastContextDependency = null;
+  lastFullyObservedContext = lastContextDependency = null;
   workInProgress = workInProgress.dependencies;
   null !== workInProgress &&
     null !== workInProgress.firstContext &&
     (0 !== (workInProgress.lanes & renderLanes) && (didReceiveUpdate = !0),
     (workInProgress.firstContext = null));
 }
-function readContext(context, observedBits) {
-  if (
-    lastContextWithAllBitsObserved !== context &&
-    !1 !== observedBits &&
-    0 !== observedBits
-  ) {
-    if ("number" !== typeof observedBits || 1073741823 === observedBits)
-      (lastContextWithAllBitsObserved = context), (observedBits = 1073741823);
-    observedBits = { context: context, observedBits: observedBits, next: null };
-    if (null === lastContextDependency) {
+function readContext(context) {
+  var value = context._currentValue;
+  if (lastFullyObservedContext !== context)
+    if (
+      ((context = { context: context, memoizedValue: value, next: null }),
+      null === lastContextDependency)
+    ) {
       if (null === currentlyRenderingFiber)
         throw Error(
           "Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo()."
         );
-      lastContextDependency = observedBits;
+      lastContextDependency = context;
       currentlyRenderingFiber.dependencies = {
         lanes: 0,
-        firstContext: observedBits,
-        responders: null
+        firstContext: context
       };
-    } else lastContextDependency = lastContextDependency.next = observedBits;
-  }
-  return context._currentValue;
+    } else lastContextDependency = lastContextDependency.next = context;
+  return value;
 }
-var hasForceUpdate = !1;
+var interleavedQueues = null,
+  hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
     firstBaseUpdate: null,
     lastBaseUpdate: null,
-    shared: { pending: null },
+    shared: { pending: null, interleaved: null, lanes: 0 },
     effects: null
   };
 }
@@ -2244,14 +2278,34 @@ function createUpdate(eventTime, lane) {
   };
 }
 function enqueueUpdate(fiber, update) {
+  var updateQueue = fiber.updateQueue;
+  null !== updateQueue &&
+    ((updateQueue = updateQueue.shared),
+    null !== workInProgressRoot &&
+    0 !== (fiber.mode & 1) &&
+    0 === (executionContext & 8)
+      ? ((fiber = updateQueue.interleaved),
+        null === fiber
+          ? ((update.next = update),
+            null === interleavedQueues
+              ? (interleavedQueues = [updateQueue])
+              : interleavedQueues.push(updateQueue))
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.interleaved = update))
+      : ((fiber = updateQueue.pending),
+        null === fiber
+          ? (update.next = update)
+          : ((update.next = fiber.next), (fiber.next = update)),
+        (updateQueue.pending = update)));
+}
+function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
-  if (null !== fiber) {
-    fiber = fiber.shared;
-    var pending = fiber.pending;
-    null === pending
-      ? (update.next = update)
-      : ((update.next = pending.next), (pending.next = update));
-    fiber.pending = update;
+  if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) {
+    var queueLanes = fiber.lanes;
+    queueLanes &= root.pendingLanes;
+    lane |= queueLanes;
+    fiber.lanes = lane;
+    markRootEntangled(root, lane);
   }
 }
 function enqueueCapturedUpdate(workInProgress, capturedUpdate) {
@@ -2320,111 +2374,111 @@ function processUpdateQueue(
       : (lastBaseUpdate.next = firstPendingUpdate);
     lastBaseUpdate = lastPendingUpdate;
     var current = workInProgress$jscomp$0.alternate;
-    if (null !== current) {
-      current = current.updateQueue;
-      var currentLastBaseUpdate = current.lastBaseUpdate;
-      currentLastBaseUpdate !== lastBaseUpdate &&
-        (null === currentLastBaseUpdate
+    null !== current &&
+      ((current = current.updateQueue),
+      (pendingQueue = current.lastBaseUpdate),
+      pendingQueue !== lastBaseUpdate &&
+        (null === pendingQueue
           ? (current.firstBaseUpdate = firstPendingUpdate)
-          : (currentLastBaseUpdate.next = firstPendingUpdate),
-        (current.lastBaseUpdate = lastPendingUpdate));
-    }
+          : (pendingQueue.next = firstPendingUpdate),
+        (current.lastBaseUpdate = lastPendingUpdate)));
   }
   if (null !== firstBaseUpdate) {
-    currentLastBaseUpdate = queue.baseState;
+    var newState = queue.baseState;
     lastBaseUpdate = 0;
     current = firstPendingUpdate = lastPendingUpdate = null;
+    pendingQueue = firstBaseUpdate;
     do {
-      pendingQueue = firstBaseUpdate.lane;
-      var updateEventTime = firstBaseUpdate.eventTime;
-      if ((renderLanes & pendingQueue) === pendingQueue) {
+      var updateLane = pendingQueue.lane,
+        updateEventTime = pendingQueue.eventTime;
+      if ((renderLanes & updateLane) === updateLane) {
         null !== current &&
           (current = current.next = {
             eventTime: updateEventTime,
             lane: 0,
-            tag: firstBaseUpdate.tag,
-            payload: firstBaseUpdate.payload,
-            callback: firstBaseUpdate.callback,
+            tag: pendingQueue.tag,
+            payload: pendingQueue.payload,
+            callback: pendingQueue.callback,
             next: null
           });
         a: {
           var workInProgress = workInProgress$jscomp$0,
-            update = firstBaseUpdate;
-          pendingQueue = props;
+            update = pendingQueue;
+          updateLane = props;
           updateEventTime = instance;
           switch (update.tag) {
             case 1:
               workInProgress = update.payload;
               if ("function" === typeof workInProgress) {
-                currentLastBaseUpdate = workInProgress.call(
+                newState = workInProgress.call(
                   updateEventTime,
-                  currentLastBaseUpdate,
-                  pendingQueue
+                  newState,
+                  updateLane
                 );
                 break a;
               }
-              currentLastBaseUpdate = workInProgress;
+              newState = workInProgress;
               break a;
             case 3:
-              workInProgress.flags = (workInProgress.flags & -8193) | 64;
+              workInProgress.flags = (workInProgress.flags & -16385) | 128;
             case 0:
               workInProgress = update.payload;
-              pendingQueue =
+              updateLane =
                 "function" === typeof workInProgress
-                  ? workInProgress.call(
-                      updateEventTime,
-                      currentLastBaseUpdate,
-                      pendingQueue
-                    )
+                  ? workInProgress.call(updateEventTime, newState, updateLane)
                   : workInProgress;
-              if (null === pendingQueue || void 0 === pendingQueue) break a;
-              currentLastBaseUpdate = Object.assign(
-                {},
-                currentLastBaseUpdate,
-                pendingQueue
-              );
+              if (null === updateLane || void 0 === updateLane) break a;
+              newState = Object.assign({}, newState, updateLane);
               break a;
             case 2:
               hasForceUpdate = !0;
           }
         }
-        null !== firstBaseUpdate.callback &&
-          ((workInProgress$jscomp$0.flags |= 32),
-          (pendingQueue = queue.effects),
-          null === pendingQueue
-            ? (queue.effects = [firstBaseUpdate])
-            : pendingQueue.push(firstBaseUpdate));
+        null !== pendingQueue.callback &&
+          0 !== pendingQueue.lane &&
+          ((workInProgress$jscomp$0.flags |= 64),
+          (updateLane = queue.effects),
+          null === updateLane
+            ? (queue.effects = [pendingQueue])
+            : updateLane.push(pendingQueue));
       } else
         (updateEventTime = {
           eventTime: updateEventTime,
-          lane: pendingQueue,
-          tag: firstBaseUpdate.tag,
-          payload: firstBaseUpdate.payload,
-          callback: firstBaseUpdate.callback,
+          lane: updateLane,
+          tag: pendingQueue.tag,
+          payload: pendingQueue.payload,
+          callback: pendingQueue.callback,
           next: null
         }),
           null === current
             ? ((firstPendingUpdate = current = updateEventTime),
-              (lastPendingUpdate = currentLastBaseUpdate))
+              (lastPendingUpdate = newState))
             : (current = current.next = updateEventTime),
-          (lastBaseUpdate |= pendingQueue);
-      firstBaseUpdate = firstBaseUpdate.next;
-      if (null === firstBaseUpdate)
+          (lastBaseUpdate |= updateLane);
+      pendingQueue = pendingQueue.next;
+      if (null === pendingQueue)
         if (((pendingQueue = queue.shared.pending), null === pendingQueue))
           break;
         else
-          (firstBaseUpdate = pendingQueue.next),
-            (pendingQueue.next = null),
-            (queue.lastBaseUpdate = pendingQueue),
+          (updateLane = pendingQueue),
+            (pendingQueue = updateLane.next),
+            (updateLane.next = null),
+            (queue.lastBaseUpdate = updateLane),
             (queue.shared.pending = null);
     } while (1);
-    null === current && (lastPendingUpdate = currentLastBaseUpdate);
+    null === current && (lastPendingUpdate = newState);
     queue.baseState = lastPendingUpdate;
     queue.firstBaseUpdate = firstPendingUpdate;
     queue.lastBaseUpdate = current;
+    props = queue.shared.interleaved;
+    if (null !== props) {
+      queue = props;
+      do (lastBaseUpdate |= queue.lane), (queue = queue.next);
+      while (queue !== props);
+    } else null === firstBaseUpdate && (queue.shared.lanes = 0);
     workInProgressRootSkippedLanes |= lastBaseUpdate;
     workInProgress$jscomp$0.lanes = lastBaseUpdate;
-    workInProgress$jscomp$0.memoizedState = currentLastBaseUpdate;
+    workInProgress$jscomp$0.memoizedState = newState;
   }
 }
 function commitUpdateQueue(finishedWork, finishedQueue, instance) {
@@ -2480,7 +2534,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2491,7 +2546,8 @@ var classComponentUpdater = {
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== payload && entangleTransitions(payload, inst, lane);
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2501,7 +2557,8 @@ var classComponentUpdater = {
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
     enqueueUpdate(inst, update);
-    scheduleUpdateOnFiber(inst, lane, eventTime);
+    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
+    null !== callback && entangleTransitions(callback, inst, lane);
   }
 };
 function checkShouldComponentUpdate(
@@ -2573,7 +2630,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
         ? previousContext
         : contextStackCursor.current),
       (instance.context = getMaskedContext(workInProgress, contextType)));
-  processUpdateQueue(workInProgress, newProps, instance, renderLanes);
   instance.state = workInProgress.memoizedState;
   contextType = ctor.getDerivedStateFromProps;
   "function" === typeof contextType &&
@@ -2595,7 +2651,6 @@ function mountClassInstance(workInProgress, ctor, newProps, renderLanes) {
   "function" === typeof instance.componentDidMount &&
     (workInProgress.flags |= 4);
 }
-var isArray = Array.isArray;
 function coerceRef(returnFiber, current, element) {
   returnFiber = element.ref;
   if (
@@ -2648,25 +2703,22 @@ function coerceRef(returnFiber, current, element) {
   return returnFiber;
 }
 function throwOnInvalidObjectType(returnFiber, newChild) {
-  if ("textarea" !== returnFiber.type)
-    throw Error(
-      "Objects are not valid as a React child (found: " +
-        ("[object Object]" === Object.prototype.toString.call(newChild)
-          ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-          : newChild) +
-        "). If you meant to render a collection of children, use an array instead."
-    );
+  returnFiber = Object.prototype.toString.call(newChild);
+  throw Error(
+    "Objects are not valid as a React child (found: " +
+      ("[object Object]" === returnFiber
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : returnFiber) +
+      "). If you meant to render a collection of children, use an array instead."
+  );
 }
 function ChildReconciler(shouldTrackSideEffects) {
   function deleteChild(returnFiber, childToDelete) {
     if (shouldTrackSideEffects) {
-      var last = returnFiber.lastEffect;
-      null !== last
-        ? ((last.nextEffect = childToDelete),
-          (returnFiber.lastEffect = childToDelete))
-        : (returnFiber.firstEffect = returnFiber.lastEffect = childToDelete);
-      childToDelete.nextEffect = null;
-      childToDelete.flags = 8;
+      var deletions = returnFiber.deletions;
+      null === deletions
+        ? ((returnFiber.deletions = [childToDelete]), (returnFiber.flags |= 16))
+        : deletions.push(childToDelete);
     }
   }
   function deleteRemainingChildren(returnFiber, currentFirstChild) {
@@ -2698,16 +2750,16 @@ function ChildReconciler(shouldTrackSideEffects) {
       return (
         (newIndex = newIndex.index),
         newIndex < lastPlacedIndex
-          ? ((newFiber.flags = 2), lastPlacedIndex)
+          ? ((newFiber.flags |= 2), lastPlacedIndex)
           : newIndex
       );
-    newFiber.flags = 2;
+    newFiber.flags |= 2;
     return lastPlacedIndex;
   }
   function placeSingleChild(newFiber) {
     shouldTrackSideEffects &&
       null === newFiber.alternate &&
-      (newFiber.flags = 2);
+      (newFiber.flags |= 2);
     return newFiber;
   }
   function updateTextNode(returnFiber, current, textContent, lanes) {
@@ -2722,7 +2774,16 @@ function ChildReconciler(shouldTrackSideEffects) {
     return current;
   }
   function updateElement(returnFiber, current, element, lanes) {
-    if (null !== current && current.elementType === element.type)
+    var elementType = element.type;
+    if (elementType === REACT_FRAGMENT_TYPE)
+      return updateFragment(
+        returnFiber,
+        current,
+        element.props.children,
+        lanes,
+        element.key
+      );
+    if (null !== current && current.elementType === elementType)
       return (
         (lanes = useFiber(current, element.props)),
         (lanes.ref = coerceRef(returnFiber, current, element)),
@@ -2811,7 +2872,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             newChild
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (newChild = createFiberFromFragment(
             newChild,
@@ -2836,22 +2897,14 @@ function ChildReconciler(shouldTrackSideEffects) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           return newChild.key === key
-            ? newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  oldFiber,
-                  newChild.props.children,
-                  lanes,
-                  key
-                )
-              : updateElement(returnFiber, oldFiber, newChild, lanes)
+            ? updateElement(returnFiber, oldFiber, newChild, lanes)
             : null;
         case REACT_PORTAL_TYPE:
           return newChild.key === key
             ? updatePortal(returnFiber, oldFiber, newChild, lanes)
             : null;
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return null !== key
           ? null
           : updateFragment(returnFiber, oldFiber, newChild, lanes, null);
@@ -2879,15 +2932,7 @@ function ChildReconciler(shouldTrackSideEffects) {
               existingChildren.get(
                 null === newChild.key ? newIdx : newChild.key
               ) || null),
-            newChild.type === REACT_FRAGMENT_TYPE
-              ? updateFragment(
-                  returnFiber,
-                  existingChildren,
-                  newChild.props.children,
-                  lanes,
-                  newChild.key
-                )
-              : updateElement(returnFiber, existingChildren, newChild, lanes)
+            updateElement(returnFiber, existingChildren, newChild, lanes)
           );
         case REACT_PORTAL_TYPE:
           return (
@@ -2898,7 +2943,7 @@ function ChildReconciler(shouldTrackSideEffects) {
             updatePortal(returnFiber, existingChildren, newChild, lanes)
           );
       }
-      if (isArray(newChild) || getIteratorFn(newChild))
+      if (isArrayImpl(newChild) || getIteratorFn(newChild))
         return (
           (existingChildren = existingChildren.get(newIdx) || null),
           updateFragment(returnFiber, existingChildren, newChild, lanes, null)
@@ -3081,55 +3126,49 @@ function ChildReconciler(shouldTrackSideEffects) {
       newChild.type === REACT_FRAGMENT_TYPE &&
       null === newChild.key;
     isUnkeyedTopLevelFragment && (newChild = newChild.props.children);
-    var isObject = "object" === typeof newChild && null !== newChild;
-    if (isObject)
+    if ("object" === typeof newChild && null !== newChild) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE:
           a: {
-            isObject = newChild.key;
+            var key = newChild.key;
             for (
               isUnkeyedTopLevelFragment = currentFirstChild;
               null !== isUnkeyedTopLevelFragment;
 
             ) {
-              if (isUnkeyedTopLevelFragment.key === isObject) {
-                switch (isUnkeyedTopLevelFragment.tag) {
-                  case 7:
-                    if (newChild.type === REACT_FRAGMENT_TYPE) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props.children
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
-                    break;
-                  default:
-                    if (
-                      isUnkeyedTopLevelFragment.elementType === newChild.type
-                    ) {
-                      deleteRemainingChildren(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment.sibling
-                      );
-                      currentFirstChild = useFiber(
-                        isUnkeyedTopLevelFragment,
-                        newChild.props
-                      );
-                      currentFirstChild.ref = coerceRef(
-                        returnFiber,
-                        isUnkeyedTopLevelFragment,
-                        newChild
-                      );
-                      currentFirstChild.return = returnFiber;
-                      returnFiber = currentFirstChild;
-                      break a;
-                    }
+              if (isUnkeyedTopLevelFragment.key === key) {
+                key = newChild.type;
+                if (key === REACT_FRAGMENT_TYPE) {
+                  if (7 === isUnkeyedTopLevelFragment.tag) {
+                    deleteRemainingChildren(
+                      returnFiber,
+                      isUnkeyedTopLevelFragment.sibling
+                    );
+                    currentFirstChild = useFiber(
+                      isUnkeyedTopLevelFragment,
+                      newChild.props.children
+                    );
+                    currentFirstChild.return = returnFiber;
+                    returnFiber = currentFirstChild;
+                    break a;
+                  }
+                } else if (isUnkeyedTopLevelFragment.elementType === key) {
+                  deleteRemainingChildren(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment.sibling
+                  );
+                  currentFirstChild = useFiber(
+                    isUnkeyedTopLevelFragment,
+                    newChild.props
+                  );
+                  currentFirstChild.ref = coerceRef(
+                    returnFiber,
+                    isUnkeyedTopLevelFragment,
+                    newChild
+                  );
+                  currentFirstChild.return = returnFiber;
+                  returnFiber = currentFirstChild;
+                  break a;
                 }
                 deleteRemainingChildren(returnFiber, isUnkeyedTopLevelFragment);
                 break;
@@ -3205,6 +3244,22 @@ function ChildReconciler(shouldTrackSideEffects) {
           }
           return placeSingleChild(returnFiber);
       }
+      if (isArrayImpl(newChild))
+        return reconcileChildrenArray(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      if (getIteratorFn(newChild))
+        return reconcileChildrenIterator(
+          returnFiber,
+          currentFirstChild,
+          newChild,
+          lanes
+        );
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
     if ("string" === typeof newChild || "number" === typeof newChild)
       return (
         (newChild = "" + newChild),
@@ -3223,30 +3278,14 @@ function ChildReconciler(shouldTrackSideEffects) {
             (returnFiber = currentFirstChild)),
         placeSingleChild(returnFiber)
       );
-    if (isArray(newChild))
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    if (getIteratorFn(newChild))
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        lanes
-      );
-    isObject && throwOnInvalidObjectType(returnFiber, newChild);
     if ("undefined" === typeof newChild && !isUnkeyedTopLevelFragment)
       switch (returnFiber.tag) {
         case 1:
-        case 22:
         case 0:
         case 11:
         case 15:
           throw Error(
-            (getComponentName(returnFiber.type) || "Component") +
+            (getComponentNameFromFiber(returnFiber) || "Component") +
               "(...): Nothing was returned from render. This usually means a return statement is missing. Or, to render nothing, return null."
           );
       }
@@ -3308,7 +3347,7 @@ function findFirstSuspended(row) {
       if (null !== state && (null === state.dehydrated || shim() || shim()))
         return node;
     } else if (19 === node.tag && void 0 !== node.memoizedProps.revealOrder) {
-      if (0 !== (node.flags & 64)) return node;
+      if (0 !== (node.flags & 128)) return node;
     } else if (null !== node.child) {
       node.child.return = node;
       node = node.child;
@@ -3460,10 +3499,11 @@ function updateReducer(reducer) {
     queue.pending = null;
   }
   if (null !== baseQueue) {
-    baseQueue = baseQueue.next;
+    pendingQueue = baseQueue.next;
     current = current.baseState;
-    var newBaseQueueLast = (baseFirst = pendingQueue = null),
-      update = baseQueue;
+    var newBaseQueueFirst = (baseFirst = null),
+      newBaseQueueLast = null,
+      update = pendingQueue;
     do {
       var updateLane = update.lane;
       if ((renderLanes & updateLane) === updateLane)
@@ -3488,22 +3528,33 @@ function updateReducer(reducer) {
           next: null
         };
         null === newBaseQueueLast
-          ? ((baseFirst = newBaseQueueLast = clone), (pendingQueue = current))
+          ? ((newBaseQueueFirst = newBaseQueueLast = clone),
+            (baseFirst = current))
           : (newBaseQueueLast = newBaseQueueLast.next = clone);
         currentlyRenderingFiber$1.lanes |= updateLane;
         workInProgressRootSkippedLanes |= updateLane;
       }
       update = update.next;
-    } while (null !== update && update !== baseQueue);
+    } while (null !== update && update !== pendingQueue);
     null === newBaseQueueLast
-      ? (pendingQueue = current)
-      : (newBaseQueueLast.next = baseFirst);
+      ? (baseFirst = current)
+      : (newBaseQueueLast.next = newBaseQueueFirst);
     objectIs(current, hook.memoizedState) || (didReceiveUpdate = !0);
     hook.memoizedState = current;
-    hook.baseState = pendingQueue;
+    hook.baseState = baseFirst;
     hook.baseQueue = newBaseQueueLast;
     queue.lastRenderedState = current;
   }
+  reducer = queue.interleaved;
+  if (null !== reducer) {
+    baseQueue = reducer;
+    do
+      (pendingQueue = baseQueue.lane),
+        (currentlyRenderingFiber$1.lanes |= pendingQueue),
+        (workInProgressRootSkippedLanes |= pendingQueue),
+        (baseQueue = baseQueue.next);
+    while (baseQueue !== reducer);
+  } else null === baseQueue && (queue.lanes = 0);
   return [hook.memoizedState, queue.dispatch];
 }
 function rerenderReducer(reducer) {
@@ -3543,7 +3594,7 @@ function readFromUnsubcribedMutableSource(root, source, getSnapshot) {
   if (root) return getSnapshot(source._source);
   workInProgressSources.push(source);
   throw Error(
-    "Cannot read from mutable source during the current render without tearing. This is a bug in React. Please file an issue."
+    "Cannot read from mutable source during the current render without tearing. This may be a bug in React. Please file an issue."
   );
 }
 function useMutableSource(hook, source, getSnapshot, subscribe) {
@@ -3573,25 +3624,13 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
       refs.getSnapshot = getSnapshot;
       refs.setSnapshot = setSnapshot;
       var maybeNewVersion = getVersion(source._source);
-      if (!objectIs(version, maybeNewVersion)) {
-        maybeNewVersion = getSnapshot(source._source);
+      objectIs(version, maybeNewVersion) ||
+        ((maybeNewVersion = getSnapshot(source._source)),
         objectIs(snapshot, maybeNewVersion) ||
           (setSnapshot(maybeNewVersion),
           (maybeNewVersion = requestUpdateLane(fiber)),
-          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes));
-        maybeNewVersion = root.mutableReadLanes;
-        root.entangledLanes |= maybeNewVersion;
-        for (
-          var entanglements = root.entanglements, lanes = maybeNewVersion;
-          0 < lanes;
-
-        ) {
-          var index$13 = 31 - clz32(lanes),
-            lane = 1 << index$13;
-          entanglements[index$13] |= maybeNewVersion;
-          lanes &= ~lane;
-        }
-      }
+          (root.mutableReadLanes |= maybeNewVersion & root.pendingLanes)),
+        markRootEntangled(root, root.mutableReadLanes));
     },
     [getSnapshot, source, subscribe]
   );
@@ -3618,6 +3657,8 @@ function useMutableSource(hook, source, getSnapshot, subscribe) {
     objectIs(memoizedState, subscribe)) ||
     ((hook = {
       pending: null,
+      interleaved: null,
+      lanes: 0,
       dispatch: null,
       lastRenderedReducer: basicStateReducer,
       lastRenderedState: snapshot
@@ -3643,6 +3684,8 @@ function mountState(initialState) {
   hook.memoizedState = hook.baseState = initialState;
   initialState = hook.queue = {
     pending: null,
+    interleaved: null,
+    lanes: 0,
     dispatch: null,
     lastRenderedReducer: basicStateReducer,
     lastRenderedState: initialState
@@ -3691,7 +3734,7 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
     var prevEffect = currentHook.memoizedState;
     destroy = prevEffect.destroy;
     if (null !== deps && areHookInputsEqual(deps, prevEffect.deps)) {
-      pushEffect(hookFlags, create, destroy, deps);
+      hook.memoizedState = pushEffect(hookFlags, create, destroy, deps);
       return;
     }
   }
@@ -3699,10 +3742,10 @@ function updateEffectImpl(fiberFlags, hookFlags, create, deps) {
   hook.memoizedState = pushEffect(1 | hookFlags, create, destroy, deps);
 }
 function mountEffect(create, deps) {
-  return mountEffectImpl(516, 4, create, deps);
+  return mountEffectImpl(1049600, 4, create, deps);
 }
 function updateEffect(create, deps) {
-  return updateEffectImpl(516, 4, create, deps);
+  return updateEffectImpl(1024, 4, create, deps);
 }
 function updateLayoutEffect(create, deps) {
   return updateEffectImpl(4, 2, create, deps);
@@ -3763,19 +3806,18 @@ function updateMemo(nextCreate, deps) {
   return nextCreate;
 }
 function startTransition(setPending, callback) {
-  var priorityLevel = getCurrentPriorityLevel();
-  runWithPriority(98 > priorityLevel ? 98 : priorityLevel, function() {
-    setPending(!0);
-  });
-  runWithPriority(97 < priorityLevel ? 97 : priorityLevel, function() {
-    var prevTransition = ReactCurrentBatchConfig$1.transition;
-    ReactCurrentBatchConfig$1.transition = 1;
-    try {
-      setPending(!1), callback();
-    } finally {
-      ReactCurrentBatchConfig$1.transition = prevTransition;
-    }
-  });
+  var previousPriority = currentUpdatePriority;
+  currentUpdatePriority =
+    0 !== previousPriority && 4 > previousPriority ? previousPriority : 4;
+  setPending(!0);
+  var prevTransition = ReactCurrentBatchConfig$1.transition;
+  ReactCurrentBatchConfig$1.transition = 1;
+  try {
+    setPending(!1), callback();
+  } finally {
+    (currentUpdatePriority = previousPriority),
+      (ReactCurrentBatchConfig$1.transition = prevTransition);
+  }
 }
 function dispatchAction(fiber, queue, action) {
   var eventTime = requestEventTime(),
@@ -3787,33 +3829,59 @@ function dispatchAction(fiber, queue, action) {
       eagerState: null,
       next: null
     },
-    pending = queue.pending;
-  null === pending
-    ? (update.next = update)
-    : ((update.next = pending.next), (pending.next = update));
-  queue.pending = update;
-  pending = fiber.alternate;
+    alternate = fiber.alternate;
   if (
     fiber === currentlyRenderingFiber$1 ||
-    (null !== pending && pending === currentlyRenderingFiber$1)
+    (null !== alternate && alternate === currentlyRenderingFiber$1)
   )
-    didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0;
+    (didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = !0),
+      (lane = queue.pending),
+      null === lane
+        ? (update.next = update)
+        : ((update.next = lane.next), (lane.next = update)),
+      (queue.pending = update);
   else {
+    if (
+      null !== workInProgressRoot &&
+      0 !== (fiber.mode & 1) &&
+      0 === (executionContext & 8)
+    ) {
+      var interleaved = queue.interleaved;
+      null === interleaved
+        ? ((update.next = update),
+          null === interleavedQueues
+            ? (interleavedQueues = [queue])
+            : interleavedQueues.push(queue))
+        : ((update.next = interleaved.next), (interleaved.next = update));
+      queue.interleaved = update;
+    } else
+      (interleaved = queue.pending),
+        null === interleaved
+          ? (update.next = update)
+          : ((update.next = interleaved.next), (interleaved.next = update)),
+        (queue.pending = update);
     if (
       0 === fiber.lanes &&
-      (null === pending || 0 === pending.lanes) &&
-      ((pending = queue.lastRenderedReducer), null !== pending)
+      (null === alternate || 0 === alternate.lanes) &&
+      ((alternate = queue.lastRenderedReducer), null !== alternate)
     )
       try {
         var currentState = queue.lastRenderedState,
-          eagerState = pending(currentState, action);
-        update.eagerReducer = pending;
+          eagerState = alternate(currentState, action);
+        update.eagerReducer = alternate;
         update.eagerState = eagerState;
         if (objectIs(eagerState, currentState)) return;
       } catch (error) {
       } finally {
       }
-    scheduleUpdateOnFiber(fiber, lane, eventTime);
+    update = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    0 !== (lane & 4194240) &&
+      null !== update &&
+      ((fiber = queue.lanes),
+      (fiber &= update.pendingLanes),
+      (lane |= fiber),
+      (queue.lanes = lane),
+      markRootEntangled(update, lane));
   }
 }
 var ContextOnlyDispatcher = {
@@ -3870,6 +3938,8 @@ var ContextOnlyDispatcher = {
       hook.memoizedState = hook.baseState = initialArg;
       reducer = hook.queue = {
         pending: null,
+        interleaved: null,
+        lanes: 0,
         dispatch: null,
         lastRenderedReducer: reducer,
         lastRenderedState: initialArg
@@ -3911,7 +3981,7 @@ var ContextOnlyDispatcher = {
         isPending = _mountState2[0];
       _mountState2 = startTransition.bind(null, _mountState2[1]);
       mountWorkInProgressHook().memoizedState = _mountState2;
-      return [_mountState2, isPending];
+      return [isPending, _mountState2];
     },
     useMutableSource: function(source, getSnapshot, subscribe) {
       var hook = mountWorkInProgressHook();
@@ -3960,8 +4030,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = updateReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = updateReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -4002,8 +4073,9 @@ var ContextOnlyDispatcher = {
       return prevValue;
     },
     useTransition: function() {
-      var isPending = rerenderReducer(basicStateReducer)[0];
-      return [updateWorkInProgressHook().memoizedState, isPending];
+      var isPending = rerenderReducer(basicStateReducer)[0],
+        start = updateWorkInProgressHook().memoizedState;
+      return [isPending, start];
     },
     useMutableSource: updateMutableSource,
     useOpaqueIdentifier: function() {
@@ -4013,7 +4085,11 @@ var ContextOnlyDispatcher = {
   },
   now$1 = Scheduler.unstable_now,
   commitTime = 0,
-  profilerStartTime = -1;
+  layoutEffectStartTime = -1,
+  profilerStartTime = -1,
+  passiveEffectStartTime = -1,
+  currentUpdateIsNested = !1,
+  nestedUpdateScheduled = !1;
 function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
   if (0 <= profilerStartTime) {
     var elapsedTime = now$1() - profilerStartTime;
@@ -4022,10 +4098,117 @@ function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) {
     profilerStartTime = -1;
   }
 }
+function recordLayoutEffectDuration(fiber) {
+  if (0 <= layoutEffectStartTime) {
+    var elapsedTime = now$1() - layoutEffectStartTime;
+    layoutEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+        case 12:
+          fiber.stateNode.effectDuration += elapsedTime;
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function recordPassiveEffectDuration(fiber) {
+  if (0 <= passiveEffectStartTime) {
+    var elapsedTime = now$1() - passiveEffectStartTime;
+    passiveEffectStartTime = -1;
+    for (fiber = fiber.return; null !== fiber; ) {
+      switch (fiber.tag) {
+        case 3:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+        case 12:
+          fiber = fiber.stateNode;
+          null !== fiber && (fiber.passiveEffectDuration += elapsedTime);
+          return;
+      }
+      fiber = fiber.return;
+    }
+  }
+}
+function startLayoutEffectTimer() {
+  layoutEffectStartTime = now$1();
+}
 function transferActualDuration(fiber) {
   for (var child = fiber.child; child; )
     (fiber.actualDuration += child.actualDuration), (child = child.sibling);
 }
+function createCapturedValue(value, source) {
+  return {
+    value: value,
+    source: source,
+    stack: getStackByFiberInDevAndProd(source)
+  };
+}
+if (
+  "function" !==
+  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
+)
+  throw Error(
+    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
+  );
+function logCapturedError(boundary, errorInfo) {
+  try {
+    !1 !==
+      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
+        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
+        error: errorInfo.value,
+        errorBoundary:
+          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
+      }) && console.error(errorInfo.value);
+  } catch (e) {
+    setTimeout(function() {
+      throw e;
+    });
+  }
+}
+var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
+function createRootErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  lane.payload = { element: null };
+  var error = errorInfo.value;
+  lane.callback = function() {
+    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
+    logCapturedError(fiber, errorInfo);
+  };
+  return lane;
+}
+function createClassErrorUpdate(fiber, errorInfo, lane) {
+  lane = createUpdate(-1, lane);
+  lane.tag = 3;
+  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
+  if ("function" === typeof getDerivedStateFromError) {
+    var error = errorInfo.value;
+    lane.payload = function() {
+      logCapturedError(fiber, errorInfo);
+      return getDerivedStateFromError(error);
+    };
+  }
+  var inst = fiber.stateNode;
+  null !== inst &&
+    "function" === typeof inst.componentDidCatch &&
+    (lane.callback = function() {
+      "function" !== typeof getDerivedStateFromError &&
+        (null === legacyErrorBoundariesThatAlreadyFailed
+          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
+          : legacyErrorBoundariesThatAlreadyFailed.add(this),
+        logCapturedError(fiber, errorInfo));
+      var stack = errorInfo.stack;
+      this.componentDidCatch(errorInfo.value, {
+        componentStack: null !== stack ? stack : ""
+      });
+    });
+  return lane;
+}
 var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner,
   didReceiveUpdate = !1;
 function reconcileChildren(current, workInProgress, nextChildren, renderLanes) {
@@ -4060,7 +4243,7 @@ function updateForwardRef(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4136,14 +4319,15 @@ function updateSimpleMemoComponent(
     null !== current &&
     shallowEqual(current.memoizedProps, nextProps) &&
     current.ref === workInProgress.ref
-  )
-    if (((didReceiveUpdate = !1), 0 !== (renderLanes & updateLanes)))
-      0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
-    else
+  ) {
+    didReceiveUpdate = !1;
+    if (0 === (renderLanes & updateLanes))
       return (
         (workInProgress.lanes = current.lanes),
         bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
       );
+    0 !== (current.flags & 32768) && (didReceiveUpdate = !0);
+  }
   return updateFunctionComponent(
     current,
     workInProgress,
@@ -4160,31 +4344,39 @@ function updateOffscreenComponent(current, workInProgress, renderLanes) {
     "hidden" === nextProps.mode ||
     "unstable-defer-without-hiding" === nextProps.mode
   )
-    if (0 === (workInProgress.mode & 4))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(workInProgress, renderLanes);
-    else if (0 !== (renderLanes & 1073741824))
-      (workInProgress.memoizedState = { baseLanes: 0 }),
-        pushRenderLanes(
-          workInProgress,
-          null !== prevState ? prevState.baseLanes : renderLanes
+    if (0 === (workInProgress.mode & 1))
+      (workInProgress.memoizedState = { baseLanes: 0, cachePool: null }),
+        push(subtreeRenderLanesCursor, subtreeRenderLanes),
+        (subtreeRenderLanes |= renderLanes);
+    else {
+      if (0 === (renderLanes & 1073741824))
+        return (
+          (current =
+            null !== prevState
+              ? prevState.baseLanes | renderLanes
+              : renderLanes),
+          (workInProgress.lanes = workInProgress.childLanes = 1073741824),
+          (workInProgress.memoizedState = {
+            baseLanes: current,
+            cachePool: null
+          }),
+          (workInProgress.updateQueue = null),
+          push(subtreeRenderLanesCursor, subtreeRenderLanes),
+          (subtreeRenderLanes |= current),
+          null
         );
-    else
-      return (
-        (current =
-          null !== prevState ? prevState.baseLanes | renderLanes : renderLanes),
-        markSpawnedWork(1073741824),
-        (workInProgress.lanes = workInProgress.childLanes = 1073741824),
-        (workInProgress.memoizedState = { baseLanes: current }),
-        pushRenderLanes(workInProgress, current),
-        null
-      );
+      workInProgress.memoizedState = { baseLanes: 0, cachePool: null };
+      nextProps = null !== prevState ? prevState.baseLanes : renderLanes;
+      push(subtreeRenderLanesCursor, subtreeRenderLanes);
+      subtreeRenderLanes |= nextProps;
+    }
   else
     null !== prevState
       ? ((nextProps = prevState.baseLanes | renderLanes),
         (workInProgress.memoizedState = null))
       : (nextProps = renderLanes),
-      pushRenderLanes(workInProgress, nextProps);
+      push(subtreeRenderLanesCursor, subtreeRenderLanes),
+      (subtreeRenderLanes |= nextProps);
   reconcileChildren(current, workInProgress, nextChildren, renderLanes);
   return workInProgress.child;
 }
@@ -4194,7 +4386,7 @@ function markRef(current, workInProgress) {
     (null === current && null !== ref) ||
     (null !== current && current.ref !== ref)
   )
-    workInProgress.flags |= 128;
+    workInProgress.flags |= 256;
 }
 function updateFunctionComponent(
   current,
@@ -4219,7 +4411,7 @@ function updateFunctionComponent(
   if (null !== current && !didReceiveUpdate)
     return (
       (workInProgress.updateQueue = current.updateQueue),
-      (workInProgress.flags &= -517),
+      (workInProgress.flags &= -1029),
       (current.lanes &= ~renderLanes),
       bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes)
     );
@@ -4379,7 +4571,8 @@ function updateClassComponent(
             oldState,
             newState,
             oldContext
-          ))
+          ) ||
+          !1)
           ? (getDerivedStateFromProps ||
               ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
                 "function" !== typeof instance.componentWillUpdate) ||
@@ -4394,7 +4587,7 @@ function updateClassComponent(
             "function" === typeof instance.componentDidUpdate &&
               (workInProgress.flags |= 4),
             "function" === typeof instance.getSnapshotBeforeUpdate &&
-              (workInProgress.flags |= 256))
+              (workInProgress.flags |= 512))
           : ("function" !== typeof instance.componentDidUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
@@ -4402,7 +4595,7 @@ function updateClassComponent(
             "function" !== typeof instance.getSnapshotBeforeUpdate ||
               (oldProps === current.memoizedProps &&
                 oldState === current.memoizedState) ||
-              (workInProgress.flags |= 256),
+              (workInProgress.flags |= 512),
             (workInProgress.memoizedProps = nextProps),
             (workInProgress.memoizedState = newState)),
         (instance.props = nextProps),
@@ -4416,7 +4609,7 @@ function updateClassComponent(
         "function" !== typeof instance.getSnapshotBeforeUpdate ||
           (oldProps === current.memoizedProps &&
             oldState === current.memoizedState) ||
-          (workInProgress.flags |= 256),
+          (workInProgress.flags |= 512),
         (nextProps = !1));
   }
   return finishClassComponent(
@@ -4437,7 +4630,7 @@ function finishClassComponent(
   renderLanes
 ) {
   markRef(current, workInProgress);
-  var didCaptureError = 0 !== (workInProgress.flags & 64);
+  var didCaptureError = 0 !== (workInProgress.flags & 128);
   if (!shouldUpdate && !didCaptureError)
     return (
       hasContext && invalidateContextProvider(workInProgress, Component, !1),
@@ -4485,18 +4678,21 @@ function pushHostRootContext(workInProgress) {
   pushHostContainer(workInProgress, root.containerInfo);
 }
 var SUSPENDED_MARKER = { dehydrated: null, retryLane: 0 };
+function mountSuspenseOffscreenState(renderLanes) {
+  return { baseLanes: renderLanes, cachePool: null };
+}
 function updateSuspenseComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
     suspenseContext = suspenseStackCursor.current,
     showFallback = !1,
     JSCompiler_temp;
-  (JSCompiler_temp = 0 !== (workInProgress.flags & 64)) ||
+  (JSCompiler_temp = 0 !== (workInProgress.flags & 128)) ||
     (JSCompiler_temp =
       null !== current && null === current.memoizedState
         ? !1
         : 0 !== (suspenseContext & 2));
   JSCompiler_temp
-    ? ((showFallback = !0), (workInProgress.flags &= -65))
+    ? ((showFallback = !0), (workInProgress.flags &= -129))
     : (null !== current && null === current.memoizedState) ||
       void 0 === nextProps.fallback ||
       !0 === nextProps.unstable_avoidThisFallback ||
@@ -4513,7 +4709,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         current
       );
@@ -4525,10 +4723,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
           suspenseContext,
           renderLanes
         )),
-        (workInProgress.child.memoizedState = { baseLanes: renderLanes }),
+        (workInProgress.child.memoizedState = mountSuspenseOffscreenState(
+          renderLanes
+        )),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
-        (workInProgress.lanes = 33554432),
-        markSpawnedWork(33554432),
+        (workInProgress.lanes = 4194304),
         current
       );
     renderLanes = createFiberFromOffscreen(
@@ -4554,8 +4753,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
         (suspenseContext = current.child.memoizedState),
         (showFallback.memoizedState =
           null === suspenseContext
-            ? { baseLanes: renderLanes }
-            : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+            ? mountSuspenseOffscreenState(renderLanes)
+            : {
+                baseLanes: suspenseContext.baseLanes | renderLanes,
+                cachePool: null
+              }),
         (showFallback.childLanes = current.childLanes & ~renderLanes),
         (workInProgress.memoizedState = SUSPENDED_MARKER),
         nextProps
@@ -4582,8 +4784,11 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
       (suspenseContext = current.child.memoizedState),
       (showFallback.memoizedState =
         null === suspenseContext
-          ? { baseLanes: renderLanes }
-          : { baseLanes: suspenseContext.baseLanes | renderLanes }),
+          ? mountSuspenseOffscreenState(renderLanes)
+          : {
+              baseLanes: suspenseContext.baseLanes | renderLanes,
+              cachePool: null
+            }),
       (showFallback.childLanes = current.childLanes & ~renderLanes),
       (workInProgress.memoizedState = SUSPENDED_MARKER),
       nextProps
@@ -4606,10 +4811,10 @@ function mountSuspenseFallbackChildren(
   var mode = workInProgress.mode,
     progressedPrimaryFragment = workInProgress.child;
   primaryChildren = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && null !== progressedPrimaryFragment
+  0 === (mode & 1) && null !== progressedPrimaryFragment
     ? ((progressedPrimaryFragment.childLanes = 0),
       (progressedPrimaryFragment.pendingProps = primaryChildren),
-      workInProgress.mode & 8 &&
+      workInProgress.mode & 2 &&
         ((progressedPrimaryFragment.actualDuration = 0),
         (progressedPrimaryFragment.actualStartTime = -1),
         (progressedPrimaryFragment.selfBaseDuration = 0),
@@ -4644,13 +4849,14 @@ function updateSuspensePrimaryChildren(
     mode: "visible",
     children: primaryChildren
   });
-  0 === (workInProgress.mode & 2) && (primaryChildren.lanes = renderLanes);
+  0 === (workInProgress.mode & 1) && (primaryChildren.lanes = renderLanes);
   primaryChildren.return = workInProgress;
   primaryChildren.sibling = null;
   null !== current &&
-    ((current.nextEffect = null),
-    (current.flags = 8),
-    (workInProgress.firstEffect = workInProgress.lastEffect = current));
+    ((renderLanes = workInProgress.deletions),
+    null === renderLanes
+      ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16))
+      : renderLanes.push(current));
   return (workInProgress.child = primaryChildren);
 }
 function updateSuspenseFallbackChildren(
@@ -4660,33 +4866,27 @@ function updateSuspenseFallbackChildren(
   fallbackChildren,
   renderLanes
 ) {
-  var mode = workInProgress.mode,
-    currentPrimaryChildFragment = current.child;
-  current = currentPrimaryChildFragment.sibling;
-  var primaryChildProps = { mode: "hidden", children: primaryChildren };
-  0 === (mode & 2) && workInProgress.child !== currentPrimaryChildFragment
+  var mode = workInProgress.mode;
+  current = current.child;
+  var currentFallbackChildFragment = current.sibling,
+    primaryChildProps = { mode: "hidden", children: primaryChildren };
+  0 === (mode & 1) && workInProgress.child !== current
     ? ((primaryChildren = workInProgress.child),
       (primaryChildren.childLanes = 0),
       (primaryChildren.pendingProps = primaryChildProps),
-      workInProgress.mode & 8 &&
+      workInProgress.mode & 2 &&
         ((primaryChildren.actualDuration = 0),
         (primaryChildren.actualStartTime = -1),
-        (primaryChildren.selfBaseDuration =
-          currentPrimaryChildFragment.selfBaseDuration),
-        (primaryChildren.treeBaseDuration =
-          currentPrimaryChildFragment.treeBaseDuration)),
-      (currentPrimaryChildFragment = primaryChildren.lastEffect),
-      null !== currentPrimaryChildFragment
-        ? ((workInProgress.firstEffect = primaryChildren.firstEffect),
-          (workInProgress.lastEffect = currentPrimaryChildFragment),
-          (currentPrimaryChildFragment.nextEffect = null))
-        : (workInProgress.firstEffect = workInProgress.lastEffect = null))
-    : (primaryChildren = createWorkInProgress(
-        currentPrimaryChildFragment,
-        primaryChildProps
-      ));
-  null !== current
-    ? (fallbackChildren = createWorkInProgress(current, fallbackChildren))
+        (primaryChildren.selfBaseDuration = current.selfBaseDuration),
+        (primaryChildren.treeBaseDuration = current.treeBaseDuration)),
+      (workInProgress.deletions = null))
+    : ((primaryChildren = createWorkInProgress(current, primaryChildProps)),
+      (primaryChildren.subtreeFlags = current.subtreeFlags & 1835008));
+  null !== currentFallbackChildFragment
+    ? (fallbackChildren = createWorkInProgress(
+        currentFallbackChildFragment,
+        fallbackChildren
+      ))
     : ((fallbackChildren = createFiberFromFragment(
         fallbackChildren,
         mode,
@@ -4711,8 +4911,7 @@ function initSuspenseListRenderState(
   isBackwards,
   tail,
   lastContentRow,
-  tailMode,
-  lastEffectBeforeRendering
+  tailMode
 ) {
   var renderState = workInProgress.memoizedState;
   null === renderState
@@ -4722,16 +4921,14 @@ function initSuspenseListRenderState(
         renderingStartTime: 0,
         last: lastContentRow,
         tail: tail,
-        tailMode: tailMode,
-        lastEffect: lastEffectBeforeRendering
+        tailMode: tailMode
       })
     : ((renderState.isBackwards = isBackwards),
       (renderState.rendering = null),
       (renderState.renderingStartTime = 0),
       (renderState.last = lastContentRow),
       (renderState.tail = tail),
-      (renderState.tailMode = tailMode),
-      (renderState.lastEffect = lastEffectBeforeRendering));
+      (renderState.tailMode = tailMode));
 }
 function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   var nextProps = workInProgress.pendingProps,
@@ -4740,9 +4937,9 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
   reconcileChildren(current, workInProgress, nextProps.children, renderLanes);
   nextProps = suspenseStackCursor.current;
   if (0 !== (nextProps & 2))
-    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 64);
+    (nextProps = (nextProps & 1) | 2), (workInProgress.flags |= 128);
   else {
-    if (null !== current && 0 !== (current.flags & 64))
+    if (null !== current && 0 !== (current.flags & 128))
       a: for (current = workInProgress.child; null !== current; ) {
         if (13 === current.tag)
           null !== current.memoizedState &&
@@ -4765,7 +4962,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
     nextProps &= 1;
   }
   push(suspenseStackCursor, nextProps);
-  if (0 === (workInProgress.mode & 2)) workInProgress.memoizedState = null;
+  if (0 === (workInProgress.mode & 1)) workInProgress.memoizedState = null;
   else
     switch (revealOrder) {
       case "forwards":
@@ -4786,8 +4983,7 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !1,
           revealOrder,
           renderLanes,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "backwards":
@@ -4809,19 +5005,11 @@ function updateSuspenseListComponent(current, workInProgress, renderLanes) {
           !0,
           renderLanes,
           null,
-          tailMode,
-          workInProgress.lastEffect
+          tailMode
         );
         break;
       case "together":
-        initSuspenseListRenderState(
-          workInProgress,
-          !1,
-          null,
-          null,
-          void 0,
-          workInProgress.lastEffect
-        );
+        initSuspenseListRenderState(workInProgress, !1, null, null, void 0);
         break;
       default:
         workInProgress.memoizedState = null;
@@ -4832,25 +5020,23 @@ function bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes) {
   null !== current && (workInProgress.dependencies = current.dependencies);
   profilerStartTime = -1;
   workInProgressRootSkippedLanes |= workInProgress.lanes;
-  if (0 !== (renderLanes & workInProgress.childLanes)) {
-    if (null !== current && workInProgress.child !== current.child)
-      throw Error("Resuming work not yet implemented.");
-    if (null !== workInProgress.child) {
-      current = workInProgress.child;
-      renderLanes = createWorkInProgress(current, current.pendingProps);
-      workInProgress.child = renderLanes;
-      for (renderLanes.return = workInProgress; null !== current.sibling; )
-        (current = current.sibling),
-          (renderLanes = renderLanes.sibling = createWorkInProgress(
-            current,
-            current.pendingProps
-          )),
-          (renderLanes.return = workInProgress);
-      renderLanes.sibling = null;
-    }
-    return workInProgress.child;
+  if (0 === (renderLanes & workInProgress.childLanes)) return null;
+  if (null !== current && workInProgress.child !== current.child)
+    throw Error("Resuming work not yet implemented.");
+  if (null !== workInProgress.child) {
+    current = workInProgress.child;
+    renderLanes = createWorkInProgress(current, current.pendingProps);
+    workInProgress.child = renderLanes;
+    for (renderLanes.return = workInProgress; null !== current.sibling; )
+      (current = current.sibling),
+        (renderLanes = renderLanes.sibling = createWorkInProgress(
+          current,
+          current.pendingProps
+        )),
+        (renderLanes.return = workInProgress);
+    renderLanes.sibling = null;
   }
-  return null;
+  return workInProgress.child;
 }
 var appendAllChildren,
   updateHostContainer,
@@ -4897,16 +5083,76 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$65 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$65 = lastTailNode),
+      for (var lastTailNode$72 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$72 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$65
+      null === lastTailNode$72
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$65.sibling = null);
+        : (lastTailNode$72.sibling = null);
   }
 }
+function bubbleProperties(completedWork) {
+  var didBailout =
+      null !== completedWork.alternate &&
+      completedWork.alternate.child === completedWork.child,
+    newChildLanes = 0,
+    subtreeFlags = 0;
+  if (didBailout)
+    if (0 !== (completedWork.mode & 2)) {
+      for (
+        var treeBaseDuration$74 = completedWork.selfBaseDuration,
+          child$75 = completedWork.child;
+        null !== child$75;
+
+      )
+        (newChildLanes |= child$75.lanes | child$75.childLanes),
+          (subtreeFlags |= child$75.subtreeFlags & 1835008),
+          (subtreeFlags |= child$75.flags & 1835008),
+          (treeBaseDuration$74 += child$75.treeBaseDuration),
+          (child$75 = child$75.sibling);
+      completedWork.treeBaseDuration = treeBaseDuration$74;
+    } else
+      for (
+        treeBaseDuration$74 = completedWork.child;
+        null !== treeBaseDuration$74;
+
+      )
+        (newChildLanes |=
+          treeBaseDuration$74.lanes | treeBaseDuration$74.childLanes),
+          (subtreeFlags |= treeBaseDuration$74.subtreeFlags & 1835008),
+          (subtreeFlags |= treeBaseDuration$74.flags & 1835008),
+          (treeBaseDuration$74.return = completedWork),
+          (treeBaseDuration$74 = treeBaseDuration$74.sibling);
+  else if (0 !== (completedWork.mode & 2)) {
+    treeBaseDuration$74 = completedWork.actualDuration;
+    child$75 = completedWork.selfBaseDuration;
+    for (var child = completedWork.child; null !== child; )
+      (newChildLanes |= child.lanes | child.childLanes),
+        (subtreeFlags |= child.subtreeFlags),
+        (subtreeFlags |= child.flags),
+        (treeBaseDuration$74 += child.actualDuration),
+        (child$75 += child.treeBaseDuration),
+        (child = child.sibling);
+    completedWork.actualDuration = treeBaseDuration$74;
+    completedWork.treeBaseDuration = child$75;
+  } else
+    for (
+      treeBaseDuration$74 = completedWork.child;
+      null !== treeBaseDuration$74;
+
+    )
+      (newChildLanes |=
+        treeBaseDuration$74.lanes | treeBaseDuration$74.childLanes),
+        (subtreeFlags |= treeBaseDuration$74.subtreeFlags),
+        (subtreeFlags |= treeBaseDuration$74.flags),
+        (treeBaseDuration$74.return = completedWork),
+        (treeBaseDuration$74 = treeBaseDuration$74.sibling);
+  completedWork.subtreeFlags |= subtreeFlags;
+  completedWork.childLanes = newChildLanes;
+  return didBailout;
+}
 function completeWork(current, workInProgress, renderLanes) {
   var newProps = workInProgress.pendingProps;
   switch (workInProgress.tag) {
@@ -4920,76 +5166,80 @@ function completeWork(current, workInProgress, renderLanes) {
     case 12:
     case 9:
     case 14:
-      return null;
+      return bubbleProperties(workInProgress), null;
     case 1:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 3:
       return (
+        (newProps = workInProgress.stateNode),
         popHostContainer(),
         pop(didPerformWorkStackCursor),
         pop(contextStackCursor),
         resetWorkInProgressVersions(),
-        (newProps = workInProgress.stateNode),
         newProps.pendingContext &&
           ((newProps.context = newProps.pendingContext),
           (newProps.pendingContext = null)),
         (null !== current && null !== current.child) ||
           newProps.hydrate ||
-          (workInProgress.flags |= 256),
-        updateHostContainer(workInProgress),
+          (workInProgress.flags |= 512),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
         null
       );
     case 5:
       popHostContext(workInProgress);
-      var rootContainerInstance = requiredContext(
-        rootInstanceStackCursor.current
-      );
-      renderLanes = workInProgress.type;
+      renderLanes = requiredContext(rootInstanceStackCursor.current);
+      var type = workInProgress.type;
       if (null !== current && null != workInProgress.stateNode)
         updateHostComponent$1(
           current,
           workInProgress,
-          renderLanes,
+          type,
           newProps,
-          rootContainerInstance
+          renderLanes
         ),
-          current.ref !== workInProgress.ref && (workInProgress.flags |= 128);
+          current.ref !== workInProgress.ref && (workInProgress.flags |= 256);
       else {
         if (!newProps) {
           if (null === workInProgress.stateNode)
             throw Error(
               "We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue."
             );
+          bubbleProperties(workInProgress);
           return null;
         }
         requiredContext(contextStackCursor$1.current);
         current = allocateTag();
-        renderLanes = getViewConfigForType(renderLanes);
+        type = getViewConfigForType(type);
         var updatePayload = diffProperties(
           null,
           emptyObject,
           newProps,
-          renderLanes.validAttributes
+          type.validAttributes
         );
         ReactNativePrivateInterface.UIManager.createView(
           current,
-          renderLanes.uiViewClassName,
-          rootContainerInstance,
+          type.uiViewClassName,
+          renderLanes,
           updatePayload
         );
-        rootContainerInstance = new ReactNativeFiberHostComponent(
+        renderLanes = new ReactNativeFiberHostComponent(
           current,
-          renderLanes,
+          type,
           workInProgress
         );
         instanceCache.set(current, workInProgress);
         instanceProps.set(current, newProps);
-        appendAllChildren(rootContainerInstance, workInProgress, !1, !1);
-        workInProgress.stateNode = rootContainerInstance;
-        finalizeInitialChildren(rootContainerInstance) &&
-          (workInProgress.flags |= 4);
-        null !== workInProgress.ref && (workInProgress.flags |= 128);
+        appendAllChildren(renderLanes, workInProgress, !1, !1);
+        workInProgress.stateNode = renderLanes;
+        finalizeInitialChildren(renderLanes) && (workInProgress.flags |= 4);
+        null !== workInProgress.ref && (workInProgress.flags |= 256);
       }
+      bubbleProperties(workInProgress);
       return null;
     case 6:
       if (current && null != workInProgress.stateNode)
@@ -5009,32 +5259,32 @@ function completeWork(current, workInProgress, renderLanes) {
           throw Error(
             "Text strings must be rendered within a <Text> component."
           );
-        rootContainerInstance = allocateTag();
+        renderLanes = allocateTag();
         ReactNativePrivateInterface.UIManager.createView(
-          rootContainerInstance,
+          renderLanes,
           "RCTRawText",
           current,
           { text: newProps }
         );
-        instanceCache.set(rootContainerInstance, workInProgress);
-        workInProgress.stateNode = rootContainerInstance;
+        instanceCache.set(renderLanes, workInProgress);
+        workInProgress.stateNode = renderLanes;
       }
+      bubbleProperties(workInProgress);
       return null;
     case 13:
       pop(suspenseStackCursor);
       newProps = workInProgress.memoizedState;
-      if (0 !== (workInProgress.flags & 64))
+      if (0 !== (workInProgress.flags & 128))
         return (
           (workInProgress.lanes = renderLanes),
-          0 !== (workInProgress.mode & 8) &&
+          0 !== (workInProgress.mode & 2) &&
             transferActualDuration(workInProgress),
           workInProgress
         );
       newProps = null !== newProps;
-      rootContainerInstance = !1;
-      null !== current &&
-        (rootContainerInstance = null !== current.memoizedState);
-      if (newProps && !rootContainerInstance && 0 !== (workInProgress.mode & 2))
+      renderLanes = !1;
+      null !== current && (renderLanes = null !== current.memoizedState);
+      if (newProps && !renderLanes && 0 !== (workInProgress.mode & 1))
         if (
           (null === current &&
             !0 !== workInProgress.memoizedProps.unstable_avoidThisFallback) ||
@@ -5049,89 +5299,100 @@ function completeWork(current, workInProgress, renderLanes) {
           )
             workInProgressRootExitStatus = 4;
           null === workInProgressRoot ||
-            (0 === (workInProgressRootSkippedLanes & 134217727) &&
-              0 === (workInProgressRootUpdatedLanes & 134217727)) ||
+            (0 === (workInProgressRootSkippedLanes & 268435455) &&
+              0 === (workInProgressRootUpdatedLanes & 268435455)) ||
             markRootSuspended$1(
               workInProgressRoot,
               workInProgressRootRenderLanes
             );
         }
-      if (newProps || rootContainerInstance) workInProgress.flags |= 4;
+      if (newProps || renderLanes) workInProgress.flags |= 4;
+      bubbleProperties(workInProgress);
+      0 !== (workInProgress.mode & 2) &&
+        newProps &&
+        ((current = workInProgress.child),
+        null !== current &&
+          (workInProgress.treeBaseDuration -= current.treeBaseDuration));
       return null;
     case 4:
-      return popHostContainer(), updateHostContainer(workInProgress), null;
+      return (
+        popHostContainer(),
+        updateHostContainer(current, workInProgress),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 10:
-      return popProvider(workInProgress), null;
+      return (
+        popProvider(workInProgress.type._context),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 17:
-      return isContextProvider(workInProgress.type) && popContext(), null;
+      return (
+        isContextProvider(workInProgress.type) && popContext(),
+        bubbleProperties(workInProgress),
+        null
+      );
     case 19:
       pop(suspenseStackCursor);
-      newProps = workInProgress.memoizedState;
-      if (null === newProps) return null;
-      rootContainerInstance = 0 !== (workInProgress.flags & 64);
-      updatePayload = newProps.rendering;
+      type = workInProgress.memoizedState;
+      if (null === type) return bubbleProperties(workInProgress), null;
+      newProps = 0 !== (workInProgress.flags & 128);
+      updatePayload = type.rendering;
       if (null === updatePayload)
-        if (rootContainerInstance) cutOffTailIfNeeded(newProps, !1);
+        if (newProps) cutOffTailIfNeeded(type, !1);
         else {
           if (
             0 !== workInProgressRootExitStatus ||
-            (null !== current && 0 !== (current.flags & 64))
+            (null !== current && 0 !== (current.flags & 128))
           )
             for (current = workInProgress.child; null !== current; ) {
               updatePayload = findFirstSuspended(current);
               if (null !== updatePayload) {
-                workInProgress.flags |= 64;
-                cutOffTailIfNeeded(newProps, !1);
+                workInProgress.flags |= 128;
+                cutOffTailIfNeeded(type, !1);
                 current = updatePayload.updateQueue;
                 null !== current &&
                   ((workInProgress.updateQueue = current),
                   (workInProgress.flags |= 4));
-                null === newProps.lastEffect &&
-                  (workInProgress.firstEffect = null);
-                workInProgress.lastEffect = newProps.lastEffect;
+                workInProgress.subtreeFlags = 0;
                 current = renderLanes;
                 for (newProps = workInProgress.child; null !== newProps; )
-                  (rootContainerInstance = newProps),
+                  (renderLanes = newProps),
                     (updatePayload = current),
-                    (rootContainerInstance.flags &= 2),
-                    (rootContainerInstance.nextEffect = null),
-                    (rootContainerInstance.firstEffect = null),
-                    (rootContainerInstance.lastEffect = null),
-                    (renderLanes = rootContainerInstance.alternate),
-                    null === renderLanes
-                      ? ((rootContainerInstance.childLanes = 0),
-                        (rootContainerInstance.lanes = updatePayload),
-                        (rootContainerInstance.child = null),
-                        (rootContainerInstance.memoizedProps = null),
-                        (rootContainerInstance.memoizedState = null),
-                        (rootContainerInstance.updateQueue = null),
-                        (rootContainerInstance.dependencies = null),
-                        (rootContainerInstance.stateNode = null),
-                        (rootContainerInstance.selfBaseDuration = 0),
-                        (rootContainerInstance.treeBaseDuration = 0))
-                      : ((rootContainerInstance.childLanes =
-                          renderLanes.childLanes),
-                        (rootContainerInstance.lanes = renderLanes.lanes),
-                        (rootContainerInstance.child = renderLanes.child),
-                        (rootContainerInstance.memoizedProps =
-                          renderLanes.memoizedProps),
-                        (rootContainerInstance.memoizedState =
-                          renderLanes.memoizedState),
-                        (rootContainerInstance.updateQueue =
-                          renderLanes.updateQueue),
-                        (rootContainerInstance.type = renderLanes.type),
-                        (updatePayload = renderLanes.dependencies),
-                        (rootContainerInstance.dependencies =
+                    (renderLanes.flags &= 1835010),
+                    (type = renderLanes.alternate),
+                    null === type
+                      ? ((renderLanes.childLanes = 0),
+                        (renderLanes.lanes = updatePayload),
+                        (renderLanes.child = null),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.memoizedProps = null),
+                        (renderLanes.memoizedState = null),
+                        (renderLanes.updateQueue = null),
+                        (renderLanes.dependencies = null),
+                        (renderLanes.stateNode = null),
+                        (renderLanes.selfBaseDuration = 0),
+                        (renderLanes.treeBaseDuration = 0))
+                      : ((renderLanes.childLanes = type.childLanes),
+                        (renderLanes.lanes = type.lanes),
+                        (renderLanes.child = type.child),
+                        (renderLanes.subtreeFlags = 0),
+                        (renderLanes.deletions = null),
+                        (renderLanes.memoizedProps = type.memoizedProps),
+                        (renderLanes.memoizedState = type.memoizedState),
+                        (renderLanes.updateQueue = type.updateQueue),
+                        (renderLanes.type = type.type),
+                        (updatePayload = type.dependencies),
+                        (renderLanes.dependencies =
                           null === updatePayload
                             ? null
                             : {
                                 lanes: updatePayload.lanes,
                                 firstContext: updatePayload.firstContext
                               }),
-                        (rootContainerInstance.selfBaseDuration =
-                          renderLanes.selfBaseDuration),
-                        (rootContainerInstance.treeBaseDuration =
-                          renderLanes.treeBaseDuration)),
+                        (renderLanes.selfBaseDuration = type.selfBaseDuration),
+                        (renderLanes.treeBaseDuration = type.treeBaseDuration)),
                     (newProps = newProps.sibling);
                 push(
                   suspenseStackCursor,
@@ -5141,80 +5402,74 @@ function completeWork(current, workInProgress, renderLanes) {
               }
               current = current.sibling;
             }
-          null !== newProps.tail &&
+          null !== type.tail &&
             now() > workInProgressRootRenderTargetTime &&
-            ((workInProgress.flags |= 64),
-            (rootContainerInstance = !0),
-            cutOffTailIfNeeded(newProps, !1),
-            (workInProgress.lanes = 33554432),
-            markSpawnedWork(33554432));
+            ((workInProgress.flags |= 128),
+            (newProps = !0),
+            cutOffTailIfNeeded(type, !1),
+            (workInProgress.lanes = 4194304));
         }
       else {
-        if (!rootContainerInstance)
+        if (!newProps)
           if (
             ((current = findFirstSuspended(updatePayload)), null !== current)
           ) {
             if (
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
               (current = current.updateQueue),
               null !== current &&
                 ((workInProgress.updateQueue = current),
                 (workInProgress.flags |= 4)),
-              cutOffTailIfNeeded(newProps, !0),
-              null === newProps.tail &&
-                "hidden" === newProps.tailMode &&
+              cutOffTailIfNeeded(type, !0),
+              null === type.tail &&
+                "hidden" === type.tailMode &&
                 !updatePayload.alternate)
             )
-              return (
-                (workInProgress = workInProgress.lastEffect =
-                  newProps.lastEffect),
-                null !== workInProgress && (workInProgress.nextEffect = null),
-                null
-              );
+              return bubbleProperties(workInProgress), null;
           } else
-            2 * now() - newProps.renderingStartTime >
+            2 * now() - type.renderingStartTime >
               workInProgressRootRenderTargetTime &&
               1073741824 !== renderLanes &&
-              ((workInProgress.flags |= 64),
-              (rootContainerInstance = !0),
-              cutOffTailIfNeeded(newProps, !1),
-              (workInProgress.lanes = 33554432),
-              markSpawnedWork(33554432));
-        newProps.isBackwards
+              ((workInProgress.flags |= 128),
+              (newProps = !0),
+              cutOffTailIfNeeded(type, !1),
+              (workInProgress.lanes = 4194304));
+        type.isBackwards
           ? ((updatePayload.sibling = workInProgress.child),
             (workInProgress.child = updatePayload))
-          : ((current = newProps.last),
+          : ((current = type.last),
             null !== current
               ? (current.sibling = updatePayload)
               : (workInProgress.child = updatePayload),
-            (newProps.last = updatePayload));
+            (type.last = updatePayload));
       }
-      return null !== newProps.tail
-        ? ((current = newProps.tail),
-          (newProps.rendering = current),
-          (newProps.tail = current.sibling),
-          (newProps.lastEffect = workInProgress.lastEffect),
-          (newProps.renderingStartTime = now()),
-          (current.sibling = null),
-          (workInProgress = suspenseStackCursor.current),
-          push(
-            suspenseStackCursor,
-            rootContainerInstance
-              ? (workInProgress & 1) | 2
-              : workInProgress & 1
-          ),
-          current)
-        : null;
+      if (null !== type.tail)
+        return (
+          (workInProgress = type.tail),
+          (type.rendering = workInProgress),
+          (type.tail = workInProgress.sibling),
+          (type.renderingStartTime = now()),
+          (workInProgress.sibling = null),
+          (current = suspenseStackCursor.current),
+          push(suspenseStackCursor, newProps ? (current & 1) | 2 : current & 1),
+          workInProgress
+        );
+      bubbleProperties(workInProgress);
+      return null;
+    case 22:
     case 23:
-    case 24:
       return (
         popRenderLanes(),
+        (renderLanes = null !== workInProgress.memoizedState),
         null !== current &&
-          (null !== current.memoizedState) !==
-            (null !== workInProgress.memoizedState) &&
+          (null !== current.memoizedState) !== renderLanes &&
           "unstable-defer-without-hiding" !== newProps.mode &&
           (workInProgress.flags |= 4),
+        (renderLanes &&
+          0 === (subtreeRenderLanes & 1073741824) &&
+          0 !== (workInProgress.mode & 1)) ||
+          bubbleProperties(workInProgress),
         null
       );
   }
@@ -5229,9 +5484,9 @@ function unwindWork(workInProgress) {
     case 1:
       isContextProvider(workInProgress.type) && popContext();
       var flags = workInProgress.flags;
-      return flags & 8192
-        ? ((workInProgress.flags = (flags & -8193) | 64),
-          0 !== (workInProgress.mode & 8) &&
+      return flags & 16384
+        ? ((workInProgress.flags = (flags & -16385) | 128),
+          0 !== (workInProgress.mode & 2) &&
             transferActualDuration(workInProgress),
           workInProgress)
         : null;
@@ -5241,11 +5496,11 @@ function unwindWork(workInProgress) {
       pop(contextStackCursor);
       resetWorkInProgressVersions();
       flags = workInProgress.flags;
-      if (0 !== (flags & 64))
+      if (0 !== (flags & 128))
         throw Error(
           "The root failed to unmount after an error. This is likely a bug in React. Please file an issue."
         );
-      workInProgress.flags = (flags & -8193) | 64;
+      workInProgress.flags = (flags & -16385) | 128;
       return workInProgress;
     case 5:
       return popHostContext(workInProgress), null;
@@ -5253,9 +5508,9 @@ function unwindWork(workInProgress) {
       return (
         pop(suspenseStackCursor),
         (flags = workInProgress.flags),
-        flags & 8192
-          ? ((workInProgress.flags = (flags & -8193) | 64),
-            0 !== (workInProgress.mode & 8) &&
+        flags & 16384
+          ? ((workInProgress.flags = (flags & -16385) | 128),
+            0 !== (workInProgress.mode & 2) &&
               transferActualDuration(workInProgress),
             workInProgress)
           : null
@@ -5265,290 +5520,202 @@ function unwindWork(workInProgress) {
     case 4:
       return popHostContainer(), null;
     case 10:
-      return popProvider(workInProgress), null;
+      return popProvider(workInProgress.type._context), null;
+    case 22:
     case 23:
-    case 24:
       return popRenderLanes(), null;
+    case 24:
+      return null;
     default:
       return null;
   }
 }
-function createCapturedValue(value, source) {
-  return {
-    value: value,
-    source: source,
-    stack: getStackByFiberInDevAndProd(source)
-  };
-}
-if (
-  "function" !==
-  typeof ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog
-)
-  throw Error(
-    "Expected ReactFiberErrorDialog.showErrorDialog to be a function."
-  );
-function logCapturedError(boundary, errorInfo) {
-  try {
-    !1 !==
-      ReactNativePrivateInterface.ReactFiberErrorDialog.showErrorDialog({
-        componentStack: null !== errorInfo.stack ? errorInfo.stack : "",
-        error: errorInfo.value,
-        errorBoundary:
-          null !== boundary && 1 === boundary.tag ? boundary.stateNode : null
-      }) && console.error(errorInfo.value);
-  } catch (e) {
-    setTimeout(function() {
-      throw e;
-    });
-  }
-}
-var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map;
-function createRootErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  lane.payload = { element: null };
-  var error = errorInfo.value;
-  lane.callback = function() {
-    hasUncaughtError || ((hasUncaughtError = !0), (firstUncaughtError = error));
-    logCapturedError(fiber, errorInfo);
-  };
-  return lane;
-}
-function createClassErrorUpdate(fiber, errorInfo, lane) {
-  lane = createUpdate(-1, lane);
-  lane.tag = 3;
-  var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
-  if ("function" === typeof getDerivedStateFromError) {
-    var error = errorInfo.value;
-    lane.payload = function() {
-      logCapturedError(fiber, errorInfo);
-      return getDerivedStateFromError(error);
-    };
-  }
-  var inst = fiber.stateNode;
-  null !== inst &&
-    "function" === typeof inst.componentDidCatch &&
-    (lane.callback = function() {
-      "function" !== typeof getDerivedStateFromError &&
-        (null === legacyErrorBoundariesThatAlreadyFailed
-          ? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
-          : legacyErrorBoundariesThatAlreadyFailed.add(this),
-        logCapturedError(fiber, errorInfo));
-      var stack = errorInfo.stack;
-      this.componentDidCatch(errorInfo.value, {
-        componentStack: null !== stack ? stack : ""
-      });
-    });
-  return lane;
-}
-var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set;
-function safelyDetachRef(current) {
+var PossiblyWeakSet = "function" === typeof WeakSet ? WeakSet : Set,
+  nextEffect = null,
+  inProgressLanes = null,
+  inProgressRoot = null;
+function safelyDetachRef(current, nearestMountedAncestor) {
   var ref = current.ref;
   if (null !== ref)
     if ("function" === typeof ref)
       try {
-        ref(null);
-      } catch (refError) {
-        captureCommitPhaseError(current, refError);
+        if (current.mode & 2)
+          try {
+            startLayoutEffectTimer(), ref(null);
+          } finally {
+            recordLayoutEffectDuration(current);
+          }
+        else ref(null);
+      } catch (error) {
+        captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
     else ref.current = null;
 }
-function commitBeforeMutationLifeCycles(current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      return;
-    case 1:
-      if (finishedWork.flags & 256 && null !== current) {
-        var prevProps = current.memoizedProps,
-          prevState = current.memoizedState;
-        current = finishedWork.stateNode;
-        finishedWork = current.getSnapshotBeforeUpdate(
-          finishedWork.elementType === finishedWork.type
-            ? prevProps
-            : resolveDefaultProps(finishedWork.type, prevProps),
-          prevState
-        );
-        current.__reactInternalSnapshotBeforeUpdate = finishedWork;
-      }
-      return;
-    case 3:
-      return;
-    case 5:
-    case 6:
-    case 4:
-    case 17:
-      return;
+function safelyCallDestroy(current, nearestMountedAncestor, destroy) {
+  try {
+    destroy();
+  } catch (error) {
+    captureCommitPhaseError(current, nearestMountedAncestor, error);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
-function commitLifeCycles(finishedRoot, current, finishedWork) {
-  switch (finishedWork.tag) {
-    case 0:
-    case 11:
-    case 15:
-    case 22:
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          if (3 === (finishedRoot.tag & 3)) {
-            var create$82 = finishedRoot.create;
-            finishedRoot.destroy = create$82();
-          }
-          finishedRoot = finishedRoot.next;
-        } while (finishedRoot !== current);
+var shouldFireAfterActiveInstanceBlur = !1;
+function commitBeforeMutationEffects(root, firstChild) {
+  for (nextEffect = firstChild; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (firstChild = root.child),
+      0 !== (root.subtreeFlags & 516) && null !== firstChild)
+    )
+      (firstChild.return = root), (nextEffect = firstChild);
+    else
+      for (; null !== nextEffect; ) {
+        root = nextEffect;
+        try {
+          var current = root.alternate;
+          if (0 !== (root.flags & 512))
+            switch (root.tag) {
+              case 0:
+              case 11:
+              case 15:
+                break;
+              case 1:
+                if (null !== current) {
+                  var prevProps = current.memoizedProps,
+                    prevState = current.memoizedState,
+                    instance = root.stateNode,
+                    snapshot = instance.getSnapshotBeforeUpdate(
+                      root.elementType === root.type
+                        ? prevProps
+                        : resolveDefaultProps(root.type, prevProps),
+                      prevState
+                    );
+                  instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+                }
+                break;
+              case 3:
+                break;
+              case 5:
+              case 6:
+              case 4:
+              case 17:
+                break;
+              default:
+                throw Error(
+                  "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                );
+            }
+        } catch (error) {
+          captureCommitPhaseError(root, root.return, error);
+        }
+        firstChild = root.sibling;
+        if (null !== firstChild) {
+          firstChild.return = root.return;
+          nextEffect = firstChild;
+          break;
+        }
+        nextEffect = root.return;
       }
-      current = finishedWork.updateQueue;
-      current = null !== current ? current.lastEffect : null;
-      if (null !== current) {
-        finishedRoot = current = current.next;
-        do {
-          var _effect = finishedRoot;
-          create$82 = _effect.next;
-          _effect = _effect.tag;
-          0 !== (_effect & 4) &&
-            0 !== (_effect & 1) &&
-            (enqueuePendingPassiveHookEffectUnmount(finishedWork, finishedRoot),
-            enqueuePendingPassiveHookEffectMount(finishedWork, finishedRoot));
-          finishedRoot = create$82;
-        } while (finishedRoot !== current);
+  current = shouldFireAfterActiveInstanceBlur;
+  shouldFireAfterActiveInstanceBlur = !1;
+  return current;
+}
+function commitHookEffectListUnmount(
+  flags,
+  finishedWork,
+  nearestMountedAncestor
+) {
+  var updateQueue = finishedWork.updateQueue;
+  updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
+  if (null !== updateQueue) {
+    var effect = (updateQueue = updateQueue.next);
+    do {
+      if ((effect.tag & flags) === flags) {
+        var destroy = effect.destroy;
+        effect.destroy = void 0;
+        void 0 !== destroy &&
+          safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy);
       }
-      return;
-    case 1:
-      finishedRoot = finishedWork.stateNode;
-      finishedWork.flags & 4 &&
-        (null === current
-          ? finishedRoot.componentDidMount()
-          : ((create$82 =
-              finishedWork.elementType === finishedWork.type
-                ? current.memoizedProps
-                : resolveDefaultProps(
-                    finishedWork.type,
-                    current.memoizedProps
-                  )),
-            finishedRoot.componentDidUpdate(
-              create$82,
-              current.memoizedState,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            )));
-      current = finishedWork.updateQueue;
-      null !== current &&
-        commitUpdateQueue(finishedWork, current, finishedRoot);
-      return;
-    case 3:
-      current = finishedWork.updateQueue;
-      if (null !== current) {
-        finishedRoot = null;
-        if (null !== finishedWork.child)
-          switch (finishedWork.child.tag) {
-            case 5:
-              finishedRoot = finishedWork.child.stateNode;
-              break;
-            case 1:
-              finishedRoot = finishedWork.child.stateNode;
-          }
-        commitUpdateQueue(finishedWork, current, finishedRoot);
+      effect = effect.next;
+    } while (effect !== updateQueue);
+  }
+}
+function commitHookEffectListMount(tag, finishedWork) {
+  finishedWork = finishedWork.updateQueue;
+  finishedWork = null !== finishedWork ? finishedWork.lastEffect : null;
+  if (null !== finishedWork) {
+    var effect = (finishedWork = finishedWork.next);
+    do {
+      if ((effect.tag & tag) === tag) {
+        var create$88 = effect.create;
+        effect.destroy = create$88();
       }
-      return;
-    case 5:
-      return;
-    case 6:
-      return;
-    case 4:
-      return;
-    case 12:
-      create$82 = finishedWork.memoizedProps.onRender;
-      _effect = commitTime;
-      "function" === typeof create$82 &&
-        create$82(
-          finishedWork.memoizedProps.id,
-          null === current ? "mount" : "update",
-          finishedWork.actualDuration,
-          finishedWork.treeBaseDuration,
-          finishedWork.actualStartTime,
-          _effect,
-          finishedRoot.memoizedInteractions
-        );
-      return;
-    case 13:
-      return;
-    case 19:
-    case 17:
-    case 20:
-    case 21:
-    case 23:
-    case 24:
-      return;
+      effect = effect.next;
+    } while (effect !== finishedWork);
   }
-  throw Error(
-    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-  );
 }
 function hideOrUnhideAllChildren(finishedWork, isHidden) {
-  for (var node = finishedWork; ; ) {
+  for (var hostSubtreeRoot = null, node = finishedWork; ; ) {
     if (5 === node.tag) {
-      var instance = node.stateNode;
-      if (isHidden) {
-        var viewConfig = instance.viewConfig;
-        var updatePayload = diffProperties(
-          null,
-          emptyObject,
-          { style: { display: "none" } },
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
-      } else {
-        instance = node.stateNode;
-        updatePayload = node.memoizedProps;
-        viewConfig = instance.viewConfig;
-        var prevProps = Object.assign({}, updatePayload, {
-          style: [updatePayload.style, { display: "none" }]
-        });
-        updatePayload = diffProperties(
-          null,
-          prevProps,
-          updatePayload,
-          viewConfig.validAttributes
-        );
-        ReactNativePrivateInterface.UIManager.updateView(
-          instance._nativeTag,
-          viewConfig.uiViewClassName,
-          updatePayload
-        );
-      }
-    } else {
-      if (6 === node.tag) throw Error("Not yet implemented.");
-      if (
-        ((23 !== node.tag && 24 !== node.tag) ||
-          null === node.memoizedState ||
-          node === finishedWork) &&
-        null !== node.child
-      ) {
-        node.child.return = node;
-        node = node.child;
-        continue;
+      if (null === hostSubtreeRoot) {
+        hostSubtreeRoot = node;
+        var instance = node.stateNode;
+        if (isHidden) {
+          var viewConfig = instance.viewConfig;
+          var updatePayload = diffProperties(
+            null,
+            emptyObject,
+            { style: { display: "none" } },
+            viewConfig.validAttributes
+          );
+          ReactNativePrivateInterface.UIManager.updateView(
+            instance._nativeTag,
+            viewConfig.uiViewClassName,
+            updatePayload
+          );
+        } else {
+          instance = node.stateNode;
+          updatePayload = node.memoizedProps;
+          viewConfig = instance.viewConfig;
+          var prevProps = Object.assign({}, updatePayload, {
+            style: [updatePayload.style, { display: "none" }]
+          });
+          updatePayload = diffProperties(
+            null,
+            prevProps,
+            updatePayload,
+            viewConfig.validAttributes
+          );
+          ReactNativePrivateInterface.UIManager.updateView(
+            instance._nativeTag,
+            viewConfig.uiViewClassName,
+            updatePayload
+          );
+        }
       }
+    } else if (6 === node.tag) {
+      if (null === hostSubtreeRoot) throw Error("Not yet implemented.");
+    } else if (
+      ((22 !== node.tag && 23 !== node.tag) ||
+        null === node.memoizedState ||
+        node === finishedWork) &&
+      null !== node.child
+    ) {
+      node.child.return = node;
+      node = node.child;
+      continue;
     }
     if (node === finishedWork) break;
     for (; null === node.sibling; ) {
       if (null === node.return || node.return === finishedWork) return;
+      hostSubtreeRoot === node && (hostSubtreeRoot = null);
       node = node.return;
     }
+    hostSubtreeRoot === node && (hostSubtreeRoot = null);
     node.sibling.return = node.return;
     node = node.sibling;
   }
 }
-function commitUnmount(finishedRoot, current) {
+function commitUnmount(finishedRoot, current, nearestMountedAncestor) {
   if (injectedHook && "function" === typeof injectedHook.onCommitFiberUnmount)
     try {
       injectedHook.onCommitFiberUnmount(rendererID, current);
@@ -5558,7 +5725,6 @@ function commitUnmount(finishedRoot, current) {
     case 11:
     case 14:
     case 15:
-    case 22:
       finishedRoot = current.updateQueue;
       if (
         null !== finishedRoot &&
@@ -5566,53 +5732,65 @@ function commitUnmount(finishedRoot, current) {
       ) {
         var effect = (finishedRoot = finishedRoot.next);
         do {
-          var _effect2 = effect,
-            destroy = _effect2.destroy;
-          _effect2 = _effect2.tag;
-          if (void 0 !== destroy)
-            if (0 !== (_effect2 & 4))
-              enqueuePendingPassiveHookEffectUnmount(current, effect);
-            else {
-              _effect2 = current;
-              try {
-                destroy();
-              } catch (error) {
-                captureCommitPhaseError(_effect2, error);
-              }
-            }
+          var _effect = effect,
+            destroy = _effect.destroy;
+          _effect = _effect.tag;
+          void 0 !== destroy &&
+            0 !== (_effect & 2) &&
+            (current.mode & 2
+              ? (startLayoutEffectTimer(),
+                safelyCallDestroy(current, nearestMountedAncestor, destroy),
+                recordLayoutEffectDuration(current))
+              : safelyCallDestroy(current, nearestMountedAncestor, destroy));
           effect = effect.next;
         } while (effect !== finishedRoot);
       }
       break;
     case 1:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor);
       finishedRoot = current.stateNode;
       if ("function" === typeof finishedRoot.componentWillUnmount)
         try {
-          (finishedRoot.props = current.memoizedProps),
+          if (
+            ((finishedRoot.props = current.memoizedProps),
             (finishedRoot.state = current.memoizedState),
-            finishedRoot.componentWillUnmount();
+            current.mode & 2)
+          )
+            try {
+              startLayoutEffectTimer(), finishedRoot.componentWillUnmount();
+            } finally {
+              recordLayoutEffectDuration(current);
+            }
+          else finishedRoot.componentWillUnmount();
         } catch (unmountError) {
-          captureCommitPhaseError(current, unmountError);
+          captureCommitPhaseError(
+            current,
+            nearestMountedAncestor,
+            unmountError
+          );
         }
       break;
     case 5:
-      safelyDetachRef(current);
+      safelyDetachRef(current, nearestMountedAncestor);
       break;
     case 4:
-      unmountHostComponents(finishedRoot, current);
+      unmountHostComponents(finishedRoot, current, nearestMountedAncestor);
   }
 }
-function detachFiberMutation(fiber) {
-  fiber.alternate = null;
+function detachFiberAfterEffects(fiber) {
+  var alternate = fiber.alternate;
+  null !== alternate &&
+    ((fiber.alternate = null), detachFiberAfterEffects(alternate));
   fiber.child = null;
+  fiber.deletions = null;
+  fiber.sibling = null;
+  fiber.stateNode = null;
+  fiber.return = null;
   fiber.dependencies = null;
-  fiber.firstEffect = null;
-  fiber.lastEffect = null;
   fiber.memoizedProps = null;
   fiber.memoizedState = null;
   fiber.pendingProps = null;
-  fiber.return = null;
+  fiber.stateNode = null;
   fiber.updateQueue = null;
 }
 function isHostParent(fiber) {
@@ -5647,7 +5825,7 @@ function commitPlacement(finishedWork) {
         "Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue."
       );
   }
-  parentFiber.flags & 16 && (parentFiber.flags &= -17);
+  parentFiber.flags & 32 && (parentFiber.flags &= -33);
   a: b: for (parentFiber = finishedWork; ; ) {
     for (; null === parentFiber.sibling; ) {
       if (null === parentFiber.return || isHostParent(parentFiber.return)) {
@@ -5682,10 +5860,9 @@ function commitPlacement(finishedWork) {
     : insertOrAppendPlacementNode(finishedWork, parentFiber, parent);
 }
 function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    if (((node = isHost ? node.stateNode : node.stateNode.instance), before)) {
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
       if ("number" === typeof parent)
         throw Error("Container does not support insertBefore operation");
     } else
@@ -5703,58 +5880,57 @@ function insertOrAppendPlacementNodeIntoContainer(node, before, parent) {
         (node = node.sibling);
 }
 function insertOrAppendPlacementNode(node, before, parent) {
-  var tag = node.tag,
-    isHost = 5 === tag || 6 === tag;
-  if (isHost)
-    (node = isHost ? node.stateNode : node.stateNode.instance),
-      before
-        ? ((tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              (before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [before],
-                [],
-                [],
-                []
-              ))
-            : ((before = tag.indexOf(before)),
-              tag.splice(before, 0, node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                ["number" === typeof node ? node : node._nativeTag],
-                [before],
-                []
-              )))
-        : ((before = "number" === typeof node ? node : node._nativeTag),
-          (tag = parent._children),
-          (isHost = tag.indexOf(node)),
-          0 <= isHost
-            ? (tag.splice(isHost, 1),
-              tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [isHost],
-                [tag.length - 1],
-                [],
-                [],
-                []
-              ))
-            : (tag.push(node),
-              ReactNativePrivateInterface.UIManager.manageChildren(
-                parent._nativeTag,
-                [],
-                [],
-                [before],
-                [tag.length - 1],
-                []
-              )));
+  var tag = node.tag;
+  if (5 === tag || 6 === tag)
+    if (((node = node.stateNode), before)) {
+      tag = parent._children;
+      var index = tag.indexOf(node);
+      0 <= index
+        ? (tag.splice(index, 1),
+          (before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [index],
+            [before],
+            [],
+            [],
+            []
+          ))
+        : ((before = tag.indexOf(before)),
+          tag.splice(before, 0, node),
+          ReactNativePrivateInterface.UIManager.manageChildren(
+            parent._nativeTag,
+            [],
+            [],
+            ["number" === typeof node ? node : node._nativeTag],
+            [before],
+            []
+          ));
+    } else
+      (before = "number" === typeof node ? node : node._nativeTag),
+        (tag = parent._children),
+        (index = tag.indexOf(node)),
+        0 <= index
+          ? (tag.splice(index, 1),
+            tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [index],
+              [tag.length - 1],
+              [],
+              [],
+              []
+            ))
+          : (tag.push(node),
+            ReactNativePrivateInterface.UIManager.manageChildren(
+              parent._nativeTag,
+              [],
+              [],
+              [before],
+              [tag.length - 1],
+              []
+            ));
   else if (4 !== tag && ((node = node.child), null !== node))
     for (
       insertOrAppendPlacementNode(node, before, parent), node = node.sibling;
@@ -5763,7 +5939,11 @@ function insertOrAppendPlacementNode(node, before, parent) {
     )
       insertOrAppendPlacementNode(node, before, parent), (node = node.sibling);
 }
-function unmountHostComponents(finishedRoot$jscomp$0, current) {
+function unmountHostComponents(
+  finishedRoot$jscomp$0,
+  current,
+  nearestMountedAncestor$jscomp$0
+) {
   for (
     var node = current,
       currentParentIsValid = !1,
@@ -5801,12 +5981,13 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
       a: for (
         var finishedRoot = finishedRoot$jscomp$0,
           root = node,
+          nearestMountedAncestor = nearestMountedAncestor$jscomp$0,
           node$jscomp$0 = root;
         ;
 
       )
         if (
-          (commitUnmount(finishedRoot, node$jscomp$0),
+          (commitUnmount(finishedRoot, node$jscomp$0, nearestMountedAncestor),
           null !== node$jscomp$0.child && 4 !== node$jscomp$0.tag)
         )
           (node$jscomp$0.child.return = node$jscomp$0),
@@ -5833,18 +6014,18 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
             [0]
           ))
         : ((finishedRoot = currentParent),
-          (node$jscomp$0 = node.stateNode),
-          recursivelyUncacheFiberNode(node$jscomp$0),
+          (nearestMountedAncestor = node.stateNode),
+          recursivelyUncacheFiberNode(nearestMountedAncestor),
           (root = finishedRoot._children),
-          (node$jscomp$0 = root.indexOf(node$jscomp$0)),
-          root.splice(node$jscomp$0, 1),
+          (nearestMountedAncestor = root.indexOf(nearestMountedAncestor)),
+          root.splice(nearestMountedAncestor, 1),
           ReactNativePrivateInterface.UIManager.manageChildren(
             finishedRoot._nativeTag,
             [],
             [],
             [],
             [],
-            [node$jscomp$0]
+            [nearestMountedAncestor]
           ));
     } else if (4 === node.tag) {
       if (null !== node.child) {
@@ -5855,7 +6036,12 @@ function unmountHostComponents(finishedRoot$jscomp$0, current) {
         continue;
       }
     } else if (
-      (commitUnmount(finishedRoot$jscomp$0, node), null !== node.child)
+      (commitUnmount(
+        finishedRoot$jscomp$0,
+        node,
+        nearestMountedAncestor$jscomp$0
+      ),
+      null !== node.child)
     ) {
       node.child.return = node;
       node = node.child;
@@ -5877,43 +6063,38 @@ function commitWork(current, finishedWork) {
     case 11:
     case 14:
     case 15:
-    case 22:
-      var updateQueue = finishedWork.updateQueue;
-      updateQueue = null !== updateQueue ? updateQueue.lastEffect : null;
-      if (null !== updateQueue) {
-        var effect = (updateQueue = updateQueue.next);
-        do
-          3 === (effect.tag & 3) &&
-            ((finishedWork = effect.destroy),
-            (effect.destroy = void 0),
-            void 0 !== finishedWork && finishedWork()),
-            (effect = effect.next);
-        while (effect !== updateQueue);
-      }
+      if (finishedWork.mode & 2)
+        try {
+          startLayoutEffectTimer(),
+            commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
+        } finally {
+          recordLayoutEffectDuration(finishedWork);
+        }
+      else commitHookEffectListUnmount(3, finishedWork, finishedWork.return);
       return;
     case 1:
       return;
     case 5:
-      updateQueue = finishedWork.stateNode;
-      if (null != updateQueue) {
-        effect = finishedWork.memoizedProps;
-        current = null !== current ? current.memoizedProps : effect;
+      var instance = finishedWork.stateNode;
+      if (null != instance) {
+        var newProps = finishedWork.memoizedProps;
+        current = null !== current ? current.memoizedProps : newProps;
         var updatePayload = finishedWork.updateQueue;
         finishedWork.updateQueue = null;
         null !== updatePayload &&
-          ((finishedWork = updateQueue.viewConfig),
-          instanceProps.set(updateQueue._nativeTag, effect),
-          (effect = diffProperties(
+          ((finishedWork = instance.viewConfig),
+          instanceProps.set(instance._nativeTag, newProps),
+          (newProps = diffProperties(
             null,
             current,
-            effect,
+            newProps,
             finishedWork.validAttributes
           )),
-          null != effect &&
+          null != newProps &&
             ReactNativePrivateInterface.UIManager.updateView(
-              updateQueue._nativeTag,
+              instance._nativeTag,
               finishedWork.uiViewClassName,
-              effect
+              newProps
             ));
       }
       return;
@@ -5943,8 +6124,8 @@ function commitWork(current, finishedWork) {
       return;
     case 17:
       return;
+    case 22:
     case 23:
-    case 24:
       hideOrUnhideAllChildren(
         finishedWork,
         null !== finishedWork.memoizedState
@@ -5964,25 +6145,296 @@ function attachSuspenseRetryListeners(finishedWork) {
       (retryCache = finishedWork.stateNode = new PossiblyWeakSet());
     wakeables.forEach(function(wakeable) {
       var retry = resolveRetryWakeable.bind(null, finishedWork, wakeable);
-      retryCache.has(wakeable) ||
-        (!0 !== wakeable.__reactDoNotTraceInteractions &&
-          (retry = tracing.unstable_wrap(retry)),
-        retryCache.add(wakeable),
-        wakeable.then(retry, retry));
+      if (!retryCache.has(wakeable)) {
+        retryCache.add(wakeable);
+        if (isDevToolsPresent)
+          if (null !== inProgressLanes && null !== inProgressRoot)
+            restorePendingUpdaters(inProgressRoot, inProgressLanes);
+          else
+            throw Error(
+              "Expected finished root and lanes to be set. This is a bug in React."
+            );
+        wakeable.then(retry, retry);
+      }
     });
   }
 }
-function isSuspenseBoundaryBeingHidden(current, finishedWork) {
-  return null !== current &&
-    ((current = current.memoizedState),
-    null === current || null !== current.dehydrated)
-    ? ((finishedWork = finishedWork.memoizedState),
-      null !== finishedWork && null === finishedWork.dehydrated)
-    : !1;
+function commitMutationEffects(root, firstChild, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = firstChild; null !== nextEffect; ) {
+    firstChild = nextEffect;
+    committedLanes = firstChild.deletions;
+    if (null !== committedLanes)
+      for (var i = 0; i < committedLanes.length; i++) {
+        var childToDelete = committedLanes[i];
+        try {
+          unmountHostComponents(root, childToDelete, firstChild);
+          var alternate = childToDelete.alternate;
+          null !== alternate && (alternate.return = null);
+          childToDelete.return = null;
+        } catch (error) {
+          captureCommitPhaseError(childToDelete, firstChild, error);
+        }
+      }
+    committedLanes = firstChild.child;
+    if (0 !== (firstChild.subtreeFlags & 6454) && null !== committedLanes)
+      (committedLanes.return = firstChild), (nextEffect = committedLanes);
+    else
+      for (; null !== nextEffect; ) {
+        firstChild = nextEffect;
+        try {
+          var flags = firstChild.flags;
+          if (flags & 256) {
+            var current = firstChild.alternate;
+            if (null !== current) {
+              committedLanes = current;
+              var currentRef = committedLanes.ref;
+              if (null !== currentRef)
+                if ("function" === typeof currentRef)
+                  if (committedLanes.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), currentRef(null);
+                    } finally {
+                      recordLayoutEffectDuration(committedLanes);
+                    }
+                  else currentRef(null);
+                else currentRef.current = null;
+            }
+          }
+          switch (flags & 2054) {
+            case 2:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              break;
+            case 6:
+              commitPlacement(firstChild);
+              firstChild.flags &= -3;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 2048:
+              firstChild.flags &= -2049;
+              break;
+            case 2052:
+              firstChild.flags &= -2049;
+              commitWork(firstChild.alternate, firstChild);
+              break;
+            case 4:
+              commitWork(firstChild.alternate, firstChild);
+          }
+        } catch (error) {
+          captureCommitPhaseError(firstChild, firstChild.return, error);
+        }
+        committedLanes = firstChild.sibling;
+        if (null !== committedLanes) {
+          committedLanes.return = firstChild.return;
+          nextEffect = committedLanes;
+          break;
+        }
+        nextEffect = firstChild.return;
+      }
+  }
+  inProgressRoot = inProgressLanes = null;
+}
+function commitLayoutEffects(finishedWork, root, committedLanes) {
+  inProgressLanes = committedLanes;
+  inProgressRoot = root;
+  for (nextEffect = finishedWork; null !== nextEffect; )
+    if (
+      ((root = nextEffect),
+      (committedLanes = root.child),
+      0 !== (root.subtreeFlags & 324) && null !== committedLanes)
+    )
+      (committedLanes.return = root), (nextEffect = committedLanes);
+    else
+      for (root = finishedWork; null !== nextEffect; ) {
+        committedLanes = nextEffect;
+        if (0 !== (committedLanes.flags & 324)) {
+          var current = committedLanes.alternate;
+          try {
+            if (0 !== (committedLanes.flags & 68))
+              switch (committedLanes.tag) {
+                case 0:
+                case 11:
+                case 15:
+                  if (committedLanes.mode & 2)
+                    try {
+                      startLayoutEffectTimer(),
+                        commitHookEffectListMount(3, committedLanes);
+                    } finally {
+                      recordLayoutEffectDuration(committedLanes);
+                    }
+                  else commitHookEffectListMount(3, committedLanes);
+                  break;
+                case 1:
+                  var instance = committedLanes.stateNode;
+                  if (committedLanes.flags & 4)
+                    if (null === current)
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidMount();
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else instance.componentDidMount();
+                    else {
+                      var prevProps =
+                          committedLanes.elementType === committedLanes.type
+                            ? current.memoizedProps
+                            : resolveDefaultProps(
+                                committedLanes.type,
+                                current.memoizedProps
+                              ),
+                        prevState = current.memoizedState;
+                      if (committedLanes.mode & 2)
+                        try {
+                          startLayoutEffectTimer(),
+                            instance.componentDidUpdate(
+                              prevProps,
+                              prevState,
+                              instance.__reactInternalSnapshotBeforeUpdate
+                            );
+                        } finally {
+                          recordLayoutEffectDuration(committedLanes);
+                        }
+                      else
+                        instance.componentDidUpdate(
+                          prevProps,
+                          prevState,
+                          instance.__reactInternalSnapshotBeforeUpdate
+                        );
+                    }
+                  var updateQueue = committedLanes.updateQueue;
+                  null !== updateQueue &&
+                    commitUpdateQueue(committedLanes, updateQueue, instance);
+                  break;
+                case 3:
+                  var updateQueue$90 = committedLanes.updateQueue;
+                  if (null !== updateQueue$90) {
+                    var instance$91 = null;
+                    if (null !== committedLanes.child)
+                      switch (committedLanes.child.tag) {
+                        case 5:
+                          instance$91 = committedLanes.child.stateNode;
+                          break;
+                        case 1:
+                          instance$91 = committedLanes.child.stateNode;
+                      }
+                    commitUpdateQueue(
+                      committedLanes,
+                      updateQueue$90,
+                      instance$91
+                    );
+                  }
+                  break;
+                case 5:
+                  break;
+                case 6:
+                  break;
+                case 4:
+                  break;
+                case 12:
+                  var _finishedWork$memoize2 = committedLanes.memoizedProps,
+                    onCommit = _finishedWork$memoize2.onCommit,
+                    onRender = _finishedWork$memoize2.onRender,
+                    effectDuration = committedLanes.stateNode.effectDuration;
+                  instance$91 = commitTime;
+                  current = null === current ? "mount" : "update";
+                  currentUpdateIsNested && (current = "nested-update");
+                  "function" === typeof onRender &&
+                    onRender(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      committedLanes.actualDuration,
+                      committedLanes.treeBaseDuration,
+                      committedLanes.actualStartTime,
+                      instance$91
+                    );
+                  "function" === typeof onCommit &&
+                    onCommit(
+                      committedLanes.memoizedProps.id,
+                      current,
+                      effectDuration,
+                      instance$91
+                    );
+                  enqueuePendingPassiveProfilerEffect(committedLanes);
+                  var parentFiber = committedLanes.return;
+                  a: for (; null !== parentFiber; ) {
+                    switch (parentFiber.tag) {
+                      case 3:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                      case 12:
+                        parentFiber.stateNode.effectDuration += effectDuration;
+                        break a;
+                    }
+                    parentFiber = parentFiber.return;
+                  }
+                  break;
+                case 13:
+                  break;
+                case 19:
+                case 17:
+                case 21:
+                case 22:
+                case 23:
+                  break;
+                default:
+                  throw Error(
+                    "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+                  );
+              }
+            if (committedLanes.flags & 256) {
+              instance$91 = void 0;
+              current = committedLanes;
+              var ref = current.ref;
+              if (null !== ref) {
+                var instance$jscomp$0 = current.stateNode;
+                switch (current.tag) {
+                  case 5:
+                    instance$91 = instance$jscomp$0;
+                    break;
+                  default:
+                    instance$91 = instance$jscomp$0;
+                }
+                if ("function" === typeof ref)
+                  if (current.mode & 2)
+                    try {
+                      startLayoutEffectTimer(), ref(instance$91);
+                    } finally {
+                      recordLayoutEffectDuration(current);
+                    }
+                  else ref(instance$91);
+                else ref.current = instance$91;
+              }
+            }
+          } catch (error) {
+            captureCommitPhaseError(
+              committedLanes,
+              committedLanes.return,
+              error
+            );
+          }
+        }
+        if (committedLanes === root) {
+          nextEffect = null;
+          break;
+        }
+        instance$91 = committedLanes.sibling;
+        if (null !== instance$91) {
+          instance$91.return = committedLanes.return;
+          nextEffect = instance$91;
+          break;
+        }
+        nextEffect = committedLanes.return;
+      }
+  inProgressRoot = inProgressLanes = null;
 }
 var ceil = Math.ceil,
   ReactCurrentDispatcher$2 = ReactSharedInternals.ReactCurrentDispatcher,
   ReactCurrentOwner$2 = ReactSharedInternals.ReactCurrentOwner,
+  ReactCurrentBatchConfig$2 = ReactSharedInternals.ReactCurrentBatchConfig,
   executionContext = 0,
   workInProgressRoot = null,
   workInProgress = null,
@@ -5991,66 +6443,44 @@ var ceil = Math.ceil,
   subtreeRenderLanesCursor = createCursor(0),
   workInProgressRootExitStatus = 0,
   workInProgressRootFatalError = null,
-  workInProgressRootIncludedLanes = 0,
   workInProgressRootSkippedLanes = 0,
   workInProgressRootUpdatedLanes = 0,
   workInProgressRootPingedLanes = 0,
-  mostRecentlyUpdatedRoot = null,
   globalMostRecentFallbackTime = 0,
   workInProgressRootRenderTargetTime = Infinity,
-  nextEffect = null,
   hasUncaughtError = !1,
   firstUncaughtError = null,
   legacyErrorBoundariesThatAlreadyFailed = null,
   rootDoesHavePassiveEffects = !1,
   rootWithPendingPassiveEffects = null,
-  pendingPassiveEffectsRenderPriority = 90,
   pendingPassiveEffectsLanes = 0,
-  pendingPassiveHookEffectsMount = [],
-  pendingPassiveHookEffectsUnmount = [],
-  rootsWithPendingDiscreteUpdates = null,
+  pendingPassiveProfilerEffects = [],
   nestedUpdateCount = 0,
   rootWithNestedUpdates = null,
-  spawnedWorkDuringRender = null,
   currentEventTime = -1,
-  currentEventWipLanes = 0,
-  currentEventPendingLanes = 0,
-  focusedInstanceHandle = null,
-  shouldFireAfterActiveInstanceBlur = !1;
+  currentEventTransitionLane = 0;
 function requestEventTime() {
-  return 0 !== (executionContext & 48)
+  return 0 !== (executionContext & 24)
     ? now()
     : -1 !== currentEventTime
     ? currentEventTime
     : (currentEventTime = now());
 }
 function requestUpdateLane(fiber) {
-  fiber = fiber.mode;
-  if (0 === (fiber & 2)) return 1;
-  if (0 === (fiber & 4)) return 99 === getCurrentPriorityLevel() ? 1 : 2;
-  0 === currentEventWipLanes &&
-    (currentEventWipLanes = workInProgressRootIncludedLanes);
-  if (0 !== ReactCurrentBatchConfig.transition) {
-    0 !== currentEventPendingLanes &&
-      (currentEventPendingLanes =
-        null !== mostRecentlyUpdatedRoot
-          ? mostRecentlyUpdatedRoot.pendingLanes
-          : 0);
-    fiber = currentEventWipLanes;
-    var lane = 4186112 & ~currentEventPendingLanes;
-    lane &= -lane;
-    0 === lane &&
-      ((fiber = 4186112 & ~fiber),
-      (lane = fiber & -fiber),
-      0 === lane && (lane = 8192));
-    return lane;
-  }
-  fiber = getCurrentPriorityLevel();
-  0 !== (executionContext & 4) && 98 === fiber
-    ? (fiber = findUpdateLane(12, currentEventWipLanes))
-    : ((fiber = schedulerPriorityToLanePriority(fiber)),
-      (fiber = findUpdateLane(fiber, currentEventWipLanes)));
-  return fiber;
+  if (0 === (fiber.mode & 1)) return 1;
+  if (0 !== (executionContext & 8) && 0 !== workInProgressRootRenderLanes)
+    return workInProgressRootRenderLanes & -workInProgressRootRenderLanes;
+  if (0 !== ReactCurrentBatchConfig.transition)
+    return (
+      0 === currentEventTransitionLane &&
+        ((fiber = nextTransitionLane),
+        (nextTransitionLane <<= 1),
+        0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64),
+        (currentEventTransitionLane = fiber)),
+      currentEventTransitionLane
+    );
+  fiber = currentUpdatePriority;
+  return 0 !== fiber ? fiber : 16;
 }
 function scheduleUpdateOnFiber(fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
@@ -6059,30 +6489,24 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  fiber = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === fiber) return null;
-  markRootUpdated(fiber, lane, eventTime);
-  fiber === workInProgressRoot &&
-    ((workInProgressRootUpdatedLanes |= lane),
+  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
+  if (null === root) return null;
+  isDevToolsPresent && addFiberToLanesMap(root, fiber, lane);
+  markRootUpdated(root, lane, eventTime);
+  root === workInProgressRoot &&
+    (0 === (executionContext & 8) && (workInProgressRootUpdatedLanes |= lane),
     4 === workInProgressRootExitStatus &&
-      markRootSuspended$1(fiber, workInProgressRootRenderLanes));
-  var priorityLevel = getCurrentPriorityLevel();
+      markRootSuspended$1(root, workInProgressRootRenderLanes));
   1 === lane
-    ? 0 !== (executionContext & 8) && 0 === (executionContext & 48)
-      ? (schedulePendingInteractions(fiber, lane), performSyncWorkOnRoot(fiber))
-      : (ensureRootIsScheduled(fiber, eventTime),
-        schedulePendingInteractions(fiber, lane),
+    ? 0 !== (executionContext & 4) && 0 === (executionContext & 24)
+      ? performSyncWorkOnRoot(root)
+      : (ensureRootIsScheduled(root, eventTime),
         0 === executionContext &&
+          0 === (fiber.mode & 1) &&
           ((workInProgressRootRenderTargetTime = now() + 500),
-          flushSyncCallbackQueue()))
-    : (0 === (executionContext & 4) ||
-        (98 !== priorityLevel && 99 !== priorityLevel) ||
-        (null === rootsWithPendingDiscreteUpdates
-          ? (rootsWithPendingDiscreteUpdates = new Set([fiber]))
-          : rootsWithPendingDiscreteUpdates.add(fiber)),
-      ensureRootIsScheduled(fiber, eventTime),
-      schedulePendingInteractions(fiber, lane));
-  mostRecentlyUpdatedRoot = fiber;
+          includesLegacySyncCallbacks && flushSyncCallbacks()))
+    : ensureRootIsScheduled(root, eventTime);
+  return root;
 }
 function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
   sourceFiber.lanes |= lane;
@@ -6107,21 +6531,12 @@ function ensureRootIsScheduled(root, currentTime) {
     0 < lanes;
 
   ) {
-    var index$7 = 31 - clz32(lanes),
-      lane = 1 << index$7,
-      expirationTime = expirationTimes[index$7];
+    var index$6 = 31 - clz32(lanes),
+      lane = 1 << index$6,
+      expirationTime = expirationTimes[index$6];
     if (-1 === expirationTime) {
-      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) {
-        expirationTime = currentTime;
-        getHighestPriorityLanes(lane);
-        var priority = return_highestLanePriority;
-        expirationTimes[index$7] =
-          10 <= priority
-            ? expirationTime + 250
-            : 6 <= priority
-            ? expirationTime + 5e3
-            : -1;
-      }
+      if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes))
+        expirationTimes[index$6] = computeExpirationTime(lane, currentTime);
     } else expirationTime <= currentTime && (root.expiredLanes |= lane);
     lanes &= ~lane;
   }
@@ -6129,47 +6544,59 @@ function ensureRootIsScheduled(root, currentTime) {
     root,
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
-  currentTime = return_highestLanePriority;
   if (0 === suspendedLanes)
-    null !== existingCallbackNode &&
-      (existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode),
+    null !== existingCallbackNode && cancelCallback(existingCallbackNode),
       (root.callbackNode = null),
-      (root.callbackPriority = 0));
-  else {
-    if (null !== existingCallbackNode) {
-      if (root.callbackPriority === currentTime) return;
-      existingCallbackNode !== fakeCallbackNode &&
-        Scheduler_cancelCallback(existingCallbackNode);
+      (root.callbackPriority = 0);
+  else if (
+    ((currentTime = suspendedLanes & -suspendedLanes),
+    root.callbackPriority !== currentTime)
+  ) {
+    null != existingCallbackNode && cancelCallback(existingCallbackNode);
+    if (1 === currentTime)
+      0 === root.tag
+        ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          (includesLegacySyncCallbacks = !0),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode))
+        : ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
+          null === syncQueue
+            ? (syncQueue = [existingCallbackNode])
+            : syncQueue.push(existingCallbackNode)),
+        scheduleCallback(ImmediatePriority, flushSyncCallbacks),
+        (existingCallbackNode = null);
+    else {
+      switch (lanesToEventPriority(suspendedLanes)) {
+        case 1:
+          existingCallbackNode = ImmediatePriority;
+          break;
+        case 4:
+          existingCallbackNode = UserBlockingPriority;
+          break;
+        case 16:
+          existingCallbackNode = NormalPriority;
+          break;
+        case 536870912:
+          existingCallbackNode = IdlePriority;
+          break;
+        default:
+          existingCallbackNode = NormalPriority;
+      }
+      existingCallbackNode = scheduleCallback(
+        existingCallbackNode,
+        performConcurrentWorkOnRoot.bind(null, root)
+      );
     }
-    15 === currentTime
-      ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)),
-        null === syncQueue
-          ? ((syncQueue = [existingCallbackNode]),
-            (immediateQueueCallbackNode = Scheduler_scheduleCallback(
-              Scheduler_ImmediatePriority,
-              flushSyncCallbackQueueImpl
-            )))
-          : syncQueue.push(existingCallbackNode),
-        (existingCallbackNode = fakeCallbackNode))
-      : 14 === currentTime
-      ? (existingCallbackNode = scheduleCallback(
-          99,
-          performSyncWorkOnRoot.bind(null, root)
-        ))
-      : ((existingCallbackNode = lanePriorityToSchedulerPriority(currentTime)),
-        (existingCallbackNode = scheduleCallback(
-          existingCallbackNode,
-          performConcurrentWorkOnRoot.bind(null, root)
-        )));
     root.callbackPriority = currentTime;
     root.callbackNode = existingCallbackNode;
   }
 }
-function performConcurrentWorkOnRoot(root) {
+function performConcurrentWorkOnRoot(root, didTimeout) {
+  nestedUpdateScheduled = currentUpdateIsNested = !1;
   currentEventTime = -1;
-  currentEventPendingLanes = currentEventWipLanes = 0;
-  if (0 !== (executionContext & 48))
+  currentEventTransitionLane = 0;
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   var originalCallbackNode = root.callbackNode;
   if (flushPassiveEffects() && root.callbackNode !== originalCallbackNode)
@@ -6179,44 +6606,53 @@ function performConcurrentWorkOnRoot(root) {
     root === workInProgressRoot ? workInProgressRootRenderLanes : 0
   );
   if (0 === lanes) return null;
-  var lanes$jscomp$0 = lanes;
-  var exitStatus = executionContext;
-  executionContext |= 16;
-  var prevDispatcher = pushDispatcher();
-  if (
-    workInProgressRoot !== root ||
-    workInProgressRootRenderLanes !== lanes$jscomp$0
-  )
-    (workInProgressRootRenderTargetTime = now() + 500),
-      prepareFreshStack(root, lanes$jscomp$0),
-      startWorkOnPendingInteractions(root, lanes$jscomp$0);
-  lanes$jscomp$0 = pushInteractions(root);
-  do
-    try {
-      workLoopConcurrent();
-      break;
-    } catch (thrownValue) {
-      handleError(root, thrownValue);
-    }
-  while (1);
-  resetContextDependencies();
-  tracing.__interactionsRef.current = lanes$jscomp$0;
-  ReactCurrentDispatcher$2.current = prevDispatcher;
-  executionContext = exitStatus;
-  null !== workInProgress
-    ? (exitStatus = 0)
-    : ((workInProgressRoot = null),
-      (workInProgressRootRenderLanes = 0),
-      (exitStatus = workInProgressRootExitStatus));
-  if (0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes))
-    prepareFreshStack(root, 0);
-  else if (0 !== exitStatus) {
-    2 === exitStatus &&
-      ((executionContext |= 64),
+  var JSCompiler_inline_result =
+    0 !== (lanes & root.expiredLanes) ? !1 : 0 === (lanes & 30);
+  if (JSCompiler_inline_result && !didTimeout) {
+    didTimeout = lanes;
+    JSCompiler_inline_result = executionContext;
+    executionContext |= 8;
+    var prevDispatcher = pushDispatcher();
+    if (
+      workInProgressRoot !== root ||
+      workInProgressRootRenderLanes !== didTimeout
+    ) {
+      if (isDevToolsPresent) {
+        var memoizedUpdaters = root.memoizedUpdaters;
+        0 < memoizedUpdaters.size &&
+          (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+          memoizedUpdaters.clear());
+        movePendingFibersToMemoized(root, didTimeout);
+      }
+      workInProgressRootRenderTargetTime = now() + 500;
+      prepareFreshStack(root, didTimeout);
+    }
+    do
+      try {
+        workLoopConcurrent();
+        break;
+      } catch (thrownValue) {
+        handleError(root, thrownValue);
+      }
+    while (1);
+    resetContextDependencies();
+    ReactCurrentDispatcher$2.current = prevDispatcher;
+    executionContext = JSCompiler_inline_result;
+    null !== workInProgress
+      ? (didTimeout = 0)
+      : ((workInProgressRoot = null),
+        (workInProgressRootRenderLanes = 0),
+        (didTimeout = workInProgressRootExitStatus));
+  } else didTimeout = renderRootSync(root, lanes);
+  if (0 !== didTimeout) {
+    2 === didTimeout &&
+      ((executionContext |= 32),
       root.hydrate && (root.hydrate = !1),
-      (lanes = getLanesToRetrySynchronouslyOnError(root)),
-      0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
-    if (1 === exitStatus)
+      (JSCompiler_inline_result = getLanesToRetrySynchronouslyOnError(root)),
+      0 !== JSCompiler_inline_result &&
+        ((lanes = JSCompiler_inline_result),
+        (didTimeout = renderRootSync(root, JSCompiler_inline_result))));
+    if (1 === didTimeout)
       throw ((originalCallbackNode = workInProgressRootFatalError),
       prepareFreshStack(root, 0),
       markRootSuspended$1(root, lanes),
@@ -6224,7 +6660,7 @@ function performConcurrentWorkOnRoot(root) {
       originalCallbackNode);
     root.finishedWork = root.current.alternate;
     root.finishedLanes = lanes;
-    switch (exitStatus) {
+    switch (didTimeout) {
       case 0:
       case 1:
         throw Error("Root did not complete. This is a bug in React.");
@@ -6234,20 +6670,20 @@ function performConcurrentWorkOnRoot(root) {
       case 3:
         markRootSuspended$1(root, lanes);
         if (
-          (lanes & 62914560) === lanes &&
-          ((exitStatus = globalMostRecentFallbackTime + 500 - now()),
-          10 < exitStatus)
+          (lanes & 130023424) === lanes &&
+          ((didTimeout = globalMostRecentFallbackTime + 500 - now()),
+          10 < didTimeout)
         ) {
           if (0 !== getNextLanes(root, 0)) break;
-          prevDispatcher = root.suspendedLanes;
-          if ((prevDispatcher & lanes) !== lanes) {
+          JSCompiler_inline_result = root.suspendedLanes;
+          if ((JSCompiler_inline_result & lanes) !== lanes) {
             requestEventTime();
-            root.pingedLanes |= root.suspendedLanes & prevDispatcher;
+            root.pingedLanes |= root.suspendedLanes & JSCompiler_inline_result;
             break;
           }
           root.timeoutHandle = scheduleTimeout(
             commitRoot.bind(null, root),
-            exitStatus
+            didTimeout
           );
           break;
         }
@@ -6255,16 +6691,16 @@ function performConcurrentWorkOnRoot(root) {
         break;
       case 4:
         markRootSuspended$1(root, lanes);
-        if ((lanes & 4186112) === lanes) break;
-        exitStatus = root.eventTimes;
-        for (prevDispatcher = -1; 0 < lanes; ) {
-          var index$6 = 31 - clz32(lanes);
-          lanes$jscomp$0 = 1 << index$6;
-          index$6 = exitStatus[index$6];
-          index$6 > prevDispatcher && (prevDispatcher = index$6);
-          lanes &= ~lanes$jscomp$0;
-        }
-        lanes = prevDispatcher;
+        if ((lanes & 4194240) === lanes) break;
+        didTimeout = root.eventTimes;
+        for (JSCompiler_inline_result = -1; 0 < lanes; )
+          (memoizedUpdaters = 31 - clz32(lanes)),
+            (prevDispatcher = 1 << memoizedUpdaters),
+            (memoizedUpdaters = didTimeout[memoizedUpdaters]),
+            memoizedUpdaters > JSCompiler_inline_result &&
+              (JSCompiler_inline_result = memoizedUpdaters),
+            (lanes &= ~prevDispatcher);
+        lanes = JSCompiler_inline_result;
         lanes = now() - lanes;
         lanes =
           (120 > lanes
@@ -6307,33 +6743,28 @@ function markRootSuspended$1(root, suspendedLanes) {
   root.suspendedLanes |= suspendedLanes;
   root.pingedLanes &= ~suspendedLanes;
   for (root = root.expirationTimes; 0 < suspendedLanes; ) {
-    var index$11 = 31 - clz32(suspendedLanes),
-      lane = 1 << index$11;
-    root[index$11] = -1;
+    var index$7 = 31 - clz32(suspendedLanes),
+      lane = 1 << index$7;
+    root[index$7] = -1;
     suspendedLanes &= ~lane;
   }
 }
 function performSyncWorkOnRoot(root) {
-  if (0 !== (executionContext & 48))
+  currentUpdateIsNested = nestedUpdateScheduled;
+  nestedUpdateScheduled = !1;
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   flushPassiveEffects();
-  if (
-    root === workInProgressRoot &&
-    0 !== (root.expiredLanes & workInProgressRootRenderLanes)
-  ) {
-    var lanes = workInProgressRootRenderLanes;
-    var exitStatus = renderRootSync(root, lanes);
-    0 !== (workInProgressRootIncludedLanes & workInProgressRootUpdatedLanes) &&
-      ((lanes = getNextLanes(root, lanes)),
-      (exitStatus = renderRootSync(root, lanes)));
-  } else
-    (lanes = getNextLanes(root, 0)), (exitStatus = renderRootSync(root, lanes));
-  0 !== root.tag &&
-    2 === exitStatus &&
-    ((executionContext |= 64),
-    root.hydrate && (root.hydrate = !1),
-    (lanes = getLanesToRetrySynchronouslyOnError(root)),
-    0 !== lanes && (exitStatus = renderRootSync(root, lanes)));
+  var lanes = getNextLanes(root, 0);
+  if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null;
+  var exitStatus = renderRootSync(root, lanes);
+  if (0 !== root.tag && 2 === exitStatus) {
+    executionContext |= 32;
+    root.hydrate && (root.hydrate = !1);
+    var errorRetryLanes = getLanesToRetrySynchronouslyOnError(root);
+    0 !== errorRetryLanes &&
+      ((lanes = errorRetryLanes), (exitStatus = renderRootSync(root, lanes)));
+  }
   if (1 === exitStatus)
     throw ((exitStatus = workInProgressRootFatalError),
     prepareFreshStack(root, 0),
@@ -6346,11 +6777,6 @@ function performSyncWorkOnRoot(root) {
   ensureRootIsScheduled(root, now());
   return null;
 }
-function pushRenderLanes(fiber, lanes) {
-  push(subtreeRenderLanesCursor, subtreeRenderLanes);
-  subtreeRenderLanes |= lanes;
-  workInProgressRootIncludedLanes |= lanes;
-}
 function popRenderLanes() {
   subtreeRenderLanes = subtreeRenderLanesCursor.current;
   pop(subtreeRenderLanesCursor);
@@ -6390,21 +6816,39 @@ function prepareFreshStack(root, lanes) {
           pop(suspenseStackCursor);
           break;
         case 10:
-          popProvider(interruptedWork);
+          popProvider(interruptedWork.type._context);
           break;
+        case 22:
         case 23:
-        case 24:
           popRenderLanes();
       }
       timeoutHandle = timeoutHandle.return;
     }
   workInProgressRoot = root;
   workInProgress = createWorkInProgress(root.current, null);
-  workInProgressRootRenderLanes = subtreeRenderLanes = workInProgressRootIncludedLanes = lanes;
+  workInProgressRootRenderLanes = subtreeRenderLanes = lanes;
   workInProgressRootExitStatus = 0;
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootUpdatedLanes = workInProgressRootSkippedLanes = 0;
-  spawnedWorkDuringRender = null;
+  if (null !== interleavedQueues) {
+    for (root = 0; root < interleavedQueues.length; root++)
+      if (
+        ((lanes = interleavedQueues[root]),
+        (timeoutHandle = lanes.interleaved),
+        null !== timeoutHandle)
+      ) {
+        lanes.interleaved = null;
+        interruptedWork = timeoutHandle.next;
+        var lastPendingUpdate = lanes.pending;
+        if (null !== lastPendingUpdate) {
+          var firstPendingUpdate = lastPendingUpdate.next;
+          lastPendingUpdate.next = interruptedWork;
+          timeoutHandle.next = firstPendingUpdate;
+        }
+        lanes.pending = timeoutHandle;
+      }
+    interleavedQueues = null;
+  }
 }
 function handleError(root$jscomp$0, thrownValue) {
   do {
@@ -6434,7 +6878,7 @@ function handleError(root$jscomp$0, thrownValue) {
         workInProgress = null;
         break;
       }
-      erroredWork.mode & 8 &&
+      erroredWork.mode & 2 &&
         stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0);
       a: {
         var root = root$jscomp$0,
@@ -6442,15 +6886,19 @@ function handleError(root$jscomp$0, thrownValue) {
           sourceFiber = erroredWork,
           value = thrownValue;
         thrownValue = workInProgressRootRenderLanes;
-        sourceFiber.flags |= 4096;
-        sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+        sourceFiber.flags |= 8192;
+        isDevToolsPresent && restorePendingUpdaters(root, thrownValue);
         if (
           null !== value &&
           "object" === typeof value &&
           "function" === typeof value.then
         ) {
-          var wakeable = value;
-          if (0 === (sourceFiber.mode & 2)) {
+          var wakeable = value,
+            tag = sourceFiber.tag;
+          if (
+            0 === (sourceFiber.mode & 1) &&
+            (0 === tag || 11 === tag || 15 === tag)
+          ) {
             var currentSource = sourceFiber.alternate;
             currentSource
               ? ((sourceFiber.updateQueue = currentSource.updateQueue),
@@ -6461,15 +6909,15 @@ function handleError(root$jscomp$0, thrownValue) {
           }
           var hasInvisibleParentBoundary =
               0 !== (suspenseStackCursor.current & 1),
-            workInProgress$77 = returnFiber;
+            workInProgress$34 = returnFiber;
           do {
             var JSCompiler_temp;
-            if ((JSCompiler_temp = 13 === workInProgress$77.tag)) {
-              var nextState = workInProgress$77.memoizedState;
+            if ((JSCompiler_temp = 13 === workInProgress$34.tag)) {
+              var nextState = workInProgress$34.memoizedState;
               if (null !== nextState)
                 JSCompiler_temp = null !== nextState.dehydrated ? !0 : !1;
               else {
-                var props = workInProgress$77.memoizedProps;
+                var props = workInProgress$34.memoizedProps;
                 JSCompiler_temp =
                   void 0 === props.fallback
                     ? !1
@@ -6481,16 +6929,19 @@ function handleError(root$jscomp$0, thrownValue) {
               }
             }
             if (JSCompiler_temp) {
-              var wakeables = workInProgress$77.updateQueue;
+              var wakeables = workInProgress$34.updateQueue;
               if (null === wakeables) {
                 var updateQueue = new Set();
                 updateQueue.add(wakeable);
-                workInProgress$77.updateQueue = updateQueue;
+                workInProgress$34.updateQueue = updateQueue;
               } else wakeables.add(wakeable);
-              if (0 === (workInProgress$77.mode & 2)) {
-                workInProgress$77.flags |= 64;
+              if (
+                0 === (workInProgress$34.mode & 1) &&
+                workInProgress$34 !== returnFiber
+              ) {
+                workInProgress$34.flags |= 128;
                 sourceFiber.flags |= 32768;
-                sourceFiber.flags &= -5029;
+                sourceFiber.flags &= -10053;
                 if (1 === sourceFiber.tag)
                   if (null === sourceFiber.alternate) sourceFiber.tag = 17;
                   else {
@@ -6519,63 +6970,64 @@ function handleError(root$jscomp$0, thrownValue) {
                   wakeable,
                   sourceFiber
                 );
+                isDevToolsPresent && restorePendingUpdaters(root, sourceFiber);
                 wakeable.then(ping, ping);
               }
-              workInProgress$77.flags |= 8192;
-              workInProgress$77.lanes = thrownValue;
+              workInProgress$34.flags |= 16384;
+              workInProgress$34.lanes = thrownValue;
               break a;
             }
-            workInProgress$77 = workInProgress$77.return;
-          } while (null !== workInProgress$77);
+            workInProgress$34 = workInProgress$34.return;
+          } while (null !== workInProgress$34);
           value = Error(
-            (getComponentName(sourceFiber.type) || "A React component") +
+            (getComponentNameFromFiber(sourceFiber) || "A React component") +
               " suspended while rendering, but no fallback UI was specified.\n\nAdd a <Suspense fallback=...> component higher in the tree to provide a loading indicator or placeholder to display."
           );
         }
         5 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         value = createCapturedValue(value, sourceFiber);
-        workInProgress$77 = returnFiber;
+        workInProgress$34 = returnFiber;
         do {
-          switch (workInProgress$77.tag) {
+          switch (workInProgress$34.tag) {
             case 3:
               root = value;
-              workInProgress$77.flags |= 8192;
+              workInProgress$34.flags |= 16384;
               thrownValue &= -thrownValue;
-              workInProgress$77.lanes |= thrownValue;
-              var update$78 = createRootErrorUpdate(
-                workInProgress$77,
+              workInProgress$34.lanes |= thrownValue;
+              var update$35 = createRootErrorUpdate(
+                workInProgress$34,
                 root,
                 thrownValue
               );
-              enqueueCapturedUpdate(workInProgress$77, update$78);
+              enqueueCapturedUpdate(workInProgress$34, update$35);
               break a;
             case 1:
               root = value;
-              var ctor = workInProgress$77.type,
-                instance = workInProgress$77.stateNode;
+              var ctor = workInProgress$34.type,
+                instance = workInProgress$34.stateNode;
               if (
-                0 === (workInProgress$77.flags & 64) &&
+                0 === (workInProgress$34.flags & 128) &&
                 ("function" === typeof ctor.getDerivedStateFromError ||
                   (null !== instance &&
                     "function" === typeof instance.componentDidCatch &&
                     (null === legacyErrorBoundariesThatAlreadyFailed ||
                       !legacyErrorBoundariesThatAlreadyFailed.has(instance))))
               ) {
-                workInProgress$77.flags |= 8192;
+                workInProgress$34.flags |= 16384;
                 thrownValue &= -thrownValue;
-                workInProgress$77.lanes |= thrownValue;
-                var update$81 = createClassErrorUpdate(
-                  workInProgress$77,
+                workInProgress$34.lanes |= thrownValue;
+                var update$38 = createClassErrorUpdate(
+                  workInProgress$34,
                   root,
                   thrownValue
                 );
-                enqueueCapturedUpdate(workInProgress$77, update$81);
+                enqueueCapturedUpdate(workInProgress$34, update$38);
                 break a;
               }
           }
-          workInProgress$77 = workInProgress$77.return;
-        } while (null !== workInProgress$77);
+          workInProgress$34 = workInProgress$34.return;
+        } while (null !== workInProgress$34);
       }
       completeUnitOfWork(erroredWork);
     } catch (yetAnotherThrownValue) {
@@ -6593,18 +7045,20 @@ function pushDispatcher() {
   ReactCurrentDispatcher$2.current = ContextOnlyDispatcher;
   return null === prevDispatcher ? ContextOnlyDispatcher : prevDispatcher;
 }
-function pushInteractions(root) {
-  var prevInteractions = tracing.__interactionsRef.current;
-  tracing.__interactionsRef.current = root.memoizedInteractions;
-  return prevInteractions;
-}
 function renderRootSync(root, lanes) {
   var prevExecutionContext = executionContext;
-  executionContext |= 16;
+  executionContext |= 8;
   var prevDispatcher = pushDispatcher();
-  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes)
-    prepareFreshStack(root, lanes), startWorkOnPendingInteractions(root, lanes);
-  lanes = pushInteractions(root);
+  if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) {
+    if (isDevToolsPresent) {
+      var memoizedUpdaters = root.memoizedUpdaters;
+      0 < memoizedUpdaters.size &&
+        (restorePendingUpdaters(root, workInProgressRootRenderLanes),
+        memoizedUpdaters.clear());
+      movePendingFibersToMemoized(root, lanes);
+    }
+    prepareFreshStack(root, lanes);
+  }
   do
     try {
       workLoopSync();
@@ -6614,7 +7068,6 @@ function renderRootSync(root, lanes) {
     }
   while (1);
   resetContextDependencies();
-  tracing.__interactionsRef.current = lanes;
   executionContext = prevExecutionContext;
   ReactCurrentDispatcher$2.current = prevDispatcher;
   if (null !== workInProgress)
@@ -6629,12 +7082,12 @@ function workLoopSync() {
   for (; null !== workInProgress; ) performUnitOfWork(workInProgress);
 }
 function workLoopConcurrent() {
-  for (; null !== workInProgress && !Scheduler_shouldYield(); )
+  for (; null !== workInProgress && !shouldYield(); )
     performUnitOfWork(workInProgress);
 }
 function performUnitOfWork(unitOfWork) {
   var current = unitOfWork.alternate;
-  0 !== (unitOfWork.mode & 8)
+  0 !== (unitOfWork.mode & 2)
     ? ((profilerStartTime = now$1()),
       0 > unitOfWork.actualStartTime && (unitOfWork.actualStartTime = now$1()),
       (current = beginWork$1(current, unitOfWork, subtreeRenderLanes)),
@@ -6651,8 +7104,8 @@ function completeUnitOfWork(unitOfWork) {
   do {
     var current = completedWork.alternate;
     unitOfWork = completedWork.return;
-    if (0 === (completedWork.flags & 4096)) {
-      if (0 === (completedWork.mode & 8))
+    if (0 === (completedWork.flags & 8192)) {
+      if (0 === (completedWork.mode & 2))
         current = completeWork(current, completedWork, subtreeRenderLanes);
       else {
         var fiber = completedWork;
@@ -6665,65 +7118,14 @@ function completeUnitOfWork(unitOfWork) {
         workInProgress = current;
         return;
       }
-      current = completedWork;
-      if (
-        (24 !== current.tag && 23 !== current.tag) ||
-        null === current.memoizedState ||
-        0 !== (subtreeRenderLanes & 1073741824) ||
-        0 === (current.mode & 4)
-      ) {
-        fiber = 0;
-        if (0 !== (current.mode & 8)) {
-          for (
-            var actualDuration = current.actualDuration,
-              treeBaseDuration = current.selfBaseDuration,
-              shouldBubbleActualDurations =
-                null === current.alternate ||
-                current.child !== current.alternate.child,
-              child = current.child;
-            null !== child;
-
-          )
-            (fiber |= child.lanes | child.childLanes),
-              shouldBubbleActualDurations &&
-                (actualDuration += child.actualDuration),
-              (treeBaseDuration += child.treeBaseDuration),
-              (child = child.sibling);
-          13 === current.tag &&
-            null !== current.memoizedState &&
-            ((shouldBubbleActualDurations = current.child),
-            null !== shouldBubbleActualDurations &&
-              (treeBaseDuration -=
-                shouldBubbleActualDurations.treeBaseDuration));
-          current.actualDuration = actualDuration;
-          current.treeBaseDuration = treeBaseDuration;
-        } else
-          for (actualDuration = current.child; null !== actualDuration; )
-            (fiber |= actualDuration.lanes | actualDuration.childLanes),
-              (actualDuration = actualDuration.sibling);
-        current.childLanes = fiber;
-      }
-      null !== unitOfWork &&
-        0 === (unitOfWork.flags & 4096) &&
-        (null === unitOfWork.firstEffect &&
-          (unitOfWork.firstEffect = completedWork.firstEffect),
-        null !== completedWork.lastEffect &&
-          (null !== unitOfWork.lastEffect &&
-            (unitOfWork.lastEffect.nextEffect = completedWork.firstEffect),
-          (unitOfWork.lastEffect = completedWork.lastEffect)),
-        1 < completedWork.flags &&
-          (null !== unitOfWork.lastEffect
-            ? (unitOfWork.lastEffect.nextEffect = completedWork)
-            : (unitOfWork.firstEffect = completedWork),
-          (unitOfWork.lastEffect = completedWork)));
     } else {
       current = unwindWork(completedWork);
       if (null !== current) {
-        current.flags &= 4095;
+        current.flags &= 8191;
         workInProgress = current;
         return;
       }
-      if (0 !== (completedWork.mode & 8)) {
+      if (0 !== (completedWork.mode & 2)) {
         stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1);
         current = completedWork.actualDuration;
         for (fiber = completedWork.child; null !== fiber; )
@@ -6731,8 +7133,9 @@ function completeUnitOfWork(unitOfWork) {
         completedWork.actualDuration = current;
       }
       null !== unitOfWork &&
-        ((unitOfWork.firstEffect = unitOfWork.lastEffect = null),
-        (unitOfWork.flags |= 4096));
+        ((unitOfWork.flags |= 8192),
+        (unitOfWork.subtreeFlags = 0),
+        (unitOfWork.deletions = null));
     }
     completedWork = completedWork.sibling;
     if (null !== completedWork) {
@@ -6744,14 +7147,22 @@ function completeUnitOfWork(unitOfWork) {
   0 === workInProgressRootExitStatus && (workInProgressRootExitStatus = 5);
 }
 function commitRoot(root) {
-  var renderPriorityLevel = getCurrentPriorityLevel();
-  runWithPriority(99, commitRootImpl.bind(null, root, renderPriorityLevel));
+  var previousUpdateLanePriority = currentUpdatePriority,
+    prevTransition = ReactCurrentBatchConfig$2.transition;
+  try {
+    (ReactCurrentBatchConfig$2.transition = 0),
+      (currentUpdatePriority = 1),
+      commitRootImpl(root, previousUpdateLanePriority);
+  } finally {
+    (ReactCurrentBatchConfig$2.transition = prevTransition),
+      (currentUpdatePriority = previousUpdateLanePriority);
+  }
   return null;
 }
 function commitRootImpl(root, renderPriorityLevel) {
   do flushPassiveEffects();
   while (null !== rootWithPendingPassiveEffects);
-  if (0 !== (executionContext & 48))
+  if (0 !== (executionContext & 24))
     throw Error("Should not already be working.");
   var finishedWork = root.finishedWork,
     lanes = root.finishedLanes;
@@ -6763,304 +7174,276 @@ function commitRootImpl(root, renderPriorityLevel) {
       "Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue."
     );
   root.callbackNode = null;
-  var remainingLanes = finishedWork.lanes | finishedWork.childLanes,
-    remainingLanes$jscomp$0 = remainingLanes,
-    noLongerPendingLanes = root.pendingLanes & ~remainingLanes$jscomp$0;
-  root.pendingLanes = remainingLanes$jscomp$0;
-  root.suspendedLanes = 0;
-  root.pingedLanes = 0;
-  root.expiredLanes &= remainingLanes$jscomp$0;
-  root.mutableReadLanes &= remainingLanes$jscomp$0;
-  root.entangledLanes &= remainingLanes$jscomp$0;
-  remainingLanes$jscomp$0 = root.entanglements;
-  for (
-    var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes;
-    0 < noLongerPendingLanes;
-
-  ) {
-    var index$12 = 31 - clz32(noLongerPendingLanes),
-      lane = 1 << index$12;
-    remainingLanes$jscomp$0[index$12] = 0;
-    eventTimes[index$12] = -1;
-    expirationTimes[index$12] = -1;
-    noLongerPendingLanes &= ~lane;
-  }
-  null !== rootsWithPendingDiscreteUpdates &&
-    0 === (remainingLanes & 24) &&
-    rootsWithPendingDiscreteUpdates.has(root) &&
-    rootsWithPendingDiscreteUpdates.delete(root);
+  root.callbackPriority = 0;
+  var remainingLanes = finishedWork.lanes | finishedWork.childLanes;
+  markRootFinished(root, remainingLanes);
   root === workInProgressRoot &&
     ((workInProgress = workInProgressRoot = null),
     (workInProgressRootRenderLanes = 0));
-  1 < finishedWork.flags
-    ? null !== finishedWork.lastEffect
-      ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-        (remainingLanes = finishedWork.firstEffect))
-      : (remainingLanes = finishedWork)
-    : (remainingLanes = finishedWork.firstEffect);
-  if (null !== remainingLanes) {
-    remainingLanes$jscomp$0 = executionContext;
-    executionContext |= 32;
-    eventTimes = pushInteractions(root);
-    focusedInstanceHandle = ReactCurrentOwner$2.current = null;
-    shouldFireAfterActiveInstanceBlur = !1;
-    nextEffect = remainingLanes;
-    do
-      try {
-        commitBeforeMutationEffects();
-      } catch (error) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    focusedInstanceHandle = null;
+  (0 === (finishedWork.subtreeFlags & 1040) &&
+    0 === (finishedWork.flags & 1040)) ||
+    rootDoesHavePassiveEffects ||
+    ((rootDoesHavePassiveEffects = !0),
+    scheduleCallback(NormalPriority, function() {
+      flushPassiveEffects();
+      return null;
+    }));
+  remainingLanes = 0 !== (finishedWork.flags & 8054);
+  if (0 !== (finishedWork.subtreeFlags & 8054) || remainingLanes) {
+    remainingLanes = ReactCurrentBatchConfig$2.transition;
+    ReactCurrentBatchConfig$2.transition = 0;
+    var previousPriority = currentUpdatePriority;
+    currentUpdatePriority = 1;
+    var prevExecutionContext = executionContext;
+    executionContext |= 16;
+    ReactCurrentOwner$2.current = null;
+    commitBeforeMutationEffects(root, finishedWork);
     commitTime = now$1();
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (expirationTimes = root; null !== nextEffect; ) {
-          var flags = nextEffect.flags;
-          if (flags & 128) {
-            var current = nextEffect.alternate;
-            if (null !== current) {
-              var currentRef = current.ref;
-              null !== currentRef &&
-                ("function" === typeof currentRef
-                  ? currentRef(null)
-                  : (currentRef.current = null));
-            }
-          }
-          switch (flags & 1038) {
-            case 2:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              break;
-            case 6:
-              commitPlacement(nextEffect);
-              nextEffect.flags &= -3;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 1024:
-              nextEffect.flags &= -1025;
-              break;
-            case 1028:
-              nextEffect.flags &= -1025;
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 4:
-              commitWork(nextEffect.alternate, nextEffect);
-              break;
-            case 8:
-              noLongerPendingLanes = nextEffect;
-              unmountHostComponents(expirationTimes, noLongerPendingLanes);
-              var alternate = noLongerPendingLanes.alternate;
-              detachFiberMutation(noLongerPendingLanes);
-              null !== alternate && detachFiberMutation(alternate);
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$91) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$91);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
+    commitMutationEffects(root, finishedWork, lanes);
     root.current = finishedWork;
-    nextEffect = remainingLanes;
-    do
-      try {
-        for (flags = root; null !== nextEffect; ) {
-          var flags$jscomp$0 = nextEffect.flags;
-          flags$jscomp$0 & 36 &&
-            commitLifeCycles(flags, nextEffect.alternate, nextEffect);
-          if (flags$jscomp$0 & 128) {
-            current = void 0;
-            var ref = nextEffect.ref;
-            if (null !== ref) {
-              var instance = nextEffect.stateNode;
-              switch (nextEffect.tag) {
-                case 5:
-                  current = instance;
-                  break;
-                default:
-                  current = instance;
-              }
-              "function" === typeof ref
-                ? ref(current)
-                : (ref.current = current);
-            }
-          }
-          nextEffect = nextEffect.nextEffect;
-        }
-      } catch (error$92) {
-        if (null === nextEffect) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(nextEffect, error$92);
-        nextEffect = nextEffect.nextEffect;
-      }
-    while (null !== nextEffect);
-    nextEffect = null;
+    commitLayoutEffects(finishedWork, root, lanes);
     requestPaint();
-    tracing.__interactionsRef.current = eventTimes;
-    executionContext = remainingLanes$jscomp$0;
+    executionContext = prevExecutionContext;
+    currentUpdatePriority = previousPriority;
+    ReactCurrentBatchConfig$2.transition = remainingLanes;
   } else (root.current = finishedWork), (commitTime = now$1());
-  if ((flags$jscomp$0 = rootDoesHavePassiveEffects))
-    (rootDoesHavePassiveEffects = !1),
-      (rootWithPendingPassiveEffects = root),
-      (pendingPassiveEffectsLanes = lanes),
-      (pendingPassiveEffectsRenderPriority = renderPriorityLevel);
-  else
-    for (nextEffect = remainingLanes; null !== nextEffect; )
-      (ref = nextEffect.nextEffect),
-        (nextEffect.nextEffect = null),
-        nextEffect.flags & 8 &&
-          ((instance = nextEffect),
-          (instance.sibling = null),
-          (instance.stateNode = null)),
-        (nextEffect = ref);
+  rootDoesHavePassiveEffects &&
+    ((rootDoesHavePassiveEffects = !1),
+    (rootWithPendingPassiveEffects = root),
+    (pendingPassiveEffectsLanes = lanes));
   remainingLanes = root.pendingLanes;
-  if (0 !== remainingLanes) {
-    if (null !== spawnedWorkDuringRender)
-      for (
-        ref = spawnedWorkDuringRender,
-          spawnedWorkDuringRender = null,
-          instance = 0;
-        instance < ref.length;
-        instance++
-      )
-        scheduleInteractions(root, ref[instance], root.memoizedInteractions);
-    schedulePendingInteractions(root, remainingLanes);
-  } else legacyErrorBoundariesThatAlreadyFailed = null;
-  flags$jscomp$0 || finishPendingInteractions(root, lanes);
-  1 === remainingLanes
-    ? root === rootWithNestedUpdates
-      ? nestedUpdateCount++
-      : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))
+  0 === remainingLanes && (legacyErrorBoundariesThatAlreadyFailed = null);
+  0 !== (remainingLanes & 1)
+    ? ((nestedUpdateScheduled = !0),
+      root === rootWithNestedUpdates
+        ? nestedUpdateCount++
+        : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)))
     : (nestedUpdateCount = 0);
-  finishedWork = finishedWork.stateNode;
-  if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot)
-    try {
-      injectedHook.onCommitFiberRoot(
-        rendererID,
-        finishedWork,
-        renderPriorityLevel,
-        64 === (finishedWork.current.flags & 64)
-      );
-    } catch (err) {}
+  onCommitRoot(finishedWork.stateNode, renderPriorityLevel);
+  isDevToolsPresent && root.memoizedUpdaters.clear();
   ensureRootIsScheduled(root, now());
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
     (firstUncaughtError = null),
     root);
-  if (0 !== (executionContext & 8)) return null;
-  flushSyncCallbackQueue();
+  if (0 !== (executionContext & 4)) return null;
+  0 !== (pendingPassiveEffectsLanes & 1) &&
+    0 !== root.tag &&
+    flushPassiveEffects();
+  flushSyncCallbacks();
   return null;
 }
-function commitBeforeMutationEffects() {
-  for (; null !== nextEffect; ) {
-    var current = nextEffect.alternate;
-    shouldFireAfterActiveInstanceBlur ||
-      null === focusedInstanceHandle ||
-      (0 !== (nextEffect.flags & 8)
-        ? doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0)
-        : 13 === nextEffect.tag &&
-          isSuspenseBoundaryBeingHidden(current, nextEffect) &&
-          doesFiberContain(nextEffect, focusedInstanceHandle) &&
-          (shouldFireAfterActiveInstanceBlur = !0));
-    var flags = nextEffect.flags;
-    0 !== (flags & 256) && commitBeforeMutationLifeCycles(current, nextEffect);
-    0 === (flags & 512) ||
-      rootDoesHavePassiveEffects ||
-      ((rootDoesHavePassiveEffects = !0),
-      scheduleCallback(97, function() {
-        flushPassiveEffects();
-        return null;
-      }));
-    nextEffect = nextEffect.nextEffect;
-  }
-}
 function flushPassiveEffects() {
-  if (90 !== pendingPassiveEffectsRenderPriority) {
-    var priorityLevel =
-      97 < pendingPassiveEffectsRenderPriority
-        ? 97
-        : pendingPassiveEffectsRenderPriority;
-    pendingPassiveEffectsRenderPriority = 90;
-    return runWithPriority(priorityLevel, flushPassiveEffectsImpl);
+  if (null !== rootWithPendingPassiveEffects) {
+    var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes),
+      prevTransition = ReactCurrentBatchConfig$2.transition,
+      previousPriority = currentUpdatePriority;
+    try {
+      ReactCurrentBatchConfig$2.transition = 0;
+      currentUpdatePriority = 16 > renderPriority ? 16 : renderPriority;
+      if (null === rootWithPendingPassiveEffects)
+        var JSCompiler_inline_result = !1;
+      else {
+        renderPriority = rootWithPendingPassiveEffects;
+        rootWithPendingPassiveEffects = null;
+        pendingPassiveEffectsLanes = 0;
+        if (0 !== (executionContext & 24))
+          throw Error("Cannot flush passive effects while already rendering.");
+        var prevExecutionContext = executionContext;
+        executionContext |= 16;
+        for (nextEffect = renderPriority.current; null !== nextEffect; ) {
+          var fiber = nextEffect,
+            child = fiber.child;
+          if (0 !== (nextEffect.flags & 16)) {
+            var deletions = fiber.deletions;
+            if (null !== deletions) {
+              for (var i = 0; i < deletions.length; i++) {
+                var fiberToDelete = deletions[i];
+                for (nextEffect = fiberToDelete; null !== nextEffect; ) {
+                  var fiber$jscomp$0 = nextEffect,
+                    current = fiber$jscomp$0;
+                  switch (current.tag) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      current.mode & 2
+                        ? ((passiveEffectStartTime = now$1()),
+                          commitHookEffectListUnmount(4, current, fiber),
+                          recordPassiveEffectDuration(current))
+                        : commitHookEffectListUnmount(4, current, fiber);
+                  }
+                  var child$jscomp$0 = fiber$jscomp$0.child;
+                  if (null !== child$jscomp$0)
+                    (child$jscomp$0.return = fiber$jscomp$0),
+                      (nextEffect = child$jscomp$0);
+                  else
+                    for (; null !== nextEffect; ) {
+                      fiber$jscomp$0 = nextEffect;
+                      var sibling = fiber$jscomp$0.sibling,
+                        returnFiber = fiber$jscomp$0.return;
+                      detachFiberAfterEffects(fiber$jscomp$0);
+                      if (fiber$jscomp$0 === fiberToDelete) {
+                        nextEffect = null;
+                        break;
+                      }
+                      if (null !== sibling) {
+                        sibling.return = returnFiber;
+                        nextEffect = sibling;
+                        break;
+                      }
+                      nextEffect = returnFiber;
+                    }
+                }
+              }
+              var previousFiber = fiber.alternate;
+              if (null !== previousFiber) {
+                var detachedChild = previousFiber.child;
+                if (null !== detachedChild) {
+                  previousFiber.child = null;
+                  do {
+                    var detachedSibling = detachedChild.sibling;
+                    detachedChild.sibling = null;
+                    detachedChild = detachedSibling;
+                  } while (null !== detachedChild);
+                }
+              }
+              nextEffect = fiber;
+            }
+          }
+          if (0 !== (fiber.subtreeFlags & 1040) && null !== child)
+            (child.return = fiber), (nextEffect = child);
+          else
+            b: for (; null !== nextEffect; ) {
+              fiber = nextEffect;
+              if (0 !== (fiber.flags & 1024))
+                switch (((i = fiber), i.tag)) {
+                  case 0:
+                  case 11:
+                  case 15:
+                    i.mode & 2
+                      ? ((passiveEffectStartTime = now$1()),
+                        commitHookEffectListUnmount(5, i, i.return),
+                        recordPassiveEffectDuration(i))
+                      : commitHookEffectListUnmount(5, i, i.return);
+                }
+              var sibling$jscomp$0 = fiber.sibling;
+              if (null !== sibling$jscomp$0) {
+                sibling$jscomp$0.return = fiber.return;
+                nextEffect = sibling$jscomp$0;
+                break b;
+              }
+              nextEffect = fiber.return;
+            }
+        }
+        var finishedWork = renderPriority.current;
+        for (nextEffect = finishedWork; null !== nextEffect; ) {
+          child = nextEffect;
+          var firstChild = child.child;
+          if (0 !== (child.subtreeFlags & 1040) && null !== firstChild)
+            (firstChild.return = child), (nextEffect = firstChild);
+          else
+            b: for (child = finishedWork; null !== nextEffect; ) {
+              deletions = nextEffect;
+              if (0 !== (deletions.flags & 1024))
+                try {
+                  switch (((fiberToDelete = deletions), fiberToDelete.tag)) {
+                    case 0:
+                    case 11:
+                    case 15:
+                      if (fiberToDelete.mode & 2) {
+                        passiveEffectStartTime = now$1();
+                        try {
+                          commitHookEffectListMount(5, fiberToDelete);
+                        } finally {
+                          recordPassiveEffectDuration(fiberToDelete);
+                        }
+                      } else commitHookEffectListMount(5, fiberToDelete);
+                  }
+                } catch (error) {
+                  captureCommitPhaseError(deletions, deletions.return, error);
+                }
+              if (deletions === child) {
+                nextEffect = null;
+                break b;
+              }
+              var sibling$jscomp$1 = deletions.sibling;
+              if (null !== sibling$jscomp$1) {
+                sibling$jscomp$1.return = deletions.return;
+                nextEffect = sibling$jscomp$1;
+                break b;
+              }
+              nextEffect = deletions.return;
+            }
+        }
+        finishedWork = pendingPassiveProfilerEffects;
+        pendingPassiveProfilerEffects = [];
+        for (firstChild = 0; firstChild < finishedWork.length; firstChild++) {
+          var finishedWork$jscomp$0 = finishedWork[firstChild];
+          if (0 !== (finishedWork$jscomp$0.flags & 4))
+            switch (finishedWork$jscomp$0.tag) {
+              case 12:
+                var passiveEffectDuration =
+                    finishedWork$jscomp$0.stateNode.passiveEffectDuration,
+                  _finishedWork$memoize = finishedWork$jscomp$0.memoizedProps,
+                  id = _finishedWork$memoize.id,
+                  onPostCommit = _finishedWork$memoize.onPostCommit;
+                sibling$jscomp$1 = commitTime;
+                var phase =
+                  null === finishedWork$jscomp$0.alternate ? "mount" : "update";
+                currentUpdateIsNested && (phase = "nested-update");
+                "function" === typeof onPostCommit &&
+                  onPostCommit(
+                    id,
+                    phase,
+                    passiveEffectDuration,
+                    sibling$jscomp$1
+                  );
+                var parentFiber = finishedWork$jscomp$0.return;
+                b: for (; null !== parentFiber; ) {
+                  switch (parentFiber.tag) {
+                    case 3:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                    case 12:
+                      parentFiber.stateNode.passiveEffectDuration += passiveEffectDuration;
+                      break b;
+                  }
+                  parentFiber = parentFiber.return;
+                }
+            }
+        }
+        executionContext = prevExecutionContext;
+        flushSyncCallbacks();
+        if (
+          injectedHook &&
+          "function" === typeof injectedHook.onPostCommitFiberRoot
+        )
+          try {
+            injectedHook.onPostCommitFiberRoot(rendererID, renderPriority);
+          } catch (err) {}
+        var stateNode = renderPriority.current.stateNode;
+        stateNode.effectDuration = 0;
+        stateNode.passiveEffectDuration = 0;
+        JSCompiler_inline_result = !0;
+      }
+      return JSCompiler_inline_result;
+    } finally {
+      (currentUpdatePriority = previousPriority),
+        (ReactCurrentBatchConfig$2.transition = prevTransition);
+    }
   }
   return !1;
 }
-function enqueuePendingPassiveHookEffectMount(fiber, effect) {
-  pendingPassiveHookEffectsMount.push(effect, fiber);
+function enqueuePendingPassiveProfilerEffect(fiber) {
+  pendingPassiveProfilerEffects.push(fiber);
   rootDoesHavePassiveEffects ||
     ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
+    scheduleCallback(NormalPriority, function() {
       flushPassiveEffects();
       return null;
     }));
 }
-function enqueuePendingPassiveHookEffectUnmount(fiber, effect) {
-  pendingPassiveHookEffectsUnmount.push(effect, fiber);
-  rootDoesHavePassiveEffects ||
-    ((rootDoesHavePassiveEffects = !0),
-    scheduleCallback(97, function() {
-      flushPassiveEffects();
-      return null;
-    }));
-}
-function flushPassiveEffectsImpl() {
-  if (null === rootWithPendingPassiveEffects) return !1;
-  var root = rootWithPendingPassiveEffects,
-    lanes = pendingPassiveEffectsLanes;
-  rootWithPendingPassiveEffects = null;
-  pendingPassiveEffectsLanes = 0;
-  if (0 !== (executionContext & 48))
-    throw Error("Cannot flush passive effects while already rendering.");
-  var prevExecutionContext = executionContext;
-  executionContext |= 32;
-  var prevInteractions = pushInteractions(root),
-    unmountEffects = pendingPassiveHookEffectsUnmount;
-  pendingPassiveHookEffectsUnmount = [];
-  for (var i = 0; i < unmountEffects.length; i += 2) {
-    var effect$97 = unmountEffects[i],
-      fiber = unmountEffects[i + 1],
-      destroy = effect$97.destroy;
-    effect$97.destroy = void 0;
-    if ("function" === typeof destroy)
-      try {
-        destroy();
-      } catch (error) {
-        if (null === fiber) throw Error("Should be working on an effect.");
-        captureCommitPhaseError(fiber, error);
-      }
-  }
-  unmountEffects = pendingPassiveHookEffectsMount;
-  pendingPassiveHookEffectsMount = [];
-  for (i = 0; i < unmountEffects.length; i += 2) {
-    effect$97 = unmountEffects[i];
-    fiber = unmountEffects[i + 1];
-    try {
-      var create$101 = effect$97.create;
-      effect$97.destroy = create$101();
-    } catch (error$102) {
-      if (null === fiber) throw Error("Should be working on an effect.");
-      captureCommitPhaseError(fiber, error$102);
-    }
-  }
-  for (unmountEffects = root.current.firstEffect; null !== unmountEffects; )
-    (create$101 = unmountEffects.nextEffect),
-      (unmountEffects.nextEffect = null),
-      unmountEffects.flags & 8 &&
-        ((unmountEffects.sibling = null), (unmountEffects.stateNode = null)),
-      (unmountEffects = create$101);
-  tracing.__interactionsRef.current = prevInteractions;
-  finishPendingInteractions(root, lanes);
-  executionContext = prevExecutionContext;
-  flushSyncCallbackQueue();
-  return !0;
-}
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   sourceFiber = createCapturedValue(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
@@ -7069,46 +7452,52 @@ function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
   rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
-    ensureRootIsScheduled(rootFiber, sourceFiber),
-    schedulePendingInteractions(rootFiber, 1));
+    ensureRootIsScheduled(rootFiber, sourceFiber));
 }
-function captureCommitPhaseError(sourceFiber, error) {
+function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
   if (3 === sourceFiber.tag)
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
   else
-    for (var fiber = sourceFiber.return; null !== fiber; ) {
-      if (3 === fiber.tag) {
-        captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
+    for (
+      nearestMountedAncestor = sourceFiber.return;
+      null !== nearestMountedAncestor;
+
+    ) {
+      if (3 === nearestMountedAncestor.tag) {
+        captureCommitPhaseErrorOnRoot(
+          nearestMountedAncestor,
+          sourceFiber,
+          error
+        );
         break;
-      } else if (1 === fiber.tag) {
-        var instance = fiber.stateNode;
+      } else if (1 === nearestMountedAncestor.tag) {
+        var instance = nearestMountedAncestor.stateNode;
         if (
-          "function" === typeof fiber.type.getDerivedStateFromError ||
+          "function" ===
+            typeof nearestMountedAncestor.type.getDerivedStateFromError ||
           ("function" === typeof instance.componentDidCatch &&
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
           sourceFiber = createCapturedValue(error, sourceFiber);
-          var update = createClassErrorUpdate(fiber, sourceFiber, 1);
-          enqueueUpdate(fiber, update);
-          update = requestEventTime();
-          fiber = markUpdateLaneFromFiberToRoot(fiber, 1);
-          if (null !== fiber)
-            markRootUpdated(fiber, 1, update),
-              ensureRootIsScheduled(fiber, update),
-              schedulePendingInteractions(fiber, 1);
-          else if (
-            "function" === typeof instance.componentDidCatch &&
-            (null === legacyErrorBoundariesThatAlreadyFailed ||
-              !legacyErrorBoundariesThatAlreadyFailed.has(instance))
-          )
-            try {
-              instance.componentDidCatch(error, sourceFiber);
-            } catch (errorToIgnore) {}
+          sourceFiber = createClassErrorUpdate(
+            nearestMountedAncestor,
+            sourceFiber,
+            1
+          );
+          enqueueUpdate(nearestMountedAncestor, sourceFiber);
+          sourceFiber = requestEventTime();
+          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+            nearestMountedAncestor,
+            1
+          );
+          null !== nearestMountedAncestor &&
+            (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
+            ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
           break;
         }
       }
-      fiber = fiber.return;
+      nearestMountedAncestor = nearestMountedAncestor.return;
     }
 }
 function pingSuspendedRoot(root, wakeable, pingedLanes) {
@@ -7120,34 +7509,28 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) {
     (workInProgressRootRenderLanes & pingedLanes) === pingedLanes &&
     (4 === workInProgressRootExitStatus ||
     (3 === workInProgressRootExitStatus &&
-      (workInProgressRootRenderLanes & 62914560) ===
+      (workInProgressRootRenderLanes & 130023424) ===
         workInProgressRootRenderLanes &&
       500 > now() - globalMostRecentFallbackTime)
       ? prepareFreshStack(root, 0)
       : (workInProgressRootPingedLanes |= pingedLanes));
   ensureRootIsScheduled(root, wakeable);
-  schedulePendingInteractions(root, pingedLanes);
 }
 function resolveRetryWakeable(boundaryFiber, wakeable) {
   var retryCache = boundaryFiber.stateNode;
   null !== retryCache && retryCache.delete(wakeable);
   wakeable = 0;
   0 === wakeable &&
-    ((wakeable = boundaryFiber.mode),
-    0 === (wakeable & 2)
+    (0 === (boundaryFiber.mode & 1)
       ? (wakeable = 1)
-      : 0 === (wakeable & 4)
-      ? (wakeable = 99 === getCurrentPriorityLevel() ? 1 : 2)
-      : (0 === currentEventWipLanes &&
-          (currentEventWipLanes = workInProgressRootIncludedLanes),
-        (wakeable = getHighestPriorityLane(62914560 & ~currentEventWipLanes)),
-        0 === wakeable && (wakeable = 4194304)));
+      : ((wakeable = nextRetryLane),
+        (nextRetryLane <<= 1),
+        0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304)));
   retryCache = requestEventTime();
   boundaryFiber = markUpdateLaneFromFiberToRoot(boundaryFiber, wakeable);
   null !== boundaryFiber &&
     (markRootUpdated(boundaryFiber, wakeable, retryCache),
-    ensureRootIsScheduled(boundaryFiber, retryCache),
-    schedulePendingInteractions(boundaryFiber, wakeable));
+    ensureRootIsScheduled(boundaryFiber, retryCache));
 }
 var beginWork$1;
 beginWork$1 = function(current, workInProgress, renderLanes) {
@@ -7158,85 +7541,90 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       didPerformWorkStackCursor.current
     )
       didReceiveUpdate = !0;
-    else if (0 !== (renderLanes & updateLanes))
-      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     else {
-      didReceiveUpdate = !1;
-      switch (workInProgress.tag) {
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        case 5:
-          pushHostContext(workInProgress);
-          break;
-        case 1:
-          isContextProvider(workInProgress.type) &&
-            pushContextProvider(workInProgress);
-          break;
-        case 4:
-          pushHostContainer(
-            workInProgress,
-            workInProgress.stateNode.containerInfo
-          );
-          break;
-        case 10:
-          updateLanes = workInProgress.memoizedProps.value;
-          var context = workInProgress.type._context;
-          push(valueCursor, context._currentValue);
-          context._currentValue = updateLanes;
-          break;
-        case 12:
-          0 !== (renderLanes & workInProgress.childLanes) &&
-            (workInProgress.flags |= 4);
-          updateLanes = workInProgress.stateNode;
-          updateLanes.effectDuration = 0;
-          updateLanes.passiveEffectDuration = 0;
-          break;
-        case 13:
-          if (null !== workInProgress.memoizedState) {
-            if (0 !== (renderLanes & workInProgress.child.childLanes))
-              return updateSuspenseComponent(
-                current,
-                workInProgress,
-                renderLanes
-              );
-            push(suspenseStackCursor, suspenseStackCursor.current & 1);
-            workInProgress = bailoutOnAlreadyFinishedWork(
-              current,
+      if (0 === (renderLanes & updateLanes)) {
+        didReceiveUpdate = !1;
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 5:
+            pushHostContext(workInProgress);
+            break;
+          case 1:
+            isContextProvider(workInProgress.type) &&
+              pushContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
               workInProgress,
-              renderLanes
+              workInProgress.stateNode.containerInfo
             );
-            return null !== workInProgress ? workInProgress.sibling : null;
-          }
-          push(suspenseStackCursor, suspenseStackCursor.current & 1);
-          break;
-        case 19:
-          updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
-          if (0 !== (current.flags & 64)) {
-            if (updateLanes)
-              return updateSuspenseListComponent(
+            break;
+          case 10:
+            updateLanes = workInProgress.type._context;
+            var nextValue = workInProgress.memoizedProps.value;
+            push(valueCursor, updateLanes._currentValue);
+            updateLanes._currentValue = nextValue;
+            break;
+          case 12:
+            0 !== (renderLanes & workInProgress.childLanes) &&
+              (workInProgress.flags |= 4);
+            updateLanes = workInProgress.stateNode;
+            updateLanes.effectDuration = 0;
+            updateLanes.passiveEffectDuration = 0;
+            break;
+          case 13:
+            if (null !== workInProgress.memoizedState) {
+              if (0 !== (renderLanes & workInProgress.child.childLanes))
+                return updateSuspenseComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              push(suspenseStackCursor, suspenseStackCursor.current & 1);
+              workInProgress = bailoutOnAlreadyFinishedWork(
                 current,
                 workInProgress,
                 renderLanes
               );
-            workInProgress.flags |= 64;
-          }
-          context = workInProgress.memoizedState;
-          null !== context &&
-            ((context.rendering = null),
-            (context.tail = null),
-            (context.lastEffect = null));
-          push(suspenseStackCursor, suspenseStackCursor.current);
-          if (updateLanes) break;
-          else return null;
-        case 23:
-        case 24:
-          return (
-            (workInProgress.lanes = 0),
-            updateOffscreenComponent(current, workInProgress, renderLanes)
-          );
+              return null !== workInProgress ? workInProgress.sibling : null;
+            }
+            push(suspenseStackCursor, suspenseStackCursor.current & 1);
+            break;
+          case 19:
+            updateLanes = 0 !== (renderLanes & workInProgress.childLanes);
+            if (0 !== (current.flags & 128)) {
+              if (updateLanes)
+                return updateSuspenseListComponent(
+                  current,
+                  workInProgress,
+                  renderLanes
+                );
+              workInProgress.flags |= 128;
+            }
+            nextValue = workInProgress.memoizedState;
+            null !== nextValue &&
+              ((nextValue.rendering = null),
+              (nextValue.tail = null),
+              (nextValue.lastEffect = null));
+            push(suspenseStackCursor, suspenseStackCursor.current);
+            if (updateLanes) break;
+            else return null;
+          case 22:
+          case 23:
+            return (
+              (workInProgress.lanes = 0),
+              updateOffscreenComponent(current, workInProgress, renderLanes)
+            );
+        }
+        return bailoutOnAlreadyFinishedWork(
+          current,
+          workInProgress,
+          renderLanes
+        );
       }
-      return bailoutOnAlreadyFinishedWork(current, workInProgress, renderLanes);
+      didReceiveUpdate = 0 !== (current.flags & 32768) ? !0 : !1;
     }
   else didReceiveUpdate = !1;
   workInProgress.lanes = 0;
@@ -7248,22 +7636,22 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         (workInProgress.alternate = null),
         (workInProgress.flags |= 2));
       current = workInProgress.pendingProps;
-      context = getMaskedContext(workInProgress, contextStackCursor.current);
+      nextValue = getMaskedContext(workInProgress, contextStackCursor.current);
       prepareToReadContext(workInProgress, renderLanes);
-      context = renderWithHooks(
+      nextValue = renderWithHooks(
         null,
         workInProgress,
         updateLanes,
         current,
-        context,
+        nextValue,
         renderLanes
       );
       workInProgress.flags |= 1;
       if (
-        "object" === typeof context &&
-        null !== context &&
-        "function" === typeof context.render &&
-        void 0 === context.$$typeof
+        "object" === typeof nextValue &&
+        null !== nextValue &&
+        "function" === typeof nextValue.render &&
+        void 0 === nextValue.$$typeof
       ) {
         workInProgress.tag = 1;
         workInProgress.memoizedState = null;
@@ -7273,21 +7661,13 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           pushContextProvider(workInProgress);
         } else hasContext = !1;
         workInProgress.memoizedState =
-          null !== context.state && void 0 !== context.state
-            ? context.state
+          null !== nextValue.state && void 0 !== nextValue.state
+            ? nextValue.state
             : null;
         initializeUpdateQueue(workInProgress);
-        var getDerivedStateFromProps = updateLanes.getDerivedStateFromProps;
-        "function" === typeof getDerivedStateFromProps &&
-          applyDerivedStateFromProps(
-            workInProgress,
-            updateLanes,
-            getDerivedStateFromProps,
-            current
-          );
-        context.updater = classComponentUpdater;
-        workInProgress.stateNode = context;
-        context._reactInternals = workInProgress;
+        nextValue.updater = classComponentUpdater;
+        workInProgress.stateNode = nextValue;
+        nextValue._reactInternals = workInProgress;
         mountClassInstance(workInProgress, updateLanes, current, renderLanes);
         workInProgress = finishClassComponent(
           null,
@@ -7299,28 +7679,28 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         );
       } else
         (workInProgress.tag = 0),
-          reconcileChildren(null, workInProgress, context, renderLanes),
+          reconcileChildren(null, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child);
       return workInProgress;
     case 16:
-      context = workInProgress.elementType;
+      nextValue = workInProgress.elementType;
       a: {
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
           (workInProgress.flags |= 2));
         current = workInProgress.pendingProps;
-        hasContext = context._init;
-        context = hasContext(context._payload);
-        workInProgress.type = context;
-        hasContext = workInProgress.tag = resolveLazyComponentTag(context);
-        current = resolveDefaultProps(context, current);
+        hasContext = nextValue._init;
+        nextValue = hasContext(nextValue._payload);
+        workInProgress.type = nextValue;
+        hasContext = workInProgress.tag = resolveLazyComponentTag(nextValue);
+        current = resolveDefaultProps(nextValue, current);
         switch (hasContext) {
           case 0:
             workInProgress = updateFunctionComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7329,7 +7709,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateClassComponent(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7338,7 +7718,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateForwardRef(
               null,
               workInProgress,
-              context,
+              nextValue,
               current,
               renderLanes
             );
@@ -7347,8 +7727,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             workInProgress = updateMemoComponent(
               null,
               workInProgress,
-              context,
-              resolveDefaultProps(context.type, current),
+              nextValue,
+              resolveDefaultProps(nextValue.type, current),
               updateLanes,
               renderLanes
             );
@@ -7356,7 +7736,7 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         }
         throw Error(
           "Element type is invalid. Received a promise that resolves to: " +
-            context +
+            nextValue +
             ". Lazy element type must resolve to a class or function."
         );
       }
@@ -7364,32 +7744,32 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 0:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateFunctionComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
     case 1:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateClassComponent(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7400,19 +7780,18 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
         throw Error(
           "If the root does not have an updateQueue, we should have already bailed out. This error is likely caused by a bug in React. Please file an issue."
         );
-      updateLanes = workInProgress.pendingProps;
-      context = workInProgress.memoizedState;
-      context = null !== context ? context.element : null;
-      cloneUpdateQueue(current, workInProgress);
-      processUpdateQueue(workInProgress, updateLanes, null, renderLanes);
+      nextValue = workInProgress.pendingProps;
       updateLanes = workInProgress.memoizedState.element;
-      updateLanes === context
+      cloneUpdateQueue(current, workInProgress);
+      processUpdateQueue(workInProgress, nextValue, null, renderLanes);
+      nextValue = workInProgress.memoizedState.element;
+      nextValue === updateLanes
         ? (workInProgress = bailoutOnAlreadyFinishedWork(
             current,
             workInProgress,
             renderLanes
           ))
-        : (reconcileChildren(current, workInProgress, updateLanes, renderLanes),
+        : (reconcileChildren(current, workInProgress, nextValue, renderLanes),
           (workInProgress = workInProgress.child));
       return workInProgress;
     case 5:
@@ -7452,16 +7831,16 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 11:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         updateForwardRef(
           current,
           workInProgress,
           updateLanes,
-          context,
+          nextValue,
           renderLanes
         )
       );
@@ -7502,27 +7881,15 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 10:
       a: {
         updateLanes = workInProgress.type._context;
-        context = workInProgress.pendingProps;
-        getDerivedStateFromProps = workInProgress.memoizedProps;
-        hasContext = context.value;
-        var context$jscomp$0 = workInProgress.type._context;
-        push(valueCursor, context$jscomp$0._currentValue);
-        context$jscomp$0._currentValue = hasContext;
-        if (null !== getDerivedStateFromProps)
-          if (
-            ((context$jscomp$0 = getDerivedStateFromProps.value),
-            (hasContext = objectIs(context$jscomp$0, hasContext)
-              ? 0
-              : ("function" === typeof updateLanes._calculateChangedBits
-                  ? updateLanes._calculateChangedBits(
-                      context$jscomp$0,
-                      hasContext
-                    )
-                  : 1073741823) | 0),
-            0 === hasContext)
-          ) {
+        nextValue = workInProgress.pendingProps;
+        hasContext = workInProgress.memoizedProps;
+        var newValue = nextValue.value;
+        push(valueCursor, updateLanes._currentValue);
+        updateLanes._currentValue = newValue;
+        if (null !== hasContext)
+          if (objectIs(hasContext.value, newValue)) {
             if (
-              getDerivedStateFromProps.children === context.children &&
+              hasContext.children === nextValue.children &&
               !didPerformWorkStackCursor.current
             ) {
               workInProgress = bailoutOnAlreadyFinishedWork(
@@ -7534,76 +7901,71 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
             }
           } else
             for (
-              context$jscomp$0 = workInProgress.child,
-                null !== context$jscomp$0 &&
-                  (context$jscomp$0.return = workInProgress);
-              null !== context$jscomp$0;
+              newValue = workInProgress.child,
+                null !== newValue && (newValue.return = workInProgress);
+              null !== newValue;
 
             ) {
-              var list = context$jscomp$0.dependencies;
+              var list = newValue.dependencies;
               if (null !== list) {
-                getDerivedStateFromProps = context$jscomp$0.child;
+                hasContext = newValue.child;
                 for (
                   var dependency = list.firstContext;
                   null !== dependency;
 
                 ) {
-                  if (
-                    dependency.context === updateLanes &&
-                    0 !== (dependency.observedBits & hasContext)
-                  ) {
-                    1 === context$jscomp$0.tag &&
-                      ((dependency = createUpdate(
-                        -1,
-                        renderLanes & -renderLanes
-                      )),
-                      (dependency.tag = 2),
-                      enqueueUpdate(context$jscomp$0, dependency));
-                    context$jscomp$0.lanes |= renderLanes;
-                    dependency = context$jscomp$0.alternate;
+                  if (dependency.context === updateLanes) {
+                    if (1 === newValue.tag) {
+                      dependency = createUpdate(-1, renderLanes & -renderLanes);
+                      dependency.tag = 2;
+                      var updateQueue = newValue.updateQueue;
+                      if (null !== updateQueue) {
+                        updateQueue = updateQueue.shared;
+                        var pending = updateQueue.pending;
+                        null === pending
+                          ? (dependency.next = dependency)
+                          : ((dependency.next = pending.next),
+                            (pending.next = dependency));
+                        updateQueue.pending = dependency;
+                      }
+                    }
+                    newValue.lanes |= renderLanes;
+                    dependency = newValue.alternate;
                     null !== dependency && (dependency.lanes |= renderLanes);
-                    scheduleWorkOnParentPath(
-                      context$jscomp$0.return,
-                      renderLanes
-                    );
+                    scheduleWorkOnParentPath(newValue.return, renderLanes);
                     list.lanes |= renderLanes;
                     break;
                   }
                   dependency = dependency.next;
                 }
               } else
-                getDerivedStateFromProps =
-                  10 === context$jscomp$0.tag
-                    ? context$jscomp$0.type === workInProgress.type
+                hasContext =
+                  10 === newValue.tag
+                    ? newValue.type === workInProgress.type
                       ? null
-                      : context$jscomp$0.child
-                    : context$jscomp$0.child;
-              if (null !== getDerivedStateFromProps)
-                getDerivedStateFromProps.return = context$jscomp$0;
+                      : newValue.child
+                    : newValue.child;
+              if (null !== hasContext) hasContext.return = newValue;
               else
-                for (
-                  getDerivedStateFromProps = context$jscomp$0;
-                  null !== getDerivedStateFromProps;
-
-                ) {
-                  if (getDerivedStateFromProps === workInProgress) {
-                    getDerivedStateFromProps = null;
+                for (hasContext = newValue; null !== hasContext; ) {
+                  if (hasContext === workInProgress) {
+                    hasContext = null;
                     break;
                   }
-                  context$jscomp$0 = getDerivedStateFromProps.sibling;
-                  if (null !== context$jscomp$0) {
-                    context$jscomp$0.return = getDerivedStateFromProps.return;
-                    getDerivedStateFromProps = context$jscomp$0;
+                  newValue = hasContext.sibling;
+                  if (null !== newValue) {
+                    newValue.return = hasContext.return;
+                    hasContext = newValue;
                     break;
                   }
-                  getDerivedStateFromProps = getDerivedStateFromProps.return;
+                  hasContext = hasContext.return;
                 }
-              context$jscomp$0 = getDerivedStateFromProps;
+              newValue = hasContext;
             }
         reconcileChildren(
           current,
           workInProgress,
-          context.children,
+          nextValue.children,
           renderLanes
         );
         workInProgress = workInProgress.child;
@@ -7611,28 +7973,27 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       return workInProgress;
     case 9:
       return (
-        (context = workInProgress.type),
-        (hasContext = workInProgress.pendingProps),
-        (updateLanes = hasContext.children),
+        (nextValue = workInProgress.type),
+        (updateLanes = workInProgress.pendingProps.children),
         prepareToReadContext(workInProgress, renderLanes),
-        (context = readContext(context, hasContext.unstable_observedBits)),
-        (updateLanes = updateLanes(context)),
+        (nextValue = readContext(nextValue)),
+        (updateLanes = updateLanes(nextValue)),
         (workInProgress.flags |= 1),
         reconcileChildren(current, workInProgress, updateLanes, renderLanes),
         workInProgress.child
       );
     case 14:
       return (
-        (context = workInProgress.type),
+        (nextValue = workInProgress.type),
         (hasContext = resolveDefaultProps(
-          context,
+          nextValue,
           workInProgress.pendingProps
         )),
-        (hasContext = resolveDefaultProps(context.type, hasContext)),
+        (hasContext = resolveDefaultProps(nextValue.type, hasContext)),
         updateMemoComponent(
           current,
           workInProgress,
-          context,
+          nextValue,
           hasContext,
           updateLanes,
           renderLanes
@@ -7650,11 +8011,11 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
     case 17:
       return (
         (updateLanes = workInProgress.type),
-        (context = workInProgress.pendingProps),
-        (context =
+        (nextValue = workInProgress.pendingProps),
+        (nextValue =
           workInProgress.elementType === updateLanes
-            ? context
-            : resolveDefaultProps(updateLanes, context)),
+            ? nextValue
+            : resolveDefaultProps(updateLanes, nextValue)),
         null !== current &&
           ((current.alternate = null),
           (workInProgress.alternate = null),
@@ -7664,8 +8025,8 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
           ? ((current = !0), pushContextProvider(workInProgress))
           : (current = !1),
         prepareToReadContext(workInProgress, renderLanes),
-        constructClassInstance(workInProgress, updateLanes, context),
-        mountClassInstance(workInProgress, updateLanes, context, renderLanes),
+        constructClassInstance(workInProgress, updateLanes, nextValue),
+        mountClassInstance(workInProgress, updateLanes, nextValue, renderLanes),
         finishClassComponent(
           null,
           workInProgress,
@@ -7677,9 +8038,9 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       );
     case 19:
       return updateSuspenseListComponent(current, workInProgress, renderLanes);
-    case 23:
+    case 22:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
-    case 24:
+    case 23:
       return updateOffscreenComponent(current, workInProgress, renderLanes);
   }
   throw Error(
@@ -7688,92 +8049,11 @@ beginWork$1 = function(current, workInProgress, renderLanes) {
       "). This error is likely caused by a bug in React. Please file an issue."
   );
 };
-function markSpawnedWork(lane) {
-  null === spawnedWorkDuringRender
-    ? (spawnedWorkDuringRender = [lane])
-    : spawnedWorkDuringRender.push(lane);
-}
-function scheduleInteractions(root, lane, interactions) {
-  if (0 < interactions.size) {
-    var pendingInteractionMap = root.pendingInteractionMap,
-      pendingInteractions = pendingInteractionMap.get(lane);
-    null != pendingInteractions
-      ? interactions.forEach(function(interaction) {
-          pendingInteractions.has(interaction) || interaction.__count++;
-          pendingInteractions.add(interaction);
-        })
-      : (pendingInteractionMap.set(lane, new Set(interactions)),
-        interactions.forEach(function(interaction) {
-          interaction.__count++;
-        }));
-    pendingInteractionMap = tracing.__subscriberRef.current;
-    if (null !== pendingInteractionMap)
-      pendingInteractionMap.onWorkScheduled(
-        interactions,
-        1e3 * lane + root.interactionThreadID
-      );
-  }
-}
-function schedulePendingInteractions(root, lane) {
-  scheduleInteractions(root, lane, tracing.__interactionsRef.current);
-}
-function startWorkOnPendingInteractions(root, lanes) {
-  var interactions = new Set();
-  root.pendingInteractionMap.forEach(function(
-    scheduledInteractions,
-    scheduledLane
-  ) {
-    0 !== (lanes & scheduledLane) &&
-      scheduledInteractions.forEach(function(interaction) {
-        return interactions.add(interaction);
-      });
-  });
-  root.memoizedInteractions = interactions;
-  if (0 < interactions.size) {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber) {
-      root = 1e3 * lanes + root.interactionThreadID;
-      try {
-        subscriber.onWorkStarted(interactions, root);
-      } catch (error) {
-        scheduleCallback(99, function() {
-          throw error;
-        });
-      }
-    }
-  }
-}
-function finishPendingInteractions(root, committedLanes) {
-  var remainingLanesAfterCommit = root.pendingLanes;
-  try {
-    var subscriber = tracing.__subscriberRef.current;
-    if (null !== subscriber && 0 < root.memoizedInteractions.size)
-      subscriber.onWorkStopped(
-        root.memoizedInteractions,
-        1e3 * committedLanes + root.interactionThreadID
-      );
-  } catch (error) {
-    scheduleCallback(99, function() {
-      throw error;
-    });
-  } finally {
-    var pendingInteractionMap = root.pendingInteractionMap;
-    pendingInteractionMap.forEach(function(scheduledInteractions, lane) {
-      0 === (remainingLanesAfterCommit & lane) &&
-        (pendingInteractionMap.delete(lane),
-        scheduledInteractions.forEach(function(interaction) {
-          interaction.__count--;
-          if (null !== subscriber && 0 === interaction.__count)
-            try {
-              subscriber.onInteractionScheduledWorkCompleted(interaction);
-            } catch (error$103) {
-              scheduleCallback(99, function() {
-                throw error$103;
-              });
-            }
-        }));
+function restorePendingUpdaters(root, lanes) {
+  isDevToolsPresent &&
+    root.memoizedUpdaters.forEach(function(schedulingFiber) {
+      addFiberToLanesMap(root, schedulingFiber, lanes);
     });
-  }
 }
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
@@ -7784,8 +8064,8 @@ function FiberNode(tag, pendingProps, key, mode) {
   this.pendingProps = pendingProps;
   this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null;
   this.mode = mode;
-  this.flags = 0;
-  this.lastEffect = this.firstEffect = this.nextEffect = null;
+  this.subtreeFlags = this.flags = 0;
+  this.deletions = null;
   this.childLanes = this.lanes = 0;
   this.alternate = null;
   this.actualDuration = 0;
@@ -7826,11 +8106,11 @@ function createWorkInProgress(current, pendingProps) {
     : ((workInProgress.pendingProps = pendingProps),
       (workInProgress.type = current.type),
       (workInProgress.flags = 0),
-      (workInProgress.nextEffect = null),
-      (workInProgress.firstEffect = null),
-      (workInProgress.lastEffect = null),
+      (workInProgress.subtreeFlags = 0),
+      (workInProgress.deletions = null),
       (workInProgress.actualDuration = 0),
       (workInProgress.actualStartTime = -1));
+  workInProgress.flags = current.flags & 1835008;
   workInProgress.childLanes = current.childLanes;
   workInProgress.lanes = current.lanes;
   workInProgress.child = current.child;
@@ -7867,17 +8147,16 @@ function createFiberFromTypeAndProps(
         return createFiberFromFragment(pendingProps.children, mode, lanes, key);
       case REACT_DEBUG_TRACING_MODE_TYPE:
         fiberTag = 8;
-        mode |= 16;
+        mode |= 4;
         break;
       case REACT_STRICT_MODE_TYPE:
         fiberTag = 8;
-        mode |= 1;
+        mode |= 8;
         break;
       case REACT_PROFILER_TYPE:
         return (
-          (type = createFiber(12, pendingProps, key, mode | 8)),
+          (type = createFiber(12, pendingProps, key, mode | 2)),
           (type.elementType = REACT_PROFILER_TYPE),
-          (type.type = REACT_PROFILER_TYPE),
           (type.lanes = lanes),
           (type.stateNode = { effectDuration: 0, passiveEffectDuration: 0 }),
           type
@@ -7885,7 +8164,6 @@ function createFiberFromTypeAndProps(
       case REACT_SUSPENSE_TYPE:
         return (
           (type = createFiber(13, pendingProps, key, mode)),
-          (type.type = REACT_SUSPENSE_TYPE),
           (type.elementType = REACT_SUSPENSE_TYPE),
           (type.lanes = lanes),
           type
@@ -7901,7 +8179,7 @@ function createFiberFromTypeAndProps(
         return createFiberFromOffscreen(pendingProps, mode, lanes, key);
       case REACT_LEGACY_HIDDEN_TYPE:
         return (
-          (type = createFiber(24, pendingProps, key, mode)),
+          (type = createFiber(23, pendingProps, key, mode)),
           (type.elementType = REACT_LEGACY_HIDDEN_TYPE),
           (type.lanes = lanes),
           type
@@ -7925,9 +8203,6 @@ function createFiberFromTypeAndProps(
               fiberTag = 16;
               owner = null;
               break a;
-            case REACT_BLOCK_TYPE:
-              fiberTag = 22;
-              break a;
           }
         throw Error(
           "Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) but got: " +
@@ -7947,7 +8222,7 @@ function createFiberFromFragment(elements, mode, lanes, key) {
   return elements;
 }
 function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
-  pendingProps = createFiber(23, pendingProps, key, mode);
+  pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
   return pendingProps;
@@ -7985,9 +8260,10 @@ function FiberRootNode(containerInfo, tag, hydrate) {
   this.expirationTimes = createLaneMap(-1);
   this.entangledLanes = this.finishedLanes = this.mutableReadLanes = this.expiredLanes = this.pingedLanes = this.suspendedLanes = this.pendingLanes = 0;
   this.entanglements = createLaneMap(0);
-  this.interactionThreadID = tracing.unstable_getThreadID();
-  this.memoizedInteractions = new Set();
-  this.pendingInteractionMap = new Map();
+  this.passiveEffectDuration = this.effectDuration = 0;
+  this.memoizedUpdaters = new Set();
+  containerInfo = this.pendingUpdatersLaneMap = [];
+  for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set());
 }
 function createPortal(children, containerInfo, implementation) {
   var key =
@@ -8069,7 +8345,8 @@ function updateContainer(element, container, parentComponent, callback) {
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
   enqueueUpdate(current, container);
-  scheduleUpdateOnFiber(current, lane, eventTime);
+  element = scheduleUpdateOnFiber(current, lane, eventTime);
+  null !== element && entangleTransitions(element, current, lane);
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -8104,14 +8381,14 @@ batchedUpdatesImpl = function(fn, a) {
     (executionContext = prevExecutionContext),
       0 === executionContext &&
         ((workInProgressRootRenderTargetTime = now() + 500),
-        flushSyncCallbackQueue());
+        includesLegacySyncCallbacks && flushSyncCallbacks());
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_930 = {
+  devToolsConfig$jscomp$inline_1013 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "17.0.1-4e5d7faf5",
+    version: "18.0.0-experimental-568dc3532",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -8126,17 +8403,18 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1148 = {
-  bundleType: devToolsConfig$jscomp$inline_930.bundleType,
-  version: devToolsConfig$jscomp$inline_930.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_930.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_930.rendererConfig,
+var internals$jscomp$inline_1287 = {
+  bundleType: devToolsConfig$jscomp$inline_1013.bundleType,
+  version: devToolsConfig$jscomp$inline_1013.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_1013.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_1013.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
   overrideProps: null,
   overridePropsDeletePath: null,
   overridePropsRenamePath: null,
+  setErrorHandler: null,
   setSuspenseHandler: null,
   scheduleUpdate: null,
   currentDispatcherRef: ReactSharedInternals.ReactCurrentDispatcher,
@@ -8145,25 +8423,26 @@ var internals$jscomp$inline_1148 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_930.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_1013.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
-  getCurrentFiber: null
+  getCurrentFiber: null,
+  reconcilerVersion: "18.0.0-experimental-568dc3532"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1149 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1288 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1149.isDisabled &&
-    hook$jscomp$inline_1149.supportsFiber
+    !hook$jscomp$inline_1288.isDisabled &&
+    hook$jscomp$inline_1288.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1149.inject(
-        internals$jscomp$inline_1148
+      (rendererID = hook$jscomp$inline_1288.inject(
+        internals$jscomp$inline_1287
       )),
-        (injectedHook = hook$jscomp$inline_1149);
+        (injectedHook = hook$jscomp$inline_1288);
     } catch (err) {}
 }
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
@@ -8213,7 +8492,7 @@ exports.render = function(element, containerTag, callback) {
   if (!root) {
     root = new FiberRootNode(containerTag, 0, !1);
     var JSCompiler_inline_result = 0;
-    isDevToolsPresent && (JSCompiler_inline_result |= 8);
+    isDevToolsPresent && (JSCompiler_inline_result |= 2);
     JSCompiler_inline_result = createFiber(
       3,
       null,
@@ -8222,6 +8501,7 @@ exports.render = function(element, containerTag, callback) {
     );
     root.current = JSCompiler_inline_result;
     JSCompiler_inline_result.stateNode = root;
+    JSCompiler_inline_result.memoizedState = { element: null };
     initializeUpdateQueue(JSCompiler_inline_result);
     roots.set(containerTag, root);
   }
@@ -8237,6 +8517,18 @@ exports.render = function(element, containerTag, callback) {
   else element = null;
   return element;
 };
+exports.sendAccessibilityEvent = function(handle, eventType) {
+  null != handle._nativeTag &&
+    (handle._internalInstanceHandle
+      ? nativeFabricUIManager.sendAccessibilityEvent(
+          handle._internalInstanceHandle.stateNode.node,
+          eventType
+        )
+      : ReactNativePrivateInterface.legacySendAccessibilityEvent(
+          handle._nativeTag,
+          eventType
+        ));
+};
 exports.unmountComponentAtNode = unmountComponentAtNode;
 exports.unmountComponentAtNodeAndRemoveContainer = function(containerTag) {
   unmountComponentAtNode(containerTag);
diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index 536ce9a6f30b65..3af1555124545f 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -6,14 +6,16 @@
  *
  * @format
  * @flow
+ * @generated SignedSource<<40f01afd3b6d95a617ac8e48748a2a76>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';
 
 import {BatchedBridge} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
 
-// TODO @sema: Adjust types
-import type {ReactNativeType} from './ReactNativeTypes';
+import type {ReactFabricType} from './ReactNativeTypes';
 
 let ReactFabric;
 
@@ -29,4 +31,4 @@ if (global.RN$Bridgeless) {
   BatchedBridge.registerCallableModule('ReactFabric', ReactFabric);
 }
 
-module.exports = (ReactFabric: ReactNativeType);
+module.exports = (ReactFabric: ReactFabricType);
diff --git a/Libraries/Renderer/shims/ReactFeatureFlags.js b/Libraries/Renderer/shims/ReactFeatureFlags.js
index 13c548b4bb1e82..45ce2c7a94df55 100644
--- a/Libraries/Renderer/shims/ReactFeatureFlags.js
+++ b/Libraries/Renderer/shims/ReactFeatureFlags.js
@@ -6,6 +6,9 @@
  *
  * @format
  * @flow strict-local
+ * @generated SignedSource<<bed66083565ac46f6de032dd8f2d6814>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';
diff --git a/Libraries/Renderer/shims/ReactNative.js b/Libraries/Renderer/shims/ReactNative.js
index 9f471e4107a7ee..f0c54b8d13b6a4 100644
--- a/Libraries/Renderer/shims/ReactNative.js
+++ b/Libraries/Renderer/shims/ReactNative.js
@@ -6,6 +6,9 @@
  *
  * @format
  * @flow
+ * @generated SignedSource<<fd14f2375864691ea971c77ac6088e4b>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';
diff --git a/Libraries/Renderer/shims/ReactNativeTypes.js b/Libraries/Renderer/shims/ReactNativeTypes.js
index 150db2c8f24f36..f3eae7bb1dd653 100644
--- a/Libraries/Renderer/shims/ReactNativeTypes.js
+++ b/Libraries/Renderer/shims/ReactNativeTypes.js
@@ -5,10 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow
+ * @flow strict
+ * @generated SignedSource<<67969011689de134487d7110b6519058>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
-import type {ElementRef, AbstractComponent} from 'react';
+import type {ElementRef, ElementType, Element, AbstractComponent} from 'react';
 
 export type MeasureOnSuccessCallback = (
   x: number,
@@ -33,51 +36,68 @@ export type MeasureLayoutOnSuccessCallback = (
   height: number,
 ) => void;
 
-type AttributeType =
+export type AttributeType<T, V> =
   | true
   | $ReadOnly<{|
-      diff?: <T>(arg1: T, arg2: T) => boolean,
-      process?: (arg1: any) => any,
+      diff?: (arg1: T, arg2: T) => boolean,
+      process?: (arg1: V) => T,
     |}>;
 
-export type AttributeConfiguration<
-  TProps = string,
-  TStyleProps = string,
-> = $ReadOnly<{
-  [propName: TProps]: AttributeType,
-  style: $ReadOnly<{[propName: TStyleProps]: AttributeType, ...}>,
+// We either force that `diff` and `process` always use mixed,
+// or we allow them to define specific types and use this hack
+export type AnyAttributeType = AttributeType<$FlowFixMe, $FlowFixMe>;
+
+export type AttributeConfiguration = $ReadOnly<{
+  [propName: string]: AnyAttributeType,
+  style: $ReadOnly<{
+    [propName: string]: AnyAttributeType,
+    ...,
+  }>,
+  ...
+}>;
+
+export type PartialAttributeConfiguration = $ReadOnly<{
+  [propName: string]: AnyAttributeType,
+  style?: $ReadOnly<{
+    [propName: string]: AnyAttributeType,
+    ...,
+  }>,
   ...
 }>;
 
-export type ReactNativeBaseComponentViewConfig<
-  TProps = string,
-  TStyleProps = string,
-> = $ReadOnly<{|
-  baseModuleName?: string,
+export type ViewConfig = $ReadOnly<{
+  Commands?: $ReadOnly<{[commandName: string]: number, ...}>,
+  Constants?: $ReadOnly<{[name: string]: mixed, ...}>,
+  Manager?: string,
+  NativeProps?: $ReadOnly<{[propName: string]: string, ...}>,
+  baseModuleName?: ?string,
   bubblingEventTypes?: $ReadOnly<{
-    [eventName: string]: $ReadOnly<{|
-      phasedRegistrationNames: $ReadOnly<{|
+    [eventName: string]: $ReadOnly<{
+      phasedRegistrationNames: $ReadOnly<{
         captured: string,
         bubbled: string,
-      |}>,
-    |}>,
+      }>,
+    }>,
     ...,
   }>,
-  Commands?: $ReadOnly<{[commandName: string]: number, ...}>,
   directEventTypes?: $ReadOnly<{
-    [eventName: string]: $ReadOnly<{|
+    [eventName: string]: $ReadOnly<{
       registrationName: string,
-    |}>,
+    }>,
     ...,
   }>,
-  NativeProps?: $ReadOnly<{[propName: string]: string, ...}>,
   uiViewClassName: string,
-  validAttributes: AttributeConfiguration<TProps, TStyleProps>,
-|}>;
+  validAttributes: AttributeConfiguration,
+}>;
 
-export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig<>;
+export type PartialViewConfig = $ReadOnly<{
+  bubblingEventTypes?: $PropertyType<ViewConfig, 'bubblingEventTypes'>,
+  directEventTypes?: $PropertyType<ViewConfig, 'directEventTypes'>,
+  uiViewClassName: string,
+  validAttributes?: PartialAttributeConfiguration,
+}>;
 
-export type NativeMethods = {
+export type NativeMethods = $ReadOnly<{|
   blur(): void,
   focus(): void,
   onKeyDown(): void,
@@ -89,9 +109,8 @@ export type NativeMethods = {
     onSuccess: MeasureLayoutOnSuccessCallback,
     onFail?: () => void,
   ): void,
-  setNativeProps(nativeProps: Object): void,
-  ...
-};
+  setNativeProps(nativeProps: {...}): void,
+|}>;
 
 export type HostComponent<T> = AbstractComponent<T, $ReadOnly<NativeMethods>>;
 
@@ -113,9 +132,11 @@ type InspectorDataSource = $ReadOnly<{|
 |}>;
 
 type InspectorDataGetter = (
-  (componentOrHandle: any) => ?number,
+  <TElementType: ElementType>(
+    componentOrHandle: ElementRef<TElementType> | number,
+  ) => ?number,
 ) => $ReadOnly<{|
-  measure: Function,
+  measure: (callback: MeasureOnSuccessCallback) => void,
   props: InspectorDataProps,
   source: InspectorDataSource,
 |}>;
@@ -147,52 +168,72 @@ export type TouchedViewDataAtPoint = $ReadOnly<{|
  * Provide minimal Flow typing for the high-level RN API and call it a day.
  */
 export type ReactNativeType = {
-  findHostInstance_DEPRECATED(
-    componentOrHandle: any,
+  findHostInstance_DEPRECATED<TElementType: ElementType>(
+    componentOrHandle: ?(ElementRef<TElementType> | number),
   ): ?ElementRef<HostComponent<mixed>>,
-  findNodeHandle(componentOrHandle: any): ?number,
-  dispatchCommand(handle: any, command: string, args: Array<any>): void,
+  findNodeHandle<TElementType: ElementType>(
+    componentOrHandle: ?(ElementRef<TElementType> | number),
+  ): ?number,
+  dispatchCommand(
+    handle: ElementRef<HostComponent<mixed>>,
+    command: string,
+    args: Array<mixed>,
+  ): void,
+  sendAccessibilityEvent(
+    handle: ElementRef<HostComponent<mixed>>,
+    eventType: string,
+  ): void,
   render(
-    element: React$Element<any>,
-    containerTag: any,
-    callback: ?Function,
-  ): any,
-  unmountComponentAtNode(containerTag: number): any,
-  unmountComponentAtNodeAndRemoveContainer(containerTag: number): any,
-  // TODO (bvaughn) Add types
-  unstable_batchedUpdates: any,
+    element: Element<ElementType>,
+    containerTag: number,
+    callback: ?() => void,
+  ): ?ElementRef<ElementType>,
+  unmountComponentAtNode(containerTag: number): void,
+  unmountComponentAtNodeAndRemoveContainer(containerTag: number): void,
+  unstable_batchedUpdates: <T>(fn: (T) => void, bookkeeping: T) => void,
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: SecretInternalsType,
   ...
 };
 
 export type ReactFabricType = {
-  findHostInstance_DEPRECATED(
-    componentOrHandle: any,
+  findHostInstance_DEPRECATED<TElementType: ElementType>(
+    componentOrHandle: ?(ElementRef<TElementType> | number),
   ): ?ElementRef<HostComponent<mixed>>,
-  findNodeHandle(componentOrHandle: any): ?number,
-  dispatchCommand(handle: any, command: string, args: Array<any>): void,
+  findNodeHandle<TElementType: ElementType>(
+    componentOrHandle: ?(ElementRef<TElementType> | number),
+  ): ?number,
+  dispatchCommand(
+    handle: ElementRef<HostComponent<mixed>>,
+    command: string,
+    args: Array<mixed>,
+  ): void,
+  sendAccessibilityEvent(
+    handle: ElementRef<HostComponent<mixed>>,
+    eventType: string,
+  ): void,
   render(
-    element: React$Element<any>,
-    containerTag: any,
-    callback: ?Function,
-  ): any,
-  unmountComponentAtNode(containerTag: number): any,
+    element: Element<ElementType>,
+    containerTag: number,
+    callback: ?() => void,
+    concurrentRoot: ?boolean,
+  ): ?ElementRef<ElementType>,
+  unmountComponentAtNode(containerTag: number): void,
   ...
 };
 
 export type ReactNativeEventTarget = {
-  node: Object,
+  node: {...},
   canonical: {
     _nativeTag: number,
-    viewConfig: ReactNativeBaseComponentViewConfig<>,
-    currentProps: Object,
-    _internalInstanceHandle: Object,
+    viewConfig: ViewConfig,
+    currentProps: {...},
+    _internalInstanceHandle: {...},
     ...
   },
   ...
 };
 
-export type ReactFaricEventTouch = {
+export type ReactFabricEventTouch = {
   identifier: number,
   locationX: number,
   locationY: number,
@@ -206,10 +247,10 @@ export type ReactFaricEventTouch = {
   ...
 };
 
-export type ReactFaricEvent = {
-  touches: Array<ReactFaricEventTouch>,
-  changedTouches: Array<ReactFaricEventTouch>,
-  targetTouches: Array<ReactFaricEventTouch>,
+export type ReactFabricEvent = {
+  touches: Array<ReactFabricEventTouch>,
+  changedTouches: Array<ReactFabricEventTouch>,
+  targetTouches: Array<ReactFabricEventTouch>,
   target: number,
   ...
 };
diff --git a/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js b/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
index 2c09ddf3caab10..b8e08eec174c0d 100644
--- a/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
+++ b/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
@@ -6,18 +6,17 @@
  *
  * @format
  * @flow strict-local
+ * @generated SignedSource<<5b2da3e92f44ee2684113b45af052f5d>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 /* eslint-disable react-internal/invariant-args */
 
 'use strict';
 
-import type {
-  ReactNativeBaseComponentViewConfig,
-  ViewConfigGetter,
-} from './ReactNativeTypes';
-
-const invariant = require('invariant');
+import {type ViewConfig} from './ReactNativeTypes';
+import invariant from 'invariant';
 
 // Event configs
 const customBubblingEventTypes: {
@@ -42,9 +41,7 @@ exports.customDirectEventTypes = customDirectEventTypes;
 const viewConfigCallbacks = new Map();
 const viewConfigs = new Map();
 
-function processEventTypes(
-  viewConfig: ReactNativeBaseComponentViewConfig<>,
-): void {
+function processEventTypes(viewConfig: ViewConfig): void {
   const {bubblingEventTypes, directEventTypes} = viewConfig;
 
   if (__DEV__) {
@@ -82,7 +79,7 @@ function processEventTypes(
  * A callback is provided to load the view config from UIManager.
  * The callback is deferred until the view is actually rendered.
  */
-exports.register = function(name: string, callback: ViewConfigGetter): string {
+exports.register = function(name: string, callback: () => ViewConfig): string {
   invariant(
     !viewConfigCallbacks.has(name),
     'Tried to register two views with the same name %s',
@@ -103,7 +100,7 @@ exports.register = function(name: string, callback: ViewConfigGetter): string {
  * If this is the first time the view has been used,
  * This configuration will be lazy-loaded from UIManager.
  */
-exports.get = function(name: string): ReactNativeBaseComponentViewConfig<> {
+exports.get = function(name: string): ViewConfig {
   let viewConfig;
   if (!viewConfigs.has(name)) {
     const callback = viewConfigCallbacks.get(name);
diff --git a/Libraries/Renderer/shims/createReactNativeComponentClass.js b/Libraries/Renderer/shims/createReactNativeComponentClass.js
index 86a758d918b483..b4711953fe0735 100644
--- a/Libraries/Renderer/shims/createReactNativeComponentClass.js
+++ b/Libraries/Renderer/shims/createReactNativeComponentClass.js
@@ -6,13 +6,15 @@
  *
  * @format
  * @flow strict-local
+ * @generated SignedSource<<435ec24b3531c66986fe5d529795713b>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';
 
 import {ReactNativeViewConfigRegistry} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
-
-import type {ViewConfigGetter} from './ReactNativeTypes';
+import {type ViewConfig} from './ReactNativeTypes';
 
 const {register} = ReactNativeViewConfigRegistry;
 
@@ -26,7 +28,7 @@ const {register} = ReactNativeViewConfigRegistry;
  */
 const createReactNativeComponentClass = function(
   name: string,
-  callback: ViewConfigGetter,
+  callback: () => ViewConfig,
 ): string {
   return register(name, callback);
 };
diff --git a/Libraries/Settings/NativeSettingsManager.js b/Libraries/Settings/NativeSettingsManager.js
index 1edd6187218962..bd03861d0c8cd8 100644
--- a/Libraries/Settings/NativeSettingsManager.js
+++ b/Libraries/Settings/NativeSettingsManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Settings/RCTSettingsManager.mm b/Libraries/Settings/RCTSettingsManager.mm
index cd0db3de91621b..4edbfc73336644 100644
--- a/Libraries/Settings/RCTSettingsManager.mm
+++ b/Libraries/Settings/RCTSettingsManager.mm
@@ -28,7 +28,7 @@ @implementation RCTSettingsManager
 #endif // ]TODO(macOS GH#774)
 }
 
-@synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -77,7 +77,7 @@ - (void)userDefaultsDidChange:(NSNotification *)note
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [_bridge.eventDispatcher
+  [[_moduleRegistry moduleForName:"EventDispatcher"]
    sendDeviceEventWithName:@"settingsUpdated"
    body:RCTJSONClean([_defaults dictionaryRepresentation])];
 #pragma clang diagnostic pop
diff --git a/Libraries/Settings/RCTSettingsPlugins.mm b/Libraries/Settings/RCTSettingsPlugins.mm
index 09438ed1fc31f3..7ce46c64c84a4d 100644
--- a/Libraries/Settings/RCTSettingsPlugins.mm
+++ b/Libraries/Settings/RCTSettingsPlugins.mm
@@ -17,12 +17,13 @@
 #import <unordered_map>
 
 Class RCTSettingsClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"SettingsManager", RCTSettingsManagerCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec
index 52f436c923e216..bc6db23e06414a 100644
--- a/Libraries/Settings/React-RCTSettings.podspec
+++ b/Libraries/Settings/React-RCTSettings.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTSettings"
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/settings"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/Settings/Settings.ios.js b/Libraries/Settings/Settings.ios.js
index cac0b3babd7ee8..d920e3502fd66b 100644
--- a/Libraries/Settings/Settings.ios.js
+++ b/Libraries/Settings/Settings.ios.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import NativeSettingsManager from './NativeSettingsManager';
 import invariant from 'invariant';
@@ -25,10 +23,12 @@ const Settings = {
     NativeSettingsManager.getConstants().settings: any),
 
   get(key: string): mixed {
+    // $FlowFixMe[object-this-reference]
     return this._settings[key];
   },
 
   set(settings: Object) {
+    // $FlowFixMe[object-this-reference]
     this._settings = Object.assign(this._settings, settings);
     NativeSettingsManager.setValues(settings);
   },
@@ -57,7 +57,9 @@ const Settings = {
   _sendObservations(body: Object) {
     Object.keys(body).forEach(key => {
       const newValue = body[key];
+      // $FlowFixMe[object-this-reference]
       const didChange = this._settings[key] !== newValue;
+      // $FlowFixMe[object-this-reference]
       this._settings[key] = newValue;
 
       if (didChange) {
diff --git a/Libraries/Share/NativeShareModule.js b/Libraries/Share/NativeShareModule.js
index 08d313d76d7d6c..f8ca82a00dc6a1 100644
--- a/Libraries/Share/NativeShareModule.js
+++ b/Libraries/Share/NativeShareModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Share/Share.js b/Libraries/Share/Share.js
index 5dad4772b7e8e1..a971d20014d53a 100644
--- a/Libraries/Share/Share.js
+++ b/Libraries/Share/Share.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const Platform = require('../Utilities/Platform');
 
 const invariant = require('invariant');
diff --git a/Libraries/Storage/AsyncStorage.js b/Libraries/Storage/AsyncStorage.js
index d1fd9c23f54237..057f39d4ee78e9 100644
--- a/Libraries/Storage/AsyncStorage.js
+++ b/Libraries/Storage/AsyncStorage.js
@@ -5,13 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @noflow
- * @flow-weak
+ * @flow strict
  * @jsdoc
  */
 
-'use strict';
-
 import NativeAsyncLocalStorage from './NativeAsyncLocalStorage';
 import NativeAsyncSQLiteDBStorage from './NativeAsyncSQLiteDBStorage';
 import invariant from 'invariant';
@@ -19,6 +16,20 @@ import invariant from 'invariant';
 // Use SQLite if available, otherwise file storage.
 const RCTAsyncStorage = NativeAsyncSQLiteDBStorage || NativeAsyncLocalStorage;
 
+type GetRequest = {
+  keys: Array<string>,
+  callback: ?(errors: ?Array<Error>, result: ?Array<Array<string>>) => void,
+  keyIndex: number,
+  resolve: (
+    result?:
+      | void
+      | null
+      | Promise<?Array<Array<string>>>
+      | Array<Array<string>>,
+  ) => void,
+  reject: (error?: mixed) => void,
+};
+
 /**
  * `AsyncStorage` is a simple, unencrypted, asynchronous, persistent, key-value
  * storage system that is global to the app.  It should be used instead of
@@ -27,7 +38,7 @@ const RCTAsyncStorage = NativeAsyncSQLiteDBStorage || NativeAsyncLocalStorage;
  * See https://reactnative.dev/docs/asyncstorage.html
  */
 const AsyncStorage = {
-  _getRequests: ([]: Array<any>),
+  _getRequests: ([]: Array<GetRequest>),
   _getKeys: ([]: Array<string>),
   _immediate: (null: ?number),
 
@@ -39,7 +50,7 @@ const AsyncStorage = {
   getItem: function(
     key: string,
     callback?: ?(error: ?Error, result: ?string) => void,
-  ): Promise {
+  ): Promise<?string> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.multiGet([key], function(errors, result) {
@@ -65,7 +76,7 @@ const AsyncStorage = {
     key: string,
     value: string,
     callback?: ?(error: ?Error) => void,
-  ): Promise {
+  ): Promise<void> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.multiSet([[key, value]], function(errors) {
@@ -74,7 +85,7 @@ const AsyncStorage = {
         if (errs) {
           reject(errs[0]);
         } else {
-          resolve(null);
+          resolve();
         }
       });
     });
@@ -88,7 +99,7 @@ const AsyncStorage = {
   removeItem: function(
     key: string,
     callback?: ?(error: ?Error) => void,
-  ): Promise {
+  ): Promise<void> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.multiRemove([key], function(errors) {
@@ -97,7 +108,7 @@ const AsyncStorage = {
         if (errs) {
           reject(errs[0]);
         } else {
-          resolve(null);
+          resolve();
         }
       });
     });
@@ -115,7 +126,7 @@ const AsyncStorage = {
     key: string,
     value: string,
     callback?: ?(error: ?Error) => void,
-  ): Promise {
+  ): Promise<void> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.multiMerge([[key, value]], function(errors) {
@@ -124,7 +135,7 @@ const AsyncStorage = {
         if (errs) {
           reject(errs[0]);
         } else {
-          resolve(null);
+          resolve();
         }
       });
     });
@@ -137,7 +148,7 @@ const AsyncStorage = {
    *
    * See https://reactnative.dev/docs/asyncstorage.html#clear
    */
-  clear: function(callback?: ?(error: ?Error) => void): Promise {
+  clear: function(callback?: ?(error: ?Error) => void): Promise<void> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.clear(function(error) {
@@ -145,7 +156,7 @@ const AsyncStorage = {
         if (error && convertError(error)) {
           reject(convertError(error));
         } else {
-          resolve(null);
+          resolve();
         }
       });
     });
@@ -158,7 +169,7 @@ const AsyncStorage = {
    */
   getAllKeys: function(
     callback?: ?(error: ?Error, keys: ?Array<string>) => void,
-  ): Promise {
+  ): Promise<?Array<string>> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.getAllKeys(function(error, keys) {
@@ -226,10 +237,11 @@ const AsyncStorage = {
    *
    * See https://reactnative.dev/docs/asyncstorage.html#multiget
    */
+  // $FlowFixMe[signature-verification-failure]
   multiGet: function(
     keys: Array<string>,
     callback?: ?(errors: ?Array<Error>, result: ?Array<Array<string>>) => void,
-  ): Promise {
+  ): Promise<?Array<Array<string>>> {
     if (!this._immediate) {
       this._immediate = setImmediate(() => {
         this._immediate = null;
@@ -237,29 +249,22 @@ const AsyncStorage = {
       });
     }
 
-    const getRequest = {
-      keys: keys,
-      callback: callback,
-      // do we need this?
-      keyIndex: this._getKeys.length,
-      resolve: null,
-      reject: null,
-    };
-
-    const promiseResult = new Promise((resolve, reject) => {
-      getRequest.resolve = resolve;
-      getRequest.reject = reject;
-    });
-
-    this._getRequests.push(getRequest);
-    // avoid fetching duplicates
-    keys.forEach(key => {
-      if (this._getKeys.indexOf(key) === -1) {
-        this._getKeys.push(key);
-      }
+    return new Promise<?Array<Array<string>>>((resolve, reject) => {
+      this._getRequests.push({
+        keys,
+        callback,
+        // do we need this?
+        keyIndex: this._getKeys.length,
+        resolve,
+        reject,
+      });
+      // avoid fetching duplicates
+      keys.forEach(key => {
+        if (this._getKeys.indexOf(key) === -1) {
+          this._getKeys.push(key);
+        }
+      });
     });
-
-    return promiseResult;
   },
 
   /**
@@ -271,7 +276,7 @@ const AsyncStorage = {
   multiSet: function(
     keyValuePairs: Array<Array<string>>,
     callback?: ?(errors: ?Array<Error>) => void,
-  ): Promise {
+  ): Promise<void> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.multiSet(keyValuePairs, function(errors) {
@@ -280,7 +285,7 @@ const AsyncStorage = {
         if (error) {
           reject(error);
         } else {
-          resolve(null);
+          resolve();
         }
       });
     });
@@ -294,7 +299,7 @@ const AsyncStorage = {
   multiRemove: function(
     keys: Array<string>,
     callback?: ?(errors: ?Array<Error>) => void,
-  ): Promise {
+  ): Promise<void> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.multiRemove(keys, function(errors) {
@@ -303,7 +308,7 @@ const AsyncStorage = {
         if (error) {
           reject(error);
         } else {
-          resolve(null);
+          resolve();
         }
       });
     });
@@ -320,7 +325,7 @@ const AsyncStorage = {
   multiMerge: function(
     keyValuePairs: Array<Array<string>>,
     callback?: ?(errors: ?Array<Error>) => void,
-  ): Promise {
+  ): Promise<void> {
     invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
     return new Promise((resolve, reject) => {
       RCTAsyncStorage.multiMerge(keyValuePairs, function(errors) {
@@ -329,7 +334,7 @@ const AsyncStorage = {
         if (error) {
           reject(error);
         } else {
-          resolve(null);
+          resolve();
         }
       });
     });
@@ -337,24 +342,38 @@ const AsyncStorage = {
 };
 
 // Not all native implementations support merge.
-if (!RCTAsyncStorage.multiMerge) {
-  delete AsyncStorage.mergeItem;
-  delete AsyncStorage.multiMerge;
+// TODO: Check whether above comment is correct. multiMerge is guaranteed to
+// exist in the module spec so we should be able to just remove this check.
+if (RCTAsyncStorage && !RCTAsyncStorage.multiMerge) {
+  // $FlowFixMe[unclear-type]
+  delete (AsyncStorage: any).mergeItem;
+  // $FlowFixMe[unclear-type]
+  delete (AsyncStorage: any).multiMerge;
 }
 
-function convertErrors(errs) {
+function convertErrors(
+  // NOTE: The native module spec only has the Array case, but the Android
+  // implementation passes a single object.
+  errs: ?(
+    | {message: string, key?: string}
+    | Array<{message: string, key?: string}>
+  ),
+) {
   if (!errs) {
     return null;
   }
   return (Array.isArray(errs) ? errs : [errs]).map(e => convertError(e));
 }
 
+declare function convertError(void | null): null;
+declare function convertError({message: string, key?: string}): Error;
 function convertError(error) {
   if (!error) {
     return null;
   }
   const out = new Error(error.message);
-  out.key = error.key; // flow doesn't like this :(
+  // $FlowFixMe[unclear-type]
+  (out: any).key = error.key;
   return out;
 }
 
diff --git a/Libraries/Storage/NativeAsyncLocalStorage.js b/Libraries/Storage/NativeAsyncLocalStorage.js
index 834cd97f3594b2..bc66d23b8cce88 100644
--- a/Libraries/Storage/NativeAsyncLocalStorage.js
+++ b/Libraries/Storage/NativeAsyncLocalStorage.js
@@ -8,35 +8,36 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
-  +getConstants: () => {||};
+  +getConstants: () => {};
   +multiGet: (
     keys: Array<string>,
     callback: (
-      errors: ?Array<{|message: string|}>,
+      errors: ?Array<{message: string, key?: string}>,
       kvPairs: ?Array<Array<string>>,
     ) => void,
   ) => void;
   +multiSet: (
     kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{|message: string|}>) => void,
+    callback: (errors: ?Array<{message: string, key?: string}>) => void,
   ) => void;
   +multiMerge: (
     kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{|message: string|}>) => void,
+    callback: (errors: ?Array<{message: string, key?: string}>) => void,
   ) => void;
   +multiRemove: (
     keys: Array<string>,
-    callback: (errors: ?Array<{|message: string|}>) => void,
+    callback: (errors: ?Array<{message: string, key?: string}>) => void,
   ) => void;
-  +clear: (callback: (error: {|message: string|}) => void) => void;
+  +clear: (callback: (error: {message: string, key?: string}) => void) => void;
   +getAllKeys: (
-    callback: (error: ?{|message: string|}, allKeys: ?Array<string>) => void,
+    callback: (
+      error: ?{message: string, key?: string},
+      allKeys: ?Array<string>,
+    ) => void,
   ) => void;
 }
 
diff --git a/Libraries/Storage/NativeAsyncSQLiteDBStorage.js b/Libraries/Storage/NativeAsyncSQLiteDBStorage.js
index 6009a98d14aebf..519b1486565dd4 100644
--- a/Libraries/Storage/NativeAsyncSQLiteDBStorage.js
+++ b/Libraries/Storage/NativeAsyncSQLiteDBStorage.js
@@ -8,35 +8,36 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
-  +getConstants: () => {||};
+  +getConstants: () => {};
   +multiGet: (
     keys: Array<string>,
     callback: (
-      errors: ?Array<{|message: string|}>,
+      errors: ?Array<{message: string, key?: string}>,
       kvPairs: ?Array<Array<string>>,
     ) => void,
   ) => void;
   +multiSet: (
     kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{|message: string|}>) => void,
+    callback: (errors: ?Array<{message: string, key?: string}>) => void,
   ) => void;
   +multiMerge: (
     kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{|message: string|}>) => void,
+    callback: (errors: ?Array<{message: string, key?: string}>) => void,
   ) => void;
   +multiRemove: (
     keys: Array<string>,
-    callback: (errors: ?Array<{|message: string|}>) => void,
+    callback: (errors: ?Array<{message: string, key?: string}>) => void,
   ) => void;
-  +clear: (callback: (error: {|message: string|}) => void) => void;
+  +clear: (callback: (error: {message: string, key?: string}) => void) => void;
   +getAllKeys: (
-    callback: (error: ?{|message: string|}, allKeys: ?Array<string>) => void,
+    callback: (
+      error: ?{message: string, key?: string},
+      allKeys: ?Array<string>,
+    ) => void,
   ) => void;
 }
 
diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.android.js b/Libraries/StyleSheet/PlatformColorValueTypes.android.js
index 82e7e55ec12889..5985af468f8443 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypes.android.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypes.android.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
 
diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.ios.js b/Libraries/StyleSheet/PlatformColorValueTypes.ios.js
index d2707ed5dfb648..193ea338bdffc5 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypes.ios.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypes.ios.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
 
@@ -18,6 +16,8 @@ export opaque type NativeColorValue = {
   dynamic?: {
     light: ?(ColorValue | ProcessedColorValue),
     dark: ?(ColorValue | ProcessedColorValue),
+    highContrastLight?: ?(ColorValue | ProcessedColorValue),
+    highContrastDark?: ?(ColorValue | ProcessedColorValue),
   },
 };
 
@@ -28,12 +28,21 @@ export const PlatformColor = (...names: Array<string>): ColorValue => {
 export type DynamicColorIOSTuplePrivate = {
   light: ColorValue,
   dark: ColorValue,
+  highContrastLight?: ColorValue,
+  highContrastDark?: ColorValue,
 };
 
 export const DynamicColorIOSPrivate = (
   tuple: DynamicColorIOSTuplePrivate,
 ): ColorValue => {
-  return {dynamic: {light: tuple.light, dark: tuple.dark}};
+  return {
+    dynamic: {
+      light: tuple.light,
+      dark: tuple.dark,
+      highContrastLight: tuple.highContrastLight,
+      highContrastDark: tuple.highContrastDark,
+    },
+  };
 };
 
 export const normalizeColorObject = (
@@ -51,6 +60,8 @@ export const normalizeColorObject = (
       dynamic: {
         light: normalizeColor(dynamic.light),
         dark: normalizeColor(dynamic.dark),
+        highContrastLight: normalizeColor(dynamic.highContrastLight),
+        highContrastDark: normalizeColor(dynamic.highContrastDark),
       },
     };
     return dynamicColor;
@@ -69,6 +80,8 @@ export const processColorObject = (
       dynamic: {
         light: processColor(dynamic.light),
         dark: processColor(dynamic.dark),
+        highContrastLight: processColor(dynamic.highContrastLight),
+        highContrastDark: processColor(dynamic.highContrastDark),
       },
     };
     return dynamicColor;
diff --git a/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js b/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js
index ebdbc7a078ac7b..912236c7359de3 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js
@@ -8,16 +8,21 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ColorValue} from './StyleSheet';
 import {DynamicColorIOSPrivate} from './PlatformColorValueTypes';
 
 export type DynamicColorIOSTuple = {
   light: ColorValue,
   dark: ColorValue,
+  highContrastLight?: ColorValue,
+  highContrastDark?: ColorValue,
 };
 
 export const DynamicColorIOS = (tuple: DynamicColorIOSTuple): ColorValue => {
-  return DynamicColorIOSPrivate({light: tuple.light, dark: tuple.dark});
+  return DynamicColorIOSPrivate({
+    light: tuple.light,
+    dark: tuple.dark,
+    highContrastLight: tuple.highContrastLight,
+    highContrastDark: tuple.highContrastDark,
+  });
 };
diff --git a/Libraries/StyleSheet/PlatformColorValueTypesIOS.js b/Libraries/StyleSheet/PlatformColorValueTypesIOS.js
index a7f27e53e50103..ead8c4fca2f59f 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypesIOS.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypesIOS.js
@@ -8,13 +8,13 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ColorValue} from './StyleSheet';
 
 export type DynamicColorIOSTuple = {
   light: ColorValue,
   dark: ColorValue,
+  highContrastLight?: ColorValue,
+  highContrastDark?: ColorValue,
 };
 
 export const DynamicColorIOS = (tuple: DynamicColorIOSTuple): ColorValue => {
diff --git a/Libraries/StyleSheet/Rect.js b/Libraries/StyleSheet/Rect.js
index 164909c74d28b2..24a4281eda2b1b 100644
--- a/Libraries/StyleSheet/Rect.js
+++ b/Libraries/StyleSheet/Rect.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 export type Rect = $ReadOnly<{|
   bottom?: ?number,
   left?: ?number,
diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index c4de35ce721987..785fbfe199e340 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -12,7 +12,6 @@
 
 const PixelRatio = require('../Utilities/PixelRatio');
 const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes');
-const StyleSheetValidation = require('./StyleSheetValidation');
 
 const flatten = require('./flattenStyle');
 
@@ -339,9 +338,9 @@ module.exports = {
     let value;
 
     if (ReactNativeStyleAttributes[property] === true) {
-      value = {};
+      value = {process};
     } else if (typeof ReactNativeStyleAttributes[property] === 'object') {
-      value = ReactNativeStyleAttributes[property];
+      value = {...ReactNativeStyleAttributes[property], process};
     } else {
       console.error(`${property} is not a valid style attribute`);
       return;
@@ -351,7 +350,7 @@ module.exports = {
       console.warn(`Overwriting ${property} style attribute preprocessor`);
     }
 
-    ReactNativeStyleAttributes[property] = {...value, process};
+    ReactNativeStyleAttributes[property] = value;
   },
 
   /**
@@ -363,7 +362,6 @@ module.exports = {
     // return value as a number (even though it was opaque).
     if (__DEV__) {
       for (const key in obj) {
-        StyleSheetValidation.validateStyle(key, obj);
         if (obj[key]) {
           Object.freeze(obj[key]);
         }
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index c9a060a55a7928..cd1d76d84dcacf 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -680,3 +680,8 @@ export type ____Styles_Internal = {
   +[key: string]: $Shape<____DangerouslyImpreciseStyle_Internal>,
   ...,
 };
+
+export type ____FlattenStyleProp_Internal<+TStyleProp> = $Call<
+  <T>(GenericStyleProp<T>) => T,
+  TStyleProp,
+>;
diff --git a/Libraries/StyleSheet/StyleSheetValidation.js b/Libraries/StyleSheet/StyleSheetValidation.js
deleted file mode 100644
index 456953f7a064f8..00000000000000
--- a/Libraries/StyleSheet/StyleSheetValidation.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-const DeprecatedImageStylePropTypes = require('../DeprecatedPropTypes/DeprecatedImageStylePropTypes');
-const DeprecatedTextStylePropTypes = require('../DeprecatedPropTypes/DeprecatedTextStylePropTypes');
-const DeprecatedViewStylePropTypes = require('../DeprecatedPropTypes/DeprecatedViewStylePropTypes');
-
-const invariant = require('invariant');
-
-// Hardcoded because this is a legit case but we don't want to load it from
-// a private API. We might likely want to unify style sheet creation with how it
-// is done in the DOM so this might move into React. I know what I'm doing so
-// plz don't fire me.
-const ReactPropTypesSecret = 'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED';
-
-class StyleSheetValidation {
-  static validateStyleProp(prop: string, style: Object, caller: string) {
-    if (!__DEV__ || global.__RCTProfileIsProfiling) {
-      return;
-    }
-    if (allStylePropTypes[prop] === undefined) {
-      const message1 = '"' + prop + '" is not a valid style property.';
-      const message2 =
-        '\nValid style props: ' +
-        JSON.stringify(Object.keys(allStylePropTypes).sort(), null, '  ');
-      styleError(message1, style, caller, message2);
-    }
-    const error = allStylePropTypes[prop](
-      style,
-      prop,
-      caller,
-      'prop',
-      null,
-      ReactPropTypesSecret,
-    );
-    if (error) {
-      styleError(error.message, style, caller);
-    }
-  }
-
-  static validateStyle(name: string, styles: Object) {
-    if (!__DEV__ || global.__RCTProfileIsProfiling) {
-      return;
-    }
-    if (!styles[name]) {
-      return;
-    }
-    const styleProps = Object.keys(styles[name]);
-    for (const prop of styleProps) {
-      StyleSheetValidation.validateStyleProp(
-        prop,
-        styles[name],
-        'StyleSheet ' + name,
-      );
-    }
-  }
-
-  /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an error
-   * found when Flow v0.85 was deployed. To see the error, delete this comment
-   * and run Flow. */
-  static addValidStylePropTypes(stylePropTypes) {
-    if (!__DEV__ || global.__RCTProfileIsProfiling) {
-      return;
-    }
-    for (const key in stylePropTypes) {
-      allStylePropTypes[key] = stylePropTypes[key];
-    }
-  }
-}
-
-const styleError = function(message1, style, caller?, message2?) {
-  invariant(
-    false,
-    message1 +
-      '\n' +
-      (caller || '<<unknown>>') +
-      ': ' +
-      JSON.stringify(style, null, '  ') +
-      (message2 || ''),
-  );
-};
-
-const allStylePropTypes = {};
-
-if (__DEV__ && !global.__RCTProfileIsProfiling) {
-  StyleSheetValidation.addValidStylePropTypes(DeprecatedImageStylePropTypes);
-  StyleSheetValidation.addValidStylePropTypes(DeprecatedTextStylePropTypes);
-  StyleSheetValidation.addValidStylePropTypes(DeprecatedViewStylePropTypes);
-}
-
-module.exports = StyleSheetValidation;
diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
index 3051b5d77dcc10..8134743039954b 100644
--- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js
+++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
@@ -11,15 +11,9 @@
 'use strict';
 
 const StyleSheet = require('../StyleSheet');
-const StyleSheetValidation = require('../StyleSheetValidation');
 const flattenStyle = require('../flattenStyle');
 
 function getFixture() {
-  StyleSheetValidation.addValidStylePropTypes({
-    styleA: () => {},
-    styleB: () => {},
-  });
-
   return StyleSheet.create({
     elementA: {
       styleA: 'moduleA/elementA/styleA',
diff --git a/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
index 80979e0ec2c75c..5421edccd23319 100644
--- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js
+++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
@@ -43,6 +43,25 @@ describe('iOS', () => {
       expect(normalizedColor).toEqual(expectedColor);
     });
 
+    it('should normalize iOS Dynamic colors with accessible colors', () => {
+      const color = DynamicColorIOS({
+        light: 'black',
+        dark: 'white',
+        highContrastLight: 'red',
+        highContrastDark: 'blue',
+      });
+      const normalizedColor = normalizeColor(color);
+      const expectedColor = {
+        dynamic: {
+          light: 'black',
+          dark: 'white',
+          highContrastLight: 'red',
+          highContrastDark: 'blue',
+        },
+      };
+      expect(normalizedColor).toEqual(expectedColor);
+    });
+
     it('should normalize iOS Dynamic colors with PlatformColor colors', () => {
       const color = DynamicColorIOS({
         light: PlatformColor('systemBlackColor'),
diff --git a/Libraries/StyleSheet/__tests__/processColorArray-test.js b/Libraries/StyleSheet/__tests__/processColorArray-test.js
index 1be389cdb92421..3ccc582a11663b 100644
--- a/Libraries/StyleSheet/__tests__/processColorArray-test.js
+++ b/Libraries/StyleSheet/__tests__/processColorArray-test.js
@@ -22,7 +22,7 @@ const PlatformColorAndroid = require('../PlatformColorValueTypes.android')
 
 const platformSpecific =
   OS === 'android'
-    ? unsigned => unsigned | 0 //eslint-disable-line no-bitwise
+    ? unsigned => unsigned | 0 // eslint-disable-line no-bitwise
     : x => x;
 
 describe('processColorArray', () => {
@@ -63,6 +63,30 @@ describe('processColorArray', () => {
       const colorFromNoArray = processColorArray(null);
       expect(colorFromNoArray).toEqual(null);
     });
+
+    it('converts invalid colors to transparent', () => {
+      const spy = jest.spyOn(console, 'error').mockReturnValue(undefined);
+
+      const colors = ['red', '???', null, undefined, false];
+      const colorFromStringArray = processColorArray(colors);
+      const expectedIntArray = [
+        0xffff0000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+      ].map(platformSpecific);
+      expect(colorFromStringArray).toEqual(expectedIntArray);
+
+      for (const color of colors.slice(1)) {
+        expect(spy).toHaveBeenCalledWith(
+          'Invalid value in color array:',
+          color,
+        );
+      }
+
+      spy.mockRestore();
+    });
   });
 
   describe('iOS', () => {
diff --git a/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js b/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js
index 0bb9a1a19940b3..2206b3fa61dcf2 100644
--- a/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js
+++ b/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const splitLayoutProps = require('../splitLayoutProps');
+const splitLayoutProps = require('../splitLayoutProps').default;
 
 test('splits style objects', () => {
   const style = {width: 10, margin: 20, padding: 30, transform: {scaleY: -1}};
@@ -45,3 +45,9 @@ test('does not copy values to both returned objects', () => {
     }
   `);
 });
+
+test('returns null values if argument is null', () => {
+  const {outer, inner} = splitLayoutProps(null);
+  expect(outer).toBe(null);
+  expect(inner).toBe(null);
+});
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index 679e39b3af6643..488ef19d061336 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -10,14 +10,12 @@
 
 'use strict';
 
-import type {
-  DangerouslyImpreciseStyle,
-  DangerouslyImpreciseStyleProp,
-} from './StyleSheet';
+import type {DangerouslyImpreciseStyleProp} from './StyleSheet';
+import type {____FlattenStyleProp_Internal} from './StyleSheetTypes';
 
-function flattenStyle(
-  style: ?DangerouslyImpreciseStyleProp,
-): ?DangerouslyImpreciseStyle {
+function flattenStyle<+TStyleProp: DangerouslyImpreciseStyleProp>(
+  style: ?TStyleProp,
+): ?____FlattenStyleProp_Internal<TStyleProp> {
   if (style === null || typeof style !== 'object') {
     return undefined;
   }
diff --git a/Libraries/StyleSheet/normalizeColor.js b/Libraries/StyleSheet/normalizeColor.js
index 94187dfa9fcff3..4ba0dae0085f11 100755
--- a/Libraries/StyleSheet/normalizeColor.js
+++ b/Libraries/StyleSheet/normalizeColor.js
@@ -10,8 +10,6 @@
 
 /* eslint no-bitwise: 0 */
 
-'use strict';
-
 import normalizeColorBase from '@react-native/normalize-color/base';
 
 import type {ColorValue} from './StyleSheet';
diff --git a/Libraries/StyleSheet/processColorArray.js b/Libraries/StyleSheet/processColorArray.js
index 0cbbdcd745b6b4..1d13d876c11df1 100644
--- a/Libraries/StyleSheet/processColorArray.js
+++ b/Libraries/StyleSheet/processColorArray.js
@@ -10,15 +10,25 @@
 
 'use strict';
 
-const processColor = require('./processColor');
-
 import type {ColorValue} from './StyleSheet';
-import type {ProcessedColorValue} from './processColor';
+import processColor, {type ProcessedColorValue} from './processColor';
+
+const TRANSPARENT = 0; // rgba(0, 0, 0, 0)
 
 function processColorArray(
-  colors: ?Array<ColorValue>,
-): ?Array<?ProcessedColorValue> {
-  return colors == null ? null : colors.map(processColor);
+  colors: ?$ReadOnlyArray<ColorValue>,
+): ?$ReadOnlyArray<ProcessedColorValue> {
+  return colors == null ? null : colors.map(processColorElement);
+}
+
+function processColorElement(color: ColorValue): ProcessedColorValue {
+  const value = processColor(color);
+  // For invalid colors, fallback to transparent.
+  if (value == null) {
+    console.error('Invalid value in color array:', color);
+    return TRANSPARENT;
+  }
+  return value;
 }
 
 module.exports = processColorArray;
diff --git a/Libraries/StyleSheet/processTransform.js b/Libraries/StyleSheet/processTransform.js
index ce1ec370135802..075967a4d40dc9 100644
--- a/Libraries/StyleSheet/processTransform.js
+++ b/Libraries/StyleSheet/processTransform.js
@@ -177,9 +177,9 @@ function _validateTransform(key, value, transformation) {
         value.length === 9 || value.length === 16,
         'Matrix transform must have a length of 9 (2d) or 16 (3d). ' +
           'Provided matrix has a length of %s: %s',
-        /* $FlowFixMe(>=0.84.0 site=react_native_fb) This comment suppresses an
-         * error found when Flow v0.84 was deployed. To see the error, delete
-         * this comment and run Flow. */
+        /* $FlowFixMe[prop-missing] (>=0.84.0 site=react_native_fb) This
+         * comment suppresses an error found when Flow v0.84 was deployed. To
+         * see the error, delete this comment and run Flow. */
         value.length,
         stringifySafe(transformation),
       );
@@ -188,9 +188,9 @@ function _validateTransform(key, value, transformation) {
       invariant(
         value.length === 2 || value.length === 3,
         'Transform with key translate must be an array of length 2 or 3, found %s: %s',
-        /* $FlowFixMe(>=0.84.0 site=react_native_fb) This comment suppresses an
-         * error found when Flow v0.84 was deployed. To see the error, delete
-         * this comment and run Flow. */
+        /* $FlowFixMe[prop-missing] (>=0.84.0 site=react_native_fb) This
+         * comment suppresses an error found when Flow v0.84 was deployed. To
+         * see the error, delete this comment and run Flow. */
         value.length,
         stringifySafe(transformation),
       );
diff --git a/Libraries/StyleSheet/splitLayoutProps.js b/Libraries/StyleSheet/splitLayoutProps.js
index 2c6fd33f87eca1..e871390a190fcf 100644
--- a/Libraries/StyleSheet/splitLayoutProps.js
+++ b/Libraries/StyleSheet/splitLayoutProps.js
@@ -4,61 +4,63 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict-local
+ * @format
  */
 
-'use strict';
-
-import type {DangerouslyImpreciseStyle} from './StyleSheet';
-
-const OUTER_PROPS = Object.assign(Object.create(null), {
-  margin: true,
-  marginHorizontal: true,
-  marginVertical: true,
-  marginBottom: true,
-  marginTop: true,
-  marginLeft: true,
-  marginRight: true,
-  flex: true,
-  flexGrow: true,
-  flexShrink: true,
-  flexBasis: true,
-  alignSelf: true,
-  height: true,
-  minHeight: true,
-  maxHeight: true,
-  width: true,
-  minWidth: true,
-  maxWidth: true,
-  position: true,
-  left: true,
-  right: true,
-  bottom: true,
-  top: true,
-  transform: true,
-});
+import type {____ViewStyle_Internal} from './StyleSheetTypes';
 
-function splitLayoutProps(
-  props: ?DangerouslyImpreciseStyle,
+export default function splitLayoutProps(
+  props: ?____ViewStyle_Internal,
 ): {
-  outer: DangerouslyImpreciseStyle,
-  inner: DangerouslyImpreciseStyle,
-  ...
+  outer: ?____ViewStyle_Internal,
+  inner: ?____ViewStyle_Internal,
 } {
-  const inner = {};
-  const outer = {};
-  if (props) {
-    Object.keys(props).forEach((k: string) => {
-      const value = props[k];
-      if (OUTER_PROPS[k]) {
-        outer[k] = value;
-      } else {
-        inner[k] = value;
+  let outer: ?____ViewStyle_Internal = null;
+  let inner: ?____ViewStyle_Internal = null;
+
+  if (props != null) {
+    // $FlowIgnore[incompatible-exact] Will contain a subset of keys from `props`.
+    outer = {};
+    // $FlowIgnore[incompatible-exact] Will contain a subset of keys from `props`.
+    inner = {};
+
+    for (const prop of Object.keys(props)) {
+      switch (prop) {
+        case 'margin':
+        case 'marginHorizontal':
+        case 'marginVertical':
+        case 'marginBottom':
+        case 'marginTop':
+        case 'marginLeft':
+        case 'marginRight':
+        case 'flex':
+        case 'flexGrow':
+        case 'flexShrink':
+        case 'flexBasis':
+        case 'alignSelf':
+        case 'height':
+        case 'minHeight':
+        case 'maxHeight':
+        case 'width':
+        case 'minWidth':
+        case 'maxWidth':
+        case 'position':
+        case 'left':
+        case 'right':
+        case 'bottom':
+        case 'top':
+        case 'transform':
+          // $FlowFixMe[cannot-write]
+          outer[prop] = props[prop];
+          break;
+        default:
+          // $FlowFixMe[cannot-write]
+          inner[prop] = props[prop];
+          break;
       }
-    });
+    }
   }
+
   return {outer, inner};
 }
-
-module.exports = splitLayoutProps;
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
index 95e30e044684e1..de1910c8b7782b 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
@@ -55,7 +55,7 @@ + (instancetype)newWithSurface:(RCTSurface *)surface options:(RCTSurfaceHostingC
   return component;
 }
 
-- (CKComponentLayout)computeLayoutThatFits:(CKSizeRange)constrainedSize
+- (RCLayout)computeLayoutThatFits:(CKSizeRange)constrainedSize
 {
   // Optimistically communicating layout constraints to the `_surface`,
   // just to provide layout constraints to React Native as early as possible.
diff --git a/Libraries/Text/React-RCTText.podspec b/Libraries/Text/React-RCTText.podspec
index de7d3a3b6993d8..f86fe139bfe621 100644
--- a/Libraries/Text/React-RCTText.podspec
+++ b/Libraries/Text/React-RCTText.podspec
@@ -11,7 +11,7 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/text"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "**/*.{h,m}"
   s.ios.exclude_files      = "**/macOS/*" # TODO(macOS GH#774)
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 46aa822983569a..f2dc30651eaff1 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -4,257 +4,209 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-'use strict';
-
-import TextInjection from './TextInjection';
+import DeprecatedTextPropTypes from '../DeprecatedPropTypes/DeprecatedTextPropTypes';
+import * as PressabilityDebug from '../Pressability/PressabilityDebug';
+import usePressability from '../Pressability/usePressability';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import processColor from '../StyleSheet/processColor';
+import TextAncestor from './TextAncestor';
 import {NativeText, NativeVirtualText} from './TextNativeComponent';
-
-const DeprecatedTextPropTypes = require('../DeprecatedPropTypes/DeprecatedTextPropTypes');
-const React = require('react');
-const TextAncestor = require('./TextAncestor');
-const Touchable = require('../Components/Touchable/Touchable');
-
-const nullthrows = require('nullthrows');
-const processColor = require('../StyleSheet/processColor');
-
-import type {PressEvent} from '../Types/CoreEventTypes';
-import type {PressRetentionOffset, TextProps} from './TextProps';
-
-type ResponseHandlers = $ReadOnly<{|
-  onStartShouldSetResponder: () => boolean,
-  onResponderGrant: (event: PressEvent) => void,
-  onResponderMove: (event: PressEvent) => void,
-  onResponderRelease: (event: PressEvent) => void,
-  onResponderTerminate: (event: PressEvent) => void,
-  onResponderTerminationRequest: () => boolean,
-|}>;
-
-type Props = $ReadOnly<{|
-  ...TextProps,
-  forwardedRef: ?React.Ref<typeof NativeText | typeof NativeVirtualText>,
-|}>;
-
-type State = {|
-  touchable: {|
-    touchState: ?string,
-    responderID: ?number,
-  |},
-  isHighlighted: boolean,
-  createResponderHandlers: () => ResponseHandlers,
-  responseHandlers: ?ResponseHandlers,
-|};
-
-const PRESS_RECT_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+import {type TextProps} from './TextProps';
+import * as React from 'react';
+import {useContext, useMemo, useState} from 'react';
+import invariant from 'invariant';
 
 /**
- * A React component for displaying text.
+ * Text is the fundamental component for displaying text.
  *
- * See https://reactnative.dev/docs/text.html
+ * @see https://reactnative.dev/docs/text.html
  */
-class TouchableText extends React.Component<Props, State> {
-  static defaultProps = {
-    accessible: true,
-    allowFontScaling: true,
-    ellipsizeMode: 'tail',
-  };
-
-  touchableGetPressRectOffset: ?() => PressRetentionOffset;
-  touchableHandleActivePressIn: ?() => void;
-  touchableHandleActivePressOut: ?() => void;
-  touchableHandleLongPress: ?(event: PressEvent) => void;
-  touchableHandlePress: ?(event: PressEvent) => void;
-  touchableHandleResponderGrant: ?(event: PressEvent) => void;
-  touchableHandleResponderMove: ?(event: PressEvent) => void;
-  touchableHandleResponderRelease: ?(event: PressEvent) => void;
-  touchableHandleResponderTerminate: ?(event: PressEvent) => void;
-  touchableHandleResponderTerminationRequest: ?() => boolean;
-
-  state = {
-    ...Touchable.Mixin.touchableGetInitialState(),
-    isHighlighted: false,
-    createResponderHandlers: this._createResponseHandlers.bind(this),
-    responseHandlers: null,
-  };
-
-  static getDerivedStateFromProps(
-    nextProps: Props,
-    prevState: State,
-  ): $Shape<State> | null {
-    return prevState.responseHandlers == null && isTouchable(nextProps)
-      ? {
-          responseHandlers: prevState.createResponderHandlers(),
-        }
-      : null;
-  }
-
-  render(): React.Node {
-    let {forwardedRef, selectionColor, ...props} = this.props;
-    if (isTouchable(this.props)) {
-      props = {
-        ...props,
-        ...this.state.responseHandlers,
-        isHighlighted: this.state.isHighlighted,
-      };
-    }
-    if (selectionColor != null) {
-      props = {
-        ...props,
-        selectionColor: processColor(selectionColor),
-      };
-    }
-    if (__DEV__) {
-      if (Touchable.TOUCH_TARGET_DEBUG && props.onPress != null) {
-        props = {
-          ...props,
-          style: [props.style, {color: 'magenta'}],
-        };
-      }
+const Text: React.AbstractComponent<
+  TextProps,
+  React.ElementRef<typeof NativeText | typeof NativeVirtualText>,
+> = React.forwardRef((props: TextProps, forwardedRef) => {
+  const {
+    accessible,
+    allowFontScaling,
+    ellipsizeMode,
+    onLongPress,
+    onPress,
+    onPressIn,
+    onPressOut,
+    onResponderGrant,
+    onResponderMove,
+    onResponderRelease,
+    onResponderTerminate,
+    onResponderTerminationRequest,
+    onStartShouldSetResponder,
+    pressRetentionOffset,
+    suppressHighlighting,
+    ...restProps
+  } = props;
+
+  const [isHighlighted, setHighlighted] = useState(false);
+
+  const isPressable =
+    (onPress != null ||
+      onLongPress != null ||
+      onStartShouldSetResponder != null) &&
+    restProps.disabled !== true;
+
+  const initialized = useLazyInitialization(isPressable);
+  const config = useMemo(
+    () =>
+      initialized
+        ? {
+            disabled: !isPressable,
+            pressRectOffset: pressRetentionOffset,
+            onLongPress,
+            onPress,
+            onPressIn(event) {
+              setHighlighted(!suppressHighlighting);
+              onPressIn?.(event);
+            },
+            onPressOut(event) {
+              setHighlighted(false);
+              onPressOut?.(event);
+            },
+            onResponderTerminationRequest_DEPRECATED: onResponderTerminationRequest,
+            onStartShouldSetResponder_DEPRECATED: onStartShouldSetResponder,
+          }
+        : null,
+    [
+      initialized,
+      isPressable,
+      pressRetentionOffset,
+      onLongPress,
+      onPress,
+      onPressIn,
+      onPressOut,
+      onResponderTerminationRequest,
+      onStartShouldSetResponder,
+      suppressHighlighting,
+    ],
+  );
+
+  const eventHandlers = usePressability(config);
+  const eventHandlersForText = useMemo(
+    () =>
+      eventHandlers == null
+        ? null
+        : {
+            onResponderGrant(event) {
+              eventHandlers.onResponderGrant(event);
+              if (onResponderGrant != null) {
+                onResponderGrant(event);
+              }
+            },
+            onResponderMove(event) {
+              eventHandlers.onResponderMove(event);
+              if (onResponderMove != null) {
+                onResponderMove(event);
+              }
+            },
+            onResponderRelease(event) {
+              eventHandlers.onResponderRelease(event);
+              if (onResponderRelease != null) {
+                onResponderRelease(event);
+              }
+            },
+            onResponderTerminate(event) {
+              eventHandlers.onResponderTerminate(event);
+              if (onResponderTerminate != null) {
+                onResponderTerminate(event);
+              }
+            },
+            onResponderTerminationRequest:
+              eventHandlers.onResponderTerminationRequest,
+            onStartShouldSetResponder: eventHandlers.onStartShouldSetResponder,
+          },
+    [
+      eventHandlers,
+      onResponderGrant,
+      onResponderMove,
+      onResponderRelease,
+      onResponderTerminate,
+    ],
+  );
+
+  // TODO: Move this processing to the view configuration.
+  const selectionColor =
+    restProps.selectionColor == null
+      ? null
+      : processColor(restProps.selectionColor);
+
+  let style = restProps.style;
+  if (__DEV__) {
+    if (PressabilityDebug.isEnabled() && onPress != null) {
+      style = StyleSheet.compose(restProps.style, {
+        color: 'magenta',
+      });
     }
-    return (
-      <TextAncestor.Consumer>
-        {hasTextAncestor =>
-          hasTextAncestor ? (
-            // $FlowFixMe[prop-missing] For the `onClick` workaround.
-            <NativeVirtualText
-              {...props}
-              // This is used on Android to call a nested Text component's press handler from the context menu.
-              // TODO T75145059 Clean this up once Text is migrated off of Touchable
-              onClick={props.onPress}
-              ref={forwardedRef}
-            />
-          ) : (
-            <TextAncestor.Provider value={true}>
-              <NativeText {...props} ref={forwardedRef} />
-            </TextAncestor.Provider>
-          )
-        }
-      </TextAncestor.Consumer>
-    );
   }
 
-  _createResponseHandlers(): ResponseHandlers {
-    return {
-      onStartShouldSetResponder: (): boolean => {
-        const {onStartShouldSetResponder} = this.props;
-        const shouldSetResponder =
-          (onStartShouldSetResponder == null
-            ? false
-            : onStartShouldSetResponder()) || isTouchable(this.props);
-
-        if (shouldSetResponder) {
-          this._attachTouchHandlers();
-        }
-        return shouldSetResponder;
-      },
-      onResponderGrant: (event: PressEvent): void => {
-        nullthrows(this.touchableHandleResponderGrant)(event);
-        if (this.props.onResponderGrant != null) {
-          this.props.onResponderGrant.call(this, event);
-        }
-      },
-      onResponderMove: (event: PressEvent): void => {
-        nullthrows(this.touchableHandleResponderMove)(event);
-        if (this.props.onResponderMove != null) {
-          this.props.onResponderMove.call(this, event);
-        }
-      },
-      onResponderRelease: (event: PressEvent): void => {
-        nullthrows(this.touchableHandleResponderRelease)(event);
-        if (this.props.onResponderRelease != null) {
-          this.props.onResponderRelease.call(this, event);
-        }
-      },
-      onResponderTerminate: (event: PressEvent): void => {
-        nullthrows(this.touchableHandleResponderTerminate)(event);
-        if (this.props.onResponderTerminate != null) {
-          this.props.onResponderTerminate.call(this, event);
-        }
-      },
-      onResponderTerminationRequest: (): boolean => {
-        const {onResponderTerminationRequest} = this.props;
-        if (!nullthrows(this.touchableHandleResponderTerminationRequest)()) {
-          return false;
-        }
-        if (onResponderTerminationRequest == null) {
-          return true;
-        }
-        return onResponderTerminationRequest();
-      },
-    };
-  }
-
-  /**
-   * Lazily attaches Touchable.Mixin handlers.
-   */
-  _attachTouchHandlers(): void {
-    if (this.touchableGetPressRectOffset != null) {
-      return;
-    }
-    for (const key in Touchable.Mixin) {
-      if (typeof Touchable.Mixin[key] === 'function') {
-        (this: any)[key] = Touchable.Mixin[key].bind(this);
-      }
-    }
-    this.touchableHandleActivePressIn = (): void => {
-      if (!this.props.suppressHighlighting && isTouchable(this.props)) {
-        this.setState({isHighlighted: true});
-      }
-    };
-    this.touchableHandleActivePressOut = (): void => {
-      if (!this.props.suppressHighlighting && isTouchable(this.props)) {
-        this.setState({isHighlighted: false});
-      }
-    };
-    this.touchableHandlePress = (event: PressEvent): void => {
-      if (this.props.onPress != null) {
-        this.props.onPress(event);
-      }
-    };
-    this.touchableHandleLongPress = (event: PressEvent): void => {
-      if (this.props.onLongPress != null) {
-        this.props.onLongPress(event);
-      }
-    };
-    this.touchableGetPressRectOffset = (): PressRetentionOffset =>
-      this.props.pressRetentionOffset == null
-        ? PRESS_RECT_OFFSET
-        : this.props.pressRetentionOffset;
+  let numberOfLines = restProps.numberOfLines;
+  if (numberOfLines != null && !(numberOfLines >= 0)) {
+    console.error(
+      `'numberOfLines' in <Text> must be a non-negative number, received: ${numberOfLines}. The value will be set to 0.`,
+    );
+    numberOfLines = 0;
   }
-}
 
-const isTouchable = (props: Props): boolean =>
-  props.onPress != null ||
-  props.onLongPress != null ||
-  props.onStartShouldSetResponder != null;
+  const hasTextAncestor = useContext(TextAncestor);
+
+  return hasTextAncestor ? (
+    <NativeVirtualText
+      {...restProps}
+      {...eventHandlersForText}
+      isHighlighted={isHighlighted}
+      numberOfLines={numberOfLines}
+      selectionColor={selectionColor}
+      style={style}
+      ref={forwardedRef}
+    />
+  ) : (
+    <TextAncestor.Provider value={true}>
+      <NativeText
+        {...restProps}
+        {...eventHandlersForText}
+        accessible={accessible !== false}
+        allowFontScaling={allowFontScaling !== false}
+        ellipsizeMode={ellipsizeMode ?? 'tail'}
+        isHighlighted={isHighlighted}
+        numberOfLines={numberOfLines}
+        selectionColor={selectionColor}
+        style={style}
+        ref={forwardedRef}
+      />
+    </TextAncestor.Provider>
+  );
+});
 
-const Text: React.AbstractComponent<
-  TextProps,
-  React.ElementRef<typeof NativeText | typeof NativeVirtualText>,
-> = React.forwardRef(
-  (
-    props: TextProps,
-    forwardedRef: ?React.Ref<typeof NativeText | typeof NativeVirtualText>,
-  ) => {
-    return <TouchableText {...props} forwardedRef={forwardedRef} />;
-  },
-);
 Text.displayName = 'Text';
 
-// TODO: Deprecate this.
-/* $FlowFixMe(>=0.89.0 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.89 was deployed. To see the error, delete this comment
- * and run Flow. */
+// TODO: Delete this.
 Text.propTypes = DeprecatedTextPropTypes;
 
-const TextToExport: typeof Text &
-  $ReadOnly<{|
-    propTypes: typeof DeprecatedTextPropTypes,
-  |}> =
-  // $FlowFixMe[incompatible-type] - No good way to type a React.AbstractComponent with statics.
-  TextInjection.unstable_Text == null ? Text : TextInjection.unstable_Text;
+/**
+ * Returns false until the first time `newValue` is true, after which this will
+ * always return true. This is necessary to lazily initialize `Pressability` so
+ * we do not eagerly create one for every pressable `Text` component.
+ */
+function useLazyInitialization(newValue: boolean): boolean {
+  const [oldValue, setValue] = useState(newValue);
+  if (!oldValue && newValue) {
+    setValue(newValue);
+  }
+  return oldValue;
+}
 
-module.exports = TextToExport;
+// $FlowFixMe[incompatible-cast] - No good way to type a React.AbstractComponent with statics.
+module.exports = (Text: typeof Text &
+  $ReadOnly<{
+    propTypes: typeof DeprecatedTextPropTypes,
+  }>);
diff --git a/Libraries/Text/TextAncestor.js b/Libraries/Text/TextAncestor.js
index b791319c80c171..3ea2d65ce91193 100644
--- a/Libraries/Text/TextAncestor.js
+++ b/Libraries/Text/TextAncestor.js
@@ -15,4 +15,10 @@ const React = require('react');
 /**
  * Whether the current element is the descendant of a <Text> element.
  */
-module.exports = (React.createContext(false): React$Context<$FlowFixMe>);
+const TextAncestorContext = (React.createContext(
+  false,
+): React$Context<$FlowFixMe>);
+if (__DEV__) {
+  TextAncestorContext.displayName = 'TextAncestorContext';
+}
+module.exports = TextAncestorContext;
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
index 144bd810f9e5a9..fedb8d23f9c2e1 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
@@ -41,8 +41,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) UITextFieldViewMode clearButtonMode;
 #endif // TODO(macOS GH#774)
 
-// The `caretHidden` property actually is not supported yet;
-// it's declared here only to conform to the interface.
 @property (nonatomic, assign) BOOL caretHidden;
 
 @property (nonatomic, strong, nullable) NSString *inputAccessoryViewID;
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index 54e19622a3616a..419654e7f166bc 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -488,6 +488,7 @@ - (void)_updatePlaceholder
 #else // [TODO(macOS GH#774)
   [self setNeedsDisplay:YES];
 #endif // ]TODO(macOS GH#774)
+  [self _invalidatePlaceholderVisibility];
 }
 
 - (NSDictionary<NSAttributedStringKey, id> *)_placeholderTextAttributes
@@ -503,6 +504,19 @@ - (void)_updatePlaceholder
   return textAttributes;
 }
 
+#pragma mark - Caret Manipulation
+#if !TARGET_OS_OSX // TODO(macOS GH#774)
+
+- (CGRect)caretRectForPosition:(UITextPosition *)position
+{
+  if (_caretHidden) {
+    return CGRectZero;
+  }
+
+  return [super caretRectForPosition:position];
+}
+#endif
+
 #pragma mark - Utility Methods
 
 - (void)copyTextAttributesFrom:(NSAttributedString *)sourceString
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index fb8c2e23392544..1b0255dabd4cba 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -451,6 +451,14 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
     if (text.length > allowedLength) {
       // If we typed/pasted more than one character, limit the text inputted.
       if (text.length > 1) {
+        if (allowedLength > 0) {
+          //make sure unicode characters that are longer than 16 bits (such as emojis) are not cut off
+          NSRange cutOffCharacterRange = [text rangeOfComposedCharacterSequenceAtIndex: allowedLength - 1];
+          if (cutOffCharacterRange.location + cutOffCharacterRange.length > allowedLength) {
+            //the character at the length limit takes more than 16bits, truncation should end at the character before
+            allowedLength = cutOffCharacterRange.location;
+          }
+        }
         // Truncate the input string so the result is exactly maxLength
         NSString *limitedString = [text substringToIndex:allowedLength];
         NSMutableAttributedString *newAttributedText = [backedTextInputView.attributedText mutableCopy];
diff --git a/Libraries/Text/TextNativeComponent.js b/Libraries/Text/TextNativeComponent.js
index eafc7ddf8d1483..858aaba750f19b 100644
--- a/Libraries/Text/TextNativeComponent.js
+++ b/Libraries/Text/TextNativeComponent.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import ReactNativeViewAttributes from '../Components/View/ReactNativeViewAttributes';
 import UIManager from '../ReactNative/UIManager';
 import {type HostComponent} from '../Renderer/shims/ReactNativeTypes';
@@ -26,6 +24,7 @@ type NativeTextProps = $ReadOnly<{
 export const NativeText: HostComponent<NativeTextProps> = (createReactNativeComponentClass(
   'RCTText',
   () => ({
+    // $FlowFixMe[incompatible-call]
     validAttributes: {
       ...ReactNativeViewAttributes.UIView,
       isHighlighted: true,
@@ -42,6 +41,7 @@ export const NativeText: HostComponent<NativeTextProps> = (createReactNativeComp
       onTextLayout: true,
       onInlineViewLayout: true,
       dataDetectorType: true,
+      android_hyphenationFrequency: true,
     },
     directEventTypes: {
       topTextLayout: {
@@ -56,9 +56,10 @@ export const NativeText: HostComponent<NativeTextProps> = (createReactNativeComp
 ): any);
 
 export const NativeVirtualText: HostComponent<NativeTextProps> =
-  UIManager.getViewManagerConfig('RCTVirtualText') == null
+  !global.RN$Bridgeless && !UIManager.hasViewManagerConfig('RCTVirtualText')
     ? NativeText
     : (createReactNativeComponentClass('RCTVirtualText', () => ({
+        // $FlowFixMe[incompatible-call]
         validAttributes: {
           ...ReactNativeViewAttributes.UIView,
           isHighlighted: true,
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index b5e48bff6f7064..b6a9d19e0aaf5b 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -20,6 +20,8 @@ import type {TextStyleProp} from '../StyleSheet/StyleSheet';
 import type {
   AccessibilityRole,
   AccessibilityState,
+  AccessibilityActionInfo,
+  AccessibilityActionEvent,
 } from '../Components/View/ViewAccessibility';
 
 export type PressRetentionOffset = $ReadOnly<{|
@@ -39,6 +41,8 @@ export type TextProps = $ReadOnly<{|
    * See https://reactnative.dev/docs/text.html#accessible
    */
   accessible?: ?boolean,
+  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
+  onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
   accessibilityHint?: ?Stringish,
   accessibilityLabel?: ?Stringish,
   accessibilityRole?: ?AccessibilityRole,
@@ -122,6 +126,8 @@ export type TextProps = $ReadOnly<{|
    * See https://reactnative.dev/docs/text.html#onpress
    */
   onPress?: ?(event: PressEvent) => mixed,
+  onPressIn?: ?(event: PressEvent) => mixed,
+  onPressOut?: ?(event: PressEvent) => mixed,
   onResponderGrant?: ?(event: PressEvent) => void,
   onResponderMove?: ?(event: PressEvent) => void,
   onResponderRelease?: ?(event: PressEvent) => void,
diff --git a/Libraries/TurboModule/RCTExport.js b/Libraries/TurboModule/RCTExport.js
index bbf236ed452d3d..d68194adb36194 100644
--- a/Libraries/TurboModule/RCTExport.js
+++ b/Libraries/TurboModule/RCTExport.js
@@ -35,4 +35,4 @@ export interface DEPRECATED_RCTExport<T: void = void> {
 
 export interface TurboModule extends DEPRECATED_RCTExport<void> {}
 
-export type {RootTag} from '../ReactNative/RootTag.js';
+export type {RootTag} from '../Types/RootTagTypes.js';
diff --git a/Libraries/TurboModule/TurboModuleRegistry.js b/Libraries/TurboModule/TurboModuleRegistry.js
index 0e70e6b4610616..90e30dd081591a 100644
--- a/Libraries/TurboModule/TurboModuleRegistry.js
+++ b/Libraries/TurboModule/TurboModuleRegistry.js
@@ -8,15 +8,13 @@
  * @format
  */
 
-'use strict';
-
 const NativeModules = require('../BatchedBridge/NativeModules');
 import type {TurboModule} from './RCTExport';
 import invariant from 'invariant';
 
 const turboModuleProxy = global.__turboModuleProxy;
 
-function requireModule<T: TurboModule>(name: string, schema?: ?$FlowFixMe): ?T {
+function requireModule<T: TurboModule>(name: string): ?T {
   // Bridgeless mode requires TurboModules
   if (!global.RN$Bridgeless) {
     // Backward compatibility layer during migration.
@@ -27,8 +25,7 @@ function requireModule<T: TurboModule>(name: string, schema?: ?$FlowFixMe): ?T {
   }
 
   if (turboModuleProxy != null) {
-    const module: ?T =
-      schema != null ? turboModuleProxy(name, schema) : turboModuleProxy(name);
+    const module: ?T = turboModuleProxy(name);
     return module;
   }
 
@@ -36,31 +33,11 @@ function requireModule<T: TurboModule>(name: string, schema?: ?$FlowFixMe): ?T {
 }
 
 export function get<T: TurboModule>(name: string): ?T {
-  /**
-   * What is Schema?
-   *
-   * @react-native/babel-plugin-codegen will parse the NativeModule
-   * spec, and pass in the generated schema as the second argument
-   * to this function. The schem will then be used to perform method
-   * dispatch on, and translate arguments/return to and from the Native
-   * TurboModule object.
-   */
-  const schema = arguments.length === 2 ? arguments[1] : undefined;
-  return requireModule<T>(name, schema);
+  return requireModule<T>(name);
 }
 
 export function getEnforcing<T: TurboModule>(name: string): T {
-  /**
-   * What is Schema?
-   *
-   * @react-native/babel-plugin-codegen will parse the NativeModule
-   * spec, and pass in the generated schema as the second argument
-   * to this function. The schem will then be used to perform method
-   * dispatch on, and translate arguments/return to and from the Native
-   * TurboModule object.
-   */
-  const schema = arguments.length === 2 ? arguments[1] : undefined;
-  const module = requireModule<T>(name, schema);
+  const module = requireModule<T>(name);
   invariant(
     module != null,
     `TurboModuleRegistry.getEnforcing(...): '${name}' could not be found. ` +
diff --git a/Libraries/TurboModule/samples/NativeSampleTurboModule.js b/Libraries/TurboModule/samples/NativeSampleTurboModule.js
index f9c4c6ef53e393..8b5b39eba188c7 100644
--- a/Libraries/TurboModule/samples/NativeSampleTurboModule.js
+++ b/Libraries/TurboModule/samples/NativeSampleTurboModule.js
@@ -8,8 +8,7 @@
  * @format
  */
 
-'use strict';
-
+import type {UnsafeObject} from '../../Types/CodegenTypes';
 import type {RootTag, TurboModule} from '../RCTExport';
 import * as TurboModuleRegistry from '../TurboModuleRegistry';
 
@@ -26,6 +25,7 @@ export interface Spec extends TurboModule {
   +getString: (arg: string) => string;
   +getArray: (arg: Array<any>) => Array<any>;
   +getObject: (arg: Object) => Object;
+  +getUnsafeObject: (arg: UnsafeObject) => UnsafeObject;
   +getRootTag: (arg: RootTag) => RootTag;
   +getValue: (x: number, y: string, z: Object) => Object;
   +getValueWithCallback: (callback: (value: string) => void) => void;
diff --git a/Libraries/TypeSafety/RCTTypeSafety.podspec b/Libraries/TypeSafety/RCTTypeSafety.podspec
index af8dab2bbd21f4..949c1d28b3bff9 100644
--- a/Libraries/TypeSafety/RCTTypeSafety.podspec
+++ b/Libraries/TypeSafety/RCTTypeSafety.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "RCTTypeSafety"
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#774)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#774)
   s.compiler_flags         = folly_compiler_flags
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
diff --git a/Libraries/Types/CodegenTypes.js b/Libraries/Types/CodegenTypes.js
index 9e33919fdd845f..458cfe80ba88ba 100644
--- a/Libraries/Types/CodegenTypes.js
+++ b/Libraries/Types/CodegenTypes.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow strict
  */
 
 'use strict';
@@ -28,6 +28,7 @@ export type DirectEventHandler<
 export type Double = number;
 export type Float = number;
 export type Int32 = number;
+export type UnsafeObject = $FlowFixMe; // Object is forbidden in strict mode
 
 type DefaultTypes = number | boolean | string | $ReadOnlyArray<string>;
 // Default handling, ignore the unused value
diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index b7e509aca107c0..c8b496154d3227 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -4,12 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict-local
+ * @flow strict
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 
diff --git a/Libraries/Components/Picker/PickerAndroid.ios.js b/Libraries/Types/RootTagTypes.js
similarity index 70%
rename from Libraries/Components/Picker/PickerAndroid.ios.js
rename to Libraries/Types/RootTagTypes.js
index d5fd5cf83f7560..4fde211e5f02b0 100644
--- a/Libraries/Components/Picker/PickerAndroid.ios.js
+++ b/Libraries/Types/RootTagTypes.js
@@ -4,9 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict
  * @format
  */
 
-'use strict';
-
-module.exports = require('../UnimplementedViews/UnimplementedView');
+export type {RootTag} from '../ReactNative/RootTag';
diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
index 65a548df756787..dabcaff86662d1 100644
--- a/Libraries/UTFSequence.js
+++ b/Libraries/UTFSequence.js
@@ -16,7 +16,7 @@ const deepFreezeAndThrowOnMutationInDev = require('./Utilities/deepFreezeAndThro
  * A collection of Unicode sequences for various characters and emoji.
  *
  *  - More explicit than using the sequences directly in code.
- *  - Source code should be limitted to ASCII.
+ *  - Source code should be limited to ASCII.
  *  - Less chance of typos.
  */
 const UTFSequence: {|
diff --git a/Libraries/Utilities/Appearance.js b/Libraries/Utilities/Appearance.js
index 314b3eaaad649c..c25d1fd20df5f0 100644
--- a/Libraries/Utilities/Appearance.js
+++ b/Libraries/Utilities/Appearance.js
@@ -8,9 +8,9 @@
  * @flow strict-local
  */
 
-'use strict';
-
-import EventEmitter from '../vendor/emitter/EventEmitter';
+import EventEmitter, {
+  type EventSubscription,
+} from '../vendor/emitter/EventEmitter';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import NativeAppearance, {
   type AppearancePreferences,
@@ -18,12 +18,23 @@ import NativeAppearance, {
 } from './NativeAppearance';
 import invariant from 'invariant';
 import {isAsyncDebugging} from './DebugEnvironment';
+import Platform from '../Utilities/Platform';
 
 type AppearanceListener = (preferences: AppearancePreferences) => void;
-const eventEmitter = new EventEmitter();
+const eventEmitter = new EventEmitter<{
+  change: [AppearancePreferences],
+}>();
+
+type NativeAppearanceEventDefinitions = {
+  appearanceChanged: [AppearancePreferences],
+};
 
 if (NativeAppearance) {
-  const nativeEventEmitter = new NativeEventEmitter(NativeAppearance);
+  const nativeEventEmitter = new NativeEventEmitter<NativeAppearanceEventDefinitions>(
+    // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+    // If you want to use the native module on other platforms, please remove this condition and test its behavior
+    Platform.OS !== 'ios' && Platform.OS !== 'macos' ? null : NativeAppearance, // TODO(macOS GH#774): Also use this parameter on macOS
+  );
   nativeEventEmitter.addListener(
     'appearanceChanged',
     (newAppearance: AppearancePreferences) => {
@@ -72,16 +83,19 @@ module.exports = {
     );
     return nativeColorScheme;
   },
+
   /**
    * Add an event handler that is fired when appearance preferences change.
    */
-  addChangeListener(listener: AppearanceListener): void {
-    eventEmitter.addListener('change', listener);
+  addChangeListener(listener: AppearanceListener): EventSubscription {
+    return eventEmitter.addListener('change', listener);
   },
+
   /**
-   * Remove an event handler.
+   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
    */
   removeChangeListener(listener: AppearanceListener): void {
+    // NOTE: This will report a deprecation notice via `console.error`.
     eventEmitter.removeListener('change', listener);
   },
 };
diff --git a/Libraries/Utilities/BackHandler.android.js b/Libraries/Utilities/BackHandler.android.js
index 757f2184b60b9f..f4d807faaf44c7 100644
--- a/Libraries/Utilities/BackHandler.android.js
+++ b/Libraries/Utilities/BackHandler.android.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import NativeDeviceEventManager from '../../Libraries/NativeModules/specs/NativeDeviceEventManager';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 
diff --git a/Libraries/Utilities/DebugEnvironment.js b/Libraries/Utilities/DebugEnvironment.js
index c2b3e8ff57ef2c..2d432b6658eba7 100644
--- a/Libraries/Utilities/DebugEnvironment.js
+++ b/Libraries/Utilities/DebugEnvironment.js
@@ -5,11 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow strict
  */
 
-'use strict';
-
 export let isAsyncDebugging: boolean = false;
 
 if (__DEV__) {
diff --git a/Libraries/Utilities/DevSettings.js b/Libraries/Utilities/DevSettings.js
index 58494938ec6536..3c01c7efc6ffb3 100644
--- a/Libraries/Utilities/DevSettings.js
+++ b/Libraries/Utilities/DevSettings.js
@@ -4,72 +4,67 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict-local
+ * @format
  */
 
 import NativeDevSettings from '../NativeModules/specs/NativeDevSettings';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import Platform from '../Utilities/Platform';
 
-interface IDevSettings {
-  addMenuItem(title: string, handler: () => mixed): void;
-  reload(reason?: string): void;
-  onFastRefresh(): void;
-}
-
-class DevSettings extends NativeEventEmitter implements IDevSettings {
-  _menuItems: Map<string, () => mixed>;
-
-  constructor() {
-    super(NativeDevSettings);
+let DevSettings: {
+  addMenuItem(title: string, handler: () => mixed): void,
+  reload(reason?: string): void,
+  onFastRefresh(): void,
+} = {
+  addMenuItem(title: string, handler: () => mixed): void {},
+  reload(reason?: string): void {},
+  onFastRefresh(): void {},
+};
 
-    this._menuItems = new Map();
-  }
+type DevSettingsEventDefinitions = {
+  didPressMenuItem: [{title: string}],
+};
 
-  addMenuItem(title: string, handler: () => mixed) {
-    // Make sure items are not added multiple times. This can
-    // happen when hot reloading the module that registers the
-    // menu items. The title is used as the id which means we
-    // don't support multiple items with the same name.
-    const oldHandler = this._menuItems.get(title);
-    if (oldHandler != null) {
-      this.removeListener('didPressMenuItem', oldHandler);
-    } else {
-      NativeDevSettings.addMenuItem(title);
-    }
+if (__DEV__) {
+  const emitter = new NativeEventEmitter<DevSettingsEventDefinitions>(
+    // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+    // If you want to use the native module on other platforms, please remove this condition and test its behavior
+    Platform.OS !== 'ios' && Platform.OS !== 'macos' ? null : NativeDevSettings, // TODO(macOS GH#774): Also use this parameter on macOS
+  );
+  const subscriptions = new Map();
 
-    this._menuItems.set(title, handler);
-    this.addListener('didPressMenuItem', event => {
-      if (event.title === title) {
-        handler();
+  DevSettings = {
+    addMenuItem(title: string, handler: () => mixed): void {
+      // Make sure items are not added multiple times. This can
+      // happen when hot reloading the module that registers the
+      // menu items. The title is used as the id which means we
+      // don't support multiple items with the same name.
+      let subscription = subscriptions.get(title);
+      if (subscription != null) {
+        subscription.remove();
+      } else {
+        NativeDevSettings.addMenuItem(title);
       }
-    });
-  }
 
-  reload(reason?: string) {
-    if (typeof NativeDevSettings.reloadWithReason === 'function') {
-      NativeDevSettings.reloadWithReason(reason ?? 'Uncategorized from JS');
-    } else {
-      NativeDevSettings.reload();
-    }
-  }
-
-  onFastRefresh() {
-    if (typeof NativeDevSettings.onFastRefresh === 'function') {
-      NativeDevSettings.onFastRefresh();
-    }
-  }
-
-  // TODO: Add other dev setting methods exposed by the native module.
-}
-
-// Avoid including the full `NativeDevSettings` class in prod.
-class NoopDevSettings implements IDevSettings {
-  addMenuItem(title: string, handler: () => mixed) {}
-  reload(reason?: string) {}
-  onFastRefresh() {}
+      subscription = emitter.addListener('didPressMenuItem', event => {
+        if (event.title === title) {
+          handler();
+        }
+      });
+      subscriptions.set(title, subscription);
+    },
+    reload(reason?: string): void {
+      if (NativeDevSettings.reloadWithReason != null) {
+        NativeDevSettings.reloadWithReason(reason ?? 'Uncategorized from JS');
+      } else {
+        NativeDevSettings.reload();
+      }
+    },
+    onFastRefresh(): void {
+      NativeDevSettings.onFastRefresh?.();
+    },
+  };
 }
 
-module.exports = ((__DEV__
-  ? new DevSettings()
-  : new NoopDevSettings()): IDevSettings);
+module.exports = DevSettings;
diff --git a/Libraries/Utilities/DeviceInfo.js b/Libraries/Utilities/DeviceInfo.js
index c3f59c5e88bced..8274c109ff26b6 100644
--- a/Libraries/Utilities/DeviceInfo.js
+++ b/Libraries/Utilities/DeviceInfo.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeDeviceInfo from './NativeDeviceInfo';
 
 module.exports = NativeDeviceInfo;
diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js
index b3e5822c401bb3..f295e0fea25676 100644
--- a/Libraries/Utilities/Dimensions.js
+++ b/Libraries/Utilities/Dimensions.js
@@ -8,29 +8,26 @@
  * @flow
  */
 
-'use strict';
-
-import EventEmitter from '../vendor/emitter/EventEmitter';
+import EventEmitter, {
+  type EventSubscription,
+} from '../vendor/emitter/EventEmitter';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import NativeDeviceInfo, {
   type DisplayMetrics,
+  type DisplayMetricsAndroid,
   type DimensionsPayload,
 } from './NativeDeviceInfo';
 import invariant from 'invariant';
 
-type DimensionsValue = {
-  window?: DisplayMetrics,
-  screen?: DisplayMetrics,
-  ...
-};
-
-const eventEmitter = new EventEmitter();
+const eventEmitter = new EventEmitter<{
+  change: [DimensionsPayload],
+}>();
 let dimensionsInitialized = false;
-let dimensions: DimensionsValue;
+let dimensions: DimensionsPayload;
 
 class Dimensions {
   /**
-   * NOTE: `useWindowDimensions` is the preffered API for React components.
+   * NOTE: `useWindowDimensions` is the preferred API for React components.
    *
    * Initial dimensions are set before `runApplication` is called so they should
    * be available before any other require's are run, but may be updated later.
@@ -44,9 +41,9 @@ class Dimensions {
    * Example: `const {height, width} = Dimensions.get('window');`
    *
    * @param {string} dim Name of dimension as defined when calling `set`.
-   * @returns {Object?} Value for the dimension.
+   * @returns {DisplayMetrics? | DisplayMetricsAndroid?} Value for the dimension.
    */
-  static get(dim: string): Object {
+  static get(dim: string): DisplayMetrics | DisplayMetricsAndroid {
     invariant(dimensions[dim], 'No dimension set for key ' + dim);
     return dimensions[dim];
   }
@@ -55,9 +52,9 @@ class Dimensions {
    * This should only be called from native code by sending the
    * didUpdateDimensions event.
    *
-   * @param {object} dims Simple string-keyed object of dimensions to set
+   * @param {DimensionsPayload} dims Simple string-keyed object of dimensions to set
    */
-  static set(dims: $ReadOnly<{[key: string]: any, ...}>): void {
+  static set(dims: $ReadOnly<DimensionsPayload>): void {
     // We calculate the window dimensions in JS so that we don't encounter loss of
     // precision in transferring the dimensions (which could be non-integers) over
     // the bridge.
@@ -100,17 +97,20 @@ class Dimensions {
    *   are the same as the return values of `Dimensions.get('window')` and
    *   `Dimensions.get('screen')`, respectively.
    */
-  static addEventListener(type: 'change', handler: Function) {
+  static addEventListener(
+    type: 'change',
+    handler: Function,
+  ): EventSubscription {
     invariant(
       type === 'change',
       'Trying to subscribe to unknown event: "%s"',
       type,
     );
-    eventEmitter.addListener(type, handler);
+    return eventEmitter.addListener(type, handler);
   }
 
   /**
-   * Remove an event handler.
+   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
    */
   static removeEventListener(type: 'change', handler: Function) {
     invariant(
@@ -118,11 +118,12 @@ class Dimensions {
       'Trying to remove listener for unknown event: "%s"',
       type,
     );
+    // NOTE: This will report a deprecation notice via `console.error`.
     eventEmitter.removeListener(type, handler);
   }
 }
 
-let initialDims: ?$ReadOnly<{[key: string]: any, ...}> =
+let initialDims: ?$ReadOnly<DimensionsPayload> =
   global.nativeExtensions &&
   global.nativeExtensions.DeviceInfo &&
   global.nativeExtensions.DeviceInfo.Dimensions;
diff --git a/Libraries/Utilities/FeatureDetection.js b/Libraries/Utilities/FeatureDetection.js
new file mode 100644
index 00000000000000..38324d7f202dd6
--- /dev/null
+++ b/Libraries/Utilities/FeatureDetection.js
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+/**
+ * @return whether or not a @param {function} f is provided natively by calling
+ * `toString` and check if the result includes `[native code]` in it.
+ *
+ * Note that a polyfill can technically fake this behavior but few does it.
+ * Therefore, this is usually good enough for our purpose.
+ */
+function isNativeFunction(f: Function): boolean {
+  return typeof f === 'function' && f.toString().indexOf('[native code]') > -1;
+}
+
+/**
+ * @return whether or not the constructor of @param {object} o is an native
+ * function named with @param {string} expectedName.
+ */
+function hasNativeConstructor(o: Object, expectedName: string): boolean {
+  const con = Object.getPrototypeOf(o).constructor;
+  return con.name === expectedName && isNativeFunction(con);
+}
+
+module.exports = {isNativeFunction, hasNativeConstructor};
diff --git a/Libraries/Utilities/GlobalPerformanceLogger.js b/Libraries/Utilities/GlobalPerformanceLogger.js
index 39bacad1988380..66806926d5eb74 100644
--- a/Libraries/Utilities/GlobalPerformanceLogger.js
+++ b/Libraries/Utilities/GlobalPerformanceLogger.js
@@ -7,7 +7,6 @@
  * @flow strict
  * @format
  */
-'use strict';
 
 import createPerformanceLogger from './createPerformanceLogger';
 import type {IPerformanceLogger} from './createPerformanceLogger';
diff --git a/Libraries/Utilities/HMRClient.js b/Libraries/Utilities/HMRClient.js
index 34108e030619e6..62bd54812cb926 100644
--- a/Libraries/Utilities/HMRClient.js
+++ b/Libraries/Utilities/HMRClient.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const DevSettings = require('./DevSettings');
 const invariant = require('invariant');
 const MetroHMRClient = require('metro-runtime/src/modules/HMRClient');
@@ -18,8 +16,8 @@ const prettyFormat = require('pretty-format');
 
 import getDevServer from '../Core/Devtools/getDevServer';
 import NativeRedBox from '../NativeModules/specs/NativeRedBox';
-import * as LogBoxData from '../LogBox/Data/LogBoxData';
-import type {ExtendedError} from '../Core/Devtools/parseErrorStack';
+import LogBox from '../LogBox/LogBox';
+import type {ExtendedError} from '../Core/ExtendedError';
 
 const pendingEntryPoints = [];
 let hmrClient = null;
@@ -50,6 +48,7 @@ export type HMRClientNativeInterface = {|
     host: string,
     port: number | string,
     isEnabled: boolean,
+    scheme?: string,
   ): void,
 |};
 
@@ -120,6 +119,7 @@ const HMRClient: HMRClientNativeInterface = {
         JSON.stringify({
           type: 'log',
           level,
+          mode: global.RN$Bridgeless ? 'NOBRIDGE' : 'BRIDGE',
           data: data.map(item =>
             typeof item === 'string'
               ? item
@@ -147,6 +147,7 @@ const HMRClient: HMRClientNativeInterface = {
     host: string,
     port: number | string,
     isEnabled: boolean,
+    scheme?: string = 'http',
   ) {
     invariant(platform, 'Missing required parameter `platform`');
     invariant(bundleEntry, 'Missing required parameter `bundleEntry`');
@@ -156,8 +157,12 @@ const HMRClient: HMRClientNativeInterface = {
     // Moving to top gives errors due to NativeModules not being initialized
     const LoadingView = require('./LoadingView');
 
-    const wsHost = port !== null && port !== '' ? `${host}:${port}` : host;
-    const client = new MetroHMRClient(`ws://${wsHost}/hot`);
+    const serverHost = port !== null && port !== '' ? `${host}:${port}` : host;
+
+    const serverScheme = scheme;
+
+    const client = new MetroHMRClient(`${serverScheme}://${serverHost}/hot`);
+
     hmrClient = client;
 
     const {fullBundleUrl} = getDevServer();
@@ -166,9 +171,7 @@ const HMRClient: HMRClientNativeInterface = {
       // there are any important URL parameters we can't reconstruct from
       // `setup()`'s arguments.
       fullBundleUrl ??
-        // The ws://.../hot?bundleEntry= format is an alternative to specifying
-        // a regular HTTP bundle URL.
-        `ws://${wsHost}/hot?bundleEntry=${bundleEntry}&platform=${platform}`,
+        `${serverScheme}://${serverHost}/hot?bundleEntry=${bundleEntry}&platform=${platform}`,
     );
 
     client.on('connection-error', e => {
@@ -211,7 +214,7 @@ Error: ${e.message}`;
     client.on('update', ({isInitialUpdate}) => {
       if (client.isEnabled() && !isInitialUpdate) {
         dismissRedbox();
-        LogBoxData.clear();
+        LogBox.clearAllLogs();
       }
     });
 
@@ -329,6 +332,8 @@ function showCompileError() {
   const message = currentCompileErrorMessage;
   currentCompileErrorMessage = null;
 
+  /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+   * parameters */
   const error: ExtendedError = new Error(message);
   // Symbolicating compile errors is wasted effort
   // because the stack trace is meaningless:
diff --git a/Libraries/Utilities/JSDevSupportModule.js b/Libraries/Utilities/JSDevSupportModule.js
index 9e6d60dce01fa9..396f1a2fb81dd3 100644
--- a/Libraries/Utilities/JSDevSupportModule.js
+++ b/Libraries/Utilities/JSDevSupportModule.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeJSDevSupport from './NativeJSDevSupport';
 const ReactNative = require('../Renderer/shims/ReactNative');
 
diff --git a/Libraries/Utilities/LoadingView.android.js b/Libraries/Utilities/LoadingView.android.js
index fc18394b144068..ae369ccf8604b7 100644
--- a/Libraries/Utilities/LoadingView.android.js
+++ b/Libraries/Utilities/LoadingView.android.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import ToastAndroid from '../Components/ToastAndroid/ToastAndroid';
 
 const TOAST_SHORT_DELAY = 2000;
diff --git a/Libraries/Utilities/LoadingView.ios.js b/Libraries/Utilities/LoadingView.ios.js
index bc423a822ae7c0..0a0ebaeda02e7a 100644
--- a/Libraries/Utilities/LoadingView.ios.js
+++ b/Libraries/Utilities/LoadingView.ios.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import processColor from '../StyleSheet/processColor';
 import NativeDevLoadingView from './NativeDevLoadingView';
 import Appearance from './Appearance';
diff --git a/Libraries/Utilities/MatrixMath.js b/Libraries/Utilities/MatrixMath.js
index f316bea68611fc..d2d6421106b53b 100755
--- a/Libraries/Utilities/MatrixMath.js
+++ b/Libraries/Utilities/MatrixMath.js
@@ -71,7 +71,7 @@ const MatrixMath = {
    * This create a perspective projection towards negative z
    * Clipping the z range of [-near, -far]
    *
-   * @param fovInRadians - field of view in randians
+   * @param fovInRadians - field of view in radians
    */
   createPerspective: function(fovInRadians, aspect, near, far) {
     const h = 1 / Math.tan(fovInRadians / 2);
diff --git a/Libraries/Utilities/NativeAppearance.js b/Libraries/Utilities/NativeAppearance.js
index 1f85cc30284988..573bb96360a668 100644
--- a/Libraries/Utilities/NativeAppearance.js
+++ b/Libraries/Utilities/NativeAppearance.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Utilities/NativeDevLoadingView.js b/Libraries/Utilities/NativeDevLoadingView.js
index a122e2c487df3b..8838f54d8da0e4 100644
--- a/Libraries/Utilities/NativeDevLoadingView.js
+++ b/Libraries/Utilities/NativeDevLoadingView.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Utilities/NativeDevSplitBundleLoader.js b/Libraries/Utilities/NativeDevSplitBundleLoader.js
index 987d47a5330b9a..5caa97a235a687 100644
--- a/Libraries/Utilities/NativeDevSplitBundleLoader.js
+++ b/Libraries/Utilities/NativeDevSplitBundleLoader.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Utilities/NativeDeviceInfo.js b/Libraries/Utilities/NativeDeviceInfo.js
index 840b754414c5e9..16c72c69544c92 100644
--- a/Libraries/Utilities/NativeDeviceInfo.js
+++ b/Libraries/Utilities/NativeDeviceInfo.js
@@ -8,12 +8,10 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
-type DisplayMetricsAndroid = {|
+export type DisplayMetricsAndroid = {|
   width: number,
   height: number,
   scale: number,
diff --git a/Libraries/Utilities/NativeJSDevSupport.js b/Libraries/Utilities/NativeJSDevSupport.js
index e609e1358ae7d7..da94a62d77cd96 100644
--- a/Libraries/Utilities/NativeJSDevSupport.js
+++ b/Libraries/Utilities/NativeJSDevSupport.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Utilities/NativePlatformConstantsAndroid.js b/Libraries/Utilities/NativePlatformConstantsAndroid.js
index 993b8091ddb487..afc0406dc98a91 100644
--- a/Libraries/Utilities/NativePlatformConstantsAndroid.js
+++ b/Libraries/Utilities/NativePlatformConstantsAndroid.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Utilities/NativePlatformConstantsIOS.js b/Libraries/Utilities/NativePlatformConstantsIOS.js
index 5b9d68bbc75565..15055ca5e932b8 100644
--- a/Libraries/Utilities/NativePlatformConstantsIOS.js
+++ b/Libraries/Utilities/NativePlatformConstantsIOS.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Utilities/PerformanceLoggerContext.js b/Libraries/Utilities/PerformanceLoggerContext.js
index 5bc3560f0fe1b9..92b77788099013 100644
--- a/Libraries/Utilities/PerformanceLoggerContext.js
+++ b/Libraries/Utilities/PerformanceLoggerContext.js
@@ -4,13 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict-local
+ * @flow strict
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
+import {useContext} from 'react';
 import GlobalPerformanceLogger from './GlobalPerformanceLogger';
 import type {IPerformanceLogger} from './createPerformanceLogger';
 
@@ -23,4 +22,12 @@ import type {IPerformanceLogger} from './createPerformanceLogger';
 const PerformanceLoggerContext: React.Context<IPerformanceLogger> = React.createContext(
   GlobalPerformanceLogger,
 );
-module.exports = PerformanceLoggerContext;
+if (__DEV__) {
+  PerformanceLoggerContext.displayName = 'PerformanceLoggerContext';
+}
+
+export function usePerformanceLogger(): IPerformanceLogger {
+  return useContext(PerformanceLoggerContext);
+}
+
+export default PerformanceLoggerContext;
diff --git a/Libraries/Utilities/Platform.android.js b/Libraries/Utilities/Platform.android.js
index ab3bc9b345c5b2..679dbb2a3a3fa2 100644
--- a/Libraries/Utilities/Platform.android.js
+++ b/Libraries/Utilities/Platform.android.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import NativePlatformConstantsAndroid from './NativePlatformConstantsAndroid';
 
 export type PlatformSelectSpec<A, N, D> = {
@@ -63,10 +61,13 @@ const Platform = {
   },
   select: <A, N, D>(spec: PlatformSelectSpec<A, N, D>): A | N | D =>
     'android' in spec
-      ? spec.android
+      ? // $FlowFixMe[incompatible-return]
+        spec.android
       : 'native' in spec
-      ? spec.native
-      : spec.default,
+      ? // $FlowFixMe[incompatible-return]
+        spec.native
+      : // $FlowFixMe[incompatible-return]
+        spec.default,
 };
 
 module.exports = Platform;
diff --git a/Libraries/Utilities/Platform.ios.js b/Libraries/Utilities/Platform.ios.js
index afb39c5aad8b06..f7ac62a5e14248 100644
--- a/Libraries/Utilities/Platform.ios.js
+++ b/Libraries/Utilities/Platform.ios.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import NativePlatformConstantsIOS from './NativePlatformConstantsIOS';
 
 export type PlatformSelectSpec<D, N, I> = {
@@ -68,6 +66,7 @@ const Platform = {
     return false;
   },
   select: <D, N, I>(spec: PlatformSelectSpec<D, N, I>): D | N | I =>
+    // $FlowFixMe[incompatible-return]
     'ios' in spec ? spec.ios : 'native' in spec ? spec.native : spec.default,
 };
 
diff --git a/Libraries/Utilities/Platform.macos.js b/Libraries/Utilities/Platform.macos.js
index 330b19085ef854..e1baf46d4f13d1 100644
--- a/Libraries/Utilities/Platform.macos.js
+++ b/Libraries/Utilities/Platform.macos.js
@@ -58,10 +58,13 @@ const Platform = {
   },
   select: <D, N, I>(spec: PlatformSelectSpec<D, N, I>): D | N | I =>
     'macos' in spec
-      ? spec.macos
+      ? // $FlowFixMe[incompatible-return]
+        spec.macos
       : 'native' in spec
-      ? spec.native
-      : spec.default,
+      ? // $FlowFixMe[incompatible-return]
+        spec.native
+      : // $FlowFixMe[incompatible-return]
+        spec.default,
 };
 
 module.exports = Platform;
diff --git a/Libraries/Utilities/ReactNativeTestTools.js b/Libraries/Utilities/ReactNativeTestTools.js
index ea4e583e38f7f9..1f4e7cd8021028 100644
--- a/Libraries/Utilities/ReactNativeTestTools.js
+++ b/Libraries/Utilities/ReactNativeTestTools.js
@@ -10,15 +10,13 @@
 
 /* eslint-env jest */
 
-'use strict';
-
 const React = require('react');
 
 const ReactTestRenderer = require('react-test-renderer');
 const ShallowRenderer = require('react-shallow-renderer');
-/* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.125.1 was deployed. To see the error, delete this comment
- * and run Flow. */
+/* $FlowFixMe[not-a-function] (>=0.125.1 site=react_native_fb) This comment
+ * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
+ * delete this comment and run Flow. */
 const shallowRenderer = new ShallowRenderer();
 
 import type {ReactTestRenderer as ReactTestRendererType} from 'react-test-renderer';
@@ -29,9 +27,12 @@ export type ReactTestInstance = $PropertyType<ReactTestRendererType, 'root'>;
 export type Predicate = (node: ReactTestInstance) => boolean;
 
 type $ReturnType<Fn> = $Call<<Ret, A>((...A) => Ret) => Ret, Fn>;
-/* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.125.1 was deployed. To see the error, delete this comment
- * and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.125.1 site=react_native_fb) This comment
+ * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
+ * delete this comment and run Flow. */
+/* $FlowFixMe[value-as-type] (>=0.125.1 site=react_native_fb) This comment
+ * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
+ * delete this comment and run Flow. */
 export type ReactTestRendererJSON = $ReturnType<ReactTestRenderer.create.toJSON>;
 
 const {
@@ -57,13 +58,8 @@ function byClickable(): Predicate {
       // HACK: Find components that use `Pressability`.
       node.instance?.state?.pressability != null ||
       // TODO: Remove this after deleting `Touchable`.
-      /* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.125.1 was deployed. To see the error, delete
-       * this comment and run Flow. */
-      (node.instance &&
-        /* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses
-         * an error found when Flow v0.125.1 was deployed. To see the error,
-         * delete this comment and run Flow. */
+      (node.instance != null &&
+        // $FlowFixMe[prop-missing]
         typeof node.instance.touchableHandlePress === 'function'),
     'is clickable',
   );
@@ -78,10 +74,7 @@ function byTestID(testID: string): Predicate {
 
 function byTextMatching(regex: RegExp): Predicate {
   return withMessage(
-    /* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.125.1 was deployed. To see the error, delete
-     * this comment and run Flow. */
-    node => node.props && regex.exec(node.props.children),
+    node => node.props != null && regex.exec(node.props.children) !== null,
     `text content matches ${regex.toString()}`,
   );
 }
diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index 79981ad2671a7b..549be83d1da7c4 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import GlobalPerformanceLogger from '../GlobalPerformanceLogger';
 import createPerformanceLogger from '../createPerformanceLogger';
 import type {IPerformanceLogger} from '../createPerformanceLogger';
diff --git a/Libraries/Utilities/__tests__/setAndForwardRef-test.js b/Libraries/Utilities/__tests__/setAndForwardRef-test.js
index 361831398062bf..14da769dbf24c2 100644
--- a/Libraries/Utilities/__tests__/setAndForwardRef-test.js
+++ b/Libraries/Utilities/__tests__/setAndForwardRef-test.js
@@ -85,14 +85,14 @@ describe('setAndForwardRef', () => {
   it('should forward refs (createRef-based)', () => {
     const createdRef = React.createRef<typeof ForwardedComponent>();
 
-    /* $FlowFixMe(>=0.89.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.89 was deployed. To see the error, delete this
-     * comment and run Flow. */
+    /* $FlowFixMe[incompatible-type] (>=0.89.0 site=react_native_fb) This
+     * comment suppresses an error found when Flow v0.89 was deployed. To see
+     * the error, delete this comment and run Flow. */
     ReactTestRenderer.create(<TestComponentWithRef ref={createdRef} />);
 
-    /* $FlowFixMe(>=0.87.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.87 was deployed. To see the error, delete this
-     * comment and run Flow. */
+    /* $FlowFixMe[prop-missing] (>=0.87.0 site=react_native_fb) This comment
+     * suppresses an error found when Flow v0.87 was deployed. To see the
+     * error, delete this comment and run Flow. */
     const val = createdRef.current && createdRef.current.testFunc();
 
     expect(innerFuncCalled).toBe(true);
diff --git a/Libraries/Utilities/__tests__/stringifySafe-test.js b/Libraries/Utilities/__tests__/stringifySafe-test.js
index 9ab85e566cbda3..f6cb307cf223e9 100644
--- a/Libraries/Utilities/__tests__/stringifySafe-test.js
+++ b/Libraries/Utilities/__tests__/stringifySafe-test.js
@@ -9,8 +9,6 @@
  * @emails oncall+react_native
  */
 
-'use strict';
-
 import stringifySafe, {createStringifySafeWithLimits} from '../stringifySafe';
 
 describe('stringifySafe', () => {
diff --git a/Libraries/Utilities/__tests__/useMergeRefs-test.js b/Libraries/Utilities/__tests__/useMergeRefs-test.js
new file mode 100644
index 00000000000000..73627f3ee70f74
--- /dev/null
+++ b/Libraries/Utilities/__tests__/useMergeRefs-test.js
@@ -0,0 +1,228 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+react_native
+ * @flow strict-local
+ * @format
+ */
+
+import useMergeRefs from '../useMergeRefs';
+import * as React from 'react';
+import {View} from 'react-native';
+import {act, create} from 'react-test-renderer';
+
+/**
+ * TestView provide a component execution environment to test hooks.
+ */
+function TestView({name, refs}) {
+  const mergeRef = useMergeRefs(...refs);
+  return <View ref={mergeRef} testID={name} />;
+}
+
+/**
+ * TestViewInstance provides a pretty-printable replacement for React instances.
+ */
+class TestViewInstance {
+  name: string;
+
+  constructor(name: string) {
+    this.name = name;
+  }
+
+  // $FlowIgnore[unclear-type] - Intentional.
+  static fromValue(value: any): ?TestViewInstance {
+    const testID = value?.props?.testID;
+    return testID == null ? null : new TestViewInstance(testID);
+  }
+
+  static named(name: string) {
+    // $FlowIssue[prop-missing] - Flow does not support type augmentation.
+    return expect.testViewInstance(name);
+  }
+}
+
+/**
+ * extend.testViewInstance makes it easier to assert expected values. But use
+ * TestViewInstance.named instead of extend.testViewInstance because of Flow.
+ */
+expect.extend({
+  testViewInstance(received, name) {
+    const pass = received instanceof TestViewInstance && received.name === name;
+    return {pass};
+  },
+});
+
+/**
+ * Creates a registry that records the values assigned to the mock refs created
+ * by either of the two returned callbacks.
+ */
+function mockRefRegistry<T>(): {
+  mockCallbackRef: (name: string) => T => mixed,
+  mockObjectRef: (name: string) => {current: T, ...},
+  registry: $ReadOnlyArray<{[string]: T}>,
+} {
+  const registry = [];
+  return {
+    mockCallbackRef: (name: string): (T => mixed) => current => {
+      registry.push({[name]: TestViewInstance.fromValue(current)});
+    },
+    mockObjectRef: (name: string): {current: T, ...} => ({
+      // $FlowIgnore[unsafe-getters-setters] - Intentional.
+      set current(current) {
+        registry.push({[name]: TestViewInstance.fromValue(current)});
+      },
+    }),
+    registry,
+  };
+}
+
+test('accepts a callback ref', () => {
+  let root;
+
+  const {mockCallbackRef, registry} = mockRefRegistry();
+  const refA = mockCallbackRef('refA');
+
+  act(() => {
+    root = create(<TestView name="foo" refs={[refA]} />);
+  });
+
+  expect(registry).toEqual([{refA: TestViewInstance.named('foo')}]);
+
+  act(() => {
+    root = create(<TestView name="bar" refs={[refA]} />);
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refA: TestViewInstance.named('bar')},
+  ]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refA: TestViewInstance.named('bar')},
+    {refA: null},
+  ]);
+});
+
+test('accepts an object ref', () => {
+  let root;
+
+  const {mockObjectRef, registry} = mockRefRegistry();
+  const refA = mockObjectRef('refA');
+
+  act(() => {
+    root = create(<TestView name="foo" refs={[refA]} />);
+  });
+
+  expect(registry).toEqual([{refA: TestViewInstance.named('foo')}]);
+
+  act(() => {
+    root = create(<TestView name="bar" refs={[refA]} />);
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refA: TestViewInstance.named('bar')},
+  ]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refA: TestViewInstance.named('bar')},
+    {refA: null},
+  ]);
+});
+
+test('invokes refs in order', () => {
+  let root;
+
+  const {mockCallbackRef, mockObjectRef, registry} = mockRefRegistry();
+  const refA = mockCallbackRef('refA');
+  const refB = mockObjectRef('refB');
+  const refC = mockCallbackRef('refC');
+  const refD = mockObjectRef('refD');
+
+  act(() => {
+    root = create(<TestView name="foo" refs={[refA, refB, refC, refD]} />);
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refB: TestViewInstance.named('foo')},
+    {refC: TestViewInstance.named('foo')},
+    {refD: TestViewInstance.named('foo')},
+  ]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refB: TestViewInstance.named('foo')},
+    {refC: TestViewInstance.named('foo')},
+    {refD: TestViewInstance.named('foo')},
+    {refA: null},
+    {refB: null},
+    {refC: null},
+    {refD: null},
+  ]);
+});
+
+// This is actually undesirable behavior, but it's what we have so let's make
+// sure it does not change unexpectedly.
+test('invokes all refs if any ref changes', () => {
+  let root;
+
+  const {mockCallbackRef, registry} = mockRefRegistry();
+  const refA = mockCallbackRef('refA');
+  const refB = mockCallbackRef('refB');
+
+  act(() => {
+    root = create(<TestView name="foo" refs={[refA, refB]} />);
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refB: TestViewInstance.named('foo')},
+  ]);
+
+  const refAPrime = mockCallbackRef('refAPrime');
+  act(() => {
+    root.update(<TestView name="foo" refs={[refAPrime, refB]} />);
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refB: TestViewInstance.named('foo')},
+    {refA: null},
+    {refB: null},
+    {refAPrime: TestViewInstance.named('foo')},
+    {refB: TestViewInstance.named('foo')},
+  ]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    {refA: TestViewInstance.named('foo')},
+    {refB: TestViewInstance.named('foo')},
+    {refA: null},
+    {refB: null},
+    {refAPrime: TestViewInstance.named('foo')},
+    {refB: TestViewInstance.named('foo')},
+    {refAPrime: null},
+    {refB: null},
+  ]);
+});
diff --git a/Libraries/Utilities/__tests__/useRefEffect-test.js b/Libraries/Utilities/__tests__/useRefEffect-test.js
new file mode 100644
index 00000000000000..8204289e71ab86
--- /dev/null
+++ b/Libraries/Utilities/__tests__/useRefEffect-test.js
@@ -0,0 +1,242 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+react_native
+ * @flow strict-local
+ * @format
+ */
+
+import useRefEffect from '../useRefEffect';
+import * as React from 'react';
+import {View} from 'react-native';
+import {act, create} from 'react-test-renderer';
+
+/**
+ * TestView provide a component execution environment to test hooks.
+ */
+function TestView({childKey = null, effect}) {
+  const ref = useRefEffect(effect);
+  return <View key={childKey} ref={ref} testID={childKey} />;
+}
+
+/**
+ * TestEffect represents an effect invocation.
+ */
+class TestEffect {
+  name: string;
+  key: ?string;
+  constructor(name: string, key: ?string) {
+    this.name = name;
+    this.key = key;
+  }
+  static called(name: string, key: ?string) {
+    // $FlowIssue[prop-missing] - Flow does not support type augmentation.
+    return expect.effect(name, key);
+  }
+}
+
+/**
+ * TestEffectCleanup represents an effect cleanup invocation.
+ */
+class TestEffectCleanup {
+  name: string;
+  key: ?string;
+  constructor(name: string, key: ?string) {
+    this.name = name;
+    this.key = key;
+  }
+  static called(name: string, key: ?string) {
+    // $FlowIssue[prop-missing] - Flow does not support type augmentation.
+    return expect.effectCleanup(name, key);
+  }
+}
+
+/**
+ * extend.effect and expect.extendCleanup make it easier to assert expected
+ * values. But use TestEffect.called and TestEffectCleanup.called instead of
+ * extend.effect and expect.extendCleanup because of Flow.
+ */
+expect.extend({
+  effect(received, name, key) {
+    const pass =
+      received instanceof TestEffect &&
+      received.name === name &&
+      received.key === key;
+    return {pass};
+  },
+  effectCleanup(received, name, key) {
+    const pass =
+      received instanceof TestEffectCleanup &&
+      received.name === name &&
+      received.key === key;
+    return {pass};
+  },
+});
+
+function mockEffectRegistry(): {
+  mockEffect: string => () => () => void,
+  mockEffectWithoutCleanup: string => () => void,
+  registry: $ReadOnlyArray<TestEffect | TestEffectCleanup>,
+} {
+  const registry = [];
+  return {
+    mockEffect(name: string): () => () => void {
+      return instance => {
+        const key = instance?.props?.testID;
+        registry.push(new TestEffect(name, key));
+        return () => {
+          registry.push(new TestEffectCleanup(name, key));
+        };
+      };
+    },
+    mockEffectWithoutCleanup(name: string): () => void {
+      return instance => {
+        const key = instance?.props?.testID;
+        registry.push(new TestEffect(name, key));
+      };
+    },
+    registry,
+  };
+}
+
+test('calls effect without cleanup', () => {
+  let root;
+
+  const {mockEffectWithoutCleanup, registry} = mockEffectRegistry();
+  const effectA = mockEffectWithoutCleanup('A');
+
+  act(() => {
+    root = create(<TestView childKey="foo" effect={effectA} />);
+  });
+
+  expect(registry).toEqual([TestEffect.called('A', 'foo')]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([TestEffect.called('A', 'foo')]);
+});
+
+test('calls effect and cleanup', () => {
+  let root;
+
+  const {mockEffect, registry} = mockEffectRegistry();
+  const effectA = mockEffect('A');
+
+  act(() => {
+    root = create(<TestView childKey="foo" effect={effectA} />);
+  });
+
+  expect(registry).toEqual([TestEffect.called('A', 'foo')]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    TestEffect.called('A', 'foo'),
+    TestEffectCleanup.called('A', 'foo'),
+  ]);
+});
+
+test('cleans up old effect before calling new effect', () => {
+  let root;
+
+  const {mockEffect, registry} = mockEffectRegistry();
+  const effectA = mockEffect('A');
+  const effectB = mockEffect('B');
+
+  act(() => {
+    root = create(<TestView childKey="foo" effect={effectA} />);
+  });
+
+  act(() => {
+    root.update(<TestView childKey="foo" effect={effectB} />);
+  });
+
+  expect(registry).toEqual([
+    TestEffect.called('A', 'foo'),
+    TestEffectCleanup.called('A', 'foo'),
+    TestEffect.called('B', 'foo'),
+  ]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    TestEffect.called('A', 'foo'),
+    TestEffectCleanup.called('A', 'foo'),
+    TestEffect.called('B', 'foo'),
+    TestEffectCleanup.called('B', 'foo'),
+  ]);
+});
+
+test('calls cleanup and effect on new instance', () => {
+  let root;
+
+  const {mockEffect, registry} = mockEffectRegistry();
+  const effectA = mockEffect('A');
+
+  act(() => {
+    root = create(<TestView childKey="foo" effect={effectA} />);
+  });
+
+  act(() => {
+    root.update(<TestView childKey="bar" effect={effectA} />);
+  });
+
+  expect(registry).toEqual([
+    TestEffect.called('A', 'foo'),
+    TestEffectCleanup.called('A', 'foo'),
+    TestEffect.called('A', 'bar'),
+  ]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    TestEffect.called('A', 'foo'),
+    TestEffectCleanup.called('A', 'foo'),
+    TestEffect.called('A', 'bar'),
+    TestEffectCleanup.called('A', 'bar'),
+  ]);
+});
+
+test('cleans up old effect before calling new effect with new instance', () => {
+  let root;
+
+  const {mockEffect, registry} = mockEffectRegistry();
+  const effectA = mockEffect('A');
+  const effectB = mockEffect('B');
+
+  act(() => {
+    root = create(<TestView childKey="foo" effect={effectA} />);
+  });
+
+  act(() => {
+    root.update(<TestView childKey="bar" effect={effectB} />);
+  });
+
+  expect(registry).toEqual([
+    TestEffect.called('A', 'foo'),
+    TestEffectCleanup.called('A', 'foo'),
+    TestEffect.called('B', 'bar'),
+  ]);
+
+  act(() => {
+    root.unmount();
+  });
+
+  expect(registry).toEqual([
+    TestEffect.called('A', 'foo'),
+    TestEffectCleanup.called('A', 'foo'),
+    TestEffect.called('B', 'bar'),
+    TestEffectCleanup.called('B', 'bar'),
+  ]);
+});
diff --git a/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js b/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js
index 58acd17758cab8..43a507335d39cb 100644
--- a/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js
+++ b/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js
@@ -10,12 +10,13 @@
 
 'use strict';
 
-const getNativeComponentAttributes = require('../../ReactNative/getNativeComponentAttributes');
+jest.dontMock('../verifyComponentAttributeEquivalence');
+
 const verifyComponentAttributeEquivalence = require('../verifyComponentAttributeEquivalence')
   .default;
 
-jest.dontMock('../verifyComponentAttributeEquivalence');
-jest.mock('../../ReactNative/getNativeComponentAttributes', () => () => ({
+const TestComponentNativeViewConfig = {
+  uiViewClassName: 'TestComponent',
   NativeProps: {
     value: 'BOOL',
   },
@@ -40,62 +41,63 @@ jest.mock('../../ReactNative/getNativeComponentAttributes', () => () => ({
     },
     transform: 'CATransform3D',
   },
-}));
-
-beforeEach(() => {
-  global.__DEV__ = true;
-  console.error = jest.fn();
-  jest.resetModules();
-});
+};
 
 describe('verifyComponentAttributeEquivalence', () => {
-  test('should not verify in prod', () => {
-    global.__DEV__ = false;
-    verifyComponentAttributeEquivalence('TestComponent', {});
+  beforeEach(() => {
+    global.__DEV__ = true;
+    console.error = jest.fn();
+    jest.resetModules();
   });
 
-  test('should not error with native config that is a subset of the given config', () => {
-    const configWithAdditionalProperties = getNativeComponentAttributes(
-      'TestComponent',
-    );
+  it('should not verify in prod', () => {
+    global.__DEV__ = false;
+    verifyComponentAttributeEquivalence(TestComponentNativeViewConfig, {});
+  });
 
-    configWithAdditionalProperties.bubblingEventTypes.topFocus = {
-      phasedRegistrationNames: {
-        bubbled: 'onFocus',
-        captured: 'onFocusCapture',
+  it('should not error with native config that is a subset of the given config', () => {
+    const configWithAdditionalProperties = {
+      ...TestComponentNativeViewConfig,
+      bubblingEventTypes: {
+        ...TestComponentNativeViewConfig.bubblingEventTypes,
+        topFocus: {
+          phasedRegistrationNames: {
+            bubbled: 'onFocus',
+            captured: 'onFocusCapture',
+          },
+        },
+      },
+      directEventTypes: {
+        ...TestComponentNativeViewConfig.directEventTypes,
+        topSlidingComplete: {
+          registrationName: 'onSlidingComplete',
+        },
+      },
+      validAttributes: {
+        ...TestComponentNativeViewConfig.validAttributes,
+        active: true,
       },
     };
-
-    configWithAdditionalProperties.directEventTypes.topSlidingComplete = {
-      registrationName: 'onSlidingComplete',
-    };
-
-    configWithAdditionalProperties.validAttributes.active = true;
-
-    verifyComponentAttributeEquivalence(
-      'TestComponent',
-      configWithAdditionalProperties,
-    );
     verifyComponentAttributeEquivalence(
-      'TestComponent',
+      TestComponentNativeViewConfig,
       configWithAdditionalProperties,
     );
 
     expect(console.error).not.toBeCalled();
   });
 
-  test('should error if given config is missing native config properties', () => {
-    verifyComponentAttributeEquivalence('TestComponent', {});
+  it('should error if given config is missing native config properties', () => {
+    verifyComponentAttributeEquivalence(TestComponentNativeViewConfig, {});
 
     expect(console.error).toBeCalledTimes(3);
     expect(console.error).toBeCalledWith(
-      'TestComponent generated view config for directEventTypes does not match native, missing: topAccessibilityAction',
+      "'TestComponent' has a view config that does not match native. 'validAttributes' is missing: borderColor, style",
     );
     expect(console.error).toBeCalledWith(
-      'TestComponent generated view config for bubblingEventTypes does not match native, missing: topChange',
+      "'TestComponent' has a view config that does not match native. 'bubblingEventTypes' is missing: topChange",
     );
     expect(console.error).toBeCalledWith(
-      'TestComponent generated view config for validAttributes does not match native, missing: borderColor style',
+      "'TestComponent' has a view config that does not match native. 'directEventTypes' is missing: topAccessibilityAction",
     );
   });
 });
diff --git a/Libraries/Utilities/codegenNativeCommands.js b/Libraries/Utilities/codegenNativeCommands.js
index 1a7532cfddc778..2de29751de47eb 100644
--- a/Libraries/Utilities/codegenNativeCommands.js
+++ b/Libraries/Utilities/codegenNativeCommands.js
@@ -8,15 +8,13 @@
  * @flow
  */
 
-'use strict';
-
 import {dispatchCommand} from '../../Libraries/Renderer/shims/ReactNative';
 
 type Options<T = string> = $ReadOnly<{|
   supportedCommands: $ReadOnlyArray<T>,
 |}>;
 
-function codegenNativeCommands<T: {...}>(options: Options<$Keys<T>>): T {
+function codegenNativeCommands<T: interface {}>(options: Options<$Keys<T>>): T {
   const commandObj = {};
 
   options.supportedCommands.forEach(command => {
diff --git a/Libraries/Utilities/codegenNativeComponent.js b/Libraries/Utilities/codegenNativeComponent.js
index f358450cece322..ae2a6fbc135e82 100644
--- a/Libraries/Utilities/codegenNativeComponent.js
+++ b/Libraries/Utilities/codegenNativeComponent.js
@@ -9,8 +9,6 @@
  */
 // TODO: move this file to shims/ReactNative (requires React update and sync)
 
-'use strict';
-
 import requireNativeComponent from '../../Libraries/ReactNative/requireNativeComponent';
 import type {HostComponent} from '../../Libraries/Renderer/shims/ReactNativeTypes';
 import UIManager from '../ReactNative/UIManager';
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 66c2183186cf60..e522647aa04141 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const Systrace = require('../Performance/Systrace');
 
 const infoLog = require('./infoLog');
diff --git a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
index 72ddbe5cdda858..54be3c4c03805b 100644
--- a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
+++ b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
@@ -42,6 +42,7 @@ function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<mixed>>(
 
     // $FlowFixMe[not-an-object] `object` can be an array, but Object.keys works with arrays too
     const keys = Object.keys((object: {...} | Array<mixed>));
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const hasOwnProperty = Object.prototype.hasOwnProperty;
 
     for (let i = 0; i < keys.length; i++) {
diff --git a/Libraries/Utilities/defineLazyObjectProperty.js b/Libraries/Utilities/defineLazyObjectProperty.js
index c1b486a5fe4902..dc663716420c30 100644
--- a/Libraries/Utilities/defineLazyObjectProperty.js
+++ b/Libraries/Utilities/defineLazyObjectProperty.js
@@ -14,7 +14,7 @@
  * Defines a lazily evaluated property on the supplied `object`.
  */
 function defineLazyObjectProperty<T>(
-  object: {...},
+  object: interface {},
   name: string,
   descriptor: {
     get: () => T,
diff --git a/Libraries/Utilities/deprecatedPropType.js b/Libraries/Utilities/deprecatedPropType.js
index 480cf4cbeda6f6..0a0fc69aab2a0e 100644
--- a/Libraries/Utilities/deprecatedPropType.js
+++ b/Libraries/Utilities/deprecatedPropType.js
@@ -8,9 +8,7 @@
  * @flow strict-local
  */
 
-'use strict';
-
-const UIManager = require('../ReactNative/UIManager');
+import UIManager from '../ReactNative/UIManager';
 
 /**
  * Adds a deprecation warning when the prop is used.
@@ -22,8 +20,8 @@ function deprecatedPropType(
   return function validate(props, propName, componentName, ...rest) {
     // Don't warn for native components.
     if (
-      !global.RN$Bridgeless &&
-      !UIManager.getViewManagerConfig(componentName) &&
+      global.RN$Bridgeless !== true &&
+      !UIManager.hasViewManagerConfig(componentName) &&
       props[propName] !== undefined
     ) {
       console.warn(
diff --git a/Libraries/Utilities/registerGeneratedViewConfig.js b/Libraries/Utilities/registerGeneratedViewConfig.js
deleted file mode 100644
index 947b3b06642b72..00000000000000
--- a/Libraries/Utilities/registerGeneratedViewConfig.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- * @format
- */
-
-'use strict';
-
-const ReactNativeViewConfigRegistry = require('../Renderer/shims/ReactNativeViewConfigRegistry');
-const ReactNativeViewViewConfig = require('../Components/View/ReactNativeViewViewConfig');
-import verifyComponentAttributeEquivalence from './verifyComponentAttributeEquivalence';
-
-export type GeneratedViewConfig = {
-  uiViewClassName: string,
-  bubblingEventTypes?: $ReadOnly<{
-    [eventName: string]: $ReadOnly<{|
-      phasedRegistrationNames: $ReadOnly<{|
-        captured: string,
-        bubbled: string,
-      |}>,
-    |}>,
-    ...,
-  }>,
-  directEventTypes?: $ReadOnly<{
-    [eventName: string]: $ReadOnly<{|
-      registrationName: string,
-    |}>,
-    ...,
-  }>,
-  validAttributes?: {
-    [propName: string]:
-      | true
-      | $ReadOnly<{|
-          diff?: <T>(arg1: any, arg2: any) => boolean,
-          process?: (arg1: any) => any,
-        |}>,
-    ...,
-  },
-  ...
-};
-
-function registerGeneratedViewConfig(
-  componentName: string,
-  viewConfig: GeneratedViewConfig,
-) {
-  const mergedViewConfig = {
-    uiViewClassName: componentName,
-    Commands: {},
-    /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.122.0 was deployed. To see the error, delete
-     * this comment and run Flow. */
-    bubblingEventTypes: {
-      ...ReactNativeViewViewConfig.bubblingEventTypes,
-      ...(viewConfig.bubblingEventTypes || {}),
-    },
-    /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.122.0 was deployed. To see the error, delete
-     * this comment and run Flow. */
-    directEventTypes: {
-      ...ReactNativeViewViewConfig.directEventTypes,
-      ...(viewConfig.directEventTypes || {}),
-    },
-    /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.122.0 was deployed. To see the error, delete
-     * this comment and run Flow. */
-    validAttributes: {
-      ...ReactNativeViewViewConfig.validAttributes,
-      ...(viewConfig.validAttributes || {}),
-    },
-  };
-
-  ReactNativeViewConfigRegistry.register(componentName, () => {
-    verifyComponentAttributeEquivalence(componentName, mergedViewConfig);
-
-    return mergedViewConfig;
-  });
-}
-
-module.exports = registerGeneratedViewConfig;
diff --git a/Libraries/Utilities/stringifySafe.js b/Libraries/Utilities/stringifySafe.js
index e051f59f8f0df0..9a451922ac42f3 100644
--- a/Libraries/Utilities/stringifySafe.js
+++ b/Libraries/Utilities/stringifySafe.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import invariant from 'invariant';
 
 /**
@@ -101,7 +99,7 @@ export function createStringifySafeWithLimits(limits: {|
       } catch (e) {
         if (typeof arg.toString === 'function') {
           try {
-            // $FlowFixMe: toString shouldn't take any arguments in general.
+            // $FlowFixMe[incompatible-use] : toString shouldn't take any arguments in general.
             return arg.toString();
           } catch (E) {}
         }
diff --git a/Libraries/Utilities/useColorScheme.js b/Libraries/Utilities/useColorScheme.js
index 0b8cfef8396105..2c7ffa5d29bb35 100644
--- a/Libraries/Utilities/useColorScheme.js
+++ b/Libraries/Utilities/useColorScheme.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import {useMemo} from 'react';
 import {useSubscription} from 'use-subscription';
 import Appearance from './Appearance';
@@ -20,8 +18,10 @@ export default function useColorScheme(): ?ColorSchemeName {
     () => ({
       getCurrentValue: () => Appearance.getColorScheme(),
       subscribe: callback => {
-        Appearance.addChangeListener(callback);
-        return () => Appearance.removeChangeListener(callback);
+        const appearanceSubscription = Appearance.addChangeListener(callback);
+        return () => {
+          appearanceSubscription.remove();
+        };
       },
     }),
     [],
diff --git a/Libraries/Utilities/useMergeRefs.js b/Libraries/Utilities/useMergeRefs.js
new file mode 100644
index 00000000000000..5b19c6f55d5edc
--- /dev/null
+++ b/Libraries/Utilities/useMergeRefs.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+import {useCallback} from 'react';
+
+type CallbackRef<T> = T => mixed;
+type ObjectRef<T> = {current: T, ...};
+
+type Ref<T> = CallbackRef<T> | ObjectRef<T>;
+
+/**
+ * Constructs a new ref that forwards new values to each of the given refs. The
+ * given refs will always be invoked in the order that they are supplied.
+ *
+ * WARNING: A known problem of merging refs using this approach is that if any
+ * of the given refs change, the returned callback ref will also be changed. If
+ * the returned callback ref is supplied as a `ref` to a React element, this may
+ * lead to problems with the given refs being invoked more times than desired.
+ */
+export default function useMergeRefs<T>(
+  ...refs: $ReadOnlyArray<?Ref<T>>
+): CallbackRef<T> {
+  return useCallback(
+    (current: T) => {
+      for (const ref of refs) {
+        if (ref != null) {
+          if (typeof ref === 'function') {
+            ref(current);
+          } else {
+            ref.current = current;
+          }
+        }
+      }
+    },
+    [...refs], // eslint-disable-line react-hooks/exhaustive-deps
+  );
+}
diff --git a/Libraries/Utilities/useRefEffect.js b/Libraries/Utilities/useRefEffect.js
new file mode 100644
index 00000000000000..6362b683fdde7d
--- /dev/null
+++ b/Libraries/Utilities/useRefEffect.js
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+import {useCallback, useRef} from 'react';
+
+type CallbackRef<T> = T => mixed;
+
+/**
+ * Constructs a callback ref that provides similar semantics as `useEffect`. The
+ * supplied `effect` callback will be called with non-null component instances.
+ * The `effect` callback can also optionally return a cleanup function.
+ *
+ * When a component is updated or unmounted, the cleanup function is called. The
+ * `effect` callback will then be called again, if applicable.
+ *
+ * When a new `effect` callback is supplied, the previously returned cleanup
+ * function will be called before the new `effect` callback is called with the
+ * same instance.
+ *
+ * WARNING: The `effect` callback should be stable (e.g. using `useCallback`).
+ */
+export default function useRefEffect<TInstance>(
+  effect: TInstance => (() => void) | void,
+): CallbackRef<TInstance | null> {
+  const cleanupRef = useRef<(() => void) | void>(undefined);
+  return useCallback(
+    instance => {
+      if (cleanupRef.current) {
+        cleanupRef.current();
+        cleanupRef.current = undefined;
+      }
+      if (instance != null) {
+        cleanupRef.current = effect(instance);
+      }
+    },
+    [effect],
+  );
+}
diff --git a/Libraries/Utilities/useWindowDimensions.js b/Libraries/Utilities/useWindowDimensions.js
index f298649c943ccc..18ca4a442012c3 100644
--- a/Libraries/Utilities/useWindowDimensions.js
+++ b/Libraries/Utilities/useWindowDimensions.js
@@ -8,13 +8,16 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import Dimensions from './Dimensions';
-import {type DisplayMetrics} from './NativeDeviceInfo';
+import {
+  type DisplayMetrics,
+  type DisplayMetricsAndroid,
+} from './NativeDeviceInfo';
 import {useEffect, useState} from 'react';
 
-export default function useWindowDimensions(): DisplayMetrics {
+export default function useWindowDimensions():
+  | DisplayMetrics
+  | DisplayMetricsAndroid {
   const [dimensions, setDimensions] = useState(() => Dimensions.get('window'));
   useEffect(() => {
     function handleChange({window}) {
@@ -27,13 +30,13 @@ export default function useWindowDimensions(): DisplayMetrics {
         setDimensions(window);
       }
     }
-    Dimensions.addEventListener('change', handleChange);
+    const subscription = Dimensions.addEventListener('change', handleChange);
     // We might have missed an update between calling `get` in render and
     // `addEventListener` in this handler, so we set it here. If there was
     // no change, React will filter out this update as a no-op.
     handleChange({window: Dimensions.get('window')});
     return () => {
-      Dimensions.removeEventListener('change', handleChange);
+      subscription.remove();
     };
   }, [dimensions]);
   return dimensions;
diff --git a/Libraries/Utilities/verifyComponentAttributeEquivalence.js b/Libraries/Utilities/verifyComponentAttributeEquivalence.js
index 10dbe98dd0b4a1..489a6ca4aef258 100644
--- a/Libraries/Utilities/verifyComponentAttributeEquivalence.js
+++ b/Libraries/Utilities/verifyComponentAttributeEquivalence.js
@@ -8,14 +8,11 @@
  * @flow
  */
 
-'use strict';
-
-const getNativeComponentAttributes = require('../ReactNative/getNativeComponentAttributes');
-
 import ReactNativeViewViewConfig from '../Components/View/ReactNativeViewViewConfig';
-import type {ReactNativeBaseComponentViewConfig} from '../Renderer/shims/ReactNativeTypes';
+import {type ViewConfig} from '../Renderer/shims/ReactNativeTypes';
 
 const IGNORED_KEYS = ['transform', 'hitSlop'];
+
 /**
  * The purpose of this function is to validate that the view config that
  * native exposes for a given view manager is the same as the view config
@@ -39,28 +36,27 @@ const IGNORED_KEYS = ['transform', 'hitSlop'];
  * single source of truth. I wonder if this message will still be here two
  * years from now...
  */
-function verifyComponentAttributeEquivalence(
-  componentName: string,
-  config: ReactNativeBaseComponentViewConfig<>,
+export default function verifyComponentAttributeEquivalence(
+  nativeViewConfig: ViewConfig,
+  staticViewConfig: ViewConfig,
 ) {
-  if (!global.RN$Bridgeless) {
-    const nativeAttributes = getNativeComponentAttributes(componentName);
-
-    ['validAttributes', 'bubblingEventTypes', 'directEventTypes'].forEach(
-      prop => {
-        const diffKeys = Object.keys(
-          lefthandObjectDiff(nativeAttributes[prop], config[prop]),
-        );
-
-        if (diffKeys.length) {
-          console.error(
-            `${componentName} generated view config for ${prop} does not match native, missing: ${diffKeys.join(
-              ' ',
-            )}`,
-          );
-        }
-      },
+  for (const prop of [
+    'validAttributes',
+    'bubblingEventTypes',
+    'directEventTypes',
+  ]) {
+    const diff = Object.keys(
+      lefthandObjectDiff(nativeViewConfig[prop], staticViewConfig[prop]),
     );
+
+    if (diff.length > 0) {
+      const name =
+        staticViewConfig.uiViewClassName ?? nativeViewConfig.uiViewClassName;
+      console.error(
+        `'${name}' has a view config that does not match native. ` +
+          `'${prop}' is missing: ${diff.join(', ')}`,
+      );
+    }
   }
 }
 
@@ -103,7 +99,7 @@ export function lefthandObjectDiff(leftObj: Object, rightObj: Object): Object {
 }
 
 export function getConfigWithoutViewProps(
-  viewConfig: ReactNativeBaseComponentViewConfig<>,
+  viewConfig: ViewConfig,
   propName: string,
 ): {...} {
   if (!viewConfig[propName]) {
@@ -130,5 +126,3 @@ export function stringifyViewConfig(viewConfig: any): string {
     2,
   );
 }
-
-export default verifyComponentAttributeEquivalence;
diff --git a/Libraries/Vibration/NativeVibration.js b/Libraries/Vibration/NativeVibration.js
index d2b2f2424e95df..e627ba43adf511 100644
--- a/Libraries/Vibration/NativeVibration.js
+++ b/Libraries/Vibration/NativeVibration.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/Vibration/RCTVibrationPlugins.mm b/Libraries/Vibration/RCTVibrationPlugins.mm
index 61421c2ef21e1c..d98ae4aae82b57 100644
--- a/Libraries/Vibration/RCTVibrationPlugins.mm
+++ b/Libraries/Vibration/RCTVibrationPlugins.mm
@@ -17,12 +17,13 @@
 #import <unordered_map>
 
 Class RCTVibrationClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"Vibration", RCTVibrationCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec
index aa7a2d60a9797a..f2f8d866fd1304 100644
--- a/Libraries/Vibration/React-RCTVibration.podspec
+++ b/Libraries/Vibration/React-RCTVibration.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTVibration"
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/vibration"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js
index ab7f466be626ec..797928a7d3dc98 100644
--- a/Libraries/Vibration/Vibration.js
+++ b/Libraries/Vibration/Vibration.js
@@ -9,8 +9,6 @@
  * @jsdoc
  */
 
-'use strict';
-
 import NativeVibration from './NativeVibration';
 const Platform = require('../Utilities/Platform');
 
diff --git a/Libraries/WebSocket/NativeWebSocketModule.js b/Libraries/WebSocket/NativeWebSocketModule.js
index c2ce1b578075c1..95e838912f0e06 100644
--- a/Libraries/WebSocket/NativeWebSocketModule.js
+++ b/Libraries/WebSocket/NativeWebSocketModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js
index 65cfd09c52c335..776641170e682a 100644
--- a/Libraries/WebSocket/WebSocket.js
+++ b/Libraries/WebSocket/WebSocket.js
@@ -8,13 +8,13 @@
  * @flow
  */
 
-'use strict';
-
 import Blob from '../Blob/Blob';
+import type {BlobData} from '../Blob/BlobTypes';
 import BlobManager from '../Blob/BlobManager';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import binaryToBase64 from '../Utilities/binaryToBase64';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import Platform from '../Utilities/Platform';
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 import NativeWebSocketModule from './NativeWebSocketModule';
 import WebSocketEvent from './WebSocketEvent';
 import base64 from 'base64-js';
@@ -46,6 +46,17 @@ const WEBSOCKET_EVENTS = ['close', 'error', 'message', 'open'];
 
 let nextWebSocketId = 0;
 
+type WebSocketEventDefinitions = {
+  websocketOpen: [{id: number, protocol: string}],
+  websocketClosed: [{id: number, code: number, reason: string}],
+  websocketMessage: [
+    | {type: 'binary', id: number, data: string}
+    | {type: 'text', id: number, data: string}
+    | {type: 'blob', id: number, data: BlobData},
+  ],
+  websocketFailed: [{id: number, message: string}],
+};
+
 /**
  * Browser-compatible WebSockets implementation.
  *
@@ -64,7 +75,7 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
   CLOSED: number = CLOSED;
 
   _socketId: number;
-  _eventEmitter: NativeEventEmitter;
+  _eventEmitter: NativeEventEmitter<WebSocketEventDefinitions>;
   _subscriptions: Array<EventSubscription>;
   _binaryType: ?BinaryType;
 
@@ -85,6 +96,7 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
     options: ?{headers?: {origin?: string, ...}, ...},
   ) {
     super();
+    this.url = url;
     if (typeof protocols === 'string') {
       protocols = [protocols];
     }
@@ -92,20 +104,17 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
     const {headers = {}, ...unrecognized} = options || {};
 
     // Preserve deprecated backwards compatibility for the 'origin' option
-    /* $FlowFixMe(>=0.68.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.68 was deployed. To see the error delete this
-     * comment and run Flow. */
     if (unrecognized && typeof unrecognized.origin === 'string') {
       console.warn(
         'Specifying `origin` as a WebSocket connection option is deprecated. Include it under `headers` instead.',
       );
-      /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
-       * comment suppresses an error found when Flow v0.54 was deployed. To see
-       * the error delete this comment and run Flow. */
+      /* $FlowFixMe[prop-missing] (>=0.54.0 site=react_native_fb,react_native_
+       * oss) This comment suppresses an error found when Flow v0.54 was
+       * deployed. To see the error delete this comment and run Flow. */
       headers.origin = unrecognized.origin;
-      /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
-       * comment suppresses an error found when Flow v0.54 was deployed. To see
-       * the error delete this comment and run Flow. */
+      /* $FlowFixMe[prop-missing] (>=0.54.0 site=react_native_fb,react_native_
+       * oss) This comment suppresses an error found when Flow v0.54 was
+       * deployed. To see the error delete this comment and run Flow. */
       delete unrecognized.origin;
     }
 
@@ -123,7 +132,13 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
       protocols = null;
     }
 
-    this._eventEmitter = new NativeEventEmitter(NativeWebSocketModule);
+    this._eventEmitter = new NativeEventEmitter(
+      // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+      // If you want to use the native module on other platforms, please remove this condition and test its behavior
+      Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
+        ? null
+        : NativeWebSocketModule,
+    );
     this._socketId = nextWebSocketId++;
     this._registerEvents();
     NativeWebSocketModule.connect(url, protocols, {headers}, this._socketId);
diff --git a/Libraries/WebSocket/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js
index 7882c46f3fdff5..e290e6751b89bf 100644
--- a/Libraries/WebSocket/WebSocketInterceptor.js
+++ b/Libraries/WebSocket/WebSocketInterceptor.js
@@ -7,10 +7,9 @@
  * @format
  */
 
-'use strict';
-
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import NativeWebSocketModule from './NativeWebSocketModule';
+import Platform from '../Utilities/Platform';
 import base64 from 'base64-js';
 
 const originalRCTWebSocketConnect = NativeWebSocketModule.connect;
@@ -133,7 +132,13 @@ const WebSocketInterceptor = {
     if (isInterceptorEnabled) {
       return;
     }
-    eventEmitter = new NativeEventEmitter(NativeWebSocketModule);
+    eventEmitter = new NativeEventEmitter(
+      // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+      // If you want to use the native module on other platforms, please remove this condition and test its behavior
+      Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
+        ? null
+        : NativeWebSocketModule,
+    );
     WebSocketInterceptor._registerEvents();
 
     // Override `connect` method for all RCTWebSocketModule requests
diff --git a/Libraries/WebSocket/__tests__/WebSocket-test.js b/Libraries/WebSocket/__tests__/WebSocket-test.js
index 5b50783cdab734..52d8fb5b375d4f 100644
--- a/Libraries/WebSocket/__tests__/WebSocket-test.js
+++ b/Libraries/WebSocket/__tests__/WebSocket-test.js
@@ -15,6 +15,7 @@ jest.setMock('../../BatchedBridge/NativeModules', {
   WebSocketModule: {
     connect: () => {},
   },
+  PlatformConstants: {},
 });
 
 const WebSocket = require('../WebSocket');
diff --git a/Libraries/YellowBox/YellowBoxDeprecated.js b/Libraries/YellowBox/YellowBoxDeprecated.js
index 46ba16eeeda5a3..5ff6217c928962 100644
--- a/Libraries/YellowBox/YellowBoxDeprecated.js
+++ b/Libraries/YellowBox/YellowBoxDeprecated.js
@@ -67,6 +67,7 @@ if (__DEV__) {
   };
 }
 
+// $FlowFixMe[method-unbinding]
 module.exports = (YellowBox: Class<React.Component<Props>> & {
   ignoreWarnings($ReadOnlyArray<IgnorePattern>): void,
   install(): void,
diff --git a/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js b/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js
index 4adadb6e87f227..38fee3de6cd902 100644
--- a/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js
+++ b/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js
@@ -20,33 +20,42 @@ describe('YellowBox', () => {
   });
   it('calling ignoreWarnings proxies to LogBox.ignoreLogs', () => {
     jest.spyOn(LogBox, 'ignoreLogs');
-    jest.spyOn(console, 'warn').mockImplementation(() => {});
+    const consoleWarn = jest
+      .spyOn(console, 'warn')
+      .mockImplementation(() => {});
     YellowBox.ignoreWarnings(['foo']);
 
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     expect(LogBox.ignoreLogs).toBeCalledWith(['foo']);
-    expect(console.warn).toBeCalledWith(
+    expect(consoleWarn).toBeCalledWith(
       'YellowBox has been replaced with LogBox. Please call LogBox.ignoreLogs() instead.',
     );
   });
 
   it('calling install proxies to LogBox.install', () => {
     jest.spyOn(LogBox, 'install');
-    jest.spyOn(console, 'warn').mockImplementation(() => {});
+    const consoleWarn = jest
+      .spyOn(console, 'warn')
+      .mockImplementation(() => {});
     YellowBox.install();
 
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     expect(LogBox.install).toBeCalled();
-    expect(console.warn).toBeCalledWith(
+    expect(consoleWarn).toBeCalledWith(
       'YellowBox has been replaced with LogBox. Please call LogBox.install() instead.',
     );
   });
 
   it('calling uninstall proxies to LogBox.uninstall', () => {
     jest.spyOn(LogBox, 'uninstall');
-    jest.spyOn(console, 'warn').mockImplementation(() => {});
+    const consoleWarn = jest
+      .spyOn(console, 'warn')
+      .mockImplementation(() => {});
     YellowBox.uninstall();
 
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     expect(LogBox.uninstall).toBeCalled();
-    expect(console.warn).toBeCalledWith(
+    expect(consoleWarn).toBeCalledWith(
       'YellowBox has been replaced with LogBox. Please call LogBox.uninstall() instead.',
     );
   });
diff --git a/Libraries/__flowtests__/ReactNativeTypes-flowtest.js b/Libraries/__flowtests__/ReactNativeTypes-flowtest.js
index e6c0bb124d5902..509cfea909351d 100644
--- a/Libraries/__flowtests__/ReactNativeTypes-flowtest.js
+++ b/Libraries/__flowtests__/ReactNativeTypes-flowtest.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 
diff --git a/Libraries/promiseRejectionIsError.js b/Libraries/promiseRejectionIsError.js
deleted file mode 100644
index 2df61813e7be3d..00000000000000
--- a/Libraries/promiseRejectionIsError.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict
- */
-
-'use strict';
-
-require('./Promise'); // make sure the default rejection handler is installed
-const rejectionTracking = require('promise/setimmediate/rejection-tracking');
-
-module.exports = () => {
-  rejectionTracking.enable({
-    allRejections: true,
-    onUnhandled: (id, error) => {
-      console.error(error);
-    },
-    onHandled: () => {},
-  });
-};
diff --git a/Libraries/promiseRejectionTrackingOptions.js b/Libraries/promiseRejectionTrackingOptions.js
index 7b30a9c66bb4bd..ac828127df58e2 100644
--- a/Libraries/promiseRejectionTrackingOptions.js
+++ b/Libraries/promiseRejectionTrackingOptions.js
@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import typeof {enable} from 'promise/setimmediate/rejection-tracking';
 
 type ExtractOptionsType = <P>((options?: ?P) => void) => P;
@@ -20,8 +18,10 @@ let rejectionTrackingOptions: $Call<ExtractOptionsType, enable> = {
     let message: string;
     let stack: ?string;
 
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const stringValue = Object.prototype.toString.call(rejection);
     if (stringValue === '[object Error]') {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       message = Error.prototype.toString.call(rejection);
       const error: Error = (rejection: $FlowFixMe);
       stack = error.stack;
diff --git a/Libraries/vendor/emitter/EventEmitter.js b/Libraries/vendor/emitter/EventEmitter.js
index 3057ea4cb5642e..c2ebd9c54e0c94 100644
--- a/Libraries/vendor/emitter/EventEmitter.js
+++ b/Libraries/vendor/emitter/EventEmitter.js
@@ -4,17 +4,50 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict-local
+ * @flow strict
  * @format
  */
 
 'use strict';
 
-// $FlowFixMe - EventEmitter Type Safety
 const EventEmitter = require('./_EventEmitter');
 
+import type {EventSubscription} from './EventSubscription';
+
 export default EventEmitter;
 
-export interface EventSubscription {
-  remove(): void;
+export type {EventSubscription};
+
+/**
+ * Essential interface for an EventEmitter.
+ */
+export interface IEventEmitter<TEventToArgsMap: {...}> {
+  /**
+   * Registers a listener that is called when the supplied event is emitted.
+   * Returns a subscription that has a `remove` method to undo registration.
+   */
+  addListener<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+    context?: mixed,
+  ): EventSubscription;
+
+  /**
+   * Emits the supplied event. Additional arguments supplied to `emit` will be
+   * passed through to each of the registered listeners.
+   */
+  emit<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    ...args: $ElementType<TEventToArgsMap, TEvent>
+  ): void;
+
+  /**
+   * Removes all registered listeners.
+   */
+  removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(eventType?: ?TEvent): void;
+
+  /**
+   * Returns the number of registered listeners for the supplied event.
+   */
+  listenerCount<TEvent: $Keys<TEventToArgsMap>>(eventType: TEvent): number;
 }
diff --git a/Libraries/vendor/emitter/EventSubscription.js b/Libraries/vendor/emitter/EventSubscription.js
new file mode 100644
index 00000000000000..c6e9501598a56c
--- /dev/null
+++ b/Libraries/vendor/emitter/EventSubscription.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+// This exists as a separate file only to avoid circular dependencies from
+// using this in `_EmitterSubscription`. Combine this back into `EventEmitter`
+// after migration and cleanup is done.
+
+export interface EventSubscription {
+  remove(): void;
+}
diff --git a/Libraries/vendor/emitter/_EmitterSubscription.js b/Libraries/vendor/emitter/_EmitterSubscription.js
index dc2c72efb85c15..b69f2daff97fe3 100644
--- a/Libraries/vendor/emitter/_EmitterSubscription.js
+++ b/Libraries/vendor/emitter/_EmitterSubscription.js
@@ -5,23 +5,25 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow
+ * @flow strict
  */
 
 'use strict';
 
 import type EventEmitter from './EventEmitter';
-import EventSubscription from './_EventSubscription';
+import _EventSubscription from './_EventSubscription';
 import type EventSubscriptionVendor from './_EventSubscriptionVendor';
+import {type EventSubscription} from './EventSubscription';
 
 /**
  * EmitterSubscription represents a subscription with listener and context data.
  */
-class EmitterSubscription extends EventSubscription {
-  // $FlowFixMe[value-as-type]
-  emitter: EventEmitter;
-  listener: Function;
-  context: ?Object;
+class EmitterSubscription<EventDefinitions: {...}, K: $Keys<EventDefinitions>>
+  extends _EventSubscription<EventDefinitions, K>
+  implements EventSubscription {
+  emitter: EventEmitter<EventDefinitions>;
+  listener: ?(...$ElementType<EventDefinitions, K>) => mixed;
+  context: ?$FlowFixMe;
 
   /**
    * @param {EventEmitter} emitter - The event emitter that registered this
@@ -34,11 +36,10 @@ class EmitterSubscription extends EventSubscription {
    *   listener
    */
   constructor(
-    // $FlowFixMe[value-as-type]
-    emitter: EventEmitter,
-    subscriber: EventSubscriptionVendor,
-    listener: Function,
-    context: ?Object,
+    emitter: EventEmitter<EventDefinitions>,
+    subscriber: EventSubscriptionVendor<EventDefinitions>,
+    listener: (...$ElementType<EventDefinitions, K>) => mixed,
+    context: ?$FlowFixMe,
   ) {
     super(subscriber);
     this.emitter = emitter;
@@ -48,12 +49,12 @@ class EmitterSubscription extends EventSubscription {
 
   /**
    * Removes this subscription from the emitter that registered it.
-   * Note: we're overriding the `remove()` method of EventSubscription here
+   * Note: we're overriding the `remove()` method of _EventSubscription here
    * but deliberately not calling `super.remove()` as the responsibility
    * for removing the subscription lies with the EventEmitter.
    */
-  remove() {
-    this.emitter.removeSubscription(this);
+  remove(): void {
+    this.emitter.__removeSubscription(this);
   }
 }
 
diff --git a/Libraries/vendor/emitter/_EventEmitter.js b/Libraries/vendor/emitter/_EventEmitter.js
index 150c2538916698..7650cc9a2242fe 100644
--- a/Libraries/vendor/emitter/_EventEmitter.js
+++ b/Libraries/vendor/emitter/_EventEmitter.js
@@ -5,15 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @noflow
+ * @flow strict
  * @typecheck
  */
 
-'use strict';
-
 const invariant = require('invariant');
 
 import EmitterSubscription from './_EmitterSubscription';
+import {type EventSubscription} from './EventSubscription';
 import EventSubscriptionVendor from './_EventSubscriptionVendor';
 
 const sparseFilterPredicate = () => true;
@@ -31,17 +30,17 @@ const sparseFilterPredicate = () => true;
  * mechanism on top of which extra functionality can be composed. For example, a
  * more advanced emitter may use an EventHolder and EventFactory.
  */
-class EventEmitter {
-  _subscriber: EventSubscriptionVendor;
+class EventEmitter<EventDefinitions: {...}> {
+  _subscriber: EventSubscriptionVendor<EventDefinitions> = new EventSubscriptionVendor<EventDefinitions>();
 
   /**
    * @constructor
-   *
-   * @param {EventSubscriptionVendor} subscriber - Optional subscriber instance
-   *   to use. If omitted, a new subscriber will be created for the emitter.
    */
-  constructor(subscriber: ?EventSubscriptionVendor) {
-    this._subscriber = subscriber || new EventSubscriptionVendor();
+  constructor(subscriber: ?EventSubscriptionVendor<EventDefinitions>) {
+    if (subscriber != null) {
+      console.warn('EventEmitter(...): Constructor argument is deprecated.');
+      this._subscriber = subscriber;
+    }
   }
 
   /**
@@ -49,24 +48,22 @@ class EventEmitter {
    * emitted. An optional calling context may be provided. The data arguments
    * emitted will be passed to the listener function.
    *
-   * TODO: Annotate the listener arg's type. This is tricky because listeners
-   *       can be invoked with varargs.
-   *
    * @param {string} eventType - Name of the event to listen to
    * @param {function} listener - Function to invoke when the specified event is
    *   emitted
    * @param {*} context - Optional context object to use when invoking the
    *   listener
    */
-  addListener(
-    eventType: string,
-    listener: Function,
-    context: ?Object,
-  ): EmitterSubscription {
+  addListener<K: $Keys<EventDefinitions>>(
+    eventType: K,
+    // FIXME: listeners should return void instead of mixed to prevent issues
+    listener: (...$ElementType<EventDefinitions, K>) => mixed,
+    context: $FlowFixMe,
+  ): EventSubscription {
     return (this._subscriber.addSubscription(
       eventType,
       new EmitterSubscription(this, this._subscriber, listener, context),
-    ): any);
+    ): $FlowFixMe);
   }
 
   /**
@@ -76,15 +73,29 @@ class EventEmitter {
    * @param {?string} eventType - Optional name of the event whose registered
    *   listeners to remove
    */
-  removeAllListeners(eventType: ?string) {
+  removeAllListeners<K: $Keys<EventDefinitions>>(eventType: ?K): void {
     this._subscriber.removeAllSubscriptions(eventType);
   }
 
   /**
-   * Removes a specific subscription. Called by the `remove()` method of the
-   * subscription itself to ensure any necessary cleanup is performed.
+   * @deprecated Use `remove` on the EventSubscription from `addListener`.
+   */
+  removeSubscription<K: $Keys<EventDefinitions>>(
+    subscription: EmitterSubscription<EventDefinitions, K>,
+  ): void {
+    console.warn(
+      'EventEmitter.removeSubscription(...): Method has been deprecated. ' +
+        'Please instead use `remove()` on the subscription itself.',
+    );
+    this.__removeSubscription(subscription);
+  }
+
+  /**
+   * Called by `EmitterSubscription` to bypass the above deprecation warning.
    */
-  removeSubscription(subscription: EmitterSubscription) {
+  __removeSubscription<K: $Keys<EventDefinitions>>(
+    subscription: EmitterSubscription<EventDefinitions, K>,
+  ): void {
     invariant(
       subscription.emitter === this,
       'Subscription does not belong to this emitter.',
@@ -99,7 +110,7 @@ class EventEmitter {
    * @param {string} eventType - Name of the event to query
    * @returns {number}
    */
-  listenerCount(eventType: string): number {
+  listenerCount<K: $Keys<EventDefinitions>>(eventType: K): number {
     const subscriptions = this._subscriber.getSubscriptionsForType(eventType);
     return subscriptions
       ? // We filter out missing entries because the array is sparse.
@@ -124,7 +135,10 @@ class EventEmitter {
    *
    *   emitter.emit('someEvent', 'abc'); // logs 'abc'
    */
-  emit(eventType: string) {
+  emit<K: $Keys<EventDefinitions>>(
+    eventType: K,
+    ...args: $ElementType<EventDefinitions, K>
+  ): void {
     const subscriptions = this._subscriber.getSubscriptionsForType(eventType);
     if (subscriptions) {
       for (let i = 0, l = subscriptions.length; i < l; i++) {
@@ -132,29 +146,25 @@ class EventEmitter {
 
         // The subscription may have been removed during this event loop.
         if (subscription && subscription.listener) {
-          subscription.listener.apply(
-            subscription.context,
-            Array.prototype.slice.call(arguments, 1),
-          );
+          subscription.listener.apply(subscription.context, args);
         }
       }
     }
   }
 
   /**
-   * Removes the given listener for event of specific type.
-   *
-   * @param {string} eventType - Name of the event to emit
-   * @param {function} listener - Function to invoke when the specified event is
-   *   emitted
-   *
-   * @example
-   *   emitter.removeListener('someEvent', function(message) {
-   *     console.log(message);
-   *   }); // removes the listener if already registered
-   *
+   * @deprecated Use `remove` on the EventSubscription from `addListener`.
    */
-  removeListener(eventType: String, listener) {
+  removeListener<K: $Keys<EventDefinitions>>(
+    eventType: K,
+    // FIXME: listeners should return void instead of mixed to prevent issues
+    listener: (...$ElementType<EventDefinitions, K>) => mixed,
+  ): void {
+    console.warn(
+      `EventEmitter.removeListener('${eventType}', ...): Method has been ` +
+        'deprecated. Please instead use `remove()` on the subscription ' +
+        'returned by `EventEmitter.addListener`.',
+    );
     const subscriptions = this._subscriber.getSubscriptionsForType(eventType);
     if (subscriptions) {
       for (let i = 0, l = subscriptions.length; i < l; i++) {
diff --git a/Libraries/vendor/emitter/_EventSubscription.js b/Libraries/vendor/emitter/_EventSubscription.js
index 54ec8f2f2ddc41..446cf2f049f55f 100644
--- a/Libraries/vendor/emitter/_EventSubscription.js
+++ b/Libraries/vendor/emitter/_EventSubscription.js
@@ -5,36 +5,40 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow strict
  */
 
 'use strict';
 
+import {type EventSubscription} from './EventSubscription';
 import type EventSubscriptionVendor from './_EventSubscriptionVendor';
 
 /**
  * EventSubscription represents a subscription to a particular event. It can
  * remove its own subscription.
  */
-class EventSubscription {
-  eventType: string;
+class _EventSubscription<EventDefinitions: {...}, K: $Keys<EventDefinitions>>
+  implements EventSubscription {
+  eventType: K;
   key: number;
-  subscriber: EventSubscriptionVendor;
+  subscriber: EventSubscriptionVendor<EventDefinitions>;
+  listener: ?(...$ElementType<EventDefinitions, K>) => mixed;
+  context: ?$FlowFixMe;
 
   /**
    * @param {EventSubscriptionVendor} subscriber the subscriber that controls
    *   this subscription.
    */
-  constructor(subscriber: EventSubscriptionVendor) {
+  constructor(subscriber: EventSubscriptionVendor<EventDefinitions>) {
     this.subscriber = subscriber;
   }
 
   /**
    * Removes this subscription from the subscriber that controls it.
    */
-  remove() {
+  remove(): void {
     this.subscriber.removeSubscription(this);
   }
 }
 
-module.exports = EventSubscription;
+module.exports = _EventSubscription;
diff --git a/Libraries/vendor/emitter/_EventSubscriptionVendor.js b/Libraries/vendor/emitter/_EventSubscriptionVendor.js
index 5ea0aa821e0360..9ac31438f305ad 100644
--- a/Libraries/vendor/emitter/_EventSubscriptionVendor.js
+++ b/Libraries/vendor/emitter/_EventSubscriptionVendor.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow
+ * @flow strict
  */
 
 'use strict';
@@ -18,13 +18,16 @@ import type EventSubscription from './_EventSubscription';
  * EventSubscriptionVendor stores a set of EventSubscriptions that are
  * subscribed to a particular event type.
  */
-class EventSubscriptionVendor {
-  _subscriptionsForType: Object;
-  _currentSubscription: ?EventSubscription;
+class EventSubscriptionVendor<EventDefinitions: {...}> {
+  _subscriptionsForType: {
+    [type: $Keys<EventDefinitions>]: Array<
+      EventSubscription<EventDefinitions, $FlowFixMe>,
+    >,
+    ...,
+  };
 
   constructor() {
     this._subscriptionsForType = {};
-    this._currentSubscription = null;
   }
 
   /**
@@ -33,10 +36,10 @@ class EventSubscriptionVendor {
    * @param {string} eventType
    * @param {EventSubscription} subscription
    */
-  addSubscription(
-    eventType: string,
-    subscription: EventSubscription,
-  ): EventSubscription {
+  addSubscription<K: $Keys<EventDefinitions>>(
+    eventType: K,
+    subscription: EventSubscription<EventDefinitions, K>,
+  ): EventSubscription<EventDefinitions, K> {
     invariant(
       subscription.subscriber === this,
       'The subscriber of the subscription is incorrectly set.',
@@ -55,10 +58,10 @@ class EventSubscriptionVendor {
    * Removes a bulk set of the subscriptions.
    *
    * @param {?string} eventType - Optional name of the event type whose
-   *   registered supscriptions to remove, if null remove all subscriptions.
+   *   registered subscriptions to remove, if null remove all subscriptions.
    */
-  removeAllSubscriptions(eventType: ?string) {
-    if (eventType === undefined) {
+  removeAllSubscriptions<K: $Keys<EventDefinitions>>(eventType: ?K): void {
+    if (eventType == null) {
       this._subscriptionsForType = {};
     } else {
       delete this._subscriptionsForType[eventType];
@@ -71,7 +74,9 @@ class EventSubscriptionVendor {
    *
    * @param {object} subscription
    */
-  removeSubscription(subscription: Object) {
+  removeSubscription<K: $Keys<EventDefinitions>>(
+    subscription: EventSubscription<EventDefinitions, K>,
+  ): void {
     const eventType = subscription.eventType;
     const key = subscription.key;
 
@@ -93,7 +98,9 @@ class EventSubscriptionVendor {
    * @param {string} eventType
    * @returns {?array}
    */
-  getSubscriptionsForType(eventType: string): ?[EventSubscription] {
+  getSubscriptionsForType<K: $Keys<EventDefinitions>>(
+    eventType: K,
+  ): ?Array<EventSubscription<EventDefinitions, K>> {
     return this._subscriptionsForType[eventType];
   }
 }
diff --git a/Libraries/vendor/emitter/__flowtests__/EventEmitter-flowtest.js b/Libraries/vendor/emitter/__flowtests__/EventEmitter-flowtest.js
new file mode 100644
index 00000000000000..43a4a92e0e101b
--- /dev/null
+++ b/Libraries/vendor/emitter/__flowtests__/EventEmitter-flowtest.js
@@ -0,0 +1,125 @@
+/**
+ * (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
+ *
+ * @flow strict
+ * @format
+ */
+
+import EventEmitter from '../EventEmitter';
+
+type MyEvents = {
+  noArgsEvent: [],
+  stringEvent: [string],
+  numberEvent: [number],
+  anotherNumberEvent: [number],
+  objectAndBooleanEvent: [{prop: string}, boolean],
+};
+
+export function testBaseEventEmitterInstance() {
+  const emitter = new EventEmitter<MyEvents>();
+
+  emitter.addListener('noArgsEvent', expectedUndefined => {
+    (expectedUndefined: void);
+  });
+
+  emitter.addListener('stringEvent', expectedString => {
+    (expectedString: string);
+  });
+
+  emitter.addListener('numberEvent', expectedNumber => {
+    (expectedNumber: number);
+  });
+
+  emitter.addListener('anotherNumberEvent', expectedNumber => {
+    (expectedNumber: number);
+  });
+
+  emitter.addListener(
+    'objectAndBooleanEvent',
+    (expectedObject, expectedBoolean, unexpectedArg) => {
+      (expectedObject: {prop: string});
+      (expectedBoolean: boolean);
+      (unexpectedArg: void);
+    },
+  );
+
+  // $FlowExpectedError[prop-missing]
+  emitter.addListener('unexpectedEvent', () => {});
+
+  // $FlowExpectedError[incompatible-call]
+  emitter.addListener('noArgsEvent', (value: number) => {});
+
+  // $FlowExpectedError[incompatible-call]
+  emitter.addListener('numberEvent', (value: string) => {});
+
+  emitter.emit('noArgsEvent');
+  emitter.emit('stringEvent', 'value');
+  emitter.emit('numberEvent', 4);
+  emitter.emit('anotherNumberEvent', 4);
+  emitter.emit('objectAndBooleanEvent', {prop: 'value'}, true);
+}
+
+export function testSubclass() {
+  // $FlowExpectedError[incompatible-type-arg]
+  class EmitterWithUndefinedDefinition extends EventEmitter<void> {}
+
+  // $FlowExpectedError[incompatible-type-arg]
+  class EmitterWithNumberDefinition extends EventEmitter<number> {}
+
+  class EmitterWithInvalidDefinitions extends EventEmitter<{
+    foo: number,
+  }> {}
+
+  const emitter = new EmitterWithInvalidDefinitions();
+  // $FlowExpectedError[not-an-array]
+  // $FlowExpectedError[incompatible-call]
+  emitter.emit('foo');
+
+  class EmitterWithValidDefinitions extends EventEmitter<MyEvents> {}
+}
+
+export function testSubclassInstance() {
+  class MyEmitter extends EventEmitter<MyEvents> {}
+
+  const emitter = new MyEmitter();
+
+  emitter.addListener('noArgsEvent', expectedUndefined => {
+    (expectedUndefined: void);
+  });
+
+  emitter.addListener('stringEvent', expectedString => {
+    (expectedString: string);
+  });
+
+  emitter.addListener('numberEvent', expectedNumber => {
+    (expectedNumber: number);
+  });
+
+  emitter.addListener('anotherNumberEvent', expectedNumber => {
+    (expectedNumber: number);
+  });
+
+  emitter.addListener(
+    'objectAndBooleanEvent',
+    (expectedObject, expectedBoolean, unexpectedArg) => {
+      (expectedObject: {prop: string});
+      (expectedBoolean: boolean);
+      (unexpectedArg: void);
+    },
+  );
+
+  // $FlowExpectedError[prop-missing]
+  emitter.addListener('unexpectedEvent', () => {});
+
+  // $FlowExpectedError[incompatible-call]
+  emitter.addListener('noArgsEvent', (value: number) => {});
+
+  // $FlowExpectedError[incompatible-call]
+  emitter.addListener('numberEvent', (value: string) => {});
+
+  emitter.emit('noArgsEvent');
+  emitter.emit('stringEvent', 'value');
+  emitter.emit('numberEvent', 4);
+  emitter.emit('anotherNumberEvent', 4);
+  emitter.emit('objectAndBooleanEvent', {prop: 'value'}, true);
+}
diff --git a/README.md b/README.md
index 26aed19de38740..27945d13bbe998 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,33 @@
 
 This repository is a working fork of **facebook/react-native** that adds support for the official React Native for macOS implementation from Microsoft. 
 
+[hello-world]: https://snack.expo.io/@hramos/hello,-world!
+[new-app]: https://reactnative.dev/docs/getting-started
+[existing]: https://reactnative.dev/docs/integration-with-existing-apps
+
+You can read more about the macOS implementation in our website - [React Native for Windows + macOS](https://microsoft.github.io/react-native-windows/)
+
+The full documentation for React Native can be found on our [website][docs].
+
+The React Native documentation discusses components, APIs, and topics that are specific to React Native. For further documentation on the React API that is shared between React Native and React DOM, refer to the [React documentation][r-docs].
+
+The source for the React Native documentation and website is hosted on a separate repo, [**@facebook/react-native-website**][repo-website].
+
+[docs]: https://reactnative.dev/docs/getting-started
+[r-docs]: https://reactjs.org/docs/getting-started.html
+[repo-website]: https://github.com/facebook/react-native-website
+
+## 🚀 Upgrading
+
+Upgrading to new versions of React Native may give you access to more APIs, views, developer tools, and other goodies. See the [Upgrading Guide][u] for instructions.
+
+React Native releases are discussed in the React Native Community, [**@react-native-community/react-native-releases**][repo-releases].
+
+[u]: https://reactnative.dev/docs/upgrading
+[repo-releases]: https://github.com/react-native-community/react-native-releases
+
+## 👏 How to Contribute
+
 You can read more about the macOS implementation on our website - [React Native for Windows + macOS](https://microsoft.github.io/react-native-windows/)
 
 ## Contents
@@ -73,3 +100,5 @@ The React Native for macOS extension, including modifications to the original Fa
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
+[l]: https://github.com/facebook/react-native/blob/HEAD/LICENSE
+[ld]: https://github.com/facebook/react-native/blob/HEAD/LICENSE-docs
diff --git a/React-Core.podspec b/React-Core.podspec
index e12f7d87a403bd..be9f7f2fb90548 100644
--- a/React-Core.podspec
+++ b/React-Core.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 header_subspecs = {
@@ -41,14 +41,14 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#774)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#774)
   s.source                 = source
   s.resource_bundle        = { "AccessibilityResources" => ["React/AccessibilityResources/*.lproj"]}
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
   s.library                = "stdc++"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\"", "DEFINES_MODULE" => "YES" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"", "DEFINES_MODULE" => "YES" }
   s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
   s.default_subspec        = "Default"
 
@@ -57,12 +57,13 @@ Pod::Spec.new do |s|
     ss.exclude_files          = "React/CoreModules/**/*",
                                 "React/DevSupport/**/*",
                                 "React/Fabric/**/*",
-                                "React/Inspector/**/*",
+                                "React/FBReactNativeSpec/**/*",
                                 "React/Tests/**/*",
                                 "React/CxxBridge/HermesExecutorFactory.*" # TODO(macOS GH#214)
 
     # [TODO(macOS GH#774)
-    ss.ios.exclude_files      = "**/macOS/*"
+    ss.ios.exclude_files      = "**/macOS/*",
+                                "React/Inspector/**/*" # TODO(macOS GH#214) don't exclude on macOS for hermes support
     ss.osx.exclude_files      = "React/Modules/RCTRedBoxExtraDataViewController.{h,m}",
                                 "React/Modules/RCTAccessibilityManager.m",
                                 "React/Profiler/{RCTFPSGraph,RCTPerfMonitor}.*",
@@ -77,7 +78,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Hermes" do |ss|
-    ss.platforms = { :osx => "10.14", :ios => "10.0" }
+    ss.platforms = { :osx => "10.15" }
     ss.source_files = "ReactCommon/hermes/executor/*.{cpp,h}",
                       "ReactCommon/hermes/inspector/*.{cpp,h}",
                       "ReactCommon/hermes/inspector/chrome/*.{cpp,h}",
diff --git a/React.podspec b/React.podspec
index 05a332c9b1e2ea..a71bfdc90ec2ca 100644
--- a/React.podspec
+++ b/React.podspec
@@ -11,7 +11,7 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -36,10 +36,10 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.cocoapods_version      = ">= 1.2.0"
+  s.cocoapods_version      = ">= 1.10.1"
 
   s.dependency "React-Core", version
   s.dependency "React-Core/DevSupport", version
diff --git a/React/AccessibilityResources/en.lproj/Localizable.strings b/React/AccessibilityResources/en.lproj/Localizable.strings
index 866bd0d883862d..ee35fc3e5fe25d 100644
--- a/React/AccessibilityResources/en.lproj/Localizable.strings
+++ b/React/AccessibilityResources/en.lproj/Localizable.strings
@@ -14,7 +14,7 @@
 "scrollbar"="scroll bar";
 "spinbutton"="spin button";
 "switch"="switch";
-"tab"="tab description";
+"tab"="tab";
 "tablist"="tab list";
 "timer"="timer";
 "toolbar"="tool bar";
diff --git a/React/Base/RCTAssert.h b/React/Base/RCTAssert.h
index 9f0e9af2dec37c..e4c77907f6e645 100644
--- a/React/Base/RCTAssert.h
+++ b/React/Base/RCTAssert.h
@@ -20,17 +20,17 @@ RCT_EXTERN BOOL RCTIsMainQueue(void);
  * assert handler through `RCTSetAssertFunction`.
  */
 #ifndef NS_BLOCK_ASSERTIONS
-#define RCTAssert(condition, ...)                                                                      \
-  do {                                                                                                 \
-    if ((condition) == 0) {                                                                            \
-      _RCTAssertFormat(#condition, __FILE__, __LINE__, __func__, __VA_ARGS__);                         \
-      if (RCT_NSASSERT) {                                                                              \
-        [[NSAssertionHandler currentHandler] handleFailureInFunction:(NSString * _Nonnull) @(__func__) \
-                                                                file:(NSString * _Nonnull) @(__FILE__) \
-                                                          lineNumber:__LINE__                          \
-                                                         description:__VA_ARGS__];                     \
-      }                                                                                                \
-    }                                                                                                  \
+#define RCTAssert(condition, ...)                                                                    \
+  do {                                                                                               \
+    if ((condition) == 0) {                                                                          \
+      _RCTAssertFormat(#condition, __FILE__, __LINE__, __func__, __VA_ARGS__);                       \
+      if (RCT_NSASSERT) {                                                                            \
+        [[NSAssertionHandler currentHandler] handleFailureInFunction:(NSString *_Nonnull)@(__func__) \
+                                                                file:(NSString *_Nonnull)@(__FILE__) \
+                                                          lineNumber:__LINE__                        \
+                                                         description:__VA_ARGS__];                   \
+      }                                                                                              \
+    }                                                                                                \
   } while (false)
 #else
 #define RCTAssert(condition, ...) \
@@ -154,13 +154,12 @@ RCT_EXTERN NSString *RCTFormatStackTrace(NSArray<NSDictionary<NSString *, id> *>
  */
 #if DEBUG
 
-#define RCTAssertThread(thread, format...)                                                                          \
-  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") RCTAssert(     \
-      [(id)thread isKindOfClass:[NSString class]]                                                                   \
-          ? [RCTCurrentThreadName() isEqualToString:(NSString *)thread]                                             \
-          : [(id)thread isKindOfClass:[NSThread class]] ? [NSThread currentThread] == (NSThread *)thread            \
-                                                        : dispatch_get_current_queue() == (dispatch_queue_t)thread, \
-      format);                                                                                                      \
+#define RCTAssertThread(thread, format...)                                                                            \
+  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") RCTAssert(       \
+      [(id)thread isKindOfClass:[NSString class]]       ? [RCTCurrentThreadName() isEqualToString:(NSString *)thread] \
+          : [(id)thread isKindOfClass:[NSThread class]] ? [NSThread currentThread] == (NSThread *)thread              \
+                                                        : dispatch_get_current_queue() == (dispatch_queue_t)thread,   \
+      format);                                                                                                        \
   _Pragma("clang diagnostic pop")
 
 #else
@@ -170,3 +169,21 @@ RCT_EXTERN NSString *RCTFormatStackTrace(NSArray<NSDictionary<NSString *, id> *>
   } while (0)
 
 #endif
+
+/**
+ * Controls for ensuring the new architecture runtime assumption holds.
+ * Note: this is work in progress.
+ */
+
+// Enable reporting of any violation related to the new React Native architecture.
+// If RCT_NEW_ARCHITECTURE is defined, it is already enabled by default, otherwise, no violation will be
+// reported until enabled.
+// Note: enabling this at runtime is not early enough to report issues within ObjC class +load execution.
+__attribute__((used)) RCT_EXTERN void RCTEnableNewArchitectureViolationReporting(BOOL enabled);
+
+// When reporting is enabled, trigger an assertion.
+__attribute__((used)) RCT_EXTERN void RCTEnforceNotAllowedForNewArchitecture(id context, NSString *extra);
+
+// When reporting is enabled, warn about the violation. Use this to prepare a specific callsite
+// for stricter enforcement. When ready, switch it to use the variant above.
+__attribute__((used)) RCT_EXTERN void RCTWarnNotAllowedForNewArchitecture(id context, NSString *extra);
diff --git a/React/Base/RCTAssert.m b/React/Base/RCTAssert.m
index 087900d1979565..634d7920d0122e 100644
--- a/React/Base/RCTAssert.m
+++ b/React/Base/RCTAssert.m
@@ -230,3 +230,55 @@ RCTFatalExceptionHandler RCTGetFatalExceptionHandler(void)
 {
   return RCTCurrentFatalExceptionHandler;
 }
+
+// -------------------------
+// New architecture section
+// -------------------------
+
+#if RCT_NEW_ARCHITECTURE
+static BOOL newArchitectureViolationReporting = YES;
+#else
+static BOOL newArchitectureViolationReporting = NO;
+#endif
+
+void RCTEnableNewArchitectureViolationReporting(BOOL enabled)
+{
+#if RCT_NEW_ARCHITECTURE
+  // Cannot disable the reporting in this mode.
+#else
+  newArchitectureViolationReporting = enabled;
+#endif
+}
+
+static NSString *getNewArchitectureViolationMessage(id context, NSString *extra)
+{
+  NSString *tag = @"uncategorized";
+  if ([context isKindOfClass:NSString.class]) {
+    tag = context;
+  } else if (context) {
+    Class klass = [context class];
+    if (klass) {
+      tag = NSStringFromClass(klass);
+    }
+  }
+  NSString *errorMessage = extra ?: @"Unexpectedly reached this code path.";
+  return [NSString stringWithFormat:@"[ReactNative Architecture][%@] %@", tag, errorMessage];
+}
+
+void RCTEnforceNotAllowedForNewArchitecture(id context, NSString *extra)
+{
+  if (!newArchitectureViolationReporting) {
+    return;
+  }
+
+  RCTAssert(0, @"%@", getNewArchitectureViolationMessage(context, extra));
+}
+
+void RCTWarnNotAllowedForNewArchitecture(id context, NSString *extra)
+{
+  if (!newArchitectureViolationReporting) {
+    return;
+  }
+
+  RCTLogWarn(@"%@", getNewArchitectureViolationMessage(context, extra));
+}
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index d5aec31b968dec..24bd122e53c490 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -160,9 +160,14 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
 RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
 RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
 
-// Turn on TurboModule block copy
-RCT_EXTERN BOOL RCTTurboModuleBlockCopyEnabled(void);
-RCT_EXTERN void RCTEnableTurboModuleBlockCopy(BOOL enabled);
+typedef enum {
+  kRCTGlobalScope,
+  kRCTGlobalScopeUsingRetainJSCallback,
+  kRCTTurboModuleManagerScope,
+} RCTTurboModuleCleanupMode;
+
+RCT_EXTERN RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void);
+RCT_EXTERN void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
 
 /**
  * Async batched bridge used to communicate with the JavaScript application.
@@ -231,6 +236,13 @@ RCT_EXTERN void RCTEnableTurboModuleBlockCopy(BOOL enabled);
  */
 - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry;
 
+/**
+ * This hook is called by the TurboModule infra with every TurboModule that's created.
+ * It allows the bridge to attach properties to TurboModules that give TurboModules
+ * access to Bridge APIs.
+ */
+- (void)attachBridgeAPIsToTurboModule:(id<RCTTurboModule>)module;
+
 /**
  * Convenience method for retrieving all modules conforming to a given protocol.
  * Modules will be synchronously instantiated if they haven't already been,
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 90c26bd4737479..ef6f76b059a23a 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -59,6 +59,9 @@
 void RCTRegisterModule(Class);
 void RCTRegisterModule(Class moduleClass)
 {
+  RCTWarnNotAllowedForNewArchitecture(
+      @"RCTRegisterModule()", [NSString stringWithFormat:@"'%@' was registered unexpectedly", moduleClass]);
+
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     RCTModuleClasses = [NSMutableArray new];
@@ -136,15 +139,15 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
   turboModuleSharedMutexInitEnabled = enabled;
 }
 
-static BOOL turboModuleBlockCopyEnabled = NO;
-BOOL RCTTurboModuleBlockCopyEnabled(void)
+static RCTTurboModuleCleanupMode turboModuleCleanupMode = kRCTGlobalScope;
+RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void)
 {
-  return turboModuleBlockCopyEnabled;
+  return turboModuleCleanupMode;
 }
 
-void RCTEnableTurboModuleBlockCopy(BOOL enabled)
+void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode)
 {
-  turboModuleBlockCopyEnabled = enabled;
+  turboModuleCleanupMode = mode;
 }
 
 @interface RCTBridge () <RCTReloadListener>
@@ -201,6 +204,7 @@ - (instancetype)initWithDelegate:(id<RCTBridgeDelegate>)delegate
                    launchOptions:(NSDictionary *)launchOptions
 {
   if (self = [super init]) {
+    RCTEnforceNotAllowedForNewArchitecture(self, nil);
     _delegate = delegate;
     _bundleURL = bundleURL;
     _moduleProvider = block;
@@ -227,6 +231,11 @@ - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistr
   [self.batchedBridge setRCTTurboModuleRegistry:turboModuleRegistry];
 }
 
+- (void)attachBridgeAPIsToTurboModule:(id<RCTTurboModule>)module
+{
+  [self.batchedBridge attachBridgeAPIsToTurboModule:module];
+}
+
 - (void)didReceiveReloadCommand
 {
 #if RCT_ENABLE_INSPECTOR
diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
index 102f98194bd5f2..27ef4fc5fbf0d0 100644
--- a/React/Base/RCTBridgeModule.h
+++ b/React/Base/RCTBridgeModule.h
@@ -6,11 +6,16 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <React/RCTUIKit.h> // TODO(macOS GH#774)
 
 #import <React/RCTDefines.h>
 
 @class RCTBridge;
 @protocol RCTBridgeMethod;
+@class RCTModuleRegistry;
+@class RCTViewRegistry;
+@class RCTBundleManager;
+@class RCTCallableJSModules;
 
 /**
  * The type of a block that is capable of sending a response to a bridged
@@ -113,6 +118,46 @@ RCT_EXTERN_C_END
 
 @optional
 
+/**
+ * A reference to the RCTModuleRegistry. Useful for modules that require access
+ * to other NativeModules. To implement this in your module, just add `@synthesize
+ * moduleRegistry = _moduleRegistry;`. If using Swift, add
+ * `@objc var moduleRegistry: RCTModuleRegistry!` to your module.
+ */
+@property (nonatomic, weak, readonly) RCTModuleRegistry *moduleRegistry;
+
+/**
+ * A reference to the RCTViewRegistry. Useful for modules that query UIViews,
+ * given a react tag. This API is deprecated, and only exists to help migrate
+ * NativeModules to Venice.
+ *
+ * To implement this in your module, just add `@synthesize
+ * viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;`. If using Swift, add
+ * `@objc var viewRegistry_DEPRECATED: RCTViewRegistry!` to your module.
+ */
+@property (nonatomic, weak, readwrite) RCTViewRegistry *viewRegistry_DEPRECATED;
+
+/**
+ * A reference to the RCTBundleManager. Useful for modules that need to read
+ * or write to the app's bundle URL.
+ *
+ * To implement this in your module, just add `@synthesize bundleManager =
+ * _bundleManager;`. If using Swift, add `@objc var bundleManager:
+ * RCTBundleManager!` to your module.
+ */
+@property (nonatomic, weak, readwrite) RCTBundleManager *bundleManager;
+
+/**
+ * A reference to an RCTCallableJSModules. Useful for modules that need to
+ * call into methods on JavaScript modules registered as callable with
+ * React Native.
+ *
+ * To implement this in your module, just add `@synthesize callableJSModules =
+ * _callableJSModules;`. If using Swift, add `@objc var callableJSModules:
+ * RCTCallableJSModules!` to your module.
+ */
+@property (nonatomic, weak, readwrite) RCTCallableJSModules *callableJSModules;
+
 /**
  * A reference to the RCTBridge. Useful for modules that require access
  * to bridge features, such as sending events or making JS calls. This
@@ -372,3 +417,62 @@ RCT_EXTERN_C_END
  * See RCTTurboModule.h for actual signature.
  */
 @protocol RCTTurboModule;
+
+/**
+ * A class that allows NativeModules and TurboModules to look up one another.
+ */
+@interface RCTModuleRegistry : NSObject
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry;
+
+- (id)moduleForName:(const char *)moduleName;
+- (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
+@end
+
+typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL);
+typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
+
+/**
+ * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge.
+ */
+@interface RCTBundleManager : NSObject
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
+                           andSetter:(RCTBridgelessBundleURLSetter)setter
+                    andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter;
+- (void)resetBundleURL;
+@property NSURL *bundleURL;
+@end
+
+typedef RCTPlatformView * (^RCTBridgelessComponentViewProvider)(NSNumber *); // TODO(macOS GH#774)
+
+/**
+ * A class that allows NativeModules to query for views, given React Tags.
+ */
+@interface RCTViewRegistry : NSObject
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)bridgelessComponentViewProvider;
+
+- (RCTPlatformView *)viewForReactTag:(NSNumber *)reactTag; // TODO(macOS GH#774)
+@end
+
+typedef void (^RCTBridgelessJSModuleMethodInvoker)(
+    NSString *moduleName,
+    NSString *methodName,
+    NSArray *args,
+    dispatch_block_t onComplete);
+
+/**
+ * A class that allows NativeModules to call methods on JavaScript modules registered
+ * as callable with React Native.
+ */
+@interface RCTCallableJSModules : NSObject
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker;
+
+- (void)invokeModule:(NSString *)moduleName method:(NSString *)methodName withArgs:(NSArray *)args;
+- (void)invokeModule:(NSString *)moduleName
+              method:(NSString *)methodName
+            withArgs:(NSArray *)args
+          onComplete:(dispatch_block_t)onComplete;
+@end
diff --git a/React/Base/RCTBundleManager.m b/React/Base/RCTBundleManager.m
new file mode 100644
index 00000000000000..b6c1b13652a49c
--- /dev/null
+++ b/React/Base/RCTBundleManager.m
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTAssert.h"
+#import "RCTBridge+Private.h"
+#import "RCTBridge.h"
+#import "RCTBridgeModule.h"
+
+@implementation RCTBundleManager {
+  __weak RCTBridge *_bridge;
+  RCTBridgelessBundleURLGetter _bridgelessBundleURLGetter;
+  RCTBridgelessBundleURLSetter _bridgelessBundleURLSetter;
+  RCTBridgelessBundleURLGetter _bridgelessBundleURLDefaultGetter;
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+}
+
+- (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
+                           andSetter:(RCTBridgelessBundleURLSetter)setter
+                    andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter
+{
+  _bridgelessBundleURLGetter = getter;
+  _bridgelessBundleURLSetter = setter;
+  _bridgelessBundleURLDefaultGetter = defaultGetter;
+}
+
+- (void)setBundleURL:(NSURL *)bundleURL
+{
+  if (_bridge) {
+    _bridge.bundleURL = bundleURL;
+    return;
+  }
+
+  RCTAssert(
+      _bridgelessBundleURLSetter != nil,
+      @"RCTBundleManager: In bridgeless mode, RCTBridgelessBundleURLSetter must not be nil.");
+  _bridgelessBundleURLSetter(bundleURL);
+}
+
+- (NSURL *)bundleURL
+{
+  if (_bridge) {
+    return _bridge.bundleURL;
+  }
+
+  RCTAssert(
+      _bridgelessBundleURLGetter != nil,
+      @"RCTBundleManager: In bridgeless mode, RCTBridgelessBundleURLGetter must not be nil.");
+
+  return _bridgelessBundleURLGetter();
+}
+
+- (void)resetBundleURL
+{
+  RCTBridge *strongBridge = _bridge;
+  if (strongBridge) {
+    strongBridge.bundleURL = [strongBridge.delegate sourceURLForBridge:strongBridge];
+    return;
+  }
+
+  RCTAssert(
+      _bridgelessBundleURLDefaultGetter != nil,
+      @"RCTBundleManager: In bridgeless mode, default RCTBridgelessBundleURLGetter must not be nil.");
+  RCTAssert(
+      _bridgelessBundleURLSetter != nil,
+      @"RCTBundleManager: In bridgeless mode, RCTBridgelessBundleURLSetter must not be nil.");
+
+  _bridgelessBundleURLSetter(_bridgelessBundleURLDefaultGetter());
+}
+
+@end
diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h
index a0f39d5bb3f20b..72b0bdbdeb6ae3 100644
--- a/React/Base/RCTBundleURLProvider.h
+++ b/React/Base/RCTBundleURLProvider.h
@@ -7,16 +7,19 @@
 
 #import <Foundation/Foundation.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-extern NSString *const RCTBundleURLProviderUpdatedNotification;
+#import "RCTDefines.h"
 
-extern const NSUInteger kRCTBundleURLProviderDefaultPort;
+RCT_EXTERN NSString *const RCTBundleURLProviderUpdatedNotification;
+RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 
-#if defined(__cplusplus)
-}
+#if RCT_DEV_MENU
+/**
+ * Allow/disallow accessing the packager server for various runtime scenario.
+ * For instance, if a test run should never access the packager, disable it
+ * by calling this function before initializing React Native (RCTBridge etc).
+ * By default the access is enabled.
+ */
+RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
 #endif
 
 extern NSString *const kRCTPlatformName; // TODO(macOS GH#774)
@@ -51,6 +54,13 @@ extern NSString *const kRCTPlatformName; // TODO(macOS GH#774)
  */
 + (BOOL)isPackagerRunning:(NSString *)hostPort;
 
+/**
+ * Returns if there's a packager running at the given scheme://host:port.
+ * The port is optional, if not specified, kRCTBundleURLProviderDefaultPort will be used
+ * The scheme is also optional, if not specified, a default http protocol will be used
+ */
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme;
+
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
@@ -99,10 +109,14 @@ extern NSString *const kRCTPlatformName; // TODO(macOS GH#774)
  */
 @property (nonatomic, copy) NSString *jsLocation;
 
-@property (nonatomic, assign) BOOL enableLiveReload;
 @property (nonatomic, assign) BOOL enableMinification;
 @property (nonatomic, assign) BOOL enableDev;
 
+/**
+ * The scheme/protocol used of the packager, the default is the http protocol
+ */
+@property (nonatomic, copy) NSString *packagerScheme;
+
 + (instancetype)sharedSettings;
 
 /**
@@ -130,6 +144,13 @@ extern NSString *const kRCTPlatformName; // TODO(macOS GH#774)
                         modulesOnly:(BOOL)modulesOnly
                           runModule:(BOOL)runModule;
 
++ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                       packagerHost:(NSString *)packagerHost
+                     packagerScheme:(NSString *)scheme
+                          enableDev:(BOOL)enableDev
+                 enableMinification:(BOOL)enableMinification
+                        modulesOnly:(BOOL)modulesOnly
+                          runModule:(BOOL)runModule;
 /**
  * Given a hostname for the packager and a resource path (including "/"), return the URL to the resource.
  * In general, please use the instance method to decide if the packager is running and fallback to the pre-packaged
@@ -137,4 +158,9 @@ extern NSString *const kRCTPlatformName; // TODO(macOS GH#774)
  */
 + (NSURL *)resourceURLForResourcePath:(NSString *)path packagerHost:(NSString *)packagerHost query:(NSString *)query;
 
++ (NSURL *)resourceURLForResourcePath:(NSString *)path
+                         packagerHost:(NSString *)packagerHost
+                               scheme:(NSString *)scheme
+                                query:(NSString *)query;
+
 @end
diff --git a/React/Base/RCTBundleURLProvider.mm b/React/Base/RCTBundleURLProvider.mm
index 06fc9a7e19ce99..776384e5ce7174 100644
--- a/React/Base/RCTBundleURLProvider.mm
+++ b/React/Base/RCTBundleURLProvider.mm
@@ -9,6 +9,7 @@
 
 #import "RCTConvert.h"
 #import "RCTDefines.h"
+#import "RCTLog.h"
 
 NSString *const RCTBundleURLProviderUpdatedNotification = @"RCTBundleURLProviderUpdatedNotification";
 
@@ -20,10 +21,15 @@
 NSString *const kRCTPlatformName = @"macos";
 #endif // ]TODO(macOS GH#774)
 
+#if RCT_DEV_MENU
+static BOOL kRCTAllowPackagerAccess = YES;
+void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
+{
+  kRCTAllowPackagerAccess = allowed;
+}
+#endif
+static NSString *const kRCTPackagerSchemeKey = @"RCT_packager_scheme";
 static NSString *const kRCTJsLocationKey = @"RCT_jsLocation";
-// This option is no longer exposed in the dev menu UI.
-// It was renamed in D15958697 so it doesn't get stuck with no way to turn it off:
-static NSString *const kRCTEnableLiveReloadKey = @"RCT_enableLiveReload_LEGACY";
 static NSString *const kRCTEnableDevKey = @"RCT_enableDev";
 static NSString *const kRCTEnableMinificationKey = @"RCT_enableMinification";
 
@@ -41,7 +47,6 @@ - (instancetype)init
 - (NSDictionary *)defaults
 {
   return @{
-    kRCTEnableLiveReloadKey : @NO,
     kRCTEnableDevKey : @YES,
     kRCTEnableMinificationKey : @NO,
   };
@@ -66,20 +71,29 @@ - (void)resetToDefaults
   [self settingsUpdated];
 }
 
-static NSURL *serverRootWithHostPort(NSString *hostPort)
+static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 {
+  if (![scheme length]) {
+    scheme = @"http";
+  }
   if ([hostPort rangeOfString:@":"].location != NSNotFound) {
-    return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/", hostPort]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/", scheme, hostPort]];
   }
-  return [NSURL
-      URLWithString:[NSString
-                        stringWithFormat:@"http://%@:%lu/", hostPort, (unsigned long)kRCTBundleURLProviderDefaultPort]];
+  return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@:%lu/",
+                                                         scheme,
+                                                         hostPort,
+                                                         (unsigned long)kRCTBundleURLProviderDefaultPort]];
 }
 
 #if RCT_DEV_MENU
 + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
-  NSURL *url = [serverRootWithHostPort(hostPort) URLByAppendingPathComponent:@"status"];
+  return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
+}
+
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
+{
+  NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
 
   NSURLSession *session = [NSURLSession sharedSession];
   NSURLRequest *request = [NSURLRequest requestWithURL:url];
@@ -121,6 +135,11 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
   return false;
 }
+
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
+{
+  return false;
+}
 #endif
 
 - (NSString *)packagerServerHost
@@ -137,9 +156,16 @@ - (NSString *)packagerServerHost
 
 - (NSString *)packagerServerHostPort
 {
+#if RCT_DEV_MENU
+  if (!kRCTAllowPackagerAccess) {
+    RCTLogInfo(@"Packager server access is disabled in this environment");
+    return nil;
+  }
+#endif
   NSString *location = [self jsLocation];
 #if RCT_DEV_MENU
-  if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location]) {
+  NSString *scheme = [self packagerScheme];
+  if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location scheme:scheme]) {
     location = nil;
   }
 #endif
@@ -163,8 +189,11 @@ - (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackURLProvider:(
   } else {
     return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
                                              packagerHost:packagerServerHostPort
+                                           packagerScheme:[self packagerScheme]
                                                 enableDev:[self enableDev]
-                                       enableMinification:[self enableMinification]];
+                                       enableMinification:[self enableMinification]
+                                              modulesOnly:NO
+                                                runModule:YES];
   }
 }
 
@@ -172,6 +201,7 @@ - (NSURL *)jsBundleURLForSplitBundleRoot:(NSString *)bundleRoot
 {
   return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
                                            packagerHost:[self packagerServerHostPort]
+                                         packagerScheme:[self packagerScheme]
                                               enableDev:[self enableDev]
                                      enableMinification:[self enableMinification]
                                             modulesOnly:YES
@@ -206,13 +236,17 @@ - (NSURL *)resourceURLForResourceRoot:(NSString *)root
                         offlineBundle:(NSBundle *)offlineBundle
 {
   NSString *packagerServerHostPort = [self packagerServerHostPort];
+  NSString *packagerServerScheme = [self packagerScheme];
   if (!packagerServerHostPort) {
     // Serve offline bundle (local file)
     NSBundle *bundle = offlineBundle ?: [NSBundle mainBundle];
     return [bundle URLForResource:name withExtension:extension];
   }
   NSString *path = [NSString stringWithFormat:@"/%@/%@.%@", root, name, extension];
-  return [[self class] resourceURLForResourcePath:path packagerHost:packagerServerHostPort query:nil];
+  return [[self class] resourceURLForResourcePath:path
+                                     packagerHost:packagerServerHostPort
+                                           scheme:packagerServerScheme
+                                            query:nil];
 }
 
 + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
@@ -235,6 +269,23 @@ + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
                  enableMinification:(BOOL)enableMinification
                         modulesOnly:(BOOL)modulesOnly
                           runModule:(BOOL)runModule
+{
+  return [[self class] jsBundleURLForBundleRoot:bundleRoot
+                                   packagerHost:packagerHost
+                                 packagerScheme:nil
+                                      enableDev:enableDev
+                             enableMinification:enableMinification
+                                    modulesOnly:modulesOnly
+                                      runModule:runModule];
+}
+
++ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                       packagerHost:(NSString *)packagerHost
+                     packagerScheme:(NSString *)scheme
+                          enableDev:(BOOL)enableDev
+                 enableMinification:(BOOL)enableMinification
+                        modulesOnly:(BOOL)modulesOnly
+                          runModule:(BOOL)runModule
 {
   NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
 #ifdef HERMES_BYTECODE_VERSION
@@ -256,12 +307,20 @@ + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
   if (bundleID) {
     query = [NSString stringWithFormat:@"%@&app=%@", query, bundleID];
   }
-  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost query:query];
+  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost scheme:scheme query:query];
 }
 
 + (NSURL *)resourceURLForResourcePath:(NSString *)path packagerHost:(NSString *)packagerHost query:(NSString *)query
 {
-  NSURLComponents *components = [NSURLComponents componentsWithURL:serverRootWithHostPort(packagerHost)
+  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost scheme:nil query:query];
+}
+
++ (NSURL *)resourceURLForResourcePath:(NSString *)path
+                         packagerHost:(NSString *)packagerHost
+                               scheme:(NSString *)scheme
+                                query:(NSString *)query
+{
+  NSURLComponents *components = [NSURLComponents componentsWithURL:serverRootWithHostPort(packagerHost, scheme)
                                            resolvingAgainstBaseURL:NO];
   components.path = path;
   if (query != nil) {
@@ -282,11 +341,6 @@ - (BOOL)enableDev
   return [[NSUserDefaults standardUserDefaults] boolForKey:kRCTEnableDevKey];
 }
 
-- (BOOL)enableLiveReload
-{
-  return [[NSUserDefaults standardUserDefaults] boolForKey:kRCTEnableLiveReloadKey];
-}
-
 - (BOOL)enableMinification
 {
   return [[NSUserDefaults standardUserDefaults] boolForKey:kRCTEnableMinificationKey];
@@ -297,14 +351,18 @@ - (NSString *)jsLocation
   return [[NSUserDefaults standardUserDefaults] stringForKey:kRCTJsLocationKey];
 }
 
-- (void)setEnableDev:(BOOL)enableDev
+- (NSString *)packagerScheme
 {
-  [self updateValue:@(enableDev) forKey:kRCTEnableDevKey];
+  NSString *packagerScheme = [[NSUserDefaults standardUserDefaults] stringForKey:kRCTPackagerSchemeKey];
+  if (![packagerScheme length]) {
+    return @"http";
+  }
+  return packagerScheme;
 }
 
-- (void)setEnableLiveReload:(BOOL)enableLiveReload
+- (void)setEnableDev:(BOOL)enableDev
 {
-  [self updateValue:@(enableLiveReload) forKey:kRCTEnableLiveReloadKey];
+  [self updateValue:@(enableDev) forKey:kRCTEnableDevKey];
 }
 
 - (void)setJsLocation:(NSString *)jsLocation
@@ -317,6 +375,11 @@ - (void)setEnableMinification:(BOOL)enableMinification
   [self updateValue:@(enableMinification) forKey:kRCTEnableMinificationKey];
 }
 
+- (void)setPackagerScheme:(NSString *)packagerScheme
+{
+  [self updateValue:packagerScheme forKey:kRCTPackagerSchemeKey];
+}
+
 + (instancetype)sharedSettings
 {
   static RCTBundleURLProvider *sharedInstance;
diff --git a/React/Base/RCTCallableJSModules.m b/React/Base/RCTCallableJSModules.m
new file mode 100644
index 00000000000000..316d4dc56e4ee1
--- /dev/null
+++ b/React/Base/RCTCallableJSModules.m
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTBridge.h"
+#import "RCTBridgeModule.h"
+
+@implementation RCTCallableJSModules {
+  RCTBridgelessJSModuleMethodInvoker _bridgelessJSModuleMethodInvoker;
+  __weak RCTBridge *_bridge;
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+}
+
+- (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker
+{
+  _bridgelessJSModuleMethodInvoker = bridgelessJSModuleMethodInvoker;
+}
+
+- (void)invokeModule:(NSString *)moduleName method:(NSString *)methodName withArgs:(NSArray *)args
+{
+  [self invokeModule:moduleName method:methodName withArgs:args onComplete:NULL];
+}
+
+- (void)invokeModule:(NSString *)moduleName
+              method:(NSString *)methodName
+            withArgs:(NSArray *)args
+          onComplete:(dispatch_block_t)onComplete
+{
+  RCTBridge *bridge = _bridge;
+  if (bridge) {
+    [bridge enqueueJSCall:moduleName method:methodName args:args completion:onComplete];
+    return;
+  }
+
+  if (_bridgelessJSModuleMethodInvoker) {
+    _bridgelessJSModuleMethodInvoker(moduleName, methodName, args, onComplete);
+  }
+}
+
+@end
diff --git a/React/Base/RCTConstants.h b/React/Base/RCTConstants.h
index c34cbc52df4b82..06fbc7597cae46 100644
--- a/React/Base/RCTConstants.h
+++ b/React/Base/RCTConstants.h
@@ -11,20 +11,19 @@ RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotification;
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey;
 
 /*
- * Allows to enable or disable on-demand view mounting feature of ScrollView.
- * It's an experimental feature that improves performance and memory footprint of huge lists inside ScrollView.
+ * Preemptive View Allocation
  */
-RCT_EXTERN BOOL RCTExperimentGetOnDemandViewMounting(void);
-RCT_EXTERN void RCTExperimentSetOnDemandViewMounting(BOOL value);
+RCT_EXTERN BOOL RCTExperimentGetPreemptiveViewAllocationDisabled(void);
+RCT_EXTERN void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value);
 
 /*
- * It's an experimental feature that improves performance of hit-testing.
+ * Initial maximum surface size
  */
-RCT_EXTERN BOOL RCTExperimentGetOptimizedHitTesting(void);
-RCT_EXTERN void RCTExperimentSetOptimizedHitTesting(BOOL value);
+RCT_EXTERN BOOL RCTGetInitialMaxSizeEnabled(void);
+RCT_EXTERN void RCTSetInitialMaxSizeEnabled(BOOL value);
 
 /*
- * Preemptive View Allocation
+ * Remove clipped subviews
  */
-RCT_EXTERN BOOL RCTExperimentGetPreemptiveViewAllocationDisabled(void);
-RCT_EXTERN void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value);
+RCT_EXTERN BOOL RCTGetRemoveClippedSubviewsEnabled(void);
+RCT_EXTERN void RCTSetRemoveClippedSubviewsEnabled(BOOL value);
diff --git a/React/Base/RCTConstants.m b/React/Base/RCTConstants.m
index e701ea81e7b592..f734a3384a68e1 100644
--- a/React/Base/RCTConstants.m
+++ b/React/Base/RCTConstants.m
@@ -11,46 +11,46 @@
 NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey = @"traitCollection";
 
 /*
- * On-demand view mounting
+ * Preemptive View Allocation
  */
-static BOOL RCTExperimentOnDemandViewMounting = NO;
+static BOOL RCTExperimentPreemptiveViewAllocationDisabled = NO;
 
-BOOL RCTExperimentGetOnDemandViewMounting()
+BOOL RCTExperimentGetPreemptiveViewAllocationDisabled()
 {
-  return RCTExperimentOnDemandViewMounting;
+  return RCTExperimentPreemptiveViewAllocationDisabled;
 }
 
-void RCTExperimentSetOnDemandViewMounting(BOOL value)
+void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
 {
-  RCTExperimentOnDemandViewMounting = value;
+  RCTExperimentPreemptiveViewAllocationDisabled = value;
 }
 
 /*
- * Optimized hit-testing
+ * Initial maximum surface size
  */
-static BOOL RCTExperimentOptimizedHitTesting = NO;
+static BOOL RCTInitialMaxSizeEnabled = NO;
 
-BOOL RCTExperimentGetOptimizedHitTesting()
+BOOL RCTGetInitialMaxSizeEnabled()
 {
-  return RCTExperimentOptimizedHitTesting;
+  return RCTInitialMaxSizeEnabled;
 }
 
-void RCTExperimentSetOptimizedHitTesting(BOOL value)
+void RCTSetInitialMaxSizeEnabled(BOOL value)
 {
-  RCTExperimentOptimizedHitTesting = value;
+  RCTInitialMaxSizeEnabled = value;
 }
 
 /*
- * Preemptive View Allocation
+ * Remove clipped subviews
  */
-static BOOL RCTExperimentPreemptiveViewAllocationDisabled = NO;
+static BOOL RCTRemoveClippedSubviewsEnabled = NO;
 
-BOOL RCTExperimentGetPreemptiveViewAllocationDisabled()
+BOOL RCTGetRemoveClippedSubviewsEnabled(void)
 {
-  return RCTExperimentPreemptiveViewAllocationDisabled;
+  return RCTRemoveClippedSubviewsEnabled;
 }
 
-void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
+void RCTSetRemoveClippedSubviewsEnabled(BOOL value)
 {
-  RCTExperimentPreemptiveViewAllocationDisabled = value;
+  RCTRemoveClippedSubviewsEnabled = value;
 }
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index 29df6e21d1fae5..55af6b684ccbb3 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -928,7 +928,7 @@ +(type)type : (id)json                                      \
 }
 // ]TODO(macOS GH#774)
 
-/** Returns a comma seperated list of the valid semantic color names
+/** Returns an alphabetically sorted comma separated list of the valid semantic color names
  */
 static NSString *RCTSemanticColorNames()
 {
@@ -974,7 +974,7 @@ + (RCTUIColor *)NSColor:(id)json
 #endif //TARGET_OS_OSX
 // ]TODO(macOS GH#750)
 
-+ (RCTUIColor *)UIColor:(id)json // TODO(OSS Candidate ISS#2710739)
++ (RCTUIColor *)UIColor:(id)json // TODO(macOS GH#750)
 {
   if (!json) {
     return nil;
@@ -982,7 +982,7 @@ + (RCTUIColor *)UIColor:(id)json // TODO(OSS Candidate ISS#2710739)
   if ([json isKindOfClass:[NSArray class]]) {
     NSArray *components = [self NSNumberArray:json];
     CGFloat alpha = components.count > 3 ? [self CGFloat:components[3]] : 1.0;
-    return [RCTUIColor colorWithRed:[self CGFloat:components[0]] // TODO(OSS Candidate ISS#2710739)
+    return [RCTUIColor colorWithRed:[self CGFloat:components[0]] // TODO(macOS GH#750)
                               green:[self CGFloat:components[1]]
                                blue:[self CGFloat:components[2]]
                               alpha:alpha];
@@ -992,15 +992,19 @@ + (RCTUIColor *)UIColor:(id)json // TODO(OSS Candidate ISS#2710739)
     CGFloat r = ((argb >> 16) & 0xFF) / 255.0;
     CGFloat g = ((argb >> 8) & 0xFF) / 255.0;
     CGFloat b = (argb & 0xFF) / 255.0;
-    return [RCTUIColor colorWithRed:r green:g blue:b alpha:a]; // TODO(OSS Candidate ISS#2710739)
-// [TODO(macOS GH#774)
+    return [RCTUIColor colorWithRed:r green:g blue:b alpha:a]; // TODO(macOS GH#750)
+
   } else if ([json isKindOfClass:[NSDictionary class]]) {
     NSDictionary *dictionary = json;
     id value = nil;
     if ((value = [dictionary objectForKey:@"semantic"])) {
       if ([value isKindOfClass:[NSString class]]) {
         NSString *semanticName = value;
-        RCTUIColor *color = RCTColorFromSemanticColorName(semanticName);
+        RCTUIColor *color = [RCTUIColor colorNamed:semanticName]; // TODO(macOS GH#750)
+        if (color != nil) {
+          return color;
+        }
+        color = RCTColorFromSemanticColorName(semanticName);
         if (color == nil) {
           RCTLogConvertError(
               json,
@@ -1009,7 +1013,11 @@ + (RCTUIColor *)UIColor:(id)json // TODO(OSS Candidate ISS#2710739)
         return color;
       } else if ([value isKindOfClass:[NSArray class]]) {
         for (id name in value) {
-          RCTUIColor *color = RCTColorFromSemanticColorName(name);
+          RCTUIColor *color = [RCTUIColor colorNamed:name]; // TODO(macOS GH#750)
+          if (color != nil) {
+            return color;
+          }
+          color = RCTColorFromSemanticColorName(name);
           if (color != nil) {
             return color;
           }
@@ -1028,7 +1036,11 @@ + (RCTUIColor *)UIColor:(id)json // TODO(OSS Candidate ISS#2710739)
       id light = [appearances objectForKey:@"light"];
       RCTUIColor *lightColor = [RCTConvert UIColor:light];
       id dark = [appearances objectForKey:@"dark"];
-      RCTUIColor *darkColor = [RCTConvert UIColor:dark];
+      RCTUIColor *darkColor = [RCTConvert UIColor:dark]; // TODO(macOS GH#750)
+      id highContrastLight = [appearances objectForKey:@"highContrastLight"];
+      RCTUIColor *highContrastLightColor = [RCTConvert UIColor:highContrastLight]; // TODO(macOS GH#750)
+      id highContrastDark = [appearances objectForKey:@"highContrastDark"];
+      RCTUIColor *highContrastDarkColor = [RCTConvert UIColor:highContrastDark]; // TODO(macOS GH#750)
       if (lightColor != nil && darkColor != nil) {
 #if TARGET_OS_OSX
         RCTDynamicColor *color = [[RCTDynamicColor alloc] initWithAquaColor:lightColor darkAquaColor:darkColor];
@@ -1036,10 +1048,22 @@ + (RCTUIColor *)UIColor:(id)json // TODO(OSS Candidate ISS#2710739)
 #else
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
         if (@available(iOS 13.0, *)) {
-          UIColor *color =
-              [UIColor colorWithDynamicProvider:^UIColor *_Nonnull(UITraitCollection *_Nonnull collection) {
-                return collection.userInterfaceStyle == UIUserInterfaceStyleDark ? darkColor : lightColor;
-              }];
+          UIColor *color = [UIColor colorWithDynamicProvider:^UIColor *_Nonnull(
+                                        UITraitCollection *_Nonnull collection) {
+            if (collection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+              if (collection.accessibilityContrast == UIAccessibilityContrastHigh && highContrastDarkColor != nil) {
+                return highContrastDarkColor;
+              } else {
+                return darkColor;
+              }
+            } else {
+              if (collection.accessibilityContrast == UIAccessibilityContrastHigh && highContrastLightColor != nil) {
+                return highContrastLightColor;
+              } else {
+                return lightColor;
+              }
+            }
+          }];
           return color;
         } else {
 #endif
diff --git a/React/Base/RCTCxxConvert.h b/React/Base/RCTCxxConvert.h
index b0432caae248c5..261e61f6096223 100644
--- a/React/Base/RCTCxxConvert.h
+++ b/React/Base/RCTCxxConvert.h
@@ -10,7 +10,7 @@
 /**
  * This class provides a collection of conversion functions for mapping
  * JSON objects to cxx types. Extensible via categories.
- * Convert methods are expected to return cxx objects wraped in RCTManagedPointer.
+ * Convert methods are expected to return cxx objects wrapped in RCTManagedPointer.
  */
 
 @interface RCTCxxConvert : NSObject
diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h
index 23be65eb5c64d7..b416f71a6353cf 100644
--- a/React/Base/RCTDefines.h
+++ b/React/Base/RCTDefines.h
@@ -142,3 +142,13 @@
     @throw _RCTNotImplementedException(_cmd, [self class]);                                             \
   }                                                                                                     \
   _Pragma("clang diagnostic pop")
+
+/**
+ * Controls for activating the new architecture without the legacy system.
+ * Note: this is work in progress.
+ */
+#ifdef REACT_NATIVE_FORCE_NEW_ARCHITECTURE
+#define RCT_NEW_ARCHITECTURE 1
+#else
+#define RCT_NEW_ARCHITECTURE 0
+#endif
diff --git a/React/Base/RCTEventDispatcherProtocol.h b/React/Base/RCTEventDispatcherProtocol.h
index 70e88279f2b14f..31ab9e68184e31 100644
--- a/React/Base/RCTEventDispatcherProtocol.h
+++ b/React/Base/RCTEventDispatcherProtocol.h
@@ -8,7 +8,6 @@
 #import <Foundation/Foundation.h> // TODO(OSS Candidate ISS#2710739)
 
 #import <React/RCTBridge.h>
-#import <React/RCTJSInvokerModule.h>
 
 /**
  * The threshold at which text inputs will start warning that the JS thread
@@ -80,7 +79,7 @@ typedef NS_ENUM(NSInteger, RCTTextEventType) {
  * This class wraps the -[RCTBridge enqueueJSCall:args:] method, and
  * provides some convenience methods for generating event calls.
  */
-@protocol RCTEventDispatcherProtocol <RCTBridgeModule, RCTJSDispatcherModule, RCTJSInvokerModule>
+@protocol RCTEventDispatcherProtocol <RCTBridgeModule, RCTJSDispatcherModule>
 
 /**
  * Deprecated, do not use.
diff --git a/React/Views/RCTPickerManager.h b/React/Base/RCTInitializing.h
similarity index 68%
rename from React/Views/RCTPickerManager.h
rename to React/Base/RCTInitializing.h
index f3ea77f99936cd..56b14b1c063b6e 100644
--- a/React/Views/RCTPickerManager.h
+++ b/React/Base/RCTInitializing.h
@@ -5,8 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTViewManager.h>
+#import <Foundation/Foundation.h>
 
-@interface RCTPickerManager : RCTViewManager
+@protocol RCTInitializing <NSObject>
+
+- (void)initialize;
 
 @end
diff --git a/React/Base/RCTJSInvokerModule.h b/React/Base/RCTJSInvokerModule.h
deleted file mode 100644
index b3b86a12d71104..00000000000000
--- a/React/Base/RCTJSInvokerModule.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/**
- * This protocol should be adopted when a turbo module needs to directly call into JavaScript.
- * In bridge-less React Native, it is a replacement for [_bridge enqueueJSCall:].
- */
-@protocol RCTJSInvokerModule
-
-@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString * _Nullable module, NSString * _Nullable method, NSArray * _Nullable args); // TODO(macOS GH#774)
-@property (nonatomic, copy, nonnull) void (^invokeJSWithModuleDotMethod)(NSString * _Nullable moduleDotMethod, NSArray * _Nullable args); // TODO(macOS GH#774)
-
-@end
diff --git a/React/Base/RCTJavaScriptLoader.mm b/React/Base/RCTJavaScriptLoader.mm
index d902f0c92d0002..dfce0d5e93a253 100755
--- a/React/Base/RCTJavaScriptLoader.mm
+++ b/React/Base/RCTJavaScriptLoader.mm
@@ -177,6 +177,7 @@ + (NSData *)attemptSynchronousLoadOfBundleAtURL:(NSURL *)scriptURL
 
   facebook::react::ScriptTag tag = facebook::react::parseTypeFromHeader(header);
   switch (tag) {
+    case facebook::react::ScriptTag::HBCBundle:
     case facebook::react::ScriptTag::RAMBundle:
       break;
 
diff --git a/React/Base/RCTModuleData.h b/React/Base/RCTModuleData.h
index 5ff81532eb34b6..71e1950aac3bce 100644
--- a/React/Base/RCTModuleData.h
+++ b/React/Base/RCTModuleData.h
@@ -13,19 +13,36 @@
 @protocol RCTBridgeMethod;
 @protocol RCTBridgeModule;
 @class RCTBridge;
+@class RCTModuleRegistry;
+@class RCTViewRegistry;
+@class RCTBundleManager;
+@class RCTCallableJSModules;
 
 typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
 
 @interface RCTModuleData : NSObject <RCTInvalidating>
 
-- (instancetype)initWithModuleClass:(Class)moduleClass bridge:(RCTBridge *)bridge;
+- (instancetype)initWithModuleClass:(Class)moduleClass
+                             bridge:(RCTBridge *)bridge
+                     moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules;
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
                      moduleProvider:(RCTBridgeModuleProvider)moduleProvider
-                             bridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
+                             bridge:(RCTBridge *)bridge
+                     moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
-                                bridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
+                                bridge:(RCTBridge *)bridge
+                        moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+               viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                         bundleManager:(RCTBundleManager *)bundleManager
+                     callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;
 
 /**
  * Calls `constantsToExport` on the module and stores the result. Note that
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index c81b8a41fafb29..1a3d8839c79ca6 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -15,6 +15,7 @@
 
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
+#import "RCTInitializing.h"
 #import "RCTLog.h"
 #import "RCTModuleMethod.h"
 #import "RCTProfile.h"
@@ -48,6 +49,11 @@ @implementation RCTModuleData {
   RCTBridgeModuleProvider _moduleProvider;
   std::mutex _instanceLock;
   BOOL _setupComplete;
+  RCTModuleRegistry *_moduleRegistry;
+  RCTViewRegistry *_viewRegistry_DEPRECATED;
+  RCTBundleManager *_bundleManager;
+  RCTCallableJSModules *_callableJSModules;
+  BOOL _isInitialized;
 }
 
 @synthesize methods = _methods;
@@ -97,34 +103,60 @@ - (void)setUp
   }
 }
 
-- (instancetype)initWithModuleClass:(Class)moduleClass bridge:(RCTBridge *)bridge
+- (instancetype)initWithModuleClass:(Class)moduleClass
+                             bridge:(RCTBridge *)bridge
+                     moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   return [self initWithModuleClass:moduleClass
                     moduleProvider:^id<RCTBridgeModule> {
                       return [moduleClass new];
                     }
-                            bridge:bridge];
+                            bridge:bridge
+                    moduleRegistry:moduleRegistry
+           viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
+                     bundleManager:bundleManager
+                 callableJSModules:callableJSModules];
 }
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
                      moduleProvider:(RCTBridgeModuleProvider)moduleProvider
                              bridge:(RCTBridge *)bridge
+                     moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
     _bridge = bridge;
     _moduleClass = moduleClass;
     _moduleProvider = [moduleProvider copy];
+    _moduleRegistry = moduleRegistry;
+    _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
     [self setUp];
   }
   return self;
 }
 
-- (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance bridge:(RCTBridge *)bridge
+- (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
+                                bridge:(RCTBridge *)bridge
+                        moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+               viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                         bundleManager:(RCTBundleManager *)bundleManager
+                     callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
     _bridge = bridge;
     _instance = instance;
     _moduleClass = [instance class];
+    _moduleRegistry = moduleRegistry;
+    _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
     [self setUp];
   }
   return self;
@@ -185,9 +217,17 @@ - (void)setUpInstanceAndBridge:(int32_t)requestId
       // initialization requires it (View Managers get their queue by calling
       // self.bridge.uiManager.methodQueue)
       [self setBridgeForInstance];
+      [self setModuleRegistryForInstance];
+      [self setViewRegistryForInstance];
+      [self setBundleManagerForInstance];
+      [self setCallableJSModulesForInstance];
     }
 
     [self setUpMethodQueue];
+
+    if (shouldSetup) {
+      [self _initializeModule];
+    }
   }
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 
@@ -231,6 +271,84 @@ - (void)setBridgeForInstance
   }
 }
 
+- (void)setModuleRegistryForInstance
+{
+  if ([_instance respondsToSelector:@selector(moduleRegistry)] && _instance.moduleRegistry != _moduleRegistry) {
+    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setModuleRegistryForInstance]", nil);
+    @try {
+      [(id)_instance setValue:_moduleRegistry forKey:@"moduleRegistry"];
+    } @catch (NSException *exception) {
+      RCTLogError(
+          @"%@ has no setter or ivar for its module registry, which is not "
+           "permitted. You must either @synthesize the moduleRegistry property, "
+           "or provide your own setter method.",
+          self.name);
+    }
+    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+  }
+}
+
+- (void)setViewRegistryForInstance
+{
+  if ([_instance respondsToSelector:@selector(viewRegistry_DEPRECATED)] &&
+      _instance.viewRegistry_DEPRECATED != _viewRegistry_DEPRECATED) {
+    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setViewRegistryForInstance]", nil);
+    @try {
+      [(id)_instance setValue:_viewRegistry_DEPRECATED forKey:@"viewRegistry_DEPRECATED"];
+    } @catch (NSException *exception) {
+      RCTLogError(
+          @"%@ has no setter or ivar for its module registry, which is not "
+           "permitted. You must either @synthesize the viewRegistry_DEPRECATED property, "
+           "or provide your own setter method.",
+          self.name);
+    }
+    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+  }
+}
+
+- (void)setBundleManagerForInstance
+{
+  if ([_instance respondsToSelector:@selector(bundleManager)] && _instance.bundleManager != _bundleManager) {
+    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setBundleManagerForInstance]", nil);
+    @try {
+      [(id)_instance setValue:_bundleManager forKey:@"bundleManager"];
+    } @catch (NSException *exception) {
+      RCTLogError(
+          @"%@ has no setter or ivar for its module registry, which is not "
+           "permitted. You must either @synthesize the bundleManager property, "
+           "or provide your own setter method.",
+          self.name);
+    }
+    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+  }
+}
+
+- (void)setCallableJSModulesForInstance
+{
+  if ([_instance respondsToSelector:@selector(callableJSModules)] &&
+      _instance.callableJSModules != _callableJSModules) {
+    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setCallableJSModulesForInstance]", nil);
+    @try {
+      [(id)_instance setValue:_callableJSModules forKey:@"callableJSModules"];
+    } @catch (NSException *exception) {
+      RCTLogError(
+          @"%@ has no setter or ivar for its module registry, which is not "
+           "permitted. You must either @synthesize the callableJSModules property, "
+           "or provide your own setter method.",
+          self.name);
+    }
+    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+  }
+}
+
+- (void)_initializeModule
+{
+  if (!_isInitialized && [_instance respondsToSelector:@selector(initialize)]) {
+    _isInitialized = YES;
+    [(id<RCTInitializing>)_instance initialize];
+  }
+}
+
 - (void)finishSetupForInstance
 {
   if (!_setupComplete && _instance) {
diff --git a/React/Base/RCTModuleRegistry.m b/React/Base/RCTModuleRegistry.m
new file mode 100644
index 00000000000000..c5a5d10ab48eb3
--- /dev/null
+++ b/React/Base/RCTModuleRegistry.m
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTBridge.h"
+#import "RCTBridgeModule.h"
+
+@implementation RCTModuleRegistry {
+  __weak id<RCTTurboModuleRegistry> _turboModuleRegistry;
+  __weak RCTBridge *_bridge;
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+}
+
+- (void)setTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry
+{
+  _turboModuleRegistry = turboModuleRegistry;
+}
+
+- (id)moduleForName:(const char *)moduleName
+{
+  return [self moduleForName:moduleName lazilyLoadIfNecessary:YES];
+}
+
+- (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad
+{
+  id<RCTBridgeModule> module = nil;
+
+  RCTBridge *bridge = _bridge;
+  if (bridge) {
+    module = [bridge moduleForName:[NSString stringWithUTF8String:moduleName] lazilyLoadIfNecessary:lazilyLoad];
+  }
+
+  id<RCTTurboModuleRegistry> turboModuleRegistry = _turboModuleRegistry;
+  if (module == nil && turboModuleRegistry && (lazilyLoad || [turboModuleRegistry moduleIsInitialized:moduleName])) {
+    module = [turboModuleRegistry moduleForName:moduleName];
+  }
+
+  return module;
+}
+
+@end
diff --git a/React/Base/RCTMultipartStreamReader.m b/React/Base/RCTMultipartStreamReader.m
index efbbdf5bdd135e..f7fd2809267068 100644
--- a/React/Base/RCTMultipartStreamReader.m
+++ b/React/Base/RCTMultipartStreamReader.m
@@ -7,8 +7,6 @@
 
 #import "RCTMultipartStreamReader.h"
 
-#import <QuartzCore/CAAnimation.h>
-
 #define CRLF @"\r\n"
 
 @implementation RCTMultipartStreamReader {
diff --git a/React/Base/RCTRootView.h b/React/Base/RCTRootView.h
index 0663ed3c3ea4e8..839e0574f2d940 100644
--- a/React/Base/RCTRootView.h
+++ b/React/Base/RCTRootView.h
@@ -50,9 +50,18 @@ extern
 /**
  * - Designated initializer -
  */
+- (instancetype)initWithFrame:(CGRect)frame
+                       bridge:(RCTBridge *)bridge
+                   moduleName:(NSString *)moduleName
+            initialProperties:(nullable NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
+
+/**
+ * - Convenience initializer -
+ * The frame will default to CGRectZero.
+ */
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
-             initialProperties:(nullable NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
+             initialProperties:(nullable NSDictionary *)initialProperties;
 
 /**
  * - Convenience initializer -
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 1d1550fb9babac..87e563f72efa40 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -58,9 +58,10 @@ @implementation RCTRootView {
 #endif // ]TODO(macOS GH#774)
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
+- (instancetype)initWithFrame:(CGRect)frame
+                       bridge:(RCTBridge *)bridge
+                   moduleName:(NSString *)moduleName
+            initialProperties:(NSDictionary *)initialProperties
 {
   RCTAssertMainQueue();
   RCTAssert(bridge, @"A bridge instance is required to create an RCTRootView");
@@ -71,7 +72,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     [bridge.performanceLogger markStartForTag:RCTPLTTI];
   }
 
-  if (self = [super initWithFrame:CGRectZero]) {
+  if (self = [super initWithFrame:frame]) {
     /* [TODO(OSS Candidate ISS#2710739): don't set the background color on mac or ios so that the view is invisible during initial render
     self.backgroundColor = [UIColor whiteColor];
     ]TODO(OSS Candidate ISS#2710739) */
@@ -115,6 +116,13 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  return [self initWithFrame:CGRectZero bridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                        moduleName:(NSString *)moduleName
                 initialProperties:(NSDictionary *)initialProperties
diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m
index f6b23e9c5695db..d0bf1af0f3b54e 100644
--- a/React/Base/RCTTouchHandler.m
+++ b/React/Base/RCTTouchHandler.m
@@ -41,6 +41,10 @@ @implementation RCTTouchHandler {
 
   __weak RCTUIView *_cachedRootView; // TODO(macOS GH#774)
 
+  // See Touch.h and usage. This gives us a time-basis for a monotonic
+  // clock that acts like a timestamp of milliseconds elapsed since UNIX epoch.
+  NSTimeInterval _unixEpochBasisTime;
+
   uint16_t _coalescingKey;
 #if TARGET_OS_OSX// [TODO(macOS GH#774)
   BOOL _shouldSendMouseUpOnSystemBehalf;
@@ -57,6 +61,10 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _nativeTouches = [NSMutableOrderedSet new];
     _reactTouches = [NSMutableArray new];
     _touchViews = [NSMutableArray new];
+
+    // Get a UNIX epoch basis time:
+    _unixEpochBasisTime = [[NSDate date] timeIntervalSince1970] - [NSProcessInfo processInfo].systemUptime;
+
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
     // `cancelsTouchesInView` and `delaysTouches*` are needed in order to be used as a top level
     // event delegated recognizer. Otherwise, lower-level components not built
@@ -228,7 +236,7 @@ - (void)_updateReactTouchAtIndex:(NSInteger)touchIndex
   reactTouch[@"pageY"] = @(RCTSanitizeNaNValue(rootViewLocation.y, @"touchEvent.pageY"));
   reactTouch[@"locationX"] = @(RCTSanitizeNaNValue(touchViewLocation.x, @"touchEvent.locationX"));
   reactTouch[@"locationY"] = @(RCTSanitizeNaNValue(touchViewLocation.y, @"touchEvent.locationY"));
-  reactTouch[@"timestamp"] = @(nativeTouch.timestamp * 1000); // in ms, for JS
+  reactTouch[@"timestamp"] = @((_unixEpochBasisTime + nativeTouch.timestamp) * 1000); // in ms, for JS
 
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
   // TODO: force for a 'normal' touch is usually 1.0;
@@ -236,6 +244,9 @@ - (void)_updateReactTouchAtIndex:(NSInteger)touchIndex
   // have a value of `1.0 / nativeTouch.maximumPossibleForce`)?
   if (RCTForceTouchAvailable()) {
     reactTouch[@"force"] = @(RCTZeroIfNaN(nativeTouch.force / nativeTouch.maximumPossibleForce));
+  } else if (nativeTouch.type == UITouchTypePencil) {
+    reactTouch[@"force"] = @(RCTZeroIfNaN(nativeTouch.force / nativeTouch.maximumPossibleForce));
+    reactTouch[@"altitudeAngle"] = @(RCTZeroIfNaN(nativeTouch.altitudeAngle));
   }
 #else // [TODO(macOS GH#774)
   NSEventModifierFlags modifierFlags = nativeTouch.modifierFlags;
diff --git a/React/Base/RCTUIKit.h b/React/Base/RCTUIKit.h
index 29cfc958f8b8de..70439f162b9f48 100644
--- a/React/Base/RCTUIKit.h
+++ b/React/Base/RCTUIKit.h
@@ -63,6 +63,8 @@ UIKIT_STATIC_INLINE CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path)
 #define RCTUIView UIView // TODO(macOS ISS#3536887)
 #define RCTUIScrollView UIScrollView // TODO(macOS ISS#3536887)
 
+#define RCTPlatformWindow UIWindow
+
 UIKIT_STATIC_INLINE RCTPlatformView *RCTUIViewHitTestWithEvent(RCTPlatformView *view, CGPoint point, UIEvent *event)
 {
   return [view hitTest:point withEvent:event];
@@ -361,6 +363,8 @@ CGPathRef UIBezierPathCreateCGPathRef(UIBezierPath *path);
 // UIView
 #define RCTPlatformView NSView
 
+#define RCTPlatformWindow NSWindow
+
 @interface RCTUIView : NSView // TODO(macOS ISS#3536887)
 
 @property (nonatomic, readonly) BOOL canBecomeFirstResponder;
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index 52311c61ef9a3f..4ad23a8a3ca68c 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -167,8 +167,12 @@ id RCTJSONClean(id object)
   static dispatch_once_t onceToken;
   static NSSet<Class> *validLeafTypes;
   dispatch_once(&onceToken, ^{
-    validLeafTypes =
-        [[NSSet alloc] initWithArray:@ [[NSString class], [NSMutableString class], [NSNumber class], [NSNull class], ]];
+    validLeafTypes = [[NSSet alloc] initWithArray:@[
+      [NSString class],
+      [NSMutableString class],
+      [NSNumber class],
+      [NSNull class],
+    ]];
   });
 
   if ([validLeafTypes containsObject:[object classForCoder]]) {
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index d601aa96cf91b0..cb38957f24f942 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -22,8 +22,8 @@
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(63),
-                  RCTVersionPatch: @(3),
+                  RCTVersionMinor: @(66),
+                  RCTVersionPatch: @(0),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });
diff --git a/React/Base/RCTViewRegistry.m b/React/Base/RCTViewRegistry.m
new file mode 100644
index 00000000000000..bf063b5f84b542
--- /dev/null
+++ b/React/Base/RCTViewRegistry.m
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTSurfacePresenterStub.h>
+#import <React/RCTUIManager.h>
+
+#import "RCTBridge.h"
+#import "RCTBridgeModule.h"
+
+@implementation RCTViewRegistry {
+  RCTBridgelessComponentViewProvider _bridgelessComponentViewProvider;
+  __weak RCTBridge *_bridge;
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+}
+
+- (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)bridgelessComponentViewProvider
+{
+  _bridgelessComponentViewProvider = bridgelessComponentViewProvider;
+}
+
+- (RCTPlatformView *)viewForReactTag:(NSNumber *)reactTag // TODO(macOS GH#774)
+{
+  RCTPlatformView *view = nil; // TODO(macOS GH#774)
+
+  RCTBridge *bridge = _bridge;
+  if (bridge) {
+    view = [bridge.uiManager viewForReactTag:reactTag];
+  }
+
+  if (view == nil && _bridgelessComponentViewProvider) {
+    view = _bridgelessComponentViewProvider(reactTag);
+  }
+
+  return view;
+}
+
+@end
diff --git a/React/Base/Surface/RCTSurfaceStage.h b/React/Base/Surface/RCTSurfaceStage.h
index 4089a245700526..c0a03820b5942a 100644
--- a/React/Base/Surface/RCTSurfaceStage.h
+++ b/React/Base/Surface/RCTSurfaceStage.h
@@ -23,17 +23,12 @@ typedef NS_OPTIONS(NSInteger, RCTSurfaceStage) {
   RCTSurfaceStageSurfaceDidStop = 1 << 7, // Surface stopped
 
   // Most of the previously existed stages make no sense in the new architecture;
-  // now Surface exposes only three simple stages:
-  //
-  // Surface object was constructed and still valid.
-  RCTSurfaceStageInitialized = RCTSurfaceStageSurfaceDidInitialize,
-  // Surface was started.
-  RCTSurfaceStageStarted = 1 << 8,
-  // All off-main-thread work is done; we are ready to mount the UI.
-  RCTSurfaceStagePrepared = RCTSurfaceStageBridgeDidLoad | RCTSurfaceStageModuleDidLoad | RCTSurfaceStageSurfaceDidRun |
-      RCTSurfaceStageSurfaceDidInitialRendering | RCTSurfaceStageSurfaceDidInitialLayout,
-  // All main-thread work is done, the UI was mounted.
-  RCTSurfaceStageMounted = RCTSurfaceStageSurfaceDidInitialMounting,
+  // now Surface exposes only two simple stages:
+  RCTSurfaceStagePreparing = RCTSurfaceStageSurfaceDidInitialize | RCTSurfaceStageBridgeDidLoad |
+      RCTSurfaceStageModuleDidLoad,
+  RCTSurfaceStageRunning = RCTSurfaceStagePreparing | RCTSurfaceStageSurfaceDidRun |
+      RCTSurfaceStageSurfaceDidInitialRendering | RCTSurfaceStageSurfaceDidInitialLayout |
+      RCTSurfaceStageSurfaceDidInitialMounting,
 };
 
 /**
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
index 32c43d6ec1b4a5..a9b0d2aa2d11e5 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
@@ -35,6 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL passThroughTouches;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDelay;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
+@property (nonatomic, assign) CGSize minimumSize;
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
index 3abf5c95c51e7c..146f2719b5721a 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
@@ -61,6 +61,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTSurfaceHostingProxyRootView init]", nil);
 
   _bridge = bridge;
+  _minimumSize = CGSizeZero;
 
   if (!bridge.isLoading) {
     [bridge.performanceLogger markStartForTag:RCTPLTTI];
@@ -75,6 +76,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   [surface start];
   if (self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
     self.backgroundColor = [RCTUIColor whiteColor]; // TODO(macOS GH#774)
+    // Nothing specific to do.
   }
 
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
@@ -172,6 +174,15 @@ - (UIViewController *)reactViewController
   return _reactViewController ?: [super reactViewController];
 }
 
+- (void)setMinimumSize:(CGSize)minimumSize
+{
+  if (!CGSizeEqualToSize(minimumSize, CGSizeZero)) {
+    // TODO (T93859532): Investigate implementation for this.
+    RCTLogError(@"RCTSurfaceHostingProxyRootView does not support changing the deprecated minimumSize");
+  }
+  _minimumSize = CGSizeZero;
+}
+
 #pragma mark unsupported
 
 - (void)cancelTouches
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index 78252f521897ba..e13556713284bb 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -60,6 +60,9 @@ - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
     _surface.delegate = self;
     _stage = surface.stage;
     [self _updateViews];
+
+    // For backward compatibility with RCTRootView, set a color here instead of transparent (OS default).
+    self.backgroundColor = [RCTUIColor whiteColor];
   }
 
   return self;
diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
index 1ef37f2d209f3e..130dd99cf731f6 100644
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@@ -1,4 +1,4 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_preprocessor_flags_for_build_mode")
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode")
 load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_apple_library", "rn_extra_build_flags")
 load(
     "@fbsource//xplat/configurations/buck/apple/plugins/sad_xplat_hosted_configurations:react_module_registration.bzl",
@@ -14,6 +14,7 @@ rn_apple_library(
         ],
     ),
     exported_headers = glob(["**/*.h"]),
+    autoglob = False,
     compiler_flags = [
         "-Wno-error=unguarded-availability-new",
         "-Wno-unknown-warning-option",
@@ -122,15 +123,15 @@ rn_apple_library(
             native_class_func = "RCTEventDispatcherCls",
         ),
     plugins_header = "FBCoreModulesPlugins.h",
-    preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
         "-DRN_DISABLE_OSS_PLUGIN_HEADER",
     ],
     reexport_all_header_dependencies = True,
     visibility = ["PUBLIC"],
     exported_deps = [
-        "//xplat/js:RCTLinkingApple",
-        "//xplat/js:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
         "//xplat/js/react-native-github:ReactInternalApple",
-        "//xplat/js/react-native-github/Libraries:generated_objcpp_modules-FBReactNativeSpecApple",
     ],
 )
diff --git a/React/CoreModules/CoreModulesPlugins.mm b/React/CoreModules/CoreModulesPlugins.mm
index e0b7533c4e3b9d..1b89493eca2468 100644
--- a/React/CoreModules/CoreModulesPlugins.mm
+++ b/React/CoreModules/CoreModulesPlugins.mm
@@ -17,7 +17,8 @@
 #import <unordered_map>
 
 Class RCTCoreModulesClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
 #if !TARGET_OS_OSX // TODO(macOS) = Do we need these?
     {"AccessibilityManager", RCTAccessibilityManagerCls},
     {"Appearance", RCTAppearanceCls},
@@ -51,8 +52,8 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"EventDispatcher", RCTEventDispatcherCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }
diff --git a/React/CoreModules/RCTAccessibilityManager.mm b/React/CoreModules/RCTAccessibilityManager.mm
index 585edaa825b80d..9a51600a20be8a 100644
--- a/React/CoreModules/RCTAccessibilityManager.mm
+++ b/React/CoreModules/RCTAccessibilityManager.mm
@@ -30,7 +30,8 @@ @interface RCTAccessibilityManager () <NativeAccessibilityManagerSpec>
 
 @implementation RCTAccessibilityManager
 
-@synthesize bridge = _bridge;
+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+@synthesize moduleRegistry = _moduleRegistry;
 @synthesize multipliers = _multipliers;
 
 RCT_EXPORT_MODULE()
@@ -83,7 +84,7 @@ - (instancetype)init
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(voiceVoiceOverStatusDidChange:)
-                                                 name:UIAccessibilityVoiceOverStatusChanged
+                                                 name:UIAccessibilityVoiceOverStatusDidChangeNotification
                                                object:nil];
 
     self.contentSizeCategory = RCTSharedApplication().preferredContentSizeCategory;
@@ -113,7 +114,7 @@ - (void)accessibilityAnnouncementDidFinish:(__unused NSNotification *)notificati
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [_bridge.eventDispatcher sendDeviceEventWithName:@"announcementFinished" body:response];
+  [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"announcementFinished" body:response];
 #pragma clang diagnostic pop
 }
 
@@ -124,7 +125,8 @@ - (void)boldTextStatusDidChange:(__unused NSNotification *)notification
     _isBoldTextEnabled = newBoldTextEnabled;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"boldTextChanged" body:@(_isBoldTextEnabled)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"boldTextChanged"
+                                                                          body:@(_isBoldTextEnabled)];
 #pragma clang diagnostic pop
   }
 }
@@ -136,7 +138,8 @@ - (void)grayscaleStatusDidChange:(__unused NSNotification *)notification
     _isGrayscaleEnabled = newGrayscaleEnabled;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"grayscaleChanged" body:@(_isGrayscaleEnabled)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"grayscaleChanged"
+                                                                          body:@(_isGrayscaleEnabled)];
 #pragma clang diagnostic pop
   }
 }
@@ -148,7 +151,8 @@ - (void)invertColorsStatusDidChange:(__unused NSNotification *)notification
     _isInvertColorsEnabled = newInvertColorsEnabled;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"invertColorsChanged" body:@(_isInvertColorsEnabled)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"invertColorsChanged"
+                                                                          body:@(_isInvertColorsEnabled)];
 #pragma clang diagnostic pop
   }
 }
@@ -160,7 +164,8 @@ - (void)reduceMotionStatusDidChange:(__unused NSNotification *)notification
     _isReduceMotionEnabled = newReduceMotionEnabled;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"reduceMotionChanged" body:@(_isReduceMotionEnabled)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"reduceMotionChanged"
+                                                                          body:@(_isReduceMotionEnabled)];
 #pragma clang diagnostic pop
   }
 }
@@ -172,7 +177,8 @@ - (void)reduceTransparencyStatusDidChange:(__unused NSNotification *)notificatio
     _isReduceTransparencyEnabled = newReduceTransparencyEnabled;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"reduceTransparencyChanged" body:@(_isReduceTransparencyEnabled)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"reduceTransparencyChanged"
+                                                                          body:@(_isReduceTransparencyEnabled)];
 #pragma clang diagnostic pop
   }
 }
@@ -184,7 +190,8 @@ - (void)voiceVoiceOverStatusDidChange:(__unused NSNotification *)notification
     _isVoiceOverEnabled = newIsVoiceOverEnabled;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"screenReaderChanged" body:@(_isVoiceOverEnabled)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"screenReaderChanged"
+                                                                          body:@(_isVoiceOverEnabled)];
 #pragma clang diagnostic pop
   }
 }
@@ -280,7 +287,7 @@ static void setMultipliers(
 RCT_EXPORT_METHOD(setAccessibilityFocus : (double)reactTag)
 {
   dispatch_async(dispatch_get_main_queue(), ^{
-    UIView *view = [self.bridge.uiManager viewForReactTag:@(reactTag)];
+    UIView *view = [self.viewRegistry_DEPRECATED viewForReactTag:@(reactTag)];
     UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, view);
   });
 }
diff --git a/React/CoreModules/RCTActionSheetManager.mm b/React/CoreModules/RCTActionSheetManager.mm
index f55a8bf0c1506c..282566207f95eb 100644
--- a/React/CoreModules/RCTActionSheetManager.mm
+++ b/React/CoreModules/RCTActionSheetManager.mm
@@ -43,7 +43,7 @@ @implementation RCTActionSheetManager {
 
 RCT_EXPORT_MODULE()
 
-@synthesize bridge = _bridge;
+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
 
 - (dispatch_queue_t)methodQueue
 {
@@ -59,7 +59,7 @@ - (void)presentViewController:(UIViewController *)alertController
   UIView *sourceView = parentViewController.view;
 
   if (anchorViewTag) {
-    sourceView = [self.bridge.uiManager viewForReactTag:anchorViewTag];
+    sourceView = [self.viewRegistry_DEPRECATED viewForReactTag:anchorViewTag];
   } else {
     alertController.popoverPresentationController.permittedArrowDirections = 0;
   }
@@ -91,9 +91,15 @@ - (void)presentViewController:(UIViewController *)alertController
   NSArray<NSString *> *buttons = RCTConvertOptionalVecToArray(options.options(), ^id(NSString *element) {
     return element;
   });
+  NSArray<NSNumber *> *disabledButtonIndices;
   NSInteger cancelButtonIndex =
       options.cancelButtonIndex() ? [RCTConvert NSInteger:@(*options.cancelButtonIndex())] : -1;
   NSArray<NSNumber *> *destructiveButtonIndices;
+  if (options.disabledButtonIndices()) {
+    disabledButtonIndices = RCTConvertVecToArray(*options.disabledButtonIndices(), ^id(double element) {
+      return @(element);
+    });
+  }
   if (options.destructiveButtonIndices()) {
     destructiveButtonIndices = RCTConvertVecToArray(*options.destructiveButtonIndices(), ^id(double element) {
       return @(element);
@@ -112,15 +118,17 @@ - (void)presentViewController:(UIViewController *)alertController
   UIColor *tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];
 
   if (controller == nil) {
-    RCTLogError(@"Tried to display action sheet but there is no application window. options: %@", @{ /*  // [ TODO(macOS GH#774): nil check our dict values before inserting them or we may crash */
-      @"title" : title ?: [NSNull null],
-      @"message" : message ?: [NSNull null],
-      @"options" : buttons ?: [NSNull null],
-      @"cancelButtonIndex" : @(cancelButtonIndex),
-      @"destructiveButtonIndices" : destructiveButtonIndices ?: [NSNull null],
-      @"anchor" : anchor ?: [NSNull null],
-      @"tintColor" : tintColor ?: [NSNull null],
-    }); /*  // TODO(macOS GH#774): nil check our dict values before inserting them or we may crash ] */
+    RCTLogError(
+        @"Tried to display action sheet but there is no application window. options: %@", @{ /*  // [ TODO(macOS GH#774): nil check our dict values before inserting them or we may crash */
+          @"title" : title ?: [NSNull null],
+          @"message" : message ?: [NSNull null],
+          @"options" : buttons ?: [NSNull null],
+          @"cancelButtonIndex" : @(cancelButtonIndex),
+          @"destructiveButtonIndices" : destructiveButtonIndices ?: [NSNull null],
+          @"anchor" : anchor ?: [NSNull null],
+          @"tintColor" : tintColor ?: [NSNull null],
+          @"disabledButtonIndices" : disabledButtonIndices ?: [NSNull null],
+        }); /*  // TODO(macOS GH#774): nil check our dict values before inserting them or we may crash ] */
     return;
   }
 #endif // TODO(macOS GH#774)
@@ -155,6 +163,20 @@ - (void)presentViewController:(UIViewController *)alertController
     index++;
   }
 
+  if (disabledButtonIndices) {
+    for (NSNumber *disabledButtonIndex in disabledButtonIndices) {
+      if ([disabledButtonIndex integerValue] < buttons.count) {
+        [alertController.actions[[disabledButtonIndex integerValue]] setEnabled:false];
+      } else {
+        RCTLogError(
+            @"Index %@ from `disabledButtonIndices` is out of bounds. Maximum index value is %@.",
+            @([disabledButtonIndex integerValue]),
+            @(buttons.count - 1));
+        return;
+      }
+    }
+  }
+
   alertController.view.tintColor = tintColor;
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
diff --git a/React/CoreModules/RCTAlertController.h b/React/CoreModules/RCTAlertController.h
index 77088a4bfb9046..e49889cbcb7646 100644
--- a/React/CoreModules/RCTAlertController.h
+++ b/React/CoreModules/RCTAlertController.h
@@ -15,6 +15,7 @@
 
 #if !TARGET_OS_OSX // [TODO(macOS GH#774)
 - (void)show:(BOOL)animated completion:(void (^)(void))completion;
+- (void)hide;
 #endif // ]TODO(macOS GH#774)
 
 @end
diff --git a/React/CoreModules/RCTAlertController.m b/React/CoreModules/RCTAlertController.m
index 85551507345493..daf32a394dd272 100644
--- a/React/CoreModules/RCTAlertController.m
+++ b/React/CoreModules/RCTAlertController.m
@@ -44,6 +44,11 @@ - (void)show:(BOOL)animated completion:(void (^)(void))completion
   }
   // TODO(macOS GH#774)]
 }
+
+- (void)hide
+{
+  _alertWindow = nil;
+}
 #endif // ]TODO(macOS GH#774)
 
 @end
diff --git a/React/CoreModules/RCTAlertManager.mm b/React/CoreModules/RCTAlertManager.mm
index 6ea41358decc75..cdadecb64394a2 100644
--- a/React/CoreModules/RCTAlertManager.mm
+++ b/React/CoreModules/RCTAlertManager.mm
@@ -177,6 +177,7 @@ - (void)invalidate
                                   case RCTAlertViewStylePlainTextInput:
                                   case RCTAlertViewStyleSecureTextInput:
                                     callback(@[ buttonKey, [weakAlertController.textFields.firstObject text] ]);
+                                    [weakAlertController hide];
                                     break;
                                   case RCTAlertViewStyleLoginAndPasswordInput: {
                                     NSDictionary<NSString *, NSString *> *loginCredentials = @{
@@ -184,10 +185,12 @@ - (void)invalidate
                                       @"password" : [weakAlertController.textFields.lastObject text]
                                     };
                                     callback(@[ buttonKey, loginCredentials ]);
+                                    [weakAlertController hide];
                                     break;
                                   }
                                   case RCTAlertViewStyleDefault:
                                     callback(@[ buttonKey ]);
+                                    [weakAlertController hide];
                                     break;
                                 }
                               }]];
diff --git a/React/CoreModules/RCTAsyncLocalStorage.mm b/React/CoreModules/RCTAsyncLocalStorage.mm
index 0fe1c714c27df1..6429f296ee2de2 100644
--- a/React/CoreModules/RCTAsyncLocalStorage.mm
+++ b/React/CoreModules/RCTAsyncLocalStorage.mm
@@ -330,7 +330,11 @@ - (NSDictionary *)_writeEntry:(NSArray<NSString *> *)entry changedManifest:(BOOL
   if (errorOut) {
     return errorOut;
   }
+  if (![entry[1] isKindOfClass:[NSString class]]) {
+    return RCTMakeAndLogError(@"Invalid value for entry - must be a string. Got entry: ", entry, nil);
+  }
   NSString *value = entry[1];
+
   NSString *filePath = [self _filePathForKey:key];
   NSError *error;
   if (value.length <= RCTInlineValueThreshold) {
diff --git a/React/CoreModules/RCTDevLoadingView.mm b/React/CoreModules/RCTDevLoadingView.mm
index f340d1806da07d..427620e7802d37 100644
--- a/React/CoreModules/RCTDevLoadingView.mm
+++ b/React/CoreModules/RCTDevLoadingView.mm
@@ -16,9 +16,6 @@
 #import <React/RCTDefines.h>
 #import <React/RCTDevSettings.h> // TODO(OSS Candidate ISS#2710739)
 #import <React/RCTDevLoadingViewSetEnabled.h>
-#if !TARGET_OS_OSX
-#import <React/RCTModalHostViewController.h>
-#endif // !TARGET_OS_OSX
 #import <React/RCTUtils.h>
 #import <React/RCTUIKit.h> // TODO(macOS GH#774)
 
@@ -44,36 +41,33 @@ @implementation RCTDevLoadingView {
   dispatch_block_t _initialMessageBlock;
 }
 
-@synthesize bridge = _bridge;
+@synthesize bundleManager = _bundleManager;
 
 RCT_EXPORT_MODULE()
 
-+ (void)setEnabled:(BOOL)enabled
+- (instancetype)init
 {
-  RCTDevLoadingViewSetEnabled(enabled);
+  if (self = [super init]) {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(hide)
+                                                 name:RCTJavaScriptDidLoadNotification
+                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(hide)
+                                                 name:RCTJavaScriptDidFailToLoadNotification
+                                               object:nil];
+  }
+  return self;
 }
 
-+ (BOOL)requiresMainQueueSetup
++ (void)setEnabled:(BOOL)enabled
 {
-  return YES;
+  RCTDevLoadingViewSetEnabled(enabled);
 }
 
-- (void)setBridge:(RCTBridge *)bridge
++ (BOOL)requiresMainQueueSetup
 {
-  _bridge = bridge;
-
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(hide)
-                                               name:RCTJavaScriptDidLoadNotification
-                                             object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(hide)
-                                               name:RCTJavaScriptDidFailToLoadNotification
-                                             object:nil];
-
-  if (bridge.loading) {
-    [self showWithURL:bridge.bundleURL];
-  }
+  return NO;
 }
 
 - (void)clearInitialMessageDelay
@@ -114,11 +108,12 @@ - (RCTUIColor *)dimColor:(RCTUIColor *)c
 
 - (NSString *)getTextForHost
 {
-  if (self->_bridge.bundleURL == nil || self->_bridge.bundleURL.fileURL) {
+  NSURL *bundleURL = _bundleManager.bundleURL;
+  if (bundleURL == nil || bundleURL.fileURL) {
     return @"React Native";
   }
 
-  return [NSString stringWithFormat:@"%@:%@", self->_bridge.bundleURL.host, self->_bridge.bundleURL.port];
+  return [NSString stringWithFormat:@"%@:%@", bundleURL.host, bundleURL.port];
 }
 
 - (void)showMessage:(NSString *)message color:(RCTUIColor *)color backgroundColor:(RCTUIColor *)backgroundColor // TODO(OSS Candidate ISS#2710739)
diff --git a/React/CoreModules/RCTDevMenu.h b/React/CoreModules/RCTDevMenu.h
index ae6ee013d790ca..00c4025af46d92 100644
--- a/React/CoreModules/RCTDevMenu.h
+++ b/React/CoreModules/RCTDevMenu.h
@@ -34,11 +34,6 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
  */
 @property (nonatomic, assign) BOOL profilingEnabled DEPRECATED_ATTRIBUTE;
 
-/**
- * Deprecated, use RCTDevSettings instead.
- */
-@property (nonatomic, assign) BOOL liveReloadEnabled DEPRECATED_ATTRIBUTE;
-
 /**
  * Deprecated, use RCTDevSettings instead.
  */
diff --git a/React/CoreModules/RCTDevMenu.mm b/React/CoreModules/RCTDevMenu.mm
index 24e08980161757..6a505635478740 100644
--- a/React/CoreModules/RCTDevMenu.mm
+++ b/React/CoreModules/RCTDevMenu.mm
@@ -113,6 +113,9 @@ @implementation RCTDevMenu {
 }
 
 @synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
+@synthesize callableJSModules = _callableJSModules;
+@synthesize bundleManager = _bundleManager;
 
 RCT_EXPORT_MODULE()
 
@@ -153,14 +156,16 @@ - (instancetype)init
     [commands registerKeyCommandWithInput:@"i"
                             modifierFlags:UIKeyModifierCommand
                                    action:^(__unused UIKeyCommand *command) {
-                                     [weakSelf.bridge.devSettings toggleElementInspector];
+                                     [(RCTDevSettings *)[weakSelf.moduleRegistry moduleForName:"DevSettings"]
+                                         toggleElementInspector];
                                    }];
 
     // Reload in normal mode
     [commands registerKeyCommandWithInput:@"n"
                             modifierFlags:UIKeyModifierCommand
                                    action:^(__unused UIKeyCommand *command) {
-                                     [weakSelf.bridge.devSettings setIsDebuggingRemotely:NO];
+                                     [(RCTDevSettings *)[weakSelf.moduleRegistry moduleForName:"DevSettings"]
+                                         setIsDebuggingRemotely:NO];
                                    }];
 #endif
   }
@@ -184,8 +189,14 @@ - (void)invalidate
 
 - (void)showOnShake
 {
-  if ([_bridge.devSettings isShakeToShowDevMenuEnabled]) {
-    [self show];
+  if ([((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]) isShakeToShowDevMenuEnabled]) {
+    for (RCTPlatformWindow *window in [RCTSharedApplication() windows]) {
+      NSString *recursiveDescription = [window valueForKey:@"recursiveDescription"];
+      if ([recursiveDescription containsString:@"RCTView"]) {
+        [self show];
+        return;
+      }
+    }
   }
 }
 
@@ -221,8 +232,8 @@ - (void)addItem:(RCTDevMenuItem *)item
 - (void)setDefaultJSBundle
 {
   [[RCTBundleURLProvider sharedSettings] resetToDefaults];
-  self->_bridge.bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForFallbackResource:nil
-                                                                                fallbackExtension:nil];
+  self->_bundleManager.bundleURL = [[RCTBundleURLProvider sharedSettings] jsBundleURLForFallbackResource:nil
+                                                                                       fallbackExtension:nil];
   RCTTriggerReloadCommandListeners(@"Dev menu - reset to default");
 }
 
@@ -231,9 +242,9 @@ - (void)setDefaultJSBundle
   NSMutableArray<RCTDevMenuItem *> *items = [NSMutableArray new];
 
   // Add built-in items
-  __weak RCTBridge *bridge = _bridge;
-  __weak RCTDevSettings *devSettings = _bridge.devSettings;
+  __weak RCTDevSettings *devSettings = [_moduleRegistry moduleForName:"DevSettings"];
   __weak RCTDevMenu *weakSelf = self;
+  __weak RCTBundleManager *bundleManager = _bundleManager;
 
   [items addObject:[RCTDevMenuItem buttonItemWithTitle:@"Reload"
                                                handler:^{
@@ -246,12 +257,6 @@ - (void)setDefaultJSBundle
       // For on-device debugging we link out to Flipper.
       // Since we're assuming Flipper is available, also include the DevTools.
       // Note: For parity with the Android code.
-
-      // Reset the old debugger setting so no one gets stuck.
-      // TODO: Remove in a few weeks.
-      if (devSettings.isDebuggingRemotely) {
-        devSettings.isDebuggingRemotely = false;
-      }
       [items addObject:[RCTDevMenuItem
                            buttonItemWithTitleBlock:^NSString * {
                              return @"Open Debugger";
@@ -259,7 +264,7 @@ - (void)setDefaultJSBundle
                            handler:^{
                              [RCTInspectorDevServerHelper
                                           openURL:@"flipper://null/Hermesdebuggerrn?device=React%20Native"
-                                    withBundleURL:bridge.bundleURL
+                                    withBundleURL:bundleManager.bundleURL
                                  withErrorMessage:@"Failed to open Flipper. Please check that Metro is runnning."];
                            }]];
 
@@ -270,7 +275,7 @@ - (void)setDefaultJSBundle
                            handler:^{
                              [RCTInspectorDevServerHelper
                                           openURL:@"flipper://null/React?device=React%20Native"
-                                    withBundleURL:bridge.bundleURL
+                                    withBundleURL:bundleManager.bundleURL
                                  withErrorMessage:@"Failed to open Flipper. Please check that Metro is runnning."];
                            }]];
     } else if (devSettings.isRemoteDebuggingAvailable) {
@@ -343,49 +348,6 @@ - (void)setDefaultJSBundle
                          }]];
   }
 
-  if (devSettings.isLiveReloadAvailable) {
-    [items addObject:[RCTDevMenuItem
-                         buttonItemWithTitleBlock:^NSString * {
-                           return devSettings.isDebuggingRemotely
-                               ? @"Systrace Unavailable"
-                               : devSettings.isProfilingEnabled ? @"Stop Systrace" : @"Start Systrace";
-                         }
-                         handler:^{
-                           if (devSettings.isDebuggingRemotely) {
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
-                             UIAlertController *alertController =
-                                 [UIAlertController alertControllerWithTitle:@"Systrace Unavailable"
-                                                                     message:@"Stop debugging to enable Systrace."
-                                                              preferredStyle:UIAlertControllerStyleAlert];
-                             __weak __typeof__(alertController) weakAlertController = alertController;
-                             [alertController
-                                 addAction:[UIAlertAction actionWithTitle:@"OK"
-                                                                    style:UIAlertActionStyleDefault
-                                                                  handler:^(__unused UIAlertAction *action) {
-                                                                    [weakAlertController
-                                                                        dismissViewControllerAnimated:YES
-                                                                                           completion:nil];
-                                                                  }]];
-                             [RCTPresentedViewController() presentViewController:alertController
-                                                                        animated:YES
-                                                                      completion:NULL];
-#else // [TODO(macOS GH#774)
-                              NSAlert *alert = [[NSAlert alloc] init];
-                              [alert setMessageText:@"Systrace Unavailable"];
-                              [alert setInformativeText:@"You need to stop remote JS debugging to enable Systrace"];
-                              [alert addButtonWithTitle:@"OK"];
-                              [alert setAlertStyle:NSWarningAlertStyle];
-                              [alert beginSheetModalForWindow:[NSApp keyWindow] completionHandler:nil];
-#endif // ]TODO(macOS GH#774)
-                           } else {
-                             devSettings.isProfilingEnabled = !devSettings.isProfilingEnabled;
-                           }
-                         }]];
-    // "Live reload" which refreshes on every edit was removed in favor of "Fast Refresh".
-    // While native code for "Live reload" is still there, please don't add the option back.
-    // See D15958697 for more context.
-  }
-
   [items
       addObject:[RCTDevMenuItem
                     buttonItemWithTitleBlock:^NSString * {
@@ -429,16 +391,15 @@ - (void)setDefaultJSBundle
                                                   }
                                                   [RCTBundleURLProvider sharedSettings].jsLocation = [NSString
                                                       stringWithFormat:@"%@:%d", ipTextField.text, portNumber.intValue];
-                                                  __strong RCTBridge *strongBridge = bridge;
-                                                  if (strongBridge) {
-                                                    NSURL *bundleURL = bundleRoot.length
-                                                        ? [[RCTBundleURLProvider sharedSettings]
-                                                              jsBundleURLForBundleRoot:bundleRoot
-                                                                      fallbackResource:nil]
-                                                        : [strongBridge.delegate sourceURLForBridge:strongBridge];
-                                                    strongBridge.bundleURL = bundleURL;
-                                                    RCTTriggerReloadCommandListeners(@"Dev menu - apply changes");
+                                                  if (bundleRoot.length == 0) {
+                                                    [bundleManager resetBundleURL];
+                                                  } else {
+                                                    bundleManager.bundleURL = [[RCTBundleURLProvider sharedSettings]
+                                                        jsBundleURLForBundleRoot:bundleRoot
+                                                                fallbackResource:nil];
                                                   }
+
+                                                  RCTTriggerReloadCommandListeners(@"Dev menu - apply changes");
                                                 }]];
                       [alertController addAction:[UIAlertAction actionWithTitle:@"Reset to Default"
                                                                           style:UIAlertActionStyleDefault
@@ -468,7 +429,7 @@ - (void)setDefaultJSBundle
 RCT_EXPORT_METHOD(show)
 {
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
-  if (_actionSheet || !_bridge || RCTRunningInAppExtension()) {
+  if (_actionSheet || RCTRunningInAppExtension()) {
     return;
   }
 
@@ -480,9 +441,11 @@ - (void)setDefaultJSBundle
   UIAlertControllerStyle style = [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone
       ? UIAlertControllerStyleActionSheet
       : UIAlertControllerStyleAlert;
-  _actionSheet = [UIAlertController alertControllerWithTitle:@"React Native Debug Menu"
-                                                     message:description
-                                              preferredStyle:style];
+
+  NSString *debugMenuType = self.bridge ? @"Bridge" : @"Bridgeless";
+  NSString *debugMenuTitle = [NSString stringWithFormat:@"React Native Debug Menu (%@)", debugMenuType];
+
+  _actionSheet = [UIAlertController alertControllerWithTitle:debugMenuTitle message:description preferredStyle:style];
 
   NSArray<RCTDevMenuItem *> *items = [self _menuItemsToPresent];
   for (RCTDevMenuItem *item in items) {
@@ -505,7 +468,7 @@ - (void)setDefaultJSBundle
   [NSMenu popUpContextMenu:menu withEvent:event forView:[window contentView]];
 #endif // ]TODO(macOS GH#774)
 
-  [_bridge enqueueJSCall:@"RCTNativeAppEventEmitter" method:@"emit" args:@[ @"RCTDevMenuShown" ] completion:NULL];
+  [_callableJSModules invokeModule:@"RCTNativeAppEventEmitter" method:@"emit" withArgs:@[ @"RCTDevMenuShown" ]];
 }
 
 #if TARGET_OS_OSX // [TODO(macOS GH#774)
@@ -576,12 +539,12 @@ - (RCTDevMenuAlertActionHandler)alertActionHandlerForDevItem:(RCTDevMenuItem *__
 
 - (void)setShakeToShow:(BOOL)shakeToShow
 {
-  _bridge.devSettings.isShakeToShowDevMenuEnabled = shakeToShow;
+  ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isShakeToShowDevMenuEnabled = shakeToShow;
 }
 
 - (BOOL)shakeToShow
 {
-  return _bridge.devSettings.isShakeToShowDevMenuEnabled;
+  return ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isShakeToShowDevMenuEnabled;
 }
 
 RCT_EXPORT_METHOD(reload)
@@ -593,29 +556,29 @@ - (BOOL)shakeToShow
 RCT_EXPORT_METHOD(debugRemotely : (BOOL)enableDebug)
 {
   WARN_DEPRECATED_DEV_MENU_EXPORT();
-  _bridge.devSettings.isDebuggingRemotely = enableDebug;
+  ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isDebuggingRemotely = enableDebug;
 }
 
 RCT_EXPORT_METHOD(setProfilingEnabled : (BOOL)enabled)
 {
   WARN_DEPRECATED_DEV_MENU_EXPORT();
-  _bridge.devSettings.isProfilingEnabled = enabled;
+  ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isProfilingEnabled = enabled;
 }
 
 - (BOOL)profilingEnabled
 {
-  return _bridge.devSettings.isProfilingEnabled;
+  return ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isProfilingEnabled;
 }
 
 RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
 {
   WARN_DEPRECATED_DEV_MENU_EXPORT();
-  _bridge.devSettings.isHotLoadingEnabled = enabled;
+  ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isHotLoadingEnabled = enabled;
 }
 
 - (BOOL)hotLoadingEnabled
 {
-  return _bridge.devSettings.isHotLoadingEnabled;
+  return ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isHotLoadingEnabled;
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
diff --git a/React/CoreModules/RCTDevSettings.h b/React/CoreModules/RCTDevSettings.h
index 98848cafd4aa55..660b7676402aaa 100644
--- a/React/CoreModules/RCTDevSettings.h
+++ b/React/CoreModules/RCTDevSettings.h
@@ -8,6 +8,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTDefines.h>
 #import <React/RCTEventEmitter.h>
+#import <React/RCTInitializing.h>
 
 @protocol RCTPackagerClientMethod;
 
@@ -37,12 +38,21 @@
 
 @end
 
-@interface RCTDevSettings : RCTEventEmitter
+@protocol RCTDevSettingsInspectable <NSObject>
+
+/**
+ * Whether current jsi::Runtime is inspectable.
+ * Only set when using as a bridgeless turbo module.
+ */
+@property (nonatomic, assign, readwrite) BOOL isInspectable;
+
+@end
+
+@interface RCTDevSettings : RCTEventEmitter <RCTInitializing>
 
 - (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource;
 
 @property (nonatomic, readonly) BOOL isHotLoadingAvailable;
-@property (nonatomic, readonly) BOOL isLiveReloadAvailable;
 @property (nonatomic, readonly) BOOL isRemoteDebuggingAvailable;
 @property (nonatomic, readonly) BOOL isDeviceDebuggingAvailable;
 @property (nonatomic, readonly) BOOL isJSCSamplingProfilerAvailable;
diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm
index a576c7809d2ac4..a444e427a0e14b 100644
--- a/React/CoreModules/RCTDevSettings.mm
+++ b/React/CoreModules/RCTDevSettings.mm
@@ -12,14 +12,14 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridgeModule.h>
+#import <React/RCTDevMenu.h>
 #import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTProfile.h>
 #import <React/RCTReloadCommand.h>
 #import <React/RCTUtils.h>
 #import <React/RCTBundleURLProvider.h> // TODO(macOS GH#774)
-
-#import <React/RCTDevMenu.h>
+#import <atomic>
 
 #import "CoreModulesPlugins.h"
 
@@ -128,10 +128,15 @@ - (void)_reloadWithDefaults:(NSDictionary *)defaultValues
 
 @end
 
-@interface RCTDevSettings () <RCTBridgeModule, RCTInvalidating, NativeDevSettingsSpec> {
+#if ENABLE_PACKAGER_CONNECTION
+static RCTHandlerToken reloadToken;
+static std::atomic<int> numInitializedModules{0};
+#endif
+
+@interface RCTDevSettings () <RCTBridgeModule, RCTInvalidating, NativeDevSettingsSpec, RCTDevSettingsInspectable> {
   BOOL _isJSLoaded;
 #if ENABLE_PACKAGER_CONNECTION
-  RCTHandlerToken _reloadToken;
+  RCTHandlerToken _bridgeExecutorOverrideToken;
 #endif
 }
 
@@ -142,6 +147,9 @@ @interface RCTDevSettings () <RCTBridgeModule, RCTInvalidating, NativeDevSetting
 
 @implementation RCTDevSettings
 
+@synthesize isInspectable = _isInspectable;
+@synthesize bundleManager = _bundleManager;
+
 RCT_EXPORT_MODULE()
 
 - (instancetype)init
@@ -174,38 +182,54 @@ - (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource
                                              selector:@selector(jsLoaded:)
                                                  name:RCTJavaScriptDidLoadNotification
                                                object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(jsLoaded:)
+                                                 name:@"RCTInstanceDidLoadBundle"
+                                               object:nil];
   }
   return self;
 }
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  [super setBridge:bridge];
-
 #if DEBUG && ENABLE_PACKAGER_CONNECTION // TODO(OSS Candidate ISS#2710739)
-  RCTBridge *__weak weakBridge = bridge;
-  _reloadToken = [[RCTPackagerConnection sharedPackagerConnection]
-      addNotificationHandler:^(id params) {
-        if (params != (id)kCFNull && [params[@"debug"] boolValue]) {
-          weakBridge.executorClass = objc_lookUpClass("RCTWebSocketExecutor");
+  if (self.bridge) {
+    RCTBridge *__weak weakBridge = self.bridge;
+    _bridgeExecutorOverrideToken = [[RCTPackagerConnection sharedPackagerConnection]
+        addNotificationHandler:^(id params) {
+          if (params != (id)kCFNull && [params[@"debug"] boolValue]) {
+            weakBridge.executorClass = objc_lookUpClass("RCTWebSocketExecutor");
+          }
         }
-        RCTTriggerReloadCommandListeners(@"Global hotkey");
-      }
-                       queue:dispatch_get_main_queue()
-                   forMethod:@"reload"];
+                         queue:dispatch_get_main_queue()
+                     forMethod:@"reload"];
+  }
+
+  if (numInitializedModules++ == 0) {
+    reloadToken = [[RCTPackagerConnection sharedPackagerConnection]
+        addNotificationHandler:^(id params) {
+          RCTTriggerReloadCommandListeners(@"Global hotkey");
+        }
+                         queue:dispatch_get_main_queue()
+                     forMethod:@"reload"];
+  }
 #endif
 
 #if RCT_ENABLE_INSPECTOR && !TARGET_OS_UIKITFORMAC && DEBUG // TODO(OSS Candidate ISS#2710739)
-  // We need this dispatch to the main thread because the bridge is not yet
-  // finished with its initialisation. By the time it relinquishes control of
-  // the main thread, this operation can be performed.
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [bridge
-        dispatchBlock:^{
-          [RCTInspectorDevServerHelper connectWithBundleURL:bridge.bundleURL];
-        }
-                queue:RCTJSThread];
-  });
+  if (self.bridge) {
+    // We need this dispatch to the main thread because the bridge is not yet
+    // finished with its initialisation. By the time it relinquishes control of
+    // the main thread, this operation can be performed.
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self.bridge
+          dispatchBlock:^{
+            [RCTInspectorDevServerHelper connectWithBundleURL:self.bundleManager.bundleURL];
+          }
+                  queue:RCTJSThread];
+    });
+  } else {
+    [RCTInspectorDevServerHelper connectWithBundleURL:self.bundleManager.bundleURL];
+  }
 #endif
 
   dispatch_async(dispatch_get_main_queue(), ^{
@@ -222,7 +246,13 @@ - (void)invalidate
 {
   [super invalidate];
 #if ENABLE_PACKAGER_CONNECTION
-  [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_reloadToken];
+  if (self.bridge) {
+    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_bridgeExecutorOverrideToken];
+  }
+
+  if (--numInitializedModules == 0) {
+    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:reloadToken];
+  }
 #endif
 }
 
@@ -244,7 +274,11 @@ - (id)settingForKey:(NSString *)key
 - (BOOL)isDeviceDebuggingAvailable
 {
 #if RCT_ENABLE_INSPECTOR
-  return self.bridge.isInspectable;
+  if (self.bridge) {
+    return self.bridge.isInspectable;
+  } else {
+    return self.isInspectable;
+  }
 #else
   return false;
 #endif // RCT_ENABLE_INSPECTOR
@@ -261,7 +295,10 @@ - (BOOL)isRemoteDebuggingAvailable
 
 - (BOOL)isHotLoadingAvailable
 {
-  return self.bridge.bundleURL && !self.bridge.bundleURL.fileURL; // Only works when running from server
+  if (self.bundleManager.bundleURL) {
+    return !self.bundleManager.bundleURL.fileURL;
+  }
+  return NO;
 }
 
 RCT_EXPORT_METHOD(reload)
@@ -358,9 +395,13 @@ - (void)_profilingSettingDidChange
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
       if (enabled) {
-        [self.bridge enqueueJSCall:@"HMRClient" method:@"enable" args:@[] completion:NULL];
+        if (self.callableJSModules) {
+          [self.callableJSModules invokeModule:@"HMRClient" method:@"enable" withArgs:@[]];
+        }
       } else {
-        [self.bridge enqueueJSCall:@"HMRClient" method:@"disable" args:@[] completion:NULL];
+        if (self.callableJSModules) {
+          [self.callableJSModules invokeModule:@"HMRClient" method:@"disable" withArgs:@[]];
+        }
       }
 #pragma clang diagnostic pop
     }
@@ -380,7 +421,7 @@ - (BOOL)isHotLoadingEnabled
   if (_isJSLoaded) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [self.bridge.eventDispatcher sendDeviceEventWithName:@"toggleElementInspector" body:nil];
+    [[self.moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"toggleElementInspector" body:nil];
 #pragma clang diagnostic pop
   }
 }
@@ -388,11 +429,11 @@ - (BOOL)isHotLoadingEnabled
 RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
 {
   __weak __typeof(self) weakSelf = self;
-  [self.bridge.devMenu addItem:[RCTDevMenuItem buttonItemWithTitle:title
-                                                           handler:^{
-                                                             [weakSelf sendEventWithName:@"didPressMenuItem"
-                                                                                    body:@{@"title" : title}];
-                                                           }]];
+  [(RCTDevMenu *)[self.moduleRegistry moduleForName:"DevMenu"]
+      addItem:[RCTDevMenuItem buttonItemWithTitle:title
+                                          handler:^{
+                                            [weakSelf sendEventWithName:@"didPressMenuItem" body:@{@"title" : title}];
+                                          }]];
 }
 
 - (BOOL)isElementInspectorShown
@@ -437,18 +478,16 @@ - (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSStr
 - (void)setupHMRClientWithBundleURL:(NSURL *)bundleURL
 {
   if (bundleURL && !bundleURL.fileURL) {
-    NSString *const path = [bundleURL.path substringFromIndex:1]; // Strip initial slash.
-    NSString *const host = bundleURL.host;
-    NSNumber *const port = bundleURL.port;
+    NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithURL:bundleURL resolvingAgainstBaseURL:NO];
+    NSString *const path = [urlComponents.path substringFromIndex:1]; // Strip initial slash.
+    NSString *const host = urlComponents.host;
+    NSNumber *const port = urlComponents.port;
+    NSString *const scheme = urlComponents.scheme;
     BOOL isHotLoadingEnabled = self.isHotLoadingEnabled;
-    // TODO(macOS GH#774) - we could perhaps infer the platform from the bundleURL's query parameters, instead of hardcoding
-    if (self.bridge) {
-      [self.bridge enqueueJSCall:@"HMRClient"
-                          method:@"setup"
-                            args:@[ kRCTPlatformName, path, host, RCTNullIfNil(port), @(isHotLoadingEnabled) ] // TODO(macOS GH#774)
-                      completion:NULL];
-    } else {
-      self.invokeJS(@"HMRClient", @"setup", @[ kRCTPlatformName, path, host, RCTNullIfNil(port), @(isHotLoadingEnabled) ]); // TODO(macOS GH#774)
+    if (self.callableJSModules) {
+      [self.callableJSModules invokeModule:@"HMRClient"
+                                    method:@"setup"
+                                  withArgs:@[ kRCTPlatformName, path, host, RCTNullIfNil(port), @(isHotLoadingEnabled), scheme ]]; // TODO(macOS GH#774)- we could perhaps infer the platform from the bundleURL's query parameters, instead of hardcoding
     }
   }
 }
@@ -456,13 +495,10 @@ - (void)setupHMRClientWithBundleURL:(NSURL *)bundleURL
 - (void)setupHMRClientWithAdditionalBundleURL:(NSURL *)bundleURL
 {
   if (bundleURL && !bundleURL.fileURL) { // isHotLoadingAvailable check
-    if (self.bridge) {
-      [self.bridge enqueueJSCall:@"HMRClient"
-                          method:@"registerBundle"
-                            args:@[ [bundleURL absoluteString] ]
-                      completion:NULL];
-    } else {
-      self.invokeJS(@"HMRClient", @"registerBundle", @[ [bundleURL absoluteString] ]);
+    if (self.callableJSModules) {
+      [self.callableJSModules invokeModule:@"HMRClient"
+                                    method:@"registerBundle"
+                                  withArgs:@[ [bundleURL absoluteString] ]];
     }
   }
 }
@@ -481,7 +517,10 @@ - (void)_synchronizeAllSettings
 
 - (void)jsLoaded:(NSNotification *)notification
 {
-  if (notification.userInfo[@"bridge"] != self.bridge) {
+  // In bridge mode, the bridge that sent the notif must be the same as the one stored in this module.
+  // In bridgless mode, we don't care about this.
+  if ([notification.name isEqualToString:RCTJavaScriptDidLoadNotification] &&
+      notification.userInfo[@"bridge"] != self.bridge) {
     return;
   }
 
@@ -494,7 +533,8 @@ - (void)jsLoaded:(NSNotification *)notification
     if ([self isElementInspectorShown]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      [self.bridge.eventDispatcher sendDeviceEventWithName:@"toggleElementInspector" body:nil];
+      [[self.moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"toggleElementInspector"
+                                                                                body:nil];
 #pragma clang diagnostic pop
     }
   });
@@ -521,6 +561,9 @@ - (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource
 {
   return [super init];
 }
+- (void)initialize
+{
+}
 - (BOOL)isHotLoadingAvailable
 {
   return NO;
diff --git a/React/CoreModules/RCTDevSplitBundleLoader.mm b/React/CoreModules/RCTDevSplitBundleLoader.mm
index 4a2243e17c2725..4afc2ee4fd7415 100644
--- a/React/CoreModules/RCTDevSplitBundleLoader.mm
+++ b/React/CoreModules/RCTDevSplitBundleLoader.mm
@@ -28,7 +28,7 @@ @implementation RCTDevSplitBundleLoader
 
 @synthesize bridge = _bridge;
 @synthesize loadScript = _loadScript;
-@synthesize turboModuleRegistry = _turboModuleRegistry;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -37,11 +37,6 @@ + (BOOL)requiresMainQueueSetup
   return NO;
 }
 
-- (void)setBridge:(RCTBridge *)bridge
-{
-  _bridge = bridge;
-}
-
 RCT_EXPORT_METHOD(loadBundle
                   : (NSString *)bundlePath resolve
                   : (RCTPromiseResolveBlock)resolve reject
@@ -69,7 +64,7 @@ - (void)setBridge:(RCTBridge *)bridge
           }
           __typeof(self) strongSelf = weakSelf;
           strongSelf->_loadScript(source);
-          RCTDevSettings *devSettings = [strongSelf->_turboModuleRegistry moduleForName:"RCTDevSettings"];
+          RCTDevSettings *devSettings = [strongSelf->_moduleRegistry moduleForName:"RCTDevSettings"];
           [devSettings setupHMRClientWithAdditionalBundleURL:source.url];
           resolve(@YES);
         }];
diff --git a/React/CoreModules/RCTDeviceInfo.h b/React/CoreModules/RCTDeviceInfo.h
index 56135a7fb21d63..5799be274d2d8f 100644
--- a/React/CoreModules/RCTDeviceInfo.h
+++ b/React/CoreModules/RCTDeviceInfo.h
@@ -7,9 +7,7 @@
 
 #import <React/RCTBridge.h>
 
-#if !TARGET_OS_OSX // [TODO(macOS GH#774) - RCTExportedDimensions is needed in RCTRootContentView
-NSDictionary *RCTExportedDimensions(RCTBridge *bridge);
-#else
+#if TARGET_OS_OSX // [TODO(macOS GH#774) - RCTExportedDimensions is needed in RCTRootContentView
 #ifdef __cplusplus
 extern "C"
 #endif
diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm
index 8705b8c05edd5b..2efb6cb24633b1 100644
--- a/React/CoreModules/RCTDeviceInfo.mm
+++ b/React/CoreModules/RCTDeviceInfo.mm
@@ -31,8 +31,7 @@ @implementation RCTDeviceInfo {
 #endif
 }
 
-@synthesize bridge = _bridge;
-@synthesize turboModuleRegistry = _turboModuleRegistry;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -46,15 +45,14 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
 {
-  _bridge = bridge;
-
+  _moduleRegistry = moduleRegistry;
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(didReceiveNewContentSizeMultiplier)
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
-                                             object:_bridge.accessibilityManager];
+                                             object:[moduleRegistry moduleForName:"AccessibilityManager"]];
 
   _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
 
@@ -63,7 +61,7 @@ - (void)setBridge:(RCTBridge *)bridge
                                                name:UIApplicationDidChangeStatusBarOrientationNotification
                                              object:nil];
 
-  _currentInterfaceDimensions = RCTExportedDimensions(_bridge, _turboModuleRegistry);
+  _currentInterfaceDimensions = RCTExportedDimensions(_moduleRegistry);
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
@@ -90,16 +88,22 @@ static BOOL RCTIsIPhoneX()
     CGSize iPhoneXScreenSize = CGSizeMake(1125, 2436);
     CGSize iPhoneXMaxScreenSize = CGSizeMake(1242, 2688);
     CGSize iPhoneXRScreenSize = CGSizeMake(828, 1792);
+    CGSize iPhone12ScreenSize = CGSizeMake(1170, 2532);
+    CGSize iPhone12MiniScreenSize = CGSizeMake(1080, 2340);
+    CGSize iPhone12ProMaxScreenSize = CGSizeMake(1284, 2778);
 
     isIPhoneX = CGSizeEqualToSize(screenSize, iPhoneXScreenSize) ||
-        CGSizeEqualToSize(screenSize, iPhoneXMaxScreenSize) || CGSizeEqualToSize(screenSize, iPhoneXRScreenSize);
+        CGSizeEqualToSize(screenSize, iPhoneXMaxScreenSize) || CGSizeEqualToSize(screenSize, iPhoneXRScreenSize) ||
+        CGSizeEqualToSize(screenSize, iPhone12ScreenSize) || CGSizeEqualToSize(screenSize, iPhone12MiniScreenSize) ||
+        CGSizeEqualToSize(screenSize, iPhone12ProMaxScreenSize);
+    ;
   });
 #endif // TODO(macOS GH#774)
   return isIPhoneX;
 }
 
 #if !TARGET_OS_OSX // [TODO(macOS GH#774)
-static NSDictionary *RCTExportedDimensions(RCTBridge *bridge, id<RCTTurboModuleRegistry> turboModuleRegistry)
+static NSDictionary *RCTExportedDimensions(RCTModuleRegistry *moduleRegistry)
 #else
 NSDictionary *RCTExportedDimensions(RCTPlatformView *rootView)
 #endif // ]TODO(macOS GH#774)
@@ -108,13 +112,11 @@ static BOOL RCTIsIPhoneX()
 
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
   RCTDimensions dimensions;
-  if (bridge) {
-    dimensions = RCTGetDimensions(bridge.accessibilityManager.multiplier ?: 1.0);
-  } else if (turboModuleRegistry) {
+  if (moduleRegistry) {
     dimensions = RCTGetDimensions(
-        ((RCTAccessibilityManager *)[turboModuleRegistry moduleForName:"RCTAccessibilityManager"]).multiplier ?: 1.0);
+        ((RCTAccessibilityManager *)[moduleRegistry moduleForName:"AccessibilityManager"]).multiplier ?: 1.0);
   } else {
-    RCTAssert(false, @"Bridge or TurboModuleRegistry must be set to properly init dimensions.");
+    RCTAssert(false, @"ModuleRegistry must be set to properly init dimensions.");
   }
 #else // [TODO(macOS GH#774)
   RCTDimensions dimensions = RCTGetDimensions(rootView);
@@ -145,10 +147,11 @@ static BOOL RCTIsIPhoneX()
 - (NSDictionary<NSString *, id> *)getConstants
 {
   __block NSDictionary<NSString *, id> *constants;
+  RCTModuleRegistry *moduleRegistry = _moduleRegistry;
   RCTUnsafeExecuteOnMainQueueSync(^{
     constants = @{
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
-      @"Dimensions" : RCTExportedDimensions(self->_bridge, self->_turboModuleRegistry),
+      @"Dimensions" : RCTExportedDimensions(moduleRegistry),
 #else // [TODO(macOS GH#774)
       @"Dimensions": RCTExportedDimensions(nil),
 #endif // ]TODO(macOS GH#774)
@@ -165,16 +168,16 @@ static BOOL RCTIsIPhoneX()
 
 - (void)didReceiveNewContentSizeMultiplier
 {
-  RCTBridge *bridge = _bridge;
+  RCTModuleRegistry *moduleRegistry = _moduleRegistry;
   RCTExecuteOnMainQueue(^{
   // Report the event across the bridge.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
+    [[moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"didUpdateDimensions"
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
-                                               body:RCTExportedDimensions(bridge, self->_turboModuleRegistry)];
+                                                                         body:RCTExportedDimensions(moduleRegistry)];
 #else // [TODO(macOS GH#774)
-                                               body:RCTExportedDimensions(nil)];
+                                                                         body:RCTExportedDimensions(nil)];
 #endif // ]TODO(macOS GH#774)
 #pragma clang diagnostic pop
   });
@@ -201,8 +204,8 @@ - (void)_interfaceOrientationDidChange
        !UIInterfaceOrientationIsLandscape(nextOrientation))) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
-                                                body:RCTExportedDimensions(_bridge, _turboModuleRegistry)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"didUpdateDimensions"
+                                                                          body:RCTExportedDimensions(_moduleRegistry)];
 #pragma clang diagnostic pop
   }
 
@@ -219,12 +222,13 @@ - (void)interfaceFrameDidChange
 
 - (void)_interfaceFrameDidChange
 {
-  NSDictionary *nextInterfaceDimensions = RCTExportedDimensions(_bridge, _turboModuleRegistry);
+  NSDictionary *nextInterfaceDimensions = RCTExportedDimensions(_moduleRegistry);
 
   if (!([nextInterfaceDimensions isEqual:_currentInterfaceDimensions])) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions" body:nextInterfaceDimensions];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"didUpdateDimensions"
+                                                                          body:nextInterfaceDimensions];
 #pragma clang diagnostic pop
   }
 
diff --git a/React/CoreModules/RCTEventDispatcher.h b/React/CoreModules/RCTEventDispatcher.h
index 5e7d51761a1471..573c5ddc9a57ff 100644
--- a/React/CoreModules/RCTEventDispatcher.h
+++ b/React/CoreModules/RCTEventDispatcher.h
@@ -9,9 +9,10 @@
 
 #import <React/RCTBridge.h>
 #import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTInitializing.h>
 /**
  * This class wraps the -[RCTBridge enqueueJSCall:args:] method, and
  * provides some convenience methods for generating event calls.
  */
-@interface RCTEventDispatcher : NSObject <RCTEventDispatcherProtocol>
+@interface RCTEventDispatcher : NSObject <RCTEventDispatcherProtocol, RCTInitializing>
 @end
diff --git a/React/CoreModules/RCTEventDispatcher.mm b/React/CoreModules/RCTEventDispatcher.mm
index 1f1ad1b9759654..26fe90a93ad41c 100644
--- a/React/CoreModules/RCTEventDispatcher.mm
+++ b/React/CoreModules/RCTEventDispatcher.mm
@@ -42,14 +42,12 @@ @implementation RCTEventDispatcher {
 
 @synthesize bridge = _bridge;
 @synthesize dispatchToJSThread = _dispatchToJSThread;
-@synthesize invokeJS = _invokeJS;
-@synthesize invokeJSWithModuleDotMethod = _invokeJSWithModuleDotMethod;
+@synthesize callableJSModules = _callableJSModules;
 
 RCT_EXPORT_MODULE()
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  _bridge = bridge;
   _events = [NSMutableDictionary new];
   _eventQueue = [NSMutableArray new];
   _eventQueueLock = [NSLock new];
@@ -60,26 +58,14 @@ - (void)setBridge:(RCTBridge *)bridge
 
 - (void)sendAppEventWithName:(NSString *)name body:(id)body
 {
-  if (_bridge) {
-    [_bridge enqueueJSCall:@"RCTNativeAppEventEmitter"
-                    method:@"emit"
-                      args:body ? @[ name, body ] : @[ name ]
-                completion:NULL];
-  } else if (_invokeJS) {
-    _invokeJS(@"RCTNativeAppEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
-  }
+  [_callableJSModules invokeModule:@"RCTNativeAppEventEmitter"
+                            method:@"emit"
+                          withArgs:body ? @[ name, body ] : @[ name ]];
 }
 
 - (void)sendDeviceEventWithName:(NSString *)name body:(id)body
 {
-  if (_bridge) {
-    [_bridge enqueueJSCall:@"RCTDeviceEventEmitter"
-                    method:@"emit"
-                      args:body ? @[ name, body ] : @[ name ]
-                completion:NULL];
-  } else if (_invokeJS) {
-    _invokeJS(@"RCTDeviceEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
-  }
+  [_callableJSModules invokeModule:@"RCTDeviceEventEmitter" method:@"emit" withArgs:body ? @[ name, body ] : @[ name ]];
 }
 
 - (void)sendTextEventWithType:(RCTTextEventType)type
@@ -196,11 +182,12 @@ - (void)removeDispatchObserver:(id<RCTEventDispatcherObserver>)observer
 
 - (void)dispatchEvent:(id<RCTEvent>)event
 {
-  if (_bridge) {
-    [_bridge enqueueJSCall:[[event class] moduleDotMethod] args:[event arguments]];
-  } else if (_invokeJSWithModuleDotMethod) {
-    _invokeJSWithModuleDotMethod([[event class] moduleDotMethod], [event arguments]);
-  }
+  NSString *moduleDotMethod = [[event class] moduleDotMethod];
+  NSArray<NSString *> *const components = [moduleDotMethod componentsSeparatedByString:@"."];
+  NSString *const moduleName = components[0];
+  NSString *const methodName = components[1];
+
+  [_callableJSModules invokeModule:moduleName method:methodName withArgs:[event arguments]];
 }
 
 - (dispatch_queue_t)methodQueue
@@ -224,6 +211,12 @@ - (void)flushEventsQueue
   }
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 Class RCTEventDispatcherCls(void)
diff --git a/React/CoreModules/RCTExceptionsManager.mm b/React/CoreModules/RCTExceptionsManager.mm
index cd2c2f34013156..175c5612cff592 100644
--- a/React/CoreModules/RCTExceptionsManager.mm
+++ b/React/CoreModules/RCTExceptionsManager.mm
@@ -23,8 +23,7 @@ @interface RCTExceptionsManager () <NativeExceptionsManagerSpec>
 
 @implementation RCTExceptionsManager
 
-@synthesize bridge = _bridge;
-@synthesize turboModuleRegistry = _turboModuleRegistry;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -42,13 +41,8 @@ - (void)reportSoft:(NSString *)message
     suppressRedBox:(BOOL)suppressRedBox
 {
   if (!suppressRedBox) {
-    // TODO T5287269 - Delete _bridge case when TM ships.
-    if (_bridge) {
-      [_bridge.redBox showErrorMessage:message withStack:stack errorCookie:((int)exceptionId)];
-    } else {
-      RCTRedBox *redbox = [_turboModuleRegistry moduleForName:"RCTRedBox"];
-      [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
-    }
+    RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
+    [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
   }
 
   if (_delegate) {
@@ -64,13 +58,8 @@ - (void)reportFatal:(NSString *)message
      suppressRedBox:(BOOL)suppressRedBox
 {
   if (!suppressRedBox) {
-    // TODO T5287269 - Delete _bridge case when TM ships.
-    if (_bridge) {
-      [_bridge.redBox showErrorMessage:message withStack:stack errorCookie:((int)exceptionId)];
-    } else {
-      RCTRedBox *redbox = [_turboModuleRegistry moduleForName:"RCTRedBox"];
-      [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
-    }
+    RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
+    [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
   }
 
   if (_delegate) {
@@ -111,13 +100,8 @@ - (void)reportFatal:(NSString *)message
                   : (NSArray<NSDictionary *> *)stack exceptionId
                   : (double)exceptionId)
 {
-  // TODO T5287269 - Delete _bridge case when TM ships.
-  if (_bridge) {
-    [_bridge.redBox updateErrorMessage:message withStack:stack errorCookie:((int)exceptionId)];
-  } else {
-    RCTRedBox *redbox = [_turboModuleRegistry moduleForName:"RCTRedBox"];
-    [redbox updateErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
-  }
+  RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
+  [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
 
   if (_delegate && [_delegate respondsToSelector:@selector(updateJSExceptionWithMessage:stack:exceptionId:)]) {
     [_delegate updateJSExceptionWithMessage:message stack:stack exceptionId:[NSNumber numberWithDouble:exceptionId]];
diff --git a/React/CoreModules/RCTKeyboardObserver.mm b/React/CoreModules/RCTKeyboardObserver.mm
index 5a6f8147a3f8e6..6782663e069952 100644
--- a/React/CoreModules/RCTKeyboardObserver.mm
+++ b/React/CoreModules/RCTKeyboardObserver.mm
@@ -63,7 +63,7 @@ - (void)stopObserving
 #define IMPLEMENT_KEYBOARD_HANDLER(EVENT)                                              \
   -(void)EVENT : (NSNotification *)notification                                        \
   {                                                                                    \
-    if (!self.bridge && !self.invokeJS) {                                              \
+    if (!self.callableJSModules) {                                                     \
       return;                                                                          \
     }                                                                                  \
     [self sendEventWithName:@ #EVENT body:RCTParseKeyboardNotification(notification)]; \
diff --git a/React/CoreModules/RCTLogBox.mm b/React/CoreModules/RCTLogBox.mm
index da08f110cf8887..9f22af7522ab21 100644
--- a/React/CoreModules/RCTLogBox.mm
+++ b/React/CoreModules/RCTLogBox.mm
@@ -43,22 +43,26 @@ + (BOOL)requiresMainQueueSetup
       if (!strongSelf) {
         return;
       }
-      if (!strongSelf->_window) { // TODO(macOS GH#774) Renamed from _view to _window
-        if (self->_bridge) {
+
+      if (strongSelf->_window) { // TODO(macOS GH#774) Renamed from _view to _window
+        [strongSelf->_window show]; // TODO(macOS GH#774) Renamed from _view to _window
+        return;
+      }
+
+      if (strongSelf->_bridge) {
+        if (strongSelf->_bridge.valid) {
 #if !TARGET_OS_OSX // TODO(macOS GH#774)
-          strongSelf->_window = [[RCTLogBoxWindow alloc] initWithFrame:[UIScreen mainScreen].bounds bridge:self->_bridge]; // TODO(macOS GH#774) Renamed from _view to _window
+          strongSelf->_window = [[RCTLogBoxWindow alloc] initWithFrame:[UIScreen mainScreen].bounds // TODO(macOS GH#774) Renamed from _view to _window
+                                                            bridge:strongSelf->_bridge];
 #else // [TODO(macOS GH#774)
           strongSelf->_window = [[RCTLogBoxWindow alloc] initWithBridge:self->_bridge]; // TODO(macOS GH#774) Renamed from _view to _window
 #endif // ]TODO(macOS GH#774)
-        } else {
-          NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:strongSelf, @"logbox", nil];
-          [[NSNotificationCenter defaultCenter] postNotificationName:@"CreateLogBoxSurface"
-                                                              object:nil
-                                                            userInfo:userInfo];
-          return;
+          [strongSelf->_window show]; // TODO(macOS GH#774) Renamed from _view to _window
         }
+      } else {
+        NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:strongSelf, @"logbox", nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"CreateLogBoxSurface" object:nil userInfo:userInfo];
       }
-      [strongSelf->_window show];
     });
   }
 }
diff --git a/React/CoreModules/RCTPerfMonitor.mm b/React/CoreModules/RCTPerfMonitor.mm
index 790591d3afcacd..bf960e5c7fbdf5 100644
--- a/React/CoreModules/RCTPerfMonitor.mm
+++ b/React/CoreModules/RCTPerfMonitor.mm
@@ -136,6 +136,7 @@ @implementation RCTPerfMonitor {
 }
 
 @synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -149,12 +150,11 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
 {
-  _bridge = bridge;
-
+  _moduleRegistry = moduleRegistry;
 #if __has_include(<React/RCTDevMenu.h>)
-  [_bridge.devMenu addItem:self.devMenuItem];
+  [(RCTDevMenu *)[_moduleRegistry moduleForName:"DevMenu"] addItem:self.devMenuItem];
 #endif
 }
 
@@ -168,7 +168,7 @@ - (RCTDevMenuItem *)devMenuItem
 {
   if (!_devMenuItem) {
     __weak __typeof__(self) weakSelf = self;
-    __weak RCTDevSettings *devSettings = self.bridge.devSettings;
+    __weak RCTDevSettings *devSettings = [self->_moduleRegistry moduleForName:"DevSettings"];
     if (devSettings.isPerfMonitorShown) {
       [weakSelf show];
     }
@@ -559,6 +559,12 @@ - (CGFloat)tableView:(__unused UITableView *)tableView heightForRowAtIndexPath:(
   return 20;
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 #endif
diff --git a/React/CoreModules/RCTRedBox.mm b/React/CoreModules/RCTRedBox.mm
index 924a357305015b..6af0ea8e750620 100644
--- a/React/CoreModules/RCTRedBox.mm
+++ b/React/CoreModules/RCTRedBox.mm
@@ -215,12 +215,6 @@ - (NSInteger)bottomSafeViewHeight
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
-- (void)dealloc
-{
-  _stackTraceTableView.dataSource = nil;
-  _stackTraceTableView.delegate = nil;
-}
-
 - (NSString *)stripAnsi:(NSString *)text
 {
   NSError *error = nil;
@@ -811,6 +805,8 @@ @implementation RCTRedBox {
 }
 
 @synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
+@synthesize bundleManager = _bundleManager;
 
 RCT_EXPORT_MODULE()
 
@@ -948,7 +944,8 @@ - (void)showErrorMessage:(NSString *)message
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [self->_bridge.eventDispatcher sendDeviceEventWithName:@"collectRedBoxExtraData" body:nil];
+    [[self->_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"collectRedBoxExtraData"
+                                                                                body:nil];
 #pragma clang diagnostic pop
 
     if (!self->_window) {
@@ -1009,7 +1006,7 @@ - (void)invalidate
 
 - (void)redBoxWindow:(__unused RCTRedBoxWindow *)redBoxWindow openStackFrameInEditor:(RCTJSStackFrame *)stackFrame
 {
-  NSURL *const bundleURL = _overrideBundleURL ?: _bridge.bundleURL;
+  NSURL *const bundleURL = _overrideBundleURL ?: _bundleManager.bundleURL;
   if (![bundleURL.scheme hasPrefix:@"http"]) {
     RCTLogWarn(@"Cannot open stack frame in editor because you're not connected to the packager.");
     return;
diff --git a/React/CoreModules/RCTSourceCode.mm b/React/CoreModules/RCTSourceCode.mm
index 92cb27ef4e6929..1b3e424f831d91 100644
--- a/React/CoreModules/RCTSourceCode.mm
+++ b/React/CoreModules/RCTSourceCode.mm
@@ -23,6 +23,7 @@ @implementation RCTSourceCode
 RCT_EXPORT_MODULE()
 
 @synthesize bridge = _bridge;
+@synthesize bundleManager = _bundleManager;
 
 + (BOOL)requiresMainQueueSetup
 {
@@ -37,7 +38,7 @@ + (BOOL)requiresMainQueueSetup
 - (NSDictionary<NSString *, id> *)getConstants
 {
   return @{
-    @"scriptURL" : self.bridge.bundleURL.absoluteString ?: @"",
+    @"scriptURL" : self.bundleManager.bundleURL.absoluteString ?: @"",
   };
 }
 
diff --git a/React/CoreModules/RCTTiming.h b/React/CoreModules/RCTTiming.h
index 4776f85e2b7673..7c197aaa9c9db0 100644
--- a/React/CoreModules/RCTTiming.h
+++ b/React/CoreModules/RCTTiming.h
@@ -9,6 +9,7 @@
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTFrameUpdate.h>
+#import <React/RCTInitializing.h>
 #import <React/RCTInvalidating.h>
 
 @protocol RCTTimingDelegate
@@ -19,7 +20,7 @@
 
 @end
 
-@interface RCTTiming : NSObject <RCTBridgeModule, RCTInvalidating, RCTFrameUpdateObserver>
+@interface RCTTiming : NSObject <RCTBridgeModule, RCTInvalidating, RCTFrameUpdateObserver, RCTInitializing>
 
 - (instancetype)initWithDelegate:(id<RCTTimingDelegate>)delegate;
 - (void)createTimerForNextFrame:(nonnull NSNumber *)callbackID
diff --git a/React/CoreModules/RCTTiming.mm b/React/CoreModules/RCTTiming.mm
index b56778e603fbf2..5960a9e9c5c9cd 100644
--- a/React/CoreModules/RCTTiming.mm
+++ b/React/CoreModules/RCTTiming.mm
@@ -118,11 +118,9 @@ - (instancetype)initWithDelegate:(id<RCTTimingDelegate>)delegate
   return self;
 }
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  RCTAssert(!_bridge, @"Should never be initialized twice!");
   [self setup];
-  _bridge = bridge;
 }
 
 - (void)setup
diff --git a/React/CoreModules/RCTWebSocketExecutor.mm b/React/CoreModules/RCTWebSocketExecutor.mm
index ac89891f17914c..5fd06fb09f6721 100644
--- a/React/CoreModules/RCTWebSocketExecutor.mm
+++ b/React/CoreModules/RCTWebSocketExecutor.mm
@@ -278,6 +278,12 @@ - (void)dealloc
   RCTAssert(!self.valid, @"-invalidate must be called before -dealloc");
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 #endif
diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec
index 3e99a3ddc5cc3f..c06240e37c0b5e 100644
--- a/React/CoreModules/React-CoreModules.podspec
+++ b/React/CoreModules/React-CoreModules.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-CoreModules"
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#774)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#774)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{c,m,mm,cpp}"
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 6b86556bb5247f..62db7d737fd41c 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -12,6 +12,8 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeMethod.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTConstants.h>
 #import <React/RCTConvert.h>
 #import <React/RCTCxxBridgeDelegate.h>
 #import <React/RCTCxxModule.h>
@@ -38,11 +40,16 @@
 #import <jsireact/JSIExecutor.h>
 #import <reactperflogger/BridgeNativeModulePerfLogger.h>
 
-#if __has_include(<hermes/hermes.h>)
+#ifndef RCT_USE_HERMES
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
 #define RCT_USE_HERMES 1
+#else
+#define RCT_USE_HERMES 0
+#endif
 #endif
+
 #if RCT_USE_HERMES
-#import "HermesExecutorFactory.h"
+#import <reacthermes/HermesExecutorFactory.h>
 #else
 #import "JSCExecutorFactory.h"
 #endif
@@ -226,6 +233,11 @@ @implementation RCTCxxBridge {
 
   // Necessary for searching in TurboModules in TurboModuleManager
   id<RCTTurboModuleRegistry> _turboModuleRegistry;
+
+  RCTModuleRegistry *_objCModuleRegistry;
+  RCTViewRegistry *_viewRegistry_DEPRECATED;
+  RCTBundleManager *_bundleManager;
+  RCTCallableJSModules *_callableJSModules;
 }
 
 @synthesize bridgeDescription = _bridgeDescription;
@@ -236,6 +248,45 @@ @implementation RCTCxxBridge {
 - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry
 {
   _turboModuleRegistry = turboModuleRegistry;
+  [_objCModuleRegistry setTurboModuleRegistry:_turboModuleRegistry];
+}
+
+- (void)attachBridgeAPIsToTurboModule:(id<RCTTurboModule>)module
+{
+  id<RCTBridgeModule> bridgeModule = (id<RCTBridgeModule>)module;
+  /**
+   * Attach the RCTViewRegistry to this TurboModule, which allows this TurboModule
+   * To query a React component's UIView, given its reactTag.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED`
+   */
+  if ([bridgeModule respondsToSelector:@selector(setViewRegistry_DEPRECATED:)]) {
+    bridgeModule.viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+  }
+
+  /**
+   * Attach the RCTBundleManager to this TurboModule, which allows this TurboModule to
+   * read from/write to the app's bundle URL.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize bundleManager = _bundleManager`
+   */
+  if ([bridgeModule respondsToSelector:@selector(setBundleManager:)]) {
+    bridgeModule.bundleManager = _bundleManager;
+  }
+
+  /**
+   * Attach the RCTCallableJSModules to this TurboModule, which allows this TurboModule
+   * to call JS Module methods.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize callableJSModules = _callableJSModules`
+   */
+
+  if ([bridgeModule respondsToSelector:@selector(setCallableJSModules:)]) {
+    bridgeModule.callableJSModules = _callableJSModules;
+  }
 }
 
 - (std::shared_ptr<MessageQueueThread>)jsMessageThread
@@ -279,6 +330,14 @@ - (instancetype)initWithParentBridge:(RCTBridge *)bridge
     _moduleDataByName = [NSMutableDictionary new];
     _moduleClassesByID = [NSMutableArray new];
     _moduleDataByID = [NSMutableArray new];
+    _objCModuleRegistry = [RCTModuleRegistry new];
+    [_objCModuleRegistry setBridge:self];
+    _bundleManager = [RCTBundleManager new];
+    [_bundleManager setBridge:self];
+    _viewRegistry_DEPRECATED = [RCTViewRegistry new];
+    [_viewRegistry_DEPRECATED setBridge:self];
+    _callableJSModules = [RCTCallableJSModules new];
+    [_callableJSModules setBridge:self];
 
     [RCTBridge setCurrentBridge:self];
 
@@ -457,6 +516,14 @@ - (void)start
   // Load the source asynchronously, then store it for later execution.
   dispatch_group_enter(prepareBridge);
   __block NSData *sourceCode;
+
+#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include(<React/RCTDevLoadingViewProtocol.h>)
+  {
+    id<RCTDevLoadingViewProtocol> loadingView = [self moduleForName:@"DevLoadingView" lazilyLoadIfNecessary:YES];
+    [loadingView showWithURL:self.bundleURL];
+  }
+#endif
+
   [self
       loadSource:^(NSError *error, RCTSource *source) {
         if (error) {
@@ -755,7 +822,12 @@ - (void)updateModuleWithInstance:(id<RCTBridgeModule>)instance
     // TODO #13258411: can we defer this until config generation?
     int32_t moduleDataId = getUniqueId();
     BridgeNativeModulePerfLogger::moduleDataCreateStart([moduleName UTF8String], moduleDataId);
-    moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass bridge:self];
+    moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass
+                                                     bridge:self
+                                             moduleRegistry:_objCModuleRegistry
+                                    viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
+                                              bundleManager:_bundleManager
+                                          callableJSModules:_callableJSModules];
     BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
     _moduleDataByName[moduleName] = moduleData;
@@ -773,11 +845,20 @@ - (void)registerExtraModules
 {
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTCxxBridge initModulesWithDispatchGroup:] extraModules", nil);
 
-  NSArray<id<RCTBridgeModule>> *extraModules = nil;
+  NSArray<id<RCTBridgeModule>> *appExtraModules = nil;
   if ([self.delegate respondsToSelector:@selector(extraModulesForBridge:)]) {
-    extraModules = [self.delegate extraModulesForBridge:_parentBridge];
+    appExtraModules = [self.delegate extraModulesForBridge:_parentBridge];
   } else if (self.moduleProvider) {
-    extraModules = self.moduleProvider();
+    appExtraModules = self.moduleProvider();
+  }
+
+  NSMutableArray<id<RCTBridgeModule>> *extraModules = [NSMutableArray new];
+
+  // Prevent TurboModules from appearing the the NativeModule system
+  for (id<RCTBridgeModule> module in appExtraModules) {
+    if (!(RCTTurboModuleEnabled() && [module conformsToProtocol:@protocol(RCTTurboModule)])) {
+      [extraModules addObject:module];
+    }
   }
 
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
@@ -818,7 +899,12 @@ - (void)registerExtraModules
     // Instantiate moduleData container
     int32_t moduleDataId = getUniqueId();
     BridgeNativeModulePerfLogger::moduleDataCreateStart([moduleName UTF8String], moduleDataId);
-    RCTModuleData *moduleData = [[RCTModuleData alloc] initWithModuleInstance:module bridge:self];
+    RCTModuleData *moduleData = [[RCTModuleData alloc] initWithModuleInstance:module
+                                                                       bridge:self
+                                                               moduleRegistry:_objCModuleRegistry
+                                                      viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
+                                                                bundleManager:_bundleManager
+                                                            callableJSModules:_callableJSModules];
     BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
     _moduleDataByName[moduleName] = moduleData;
@@ -869,7 +955,12 @@ - (void)registerExtraLazyModules
 
       int32_t moduleDataId = getUniqueId();
       BridgeNativeModulePerfLogger::moduleDataCreateStart([moduleName UTF8String], moduleDataId);
-      moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass bridge:self];
+      moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass
+                                                       bridge:self
+                                               moduleRegistry:_objCModuleRegistry
+                                      viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
+                                                bundleManager:_bundleManager
+                                            callableJSModules:_callableJSModules];
       BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
       _moduleDataByName[moduleName] = moduleData;
diff --git a/React/CxxModule/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
index be74794fc572c0..cea144f5f469da 100644
--- a/React/CxxModule/RCTNativeModule.mm
+++ b/React/CxxModule/RCTNativeModule.mm
@@ -100,7 +100,9 @@ static MethodCallResult invokeInner(
 #else
     (void)(callId);
 #endif
-    invokeInner(weakBridge, weakModuleData, methodId, std::move(params), callId, isSyncModule ? Sync : Async);
+    @autoreleasepool {
+      invokeInner(weakBridge, weakModuleData, methodId, std::move(params), callId, isSyncModule ? Sync : Async);
+    }
   };
 
   if (isSyncModule) {
diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm
index 8b6088b16751d0..11623b6190e82c 100644
--- a/React/DevSupport/RCTPackagerConnection.mm
+++ b/React/DevSupport/RCTPackagerConnection.mm
@@ -41,6 +41,7 @@ @implementation RCTPackagerConnection {
   RCTReconnectingWebSocket *_socket;
   BOOL _socketConnected;
   NSString *_serverHostPortForSocket;
+  NSString *_serverSchemeForSocket;
   id _bundleURLChangeObserver;
   uint32_t _nextToken;
   std::vector<Registration<RCTNotificationHandler>> _notificationRegistrations;
@@ -63,7 +64,8 @@ - (instancetype)init
   if (self = [super init]) {
     _nextToken = 1; // Prevent randomly erasing a handler if you pass a bogus 0 token
     _serverHostPortForSocket = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-    _socket = socketForLocation(_serverHostPortForSocket);
+    _serverSchemeForSocket = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+    _socket = socketForLocation(_serverHostPortForSocket, _serverSchemeForSocket);
     _socket.delegate = self;
     [_socket start];
 
@@ -79,7 +81,7 @@ - (instancetype)init
   return self;
 }
 
-static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPort)
+static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPort, NSString *scheme)
 {
   NSString *serverHost;
   NSString *serverPort;
@@ -90,9 +92,12 @@ - (instancetype)init
   if ([locationComponents count] > 1) {
     serverPort = locationComponents[1];
   }
+  if (![scheme length]) {
+    scheme = @"http";
+  }
   NSURLComponents *const components = [NSURLComponents new];
   components.host = serverHost ?: @"localhost";
-  components.scheme = @"http";
+  components.scheme = scheme;
   components.port = serverPort ? @(serverPort.integerValue) : @(kRCTBundleURLProviderDefaultPort);
   components.path = @"/message";
   components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"role" value:kRCTPlatformName] ]; // TODO(macOS GH#774)
@@ -128,14 +133,16 @@ - (void)bundleURLSettingsChanged
   }
 
   NSString *const serverHostPort = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-  if ([serverHostPort isEqual:_serverHostPortForSocket]) {
+  NSString *const serverScheme = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+  if ([serverHostPort isEqual:_serverHostPortForSocket] && [serverScheme isEqual:_serverSchemeForSocket]) {
     return; // unchanged
   }
 
   _socket.delegate = nil;
   [_socket stop];
   _serverHostPortForSocket = serverHostPort;
-  _socket = socketForLocation(serverHostPort);
+  _serverSchemeForSocket = serverScheme;
+  _socket = socketForLocation(serverHostPort, serverScheme);
   _socket.delegate = self;
   [_socket start];
 }
diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec b/React/FBReactNativeSpec/FBReactNativeSpec.podspec
similarity index 60%
rename from Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec
rename to React/FBReactNativeSpec/FBReactNativeSpec.podspec
index e0cd597d7cc3d5..54246ebb0ac2ec 100644
--- a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec
+++ b/React/FBReactNativeSpec/FBReactNativeSpec.podspec
@@ -13,22 +13,13 @@ source = { :git => 'https://github.com/facebook/react-native.git' }
 codegen_path_prefix = ".."
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
-  codegen_path_prefix = "packages"
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
-react_native_path = File.join(__dir__, "..", "..")
-srcs_dir = File.join(__dir__, "..")
-codegen_script_path = File.join(react_native_path, "scripts", "generate-native-modules-specs.sh")
-codegen_path = File.join(react_native_path, codegen_path_prefix, "react-native-codegen")
-output_dir = File.join(__dir__, "FBReactNativeSpec")
-generated_files = [File.join(output_dir, "FBReactNativeSpec.h"), File.join(output_dir, "FBReactNativeSpec-generated.mm")]
-codegen_command = "CODEGEN_PATH=#{codegen_path} sh '#{codegen_script_path}' | tee \"${SCRIPT_OUTPUT_FILE_0}\""
-
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "FBReactNativeSpec"
@@ -37,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#774)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#774)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
@@ -46,7 +37,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/Libraries/FBReactNativeSpec\" \"$(PODS_ROOT)/RCT-Folly\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/FBReactNativeSpec\" \"$(PODS_ROOT)/RCT-Folly\""
                              }
 
   s.dependency "RCT-Folly", folly_version
@@ -56,12 +47,5 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
   s.dependency "ReactCommon/turbomodule/core", version
 
-  s.prepare_command = "mkdir -p #{output_dir} && touch #{generated_files.reduce() { |str, file| str + " " + file }}"
-  s.script_phase = {
-    :name => 'Generate Native Modules Code',
-    :input_files => [srcs_dir],
-    :output_files => ["$(DERIVED_FILE_DIR)/FBReactNativeSpec-codegen.log"],
-    :script => codegen_command,
-    :execution_position => :before_compile
-  }
+  use_react_native_codegen! (s)
 end
diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
index 7b5a56999ed8be..f5c0a1e421deb8 100644
--- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
@@ -13,7 +13,7 @@
 #import <react/renderer/components/rncore/EventEmitters.h>
 #import <react/renderer/components/rncore/Props.h>
 
-#import "FBRCTFabricComponentsPlugins.h"
+#import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
index 8f40efe885c947..64bdbfd3bb8e19 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.h
@@ -6,6 +6,7 @@
  */
 
 #import <React/RCTImageResponseDelegate.h>
+#import <React/RCTUIImageViewAnimated.h>
 #import <React/RCTViewComponentView.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -15,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface RCTImageComponentView : RCTViewComponentView <RCTImageResponseDelegate> {
  @protected
-  UIImageView *_imageView;
+  RCTUIImageViewAnimated *_imageView;
 }
 
 @end
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index 9e66149b98d0fb..e43b04b69c2fd1 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -7,6 +7,7 @@
 
 #import "RCTImageComponentView.h"
 
+#import <React/RCTAssert.h>
 #import <React/RCTConversions.h>
 #import <React/RCTImageBlurUtils.h>
 #import <React/RCTImageResponseObserverProxy.h>
@@ -18,12 +19,8 @@
 
 using namespace facebook::react;
 
-@interface RCTImageComponentView ()
-@end
-
 @implementation RCTImageComponentView {
-  ImageShadowNode::ConcreteStateTeller _stateTeller;
-  ImageResponseObserverCoordinator const *_coordinator;
+  ImageShadowNode::ConcreteState::Shared _state;
   RCTImageResponseObserverProxy _imageResponseObserverProxy;
 }
 
@@ -33,9 +30,9 @@ - (instancetype)initWithFrame:(CGRect)frame
     static auto const defaultProps = std::make_shared<ImageProps const>();
     _props = defaultProps;
 
-    _imageView = [[UIImageView alloc] initWithFrame:self.bounds];
+    _imageView = [RCTUIImageViewAnimated new];
     _imageView.clipsToBounds = YES;
-    _imageView.contentMode = (UIViewContentMode)RCTResizeModeFromImageResizeMode(defaultProps->resizeMode);
+    _imageView.contentMode = RCTContentModeFromImageResizeMode(defaultProps->resizeMode);
     _imageView.layer.minificationFilter = kCAFilterTrilinear;
     _imageView.layer.magnificationFilter = kCAFilterTrilinear;
 
@@ -61,13 +58,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
   // `resizeMode`
   if (oldImageProps.resizeMode != newImageProps.resizeMode) {
-    if (newImageProps.resizeMode == ImageResizeMode::Repeat) {
-      // Repeat resize mode is handled by the UIImage. Use scale to fill
-      // so the repeated image fills the UIImageView.
-      _imageView.contentMode = UIViewContentModeScaleToFill;
-    } else {
-      _imageView.contentMode = (UIViewContentMode)RCTResizeModeFromImageResizeMode(newImageProps.resizeMode);
-    }
+    _imageView.contentMode = RCTContentModeFromImageResizeMode(newImageProps.resizeMode);
   }
 
   // `tintColor`
@@ -80,17 +71,20 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
 - (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
 {
-  _stateTeller.setConcreteState(state);
-  auto _oldState = std::static_pointer_cast<ImageShadowNode::ConcreteState const>(oldState);
-  auto data = _stateTeller.getData().value();
+  RCTAssert(state, @"`state` must not be null.");
+  RCTAssert(
+      std::dynamic_pointer_cast<ImageShadowNode::ConcreteState const>(state),
+      @"`state` must be a pointer to `ImageShadowNode::ConcreteState`.");
 
-  // This call (setting `coordinator`) must be unconditional (at the same block as setting `State`)
-  // because the setter stores a raw pointer to object that `State` owns.
-  self.coordinator = &data.getImageRequest().getObserverCoordinator();
+  auto oldImageState = std::static_pointer_cast<ImageShadowNode::ConcreteState const>(_state);
+  auto newImageState = std::static_pointer_cast<ImageShadowNode::ConcreteState const>(state);
 
-  bool havePreviousData = _oldState && _oldState->getData().getImageSource() != ImageSource{};
+  [self _setStateAndResubscribeImageResponseObserver:newImageState];
 
-  if (!havePreviousData || data.getImageSource() != _oldState->getData().getImageSource()) {
+  bool havePreviousData = oldImageState && oldImageState->getData().getImageSource() != ImageSource{};
+
+  if (!havePreviousData ||
+      (newImageState && newImageState->getData().getImageSource() != oldImageState->getData().getImageSource())) {
     // Loading actually starts a little before this, but this is the first time we know
     // the image is loading and can fire an event from this component
     std::static_pointer_cast<ImageEventEmitter const>(_eventEmitter)->onLoadStart();
@@ -100,35 +94,33 @@ - (void)updateState:(State::Shared const &)state oldState:(State::Shared const &
   }
 }
 
-- (void)setCoordinator:(ImageResponseObserverCoordinator const *)coordinator
+- (void)_setStateAndResubscribeImageResponseObserver:(ImageShadowNode::ConcreteState::Shared const &)state
 {
-  if (_coordinator) {
-    _coordinator->removeObserver(_imageResponseObserverProxy);
+  if (_state) {
+    auto &observerCoordinator = _state->getData().getImageRequest().getObserverCoordinator();
+    observerCoordinator.removeObserver(_imageResponseObserverProxy);
   }
-  _coordinator = coordinator;
-  if (_coordinator != nullptr) {
-    _coordinator->addObserver(_imageResponseObserverProxy);
+
+  _state = state;
+
+  if (_state) {
+    auto &observerCoordinator = _state->getData().getImageRequest().getObserverCoordinator();
+    observerCoordinator.addObserver(_imageResponseObserverProxy);
   }
 }
 
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
-  self.coordinator = nullptr;
+  [self _setStateAndResubscribeImageResponseObserver:nullptr];
   _imageView.image = nil;
-  _stateTeller.invalidate();
-}
-
-- (void)dealloc
-{
-  self.coordinator = nullptr;
 }
 
 #pragma mark - RCTImageResponseDelegate
 
 - (void)didReceiveImage:(UIImage *)image metadata:(id)metadata fromObserver:(void const *)observer
 {
-  if (!_eventEmitter || !_stateTeller.isValid()) {
+  if (!_eventEmitter || !_state) {
     // Notifications are delivered asynchronously and might arrive after the view is already recycled.
     // In the future, we should incorporate an `EventEmitter` into a separate object owned by `ImageRequest` or `State`.
     // See for more info: T46311063.
diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm
index d151d1c0c3a421..e53c8570d95cc6 100644
--- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm
@@ -41,7 +41,7 @@
 }
 
 @implementation RCTInputAccessoryComponentView {
-  InputAccessoryShadowNode::ConcreteStateTeller _stateTeller;
+  InputAccessoryShadowNode::ConcreteState::Shared _state;
   RCTInputAccessoryContentView *_contentView;
   RCTSurfaceTouchHandler *_touchHandler;
   UIView<RCTBackedTextInputViewProtocol> __weak *_textInput;
@@ -118,15 +118,16 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   self.hidden = true;
 }
 
-- (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
+- (void)updateState:(const facebook::react::State::Shared &)state
+           oldState:(const facebook::react::State::Shared &)oldState
 {
-  _stateTeller.setConcreteState(state);
-  CGSize oldViewportSize = RCTCGSizeFromSize(_stateTeller.getData().value().viewportSize);
+  _state = std::static_pointer_cast<InputAccessoryShadowNode::ConcreteState const>(state);
+  CGSize oldScreenSize = RCTCGSizeFromSize(_state->getData().viewportSize);
   CGSize viewportSize = RCTViewportSize();
   viewportSize.height = std::nan("");
-  if (oldViewportSize.width != viewportSize.width) {
+  if (oldScreenSize.width != viewportSize.width) {
     auto stateData = InputAccessoryState{RCTSizeFromCGSize(viewportSize)};
-    _stateTeller.updateState(std::move(stateData));
+    _state->updateState(std::move(stateData));
   }
 }
 
@@ -141,7 +142,7 @@ - (void)updateLayoutMetrics:(LayoutMetrics const &)layoutMetrics
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
-  _stateTeller.invalidate();
+  _state.reset();
   _textInput = nil;
 }
 
diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm
index 3262418b17832c..3e216fb625b881 100644
--- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm
@@ -7,6 +7,7 @@
 
 #import "RCTLegacyViewManagerInteropComponentView.h"
 
+#import <React/RCTAssert.h>
 #import <React/UIView+React.h>
 #import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h>
 #import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h>
@@ -22,12 +23,14 @@ @implementation RCTLegacyViewManagerInteropComponentView {
   NSMutableArray<NSDictionary *> *_viewsToBeMounted;
   NSMutableArray<UIView *> *_viewsToBeUnmounted;
   RCTLegacyViewManagerInteropCoordinatorAdapter *_adapter;
-  LegacyViewManagerInteropShadowNode::ConcreteStateTeller _stateTeller;
+  LegacyViewManagerInteropShadowNode::ConcreteState::Shared _state;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    RCTWarnNotAllowedForNewArchitecture(
+        self, @"ViewManager with interop layer is not allowed in the new architecture.");
     static const auto defaultProps = std::make_shared<const LegacyViewManagerInteropViewProps>();
     _props = defaultProps;
     _viewsToBeMounted = [NSMutableArray new];
@@ -50,8 +53,7 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 
 + (NSMutableSet<NSString *> *)supportedViewManagers
 {
-  static NSMutableSet<NSString *> *supported = [NSMutableSet setWithObjects:@"Picker",
-                                                                            @"DatePicker",
+  static NSMutableSet<NSString *> *supported = [NSMutableSet setWithObjects:@"DatePicker",
                                                                             @"ProgressView",
                                                                             @"SegmentedControl",
                                                                             @"MaskedView",
@@ -75,9 +77,9 @@ + (void)supportLegacyViewManagerWithName:(NSString *)componentName
 
 - (RCTLegacyViewManagerInteropCoordinator *)coordinator
 {
-  auto data = _stateTeller.getData();
-  if (data.hasValue()) {
-    return unwrapManagedObject(data.value().coordinator);
+  if (_state != nullptr) {
+    const auto &state = _state->getData();
+    return unwrapManagedObject(state.coordinator);
   } else {
     return nil;
   }
@@ -85,7 +87,9 @@ - (RCTLegacyViewManagerInteropCoordinator *)coordinator
 
 - (NSString *)componentViewName_DO_NOT_USE_THIS_IS_BROKEN
 {
-  return self.coordinator.componentViewName;
+  const auto &state = _state->getData();
+  RCTLegacyViewManagerInteropCoordinator *coordinator = unwrapManagedObject(state.coordinator);
+  return coordinator.componentViewName;
 }
 
 #pragma mark - RCTComponentViewProtocol
@@ -95,7 +99,7 @@ - (void)prepareForRecycle
   _adapter = nil;
   [_viewsToBeMounted removeAllObjects];
   [_viewsToBeUnmounted removeAllObjects];
-  _stateTeller.invalidate();
+  _state.reset();
   self.contentView = nil;
   [super prepareForRecycle];
 }
@@ -124,7 +128,7 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
 
 - (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
 {
-  _stateTeller.setConcreteState(state);
+  _state = std::static_pointer_cast<LegacyViewManagerInteropShadowNode::ConcreteState const>(state);
 }
 
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm
index 31d505630fa4b1..15980bcfd9f641 100644
--- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm
+++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.mm
@@ -31,9 +31,7 @@ - (void)dealloc
 - (UIView *)paperView
 {
   if (!_paperView) {
-    _paperView = _coordinator.paperView;
-    _paperView.reactTag = [NSNumber numberWithInteger:_tag];
-
+    _paperView = [_coordinator createPaperViewWithTag:_tag];
     __weak __typeof(self) weakSelf = self;
     [_coordinator addObserveForTag:_tag
                         usingBlock:^(std::string eventName, folly::dynamic event) {
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
index dc852ff001da6d..feac1dd6d2117d 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
@@ -22,6 +22,13 @@ - (instancetype)init
   }
   _touchHandler = [RCTSurfaceTouchHandler new];
 
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
+  if (@available(iOS 13.0, *)) {
+    self.modalInPresentation = YES;
+  }
+#endif
+
   return self;
 }
 
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h
index b61196c4c57b0a..3a93dbc70cc5c0 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h
@@ -25,6 +25,8 @@
  * Subclasses may override this method.
  * Default implementation calls `[UIViewController dismissViewControllerAnimated:completion:]`.
  */
-- (void)dismissViewController:(UIViewController *)modalViewController animated:(BOOL)animated;
+- (void)dismissViewController:(UIViewController *)modalViewController
+                     animated:(BOOL)animated
+                   completion:(void (^)(void))completion;
 
 @end
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
index 01648dd2f423d9..16ae9beeec2342 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
@@ -7,6 +7,8 @@
 
 #import "RCTModalHostViewComponentView.h"
 
+#import <React/RCTBridge+Private.h>
+#import <React/RCTModalManager.h>
 #import <React/UIView+React.h>
 #import <react/renderer/components/modal/ModalHostViewComponentDescriptor.h>
 #import <react/renderer/components/modal/ModalHostViewState.h>
@@ -98,8 +100,9 @@ @interface RCTModalHostViewComponentView () <RCTFabricModalHostViewControllerDel
 
 @implementation RCTModalHostViewComponentView {
   RCTFabricModalHostViewController *_viewController;
-  ModalHostViewShadowNode::ConcreteStateTeller _stateTeller;
+  ModalHostViewShadowNode::ConcreteState::Shared _state;
   BOOL _shouldAnimatePresentation;
+  BOOL _shouldPresent;
   BOOL _isPresented;
   UIView *_modalContentsSnapshot;
 }
@@ -135,40 +138,61 @@ - (void)presentViewController:(UIViewController *)modalViewController
   [controller presentViewController:modalViewController animated:animated completion:completion];
 }
 
-- (void)dismissViewController:(UIViewController *)modalViewController animated:(BOOL)animated
+- (void)dismissViewController:(UIViewController *)modalViewController
+                     animated:(BOOL)animated
+                   completion:(void (^)(void))completion
 {
-  [modalViewController dismissViewControllerAnimated:animated completion:nil];
+  [modalViewController dismissViewControllerAnimated:animated completion:completion];
 }
 
 - (void)ensurePresentedOnlyIfNeeded
 {
-  BOOL shouldBePresented = !_isPresented && self.window;
+  BOOL shouldBePresented = !_isPresented && _shouldPresent && self.window;
   if (shouldBePresented) {
     _isPresented = YES;
     [self presentViewController:self.viewController
                        animated:_shouldAnimatePresentation
                      completion:^{
-                       if (!self->_eventEmitter) {
-                         return;
-                       }
+                       auto eventEmitter = [self modalEventEmitter];
+                       if (eventEmitter) {
+                         eventEmitter->onShow(ModalHostViewEventEmitter::OnShow{});
 
-                       assert(std::dynamic_pointer_cast<ModalHostViewEventEmitter const>(self->_eventEmitter));
-                       auto eventEmitter =
-                           std::static_pointer_cast<ModalHostViewEventEmitter const>(self->_eventEmitter);
-                       eventEmitter->onShow(ModalHostViewEventEmitter::OnShow{});
+                         // A hack so that EventEmitter.cpp's eventTarget_ does not become null when modal is dismissed
+                         eventEmitter->setEnabled(true);
+                       }
                      }];
   }
 
-  BOOL shouldBeHidden = _isPresented && !self.superview;
+  BOOL shouldBeHidden = _isPresented && (!_shouldPresent || !self.superview);
   if (shouldBeHidden) {
     _isPresented = NO;
     // To animate dismissal of view controller, snapshot of
     // view hierarchy needs to be added to the UIViewController.
-    [self.viewController.view addSubview:_modalContentsSnapshot];
-    [self dismissViewController:self.viewController animated:_shouldAnimatePresentation];
+    UIView *snapshot = _modalContentsSnapshot;
+    [self.viewController.view addSubview:snapshot];
+
+    [self dismissViewController:self.viewController
+                       animated:_shouldAnimatePresentation
+                     completion:^{
+                       [snapshot removeFromSuperview];
+                       auto eventEmitter = [self modalEventEmitter];
+                       if (eventEmitter) {
+                         eventEmitter->onDismiss(ModalHostViewEventEmitter::OnDismiss{});
+                       }
+                     }];
   }
 }
 
+- (std::shared_ptr<const ModalHostViewEventEmitter>)modalEventEmitter
+{
+  if (!self->_eventEmitter) {
+    return nullptr;
+  }
+
+  assert(std::dynamic_pointer_cast<ModalHostViewEventEmitter const>(self->_eventEmitter));
+  return std::static_pointer_cast<ModalHostViewEventEmitter const>(self->_eventEmitter);
+}
+
 #pragma mark - RCTMountingTransactionObserving
 
 - (void)mountingTransactionWillMountWithMetadata:(MountingTransactionMetadata const &)metadata
@@ -194,15 +218,15 @@ - (void)didMoveToSuperview
 
 - (void)boundsDidChange:(CGRect)newBounds
 {
-  if (_eventEmitter) {
-    assert(std::dynamic_pointer_cast<ModalHostViewEventEmitter const>(_eventEmitter));
-
-    auto eventEmitter = std::static_pointer_cast<ModalHostViewEventEmitter const>(_eventEmitter);
+  auto eventEmitter = [self modalEventEmitter];
+  if (eventEmitter) {
     eventEmitter->onOrientationChange(onOrientationChangeStruct(newBounds));
   }
 
-  auto newState = ModalHostViewState{RCTSizeFromCGSize(newBounds.size)};
-  _stateTeller.updateState(std::move(newState));
+  if (_state != nullptr) {
+    auto newState = ModalHostViewState{RCTSizeFromCGSize(newBounds.size)};
+    _state->updateState(std::move(newState));
+  }
 }
 
 #pragma mark - RCTComponentViewProtocol
@@ -215,9 +239,10 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
-  _stateTeller.invalidate();
+  _state.reset();
   _viewController = nil;
   _isPresented = NO;
+  _shouldPresent = NO;
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
@@ -228,18 +253,22 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   self.viewController.supportedInterfaceOrientations = supportedOrientationsMask(newProps.supportedOrientations);
 #endif
 
-  std::tuple<BOOL, UIModalTransitionStyle> result = animationConfiguration(newProps.animationType);
-  _shouldAnimatePresentation = std::get<0>(result);
-  self.viewController.modalTransitionStyle = std::get<1>(result);
+  auto const [shouldAnimate, transitionStyle] = animationConfiguration(newProps.animationType);
+  _shouldAnimatePresentation = shouldAnimate;
+  self.viewController.modalTransitionStyle = transitionStyle;
 
   self.viewController.modalPresentationStyle = presentationConfiguration(newProps);
 
+  _shouldPresent = newProps.visible;
+  [self ensurePresentedOnlyIfNeeded];
+
   [super updateProps:props oldProps:oldProps];
 }
 
-- (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
+- (void)updateState:(facebook::react::State::Shared const &)state
+           oldState:(facebook::react::State::Shared const &)oldState
 {
-  _stateTeller.setConcreteState(state);
+  _state = std::static_pointer_cast<const ModalHostViewShadowNode::ConcreteState>(state);
 }
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
@@ -253,3 +282,19 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
 }
 
 @end
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Can't the import generated Plugin.h because plugins are not in this BUCK target
+Class<RCTComponentViewProtocol> RCTModalHostViewCls(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+Class<RCTComponentViewProtocol> RCTModalHostViewCls(void)
+{
+  return RCTModalHostViewComponentView.class;
+}
diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h
deleted file mode 100644
index 62f6d1e61a68c5..00000000000000
--- a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <React/RCTViewComponentView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * UIView class for root <Picker> component.
- */
-@interface RCTPickerComponentView : RCTViewComponentView
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
deleted file mode 100644
index d1a2037473a78d..00000000000000
--- a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTPickerComponentView.h"
-
-#import <React/RCTConvert.h>
-#import <React/RCTLog.h>
-#import <UIKit/UIKit.h>
-#import <react/renderer/components/iospicker/PickerComponentDescriptor.h>
-#import <react/renderer/components/iospicker/PickerEventEmitter.h>
-#import <react/renderer/components/iospicker/PickerProps.h>
-#import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
-
-#import "FBRCTFabricComponentsPlugins.h"
-#import "RCTConversions.h"
-
-using namespace facebook::react;
-
-@interface RCTPickerComponentView () <UIPickerViewAccessibilityDelegate, UIPickerViewDelegate, UIPickerViewDataSource>
-
-@end
-
-@implementation RCTPickerComponentView {
-  UIPickerView *_pickerView;
-  std::vector<PickerItemsStruct> _items;
-  NSInteger _selectedIndex;
-  NSString *_accessibilityLabel;
-  NSDictionary<NSAttributedStringKey, id> *_textAttributes;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    _pickerView = [[UIPickerView alloc] initWithFrame:self.bounds];
-    self.contentView = _pickerView;
-    [self setPropsToDefault];
-  }
-
-  return self;
-}
-
-- (void)setPropsToDefault
-{
-  static const auto defaultProps = std::make_shared<const PickerProps>();
-  _props = defaultProps;
-  _pickerView.delegate = self;
-  _pickerView.dataSource = self;
-  _selectedIndex = NSNotFound;
-  NSMutableParagraphStyle *const paragraphStyle = [NSMutableParagraphStyle new];
-  paragraphStyle.alignment = NSTextAlignmentCenter;
-  _textAttributes = @{
-    NSForegroundColorAttributeName : [UIColor blackColor],
-    NSFontAttributeName : [UIFont systemFontOfSize:21],
-    NSParagraphStyleAttributeName : paragraphStyle
-  };
-}
-
-- (void)prepareForRecycle
-{
-  [super prepareForRecycle];
-  _selectedIndex = NSNotFound;
-}
-
-#pragma mark - RCTComponentViewProtocol
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<PickerComponentDescriptor>();
-}
-
-- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
-{
-  const auto &oldPickerProps = *std::static_pointer_cast<const PickerProps>(_props);
-  const auto &newPickerProps = *std::static_pointer_cast<const PickerProps>(props);
-  bool needsToReload = false;
-
-  if (oldPickerProps.items != newPickerProps.items) {
-    _items = newPickerProps.items;
-    needsToReload = true;
-  }
-
-  if (oldPickerProps.selectedIndex != newPickerProps.selectedIndex) {
-    _selectedIndex = newPickerProps.selectedIndex;
-    [self setSelectedIndex];
-  }
-
-  if (oldPickerProps.textAttributes != newPickerProps.textAttributes) {
-    _textAttributes = RCTNSTextAttributesFromTextAttributes(newPickerProps.getEffectiveTextAttributes());
-    needsToReload = true;
-  }
-
-  // TODO (T75217510) - Figure out testID.
-  if (oldPickerProps.testID != newPickerProps.testID) {
-  }
-
-  if (oldPickerProps.accessibilityLabel != newPickerProps.accessibilityLabel) {
-    _accessibilityLabel = [NSString stringWithUTF8String:newPickerProps.accessibilityLabel.c_str()];
-  }
-
-  if (needsToReload) {
-    [_pickerView reloadAllComponents];
-  }
-
-  [super updateProps:props oldProps:oldProps];
-}
-
-#pragma mark - Native Commands
-
-- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
-{
-  if ([commandName isEqualToString:@"setNativeSelectedIndex"] && [args objectAtIndex:0]) {
-    NSNumber *selectedIndex = [args objectAtIndex:0];
-    if (_selectedIndex != selectedIndex.integerValue) {
-      [self setSelectedIndex];
-    }
-  } else {
-    RCTLogWarn(@"Attempting to send unknown command to Picker component: %@", commandName);
-  }
-}
-
-- (void)setSelectedIndex
-{
-  BOOL animated = _selectedIndex != NSNotFound; // Don't animate the initial value.
-  [_pickerView selectRow:_selectedIndex inComponent:0 animated:animated];
-}
-
-#pragma mark - UIPickerViewDataSource protocol
-
-- (NSInteger)numberOfComponentsInPickerView:(__unused UIPickerView *)pickerView
-{
-  return 1;
-}
-
-- (NSInteger)pickerView:(__unused UIPickerView *)pickerView numberOfRowsInComponent:(__unused NSInteger)component
-{
-  return _items.size();
-}
-
-#pragma mark - UIPickerViewDelegate methods
-
-- (NSString *)pickerView:(__unused UIPickerView *)pickerView
-             titleForRow:(NSInteger)row
-            forComponent:(__unused NSInteger)component
-{
-  return [NSString stringWithUTF8String:_items[row].label.c_str()];
-}
-
-- (CGFloat)pickerView:(__unused UIPickerView *)pickerView rowHeightForComponent:(NSInteger)__unused component
-{
-  return ((UIFont *)_textAttributes[NSFontAttributeName]).pointSize + 19;
-}
-
-- (UIView *)pickerView:(UIPickerView *)pickerView
-            viewForRow:(NSInteger)row
-          forComponent:(NSInteger)component
-           reusingView:(UILabel *)label
-{
-  if (!label) {
-    label = [[UILabel alloc] initWithFrame:(CGRect){CGPointZero,
-                                                    {
-                                                        [pickerView rowSizeForComponent:component].width,
-                                                        [pickerView rowSizeForComponent:component].height,
-                                                    }}];
-  }
-  NSMutableDictionary<NSAttributedStringKey, id> *attributes = [_textAttributes mutableCopy];
-  // Color can be passed in from <Picker style={}/> or from <Picker.Item color={}/>
-  // If Picker.Item color is set, use that. Else fall back to Picker style (with black as default).
-  if (RCTUIColorFromSharedColor(_items[row].textColor)) {
-    attributes[NSForegroundColorAttributeName] = RCTUIColorFromSharedColor(_items[row].textColor);
-  }
-  label.attributedText = [[NSAttributedString alloc] initWithString:[self pickerView:pickerView
-                                                                         titleForRow:row
-                                                                        forComponent:component]
-                                                         attributes:attributes];
-  return label;
-}
-
-- (void)pickerView:(__unused UIPickerView *)pickerView
-      didSelectRow:(NSInteger)row
-       inComponent:(__unused NSInteger)component
-{
-  _selectedIndex = row;
-  PickerEventEmitter::PickerIOSChangeEvent event = {.newValue = _items[row].value, .newIndex = (int)row};
-  if (_eventEmitter) {
-    std::static_pointer_cast<PickerEventEmitter const>(_eventEmitter)->onChange(event);
-  }
-}
-
-#pragma mark - UIPickerViewAccessibilityDelegate protocol
-
-- (NSString *)pickerView:(UIPickerView *)pickerView accessibilityLabelForComponent:(NSInteger)component
-{
-  return _accessibilityLabel;
-}
-
-@end
-
-Class<RCTComponentViewProtocol> RCTPickerCls(void)
-{
-  return RCTPickerComponentView.class;
-}
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
index 47cd8759fab861..78e52b5e3f5eb0 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
@@ -35,12 +35,12 @@ Class<RCTComponentViewProtocol> RCTPullToRefreshViewCls(void) __attribute__((use
 Class<RCTComponentViewProtocol> RCTActivityIndicatorViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSliderCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSwitchCls(void) __attribute__((used));
-Class<RCTComponentViewProtocol> RCTPickerCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTUnimplementedNativeViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTParagraphCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTTextInputCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTInputAccessoryCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTViewCls(void) __attribute__((used));
+Class<RCTComponentViewProtocol> RCTImageCls(void) __attribute__((used));
 
 #ifdef __cplusplus
 }
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
index e5ed57f33af978..2d11085a92a3a5 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
@@ -24,12 +24,12 @@
     {"ActivityIndicatorView", RCTActivityIndicatorViewCls},
     {"Slider", RCTSliderCls},
     {"Switch", RCTSwitchCls},
-    {"Picker", RCTPickerCls},
     {"UnimplementedNativeView", RCTUnimplementedNativeViewCls},
     {"Paragraph", RCTParagraphCls},
     {"TextInput", RCTTextInputCls},
     {"InputAccessoryView", RCTInputAccessoryCls},
     {"View", RCTViewCls},
+    {"Image", RCTImageCls},
   };
 
   auto p = sFabricComponentsClassMap.find(name);
diff --git a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
index 7623c1099f93b0..fa362f134a4b6f 100644
--- a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
@@ -10,15 +10,13 @@
 #import <React/RCTUtils.h>
 #import <react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h>
 #import <react/renderer/components/safeareaview/SafeAreaViewState.h>
-#import "FBRCTFabricComponentsPlugins.h"
 #import "RCTConversions.h"
 #import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
 
 @implementation RCTSafeAreaViewComponentView {
-  SafeAreaViewShadowNode::ConcreteStateTeller _stateTeller;
-  EdgeInsets _lastPaddingStateWasUpdatedWith;
+  SafeAreaViewShadowNode::ConcreteState::Shared _state;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -50,6 +48,10 @@ - (void)safeAreaInsetsDidChange
 
 - (void)_updateStateIfNecessary
 {
+  if (!_state) {
+    return;
+  }
+
   UIEdgeInsets insets = [self _safeAreaInsets];
   insets.left = RCTRoundPixelValue(insets.left);
   insets.top = RCTRoundPixelValue(insets.top);
@@ -58,35 +60,47 @@ - (void)_updateStateIfNecessary
 
   auto newPadding = RCTEdgeInsetsFromUIEdgeInsets(insets);
   auto threshold = 1.0 / RCTScreenScale() + 0.01; // Size of a pixel plus some small threshold.
-  auto deltaPadding = newPadding - _lastPaddingStateWasUpdatedWith;
-
-  if (std::abs(deltaPadding.left) < threshold && std::abs(deltaPadding.top) < threshold &&
-      std::abs(deltaPadding.right) < threshold && std::abs(deltaPadding.bottom) < threshold) {
-    return;
-  }
 
-  _lastPaddingStateWasUpdatedWith = newPadding;
-  _stateTeller.updateState(SafeAreaViewState{newPadding});
+  _state->updateState(
+      [=](SafeAreaViewShadowNode::ConcreteState::Data const &oldData)
+          -> SafeAreaViewShadowNode::ConcreteState::SharedData {
+        auto oldPadding = oldData.padding;
+        auto deltaPadding = newPadding - oldPadding;
+
+        if (std::abs(deltaPadding.left) < threshold && std::abs(deltaPadding.top) < threshold &&
+            std::abs(deltaPadding.right) < threshold && std::abs(deltaPadding.bottom) < threshold) {
+          return nullptr;
+        }
+
+        auto newData = oldData;
+        newData.padding = newPadding;
+        return std::make_shared<SafeAreaViewShadowNode::ConcreteState::Data const>(newData);
+      });
 }
 
 #pragma mark - RCTComponentViewProtocol
 
-- (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
++ (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  _stateTeller.setConcreteState(state);
-  [self _updateStateIfNecessary];
+  return concreteComponentDescriptorProvider<SafeAreaViewComponentDescriptor>();
 }
 
-- (void)prepareForRecycle
+- (void)updateState:(facebook::react::State::Shared const &)state
+           oldState:(facebook::react::State::Shared const &)oldState
 {
-  [super prepareForRecycle];
-  _stateTeller.invalidate();
-  _lastPaddingStateWasUpdatedWith = {};
+  _state = std::static_pointer_cast<SafeAreaViewShadowNode::ConcreteState const>(state);
 }
 
-+ (ComponentDescriptorProvider)componentDescriptorProvider
+- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 {
-  return concreteComponentDescriptorProvider<SafeAreaViewComponentDescriptor>();
+  [super finalizeUpdates:updateMask];
+  [self _updateStateIfNecessary];
+}
+
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  _state.reset();
 }
 
 @end
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h
index f6325ea2934cea..fa0c29dd6d97a6 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.h
@@ -52,6 +52,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL snapToEnd;
 @property (nonatomic, copy) NSArray<NSNumber *> *snapToOffsets;
 
+/*
+ * Makes `setContentOffset:` method no-op when given `block` is executed.
+ * The block is being executed synchronously.
+ */
+- (void)preserveContentOffsetWithBlock:(void (^)())block;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
index 8afa0c906e1e8e..80514c2a54f6ca 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
@@ -13,6 +13,7 @@ @interface RCTEnhancedScrollView () <UIScrollViewDelegate>
 
 @implementation RCTEnhancedScrollView {
   __weak id<UIScrollViewDelegate> _publicDelegate;
+  BOOL _isSetContentOffsetDisabled;
 }
 
 + (BOOL)automaticallyNotifiesObserversForKey:(NSString *)key
@@ -36,6 +37,11 @@ - (instancetype)initWithFrame:(CGRect)frame
       self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     }
 
+    // We intentionally force `UIScrollView`s `semanticContentAttribute` to `LTR` here
+    // because this attribute affects a position of vertical scrollbar; we don't want this
+    // scrollbar flip because we also flip it with whole `UIScrollView` flip.
+    self.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+
     __weak __typeof(self) weakSelf = self;
     _delegateSplitter = [[RCTGenericDelegateSplitter alloc] initWithDelegateUpdateBlock:^(id delegate) {
       [weakSelf setPrivateDelegate:delegate];
@@ -46,6 +52,17 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
+- (void)preserveContentOffsetWithBlock:(void (^)())block
+{
+  if (!block) {
+    return;
+  }
+
+  _isSetContentOffsetDisabled = YES;
+  block();
+  _isSetContentOffsetDisabled = NO;
+}
+
 /*
  * Automatically centers the content such that if the content is smaller than the
  * ScrollView, we force it to be centered, but when you zoom or the content otherwise
@@ -54,6 +71,10 @@ - (instancetype)initWithFrame:(CGRect)frame
  */
 - (void)setContentOffset:(CGPoint)contentOffset
 {
+  if (_isSetContentOffsetDisabled) {
+    return;
+  }
+
   if (_centerContent && !CGSizeEqualToSize(self.contentSize, CGSizeZero)) {
     CGSize scrollViewSize = self.bounds.size;
     if (self.contentSize.width <= scrollViewSize.width) {
@@ -224,9 +245,9 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView
     // Pick snap point based on direction and proximity
     CGFloat fractionalIndex = (targetContentOffsetAlongAxis + alignmentOffset) / snapToIntervalF;
 
-    NSInteger snapIndex = velocityAlongAxis > 0.0
-        ? ceil(fractionalIndex)
-        : velocityAlongAxis < 0.0 ? floor(fractionalIndex) : round(fractionalIndex);
+    NSInteger snapIndex = velocityAlongAxis > 0.0 ? ceil(fractionalIndex)
+        : velocityAlongAxis < 0.0                 ? floor(fractionalIndex)
+                                                  : round(fractionalIndex);
     CGFloat newTargetContentOffset = (snapIndex * snapToIntervalF) - alignmentOffset;
 
     // Set new targetContentOffset
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm
index afcec45afa68cc..6d89e699307df8 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm
@@ -16,7 +16,7 @@
 #import <React/RCTRefreshableProtocol.h>
 #import <React/RCTScrollViewComponentView.h>
 
-#import "FBRCTFabricComponentsPlugins.h"
+#import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index d958209607f6a2..885e8636f180ea 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -40,6 +40,18 @@ static UIScrollViewKeyboardDismissMode RCTUIKeyboardDismissModeFromProps(ScrollV
   }
 }
 
+static UIScrollViewIndicatorStyle RCTUIScrollViewIndicatorStyleFromProps(ScrollViewProps const &props)
+{
+  switch (props.indicatorStyle) {
+    case ScrollViewIndicatorStyle::Default:
+      return UIScrollViewIndicatorStyleDefault;
+    case ScrollViewIndicatorStyle::Black:
+      return UIScrollViewIndicatorStyleBlack;
+    case ScrollViewIndicatorStyle::White:
+      return UIScrollViewIndicatorStyleWhite;
+  }
+}
+
 static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteger tag)
 {
   static uint16_t coalescingKey = 0;
@@ -64,7 +76,7 @@ @interface RCTScrollViewComponentView () <
 @end
 
 @implementation RCTScrollViewComponentView {
-  ScrollViewShadowNode::ConcreteStateTeller _stateTeller;
+  ScrollViewShadowNode::ConcreteState::Shared _state;
   CGSize _contentSize;
   NSTimeInterval _lastScrollEventDispatchTime;
   NSTimeInterval _scrollEventThrottle;
@@ -74,9 +86,9 @@ @implementation RCTScrollViewComponentView {
   // some other part of the system scrolls scroll view.
   BOOL _isUserTriggeredScrolling;
 
-  BOOL _isOnDemandViewMountingEnabled;
   CGPoint _contentOffsetWhenClipped;
   NSMutableArray<UIView<RCTComponentViewProtocol> *> *_childComponentViews;
+  BOOL _subviewClippingEnabled;
 }
 
 + (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(UIView *)view
@@ -93,7 +105,6 @@ - (instancetype)initWithFrame:(CGRect)frame
     static const auto defaultProps = std::make_shared<const ScrollViewProps>();
     _props = defaultProps;
 
-    _isOnDemandViewMountingEnabled = RCTExperimentGetOnDemandViewMounting();
     _childComponentViews = [[NSMutableArray alloc] init];
 
     _scrollView = [[RCTEnhancedScrollView alloc] initWithFrame:self.bounds];
@@ -102,6 +113,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     ((RCTEnhancedScrollView *)_scrollView).overridingDelegate = self;
     _isUserTriggeredScrolling = NO;
     [self addSubview:_scrollView];
+    _subviewClippingEnabled = RCTGetRemoveClippedSubviewsEnabled();
 
     _containerView = [[UIView alloc] initWithFrame:CGRectZero];
     [_scrollView addSubview:_containerView];
@@ -140,6 +152,20 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
   return concreteComponentDescriptorProvider<ScrollViewComponentDescriptor>();
 }
 
+- (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
+           oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics
+{
+  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+  if (layoutMetrics.layoutDirection != oldLayoutMetrics.layoutDirection) {
+    CGAffineTransform transform = (layoutMetrics.layoutDirection == LayoutDirection::LeftToRight)
+        ? CGAffineTransformIdentity
+        : CGAffineTransformMakeScale(-1, 1);
+
+    _containerView.transform = transform;
+    _scrollView.transform = transform;
+  }
+}
+
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
   const auto &oldScrollViewProps = *std::static_pointer_cast<const ScrollViewProps>(_props);
@@ -166,7 +192,6 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   // MAP_SCROLL_VIEW_PROP(automaticallyAdjustContentInsets);
   MAP_SCROLL_VIEW_PROP(decelerationRate);
   MAP_SCROLL_VIEW_PROP(directionalLockEnabled);
-  // MAP_SCROLL_VIEW_PROP(indicatorStyle);
   MAP_SCROLL_VIEW_PROP(maximumZoomScale);
   MAP_SCROLL_VIEW_PROP(minimumZoomScale);
   MAP_SCROLL_VIEW_PROP(scrollEnabled);
@@ -176,6 +201,14 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   MAP_SCROLL_VIEW_PROP(showsHorizontalScrollIndicator);
   MAP_SCROLL_VIEW_PROP(showsVerticalScrollIndicator);
 
+  if (oldScrollViewProps.scrollIndicatorInsets != newScrollViewProps.scrollIndicatorInsets) {
+    _scrollView.scrollIndicatorInsets = RCTUIEdgeInsetsFromEdgeInsets(newScrollViewProps.scrollIndicatorInsets);
+  }
+
+  if (oldScrollViewProps.indicatorStyle != newScrollViewProps.indicatorStyle) {
+    _scrollView.indicatorStyle = RCTUIScrollViewIndicatorStyleFromProps(newScrollViewProps);
+  }
+
   if (oldScrollViewProps.scrollEventThrottle != newScrollViewProps.scrollEventThrottle) {
     // Zero means "send value only once per significant logical event".
     // Prop value is in milliseconds.
@@ -217,6 +250,14 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     scrollView.snapToOffsets = snapToOffsets;
   }
 
+  if (@available(iOS 13.0, *)) {
+    if (oldScrollViewProps.automaticallyAdjustsScrollIndicatorInsets !=
+        newScrollViewProps.automaticallyAdjustsScrollIndicatorInsets) {
+      scrollView.automaticallyAdjustsScrollIndicatorInsets =
+          newScrollViewProps.automaticallyAdjustsScrollIndicatorInsets;
+    }
+  }
+
   if (@available(iOS 11.0, *)) {
     if (oldScrollViewProps.contentInsetAdjustmentBehavior != newScrollViewProps.contentInsetAdjustmentBehavior) {
       auto const contentInsetAdjustmentBehavior = newScrollViewProps.contentInsetAdjustmentBehavior;
@@ -239,16 +280,14 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     scrollView.keyboardDismissMode = RCTUIKeyboardDismissModeFromProps(newScrollViewProps);
   }
 
-  // MAP_SCROLL_VIEW_PROP(scrollIndicatorInsets);
-
   [super updateProps:props oldProps:oldProps];
 }
 
 - (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
 {
   assert(std::dynamic_pointer_cast<ScrollViewShadowNode::ConcreteState const>(state));
-  _stateTeller.setConcreteState(state);
-  auto data = _stateTeller.getData().value();
+  _state = std::static_pointer_cast<ScrollViewShadowNode::ConcreteState const>(state);
+  auto &data = _state->getData();
 
   auto contentOffset = RCTCGPointFromPoint(data.contentOffset);
   if (!oldState && !CGPointEqualToPoint(contentOffset, CGPointZero)) {
@@ -262,33 +301,72 @@ - (void)updateState:(State::Shared const &)state oldState:(State::Shared const &
   }
 
   _contentSize = contentSize;
-  _containerView.frame = CGRect{CGPointZero, contentSize};
-  _scrollView.contentSize = contentSize;
+  _containerView.frame = CGRect{RCTCGPointFromPoint(data.contentBoundingRect.origin), contentSize};
+
+  [self _preserveContentOffsetIfNeededWithBlock:^{
+    self->_scrollView.contentSize = contentSize;
+  }];
+}
+
+/*
+ * Disables programmatical changing of ScrollView's `contentOffset` if a touch gesture is in progress.
+ */
+- (void)_preserveContentOffsetIfNeededWithBlock:(void (^)())block
+{
+  if (!block) {
+    return;
+  }
+
+  if (!_isUserTriggeredScrolling) {
+    return block();
+  }
+
+  [((RCTEnhancedScrollView *)_scrollView) preserveContentOffsetWithBlock:block];
 }
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  if (_isOnDemandViewMountingEnabled) {
-    [_childComponentViews insertObject:childComponentView atIndex:index];
-  } else {
+  if (_subviewClippingEnabled) {
     [_containerView insertSubview:childComponentView atIndex:index];
+  } else {
+    [_childComponentViews insertObject:childComponentView atIndex:index];
   }
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  if (_isOnDemandViewMountingEnabled) {
+  if (!_subviewClippingEnabled) {
     RCTAssert(
         [_childComponentViews objectAtIndex:index] == childComponentView,
         @"Attempt to unmount improperly mounted component view.");
     [_childComponentViews removeObjectAtIndex:index];
-    // In addition to removing a view from `_childComponentViews`,
-    // we have to unmount views immediately to not mess with recycling.
-    [childComponentView removeFromSuperview];
-  } else {
-    RCTAssert(childComponentView.superview == _containerView, @"Attempt to unmount improperly mounted component view.");
-    [childComponentView removeFromSuperview];
   }
+
+  // In addition to removing a view from `_childComponentViews`,
+  // we have to unmount views immediately to not mess with recycling.
+  [childComponentView removeFromSuperview];
+}
+
+/*
+ * Returns whether or not the scroll view interaction should be blocked because
+ * JavaScript was found to be the responder.
+ */
+- (BOOL)_shouldDisableScrollInteraction
+{
+  UIView *ancestorView = self.superview;
+
+  while (ancestorView) {
+    if ([ancestorView respondsToSelector:@selector(isJSResponder)]) {
+      BOOL isJSResponder = ((UIView<RCTComponentViewProtocol> *)ancestorView).isJSResponder;
+      if (isJSResponder) {
+        return YES;
+      }
+    }
+
+    ancestorView = ancestorView.superview;
+  }
+
+  return NO;
 }
 
 - (ScrollViewMetrics)_scrollViewMetrics
@@ -304,11 +382,14 @@ - (ScrollViewMetrics)_scrollViewMetrics
 
 - (void)_updateStateWithContentOffset
 {
+  if (!_state) {
+    return;
+  }
   auto contentOffset = RCTPointFromCGPoint(_scrollView.contentOffset);
-  _stateTeller.updateState([contentOffset](ScrollViewShadowNode::ConcreteState::Data const &data) {
+  _state->updateState([contentOffset](ScrollViewShadowNode::ConcreteState::Data const &data) {
     auto newData = data;
     newData.contentOffset = contentOffset;
-    return newData;
+    return std::make_shared<ScrollViewShadowNode::ConcreteState::Data const>(newData);
   });
 }
 
@@ -316,7 +397,7 @@ - (void)prepareForRecycle
 {
   const auto &props = *std::static_pointer_cast<const ScrollViewProps>(_props);
   _scrollView.contentOffset = RCTCGPointFromPoint(props.contentOffset);
-  _stateTeller.invalidate();
+  _state.reset();
   _isUserTriggeredScrolling = NO;
   [super prepareForRecycle];
 }
@@ -327,7 +408,7 @@ - (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view
 {
   // Historically, `UIScrollView`s in React Native do not cancel touches
   // started on `UIControl`-based views (as normal iOS `UIScrollView`s do).
-  return YES;
+  return ![self _shouldDisableScrollInteraction];
 }
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
@@ -452,7 +533,12 @@ - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(nullable UI
   [self _updateStateWithContentOffset];
 }
 
-#pragma mark - UIScrollViewDelegate
+- (UIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView
+{
+  return _containerView;
+}
+
+#pragma mark -
 
 - (void)_forceDispatchNextScrollEvent
 {
@@ -474,31 +560,29 @@ - (void)flashScrollIndicators
 - (void)scrollTo:(double)x y:(double)y animated:(BOOL)animated
 {
   CGPoint offset = CGPointMake(x, y);
-  if (!CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
-    CGRect maxRect = CGRectMake(
-        fmin(-_scrollView.contentInset.left, 0),
-        fmin(-_scrollView.contentInset.top, 0),
-        fmax(
-            _scrollView.contentSize.width - _scrollView.bounds.size.width + _scrollView.contentInset.right +
-                fmax(_scrollView.contentInset.left, 0),
-            0.01),
-        fmax(
-            _scrollView.contentSize.height - _scrollView.bounds.size.height + _scrollView.contentInset.bottom +
-                fmax(_scrollView.contentInset.top, 0),
-            0.01)); // Make width and height greater than 0
-
-    const auto &props = *std::static_pointer_cast<const ScrollViewProps>(_props);
-    if (!CGRectContainsPoint(maxRect, offset) && !props.scrollToOverflowEnabled) {
-      CGFloat localX = fmax(offset.x, CGRectGetMinX(maxRect));
-      localX = fmin(localX, CGRectGetMaxX(maxRect));
-      CGFloat localY = fmax(offset.y, CGRectGetMinY(maxRect));
-      localY = fmin(localY, CGRectGetMaxY(maxRect));
-      offset = CGPointMake(localX, localY);
-    }
+  CGRect maxRect = CGRectMake(
+      fmin(-_scrollView.contentInset.left, 0),
+      fmin(-_scrollView.contentInset.top, 0),
+      fmax(
+          _scrollView.contentSize.width - _scrollView.bounds.size.width + _scrollView.contentInset.right +
+              fmax(_scrollView.contentInset.left, 0),
+          0.01),
+      fmax(
+          _scrollView.contentSize.height - _scrollView.bounds.size.height + _scrollView.contentInset.bottom +
+              fmax(_scrollView.contentInset.top, 0),
+          0.01)); // Make width and height greater than 0
 
-    [self _forceDispatchNextScrollEvent];
-    [_scrollView setContentOffset:offset animated:animated];
+  const auto &props = *std::static_pointer_cast<const ScrollViewProps>(_props);
+  if (!CGRectContainsPoint(maxRect, offset) && !props.scrollToOverflowEnabled) {
+    CGFloat localX = fmax(offset.x, CGRectGetMinX(maxRect));
+    localX = fmin(localX, CGRectGetMaxX(maxRect));
+    CGFloat localY = fmax(offset.y, CGRectGetMinY(maxRect));
+    localY = fmin(localY, CGRectGetMaxY(maxRect));
+    offset = CGPointMake(localX, localY);
   }
+
+  [self _forceDispatchNextScrollEvent];
+  [self scrollToOffset:offset animated:animated];
 }
 
 - (void)scrollToEnd:(BOOL)animated
@@ -513,17 +597,13 @@ - (void)scrollToEnd:(BOOL)animated
     offset = CGPointMake(0, fmax(offsetY, 0));
   }
 
-  [_scrollView setContentOffset:offset animated:animated];
+  [self scrollToOffset:offset animated:animated];
 }
 
 #pragma mark - Child views mounting
 
 - (void)_remountChildrenIfNeeded
 {
-  if (!_isOnDemandViewMountingEnabled) {
-    return;
-  }
-
   CGPoint contentOffset = _scrollView.contentOffset;
 
   if (std::abs(_contentOffsetWhenClipped.x - contentOffset.x) < kClippingLeeway &&
@@ -538,67 +618,68 @@ - (void)_remountChildrenIfNeeded
 
 - (void)_remountChildren
 {
-  if (!_isOnDemandViewMountingEnabled) {
-    return;
-  }
-
-  CGRect visibleFrame = CGRect{_scrollView.contentOffset, _scrollView.bounds.size};
-  visibleFrame = CGRectInset(visibleFrame, -kClippingLeeway, -kClippingLeeway);
-
-  CGFloat scale = 1.0 / _scrollView.zoomScale;
-  visibleFrame.origin.x *= scale;
-  visibleFrame.origin.y *= scale;
-  visibleFrame.size.width *= scale;
-  visibleFrame.size.height *= scale;
-
+  if (_subviewClippingEnabled) {
+    [_scrollView updateClippedSubviewsWithClipRect:CGRectInset(_scrollView.bounds, -kClippingLeeway, -kClippingLeeway)
+                                    relativeToView:_scrollView];
+  } else {
+    CGRect visibleFrame = [_scrollView convertRect:_scrollView.bounds toView:_containerView];
+    visibleFrame = CGRectInset(visibleFrame, -kClippingLeeway, -kClippingLeeway);
+
+    // `zoomScale` is negative in RTL. Absolute value is needed.
+    CGFloat scale = 1.0 / std::abs(_scrollView.zoomScale);
+    visibleFrame.origin.x *= scale;
+    visibleFrame.origin.y *= scale;
+    visibleFrame.size.width *= scale;
+    visibleFrame.size.height *= scale;
 #ifndef NDEBUG
-  NSMutableArray<UIView<RCTComponentViewProtocol> *> *expectedSubviews = [NSMutableArray new];
+    NSMutableArray<UIView<RCTComponentViewProtocol> *> *expectedSubviews = [NSMutableArray new];
 #endif
 
-  NSInteger mountedIndex = 0;
-  for (UIView *componentView in _childComponentViews) {
-    BOOL shouldBeMounted = YES;
-    BOOL isMounted = componentView.superview != nil;
+    NSInteger mountedIndex = 0;
+    for (UIView *componentView in _childComponentViews) {
+      BOOL shouldBeMounted = YES;
+      BOOL isMounted = componentView.superview != nil;
 
-    // It's simpler and faster to not mess with views that are not `RCTViewComponentView` subclasses.
-    if ([componentView isKindOfClass:[RCTViewComponentView class]]) {
-      RCTViewComponentView *viewComponentView = (RCTViewComponentView *)componentView;
-      auto layoutMetrics = viewComponentView->_layoutMetrics;
+      // It's simpler and faster to not mess with views that are not `RCTViewComponentView` subclasses.
+      if ([componentView isKindOfClass:[RCTViewComponentView class]]) {
+        RCTViewComponentView *viewComponentView = (RCTViewComponentView *)componentView;
+        auto layoutMetrics = viewComponentView->_layoutMetrics;
 
-      if (layoutMetrics.overflowInset == EdgeInsets{}) {
-        shouldBeMounted = CGRectIntersectsRect(visibleFrame, componentView.frame);
+        if (layoutMetrics.overflowInset == EdgeInsets{}) {
+          shouldBeMounted = CGRectIntersectsRect(visibleFrame, componentView.frame);
+        }
       }
-    }
 
-    if (shouldBeMounted != isMounted) {
-      if (shouldBeMounted) {
-        [_containerView insertSubview:componentView atIndex:mountedIndex];
-      } else {
-        [componentView removeFromSuperview];
+      if (shouldBeMounted != isMounted) {
+        if (shouldBeMounted) {
+          [_containerView insertSubview:componentView atIndex:mountedIndex];
+        } else {
+          [componentView removeFromSuperview];
+        }
       }
-    }
 
-    if (shouldBeMounted) {
-      mountedIndex++;
-    }
+      if (shouldBeMounted) {
+        mountedIndex++;
+      }
 
 #ifndef NDEBUG
-    if (shouldBeMounted) {
-      [expectedSubviews addObject:componentView];
-    }
+      if (shouldBeMounted) {
+        [expectedSubviews addObject:componentView];
+      }
 #endif
-  }
+    }
 
 #ifndef NDEBUG
-  RCTAssert(
-      _containerView.subviews.count == expectedSubviews.count,
-      @"-[RCTScrollViewComponentView _remountChildren]: Inconsistency detected.");
-  for (NSInteger i = 0; i < expectedSubviews.count; i++) {
     RCTAssert(
-        [_containerView.subviews objectAtIndex:i] == [expectedSubviews objectAtIndex:i],
+        _containerView.subviews.count == expectedSubviews.count,
         @"-[RCTScrollViewComponentView _remountChildren]: Inconsistency detected.");
-  }
+    for (NSInteger i = 0; i < expectedSubviews.count; i++) {
+      RCTAssert(
+          [_containerView.subviews objectAtIndex:i] == [expectedSubviews objectAtIndex:i],
+          @"-[RCTScrollViewComponentView _remountChildren]: Inconsistency detected.");
+    }
 #endif
+  }
 }
 
 #pragma mark - RCTScrollableProtocol
@@ -617,12 +698,18 @@ - (void)scrollToOffset:(CGPoint)offset
 - (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated
 {
   [self _forceDispatchNextScrollEvent];
-  [self.scrollView setContentOffset:offset animated:animated];
+
+  if (_layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) {
+    // Adjusting offset.x in right to left layout direction.
+    offset.x = self.contentSize.width - _scrollView.frame.size.width - offset.x;
+  }
+
+  [_scrollView setContentOffset:offset animated:animated];
 }
 
 - (void)zoomToRect:(CGRect)rect animated:(BOOL)animated
 {
-  // Not implemented.
+  [_scrollView zoomToRect:rect animated:animated];
 }
 
 - (void)addScrollListener:(NSObject<UIScrollViewDelegate> *)scrollListener
diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
index af62366caa3be3..f9c4d89f9b10d9 100644
--- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
@@ -15,7 +15,7 @@
 #import <react/renderer/components/rncore/Props.h>
 #import <react/renderer/components/slider/SliderComponentDescriptor.h>
 
-#import "FBRCTFabricComponentsPlugins.h"
+#import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
index e680a25ba2827f..970414806e1cd9 100644
--- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
@@ -14,7 +14,7 @@
 #import <react/renderer/components/rncore/Props.h>
 #import <react/renderer/components/rncore/RCTComponentViewHelpers.h>
 
-#import "FBRCTFabricComponentsPlugins.h"
+#import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h
new file mode 100644
index 00000000000000..9a814731a9c2e5
--- /dev/null
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTAccessibilityElement : UIAccessibilityElement
+
+/*
+ * Frame of the accessibility element in parent coordinate system.
+ * Set to `CGRectZero` to use size of the container.
+ *
+ * Default value: `CGRectZero`.
+ */
+@property (nonatomic, assign) CGRect frame;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm
new file mode 100644
index 00000000000000..d9dcfd73c918a5
--- /dev/null
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTAccessibilityElement.mm
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTAccessibilityElement.h"
+
+@implementation RCTAccessibilityElement
+
+- (CGRect)accessibilityFrame
+{
+  UIView *container = (UIView *)self.accessibilityContainer;
+  if (CGRectEqualToRect(_frame, CGRectZero)) {
+    return UIAccessibilityConvertFrameToScreenCoordinates(container.bounds, container);
+  } else {
+    return UIAccessibilityConvertFrameToScreenCoordinates(_frame, container);
+  }
+}
+
+@end
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm
index fc40be86aceefc..1048679265d637 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm
@@ -13,6 +13,7 @@
 #import <react/renderer/textlayoutmanager/RCTTextLayoutManager.h>
 #import <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
+#import "RCTAccessibilityElement.h"
 #import "RCTConversions.h"
 #import "RCTFabricComponentsPlugins.h"
 #import "RCTLocalizationProvider.h"
@@ -56,14 +57,15 @@ - (instancetype)initWithString:(facebook::react::AttributedString)attributedStri
   // build an array of the accessibleElements
   NSMutableArray<UIAccessibilityElement *> *elements = [NSMutableArray new];
 
-  NSString *accessibilityLabel = [_view valueForKey:@"accessibilityLabel"];
-  if (!accessibilityLabel.length) {
+  NSString *accessibilityLabel = _view.accessibilityLabel;
+  if (accessibilityLabel.length == 0) {
     accessibilityLabel = RCTNSStringFromString(_attributedString.getString());
   }
   // add first element has the text for the whole textview in order to read out the whole text
-  UIAccessibilityElement *firstElement = [[UIAccessibilityElement alloc] initWithAccessibilityContainer:_view];
+  RCTAccessibilityElement *firstElement =
+      [[RCTAccessibilityElement alloc] initWithAccessibilityContainer:_view.superview];
   firstElement.isAccessibilityElement = YES;
-  firstElement.accessibilityTraits = UIAccessibilityTraitStaticText;
+  firstElement.accessibilityTraits = _view.accessibilityTraits;
   firstElement.accessibilityLabel = accessibilityLabel;
   firstElement.accessibilityFrame = UIAccessibilityConvertFrameToScreenCoordinates(_view.bounds, _view);
   [firstElement setAccessibilityActivationPoint:CGPointMake(
@@ -78,7 +80,11 @@ - (instancetype)initWithString:(facebook::react::AttributedString)attributedStri
                            enumerateAttribute:RCTTextAttributesAccessibilityRoleAttributeName
                                         frame:_frame
                                    usingBlock:^(CGRect fragmentRect, NSString *_Nonnull fragmentText, NSString *value) {
-                                     if (![value isEqualToString:@"button"] && ![value isEqualToString:@"link"]) {
+                                     if ([fragmentText isEqualToString:firstElement.accessibilityLabel]) {
+                                       // The fragment is the entire paragraph. This is handled as `firstElement`.
+                                       return;
+                                     }
+                                     if ((![value isEqualToString:@"button"] && ![value isEqualToString:@"link"])) {
                                        return;
                                      }
                                      if ([value isEqualToString:@"button"] &&
@@ -87,8 +93,8 @@ - (instancetype)initWithString:(facebook::react::AttributedString)attributedStri
                                        truncatedText = fragmentText;
                                        return;
                                      }
-                                     UIAccessibilityElement *element =
-                                         [[UIAccessibilityElement alloc] initWithAccessibilityContainer:self->_view];
+                                     RCTAccessibilityElement *element =
+                                         [[RCTAccessibilityElement alloc] initWithAccessibilityContainer:self->_view];
                                      element.isAccessibilityElement = YES;
                                      if ([value isEqualToString:@"link"]) {
                                        element.accessibilityTraits = UIAccessibilityTraitLink;
@@ -98,8 +104,7 @@ - (instancetype)initWithString:(facebook::react::AttributedString)attributedStri
                                        numberOfButtons++;
                                      }
                                      element.accessibilityLabel = fragmentText;
-                                     element.accessibilityFrame =
-                                         UIAccessibilityConvertFrameToScreenCoordinates(fragmentRect, self->_view);
+                                     element.frame = fragmentRect;
                                      [elements addObject:element];
                                    }];
 
diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
index 824a140c7c7063..53dfe92b9a1068 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -8,6 +8,7 @@
 #import "RCTParagraphComponentView.h"
 #import "RCTParagraphComponentAccessibilityProvider.h"
 
+#import <MobileCoreServices/UTCoreTypes.h>
 #import <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #import <react/renderer/components/text/ParagraphProps.h>
 #import <react/renderer/components/text/ParagraphState.h>
@@ -28,6 +29,7 @@ @implementation RCTParagraphComponentView {
   ParagraphShadowNode::ConcreteState::Shared _state;
   ParagraphAttributes _paragraphAttributes;
   RCTParagraphComponentAccessibilityProvider *_accessibilityProvider;
+  UILongPressGestureRecognizer *_longPressGestureRecognizer;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -36,7 +38,6 @@ - (instancetype)initWithFrame:(CGRect)frame
     static const auto defaultProps = std::make_shared<const ParagraphProps>();
     _props = defaultProps;
 
-    self.isAccessibilityElement = YES;
     self.opaque = NO;
     self.contentMode = UIViewContentModeRedraw;
   }
@@ -74,16 +75,25 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
 
 + (std::vector<facebook::react::ComponentDescriptorProvider>)supplementalComponentDescriptorProviders
 {
-  return {concreteComponentDescriptorProvider<RawTextComponentDescriptor>(),
-          concreteComponentDescriptorProvider<TextComponentDescriptor>()};
+  return {
+      concreteComponentDescriptorProvider<RawTextComponentDescriptor>(),
+      concreteComponentDescriptorProvider<TextComponentDescriptor>()};
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
-  const auto &paragraphProps = std::static_pointer_cast<const ParagraphProps>(props);
+  auto const &oldParagraphProps = *std::static_pointer_cast<ParagraphProps const>(_props);
+  auto const &newParagraphProps = *std::static_pointer_cast<ParagraphProps const>(props);
 
-  assert(paragraphProps);
-  _paragraphAttributes = paragraphProps->paragraphAttributes;
+  _paragraphAttributes = newParagraphProps.paragraphAttributes;
+
+  if (newParagraphProps.isSelectable != oldParagraphProps.isSelectable) {
+    if (newParagraphProps.isSelectable) {
+      [self enableContextMenu];
+    } else {
+      [self disableContextMenu];
+    }
+  }
 
   [super updateProps:props oldProps:oldProps];
 }
@@ -98,6 +108,7 @@ - (void)prepareForRecycle
 {
   [super prepareForRecycle];
   _state.reset();
+  _accessibilityProvider = nil;
 }
 
 - (void)drawRect:(CGRect)rect
@@ -106,8 +117,7 @@ - (void)drawRect:(CGRect)rect
     return;
   }
 
-  auto textLayoutManager = _state->getData().layoutManager;
-  assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
+  auto textLayoutManager = _state->getData().layoutManager.lock();
 
   if (!textLayoutManager) {
     return;
@@ -127,38 +137,45 @@ - (void)drawRect:(CGRect)rect
 
 - (NSString *)accessibilityLabel
 {
-  NSString *superAccessibilityLabel = RCTNSStringFromStringNilIfEmpty(_props->accessibilityLabel);
-  if (superAccessibilityLabel) {
-    return superAccessibilityLabel;
-  }
-
-  if (!_state) {
-    return nil;
-  }
+  return self.attributedText.string;
+}
 
-  return RCTNSStringFromString(_state->getData().attributedString.getString());
+- (BOOL)isAccessibilityElement
+{
+  // All accessibility functionality of the component is implemented in `accessibilityElements` method below.
+  // Hence to avoid calling all other methods from `UIAccessibilityContainer` protocol (most of them have default
+  // implementations), we return here `NO`.
+  return NO;
 }
 
 - (NSArray *)accessibilityElements
 {
-  if (!_state) {
+  auto const &paragraphProps = *std::static_pointer_cast<ParagraphProps const>(_props);
+
+  // If the component is not `accessible`, we return an empty array.
+  // We do this because logically all nested <Text> components represent the content of the <Paragraph> component;
+  // in other words, all nested <Text> components individually have no sense without the <Paragraph>.
+  if (!_state || !paragraphProps.accessible) {
     return [NSArray new];
   }
 
   auto &data = _state->getData();
 
   if (![_accessibilityProvider isUpToDate:data.attributedString]) {
-    RCTTextLayoutManager *textLayoutManager =
-        (RCTTextLayoutManager *)unwrapManagedObject(data.layoutManager->getNativeTextLayoutManager());
-    CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
-    _accessibilityProvider = [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
-                                                                                  layoutManager:textLayoutManager
-                                                                            paragraphAttributes:data.paragraphAttributes
-                                                                                          frame:frame
-                                                                                           view:self];
+    auto textLayoutManager = data.layoutManager.lock();
+    if (textLayoutManager) {
+      RCTTextLayoutManager *nativeTextLayoutManager =
+          (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
+      CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+      _accessibilityProvider =
+          [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
+                                                               layoutManager:nativeTextLayoutManager
+                                                         paragraphAttributes:data.paragraphAttributes
+                                                                       frame:frame
+                                                                        view:self];
+    }
   }
 
-  self.isAccessibilityElement = NO;
   return _accessibilityProvider.accessibilityElements;
 }
 
@@ -167,15 +184,15 @@ - (UIAccessibilityTraits)accessibilityTraits
   return [super accessibilityTraits] | UIAccessibilityTraitStaticText;
 }
 
+#pragma mark - RCTTouchableComponentViewProtocol
+
 - (SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point
 {
   if (!_state) {
     return _eventEmitter;
   }
 
-  auto textLayoutManager = _state->getData().layoutManager;
-
-  assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
+  auto textLayoutManager = _state->getData().layoutManager.lock();
 
   if (!textLayoutManager) {
     return _eventEmitter;
@@ -198,6 +215,77 @@ - (SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point
   return std::static_pointer_cast<const TouchEventEmitter>(eventEmitter);
 }
 
+#pragma mark - Context Menu
+
+- (void)enableContextMenu
+{
+  _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+                                                                              action:@selector(handleLongPress:)];
+  [self addGestureRecognizer:_longPressGestureRecognizer];
+}
+
+- (void)disableContextMenu
+{
+  [self removeGestureRecognizer:_longPressGestureRecognizer];
+  _longPressGestureRecognizer = nil;
+}
+
+- (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
+{
+  // TODO: Adopt showMenuFromRect (necessary for UIKitForMac)
+#if !TARGET_OS_UIKITFORMAC
+  UIMenuController *menuController = [UIMenuController sharedMenuController];
+
+  if (menuController.isMenuVisible) {
+    return;
+  }
+
+  if (!self.isFirstResponder) {
+    [self becomeFirstResponder];
+  }
+
+  [menuController setTargetRect:self.bounds inView:self];
+  [menuController setMenuVisible:YES animated:YES];
+#endif
+}
+
+- (BOOL)canBecomeFirstResponder
+{
+  auto const &paragraphProps = *std::static_pointer_cast<ParagraphProps const>(_props);
+  return paragraphProps.isSelectable;
+}
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+  auto const &paragraphProps = *std::static_pointer_cast<ParagraphProps const>(_props);
+
+  if (paragraphProps.isSelectable && action == @selector(copy:)) {
+    return YES;
+  }
+
+  return [self.nextResponder canPerformAction:action withSender:sender];
+}
+
+- (void)copy:(id)sender
+{
+  NSAttributedString *attributedText = self.attributedText;
+
+  NSMutableDictionary *item = [NSMutableDictionary new];
+
+  NSData *rtf = [attributedText dataFromRange:NSMakeRange(0, attributedText.length)
+                           documentAttributes:@{NSDocumentTypeDocumentAttribute : NSRTFDTextDocumentType}
+                                        error:nil];
+
+  if (rtf) {
+    [item setObject:rtf forKey:(id)kUTTypeFlatRTFD];
+  }
+
+  [item setObject:attributedText.string forKey:(id)kUTTypeUTF8PlainText];
+
+  UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
+  pasteboard.items = @[ item ];
+}
+
 @end
 
 Class<RCTComponentViewProtocol> RCTParagraphCls(void)
diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
index d43a49275e9d3a..8fe5537da5c39b 100644
--- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
@@ -29,7 +29,7 @@ @interface RCTTextInputComponentView () <RCTBackedTextInputDelegate, RCTTextInpu
 @end
 
 @implementation RCTTextInputComponentView {
-  TextInputShadowNode::ConcreteStateTeller _stateTeller;
+  TextInputShadowNode::ConcreteState::Shared _state;
   UIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
   NSUInteger _mostRecentEventCount;
   NSAttributedString *_lastStringStateWasUpdatedWith;
@@ -89,6 +89,7 @@ - (void)didMoveToWindow
     }
     _didMoveToWindow = YES;
   }
+  [self _restoreTextSelection];
 }
 
 #pragma mark - RCTViewComponentView overrides
@@ -208,27 +209,28 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   if (newTextInputProps.inputAccessoryViewID != oldTextInputProps.inputAccessoryViewID) {
     _backedTextInputView.inputAccessoryViewID = RCTNSStringFromString(newTextInputProps.inputAccessoryViewID);
   }
-
   [super updateProps:props oldProps:oldProps];
+
+  [self setDefaultInputAccessoryView];
 }
 
 - (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
 {
-  _stateTeller.setConcreteState(state);
+  _state = std::static_pointer_cast<TextInputShadowNode::ConcreteState const>(state);
 
-  if (!_stateTeller.isValid()) {
+  if (!_state) {
     assert(false && "State is `null` for <TextInput> component.");
     _backedTextInputView.attributedText = nil;
     return;
   }
 
-  auto data = _stateTeller.getData().value();
+  auto data = _state->getData();
 
   if (!oldState) {
-    _mostRecentEventCount = data.mostRecentEventCount;
+    _mostRecentEventCount = _state->getData().mostRecentEventCount;
   }
 
-  if (_mostRecentEventCount == data.mostRecentEventCount) {
+  if (_mostRecentEventCount == _state->getData().mostRecentEventCount) {
     _comingFromJS = YES;
     [self _setAttributedString:RCTNSAttributedStringFromAttributedStringBox(data.attributedStringBox)];
     _comingFromJS = NO;
@@ -249,13 +251,14 @@ - (void)updateLayoutMetrics:(LayoutMetrics const &)layoutMetrics
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
-  _stateTeller.invalidate();
+  _state.reset();
   _backedTextInputView.attributedText = nil;
   _mostRecentEventCount = 0;
   _comingFromJS = NO;
   _lastStringStateWasUpdatedWith = nil;
   _ignoreNextTextInputCall = NO;
   _didMoveToWindow = NO;
+  [_backedTextInputView resignFirstResponder];
 }
 
 #pragma mark - RCTBackedTextInputDelegate
@@ -333,6 +336,15 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
   if (props.maxLength) {
     NSInteger allowedLength = props.maxLength - _backedTextInputView.attributedText.string.length + range.length;
 
+    if (allowedLength > 0 && text.length > allowedLength) {
+      // make sure unicode characters that are longer than 16 bits (such as emojis) are not cut off
+      NSRange cutOffCharacterRange = [text rangeOfComposedCharacterSequenceAtIndex:allowedLength - 1];
+      if (cutOffCharacterRange.location + cutOffCharacterRange.length > allowedLength) {
+        // the character at the length limit takes more than 16bits, truncation should end at the character before
+        allowedLength = cutOffCharacterRange.location;
+      }
+    }
+
     if (allowedLength <= 0) {
       return nil;
     }
@@ -354,7 +366,7 @@ - (void)textInputDidChange
     return;
   }
 
-  if (_ignoreNextTextInputCall) {
+  if (_ignoreNextTextInputCall && [_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
     _ignoreNextTextInputCall = NO;
     return;
   }
@@ -409,11 +421,9 @@ - (void)setTextAndSelection:(NSInteger)eventCount
   }
   _comingFromJS = YES;
   if (![value isEqualToString:_backedTextInputView.attributedText.string]) {
-    NSMutableAttributedString *mutableString =
-        [[NSMutableAttributedString alloc] initWithAttributedString:_backedTextInputView.attributedText];
-    [mutableString replaceCharactersInRange:NSMakeRange(0, _backedTextInputView.attributedText.length)
-                                 withString:value];
-    [self _setAttributedString:mutableString];
+    NSAttributedString *attributedString =
+        [[NSAttributedString alloc] initWithString:value attributes:_backedTextInputView.defaultTextAttributes];
+    [self _setAttributedString:attributedString];
     [self _updateState];
   }
 
@@ -429,6 +439,58 @@ - (void)setTextAndSelection:(NSInteger)eventCount
   _comingFromJS = NO;
 }
 
+#pragma mark - Default input accessory view
+
+- (void)setDefaultInputAccessoryView
+{
+  // InputAccessoryView component sets the inputAccessoryView when inputAccessoryViewID exists
+  if (_backedTextInputView.inputAccessoryViewID) {
+    if (_backedTextInputView.isFirstResponder) {
+      [_backedTextInputView reloadInputViews];
+    }
+    return;
+  }
+
+  UIKeyboardType keyboardType = _backedTextInputView.keyboardType;
+
+  // These keyboard types (all are number pads) don't have a "Done" button by default,
+  // so we create an `inputAccessoryView` with this button for them.
+  BOOL shouldHaveInputAccesoryView =
+      (keyboardType == UIKeyboardTypeNumberPad || keyboardType == UIKeyboardTypePhonePad ||
+       keyboardType == UIKeyboardTypeDecimalPad || keyboardType == UIKeyboardTypeASCIICapableNumberPad) &&
+      _backedTextInputView.returnKeyType == UIReturnKeyDone;
+
+  if ((_backedTextInputView.inputAccessoryView != nil) == shouldHaveInputAccesoryView) {
+    return;
+  }
+
+  if (shouldHaveInputAccesoryView) {
+    UIToolbar *toolbarView = [[UIToolbar alloc] init];
+    [toolbarView sizeToFit];
+    UIBarButtonItem *flexibleSpace =
+        [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
+    UIBarButtonItem *doneButton =
+        [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+                                                      target:self
+                                                      action:@selector(handleInputAccessoryDoneButton)];
+    toolbarView.items = @[ flexibleSpace, doneButton ];
+    _backedTextInputView.inputAccessoryView = toolbarView;
+  } else {
+    _backedTextInputView.inputAccessoryView = nil;
+  }
+
+  if (_backedTextInputView.isFirstResponder) {
+    [_backedTextInputView reloadInputViews];
+  }
+}
+
+- (void)handleInputAccessoryDoneButton
+{
+  if ([self textInputShouldReturn]) {
+    [_backedTextInputView endEditing:YES];
+  }
+}
+
 #pragma mark - Other
 
 - (TextInputMetrics)_textInputMetrics
@@ -442,17 +504,16 @@ - (TextInputMetrics)_textInputMetrics
 
 - (void)_updateState
 {
-  if (!_stateTeller.isValid()) {
+  if (!_state) {
     return;
   }
-
   NSAttributedString *attributedString = _backedTextInputView.attributedText;
-  auto data = _stateTeller.getData().value();
+  auto data = _state->getData();
   _lastStringStateWasUpdatedWith = attributedString;
   data.attributedStringBox = RCTAttributedStringBoxFromNSAttributedString(attributedString);
   _mostRecentEventCount += _comingFromJS ? 0 : 1;
   data.mostRecentEventCount = _mostRecentEventCount;
-  _stateTeller.updateState(std::move(data));
+  _state->updateState(std::move(data));
 }
 
 - (AttributedString::Range)_selectionRange
@@ -465,19 +526,39 @@ - (void)_updateState
   return AttributedString::Range{(int)start, (int)(end - start)};
 }
 
-- (void)_setAttributedString:(NSAttributedString *)attributedString
+- (void)_restoreTextSelection
 {
-  UITextRange *selectedRange = [_backedTextInputView selectedTextRange];
-  if (![self _textOf:attributedString equals:_backedTextInputView.attributedText]) {
-    _backedTextInputView.attributedText = attributedString;
+  const auto selection = std::dynamic_pointer_cast<TextInputProps const>(_props)->selection.get_pointer();
+  if (selection == nullptr) {
+    return;
   }
-  if (_lastStringStateWasUpdatedWith.length == attributedString.length) {
-    // Calling `[_backedTextInputView setAttributedText]` moves caret
-    // to the end of text input field. This cancels any selection as well
-    // as position in the text input field. In case the length of string
-    // doesn't change, selection and caret position is maintained.
-    [_backedTextInputView setSelectedTextRange:selectedRange notifyDelegate:NO];
+  auto start = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
+                                                   offset:selection->start];
+  auto end = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument offset:selection->end];
+  auto range = [_backedTextInputView textRangeFromPosition:start toPosition:end];
+  [_backedTextInputView setSelectedTextRange:range notifyDelegate:YES];
+}
+
+- (void)_setAttributedString:(NSAttributedString *)attributedString
+{
+  if ([self _textOf:attributedString equals:_backedTextInputView.attributedText]) {
+    return;
   }
+  UITextRange *selectedRange = _backedTextInputView.selectedTextRange;
+  NSInteger oldTextLength = _backedTextInputView.attributedText.string.length;
+  _backedTextInputView.attributedText = attributedString;
+  if (selectedRange.empty) {
+    // Maintaining a cursor position relative to the end of the old text.
+    NSInteger offsetStart = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
+                                                          toPosition:selectedRange.start];
+    NSInteger offsetFromEnd = oldTextLength - offsetStart;
+    NSInteger newOffset = attributedString.string.length - offsetFromEnd;
+    UITextPosition *position = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
+                                                                   offset:newOffset];
+    [_backedTextInputView setSelectedTextRange:[_backedTextInputView textRangeFromPosition:position toPosition:position]
+                                notifyDelegate:YES];
+  }
+  [self _restoreTextSelection];
   _lastStringStateWasUpdatedWith = attributedString;
 }
 
diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm
index 51ead371f74443..a861c36c38aefa 100644
--- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm
+++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm
@@ -180,8 +180,54 @@ UIReturnKeyType RCTUIReturnKeyTypeFromReturnKeyType(ReturnKeyType returnKeyType)
 API_AVAILABLE(ios(10.0))
 UITextContentType RCTUITextContentTypeFromString(std::string const &contentType)
 {
-  // TODO: Implement properly (T26519801).
-  return RCTNSStringFromStringNilIfEmpty(contentType);
+  static dispatch_once_t onceToken;
+  static NSDictionary<NSString *, NSString *> *contentTypeMap;
+
+  dispatch_once(&onceToken, ^{
+    NSMutableDictionary<NSString *, NSString *> *mutableContentTypeMap = [@{
+      @"" : @"",
+      @"none" : @"",
+      @"URL" : UITextContentTypeURL,
+      @"addressCity" : UITextContentTypeAddressCity,
+      @"addressCityAndState" : UITextContentTypeAddressCityAndState,
+      @"addressState" : UITextContentTypeAddressState,
+      @"countryName" : UITextContentTypeCountryName,
+      @"creditCardNumber" : UITextContentTypeCreditCardNumber,
+      @"emailAddress" : UITextContentTypeEmailAddress,
+      @"familyName" : UITextContentTypeFamilyName,
+      @"fullStreetAddress" : UITextContentTypeFullStreetAddress,
+      @"givenName" : UITextContentTypeGivenName,
+      @"jobTitle" : UITextContentTypeJobTitle,
+      @"location" : UITextContentTypeLocation,
+      @"middleName" : UITextContentTypeMiddleName,
+      @"name" : UITextContentTypeName,
+      @"namePrefix" : UITextContentTypeNamePrefix,
+      @"nameSuffix" : UITextContentTypeNameSuffix,
+      @"nickname" : UITextContentTypeNickname,
+      @"organizationName" : UITextContentTypeOrganizationName,
+      @"postalCode" : UITextContentTypePostalCode,
+      @"streetAddressLine1" : UITextContentTypeStreetAddressLine1,
+      @"streetAddressLine2" : UITextContentTypeStreetAddressLine2,
+      @"sublocality" : UITextContentTypeSublocality,
+      @"telephoneNumber" : UITextContentTypeTelephoneNumber,
+    } mutableCopy];
+
+    if (@available(iOS 11.0, *)) {
+      [mutableContentTypeMap
+          addEntriesFromDictionary:@{@"username" : UITextContentTypeUsername, @"password" : UITextContentTypePassword}];
+    }
+
+    if (@available(iOS 12.0, *)) {
+      [mutableContentTypeMap addEntriesFromDictionary:@{
+        @"newPassword" : UITextContentTypeNewPassword,
+        @"oneTimeCode" : UITextContentTypeOneTimeCode
+      }];
+    }
+
+    contentTypeMap = [mutableContentTypeMap copy];
+  });
+
+  return contentTypeMap[RCTNSStringFromString(contentType)] ?: @"";
 }
 
 API_AVAILABLE(ios(12.0))
diff --git a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm
index d7eaa6c62a54fc..04e426d7ab9e5b 100644
--- a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm
@@ -16,7 +16,7 @@
 
 #import <React/RCTConversions.h>
 
-#import "FBRCTFabricComponentsPlugins.h"
+#import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
 
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 70eec56a685b8c..86748bcfe6b7b7 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -23,6 +23,9 @@ @implementation RCTViewComponentView {
   UIColor *_backgroundColor;
   CALayer *_borderLayer;
   BOOL _needsInvalidateLayer;
+  BOOL _isJSResponder;
+  BOOL _removeClippedSubviews;
+  NSMutableArray<UIView *> *_reactSubviews;
   NSSet<NSString *> *_Nullable _propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN;
 }
 
@@ -31,6 +34,7 @@ - (instancetype)initWithFrame:(CGRect)frame
   if (self = [super initWithFrame:frame]) {
     static auto const defaultProps = std::make_shared<ViewProps const>();
     _props = defaultProps;
+    _reactSubviews = [NSMutableArray new];
     self.multipleTouchEnabled = YES;
   }
   return self;
@@ -85,6 +89,81 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
   return concreteComponentDescriptorProvider<ViewComponentDescriptor>();
 }
 
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+  RCTAssert(
+      childComponentView.superview == nil,
+      @"Attempt to mount already mounted component view. (parent: %@, child: %@, index: %@, existing parent: %@)",
+      self,
+      childComponentView,
+      @(index),
+      @([childComponentView.superview tag]));
+
+  if (_removeClippedSubviews) {
+    [_reactSubviews insertObject:childComponentView atIndex:index];
+  } else {
+    [self insertSubview:childComponentView atIndex:index];
+  }
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+  if (_removeClippedSubviews) {
+    [_reactSubviews removeObjectAtIndex:index];
+  } else {
+    RCTAssert(
+        childComponentView.superview == self,
+        @"Attempt to unmount a view which is mounted inside different view. (parent: %@, child: %@, index: %@)",
+        self,
+        childComponentView,
+        @(index));
+    RCTAssert(
+        (self.subviews.count > index) && [self.subviews objectAtIndex:index] == childComponentView,
+        @"Attempt to unmount a view which has a different index. (parent: %@, child: %@, index: %@, actual index: %@, tag at index: %@)",
+        self,
+        childComponentView,
+        @(index),
+        @([self.subviews indexOfObject:childComponentView]),
+        @([[self.subviews objectAtIndex:index] tag]));
+  }
+
+  [childComponentView removeFromSuperview];
+}
+
+- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView
+{
+  if (!_removeClippedSubviews) {
+    // Use default behavior if unmounting is disabled
+    return [super updateClippedSubviewsWithClipRect:clipRect relativeToView:clipView];
+  }
+
+  if (_reactSubviews.count == 0) {
+    // Do nothing if we have no subviews
+    return;
+  }
+
+  if (CGSizeEqualToSize(self.bounds.size, CGSizeZero)) {
+    // Do nothing if layout hasn't happened yet
+    return;
+  }
+
+  // Convert clipping rect to local coordinates
+  clipRect = [clipView convertRect:clipRect toView:self];
+
+  // Mount / unmount views
+  for (UIView *view in _reactSubviews) {
+    if (CGRectIntersectsRect(clipRect, view.frame)) {
+      // View is at least partially visible, so remount it if unmounted
+      [self addSubview:view];
+      // View is visible, update clipped subviews
+      [view updateClippedSubviewsWithClipRect:clipRect relativeToView:self];
+    } else if (view.superview) {
+      // View is completely outside the clipRect, so unmount it
+      [view removeFromSuperview];
+    }
+  }
+}
+
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
   RCTAssert(props, @"`props` must not be `null`.");
@@ -112,6 +191,14 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     needsInvalidateLayer = YES;
   }
 
+  if (RCTGetRemoveClippedSubviewsEnabled() &&
+      oldViewProps.removeClippedSubviews != newViewProps.removeClippedSubviews) {
+    _removeClippedSubviews = newViewProps.removeClippedSubviews;
+    if (_removeClippedSubviews && self.subviews.count > 0) {
+      _reactSubviews = [NSMutableArray arrayWithArray:self.subviews];
+    }
+  }
+
   // `backgroundColor`
   if (oldViewProps.backgroundColor != newViewProps.backgroundColor) {
     self.backgroundColor = RCTUIColorFromSharedColor(newViewProps.backgroundColor);
@@ -174,10 +261,11 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
   // `hitSlop`
   if (oldViewProps.hitSlop != newViewProps.hitSlop) {
-    self.hitTestEdgeInsets = {-newViewProps.hitSlop.top,
-                              -newViewProps.hitSlop.left,
-                              -newViewProps.hitSlop.bottom,
-                              -newViewProps.hitSlop.right};
+    self.hitTestEdgeInsets = {
+        -newViewProps.hitSlop.top,
+        -newViewProps.hitSlop.left,
+        -newViewProps.hitSlop.bottom,
+        -newViewProps.hitSlop.right};
   }
 
   // `overflow`
@@ -248,6 +336,29 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 #endif
   }
 
+  // `accessibilityValue`
+  if (oldViewProps.accessibilityValue != newViewProps.accessibilityValue) {
+    if (newViewProps.accessibilityValue.text.hasValue()) {
+      self.accessibilityElement.accessibilityValue =
+          RCTNSStringFromStringNilIfEmpty(newViewProps.accessibilityValue.text.value());
+    } else if (
+        newViewProps.accessibilityValue.now.hasValue() && newViewProps.accessibilityValue.min.hasValue() &&
+        newViewProps.accessibilityValue.max.hasValue()) {
+      CGFloat val = (CGFloat)(newViewProps.accessibilityValue.now.value()) /
+          (newViewProps.accessibilityValue.max.value() - newViewProps.accessibilityValue.min.value());
+      self.accessibilityElement.accessibilityValue =
+          [NSNumberFormatter localizedStringFromNumber:@(val) numberStyle:NSNumberFormatterPercentStyle];
+      ;
+    } else {
+      self.accessibilityElement.accessibilityValue = nil;
+    }
+  }
+
+  // `testId`
+  if (oldViewProps.testId != newViewProps.testId) {
+    self.accessibilityIdentifier = RCTNSStringFromString(newViewProps.testId);
+  }
+
   _needsInvalidateLayer = _needsInvalidateLayer || needsInvalidateLayer;
 
   _props = std::static_pointer_cast<ViewProps const>(props);
@@ -278,6 +389,16 @@ - (void)updateLayoutMetrics:(LayoutMetrics const &)layoutMetrics
   }
 }
 
+- (BOOL)isJSResponder
+{
+  return _isJSResponder;
+}
+
+- (void)setIsJSResponder:(BOOL)isJSResponder
+{
+  _isJSResponder = isJSResponder;
+}
+
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 {
   [super finalizeUpdates:updateMask];
@@ -304,6 +425,9 @@ - (void)prepareForRecycle
 
   _propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN = nil;
   _eventEmitter.reset();
+  _isJSResponder = NO;
+  _removeClippedSubviews = NO;
+  _reactSubviews = [NSMutableArray new];
 }
 
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(NSSet<NSString *> *_Nullable)props
@@ -332,9 +456,7 @@ - (UIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event
 
   BOOL clipsToBounds = self.clipsToBounds;
 
-  if (RCTExperimentGetOptimizedHitTesting()) {
-    clipsToBounds = clipsToBounds || _layoutMetrics.overflowInset == EdgeInsets{};
-  }
+  clipsToBounds = clipsToBounds || _layoutMetrics.overflowInset == EdgeInsets{};
 
   if (clipsToBounds && !isPointInside) {
     return nil;
@@ -367,18 +489,20 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 
 static RCTCornerRadii RCTCornerRadiiFromBorderRadii(BorderRadii borderRadii)
 {
-  return RCTCornerRadii{.topLeft = (CGFloat)borderRadii.topLeft,
-                        .topRight = (CGFloat)borderRadii.topRight,
-                        .bottomLeft = (CGFloat)borderRadii.bottomLeft,
-                        .bottomRight = (CGFloat)borderRadii.bottomRight};
+  return RCTCornerRadii{
+      .topLeft = (CGFloat)borderRadii.topLeft,
+      .topRight = (CGFloat)borderRadii.topRight,
+      .bottomLeft = (CGFloat)borderRadii.bottomLeft,
+      .bottomRight = (CGFloat)borderRadii.bottomRight};
 }
 
 static RCTBorderColors RCTCreateRCTBorderColorsFromBorderColors(BorderColors borderColors)
 {
-  return RCTBorderColors{.top = RCTCreateCGColorRefFromSharedColor(borderColors.top),
-                         .left = RCTCreateCGColorRefFromSharedColor(borderColors.left),
-                         .bottom = RCTCreateCGColorRefFromSharedColor(borderColors.bottom),
-                         .right = RCTCreateCGColorRefFromSharedColor(borderColors.right)};
+  return RCTBorderColors{
+      .top = RCTCreateCGColorRefFromSharedColor(borderColors.top),
+      .left = RCTCreateCGColorRefFromSharedColor(borderColors.left),
+      .bottom = RCTCreateCGColorRefFromSharedColor(borderColors.bottom),
+      .right = RCTCreateCGColorRefFromSharedColor(borderColors.right)};
 }
 
 static void RCTReleaseRCTBorderColors(RCTBorderColors borderColors)
@@ -486,9 +610,9 @@ - (void)invalidateLayer
     } else {
       CGSize imageSize = image.size;
       UIEdgeInsets imageCapInsets = image.capInsets;
-      CGRect contentsCenter =
-          CGRect{CGPoint{imageCapInsets.left / imageSize.width, imageCapInsets.top / imageSize.height},
-                 CGSize{(CGFloat)1.0 / imageSize.width, (CGFloat)1.0 / imageSize.height}};
+      CGRect contentsCenter = CGRect{
+          CGPoint{imageCapInsets.left / imageSize.width, imageCapInsets.top / imageSize.height},
+          CGSize{(CGFloat)1.0 / imageSize.width, (CGFloat)1.0 / imageSize.height}};
 
       _borderLayer.contents = (id)image.CGImage;
       _borderLayer.contentsScale = image.scale;
@@ -612,7 +736,7 @@ - (BOOL)shouldGroupAccessibilityChildren
   NSMutableArray<UIAccessibilityCustomAction *> *customActions = [NSMutableArray array];
   for (auto const &accessibilityAction : accessibilityActions) {
     [customActions
-        addObject:[[UIAccessibilityCustomAction alloc] initWithName:RCTNSStringFromString(accessibilityAction)
+        addObject:[[UIAccessibilityCustomAction alloc] initWithName:RCTNSStringFromString(accessibilityAction.name)
                                                              target:self
                                                            selector:@selector(didActivateAccessibilityCustomAction:)]];
   }
diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.h b/React/Fabric/Mounting/RCTComponentViewFactory.h
index 745df38f2f4d3b..a5193e63d95679 100644
--- a/React/Fabric/Mounting/RCTComponentViewFactory.h
+++ b/React/Fabric/Mounting/RCTComponentViewFactory.h
@@ -9,11 +9,13 @@
 
 #import <React/RCTComponentViewDescriptor.h>
 #import <React/RCTComponentViewProtocol.h>
-
+#import <jsi/jsi.h>
 #import <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+void RCTInstallNativeComponentRegistryBinding(facebook::jsi::Runtime &runtime);
+
 /**
  * Registry of supported component view classes that can instantiate
  * view component instances by given component handle.
@@ -23,13 +25,19 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Constructs and returns an instance of the class with a bunch of already registered standard components.
  */
-+ (RCTComponentViewFactory *)standardComponentViewFactory;
++ (RCTComponentViewFactory *)currentComponentViewFactory;
 
 /**
  * Registers a component view class in the factory.
  */
 - (void)registerComponentViewClass:(Class<RCTComponentViewProtocol>)componentViewClass;
 
+/**
+ * Registers component if there is a matching class. Returns true if it matching class is found or the component has
+ * already been registered, false otherwise.
+ */
+- (BOOL)registerComponentIfPossible:(std::string const &)componentName;
+
 /**
  * Creates a component view with given component handle.
  */
diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.mm b/React/Fabric/Mounting/RCTComponentViewFactory.mm
index 1c857b440c9d95..eef565f17dc81d 100644
--- a/React/Fabric/Mounting/RCTComponentViewFactory.mm
+++ b/React/Fabric/Mounting/RCTComponentViewFactory.mm
@@ -12,8 +12,12 @@
 
 #import <better/map.h>
 #import <better/mutex.h>
+#import <better/set.h>
 
 #import <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#import <react/renderer/componentregistry/componentNameByReactViewName.h>
+#import <react/renderer/componentregistry/native/NativeComponentRegistryBinding.h>
+#import <react/renderer/core/PropsParserContext.h>
 #import <react/renderer/core/ReactPrimitives.h>
 
 #ifdef RN_DISABLE_OSS_PLUGIN_HEADER
@@ -37,6 +41,15 @@
 
 using namespace facebook::react;
 
+void RCTInstallNativeComponentRegistryBinding(facebook::jsi::Runtime &runtime)
+{
+  auto hasComponentProvider = [](std::string const &name) -> bool {
+    return [[RCTComponentViewFactory currentComponentViewFactory]
+        registerComponentIfPossible:componentNameByReactViewName(name)];
+  };
+  NativeComponentRegistryBinding::install(runtime, std::move(hasComponentProvider));
+}
+
 static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char *componentName)
 {
   return RCTFabricComponentsProvider(componentName);
@@ -44,58 +57,31 @@
 
 @implementation RCTComponentViewFactory {
   better::map<ComponentHandle, RCTComponentViewClassDescriptor> _componentViewClasses;
+  better::set<std::string> _registeredComponentsNames;
   ComponentDescriptorProviderRegistry _providerRegistry;
   better::shared_mutex _mutex;
 }
 
-+ (RCTComponentViewFactory *)standardComponentViewFactory
++ (RCTComponentViewFactory *)currentComponentViewFactory
 {
-  RCTComponentViewFactory *componentViewFactory = [[RCTComponentViewFactory alloc] init];
-
-  [componentViewFactory registerComponentViewClass:[RCTRootComponentView class]];
-  [componentViewFactory registerComponentViewClass:[RCTViewComponentView class]];
-  [componentViewFactory registerComponentViewClass:[RCTParagraphComponentView class]];
-  [componentViewFactory registerComponentViewClass:[RCTTextInputComponentView class]];
-
-  Class<RCTComponentViewProtocol> imageClass = RCTComponentViewClassWithName("Image");
-  [componentViewFactory registerComponentViewClass:imageClass];
-
-  auto providerRegistry = &componentViewFactory->_providerRegistry;
+  static dispatch_once_t onceToken;
+  static RCTComponentViewFactory *componentViewFactory;
 
-  providerRegistry->setComponentDescriptorProviderRequest(
-      [providerRegistry, componentViewFactory](ComponentName requestedComponentName) {
-        // Fallback 1: Call provider function for component view class.
-        Class<RCTComponentViewProtocol> klass = RCTComponentViewClassWithName(requestedComponentName);
-        if (klass) {
-          [componentViewFactory registerComponentViewClass:klass];
-          return;
-        }
+  dispatch_once(&onceToken, ^{
+    componentViewFactory = [[RCTComponentViewFactory alloc] init];
+    [componentViewFactory registerComponentViewClass:[RCTRootComponentView class]];
+    [componentViewFactory registerComponentViewClass:[RCTViewComponentView class]];
+    [componentViewFactory registerComponentViewClass:[RCTParagraphComponentView class]];
+    [componentViewFactory registerComponentViewClass:[RCTTextInputComponentView class]];
 
-        // Fallback 2: Try to use Paper Interop.
-        if ([RCTLegacyViewManagerInteropComponentView isSupported:RCTNSStringFromString(requestedComponentName)]) {
-          auto flavor = std::make_shared<std::string const>(requestedComponentName);
-          auto componentName = ComponentName{flavor->c_str()};
-          auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
-          auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor;
+    Class<RCTComponentViewProtocol> imageClass = RCTComponentViewClassWithName("Image");
+    [componentViewFactory registerComponentViewClass:imageClass];
 
-          providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor});
-
-          componentViewFactory->_componentViewClasses[componentHandle] = [componentViewFactory
-              _componentViewClassDescriptorFromClass:[RCTLegacyViewManagerInteropComponentView class]];
-          return;
-        }
-
-        // Fallback 3: Finally use <UnimplementedView>.
-        auto flavor = std::make_shared<std::string const>(requestedComponentName);
-        auto componentName = ComponentName{flavor->c_str()};
-        auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
-        auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor;
-
-        providerRegistry->add(ComponentDescriptorProvider{componentHandle, componentName, flavor, constructor});
-
-        componentViewFactory->_componentViewClasses[componentHandle] =
-            [componentViewFactory _componentViewClassDescriptorFromClass:[RCTUnimplementedViewComponentView class]];
-      });
+    componentViewFactory->_providerRegistry.setComponentDescriptorProviderRequest(
+        [](ComponentName requestedComponentName) {
+          [componentViewFactory registerComponentIfPossible:requestedComponentName];
+        });
+  });
 
   return componentViewFactory;
 }
@@ -115,6 +101,51 @@ - (RCTComponentViewClassDescriptor)_componentViewClassDescriptorFromClass:(Class
 #pragma clang diagnostic pop
 }
 
+- (BOOL)registerComponentIfPossible:(std::string const &)name
+{
+  if (_registeredComponentsNames.find(name) != _registeredComponentsNames.end()) {
+    // Component has already been registered.
+    return YES;
+  }
+
+  // Fallback 1: Call provider function for component view class.
+  Class<RCTComponentViewProtocol> klass = RCTComponentViewClassWithName(name.c_str());
+  if (klass) {
+    [self registerComponentViewClass:klass];
+    return YES;
+  }
+
+  // Fallback 2: Try to use Paper Interop.
+  if ([RCTLegacyViewManagerInteropComponentView isSupported:RCTNSStringFromString(name)]) {
+    auto flavor = std::make_shared<std::string const>(name);
+    auto componentName = ComponentName{flavor->c_str()};
+    auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
+    auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor;
+
+    [self _addDescriptorToProviderRegistry:ComponentDescriptorProvider{
+                                               componentHandle, componentName, flavor, constructor}];
+
+    _componentViewClasses[componentHandle] =
+        [self _componentViewClassDescriptorFromClass:[RCTLegacyViewManagerInteropComponentView class]];
+    return YES;
+  }
+
+  // Fallback 3: use <UnimplementedView> if component doesn't exist.
+  auto flavor = std::make_shared<std::string const>(name);
+  auto componentName = ComponentName{flavor->c_str()};
+  auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
+  auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor;
+
+  [self _addDescriptorToProviderRegistry:ComponentDescriptorProvider{
+                                             componentHandle, componentName, flavor, constructor}];
+
+  _componentViewClasses[componentHandle] =
+      [self _componentViewClassDescriptorFromClass:[RCTUnimplementedViewComponentView class]];
+
+  // No matching class exists for `name`.
+  return NO;
+}
+
 - (void)registerComponentViewClass:(Class<RCTComponentViewProtocol>)componentViewClass
 {
   RCTAssert(componentViewClass, @"RCTComponentViewFactory: Provided `componentViewClass` is `nil`.");
@@ -123,14 +154,20 @@ - (void)registerComponentViewClass:(Class<RCTComponentViewProtocol>)componentVie
   auto componentDescriptorProvider = [componentViewClass componentDescriptorProvider];
   _componentViewClasses[componentDescriptorProvider.handle] =
       [self _componentViewClassDescriptorFromClass:componentViewClass];
-  _providerRegistry.add(componentDescriptorProvider);
+  [self _addDescriptorToProviderRegistry:componentDescriptorProvider];
 
   auto supplementalComponentDescriptorProviders = [componentViewClass supplementalComponentDescriptorProviders];
   for (const auto &provider : supplementalComponentDescriptorProviders) {
-    _providerRegistry.add(provider);
+    [self _addDescriptorToProviderRegistry:provider];
   }
 }
 
+- (void)_addDescriptorToProviderRegistry:(ComponentDescriptorProvider const &)provider
+{
+  _registeredComponentsNames.insert(provider.name);
+  _providerRegistry.add(provider);
+}
+
 - (RCTComponentViewDescriptor)createComponentViewWithComponentHandle:(facebook::react::ComponentHandle)componentHandle
 {
   RCTAssertMainQueue();
diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h
index 8183e419202a0d..11493c42798faa 100644
--- a/React/Fabric/Mounting/RCTComponentViewProtocol.h
+++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h
@@ -116,6 +116,9 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) {
  */
 - (facebook::react::SharedProps)props;
 
+- (BOOL)isJSResponder;
+- (void)setIsJSResponder:(BOOL)isJSResponder;
+
 /*
  * This is broken. Do not use.
  */
diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/React/Fabric/Mounting/RCTComponentViewRegistry.mm
index a8d21829d23090..1217cf71bf8704 100644
--- a/React/Fabric/Mounting/RCTComponentViewRegistry.mm
+++ b/React/Fabric/Mounting/RCTComponentViewRegistry.mm
@@ -29,7 +29,7 @@ @implementation RCTComponentViewRegistry {
 - (instancetype)init
 {
   if (self = [super init]) {
-    _componentViewFactory = [RCTComponentViewFactory standardComponentViewFactory];
+    _componentViewFactory = [RCTComponentViewFactory currentComponentViewFactory];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleApplicationDidReceiveMemoryWarningNotification)
diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h
index 0166914bed2949..cf713c1468f5aa 100644
--- a/React/Fabric/Mounting/RCTMountingManager.h
+++ b/React/Fabric/Mounting/RCTMountingManager.h
@@ -13,6 +13,7 @@
 #import <react/renderer/core/ReactPrimitives.h>
 #import <react/renderer/mounting/MountingCoordinator.h>
 #import <react/renderer/mounting/ShadowView.h>
+#import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,6 +27,22 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak) id<RCTMountingManagerDelegate> delegate;
 @property (nonatomic, strong) RCTComponentViewRegistry *componentViewRegistry;
 
+- (void)setContextContainer:(facebook::react::ContextContainer::Shared)contextContainer;
+
+/**
+ * Designates the view as a rendering viewport of a React Native surface.
+ * The provided view must not have any subviews, and the caller is not supposed to interact with the view hierarchy
+ * inside the provided view. The view hierarchy created by mounting infrastructure inside the provided view does not
+ * influence the intrinsic size of the view and cannot be measured using UIView/UIKit layout API.
+ * Must be called on the main thead.
+ */
+- (void)attachSurfaceToView:(UIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId;
+
+/**
+ * Stops designating the view as a rendering viewport of a React Native surface.
+ */
+- (void)detachSurfaceFromView:(UIView *)view surfaceId:(facebook::react::SurfaceId)surfaceId;
+
 /**
  * Schedule a mounting transaction to be performed on the main thread.
  * Can be called from any thread.
@@ -38,9 +55,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)dispatchCommand:(ReactTag)reactTag commandName:(NSString *)commandName args:(NSArray *)args;
 
+/**
+ * Dispatch an accessibility event to be performed on the main thread.
+ * Can be called from any thread.
+ */
+- (void)sendAccessibilityEvent:(ReactTag)reactTag eventType:(NSString *)eventType;
+
+- (void)setIsJSResponder:(BOOL)isJSResponder
+    blockNativeResponder:(BOOL)blockNativeResponder
+           forShadowView:(facebook::react::ShadowView)shadowView;
+
 - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
                              changedProps:(NSDictionary *)props
-                      componentDescriptor:(const facebook::react::ComponentDescriptor &)componentDescriptor;
+                      componentDescriptor:(facebook::react::ComponentDescriptor const &)componentDescriptor;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
index 387542399fc409..beb1ed2b660e3c 100644
--- a/React/Fabric/Mounting/RCTMountingManager.mm
+++ b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -13,6 +13,7 @@
 #import <React/RCTFollyConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
+#import <react/renderer/components/root/RootShadowNode.h>
 #import <react/renderer/core/LayoutableShadowNode.h>
 #import <react/renderer/core/RawProps.h>
 #import <react/renderer/debug/SystraceSection.h>
@@ -67,6 +68,8 @@ static void RCTPerformMountInstructions(
 
         UIView<RCTComponentViewProtocol> *newChildComponentView = newChildViewDescriptor.view;
 
+        RCTAssert(newChildShadowView.props, @"`newChildShadowView.props` must not be null.");
+
         [newChildComponentView updateProps:newChildShadowView.props oldProps:oldChildShadowView.props];
         [newChildComponentView updateEventEmitter:newChildShadowView.eventEmitter];
         [newChildComponentView updateState:newChildShadowView.state oldState:oldChildShadowView.state];
@@ -95,6 +98,8 @@ static void RCTPerformMountInstructions(
 
         auto mask = RNComponentViewUpdateMask{};
 
+        RCTAssert(newChildShadowView.props, @"`newChildShadowView.props` must not be null.");
+
         if (oldChildShadowView.props != newChildShadowView.props) {
           [newChildComponentView updateProps:newChildShadowView.props oldProps:oldChildShadowView.props];
           mask |= RNComponentViewUpdateMaskProps;
@@ -131,6 +136,7 @@ @implementation RCTMountingManager {
   RCTMountingTransactionObserverCoordinator _observerCoordinator;
   BOOL _transactionInFlight;
   BOOL _followUpTransactionRequired;
+  ContextContainer::Shared _contextContainer;
 }
 
 - (instancetype)init
@@ -142,6 +148,34 @@ - (instancetype)init
   return self;
 }
 
+- (void)setContextContainer:(ContextContainer::Shared)contextContainer
+{
+  _contextContainer = contextContainer;
+}
+
+- (void)attachSurfaceToView:(UIView *)view surfaceId:(SurfaceId)surfaceId
+{
+  RCTAssertMainQueue();
+
+  RCTAssert(view.subviews.count == 0, @"The view must not have any subviews.");
+
+  RCTComponentViewDescriptor rootViewDescriptor =
+      [_componentViewRegistry dequeueComponentViewWithComponentHandle:RootShadowNode::Handle() tag:surfaceId];
+  [view addSubview:rootViewDescriptor.view];
+}
+
+- (void)detachSurfaceFromView:(UIView *)view surfaceId:(SurfaceId)surfaceId
+{
+  RCTAssertMainQueue();
+  RCTComponentViewDescriptor rootViewDescriptor = [_componentViewRegistry componentViewDescriptorWithTag:surfaceId];
+
+  [rootViewDescriptor.view removeFromSuperview];
+
+  [_componentViewRegistry enqueueComponentViewWithComponentHandle:RootShadowNode::Handle()
+                                                              tag:surfaceId
+                                          componentViewDescriptor:rootViewDescriptor];
+}
+
 - (void)scheduleTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
 {
   if (RCTIsMainQueue()) {
@@ -176,6 +210,22 @@ - (void)dispatchCommand:(ReactTag)reactTag commandName:(NSString *)commandName a
   });
 }
 
+- (void)sendAccessibilityEvent:(ReactTag)reactTag eventType:(NSString *)eventType
+{
+  if (RCTIsMainQueue()) {
+    // Already on the proper thread, so:
+    // * No need to do a thread jump;
+    // * No need to allocate a block.
+    [self synchronouslyDispatchAccessbilityEventOnUIThread:reactTag eventType:eventType];
+    return;
+  }
+
+  RCTExecuteOnMainQueue(^{
+    RCTAssertMainQueue();
+    [self synchronouslyDispatchAccessbilityEventOnUIThread:reactTag eventType:eventType];
+  });
+}
+
 - (void)initiateTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
 {
   SystraceSection s("-[RCTMountingManager initiateTransaction:]");
@@ -215,6 +265,17 @@ - (void)performTransaction:(MountingCoordinator::Shared const &)mountingCoordina
       });
 }
 
+- (void)setIsJSResponder:(BOOL)isJSResponder
+    blockNativeResponder:(BOOL)blockNativeResponder
+           forShadowView:(facebook::react::ShadowView)shadowView
+{
+  RCTExecuteOnMainQueue(^{
+    UIView<RCTComponentViewProtocol> *componentView =
+        [self->_componentViewRegistry findComponentViewWithTag:shadowView.tag];
+    [componentView setIsJSResponder:isJSResponder];
+  });
+}
+
 - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
                              changedProps:(NSDictionary *)props
                       componentDescriptor:(const ComponentDescriptor &)componentDescriptor
@@ -222,7 +283,8 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
   RCTAssertMainQueue();
   UIView<RCTComponentViewProtocol> *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag];
   SharedProps oldProps = [componentView props];
-  SharedProps newProps = componentDescriptor.cloneProps(oldProps, RawProps(convertIdToFollyDynamic(props)));
+  SharedProps newProps = componentDescriptor.cloneProps(
+      PropsParserContext{-1, *_contextContainer.get()}, oldProps, RawProps(convertIdToFollyDynamic(props)));
 
   NSSet<NSString *> *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new];
   propKeys = [propKeys setByAddingObjectsFromArray:props.allKeys];
@@ -235,11 +297,9 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
   if (props[@"transform"] &&
       !CATransform3DEqualToTransform(
           RCTCATransform3DFromTransformMatrix(newViewProps.transform), componentView.layer.transform)) {
-    RCTLogWarn(@"transform was not applied during [RCTViewComponentView updateProps:oldProps:]");
     componentView.layer.transform = RCTCATransform3DFromTransformMatrix(newViewProps.transform);
   }
   if (props[@"opacity"] && componentView.layer.opacity != (float)newViewProps.opacity) {
-    RCTLogWarn(@"opacity was not applied during [RCTViewComponentView updateProps:oldProps:]");
     componentView.layer.opacity = newViewProps.opacity;
   }
 }
@@ -253,4 +313,12 @@ - (void)synchronouslyDispatchCommandOnUIThread:(ReactTag)reactTag
   [componentView handleCommand:commandName args:args];
 }
 
+- (void)synchronouslyDispatchAccessbilityEventOnUIThread:(ReactTag)reactTag eventType:(NSString *)eventType
+{
+  if ([@"focus" isEqualToString:eventType]) {
+    UIView<RCTComponentViewProtocol> *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag];
+    UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, componentView);
+  }
+}
+
 @end
diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
index 3cb45b8f7b7b93..2a3fdc9b3de2ce 100644
--- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
+++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
@@ -39,9 +39,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (facebook::react::SharedProps)props;
 
+- (void)setIsJSResponder:(BOOL)isJSResponder;
+
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet<NSString *> *)props;
 - (nullable NSSet<NSString *> *)propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN;
 
+- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
index c10dfbc8654024..a3704408f2d29c 100644
--- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
+++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
@@ -32,10 +32,11 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 {
   RCTAssert(
       childComponentView.superview == nil,
-      @"Attempt to mount already mounted component view. (parent: %@, child: %@, index: %@)",
+      @"Attempt to mount already mounted component view. (parent: %@, child: %@, index: %@, existing parent: %@)",
       self,
       childComponentView,
-      @(index));
+      @(index),
+      @([childComponentView.superview tag]));
   [self insertSubview:childComponentView atIndex:index];
 }
 
@@ -49,10 +50,12 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
       @(index));
   RCTAssert(
       (self.subviews.count > index) && [self.subviews objectAtIndex:index] == childComponentView,
-      @"Attempt to unmount a view which has a different index. (parent: %@, child: %@, index: %@)",
+      @"Attempt to unmount a view which has a different index. (parent: %@, child: %@, index: %@, actual index: %@, tag at index: %@)",
       self,
       childComponentView,
-      @(index));
+      @(index),
+      @([self.subviews indexOfObject:childComponentView]),
+      @([[self.subviews objectAtIndex:index] tag]));
 
   [childComponentView removeFromSuperview];
 }
@@ -132,6 +135,17 @@ - (void)prepareForRecycle
   return nullptr;
 }
 
+- (BOOL)isJSResponder
+{
+  // Default implementation always returns `NO`.
+  return NO;
+}
+
+- (void)setIsJSResponder:(BOOL)isJSResponder
+{
+  // Default implementation does nothing.
+}
+
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet<NSString *> *)propKeys
 {
   // Default implementation does nothing.
@@ -142,4 +156,16 @@ - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(nullable NSSet<N
   return nil;
 }
 
+- (void)updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView
+{
+  clipRect = [clipView convertRect:clipRect toView:self];
+
+  // Normal views don't support unmounting, so all
+  // this does is forward message to our subviews,
+  // in case any of those do support it
+  for (UIView *subview in self.subviews) {
+    [subview updateClippedSubviewsWithClipRect:clipRect relativeToView:self];
+  }
+}
+
 @end
diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
index 222e9ba85005b2..495198b9709317 100644
--- a/React/Fabric/RCTConversions.h
+++ b/React/Fabric/RCTConversions.h
@@ -141,27 +141,31 @@ inline UIAccessibilityTraits RCTUIAccessibilityTraitsFromAccessibilityTraits(
   if ((accessibilityTraits & AccessibilityTraits::Switch) != AccessibilityTraits::None) {
     result |= AccessibilityTraitSwitch;
   }
+  if ((accessibilityTraits & AccessibilityTraits::TabBar) != AccessibilityTraits::None) {
+    result |= UIAccessibilityTraitTabBar;
+  }
   return result;
 };
 
 inline CATransform3D RCTCATransform3DFromTransformMatrix(const facebook::react::Transform &transformMatrix)
 {
-  return {(CGFloat)transformMatrix.matrix[0],
-          (CGFloat)transformMatrix.matrix[1],
-          (CGFloat)transformMatrix.matrix[2],
-          (CGFloat)transformMatrix.matrix[3],
-          (CGFloat)transformMatrix.matrix[4],
-          (CGFloat)transformMatrix.matrix[5],
-          (CGFloat)transformMatrix.matrix[6],
-          (CGFloat)transformMatrix.matrix[7],
-          (CGFloat)transformMatrix.matrix[8],
-          (CGFloat)transformMatrix.matrix[9],
-          (CGFloat)transformMatrix.matrix[10],
-          (CGFloat)transformMatrix.matrix[11],
-          (CGFloat)transformMatrix.matrix[12],
-          (CGFloat)transformMatrix.matrix[13],
-          (CGFloat)transformMatrix.matrix[14],
-          (CGFloat)transformMatrix.matrix[15]};
+  return {
+      (CGFloat)transformMatrix.matrix[0],
+      (CGFloat)transformMatrix.matrix[1],
+      (CGFloat)transformMatrix.matrix[2],
+      (CGFloat)transformMatrix.matrix[3],
+      (CGFloat)transformMatrix.matrix[4],
+      (CGFloat)transformMatrix.matrix[5],
+      (CGFloat)transformMatrix.matrix[6],
+      (CGFloat)transformMatrix.matrix[7],
+      (CGFloat)transformMatrix.matrix[8],
+      (CGFloat)transformMatrix.matrix[9],
+      (CGFloat)transformMatrix.matrix[10],
+      (CGFloat)transformMatrix.matrix[11],
+      (CGFloat)transformMatrix.matrix[12],
+      (CGFloat)transformMatrix.matrix[13],
+      (CGFloat)transformMatrix.matrix[14],
+      (CGFloat)transformMatrix.matrix[15]};
 }
 
 inline facebook::react::Point RCTPointFromCGPoint(const CGPoint &point)
diff --git a/React/Fabric/RCTScheduler.h b/React/Fabric/RCTScheduler.h
index 20536137226c74..68353bfea68d8b 100644
--- a/React/Fabric/RCTScheduler.h
+++ b/React/Fabric/RCTScheduler.h
@@ -14,6 +14,7 @@
 #import <react/renderer/core/LayoutContext.h>
 #import <react/renderer/mounting/MountingCoordinator.h>
 #import <react/renderer/scheduler/SchedulerToolbox.h>
+#import <react/renderer/scheduler/SurfaceHandler.h>
 #import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -31,6 +32,13 @@ NS_ASSUME_NONNULL_BEGIN
                         commandName:(std::string const &)commandName
                                args:(folly::dynamic const)args;
 
+- (void)schedulerDidSendAccessibilityEvent:(facebook::react::ShadowView const &)shadowView
+                                 eventType:(std::string const &)eventType;
+
+- (void)schedulerDidSetIsJSResponder:(BOOL)isJSResponder
+                blockNativeResponder:(BOOL)blockNativeResponder
+                       forShadowView:(facebook::react::ShadowView const &)shadowView;
+
 @end
 
 /**
@@ -42,26 +50,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithToolbox:(facebook::react::SchedulerToolbox)toolbox;
 
-- (void)startSurfaceWithSurfaceId:(facebook::react::SurfaceId)surfaceId
-                       moduleName:(NSString *)moduleName
-                     initialProps:(NSDictionary *)initialProps
-                layoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                    layoutContext:(facebook::react::LayoutContext)layoutContext;
-
-- (void)stopSurfaceWithSurfaceId:(facebook::react::SurfaceId)surfaceId;
-
-- (CGSize)measureSurfaceWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                                layoutContext:(facebook::react::LayoutContext)layoutContext
-                                    surfaceId:(facebook::react::SurfaceId)surfaceId;
-
-- (void)constraintSurfaceLayoutWithLayoutConstraints:(facebook::react::LayoutConstraints)layoutConstraints
-                                       layoutContext:(facebook::react::LayoutContext)layoutContext
-                                           surfaceId:(facebook::react::SurfaceId)surfaceId;
+- (void)registerSurface:(facebook::react::SurfaceHandler const &)surfaceHandler;
+- (void)unregisterSurface:(facebook::react::SurfaceHandler const &)surfaceHandler;
 
 - (facebook::react::ComponentDescriptor const *)findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN:
     (facebook::react::ComponentHandle)handle;
 
-- (facebook::react::MountingCoordinator::Shared)mountingCoordinatorWithSurfaceId:(facebook::react::SurfaceId)surfaceId;
+- (void)setupAnimationDriver:(facebook::react::SurfaceHandler const &)surfaceHandler;
 
 - (void)onAnimationStarted;
 
diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm
index 31190002461596..228e92b8a7df5b 100644
--- a/React/Fabric/RCTScheduler.mm
+++ b/React/Fabric/RCTScheduler.mm
@@ -30,10 +30,19 @@ void schedulerDidFinishTransaction(MountingCoordinator::Shared const &mountingCo
     [scheduler.delegate schedulerDidFinishTransaction:mountingCoordinator];
   }
 
-  void schedulerDidRequestPreliminaryViewAllocation(SurfaceId surfaceId, const ShadowView &shadowView) override
+  void schedulerDidRequestPreliminaryViewAllocation(SurfaceId surfaceId, const ShadowNode &shadowNode) override
   {
     // Does nothing.
-    // Preemptive allocation of native views on iOS does not require this call.
+    // This delegate method is not currently used on iOS.
+  }
+
+  void schedulerDidCloneShadowNode(
+      SurfaceId surfaceId,
+      const ShadowNode &oldShadowNode,
+      const ShadowNode &newShadowNode) override
+  {
+    // Does nothing.
+    // This delegate method is not currently used on iOS.
   }
 
   void schedulerDidDispatchCommand(
@@ -45,18 +54,19 @@ void schedulerDidDispatchCommand(
     [scheduler.delegate schedulerDidDispatchCommand:shadowView commandName:commandName args:args];
   }
 
-  void schedulerDidSetJSResponder(
-      SurfaceId surfaceId,
-      const ShadowView &shadowView,
-      const ShadowView &initialShadowView,
-      bool blockNativeResponder) override
+  void schedulerDidSetIsJSResponder(ShadowView const &shadowView, bool isJSResponder, bool blockNativeResponder)
+      override
   {
-    // Does nothing for now.
+    RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
+    [scheduler.delegate schedulerDidSetIsJSResponder:isJSResponder
+                                blockNativeResponder:blockNativeResponder
+                                       forShadowView:shadowView];
   }
 
-  void schedulerDidClearJSResponder() override
+  void schedulerDidSendAccessibilityEvent(const ShadowView &shadowView, std::string const &eventType) override
   {
-    // Does nothing for now.
+    RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
+    [scheduler.delegate schedulerDidSendAccessibilityEvent:shadowView eventType:eventType];
   }
 
  private:
@@ -83,8 +93,8 @@ void onAllAnimationsComplete() override
     [scheduler onAllAnimationsComplete];
   }
 
-  void activityDidChange(RunLoopObserver::Delegate const *delegate, RunLoopObserver::Activity activity) const
-      noexcept override
+  void activityDidChange(RunLoopObserver::Delegate const *delegate, RunLoopObserver::Activity activity)
+      const noexcept override
   {
     RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
     [scheduler animationTick];
@@ -103,7 +113,7 @@ @implementation RCTScheduler {
   BOOL _layoutAnimationsEnabled;
 }
 
-- (instancetype)initWithToolbox:(facebook::react::SchedulerToolbox)toolbox
+- (instancetype)initWithToolbox:(SchedulerToolbox)toolbox
 {
   if (self = [super init]) {
     auto reactNativeConfig =
@@ -141,41 +151,14 @@ - (void)dealloc
   _animationDriver = nullptr;
 }
 
-- (void)startSurfaceWithSurfaceId:(SurfaceId)surfaceId
-                       moduleName:(NSString *)moduleName
-                     initialProps:(NSDictionary *)initialProps
-                layoutConstraints:(LayoutConstraints)layoutConstraints
-                    layoutContext:(LayoutContext)layoutContext
-{
-  SystraceSection s("-[RCTScheduler startSurfaceWithSurfaceId:...]");
-
-  auto props = convertIdToFollyDynamic(initialProps);
-  _scheduler->startSurface(
-      surfaceId, RCTStringFromNSString(moduleName), props, layoutConstraints, layoutContext, _animationDriver);
-  _scheduler->renderTemplateToSurface(
-      surfaceId, props.getDefault("navigationConfig").getDefault("initialUITemplate", "").getString());
-}
-
-- (void)stopSurfaceWithSurfaceId:(SurfaceId)surfaceId
-{
-  SystraceSection s("-[RCTScheduler stopSurfaceWithSurfaceId:]");
-  _scheduler->stopSurface(surfaceId);
-}
-
-- (CGSize)measureSurfaceWithLayoutConstraints:(LayoutConstraints)layoutConstraints
-                                layoutContext:(LayoutContext)layoutContext
-                                    surfaceId:(SurfaceId)surfaceId
+- (void)registerSurface:(facebook::react::SurfaceHandler const &)surfaceHandler
 {
-  SystraceSection s("-[RCTScheduler measureSurfaceWithLayoutConstraints:]");
-  return RCTCGSizeFromSize(_scheduler->measureSurface(surfaceId, layoutConstraints, layoutContext));
+  _scheduler->registerSurface(surfaceHandler);
 }
 
-- (void)constraintSurfaceLayoutWithLayoutConstraints:(LayoutConstraints)layoutConstraints
-                                       layoutContext:(LayoutContext)layoutContext
-                                           surfaceId:(SurfaceId)surfaceId
+- (void)unregisterSurface:(facebook::react::SurfaceHandler const &)surfaceHandler
 {
-  SystraceSection s("-[RCTScheduler constraintSurfaceLayoutWithLayoutConstraints:]");
-  _scheduler->constraintSurfaceLayout(surfaceId, layoutConstraints, layoutContext);
+  _scheduler->unregisterSurface(surfaceHandler);
 }
 
 - (ComponentDescriptor const *)findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN:(ComponentHandle)handle
@@ -183,9 +166,9 @@ - (ComponentDescriptor const *)findComponentDescriptorByHandle_DO_NOT_USE_THIS_I
   return _scheduler->findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN(handle);
 }
 
-- (MountingCoordinator::Shared)mountingCoordinatorWithSurfaceId:(SurfaceId)surfaceId
+- (void)setupAnimationDriver:(facebook::react::SurfaceHandler const &)surfaceHandler
 {
-  return _scheduler->findMountingCoordinator(surfaceId);
+  surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(_animationDriver);
 }
 
 - (void)onAnimationStarted
diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h
index 061ed0da81683b..0053a376ee1c17 100644
--- a/React/Fabric/RCTSurfacePresenter.h
+++ b/React/Fabric/RCTSurfacePresenter.h
@@ -11,6 +11,7 @@
 #import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTSurfaceStage.h>
 #import <ReactCommon/RuntimeExecutor.h>
+#import <react/renderer/scheduler/SurfaceHandler.h>
 #import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -45,33 +46,25 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTSurfacePresenter (Surface) <RCTSurfacePresenterStub>
 
-/**
+/*
  * Surface uses these methods to register itself in the Presenter.
  */
 - (void)registerSurface:(RCTFabricSurface *)surface;
 - (void)unregisterSurface:(RCTFabricSurface *)surface;
-- (void)setProps:(NSDictionary *)props surface:(RCTFabricSurface *)surface;
-
-- (nullable RCTFabricSurface *)surfaceForRootTag:(ReactTag)rootTag;
 
-/**
- * Measures the Surface with given constraints.
- */
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
-                      maximumSize:(CGSize)maximumSize
-                          surface:(RCTFabricSurface *)surface;
+@property (readonly) RCTMountingManager *mountingManager;
 
-/**
- * Sets `minimumSize` and `maximumSize` layout constraints for the Surface.
- */
-- (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize surface:(RCTFabricSurface *)surface;
+- (nullable RCTFabricSurface *)surfaceForRootTag:(ReactTag)rootTag;
 
 - (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag props:(NSDictionary *)props;
 
-- (BOOL)synchronouslyWaitSurface:(RCTFabricSurface *)surface timeout:(NSTimeInterval)timeout;
+- (void)setupAnimationDriverWithSurfaceHandler:(facebook::react::SurfaceHandler const &)surfaceHandler;
 
+/*
+ * Deprecated.
+ * Use `RCTMountingTransactionObserverCoordinator` instead.
+ */
 - (void)addObserver:(id<RCTSurfacePresenterObserver>)observer;
-
 - (void)removeObserver:(id<RCTSurfacePresenterObserver>)observer;
 
 /*
diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
index c16af9779fcb3f..82fdc0978fa195 100644
--- a/React/Fabric/RCTSurfacePresenter.mm
+++ b/React/Fabric/RCTSurfacePresenter.mm
@@ -10,6 +10,7 @@
 #import <mutex>
 
 #import <React/RCTAssert.h>
+#import <React/RCTBridge+Private.h>
 #import <React/RCTComponentViewFactory.h>
 #import <React/RCTComponentViewRegistry.h>
 #import <React/RCTConstants.h>
@@ -26,9 +27,7 @@
 
 #import <react/config/ReactNativeConfig.h>
 #import <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#import <react/renderer/components/root/RootShadowNode.h>
-#import <react/renderer/core/LayoutConstraints.h>
-#import <react/renderer/core/LayoutContext.h>
+#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/scheduler/AsynchronousEventBeat.h>
 #import <react/renderer/scheduler/SchedulerToolbox.h>
 #import <react/renderer/scheduler/SynchronousEventBeat.h>
@@ -40,24 +39,6 @@
 
 using namespace facebook::react;
 
-static inline LayoutConstraints RCTGetLayoutConstraintsForSize(CGSize minimumSize, CGSize maximumSize)
-{
-  return {
-      .minimumSize = RCTSizeFromCGSize(minimumSize),
-      .maximumSize = RCTSizeFromCGSize(maximumSize),
-      .layoutDirection = RCTLayoutDirection([[RCTI18nUtil sharedInstance] isRTL]),
-  };
-}
-
-static inline LayoutContext RCTGetLayoutContext(CGPoint viewportOffset)
-{
-  return {.pointScaleFactor = RCTScreenScale(),
-          .swapLeftAndRightInRTL =
-              [[RCTI18nUtil sharedInstance] isRTL] && [[RCTI18nUtil sharedInstance] doLeftAndRightSwapInRTL],
-          .fontSizeMultiplier = RCTFontSizeMultiplier(),
-          .viewportOffset = RCTPointFromCGPoint(viewportOffset)};
-}
-
 static dispatch_queue_t RCTGetBackgroundQueue()
 {
   static dispatch_queue_t queue;
@@ -109,27 +90,27 @@ - (instancetype)initWithContextContainer:(ContextContainer::Shared)contextContai
 {
   if (self = [super init]) {
     assert(contextContainer && "RuntimeExecutor must be not null.");
-
     _runtimeExecutor = runtimeExecutor;
     _contextContainer = contextContainer;
 
     _surfaceRegistry = [[RCTSurfaceRegistry alloc] init];
     _mountingManager = [[RCTMountingManager alloc] init];
+    _mountingManager.contextContainer = contextContainer;
     _mountingManager.delegate = self;
 
     _observers = [NSMutableArray array];
 
     _scheduler = [self _createScheduler];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(_handleContentSizeCategoryDidChangeNotification:)
-                                                 name:UIContentSizeCategoryDidChangeNotification
-                                               object:nil];
   }
 
   return self;
 }
 
+- (RCTMountingManager *)mountingManager
+{
+  return _mountingManager;
+}
+
 - (RCTScheduler *_Nullable)_scheduler
 {
   std::lock_guard<std::mutex> lock(_schedulerAccessMutex);
@@ -146,6 +127,7 @@ - (void)setContextContainer:(ContextContainer::Shared)contextContainer
 {
   std::lock_guard<std::mutex> lock(_schedulerLifeCycleMutex);
   _contextContainer = contextContainer;
+  _mountingManager.contextContainer = contextContainer;
 }
 
 - (RuntimeExecutor)runtimeExecutor
@@ -164,10 +146,10 @@ - (void)setRuntimeExecutor:(RuntimeExecutor)runtimeExecutor
 
 - (void)registerSurface:(RCTFabricSurface *)surface
 {
-  RCTScheduler *scheduler = [self _scheduler];
   [_surfaceRegistry registerSurface:surface];
+  RCTScheduler *scheduler = [self _scheduler];
   if (scheduler) {
-    [self _startSurface:surface scheduler:scheduler];
+    [scheduler registerSurface:surface.surfaceHandler];
   }
 }
 
@@ -175,54 +157,16 @@ - (void)unregisterSurface:(RCTFabricSurface *)surface
 {
   RCTScheduler *scheduler = [self _scheduler];
   if (scheduler) {
-    [self _stopSurface:surface scheduler:scheduler];
+    [scheduler unregisterSurface:surface.surfaceHandler];
   }
   [_surfaceRegistry unregisterSurface:surface];
 }
 
-- (void)setProps:(NSDictionary *)props surface:(RCTFabricSurface *)surface
-{
-  RCTScheduler *scheduler = [self _scheduler];
-  if (scheduler) {
-    [self _stopSurface:surface scheduler:scheduler];
-    [self _startSurface:surface scheduler:scheduler];
-  }
-}
-
 - (RCTFabricSurface *)surfaceForRootTag:(ReactTag)rootTag
 {
   return [_surfaceRegistry surfaceForRootTag:rootTag];
 }
 
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
-                      maximumSize:(CGSize)maximumSize
-                          surface:(RCTFabricSurface *)surface
-{
-  RCTScheduler *scheduler = [self _scheduler];
-  if (!scheduler) {
-    return minimumSize;
-  }
-  LayoutContext layoutContext = RCTGetLayoutContext(surface.viewportOffset);
-  LayoutConstraints layoutConstraints = RCTGetLayoutConstraintsForSize(minimumSize, maximumSize);
-  return [scheduler measureSurfaceWithLayoutConstraints:layoutConstraints
-                                          layoutContext:layoutContext
-                                              surfaceId:surface.rootTag];
-}
-
-- (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize surface:(RCTFabricSurface *)surface
-{
-  RCTScheduler *scheduler = [self _scheduler];
-  if (!scheduler) {
-    return;
-  }
-
-  LayoutContext layoutContext = RCTGetLayoutContext(surface.viewportOffset);
-  LayoutConstraints layoutConstraints = RCTGetLayoutConstraintsForSize(minimumSize, maximumSize);
-  [scheduler constraintSurfaceLayoutWithLayoutConstraints:layoutConstraints
-                                            layoutContext:layoutContext
-                                                surfaceId:surface.rootTag];
-}
-
 - (UIView *)findComponentViewWithTag_DO_NOT_USE_DEPRECATED:(NSInteger)tag
 {
   UIView<RCTComponentViewProtocol> *componentView =
@@ -254,22 +198,9 @@ - (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag props:(NSDictiona
   return YES;
 }
 
-- (BOOL)synchronouslyWaitSurface:(RCTFabricSurface *)surface timeout:(NSTimeInterval)timeout
+- (void)setupAnimationDriverWithSurfaceHandler:(facebook::react::SurfaceHandler const &)surfaceHandler
 {
-  RCTScheduler *scheduler = [self _scheduler];
-  if (!scheduler) {
-    return NO;
-  }
-
-  auto mountingCoordinator = [scheduler mountingCoordinatorWithSurfaceId:surface.rootTag];
-
-  if (!mountingCoordinator->waitForTransaction(std::chrono::duration<NSTimeInterval>(timeout))) {
-    return NO;
-  }
-
-  [_mountingManager scheduleTransaction:mountingCoordinator];
-
-  return YES;
+  [[self _scheduler] setupAnimationDriver:surfaceHandler];
 }
 
 - (BOOL)suspend
@@ -322,16 +253,16 @@ - (RCTScheduler *)_createScheduler
 {
   auto reactNativeConfig = _contextContainer->at<std::shared_ptr<ReactNativeConfig const>>("ReactNativeConfig");
 
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:scrollview_on_demand_mounting_ios")) {
-    RCTExperimentSetOnDemandViewMounting(YES);
+  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:preemptive_view_allocation_disabled_ios")) {
+    RCTExperimentSetPreemptiveViewAllocationDisabled(YES);
   }
 
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:optimized_hit_testing_ios")) {
-    RCTExperimentSetOptimizedHitTesting(YES);
+  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_remove_clipped_subviews_ios")) {
+    RCTSetRemoveClippedSubviewsEnabled(YES);
   }
 
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:preemptive_view_allocation_disabled_ios")) {
-    RCTExperimentSetPreemptiveViewAllocationDisabled(YES);
+  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_initial_max_size_ios")) {
+    RCTSetInitialMaxSizeEnabled(YES);
   }
 
   auto componentRegistryFactory =
@@ -346,7 +277,19 @@ - (RCTScheduler *)_createScheduler
   auto toolbox = SchedulerToolbox{};
   toolbox.contextContainer = _contextContainer;
   toolbox.componentRegistryFactory = componentRegistryFactory;
+
+  auto weakRuntimeScheduler = _contextContainer->find<std::weak_ptr<RuntimeScheduler>>("RuntimeScheduler");
+  auto runtimeScheduler = weakRuntimeScheduler.hasValue() ? weakRuntimeScheduler.value().lock() : nullptr;
+  if (runtimeScheduler) {
+    runtimeScheduler->setEnableYielding(
+        reactNativeConfig->getBool("react_native_new_architecture:runtimescheduler_enable_yielding_ios"));
+    runtimeExecutor = [runtimeScheduler](std::function<void(jsi::Runtime & runtime)> &&callback) {
+      runtimeScheduler->scheduleWork(std::move(callback));
+    };
+  }
+
   toolbox.runtimeExecutor = runtimeExecutor;
+
   toolbox.mainRunLoopObserverFactory = [](RunLoopObserver::Activity activities,
                                           RunLoopObserver::WeakOwner const &owner) {
     return std::make_unique<MainRunLoopObserver>(activities, owner);
@@ -356,13 +299,15 @@ - (RCTScheduler *)_createScheduler
     toolbox.backgroundExecutor = RCTGetBackgroundExecutor();
   }
 
-  toolbox.synchronousEventBeatFactory = [runtimeExecutor](EventBeat::SharedOwnerBox const &ownerBox) {
-    auto runLoopObserver =
-        std::make_unique<MainRunLoopObserver const>(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner);
-    return std::make_unique<SynchronousEventBeat>(std::move(runLoopObserver), runtimeExecutor);
-  };
+  toolbox.synchronousEventBeatFactory =
+      [runtimeExecutor, runtimeScheduler = runtimeScheduler](EventBeat::SharedOwnerBox const &ownerBox) {
+        auto runLoopObserver =
+            std::make_unique<MainRunLoopObserver const>(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner);
+        return std::make_unique<SynchronousEventBeat>(std::move(runLoopObserver), runtimeExecutor, runtimeScheduler);
+      };
 
-  toolbox.asynchronousEventBeatFactory = [runtimeExecutor](EventBeat::SharedOwnerBox const &ownerBox) {
+  toolbox.asynchronousEventBeatFactory =
+      [runtimeExecutor](EventBeat::SharedOwnerBox const &ownerBox) -> std::unique_ptr<EventBeat> {
     auto runLoopObserver =
         std::make_unique<MainRunLoopObserver const>(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner);
     return std::make_unique<AsynchronousEventBeat>(std::move(runLoopObserver), runtimeExecutor);
@@ -374,47 +319,12 @@ - (RCTScheduler *)_createScheduler
   return scheduler;
 }
 
-- (void)_startSurface:(RCTFabricSurface *)surface scheduler:(RCTScheduler *)scheduler
-{
-  RCTMountingManager *mountingManager = _mountingManager;
-  RCTExecuteOnMainQueue(^{
-    [mountingManager.componentViewRegistry dequeueComponentViewWithComponentHandle:RootShadowNode::Handle()
-                                                                               tag:surface.rootTag];
-  });
-
-  LayoutContext layoutContext = RCTGetLayoutContext(surface.viewportOffset);
-
-  LayoutConstraints layoutConstraints = RCTGetLayoutConstraintsForSize(surface.minimumSize, surface.maximumSize);
-
-  [scheduler startSurfaceWithSurfaceId:surface.rootTag
-                            moduleName:surface.moduleName
-                          initialProps:surface.properties
-                     layoutConstraints:layoutConstraints
-                         layoutContext:layoutContext];
-}
-
-- (void)_stopSurface:(RCTFabricSurface *)surface scheduler:(RCTScheduler *)scheduler
-{
-  [scheduler stopSurfaceWithSurfaceId:surface.rootTag];
-
-  RCTMountingManager *mountingManager = _mountingManager;
-  RCTExecuteOnMainQueue(^{
-    surface.view.rootView = nil;
-    RCTComponentViewDescriptor rootViewDescriptor =
-        [mountingManager.componentViewRegistry componentViewDescriptorWithTag:surface.rootTag];
-    [mountingManager.componentViewRegistry enqueueComponentViewWithComponentHandle:RootShadowNode::Handle()
-                                                                               tag:surface.rootTag
-                                                           componentViewDescriptor:rootViewDescriptor];
-  });
-
-  [surface _unsetStage:(RCTSurfaceStagePrepared | RCTSurfaceStageMounted)];
-}
-
 - (void)_startAllSurfacesWithScheduler:(RCTScheduler *)scheduler
 {
   [_surfaceRegistry enumerateWithBlock:^(NSEnumerator<RCTFabricSurface *> *enumerator) {
     for (RCTFabricSurface *surface in enumerator) {
-      [self _startSurface:surface scheduler:scheduler];
+      [scheduler registerSurface:surface.surfaceHandler];
+      [surface start];
     }
   }];
 }
@@ -423,24 +333,8 @@ - (void)_stopAllSurfacesWithScheduler:(RCTScheduler *)scheduler
 {
   [_surfaceRegistry enumerateWithBlock:^(NSEnumerator<RCTFabricSurface *> *enumerator) {
     for (RCTFabricSurface *surface in enumerator) {
-      [self _stopSurface:surface scheduler:scheduler];
-    }
-  }];
-}
-
-- (void)_handleContentSizeCategoryDidChangeNotification:(NSNotification *)notification
-{
-  RCTScheduler *scheduler = [self _scheduler];
-
-  [_surfaceRegistry enumerateWithBlock:^(NSEnumerator<RCTFabricSurface *> *enumerator) {
-    for (RCTFabricSurface *surface in enumerator) {
-      LayoutContext layoutContext = RCTGetLayoutContext(surface.viewportOffset);
-
-      LayoutConstraints layoutConstraints = RCTGetLayoutConstraintsForSize(surface.minimumSize, surface.maximumSize);
-
-      [scheduler constraintSurfaceLayoutWithLayoutConstraints:layoutConstraints
-                                                layoutContext:layoutContext
-                                                    surfaceId:surface.rootTag];
+      [surface stop];
+      [scheduler unregisterSurface:surface.surfaceHandler];
     }
   }];
 }
@@ -449,10 +343,6 @@ - (void)_handleContentSizeCategoryDidChangeNotification:(NSNotification *)notifi
 
 - (void)schedulerDidFinishTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
 {
-  RCTFabricSurface *surface = [_surfaceRegistry surfaceForRootTag:mountingCoordinator->getSurfaceId()];
-
-  [surface _setStage:RCTSurfaceStagePrepared];
-
   [_mountingManager scheduleTransaction:mountingCoordinator];
 }
 
@@ -467,6 +357,24 @@ - (void)schedulerDidDispatchCommand:(ShadowView const &)shadowView
   [self->_mountingManager dispatchCommand:tag commandName:commandStr args:argsArray];
 }
 
+- (void)schedulerDidSendAccessibilityEvent:(const facebook::react::ShadowView &)shadowView
+                                 eventType:(const std::string &)eventType
+{
+  ReactTag tag = shadowView.tag;
+  NSString *eventTypeStr = [[NSString alloc] initWithUTF8String:eventType.c_str()];
+
+  [self->_mountingManager sendAccessibilityEvent:tag eventType:eventTypeStr];
+}
+
+- (void)schedulerDidSetIsJSResponder:(BOOL)isJSResponder
+                blockNativeResponder:(BOOL)blockNativeResponder
+                       forShadowView:(facebook::react::ShadowView const &)shadowView;
+{
+  [self->_mountingManager setIsJSResponder:isJSResponder
+                      blockNativeResponder:blockNativeResponder
+                             forShadowView:shadowView];
+}
+
 - (void)addObserver:(id<RCTSurfacePresenterObserver>)observer
 {
   std::unique_lock<better::shared_mutex> lock(_observerListMutex);
@@ -497,17 +405,6 @@ - (void)mountingManager:(RCTMountingManager *)mountingManager didMountComponents
 {
   RCTAssertMainQueue();
 
-  RCTFabricSurface *surface = [_surfaceRegistry surfaceForRootTag:rootTag];
-  RCTSurfaceStage stage = surface.stage;
-  if (stage & RCTSurfaceStagePrepared) {
-    // We have to progress the stage only if the preparing phase is done.
-    if ([surface _setStage:RCTSurfaceStageMounted]) {
-      auto rootComponentViewDescriptor =
-          [_mountingManager.componentViewRegistry componentViewDescriptorWithTag:rootTag];
-      surface.view.rootView = (RCTSurfaceRootView *)rootComponentViewDescriptor.view;
-    }
-  }
-
   std::shared_lock<better::shared_mutex> lock(_observerListMutex);
   for (id<RCTSurfacePresenterObserver> observer in _observers) {
     if ([observer respondsToSelector:@selector(didMountComponentsWithRootTag:)]) {
diff --git a/React/Fabric/RCTSurfacePresenterBridgeAdapter.h b/React/Fabric/RCTSurfacePresenterBridgeAdapter.h
index 72592b2831ecf9..da2eedb3a2e6a2 100644
--- a/React/Fabric/RCTSurfacePresenterBridgeAdapter.h
+++ b/React/Fabric/RCTSurfacePresenterBridgeAdapter.h
@@ -6,8 +6,8 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <ReactCommon/RuntimeExecutor.h>
 #import <UIKit/UIKit.h>
-
 #import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 @class RCTSurfacePresenter;
 @class RCTBridge;
 
+facebook::react::RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge);
+
 /*
  * Controls a life-cycle of a Surface Presenter based on Bridge's life-cycle.
  * We are moving away from using Bridge.
@@ -32,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /*
  * Controls a stored instance of the Bridge. A consumer can re-set the stored Bridge using that method; the class is
- * responsible to coordinate this change with a SurfacePresetner accordingly.
+ * responsible to coordinate this change with a SurfacePresenter accordingly.
  */
 @property (nonatomic, weak) RCTBridge *bridge;
 
diff --git a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
index a70c494d937838..e39c269bc3c2b9 100644
--- a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
+++ b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
@@ -41,7 +41,7 @@ - (void)invokeAsync:(std::function<void()> &&)func;
   return contextContainer;
 }
 
-static RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge)
+RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge)
 {
   RCTAssert(bridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil.");
 
diff --git a/React/Fabric/RCTSurfaceRegistry.h b/React/Fabric/RCTSurfaceRegistry.h
index 405d16728a7b83..07fb4062f9264d 100644
--- a/React/Fabric/RCTSurfaceRegistry.h
+++ b/React/Fabric/RCTSurfaceRegistry.h
@@ -17,7 +17,7 @@ typedef void (^RCTSurfaceEnumeratorBlock)(NSEnumerator<RCTFabricSurface *> *enum
 
 /**
  * Registry of Surfaces.
- * Incapsulates storing Surface objects and querying them by root tag.
+ * Encapsulates storing Surface objects and querying them by root tag.
  * All methods of the registry are thread-safe.
  * The registry stores Surface objects as weak references.
  */
diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm
index 04e09ddfd5718c..ba64bef7c1c786 100644
--- a/React/Fabric/RCTSurfaceTouchHandler.mm
+++ b/React/Fabric/RCTSurfaceTouchHandler.mm
@@ -10,6 +10,7 @@
 #import <React/RCTUtils.h>
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIGestureRecognizerSubclass.h>
+#import <UIKit/UIKit.h>
 
 #import "RCTConversions.h"
 #import "RCTTouchableComponentViewProtocol.h"
@@ -82,7 +83,8 @@ static void UpdateActiveTouchWithUITouch(
     ActiveTouch &activeTouch,
     UITouch *uiTouch,
     UIView *rootComponentView,
-    CGPoint rootViewOriginOffset)
+    CGPoint rootViewOriginOffset,
+    NSTimeInterval unixTimestampBasis)
 {
   CGPoint offsetPoint = [uiTouch locationInView:activeTouch.componentView];
   CGPoint screenPoint = [uiTouch locationInView:uiTouch.window];
@@ -93,14 +95,18 @@ static void UpdateActiveTouchWithUITouch(
   activeTouch.touch.screenPoint = RCTPointFromCGPoint(screenPoint);
   activeTouch.touch.pagePoint = RCTPointFromCGPoint(pagePoint);
 
-  activeTouch.touch.timestamp = uiTouch.timestamp;
+  activeTouch.touch.timestamp = unixTimestampBasis + uiTouch.timestamp;
 
   if (RCTForceTouchAvailable()) {
-    activeTouch.touch.force = uiTouch.force / uiTouch.maximumPossibleForce;
+    activeTouch.touch.force = RCTZeroIfNaN(uiTouch.force / uiTouch.maximumPossibleForce);
   }
 }
 
-static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, UIView *rootComponentView, CGPoint rootViewOriginOffset)
+static ActiveTouch CreateTouchWithUITouch(
+    UITouch *uiTouch,
+    UIView *rootComponentView,
+    CGPoint rootViewOriginOffset,
+    NSTimeInterval unixTimestampBasis)
 {
   ActiveTouch activeTouch = {};
 
@@ -117,7 +123,7 @@ static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, UIView *rootComponen
     componentView = componentView.superview;
   }
 
-  UpdateActiveTouchWithUITouch(activeTouch, uiTouch, rootComponentView, rootViewOriginOffset);
+  UpdateActiveTouchWithUITouch(activeTouch, uiTouch, rootComponentView, rootViewOriginOffset, unixTimestampBasis);
   return activeTouch;
 }
 
@@ -167,6 +173,12 @@ @implementation RCTSurfaceTouchHandler {
    */
   __weak UIView *_rootComponentView;
   IdentifierPool<11> _identifierPool;
+
+  /*
+   * See Touch.h and usage. This gives us a time-basis for a monotonic
+   * clock that acts like a timestamp of milliseconds elapsed since UNIX epoch.
+   */
+  NSTimeInterval _unixEpochBasisTime;
 }
 
 - (instancetype)init
@@ -181,6 +193,8 @@ - (instancetype)init
     self.delaysTouchesEnded = NO;
 
     self.delegate = self;
+
+    _unixEpochBasisTime = [[NSDate date] timeIntervalSince1970] - [NSProcessInfo processInfo].systemUptime;
   }
 
   return self;
@@ -208,7 +222,7 @@ - (void)detachFromView:(UIView *)view
 - (void)_registerTouches:(NSSet<UITouch *> *)touches
 {
   for (UITouch *touch in touches) {
-    auto activeTouch = CreateTouchWithUITouch(touch, _rootComponentView, _viewOriginOffset);
+    auto activeTouch = CreateTouchWithUITouch(touch, _rootComponentView, _viewOriginOffset, _unixEpochBasisTime);
     activeTouch.touch.identifier = _identifierPool.dequeue();
     _activeTouches.emplace(touch, activeTouch);
   }
@@ -223,7 +237,7 @@ - (void)_updateTouches:(NSSet<UITouch *> *)touches
       continue;
     }
 
-    UpdateActiveTouchWithUITouch(iterator->second, touch, _rootComponentView, _viewOriginOffset);
+    UpdateActiveTouchWithUITouch(iterator->second, touch, _rootComponentView, _viewOriginOffset, _unixEpochBasisTime);
   }
 }
 
@@ -410,4 +424,22 @@ - (BOOL)gestureRecognizer:(__unused UIGestureRecognizer *)gestureRecognizer
   return [self canBePreventedByGestureRecognizer:otherGestureRecognizer];
 }
 
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+    shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+  BOOL canBePrevented = [self canBePreventedByGestureRecognizer:otherGestureRecognizer];
+  if (canBePrevented) {
+    [self _cancelTouches];
+  }
+  return NO;
+}
+
+#pragma mark -
+
+- (void)_cancelTouches
+{
+  [self setEnabled:NO];
+  [self setEnabled:YES];
+}
+
 @end
diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h
index d4dd93c91197a5..77b3c906cc7dd0 100644
--- a/React/Fabric/Surface/RCTFabricSurface.h
+++ b/React/Fabric/Surface/RCTFabricSurface.h
@@ -8,6 +8,7 @@
 #import <React/RCTSurfaceProtocol.h>
 #import <React/RCTSurfaceStage.h>
 #import <react/renderer/mounting/MountingCoordinator.h>
+#import <react/renderer/scheduler/SurfaceHandler.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -70,6 +71,13 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)start;
 - (BOOL)stop;
 
+/**
+ * EXPERIMENTAL
+ * Reset's the Surface to it's initial stage.
+ * It uses the passed in surface presenter, and whatever else was passed in init.
+ */
+- (void)resetWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter;
+
 #pragma mark - Layout: Setting the size constrains
 
 /**
@@ -121,12 +129,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTFabricSurface (Internal)
 
-/**
- * Sets and clears given stage flags (bitmask).
- * Returns `YES` if the actual state was changed.
- */
-- (BOOL)_setStage:(RCTSurfaceStage)stage;
-- (BOOL)_unsetStage:(RCTSurfaceStage)stage;
+- (facebook::react::SurfaceHandler const &)surfaceHandler;
 
 @end
 
diff --git a/React/Fabric/Surface/RCTFabricSurface.mm b/React/Fabric/Surface/RCTFabricSurface.mm
index 35368dada39056..e18ee5a5f2beeb 100644
--- a/React/Fabric/Surface/RCTFabricSurface.mm
+++ b/React/Fabric/Surface/RCTFabricSurface.mm
@@ -10,6 +10,11 @@
 #import <mutex>
 
 #import <React/RCTAssert.h>
+#import <React/RCTConstants.h>
+#import <React/RCTConversions.h>
+#import <React/RCTFollyConvert.h>
+#import <React/RCTI18nUtil.h>
+#import <React/RCTMountingManager.h>
 #import <React/RCTSurfaceDelegate.h>
 #import <React/RCTSurfaceRootView.h>
 #import <React/RCTSurfaceTouchHandler.h>
@@ -23,26 +28,25 @@
 using namespace facebook::react;
 
 @implementation RCTFabricSurface {
-  // Immutable
   __weak RCTSurfacePresenter *_surfacePresenter;
-  NSString *_moduleName;
-
-  // Protected by the `_mutex`
-  std::mutex _mutex;
-  RCTSurfaceStage _stage;
-  NSDictionary *_properties;
-  CGSize _minimumSize;
-  CGSize _maximumSize;
-  CGPoint _viewportOffset;
-  CGSize _intrinsicSize;
-
-  // The Main thread only
+
+  // `SurfaceHandler` is a thread-safe object, so we don't need additional synchronization.
+  // Objective-C++ classes cannot have instance variables without default constructors,
+  // hence we wrap a value into `optional` to workaround it.
+  better::optional<SurfaceHandler> _surfaceHandler;
+
+  // Protects Surface's start and stop processes.
+  // Even though SurfaceHandler is tread-safe, it will crash if we try to stop a surface that is not running.
+  // To make the API easy to use, we check the status of the surface before calling `start` or `stop`,
+  // and we need this mutex to prevent races.
+  std::mutex _surfaceMutex;
+
+  // Can be accessed from the main thread only.
   RCTSurfaceView *_Nullable _view;
   RCTSurfaceTouchHandler *_Nullable _touchHandler;
 }
 
 @synthesize delegate = _delegate;
-@synthesize rootTag = _rootTag;
 
 - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
                               moduleName:(NSString *)moduleName
@@ -50,50 +54,88 @@ - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
 {
   if (self = [super init]) {
     _surfacePresenter = surfacePresenter;
-    _moduleName = moduleName;
-    _properties = [initialProperties copy];
-    _rootTag = [RCTAllocateRootViewTag() integerValue];
 
-    _minimumSize = CGSizeZero;
+    _surfaceHandler =
+        SurfaceHandler{RCTStringFromNSString(moduleName), (SurfaceId)[RCTAllocateRootViewTag() integerValue]};
+    _surfaceHandler->setProps(convertIdToFollyDynamic(initialProperties));
+
+    [_surfacePresenter registerSurface:self];
+
+    if (RCTGetInitialMaxSizeEnabled()) {
+      [self setMinimumSize:CGSizeZero maximumSize:RCTViewportSize()];
+    }
 
-    _maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
+    [self _updateLayoutContext];
 
-    _stage = RCTSurfaceStageSurfaceDidInitialize;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleContentSizeCategoryDidChangeNotification:)
+                                                 name:UIContentSizeCategoryDidChangeNotification
+                                               object:nil];
   }
 
   return self;
 }
 
+- (void)resetWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
+{
+  _view = nil;
+  _surfacePresenter = surfacePresenter;
+  [_surfacePresenter registerSurface:self];
+}
+
+- (void)dealloc
+{
+  [_surfacePresenter unregisterSurface:self];
+}
+
+#pragma mark - Life-cycle management
+
 - (BOOL)start
 {
-  if (![self _setStage:RCTSurfaceStageStarted]) {
+  std::lock_guard<std::mutex> lock(_surfaceMutex);
+
+  if (_surfaceHandler->getStatus() != SurfaceHandler::Status::Registered) {
     return NO;
   }
-  [_surfacePresenter registerSurface:self];
 
+  // We need to register a root view component here synchronously because right after
+  // we start a surface, it can initiate an update that can query the root component.
+  RCTUnsafeExecuteOnMainQueueSync(^{
+    [self->_surfacePresenter.mountingManager attachSurfaceToView:self.view
+                                                       surfaceId:self->_surfaceHandler->getSurfaceId()];
+  });
+
+  _surfaceHandler->start();
+  [self _propagateStageChange];
+
+  [_surfacePresenter setupAnimationDriverWithSurfaceHandler:*_surfaceHandler];
   return YES;
 }
 
 - (BOOL)stop
 {
-  if (![self _unsetStage:RCTSurfaceStageStarted]) {
+  std::lock_guard<std::mutex> lock(_surfaceMutex);
+
+  if (_surfaceHandler->getStatus() != SurfaceHandler::Status::Running) {
     return NO;
   }
 
-  [_surfacePresenter unregisterSurface:self];
-  return YES;
-}
+  _surfaceHandler->stop();
+  [self _propagateStageChange];
 
-- (void)dealloc
-{
-  [self stop];
+  RCTExecuteOnMainQueue(^{
+    [self->_surfacePresenter.mountingManager detachSurfaceFromView:self.view
+                                                         surfaceId:self->_surfaceHandler->getSurfaceId()];
+  });
+
+  return YES;
 }
 
 #pragma mark - Immutable Properties (no need to enforce synchronization)
 
 - (NSString *)moduleName
 {
-  return _moduleName;
+  return RCTNSStringFromString(_surfaceHandler->getModuleName());
 }
 
 #pragma mark - Main-Threaded Routines
@@ -115,165 +157,130 @@ - (RCTSurfaceView *)view
 
 - (RCTSurfaceStage)stage
 {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return _stage;
+  return _surfaceHandler->getStatus() == SurfaceHandler::Status::Running ? RCTSurfaceStageRunning
+                                                                         : RCTSurfaceStagePreparing;
 }
 
-- (BOOL)_setStage:(RCTSurfaceStage)stage
+- (void)_propagateStageChange
 {
-  return [self _setStage:stage setOrUnset:YES];
-}
+  RCTSurfaceStage stage = self.stage;
 
-- (BOOL)_unsetStage:(RCTSurfaceStage)stage
-{
-  return [self _setStage:stage setOrUnset:NO];
+  // Notifying the `delegate`
+  id<RCTSurfaceDelegate> delegate = self.delegate;
+  if ([delegate respondsToSelector:@selector(surface:didChangeStage:)]) {
+    [delegate surface:(RCTSurface *)self didChangeStage:stage];
+  }
 }
 
-- (BOOL)_setStage:(RCTSurfaceStage)stage setOrUnset:(BOOL)setOrUnset
+- (void)_updateLayoutContext
 {
-  RCTSurfaceStage updatedStage;
-  {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    if (setOrUnset) {
-      updatedStage = (RCTSurfaceStage)(_stage | stage);
-    } else {
-      updatedStage = (RCTSurfaceStage)(_stage & ~stage);
-    }
+  auto layoutConstraints = _surfaceHandler->getLayoutConstraints();
+  layoutConstraints.layoutDirection = RCTLayoutDirection([[RCTI18nUtil sharedInstance] isRTL]);
 
-    if (updatedStage == _stage) {
-      return NO;
-    }
+  auto layoutContext = _surfaceHandler->getLayoutContext();
 
-    _stage = updatedStage;
-  }
+  layoutContext.pointScaleFactor = RCTScreenScale();
+  layoutContext.swapLeftAndRightInRTL =
+      [[RCTI18nUtil sharedInstance] isRTL] && [[RCTI18nUtil sharedInstance] doLeftAndRightSwapInRTL];
+  layoutContext.fontSizeMultiplier = RCTFontSizeMultiplier();
 
-  [self _propagateStageChange:updatedStage];
-  return YES;
-}
-
-- (void)_propagateStageChange:(RCTSurfaceStage)stage
-{
-  // Updating the `view`
-  RCTExecuteOnMainQueue(^{
-    self->_view.stage = stage;
-  });
-
-  // Notifying the `delegate`
-  id<RCTSurfaceDelegate> delegate = self.delegate;
-  if ([delegate respondsToSelector:@selector(surface:didChangeStage:)]) {
-    [delegate surface:(RCTSurface *)self didChangeStage:stage];
-  }
+  _surfaceHandler->constraintLayout(layoutConstraints, layoutContext);
 }
 
 #pragma mark - Properties Management
 
 - (NSDictionary *)properties
 {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return _properties;
+  return convertFollyDynamicToId(_surfaceHandler->getProps());
 }
 
 - (void)setProperties:(NSDictionary *)properties
 {
-  {
-    std::lock_guard<std::mutex> lock(_mutex);
+  _surfaceHandler->setProps(convertIdToFollyDynamic(properties));
+}
 
-    if ([properties isEqualToDictionary:_properties]) {
-      return;
-    }
+#pragma mark - Layout
+
+- (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize viewportOffset:(CGPoint)viewportOffset
+{
+  auto layoutConstraints = _surfaceHandler->getLayoutConstraints();
+  auto layoutContext = _surfaceHandler->getLayoutContext();
+
+  layoutConstraints.minimumSize = RCTSizeFromCGSize(minimumSize);
+  layoutConstraints.maximumSize = RCTSizeFromCGSize(maximumSize);
 
-    _properties = [properties copy];
+  if (!isnan(viewportOffset.x) && !isnan(viewportOffset.y)) {
+    layoutContext.viewportOffset = RCTPointFromCGPoint(viewportOffset);
   }
 
-  [_surfacePresenter setProps:properties surface:self];
+  _surfaceHandler->constraintLayout(layoutConstraints, layoutContext);
 }
 
-#pragma mark - Layout
-
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+- (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
 {
-  return [_surfacePresenter sizeThatFitsMinimumSize:minimumSize maximumSize:maximumSize surface:self];
+  [self setMinimumSize:minimumSize maximumSize:maximumSize viewportOffset:CGPointMake(NAN, NAN)];
 }
 
-#pragma mark - Size Constraints
-
 - (void)setSize:(CGSize)size
 {
-  [self setMinimumSize:size maximumSize:size viewportOffset:_viewportOffset];
+  [self setMinimumSize:size maximumSize:size];
 }
 
-- (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize viewportOffset:(CGPoint)viewportOffset
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
 {
-  {
-    std::lock_guard<std::mutex> lock(_mutex);
-    if (CGSizeEqualToSize(minimumSize, _minimumSize) && CGSizeEqualToSize(maximumSize, _maximumSize) &&
-        CGPointEqualToPoint(viewportOffset, _viewportOffset)) {
-      return;
-    }
+  auto layoutConstraints = _surfaceHandler->getLayoutConstraints();
+  auto layoutContext = _surfaceHandler->getLayoutContext();
 
-    _maximumSize = maximumSize;
-    _minimumSize = minimumSize;
-    _viewportOffset = viewportOffset;
-  }
+  layoutConstraints.minimumSize = RCTSizeFromCGSize(minimumSize);
+  layoutConstraints.maximumSize = RCTSizeFromCGSize(maximumSize);
 
-  [_surfacePresenter setMinimumSize:minimumSize maximumSize:maximumSize surface:self];
-}
-
-- (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
-{
-  [self setMinimumSize:minimumSize maximumSize:maximumSize viewportOffset:_viewportOffset];
+  return RCTCGSizeFromSize(_surfaceHandler->measure(layoutConstraints, layoutContext));
 }
 
 - (CGSize)minimumSize
 {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return _minimumSize;
+  return RCTCGSizeFromSize(_surfaceHandler->getLayoutConstraints().minimumSize);
 }
 
 - (CGSize)maximumSize
 {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return _maximumSize;
+  return RCTCGSizeFromSize(_surfaceHandler->getLayoutConstraints().maximumSize);
 }
 
 - (CGPoint)viewportOffset
 {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return _viewportOffset;
+  return RCTCGPointFromPoint(_surfaceHandler->getLayoutContext().viewportOffset);
 }
 
-#pragma mark - intrinsicSize
+#pragma mark - Synchronous Waiting
 
-- (void)setIntrinsicSize:(CGSize)intrinsicSize
+- (BOOL)synchronouslyWaitFor:(NSTimeInterval)timeout
 {
-  {
-    std::lock_guard<std::mutex> lock(_mutex);
-    if (CGSizeEqualToSize(intrinsicSize, _intrinsicSize)) {
-      return;
-    }
+  auto mountingCoordinator = _surfaceHandler->getMountingCoordinator();
 
-    _intrinsicSize = intrinsicSize;
+  if (!mountingCoordinator) {
+    return NO;
   }
 
-  // Notifying `delegate`
-  id<RCTSurfaceDelegate> delegate = self.delegate;
-  if ([delegate respondsToSelector:@selector(surface:didChangeIntrinsicSize:)]) {
-    [delegate surface:(RCTSurface *)(id)self didChangeIntrinsicSize:intrinsicSize];
+  if (!mountingCoordinator->waitForTransaction(std::chrono::duration<NSTimeInterval>(timeout))) {
+    return NO;
   }
+
+  [_surfacePresenter.mountingManager scheduleTransaction:mountingCoordinator];
+
+  return YES;
 }
 
-- (CGSize)intrinsicSize
+- (void)handleContentSizeCategoryDidChangeNotification:(NSNotification *)notification
 {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return _intrinsicSize;
+  [self _updateLayoutContext];
 }
 
-#pragma mark - Synchronous Waiting
+#pragma mark - Private
 
-- (BOOL)synchronouslyWaitFor:(NSTimeInterval)timeout
+- (SurfaceHandler const &)surfaceHandler;
 {
-  return [_surfacePresenter synchronouslyWaitSurface:self timeout:timeout];
+  return *_surfaceHandler;
 }
 
 #pragma mark - Deprecated
@@ -289,7 +296,12 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 
 - (NSNumber *)rootViewTag
 {
-  return @(_rootTag);
+  return @(_surfaceHandler->getSurfaceId());
+}
+
+- (NSInteger)rootTag
+{
+  return (NSInteger)(_surfaceHandler->getSurfaceId());
 }
 
 @end
diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h
index 16dc71dcddfc2a..bd58377eceaaaf 100644
--- a/React/Modules/RCTEventEmitter.h
+++ b/React/Modules/RCTEventEmitter.h
@@ -6,15 +6,16 @@
  */
 
 #import <React/RCTBridge.h>
-#import <React/RCTJSInvokerModule.h>
 
 /**
  * RCTEventEmitter is an abstract base class to be used for modules that emit
  * events to be observed by JS.
  */
-@interface RCTEventEmitter : NSObject <RCTBridgeModule, RCTJSInvokerModule, RCTInvalidating>
+@interface RCTEventEmitter : NSObject <RCTBridgeModule, RCTInvalidating>
 
 @property (nonatomic, weak) RCTBridge * _Nullable bridge; // TODO(macOS GH#774)
+@property (nonatomic, weak) RCTModuleRegistry *moduleRegistry;
+@property (nonatomic, weak) RCTViewRegistry *viewRegistry_DEPRECATED;
 
 - (instancetype _Nullable)initWithDisabledObservation; // TODO(macOS GH#774)
 
diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m
index c3cc596e13ca18..20af19f91a5dbf 100644
--- a/React/Modules/RCTEventEmitter.m
+++ b/React/Modules/RCTEventEmitter.m
@@ -15,7 +15,7 @@ @implementation RCTEventEmitter {
   BOOL _observationDisabled;
 }
 
-@synthesize invokeJS = _invokeJS;
+@synthesize callableJSModules = _callableJSModules;
 
 + (NSString *)moduleName
 {
@@ -48,10 +48,10 @@ - (instancetype)initWithDisabledObservation
 - (void)sendEventWithName:(NSString *)eventName body:(id)body
 {
   RCTAssert(
-      _bridge != nil || _invokeJS != nil,
+      _callableJSModules != nil,
       @"Error when sending event: %@ with body: %@. "
-       "Bridge is not set. This is probably because you've "
-       "explicitly synthesized the bridge in %@, even though it's inherited "
+       "RCTCallableJSModules is not set. This is probably because you've "
+       "explicitly synthesized the RCTCallableJSModules in %@, even though it's inherited "
        "from RCTEventEmitter.",
       eventName,
       body,
@@ -67,13 +67,10 @@ - (void)sendEventWithName:(NSString *)eventName body:(id)body
 
   BOOL shouldEmitEvent = (_observationDisabled || _listenerCount > 0);
 
-  if (shouldEmitEvent && _bridge) {
-    [_bridge enqueueJSCall:@"RCTDeviceEventEmitter"
-                    method:@"emit"
-                      args:body ? @[ eventName, body ] : @[ eventName ]
-                completion:NULL];
-  } else if (shouldEmitEvent && _invokeJS) {
-    _invokeJS(@"RCTDeviceEventEmitter", @"emit", body ? @[ eventName, body ] : @[ eventName ]);
+  if (shouldEmitEvent && _callableJSModules) {
+    [_callableJSModules invokeModule:@"RCTDeviceEventEmitter"
+                              method:@"emit"
+                            withArgs:body ? @[ eventName, body ] : @[ eventName ]];
   } else {
     RCTLogWarn(@"Sending `%@` with no listeners registered.", eventName);
   }
diff --git a/React/Modules/RCTI18nUtil.h b/React/Modules/RCTI18nUtil.h
index 79e2f5ba2643e7..102659331758c3 100644
--- a/React/Modules/RCTI18nUtil.h
+++ b/React/Modules/RCTI18nUtil.h
@@ -18,20 +18,18 @@
 + (instancetype)sharedInstance;
 
 - (BOOL)isRTL;
-// [ TODO(macOS#4904077)
 /**
  * Should be used very early during app start up
  * Before the bridge is initialized
  */
-@property(atomic, setter=allowRTL:) BOOL isRTLAllowed;
+@property (atomic, setter=allowRTL:) BOOL isRTLAllowed;
 
 /**
  * Could be used to test RTL layout with English
  * Used for development and testing purpose
  */
-@property(atomic, setter=forceRTL:) BOOL isRTLForced;
+@property (atomic, setter=forceRTL:) BOOL isRTLForced;
 
-@property(atomic, setter=swapLeftAndRightInRTL:) BOOL doLeftAndRightSwapInRTL;
-// ]TODO(macOS#4904077)
+@property (atomic, setter=swapLeftAndRightInRTL:) BOOL doLeftAndRightSwapInRTL;
 
 @end
diff --git a/React/Modules/RCTI18nUtil.m b/React/Modules/RCTI18nUtil.m
index 41f3fd045bfc0e..6234ab9aee9495 100644
--- a/React/Modules/RCTI18nUtil.m
+++ b/React/Modules/RCTI18nUtil.m
@@ -18,7 +18,7 @@ + (instancetype)sharedInstance
   dispatch_once(&onceToken, ^{
     sharedInstance = [self new];
     [sharedInstance swapLeftAndRightInRTL:true];
-    [sharedInstance allowRTL:true]; // TODO(macOS#4904077)
+    [sharedInstance allowRTL:true];
   });
 
   return sharedInstance;
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 1dedcdac1a47f8..f768852b6997a5 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -90,6 +90,7 @@ @implementation RCTUIManager {
 }
 
 @synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -155,6 +156,8 @@ - (NSMapTable *)nativeIDRegistry
 
 - (void)setBridge:(RCTBridge *)bridge
 {
+  RCTEnforceNotAllowedForNewArchitecture(self, @"RCTUIManager must not be initialized for the new architecture");
+
   RCTAssert(_bridge == nil, @"Should not re-use same UIManager instance");
   _bridge = bridge;
 
@@ -175,7 +178,9 @@ - (void)setBridge:(RCTBridge *)bridge
   _componentDataByName = [NSMutableDictionary new];
   for (Class moduleClass in _bridge.moduleClasses) {
     if ([moduleClass isSubclassOfClass:[RCTViewManager class]]) {
-      RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:moduleClass bridge:_bridge];
+      RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:moduleClass
+                                                                                bridge:_bridge
+                                                                       eventDispatcher:_bridge.eventDispatcher];
       _componentDataByName[componentData.name] = componentData;
     }
   }
@@ -208,7 +213,8 @@ - (void)didReceiveNewContentSizeMultiplier
   id multiplier = [[self->_bridge moduleForName:@"AccessibilityManager"
                           lazilyLoadIfNecessary:YES] valueForKey:@"multiplier"];
   if (multiplier) {
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateContentSizeMultiplier" body:multiplier];
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"didUpdateContentSizeMultiplier"
+                                                                          body:multiplier];
   }
 #pragma clang diagnostic pop
 
@@ -270,7 +276,8 @@ - (void)namedOrientationDidChange
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [_bridge.eventDispatcher sendDeviceEventWithName:@"namedOrientationDidChange" body:orientationEvent];
+  [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"namedOrientationDidChange"
+                                                                        body:orientationEvent];
 #pragma clang diagnostic pop
 }
 #endif // TODO(macOS GH#774)
@@ -569,11 +576,12 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
     for (RCTShadowView *shadowView in affectedShadowViews) {
       reactTags[index] = shadowView.reactTag;
       RCTLayoutMetrics layoutMetrics = shadowView.layoutMetrics;
-      frameDataArray[index++] = (RCTFrameData){layoutMetrics.frame,
-                                               layoutMetrics.layoutDirection,
-                                               shadowView.isNewView,
-                                               shadowView.superview.isNewView,
-                                               layoutMetrics.displayType};
+      frameDataArray[index++] = (RCTFrameData){
+          layoutMetrics.frame,
+          layoutMetrics.layoutDirection,
+          shadowView.isNewView,
+          shadowView.superview.isNewView,
+          layoutMetrics.displayType};
     }
   }
 
@@ -1609,7 +1617,9 @@ static void RCTMeasureLayout(RCTShadowView *view, RCTShadowView *ancestor, RCTRe
     return @{};
   }
 
-  RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:[module class] bridge:self.bridge];
+  RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:[module class]
+                                                                            bridge:self.bridge
+                                                                   eventDispatcher:self.bridge.eventDispatcher];
   _componentDataByName[componentData.name] = componentData;
   NSMutableDictionary *directEvents = [NSMutableDictionary new];
   NSMutableDictionary *bubblingEvents = [NSMutableDictionary new];
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index deaf62202b609c..1affdbac8500b2 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -473,14 +473,15 @@ void RCTProfileInit(RCTBridge *bridge)
     NSArray *orderedThreads =
         @[ @"JS async", @"RCTPerformanceLogger", @"com.facebook.react.JavaScript", @(RCTUIManagerQueueName), @"main" ];
     [orderedThreads enumerateObjectsUsingBlock:^(NSString *thread, NSUInteger idx, __unused BOOL *stop) {
-      RCTProfileAddEvent(kProfileTraceEvents,
-                         @"ph"
-                         : @"M", // metadata event
-                           @"name"
-                         : @"thread_sort_index", @"tid"
-                         : thread, @"args"
-                         :
-                         @{@"sort_index" : @(-1000 + (NSInteger)idx)});
+      RCTProfileAddEvent(
+          kProfileTraceEvents,
+          @"ph"
+          : @"M", // metadata event
+            @"name"
+          : @"thread_sort_index", @"tid"
+          : thread, @"args"
+          :
+          @{@"sort_index" : @(-1000 + (NSInteger)idx)});
     }];
   });
 
diff --git a/React/Profiler/RCTProfileTrampoline-arm.S b/React/Profiler/RCTProfileTrampoline-arm.S
index 47934922303115..f304932c92313a 100644
--- a/React/Profiler/RCTProfileTrampoline-arm.S
+++ b/React/Profiler/RCTProfileTrampoline-arm.S
@@ -89,7 +89,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
 
   pop {lr} // pop the caller
   pop {r0} // pop the return value
-  bx lr // jump to the calleer
+  bx lr // jump to the caller
 
   trap
 
diff --git a/React/Profiler/RCTProfileTrampoline-arm64.S b/React/Profiler/RCTProfileTrampoline-arm64.S
index 8aa24ffd107849..c858371f33060e 100644
--- a/React/Profiler/RCTProfileTrampoline-arm64.S
+++ b/React/Profiler/RCTProfileTrampoline-arm64.S
@@ -41,7 +41,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
   /**
    * Allocate 16-bytes for the values that have to be preserved across the call
    * to the actual function, since the stack has to be in the exact initial
-   * state. During its lifetimewe use it to store the initial value of the
+   * state. During its lifetime we use it to store the initial value of the
    * callee saved registers we use to point the memory, the actual address of
    * the implementation and the caller address.
    */
@@ -119,7 +119,7 @@ SYMBOL_NAME(RCTProfileTrampoline):
   // restore the stack pointer
   add sp, sp, #0x20
 
-  // jump to the calleer, without a link
+  // jump to the caller, without a link
   br lr
 
 #endif
diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec
index ae5654780f8277..6f64a5b7d5f2a5 100644
--- a/React/React-RCTFabric.podspec
+++ b/React/React-RCTFabric.podspec
@@ -11,14 +11,14 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -28,22 +28,26 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0" }
+  s.platforms              = { :ios => "11.0" }
   s.source                 = source
-  s.source_files           = "Fabric/**/*.{c,h,m,mm,S,cpp}",
-                             "Tests/**/*.{mm}"
+  s.source_files           = "Fabric/**/*.{c,h,m,mm,S,cpp}"
   s.exclude_files          = "**/tests/*",
                              "**/android/*",
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
   s.library                = "stdc++"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" }
-  s.xcconfig               = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" }
+  s.xcconfig               = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"",
                                "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags  }
 
   s.dependency "React-Core", version
   s.dependency "React-Fabric", version
   s.dependency "React-RCTImage", version
   s.dependency "RCT-Folly/Fabric", folly_version
+
+  s.test_spec 'Tests' do |test_spec|
+    test_spec.source_files = "Tests/**/*.{mm}"
+    test_spec.framework = "XCTest"
+  end
 end
diff --git a/React/Tests/Text/RCTParagraphComponentViewTests.mm b/React/Tests/Text/RCTParagraphComponentViewTests.mm
index f513f5c0303fba..e847ef76f2f423 100644
--- a/React/Tests/Text/RCTParagraphComponentViewTests.mm
+++ b/React/Tests/Text/RCTParagraphComponentViewTests.mm
@@ -130,6 +130,7 @@ - (void)setUp
                   .props([] {
                     auto sharedProps = std::make_shared<ParagraphProps>();
                     auto &props = *sharedProps;
+                    props.accessible = true;
                     auto &yogaStyle = props.yogaStyle;
                     yogaStyle.positionType() = YGPositionTypeAbsolute;
                     yogaStyle.position()[YGEdgeLeft] = YGValue{0, YGUnitPoint};
@@ -209,6 +210,7 @@ - (void)setUp
                   .props([] {
                     auto sharedProps = std::make_shared<ParagraphProps>();
                     auto &props = *sharedProps;
+                    props.accessible = true;
                     auto &yogaStyle = props.yogaStyle;
                     yogaStyle.positionType() = YGPositionTypeAbsolute;
                     yogaStyle.position()[YGEdgeLeft] = YGValue{0, YGUnitPoint};
@@ -252,6 +254,7 @@ - (void)setUp
                   .props([] {
                     auto sharedProps = std::make_shared<ParagraphProps>();
                     auto &props = *sharedProps;
+                    props.accessible = true;
                     auto &yogaStyle = props.yogaStyle;
                     yogaStyle.positionType() = YGPositionTypeAbsolute;
                     yogaStyle.position()[YGEdgeLeft] = YGValue{0, YGUnitPoint};
@@ -320,14 +323,17 @@ - (void)testAttributedString
 {
   ParagraphShadowNode::ConcreteState::Shared _stateA = stateWithShadowNode(ParagrahShadowNodeA_);
   RCTParagraphComponentView *paragraphComponentViewA = [[RCTParagraphComponentView alloc] init];
+  [paragraphComponentViewA updateProps:ParagrahShadowNodeA_->getProps() oldProps:nullptr];
   [paragraphComponentViewA updateState:_stateA oldState:nil];
 
   ParagraphShadowNode::ConcreteState::Shared _stateB = stateWithShadowNode(ParagrahShadowNodeB_);
   RCTParagraphComponentView *paragraphComponentViewB = [[RCTParagraphComponentView alloc] init];
+  [paragraphComponentViewB updateProps:ParagrahShadowNodeB_->getProps() oldProps:nullptr];
   [paragraphComponentViewB updateState:_stateB oldState:nil];
 
   ParagraphShadowNode::ConcreteState::Shared _stateC = stateWithShadowNode(ParagrahShadowNodeC_);
   RCTParagraphComponentView *paragraphComponentViewC = [[RCTParagraphComponentView alloc] init];
+  [paragraphComponentViewC updateProps:ParagrahShadowNodeC_->getProps() oldProps:nullptr];
   [paragraphComponentViewC updateState:_stateC oldState:nil];
 
   // Check the correctness of attributedString
@@ -353,6 +359,7 @@ - (void)testAccessibilityMultipleLinks
   // initialize the paragraphComponentView to get the accessibilityElements
   ParagraphShadowNode::ConcreteState::Shared _state = stateWithShadowNode(ParagrahShadowNodeA_);
   RCTParagraphComponentView *paragraphComponentView = [[RCTParagraphComponentView alloc] init];
+  [paragraphComponentView updateProps:ParagrahShadowNodeA_->getProps() oldProps:nullptr];
   [paragraphComponentView updateState:_state oldState:nil];
 
   NSArray<UIAccessibilityElement *> *elements = [paragraphComponentView accessibilityElements];
@@ -373,6 +380,7 @@ - (void)testAccessibilityLinkWrappingMultipleLines
 {
   ParagraphShadowNode::ConcreteState::Shared _state = stateWithShadowNode(ParagrahShadowNodeB_);
   RCTParagraphComponentView *paragraphComponentView = [[RCTParagraphComponentView alloc] init];
+  [paragraphComponentView updateProps:ParagrahShadowNodeB_->getProps() oldProps:nullptr];
   [paragraphComponentView updateState:_state oldState:nil];
 
   NSArray<UIAccessibilityElement *> *elements = [paragraphComponentView accessibilityElements];
@@ -386,6 +394,7 @@ - (void)testAccessibilityTruncatedText
 {
   ParagraphShadowNode::ConcreteState::Shared _state = stateWithShadowNode(ParagrahShadowNodeC_);
   RCTParagraphComponentView *paragraphComponentView = [[RCTParagraphComponentView alloc] init];
+  [paragraphComponentView updateProps:ParagrahShadowNodeC_->getProps() oldProps:nullptr];
   [paragraphComponentView updateState:_state oldState:nil];
 
   NSArray<UIAccessibilityElement *> *elements = [paragraphComponentView accessibilityElements];
@@ -395,4 +404,67 @@ - (void)testAccessibilityTruncatedText
       @"Expected the second accessibilityElement has link trait");
 }
 
+- (void)testEntireParagraphLink
+{
+  std::shared_ptr<RootShadowNode> rootShadowNode;
+  std::shared_ptr<ParagraphShadowNode> paragrahShadowNode;
+
+  auto element = Element<RootShadowNode>()
+                     .reference(rootShadowNode)
+                     .tag(1)
+                     .props([] {
+                       auto sharedProps = std::make_shared<RootProps>();
+                       auto &props = *sharedProps;
+                       props.layoutConstraints = LayoutConstraints{{0, 0}, {500, 500}};
+                       auto &yogaStyle = props.yogaStyle;
+                       yogaStyle.dimensions()[YGDimensionWidth] = YGValue{200, YGUnitPoint};
+                       yogaStyle.dimensions()[YGDimensionHeight] = YGValue{200, YGUnitPoint};
+                       return sharedProps;
+                     })
+                     .children({
+                         Element<ParagraphShadowNode>()
+                             .reference(paragrahShadowNode)
+                             .props([] {
+                               auto sharedProps = std::make_shared<ParagraphProps>();
+                               auto &props = *sharedProps;
+                               props.accessible = true;
+                               props.accessibilityTraits = AccessibilityTraits::Link;
+                               auto &yogaStyle = props.yogaStyle;
+                               yogaStyle.positionType() = YGPositionTypeAbsolute;
+                               yogaStyle.position()[YGEdgeLeft] = YGValue{0, YGUnitPoint};
+                               yogaStyle.position()[YGEdgeTop] = YGValue{0, YGUnitPoint};
+                               yogaStyle.dimensions()[YGDimensionWidth] = YGValue{200, YGUnitPoint};
+                               yogaStyle.dimensions()[YGDimensionHeight] = YGValue{20, YGUnitPoint};
+                               return sharedProps;
+                             })
+                             .children({
+                                 Element<TextShadowNode>()
+                                     .props([] {
+                                       auto sharedProps = std::make_shared<TextProps>();
+                                       auto &props = *sharedProps;
+                                       props.textAttributes.accessibilityRole = AccessibilityRole::Link;
+                                       return sharedProps;
+                                     })
+                                     .children({Element<RawTextShadowNode>().reference(RawTextShadowNodeABA_).props([] {
+                                       auto sharedProps = std::make_shared<RawTextProps>();
+                                       auto &props = *sharedProps;
+                                       props.text = "A long text that happens to be a link";
+                                       return sharedProps;
+                                     })}),
+                             }),
+                     });
+
+  builder_->build(element);
+  rootShadowNode->layoutIfNeeded();
+
+  ParagraphShadowNode::ConcreteState::Shared _state = stateWithShadowNode(paragrahShadowNode);
+  RCTParagraphComponentView *paragraphComponentView = [[RCTParagraphComponentView alloc] init];
+  [paragraphComponentView updateProps:paragrahShadowNode->getProps() oldProps:nullptr];
+  [paragraphComponentView updateState:_state oldState:nil];
+
+  NSArray<UIAccessibilityElement *> *elements = paragraphComponentView.accessibilityElements;
+  XCTAssertEqual(elements.count, 1);
+  XCTAssertTrue(elements[0].accessibilityTraits & UIAccessibilityTraitLink);
+}
+
 @end
diff --git a/React/Views/RCTBorderDrawing.m b/React/Views/RCTBorderDrawing.m
index d70c165e018ac3..30e4357091c94f 100644
--- a/React/Views/RCTBorderDrawing.m
+++ b/React/Views/RCTBorderDrawing.m
@@ -33,22 +33,23 @@ BOOL RCTBorderColorsAreEqual(RCTBorderColors borderColors)
 
 RCTCornerInsets RCTGetCornerInsets(RCTCornerRadii cornerRadii, UIEdgeInsets edgeInsets)
 {
-  return (RCTCornerInsets){{
-                               MAX(0, cornerRadii.topLeft - edgeInsets.left),
-                               MAX(0, cornerRadii.topLeft - edgeInsets.top),
-                           },
-                           {
-                               MAX(0, cornerRadii.topRight - edgeInsets.right),
-                               MAX(0, cornerRadii.topRight - edgeInsets.top),
-                           },
-                           {
-                               MAX(0, cornerRadii.bottomLeft - edgeInsets.left),
-                               MAX(0, cornerRadii.bottomLeft - edgeInsets.bottom),
-                           },
-                           {
-                               MAX(0, cornerRadii.bottomRight - edgeInsets.right),
-                               MAX(0, cornerRadii.bottomRight - edgeInsets.bottom),
-                           }};
+  return (RCTCornerInsets){
+      {
+          MAX(0, cornerRadii.topLeft - edgeInsets.left),
+          MAX(0, cornerRadii.topLeft - edgeInsets.top),
+      },
+      {
+          MAX(0, cornerRadii.topRight - edgeInsets.right),
+          MAX(0, cornerRadii.topRight - edgeInsets.top),
+      },
+      {
+          MAX(0, cornerRadii.bottomLeft - edgeInsets.left),
+          MAX(0, cornerRadii.bottomLeft - edgeInsets.bottom),
+      },
+      {
+          MAX(0, cornerRadii.bottomRight - edgeInsets.right),
+          MAX(0, cornerRadii.bottomRight - edgeInsets.bottom),
+      }};
 }
 
 static UIEdgeInsets RCTRoundInsetsToPixel(
@@ -220,11 +221,11 @@ static CGPathRef RCTPathCreateOuterOutline(BOOL drawToEdge, CGRect rect, RCTCorn
       (borderInsets.top + cornerInsets.topRight.height + borderInsets.bottom + cornerInsets.bottomLeft.height <=
        viewSize.height);
 
-  UIEdgeInsets edgeInsets =
-      (UIEdgeInsets){borderInsets.top + MAX(cornerInsets.topLeft.height, cornerInsets.topRight.height),
-                     borderInsets.left + MAX(cornerInsets.topLeft.width, cornerInsets.bottomLeft.width),
-                     borderInsets.bottom + MAX(cornerInsets.bottomLeft.height, cornerInsets.bottomRight.height),
-                     borderInsets.right + MAX(cornerInsets.bottomRight.width, cornerInsets.topRight.width)};
+  UIEdgeInsets edgeInsets = (UIEdgeInsets){
+      borderInsets.top + MAX(cornerInsets.topLeft.height, cornerInsets.topRight.height),
+      borderInsets.left + MAX(cornerInsets.topLeft.width, cornerInsets.bottomLeft.width),
+      borderInsets.bottom + MAX(cornerInsets.bottomLeft.height, cornerInsets.bottomRight.height),
+      borderInsets.right + MAX(cornerInsets.bottomRight.width, cornerInsets.topRight.width)};
 
   if (hasCornerRadii) {
     // Asymmetrical edgeInsets cause strange artifacting on iOS 10 and earlier.
@@ -290,8 +291,9 @@ static CGPathRef RCTPathCreateOuterOutline(BOOL drawToEdge, CGRect rect, RCTCorn
     if (cornerInsets.bottomLeft.width > 0 && cornerInsets.bottomLeft.height > 0) {
       CGPoint points[2];
       RCTEllipseGetIntersectionsWithLine(
-          (CGRect){{bottomLeft.x, bottomLeft.y - 2 * cornerInsets.bottomLeft.height},
-                   {2 * cornerInsets.bottomLeft.width, 2 * cornerInsets.bottomLeft.height}},
+          (CGRect){
+              {bottomLeft.x, bottomLeft.y - 2 * cornerInsets.bottomLeft.height},
+              {2 * cornerInsets.bottomLeft.width, 2 * cornerInsets.bottomLeft.height}},
           (CGPoint){0, size.height},
           bottomLeft,
           points);
@@ -304,8 +306,9 @@ static CGPathRef RCTPathCreateOuterOutline(BOOL drawToEdge, CGRect rect, RCTCorn
     if (cornerInsets.topRight.width > 0 && cornerInsets.topRight.height > 0) {
       CGPoint points[2];
       RCTEllipseGetIntersectionsWithLine(
-          (CGRect){{topRight.x - 2 * cornerInsets.topRight.width, topRight.y},
-                   {2 * cornerInsets.topRight.width, 2 * cornerInsets.topRight.height}},
+          (CGRect){
+              {topRight.x - 2 * cornerInsets.topRight.width, topRight.y},
+              {2 * cornerInsets.topRight.width, 2 * cornerInsets.topRight.height}},
           (CGPoint){size.width, 0},
           topRight,
           points);
diff --git a/React/Views/RCTComponentData.h b/React/Views/RCTComponentData.h
index 70594b81a4285c..a9be7fc6581f36 100644
--- a/React/Views/RCTComponentData.h
+++ b/React/Views/RCTComponentData.h
@@ -14,6 +14,7 @@
 @class RCTBridge;
 @class RCTShadowView;
 @class RCTUIView; // TODO(macOS GH#774)
+@class RCTEventDispatcherProtocol;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -22,8 +23,16 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) Class managerClass;
 @property (nonatomic, copy, readonly) NSString *name;
 @property (nonatomic, weak, readonly) RCTViewManager *manager;
+/*
+ * When running React Native with the bridge, view managers are retained by the
+ * bridge. When running in bridgeless mode, allocate and retain view managers
+ * in this class.
+ */
+@property (nonatomic, strong, readonly) RCTViewManager *bridgelessViewManager;
 
-- (instancetype)initWithManagerClass:(Class)managerClass bridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithManagerClass:(Class)managerClass
+                              bridge:(RCTBridge *)bridge
+                     eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher NS_DESIGNATED_INITIALIZER;
 
 - (RCTPlatformView *)createViewWithTag:(nullable NSNumber *)tag rootTag:(nullable NSNumber *)rootTag; // TODO(macOS GH#774)
 - (RCTShadowView *)createShadowViewWithTag:(NSNumber *)tag;
diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m
index e90f0686d18942..7c86cd90013ed0 100644
--- a/React/Views/RCTComponentData.m
+++ b/React/Views/RCTComponentData.m
@@ -13,6 +13,7 @@
 #import "RCTBridgeModule.h"
 #import "RCTComponentEvent.h"
 #import "RCTConvert.h"
+#import "RCTEventDispatcherProtocol.h"
 #import "RCTParserUtils.h"
 #import "RCTShadowView.h"
 #import "RCTUtils.h"
@@ -36,14 +37,19 @@ @implementation RCTComponentData {
   RCTPropBlockDictionary *_viewPropBlocks;
   RCTPropBlockDictionary *_shadowPropBlocks;
   __weak RCTBridge *_bridge;
+  __weak id<RCTEventDispatcherProtocol> _eventDispatcher;
 }
 
 @synthesize manager = _manager;
+@synthesize bridgelessViewManager = _bridgelessViewManager;
 
-- (instancetype)initWithManagerClass:(Class)managerClass bridge:(RCTBridge *)bridge
+- (instancetype)initWithManagerClass:(Class)managerClass
+                              bridge:(RCTBridge *)bridge
+                     eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher
 {
   if ((self = [super init])) {
     _bridge = bridge;
+    _eventDispatcher = eventDispatcher;
     _managerClass = managerClass;
     _viewPropBlocks = [NSMutableDictionary new];
     _shadowPropBlocks = [NSMutableDictionary new];
@@ -55,10 +61,15 @@ - (instancetype)initWithManagerClass:(Class)managerClass bridge:(RCTBridge *)bri
 
 - (RCTViewManager *)manager
 {
-  if (!_manager) {
+  if (!_manager && _bridge) {
     _manager = [_bridge moduleForClass:_managerClass];
+  } else if (!_manager && !_bridgelessViewManager) {
+    _bridgelessViewManager = [_managerClass new];
+    [[NSNotificationCenter defaultCenter] postNotificationName:RCTDidInitializeModuleNotification
+                                                        object:nil
+                                                      userInfo:@{@"module" : _bridgelessViewManager}];
   }
-  return _manager;
+  return _manager ?: _bridgelessViewManager;
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)init)
@@ -100,10 +111,13 @@ - (void)callCustomSetter:(SEL)setter onView:(id<RCTComponent>)view withProp:(id)
   }
 }
 
-static RCTPropBlock
-createEventSetter(NSString *propName, SEL setter, InterceptorBlock eventInterceptor, RCTBridge *bridge)
+static RCTPropBlock createEventSetter(
+    NSString *propName,
+    SEL setter,
+    InterceptorBlock eventInterceptor,
+    id<RCTEventDispatcherProtocol> eventDispatcher)
 {
-  __weak RCTBridge *weakBridge = bridge;
+  __weak id<RCTEventDispatcherProtocol> weakEventDispatcher = eventDispatcher;
   return ^(id target, id json) {
     void (^eventHandler)(NSDictionary *event) = nil;
     if ([RCTConvert BOOL:json]) {
@@ -121,7 +135,7 @@ - (void)callCustomSetter:(SEL)setter onView:(id<RCTComponent>)view withProp:(id)
           RCTComponentEvent *componentEvent = [[RCTComponentEvent alloc] initWithName:propName
                                                                               viewTag:strongTarget.reactTag
                                                                                  body:event];
-          [weakBridge.eventDispatcher sendEvent:componentEvent];
+          [weakEventDispatcher sendEvent:componentEvent];
         }
       };
     }
@@ -250,7 +264,8 @@ - (RCTPropBlock)createPropBlock:(NSString *)name isShadowView:(BOOL)isShadowView
     if (type == NSSelectorFromString(@"RCTBubblingEventBlock:") ||
         type == NSSelectorFromString(@"RCTDirectEventBlock:")) {
       // Special case for event handlers
-      setterBlock = createEventSetter(name, setter, self.eventInterceptor, _bridge);
+      setterBlock =
+          createEventSetter(name, setter, self.eventInterceptor, _bridge ? _bridge.eventDispatcher : _eventDispatcher);
     } else {
       // Ordinary property handlers
       NSMethodSignature *typeSignature = [[RCTConvert class] methodSignatureForSelector:type];
diff --git a/React/Views/RCTConvert+CoreLocation.m b/React/Views/RCTConvert+CoreLocation.m
index 95ec773d32fb99..0fd6bb13a13868 100644
--- a/React/Views/RCTConvert+CoreLocation.m
+++ b/React/Views/RCTConvert+CoreLocation.m
@@ -15,8 +15,8 @@ @implementation RCTConvert (CoreLocation)
 + (CLLocationCoordinate2D)CLLocationCoordinate2D:(id)json
 {
   json = [self NSDictionary:json];
-  return (CLLocationCoordinate2D){[self CLLocationDegrees:json[@"latitude"]],
-                                  [self CLLocationDegrees:json[@"longitude"]]};
+  return (CLLocationCoordinate2D){
+      [self CLLocationDegrees:json[@"latitude"]], [self CLLocationDegrees:json[@"longitude"]]};
 }
 
 @end
diff --git a/React/Views/RCTDatePickerManager.m b/React/Views/RCTDatePickerManager.m
index 33df1aac996dfe..39f1a613896745 100644
--- a/React/Views/RCTDatePickerManager.m
+++ b/React/Views/RCTDatePickerManager.m
@@ -38,6 +38,21 @@ @implementation RCTConvert (NSDatePicker)
 }), NSTextFieldAndStepperDatePickerStyle, unsignedIntegerValue)
 #endif // ]TODO(macOS GH#774)
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0
+
+RCT_ENUM_CONVERTER(
+    UIDatePickerStyle,
+    (@{
+      @"compact" : @(UIDatePickerStyleCompact),
+      @"spinner" : @(UIDatePickerStyleWheels),
+      @"inline" : @(UIDatePickerStyleInline),
+    }),
+    UIDatePickerStyleAutomatic,
+    integerValue)
+#endif
+#pragma clang diagnostic pop
 @end
 
 @implementation RCTDatePickerManager
@@ -97,4 +112,22 @@ - (RCTPlatformView *)view // TODO(macOS GH#774)
   }];
 }
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0
+RCT_CUSTOM_VIEW_PROPERTY(pickerStyle, UIDatePickerStyle, RCTDatePicker)
+{
+  if (@available(iOS 14, *)) {
+    // If the style changed, then the date picker may need to be resized and will generate a layout pass to display
+    // correctly. We need to prevent that to get consistent layout. That's why we memorise the old frame and set it
+    // after style is changed.
+    CGRect oldFrame = view.frame;
+    if (json) {
+      UIDatePickerStyle style = [RCTConvert UIDatePickerStyle:json];
+      view.preferredDatePickerStyle = style;
+    } else {
+      view.preferredDatePickerStyle = UIDatePickerStyleWheels;
+    }
+    view.frame = oldFrame;
+  }
+}
+#endif
 @end
diff --git a/React/Views/RCTLayout.m b/React/Views/RCTLayout.m
index 0ca11c7b8ea55d..b6e66d409623de 100644
--- a/React/Views/RCTLayout.m
+++ b/React/Views/RCTLayout.m
@@ -14,27 +14,31 @@ RCTLayoutMetrics RCTLayoutMetricsFromYogaNode(YGNodeRef yogaNode)
 {
   RCTLayoutMetrics layoutMetrics;
 
-  CGRect frame = (CGRect){(CGPoint){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetLeft(yogaNode)),
-                                    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetTop(yogaNode))},
-                          (CGSize){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(yogaNode)),
-                                   RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(yogaNode))}};
-
-  UIEdgeInsets padding =
-      (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
-                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
-                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
-                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
-
-  UIEdgeInsets borderWidth =
-      (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
-                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
-                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
-                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
-
-  UIEdgeInsets compoundInsets = (UIEdgeInsets){borderWidth.top + padding.top,
-                                               borderWidth.left + padding.left,
-                                               borderWidth.bottom + padding.bottom,
-                                               borderWidth.right + padding.right};
+  CGRect frame = (CGRect){
+      (CGPoint){
+          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetLeft(yogaNode)),
+          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetTop(yogaNode))},
+      (CGSize){
+          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(yogaNode)),
+          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(yogaNode))}};
+
+  UIEdgeInsets padding = (UIEdgeInsets){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
+
+  UIEdgeInsets borderWidth = (UIEdgeInsets){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
+
+  UIEdgeInsets compoundInsets = (UIEdgeInsets){
+      borderWidth.top + padding.top,
+      borderWidth.left + padding.left,
+      borderWidth.bottom + padding.bottom,
+      borderWidth.right + padding.right};
 
   CGRect bounds = (CGRect){CGPointZero, frame.size};
   CGRect contentFrame = UIEdgeInsetsInsetRect(bounds, compoundInsets);
diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h
index c54c1c69c94413..01d38615400060 100644
--- a/React/Views/RCTModalHostView.h
+++ b/React/Views/RCTModalHostView.h
@@ -16,13 +16,14 @@
 
 @protocol RCTModalHostViewInteractor;
 
-@interface RCTModalHostView : UIView <RCTInvalidating>
+@interface RCTModalHostView : UIView <RCTInvalidating, UIAdaptivePresentationControllerDelegate>
 
 @property (nonatomic, copy) NSString *animationType;
 @property (nonatomic, assign) UIModalPresentationStyle presentationStyle;
 @property (nonatomic, assign, getter=isTransparent) BOOL transparent;
 
 @property (nonatomic, copy) RCTDirectEventBlock onShow;
+@property (nonatomic, assign) BOOL visible;
 
 @property (nonatomic, copy) NSNumber *identifier;
 
@@ -31,6 +32,9 @@
 @property (nonatomic, copy) NSArray<NSString *> *supportedOrientations;
 @property (nonatomic, copy) RCTDirectEventBlock onOrientationChange;
 
+// Fabric only
+@property (nonatomic, copy) RCTBubblingEventBlock onDismiss;
+
 - (instancetype)initWithBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
 
 @end
diff --git a/React/Views/RCTModalHostView.m b/React/Views/RCTModalHostView.m
index 0cfa69a99aab6f..bea9e08af961b5 100644
--- a/React/Views/RCTModalHostView.m
+++ b/React/Views/RCTModalHostView.m
@@ -24,6 +24,7 @@ @implementation RCTModalHostView {
   RCTTouchHandler *_touchHandler;
   UIView *_reactSubview;
   UIInterfaceOrientation _lastKnownOrientation;
+  RCTDirectEventBlock _onRequestClose;
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
@@ -57,6 +58,18 @@ - (void)notifyForBoundsChange:(CGRect)newBounds
   }
 }
 
+- (void)setOnRequestClose:(RCTDirectEventBlock)onRequestClose
+{
+  _onRequestClose = onRequestClose;
+}
+
+- (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)controller
+{
+  if (_onRequestClose != nil) {
+    _onRequestClose(nil);
+  }
+}
+
 - (void)notifyForOrientationChange
 {
   if (!_onOrientationChange) {
@@ -119,31 +132,13 @@ - (void)didMoveToWindow
     return;
   }
 
-  if (!_isPresented && self.window) {
-    RCTAssert(self.reactViewController, @"Can't present modal view controller without a presenting view controller");
-
-    _modalViewController.supportedInterfaceOrientations = [self supportedOrientationsMask];
-
-    if ([self.animationType isEqualToString:@"fade"]) {
-      _modalViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
-    } else if ([self.animationType isEqualToString:@"slide"]) {
-      _modalViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
-    }
-    if (self.presentationStyle != UIModalPresentationNone) {
-      _modalViewController.modalPresentationStyle = self.presentationStyle;
-    }
-    [_delegate presentModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
-    _isPresented = YES;
-  }
+  [self ensurePresentedOnlyIfNeeded];
 }
 
 - (void)didMoveToSuperview
 {
   [super didMoveToSuperview];
-
-  if (_isPresented && !self.superview) {
-    [self dismissModalViewController];
-  }
+  [self ensurePresentedOnlyIfNeeded];
 }
 
 - (void)invalidate
@@ -163,6 +158,43 @@ - (BOOL)hasAnimationType
   return ![self.animationType isEqualToString:@"none"];
 }
 
+- (void)setVisible:(BOOL)visible
+{
+  if (_visible != visible) {
+    _visible = visible;
+    [self ensurePresentedOnlyIfNeeded];
+  }
+}
+
+- (void)ensurePresentedOnlyIfNeeded
+{
+  BOOL shouldBePresented = !_isPresented && _visible && self.window;
+  if (shouldBePresented) {
+    RCTAssert(self.reactViewController, @"Can't present modal view controller without a presenting view controller");
+
+    _modalViewController.supportedInterfaceOrientations = [self supportedOrientationsMask];
+
+    if ([self.animationType isEqualToString:@"fade"]) {
+      _modalViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+    } else if ([self.animationType isEqualToString:@"slide"]) {
+      _modalViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+    }
+    if (self.presentationStyle != UIModalPresentationNone) {
+      _modalViewController.modalPresentationStyle = self.presentationStyle;
+    }
+    if (@available(iOS 13.0, *)) {
+      _modalViewController.presentationController.delegate = self;
+    }
+    [_delegate presentModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
+    _isPresented = YES;
+  }
+
+  BOOL shouldBeHidden = _isPresented && (!_visible || !self.superview);
+  if (shouldBeHidden) {
+    [self dismissModalViewController];
+  }
+}
+
 - (void)setTransparent:(BOOL)transparent
 {
   if (self.isTransparent != transparent) {
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index 56d3a5b460d1f3..80342bac8dd792 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -47,8 +47,6 @@ - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex
 
 @interface RCTModalHostViewManager () <RCTModalHostViewInteractor>
 
-@property (nonatomic, copy) dispatch_block_t dismissWaitingBlock;
-
 @end
 
 @implementation RCTModalHostViewManager {
@@ -80,16 +78,9 @@ - (void)presentModalHostView:(RCTModalHostView *)modalHostView
   if (_presentationBlock) {
     _presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
   } else {
-    __weak typeof(self) weakself = self;
     [[modalHostView reactViewController] presentViewController:viewController
                                                       animated:animated
-                                                    completion:^{
-                                                      !completionBlock ?: completionBlock();
-                                                      __strong typeof(weakself) strongself = weakself;
-                                                      !strongself.dismissWaitingBlock
-                                                          ?: strongself.dismissWaitingBlock();
-                                                      strongself.dismissWaitingBlock = nil;
-                                                    }];
+                                                    completion:completionBlock];
   }
 }
 
@@ -105,13 +96,7 @@ - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
   if (_dismissalBlock) {
     _dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
   } else {
-    self.dismissWaitingBlock = ^{
-      [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
-    };
-    if (viewController.presentingViewController) {
-      self.dismissWaitingBlock();
-      self.dismissWaitingBlock = nil;
-    }
+    [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
   }
 }
 
@@ -135,5 +120,10 @@ - (void)invalidate
 RCT_EXPORT_VIEW_PROPERTY(identifier, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(supportedOrientations, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(onOrientationChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(onRequestClose, RCTDirectEventBlock)
+
+// Fabric only
+RCT_EXPORT_VIEW_PROPERTY(onDismiss, RCTDirectEventBlock)
 
 @end
diff --git a/React/Views/RCTModalManager.h b/React/Views/RCTModalManager.h
index 8ce1a29d7f52d3..4fbe6dfbd01e25 100644
--- a/React/Views/RCTModalManager.h
+++ b/React/Views/RCTModalManager.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
diff --git a/React/Views/RCTModalManager.m b/React/Views/RCTModalManager.m
index 5303866d1b17c3..992b73c62db660 100644
--- a/React/Views/RCTModalManager.m
+++ b/React/Views/RCTModalManager.m
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -35,7 +35,7 @@ - (void)stopObserving
 - (void)modalDismissed:(NSNumber *)modalID
 {
   if (_shouldEmit) {
-    [self sendEventWithName:@"modalDismissed" body:@{ @"modalID": modalID }];
+    [self sendEventWithName:@"modalDismissed" body:@{@"modalID" : modalID}];
   }
 }
 
diff --git a/React/Views/RCTPicker.h b/React/Views/RCTPicker.h
deleted file mode 100644
index a3e291d0be702c..00000000000000
--- a/React/Views/RCTPicker.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <React/UIView+React.h>
-#import <React/RCTUIKit.h> // TODO(OSS Candidate ISS#2710739)
-
-#if !TARGET_OS_OSX // TODO(OSS Candidate ISS#2710739)
-@interface RCTPicker : UIPickerView
-#else // [TODO(OSS Candidate ISS#2710739)
-@interface RCTPicker : NSComboBox
-#endif // ]TODO(OSS Candidate ISS#2710739)
-
-@property (nonatomic, copy) NSArray<NSDictionary *> *items;
-@property (nonatomic, assign) NSInteger selectedIndex;
-
-@property (nonatomic, strong) RCTUIColor *color; // TODO(OSS Candidate ISS#2710739)
-#if !TARGET_OS_OSX // [TODO(OSS Candidate ISS#2710739) // NSControl defines font prop for macOS, but iOS superviews don't
-@property (nonatomic, strong) UIFont *font;
-#endif // ]TODO(OSS Candidate ISS#2710739)
-@property (nonatomic, assign) NSTextAlignment textAlign;
-
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
-
-@end
diff --git a/React/Views/RCTPicker.m b/React/Views/RCTPicker.m
deleted file mode 100644
index 4ea42c175de696..00000000000000
--- a/React/Views/RCTPicker.m
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTPicker.h"
-
-#import "RCTConvert.h"
-#import "RCTUtils.h"
-
-@interface RCTPicker ()
-#if !TARGET_OS_OSX // [TODO(macOS GH#774)
-  <UIPickerViewDataSource, UIPickerViewDelegate, UIPickerViewAccessibilityDelegate>
-#else
-  <NSComboBoxDataSource, NSComboBoxDelegate>
-#endif // ]TODO(macOS GH#774)
-@end
-
-@implementation RCTPicker
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if ((self = [super initWithFrame:frame])) {
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
-    _color = [RCTUIColor blackColor]; // TODO(OSS Candidate ISS#2710739)
-    _font = [UIFont systemFontOfSize:21]; // TODO: selected title default should be 23.5
-#else // [TODO(macOS GH#774)
-    _color = [NSColor labelColor];
-    [self setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
-#endif // ]TODO(macOS GH#774)
-    _selectedIndex = NSNotFound;
-    _textAlign = NSTextAlignmentCenter;
-    self.delegate = self;
-#if TARGET_OS_OSX // [TODO(macOS GH#774)
-    self.controlSize = NSControlSizeRegular;
-    self.editable = NO;
-    self.drawsBackground = NO;
-    self.usesDataSource = YES;
-    self.dataSource = self;
-#else
-    [self selectRow:0 inComponent:0
-           animated:
-               YES]; // Workaround for missing selection indicator lines (see
-                     // https://stackoverflow.com/questions/39564660/uipickerview-selection-indicator-not-visible-in-ios10)
-#endif // ]TODO(macOS GH#774)
-  }
-  return self;
-}
-
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
-
-- (void)setItems:(NSArray<NSDictionary *> *)items
-{
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
-  _items = [items copy];
-  [self setNeedsLayout];
-#else // [TODO(macOS GH#774)
-  CGFloat maxHeight = 0.0;
-  NSMutableParagraphStyle *mutableParagraphStyle = [[NSMutableParagraphStyle alloc] init];
-  mutableParagraphStyle.alignment = _textAlign;
-  NSParagraphStyle *paragraphStyle = [mutableParagraphStyle copy];
-  NSMutableArray *mutableItems = [[NSMutableArray alloc] initWithCapacity:items.count];
-  for (NSDictionary *item in items) {
-    NSMutableDictionary *mutableItem = item.mutableCopy;
-    NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:[RCTConvert NSString:item[@"label"]]
-                                                                     attributes:@{NSForegroundColorAttributeName : [RCTConvert UIColor:item[@"textColor"]] ?: _color,
-                                                                                  NSFontAttributeName: [self font] /* Use the font prop instead of the ivar so it's compatible on iOS and macOS TODO(OSS Candidate ISS#2710739) */,
-                                                                                  NSParagraphStyleAttributeName: paragraphStyle}];
-    NSSize size = attrString.size;
-    if (size.height > maxHeight) {
-      maxHeight = size.height;
-    }
-    mutableItem[@"label"] = attrString;
-    [mutableItems addObject:mutableItem.copy];
-  }
-  self.itemHeight = maxHeight;
-  _items = mutableItems.copy;
-  self.needsLayout = YES;
-#endif // ]TODO(macOS GH#774)
-}
-
-- (void)setSelectedIndex:(NSInteger)selectedIndex
-{
-  if (_selectedIndex != selectedIndex) {
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
-    BOOL animated = _selectedIndex != NSNotFound; // Don't animate the initial value
-#endif // TODO(macOS GH#774)
-    _selectedIndex = selectedIndex;
-    dispatch_async(dispatch_get_main_queue(), ^{
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
-      [self selectRow:selectedIndex inComponent:0 animated:animated];
-#else // [TODO(macOS GH#774)
-      self.delegate = nil;
-      [self selectItemAtIndex:selectedIndex];
-      self.attributedStringValue = _items[selectedIndex][@"label"];
-      self.delegate = self;
-#endif // ]TODO(macOS GH#774)
-    });
-  }
-}
-
-#if !TARGET_OS_OSX // TODO(macOS GH#774)
-
-#pragma mark - UIPickerViewDataSource protocol
-
-- (NSInteger)numberOfComponentsInPickerView:(__unused UIPickerView *)pickerView
-{
-  return 1;
-}
-
-- (NSInteger)pickerView:(__unused UIPickerView *)pickerView numberOfRowsInComponent:(__unused NSInteger)component
-{
-  return _items.count;
-}
-
-#pragma mark - UIPickerViewDelegate methods
-
-- (NSString *)pickerView:(__unused UIPickerView *)pickerView
-             titleForRow:(NSInteger)row
-            forComponent:(__unused NSInteger)component
-{
-  return [RCTConvert NSString:_items[row][@"label"]];
-}
-
-- (CGFloat)pickerView:(__unused UIPickerView *)pickerView rowHeightForComponent:(NSInteger)__unused component
-{
-  return _font.pointSize + 19;
-}
-
-- (UIView *)pickerView:(UIPickerView *)pickerView
-            viewForRow:(NSInteger)row
-          forComponent:(NSInteger)component
-           reusingView:(UILabel *)label
-{
-  if (!label) {
-    label = [[UILabel alloc] initWithFrame:(CGRect){CGPointZero,
-                                                    {
-                                                        [pickerView rowSizeForComponent:component].width,
-                                                        [pickerView rowSizeForComponent:component].height,
-                                                    }}];
-  }
-
-  label.font = _font;
-
-  label.textColor = [RCTConvert UIColor:_items[row][@"textColor"]] ?: _color;
-
-  label.textAlignment = _textAlign;
-  label.text = [self pickerView:pickerView titleForRow:row forComponent:component];
-  return label;
-}
-
-- (void)pickerView:(__unused UIPickerView *)pickerView
-      didSelectRow:(NSInteger)row
-       inComponent:(__unused NSInteger)component
-{
-// [TODO(macOS GH#774)
-  [self didSelectRowAtIndex:row];
-}
-
-#pragma mark - UIPickerViewAccessibilityDelegate protocol
-
-- (NSString *)pickerView:(UIPickerView *)pickerView accessibilityLabelForComponent:(NSInteger)component
-{
-  return super.accessibilityLabel;
-}
-
-#else
-
-#pragma mark - NSComboBoxDataSource protocol
-
-- (BOOL)usesDataSource
-{
-  return YES;
-}
-
-- (NSInteger)numberOfItemsInComboBox:(__unused NSComboBox *)theComboBox
-{
-  return _items.count;
-}
-
-- (id)comboBox:(__unused NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index
-{
-  return index >= 0 ? _items[index][@"label"] : nil;
-}
-
-#pragma mark - NSComboBoxDelegate methods
-
-- (void)comboBoxSelectionDidChange:(__unused NSNotification *)notification
-{
-  [self didSelectRowAtIndex:self.indexOfSelectedItem];
-}
-
-#endif
-
-- (void)didSelectRowAtIndex:(NSInteger)idx
-{
-  _selectedIndex = idx;
-  if (_onChange && _items.count > (NSUInteger)idx) {
-// ]TODO(macOS GH#774)
-    _onChange(@{
-// [TODO(macOS GH#774)
-      @"newIndex" : @(idx),
-      @"newValue" : RCTNullIfNil(_items[idx][@"value"]),
-// ]TODO(macOS GH#774)
-    });
-  }
-}
-
-@end
diff --git a/React/Views/RCTPickerManager.m b/React/Views/RCTPickerManager.m
deleted file mode 100644
index 8fd537c91a0709..00000000000000
--- a/React/Views/RCTPickerManager.m
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTPickerManager.h"
-
-#import <React/RCTUIManager.h>
-#import "RCTBridge.h"
-#import "RCTFont.h"
-#import "RCTPicker.h"
-
-@implementation RCTPickerManager
-
-RCT_EXPORT_MODULE()
-
-- (RCTPlatformView *)view // TODO(macOS GH#774)
-{
-  return [RCTPicker new];
-}
-
-RCT_EXPORT_VIEW_PROPERTY(items, NSArray<NSDictionary *>)
-RCT_EXPORT_VIEW_PROPERTY(selectedIndex, NSInteger)
-RCT_REMAP_VIEW_PROPERTY(accessibilityLabel, reactAccessibilityElement.accessibilityLabel, NSString)
-RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(color, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(textAlign, NSTextAlignment)
-RCT_CUSTOM_VIEW_PROPERTY(fontSize, NSNumber, RCTPicker)
-{
-  view.font = [RCTFont updateFont:view.font withSize:json ?: @(defaultView.font.pointSize)];
-}
-RCT_CUSTOM_VIEW_PROPERTY(fontWeight, NSString, __unused RCTPicker)
-{
-  view.font = [RCTFont updateFont:view.font withWeight:json]; // defaults to normal
-}
-RCT_CUSTOM_VIEW_PROPERTY(fontStyle, NSString, __unused RCTPicker)
-{
-  view.font = [RCTFont updateFont:view.font withStyle:json]; // defaults to normal
-}
-RCT_CUSTOM_VIEW_PROPERTY(fontFamily, NSString, RCTPicker)
-{
-  view.font = [RCTFont updateFont:view.font withFamily:json ?: defaultView.font.familyName];
-}
-
-RCT_EXPORT_METHOD(setNativeSelectedIndex : (nonnull NSNumber *)viewTag toIndex : (nonnull NSNumber *)index)
-{
-  [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTUIView *> *viewRegistry) { // TODO(macOS GH#774)
-    RCTPlatformView *view = viewRegistry[viewTag]; // TODO(macOS GH#774)
-
-    if ([view isKindOfClass:[RCTPicker class]]) {
-      [(RCTPicker *)view setSelectedIndex:index.integerValue];
-    } else {
-      // This component is used in Fabric through LegacyInteropLayer.
-      // `RCTPicker` view is subview of `RCTLegacyViewManagerInteropComponentView`.
-      // `viewTag` passed as parameter to this method is tag of the `RCTLegacyViewManagerInteropComponentView`.
-      RCTPlatformView *subview = [uiManager viewForReactTag:viewTag].subviews.firstObject; // TODO(macOS GH#774)
-      if ([subview isKindOfClass:[RCTPicker class]]) {
-        [(RCTPicker *)subview setSelectedIndex:index.integerValue];
-      } else {
-        RCTLogError(@"view type must be RCTPicker");
-      }
-    }
-  }];
-}
-
-@end
diff --git a/React/Views/RCTShadowView+Layout.m b/React/Views/RCTShadowView+Layout.m
index 734f053fc56894..91662c0b64683f 100644
--- a/React/Views/RCTShadowView+Layout.m
+++ b/React/Views/RCTShadowView+Layout.m
@@ -18,19 +18,21 @@ @implementation RCTShadowView (Layout)
 - (UIEdgeInsets)paddingAsInsets
 {
   YGNodeRef yogaNode = self.yogaNode;
-  return (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
-                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
-                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
-                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
+  return (UIEdgeInsets){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
 }
 
 - (UIEdgeInsets)borderAsInsets
 {
   YGNodeRef yogaNode = self.yogaNode;
-  return (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
-                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
-                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
-                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
+  return (UIEdgeInsets){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
 }
 
 - (UIEdgeInsets)compoundInsets
@@ -38,10 +40,11 @@ - (UIEdgeInsets)compoundInsets
   UIEdgeInsets borderAsInsets = self.borderAsInsets;
   UIEdgeInsets paddingAsInsets = self.paddingAsInsets;
 
-  return (UIEdgeInsets){borderAsInsets.top + paddingAsInsets.top,
-                        borderAsInsets.left + paddingAsInsets.left,
-                        borderAsInsets.bottom + paddingAsInsets.bottom,
-                        borderAsInsets.right + paddingAsInsets.right};
+  return (UIEdgeInsets){
+      borderAsInsets.top + paddingAsInsets.top,
+      borderAsInsets.left + paddingAsInsets.left,
+      borderAsInsets.bottom + paddingAsInsets.bottom,
+      borderAsInsets.right + paddingAsInsets.right};
 }
 
 - (CGSize)availableSize
diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
index b79012bf04f2ad..8512f20f76f8da 100644
--- a/React/Views/RCTShadowView.m
+++ b/React/Views/RCTShadowView.m
@@ -277,8 +277,9 @@ - (void)layoutWithMinimumSize:(CGSize)minimumSize
 {
   YGNodeRef yogaNode = _yogaNode;
 
-  CGSize oldMinimumSize = (CGSize){RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinWidth(yogaNode), 0.0),
-                                   RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinHeight(yogaNode), 0.0)};
+  CGSize oldMinimumSize = (CGSize){
+      RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinWidth(yogaNode), 0.0),
+      RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinHeight(yogaNode), 0.0)};
 
   if (!CGSizeEqualToSize(oldMinimumSize, minimumSize)) {
     YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h
index 20cbdfd7e2a500..7a13e8defc16e5 100644
--- a/React/Views/RCTView.h
+++ b/React/Views/RCTView.h
@@ -95,13 +95,13 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
 /**
  * Border colors (actually retained).
  */
-@property (nonatomic, assign) CGColorRef borderTopColor;
-@property (nonatomic, assign) CGColorRef borderRightColor;
-@property (nonatomic, assign) CGColorRef borderBottomColor;
-@property (nonatomic, assign) CGColorRef borderLeftColor;
-@property (nonatomic, assign) CGColorRef borderStartColor;
-@property (nonatomic, assign) CGColorRef borderEndColor;
-@property (nonatomic, assign) CGColorRef borderColor;
+@property (nonatomic, strong) RCTUIColor *borderTopColor;
+@property (nonatomic, strong) RCTUIColor *borderRightColor;
+@property (nonatomic, strong) RCTUIColor *borderBottomColor;
+@property (nonatomic, strong) RCTUIColor *borderLeftColor;
+@property (nonatomic, strong) RCTUIColor *borderStartColor;
+@property (nonatomic, strong) RCTUIColor *borderEndColor;
+@property (nonatomic, strong) RCTUIColor *borderColor;
 
 /**
  * Border widths.
diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
index 2d74542d5f430d..45463cde073b49 100644
--- a/React/Views/RCTView.m
+++ b/React/Views/RCTView.m
@@ -822,7 +822,7 @@ + (UIEdgeInsets)contentInsetsForView:(UIView *)view
   while (view) {
     UIViewController *controller = view.reactViewController;
     if (controller) {
-      return (UIEdgeInsets){controller.topLayoutGuide.length, 0, controller.bottomLayoutGuide.length, 0};
+      return controller.view.safeAreaInsets;
     }
     view = view.superview;
   }
@@ -978,12 +978,12 @@ - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
 
 #pragma mark - Borders
 
-- (RCTUIColor *)backgroundColor // TODO(OSS Candidate ISS#2710739)
+- (RCTUIColor *)backgroundColor // TODO(OSS Candidate ISS#2710739) RCTUIColor
 {
   return _backgroundColor;
 }
 
-- (void)setBackgroundColor:(RCTUIColor *)backgroundColor // TODO(OSS Candidate ISS#2710739)
+- (void)setBackgroundColor:(RCTUIColor *)backgroundColor // TODO(OSS Candidate ISS#2710739) RCTUIColor
 {
   if ([_backgroundColor isEqual:backgroundColor]) {
     return;
@@ -1091,28 +1091,28 @@ - (RCTBorderColors)borderColors
   const BOOL isRTL = _reactLayoutDirection == UIUserInterfaceLayoutDirectionRightToLeft;
 
   if ([[RCTI18nUtil sharedInstance] doLeftAndRightSwapInRTL]) {
-    const CGColorRef borderStartColor = _borderStartColor ?: _borderLeftColor;
-    const CGColorRef borderEndColor = _borderEndColor ?: _borderRightColor;
+    RCTUIColor *borderStartColor = _borderStartColor ?: _borderLeftColor; // TODO(OSS Candidate ISS#2710739) RCTUIColor
+    RCTUIColor *borderEndColor = _borderEndColor ?: _borderRightColor; // TODO(OSS Candidate ISS#2710739) RCTUIColor
 
-    const CGColorRef directionAwareBorderLeftColor = isRTL ? borderEndColor : borderStartColor;
-    const CGColorRef directionAwareBorderRightColor = isRTL ? borderStartColor : borderEndColor;
+    RCTUIColor *directionAwareBorderLeftColor = isRTL ? borderEndColor : borderStartColor; // TODO(OSS Candidate ISS#2710739) RCTUIColor
+    RCTUIColor *directionAwareBorderRightColor = isRTL ? borderStartColor : borderEndColor; // TODO(OSS Candidate ISS#2710739) RCTUIColor
 
     return (RCTBorderColors){
-        _borderTopColor ?: _borderColor,
-        directionAwareBorderLeftColor ?: _borderColor,
-        _borderBottomColor ?: _borderColor,
-        directionAwareBorderRightColor ?: _borderColor,
+        (_borderTopColor ?: _borderColor).CGColor,
+        (directionAwareBorderLeftColor ?: _borderColor).CGColor,
+        (_borderBottomColor ?: _borderColor).CGColor,
+        (directionAwareBorderRightColor ?: _borderColor).CGColor,
     };
   }
 
-  const CGColorRef directionAwareBorderLeftColor = isRTL ? _borderEndColor : _borderStartColor;
-  const CGColorRef directionAwareBorderRightColor = isRTL ? _borderStartColor : _borderEndColor;
+  RCTUIColor *directionAwareBorderLeftColor = isRTL ? _borderEndColor : _borderStartColor; // TODO(OSS Candidate ISS#2710739) RCTUIColor
+  RCTUIColor *directionAwareBorderRightColor = isRTL ? _borderStartColor : _borderEndColor; // TODO(OSS Candidate ISS#2710739) RCTUIColor
 
   return (RCTBorderColors){
-      _borderTopColor ?: _borderColor,
-      directionAwareBorderLeftColor ?: _borderLeftColor ?: _borderColor,
-      _borderBottomColor ?: _borderColor,
-      directionAwareBorderRightColor ?: _borderRightColor ?: _borderColor,
+    (_borderTopColor ?: _borderColor).CGColor,
+    (directionAwareBorderLeftColor ?: _borderLeftColor ?: _borderColor).CGColor,
+    (_borderBottomColor ?: _borderColor).CGColor,
+    (directionAwareBorderRightColor ?: _borderRightColor ?: _borderColor).CGColor,
   };
 }
 
@@ -1287,19 +1287,19 @@ - (void)updateClippingForLayer:(CALayer *)layer
 
 #pragma mark Border Color
 
-#define setBorderColor(side)                                \
-  -(void)setBorder##side##Color : (CGColorRef)color         \
-  {                                                         \
-    if (CGColorEqualToColor(_border##side##Color, color)) { \
-      return;                                               \
-    }                                                       \
-    CGColorRelease(_border##side##Color);                   \
-    _border##side##Color = CGColorRetain(color);            \
-    [self.layer setNeedsDisplay];                           \
+// TODO(OSS Candidate ISS#2710739) RCTUIColor
+#define setBorderColor(side)                       \
+  -(void)setBorder##side##Color : (RCTUIColor *)color \
+  {                                                \
+    if ([_border##side##Color isEqual:color]) {    \
+      return;                                      \
+    }                                              \
+    _border##side##Color = color;                  \
+    [self.layer setNeedsDisplay];                  \
   }
 
 setBorderColor() setBorderColor(Top) setBorderColor(Right) setBorderColor(Bottom) setBorderColor(Left)
-        setBorderColor(Start) setBorderColor(End)
+    setBorderColor(Start) setBorderColor(End)
 
 #pragma mark - Border Width
 
@@ -1313,8 +1313,8 @@ -(void)setBorder##side##Width : (CGFloat)width \
     [self.layer setNeedsDisplay];                \
   }
 
-            setBorderWidth() setBorderWidth(Top) setBorderWidth(Right) setBorderWidth(Bottom) setBorderWidth(Left)
-                setBorderWidth(Start) setBorderWidth(End)
+        setBorderWidth() setBorderWidth(Top) setBorderWidth(Right) setBorderWidth(Bottom) setBorderWidth(Left)
+            setBorderWidth(Start) setBorderWidth(End)
 
 #pragma mark - Border Radius
 
@@ -1328,9 +1328,9 @@ -(void)setBorder##side##Radius : (CGFloat)radius \
     [self.layer setNeedsDisplay];                  \
   }
 
-                    setBorderRadius() setBorderRadius(TopLeft) setBorderRadius(TopRight) setBorderRadius(TopStart)
-                        setBorderRadius(TopEnd) setBorderRadius(BottomLeft) setBorderRadius(BottomRight)
-                            setBorderRadius(BottomStart) setBorderRadius(BottomEnd)
+                setBorderRadius() setBorderRadius(TopLeft) setBorderRadius(TopRight) setBorderRadius(TopStart)
+                    setBorderRadius(TopEnd) setBorderRadius(BottomLeft) setBorderRadius(BottomRight)
+                        setBorderRadius(BottomStart) setBorderRadius(BottomEnd)
 
 #pragma mark - Border Style
 
@@ -1344,21 +1344,7 @@ -(void)setBorder##side##Style : (RCTBorderStyle)style \
     [self.layer setNeedsDisplay];                       \
   }
 
-                                setBorderStyle()
-
-    - (void)dealloc
-{
-#if TARGET_OS_OSX // [TODO(macOS GH#774)
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-#endif // ]TODO(macOS GH#774)
-  CGColorRelease(_borderColor);
-  CGColorRelease(_borderTopColor);
-  CGColorRelease(_borderRightColor);
-  CGColorRelease(_borderBottomColor);
-  CGColorRelease(_borderLeftColor);
-  CGColorRelease(_borderStartColor);
-  CGColorRelease(_borderEndColor);
-}
+  setBorderStyle()
 
 #pragma mark Focus ring // [TODO(macOS GH#774)
 
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index 223d8e3b1c7663..f63a37a80c394e 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -7,6 +7,7 @@
 
 #import "RCTViewManager.h"
 
+#import "RCTAssert.h"
 #import "RCTBorderStyle.h"
 #import "RCTBridge.h"
 #import "RCTConvert+Transform.h"
@@ -28,6 +29,7 @@ @implementation RCTConvert (UIAccessibilityTraits)
     (@{
       @"none" : @(UIAccessibilityTraitNone),
       @"button" : @(UIAccessibilityTraitButton),
+      @"togglebutton" : @(UIAccessibilityTraitButton),
       @"link" : @(UIAccessibilityTraitLink),
       @"header" : @(UIAccessibilityTraitHeader),
       @"search" : @(UIAccessibilityTraitSearchField),
@@ -64,9 +66,11 @@ @implementation RCTConvert (UIAccessibilityTraits)
       @"spinbutton" : @(UIAccessibilityTraitNone),
       @"switch" : @(SwitchAccessibilityTrait),
       @"tab" : @(UIAccessibilityTraitNone),
+      @"tabbar" : @(UIAccessibilityTraitTabBar),
       @"tablist" : @(UIAccessibilityTraitNone),
       @"timer" : @(UIAccessibilityTraitNone),
       @"toolbar" : @(UIAccessibilityTraitNone),
+      @"list" : @(UIAccessibilityTraitNone),
     }),
     UIAccessibilityTraitNone,
     unsignedLongLongValue)
@@ -85,6 +89,12 @@ - (dispatch_queue_t)methodQueue
   return RCTGetUIManagerQueue();
 }
 
+- (void)setBridge:(RCTBridge *)bridge
+{
+  RCTWarnNotAllowedForNewArchitecture(self, @"RCTViewManager must not be initialized for the new architecture");
+  _bridge = bridge;
+}
+
 - (RCTPlatformView *)view // TODO(macOS GH#774)
 {
   return [[RCTView alloc] initWithEventDispatcher:self.bridge.eventDispatcher]; // TODO(OSS Candidate ISS#2710739)
@@ -336,7 +346,7 @@ - (RCTShadowView *)shadowView
 RCT_CUSTOM_VIEW_PROPERTY(borderColor, CGColor, RCTView)
 {
   if ([view respondsToSelector:@selector(setBorderColor:)]) {
-    view.borderColor = json ? [RCTConvert CGColor:json] : defaultView.borderColor;
+    view.borderColor = json ? [RCTConvert UIColor:json] : defaultView.borderColor;
   } else {
     view.layer.borderColor = json ? [RCTConvert CGColor:json] : defaultView.layer.borderColor;
   }
@@ -409,6 +419,13 @@ - (RCTShadowView *)shadowView
 
 #endif // ]TODO(macOS GH#774)
 
+RCT_CUSTOM_VIEW_PROPERTY(collapsable, BOOL, RCTView)
+{
+  // Property is only to be used in the new renderer.
+  // It is necessary to add it here, otherwise it gets
+  // filtered by view configs.
+}
+
 #define RCT_VIEW_BORDER_PROPERTY(SIDE)                                                               \
   RCT_CUSTOM_VIEW_PROPERTY(border##SIDE##Width, float, RCTView)                                      \
   {                                                                                                  \
@@ -419,7 +436,7 @@ - (RCTShadowView *)shadowView
   RCT_CUSTOM_VIEW_PROPERTY(border##SIDE##Color, UIColor, RCTView)                                    \
   {                                                                                                  \
     if ([view respondsToSelector:@selector(setBorder##SIDE##Color:)]) {                              \
-      view.border##SIDE##Color = json ? [RCTConvert CGColor:json] : defaultView.border##SIDE##Color; \
+      view.border##SIDE##Color = json ? [RCTConvert UIColor:json] : defaultView.border##SIDE##Color; \
     }                                                                                                \
   }
 
diff --git a/React/Views/RCTWeakViewHolder.h b/React/Views/RCTWeakViewHolder.h
new file mode 100644
index 00000000000000..ce39eee5d38c0d
--- /dev/null
+++ b/React/Views/RCTWeakViewHolder.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/*
+ * THIS IS A HACK
+ * This protocol should only be used for Paper ViewManagers which need to
+ * use the Fabric Interop layer, and also need to reference their created
+ * views. This protocol allows the view manager to store a weak reference to
+ * any created views. It will not affect view lifecycle in any way.
+ */
+@protocol RCTWeakViewHolder
+
+@property (nonatomic, strong) NSMapTable<NSNumber *, UIView *> *weakViews;
+
+@end
diff --git a/React/Views/RefreshControl/RCTRefreshControl.m b/React/Views/RefreshControl/RCTRefreshControl.m
index 1022b7896d8867..38f2ab53a10437 100644
--- a/React/Views/RefreshControl/RCTRefreshControl.m
+++ b/React/Views/RefreshControl/RCTRefreshControl.m
@@ -21,6 +21,7 @@ @implementation RCTRefreshControl {
   BOOL _refreshingProgrammatically;
   NSString *_title;
   UIColor *_titleColor;
+  CGFloat _progressViewOffset;
 }
 
 - (instancetype)init
@@ -40,6 +41,12 @@ - (instancetype)init
 - (void)layoutSubviews
 {
   [super layoutSubviews];
+  [self _applyProgressViewOffset];
+
+  // Fix for bug #7976
+  if (self.backgroundColor == nil) {
+    self.backgroundColor = [UIColor clearColor];
+  }
 
   // If the control is refreshing when mounted we need to call
   // beginRefreshing in layoutSubview or it doesn't work.
@@ -108,6 +115,19 @@ - (void)endRefreshingProgrammatically
   }
 }
 
+- (void)_applyProgressViewOffset
+{
+  // progressViewOffset must be converted from the ScrollView parent's coordinate space to
+  // the coordinate space of the RefreshControl. This ensures that the control respects any
+  // offset in the view hierarchy, and that progressViewOffset is not inadvertently applied
+  // multiple times.
+  UIView *scrollView = self.superview;
+  UIView *target = scrollView.superview;
+  CGPoint rawOffset = CGPointMake(0, _progressViewOffset);
+  CGPoint converted = [self convertPoint:rawOffset fromView:target];
+  self.frame = CGRectOffset(self.frame, 0, converted.y);
+}
+
 - (NSString *)title
 {
   return _title;
@@ -160,6 +180,12 @@ - (void)setCurrentRefreshingState:(BOOL)refreshing
   _currentRefreshingStateTimestamp = _currentRefreshingStateClock++;
 }
 
+- (void)setProgressViewOffset:(CGFloat)offset
+{
+  _progressViewOffset = offset;
+  [self _applyProgressViewOffset];
+}
+
 - (void)refreshControlValueChanged
 {
   [self setCurrentRefreshingState:super.refreshing];
diff --git a/React/Views/RefreshControl/RCTRefreshControlManager.m b/React/Views/RefreshControl/RCTRefreshControlManager.m
index 3152b1c8069020..87c997a8edda4f 100644
--- a/React/Views/RefreshControl/RCTRefreshControlManager.m
+++ b/React/Views/RefreshControl/RCTRefreshControlManager.m
@@ -25,6 +25,7 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(title, NSString)
 RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(progressViewOffset, CGFloat)
 
 RCT_EXPORT_METHOD(setNativeRefreshing : (nonnull NSNumber *)viewTag toRefreshing : (BOOL)refreshing)
 {
diff --git a/React/Views/ScrollView/RCTScrollContentView.m b/React/Views/ScrollView/RCTScrollContentView.m
index 23b61836cce0ae..ca0f832cacf7d5 100644
--- a/React/Views/ScrollView/RCTScrollContentView.m
+++ b/React/Views/ScrollView/RCTScrollContentView.m
@@ -42,7 +42,7 @@ - (void)reactSetFrame:(CGRect)frame
 
   RCTAssert([scrollView isKindOfClass:[RCTScrollView class]], @"Unexpected view hierarchy of RCTScrollView component.");
 
-  [scrollView updateContentOffsetIfNeeded];
+  [scrollView updateContentSizeIfNeeded];
 
 #if TARGET_OS_OSX // [TODO(macOS GH#774)
   // On macOS scroll indicators may float over the content view like they do in iOS
diff --git a/React/Views/ScrollView/RCTScrollView.h b/React/Views/ScrollView/RCTScrollView.h
index ac4cbc615e220b..3a39955a997aae 100644
--- a/React/Views/ScrollView/RCTScrollView.h
+++ b/React/Views/ScrollView/RCTScrollView.h
@@ -35,12 +35,6 @@
  */
 @property (nonatomic, readonly) RCTUIView *contentView; // TODO(macOS ISS#3536887)
 
-/**
- * If the `contentSize` is not specified (or is specified as {0, 0}, then the
- * `contentSize` will automatically be determined by the size of the subview.
- */
-@property (nonatomic, assign) CGSize contentSize;
-
 /**
  * The underlying scrollView (TODO: can we remove this?)
  */
@@ -79,7 +73,7 @@
 
 @interface RCTScrollView (Internal)
 
-- (void)updateContentOffsetIfNeeded;
+- (void)updateContentSizeIfNeeded;
 
 @end
 
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index fb9c9415cf82e3..dd4479436defea 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -423,7 +423,6 @@ - (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDis
 
     _automaticallyAdjustContentInsets = YES;
     _contentInset = UIEdgeInsetsZero;
-    _contentSize = CGSizeZero;
     _lastClippedToRect = CGRectNull;
 
     _scrollEventThrottle = 0.0;
@@ -543,7 +542,6 @@ - (void)removeReactSubview:(RCTUIView *)subview // TODO(macOS ISS#3536887)
   [super removeReactSubview:subview];
 #if TARGET_OS_OSX // [TODO(macOS GH#774)
   _scrollView.documentView = nil;
-  _contentSize = CGSizeZero;
 #else // ]TODO(macOS GH#774)
   if ([subview conformsToProtocol:@protocol(RCTCustomRefreshContolProtocol)]) {
     [_scrollView setCustomRefreshControl:nil];
@@ -566,7 +564,7 @@ - (void)didUpdateReactSubviews
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
 {
   if ([changedProps containsObject:@"contentSize"]) {
-    [self updateContentOffsetIfNeeded];
+    [self updateContentSizeIfNeeded];
   }
 }
 
@@ -1001,9 +999,9 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView
     // Pick snap point based on direction and proximity
     CGFloat fractionalIndex = (targetContentOffsetAlongAxis + alignmentOffset) / snapToIntervalF;
 
-    NSInteger snapIndex = velocityAlongAxis > 0.0
-        ? ceil(fractionalIndex)
-        : velocityAlongAxis < 0.0 ? floor(fractionalIndex) : round(fractionalIndex);
+    NSInteger snapIndex = velocityAlongAxis > 0.0 ? ceil(fractionalIndex)
+        : velocityAlongAxis < 0.0                 ? floor(fractionalIndex)
+                                                  : round(fractionalIndex);
     CGFloat newTargetContentOffset = (snapIndex * snapToIntervalF) - alignmentOffset;
 
     // Set new targetContentOffset
@@ -1087,8 +1085,6 @@ - (UIView *)viewForZoomingInScrollView:(__unused UIScrollView *)scrollView
 
 #endif // TODO(macOS GH#774)
 
-#pragma mark - Setters
-
 - (CGSize)_calculateViewportSize
 {
   CGSize viewportSize = self.bounds.size;
@@ -1104,71 +1100,16 @@ - (CGSize)_calculateViewportSize
   return viewportSize;
 }
 
-- (CGPoint)calculateOffsetForContentSize:(CGSize)newContentSize
-{
-  CGPoint oldOffset = _scrollView.contentOffset;
-  CGPoint newOffset = oldOffset;
-
-  CGSize oldContentSize = _scrollView.contentSize;
-  CGSize viewportSize = [self _calculateViewportSize];
-
-  BOOL fitsinViewportY = oldContentSize.height <= viewportSize.height && newContentSize.height <= viewportSize.height;
-  if (newContentSize.height < oldContentSize.height && !fitsinViewportY) {
-    CGFloat offsetHeight = oldOffset.y + viewportSize.height;
-    if (oldOffset.y < 0) {
-      // overscrolled on top, leave offset alone
-    } else if (offsetHeight > oldContentSize.height) {
-      // overscrolled on the bottom, preserve overscroll amount
-      newOffset.y = MAX(0, oldOffset.y - (oldContentSize.height - newContentSize.height));
-    } else if (offsetHeight > newContentSize.height) {
-      // offset falls outside of bounds, scroll back to end of list
-      newOffset.y = MAX(0, newContentSize.height - viewportSize.height);
-    }
-  }
-
-  BOOL fitsinViewportX = oldContentSize.width <= viewportSize.width && newContentSize.width <= viewportSize.width;
-  if (newContentSize.width < oldContentSize.width && !fitsinViewportX) {
-    CGFloat offsetHeight = oldOffset.x + viewportSize.width;
-    if (oldOffset.x < 0) {
-      // overscrolled at the beginning, leave offset alone
-    } else if (offsetHeight > oldContentSize.width && newContentSize.width > viewportSize.width) {
-      // overscrolled at the end, preserve overscroll amount as much as possible
-      newOffset.x = MAX(0, oldOffset.x - (oldContentSize.width - newContentSize.width));
-    } else if (offsetHeight > newContentSize.width) {
-      // offset falls outside of bounds, scroll back to end
-      newOffset.x = MAX(0, newContentSize.width - viewportSize.width);
-    }
-  }
-
-  // all other cases, offset doesn't change
-  return newOffset;
-}
-
-/**
- * Once you set the `contentSize`, to a nonzero value, it is assumed to be
- * managed by you, and we'll never automatically compute the size for you,
- * unless you manually reset it back to {0, 0}
- */
 - (CGSize)contentSize
 {
-  if (!CGSizeEqualToSize(_contentSize, CGSizeZero)) {
-    return _contentSize;
-  }
-
   return self.contentView.frame.size; // TODO(OSS Candidate ISS#2710739) use property instead of ivar for mac
 }
 
-- (void)updateContentOffsetIfNeeded
+- (void)updateContentSizeIfNeeded
 {
   CGSize contentSize = self.contentSize;
   if (!CGSizeEqualToSize(_scrollView.contentSize, contentSize)) {
-    // When contentSize is set manually, ScrollView internals will reset
-    // contentOffset to  {0, 0}. Since we potentially set contentSize whenever
-    // anything in the ScrollView updates, we workaround this issue by manually
-    // adjusting contentOffset whenever this happens
-    CGPoint newOffset = [self calculateOffsetForContentSize:contentSize];
     _scrollView.contentSize = contentSize;
-    _scrollView.contentOffset = newOffset;
   }
 }
 
@@ -1352,6 +1293,19 @@ -(type)getter                                           \
 
 #pragma clang diagnostic push // TODO(OSS Candidate ISS#2710739)
 #pragma clang diagnostic ignored "-Wunguarded-availability" // TODO(OSS Candidate ISS#2710739)
+
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* __IPHONE_13_0 */
+- (void)setAutomaticallyAdjustsScrollIndicatorInsets:(BOOL)automaticallyAdjusts API_AVAILABLE(ios(13.0))
+{
+  // `automaticallyAdjustsScrollIndicatorInsets` is available since iOS 13.
+  if ([_scrollView respondsToSelector:@selector(setAutomaticallyAdjustsScrollIndicatorInsets:)]) {
+    if (@available(iOS 13.0, *)) {
+      _scrollView.automaticallyAdjustsScrollIndicatorInsets = automaticallyAdjusts;
+    }
+  }
+}
+#endif
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
 - (void)setContentInsetAdjustmentBehavior:(UIScrollViewContentInsetAdjustmentBehavior)behavior API_AVAILABLE(ios(11.0))
 {
diff --git a/React/Views/ScrollView/RCTScrollViewManager.m b/React/Views/ScrollView/RCTScrollViewManager.m
index f7be154fa7ad24..8c5c28a064ac55 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.m
+++ b/React/Views/ScrollView/RCTScrollViewManager.m
@@ -106,6 +106,9 @@ - (RCTPlatformView *)view // TODO(macOS GH#774)
 RCT_EXPORT_OSX_VIEW_PROPERTY(onScrollKeyDown, RCTDirectEventBlock) // TODO(macOS GH#774)
 RCT_EXPORT_OSX_VIEW_PROPERTY(onPreferredScrollerStyleDidChange, RCTDirectEventBlock) // TODO(macOS GH#774)
 RCT_EXPORT_VIEW_PROPERTY(inverted, BOOL)
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* __IPHONE_13_0 */
+RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustsScrollIndicatorInsets, BOOL)
+#endif
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
 RCT_EXPORT_VIEW_PROPERTY(contentInsetAdjustmentBehavior, UIScrollViewContentInsetAdjustmentBehavior)
 #endif
diff --git a/React/third-party.xcconfig b/React/third-party.xcconfig
index ada55f5ebe8ce0..683e73b1ebb442 100644
--- a/React/third-party.xcconfig
+++ b/React/third-party.xcconfig
@@ -8,5 +8,5 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2020.01.13.00 $(SRCROOT)/../third-party/glog-0.3.5/src
+HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_63_0 $(SRCROOT)/../third-party/folly-2021.06.28.00 $(SRCROOT)/../third-party/glog-0.3.5/src
 OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1
diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
index 6a921100744dca..18f8c266204588 100644
--- a/ReactAndroid/Android-prebuilt.mk
+++ b/ReactAndroid/Android-prebuilt.mk
@@ -64,6 +64,18 @@ LOCAL_EXPORT_C_INCLUDES := $(THIRD_PARTY_NDK_DIR)/glog/exported
 LOCAL_SHARED_LIBRARIES := libglog
 include $(PREBUILT_SHARED_LIBRARY)
 
+# yoga
+include $(CLEAR_VARS)
+LOCAL_MODULE := yoga
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libyoga.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(FIRST_PARTY_NDK_DIR)/yogajni/jni \
+  $(REACT_COMMON_DIR)/yoga
+# Note: Sync with yogajni/Android.mk
+LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti -O3
+LOCAL_LDLIBS += -landroid -llog
+include $(PREBUILT_SHARED_LIBRARY)
+
 # react_nativemodule_core
 include $(CLEAR_VARS)
 LOCAL_MODULE := react_nativemodule_core
@@ -85,10 +97,77 @@ LOCAL_EXPORT_C_INCLUDES := \
   $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/turbomodule/core/jni
 include $(PREBUILT_SHARED_LIBRARY)
 
-# react_codegen_reactandroidspec
+# react_render_core
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_render_core
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_render_core.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR) \
+  $(REACT_COMMON_DIR)/react/renderer/core
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_render_debug
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_render_debug
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_render_debug.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR)/react/renderer/debug
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_render_graphics
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_render_graphics
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_render_graphics.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR)/react/renderer/graphics \
+  $(REACT_COMMON_DIR)/react/renderer/graphics/platform/cxx
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_render_imagemanager
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_render_imagemanager
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_render_imagemanager.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR)/react/renderer/imagemanager \
+  $(REACT_COMMON_DIR)/react/renderer/imagemanager/platform/cxx
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_render_mounting
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_render_mounting
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_render_mounting.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR)/react/renderer/mounting
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_render_mapbuffer
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_render_mapbuffer
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_render_mapbuffer.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR)/react/renderer/mapbuffer
+include $(PREBUILT_SHARED_LIBRARY)
+
+# rrc_view
+include $(CLEAR_VARS)
+LOCAL_MODULE := rrc_view
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/librrc_view.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR)/react/renderer/components/view
+include $(PREBUILT_SHARED_LIBRARY)
+
+# jsi
+include $(CLEAR_VARS)
+LOCAL_MODULE := jsi
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libjsi.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_COMMON_DIR)/jsi
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_codegen_rncore
 include $(CLEAR_VARS)
-LOCAL_MODULE := react_codegen_reactandroidspec
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_codegen_reactandroidspec.so
+LOCAL_MODULE := react_codegen_rncore
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_codegen_rncore.so
 LOCAL_EXPORT_C_INCLUDES := \
   $(REACT_GENERATED_SRC_DIR)/codegen/jni
 include $(PREBUILT_SHARED_LIBRARY)
diff --git a/ReactAndroid/README.md b/ReactAndroid/README.md
index a920b7615d9b0e..d2dd8f2f072821 100644
--- a/ReactAndroid/README.md
+++ b/ReactAndroid/README.md
@@ -1,7 +1,7 @@
 # Building React Native for Android
 
-See the [docs on the website](https://reactnative.dev/docs/building-from-source.html#android).
+See the [docs on the wiki](https://github.com/facebook/react-native/wiki/Building-from-source#prerequisites).
 
 # Running tests
 
-When you submit a pull request CircleCI will automatically run all tests. To run tests locally, see [Testing](https://reactnative.dev/docs/testing.html).
+When you submit a pull request CircleCI will automatically run all tests. To run tests locally, see [Testing](https://github.com/facebook/react-native/wiki/Tests).
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 70c245c1fd5f21..edadad219f3b40 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -8,7 +8,7 @@
 plugins {
     id("com.android.library")
     id("com.facebook.react.codegen")
-    id("maven")
+    id("maven-publish")
     id("de.undercouch.download")
 }
 
@@ -18,6 +18,7 @@ import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.apache.tools.ant.filters.ReplaceTokens
 
+def AAR_OUTPUT_URL = "file://${projectDir}/../android"
 // We download various C++ open-source dependencies into downloads.
 // We then copy both the downloaded code and our custom makefiles and headers into third-party-ndk.
 // After that we build native code from src/main/jni with module path pointing at third-party-ndk.
@@ -33,11 +34,6 @@ def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
 //   - glog-0.3.5
 def dependenciesPath = System.getenv("REACT_NATIVE_DEPENDENCIES")
 
-// The 'USE_FABRIC' environment variable will build Fabric C++ code into the bundle
-// USE_FABRIC=0 will build RN excluding fabric
-// USE_FABRIC=1 will build RN including fabric
-def enableFabric = (System.getenv('USE_FABRIC') ?: '0').toBoolean()
-
 // The Boost library is a very large download (>100MB).
 // If Boost is already present on your system, define the REACT_NATIVE_BOOST_PATH env variable
 // and the build will use that.
@@ -61,7 +57,8 @@ task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
 task prepareBoost(dependsOn: boostPath ? [] : [downloadBoost], type: Copy) {
     from(boostPath ?: tarTree(resources.gzip(downloadBoost.dest)))
     from("src/main/jni/third-party/boost/Android.mk")
-    include("Android.mk", "boost_${BOOST_VERSION}/boost/**/*.hpp", "boost/boost/**/*.hpp")
+    from("src/main/jni/third-party/boost")
+    include("Android.mk", "boost_${BOOST_VERSION}/boost/**/*.hpp", "boost/boost/**/*.hpp", "asm/**/*.S")
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/boost")
     doLast {
@@ -101,6 +98,51 @@ task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy
     into("$thirdPartyNdkDir/folly")
 }
 
+task downloadFmt(dependsOn: createNativeDepsDirectories, type: Download) {
+    src("https://github.com/fmtlib/fmt/archive/${FMT_VERSION}.tar.gz")
+    onlyIfNewer(true)
+    overwrite(false)
+    dest(new File(downloadsDir, "fmt-${FMT_VERSION}.tar.gz"))
+}
+
+task prepareFmt(dependsOn: dependenciesPath ? [] : [downloadFmt], type: Copy) {
+    from(dependenciesPath ?: tarTree(downloadFmt.dest))
+    from("src/main/jni/third-party/fmt/Android.mk")
+    include("fmt-${FMT_VERSION}/src/**/*", "fmt-${FMT_VERSION}/include/**/*", "Android.mk")
+    eachFile { fname -> fname.path = (fname.path - "fmt-${FMT_VERSION}/") }
+    includeEmptyDirs = false
+    into("$thirdPartyNdkDir/fmt")
+}
+
+task downloadLibevent(dependsOn: createNativeDepsDirectories, type: Download) {
+    src("https://github.com/libevent/libevent/releases/download/release-${LIBEVENT_VERSION}-stable/libevent-${LIBEVENT_VERSION}-stable.tar.gz")
+    onlyIfNewer(true)
+    overwrite(false)
+    dest(new File(downloadsDir, "libevent-${LIBEVENT_VERSION}.tar.gz"))
+}
+
+task prepareLibevent(dependsOn: dependenciesPath ? [] : [downloadLibevent], type: Copy) {
+    from(dependenciesPath ?: tarTree(downloadLibevent.dest))
+    from("src/main/jni/third-party/libevent/Android.mk")
+    from("src/main/jni/third-party/libevent/event-config.h")
+    from("src/main/jni/third-party/libevent/evconfig-private.h")
+    include(
+        "libevent-${LIBEVENT_VERSION}-stable/*.c",
+        "libevent-${LIBEVENT_VERSION}-stable/*.h",
+        "libevent-${LIBEVENT_VERSION}-stable/include/**/*",
+        "evconfig-private.h",
+        "event-config.h",
+        "Android.mk"
+    )
+    eachFile { fname -> fname.path = (fname.path - "libevent-${LIBEVENT_VERSION}-stable/") }
+    includeEmptyDirs = false
+    into("$thirdPartyNdkDir/libevent")
+
+    doLast {
+        ant.move(file: "$thirdPartyNdkDir/libevent/event-config.h", tofile: "$thirdPartyNdkDir/libevent/include/event2/event-config.h")
+    }
+}
+
 task prepareHermes(dependsOn: createNativeDepsDirectories, type: Copy) {
     def hermesPackagePath = findNodeModulePath(projectDir, "hermes-engine")
     if (!hermesPackagePath) {
@@ -201,6 +243,8 @@ task downloadNdkBuildDependencies {
     dependsOn(downloadDoubleConversion)
     dependsOn(downloadFolly)
     dependsOn(downloadGlog)
+    dependsOn(downloadFmt)
+    dependsOn(downloadLibevent)
 }
 
 /**
@@ -247,26 +291,28 @@ def getNdkBuildName() {
 }
 
 def findNdkBuildFullPath() {
+    // android.ndkDirectory should return project.android.ndkVersion ndkDirectory
+    def ndkDir = android.ndkDirectory ? android.ndkDirectory.absolutePath : null
+    if (ndkDir) {
+        return new File(ndkDir, getNdkBuildName()).getAbsolutePath()
+    }
+
     // we allow to provide full path to ndk-build tool
     if (hasProperty("ndk.command")) {
         return property("ndk.command")
     }
     // or just a path to the containing directory
     if (hasProperty("ndk.path")) {
-        def ndkDir = property("ndk.path")
+        ndkDir = property("ndk.path")
         return new File(ndkDir, getNdkBuildName()).getAbsolutePath()
     }
 
+    // @TODO ANDROID_NDK && ndk.dir is deprecated and will be removed in the future.
     if (System.getenv("ANDROID_NDK") != null) {
-        def ndkDir = System.getenv("ANDROID_NDK")
+        ndkDir = System.getenv("ANDROID_NDK")
         return new File(ndkDir, getNdkBuildName()).getAbsolutePath()
     }
 
-    def ndkDir = android.ndkDirectory ? android.ndkDirectory.absolutePath : null
-
-    if (ndkDir) {
-        return new File(ndkDir, getNdkBuildName()).getAbsolutePath()
-    }
     return null
 }
 
@@ -280,6 +326,14 @@ def reactNativeInspectorProxyPort() {
     return value != null ? value : reactNativeDevServerPort()
 }
 
+def reactNativeArchitectures() {
+    def isDebug = gradle.startParameter.taskRequests.any {
+        it.args.any { it.endsWith("Debug") }
+    }
+    def value = project.getProperties().get("reactNativeDebugArchitectures")
+    return value != null && isDebug ? value : "all"
+}
+
 def getNdkBuildFullPath() {
     def ndkBuildFullPath = findNdkBuildFullPath()
     if (ndkBuildFullPath == null) {
@@ -300,14 +354,16 @@ def getNdkBuildFullPath() {
 }
 
 def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
-    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
+    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractAARHeaders, extractJNIFiles)
     dependsOn("generateCodegenArtifactsFromSchema");
 
     inputs.dir("$projectDir/../ReactCommon")
     inputs.dir("src/main/jni")
+    inputs.dir("src/main/java/com/facebook/react/turbomodule/core/jni")
     inputs.dir("src/main/java/com/facebook/react/modules/blob")
     outputs.dir("$buildDir/react-ndk/all")
     commandLine(getNdkBuildFullPath(),
+            "APP_ABI=${reactNativeArchitectures()}",
             "NDK_DEBUG=" + (nativeBuildType.equalsIgnoreCase("debug") ? "1" : "0"),
             "NDK_PROJECT_PATH=null",
             "NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk",
@@ -317,7 +373,6 @@ def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
             "REACT_COMMON_DIR=$projectDir/../ReactCommon",
             "REACT_GENERATED_SRC_DIR=$buildDir/generated/source",
             "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
-            "BUILD_FABRIC=$enableFabric",
             "-C", file("src/main/jni/react/jni").absolutePath,
             "--jobs", project.findProperty("jobs") ?: Runtime.runtime.availableProcessors()
     )
@@ -380,12 +435,15 @@ task extractJNIFiles {
     }
 }
 
-android {
-    compileSdkVersion 29
+task installArchives {
+    dependsOn("publishReleasePublicationToNpmRepository")
+}
 
-    compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_1_8)
-        targetCompatibility(JavaVersion.VERSION_1_8)
+android {
+    compileSdkVersion 30
+    ndkVersion ANDROID_NDK_VERSION
+    if (ANDROID_NDK_PATH != null) {
+        ndkPath ANDROID_NDK_PATH
     }
 
     defaultConfig {
@@ -398,6 +456,7 @@ android {
 
         buildConfigField("boolean", "IS_INTERNAL_BUILD", "false")
         buildConfigField("int", "EXOPACKAGE_FLAGS", "0")
+        buildConfigField("int", "HERMES_BYTECODE_VERSION", "0")
 
         resValue "integer", "react_native_dev_server_port", reactNativeDevServerPort()
         resValue "integer", "react_native_inspector_proxy_port", reactNativeInspectorProxyPort()
@@ -417,11 +476,7 @@ android {
         }
     }
 
-    tasks.withType(JavaCompile) {
-        compileTask ->
-            compileTask.dependsOn(packageReactNdkLibs)
-    }
-
+    preBuild.dependsOn(packageReactNdkLibs)
     clean.dependsOn(cleanReactNdkLib)
 
     lintOptions {
@@ -436,25 +491,30 @@ android {
     configurations {
         extractHeaders
         extractJNI
+        javadocDeps.extendsFrom api
     }
 }
 
 dependencies {
-    api("com.facebook.infer.annotation:infer-annotation:0.11.2")
-    api("com.facebook.yoga:proguard-annotations:1.14.1")
+    api("com.facebook.infer.annotation:infer-annotation:0.18.0")
+    api("com.facebook.yoga:proguard-annotations:1.19.0")
     api("javax.inject:javax.inject:1")
     api("androidx.appcompat:appcompat:1.0.2")
+    api("androidx.autofill:autofill:1.1.0")
     api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
     api("com.facebook.fresco:fresco:${FRESCO_VERSION}")
     api("com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}")
+    api("com.facebook.fresco:ui-common:${FRESCO_VERSION}")
     api("com.facebook.soloader:soloader:${SO_LOADER_VERSION}")
     api("com.google.code.findbugs:jsr305:3.0.2")
     api("com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}")
     api("com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}")
-    api("com.squareup.okio:okio:1.17.5")
-    api("com.facebook.fbjni:fbjni-java-only:0.0.3")
-    extractHeaders("com.facebook.fbjni:fbjni:0.0.2:headers")
-    extractJNI("com.facebook.fbjni:fbjni:0.0.2")
+    api("com.squareup.okio:okio:2.9.0")
+    api("com.facebook.fbjni:fbjni-java-only:0.2.2")
+    extractHeaders("com.facebook.fbjni:fbjni:0.2.2:headers")
+    extractJNI("com.facebook.fbjni:fbjni:0.2.2")
+
+    javadocDeps("com.squareup:javapoet:1.13.0")
 
     testImplementation("junit:junit:${JUNIT_VERSION}")
     testImplementation("org.powermock:powermock-api-mockito2:${POWERMOCK_VERSION}")
@@ -470,10 +530,61 @@ dependencies {
     androidTestImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
 }
 
-apply(from: "release.gradle")
-
 react {
+    // TODO: The library name is chosen for parity with Fabric components & iOS
+    // This should be changed to a more generic name, e.g. `ReactCoreSpec`.
+    libraryName = "rncore"
     jsRootDir = file("../Libraries")
     reactNativeRootDir = file("$projectDir/..")
     useJavaGenerator = System.getenv("USE_CODEGEN_JAVAPOET") ?: false
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                // Applies the component for the release build variant.
+                from components.release
+
+                // You can then customize attributes of the publication as shown below.
+                artifactId = POM_ARTIFACT_ID
+                groupId = GROUP
+                version = VERSION_NAME
+
+                pom {
+                    name = POM_NAME
+                    description = "A framework for building native apps with React"
+                    url = "https://github.com/facebook/react-native"
+
+                    developers {
+                        developer {
+                            id = "facebook"
+                            name = "Facebook"
+                        }
+                    }
+
+                    licenses {
+                        license {
+                            name = "MIT License"
+                            url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
+                            distribution = "repo"
+                        }
+                    }
+
+                    scm {
+                        url = "https://github.com/facebook/react-native.git"
+                        connection = "scm:git:https://github.com/facebook/react-native.git"
+                        developerConnection = "scm:git:git@github.com:facebook/react-native.git"
+                    }
+                }
+            }
+        }
+
+        repositories {
+            maven {
+                name = "npm"
+                url = AAR_OUTPUT_URL
+            }
+        }
+    }
+}
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index d81ac6b7997a8e..282776b42aefc0 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,5 +1,4 @@
-# TODO :: ANDROID patch to stay consistant with the npm version.
-VERSION_NAME=0.63.3
+VERSION_NAME=0.66.0
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
@@ -12,13 +11,15 @@ ROBOLECTRIC_VERSION=4.4
 JUNIT_VERSION=4.12
 
 ANDROIDX_TEST_VERSION=1.1.0
-FRESCO_VERSION=2.0.0
-OKHTTP_VERSION=3.12.12
-SO_LOADER_VERSION=0.9.0
+FRESCO_VERSION=2.5.0
+OKHTTP_VERSION=4.9.1
+SO_LOADER_VERSION=0.10.1
 
 BOOST_VERSION=1_63_0
 DOUBLE_CONVERSION_VERSION=1.1.6
-FOLLY_VERSION=2020.01.13.00
+FOLLY_VERSION=2021.06.28.00
+FMT_VERSION=6.2.1
+LIBEVENT_VERSION=2.1.12
 GLOG_VERSION=0.3.5
 
 android.useAndroidX=true
diff --git a/ReactAndroid/proguard-rules.pro b/ReactAndroid/proguard-rules.pro
index e13dfef7ec70ad..93a74c617b83fa 100644
--- a/ReactAndroid/proguard-rules.pro
+++ b/ReactAndroid/proguard-rules.pro
@@ -50,17 +50,11 @@
 
 -dontwarn com.facebook.react.**
 -keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
+-keep,includedescriptorclasses class com.facebook.react.turbomodule.core.** { *; }
 
 # hermes
 -keep class com.facebook.jni.** { *; }
 
-# okhttp
-
--keepattributes Signature
--keepattributes *Annotation*
--keep class okhttp3.** { *; }
--keep interface okhttp3.** { *; }
--dontwarn okhttp3.**
 
 # okio
 
diff --git a/ReactAndroid/release.gradle b/ReactAndroid/release.gradle
deleted file mode 100644
index bf3db45264580c..00000000000000
--- a/ReactAndroid/release.gradle
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-apply(plugin: "maven")
-apply(plugin: "signing")
-
-ext {
-    AAR_OUTPUT_URL = "file://${projectDir}/../android"
-}
-
-// Gradle tasks for publishing to maven
-// 1) To install in local maven repo use :installArchives task
-// 2) To upload artifact to maven central use: :uploadArchives (you'd need to have the permission to do that)
-
-def isReleaseBuild() {
-    return VERSION_NAME.contains("SNAPSHOT") == false
-}
-
-def getRepositoryUrl() {
-    return project.findProperty("repositoryUrl") ?: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-}
-
-def getRepositoryUsername() {
-    return project.findProperty("repositoryUsername") ?: ""
-}
-
-def getRepositoryPassword() {
-    return project.findProperty("repositoryPassword") ?: ""
-}
-
-def configureReactNativePom(def pom) {
-    pom.project {
-        name(POM_NAME)
-        artifactId(POM_ARTIFACT_ID)
-        packaging(POM_PACKAGING)
-        description("A framework for building native apps with React")
-        url("https://github.com/facebook/react-native")
-
-        scm {
-            url("https://github.com/facebook/react-native.git")
-            connection("scm:git:https://github.com/facebook/react-native.git")
-            developerConnection("scm:git:git@github.com:facebook/react-native.git")
-        }
-
-        licenses {
-            license {
-                name("MIT License")
-                url("https://github.com/facebook/react-native/blob/master/LICENSE")
-                distribution("repo")
-            }
-        }
-
-        developers {
-            developer {
-                id("facebook")
-                name("Facebook")
-            }
-        }
-    }
-}
-
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption("Xdoclint:none", "-quiet")
-        }
-    }
-}
-
-afterEvaluate { project ->
-
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName("compile").asList())
-        include("**/*.java")
-        exclude("**/ReactBuildConfig.java")
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = "javadoc"
-        from(androidJavadoc.destinationDir)
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = "sources"
-        from(android.sourceSets.main.java.srcDirs)
-        include("**/*.java")
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider.get()) {
-            from(variant.javaCompileProvider.get().destinationDir)
-        }
-    }
-
-    artifacts {
-        archives(androidSourcesJar)
-        archives(androidJavadocJar)
-    }
-
-    version = VERSION_NAME
-    group = GROUP
-
-    signing {
-        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-        sign(configurations.archives)
-    }
-
-    uploadArchives {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            beforeDeployment {
-                MavenDeployment deployment -> signing.signPom(deployment)
-            }
-
-            repository(url: getRepositoryUrl()) {
-                authentication(
-                        userName: getRepositoryUsername(),
-                        password: getRepositoryPassword())
-
-            }
-
-            configureReactNativePom(pom)
-        }
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native/android, ready to publish to npm
-            repository(url: AAR_OUTPUT_URL)
-
-            configureReactNativePom(pom)
-        }
-    }
-}
diff --git a/ReactAndroid/src/androidTest/buck-runner/BUCK b/ReactAndroid/src/androidTest/buck-runner/BUCK
index 0bad88bdeb83e5..c27596ee462c3e 100644
--- a/ReactAndroid/src/androidTest/buck-runner/BUCK
+++ b/ReactAndroid/src/androidTest/buck-runner/BUCK
@@ -11,6 +11,7 @@ rn_android_binary(
     name = "instrumentation-tests",
     keystore = KEYSTORE_TARGET,
     manifest = "AndroidManifest.xml",
+    use_split_dex = True,
     deps = [
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         react_native_dep("third-party/java/testing-support-lib:exposed-instrumentation-api"),
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 6d16a702ecf400..78e1dd6ae74fa4 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -9,6 +9,7 @@ rn_android_library(
             "network/**/*.java",
         ],
     ),
+    autoglob = False,
     is_androidx = True,
     visibility = [
         "PUBLIC",
@@ -26,7 +27,7 @@ rn_android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/junit:junit"),
         react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
-        react_native_dep("third-party/java/testing-support-lib:runner"),
+        react_native_dep("third-party/android/androidx:test-runner"),
         react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
         react_native_integration_tests_target("java/com/facebook/react/testing/network:network"),
         react_native_target("java/com/facebook/react:react"),
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
index 4150b833ee5f21..036a2d5abcfe5c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
@@ -37,7 +37,7 @@ protected void setUp() throws Exception {
     final ReactAppTestActivity activity = getActivity();
     activity.loadApp(
         getReactApplicationKeyUnderTest(), createReactInstanceSpecForTest(), getEnableDevSupport());
-    waitForBridgeAndUIIdle();
+    waitForBridgeAndUIIdle(5000);
   }
 
   @Override
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
index 80a28b690ef50f..6a540efc6d6e34 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
@@ -3,12 +3,13 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "idledetection",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/java/testing-support-lib:runner"),
+        react_native_dep("third-party/android/androidx:test-runner"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
index e7410dc91b0db5..4cdbf83a058dda 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
@@ -79,7 +79,7 @@ public void doFrame(long frameTimeNanos) {
   }
 
   private static void waitForJSIdle(ReactContext reactContext) {
-    if (!reactContext.hasActiveCatalystInstance()) {
+    if (!reactContext.hasActiveReactInstance()) {
       return;
     }
     final CountDownLatch latch = new CountDownLatch(1);
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
index 980eda5d8d0601..d8e68b3f29aa64 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
index 1bf0b3c7a8ab15..d410f7c5f3a09c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
@@ -1,4 +1,3 @@
-# BUILD FILE SYNTAX: SKYLARK
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "IS_OSS_BUILD",
@@ -11,21 +10,23 @@ load(
 rn_android_library(
     name = "rule",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     visibility = [
         "PUBLIC",
     ],
-    deps = ([
+    deps = [
         react_native_dep("third-party/android/androidx:test-espresso-core"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/junit:junit"),
-        react_native_dep("third-party/java/testing-support-lib:testing-support-lib"),
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
         react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
+        react_native_dep("third-party/android/androidx:test-rules"),
+        react_native_dep("third-party/android/androidx:test-runner"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
         react_native_integration_tests_target("java/com/facebook/react/testing/idledetection:idledetection"),
@@ -35,8 +36,8 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-    ]) + ([
+    ] + [
         react_native_dep("java/com/facebook/testing/instrumentation:instrumentation"),
         react_native_dep("java/com/facebook/testing/instrumentation/base:base"),
-    ]) if not IS_OSS_BUILD else [],
+    ] if not IS_OSS_BUILD else [],
 )
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 0b29ef31268c22..451cd7413b9686 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_int
 rn_android_library(
     name = "tests",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     visibility = [
         "PUBLIC",
@@ -32,7 +33,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager/util:util"),
-        react_native_target("java/com/facebook/react/views/picker:picker"),
         react_native_target("java/com/facebook/react/views/progressbar:progressbar"),
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
         react_native_target("java/com/facebook/react/views/slider:slider"),
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
deleted file mode 100644
index c301b04e7e8b9f..00000000000000
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tests;
-
-import android.graphics.Color;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-import com.facebook.react.bridge.BaseJavaModule;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.testing.ReactAppInstrumentationTestCase;
-import com.facebook.react.testing.ReactInstanceSpecForTest;
-import com.facebook.react.views.picker.ReactDialogPickerManager;
-import com.facebook.react.views.picker.ReactDropdownPickerManager;
-import com.facebook.react.views.picker.ReactPicker;
-import com.facebook.react.views.picker.ReactPickerManager;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Integration test for {@link ReactDialogPickerManager} and {@link ReactDropdownPickerManager}
- * (and, implicitly, {@link ReactPickerManager}). Tests basic properties, events and switching
- * between spinner modes (which changes the used manager).
- */
-public class ReactPickerTestCase extends ReactAppInstrumentationTestCase {
-
-  private static interface PickerAndroidTestModule extends JavaScriptModule {
-    public void selectItem(int position);
-
-    public void setMode(String mode);
-
-    public void setPrimaryColor(String color);
-  }
-
-  public static class PickerAndroidRecordingModule extends BaseJavaModule {
-    private final List<Integer> mSelections = new ArrayList<Integer>();
-
-    @Override
-    public String getName() {
-      return "PickerAndroidRecordingModule";
-    }
-
-    @ReactMethod
-    public void recordSelection(int position) {
-      mSelections.add(position);
-    }
-
-    public List<Integer> getSelections() {
-      return new ArrayList<Integer>(mSelections);
-    }
-  }
-
-  private PickerAndroidRecordingModule mRecordingModule;
-
-  @Override
-  protected String getReactApplicationKeyUnderTest() {
-    return "PickerAndroidTestApp";
-  }
-
-  @Override
-  protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
-    mRecordingModule = new PickerAndroidRecordingModule();
-    return super.createReactInstanceSpecForTest().addNativeModule(mRecordingModule);
-  }
-
-  public void testBasicProperties() {
-    ReactPicker spinner = getViewAtPath(0, 0);
-    SpinnerAdapter adapter = spinner.getAdapter();
-
-    assertEquals(Spinner.MODE_DIALOG, spinner.getMode());
-    assertEquals("prompt", spinner.getPrompt());
-    assertNotNull(adapter);
-    assertEquals(3, adapter.getCount());
-    assertEquals("item1", ((TextView) adapter.getView(0, null, null)).getText());
-    assertEquals("item2", ((TextView) adapter.getView(1, null, null)).getText());
-    assertEquals("item3", ((TextView) adapter.getView(2, null, null)).getText());
-    assertEquals(1, spinner.getSelectedItemPosition());
-
-    // test colors
-    assertEquals(Color.RED, ((TextView) adapter.getView(0, null, null)).getCurrentTextColor());
-    assertEquals(Color.GREEN, ((TextView) adapter.getView(1, null, null)).getCurrentTextColor());
-    assertEquals(Color.BLUE, ((TextView) adapter.getView(2, null, null)).getCurrentTextColor());
-    assertEquals(
-        Color.RED, ((TextView) adapter.getDropDownView(0, null, null)).getCurrentTextColor());
-    assertEquals(
-        Color.GREEN, ((TextView) adapter.getDropDownView(1, null, null)).getCurrentTextColor());
-    assertEquals(
-        Color.BLUE, ((TextView) adapter.getDropDownView(2, null, null)).getCurrentTextColor());
-    getTestModule().setPrimaryColor("black");
-    waitForBridgeAndUIIdle();
-    assertEquals(Color.BLACK, ((TextView) adapter.getView(0, null, null)).getCurrentTextColor());
-    assertEquals(Color.BLACK, ((TextView) adapter.getView(1, null, null)).getCurrentTextColor());
-    assertEquals(Color.BLACK, ((TextView) adapter.getView(2, null, null)).getCurrentTextColor());
-    assertEquals(
-        Color.RED, ((TextView) adapter.getDropDownView(0, null, null)).getCurrentTextColor());
-    assertEquals(
-        Color.GREEN, ((TextView) adapter.getDropDownView(1, null, null)).getCurrentTextColor());
-    assertEquals(
-        Color.BLUE, ((TextView) adapter.getDropDownView(2, null, null)).getCurrentTextColor());
-  }
-
-  public void testDropdownPicker() {
-    ReactPicker spinner = getViewAtPath(0, 1);
-
-    assertEquals(Spinner.MODE_DROPDOWN, spinner.getMode());
-  }
-
-  public void testDisabledPicker() {
-    ReactPicker spinner = getViewAtPath(0, 2);
-
-    assertFalse(spinner.isEnabled());
-  }
-
-  public void testUpdateSelectedItem() {
-    ReactPicker spinner = getViewAtPath(0, 0);
-    assertEquals(1, spinner.getSelectedItemPosition());
-
-    getTestModule().selectItem(2);
-    waitForBridgeAndUIIdle();
-    getInstrumentation().waitForIdleSync();
-
-    assertEquals(2, spinner.getSelectedItemPosition());
-  }
-
-  public void testUpdateMode() {
-    ReactPicker spinner = getViewAtPath(0, 1);
-    assertEquals(Spinner.MODE_DROPDOWN, spinner.getMode());
-
-    getTestModule().setMode("dialog");
-    waitForBridgeAndUIIdle();
-    getInstrumentation().waitForIdleSync();
-
-    // changing the spinner mode in JS actually creates a new component on the native side, as
-    // there's no way to change the mode once you have constructed a Spinner.
-    ReactPicker newPicker = getViewAtPath(0, 1);
-    assertTrue(spinner != newPicker);
-    assertEquals(Spinner.MODE_DIALOG, newPicker.getMode());
-  }
-
-  public void testOnSelect() throws Throwable {
-    runTestOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            ReactPicker spinner = getViewAtPath(0, 0);
-            spinner.setSelection(2);
-          }
-        });
-
-    getInstrumentation().waitForIdleSync();
-    waitForBridgeAndUIIdle();
-
-    List<Integer> selections = mRecordingModule.getSelections();
-    assertEquals(1, selections.size());
-    assertEquals(2, (int) selections.get(0));
-  }
-
-  public void testOnSelectSequence() throws Throwable {
-    updateFirstSpinnerAndCheckLastSpinnerMatches(0);
-    updateFirstSpinnerAndCheckLastSpinnerMatches(2);
-    updateFirstSpinnerAndCheckLastSpinnerMatches(0);
-    updateFirstSpinnerAndCheckLastSpinnerMatches(2);
-  }
-
-  private void updateFirstSpinnerAndCheckLastSpinnerMatches(final int indexToSelect)
-      throws Throwable {
-    // The last spinner has the same selected value as the first one.
-    // Test that user selection is propagated correctly to JS, to setState, and to Spinners.
-    runTestOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            ReactPicker spinner = getViewAtPath(0, 0);
-            spinner.setSelection(indexToSelect);
-          }
-        });
-    getInstrumentation().waitForIdleSync();
-    waitForBridgeAndUIIdle();
-
-    ReactPicker spinnerInSync = getViewAtPath(0, 3);
-    assertEquals(
-        "Picker selection was not updated correctly via setState.",
-        indexToSelect,
-        spinnerInSync.getSelectedItemPosition());
-  }
-
-  private PickerAndroidTestModule getTestModule() {
-    return getReactContext().getCatalystInstance().getJSModule(PickerAndroidTestModule.class);
-  }
-}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
index 920ce021812192..88e0cf51e09d74 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
@@ -259,8 +259,7 @@ public void run() {
   /**
    * Test that the mentions input has colors displayed correctly. Removed for being flaky in open
    * source, December 2016 public void testMetionsInputColors() throws Throwable { EventDispatcher
-   * eventDispatcher =
-   * getReactContext().getNativeModule(UIManagerModule.class).getEventDispatcher(); ReactEditText
+   * eventDispatcher = UIManagerHelper.getEventEmitterForReactTag(reactContext, tag); ReactEditText
    * reactEditText = getViewByTestId("tokenizedInput"); String newText = "#Things and more #things";
    * int contentWidth = reactEditText.getWidth(); int contentHeight = reactEditText.getHeight(); int
    * start = 0; int count = newText.length();
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
index 0c2c6a3781d998..8ce6ba218f7c76 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
@@ -1,4 +1,3 @@
-# BUILD FILE SYNTAX: SKYLARK
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "IS_OSS_BUILD",
@@ -11,12 +10,14 @@ load(
 rn_android_library(
     name = "core",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
-    deps = ([
+    deps = [
         react_native_dep("third-party/android/androidx:test-espresso-core"),
         react_native_dep("third-party/java/fest:fest"),
         react_native_dep("third-party/java/junit:junit"),
-        react_native_dep("third-party/java/testing-support-lib:testing-support-lib"),
+        react_native_dep("third-party/android/androidx:test-rules"),
+        react_native_dep("third-party/android/androidx:test-runner"),
         react_native_integration_tests_target("java/com/facebook/react/testing:testing"),
         react_native_integration_tests_target("java/com/facebook/react/testing/rule:rule"),
         react_native_target("java/com/facebook/react:react"),
@@ -26,7 +27,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/model:model"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-    ]) + ([
+    ] + [
         react_native_dep("java/com/facebook/fbreact/testing:testing"),
-    ]) if not IS_OSS_BUILD else [],
+    ] if not IS_OSS_BUILD else [],
 )
diff --git a/ReactAndroid/src/androidTest/js/BUCK b/ReactAndroid/src/androidTest/js/BUCK
new file mode 100644
index 00000000000000..3820c3470fb07a
--- /dev/null
+++ b/ReactAndroid/src/androidTest/js/BUCK
@@ -0,0 +1,26 @@
+load("//tools/build_defs:js_glob.bzl", "js_glob")
+load("//tools/build_defs/oss:metro_defs.bzl", "rn_library")
+
+# This file was generated by running
+# js1 build buckfiles
+
+rn_library(
+    name = "js",
+    srcs = js_glob(
+        [
+            "**/*",
+        ],
+        excludes = [
+            "**/__*__/**",
+            "**/*.command",
+            "**/*.md",
+        ],
+    ),
+    labels = ["supermodule:xplat/default/public.react_native.tests"],
+    skip_processors = True,
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/RKJSModules/vendor/react:react",
+        "//xplat/js/react-native-github:react-native",
+    ],
+)
diff --git a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js b/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
deleted file mode 100644
index a4e0cc0ae67ad0..00000000000000
--- a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-'use strict';
-
-const React = require('react');
-const {NativeModules, Picker, View} = require('react-native');
-const BatchedBridge = require('react-native/Libraries/BatchedBridge/BatchedBridge');
-
-const {Recording: RecordingModule} = NativeModules;
-const Item = Picker.Item;
-
-let appInstance;
-
-class PickerAndroidTestApp extends React.Component {
-  state = {
-    selected: 1,
-    mode: 'dropdown',
-    style: {},
-  };
-
-  UNSAFE_componentWillMount() {
-    appInstance = this;
-  }
-
-  render() {
-    return (
-      <View collapsable={false}>
-        <Picker
-          mode="dialog"
-          prompt="prompt"
-          style={this.state.style}
-          selectedValue={this.state.selected}
-          onValueChange={this.onValueChange}>
-          <Item label="item1" color="#ff0000" value={0} />
-          <Item label="item2" color="#00ff00" value={1} />
-          <Item label="item3" color="#0000ff" value={2} />
-        </Picker>
-        <Picker mode={this.state.mode}>
-          <Item label="item1" />
-          <Item label="item2" />
-        </Picker>
-        <Picker enabled={false}>
-          <Item label="item1" />
-          <Item label="item2" />
-        </Picker>
-        <Picker
-          mode="dropdown"
-          selectedValue={this.state.selected}
-          onValueChange={this.onValueChange}>
-          <Item label="item in sync 1" value={0} />
-          <Item label="item in sync 2" value={1} />
-          <Item label="item in sync 3" value={2} />
-        </Picker>
-      </View>
-    );
-  }
-
-  onValueChange = value => {
-    this.setState({selected: value});
-    RecordingModule.recordSelection(value);
-  };
-}
-
-const PickerAndroidTestModule = {
-  PickerAndroidTestApp: PickerAndroidTestApp,
-  selectItem: function(value) {
-    appInstance.setState({selected: value});
-  },
-  setMode: function(mode) {
-    appInstance.setState({mode: mode});
-  },
-  setPrimaryColor: function(color) {
-    appInstance.setState({style: {color}});
-  },
-};
-
-BatchedBridge.registerCallableModule(
-  'PickerAndroidTestModule',
-  PickerAndroidTestModule,
-);
-
-module.exports = PickerAndroidTestModule;
diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js
index 4608c1780d3733..709f469b118d45 100644
--- a/ReactAndroid/src/androidTest/js/TestBundle.js
+++ b/ReactAndroid/src/androidTest/js/TestBundle.js
@@ -24,7 +24,6 @@ require('./UIManagerTestModule');
 require('./CatalystRootViewTestModule');
 require('./DatePickerDialogTestModule');
 require('./MeasureLayoutTestModule');
-require('./PickerAndroidTestModule');
 require('./ScrollViewTestModule');
 require('./ShareTestModule');
 require('./SwipeRefreshLayoutTestModule');
@@ -86,10 +85,6 @@ const apps = [
     appKey: 'NativeIdTestApp',
     component: () => require('./NativeIdTestModule').NativeIdTestApp,
   },
-  {
-    appKey: 'PickerAndroidTestApp',
-    component: () => require('./PickerAndroidTestModule').PickerAndroidTestApp,
-  },
   {
     appKey: 'ScrollViewTestApp',
     component: () => require('./ScrollViewTestModule').ScrollViewTestApp,
diff --git a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
index 61b0d0b2f384dd..25c7c5e0cc75c1 100644
--- a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
+++ b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
@@ -16,6 +16,7 @@ const React = require('react');
 const renderApplication = require('react-native/Libraries/ReactNative/renderApplication');
 
 const {StyleSheet, Text, View} = require('react-native');
+import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 type FlexTestAppProps = $ReadOnly<{||}>;
 class FlexTestApp extends React.Component<FlexTestAppProps> {
@@ -234,26 +235,26 @@ const UpdatePositionInListTestAppStyles = StyleSheet.create({
 const emptyExactProps = Object.freeze({});
 
 const UIManagerTestModule = {
-  renderFlexTestApplication(rootTag: number) {
+  renderFlexTestApplication(rootTag: RootTag) {
     renderApplication(FlexTestApp, emptyExactProps, rootTag);
   },
-  renderFlexWithTextApplication(rootTag: number) {
+  renderFlexWithTextApplication(rootTag: RootTag) {
     renderApplication(FlexWithText, emptyExactProps, rootTag);
   },
-  renderAbsolutePositionBottomRightTestApplication(rootTag: number) {
+  renderAbsolutePositionBottomRightTestApplication(rootTag: RootTag) {
     renderApplication(
       AbsolutePositionBottomRightTestApp,
       emptyExactProps,
       rootTag,
     );
   },
-  renderAbsolutePositionTestApplication(rootTag: number) {
+  renderAbsolutePositionTestApplication(rootTag: RootTag) {
     renderApplication(AbsolutePositionTestApp, emptyExactProps, rootTag);
   },
-  renderCenteredTextViewTestApplication(rootTag: number, text: string) {
+  renderCenteredTextViewTestApplication(rootTag: RootTag, text: string) {
     renderApplication(CenteredTextView, {text: text}, rootTag);
   },
-  renderUpdatePositionInListTestApplication(rootTag: number) {
+  renderUpdatePositionInListTestApplication(rootTag: RootTag) {
     renderApplication(UpdatePositionInListTestApp, emptyExactProps, rootTag);
   },
   flushUpdatePositionInList,
diff --git a/ReactAndroid/src/main/java/com/facebook/BUCK b/ReactAndroid/src/main/java/com/facebook/BUCK
index a7461d145d8fc2..f24e877ad0ad4f 100644
--- a/ReactAndroid/src/main/java/com/facebook/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "yoga",
     srcs = glob(["yoga/*.java"]),
+    autoglob = False,
     visibility = ["PUBLIC"],
     deps = [
         react_native_dep("libraries/fbjni:java"),
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK
index a161001ec1cab1..3ccc5d058d7d85 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "model",
     srcs = glob(["*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
index 2daef176010bf5..13c5da59066b27 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "holder",
     srcs = glob(["*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
index 3e2e015c78e8d2..2133f0f6b9978b 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "tags",
     srcs = glob(["*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
index 3548e86abd3c93..651168243ef04e 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
@@ -18,8 +18,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
index 439ae4b4743578..c78901a85f6c1d 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_nat
 rn_android_library(
     name = "instrumentation",
     srcs = ["HermesMemoryDumper.java"],
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
@@ -11,6 +12,7 @@ rn_android_library(
 rn_android_library(
     name = "hermes_samplingprofiler",
     srcs = ["HermesSamplingProfiler.java"],
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = ["PUBLIC"],
     deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
index ff05e4c14824cf..7716394c31f78b 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
@@ -17,8 +17,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-release
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-debug libhermes-inspector
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug libhermes-inspector
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
index 5f42f833dfb309..fca40c1027f765 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
@@ -6,6 +6,7 @@ rn_android_library(
         "HermesExecutor.java",
         "HermesExecutorFactory.java",
     ],
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
@@ -25,6 +26,7 @@ rn_android_library(
     srcs = [
         "RuntimeConfig.java",
     ],
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java
index 976af80b1eeb66..ce09abba961109 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java
@@ -17,7 +17,7 @@ public class HermesExecutorFactory implements JavaScriptExecutorFactory {
   private final RuntimeConfig mConfig;
 
   public HermesExecutorFactory() {
-    this(new RuntimeConfig(1024));
+    this(null);
   }
 
   public HermesExecutorFactory(RuntimeConfig config) {
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
index 0e666e328e0223..56a9f589490f1f 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
@@ -7,7 +7,9 @@
 
 #include <../instrumentation/HermesMemoryDumper.h>
 #include <HermesExecutorFactory.h>
+#include <android/log.h>
 #include <fbjni/fbjni.h>
+#include <glog/logging.h>
 #include <hermes/Public/GCConfig.h>
 #include <hermes/Public/RuntimeConfig.h>
 #include <jni.h>
@@ -21,6 +23,13 @@
 namespace facebook {
 namespace react {
 
+static void hermesFatalHandler(const std::string &reason) {
+  LOG(ERROR) << "Hermes Fatal: " << reason << "\n";
+  __android_log_assert(nullptr, "Hermes", "%s", reason.c_str());
+}
+
+static std::once_flag flag;
+
 static ::hermes::vm::RuntimeConfig makeRuntimeConfig(jlong heapSizeMB) {
   namespace vm = ::hermes::vm;
   auto gcConfigBuilder =
@@ -62,6 +71,9 @@ class HermesExecutorHolder
       jni::alias_ref<jclass>) {
     JReactMarker::setLogPerfMarkerIfNeeded();
 
+    std::call_once(flag, []() {
+      facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
+    });
     return makeCxxInstance(
         std::make_unique<HermesExecutorFactory>(installBindings));
   }
@@ -71,6 +83,9 @@ class HermesExecutorHolder
       jlong heapSizeMB) {
     JReactMarker::setLogPerfMarkerIfNeeded();
     auto runtimeConfig = makeRuntimeConfig(heapSizeMB);
+    std::call_once(flag, []() {
+      facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
+    });
     return makeCxxInstance(std::make_unique<HermesExecutorFactory>(
         installBindings, JSIExecutor::defaultTimeoutInvoker, runtimeConfig));
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/RuntimeConfig.java b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/RuntimeConfig.java
index fec7c457bc8b98..a3e91b8cce6ff9 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/RuntimeConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/RuntimeConfig.java
@@ -10,10 +10,4 @@
 /** Holds runtime configuration for a Hermes VM instance (master or snapshot). */
 public final class RuntimeConfig {
   public long heapSizeMB;
-
-  RuntimeConfig() {}
-
-  RuntimeConfig(long heapSizeMB) {
-    this.heapSizeMB = heapSizeMB;
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/unicode/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/unicode/BUCK
index 8f5636e166283b..49f7e87f72be9a 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/unicode/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/unicode/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "unicode",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/perftest/BUCK b/ReactAndroid/src/main/java/com/facebook/perftest/BUCK
index 974cfdbcd02591..1809442c8eae59 100644
--- a/ReactAndroid/src/main/java/com/facebook/perftest/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/perftest/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 rn_android_library(
     name = "perftest",
     srcs = glob(["*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
index 31dc81e24005ae..bae5e4f25e3c20 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
@@ -9,13 +9,14 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "annotations-binary.jar",
-    sha1 = "3d015bb821875657ac8e4b808a223aae339defb2",
-    url = "https://jcenter.bintray.com/com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1.jar",
+    sha1 = "fcbbb39052e6490eaaf6a6959c49c3a4fbe87c63",
+    url = "mvn:com.facebook.yoga:proguard-annotations:jar:1.19.0",
 )
 
 rn_android_library(
     name = "annotations",
     srcs = glob(["*.java"]),
+    autoglob = False,
     proguard_config = "proguard_annotations.pro",
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/proguard_annotations.pro b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/proguard_annotations.pro
index f9d4677e299ba8..19b04a62a2dffe 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/proguard_annotations.pro
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/proguard_annotations.pro
@@ -6,6 +6,7 @@
 # Keep our interfaces so they can be used by other ProGuard rules.
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStripAny
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
 
 # Do not strip any method/class that is annotated with @DoNotStrip
diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index e2a345df18109c..b550756ae1baa2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "react",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -12,6 +13,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:fragment"),
         react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
+        react_native_dep("third-party/android/androidx:autofill"),
     ],
     visibility = [
         "PUBLIC",
@@ -43,10 +45,11 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
         react_native_target("java/com/facebook/react/modules/toast:toast"),
         react_native_target("java/com/facebook/react/surface:surface"),
-        react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
         react_native_target("java/com/facebook/react/config:config"),
+        react_native_target("java/com/facebook/react/turbomodule/core:core"),
         react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
+        react_native_target("java/com/facebook/react/runtimescheduler:runtimescheduler"),
     ],
     exported_deps = [
         react_native_target("java/com/facebook/react/modules/core:core"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 36fb15b0a52d41..59c5c7759c52c6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -35,6 +35,7 @@
 import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.uimanager.ViewManagerResolver;
 import com.facebook.systrace.Systrace;
 import java.util.HashMap;
 import java.util.List;
@@ -175,8 +176,8 @@ private UIManagerModule createUIManager(final ReactApplicationContext reactConte
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "createUIManagerModule");
     try {
       if (mLazyViewManagersEnabled) {
-        UIManagerModule.ViewManagerResolver resolver =
-            new UIManagerModule.ViewManagerResolver() {
+        ViewManagerResolver resolver =
+            new ViewManagerResolver() {
               @Override
               public @Nullable ViewManager getViewManager(String viewManagerName) {
                 return mReactInstanceManager.createViewManager(viewManagerName);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
index 4504a261cb8b4d..3eb5aa740881d3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
@@ -65,6 +65,7 @@ protected void onDestroy() {
 
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
     mDelegate.onActivityResult(requestCode, resultCode, data);
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
index 7083f86bfc9cbb..c6766d138f59d4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
@@ -20,9 +20,9 @@
 import com.facebook.react.modules.core.PermissionListener;
 
 /**
- * Delegate class for {@link ReactActivity} and {@link ReactFragmentActivity}. You can subclass this
- * to provide custom implementations for e.g. {@link #getReactNativeHost()}, if your Application
- * class doesn't implement {@link ReactApplication}.
+ * Delegate class for {@link ReactActivity}. You can subclass this to provide custom implementations
+ * for e.g. {@link #getReactNativeHost()}, if your Application class doesn't implement {@link
+ * ReactApplication}.
  */
 public class ReactActivityDelegate {
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
index a603b374f20a96..c73590c7d2ab0d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
@@ -29,10 +29,15 @@ public class ReactAndroidHWInputDeviceHelper {
           .put(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, "playPause")
           .put(KeyEvent.KEYCODE_MEDIA_REWIND, "rewind")
           .put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, "fastForward")
+          .put(KeyEvent.KEYCODE_MEDIA_STOP, "stop")
+          .put(KeyEvent.KEYCODE_MEDIA_NEXT, "next")
+          .put(KeyEvent.KEYCODE_MEDIA_PREVIOUS, "previous")
           .put(KeyEvent.KEYCODE_DPAD_UP, "up")
           .put(KeyEvent.KEYCODE_DPAD_RIGHT, "right")
           .put(KeyEvent.KEYCODE_DPAD_DOWN, "down")
           .put(KeyEvent.KEYCODE_DPAD_LEFT, "left")
+          .put(KeyEvent.KEYCODE_INFO, "info")
+          .put(KeyEvent.KEYCODE_MENU, "menu")
           .build();
 
   /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java b/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java
index 5f6f0496ff955f..5a4b9c8b49fe40 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java
@@ -27,8 +27,8 @@
  */
 public class ReactFragment extends Fragment implements PermissionAwareActivity {
 
-  private static final String ARG_COMPONENT_NAME = "arg_component_name";
-  private static final String ARG_LAUNCH_OPTIONS = "arg_launch_options";
+  protected static final String ARG_COMPONENT_NAME = "arg_component_name";
+  protected static final String ARG_LAUNCH_OPTIONS = "arg_launch_options";
 
   private ReactDelegate mReactDelegate;
 
@@ -79,6 +79,10 @@ protected ReactNativeHost getReactNativeHost() {
     return ((ReactApplication) getActivity().getApplication()).getReactNativeHost();
   }
 
+  protected ReactDelegate getReactDelegate() {
+    return mReactDelegate;
+  }
+
   @Override
   public View onCreateView(
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
deleted file mode 100644
index 9a0e1a1c1fea46..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react;
-
-/**
- * @deprecated ReactFragmentActivity will be removed in 0.59 release. Use {@link ReactActivity}
- *     instead.
- */
-@Deprecated
-public abstract class ReactFragmentActivity extends ReactActivity {}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index d685867afbbf77..3792fe60c963da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -41,6 +41,7 @@
 import android.os.Bundle;
 import android.os.Process;
 import android.view.View;
+import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import com.facebook.common.logging.FLog;
@@ -53,7 +54,6 @@
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
-import com.facebook.react.bridge.JSIModule;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JSIModuleType;
 import com.facebook.react.bridge.JavaJSExecutor;
@@ -68,7 +68,7 @@
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableNativeMap;
@@ -78,7 +78,7 @@
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.devsupport.DevSupportManagerFactory;
-import com.facebook.react.devsupport.ReactInstanceManagerDevHelper;
+import com.facebook.react.devsupport.ReactInstanceDevHelper;
 import com.facebook.react.devsupport.RedBoxHandler;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
@@ -91,8 +91,13 @@
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import com.facebook.react.modules.fabric.ReactFabric;
 import com.facebook.react.packagerconnection.RequestHandler;
+import com.facebook.react.runtimescheduler.RuntimeSchedulerManager;
 import com.facebook.react.surface.ReactStage;
+import com.facebook.react.turbomodule.core.TurboModuleManager;
+import com.facebook.react.turbomodule.core.TurboModuleManagerDelegate;
 import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry;
+import com.facebook.react.uimanager.ComponentNameResolver;
+import com.facebook.react.uimanager.ComponentNameResolverManager;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.UIImplementationProvider;
@@ -151,11 +156,14 @@ public interface ReactInstanceEventListener {
   /* accessed from any thread */
   private final JavaScriptExecutorFactory mJavaScriptExecutorFactory;
 
+  private @Nullable List<String> mViewManagerNames = null;
   private final @Nullable JSBundleLoader mBundleLoader;
   private final @Nullable String mJSMainModulePath; /* path to JS bundle root on Metro */
   private final List<ReactPackage> mPackages;
   private final DevSupportManager mDevSupportManager;
   private final boolean mUseDeveloperSupport;
+  private @Nullable ComponentNameResolverManager mComponentNameResolverManager;
+  private @Nullable RuntimeSchedulerManager mRuntimeSchedulerManager;
   private final @Nullable NotThreadSafeBridgeIdleDebugListener mBridgeIdleDebugListener;
   private final Object mReactContextLock = new Object();
   private @Nullable volatile ReactContext mCurrentReactContext;
@@ -172,6 +180,7 @@ public interface ReactInstanceEventListener {
   private final MemoryPressureRouter mMemoryPressureRouter;
   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private final @Nullable JSIModulePackage mJSIModulePackage;
+  private final @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
   private List<ViewManager> mViewManagers;
 
   private class ReactContextInitParams {
@@ -217,7 +226,8 @@ public static ReactInstanceManagerBuilder builder() {
       int minNumShakes,
       int minTimeLeftInFrameForNonBatchedOperationMs,
       @Nullable JSIModulePackage jsiModulePackage,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
+      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
+      @Nullable ReactPackageTurboModuleManagerDelegate.Builder tmmDelegateBuilder) {
     FLog.d(TAG, "ReactInstanceManager.ctor()");
     initializeSoLoaderIfNecessary(applicationContext);
 
@@ -248,6 +258,7 @@ public static ReactInstanceManagerBuilder builder() {
     mLifecycleState = initialLifecycleState;
     mMemoryPressureRouter = new MemoryPressureRouter(applicationContext);
     mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
+    mTMMDelegateBuilder = tmmDelegateBuilder;
     synchronized (mPackages) {
       PrinterHolder.getPrinter()
           .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: Use Split Packages");
@@ -277,8 +288,8 @@ public void invokeDefaultOnBackPressed() {
     }
   }
 
-  private ReactInstanceManagerDevHelper createDevHelperInterface() {
-    return new ReactInstanceManagerDevHelper() {
+  private ReactInstanceDevHelper createDevHelperInterface() {
+    return new ReactInstanceDevHelper() {
       @Override
       public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
         ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
@@ -309,9 +320,8 @@ public JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
         Activity currentActivity = getCurrentActivity();
         if (currentActivity != null) {
           ReactRootView rootView = new ReactRootView(currentActivity);
-
+          rootView.setIsFabric(ReactFeatureFlags.enableFabricInLogBox);
           rootView.startReactApplication(ReactInstanceManager.this, appKey, null);
-
           return rootView;
         }
 
@@ -509,12 +519,12 @@ public void onNewIntent(Intent intent) {
 
   private void toggleElementInspector() {
     ReactContext currentContext = getCurrentReactContext();
-    if (currentContext != null && currentContext.hasActiveCatalystInstance()) {
+    if (currentContext != null && currentContext.hasActiveReactInstance()) {
       currentContext
           .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
           .emit("toggleElementInspector", null);
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new ReactNoCrashSoftException(
               "Cannot toggleElementInspector, CatalystInstance not available"));
@@ -588,34 +598,41 @@ public void onHostResume(Activity activity) {
     mCurrentActivity = activity;
 
     if (mUseDeveloperSupport) {
-      // Resume can be called from one of two different states:
+      // Resume can be called from one of three different states:
       // a) when activity was paused
       // b) when activity has just been created
+      // c) when there is no activity
       // In case of (a) the activity is attached to window and it is ok to add new views to it or
       // open dialogs. In case of (b) there is often a slight delay before such a thing happens.
       // As dev support manager can add views or open dialogs immediately after it gets enabled
       // (e.g. in the case when JS bundle is being fetched in background) we only want to enable
       // it once we know for sure the current activity is attached.
+      // We want to enable the various devsupport tools in case of (c) even without any activity
+
+      if (mCurrentActivity != null) {
+        // We check if activity is attached to window by checking if decor view is attached
+        final View decorView = mCurrentActivity.getWindow().getDecorView();
+        if (!ViewCompat.isAttachedToWindow(decorView)) {
+          decorView.addOnAttachStateChangeListener(
+              new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View v) {
+                  // we can drop listener now that we know the view is attached
+                  decorView.removeOnAttachStateChangeListener(this);
+                  mDevSupportManager.setDevSupportEnabled(true);
+                }
 
-      // We check if activity is attached to window by checking if decor view is attached
-      final View decorView = mCurrentActivity.getWindow().getDecorView();
-      if (!ViewCompat.isAttachedToWindow(decorView)) {
-        decorView.addOnAttachStateChangeListener(
-            new View.OnAttachStateChangeListener() {
-              @Override
-              public void onViewAttachedToWindow(View v) {
-                // we can drop listener now that we know the view is attached
-                decorView.removeOnAttachStateChangeListener(this);
-                mDevSupportManager.setDevSupportEnabled(true);
-              }
-
-              @Override
-              public void onViewDetachedFromWindow(View v) {
-                // do nothing
-              }
-            });
+                @Override
+                public void onViewDetachedFromWindow(View v) {
+                  // do nothing
+                }
+              });
+        } else {
+          // activity is attached to window, we can enable dev support immediately
+          mDevSupportManager.setDevSupportEnabled(true);
+        }
       } else {
-        // activity is attached to window, we can enable dev support immediately
+        // there is no activity, we can enable dev support
         mDevSupportManager.setDevSupportEnabled(true);
       }
     }
@@ -706,6 +723,11 @@ public void destroy() {
     synchronized (mHasStartedDestroying) {
       mHasStartedDestroying.notifyAll();
     }
+    synchronized (mPackages) {
+      mViewManagerNames = null;
+    }
+    mComponentNameResolverManager = null;
+    mRuntimeSchedulerManager = null;
     FLog.d(ReactConstants.TAG, "ReactInstanceManager has been destroyed");
   }
 
@@ -756,7 +778,8 @@ private synchronized void moveReactContextToCurrentLifecycleState() {
   }
 
   @ThreadConfined(UI)
-  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+  public void onActivityResult(
+      Activity activity, int requestCode, int resultCode, @Nullable Intent data) {
     ReactContext currentContext = getCurrentReactContext();
     if (currentContext != null) {
       currentContext.onActivityResult(activity, requestCode, resultCode, data);
@@ -794,9 +817,13 @@ public void showDevOptionsDialog() {
     mDevSupportManager.showDevOptionsDialog();
   }
 
+  @ThreadConfined(UI)
   private void clearReactRoot(ReactRoot reactRoot) {
-    reactRoot.getRootViewGroup().removeAllViews();
-    reactRoot.getRootViewGroup().setId(View.NO_ID);
+    UiThreadUtil.assertOnUiThread();
+    reactRoot.getState().compareAndSet(ReactRoot.STATE_STARTED, ReactRoot.STATE_STOPPED);
+    ViewGroup rootViewGroup = reactRoot.getRootViewGroup();
+    rootViewGroup.removeAllViews();
+    rootViewGroup.setId(View.NO_ID);
   }
 
   /**
@@ -810,17 +837,22 @@ private void clearReactRoot(ReactRoot reactRoot) {
   @ThreadConfined(UI)
   public void attachRootView(ReactRoot reactRoot) {
     UiThreadUtil.assertOnUiThread();
-    mAttachedReactRoots.add(reactRoot);
 
-    // Reset reactRoot content as it's going to be populated by the application content from JS.
-    clearReactRoot(reactRoot);
+    // Calling clearReactRoot is necessary to initialize the Id on reactRoot
+    // This is necessary independently if the RN Bridge has been initialized or not.
+    // Ideally reactRoot should be initialized with id == NO_ID
+    if (mAttachedReactRoots.add(reactRoot)) {
+      clearReactRoot(reactRoot);
+    }
 
     // If react context is being created in the background, JS application will be started
     // automatically when creation completes, as reactRoot reactRoot is part of the attached
     // reactRoot reactRoot list.
     ReactContext currentContext = getCurrentReactContext();
     if (mCreateReactContextThread == null && currentContext != null) {
-      attachRootViewToInstance(reactRoot);
+      if (reactRoot.getState().compareAndSet(ReactRoot.STATE_STOPPED, ReactRoot.STATE_STARTED)) {
+        attachRootViewToInstance(reactRoot);
+      }
     }
   }
 
@@ -836,7 +868,7 @@ public void detachRootView(ReactRoot reactRoot) {
       if (mAttachedReactRoots.contains(reactRoot)) {
         ReactContext currentContext = getCurrentReactContext();
         mAttachedReactRoots.remove(reactRoot);
-        if (currentContext != null && currentContext.hasActiveCatalystInstance()) {
+        if (currentContext != null && currentContext.hasActiveReactInstance()) {
           detachViewFromInstance(reactRoot, currentContext.getCatalystInstance());
         }
       }
@@ -871,7 +903,7 @@ public List<ViewManager> getOrCreateViewManagers(
     ReactApplicationContext context;
     synchronized (mReactContextLock) {
       context = (ReactApplicationContext) getCurrentReactContext();
-      if (context == null || !context.hasActiveCatalystInstance()) {
+      if (context == null || !context.hasActiveReactInstance()) {
         return null;
       }
     }
@@ -893,32 +925,39 @@ public List<ViewManager> getOrCreateViewManagers(
 
   public @Nullable List<String> getViewManagerNames() {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerNames");
+    List<String> viewManagerNames = mViewManagerNames;
+    if (viewManagerNames != null) {
+      return viewManagerNames;
+    }
     ReactApplicationContext context;
     synchronized (mReactContextLock) {
       context = (ReactApplicationContext) getCurrentReactContext();
-      if (context == null || !context.hasActiveCatalystInstance()) {
+      if (context == null || !context.hasActiveReactInstance()) {
         return null;
       }
     }
 
     synchronized (mPackages) {
-      Set<String> uniqueNames = new HashSet<>();
-      for (ReactPackage reactPackage : mPackages) {
-        SystraceMessage.beginSection(
-                TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerName")
-            .arg("Package", reactPackage.getClass().getSimpleName())
-            .flush();
-        if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
-          List<String> names =
-              ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
-          if (names != null) {
-            uniqueNames.addAll(names);
+      if (mViewManagerNames == null) {
+        Set<String> uniqueNames = new HashSet<>();
+        for (ReactPackage reactPackage : mPackages) {
+          SystraceMessage.beginSection(
+                  TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerName")
+              .arg("Package", reactPackage.getClass().getSimpleName())
+              .flush();
+          if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
+            List<String> names =
+                ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
+            if (names != null) {
+              uniqueNames.addAll(names);
+            }
           }
+          SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
         }
-        SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
+        Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+        mViewManagerNames = new ArrayList<>(uniqueNames);
       }
-      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
-      return new ArrayList<>(uniqueNames);
+      return mViewManagerNames;
     }
   }
 
@@ -987,6 +1026,9 @@ private void recreateReactContextInBackground(
   private void runCreateReactContextOnNewThread(final ReactContextInitParams initParams) {
     FLog.d(ReactConstants.TAG, "ReactInstanceManager.runCreateReactContextOnNewThread()");
     UiThreadUtil.assertOnUiThread();
+
+    // Mark start of bridge loading
+    ReactMarker.logMarker(ReactMarkerConstants.REACT_BRIDGE_LOADING_START);
     synchronized (mAttachedReactRoots) {
       synchronized (mReactContextLock) {
         if (mCurrentReactContext != null) {
@@ -1087,7 +1129,9 @@ private void setupReactContext(final ReactApplicationContext reactContext) {
 
       ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_START);
       for (ReactRoot reactRoot : mAttachedReactRoots) {
-        attachRootViewToInstance(reactRoot);
+        if (reactRoot.getState().compareAndSet(ReactRoot.STATE_STOPPED, ReactRoot.STATE_STARTED)) {
+          attachRootViewToInstance(reactRoot);
+        }
       }
       ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_END);
     }
@@ -1116,6 +1160,8 @@ public void run() {
         });
     Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     ReactMarker.logMarker(SETUP_REACT_CONTEXT_END);
+    // Mark end of bridge loading
+    ReactMarker.logMarker(ReactMarkerConstants.REACT_BRIDGE_LOADING_END);
     reactContext.runOnJSQueueThread(
         new Runnable() {
           @Override
@@ -1203,6 +1249,7 @@ private void detachViewFromInstance(ReactRoot reactRoot, CatalystInstance cataly
     }
   }
 
+  @ThreadConfined(UI)
   private void tearDownReactContext(ReactContext reactContext) {
     FLog.d(ReactConstants.TAG, "ReactInstanceManager.tearDownReactContext()");
     UiThreadUtil.assertOnUiThread();
@@ -1260,25 +1307,35 @@ private ReactApplicationContext createReactContext(
 
     reactContext.initializeWithInstance(catalystInstance);
 
-    if (mJSIModulePackage != null) {
-      catalystInstance.addJSIModules(
-          mJSIModulePackage.getJSIModules(
-              reactContext, catalystInstance.getJavaScriptContextHolder()));
+    if (ReactFeatureFlags.useTurboModules && mTMMDelegateBuilder != null) {
+      TurboModuleManagerDelegate tmmDelegate =
+          mTMMDelegateBuilder
+              .setPackages(mPackages)
+              .setReactApplicationContext(reactContext)
+              .build();
 
-      if (ReactFeatureFlags.useTurboModules) {
-        JSIModule turboModuleManager =
-            catalystInstance.getJSIModule(JSIModuleType.TurboModuleManager);
+      TurboModuleManager turboModuleManager =
+          new TurboModuleManager(
+              catalystInstance.getRuntimeExecutor(),
+              tmmDelegate,
+              catalystInstance.getJSCallInvokerHolder(),
+              catalystInstance.getNativeCallInvokerHolder());
 
-        catalystInstance.setTurboModuleManager(turboModuleManager);
+      catalystInstance.setTurboModuleManager(turboModuleManager);
 
-        TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager;
+      TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager;
 
-        // Eagerly initialize TurboModules
-        for (String moduleName : registry.getEagerInitModuleNames()) {
-          registry.getModule(moduleName);
-        }
+      // Eagerly initialize TurboModules
+      for (String moduleName : registry.getEagerInitModuleNames()) {
+        registry.getModule(moduleName);
       }
     }
+
+    if (mJSIModulePackage != null) {
+      catalystInstance.addJSIModules(
+          mJSIModulePackage.getJSIModules(
+              reactContext, catalystInstance.getJavaScriptContextHolder()));
+    }
     if (ReactFeatureFlags.eagerInitializeFabric) {
       catalystInstance.getJSIModule(JSIModuleType.UIManager);
     }
@@ -1288,6 +1345,27 @@ private ReactApplicationContext createReactContext(
     if (Systrace.isTracing(TRACE_TAG_REACT_APPS | TRACE_TAG_REACT_JS_VM_CALLS)) {
       catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true");
     }
+    if (ReactFeatureFlags.enableExperimentalStaticViewConfigs) {
+      mComponentNameResolverManager =
+          new ComponentNameResolverManager(
+              catalystInstance.getRuntimeExecutor(),
+              new ComponentNameResolver() {
+                @Override
+                public String[] getComponentNames() {
+                  List<String> viewManagerNames = getViewManagerNames();
+                  if (viewManagerNames == null) {
+                    FLog.e(TAG, "No ViewManager names found");
+                    return new String[0];
+                  }
+                  return viewManagerNames.toArray(new String[0]);
+                }
+              });
+      catalystInstance.setGlobalVariable("__fbStaticViewConfig", "true");
+    }
+    if (ReactFeatureFlags.enableRuntimeScheduler) {
+      mRuntimeSchedulerManager = new RuntimeSchedulerManager(catalystInstance.getRuntimeExecutor());
+    }
+
     ReactMarker.logMarker(ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START);
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "runJSBundle");
     catalystInstance.runJSBundle();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index a3b33f6cfa3b71..c06f71b9a5945f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -58,6 +58,7 @@ public class ReactInstanceManagerBuilder {
   private int mMinTimeLeftInFrameForNonBatchedOperationMs = -1;
   private @Nullable JSIModulePackage mJSIModulesPackage;
   private @Nullable Map<String, RequestHandler> mCustomPackagerCommandHandlers;
+  private @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
 
   /* package protected */ ReactInstanceManagerBuilder() {}
 
@@ -224,6 +225,12 @@ public ReactInstanceManagerBuilder setCustomPackagerCommandHandlers(
     return this;
   }
 
+  public ReactInstanceManagerBuilder setReactPackageTurboModuleManagerDelegateBuilder(
+      @Nullable ReactPackageTurboModuleManagerDelegate.Builder builder) {
+    mTMMDelegateBuilder = builder;
+    return this;
+  }
+
   /**
    * Instantiates a new {@link ReactInstanceManager}. Before calling {@code build}, the following
    * must be called:
@@ -286,7 +293,8 @@ public ReactInstanceManager build() {
         mMinNumShakes,
         mMinTimeLeftInFrameForNonBatchedOperationMs,
         mJSIModulesPackage,
-        mCustomPackagerCommandHandlers);
+        mCustomPackagerCommandHandlers,
+        mTMMDelegateBuilder);
   }
 
   private JavaScriptExecutorFactory getDefaultJSExecutorFactory(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index 188ae05f361ee1..d4c457ff87de9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -72,7 +72,9 @@ protected ReactInstanceManager createReactInstanceManager() {
             .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
             .setUIImplementationProvider(getUIImplementationProvider())
             .setJSIModulesPackage(getJSIModulePackage())
-            .setInitialLifecycleState(LifecycleState.BEFORE_CREATE);
+            .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
+            .setReactPackageTurboModuleManagerDelegateBuilder(
+                getReactPackageTurboModuleManagerDelegateBuilder());
 
     for (ReactPackage reactPackage : getPackages()) {
       builder.addPackage(reactPackage);
@@ -99,6 +101,11 @@ protected ReactInstanceManager createReactInstanceManager() {
     return null;
   }
 
+  protected @Nullable ReactPackageTurboModuleManagerDelegate.Builder
+      getReactPackageTurboModuleManagerDelegateBuilder() {
+    return null;
+  }
+
   protected final Application getApplication() {
     return mApplication;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/ReactPackageTurboModuleManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java
similarity index 82%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/ReactPackageTurboModuleManagerDelegate.java
rename to ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java
index 65ee5186e476bc..2a9c99549bda5f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/ReactPackageTurboModuleManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java
@@ -5,23 +5,26 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.turbomodule.core;
+package com.facebook.react;
 
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.CxxModuleWrapper;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.turbomodule.core.TurboModuleManagerDelegate;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public abstract class ReactPackageTurboModuleManagerDelegate extends TurboModuleManagerDelegate {
   private final List<TurboReactPackage> mPackages = new ArrayList<>();
+  private final Map<TurboReactPackage, Map<String, ReactModuleInfo>> mPackageModuleInfos =
+      new HashMap<>();
   private final ReactApplicationContext mReactApplicationContext;
 
   protected ReactPackageTurboModuleManagerDelegate(
@@ -30,7 +33,9 @@ protected ReactPackageTurboModuleManagerDelegate(
     mReactApplicationContext = reactApplicationContext;
     for (ReactPackage reactPackage : packages) {
       if (reactPackage instanceof TurboReactPackage) {
-        mPackages.add((TurboReactPackage) reactPackage);
+        TurboReactPackage pkg = (TurboReactPackage) reactPackage;
+        mPackages.add(pkg);
+        mPackageModuleInfos.put(pkg, pkg.getReactModuleInfoProvider().getReactModuleInfos());
       }
     }
   }
@@ -72,8 +77,15 @@ private TurboModule resolveModule(String moduleName) {
 
     for (final TurboReactPackage pkg : mPackages) {
       try {
-        NativeModule module = pkg.getModule(moduleName, mReactApplicationContext);
-        if (resolvedModule == null || module != null && module.canOverrideExistingModule()) {
+        final ReactModuleInfo moduleInfo = mPackageModuleInfos.get(pkg).get(moduleName);
+        if (moduleInfo == null
+            || !moduleInfo.isTurboModule()
+            || resolvedModule != null && !moduleInfo.canOverrideExistingModule()) {
+          continue;
+        }
+
+        final NativeModule module = pkg.getModule(moduleName, mReactApplicationContext);
+        if (module != null) {
           resolvedModule = module;
         }
       } catch (IllegalArgumentException ex) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 9098fa1a2fc4db..13074f8963e445 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -35,13 +35,13 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
@@ -50,13 +50,15 @@
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactClippingProhibitedView;
 import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.RootView;
+import com.facebook.react.uimanager.RootViewUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Default root view for catalyst apps. Provides the ability to listen for size changes so that a UI
@@ -85,7 +87,8 @@ public interface ReactRootViewEventListener {
   private @Nullable String mInitialUITemplate;
   private @Nullable CustomGlobalLayoutListener mCustomGlobalLayoutListener;
   private @Nullable ReactRootViewEventListener mRootViewEventListener;
-  private int mRootViewTag;
+  private int mRootViewTag =
+      0; /* This should be View.NO_ID, but for legacy reasons we haven't migrated yet */
   private boolean mIsAttachedToInstance;
   private boolean mShouldLogContentAppeared;
   private @Nullable JSTouchDispatcher mJSTouchDispatcher;
@@ -99,6 +102,7 @@ public interface ReactRootViewEventListener {
   private int mLastOffsetX = Integer.MIN_VALUE;
   private int mLastOffsetY = Integer.MIN_VALUE;
   private @UIManagerType int mUIManagerType = DEFAULT;
+  private final AtomicInteger mState = new AtomicInteger(STATE_STOPPED);
 
   public ReactRootView(Context context) {
     super(context);
@@ -122,6 +126,7 @@ private void init() {
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactRootView.onMeasure");
+    ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_ON_MEASURE_START);
     try {
       boolean measureSpecsUpdated =
           widthMeasureSpec != mWidthMeasureSpec || heightMeasureSpec != mHeightMeasureSpec;
@@ -171,6 +176,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       mLastHeight = height;
 
     } finally {
+      ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_ON_MEASURE_END);
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     }
   }
@@ -188,7 +194,7 @@ public void onChildStartedNativeGesture(MotionEvent androidEvent) {
       return;
     }
     ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
-    UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+    UIManager uiManager = UIManagerHelper.getUIManager(reactContext, getUIManagerType());
 
     if (uiManager != null) {
       EventDispatcher eventDispatcher = uiManager.getEventDispatcher();
@@ -276,7 +282,7 @@ private void dispatchJSTouchEvent(MotionEvent event) {
       return;
     }
     ReactContext reactContext = mReactInstanceManager.getCurrentReactContext();
-    UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+    UIManager uiManager = UIManagerHelper.getUIManager(reactContext, getUIManagerType());
 
     if (uiManager != null) {
       EventDispatcher eventDispatcher = uiManager.getEventDispatcher();
@@ -325,9 +331,29 @@ private void removeOnGlobalLayoutListener() {
   }
 
   @Override
-  public void onViewAdded(View child) {
+  public void onViewAdded(final View child) {
     super.onViewAdded(child);
 
+    // See comments in {@code ReactRootViewProhibitedChildView} for why we want this mechanism.
+    if (child instanceof ReactClippingProhibitedView) {
+      UiThreadUtil.runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              if (!child.isShown()) {
+                ReactSoftExceptionLogger.logSoftException(
+                    TAG,
+                    new ReactNoCrashSoftException(
+                        "A view was illegally added as a child of a ReactRootView. "
+                            + "This View should not be a direct child of a ReactRootView, because it is not visible and will never be reachable. Child: "
+                            + child.getClass().getCanonicalName().toString()
+                            + " child ID: "
+                            + child.getId()));
+              }
+            }
+          });
+    }
+
     if (mShouldLogContentAppeared) {
       mShouldLogContentAppeared = false;
 
@@ -412,18 +438,8 @@ public String getSurfaceID() {
     return appProperties != null ? appProperties.getString("surfaceID") : null;
   }
 
-  public static Point getViewportOffset(View v) {
-    int[] locationInWindow = new int[2];
-    v.getLocationInWindow(locationInWindow);
-
-    // we need to subtract visibleWindowCoords - to subtract possible window insets, split
-    // screen or multi window
-    Rect visibleWindowFrame = new Rect();
-    v.getWindowVisibleDisplayFrame(visibleWindowFrame);
-    locationInWindow[0] -= visibleWindowFrame.left;
-    locationInWindow[1] -= visibleWindowFrame.top;
-
-    return new Point(locationInWindow[0], locationInWindow[1]);
+  public AtomicInteger getState() {
+    return mState;
   }
 
   /**
@@ -437,10 +453,20 @@ public static Point getViewportOffset(View v) {
    */
   private void updateRootLayoutSpecs(
       boolean measureSpecsChanged, final int widthMeasureSpec, final int heightMeasureSpec) {
+    ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_UPDATE_LAYOUT_SPECS_START);
     if (mReactInstanceManager == null) {
+      ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_UPDATE_LAYOUT_SPECS_END);
       FLog.w(TAG, "Unable to update root layout specs for uninitialized ReactInstanceManager");
       return;
     }
+    // In Fabric we cannot call `updateRootLayoutSpecs` until a SurfaceId has been set.
+    // Sometimes,
+    if (getUIManagerType() == FABRIC && !isRootViewTagSet()) {
+      ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_UPDATE_LAYOUT_SPECS_END);
+      FLog.e(TAG, "Unable to update root layout specs for ReactRootView: no rootViewTag set yet");
+      return;
+    }
+
     final ReactContext reactApplicationContext = mReactInstanceManager.getCurrentReactContext();
 
     if (reactApplicationContext != null) {
@@ -453,7 +479,7 @@ private void updateRootLayoutSpecs(
         int offsetX = 0;
         int offsetY = 0;
         if (getUIManagerType() == FABRIC) {
-          Point viewportOffset = getViewportOffset(this);
+          Point viewportOffset = RootViewUtil.getViewportOffset(this);
           offsetX = viewportOffset.x;
           offsetY = viewportOffset.y;
         }
@@ -466,6 +492,8 @@ private void updateRootLayoutSpecs(
         mLastOffsetY = offsetY;
       }
     }
+
+    ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_UPDATE_LAYOUT_SPECS_END);
   }
 
   /**
@@ -483,25 +511,30 @@ public void unmountReactApplication() {
     // to be committed via the Scheduler, which will cause mounting instructions
     // to be queued up and synchronously executed to delete and remove
     // all the views in the hierarchy.
-    if (mReactInstanceManager != null && ReactFeatureFlags.enableStopSurfaceOnRootViewUnmount) {
+    if (mReactInstanceManager != null) {
       final ReactContext reactApplicationContext = mReactInstanceManager.getCurrentReactContext();
       if (reactApplicationContext != null && getUIManagerType() == FABRIC) {
         @Nullable
         UIManager uiManager =
             UIManagerHelper.getUIManager(reactApplicationContext, getUIManagerType());
         if (uiManager != null) {
-          // TODO T48186892: remove when resolved
-          FLog.e(
-              TAG,
-              "stopSurface for surfaceId: " + this.getId(),
-              new RuntimeException("unmountReactApplication"));
-          if (getId() == NO_ID) {
-            ReactSoftException.logSoftException(
+          final int surfaceId = this.getId();
+
+          // In case of "retry" or error dialogues being shown, this ReactRootView could be
+          // reused (with the same surfaceId, or a different one). Ensure the ReactRootView
+          // is marked as unused in case of that.
+          setId(NO_ID);
+
+          // Remove all children from ReactRootView
+          removeAllViews();
+
+          if (surfaceId == NO_ID) {
+            ReactSoftExceptionLogger.logSoftException(
                 TAG,
                 new RuntimeException(
                     "unmountReactApplication called on ReactRootView with invalid id"));
           } else {
-            uiManager.stopSurface(this.getId());
+            uiManager.stopSurface(surfaceId);
           }
         }
       }
@@ -537,7 +570,7 @@ public void onAttachedToReactInstance() {
     }
   }
 
-  public void setEventListener(ReactRootViewEventListener eventListener) {
+  public void setEventListener(@Nullable ReactRootViewEventListener eventListener) {
     mRootViewEventListener = eventListener;
   }
 
@@ -560,7 +593,7 @@ public String getJSModuleName() {
   public void setAppProperties(@Nullable Bundle appProperties) {
     UiThreadUtil.assertOnUiThread();
     mAppProperties = appProperties;
-    if (getRootViewTag() != 0) {
+    if (isRootViewTagSet()) {
       runApplication();
     }
   }
@@ -623,16 +656,28 @@ private CustomGlobalLayoutListener getCustomGlobalLayoutListener() {
 
   private void attachToReactInstanceManager() {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachToReactInstanceManager");
+    ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_ATTACH_TO_REACT_INSTANCE_MANAGER_START);
 
-    if (mIsAttachedToInstance) {
-      return;
+    // React Native requires that the RootView id be managed entirely by React Native, and will
+    // crash in addRootView/startSurface if the native View id isn't set to NO_ID.
+    if (getId() != View.NO_ID) {
+      throw new IllegalViewOperationException(
+          "Trying to attach a ReactRootView with an explicit id already set to ["
+              + getId()
+              + "]. React Native uses the id field to track react tags and will overwrite this"
+              + " field. If that is fine, explicitly overwrite the id field to View.NO_ID.");
     }
 
     try {
+      if (mIsAttachedToInstance) {
+        return;
+      }
+
       mIsAttachedToInstance = true;
       Assertions.assertNotNull(mReactInstanceManager).attachRootView(this);
       getViewTreeObserver().addOnGlobalLayoutListener(getCustomGlobalLayoutListener());
     } finally {
+      ReactMarker.logMarker(ReactMarkerConstants.ROOT_VIEW_ATTACH_TO_REACT_INSTANCE_MANAGER_END);
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     }
   }
@@ -653,6 +698,10 @@ public int getRootViewTag() {
     return mRootViewTag;
   }
 
+  private boolean isRootViewTagSet() {
+    return mRootViewTag != 0 && mRootViewTag != NO_ID;
+  }
+
   public void setRootViewTag(int rootViewTag) {
     mRootViewTag = rootViewTag;
   }
@@ -756,6 +805,7 @@ private void checkForDeviceOrientationChanges() {
         return;
       }
       mDeviceRotation = rotation;
+      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
       emitOrientationChanged(rotation);
     }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
index 9c1b8a17ecc67c..1f4e245b01f88a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
@@ -5,6 +5,7 @@ rn_android_library(
     srcs = glob([
         "*.java",
     ]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -28,5 +29,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
index 2f2880080e6fc5..0c4badcd481d94 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -17,7 +17,7 @@
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
@@ -365,7 +365,7 @@ private void initializeLifecycleEventListenersForViewTag(final int viewTag) {
     if (nodesManager != null) {
       nodesManager.initializeEventListenerForUIManagerType(mUIManagerType);
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           NAME,
           new RuntimeException(
               "initializeLifecycleEventListenersForViewTag could not get NativeAnimatedNodesManager"));
@@ -891,4 +891,12 @@ public void execute(NativeAnimatedNodesManager animatedNodesManager) {
           }
         });
   }
+
+  @Override
+  public void invalidate() {
+    ReactApplicationContext context = getReactApplicationContextIfActiveOrWarn();
+    if (context != null) {
+      context.removeLifecycleEventListener(this);
+    }
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
index 9bf6d02fd2a11c..a2707f5842ed60 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
@@ -17,7 +17,7 @@
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UIManager;
@@ -121,7 +121,7 @@ public boolean hasActiveAnimations() {
   public void createAnimatedNode(int tag, ReadableMap config) {
     if (mAnimatedNodes.get(tag) != null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " already exists");
+          "createAnimatedNode: Animated node [" + tag + "] already exists");
     }
     String type = config.getString("type");
     final AnimatedNode node;
@@ -168,7 +168,9 @@ public void startListeningToAnimatedNodeValue(int tag, AnimatedNodeValueListener
     AnimatedNode node = mAnimatedNodes.get(tag);
     if (node == null || !(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " does not exist, or is not a 'value' node");
+          "startListeningToAnimatedNodeValue: Animated node ["
+              + tag
+              + "] does not exist, or is not a 'value' node");
     }
     ((ValueAnimatedNode) node).setValueListener(listener);
   }
@@ -178,7 +180,9 @@ public void stopListeningToAnimatedNodeValue(int tag) {
     AnimatedNode node = mAnimatedNodes.get(tag);
     if (node == null || !(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " does not exist, or is not a 'value' node");
+          "startListeningToAnimatedNodeValue: Animated node ["
+              + tag
+              + "] does not exist, or is not a 'value' node");
     }
     ((ValueAnimatedNode) node).setValueListener(null);
   }
@@ -188,7 +192,9 @@ public void setAnimatedNodeValue(int tag, double value) {
     AnimatedNode node = mAnimatedNodes.get(tag);
     if (node == null || !(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " does not exist, or is not a 'value' node");
+          "setAnimatedNodeValue: Animated node ["
+              + tag
+              + "] does not exist, or is not a 'value' node");
     }
     stopAnimationsForNode(node);
     ((ValueAnimatedNode) node).mValue = value;
@@ -200,7 +206,9 @@ public void setAnimatedNodeOffset(int tag, double offset) {
     AnimatedNode node = mAnimatedNodes.get(tag);
     if (node == null || !(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " does not exist, or is not a 'value' node");
+          "setAnimatedNodeOffset: Animated node ["
+              + tag
+              + "] does not exist, or is not a 'value' node");
     }
     ((ValueAnimatedNode) node).mOffset = offset;
     mUpdatedNodes.put(tag, node);
@@ -211,7 +219,9 @@ public void flattenAnimatedNodeOffset(int tag) {
     AnimatedNode node = mAnimatedNodes.get(tag);
     if (node == null || !(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " does not exist, or is not a 'value' node");
+          "flattenAnimatedNodeOffset: Animated node ["
+              + tag
+              + "] does not exist, or is not a 'value' node");
     }
     ((ValueAnimatedNode) node).flattenOffset();
   }
@@ -221,7 +231,9 @@ public void extractAnimatedNodeOffset(int tag) {
     AnimatedNode node = mAnimatedNodes.get(tag);
     if (node == null || !(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " does not exist, or is not a 'value' node");
+          "extractAnimatedNodeOffset: Animated node ["
+              + tag
+              + "] does not exist, or is not a 'value' node");
     }
     ((ValueAnimatedNode) node).extractOffset();
   }
@@ -232,11 +244,14 @@ public void startAnimatingNode(
     AnimatedNode node = mAnimatedNodes.get(animatedNodeTag);
     if (node == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + animatedNodeTag + " does not exist");
+          "startAnimatingNode: Animated node [" + animatedNodeTag + "] does not exist");
     }
     if (!(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node should be of type " + ValueAnimatedNode.class.getName());
+          "startAnimatingNode: Animated node ["
+              + animatedNodeTag
+              + "] should be of type "
+              + ValueAnimatedNode.class.getName());
     }
 
     final AnimationDriver existingDriver = mActiveAnimations.get(animationId);
@@ -256,7 +271,8 @@ public void startAnimatingNode(
     } else if ("decay".equals(type)) {
       animation = new DecayAnimation(animationConfig);
     } else {
-      throw new JSApplicationIllegalArgumentException("Unsupported animation type: " + type);
+      throw new JSApplicationIllegalArgumentException(
+          "startAnimatingNode: Unsupported animation type [" + animatedNodeTag + "]: " + type);
     }
     animation.mId = animationId;
     animation.mEndCallback = endCallback;
@@ -315,12 +331,16 @@ public void connectAnimatedNodes(int parentNodeTag, int childNodeTag) {
     AnimatedNode parentNode = mAnimatedNodes.get(parentNodeTag);
     if (parentNode == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + parentNodeTag + " does not exists");
+          "connectAnimatedNodes: Animated node with tag (parent) ["
+              + parentNodeTag
+              + "] does not exist");
     }
     AnimatedNode childNode = mAnimatedNodes.get(childNodeTag);
     if (childNode == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + childNodeTag + " does not exists");
+          "connectAnimatedNodes: Animated node with tag (child) ["
+              + childNodeTag
+              + "] does not exist");
     }
     parentNode.addChild(childNode);
     mUpdatedNodes.put(childNodeTag, childNode);
@@ -330,12 +350,16 @@ public void disconnectAnimatedNodes(int parentNodeTag, int childNodeTag) {
     AnimatedNode parentNode = mAnimatedNodes.get(parentNodeTag);
     if (parentNode == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + parentNodeTag + " does not exists");
+          "disconnectAnimatedNodes: Animated node with tag (parent) ["
+              + parentNodeTag
+              + "] does not exist");
     }
     AnimatedNode childNode = mAnimatedNodes.get(childNodeTag);
     if (childNode == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + childNodeTag + " does not exists");
+          "disconnectAnimatedNodes: Animated node with tag (child) ["
+              + childNodeTag
+              + "] does not exist");
     }
     parentNode.removeChild(childNode);
     mUpdatedNodes.put(childNodeTag, childNode);
@@ -346,27 +370,31 @@ public void connectAnimatedNodeToView(int animatedNodeTag, int viewTag) {
     AnimatedNode node = mAnimatedNodes.get(animatedNodeTag);
     if (node == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + animatedNodeTag + " does not exists");
+          "connectAnimatedNodeToView: Animated node with tag ["
+              + animatedNodeTag
+              + "] does not exist");
     }
     if (!(node instanceof PropsAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node connected to view should be"
-              + "of type "
+          "connectAnimatedNodeToView: Animated node connected to view ["
+              + viewTag
+              + "] should be of type "
               + PropsAnimatedNode.class.getName());
     }
     if (mReactApplicationContext == null) {
       throw new IllegalStateException(
-          "Animated node could not be connected, no ReactApplicationContext: " + viewTag);
+          "connectAnimatedNodeToView: Animated node could not be connected, no ReactApplicationContext: "
+              + viewTag);
     }
 
     @Nullable
     UIManager uiManager =
         UIManagerHelper.getUIManagerForReactTag(mReactApplicationContext, viewTag);
     if (uiManager == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new ReactNoCrashSoftException(
-              "Animated node could not be connected to UIManager - uiManager disappeared for tag: "
+              "connectAnimatedNodeToView: Animated node could not be connected to UIManager - uiManager disappeared for tag: "
                   + viewTag));
       return;
     }
@@ -381,12 +409,15 @@ public void disconnectAnimatedNodeFromView(int animatedNodeTag, int viewTag) {
     AnimatedNode node = mAnimatedNodes.get(animatedNodeTag);
     if (node == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + animatedNodeTag + " does not exists");
+          "disconnectAnimatedNodeFromView: Animated node with tag ["
+              + animatedNodeTag
+              + "] does not exist");
     }
     if (!(node instanceof PropsAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node connected to view should be"
-              + "of type "
+          "disconnectAnimatedNodeFromView: Animated node connected to view ["
+              + viewTag
+              + "] should be of type "
               + PropsAnimatedNode.class.getName());
     }
     PropsAnimatedNode propsAnimatedNode = (PropsAnimatedNode) node;
@@ -398,7 +429,7 @@ public void getValue(int tag, Callback callback) {
     AnimatedNode node = mAnimatedNodes.get(tag);
     if (node == null || !(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + tag + " does not exists or is not a 'value' node");
+          "getValue: Animated node with tag [" + tag + "] does not exist or is not a 'value' node");
     }
     callback.invoke(((ValueAnimatedNode) node).getValue());
   }
@@ -415,8 +446,7 @@ public void restoreDefaultValues(int animatedNodeTag) {
     }
     if (!(node instanceof PropsAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node connected to view should be"
-              + "of type "
+          "Animated node connected to view [?] should be of type "
               + PropsAnimatedNode.class.getName());
     }
     PropsAnimatedNode propsAnimatedNode = (PropsAnimatedNode) node;
@@ -429,12 +459,15 @@ public void addAnimatedEventToView(int viewTag, String eventName, ReadableMap ev
     AnimatedNode node = mAnimatedNodes.get(nodeTag);
     if (node == null) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node with tag " + nodeTag + " does not exists");
+          "addAnimatedEventToView: Animated node with tag [" + nodeTag + "] does not exist");
     }
     if (!(node instanceof ValueAnimatedNode)) {
       throw new JSApplicationIllegalArgumentException(
-          "Animated node connected to event should be"
-              + "of type "
+          "addAnimatedEventToView: Animated node on view ["
+              + viewTag
+              + "] connected to event ("
+              + eventName
+              + ") should be of type "
               + ValueAnimatedNode.class.getName());
     }
 
@@ -502,7 +535,7 @@ private void handleEvent(Event event) {
         return;
       }
       UIManager uiManager =
-          UIManagerHelper.getUIManagerForReactTag(mReactApplicationContext, event.getViewTag());
+          UIManagerHelper.getUIManager(mReactApplicationContext, event.getUIManagerType());
       if (uiManager == null) {
         return;
       }
@@ -720,11 +753,11 @@ private void updateNodes(List<AnimatedNode> nodes) {
       if (mEventListenerInitializedForFabric && cyclesDetected == 0) {
         // TODO T71377544: investigate these SoftExceptions and see if we can remove entirely
         // or fix the root cause
-        ReactSoftException.logSoftException(TAG, new ReactNoCrashSoftException(ex));
+        ReactSoftExceptionLogger.logSoftException(TAG, new ReactNoCrashSoftException(ex));
       } else if (mEventListenerInitializedForFabric) {
         // TODO T71377544: investigate these SoftExceptions and see if we can remove entirely
         // or fix the root cause
-        ReactSoftException.logSoftException(TAG, new ReactNoCrashSoftException(ex));
+        ReactSoftExceptionLogger.logSoftException(TAG, new ReactNoCrashSoftException(ex));
       } else {
         throw ex;
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
index 6302abe043e5f3..c5e8a5ccbcfad0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
@@ -10,12 +10,14 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
 import java.lang.reflect.Array;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+@DoNotStrip
 public class Arguments {
   private static Object makeNativeObject(Object object) {
     if (object == null) {
@@ -122,6 +124,7 @@ private static void addEntry(WritableNativeMap nativeMap, String key, Object val
    * The best way to think of this is a way to generate a Java representation of a json object, from
    * Java types which have a natural representation in json.
    */
+  @DoNotStrip
   public static WritableNativeMap makeNativeMap(Map<String, Object> objects) {
     WritableNativeMap nativeMap = new WritableNativeMap();
     if (objects == null) {
@@ -134,6 +137,7 @@ public static WritableNativeMap makeNativeMap(Map<String, Object> objects) {
   }
 
   /** Like the above, but takes a Bundle instead of a Map. */
+  @DoNotStrip
   public static WritableNativeMap makeNativeMap(Bundle bundle) {
     WritableNativeMap nativeMap = new WritableNativeMap();
     if (bundle == null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
index fcf60e30696589..0f54a3c0b0b57f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -20,6 +20,7 @@ rn_android_library(
         ["**/*.java"],
         exclude = INTERFACES,
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     proguard_config = "reactnative.pro",
@@ -65,6 +66,7 @@ rn_android_library(
 rn_android_library(
     name = "interfaces",
     srcs = glob(INTERFACES),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     proguard_config = "reactnative.pro",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BackgroundExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BackgroundExecutor.java
index 8b5d7c942542ff..7ed0b3526f6e13 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BackgroundExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BackgroundExecutor.java
@@ -30,13 +30,14 @@ private void queueRunnable(Runnable runnable) {
     // but it's also cheap to leave it here.
 
     if (runnable == null) {
-      ReactSoftException.logSoftException(TAG, new ReactNoCrashSoftException("runnable is null"));
+      ReactSoftExceptionLogger.logSoftException(
+          TAG, new ReactNoCrashSoftException("runnable is null"));
       return;
     }
 
     final ExecutorService executorService = mExecutorService;
     if (executorService == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG, new ReactNoCrashSoftException("executorService is null"));
       return;
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
index 283c365e910d67..a8bf93676f4407 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
@@ -61,16 +61,18 @@ public boolean canOverrideExistingModule() {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
-    // do nothing
-  }
+  public void onCatalystInstanceDestroy() {}
 
   public boolean hasConstants() {
     return false;
   }
 
-  // Cleanup Logic for TurboModules
+  /**
+   * The CatalystInstance is going away with Venice. Therefore, the TurboModule infra introduces the
+   * invalidate() method to allow NativeModules to clean up after themselves.
+   */
+  @Override
   public void invalidate() {
-    // Do nothing
+    onCatalystInstanceDestroy();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index a61d7f4b108ad1..baffa40aabbe83 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -85,8 +85,6 @@ public String toString() {
   private final String mJsPendingCallsTitleForTrace =
       "pending_js_calls_instance" + sNextInstanceIdForTrace.getAndIncrement();
   private volatile boolean mDestroyed = false;
-  private volatile boolean mNativeModulesThreadDestructionComplete = false;
-  private volatile boolean mJSThreadDestructionComplete = false;
   private final TraceListener mTraceListener;
   private final JavaScriptModuleRegistry mJSModuleRegistry;
   private final JSBundleLoader mJSBundleLoader;
@@ -141,6 +139,11 @@ private CatalystInstanceImpl(
 
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "initializeCxxBridge");
+
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      warnOnLegacyNativeModuleSystemUse();
+    }
+
     initializeBridge(
         new BridgeCallback(this),
         jsExecutor,
@@ -208,6 +211,8 @@ public void extendNativeModules(NativeModuleRegistry modules) {
   private native void jniExtendNativeModules(
       Collection<JavaModuleWrapper> javaModules, Collection<ModuleHolder> cxxModules);
 
+  private native void warnOnLegacyNativeModuleSystemUse();
+
   private native void initializeBridge(
       ReactCallback callback,
       JavaScriptExecutor jsExecutor,
@@ -551,7 +556,6 @@ public JavaScriptContextHolder getJavaScriptContextHolder() {
     return mJavaScriptContextHolder;
   }
 
-  @Override
   public native RuntimeExecutor getRuntimeExecutor();
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java
index 536434c4105003..1d2814a1d545e7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.java
@@ -38,7 +38,10 @@ public boolean canOverrideExistingModule() {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
+  public void onCatalystInstanceDestroy() {}
+
+  @Override
+  public void invalidate() {
     mHybridData.resetNative();
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
index 09d20d6c9a3d8c..52e9f43f64b23f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
@@ -8,6 +8,7 @@
 package com.facebook.react.bridge;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.config.ReactFeatureFlags;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,5 +45,8 @@ public void notifyJSInstanceDestroy() {
       JSIModuleHolder moduleHolder = entry.getValue();
       moduleHolder.notifyJSInstanceDestroy();
     }
+    if (ReactFeatureFlags.enableReactContextCleanupFix) {
+      mModules.clear();
+    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
index 2267300ec2fdc1..c113c6b056b0f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
@@ -15,6 +15,7 @@
 
 import androidx.annotation.Nullable;
 import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 import java.lang.reflect.Method;
@@ -43,6 +44,7 @@ public class MethodDescriptor {
   private final ModuleHolder mModuleHolder;
   private final ArrayList<NativeModule.NativeMethod> mMethods;
   private final ArrayList<MethodDescriptor> mDescs;
+  private static final String TAG = JavaModuleWrapper.class.getSimpleName();
 
   public JavaModuleWrapper(JSInstance jsInstance, ModuleHolder moduleHolder) {
     mJSInstance = jsInstance;
@@ -113,6 +115,17 @@ public List<MethodDescriptor> getMethodDescriptors() {
 
   @DoNotStrip
   public @Nullable NativeMap getConstants() {
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling getConstants() on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     if (!mModuleHolder.getHasConstants()) {
       return null;
     }
@@ -144,10 +157,34 @@ public List<MethodDescriptor> getMethodDescriptors() {
 
   @DoNotStrip
   public void invoke(int methodId, ReadableNativeArray parameters) {
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling method on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     if (mMethods == null || methodId >= mMethods.size()) {
       return;
     }
 
+    if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Calling "
+                  + mDescs.get(methodId).name
+                  + "() on Java NativeModule (name = \""
+                  + mModuleHolder.getName()
+                  + "\", className = "
+                  + mModuleHolder.getClassName()
+                  + ")."));
+    }
+
     mMethods.get(methodId).invoke(mJSInstance, parameters);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java
index 0398c85a4731b1..ad5709a07e033f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java
@@ -107,7 +107,7 @@ public ModuleHolder(NativeModule nativeModule) {
 
   public synchronized void destroy() {
     if (mModule != null) {
-      mModule.onCatalystInstanceDestroy();
+      mModule.invalidate();
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
index 16939d03209621..11f7117f2e9789 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
@@ -47,6 +47,13 @@ interface NativeMethod {
    */
   boolean canOverrideExistingModule();
 
-  /** Called before {CatalystInstance#onHostDestroy} */
+  /**
+   * Allow NativeModule to clean up. Called before {CatalystInstance#onHostDestroy}
+   *
+   * @deprecated use {@link #invalidate()} instead.
+   */
   void onCatalystInstanceDestroy();
+
+  /** Allow NativeModule to clean up. Called before {CatalystInstance#onHostDestroy} */
+  void invalidate();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
index e45069d75adb53..809d915c01497f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
@@ -8,6 +8,7 @@
 package com.facebook.react.bridge;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.systrace.Systrace;
 import java.util.ArrayList;
@@ -20,6 +21,7 @@ public class NativeModuleRegistry {
 
   private final ReactApplicationContext mReactApplicationContext;
   private final Map<String, ModuleHolder> mModules;
+  private final String TAG = NativeModuleRegistry.class.getSimpleName();
 
   public NativeModuleRegistry(
       ReactApplicationContext reactApplicationContext, Map<String, ModuleHolder> modules) {
@@ -40,6 +42,17 @@ private ReactApplicationContext getReactApplicationContext() {
     ArrayList<JavaModuleWrapper> javaModules = new ArrayList<>();
     for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
       if (!entry.getValue().isCxxModule()) {
+        if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              new ReactNoCrashSoftException(
+                  "Registering legacy NativeModule: Java NativeModule (name = \""
+                      + entry.getValue().getName()
+                      + "\", className = "
+                      + entry.getValue().getClassName()
+                      + ")."));
+        }
+
         javaModules.add(new JavaModuleWrapper(jsInstance, entry.getValue()));
       }
     }
@@ -50,6 +63,16 @@ private ReactApplicationContext getReactApplicationContext() {
     ArrayList<ModuleHolder> cxxModules = new ArrayList<>();
     for (Map.Entry<String, ModuleHolder> entry : mModules.entrySet()) {
       if (entry.getValue().isCxxModule()) {
+        if (ReactFeatureFlags.warnOnLegacyNativeModuleSystemUse) {
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              new ReactNoCrashSoftException(
+                  "Registering legacy NativeModule: Cxx NativeModule (name = \""
+                      + entry.getValue().getName()
+                      + "\", className = "
+                      + entry.getValue().getClassName()
+                      + ")."));
+        }
         cxxModules.add(entry.getValue());
       }
     }
@@ -84,6 +107,9 @@ private ReactApplicationContext getReactApplicationContext() {
       for (ModuleHolder module : mModules.values()) {
         module.destroy();
       }
+      if (ReactFeatureFlags.enableReactContextCleanupFix) {
+        mModules.clear();
+      }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
index 859d227243f2e8..0f89c17dc4b07b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -23,6 +23,7 @@
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.config.ReactFeatureFlags;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -62,6 +63,7 @@ public class ReactContext extends ContextWrapper {
   private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private @Nullable NativeModuleCallExceptionHandler mExceptionHandlerWrapper;
   private @Nullable WeakReference<Activity> mCurrentActivity;
+  private boolean mIsInitialized = false;
 
   public ReactContext(Context base) {
     super(base);
@@ -76,7 +78,7 @@ public void initializeWithInstance(CatalystInstance catalystInstance) {
       throw new IllegalStateException("ReactContext has been already initialized");
     }
     if (mDestroyed) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           TAG,
           new IllegalStateException("Cannot initialize ReactContext after it has been destroyed."));
     }
@@ -87,11 +89,8 @@ public void initializeWithInstance(CatalystInstance catalystInstance) {
     initializeMessageQueueThreads(queueConfig);
   }
 
-  /**
-   * Initialize message queue threads using a ReactQueueConfiguration. TODO (janzer) T43898341 Make
-   * this package instead of public
-   */
-  public void initializeMessageQueueThreads(ReactQueueConfiguration queueConfig) {
+  /** Initialize message queue threads using a ReactQueueConfiguration. */
+  public synchronized void initializeMessageQueueThreads(ReactQueueConfiguration queueConfig) {
     if (mUiMessageQueueThread != null
         || mNativeModulesMessageQueueThread != null
         || mJSMessageQueueThread != null) {
@@ -100,6 +99,18 @@ public void initializeMessageQueueThreads(ReactQueueConfiguration queueConfig) {
     mUiMessageQueueThread = queueConfig.getUIQueueThread();
     mNativeModulesMessageQueueThread = queueConfig.getNativeModulesQueueThread();
     mJSMessageQueueThread = queueConfig.getJSQueueThread();
+
+    /** TODO(T85807990): Fail fast if any of the threads is null. */
+    if (mUiMessageQueueThread == null) {
+      throw new IllegalStateException("UI thread is null");
+    }
+    if (mNativeModulesMessageQueueThread == null) {
+      throw new IllegalStateException("NativeModules thread is null");
+    }
+    if (mJSMessageQueueThread == null) {
+      throw new IllegalStateException("JavaScript thread is null");
+    }
+    mIsInitialized = true;
   }
 
   public void resetPerfStats() {
@@ -169,7 +180,19 @@ public CatalystInstance getCatalystInstance() {
     return Assertions.assertNotNull(mCatalystInstance);
   }
 
+  /**
+   * This API has been deprecated due to naming consideration, please use hasActiveReactInstance()
+   * instead
+   *
+   * @return
+   */
+  @Deprecated
   public boolean hasActiveCatalystInstance() {
+    return hasActiveReactInstance();
+  }
+
+  /** @return true if there is an non-null, alive react native instance */
+  public boolean hasActiveReactInstance() {
     return mCatalystInstance != null && !mCatalystInstance.isDestroyed();
   }
 
@@ -183,7 +206,7 @@ public LifecycleState getLifecycleState() {
 
   public void addLifecycleEventListener(final LifecycleEventListener listener) {
     mLifecycleEventListeners.add(listener);
-    if (hasActiveCatalystInstance() || isBridgeless()) {
+    if (hasActiveReactInstance() || isBridgeless()) {
       switch (mLifecycleState) {
         case BEFORE_CREATE:
         case BEFORE_RESUME:
@@ -296,6 +319,11 @@ public void destroy() {
     if (mCatalystInstance != null) {
       mCatalystInstance.destroy();
     }
+    if (ReactFeatureFlags.enableReactContextCleanupFix) {
+      mLifecycleEventListeners.clear();
+      mActivityEventListeners.clear();
+      mWindowFocusEventListeners.clear();
+    }
   }
 
   /** Should be called by the hosting Fragment in {@link Fragment#onActivityResult} */
@@ -334,10 +362,20 @@ public void runOnUiQueueThread(Runnable runnable) {
   }
 
   public void assertOnNativeModulesQueueThread() {
+    /** TODO(T85807990): Fail fast if the ReactContext isn't initialized */
+    if (!mIsInitialized) {
+      throw new IllegalStateException(
+          "Tried to call assertOnNativeModulesQueueThread() on an uninitialized ReactContext");
+    }
     Assertions.assertNotNull(mNativeModulesMessageQueueThread).assertIsOnThread();
   }
 
   public void assertOnNativeModulesQueueThread(String message) {
+    /** TODO(T85807990): Fail fast if the ReactContext isn't initialized */
+    if (!mIsInitialized) {
+      throw new IllegalStateException(
+          "Tried to call assertOnNativeModulesQueueThread(message) on an uninitialized ReactContext");
+    }
     Assertions.assertNotNull(mNativeModulesMessageQueueThread).assertIsOnThread(message);
   }
 
@@ -446,7 +484,7 @@ public JavaScriptContextHolder getJavaScriptContextHolder() {
   }
 
   public @Nullable JSIModule getJSIModule(JSIModuleType moduleType) {
-    if (!hasActiveCatalystInstance()) {
+    if (!hasActiveReactInstance()) {
       throw new IllegalStateException(
           "Unable to retrieve a JSIModule if CatalystInstance is not active.");
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
index eb2111e4db3f16..132520c386b265 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
@@ -52,8 +52,7 @@ protected final ReactApplicationContext getReactApplicationContext() {
    */
   @ThreadConfined(ANY)
   protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() {
-    if (mReactApplicationContext.hasActiveCatalystInstance()
-        || mReactApplicationContext.isBridgeless()) {
+    if (mReactApplicationContext.hasActiveReactInstance()) {
       return mReactApplicationContext;
     }
 
@@ -64,7 +63,7 @@ protected final ReactApplicationContext getReactApplicationContext() {
     if (ReactBuildConfig.DEBUG) {
       FLog.w(tag, msg);
     } else {
-      ReactSoftException.logSoftException(tag, new RuntimeException(msg));
+      ReactSoftExceptionLogger.logSoftException(tag, new RuntimeException(msg));
     }
     return null;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index 8c5f38d4d89c06..4c19185c725215 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -94,6 +94,12 @@ public enum ReactMarkerConstants {
   JAVASCRIPT_EXECUTOR_FACTORY_INJECT_END,
   LOAD_REACT_NATIVE_SO_FILE_START,
   LOAD_REACT_NATIVE_SO_FILE_END,
+  ROOT_VIEW_ON_MEASURE_START,
+  ROOT_VIEW_ON_MEASURE_END,
+  ROOT_VIEW_ATTACH_TO_REACT_INSTANCE_MANAGER_START,
+  ROOT_VIEW_ATTACH_TO_REACT_INSTANCE_MANAGER_END,
+  ROOT_VIEW_UPDATE_LAYOUT_SPECS_START,
+  ROOT_VIEW_UPDATE_LAYOUT_SPECS_END,
   // Fabric-specific constants below this line
   LOAD_REACT_NATIVE_FABRIC_SO_FILE_START,
   LOAD_REACT_NATIVE_FABRIC_SO_FILE_END,
@@ -109,7 +115,11 @@ public enum ReactMarkerConstants {
   FABRIC_BATCH_EXECUTION_END,
   FABRIC_UPDATE_UI_MAIN_THREAD_START,
   FABRIC_UPDATE_UI_MAIN_THREAD_END,
-  // New markers used by bridgeless RN below this line
-  REACT_INSTANCE_INIT_START,
-  REACT_INSTANCE_INIT_END
+  // New markers used by bridge and bridgeless loading below this line
+  REACT_BRIDGE_LOADING_START,
+  REACT_BRIDGE_LOADING_END,
+  REACT_BRIDGELESS_LOADING_START,
+  REACT_BRIDGELESS_LOADING_END,
+  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START,
+  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END,
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.java
similarity index 83%
rename from ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftException.java
rename to ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.java
index fdb5205b1f608f..a33590a83d0903 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.java
@@ -13,9 +13,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 @DoNotStrip
-@Deprecated
-// TODO T53446395: unify ReactSoftException with a more generic exception-handling utility
-public class ReactSoftException {
+public class ReactSoftExceptionLogger {
   public interface ReactSoftExceptionListener {
     void logSoftException(final String category, final Throwable cause);
   }
@@ -52,4 +50,11 @@ public static void logSoftException(final String category, final Throwable cause
       FLog.e(category, "Unhandled SoftException", cause);
     }
   }
+
+  @DoNotStrip
+  // For use from within the C++ JReactSoftExceptionLogger
+  private static void logNoThrowSoftExceptionWithMessage(
+      final String category, final String message) {
+    logSoftException(category, new ReactNoCrashSoftException(message));
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
index ae471c2a8c4384..a2e4319224abcc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
@@ -187,12 +187,62 @@ public int getInt(@NonNull String name) {
 
   @Override
   public @NonNull Iterator<Map.Entry<String, Object>> getEntryIterator() {
-    return getLocalMap().entrySet().iterator();
+    if (mKeys == null) {
+      mKeys = Assertions.assertNotNull(importKeys());
+    }
+    final String[] iteratorKeys = mKeys;
+    final Object[] iteratorValues = Assertions.assertNotNull(importValues());
+    return new Iterator<Map.Entry<String, Object>>() {
+      int currentIndex = 0;
+
+      @Override
+      public boolean hasNext() {
+        return currentIndex < iteratorKeys.length;
+      }
+
+      @Override
+      public Map.Entry<String, Object> next() {
+        final int index = currentIndex++;
+        return new Map.Entry<String, Object>() {
+          @Override
+          public String getKey() {
+            return iteratorKeys[index];
+          }
+
+          @Override
+          public Object getValue() {
+            return iteratorValues[index];
+          }
+
+          @Override
+          public Object setValue(Object value) {
+            throw new UnsupportedOperationException(
+                "Can't set a value while iterating over a ReadableNativeMap");
+          }
+        };
+      }
+    };
   }
 
   @Override
   public @NonNull ReadableMapKeySetIterator keySetIterator() {
-    return new ReadableNativeMapKeySetIterator(this);
+    if (mKeys == null) {
+      mKeys = Assertions.assertNotNull(importKeys());
+    }
+    final String[] iteratorKeys = mKeys;
+    return new ReadableMapKeySetIterator() {
+      int currentIndex = 0;
+
+      @Override
+      public boolean hasNextKey() {
+        return currentIndex < iteratorKeys.length;
+      }
+
+      @Override
+      public String nextKey() {
+        return iteratorKeys[currentIndex++];
+      }
+    };
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
index 434ad411ad1560..4bccdfd1dd0709 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
@@ -20,31 +20,32 @@ public class SoftAssertions {
   /**
    * Throw {@link AssertionException} with a given message. Use this method surrounded with {@code
    * if} block with assert condition in case you plan to do string concatenation to produce the
-   * message. This logs an assertion with ReactSoftException, which decides whether or not to
+   * message. This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to
    * actually throw.
    */
   public static void assertUnreachable(String message) {
-    ReactSoftException.logSoftException("SoftAssertions", new AssertionException(message));
+    ReactSoftExceptionLogger.logSoftException("SoftAssertions", new AssertionException(message));
   }
 
   /**
    * Asserts the given condition, throwing an {@link AssertionException} if the condition doesn't
-   * hold. This logs an assertion with ReactSoftException, which decides whether or not to actually
-   * throw.
+   * hold. This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to
+   * actually throw.
    */
   public static void assertCondition(boolean condition, String message) {
     if (!condition) {
-      ReactSoftException.logSoftException("SoftAssertions", new AssertionException(message));
+      ReactSoftExceptionLogger.logSoftException("SoftAssertions", new AssertionException(message));
     }
   }
 
   /**
    * Asserts that the given Object isn't null, throwing an {@link AssertionException} if it was.
-   * This logs an assertion with ReactSoftException, which decides whether or not to actually throw.
+   * This logs an assertion with ReactSoftExceptionLogger, which decides whether or not to actually
+   * throw.
    */
   public static <T> T assertNotNull(@Nullable T instance) {
     if (instance == null) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           "SoftAssertions", new AssertionException("Expected object to not be null!"));
     }
     return instance;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
index 74af261f5b47c3..50ab07a1b3b6fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
@@ -14,12 +14,14 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.infer.annotation.ThreadConfined;
+import java.util.List;
 
 public interface UIManager extends JSIModule, PerformanceCounter {
 
-  /** Registers a new root view. */
+  /** Registers a new root view. @Deprecated call startSurface instead */
   @UiThread
   @ThreadConfined(UI)
+  @Deprecated
   <T extends View> int addRootView(
       final T rootView, WritableMap initialProps, @Nullable String initialUITemplate);
 
@@ -83,7 +85,7 @@ void updateRootLayoutSpecs(
    * layout-related propertied won't be handled properly. Make sure you know what you're doing
    * before calling this method :)
    *
-   * @param tag {@link int} that identifies the view that will be updated
+   * @param reactTag {@link int} that identifies the view that will be updated
    * @param props {@link ReadableMap} props that should be immediately updated in view
    */
   @UiThread
@@ -115,6 +117,16 @@ void updateRootLayoutSpecs(
    */
   void removeUIManagerEventListener(UIManagerListener listener);
 
+  /**
+   * Resolves a view based on its reactTag. Do not mutate properties on this view that are already
+   * managed by React, as there are no guarantees this changes will be preserved.
+   *
+   * @throws IllegalViewOperationException if tag could not be resolved.
+   * @param reactTag tag
+   * @return view if found
+   */
+  View resolveView(int reactTag);
+
   /**
    * This method dispatches events from RN Android code to JS. The delivery of this event will not
    * be queued in EventDispatcher class.
@@ -123,10 +135,33 @@ void updateRootLayoutSpecs(
    * @param eventName name of the event
    * @param event parameters
    */
+  @Deprecated
   void receiveEvent(int reactTag, String eventName, @Nullable WritableMap event);
 
+  /**
+   * This method dispatches events from RN Android code to JS. The delivery of this event will not
+   * be queued in EventDispatcher class.
+   *
+   * @param surfaceId
+   * @param reactTag tag
+   * @param eventName name of the event
+   * @param event parameters
+   */
+  void receiveEvent(int surfaceId, int reactTag, String eventName, @Nullable WritableMap event);
+
   /** Resolves Direct Event name exposed to JS from the one known to the Native side. */
   @Deprecated
   @Nullable
   String resolveCustomDirectEventName(@Nullable String eventName);
+
+  /**
+   * Helper method to pre-initialize view managers. When using Native ViewConfigs this method will
+   * also pre-compute the constants for a view manager. The purpose is to ensure that we don't block
+   * for getting the constants for view managers during initial rendering of a surface.
+   *
+   * @deprecated this method will be removed in the future
+   * @param viewManagerNames {@link List <String>} names of ViewManagers
+   */
+  @Deprecated
+  void preInitializeViewManagers(List<String> viewManagerNames);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
index ef52fb6fb78abf..02246b533959ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
@@ -2,6 +2,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_build
 
 SUB_PROJECTS = [
     "network/**/*",
+    "mapbuffer/**/*",
 ]
 
 rn_android_library(
@@ -10,6 +11,7 @@ rn_android_library(
         ["**/*.java"],
         exclude = SUB_PROJECTS,
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -39,6 +41,7 @@ rn_android_build_config(
     package = "com.facebook.react",
     values = [
         "boolean IS_INTERNAL_BUILD = true",
+        "int HERMES_BYTECODE_VERSION = 0",
     ],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
index a90ec674e12edd..093bd88c580a45 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
@@ -20,4 +20,5 @@ public class ReactBuildConfig {
   public static final boolean DEBUG = BuildConfig.DEBUG;
   public static final boolean IS_INTERNAL_BUILD = BuildConfig.IS_INTERNAL_BUILD;
   public static final int EXOPACKAGE_FLAGS = BuildConfig.EXOPACKAGE_FLAGS;
+  public static final int HERMES_BYTECODE_VERSION = BuildConfig.HERMES_BYTECODE_VERSION;
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK
new file mode 100644
index 00000000000000..a552d6027fe00b
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK
@@ -0,0 +1,29 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "FBJNI_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+
+rn_android_library(
+    name = "mapbuffer",
+    srcs = glob([
+        "*.java",
+    ]),
+    autoglob = False,
+    is_androidx = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    provided_deps = [],
+    required_for_source_only_abi = True,
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        FBJNI_TARGET,
+        react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+        react_native_target("java/com/facebook/react/common/mapbuffer/jni:jni"),
+        react_native_dep("libraries/fbjni:java"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
+        react_native_target("java/com/facebook/react/common:common"),
+        # dependencies used for systraces
+        react_native_dep("java/com/facebook/systrace:systrace"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+    ],
+    exported_deps = [],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java
new file mode 100644
index 00000000000000..f38ae42b07ad70
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.common.mapbuffer;
+
+import androidx.annotation.Nullable;
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Iterator;
+
+/**
+ * TODO T83483191: add documentation.
+ *
+ * <p>NOTE: {@link ReadableMapBuffer} is NOT thread safe.
+ */
+public class ReadableMapBuffer implements Iterable<ReadableMapBuffer.MapBufferEntry> {
+
+  static {
+    ReadableMapBufferSoLoader.staticInit();
+  }
+
+  // Value used to verify if the data is serialized with LittleEndian order.
+  private static final int ALIGNMENT = 0xFE;
+
+  // 8 bytes = 2 (alignment) + 2 (count) + 4 (size)
+  private static final int HEADER_SIZE = 8;
+
+  // key size = 2 bytes
+  private static final int KEY_SIZE = 2;
+
+  // 10 bytes = 2 bytes key + 8 bytes value
+  private static final int BUCKET_SIZE = 10;
+
+  private static final int INT_SIZE = 4;
+
+  // TODO T83483191: consider moving short to INTs, we are doing extra cast operations just because
+  //  of short java operates with int
+  private static final int SHORT_SIZE = 2;
+
+  private static final short SHORT_ONE = (short) 1;
+
+  @Nullable ByteBuffer mBuffer = null;
+
+  // Size of the Serialized Data
+  @SuppressWarnings("unused")
+  private int mSizeOfData = 0;
+
+  // Amount of items serialized on the ByteBuffer
+  @SuppressWarnings("unused")
+  private short mCount = 0;
+
+  private ReadableMapBuffer(HybridData hybridData) {
+    mHybridData = hybridData;
+  }
+
+  private ReadableMapBuffer(ByteBuffer buffer) {
+    mBuffer = buffer;
+    readHeader();
+  }
+
+  private native ByteBuffer importByteBufferAllocateDirect();
+
+  private native ByteBuffer importByteBuffer();
+
+  @SuppressWarnings("unused")
+  @DoNotStrip
+  @Nullable
+  private HybridData mHybridData;
+
+  @Override
+  protected void finalize() throws Throwable {
+    super.finalize();
+    if (mHybridData != null) {
+      mHybridData.resetNative();
+    }
+  }
+
+  private int getKeyOffsetForBucketIndex(int bucketIndex) {
+    return HEADER_SIZE + BUCKET_SIZE * bucketIndex;
+  }
+
+  private int getValueOffsetForKey(short key) {
+    importByteBufferAndReadHeader();
+    int bucketIndex = getBucketIndexForKey(key);
+    if (bucketIndex == -1) {
+      // TODO T83483191: Add tests
+      throw new IllegalArgumentException("Unable to find key: " + key);
+    }
+    assertKeyExists(key, bucketIndex);
+    return getKeyOffsetForBucketIndex(bucketIndex) + KEY_SIZE;
+  }
+
+  // returns the relative offset of the first byte of dynamic data
+  private int getOffsetForDynamicData() {
+    // TODO T83483191: check if there's dynamic data?
+    return getKeyOffsetForBucketIndex(mCount);
+  }
+
+  /**
+   * @param key Key to search for
+   * @return the "bucket index" for a key or -1 if not found. It uses a binary search algorithm
+   *     (log(n))
+   */
+  private int getBucketIndexForKey(short key) {
+    short lo = 0;
+    short hi = (short) (getCount() - SHORT_ONE);
+    while (lo <= hi) {
+      final short mid = (short) ((lo + hi) >>> SHORT_ONE);
+      final short midVal = readKey(getKeyOffsetForBucketIndex(mid));
+      if (midVal < key) {
+        lo = (short) (mid + SHORT_ONE);
+      } else if (midVal > key) {
+        hi = (short) (mid - SHORT_ONE);
+      } else {
+        return mid;
+      }
+    }
+    return -1;
+  }
+
+  private short readKey(int position) {
+    return mBuffer.getShort(position);
+  }
+
+  private double readDoubleValue(int bufferPosition) {
+    return mBuffer.getDouble(bufferPosition);
+  }
+
+  private int readIntValue(int bufferPosition) {
+    return mBuffer.getInt(bufferPosition);
+  }
+
+  private boolean readBooleanValue(int bufferPosition) {
+    return readIntValue(bufferPosition) == 1;
+  }
+
+  private String readStringValue(int bufferPosition) {
+    int offset = getOffsetForDynamicData() + mBuffer.getInt(bufferPosition);
+
+    int sizeOfString = mBuffer.getInt(offset);
+    byte[] result = new byte[sizeOfString];
+
+    int stringOffset = offset + INT_SIZE;
+
+    mBuffer.position(stringOffset);
+    mBuffer.get(result, 0, sizeOfString);
+
+    return new String(result);
+  }
+
+  private ReadableMapBuffer readMapBufferValue(int position) {
+    int offset = getOffsetForDynamicData() + mBuffer.getInt(position);
+
+    int sizeMapBuffer = mBuffer.getInt(offset);
+    byte[] buffer = new byte[sizeMapBuffer];
+
+    int bufferOffset = offset + INT_SIZE;
+
+    mBuffer.position(bufferOffset);
+    mBuffer.get(buffer, 0, sizeMapBuffer);
+
+    return new ReadableMapBuffer(ByteBuffer.wrap(buffer));
+  }
+
+  private void readHeader() {
+    // byte order
+    short storedAlignment = mBuffer.getShort();
+    if (storedAlignment != ALIGNMENT) {
+      mBuffer.order(ByteOrder.LITTLE_ENDIAN);
+    }
+    // count
+    mCount = mBuffer.getShort();
+    // size
+    mSizeOfData = mBuffer.getInt();
+  }
+
+  /**
+   * Binary search of the key inside the mapBuffer (log(n)).
+   *
+   * @param key Key to search for
+   * @return true if and only if the Key received as a parameter is stored in the MapBuffer.
+   */
+  public boolean hasKey(short key) {
+    // TODO T83483191: Add tests
+    return getBucketIndexForKey(key) != -1;
+  }
+
+  /** @return amount of elements stored into the MapBuffer */
+  public short getCount() {
+    importByteBufferAndReadHeader();
+    return mCount;
+  }
+
+  /**
+   * @param key {@link int} representing the key
+   * @return return the int associated to the Key received as a parameter.
+   */
+  public int getInt(short key) {
+    // TODO T83483191: extract common code of "get methods"
+    return readIntValue(getValueOffsetForKey(key));
+  }
+
+  /**
+   * @param key {@link int} representing the key
+   * @return return the double associated to the Key received as a parameter.
+   */
+  public double getDouble(short key) {
+    return readDoubleValue(getValueOffsetForKey(key));
+  }
+
+  /**
+   * @param key {@link int} representing the key
+   * @return return the int associated to the Key received as a parameter.
+   */
+  public String getString(short key) {
+    return readStringValue(getValueOffsetForKey(key));
+  }
+
+  public boolean getBoolean(short key) {
+    return readBooleanValue(getValueOffsetForKey(key));
+  }
+
+  /**
+   * @param key {@link int} representing the key
+   * @return return the int associated to the Key received as a parameter.
+   */
+  public ReadableMapBuffer getMapBuffer(short key) {
+    return readMapBufferValue(getValueOffsetForKey(key));
+  }
+
+  /**
+   * Import ByteBuffer from C++, read the header and move the current cursor at the start of the
+   * payload.
+   */
+  private ByteBuffer importByteBufferAndReadHeader() {
+    if (mBuffer != null) {
+      return mBuffer;
+    }
+
+    //    mBuffer = importByteBufferAllocateDirect();
+    mBuffer = importByteBuffer();
+
+    readHeader();
+    return mBuffer;
+  }
+
+  private void assertKeyExists(short key, int bucketIndex) {
+    short storedKey = mBuffer.getShort(getKeyOffsetForBucketIndex(bucketIndex));
+    if (storedKey != key) {
+      throw new IllegalStateException(
+          "Stored key doesn't match parameter - expected: " + key + " - found: " + storedKey);
+    }
+  }
+
+  @Override
+  public int hashCode() {
+    ByteBuffer byteBuffer = importByteBufferAndReadHeader();
+    byteBuffer.rewind();
+    return byteBuffer.hashCode();
+  }
+
+  @Override
+  public boolean equals(@Nullable Object obj) {
+    if (!(obj instanceof ReadableMapBuffer)) {
+      return false;
+    }
+
+    ReadableMapBuffer other = (ReadableMapBuffer) obj;
+    ByteBuffer thisByteBuffer = importByteBufferAndReadHeader();
+    ByteBuffer otherByteBuffer = other.importByteBufferAndReadHeader();
+    if (thisByteBuffer == otherByteBuffer) {
+      return true;
+    }
+    thisByteBuffer.rewind();
+    otherByteBuffer.rewind();
+    return thisByteBuffer.equals(otherByteBuffer);
+  }
+
+  /** @return an {@link Iterator<MapBufferEntry>} for the entries of this MapBuffer. */
+  @Override
+  public Iterator<MapBufferEntry> iterator() {
+    return new Iterator<MapBufferEntry>() {
+      short current = 0;
+      short last = (short) (getCount() - SHORT_ONE);
+
+      @Override
+      public boolean hasNext() {
+        return current <= last;
+      }
+
+      @Override
+      public MapBufferEntry next() {
+        return new MapBufferEntry(getKeyOffsetForBucketIndex(current++));
+      }
+    };
+  }
+
+  /** This class represents an Entry of the {@link ReadableMapBuffer} class. */
+  public class MapBufferEntry {
+    private final int mBucketOffset;
+
+    private MapBufferEntry(int position) {
+      mBucketOffset = position;
+    }
+
+    /** @return a {@link short} that represents the key of this {@link MapBufferEntry}. */
+    public short getKey() {
+      return readKey(mBucketOffset);
+    }
+
+    /** @return the double value that is stored in this {@link MapBufferEntry}. */
+    public double getDouble(double defaultValue) {
+      // TODO T83483191 Extend serialization of MapBuffer to add type checking
+      // TODO T83483191 Extend serialization of MapBuffer to return null if there's no value
+      // stored in this MapBufferEntry.
+      return readDoubleValue(mBucketOffset + KEY_SIZE);
+    }
+
+    /** @return the int value that is stored in this {@link MapBufferEntry}. */
+    public int getInt(int defaultValue) {
+      return readIntValue(mBucketOffset + KEY_SIZE);
+    }
+
+    /** @return the boolean value that is stored in this {@link MapBufferEntry}. */
+    public boolean getBoolean(boolean defaultValue) {
+      return readBooleanValue(mBucketOffset + KEY_SIZE);
+    }
+
+    /** @return the String value that is stored in this {@link MapBufferEntry}. */
+    public @Nullable String getString() {
+      return readStringValue(mBucketOffset + KEY_SIZE);
+    }
+
+    /**
+     * @return the {@link ReadableMapBuffer} value that is stored in this {@link MapBufferEntry}.
+     */
+    public @Nullable ReadableMapBuffer getReadableMapBuffer() {
+      return readMapBufferValue(mBucketOffset + KEY_SIZE);
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBufferSoLoader.java b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBufferSoLoader.java
new file mode 100644
index 00000000000000..d38c3a11ea3a5a
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBufferSoLoader.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.common.mapbuffer;
+
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.soloader.SoLoader;
+import com.facebook.systrace.Systrace;
+
+public class ReadableMapBufferSoLoader {
+  private static volatile boolean sDidInit = false;
+
+  public static void staticInit() {
+    if (sDidInit) {
+      return;
+    }
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+        "ReadableMapBufferSoLoader.staticInit::load:mapbufferjni");
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START);
+    SoLoader.loadLibrary("mapbufferjni");
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END);
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
+    sDidInit = true;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
new file mode 100644
index 00000000000000..f29eb0137c0016
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
@@ -0,0 +1,39 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := mapbufferjni
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp)
+
+LOCAL_SHARED_LIBRARIES := libreactconfig libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_utils libreact_render_mapbuffer libreact_debug
+
+LOCAL_STATIC_LIBRARIES :=
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"Fabric\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,fbgloginit)
+$(call import-module,folly)
+$(call import-module,fb)
+$(call import-module,fbjni)
+$(call import-module,yogajni)
+$(call import-module,glog)
+
+$(call import-module,react/utils)
+$(call import-module,react/debug)
+$(call import-module,react/config)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK
new file mode 100644
index 00000000000000..0e5d2d726d91e9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK
@@ -0,0 +1,34 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
+
+rn_xplat_cxx_library(
+    name = "jni",
+    srcs = glob(["**/*.cpp"]),
+    headers = glob(["**/*.h"]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("react/common/mapbuffer", "*.h"),
+        ],
+        prefix = "react/common/mapbuffer",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    fbandroid_allow_jni_merging = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    platforms = ANDROID,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    soname = "libmapbufferjni.$(ext)",
+    visibility = ["PUBLIC"],
+    deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+        react_native_xplat_target("react/debug:debug"),
+        FBJNI_TARGET,
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp
new file mode 100644
index 00000000000000..76e0aa1a2c877b
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fbjni/fbjni.h>
+
+#include "ReadableMapBuffer.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(
+      vm, [] { facebook::react::ReadableMapBuffer::registerNatives(); });
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp
new file mode 100644
index 00000000000000..83d856abd0a9f0
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ReadableMapBuffer.h"
+
+namespace facebook {
+namespace react {
+
+void ReadableMapBuffer::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("importByteBuffer", ReadableMapBuffer::importByteBuffer),
+      makeNativeMethod(
+          "importByteBufferAllocateDirect",
+          ReadableMapBuffer::importByteBufferAllocateDirect),
+  });
+}
+
+jni::local_ref<jni::JByteBuffer>
+ReadableMapBuffer::importByteBufferAllocateDirect() {
+  // TODO T83483191: Using this method is safer than "importByteBuffer" because
+  // ByteBuffer memory will be deallocated once the "Java ByteBuffer" is
+  // deallocated. Next steps:
+  // - Validate perf of this method vs importByteBuffer
+  // - Validate that there's no leaking of memory
+  react_native_assert(
+      (serializedData_ != nullptr && serializedDataSize_ != 0) &&
+      "Error serializedData_ is not initialized");
+  auto ret = jni::JByteBuffer::allocateDirect(serializedDataSize_);
+  // TODO T83483191: avoid allocating serializedData_ when using
+  // JByteBuffer::allocateDirect
+  std::memcpy(
+      ret->getDirectBytes(), (void *)serializedData_, serializedDataSize_);
+
+  // Deallocate serializedData_ since it's not necessary anymore
+  delete[] serializedData_;
+  serializedData_ = nullptr;
+  serializedDataSize_ = 0;
+  return ret;
+}
+
+jni::JByteBuffer::javaobject ReadableMapBuffer::importByteBuffer() {
+  // TODO T83483191: Reevaluate what's the best approach here (allocateDirect vs
+  // DirectByteBuffer).
+  //
+  // On this method we should:
+  // - Review deallocation of serializedData (we are probably leaking
+  // _serializedData now).
+  // - Consider using allocate() or allocateDirect() methods from java instead
+  // of newDirectByteBuffer (to simplify de/allocation) :
+  // https://www.internalfb.com/intern/diffusion/FBS/browsefile/master/fbandroid/libraries/fbjni/cxx/fbjni/ByteBuffer.cpp
+  // - Add flags to describe if the data was already 'imported'
+  // - Long-term: Consider creating a big ByteBuffer that can be re-used to
+  // transfer data of multitple Maps
+  return static_cast<jni::JByteBuffer::javaobject>(
+      jni::Environment::current()->NewDirectByteBuffer(
+          (void *)serializedData_, serializedDataSize_));
+}
+
+jni::local_ref<ReadableMapBuffer::jhybridobject>
+ReadableMapBuffer::createWithContents(MapBuffer &&map) {
+  return newObjectCxxArgs(std::move(map));
+}
+
+ReadableMapBuffer::~ReadableMapBuffer() {
+  if (serializedData_ != nullptr) {
+    delete[] serializedData_;
+    serializedData_ = nullptr;
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h
new file mode 100644
index 00000000000000..b3f753a67b1711
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+
+#include <fbjni/ByteBuffer.h>
+
+namespace facebook {
+namespace react {
+
+class ReadableMapBuffer : public jni::HybridClass<ReadableMapBuffer> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/common/mapbuffer/ReadableMapBuffer;";
+
+  static void registerNatives();
+
+  static jni::local_ref<jhybridobject> createWithContents(MapBuffer &&map);
+
+  jni::local_ref<jni::JByteBuffer> importByteBufferAllocateDirect();
+
+  jni::JByteBuffer::javaobject importByteBuffer();
+
+  ~ReadableMapBuffer();
+
+ private:
+  uint8_t *serializedData_ = nullptr;
+
+  int32_t serializedDataSize_ = 0;
+
+  friend HybridBase;
+
+  explicit ReadableMapBuffer(MapBuffer &&map) {
+    serializedDataSize_ = map.getBufferSize();
+    react_native_assert(
+        (serializedDataSize_ != 0) && "Error no content in map");
+    serializedData_ = new Byte[serializedDataSize_];
+    map.copy(serializedData_);
+  }
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
index 25f39b59688c28..2eca2adf3f72ca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/BUCK b/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
index 6120fdec936c2d..f5ea5a7dd8065b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
@@ -1,12 +1,14 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "config",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
     ],
     deps = [
+        react_native_dep("java/com/facebook/proguard/annotations:annotations"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
index 04a8a88eb5ca6d..8513e6c0ccd423 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -7,6 +7,8 @@
 
 package com.facebook.react.config;
 
+import com.facebook.proguard.annotations.DoNotStripAny;
+
 /**
  * Hi there, traveller! This configuration class is not meant to be used by end-users of RN. It
  * contains mainly flags for features that are either under active development and not ready for
@@ -14,8 +16,8 @@
  *
  * <p>These values are safe defaults and should not require manual changes.
  */
+@DoNotStripAny
 public class ReactFeatureFlags {
-
   /**
    * Should this application use TurboModules? If yes, then any module that inherits {@link
    * com.facebook.react.turbomodule.core.interfaces.TurboModule} will NOT be passed in to C++
@@ -23,58 +25,68 @@ public class ReactFeatureFlags {
    */
   public static volatile boolean useTurboModules = false;
 
-  /*
-   * This feature flag enables logs for Fabric
-   */
-  public static boolean enableFabricLogs = false;
-
   /**
-   * Should this application use a {@link com.facebook.react.uimanager.ViewManagerDelegate} (if
-   * provided) to update the view properties. If {@code false}, then the generated {@code
-   * ...$$PropsSetter} class will be used instead.
+   * After TurboModules and Fabric are enabled, we need to ensure that the legacy NativeModule isn't
+   * isn't used. So, turn this flag on to trigger warnings whenever the legacy NativeModule system
+   * is used.
    */
-  public static boolean useViewManagerDelegates = false;
+  public static volatile boolean warnOnLegacyNativeModuleSystemUse = false;
 
-  /**
-   * Should this application use a {@link com.facebook.react.uimanager.ViewManagerDelegate} (if
-   * provided) to execute the view commands. If {@code false}, then {@code receiveCommand} method
-   * inside view manager will be called instead.
-   */
-  public static boolean useViewManagerDelegatesForCommands = false;
+  /** Should we dispatch TurboModule methods with promise returns to the NativeModules thread? */
+  public static volatile boolean enableTurboModulePromiseAsyncDispatch = false;
 
   /**
-   * This react flag enables a custom algorithm for the getChildVisibleRect() method in the classes
-   * ReactViewGroup, ReactHorizontalScrollView and ReactScrollView.
+   * Experiment:
+   *
+   * <p>Bridge and Bridgeless mode can run concurrently. This means that there can be two
+   * TurboModule systems alive at the same time.
+   *
+   * <p>The TurboModule system stores all JS callbacks in a global LongLivedObjectCollection. This
+   * collection is cleared when the JS VM is torn down. Implication: Tearing down the bridge JSVM
+   * invalidates the bridgeless JSVM's callbacks, and vice versa.
    *
-   * <p>This new algorithm clip child rects if overflow is set to ViewProps.HIDDEN. More details in
-   * https://github.com/facebook/react-native/issues/23870 and
-   * https://github.com/facebook/react-native/pull/26334
+   * <p>useGlobalCallbackCleanupScopeUsingRetainJSCallback => Use a retainJSCallbacks lambda to
+   * store jsi::Functions into the global LongLivedObjectCollection
    *
-   * <p>The react flag is disabled by default because this is increasing ANRs (T57363204)
+   * <p>useTurboModuleManagerCallbackCleanupScope => Use a retainJSCallbacks labmda to store
+   * jsi::Functions into a LongLivedObjectCollection owned by the TurboModuleManager
    */
-  public static boolean clipChildRectsIfOverflowIsHidden = false;
+  public static boolean useGlobalCallbackCleanupScopeUsingRetainJSCallback = false;
 
-  /**
-   * Temporary feature flat to control a fix in the transition to layoutOnlyViews TODO T61185028:
-   * remove this when bug is fixed
-   */
-  public static boolean enableTransitionLayoutOnlyViewCleanup = false;
+  public static boolean useTurboModuleManagerCallbackCleanupScope = false;
+
+  /** This feature flag enables logs for Fabric */
+  public static boolean enableFabricLogs = false;
 
   /** Feature flag to configure eager initialization of Fabric */
   public static boolean eagerInitializeFabric = false;
 
-  /** Feature flag to use stopSurface when ReactRootView is unmounted. */
-  public static boolean enableStopSurfaceOnRootViewUnmount = false;
+  /** Enables Static ViewConfig in RN Android native code. */
+  public static boolean enableExperimentalStaticViewConfigs = false;
+
+  public static boolean enableRuntimeScheduler = false;
+
+  /** Enables a more aggressive cleanup during destruction of ReactContext */
+  public static boolean enableReactContextCleanupFix = false;
+
+  /** Feature flag to configure eager initialization of MapBuffer So file */
+  public static boolean enableEagerInitializeMapBufferSoFile = false;
+
+  private static boolean mapBufferSerializationEnabled = false;
+
+  /** Enables or disables MapBuffer Serialization */
+  public static void setMapBufferSerializationEnabled(boolean enabled) {
+    mapBufferSerializationEnabled = enabled;
+  }
 
-  /** Use experimental SetState retry mechanism in view? */
-  public static boolean enableExperimentalStateUpdateRetry = false;
+  public static boolean isMapBufferSerializationEnabled() {
+    return mapBufferSerializationEnabled;
+  }
 
-  /** Enable caching of Spannable objects using equality of ReadableNativeMaps */
-  public static boolean enableSpannableCacheByReadableNativeMapEquality = true;
+  /** Enables Fabric for LogBox */
+  public static boolean enableFabricInLogBox = false;
 
-  /** Disable customDrawOrder in ReactViewGroup under Fabric only. */
-  public static boolean disableCustomDrawOrderFabric = false;
+  public static boolean enableLockFreeEventDispatcher = false;
 
-  /** Potential bugfix for crashes caused by mutating the view hierarchy during onDraw. */
-  public static boolean enableDrawMutationFix = true;
+  public static boolean enableAggressiveEventEmitterCleanup = false;
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
index a2113e6fc542a1..88de5f78c8741d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "devsupport",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     manifest = "AndroidManifest.xml",
@@ -39,13 +40,14 @@ rn_android_library(
         react_native_target("res:devsupport"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
 
 rn_android_library(
     name = "interfaces",
     srcs = glob(["interfaces/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java
new file mode 100644
index 00000000000000..0efbec7cf4c2c9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport;
+
+import android.content.Context;
+import android.widget.Toast;
+import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
+import com.facebook.debug.holder.PrinterHolder;
+import com.facebook.debug.tags.ReactDebugOverlayTags;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.JavaJSExecutor;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.ReactConstants;
+import com.facebook.react.common.futures.SimpleSettableFuture;
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+import com.facebook.react.devsupport.interfaces.DevOptionHandler;
+import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
+import com.facebook.react.packagerconnection.RequestHandler;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Interface for accessing and interacting with development features. Following features
+ * are supported through this manager class:
+ * 1) Displaying JS errors (aka RedBox)
+ * 2) Displaying developers menu (Reload JS, Debug JS)
+ * 3) Communication with developer server in order to download updated JS bundle
+ * 4) Starting/stopping broadcast receiver for js reload signals
+ * 5) Starting/stopping motion sensor listener that recognize shake gestures which in turn may
+ *    trigger developers menu.
+ * 6) Launching developers settings view
+ *
+ * This class automatically monitors the state of registered views and activities to which they are
+ * bound to make sure that we don't display overlay or that we we don't listen for sensor events
+ * when app is backgrounded.
+ *
+ * {@link com.facebook.react.ReactInstanceManager} implementation is responsible for instantiating
+ * this class as well as for populating with a reference to {@link CatalystInstance} whenever
+ * instance manager recreates it (through {@link #onNewReactContextCreated). Also, instance manager
+ * is responsible for enabling/disabling dev support in case when app is backgrounded or when all
+ * the views has been detached from the instance (through {@link #setDevSupportEnabled} method).
+ *
+ * IMPORTANT: In order for developer support to work correctly it is required that the
+ * manifest of your application contain the following entries:
+ * {@code <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>}
+ * {@code <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>}
+ */
+public final class BridgeDevSupportManager extends DevSupportManagerBase {
+  private boolean mIsSamplingProfilerEnabled = false;
+
+  public BridgeDevSupportManager(
+      Context applicationContext,
+      ReactInstanceDevHelper reactInstanceManagerHelper,
+      @Nullable String packagerPathForJSBundleName,
+      boolean enableOnCreate,
+      @Nullable RedBoxHandler redBoxHandler,
+      @Nullable DevBundleDownloadListener devBundleDownloadListener,
+      int minNumShakes,
+      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
+    super(
+        applicationContext,
+        reactInstanceManagerHelper,
+        packagerPathForJSBundleName,
+        enableOnCreate,
+        redBoxHandler,
+        devBundleDownloadListener,
+        minNumShakes,
+        customPackagerCommandHandlers);
+
+    if (getDevSettings().isStartSamplingProfilerOnInit()) {
+      // Only start the profiler. If its already running, there is an error
+      if (!mIsSamplingProfilerEnabled) {
+        toggleJSSamplingProfiler();
+      } else {
+        Toast.makeText(
+                applicationContext,
+                "JS Sampling Profiler was already running, so did not start the sampling profiler",
+                Toast.LENGTH_LONG)
+            .show();
+      }
+    }
+
+    addCustomDevOption(
+        mIsSamplingProfilerEnabled
+            ? applicationContext.getString(
+                com.facebook.react.R.string.catalyst_sample_profiler_disable)
+            : applicationContext.getString(
+                com.facebook.react.R.string.catalyst_sample_profiler_enable),
+        new DevOptionHandler() {
+          @Override
+          public void onOptionSelected() {
+            toggleJSSamplingProfiler();
+          }
+        });
+
+    if (!getDevSettings().isDeviceDebugEnabled()) {
+      // For remote debugging, we open up Chrome running the app in a web worker.
+      // Note that this requires async communication, which will not work for Turbo Modules.
+      addCustomDevOption(
+          getDevSettings().isRemoteJSDebugEnabled()
+              ? applicationContext.getString(com.facebook.react.R.string.catalyst_debug_stop)
+              : applicationContext.getString(com.facebook.react.R.string.catalyst_debug),
+          new DevOptionHandler() {
+            @Override
+            public void onOptionSelected() {
+              getDevSettings().setRemoteJSDebugEnabled(!getDevSettings().isRemoteJSDebugEnabled());
+              handleReloadJS();
+            }
+          });
+    }
+  }
+
+  @Override
+  protected String getUniqueTag() {
+    return "Bridge";
+  }
+
+  @Override
+  public void loadSplitBundleFromServer(
+      final String bundlePath, final DevSplitBundleCallback callback) {
+    fetchSplitBundleAndCreateBundleLoader(
+        bundlePath,
+        new CallbackWithBundleLoader() {
+          @Override
+          public void onSuccess(JSBundleLoader bundleLoader) {
+            bundleLoader.loadScript(getCurrentContext().getCatalystInstance());
+            getCurrentContext()
+                .getJSModule(HMRClient.class)
+                .registerBundle(getDevServerHelper().getDevServerSplitBundleURL(bundlePath));
+            callback.onSuccess();
+          }
+
+          @Override
+          public void onError(String url, Throwable cause) {
+            callback.onError(url, cause);
+          }
+        });
+  }
+
+  private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
+      final SimpleSettableFuture<Boolean> future) {
+    return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
+      @Override
+      public void onSuccess() {
+        future.set(true);
+        hideDevLoadingView();
+      }
+
+      @Override
+      public void onFailure(final Throwable cause) {
+        hideDevLoadingView();
+        FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
+        future.setException(
+            new IOException(
+                getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
+                cause));
+      }
+    };
+  }
+
+  private void reloadJSInProxyMode() {
+    // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
+    // anyway
+    getDevServerHelper().launchJSDevtools();
+
+    JavaJSExecutor.Factory factory =
+        new JavaJSExecutor.Factory() {
+          @Override
+          public JavaJSExecutor create() throws Exception {
+            WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
+            SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
+            executor.connect(
+                getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
+            // TODO(t9349129) Don't use timeout
+            try {
+              future.get(90, TimeUnit.SECONDS);
+              return executor;
+            } catch (ExecutionException e) {
+              throw (Exception) e.getCause();
+            } catch (InterruptedException | TimeoutException e) {
+              throw new RuntimeException(e);
+            }
+          }
+        };
+    getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
+  }
+
+  @Override
+  public void handleReloadJS() {
+
+    UiThreadUtil.assertOnUiThread();
+
+    ReactMarker.logMarker(
+        ReactMarkerConstants.RELOAD,
+        getDevSettings().getPackagerConnectionSettings().getDebugServerHost());
+
+    // dismiss redbox if exists
+    hideRedboxDialog();
+
+    if (getDevSettings().isRemoteJSDebugEnabled()) {
+      PrinterHolder.getPrinter()
+          .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
+      showDevLoadingViewForRemoteJSEnabled();
+      reloadJSInProxyMode();
+    } else {
+      PrinterHolder.getPrinter()
+          .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
+      String bundleURL =
+          getDevServerHelper()
+              .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
+      reloadJSFromServer(bundleURL);
+    }
+  }
+
+  /** Starts of stops the sampling profiler */
+  private void toggleJSSamplingProfiler() {
+    JavaScriptExecutorFactory javaScriptExecutorFactory =
+        getReactInstanceDevHelper().getJavaScriptExecutorFactory();
+    if (!mIsSamplingProfilerEnabled) {
+      try {
+        javaScriptExecutorFactory.startSamplingProfiler();
+        Toast.makeText(getApplicationContext(), "Starting Sampling Profiler", Toast.LENGTH_SHORT)
+            .show();
+      } catch (UnsupportedOperationException e) {
+        Toast.makeText(
+                getApplicationContext(),
+                javaScriptExecutorFactory.toString() + " does not support Sampling Profiler",
+                Toast.LENGTH_LONG)
+            .show();
+      } finally {
+        mIsSamplingProfilerEnabled = true;
+      }
+    } else {
+      try {
+        final String outputPath =
+            File.createTempFile(
+                    "sampling-profiler-trace", ".cpuprofile", getApplicationContext().getCacheDir())
+                .getPath();
+        javaScriptExecutorFactory.stopSamplingProfiler(outputPath);
+        Toast.makeText(
+                getApplicationContext(),
+                "Saved results from Profiler to " + outputPath,
+                Toast.LENGTH_LONG)
+            .show();
+      } catch (IOException e) {
+        FLog.e(
+            ReactConstants.TAG,
+            "Could not create temporary file for saving results from Sampling Profiler");
+      } catch (UnsupportedOperationException e) {
+        Toast.makeText(
+                getApplicationContext(),
+                javaScriptExecutorFactory.toString() + "does not support Sampling Profiler",
+                Toast.LENGTH_LONG)
+            .show();
+      } finally {
+        mIsSamplingProfilerEnabled = false;
+      }
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
index b718751f52971a..9b9b32e01d8cb9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
@@ -29,7 +29,7 @@
 /** Controller to display loading messages on top of the screen. All methods are thread safe. */
 public class DevLoadingViewController {
   private static boolean sEnabled = true;
-  private final ReactInstanceManagerDevHelper mReactInstanceManagerHelper;
+  private final ReactInstanceDevHelper mReactInstanceManagerHelper;
   private @Nullable TextView mDevLoadingView;
   private @Nullable PopupWindow mDevLoadingPopup;
 
@@ -37,7 +37,7 @@ public static void setDevLoadingEnabled(boolean enabled) {
     sEnabled = enabled;
   }
 
-  public DevLoadingViewController(ReactInstanceManagerDevHelper reactInstanceManagerHelper) {
+  public DevLoadingViewController(ReactInstanceDevHelper reactInstanceManagerHelper) {
     mReactInstanceManagerHelper = reactInstanceManagerHelper;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 83e7ca48cb1558..121a4bd7b47456 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -14,6 +14,7 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.devsupport.interfaces.StackFrame;
@@ -40,7 +41,6 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.ResponseBody;
 import okio.Okio;
 import okio.Sink;
 import org.json.JSONArray;
@@ -62,8 +62,6 @@
 public class DevServerHelper {
   public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";
 
-  private static final String PACKAGER_OK_STATUS = "packager-status:running";
-
   private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;
 
   private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
@@ -112,6 +110,7 @@ public String typeID() {
   private final DevInternalSettings mSettings;
   private final OkHttpClient mClient;
   private final BundleDownloader mBundleDownloader;
+  private final PackagerStatusCheck mPackagerStatusCheck;
   private final String mPackageName;
 
   private @Nullable JSPackagerClient mPackagerClient;
@@ -131,7 +130,7 @@ public DevServerHelper(
             .writeTimeout(0, TimeUnit.MILLISECONDS)
             .build();
     mBundleDownloader = new BundleDownloader(mClient);
-
+    mPackagerStatusCheck = new PackagerStatusCheck(mClient);
     mPackageName = packageName;
   }
 
@@ -428,9 +427,13 @@ private String createSplitBundleURL(String mainModuleID, String host) {
 
   private String createBundleURL(
       String mainModuleID, BundleType type, String host, boolean modulesOnly, boolean runModule) {
+    String runtimeBytecodeVersion =
+        ReactBuildConfig.HERMES_BYTECODE_VERSION != 0
+            ? "&runtimeBytecodeVersion=" + ReactBuildConfig.HERMES_BYTECODE_VERSION
+            : "";
     return String.format(
         Locale.US,
-        "http://%s/%s.%s?platform=android&dev=%s&minify=%s&app=%s&modulesOnly=%s&runModule=%s",
+        "http://%s/%s.%s?platform=android&dev=%s&minify=%s&app=%s&modulesOnly=%s&runModule=%s%s",
         host,
         mainModuleID,
         type.typeID(),
@@ -438,7 +441,8 @@ private String createBundleURL(
         getJSMinifyMode(),
         mPackageName,
         modulesOnly ? "true" : "false",
-        runModule ? "true" : "false");
+        runModule ? "true" : "false",
+        runtimeBytecodeVersion);
   }
 
   private String createBundleURL(String mainModuleID, BundleType type) {
@@ -471,60 +475,13 @@ public String getDevServerSplitBundleURL(String jsModulePath) {
   }
 
   public void isPackagerRunning(final PackagerStatusCallback callback) {
-    String statusURL =
-        createPackagerStatusURL(mSettings.getPackagerConnectionSettings().getDebugServerHost());
-    Request request = new Request.Builder().url(statusURL).build();
-
-    mClient
-        .newCall(request)
-        .enqueue(
-            new Callback() {
-              @Override
-              public void onFailure(Call call, IOException e) {
-                FLog.w(
-                    ReactConstants.TAG,
-                    "The packager does not seem to be running as we got an IOException requesting "
-                        + "its status: "
-                        + e.getMessage());
-                callback.onPackagerStatusFetched(false);
-              }
-
-              @Override
-              public void onResponse(Call call, Response response) throws IOException {
-                if (!response.isSuccessful()) {
-                  FLog.e(
-                      ReactConstants.TAG,
-                      "Got non-success http code from packager when requesting status: "
-                          + response.code());
-                  callback.onPackagerStatusFetched(false);
-                  return;
-                }
-                ResponseBody body = response.body();
-                if (body == null) {
-                  FLog.e(
-                      ReactConstants.TAG,
-                      "Got null body response from packager when requesting status");
-                  callback.onPackagerStatusFetched(false);
-                  return;
-                }
-                String bodyString =
-                    body.string(); // cannot call body.string() twice, stored it into variable.
-                // https://github.com/square/okhttp/issues/1240#issuecomment-68142603
-                if (!PACKAGER_OK_STATUS.equals(bodyString)) {
-                  FLog.e(
-                      ReactConstants.TAG,
-                      "Got unexpected response from packager when requesting status: "
-                          + bodyString);
-                  callback.onPackagerStatusFetched(false);
-                  return;
-                }
-                callback.onPackagerStatusFetched(true);
-              }
-            });
-  }
-
-  private static String createPackagerStatusURL(String host) {
-    return String.format(Locale.US, "http://%s/status", host);
+    String host = mSettings.getPackagerConnectionSettings().getDebugServerHost();
+    if (host == null) {
+      FLog.w(ReactConstants.TAG, "No packager host configured.");
+      callback.onPackagerStatusFetched(false);
+    } else {
+      mPackagerStatusCheck.run(host, callback);
+    }
   }
 
   private String createLaunchJSDevtoolsCommandUrl() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
index 427c7f37a1ac16..e0de54893873c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
@@ -17,22 +17,22 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.Typeface;
 import android.hardware.SensorManager;
 import android.util.Pair;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.common.logging.FLog;
-import com.facebook.debug.holder.PrinterHolder;
-import com.facebook.debug.tags.ReactDebugOverlayTags;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
 import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.JSBundleLoader;
-import com.facebook.react.bridge.JavaJSExecutor;
-import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -41,21 +41,19 @@
 import com.facebook.react.common.DebugServerException;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.ShakeDetector;
-import com.facebook.react.common.futures.SimpleSettableFuture;
 import com.facebook.react.devsupport.DevServerHelper.PackagerCommandListener;
+import com.facebook.react.devsupport.interfaces.BundleLoadCallback;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevOptionHandler;
-import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.ErrorCustomizer;
+import com.facebook.react.devsupport.interfaces.ErrorType;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
-import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import com.facebook.react.packagerconnection.RequestHandler;
 import com.facebook.react.packagerconnection.Responder;
 import java.io.File;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -63,12 +61,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
-public abstract class DevSupportManagerBase
-    implements DevSupportManager, PackagerCommandListener, DevInternalSettings.Listener {
+public abstract class DevSupportManagerBase implements DevSupportManager {
 
   public interface CallbackWithBundleLoader {
     void onSuccess(JSBundleLoader bundleLoader);
@@ -78,35 +72,24 @@ public interface CallbackWithBundleLoader {
 
   private static final int JAVA_ERROR_COOKIE = -1;
   private static final int JSEXCEPTION_ERROR_COOKIE = -1;
-  private static final String JS_BUNDLE_FILE_NAME = "ReactNativeDevBundle.js";
-  private static final String JS_SPLIT_BUNDLES_DIR_NAME = "dev_js_split_bundles";
   private static final String RELOAD_APP_ACTION_SUFFIX = ".RELOAD_APP_ACTION";
   private static final String FLIPPER_DEBUGGER_URL =
       "flipper://null/Hermesdebuggerrn?device=React%20Native";
   private static final String FLIPPER_DEVTOOLS_URL = "flipper://null/React?device=React%20Native";
-  private boolean mIsSamplingProfilerEnabled = false;
-
-  private enum ErrorType {
-    JS,
-    NATIVE
-  }
-
   private static final String EXOPACKAGE_LOCATION_FORMAT =
       "/data/local/tmp/exopackage/%s//secondary-dex";
 
   public static final String EMOJI_HUNDRED_POINTS_SYMBOL = " \uD83D\uDCAF";
   public static final String EMOJI_FACE_WITH_NO_GOOD_GESTURE = " \uD83D\uDE45";
 
-  private final List<ExceptionLogger> mExceptionLoggers = new ArrayList<>();
-
   private final Context mApplicationContext;
   private final ShakeDetector mShakeDetector;
   private final BroadcastReceiver mReloadAppBroadcastReceiver;
   private final DevServerHelper mDevServerHelper;
   private final LinkedHashMap<String, DevOptionHandler> mCustomDevOptions = new LinkedHashMap<>();
-  private final ReactInstanceManagerDevHelper mReactInstanceManagerHelper;
+  private final ReactInstanceDevHelper mReactInstanceDevHelper;
   private final @Nullable String mJSAppBundleName;
-  private final File mJSBundleTempFile;
+  private final File mJSBundleDownloadedFile;
   private final File mJSSplitBundlesDir;
   private final DefaultNativeModuleCallExceptionHandler mDefaultNativeModuleCallExceptionHandler;
   private final DevLoadingViewController mDevLoadingViewController;
@@ -124,6 +107,7 @@ private enum ErrorType {
   private @Nullable RedBoxHandler mRedBoxHandler;
   private @Nullable String mLastErrorTitle;
   private @Nullable StackFrame[] mLastErrorStack;
+  private @Nullable ErrorType mLastErrorType;
   private int mLastErrorCookie = 0;
   private @Nullable DevBundleDownloadListener mBundleDownloadListener;
   private @Nullable List<ErrorCustomizer> mErrorCustomizers;
@@ -133,37 +117,29 @@ private enum ErrorType {
 
   private @Nullable Map<String, RequestHandler> mCustomPackagerCommandHandlers;
 
-  public DevSupportManagerBase(
-      Context applicationContext,
-      ReactInstanceManagerDevHelper reactInstanceManagerHelper,
-      @Nullable String packagerPathForJSBundleName,
-      boolean enableOnCreate,
-      int minNumShakes) {
-
-    this(
-        applicationContext,
-        reactInstanceManagerHelper,
-        packagerPathForJSBundleName,
-        enableOnCreate,
-        null,
-        null,
-        minNumShakes,
-        null);
-  }
+  private @Nullable Activity currentActivity;
 
   public DevSupportManagerBase(
       Context applicationContext,
-      ReactInstanceManagerDevHelper reactInstanceManagerHelper,
+      ReactInstanceDevHelper reactInstanceDevHelper,
       @Nullable String packagerPathForJSBundleName,
       boolean enableOnCreate,
       @Nullable RedBoxHandler redBoxHandler,
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
       @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
-    mReactInstanceManagerHelper = reactInstanceManagerHelper;
+    mReactInstanceDevHelper = reactInstanceDevHelper;
     mApplicationContext = applicationContext;
     mJSAppBundleName = packagerPathForJSBundleName;
-    mDevSettings = new DevInternalSettings(applicationContext, this);
+    mDevSettings =
+        new DevInternalSettings(
+            applicationContext,
+            new DevInternalSettings.Listener() {
+              @Override
+              public void onInternalSettingsChanged() {
+                reloadSettings();
+              }
+            });
     mBundleStatus = new InspectorPackagerConnection.BundleStatus();
     mDevServerHelper =
         new DevServerHelper(
@@ -213,75 +189,51 @@ public void onReceive(Context context, Intent intent) {
     // start reading first reload output while the second reload starts writing to the same
     // file. As this should only be the case in dev mode we leave it as it is.
     // TODO(6418010): Fix readers-writers problem in debug reload from HTTP server
-    mJSBundleTempFile = new File(applicationContext.getFilesDir(), JS_BUNDLE_FILE_NAME);
+    final String subclassTag = getUniqueTag();
+    final String bundleFile = subclassTag + "ReactNativeDevBundle.js";
+    mJSBundleDownloadedFile = new File(applicationContext.getFilesDir(), bundleFile);
 
-    mJSSplitBundlesDir =
-        mApplicationContext.getDir(JS_SPLIT_BUNDLES_DIR_NAME, Context.MODE_PRIVATE);
+    final String splitBundlesDir = subclassTag.toLowerCase() + "_dev_js_split_bundles";
+    mJSSplitBundlesDir = mApplicationContext.getDir(splitBundlesDir, Context.MODE_PRIVATE);
 
     mDefaultNativeModuleCallExceptionHandler = new DefaultNativeModuleCallExceptionHandler();
 
     setDevSupportEnabled(enableOnCreate);
 
     mRedBoxHandler = redBoxHandler;
-    mDevLoadingViewController = new DevLoadingViewController(reactInstanceManagerHelper);
-
-    mExceptionLoggers.add(new JSExceptionLogger());
-
-    if (mDevSettings.isStartSamplingProfilerOnInit()) {
-      // Only start the profiler. If its already running, there is an error
-      if (!mIsSamplingProfilerEnabled) {
-        toggleJSSamplingProfiler();
-      } else {
-        Toast.makeText(
-                mApplicationContext,
-                "JS Sampling Profiler was already running, so did not start the sampling profiler",
-                Toast.LENGTH_LONG)
-            .show();
-      }
-    }
+    mDevLoadingViewController = new DevLoadingViewController(reactInstanceDevHelper);
   }
 
+  protected abstract String getUniqueTag();
+
   @Override
   public void handleException(Exception e) {
     if (mIsDevSupportEnabled) {
-
-      for (ExceptionLogger logger : mExceptionLoggers) {
-        logger.log(e);
-      }
-
+      logJSException(e);
     } else {
       mDefaultNativeModuleCallExceptionHandler.handleException(e);
     }
   }
 
-  private interface ExceptionLogger {
-    void log(Exception ex);
-  }
-
-  private class JSExceptionLogger implements ExceptionLogger {
-
-    @Override
-    public void log(Exception e) {
-      StringBuilder message =
-          new StringBuilder(
-              e.getMessage() == null ? "Exception in native call from JS" : e.getMessage());
-      Throwable cause = e.getCause();
-      while (cause != null) {
-        message.append("\n\n").append(cause.getMessage());
-        cause = cause.getCause();
-      }
+  private void logJSException(Exception e) {
+    StringBuilder message =
+        new StringBuilder(
+            e.getMessage() == null ? "Exception in native call from JS" : e.getMessage());
+    Throwable cause = e.getCause();
+    while (cause != null) {
+      message.append("\n\n").append(cause.getMessage());
+      cause = cause.getCause();
+    }
 
-      if (e instanceof JSException) {
-        FLog.e(ReactConstants.TAG, "Exception in native call from JS", e);
-        String stack = ((JSException) e).getStack();
-        message.append("\n\n").append(stack);
+    if (e instanceof JSException) {
+      FLog.e(ReactConstants.TAG, "Exception in native call from JS", e);
+      String stack = ((JSException) e).getStack();
+      message.append("\n\n").append(stack);
 
-        // TODO #11638796: convert the stack into something useful
-        showNewError(
-            message.toString(), new StackFrame[] {}, JSEXCEPTION_ERROR_COOKIE, ErrorType.JS);
-      } else {
-        showNewJavaError(message.toString(), e);
-      }
+      // TODO #11638796: convert the stack into something useful
+      showNewError(message.toString(), new StackFrame[] {}, JSEXCEPTION_ERROR_COOKIE, ErrorType.JS);
+    } else {
+      showNewJavaError(message.toString(), e);
     }
   }
 
@@ -351,7 +303,7 @@ public void run() {
             updateLastErrorInfo(message, stack, errorCookie, ErrorType.JS);
             // JS errors are reported here after source mapping.
             if (mRedBoxHandler != null) {
-              mRedBoxHandler.handleRedbox(message, stack, RedBoxHandler.ErrorType.JS);
+              mRedBoxHandler.handleRedbox(message, stack, ErrorType.JS);
               mRedBoxDialog.resetReporting();
             }
             mRedBoxDialog.show();
@@ -369,11 +321,11 @@ public void hideRedboxDialog() {
   }
 
   public @Nullable View createRootView(String appKey) {
-    return mReactInstanceManagerHelper.createRootView(appKey);
+    return mReactInstanceDevHelper.createRootView(appKey);
   }
 
   public void destroyRootView(View rootView) {
-    mReactInstanceManagerHelper.destroyRootView(rootView);
+    mReactInstanceDevHelper.destroyRootView(rootView);
   }
 
   private void hideDevOptionsDialog() {
@@ -392,8 +344,8 @@ private void showNewError(
         new Runnable() {
           @Override
           public void run() {
-            if (mRedBoxDialog == null) {
-              Activity context = mReactInstanceManagerHelper.getCurrentActivity();
+            Activity context = mReactInstanceDevHelper.getCurrentActivity();
+            if (mRedBoxDialog == null || context != currentActivity) {
               if (context == null || context.isFinishing()) {
                 FLog.e(
                     ReactConstants.TAG,
@@ -402,7 +354,9 @@ public void run() {
                         + message);
                 return;
               }
-              mRedBoxDialog = new RedBoxDialog(context, DevSupportManagerBase.this, mRedBoxHandler);
+              currentActivity = context;
+              mRedBoxDialog =
+                  new RedBoxDialog(currentActivity, DevSupportManagerBase.this, mRedBoxHandler);
             }
             if (mRedBoxDialog.isShowing()) {
               // Sometimes errors cause multiple errors to be thrown in JS in quick succession. Only
@@ -416,7 +370,7 @@ public void run() {
             // Only report native errors here. JS errors are reported
             // inside {@link #updateJSError} after source mapping.
             if (mRedBoxHandler != null && errorType == ErrorType.NATIVE) {
-              mRedBoxHandler.handleRedbox(message, stack, RedBoxHandler.ErrorType.NATIVE);
+              mRedBoxHandler.handleRedbox(message, stack, ErrorType.NATIVE);
             }
             mRedBoxDialog.resetReporting();
             mRedBoxDialog.show();
@@ -448,6 +402,7 @@ public void onOptionSelected() {
             handleReloadJS();
           }
         });
+
     if (mDevSettings.isDeviceDebugEnabled()) {
       // For on-device debugging we link out to Flipper.
       // Since we're assuming Flipper is available, also include the DevTools.
@@ -480,27 +435,14 @@ public void onOptionSelected() {
                   mApplicationContext.getString(R.string.catalyst_open_flipper_error));
             }
           });
-    } else {
-      // For remote debugging, we open up Chrome running the app in a web worker.
-      // Note that this requires async communication, which will not work for Turbo Modules.
-      options.put(
-          mDevSettings.isRemoteJSDebugEnabled()
-              ? mApplicationContext.getString(R.string.catalyst_debug_stop)
-              : mApplicationContext.getString(R.string.catalyst_debug),
-          new DevOptionHandler() {
-            @Override
-            public void onOptionSelected() {
-              mDevSettings.setRemoteJSDebugEnabled(!mDevSettings.isRemoteJSDebugEnabled());
-              handleReloadJS();
-            }
-          });
     }
+
     options.put(
         mApplicationContext.getString(R.string.catalyst_change_bundle_location),
         new DevOptionHandler() {
           @Override
           public void onOptionSelected() {
-            Activity context = mReactInstanceManagerHelper.getCurrentActivity();
+            Activity context = mReactInstanceDevHelper.getCurrentActivity();
             if (context == null || context.isFinishing()) {
               FLog.e(
                   ReactConstants.TAG,
@@ -530,14 +472,16 @@ public void onClick(DialogInterface dialog, int which) {
             bundleLocationDialog.show();
           }
         });
+
     options.put(
-        // NOTE: `isElementInspectorEnabled` is not guaranteed to be accurate.
-        mApplicationContext.getString(R.string.catalyst_inspector),
+        mDevSettings.isElementInspectorEnabled()
+            ? mApplicationContext.getString(R.string.catalyst_inspector_stop)
+            : mApplicationContext.getString(R.string.catalyst_inspector),
         new DevOptionHandler() {
           @Override
           public void onOptionSelected() {
             mDevSettings.setElementInspectorEnabled(!mDevSettings.isElementInspectorEnabled());
-            mReactInstanceManagerHelper.toggleElementInspector();
+            mReactInstanceDevHelper.toggleElementInspector();
           }
         });
 
@@ -569,17 +513,6 @@ public void onOptionSelected() {
           }
         });
 
-    options.put(
-        mIsSamplingProfilerEnabled
-            ? mApplicationContext.getString(R.string.catalyst_sample_profiler_disable)
-            : mApplicationContext.getString(R.string.catalyst_sample_profiler_enable),
-        new DevOptionHandler() {
-          @Override
-          public void onOptionSelected() {
-            toggleJSSamplingProfiler();
-          }
-        });
-
     options.put(
         mDevSettings.isFpsDebugEnabled()
             ? mApplicationContext.getString(R.string.catalyst_perf_monitor_stop)
@@ -589,7 +522,7 @@ public void onOptionSelected() {
           public void onOptionSelected() {
             if (!mDevSettings.isFpsDebugEnabled()) {
               // Request overlay permission if needed when "Show Perf Monitor" option is selected
-              Context context = mReactInstanceManagerHelper.getCurrentActivity();
+              Context context = mReactInstanceDevHelper.getCurrentActivity();
               if (context == null) {
                 FLog.e(ReactConstants.TAG, "Unable to get reference to react activity");
               } else {
@@ -616,15 +549,25 @@ public void onOptionSelected() {
 
     final DevOptionHandler[] optionHandlers = options.values().toArray(new DevOptionHandler[0]);
 
-    Activity context = mReactInstanceManagerHelper.getCurrentActivity();
+    Activity context = mReactInstanceDevHelper.getCurrentActivity();
     if (context == null || context.isFinishing()) {
       FLog.e(
           ReactConstants.TAG,
           "Unable to launch dev options menu because react activity " + "isn't available");
       return;
     }
+
+    final TextView textView = new TextView(getApplicationContext());
+    textView.setText("React Native DevMenu (" + getUniqueTag() + ")");
+    textView.setPadding(0, 50, 0, 0);
+    textView.setGravity(Gravity.CENTER);
+    textView.setTextColor(Color.BLACK);
+    textView.setTextSize(17);
+    textView.setTypeface(textView.getTypeface(), Typeface.BOLD);
+
     mDevOptionsDialog =
         new AlertDialog.Builder(context)
+            .setCustomTitle(textView)
             .setItems(
                 options.keySet().toArray(new String[0]),
                 new DialogInterface.OnClickListener() {
@@ -648,52 +591,6 @@ public void onCancel(DialogInterface dialog) {
     }
   }
 
-  /** Starts of stops the sampling profiler */
-  private void toggleJSSamplingProfiler() {
-    JavaScriptExecutorFactory javaScriptExecutorFactory =
-        mReactInstanceManagerHelper.getJavaScriptExecutorFactory();
-    if (!mIsSamplingProfilerEnabled) {
-      try {
-        javaScriptExecutorFactory.startSamplingProfiler();
-        Toast.makeText(mApplicationContext, "Starting Sampling Profiler", Toast.LENGTH_SHORT)
-            .show();
-      } catch (UnsupportedOperationException e) {
-        Toast.makeText(
-                mApplicationContext,
-                javaScriptExecutorFactory.toString() + " does not support Sampling Profiler",
-                Toast.LENGTH_LONG)
-            .show();
-      } finally {
-        mIsSamplingProfilerEnabled = true;
-      }
-    } else {
-      try {
-        final String outputPath =
-            File.createTempFile(
-                    "sampling-profiler-trace", ".cpuprofile", mApplicationContext.getCacheDir())
-                .getPath();
-        javaScriptExecutorFactory.stopSamplingProfiler(outputPath);
-        Toast.makeText(
-                mApplicationContext,
-                "Saved results from Profiler to " + outputPath,
-                Toast.LENGTH_LONG)
-            .show();
-      } catch (IOException e) {
-        FLog.e(
-            ReactConstants.TAG,
-            "Could not create temporary file for saving results from Sampling Profiler");
-      } catch (UnsupportedOperationException e) {
-        Toast.makeText(
-                mApplicationContext,
-                javaScriptExecutorFactory.toString() + "does not support Sampling Profiler",
-                Toast.LENGTH_LONG)
-            .show();
-      } finally {
-        mIsSamplingProfilerEnabled = false;
-      }
-    }
-  }
-
   /**
    * {@link ReactInstanceDevCommandsHandler} is responsible for enabling/disabling dev support when
    * a React view is attached/detached or when application state changes (e.g. the application is
@@ -711,7 +608,7 @@ public boolean getDevSupportEnabled() {
   }
 
   @Override
-  public DeveloperSettings getDevSettings() {
+  public DevInternalSettings getDevSettings() {
     return mDevSettings;
   }
 
@@ -755,7 +652,7 @@ public String getJSBundleURLForRemoteDebugging() {
 
   @Override
   public String getDownloadedJSBundleFile() {
-    return mJSBundleTempFile.getAbsolutePath();
+    return mJSBundleDownloadedFile.getAbsolutePath();
   }
 
   /**
@@ -765,19 +662,19 @@ public String getDownloadedJSBundleFile() {
    */
   @Override
   public boolean hasUpToDateJSBundleInCache() {
-    if (mIsDevSupportEnabled && mJSBundleTempFile.exists()) {
+    if (mIsDevSupportEnabled && mJSBundleDownloadedFile.exists()) {
       try {
         String packageName = mApplicationContext.getPackageName();
         PackageInfo thisPackage =
             mApplicationContext.getPackageManager().getPackageInfo(packageName, 0);
-        if (mJSBundleTempFile.lastModified() > thisPackage.lastUpdateTime) {
+        if (mJSBundleDownloadedFile.lastModified() > thisPackage.lastUpdateTime) {
           // Base APK has not been updated since we downloaded JS, but if app is using exopackage
           // it may only be a single dex that has been updated. We check for exopackage dir update
           // time in that case.
           File exopackageDir =
               new File(String.format(Locale.US, EXOPACKAGE_LOCATION_FORMAT, packageName));
           if (exopackageDir.exists()) {
-            return mJSBundleTempFile.lastModified() > exopackageDir.lastModified();
+            return mJSBundleDownloadedFile.lastModified() > exopackageDir.lastModified();
           }
           return true;
         }
@@ -837,57 +734,42 @@ public void run() {
     }
   }
 
-  public void onInternalSettingsChanged() {
-    reloadSettings();
+  protected @Nullable ReactContext getCurrentContext() {
+    return mCurrentContext;
   }
 
-  @Override
-  public void handleReloadJS() {
+  protected @Nullable String getJSAppBundleName() {
+    return mJSAppBundleName;
+  }
 
-    UiThreadUtil.assertOnUiThread();
+  protected Context getApplicationContext() {
+    return mApplicationContext;
+  }
 
-    ReactMarker.logMarker(
-        ReactMarkerConstants.RELOAD,
-        mDevSettings.getPackagerConnectionSettings().getDebugServerHost());
+  protected DevServerHelper getDevServerHelper() {
+    return mDevServerHelper;
+  }
 
-    // dismiss redbox if exists
-    hideRedboxDialog();
-
-    if (mDevSettings.isRemoteJSDebugEnabled()) {
-      PrinterHolder.getPrinter()
-          .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
-      mDevLoadingViewController.showForRemoteJSEnabled();
-      mDevLoadingViewVisible = true;
-      reloadJSInProxyMode();
-    } else {
-      PrinterHolder.getPrinter()
-          .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
-      String bundleURL =
-          mDevServerHelper.getDevServerBundleURL(Assertions.assertNotNull(mJSAppBundleName));
-      reloadJSFromServer(bundleURL);
-    }
+  protected ReactInstanceDevHelper getReactInstanceDevHelper() {
+    return mReactInstanceDevHelper;
   }
 
-  @Override
-  public void loadSplitBundleFromServer(
-      final String bundlePath, final DevSplitBundleCallback callback) {
-    fetchSplitBundleAndCreateBundleLoader(
-        bundlePath,
-        new CallbackWithBundleLoader() {
-          @Override
-          public void onSuccess(JSBundleLoader bundleLoader) {
-            bundleLoader.loadScript(mCurrentContext.getCatalystInstance());
-            mCurrentContext
-                .getJSModule(HMRClient.class)
-                .registerBundle(mDevServerHelper.getDevServerSplitBundleURL(bundlePath));
-            callback.onSuccess();
-          }
+  @UiThread
+  private void showDevLoadingViewForUrl(String bundleUrl) {
+    mDevLoadingViewController.showForUrl(bundleUrl);
+    mDevLoadingViewVisible = true;
+  }
 
-          @Override
-          public void onError(String url, Throwable cause) {
-            callback.onError(url, cause);
-          }
-        });
+  @UiThread
+  protected void showDevLoadingViewForRemoteJSEnabled() {
+    mDevLoadingViewController.showForRemoteJSEnabled();
+    mDevLoadingViewVisible = true;
+  }
+
+  @UiThread
+  protected void hideDevLoadingView() {
+    mDevLoadingViewController.hide();
+    mDevLoadingViewVisible = false;
   }
 
   public void fetchSplitBundleAndCreateBundleLoader(
@@ -914,8 +796,7 @@ public void run() {
                         });
 
                     @Nullable ReactContext context = mCurrentContext;
-                    if (context == null
-                        || (!context.isBridgeless() && !context.hasActiveCatalystInstance())) {
+                    if (context == null || !context.hasActiveReactInstance()) {
                       return;
                     }
 
@@ -953,16 +834,14 @@ public void run() {
 
   @UiThread
   private void showSplitBundleDevLoadingView(String bundleUrl) {
-    mDevLoadingViewController.showForUrl(bundleUrl);
-    mDevLoadingViewVisible = true;
+    showDevLoadingViewForUrl(bundleUrl);
     mPendingJSSplitBundleRequests++;
   }
 
   @UiThread
   private void hideSplitBundleDevLoadingView() {
     if (--mPendingJSSplitBundleRequests == 0) {
-      mDevLoadingViewController.hide();
-      mDevLoadingViewVisible = false;
+      hideDevLoadingView();
     }
   }
 
@@ -999,53 +878,8 @@ public void run() {
   }
 
   @Override
-  public void onPackagerConnected() {
-    // No-op
-  }
-
-  @Override
-  public void onPackagerDisconnected() {
-    // No-op
-  }
-
-  @Override
-  public void onPackagerReloadCommand() {
-    // Disable debugger to resume the JsVM & avoid thread locks while reloading
-    mDevServerHelper.disableDebugger();
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            handleReloadJS();
-          }
-        });
-  }
-
-  @Override
-  public void onPackagerDevMenuCommand() {
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            showDevOptionsDialog();
-          }
-        });
-  }
-
-  @Override
-  public void onCaptureHeapCommand(final Responder responder) {
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            handleCaptureHeap(responder);
-          }
-        });
-  }
-
-  @Override
-  public @Nullable Map<String, RequestHandler> customCommandHandlers() {
-    return mCustomPackagerCommandHandlers;
+  public @Nullable ErrorType getLastErrorType() {
+    return mLastErrorType;
   }
 
   private void handleCaptureHeap(final Responder responder) {
@@ -1079,54 +913,7 @@ private void updateLastErrorInfo(
     mLastErrorTitle = message;
     mLastErrorStack = stack;
     mLastErrorCookie = errorCookie;
-  }
-
-  private void reloadJSInProxyMode() {
-    // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
-    // anyway
-    mDevServerHelper.launchJSDevtools();
-
-    JavaJSExecutor.Factory factory =
-        new JavaJSExecutor.Factory() {
-          @Override
-          public JavaJSExecutor create() throws Exception {
-            WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
-            SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
-            executor.connect(
-                mDevServerHelper.getWebsocketProxyURL(), getExecutorConnectCallback(future));
-            // TODO(t9349129) Don't use timeout
-            try {
-              future.get(90, TimeUnit.SECONDS);
-              return executor;
-            } catch (ExecutionException e) {
-              throw (Exception) e.getCause();
-            } catch (InterruptedException | TimeoutException e) {
-              throw new RuntimeException(e);
-            }
-          }
-        };
-    mReactInstanceManagerHelper.onReloadWithJSDebugger(factory);
-  }
-
-  private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
-      final SimpleSettableFuture<Boolean> future) {
-    return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
-      @Override
-      public void onSuccess() {
-        future.set(true);
-        mDevLoadingViewController.hide();
-        mDevLoadingViewVisible = false;
-      }
-
-      @Override
-      public void onFailure(final Throwable cause) {
-        mDevLoadingViewController.hide();
-        mDevLoadingViewVisible = false;
-        FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
-        future.setException(
-            new IOException(mApplicationContext.getString(R.string.catalyst_debug_error), cause));
-      }
-    };
+    mLastErrorType = errorType;
   }
 
   public void reloadJSFromServer(final String bundleURL) {
@@ -1139,22 +926,17 @@ public void onSuccess() {
                 new Runnable() {
                   @Override
                   public void run() {
-                    mReactInstanceManagerHelper.onJSBundleLoadedFromServer();
+                    mReactInstanceDevHelper.onJSBundleLoadedFromServer();
                   }
                 });
           }
         });
   }
 
-  protected interface BundleLoadCallback {
-    void onSuccess();
-  }
-
-  protected void reloadJSFromServer(final String bundleURL, final BundleLoadCallback callback) {
+  public void reloadJSFromServer(final String bundleURL, final BundleLoadCallback callback) {
     ReactMarker.logMarker(ReactMarkerConstants.DOWNLOAD_START);
 
-    mDevLoadingViewController.showForUrl(bundleURL);
-    mDevLoadingViewVisible = true;
+    showDevLoadingViewForUrl(bundleURL);
 
     final BundleDownloader.BundleInfo bundleInfo = new BundleDownloader.BundleInfo();
 
@@ -1162,8 +944,7 @@ protected void reloadJSFromServer(final String bundleURL, final BundleLoadCallba
         new DevBundleDownloadListener() {
           @Override
           public void onSuccess() {
-            mDevLoadingViewController.hide();
-            mDevLoadingViewVisible = false;
+            hideDevLoadingView();
             synchronized (DevSupportManagerBase.this) {
               mBundleStatus.isLastDownloadSucess = true;
               mBundleStatus.updateTimestamp = System.currentTimeMillis();
@@ -1188,8 +969,7 @@ public void onProgress(
 
           @Override
           public void onFailure(final Exception cause) {
-            mDevLoadingViewController.hide();
-            mDevLoadingViewVisible = false;
+            hideDevLoadingView();
             synchronized (DevSupportManagerBase.this) {
               mBundleStatus.isLastDownloadSucess = false;
             }
@@ -1200,7 +980,7 @@ public void onFailure(final Exception cause) {
             reportBundleLoadingFailure(cause);
           }
         },
-        mJSBundleTempFile,
+        mJSBundleDownloadedFile,
         bundleURL,
         bundleInfo);
   }
@@ -1291,7 +1071,7 @@ public void toggleElementInspector() {
           @Override
           public void run() {
             mDevSettings.setElementInspectorEnabled(!mDevSettings.isElementInspectorEnabled());
-            mReactInstanceManagerHelper.toggleElementInspector();
+            mReactInstanceDevHelper.toggleElementInspector();
           }
         });
   }
@@ -1326,7 +1106,59 @@ private void reload() {
         mDevLoadingViewController.showMessage("Reloading...");
       }
 
-      mDevServerHelper.openPackagerConnection(this.getClass().getSimpleName(), this);
+      mDevServerHelper.openPackagerConnection(
+          this.getClass().getSimpleName(),
+          new PackagerCommandListener() {
+            @Override
+            public void onPackagerConnected() {
+              // No-op
+            }
+
+            @Override
+            public void onPackagerDisconnected() {
+              // No-op
+            }
+
+            @Override
+            public void onPackagerReloadCommand() {
+              // Disable debugger to resume the JsVM & avoid thread locks while reloading
+              mDevServerHelper.disableDebugger();
+              UiThreadUtil.runOnUiThread(
+                  new Runnable() {
+                    @Override
+                    public void run() {
+                      handleReloadJS();
+                    }
+                  });
+            }
+
+            @Override
+            public void onPackagerDevMenuCommand() {
+              UiThreadUtil.runOnUiThread(
+                  new Runnable() {
+                    @Override
+                    public void run() {
+                      showDevOptionsDialog();
+                    }
+                  });
+            }
+
+            @Override
+            public void onCaptureHeapCommand(final Responder responder) {
+              UiThreadUtil.runOnUiThread(
+                  new Runnable() {
+                    @Override
+                    public void run() {
+                      handleCaptureHeap(responder);
+                    }
+                  });
+            }
+
+            @Override
+            public @Nullable Map<String, RequestHandler> customCommandHandlers() {
+              return mCustomPackagerCommandHandlers;
+            }
+          });
     } else {
       // hide FPS debug overlay
       if (mDebugOverlayController != null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
index 9b48b3104d52a1..24ef6b3d3bb229 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
@@ -17,25 +17,25 @@
 
 /**
  * A simple factory that creates instances of {@link DevSupportManager} implementations. Uses
- * reflection to create DevSupportManagerImpl if it exists. This allows ProGuard to strip that class
- * and its dependencies in release builds. If the class isn't found, {@link
+ * reflection to create BridgeDevSupportManager if it exists. This allows ProGuard to strip that
+ * class and its dependencies in release builds. If the class isn't found, {@link
  * DisabledDevSupportManager} is returned instead.
  */
 public class DevSupportManagerFactory {
 
   private static final String DEVSUPPORT_IMPL_PACKAGE = "com.facebook.react.devsupport";
-  private static final String DEVSUPPORT_IMPL_CLASS = "DevSupportManagerImpl";
+  private static final String DEVSUPPORT_IMPL_CLASS = "BridgeDevSupportManager";
 
   public static DevSupportManager create(
       Context applicationContext,
-      ReactInstanceManagerDevHelper reactInstanceManagerHelper,
+      ReactInstanceDevHelper reactInstanceDevHelper,
       @Nullable String packagerPathForJSBundleName,
       boolean enableOnCreate,
       int minNumShakes) {
 
     return create(
         applicationContext,
-        reactInstanceManagerHelper,
+        reactInstanceDevHelper,
         packagerPathForJSBundleName,
         enableOnCreate,
         null,
@@ -46,7 +46,7 @@ public static DevSupportManager create(
 
   public static DevSupportManager create(
       Context applicationContext,
-      ReactInstanceManagerDevHelper reactInstanceManagerHelper,
+      ReactInstanceDevHelper reactInstanceManagerHelper,
       @Nullable String packagerPathForJSBundleName,
       boolean enableOnCreate,
       @Nullable RedBoxHandler redBoxHandler,
@@ -69,7 +69,7 @@ public static DevSupportManager create(
       Constructor constructor =
           devSupportManagerClass.getConstructor(
               Context.class,
-              ReactInstanceManagerDevHelper.class,
+              ReactInstanceDevHelper.class,
               String.class,
               boolean.class,
               RedBoxHandler.class,
@@ -88,7 +88,7 @@ public static DevSupportManager create(
               customPackagerCommandHandlers);
     } catch (Exception e) {
       throw new RuntimeException(
-          "Requested enabled DevSupportManager, but DevSupportManagerImpl class was not found"
+          "Requested enabled DevSupportManager, but BridgeDevSupportManager class was not found"
               + " or could not be created",
           e);
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
deleted file mode 100644
index 8c0beeafe5bd14..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.devsupport;
-
-import android.content.Context;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
-import com.facebook.react.packagerconnection.RequestHandler;
-import java.util.Map;
-
-/**
- * Interface for accessing and interacting with development features. Following features
- * are supported through this manager class:
- * 1) Displaying JS errors (aka RedBox)
- * 2) Displaying developers menu (Reload JS, Debug JS)
- * 3) Communication with developer server in order to download updated JS bundle
- * 4) Starting/stopping broadcast receiver for js reload signals
- * 5) Starting/stopping motion sensor listener that recognize shake gestures which in turn may
- *    trigger developers menu.
- * 6) Launching developers settings view
- *
- * This class automatically monitors the state of registered views and activities to which they are
- * bound to make sure that we don't display overlay or that we we don't listen for sensor events
- * when app is backgrounded.
- *
- * {@link com.facebook.react.ReactInstanceManager} implementation is responsible for instantiating
- * this class as well as for populating with a reference to {@link CatalystInstance} whenever
- * instance manager recreates it (through {@link #onNewReactContextCreated). Also, instance manager
- * is responsible for enabling/disabling dev support in case when app is backgrounded or when all
- * the views has been detached from the instance (through {@link #setDevSupportEnabled} method).
- *
- * IMPORTANT: In order for developer support to work correctly it is required that the
- * manifest of your application contain the following entries:
- * {@code <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>}
- * {@code <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>}
- */
-public final class DevSupportManagerImpl extends DevSupportManagerBase {
-
-  public DevSupportManagerImpl(
-      Context applicationContext,
-      ReactInstanceManagerDevHelper reactInstanceManagerHelper,
-      @Nullable String packagerPathForJSBundleName,
-      boolean enableOnCreate,
-      int minNumShakes) {
-
-    super(
-        applicationContext,
-        reactInstanceManagerHelper,
-        packagerPathForJSBundleName,
-        enableOnCreate,
-        null,
-        null,
-        minNumShakes,
-        null);
-  }
-
-  public DevSupportManagerImpl(
-      Context applicationContext,
-      ReactInstanceManagerDevHelper reactInstanceManagerHelper,
-      @Nullable String packagerPathForJSBundleName,
-      boolean enableOnCreate,
-      @Nullable RedBoxHandler redBoxHandler,
-      @Nullable DevBundleDownloadListener devBundleDownloadListener,
-      int minNumShakes,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
-    super(
-        applicationContext,
-        reactInstanceManagerHelper,
-        packagerPathForJSBundleName,
-        enableOnCreate,
-        redBoxHandler,
-        devBundleDownloadListener,
-        minNumShakes,
-        customPackagerCommandHandlers);
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
index 298de68ce389f4..b3738654b61540 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
@@ -12,10 +12,12 @@
 import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.devsupport.interfaces.BundleLoadCallback;
 import com.facebook.react.devsupport.interfaces.DevOptionHandler;
 import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.ErrorCustomizer;
+import com.facebook.react.devsupport.interfaces.ErrorType;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
@@ -130,11 +132,16 @@ public void handleReloadJS() {}
   @Override
   public void reloadJSFromServer(String bundleURL) {}
 
+  @Override
+  public void reloadJSFromServer(final String bundleURL, final BundleLoadCallback callback) {}
+
   @Override
   public void loadSplitBundleFromServer(String bundlePath, DevSplitBundleCallback callback) {}
 
   @Override
-  public void isPackagerRunning(final PackagerStatusCallback callback) {}
+  public void isPackagerRunning(final PackagerStatusCallback callback) {
+    callback.onPackagerStatusFetched(false);
+  }
 
   @Override
   public @Nullable File downloadBundleResourceFromUrlSync(
@@ -152,6 +159,11 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {}
     return null;
   }
 
+  @Override
+  public @Nullable ErrorType getLastErrorType() {
+    return null;
+  }
+
   @Override
   public void registerErrorCustomizer(ErrorCustomizer errorCustomizer) {}
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java
index 3fccd255d9d0e6..0eb907620c4cc6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java
@@ -92,7 +92,7 @@ public void run() {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
+  public void invalidate() {
     UiThreadUtil.runOnUiThread(
         new Runnable() {
           @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java
new file mode 100644
index 00000000000000..b83ca3ece7f545
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport;
+
+import com.facebook.common.logging.FLog;
+import com.facebook.react.common.ReactConstants;
+import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+/** Use this class to check if the JavaScript packager is running on the provided host. */
+public class PackagerStatusCheck {
+
+  private static final String PACKAGER_OK_STATUS = "packager-status:running";
+  private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;
+  private static final String PACKAGER_STATUS_URL_TEMPLATE = "http://%s/status";
+
+  private final OkHttpClient mClient;
+
+  public PackagerStatusCheck() {
+    mClient =
+        new OkHttpClient.Builder()
+            .connectTimeout(HTTP_CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .readTimeout(0, TimeUnit.MILLISECONDS)
+            .writeTimeout(0, TimeUnit.MILLISECONDS)
+            .build();
+  }
+
+  public PackagerStatusCheck(OkHttpClient client) {
+    mClient = client;
+  }
+
+  public void run(String host, final PackagerStatusCallback callback) {
+    String statusURL = createPackagerStatusURL(host);
+    Request request = new Request.Builder().url(statusURL).build();
+
+    mClient
+        .newCall(request)
+        .enqueue(
+            new Callback() {
+              @Override
+              public void onFailure(Call call, IOException e) {
+                FLog.w(
+                    ReactConstants.TAG,
+                    "The packager does not seem to be running as we got an IOException requesting "
+                        + "its status: "
+                        + e.getMessage());
+                callback.onPackagerStatusFetched(false);
+              }
+
+              @Override
+              public void onResponse(Call call, Response response) throws IOException {
+                if (!response.isSuccessful()) {
+                  FLog.e(
+                      ReactConstants.TAG,
+                      "Got non-success http code from packager when requesting status: "
+                          + response.code());
+                  callback.onPackagerStatusFetched(false);
+                  return;
+                }
+                ResponseBody body = response.body();
+                if (body == null) {
+                  FLog.e(
+                      ReactConstants.TAG,
+                      "Got null body response from packager when requesting status");
+                  callback.onPackagerStatusFetched(false);
+                  return;
+                }
+                String bodyString =
+                    body.string(); // cannot call body.string() twice, stored it into variable.
+                // https://github.com/square/okhttp/issues/1240#issuecomment-68142603
+                if (!PACKAGER_OK_STATUS.equals(bodyString)) {
+                  FLog.e(
+                      ReactConstants.TAG,
+                      "Got unexpected response from packager when requesting status: "
+                          + bodyString);
+                  callback.onPackagerStatusFetched(false);
+                  return;
+                }
+                callback.onPackagerStatusFetched(true);
+              }
+            });
+  }
+
+  private static String createPackagerStatusURL(String host) {
+    return String.format(Locale.US, PACKAGER_STATUS_URL_TEMPLATE, host);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceDevHelper.java
similarity index 88%
rename from ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
rename to ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceDevHelper.java
index 02483586b3416f..242b0a62fce77b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceDevHelper.java
@@ -15,9 +15,10 @@
 
 /**
  * Interface used by {@link DevSupportManager} for accessing some fields and methods of {@link
- * ReactInstanceManager} for the purpose of displaying and handling developer menu options.
+ * ReactInstanceManager} or {@link ReactHost} for the purpose of displaying and handling developer
+ * menu options.
  */
-public interface ReactInstanceManagerDevHelper {
+public interface ReactInstanceDevHelper {
 
   /** Request react instance recreation with JS debugging enabled. */
   void onReloadWithJSDebugger(JavaJSExecutor.Factory proxyExecutorFactory);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
index f61b366a77a8ae..9791b7fde474a3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
@@ -10,29 +10,15 @@
 import android.content.Context;
 import android.text.SpannedString;
 import androidx.annotation.Nullable;
+import com.facebook.react.devsupport.interfaces.ErrorType;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 
 /**
- * Interface used by {@link DevSupportManagerImpl} to allow interception on any redboxes during
+ * Interface used by {@link BridgeDevSupportManager} to allow interception on any redboxes during
  * development and handling the information from the redbox. The implementation should be passed by
  * setRedBoxHandler in ReactInstanceManager.
  */
 public interface RedBoxHandler {
-  enum ErrorType {
-    JS("JS"),
-    NATIVE("Native");
-
-    private final String name;
-
-    ErrorType(String name) {
-      this.name = name;
-    }
-
-    public String getName() {
-      return name;
-    }
-  }
-
   /** Callback interface for {@link #reportRedbox}. */
   interface ReportCompletedListener {
     void onReportSuccess(SpannedString spannedString);
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/build.gradle b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/BundleLoadCallback.java
similarity index 63%
rename from packages/react-native-codegen/android/gradlePlugin-build/build.gradle
rename to ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/BundleLoadCallback.java
index c335f1ce14e06d..40495dfdbf9341 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/build.gradle
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/BundleLoadCallback.java
@@ -5,10 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-allprojects {
-    repositories {
-        mavenLocal()
-        google()
-        jcenter()
-    }
+package com.facebook.react.devsupport.interfaces;
+
+public interface BundleLoadCallback {
+  void onSuccess();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
index 92181077ab4c4a..a780d523723421 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
@@ -17,7 +17,7 @@
 
 /**
  * Interface for accessing and interacting with development features. In dev mode, use the
- * implementation {@link DevSupportManagerImpl}. In production mode, use the dummy implementation
+ * implementation {@link BridgeDevSupportManager}. In production mode, use the dummy implementation
  * {@link DisabledDevSupportManager}.
  */
 public interface DevSupportManager extends NativeModuleCallExceptionHandler {
@@ -69,6 +69,8 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
 
   void reloadJSFromServer(final String bundleURL);
 
+  void reloadJSFromServer(final String bundleURL, final BundleLoadCallback callback);
+
   void loadSplitBundleFromServer(String bundlePath, DevSplitBundleCallback callback);
 
   void isPackagerRunning(PackagerStatusCallback callback);
@@ -90,6 +92,9 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
   @Nullable
   StackFrame[] getLastErrorStack();
 
+  @Nullable
+  ErrorType getLastErrorType();
+
   void registerErrorCustomizer(ErrorCustomizer errorCustomizer);
 
   /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorType.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorType.java
new file mode 100644
index 00000000000000..2b5a1884b54af4
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorType.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport.interfaces;
+
+public enum ErrorType {
+  JS("JS"),
+  NATIVE("Native");
+
+  private final String name;
+
+  ErrorType(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
index a1882a6cdbd5d1..df7dee67bd64e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
@@ -8,6 +8,7 @@ rn_android_library(
         "jsi/*.java",
         "mounting/**/*.java",
     ]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -32,11 +33,11 @@ rn_android_library(
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/fabric/jni:jni"),
-        react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
         react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/views/view:view"),
         react_native_target("java/com/facebook/react/views/text:text"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
index ea080bd4e071ed..6449ef07579550 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
@@ -12,9 +12,11 @@
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.RuntimeExecutor;
 import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.fabric.events.EventBeatManager;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.uimanager.PixelUtil;
 
 @DoNotStrip
@@ -76,7 +78,9 @@ public native void setConstraints(
 
   public native void driveCxxAnimations();
 
-  // TODO (T67721598) Remove the jsContext param once we've migrated to using RuntimeExecutor
+  public native ReadableNativeMap getInspectorDataForInstance(
+      EventEmitterWrapper eventEmitterWrapper);
+
   public void register(
       @NonNull RuntimeExecutor runtimeExecutor,
       @NonNull FabricUIManager fabricUIManager,
@@ -92,6 +96,7 @@ public void register(
         jsMessageQueueThread,
         componentFactory,
         reactNativeConfig);
+
     setPixelDensity(PixelUtil.getDisplayMetricDensity());
   }
 
@@ -100,4 +105,8 @@ public void register(
   public void unregister() {
     uninstallFabricUIManager();
   }
+
+  public native void registerSurface(SurfaceHandlerBinding surfaceHandler);
+
+  public native void unregisterSurface(SurfaceHandlerBinding surfaceHandler);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java
index ab16eac8e2785f..73d2c6f59bf24d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java
@@ -14,15 +14,15 @@
 /**
  * Utility class for Fabric components, this will be removed
  *
- * <p>//TODO T31905686: remove this class when the component names are unified between JS - Android
- * - iOS - C++
+ * <p>TODO T97384889: remove this class when the component names are unified between JS - Android -
+ * iOS - C++
  */
 public class FabricComponents {
 
   private static @NonNull final Map<String, String> sComponentNames = new HashMap<>();
 
   static {
-    // TODO T31905686: unify component names between JS - Android - iOS - C++
+    // TODO T97384889: unify component names between JS - Android - iOS - C++
     sComponentNames.put("View", "RCTView");
     sComponentNames.put("Image", "RCTImageView");
     sComponentNames.put("ScrollView", "RCTScrollView");
@@ -40,6 +40,7 @@ public class FabricComponents {
     sComponentNames.put("Map", "RCTMap");
     sComponentNames.put("WebView", "RCTWebView");
     sComponentNames.put("Keyframes", "RCTKeyframes");
+    sComponentNames.put("ImpressionTrackingView", "RCTImpressionTrackingView");
   }
 
   /** @return the name of component in the Fabric environment */
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
index c079b48231795a..84bea4d85f6181 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
@@ -8,35 +8,14 @@
 package com.facebook.react.fabric;
 
 import androidx.annotation.NonNull;
-import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.queue.MessageQueueThread;
+import com.facebook.react.common.mapbuffer.ReadableMapBufferSoLoader;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventBeatManager;
-import com.facebook.react.fabric.events.EventEmitterWrapper;
-import com.facebook.react.fabric.events.FabricEventEmitter;
-import com.facebook.react.fabric.mounting.LayoutMetricsConversions;
-import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.react.fabric.mounting.mountitems.BatchMountItem;
-import com.facebook.react.fabric.mounting.mountitems.CreateMountItem;
-import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
-import com.facebook.react.fabric.mounting.mountitems.DispatchIntCommandMountItem;
-import com.facebook.react.fabric.mounting.mountitems.DispatchStringCommandMountItem;
-import com.facebook.react.fabric.mounting.mountitems.InsertMountItem;
-import com.facebook.react.fabric.mounting.mountitems.MountItem;
-import com.facebook.react.fabric.mounting.mountitems.PreAllocateViewMountItem;
-import com.facebook.react.fabric.mounting.mountitems.RemoveDeleteMultiMountItem;
-import com.facebook.react.fabric.mounting.mountitems.SendAccessibilityEvent;
-import com.facebook.react.fabric.mounting.mountitems.UpdateEventEmitterMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdateLayoutMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdatePaddingMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdatePropsMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdateStateMountItem;
-import com.facebook.react.uimanager.StateWrapper;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
-import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.systrace.Systrace;
 
 public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
@@ -44,25 +23,30 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
   @NonNull private final ReactApplicationContext mReactApplicationContext;
   @NonNull private final ComponentFactory mComponentFactory;
   @NonNull private final ReactNativeConfig mConfig;
+  @NonNull private final ViewManagerRegistry mViewManagerRegistry;
 
   public FabricJSIModuleProvider(
       @NonNull ReactApplicationContext reactApplicationContext,
       @NonNull ComponentFactory componentFactory,
-      @NonNull ReactNativeConfig config) {
+      @NonNull ReactNativeConfig config,
+      @NonNull ViewManagerRegistry viewManagerRegistry) {
     mReactApplicationContext = reactApplicationContext;
     mComponentFactory = componentFactory;
     mConfig = config;
+    mViewManagerRegistry = viewManagerRegistry;
   }
 
   @Override
   public UIManager get() {
+    Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.get");
     final EventBeatManager eventBeatManager = new EventBeatManager(mReactApplicationContext);
     final FabricUIManager uiManager = createUIManager(eventBeatManager);
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding");
     final Binding binding = new Binding();
-    // TODO T31905686: remove this call
-    loadClasses();
+    if (ReactFeatureFlags.enableEagerInitializeMapBufferSoFile) {
+      ReadableMapBufferSoLoader.staticInit();
+    }
     MessageQueueThread jsMessageQueueThread =
         mReactApplicationContext
             .getCatalystInstance()
@@ -76,59 +60,21 @@ public UIManager get() {
         jsMessageQueueThread,
         mComponentFactory,
         mConfig);
+
+    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+
     return uiManager;
   }
 
   private FabricUIManager createUIManager(@NonNull EventBeatManager eventBeatManager) {
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.createUIManager");
-    UIManagerModule nativeModule =
-        Assertions.assertNotNull(mReactApplicationContext.getNativeModule(UIManagerModule.class));
-    EventDispatcher eventDispatcher = nativeModule.getEventDispatcher();
-    FabricUIManager fabricUIManager =
-        new FabricUIManager(
-            mReactApplicationContext,
-            nativeModule.getViewManagerRegistry_DO_NOT_USE(),
-            eventDispatcher,
-            eventBeatManager);
 
+    FabricUIManager fabricUIManager;
+    fabricUIManager =
+        new FabricUIManager(mReactApplicationContext, mViewManagerRegistry, eventBeatManager);
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     return fabricUIManager;
   }
-
-  // TODO T31905686: eager load Fabric classes, this is temporary and it will be removed
-  // in the near future
-  private static void loadClasses() {
-    EventBeatManager.class.getClass();
-    EventEmitterWrapper.class.getClass();
-    FabricEventEmitter.class.getClass();
-    BatchMountItem.class.getClass();
-    CreateMountItem.class.getClass();
-    DispatchCommandMountItem.class.getClass();
-    DispatchIntCommandMountItem.class.getClass();
-    DispatchStringCommandMountItem.class.getClass();
-    InsertMountItem.class.getClass();
-    MountItem.class.getClass();
-    PreAllocateViewMountItem.class.getClass();
-    RemoveDeleteMultiMountItem.class.getClass();
-    SendAccessibilityEvent.class.getClass();
-    UpdateEventEmitterMountItem.class.getClass();
-    UpdateLayoutMountItem.class.getClass();
-    UpdatePaddingMountItem.class.getClass();
-    UpdatePropsMountItem.class.getClass();
-    UpdateStateMountItem.class.getClass();
-    LayoutMetricsConversions.class.getClass();
-    MountingManager.class.getClass();
-    Binding.class.getClass();
-    ComponentFactory.class.getClass();
-    FabricComponents.class.getClass();
-    FabricSoLoader.class.getClass();
-    FabricUIManager.class.getClass();
-    GuardedFrameCallback.class.getClass();
-    StateWrapper.class.getClass();
-    StateWrapperImpl.class.getClass();
-    BatchEventDispatchedListener.class.getClass();
-    ReactNativeConfig.class.getClass();
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index a61694b67c2fb4..76e084d9a75920 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -25,8 +25,8 @@
 import android.graphics.Point;
 import android.os.SystemClock;
 import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
 import androidx.annotation.AnyThread;
-import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
@@ -34,81 +34,76 @@
 import com.facebook.debug.holder.PrinterHolder;
 import com.facebook.debug.tags.ReactDebugOverlayTags;
 import com.facebook.infer.annotation.ThreadConfined;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.ReactRootView;
+import com.facebook.proguard.annotations.DoNotStripAny;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactIgnorableMountingException;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.events.FabricEventEmitter;
+import com.facebook.react.fabric.mounting.MountItemDispatcher;
 import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.react.fabric.mounting.mountitems.BatchMountItem;
-import com.facebook.react.fabric.mounting.mountitems.CreateMountItem;
-import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
+import com.facebook.react.fabric.mounting.SurfaceMountingManager;
 import com.facebook.react.fabric.mounting.mountitems.DispatchIntCommandMountItem;
 import com.facebook.react.fabric.mounting.mountitems.DispatchStringCommandMountItem;
-import com.facebook.react.fabric.mounting.mountitems.InsertMountItem;
 import com.facebook.react.fabric.mounting.mountitems.IntBufferBatchMountItem;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.fabric.mounting.mountitems.PreAllocateViewMountItem;
-import com.facebook.react.fabric.mounting.mountitems.RemoveDeleteMultiMountItem;
 import com.facebook.react.fabric.mounting.mountitems.SendAccessibilityEvent;
-import com.facebook.react.fabric.mounting.mountitems.UpdateEventEmitterMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdateLayoutMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdatePaddingMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdatePropsMountItem;
-import com.facebook.react.fabric.mounting.mountitems.UpdateStateMountItem;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.ReactRootViewTagGenerator;
+import com.facebook.react.uimanager.RootViewUtil;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManagerPropertyUpdater;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.uimanager.events.EventDispatcherImpl;
+import com.facebook.react.uimanager.events.LockFreeEventDispatcherImpl;
 import com.facebook.react.views.text.TextLayoutManager;
-import com.facebook.systrace.Systrace;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
+import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Queue;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+/**
+ * We instruct ProGuard not to strip out any fields or methods, because many of these methods are
+ * only called through the JNI from Cxx so it appears that most of this class is "unused".
+ */
 @SuppressLint("MissingNativeLoadLibrary")
+@DoNotStripAny
 public class FabricUIManager implements UIManager, LifecycleEventListener {
+  public static final String TAG = FabricUIManager.class.getSimpleName();
 
-  public static final String TAG = "FabricUIManager";
   // The IS_DEVELOPMENT_ENVIRONMENT variable is used to log extra data when running fabric in a
   // development environment. DO NOT ENABLE THIS ON PRODUCTION OR YOU WILL BE FIRED!
-  public static final boolean IS_DEVELOPMENT_ENVIRONMENT = false;
+  public static final boolean IS_DEVELOPMENT_ENVIRONMENT = false && ReactBuildConfig.DEBUG;
   public static final boolean ENABLE_FABRIC_LOGS =
       ReactFeatureFlags.enableFabricLogs
           || PrinterHolder.getPrinter()
               .shouldDisplayLogMessage(ReactDebugOverlayTags.FABRIC_UI_MANAGER);
-  private static final int FRAME_TIME_MS = 16;
-  private static final int MAX_TIME_IN_FRAME_FOR_NON_BATCHED_OPERATIONS_MS = 8;
-  private static final int PRE_MOUNT_ITEMS_INITIAL_SIZE_ARRAY = 250;
 
   static {
     FabricSoLoader.staticInit();
@@ -118,55 +113,28 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   @NonNull private final ReactApplicationContext mReactApplicationContext;
   @NonNull private final MountingManager mMountingManager;
   @NonNull private final EventDispatcher mEventDispatcher;
-
-  @NonNull
-  private final ConcurrentHashMap<Integer, ThemedReactContext> mReactContextForRootTag =
-      new ConcurrentHashMap<>();
+  @NonNull private final MountItemDispatcher mMountItemDispatcher;
 
   @NonNull private final EventBeatManager mEventBeatManager;
-  @NonNull private final Object mViewCommandMountItemsLock = new Object();
-  @NonNull private final Object mMountItemsLock = new Object();
-  @NonNull private final Object mPreMountItemsLock = new Object();
-
-  private boolean mInDispatch = false;
-  private int mReDispatchCounter = 0;
-
-  @GuardedBy("mViewCommandMountItemsLock")
-  @NonNull
-  private List<DispatchCommandMountItem> mViewCommandMountItems = new ArrayList<>();
 
   @NonNull
   private final CopyOnWriteArrayList<UIManagerListener> mListeners = new CopyOnWriteArrayList<>();
 
-  @GuardedBy("mMountItemsLock")
-  @NonNull
-  private List<MountItem> mMountItems = new ArrayList<>();
-
-  @GuardedBy("mPreMountItemsLock")
-  @NonNull
-  private ArrayDeque<PreAllocateViewMountItem> mPreMountItems =
-      new ArrayDeque<>(PRE_MOUNT_ITEMS_INITIAL_SIZE_ARRAY);
-
   @ThreadConfined(UI)
   @NonNull
   private final DispatchUIFrameCallback mDispatchUIFrameCallback;
 
-  @ThreadConfined(UI)
-  private int mLastExecutedMountItemSurfaceId = -1;
-
-  @ThreadConfined(UI)
-  private boolean mLastExecutedMountItemSurfaceIdActive = false;
-
   /**
    * This is used to keep track of whether or not the FabricUIManager has been destroyed. Once the
    * Catalyst instance is being destroyed, we should cease all operation here.
    */
   private volatile boolean mDestroyed = false;
 
+  // TODO T83943316: Delete this variable once StaticViewConfigs are enabled by default
+  private volatile boolean mShouldDeallocateEventDispatcher = false;
+
   private boolean mDriveCxxAnimations = false;
 
-  private long mRunStartTime = 0l;
-  private long mBatchedExecutionTime = 0l;
   private long mDispatchViewUpdatesTime = 0l;
   private long mCommitStartTime = 0l;
   private long mLayoutTime = 0l;
@@ -179,6 +147,19 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
   // from C++ to exceed 9,999 and it should be obvious what's going on when analyzing performance.
   private int mCurrentSynchronousCommitNumber = 10000;
 
+  private MountingManager.MountItemExecutor mMountItemExecutor =
+      new MountingManager.MountItemExecutor() {
+        @Override
+        public void executeItems(Queue<MountItem> items) {
+          // This executor can be technically accessed before the dispatcher is created,
+          // but if that happens, something is terribly wrong
+          mMountItemDispatcher.dispatchMountItems(items);
+        }
+      };
+
+  // TODO T83943316: Deprecate and delete this constructor once StaticViewConfigs are enabled by
+  // default
+  @Deprecated
   public FabricUIManager(
       ReactApplicationContext reactContext,
       ViewManagerRegistry viewManagerRegistry,
@@ -186,8 +167,29 @@ public FabricUIManager(
       EventBeatManager eventBeatManager) {
     mDispatchUIFrameCallback = new DispatchUIFrameCallback(reactContext);
     mReactApplicationContext = reactContext;
-    mMountingManager = new MountingManager(viewManagerRegistry);
+    mMountingManager = new MountingManager(viewManagerRegistry, mMountItemExecutor);
+    mMountItemDispatcher =
+        new MountItemDispatcher(mMountingManager, new MountItemDispatchListener());
     mEventDispatcher = eventDispatcher;
+    mShouldDeallocateEventDispatcher = false;
+    mEventBeatManager = eventBeatManager;
+    mReactApplicationContext.addLifecycleEventListener(this);
+  }
+
+  public FabricUIManager(
+      ReactApplicationContext reactContext,
+      ViewManagerRegistry viewManagerRegistry,
+      EventBeatManager eventBeatManager) {
+    mDispatchUIFrameCallback = new DispatchUIFrameCallback(reactContext);
+    mReactApplicationContext = reactContext;
+    mMountingManager = new MountingManager(viewManagerRegistry, mMountItemExecutor);
+    mMountItemDispatcher =
+        new MountItemDispatcher(mMountingManager, new MountItemDispatchListener());
+    mEventDispatcher =
+        ReactFeatureFlags.enableLockFreeEventDispatcher
+            ? new LockFreeEventDispatcherImpl(reactContext)
+            : new EventDispatcherImpl(reactContext);
+    mShouldDeallocateEventDispatcher = true;
     mEventBeatManager = eventBeatManager;
     mReactApplicationContext.addLifecycleEventListener(this);
   }
@@ -196,18 +198,22 @@ public FabricUIManager(
   @Override
   @UiThread
   @ThreadConfined(UI)
+  @Deprecated
   public <T extends View> int addRootView(
       final T rootView, final WritableMap initialProps, final @Nullable String initialUITemplate) {
+    ReactSoftExceptionLogger.logSoftException(
+        TAG,
+        new IllegalViewOperationException(
+            "Do not call addRootView in Fabric; it is unsupported. Call startSurface instead."));
+
     final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
     ReactRoot reactRootView = (ReactRoot) rootView;
 
-    // TODO T31905686: Combine with startSurface below
     ThemedReactContext reactContext =
         new ThemedReactContext(
-            mReactApplicationContext, rootView.getContext(), reactRootView.getSurfaceID());
-    mMountingManager.addRootView(rootTag, rootView);
+            mReactApplicationContext, rootView.getContext(), reactRootView.getSurfaceID(), rootTag);
+    mMountingManager.startSurface(rootTag, rootView, reactContext);
     String moduleName = reactRootView.getJSModuleName();
-    mReactContextForRootTag.put(rootTag, reactContext);
     if (ENABLE_FABRIC_LOGS) {
       FLog.d(TAG, "Starting surface for module: %s and reactTag: %d", moduleName, rootTag);
     }
@@ -218,6 +224,36 @@ public <T extends View> int addRootView(
     return rootTag;
   }
 
+  /**
+   * This API returns metadata associated to the React Component that rendered the Android View
+   * received as a parameter.
+   *
+   * @param surfaceId {@link int} that represents the surfaceId for the View received as a
+   *     parameter. In practice surfaceId can be retrieved calling the {@link View#getId()} method
+   *     on the {@link ReactRoot} that holds the View received as a second parameter.
+   * @param view {@link View} view that will be used to retrieve the React view hierarchy metadata.
+   * @return a {@link ReadableMap} that contains metadata associated to the React Component that
+   *     rendered the Android View received as a parameter. For more details about the keys stored
+   *     in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
+   *     com/facebook/react/fabric/jni/Binding.cpp file.
+   */
+  @UiThread
+  @ThreadConfined(UI)
+  public ReadableMap getInspectorDataForInstance(final int surfaceId, final View view) {
+    UiThreadUtil.assertOnUiThread();
+    int reactTag = view.getId();
+
+    EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
+    return mBinding.getInspectorDataForInstance(eventEmitter);
+  }
+
+  @Override
+  public void preInitializeViewManagers(List<String> viewManagerNames) {
+    for (String viewManagerName : viewManagerNames) {
+      mMountingManager.initializeViewManager(viewManagerName);
+    }
+  }
+
   @Override
   @AnyThread
   @ThreadConfined(ANY)
@@ -230,14 +266,18 @@ public <T extends View> int startSurface(
     final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
     Context context = rootView.getContext();
     ThemedReactContext reactContext =
-        new ThemedReactContext(mReactApplicationContext, context, moduleName);
+        new ThemedReactContext(mReactApplicationContext, context, moduleName, rootTag);
     if (ENABLE_FABRIC_LOGS) {
       FLog.d(TAG, "Starting surface for module: %s and reactTag: %d", moduleName, rootTag);
     }
-    mMountingManager.addRootView(rootTag, rootView);
-    mReactContextForRootTag.put(rootTag, reactContext);
+    mMountingManager.startSurface(rootTag, rootView, reactContext);
 
-    Point viewportOffset = ReactRootView.getViewportOffset(rootView);
+    // If startSurface is executed in the UIThread then, it uses the ViewportOffset from the View,
+    // Otherwise Fabric relies on calling {@link Binding#setConstraints} method to update the
+    // ViewportOffset during measurement or onLayout.
+    @SuppressLint("WrongThread")
+    Point viewportOffset =
+        UiThreadUtil.isOnUiThread() ? RootViewUtil.getViewportOffset(rootView) : new Point(0, 0);
 
     mBinding.startSurfaceWithConstraints(
         rootTag,
@@ -254,8 +294,57 @@ public <T extends View> int startSurface(
     return rootTag;
   }
 
+  public void startSurface(final SurfaceHandler surfaceHandler, final @Nullable View rootView) {
+    final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
+
+    if (rootView == null) {
+      mMountingManager.startSurface(rootTag);
+    } else {
+      Context context = rootView.getContext();
+      ThemedReactContext reactContext =
+          new ThemedReactContext(
+              mReactApplicationContext, context, surfaceHandler.getModuleName(), rootTag);
+      mMountingManager.startSurface(rootTag, rootView, reactContext);
+    }
+
+    surfaceHandler.setSurfaceId(rootTag);
+    if (surfaceHandler instanceof SurfaceHandlerBinding) {
+      mBinding.registerSurface((SurfaceHandlerBinding) surfaceHandler);
+    }
+    surfaceHandler.setMountable(rootView != null);
+    surfaceHandler.start();
+  }
+
+  public void attachRootView(final SurfaceHandler surfaceHandler, final View rootView) {
+    ThemedReactContext reactContext =
+        new ThemedReactContext(
+            mReactApplicationContext,
+            rootView.getContext(),
+            surfaceHandler.getModuleName(),
+            surfaceHandler.getSurfaceId());
+    mMountingManager.attachRootView(surfaceHandler.getSurfaceId(), rootView, reactContext);
+
+    surfaceHandler.setMountable(true);
+  }
+
+  public void stopSurface(final SurfaceHandler surfaceHandler) {
+    if (!surfaceHandler.isRunning()) {
+      ReactSoftExceptionLogger.logSoftException(
+          FabricUIManager.TAG,
+          new IllegalStateException("Trying to stop surface that hasn't started yet"));
+      return;
+    }
+
+    mMountingManager.stopSurface(surfaceHandler.getSurfaceId());
+
+    surfaceHandler.stop();
+
+    if (surfaceHandler instanceof SurfaceHandlerBinding) {
+      mBinding.unregisterSurface((SurfaceHandlerBinding) surfaceHandler);
+    }
+  }
+
   /** Method called when an event has been dispatched on the C++ side. */
-  @DoNotStrip
   @SuppressWarnings("unused")
   public void onRequestEventBeat() {
     mEventDispatcher.dispatchAllEvents();
@@ -265,15 +354,13 @@ public void onRequestEventBeat() {
   @ThreadConfined(ANY)
   @Override
   public void stopSurface(final int surfaceID) {
-    mReactContextForRootTag.remove(surfaceID);
+    // Mark surfaceId as dead, stop executing mounting instructions
+    mMountingManager.stopSurface(surfaceID);
+
+    // Communicate stopSurface to Cxx - causes an empty ShadowTree to be committed,
+    // but all mounting instructions will be ignored because stopSurface was called
+    // on the MountingManager
     mBinding.stopSurface(surfaceID);
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            mMountingManager.deleteRootView(surfaceID);
-          }
-        });
   }
 
   @Override
@@ -290,7 +377,7 @@ public void onCatalystInstanceDestroy() {
     FLog.i(TAG, "FabricUIManager.onCatalystInstanceDestroy");
 
     if (mDestroyed) {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           FabricUIManager.TAG, new IllegalStateException("Cannot double-destroy FabricUIManager"));
       return;
     }
@@ -320,148 +407,15 @@ public void onCatalystInstanceDestroy() {
     mBinding = null;
 
     ViewManagerPropertyUpdater.clear();
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private void preallocateView(
-      int rootTag,
-      int reactTag,
-      final String componentName,
-      @Nullable ReadableMap props,
-      @Nullable Object stateWrapper,
-      boolean isLayoutable) {
 
-    // This could be null if teardown/navigation away from a surface on the main thread happens
-    // while a commit is being processed in a different thread. By contract we expect this to be
-    // possible at teardown, but this race should *never* happen at startup.
-    @Nullable ThemedReactContext context = mReactContextForRootTag.get(rootTag);
-
-    String component = getFabricComponentName(componentName);
-    synchronized (mPreMountItemsLock) {
-      mPreMountItems.add(
-          new PreAllocateViewMountItem(
-              context,
-              rootTag,
-              reactTag,
-              component,
-              props,
-              (StateWrapper) stateWrapper,
-              isLayoutable));
+    // When using ReactFeatureFlags.enableExperimentalStaticViewConfigs enabled, FabriUIManager is
+    // responsible for initializing and deallocating EventDispatcher.
+    // TODO T83943316: Remove this IF once StaticViewConfigs are enabled by default
+    if (mShouldDeallocateEventDispatcher) {
+      mEventDispatcher.onCatalystInstanceDestroyed();
     }
   }
 
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem createMountItem(
-      String componentName,
-      @Nullable ReadableMap props,
-      @Nullable Object stateWrapper,
-      int reactRootTag,
-      int reactTag,
-      boolean isLayoutable) {
-    String component = getFabricComponentName(componentName);
-
-    // This could be null if teardown/navigation away from a surface on the main thread happens
-    // while a commit is being processed in a different thread. By contract we expect this to be
-    // possible at teardown, but this race should *never* happen at startup.
-    @Nullable ThemedReactContext reactContext = mReactContextForRootTag.get(reactRootTag);
-
-    return new CreateMountItem(
-        reactContext,
-        reactRootTag,
-        reactTag,
-        component,
-        props,
-        (StateWrapper) stateWrapper,
-        isLayoutable);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem insertMountItem(int reactTag, int parentReactTag, int index) {
-    return new InsertMountItem(reactTag, parentReactTag, index);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem removeDeleteMultiMountItem(int[] metadata) {
-    return new RemoveDeleteMultiMountItem(metadata);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem updateLayoutMountItem(
-      int reactTag, int x, int y, int width, int height, int layoutDirection) {
-    return new UpdateLayoutMountItem(reactTag, x, y, width, height, layoutDirection);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem updatePaddingMountItem(int reactTag, int left, int top, int right, int bottom) {
-    return new UpdatePaddingMountItem(reactTag, left, top, right, bottom);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem updatePropsMountItem(int reactTag, ReadableMap map) {
-    return new UpdatePropsMountItem(reactTag, map);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem updateStateMountItem(int reactTag, @Nullable Object stateWrapper) {
-    return new UpdateStateMountItem(reactTag, (StateWrapper) stateWrapper);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem updateEventEmitterMountItem(int reactTag, Object eventEmitter) {
-    return new UpdateEventEmitterMountItem(reactTag, (EventEmitterWrapper) eventEmitter);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem createBatchMountItem(
-      int rootTag, MountItem[] items, int size, int commitNumber) {
-    return new BatchMountItem(rootTag, items, size, commitNumber);
-  }
-
-  @DoNotStrip
-  @SuppressWarnings("unused")
-  @AnyThread
-  @ThreadConfined(ANY)
-  private MountItem createIntBufferBatchMountItem(
-      int rootTag, int[] intBuffer, Object[] objBuffer, int commitNumber) {
-    // This could be null if teardown/navigation away from a surface on the main thread happens
-    // while a commit is being processed in a different thread. By contract we expect this to be
-    // possible at teardown, but this race should *never* happen at startup.
-    @Nullable ThemedReactContext reactContext = mReactContextForRootTag.get(rootTag);
-
-    return new IntBufferBatchMountItem(rootTag, reactContext, intBuffer, objBuffer, commitNumber);
-  }
-
-  @DoNotStrip
   @SuppressWarnings("unused")
   private NativeArray measureLines(
       ReadableMap attributedString, ReadableMap paragraphAttributes, float width, float height) {
@@ -473,7 +427,20 @@ private NativeArray measureLines(
             PixelUtil.toPixelFromDIP(width));
   }
 
-  @DoNotStrip
+  @SuppressWarnings("unused")
+  private NativeArray measureLinesMapBuffer(
+      ReadableMapBuffer attributedString,
+      ReadableMapBuffer paragraphAttributes,
+      float width,
+      float height) {
+    return (NativeArray)
+        TextLayoutManagerMapBuffer.measureLines(
+            mReactApplicationContext,
+            attributedString,
+            paragraphAttributes,
+            PixelUtil.toPixelFromDIP(width));
+  }
+
   @SuppressWarnings("unused")
   private long measure(
       int rootTag,
@@ -498,10 +465,17 @@ private long measure(
         null);
   }
 
-  @DoNotStrip
+  @SuppressWarnings("unused")
+  public int getColor(int surfaceId, ReadableMap platformColor) {
+    ThemedReactContext context =
+        mMountingManager.getSurfaceManagerEnforced(surfaceId, "getColor").getContext();
+    Integer color = ColorPropConverter.getColor(platformColor, context);
+    return color != null ? color : 0;
+  }
+
   @SuppressWarnings("unused")
   private long measure(
-      int rootTag,
+      int surfaceId,
       String componentName,
       ReadableMap localData,
       ReadableMap props,
@@ -512,16 +486,16 @@ private long measure(
       float maxHeight,
       @Nullable float[] attachmentsPositions) {
 
-    // This could be null if teardown/navigation away from a surface on the main thread happens
-    // while a commit is being processed in a different thread. By contract we expect this to be
-    // possible at teardown, but this race should *never* happen at startup.
-    @Nullable
-    ReactContext context =
-        rootTag < 0 ? mReactApplicationContext : mReactContextForRootTag.get(rootTag);
-
-    // Don't both measuring if we can't get a context.
-    if (context == null) {
-      return 0;
+    ReactContext context;
+    if (surfaceId > 0) {
+      SurfaceMountingManager surfaceMountingManager =
+          mMountingManager.getSurfaceManagerEnforced(surfaceId, "measure");
+      if (surfaceMountingManager.isStopped()) {
+        return 0;
+      }
+      context = surfaceMountingManager.getContext();
+    } else {
+      context = mReactApplicationContext;
     }
 
     return mMountingManager.measure(
@@ -537,23 +511,53 @@ private long measure(
         attachmentsPositions);
   }
 
+  @SuppressWarnings("unused")
+  private long measureMapBuffer(
+      int surfaceId,
+      String componentName,
+      ReadableMapBuffer attributedString,
+      ReadableMapBuffer paragraphAttributes,
+      float minWidth,
+      float maxWidth,
+      float minHeight,
+      float maxHeight,
+      @Nullable float[] attachmentsPositions) {
+
+    ReactContext context;
+    if (surfaceId > 0) {
+      SurfaceMountingManager surfaceMountingManager =
+          mMountingManager.getSurfaceManagerEnforced(surfaceId, "measure");
+      if (surfaceMountingManager.isStopped()) {
+        return 0;
+      }
+      context = surfaceMountingManager.getContext();
+    } else {
+      context = mReactApplicationContext;
+    }
+
+    // TODO: replace ReadableNativeMap -> ReadableMapBuffer
+    return mMountingManager.measureTextMapBuffer(
+        context,
+        componentName,
+        attributedString,
+        paragraphAttributes,
+        getYogaSize(minWidth, maxWidth),
+        getYogaMeasureMode(minWidth, maxWidth),
+        getYogaSize(minHeight, maxHeight),
+        getYogaMeasureMode(minHeight, maxHeight),
+        attachmentsPositions);
+  }
+
   /**
-   * @param surfaceID {@link int} surface ID
+   * @param surfaceId {@link int} surface ID
    * @param defaultTextInputPadding {@link float[]} output parameter will contain the default theme
    *     padding used by RN Android TextInput.
    * @return if theme data is available in the output parameters.
    */
-  @DoNotStrip
-  public boolean getThemeData(int surfaceID, float[] defaultTextInputPadding) {
-    ThemedReactContext themedReactContext = mReactContextForRootTag.get(surfaceID);
-    if (themedReactContext == null) {
-      // TODO T68526882: Review if this should cause a crash instead.
-      ReactSoftException.logSoftException(
-          TAG,
-          new ReactNoCrashSoftException(
-              "Unable to find ThemedReactContext associated to surfaceID: " + surfaceID));
-      return false;
-    }
+  public boolean getThemeData(int surfaceId, float[] defaultTextInputPadding) {
+    SurfaceMountingManager surfaceMountingManager =
+        mMountingManager.getSurfaceManagerEnforced(surfaceId, "getThemeData");
+    ThemedReactContext themedReactContext = surfaceMountingManager.getContext();
     float[] defaultTextInputPaddingForTheme =
         UIManagerHelper.getDefaultTextInputPadding(themedReactContext);
     defaultTextInputPadding[0] = defaultTextInputPaddingForTheme[PADDING_START_INDEX];
@@ -563,6 +567,14 @@ public boolean getThemeData(int surfaceID, float[] defaultTextInputPadding) {
     return true;
   }
 
+  public void addUIManagerEventListener(UIManagerListener listener) {
+    mListeners.add(listener);
+  }
+
+  public void removeUIManagerEventListener(UIManagerListener listener) {
+    mListeners.remove(listener);
+  }
+
   @Override
   @UiThread
   @ThreadConfined(UI)
@@ -572,11 +584,11 @@ public void synchronouslyUpdateViewOnUIThread(
 
     int commitNumber = mCurrentSynchronousCommitNumber++;
 
-    // We are on the UI thread so this would otherwise be safe to call, *BUT* we don't know
-    // where we are on the callstack. Why isn't this safe, and why do we have additional safeguards
-    // here?
+    // We are on the UI thread so it would otherwise be safe to call `tryDispatchMountItems` here to
+    // flush previously-queued mountitems, *BUT* we don't know where we are on the callstack.
+    // Why isn't it safe, and why do we have additional safeguards here?
     //
-    // A tangible example where this will cause a crash:
+    // A tangible example where it would cause a crash, and did in the past:
     // 1. There are queued "delete" mutations
     // 2. We're called by this stack trace:
     //    FabricUIManager.synchronouslyUpdateViewOnUIThread(FabricUIManager.java:574)
@@ -593,32 +605,34 @@ public void synchronouslyUpdateViewOnUIThread(
     //    android.widget.ScrollView.overScrollBy(ScrollView.java:2040)
     //    android.widget.ScrollView.computeScroll(ScrollView.java:1481)
     //    android.view.View.updateDisplayListIfDirty(View.java:20466)
-    if (!ReactFeatureFlags.enableDrawMutationFix) {
-      tryDispatchMountItems();
-    }
+    // 3. A view is deleted while its parent is being drawn, causing a crash.
 
     MountItem synchronousMountItem =
         new MountItem() {
           @Override
           public void execute(@NonNull MountingManager mountingManager) {
             try {
-              updatePropsMountItem(reactTag, props).execute(mountingManager);
+              mountingManager.updateProps(reactTag, props);
             } catch (Exception ex) {
-              // TODO T42943890: Fix animations in Fabric and remove this try/catch
-              ReactSoftException.logSoftException(
-                  TAG,
-                  new ReactNoCrashSoftException(
-                      "Caught exception in synchronouslyUpdateViewOnUIThread", ex));
+              // TODO T42943890: Fix animations in Fabric and remove this try/catch?
+              // There might always be race conditions between surface teardown and
+              // animations/other operations, so it may not be feasible to remove this.
+              // Practically 100% of reported errors from this point are because the
+              // surface has stopped by this point, but the MountItem was queued before
+              // the surface was stopped. It's likely not feasible to prevent all such races.
             }
           }
+
+          @Override
+          public int getSurfaceId() {
+            return View.NO_ID;
+          }
         };
 
     // If the reactTag exists, we assume that it might at the end of the next
     // batch of MountItems. Otherwise, we try to execute immediately.
     if (!mMountingManager.getViewExists(reactTag)) {
-      synchronized (mMountItemsLock) {
-        mMountItems.add(synchronousMountItem);
-      }
+      mMountItemDispatcher.addMountItem(synchronousMountItem);
       return;
     }
 
@@ -639,20 +653,42 @@ public void execute(@NonNull MountingManager mountingManager) {
         ReactMarkerConstants.FABRIC_UPDATE_UI_MAIN_THREAD_END, null, commitNumber);
   }
 
-  public void addUIManagerEventListener(UIManagerListener listener) {
-    mListeners.add(listener);
+  @SuppressWarnings("unused")
+  @AnyThread
+  @ThreadConfined(ANY)
+  private void preallocateView(
+      int rootTag,
+      int reactTag,
+      final String componentName,
+      @Nullable ReadableMap props,
+      @Nullable Object stateWrapper,
+      @Nullable Object eventEmitterWrapper,
+      boolean isLayoutable) {
+
+    mMountItemDispatcher.addPreAllocateMountItem(
+        new PreAllocateViewMountItem(
+            rootTag,
+            reactTag,
+            getFabricComponentName(componentName),
+            props,
+            (StateWrapper) stateWrapper,
+            (EventEmitterWrapper) eventEmitterWrapper,
+            isLayoutable));
   }
 
-  public void removeUIManagerEventListener(UIManagerListener listener) {
-    mListeners.remove(listener);
+  @SuppressWarnings("unused")
+  @AnyThread
+  @ThreadConfined(ANY)
+  private MountItem createIntBufferBatchMountItem(
+      int rootTag, int[] intBuffer, Object[] objBuffer, int commitNumber) {
+    return new IntBufferBatchMountItem(rootTag, intBuffer, objBuffer, commitNumber);
   }
 
   /**
    * This method enqueues UI operations directly to the UI thread. This might change in the future
-   * to enforce execution order using {@link ReactChoreographer#CallbackType}. This method should
+   * to enforce execution order using {@link ReactChoreographer.CallbackType}. This method should
    * only be called as the result of a new tree being committed.
    */
-  @DoNotStrip
   @SuppressWarnings("unused")
   @AnyThread
   @ThreadConfined(ANY)
@@ -669,12 +705,9 @@ private void scheduleMountItem(
     // When Binding.cpp calls scheduleMountItems during a commit phase, it always calls with
     // a BatchMountItem. No other sites call into this with a BatchMountItem, and Binding.cpp only
     // calls scheduleMountItems with a BatchMountItem.
-    boolean isClassicBatchMountItem = mountItem instanceof BatchMountItem;
-    boolean isIntBufferMountItem = mountItem instanceof IntBufferBatchMountItem;
-    boolean isBatchMountItem = isClassicBatchMountItem || isIntBufferMountItem;
+    boolean isBatchMountItem = mountItem instanceof IntBufferBatchMountItem;
     boolean shouldSchedule =
-        (isClassicBatchMountItem && ((BatchMountItem) mountItem).shouldSchedule())
-            || (isIntBufferMountItem && ((IntBufferBatchMountItem) mountItem).shouldSchedule())
+        (isBatchMountItem && ((IntBufferBatchMountItem) mountItem).shouldSchedule())
             || (!isBatchMountItem && mountItem != null);
 
     // In case of sync rendering, this could be called on the UI thread. Otherwise,
@@ -691,13 +724,11 @@ private void scheduleMountItem(
       mDispatchViewUpdatesTime = SystemClock.uptimeMillis();
     }
 
-    if (shouldSchedule && mountItem != null) {
-      synchronized (mMountItemsLock) {
-        mMountItems.add(mountItem);
-      }
+    if (shouldSchedule) {
+      mMountItemDispatcher.addMountItem(mountItem);
       if (UiThreadUtil.isOnUiThread()) {
         // We only read these flags on the UI thread.
-        tryDispatchMountItems();
+        mMountItemDispatcher.tryDispatchMountItems();
       }
     }
 
@@ -727,306 +758,6 @@ private void scheduleMountItem(
     }
   }
 
-  @UiThread
-  @ThreadConfined(UI)
-  private void tryDispatchMountItems() {
-    // If we're already dispatching, don't reenter.
-    // Reentrance can potentially happen a lot on Android in Fabric because
-    // `updateState` from the
-    // mounting layer causes mount items to be dispatched synchronously. We want to 1) make sure
-    // we don't reenter in those cases, but 2) still execute those queued instructions
-    // synchronously.
-    // This is a pretty blunt tool, but we might not have better options since we really don't want
-    // to execute anything out-of-order.
-    if (mInDispatch) {
-      return;
-    }
-
-    final boolean didDispatchItems;
-    try {
-      didDispatchItems = dispatchMountItems();
-    } catch (Throwable e) {
-      mReDispatchCounter = 0;
-      mLastExecutedMountItemSurfaceId = -1;
-      throw e;
-    } finally {
-      // Clean up after running dispatchMountItems - even if an exception was thrown
-      mInDispatch = false;
-    }
-
-    for (UIManagerListener listener : mListeners) {
-      listener.didDispatchMountItems(this);
-    }
-
-    // Decide if we want to try reentering
-    if (mReDispatchCounter < 10 && didDispatchItems) {
-      // Executing twice in a row is normal. Only log after that point.
-      if (mReDispatchCounter > 2) {
-        ReactSoftException.logSoftException(
-            TAG,
-            new ReactNoCrashSoftException(
-                "Re-dispatched "
-                    + mReDispatchCounter
-                    + " times. This indicates setState (?) is likely being called too many times during mounting."));
-      }
-
-      mReDispatchCounter++;
-      tryDispatchMountItems();
-    }
-    mReDispatchCounter = 0;
-    mLastExecutedMountItemSurfaceId = -1;
-  }
-
-  @UiThread
-  @ThreadConfined(UI)
-  private List<DispatchCommandMountItem> getAndResetViewCommandMountItems() {
-    synchronized (mViewCommandMountItemsLock) {
-      List<DispatchCommandMountItem> result = mViewCommandMountItems;
-      if (result.isEmpty()) {
-        return null;
-      }
-      mViewCommandMountItems = new ArrayList<>();
-      return result;
-    }
-  }
-
-  @UiThread
-  @ThreadConfined(UI)
-  private List<MountItem> getAndResetMountItems() {
-    synchronized (mMountItemsLock) {
-      List<MountItem> result = mMountItems;
-      if (result.isEmpty()) {
-        return null;
-      }
-      mMountItems = new ArrayList<>();
-      return result;
-    }
-  }
-
-  private ArrayDeque<PreAllocateViewMountItem> getAndResetPreMountItems() {
-    synchronized (mPreMountItemsLock) {
-      ArrayDeque<PreAllocateViewMountItem> result = mPreMountItems;
-      if (result.isEmpty()) {
-        return null;
-      }
-      mPreMountItems = new ArrayDeque<>(PRE_MOUNT_ITEMS_INITIAL_SIZE_ARRAY);
-      return result;
-    }
-  }
-
-  /**
-   * Check if a surfaceId is active and ready for MountItems to be executed against it. It is safe
-   * and cheap to call this repeatedly because we expect many operations to be batched with the same
-   * surfaceId in a row and we memoize the parameters and results.
-   *
-   * @param surfaceId
-   * @param context
-   * @return
-   */
-  @UiThread
-  @ThreadConfined(UI)
-  private boolean surfaceActiveForExecution(int surfaceId, String context) {
-    if (mLastExecutedMountItemSurfaceId != surfaceId) {
-      mLastExecutedMountItemSurfaceId = surfaceId;
-      mLastExecutedMountItemSurfaceIdActive = mReactContextForRootTag.get(surfaceId) != null;
-
-      // If there are many MountItems with the same SurfaceId, we only
-      // log a warning for the first one that is skipped.
-      if (!mLastExecutedMountItemSurfaceIdActive) {
-        ReactSoftException.logSoftException(
-            TAG,
-            new ReactNoCrashSoftException(
-                "dispatchMountItems: skipping "
-                    + context
-                    + ", because surface not available: "
-                    + surfaceId));
-      }
-    }
-
-    return mLastExecutedMountItemSurfaceIdActive;
-  }
-
-  private static void printMountItem(MountItem mountItem, String prefix) {
-    // If a MountItem description is split across multiple lines, it's because it's a
-    // compound MountItem. Log each line separately.
-    String[] mountItemLines = mountItem.toString().split("\n");
-    for (String m : mountItemLines) {
-      FLog.e(TAG, prefix + ": " + m);
-    }
-  }
-
-  @UiThread
-  @ThreadConfined(UI)
-  /** Nothing should call this directly except for `tryDispatchMountItems`. */
-  private boolean dispatchMountItems() {
-    if (mReDispatchCounter == 0) {
-      mBatchedExecutionTime = 0;
-    }
-
-    mRunStartTime = SystemClock.uptimeMillis();
-
-    List<DispatchCommandMountItem> viewCommandMountItemsToDispatch =
-        getAndResetViewCommandMountItems();
-    List<MountItem> mountItemsToDispatch = getAndResetMountItems();
-
-    if (mountItemsToDispatch == null && viewCommandMountItemsToDispatch == null) {
-      return false;
-    }
-
-    // As an optimization, execute all ViewCommands first
-    // This should be:
-    // 1) Performant: ViewCommands are often a replacement for SetNativeProps, which we've always
-    // wanted to be as "synchronous" as possible.
-    // 2) Safer: ViewCommands are inherently disconnected from the tree commit/diff/mount process.
-    // JS imperatively queues these commands.
-    //    If JS has queued a command, it's reasonable to assume that the more time passes, the more
-    // likely it is that the view disappears.
-    //    Thus, by executing ViewCommands early, we should actually avoid a category of
-    // errors/glitches.
-    if (viewCommandMountItemsToDispatch != null) {
-      Systrace.beginSection(
-          Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-          "FabricUIManager::mountViews viewCommandMountItems to execute: "
-              + viewCommandMountItemsToDispatch.size());
-      for (DispatchCommandMountItem command : viewCommandMountItemsToDispatch) {
-        if (ENABLE_FABRIC_LOGS) {
-          printMountItem(command, "dispatchMountItems: Executing viewCommandMountItem");
-        }
-        try {
-          command.execute(mMountingManager);
-        } catch (RetryableMountingLayerException e) {
-          // If the exception is marked as Retryable, we retry the viewcommand exactly once, after
-          // the current batch of mount items has finished executing.
-          if (command.getRetries() == 0) {
-            command.incrementRetries();
-            dispatchCommandMountItem(command);
-          } else {
-            // It's very common for commands to be executed on views that no longer exist - for
-            // example, a blur event on TextInput being fired because of a navigation event away
-            // from the current screen. If the exception is marked as Retryable, we log a soft
-            // exception but never crash in debug.
-            // It's not clear that logging this is even useful, because these events are very
-            // common, mundane, and there's not much we can do about them currently.
-            ReactSoftException.logSoftException(
-                TAG,
-                new ReactNoCrashSoftException(
-                    "Caught exception executing ViewCommand: " + command.toString(), e));
-          }
-        } catch (Throwable e) {
-          // Non-Retryable exceptions are logged as soft exceptions in prod, but crash in Debug.
-          ReactSoftException.logSoftException(
-              TAG,
-              new RuntimeException(
-                  "Caught exception executing ViewCommand: " + command.toString(), e));
-        }
-      }
-
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-
-    // If there are MountItems to dispatch, we make sure all the "pre mount items" are executed
-    // first
-    ArrayDeque<PreAllocateViewMountItem> mPreMountItemsToDispatch = getAndResetPreMountItems();
-
-    if (mPreMountItemsToDispatch != null) {
-      Systrace.beginSection(
-          Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-          "FabricUIManager::mountViews preMountItems to execute: "
-              + mPreMountItemsToDispatch.size());
-
-      while (!mPreMountItemsToDispatch.isEmpty()) {
-        PreAllocateViewMountItem mountItem = mPreMountItemsToDispatch.pollFirst();
-        if (surfaceActiveForExecution(
-            mountItem.getRootTag(), "dispatchMountItems PreAllocateViewMountItem")) {
-          mountItem.execute(mMountingManager);
-        }
-      }
-
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-
-    if (mountItemsToDispatch != null) {
-      Systrace.beginSection(
-          Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-          "FabricUIManager::mountViews mountItems to execute: " + mountItemsToDispatch.size());
-
-      long batchedExecutionStartTime = SystemClock.uptimeMillis();
-
-      for (MountItem mountItem : mountItemsToDispatch) {
-        if (ENABLE_FABRIC_LOGS) {
-          printMountItem(mountItem, "dispatchMountItems: Executing mountItem");
-        }
-
-        try {
-          // Make sure surface associated with this MountItem has been started, and not stopped.
-          // TODO T68118357: clean up this logic and simplify this method overall
-          if (mountItem instanceof BatchMountItem) {
-            BatchMountItem batchMountItem = (BatchMountItem) mountItem;
-            if (!surfaceActiveForExecution(
-                batchMountItem.getRootTag(), "dispatchMountItems BatchMountItem")) {
-              continue;
-            }
-          }
-
-          mountItem.execute(mMountingManager);
-        } catch (Throwable e) {
-          // If there's an exception, we want to log diagnostics in prod and rethrow.
-          FLog.e(TAG, "dispatchMountItems: caught exception, displaying all MountItems", e);
-          for (MountItem m : mountItemsToDispatch) {
-            printMountItem(m, "dispatchMountItems: mountItem");
-          }
-
-          if (ReactIgnorableMountingException.isIgnorable(e)) {
-            ReactSoftException.logSoftException(TAG, e);
-          } else {
-            throw e;
-          }
-        }
-      }
-      mBatchedExecutionTime += SystemClock.uptimeMillis() - batchedExecutionStartTime;
-    }
-    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-
-    return true;
-  }
-
-  @UiThread
-  @ThreadConfined(UI)
-  private void dispatchPreMountItems(long frameTimeNanos) {
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricUIManager::premountViews");
-
-    // dispatchPreMountItems cannot be reentrant, but we want to prevent dispatchMountItems from
-    // reentering during dispatchPreMountItems
-    mInDispatch = true;
-
-    try {
-      while (true) {
-        long timeLeftInFrame = FRAME_TIME_MS - ((System.nanoTime() - frameTimeNanos) / 1000000);
-        if (timeLeftInFrame < MAX_TIME_IN_FRAME_FOR_NON_BATCHED_OPERATIONS_MS) {
-          break;
-        }
-
-        PreAllocateViewMountItem preMountItemToDispatch;
-        synchronized (mPreMountItemsLock) {
-          if (mPreMountItems.isEmpty()) {
-            break;
-          }
-          preMountItemToDispatch = mPreMountItems.pollFirst();
-        }
-
-        if (surfaceActiveForExecution(
-            preMountItemToDispatch.getRootTag(), "dispatchPreMountItems")) {
-          preMountItemToDispatch.execute(mMountingManager);
-        }
-      }
-    } finally {
-      mInDispatch = false;
-      mLastExecutedMountItemSurfaceId = -1;
-    }
-
-    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-  }
-
   public void setBinding(Binding binding) {
     mBinding = binding;
   }
@@ -1038,17 +769,28 @@ public void setBinding(Binding binding) {
   @UiThread
   @ThreadConfined(UI)
   public void updateRootLayoutSpecs(
-      final int rootTag,
+      final int surfaceId,
       final int widthMeasureSpec,
       final int heightMeasureSpec,
       final int offsetX,
       final int offsetY) {
 
     if (ENABLE_FABRIC_LOGS) {
-      FLog.d(TAG, "Updating Root Layout Specs");
+      FLog.d(TAG, "Updating Root Layout Specs for [%d]", surfaceId);
+    }
+
+    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+
+    // TODO T83615646: make this a hard-crash in the future.
+    if (surfaceMountingManager == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalViewOperationException(
+              "Cannot updateRootLayoutSpecs on surfaceId that does not exist: " + surfaceId));
+      return;
     }
 
-    ThemedReactContext reactContext = mReactContextForRootTag.get(rootTag);
+    ThemedReactContext reactContext = surfaceMountingManager.getContext();
     boolean isRTL = false;
     boolean doLeftAndRightSwapInRTL = false;
     if (reactContext != null) {
@@ -1057,7 +799,7 @@ public void updateRootLayoutSpecs(
     }
 
     mBinding.setConstraints(
-        rootTag,
+        surfaceId,
         getMinSize(widthMeasureSpec),
         getMaxSize(widthMeasureSpec),
         getMinSize(heightMeasureSpec),
@@ -1068,16 +810,68 @@ public void updateRootLayoutSpecs(
         doLeftAndRightSwapInRTL);
   }
 
+  @Override
+  public View resolveView(int reactTag) {
+    UiThreadUtil.assertOnUiThread();
+
+    SurfaceMountingManager surfaceManager = mMountingManager.getSurfaceManagerForView(reactTag);
+    return surfaceManager == null ? null : surfaceManager.getView(reactTag);
+  }
+
   @Override
   public void receiveEvent(int reactTag, String eventName, @Nullable WritableMap params) {
-    EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(reactTag);
+    receiveEvent(View.NO_ID, reactTag, eventName, params);
+  }
+
+  @Override
+  public void receiveEvent(
+      int surfaceId, int reactTag, String eventName, @Nullable WritableMap params) {
+    receiveEvent(surfaceId, reactTag, eventName, false, 0, params);
+  }
+
+  /**
+   * receiveEvent API that emits an event to C++. If `canCoalesceEvent` is true, that signals that
+   * C++ may coalesce the event optionally. Otherwise, coalescing can happen in Java before
+   * emitting.
+   *
+   * <p>`customCoalesceKey` is currently unused.
+   *
+   * @param surfaceId
+   * @param reactTag
+   * @param eventName
+   * @param canCoalesceEvent
+   * @param customCoalesceKey
+   * @param params
+   */
+  public void receiveEvent(
+      int surfaceId,
+      int reactTag,
+      String eventName,
+      boolean canCoalesceEvent,
+      int customCoalesceKey,
+      @Nullable WritableMap params) {
+    if (ReactBuildConfig.DEBUG && surfaceId == View.NO_ID) {
+      FLog.d(TAG, "Emitted event without surfaceId: [%d] %s", reactTag, eventName);
+    }
+
+    if (mDestroyed) {
+      FLog.e(TAG, "Attempted to receiveEvent after destruction");
+      return;
+    }
+
+    EventEmitterWrapper eventEmitter = mMountingManager.getEventEmitter(surfaceId, reactTag);
+
     if (eventEmitter == null) {
       // This can happen if the view has disappeared from the screen (because of async events)
       FLog.d(TAG, "Unable to invoke event: " + eventName + " for reactTag: " + reactTag);
       return;
     }
 
-    eventEmitter.invoke(eventName, params);
+    if (canCoalesceEvent) {
+      eventEmitter.invokeUnique(eventName, params, customCoalesceKey);
+    } else {
+      eventEmitter.invoke(eventName, params);
+    }
   }
 
   @Override
@@ -1102,38 +896,73 @@ public void onHostPause() {
   @Override
   public void onHostDestroy() {}
 
-  @Deprecated
   @Override
+  @Deprecated
   @AnyThread
   @ThreadConfined(ANY)
   public void dispatchCommand(
       final int reactTag, final int commandId, @Nullable final ReadableArray commandArgs) {
-    dispatchCommandMountItem(new DispatchIntCommandMountItem(reactTag, commandId, commandArgs));
+    throw new UnsupportedOperationException(
+        "dispatchCommand called without surfaceId - Fabric dispatchCommand must be called through Fabric JSI API");
   }
 
   @Override
+  @Deprecated
   @AnyThread
   @ThreadConfined(ANY)
   public void dispatchCommand(
       final int reactTag, final String commandId, @Nullable final ReadableArray commandArgs) {
-    dispatchCommandMountItem(new DispatchStringCommandMountItem(reactTag, commandId, commandArgs));
+    throw new UnsupportedOperationException(
+        "dispatchCommand called without surfaceId - Fabric dispatchCommand must be called through Fabric JSI API");
   }
 
+  @Deprecated
   @AnyThread
   @ThreadConfined(ANY)
-  private void dispatchCommandMountItem(DispatchCommandMountItem command) {
-    synchronized (mViewCommandMountItemsLock) {
-      mViewCommandMountItems.add(command);
-    }
+  public void dispatchCommand(
+      final int surfaceId,
+      final int reactTag,
+      final int commandId,
+      @Nullable final ReadableArray commandArgs) {
+    mMountItemDispatcher.dispatchCommandMountItem(
+        new DispatchIntCommandMountItem(surfaceId, reactTag, commandId, commandArgs));
+  }
+
+  @AnyThread
+  @ThreadConfined(ANY)
+  public void dispatchCommand(
+      final int surfaceId,
+      final int reactTag,
+      final String commandId,
+      @Nullable final ReadableArray commandArgs) {
+    mMountItemDispatcher.dispatchCommandMountItem(
+        new DispatchStringCommandMountItem(surfaceId, reactTag, commandId, commandArgs));
   }
 
   @Override
   @AnyThread
   @ThreadConfined(ANY)
   public void sendAccessibilityEvent(int reactTag, int eventType) {
-    synchronized (mMountItemsLock) {
-      mMountItems.add(new SendAccessibilityEvent(reactTag, eventType));
+    // Can be called from native, not just JS - we need to migrate the native callsites
+    // before removing this entirely.
+    mMountItemDispatcher.addMountItem(new SendAccessibilityEvent(View.NO_ID, reactTag, eventType));
+  }
+
+  @AnyThread
+  @ThreadConfined(ANY)
+  public void sendAccessibilityEventFromJS(int surfaceId, int reactTag, String eventTypeJS) {
+    int eventType;
+    if ("focus".equals(eventTypeJS)) {
+      eventType = AccessibilityEvent.TYPE_VIEW_FOCUSED;
+    } else if ("windowStateChange".equals(eventTypeJS)) {
+      eventType = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
+    } else if ("click".equals(eventTypeJS)) {
+      eventType = AccessibilityEvent.TYPE_VIEW_CLICKED;
+    } else {
+      throw new IllegalArgumentException(
+          "sendAccessibilityEventFromJS: invalid eventType " + eventTypeJS);
     }
+    mMountItemDispatcher.addMountItem(new SendAccessibilityEvent(surfaceId, reactTag, eventType));
   }
 
   /**
@@ -1143,35 +972,50 @@ public void sendAccessibilityEvent(int reactTag, int eventType) {
    * @param initialReactTag React tag of the JS view that initiated the touch operation
    * @param blockNativeResponder If native responder should be blocked or not
    */
-  @DoNotStrip
   public void setJSResponder(
-      final int reactTag, final int initialReactTag, final boolean blockNativeResponder) {
-    synchronized (mMountItemsLock) {
-      mMountItems.add(
-          new MountItem() {
-            @Override
-            public void execute(MountingManager mountingManager) {
-              mountingManager.setJSResponder(reactTag, initialReactTag, blockNativeResponder);
+      final int surfaceId,
+      final int reactTag,
+      final int initialReactTag,
+      final boolean blockNativeResponder) {
+    mMountItemDispatcher.addMountItem(
+        new MountItem() {
+          @Override
+          public void execute(MountingManager mountingManager) {
+            SurfaceMountingManager surfaceMountingManager =
+                mountingManager.getSurfaceManager(surfaceId);
+            if (surfaceMountingManager != null) {
+              surfaceMountingManager.setJSResponder(
+                  reactTag, initialReactTag, blockNativeResponder);
+            } else {
+              FLog.e(
+                  TAG, "setJSResponder skipped, surface no longer available [" + surfaceId + "]");
             }
-          });
-    }
+          }
+
+          @Override
+          public int getSurfaceId() {
+            return surfaceId;
+          }
+        });
   }
 
   /**
-   * Clears the JS Responder specified by {@link #setJSResponder(int, int, boolean)}. After this
-   * method is called, all the touch events are going to be handled by JS.
+   * Clears the JS Responder specified by {@link #setJSResponder}. After this method is called, all
+   * the touch events are going to be handled by JS.
    */
-  @DoNotStrip
   public void clearJSResponder() {
-    synchronized (mMountItemsLock) {
-      mMountItems.add(
-          new MountItem() {
-            @Override
-            public void execute(MountingManager mountingManager) {
-              mountingManager.clearJSResponder();
-            }
-          });
-    }
+    mMountItemDispatcher.addMountItem(
+        new MountItem() {
+          @Override
+          public void execute(MountingManager mountingManager) {
+            mountingManager.clearJSResponder();
+          }
+
+          @Override
+          public int getSurfaceId() {
+            return View.NO_ID;
+          }
+        });
   }
 
   @Override
@@ -1186,21 +1030,19 @@ public String resolveCustomDirectEventName(@Nullable String eventName) {
     if (eventName == null) {
       return null;
     }
-    if (eventName.substring(0, 3).equals("top")) {
+    if (eventName.startsWith("top")) {
       return "on" + eventName.substring(3);
     }
     return eventName;
   }
 
   // Called from Binding.cpp
-  @DoNotStrip
   @AnyThread
   public void onAnimationStarted() {
     mDriveCxxAnimations = true;
   }
 
   // Called from Binding.cpp
-  @DoNotStrip
   @AnyThread
   public void onAllAnimationsComplete() {
     mDriveCxxAnimations = false;
@@ -1212,13 +1054,22 @@ public Map<String, Long> getPerformanceCounters() {
     performanceCounters.put("CommitStartTime", mCommitStartTime);
     performanceCounters.put("LayoutTime", mLayoutTime);
     performanceCounters.put("DispatchViewUpdatesTime", mDispatchViewUpdatesTime);
-    performanceCounters.put("RunStartTime", mRunStartTime);
-    performanceCounters.put("BatchedExecutionTime", mBatchedExecutionTime);
+    performanceCounters.put("RunStartTime", mMountItemDispatcher.getRunStartTime());
+    performanceCounters.put("BatchedExecutionTime", mMountItemDispatcher.getBatchedExecutionTime());
     performanceCounters.put("FinishFabricTransactionTime", mFinishTransactionTime);
     performanceCounters.put("FinishFabricTransactionCPPTime", mFinishTransactionCPPTime);
     return performanceCounters;
   }
 
+  private class MountItemDispatchListener implements MountItemDispatcher.ItemDispatchListener {
+    @Override
+    public void didDispatchMountItems() {
+      for (UIManagerListener listener : mListeners) {
+        listener.didDispatchMountItems(FabricUIManager.this);
+      }
+    }
+  }
+
   private class DispatchUIFrameCallback extends GuardedFrameCallback {
 
     private volatile boolean mIsMountingEnabled = true;
@@ -1250,9 +1101,8 @@ public void doFrameGuarded(long frameTimeNanos) {
       }
 
       try {
-        dispatchPreMountItems(frameTimeNanos);
-
-        tryDispatchMountItems();
+        mMountItemDispatcher.dispatchPreMountItems(frameTimeNanos);
+        mMountItemDispatcher.tryDispatchMountItems();
       } catch (Exception ex) {
         FLog.e(TAG, "Exception thrown when executing UIFrameGuarded", ex);
         stop();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java
index 6a461623e99aca..821dff8a5fdfb1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java
@@ -8,14 +8,15 @@
 package com.facebook.react.fabric;
 
 import android.annotation.SuppressLint;
-import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.ReadableNativeMap;
-import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.uimanager.StateWrapper;
 
 /**
@@ -28,10 +29,10 @@ public class StateWrapperImpl implements StateWrapper {
     FabricSoLoader.staticInit();
   }
 
-  @DoNotStrip private final HybridData mHybridData;
+  private static final String TAG = "StateWrapperImpl";
 
-  private Runnable mFailureCallback = null;
-  private int mUpdateStateId = 0;
+  @DoNotStrip private final HybridData mHybridData;
+  private volatile boolean mDestroyed = false;
 
   private static native HybridData initHybrid();
 
@@ -39,34 +40,46 @@ private StateWrapperImpl() {
     mHybridData = initHybrid();
   }
 
-  @Override
-  public native ReadableNativeMap getState();
+  private native ReadableNativeMap getStateDataImpl();
 
-  public native void updateStateImpl(@NonNull NativeMap map);
+  private native ReadableMapBuffer getStateMapBufferDataImpl();
 
-  public native void updateStateWithFailureCallbackImpl(
-      @NonNull NativeMap map, Object self, int updateStateId);
+  @Override
+  @Nullable
+  public ReadableMapBuffer getStatDataMapBuffer() {
+    if (mDestroyed) {
+      FLog.e(TAG, "Race between StateWrapperImpl destruction and getState");
+      return null;
+    }
+    return getStateMapBufferDataImpl();
+  }
 
   @Override
-  public void updateState(@NonNull WritableMap map, Runnable failureCallback) {
-    mUpdateStateId++;
-    mFailureCallback = failureCallback;
-    updateStateWithFailureCallbackImpl((NativeMap) map, this, mUpdateStateId);
+  @Nullable
+  public ReadableNativeMap getStateData() {
+    if (mDestroyed) {
+      FLog.e(TAG, "Race between StateWrapperImpl destruction and getState");
+      return null;
+    }
+    return getStateDataImpl();
   }
 
-  @DoNotStrip
-  @AnyThread
-  public void updateStateFailed(int callbackRefId) {
-    // If the callback ref ID doesn't match the ID of the most-recent updateState call,
-    // then it's an outdated failure callback and we ignore it.
-    if (callbackRefId != mUpdateStateId) {
+  public native void updateStateImpl(@NonNull NativeMap map);
+
+  @Override
+  public void updateState(@NonNull WritableMap map) {
+    if (mDestroyed) {
+      FLog.e(TAG, "Race between StateWrapperImpl destruction and updateState");
       return;
     }
+    updateStateImpl((NativeMap) map);
+  }
 
-    final Runnable failureCallback = mFailureCallback;
-    mFailureCallback = null;
-    if (failureCallback != null) {
-      UiThreadUtil.runOnUiThread(failureCallback);
+  @Override
+  public void destroyState() {
+    if (!mDestroyed) {
+      mDestroyed = true;
+      mHybridData.resetNative();
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.java
new file mode 100644
index 00000000000000..8a2a482c379afd
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandler.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.fabric;
+
+import com.facebook.react.bridge.NativeMap;
+import javax.annotation.concurrent.ThreadSafe;
+
+/** Represents a Java variant of the surface, its status and inner data required to display it. */
+@ThreadSafe
+public interface SurfaceHandler {
+
+  /** Starts the surface if the surface is not running */
+  void start();
+
+  /** Stops the surface if it is currently running */
+  void stop();
+
+  void setProps(NativeMap props);
+
+  /**
+   * Provides current surface id. Id should be updated after each call to {@link
+   * SurfaceHandler#stop}
+   */
+  int getSurfaceId();
+
+  /**
+   * Updates current surface id. Id should be updated after each call to {@link SurfaceHandler#stop}
+   */
+  void setSurfaceId(int surfaceId);
+
+  boolean isRunning();
+
+  String getModuleName();
+
+  void setLayoutConstraints(
+      int widthMeasureSpec,
+      int heightMeasureSpec,
+      int offsetX,
+      int offsetY,
+      boolean doLeftAndRightSwapInRTL,
+      boolean isRTL,
+      float pixelDensity);
+
+  void setMountable(boolean mountable);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java
new file mode 100644
index 00000000000000..2683c5746db3b0
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.fabric;
+
+import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMaxSize;
+import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMinSize;
+
+import androidx.annotation.IntDef;
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.NativeMap;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public class SurfaceHandlerBinding implements SurfaceHandler {
+  static {
+    FabricSoLoader.staticInit();
+  }
+
+  private static final int NO_SURFACE_ID = 0;
+
+  /* Keep in sync with SurfaceHandler.cpp */
+  public static final int DISPLAY_MODE_VISIBLE = 0;
+  public static final int DISPLAY_MODE_SUSPENDED = 1;
+  public static final int DISPLAY_MODE_HIDDEN = 2;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({DISPLAY_MODE_VISIBLE, DISPLAY_MODE_SUSPENDED, DISPLAY_MODE_HIDDEN})
+  public @interface DisplayModeTypeDef {}
+
+  @DoNotStrip private final HybridData mHybridData;
+
+  private static native HybridData initHybrid(int surfaceId, String moduleName);
+
+  public SurfaceHandlerBinding(String moduleName) {
+    mHybridData = initHybrid(NO_SURFACE_ID, moduleName);
+  }
+
+  @Override
+  public int getSurfaceId() {
+    return getSurfaceIdNative();
+  }
+
+  private native int getSurfaceIdNative();
+
+  @Override
+  public void setSurfaceId(int surfaceId) {
+    setSurfaceIdNative(surfaceId);
+  }
+
+  private native void setSurfaceIdNative(int surfaceId);
+
+  @Override
+  public String getModuleName() {
+    return getModuleNameNative();
+  }
+
+  private native String getModuleNameNative();
+
+  @Override
+  public void start() {
+    startNative();
+  }
+
+  private native void startNative();
+
+  @Override
+  public void stop() {
+    stopNative();
+  }
+
+  private native void stopNative();
+
+  @Override
+  public boolean isRunning() {
+    return isRunningNative();
+  }
+
+  private native boolean isRunningNative();
+
+  @Override
+  public void setLayoutConstraints(
+      int widthMeasureSpec,
+      int heightMeasureSpec,
+      int offsetX,
+      int offsetY,
+      boolean doLeftAndRightSwapInRTL,
+      boolean isRTL,
+      float pixelDensity) {
+    setLayoutConstraintsNative(
+        getMinSize(widthMeasureSpec) / pixelDensity,
+        getMaxSize(widthMeasureSpec) / pixelDensity,
+        getMinSize(heightMeasureSpec) / pixelDensity,
+        getMaxSize(heightMeasureSpec) / pixelDensity,
+        offsetX / pixelDensity,
+        offsetY / pixelDensity,
+        doLeftAndRightSwapInRTL,
+        isRTL,
+        pixelDensity);
+  }
+
+  private native void setLayoutConstraintsNative(
+      float minWidth,
+      float maxWidth,
+      float minHeight,
+      float maxHeight,
+      float offsetX,
+      float offsetY,
+      boolean doLeftAndRightSwapInRTL,
+      boolean isRTL,
+      float pixelDensity);
+
+  @Override
+  public void setProps(NativeMap props) {
+    setPropsNative(props);
+  }
+
+  private native void setPropsNative(NativeMap props);
+
+  @Override
+  public void setMountable(boolean mountable) {
+    setDisplayModeNative(mountable ? DISPLAY_MODE_VISIBLE : DISPLAY_MODE_SUSPENDED);
+  }
+
+  private native void setDisplayModeNative(@DisplayModeTypeDef int mode);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java
index a1cd86518c40e0..e1652a4f2bdd45 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java
@@ -38,14 +38,49 @@ private EventEmitterWrapper() {
 
   private native void invokeEvent(@NonNull String eventName, @NonNull NativeMap params);
 
+  private native void invokeUniqueEvent(
+      @NonNull String eventName, @NonNull NativeMap params, int customCoalesceKey);
+
   /**
    * Invokes the execution of the C++ EventEmitter.
    *
    * @param eventName {@link String} name of the event to execute.
    * @param params {@link WritableMap} payload of the event
    */
-  public void invoke(@NonNull String eventName, @Nullable WritableMap params) {
+  public synchronized void invoke(@NonNull String eventName, @Nullable WritableMap params) {
+    if (!isValid()) {
+      return;
+    }
     NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params;
     invokeEvent(eventName, payload);
   }
+
+  /**
+   * Invokes the execution of the C++ EventEmitter. C++ will coalesce events sent to the same
+   * target.
+   *
+   * @param eventName {@link String} name of the event to execute.
+   * @param params {@link WritableMap} payload of the event
+   */
+  public synchronized void invokeUnique(
+      @NonNull String eventName, @Nullable WritableMap params, int customCoalesceKey) {
+    if (!isValid()) {
+      return;
+    }
+    NativeMap payload = params == null ? new WritableNativeMap() : (NativeMap) params;
+    invokeUniqueEvent(eventName, payload, customCoalesceKey);
+  }
+
+  public synchronized void destroy() {
+    if (mHybridData != null) {
+      mHybridData.resetNative();
+    }
+  }
+
+  private boolean isValid() {
+    if (mHybridData != null) {
+      return mHybridData.isValid();
+    }
+    return false;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java
index 6b9578b442c1d3..82d209ab494f40 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java
@@ -9,6 +9,7 @@
 
 import static com.facebook.react.uimanager.events.TouchesHelper.CHANGED_TOUCHES_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_KEY;
+import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_SURFACE_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TOP_TOUCH_CANCEL_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TOP_TOUCH_END_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TOUCHES_KEY;
@@ -23,12 +24,12 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.facebook.react.uimanager.events.RCTModernEventEmitter;
 import com.facebook.systrace.Systrace;
 import java.util.HashSet;
 import java.util.Set;
 
-public class FabricEventEmitter implements RCTEventEmitter {
+public class FabricEventEmitter implements RCTModernEventEmitter {
 
   private static final String TAG = "FabricEventEmitter";
 
@@ -40,10 +41,28 @@ public FabricEventEmitter(@NonNull FabricUIManager uiManager) {
 
   @Override
   public void receiveEvent(int reactTag, @NonNull String eventName, @Nullable WritableMap params) {
+    receiveEvent(-1, reactTag, eventName, params);
+  }
+
+  @Override
+  public void receiveEvent(
+      int surfaceId, int reactTag, String eventName, @Nullable WritableMap params) {
+    receiveEvent(surfaceId, reactTag, eventName, false, 0, params);
+  }
+
+  @Override
+  public void receiveEvent(
+      int surfaceId,
+      int reactTag,
+      String eventName,
+      boolean canCoalesceEvent,
+      int customCoalesceKey,
+      @Nullable WritableMap params) {
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
         "FabricEventEmitter.receiveEvent('" + eventName + "')");
-    mUIManager.receiveEvent(reactTag, eventName, params);
+    mUIManager.receiveEvent(
+        surfaceId, reactTag, eventName, canCoalesceEvent, customCoalesceKey, params);
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
   }
 
@@ -70,14 +89,15 @@ public void receiveTouches(
       touch.putArray(TOUCHES_KEY, copyWritableArray(touches));
       WritableMap nativeEvent = touch;
       int rootNodeID = 0;
-      int target = nativeEvent.getInt(TARGET_KEY);
-      if (target < 1) {
+      int targetSurfaceId = nativeEvent.getInt(TARGET_SURFACE_KEY);
+      int targetReactTag = nativeEvent.getInt(TARGET_KEY);
+      if (targetReactTag < 1) {
         FLog.e(TAG, "A view is reporting that a touch occurred on tag zero.");
       } else {
-        rootNodeID = target;
+        rootNodeID = targetReactTag;
       }
 
-      receiveEvent(rootNodeID, eventTopLevelType, touch);
+      receiveEvent(targetSurfaceId, rootNodeID, eventTopLevelType, false, 0, touch);
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
index 593a8cf30815b3..2ad53b97cc2cee 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
@@ -11,7 +11,7 @@ LOCAL_MODULE := fabricjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libreactconfig libreact_render_components_slider libreact_render_components_progressbar libreact_render_components_switch libreact_render_components_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core libreact_render_mapbuffer react_render_componentregistry libreact_render_components_view libreact_render_components_unimplementedview libreact_render_components_root libreact_render_components_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_viewmanagers react_render_components_text libreact_render_components_image react_render_components_textinput react_render_components_picker
+LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
 
 LOCAL_STATIC_LIBRARIES :=
 
@@ -22,7 +22,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -34,6 +34,7 @@ $(call import-module,yogajni)
 $(call import-module,glog)
 
 $(call import-module,react/utils)
+$(call import-module,react/debug)
 $(call import-module,react/config)
 $(call import-module,react/renderer/animations)
 $(call import-module,react/renderer/attributedstring)
@@ -42,7 +43,6 @@ $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/components/image)
 $(call import-module,react/renderer/components/modal)
 $(call import-module,react/renderer/components/root)
-$(call import-module,react/renderer/components/picker)
 $(call import-module,react/renderer/components/progressbar)
 $(call import-module,react/renderer/components/scrollview)
 $(call import-module,react/renderer/components/slider)
@@ -60,5 +60,4 @@ $(call import-module,react/renderer/scheduler)
 $(call import-module,react/renderer/templateprocessor)
 $(call import-module,react/renderer/textlayoutmanager)
 $(call import-module,react/renderer/uimanager)
-
-# $(call import-module,react/fabric/viewmanagers/jni)
+$(call import-module,react/renderer/telemetry)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
index 0d6dd21aaaaef3..a534958295f9aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
@@ -12,14 +12,14 @@ rn_xplat_cxx_library(
         prefix = "react/fabric",
     ),
     compiler_flags = [
-        "-Wall",
         "-fexceptions",
-        "-std=gnu++1y",
         "-frtti",
+        "-std=c++17",
+        "-Wall",
     ],
     fbandroid_allow_jni_merging = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
@@ -27,7 +27,7 @@ rn_xplat_cxx_library(
     soname = "libfabricjni.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
-        react_native_xplat_target("better:better"),
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/renderer/animations:animations"),
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
@@ -47,7 +47,6 @@ rn_xplat_cxx_library(
         "//xplat/js/react-native-github:generated_components-rncore",
         react_native_xplat_target("react/renderer/components/image:image"),
         react_native_xplat_target("react/renderer/components/modal:modal"),
-        react_native_xplat_target("react/renderer/components/picker:androidpicker"),
         react_native_xplat_target("react/renderer/components/slider:slider"),
         react_native_xplat_target("react/renderer/components/switch:androidswitch"),
         react_native_xplat_target("react/renderer/components/progressbar:androidprogressbar"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
index 62571a1f7018e9..d7fb074d31ccd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
@@ -11,7 +11,9 @@
 #include "ReactNativeConfigHolder.h"
 #include "StateWrapperImpl.h"
 
-#include <better/set.h>
+#include <cfenv>
+#include <cmath>
+
 #include <fbjni/fbjni.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
@@ -43,14 +45,6 @@ struct JMountItem : public JavaClass<JMountItem> {
       "Lcom/facebook/react/fabric/mounting/mountitems/MountItem;";
 };
 
-struct RemoveDeleteMetadata {
-  Tag tag;
-  Tag parentTag;
-  int index;
-  bool shouldRemove;
-  bool shouldDelete;
-};
-
 } // namespace
 
 CppMountItem CppMountItem::CreateMountItem(ShadowView shadowView) {
@@ -103,7 +97,7 @@ static inline int getIntBufferSizeForType(CppMountItem::Type mountItemType) {
   } else if (mountItemType == CppMountItem::Type::UpdatePadding) {
     return 5; // tag, top, left, bottom, right
   } else if (mountItemType == CppMountItem::Type::UpdateLayout) {
-    return 6; // tag, x, y, w, h, layoutDirection
+    return 6; // tag, x, y, w, h, DisplayType
   } else if (mountItemType == CppMountItem::Type::UpdateEventEmitter) {
     return 1; // tag
   } else {
@@ -165,7 +159,8 @@ static inline void computeBufferSizes(
 
     batchMountItemIntsSize += getIntBufferSizeForType(mountItemType);
     if (mountItemType == CppMountItem::Type::Create) {
-      batchMountItemObjectsSize += 3; // component name, props, state
+      batchMountItemObjectsSize +=
+          4; // component name, props, state, event emitter
     }
   }
 
@@ -237,6 +232,33 @@ std::shared_ptr<Scheduler> Binding::getScheduler() {
   return scheduler_;
 }
 
+jni::local_ref<ReadableNativeMap::jhybridobject>
+Binding::getInspectorDataForInstance(
+    jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper) {
+  std::shared_ptr<Scheduler> scheduler = getScheduler();
+  if (!scheduler) {
+    LOG(ERROR) << "Binding::startSurface: scheduler disappeared";
+    return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object());
+  }
+
+  EventEmitterWrapper *cEventEmitter = cthis(eventEmitterWrapper);
+  InspectorData data =
+      scheduler->getInspectorDataForInstance(cEventEmitter->eventEmitter);
+
+  folly::dynamic result = folly::dynamic::object;
+  result["fileName"] = data.fileName;
+  result["lineNumber"] = data.lineNumber;
+  result["columnNumber"] = data.columnNumber;
+  result["selectedIndex"] = data.selectedIndex;
+  result["props"] = data.props;
+  auto hierarchy = folly::dynamic::array();
+  for (auto hierarchyItem : data.hierarchy) {
+    hierarchy.push_back(hierarchyItem);
+  }
+  result["hierarchy"] = hierarchy;
+  return ReadableNativeMap::newObjectCxxArgs(result);
+}
+
 void Binding::startSurface(
     jint surfaceId,
     jni::alias_ref<jstring> moduleName,
@@ -249,15 +271,27 @@ void Binding::startSurface(
     return;
   }
 
-  LayoutContext context;
-  context.pointScaleFactor = pointScaleFactor_;
-  scheduler->startSurface(
-      surfaceId,
-      moduleName->toStdString(),
-      initialProps->consume(),
-      {},
-      context,
+  auto layoutContext = LayoutContext{};
+  layoutContext.pointScaleFactor = pointScaleFactor_;
+
+  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
+  surfaceHandler.setContextContainer(scheduler->getContextContainer());
+  surfaceHandler.setProps(initialProps->consume());
+  surfaceHandler.constraintLayout({}, layoutContext);
+
+  scheduler->registerSurface(surfaceHandler);
+
+  surfaceHandler.start();
+
+  surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
       animationDriver_);
+
+  {
+    SystraceSection s2("FabricUIManagerBinding::startSurface::surfaceId::lock");
+    std::unique_lock<better::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+    SystraceSection s3("FabricUIManagerBinding::startSurface::surfaceId");
+    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
+  }
 }
 
 void Binding::startSurfaceWithConstraints(
@@ -302,13 +336,26 @@ void Binding::startSurfaceWithConstraints(
   constraints.layoutDirection =
       isRTL ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
 
-  scheduler->startSurface(
-      surfaceId,
-      moduleName->toStdString(),
-      initialProps->consume(),
-      constraints,
-      context,
+  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
+  surfaceHandler.setContextContainer(scheduler_->getContextContainer());
+  surfaceHandler.setProps(initialProps->consume());
+  surfaceHandler.constraintLayout(constraints, context);
+
+  scheduler->registerSurface(surfaceHandler);
+
+  surfaceHandler.start();
+
+  surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
       animationDriver_);
+
+  {
+    SystraceSection s2(
+        "FabricUIManagerBinding::startSurfaceWithConstraints::surfaceId::lock");
+    std::unique_lock<better::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+    SystraceSection s3(
+        "FabricUIManagerBinding::startSurfaceWithConstraints::surfaceId");
+    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
+  }
 }
 
 void Binding::renderTemplateToSurface(jint surfaceId, jstring uiTemplate) {
@@ -340,7 +387,47 @@ void Binding::stopSurface(jint surfaceId) {
     return;
   }
 
-  scheduler->stopSurface(surfaceId);
+  {
+    std::unique_lock<better::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+
+    auto iterator = surfaceHandlerRegistry_.find(surfaceId);
+
+    if (iterator == surfaceHandlerRegistry_.end()) {
+      LOG(ERROR) << "Binding::stopSurface: Surface with given id is not found";
+      return;
+    }
+
+    auto surfaceHandler = std::move(iterator->second);
+    surfaceHandlerRegistry_.erase(iterator);
+    surfaceHandler.stop();
+    scheduler->unregisterSurface(surfaceHandler);
+  }
+}
+
+void Binding::registerSurface(SurfaceHandlerBinding *surfaceHandlerBinding) {
+  auto scheduler = getScheduler();
+  scheduler->registerSurface(surfaceHandlerBinding->getSurfaceHandler());
+}
+
+void Binding::unregisterSurface(SurfaceHandlerBinding *surfaceHandlerBinding) {
+  auto scheduler = getScheduler();
+  scheduler->unregisterSurface(surfaceHandlerBinding->getSurfaceHandler());
+}
+
+static inline float scale(Float value, Float pointScaleFactor) {
+  std::feclearexcept(FE_ALL_EXCEPT);
+  float result = value * pointScaleFactor;
+  if (std::fetestexcept(FE_OVERFLOW)) {
+    LOG(ERROR) << "Binding::scale - FE_OVERFLOW - value: " << value
+               << " pointScaleFactor: " << pointScaleFactor
+               << " result: " << result;
+  }
+  if (std::fetestexcept(FE_UNDERFLOW)) {
+    LOG(ERROR) << "Binding::scale - FE_UNDERFLOW - value: " << value
+               << " pointScaleFactor: " << pointScaleFactor
+               << " result: " << result;
+  }
+  return result;
 }
 
 void Binding::setConstraints(
@@ -377,7 +464,31 @@ void Binding::setConstraints(
   constraints.layoutDirection =
       isRTL ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
 
-  scheduler->constraintSurfaceLayout(surfaceId, constraints, context);
+  {
+    std::shared_lock<better::shared_mutex> lock(surfaceHandlerRegistryMutex_);
+
+    auto iterator = surfaceHandlerRegistry_.find(surfaceId);
+
+    if (iterator == surfaceHandlerRegistry_.end()) {
+      LOG(ERROR)
+          << "Binding::setConstraints: Surface with given id is not found";
+      return;
+    }
+
+    auto &surfaceHandler = iterator->second;
+    surfaceHandler.constraintLayout(constraints, context);
+  }
+}
+
+bool isMapBufferSerializationEnabled() {
+  static const auto reactFeatureFlagsJavaDescriptor =
+      jni::findClassStatic(Binding::ReactFeatureFlagsJavaDescriptor);
+  static const auto isMapBufferSerializationEnabledMethod =
+      reactFeatureFlagsJavaDescriptor->getStaticMethod<jboolean()>(
+          "isMapBufferSerializationEnabled");
+  bool value =
+      isMapBufferSerializationEnabledMethod(reactFeatureFlagsJavaDescriptor);
+  return value;
 }
 
 void Binding::installFabricUIManager(
@@ -420,39 +531,34 @@ void Binding::installFabricUIManager(
   jni::global_ref<jobject> localJavaUIManager = javaUIManager_;
   EventBeat::Factory synchronousBeatFactory =
       [eventBeatManager, runtimeExecutor, localJavaUIManager](
-          EventBeat::SharedOwnerBox const &ownerBox) {
-        return std::make_unique<AsyncEventBeat>(
-            ownerBox, eventBeatManager, runtimeExecutor, localJavaUIManager);
-      };
+          EventBeat::SharedOwnerBox const &ownerBox)
+      -> std::unique_ptr<EventBeat> {
+    return std::make_unique<AsyncEventBeat>(
+        ownerBox, eventBeatManager, runtimeExecutor, localJavaUIManager);
+  };
 
   EventBeat::Factory asynchronousBeatFactory =
       [eventBeatManager, runtimeExecutor, localJavaUIManager](
-          EventBeat::SharedOwnerBox const &ownerBox) {
-        return std::make_unique<AsyncEventBeat>(
-            ownerBox, eventBeatManager, runtimeExecutor, localJavaUIManager);
-      };
+          EventBeat::SharedOwnerBox const &ownerBox)
+      -> std::unique_ptr<EventBeat> {
+    return std::make_unique<AsyncEventBeat>(
+        ownerBox, eventBeatManager, runtimeExecutor, localJavaUIManager);
+  };
 
   contextContainer->insert("ReactNativeConfig", config);
   contextContainer->insert("FabricUIManager", javaUIManager_);
 
   // Keep reference to config object and cache some feature flags here
   reactNativeConfig_ = config;
-  collapseDeleteCreateMountingInstructions_ =
-      reactNativeConfig_->getBool(
-          "react_fabric:enabled_collapse_delete_create_mounting_instructions") &&
-      !reactNativeConfig_->getBool(
-          "react_fabric:enable_reparenting_detection_android") &&
-      !reactNativeConfig_->getBool(
-          "react_fabric:enabled_layout_animations_android");
 
-  useIntBufferBatchMountItem_ = reactNativeConfig_->getBool(
-      "react_fabric:use_int_buffer_batch_mountitem_android");
+  contextContainer->insert(
+      "MapBufferSerializationEnabled", isMapBufferSerializationEnabled());
 
   disablePreallocateViews_ = reactNativeConfig_->getBool(
       "react_fabric:disabled_view_preallocation_android");
 
-  bool enableLayoutAnimations = reactNativeConfig_->getBool(
-      "react_fabric:enabled_layout_animations_android");
+  enableEarlyEventEmitterUpdate_ = reactNativeConfig_->getBool(
+      "react_fabric:enable_early_event_emitter_update");
 
   auto toolbox = SchedulerToolbox{};
   toolbox.contextContainer = contextContainer;
@@ -467,10 +573,8 @@ void Binding::installFabricUIManager(
     toolbox.backgroundExecutor = backgroundExecutor_->get();
   }
 
-  if (enableLayoutAnimations) {
-    animationDriver_ =
-        std::make_shared<LayoutAnimationDriver>(runtimeExecutor, this);
-  }
+  animationDriver_ =
+      std::make_shared<LayoutAnimationDriver>(runtimeExecutor, this);
   scheduler_ = std::make_shared<Scheduler>(
       toolbox, (animationDriver_ ? animationDriver_.get() : nullptr), this);
 }
@@ -519,226 +623,7 @@ local_ref<JString> getPlatformComponentName(const ShadowView &shadowView) {
   return componentName;
 }
 
-local_ref<JMountItem::javaobject> createUpdateEventEmitterMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const ShadowViewMutation &mutation) {
-  if (!mutation.newChildShadowView.eventEmitter) {
-    return nullptr;
-  }
-  SharedEventEmitter eventEmitter = mutation.newChildShadowView.eventEmitter;
-
-  // Do not hold a reference to javaEventEmitter from the C++ side.
-  auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
-  EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
-  cEventEmitter->eventEmitter = eventEmitter;
-
-  static auto updateEventEmitterInstruction =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(jint, jobject)>(
-              "updateEventEmitterMountItem");
-
-  return updateEventEmitterInstruction(
-      javaUIManager, mutation.newChildShadowView.tag, javaEventEmitter.get());
-}
-
-local_ref<JMountItem::javaobject> createUpdatePropsMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const ShadowViewMutation &mutation) {
-  auto shadowView = mutation.newChildShadowView;
-
-  // TODO: move props from map to a typed object.
-  auto newProps = shadowView.props->rawProps;
-
-  local_ref<ReadableMap::javaobject> readableMap =
-      castReadableMap(ReadableNativeMap::newObjectCxxArgs(newProps));
-  static auto updatePropsInstruction =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(jint, ReadableMap::javaobject)>(
-              "updatePropsMountItem");
-
-  return updatePropsInstruction(
-      javaUIManager, mutation.newChildShadowView.tag, readableMap.get());
-}
-
-local_ref<JMountItem::javaobject> createUpdateLayoutMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const ShadowViewMutation &mutation) {
-  auto oldChildShadowView = mutation.oldChildShadowView;
-  auto newChildShadowView = mutation.newChildShadowView;
-
-  if (newChildShadowView.layoutMetrics != EmptyLayoutMetrics &&
-      oldChildShadowView.layoutMetrics != newChildShadowView.layoutMetrics) {
-    static auto updateLayoutInstruction =
-        jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-            ->getMethod<alias_ref<JMountItem>(
-                jint, jint, jint, jint, jint, jint)>("updateLayoutMountItem");
-    auto layoutMetrics = newChildShadowView.layoutMetrics;
-    auto pointScaleFactor = layoutMetrics.pointScaleFactor;
-    auto frame = layoutMetrics.frame;
-
-    int x = round(frame.origin.x * pointScaleFactor);
-    int y = round(frame.origin.y * pointScaleFactor);
-    int w = round(frame.size.width * pointScaleFactor);
-    int h = round(frame.size.height * pointScaleFactor);
-    auto layoutDirection =
-        toInt(newChildShadowView.layoutMetrics.layoutDirection);
-    return updateLayoutInstruction(
-        javaUIManager, newChildShadowView.tag, x, y, w, h, layoutDirection);
-  }
-
-  return nullptr;
-}
-
-local_ref<JMountItem::javaobject> createUpdatePaddingMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const ShadowViewMutation &mutation) {
-  auto oldChildShadowView = mutation.oldChildShadowView;
-  auto newChildShadowView = mutation.newChildShadowView;
-
-  if (oldChildShadowView.layoutMetrics.contentInsets ==
-          newChildShadowView.layoutMetrics.contentInsets &&
-      mutation.type != ShadowViewMutation::Type::Insert) {
-    return nullptr;
-  }
-
-  static auto updatePaddingInstruction =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(jint, jint, jint, jint, jint)>(
-              "updatePaddingMountItem");
-
-  auto layoutMetrics = newChildShadowView.layoutMetrics;
-  auto pointScaleFactor = layoutMetrics.pointScaleFactor;
-  auto contentInsets = layoutMetrics.contentInsets;
-
-  int left = floor(contentInsets.left * pointScaleFactor);
-  int top = floor(contentInsets.top * pointScaleFactor);
-  int right = floor(contentInsets.right * pointScaleFactor);
-  int bottom = floor(contentInsets.bottom * pointScaleFactor);
-
-  return updatePaddingInstruction(
-      javaUIManager, newChildShadowView.tag, left, top, right, bottom);
-}
-
-local_ref<JMountItem::javaobject> createInsertMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const ShadowViewMutation &mutation) {
-  static auto insertInstruction =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(jint, jint, jint)>(
-              "insertMountItem");
-
-  return insertInstruction(
-      javaUIManager,
-      mutation.newChildShadowView.tag,
-      mutation.parentShadowView.tag,
-      mutation.index);
-}
-
-local_ref<JMountItem::javaobject> createUpdateStateMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const ShadowViewMutation &mutation) {
-  static auto updateStateInstruction =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(jint, jobject)>(
-              "updateStateMountItem");
-
-  auto state = mutation.newChildShadowView.state;
-
-  // Do not hold onto Java object from C
-  // We DO want to hold onto C object from Java, since we don't know the
-  // lifetime of the Java object
-  local_ref<StateWrapperImpl::JavaPart> javaStateWrapper = nullptr;
-  if (state != nullptr) {
-    javaStateWrapper = StateWrapperImpl::newObjectJavaArgs();
-    StateWrapperImpl *cStateWrapper = cthis(javaStateWrapper);
-    cStateWrapper->state_ = state;
-  }
-
-  return updateStateInstruction(
-      javaUIManager,
-      mutation.newChildShadowView.tag,
-      (javaStateWrapper != nullptr ? javaStateWrapper.get() : nullptr));
-}
-
-local_ref<JMountItem::javaobject> createRemoveAndDeleteMultiMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const std::vector<RemoveDeleteMetadata> &metadata) {
-  auto env = Environment::current();
-  auto removeAndDeleteArray = env->NewIntArray(metadata.size() * 4);
-  int position = 0;
-  jint temp[4];
-  for (const auto &x : metadata) {
-    temp[0] = x.tag;
-    temp[1] = x.parentTag;
-    temp[2] = x.index;
-    temp[3] = (x.shouldRemove ? 1 : 0) | (x.shouldDelete ? 2 : 0);
-    env->SetIntArrayRegion(removeAndDeleteArray, position, 4, temp);
-    position += 4;
-  }
-
-  static auto removeDeleteMultiInstruction =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(jintArray)>(
-              "removeDeleteMultiMountItem");
-
-  auto ret = removeDeleteMultiInstruction(javaUIManager, removeAndDeleteArray);
-
-  // It is not strictly necessary to manually delete the ref here, in this
-  // particular case. If JNI memory is being allocated in a loop, it's easy to
-  // overload the localref table and crash; this is not possible in this case
-  // since the JNI would automatically clear this ref when it goes out of scope,
-  // anyway. However, this is being left here as a reminder of good hygiene and
-  // to be careful with JNI-allocated memory in general.
-  env->DeleteLocalRef(removeAndDeleteArray);
-
-  return ret;
-}
-
-// TODO T48019320: because we pass initial props and state to the Create (and
-// preallocate) mount instruction, we technically don't need to pass the first
-// Update to any components. Dedupe?
-local_ref<JMountItem::javaobject> createCreateMountItem(
-    const jni::global_ref<jobject> &javaUIManager,
-    const ShadowViewMutation &mutation,
-    const Tag surfaceId) {
-  static auto createJavaInstruction =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(
-              jstring, ReadableMap::javaobject, jobject, jint, jint, jboolean)>(
-              "createMountItem");
-
-  auto newChildShadowView = mutation.newChildShadowView;
-
-  local_ref<JString> componentName =
-      getPlatformComponentName(newChildShadowView);
-
-  jboolean isLayoutable =
-      newChildShadowView.layoutMetrics != EmptyLayoutMetrics;
-
-  local_ref<ReadableMap::javaobject> props = castReadableMap(
-      ReadableNativeMap::newObjectCxxArgs(newChildShadowView.props->rawProps));
-
-  // Do not hold onto Java object from C
-  // We DO want to hold onto C object from Java, since we don't know the
-  // lifetime of the Java object
-  local_ref<StateWrapperImpl::JavaPart> javaStateWrapper = nullptr;
-  if (newChildShadowView.state != nullptr) {
-    javaStateWrapper = StateWrapperImpl::newObjectJavaArgs();
-    StateWrapperImpl *cStateWrapper = cthis(javaStateWrapper);
-    cStateWrapper->state_ = newChildShadowView.state;
-  }
-
-  return createJavaInstruction(
-      javaUIManager,
-      componentName.get(),
-      props.get(),
-      (javaStateWrapper != nullptr ? javaStateWrapper.get() : nullptr),
-      surfaceId,
-      newChildShadowView.tag,
-      isLayoutable);
-}
-
-void Binding::schedulerDidFinishTransactionIntBuffer(
+void Binding::schedulerDidFinishTransaction(
     MountingCoordinator::Shared const &mountingCoordinator) {
   std::lock_guard<std::recursive_mutex> lock(commitMutex_);
 
@@ -782,8 +667,7 @@ void Binding::schedulerDidFinishTransactionIntBuffer(
     auto &mutationType = mutation.type;
     auto &index = mutation.index;
 
-    bool isVirtual = newChildShadowView.layoutMetrics == EmptyLayoutMetrics &&
-        oldChildShadowView.layoutMetrics == EmptyLayoutMetrics;
+    bool isVirtual = mutation.mutatedViewIsVirtual();
 
     switch (mutationType) {
       case ShadowViewMutation::Create: {
@@ -949,7 +833,7 @@ void Binding::schedulerDidFinishTransactionIntBuffer(
   int intBufferPosition = 0;
   int objBufferPosition = 0;
   int prevMountItemType = -1;
-  jint temp[6];
+  jint temp[7];
   for (int i = 0; i < cppCommonMountItems.size(); i++) {
     const auto &mountItem = cppCommonMountItems[i];
     const auto &mountItemType = mountItem.type;
@@ -996,6 +880,13 @@ void Binding::schedulerDidFinishTransactionIntBuffer(
         cStateWrapper->state_ = mountItem.newChildShadowView.state;
       }
 
+      // Do not hold a reference to javaEventEmitter from the C++ side.
+      SharedEventEmitter eventEmitter =
+          mountItem.newChildShadowView.eventEmitter;
+      auto javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
+      EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
+      cEventEmitter->eventEmitter = eventEmitter;
+
       temp[0] = mountItem.newChildShadowView.tag;
       temp[1] = isLayoutable;
       env->SetIntArrayRegion(intBufferArray, intBufferPosition, 2, temp);
@@ -1005,6 +896,7 @@ void Binding::schedulerDidFinishTransactionIntBuffer(
       (*objBufferArray)[objBufferPosition++] = props.get();
       (*objBufferArray)[objBufferPosition++] =
           javaStateWrapper != nullptr ? javaStateWrapper.get() : nullptr;
+      (*objBufferArray)[objBufferPosition++] = javaEventEmitter.get();
     } else if (mountItemType == CppMountItem::Type::Insert) {
       temp[0] = mountItem.newChildShadowView.tag;
       temp[1] = mountItem.parentShadowView.tag;
@@ -1081,10 +973,10 @@ void Binding::schedulerDidFinishTransactionIntBuffer(
       auto pointScaleFactor = layoutMetrics.pointScaleFactor;
       auto contentInsets = layoutMetrics.contentInsets;
 
-      int left = floor(contentInsets.left * pointScaleFactor);
-      int top = floor(contentInsets.top * pointScaleFactor);
-      int right = floor(contentInsets.right * pointScaleFactor);
-      int bottom = floor(contentInsets.bottom * pointScaleFactor);
+      int left = floor(scale(contentInsets.left, pointScaleFactor));
+      int top = floor(scale(contentInsets.top, pointScaleFactor));
+      int right = floor(scale(contentInsets.right, pointScaleFactor));
+      int bottom = floor(scale(contentInsets.bottom, pointScaleFactor));
 
       temp[0] = mountItem.newChildShadowView.tag;
       temp[1] = left;
@@ -1108,19 +1000,19 @@ void Binding::schedulerDidFinishTransactionIntBuffer(
       auto pointScaleFactor = layoutMetrics.pointScaleFactor;
       auto frame = layoutMetrics.frame;
 
-      int x = round(frame.origin.x * pointScaleFactor);
-      int y = round(frame.origin.y * pointScaleFactor);
-      int w = round(frame.size.width * pointScaleFactor);
-      int h = round(frame.size.height * pointScaleFactor);
-      int layoutDirection =
-          toInt(mountItem.newChildShadowView.layoutMetrics.layoutDirection);
+      int x = round(scale(frame.origin.x, pointScaleFactor));
+      int y = round(scale(frame.origin.y, pointScaleFactor));
+      int w = round(scale(frame.size.width, pointScaleFactor));
+      int h = round(scale(frame.size.height, pointScaleFactor));
+      int displayType =
+          toInt(mountItem.newChildShadowView.layoutMetrics.displayType);
 
       temp[0] = mountItem.newChildShadowView.tag;
       temp[1] = x;
       temp[2] = y;
       temp[3] = w;
       temp[4] = h;
-      temp[5] = layoutDirection;
+      temp[5] = displayType;
       env->SetIntArrayRegion(intBufferArray, intBufferPosition, 6, temp);
       intBufferPosition += 6;
     }
@@ -1196,295 +1088,6 @@ void Binding::schedulerDidFinishTransactionIntBuffer(
   env->DeleteLocalRef(intBufferArray);
 }
 
-void Binding::schedulerDidFinishTransaction(
-    MountingCoordinator::Shared const &mountingCoordinator) {
-  std::lock_guard<std::recursive_mutex> lock(commitMutex_);
-
-  if (useIntBufferBatchMountItem_) {
-    return schedulerDidFinishTransactionIntBuffer(mountingCoordinator);
-  }
-
-  SystraceSection s("FabricUIManagerBinding::schedulerDidFinishTransaction");
-  auto finishTransactionStartTime = telemetryTimePointNow();
-
-  jni::global_ref<jobject> localJavaUIManager = getJavaUIManager();
-  if (!localJavaUIManager) {
-    LOG(ERROR)
-        << "Binding::schedulerDidFinishTransaction: JavaUIManager disappeared";
-    return;
-  }
-
-  auto mountingTransaction = mountingCoordinator->pullTransaction();
-
-  if (!mountingTransaction.has_value()) {
-    return;
-  }
-
-  auto telemetry = mountingTransaction->getTelemetry();
-  auto surfaceId = mountingTransaction->getSurfaceId();
-  auto &mutations = mountingTransaction->getMutations();
-
-  facebook::better::set<Tag> createAndDeleteTagsToProcess;
-  // When collapseDeleteCreateMountingInstructions_ is enabled, the
-  // createAndDeleteTagsToProcess set will contain all the tags belonging to
-  // CREATE and DELETE mutation instructions that needs to be processed. If a
-  // CREATE or DELETE mutation instruction does not belong in the set, it means
-  // that the we received a pair of mutation instructions: DELETE - CREATE and
-  // it is not necessary to create or delete on the screen.
-  if (collapseDeleteCreateMountingInstructions_) {
-    for (const auto &mutation : mutations) {
-      if (mutation.type == ShadowViewMutation::Delete) {
-        // TAG on 'Delete' mutation instructions are part of the
-        // oldChildShadowView
-        createAndDeleteTagsToProcess.insert(mutation.oldChildShadowView.tag);
-      } else if (mutation.type == ShadowViewMutation::Create) {
-        // TAG on 'Create' mutation instructions are part of the
-        // newChildShadowView
-        Tag tag = mutation.newChildShadowView.tag;
-        if (createAndDeleteTagsToProcess.find(tag) ==
-            createAndDeleteTagsToProcess.end()) {
-          createAndDeleteTagsToProcess.insert(tag);
-        } else {
-          createAndDeleteTagsToProcess.erase(tag);
-        }
-      }
-    }
-  }
-
-  auto revisionNumber = telemetry.getRevisionNumber();
-
-  std::vector<local_ref<jobject>> queue;
-  // Upper bound estimation of mount items to be delivered to Java side.
-  int size = mutations.size() * 3 + 42;
-
-  local_ref<JArrayClass<JMountItem::javaobject>> mountItemsArray =
-      JArrayClass<JMountItem::javaobject>::newArray(size);
-
-  auto mountItems = *(mountItemsArray);
-  std::unordered_set<Tag> deletedViewTags;
-
-  // Find the set of tags that are removed and deleted in one block
-  std::vector<RemoveDeleteMetadata> toRemove;
-
-  int position = 0;
-  for (const auto &mutation : mutations) {
-    auto oldChildShadowView = mutation.oldChildShadowView;
-    auto newChildShadowView = mutation.newChildShadowView;
-    auto mutationType = mutation.type;
-
-    if (collapseDeleteCreateMountingInstructions_ &&
-        (mutationType == ShadowViewMutation::Create ||
-         mutationType == ShadowViewMutation::Delete) &&
-        createAndDeleteTagsToProcess.size() > 0) {
-      // The TAG on 'Delete' mutation instructions are part of the
-      // oldChildShadowView. On the other side, the TAG on 'Create' mutation
-      // instructions are part of the newChildShadowView
-      Tag tag = mutationType == ShadowViewMutation::Create
-          ? mutation.newChildShadowView.tag
-          : mutation.oldChildShadowView.tag;
-      if (createAndDeleteTagsToProcess.find(tag) ==
-          createAndDeleteTagsToProcess.end()) {
-        continue;
-      }
-    }
-
-    bool isVirtual = newChildShadowView.layoutMetrics == EmptyLayoutMetrics &&
-        oldChildShadowView.layoutMetrics == EmptyLayoutMetrics;
-
-    // Handle accumulated removals/deletions
-    if (mutation.type != ShadowViewMutation::Remove &&
-        mutation.type != ShadowViewMutation::Delete) {
-      if (toRemove.size() > 0) {
-        mountItems[position++] =
-            createRemoveAndDeleteMultiMountItem(localJavaUIManager, toRemove);
-        toRemove.clear();
-      }
-    }
-
-    switch (mutation.type) {
-      case ShadowViewMutation::Create: {
-        if (disablePreallocateViews_ ||
-            mutation.newChildShadowView.props->revision > 1 ||
-            deletedViewTags.find(mutation.newChildShadowView.tag) !=
-                deletedViewTags.end()) {
-          mountItems[position++] =
-              createCreateMountItem(localJavaUIManager, mutation, surfaceId);
-        }
-        break;
-      }
-      case ShadowViewMutation::Remove: {
-        if (!isVirtual) {
-          toRemove.push_back(
-              RemoveDeleteMetadata{mutation.oldChildShadowView.tag,
-                                   mutation.parentShadowView.tag,
-                                   mutation.index,
-                                   true,
-                                   false});
-        }
-        break;
-      }
-      case ShadowViewMutation::Delete: {
-        // It is impossible to delete without removing node first
-        const auto &it = std::find_if(
-            std::begin(toRemove),
-            std::end(toRemove),
-            [&mutation](const auto &x) {
-              return x.tag == mutation.oldChildShadowView.tag;
-            });
-
-        if (it != std::end(toRemove)) {
-          it->shouldDelete = true;
-        } else {
-          toRemove.push_back(RemoveDeleteMetadata{
-              mutation.oldChildShadowView.tag, -1, -1, false, true});
-        }
-
-        deletedViewTags.insert(mutation.oldChildShadowView.tag);
-        break;
-      }
-      case ShadowViewMutation::Update: {
-        if (!isVirtual) {
-          if (mutation.oldChildShadowView.props !=
-              mutation.newChildShadowView.props) {
-            mountItems[position++] =
-                createUpdatePropsMountItem(localJavaUIManager, mutation);
-          }
-          if (mutation.oldChildShadowView.state !=
-              mutation.newChildShadowView.state) {
-            mountItems[position++] =
-                createUpdateStateMountItem(localJavaUIManager, mutation);
-          }
-
-          // Padding: padding mountItems must be executed before layout props
-          // are updated in the view. This is necessary to ensure that events
-          // (resulting from layout changes) are dispatched with the correct
-          // padding information.
-          auto updatePaddingMountItem =
-              createUpdatePaddingMountItem(localJavaUIManager, mutation);
-          if (updatePaddingMountItem) {
-            mountItems[position++] = updatePaddingMountItem;
-          }
-
-          auto updateLayoutMountItem =
-              createUpdateLayoutMountItem(localJavaUIManager, mutation);
-          if (updateLayoutMountItem) {
-            mountItems[position++] = updateLayoutMountItem;
-          }
-        }
-
-        if (mutation.oldChildShadowView.eventEmitter !=
-            mutation.newChildShadowView.eventEmitter) {
-          auto updateEventEmitterMountItem =
-              createUpdateEventEmitterMountItem(localJavaUIManager, mutation);
-          if (updateEventEmitterMountItem) {
-            mountItems[position++] = updateEventEmitterMountItem;
-          }
-        }
-        break;
-      }
-      case ShadowViewMutation::Insert: {
-        if (!isVirtual) {
-          // Insert item
-          mountItems[position++] =
-              createInsertMountItem(localJavaUIManager, mutation);
-
-          if (disablePreallocateViews_ ||
-              mutation.newChildShadowView.props->revision > 1 ||
-              deletedViewTags.find(mutation.newChildShadowView.tag) !=
-                  deletedViewTags.end()) {
-            mountItems[position++] =
-                createUpdatePropsMountItem(localJavaUIManager, mutation);
-          }
-
-          // State
-          if (mutation.newChildShadowView.state) {
-            mountItems[position++] =
-                createUpdateStateMountItem(localJavaUIManager, mutation);
-          }
-
-          // Padding: padding mountItems must be executed before layout props
-          // are updated in the view. This is necessary to ensure that events
-          // (resulting from layout changes) are dispatched with the correct
-          // padding information.
-          auto updatePaddingMountItem =
-              createUpdatePaddingMountItem(localJavaUIManager, mutation);
-          if (updatePaddingMountItem) {
-            mountItems[position++] = updatePaddingMountItem;
-          }
-
-          // Layout
-          auto updateLayoutMountItem =
-              createUpdateLayoutMountItem(localJavaUIManager, mutation);
-          if (updateLayoutMountItem) {
-            mountItems[position++] = updateLayoutMountItem;
-          }
-        }
-
-        // EventEmitter
-        auto updateEventEmitterMountItem =
-            createUpdateEventEmitterMountItem(localJavaUIManager, mutation);
-        if (updateEventEmitterMountItem) {
-          mountItems[position++] = updateEventEmitterMountItem;
-        }
-
-        break;
-      }
-      default: {
-        break;
-      }
-    }
-  }
-
-  // Handle remaining removals and deletions
-  if (toRemove.size() > 0) {
-    mountItems[position++] =
-        createRemoveAndDeleteMultiMountItem(localJavaUIManager, toRemove);
-    toRemove.clear();
-  }
-
-  static auto createMountItemsBatchContainer =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<alias_ref<JMountItem>(
-              jint, jtypeArray<JMountItem::javaobject>, jint, jint)>(
-              "createBatchMountItem");
-
-  // If there are no items, we pass a nullptr instead of passing the object
-  // through the JNI
-  auto batch = createMountItemsBatchContainer(
-      localJavaUIManager,
-      surfaceId,
-      position == 0 ? nullptr : mountItemsArray.get(),
-      position,
-      revisionNumber);
-
-  static auto scheduleMountItem =
-      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<void(
-              JMountItem::javaobject,
-              jint,
-              jlong,
-              jlong,
-              jlong,
-              jlong,
-              jlong,
-              jlong,
-              jlong)>("scheduleMountItem");
-
-  auto finishTransactionEndTime = telemetryTimePointNow();
-
-  scheduleMountItem(
-      localJavaUIManager,
-      batch.get(),
-      telemetry.getRevisionNumber(),
-      telemetryTimePointToMilliseconds(telemetry.getCommitStartTime()),
-      telemetryTimePointToMilliseconds(telemetry.getDiffStartTime()),
-      telemetryTimePointToMilliseconds(telemetry.getDiffEndTime()),
-      telemetryTimePointToMilliseconds(telemetry.getLayoutStartTime()),
-      telemetryTimePointToMilliseconds(telemetry.getLayoutEndTime()),
-      telemetryTimePointToMilliseconds(finishTransactionStartTime),
-      telemetryTimePointToMilliseconds(finishTransactionEndTime));
-}
-
 void Binding::setPixelDensity(float pointScaleFactor) {
   pointScaleFactor_ = pointScaleFactor;
 }
@@ -1520,13 +1123,9 @@ void Binding::driveCxxAnimations() {
   scheduler_->animationTick();
 }
 
-void Binding::schedulerDidRequestPreliminaryViewAllocation(
+void Binding::preallocateShadowView(
     const SurfaceId surfaceId,
     const ShadowView &shadowView) {
-  if (disablePreallocateViews_) {
-    return;
-  }
-
   jni::global_ref<jobject> localJavaUIManager = getJavaUIManager();
   if (!localJavaUIManager) {
     LOG(ERROR)
@@ -1536,15 +1135,16 @@ void Binding::schedulerDidRequestPreliminaryViewAllocation(
 
   bool isLayoutableShadowNode = shadowView.layoutMetrics != EmptyLayoutMetrics;
 
-  if (disableVirtualNodePreallocation_ && !isLayoutableShadowNode) {
-    return;
-  }
-
   static auto preallocateView =
       jni::findClassStatic(Binding::UIManagerJavaDescriptor)
           ->getMethod<void(
-              jint, jint, jstring, ReadableMap::javaobject, jobject, jboolean)>(
-              "preallocateView");
+              jint,
+              jint,
+              jstring,
+              ReadableMap::javaobject,
+              jobject,
+              jobject,
+              jboolean)>("preallocateView");
 
   // Do not hold onto Java object from C
   // We DO want to hold onto C object from Java, since we don't know the
@@ -1556,6 +1156,17 @@ void Binding::schedulerDidRequestPreliminaryViewAllocation(
     cStateWrapper->state_ = shadowView.state;
   }
 
+  // Do not hold a reference to javaEventEmitter from the C++ side.
+  local_ref<EventEmitterWrapper::JavaPart> javaEventEmitter = nullptr;
+  if (enableEarlyEventEmitterUpdate_) {
+    SharedEventEmitter eventEmitter = shadowView.eventEmitter;
+    if (eventEmitter != nullptr) {
+      javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
+      EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
+      cEventEmitter->eventEmitter = eventEmitter;
+    }
+  }
+
   local_ref<ReadableMap::javaobject> props = castReadableMap(
       ReadableNativeMap::newObjectCxxArgs(shadowView.props->rawProps));
   auto component = getPlatformComponentName(shadowView);
@@ -1567,9 +1178,53 @@ void Binding::schedulerDidRequestPreliminaryViewAllocation(
       component.get(),
       props.get(),
       (javaStateWrapper != nullptr ? javaStateWrapper.get() : nullptr),
+      (javaEventEmitter != nullptr ? javaEventEmitter.get() : nullptr),
       isLayoutableShadowNode);
 }
 
+void Binding::schedulerDidRequestPreliminaryViewAllocation(
+    const SurfaceId surfaceId,
+    const ShadowNode &shadowNode) {
+  if (disablePreallocateViews_) {
+    return;
+  }
+
+  auto shadowView = ShadowView(shadowNode);
+
+  if (!shadowView.traits.check(ShadowNodeTraits::Trait::FormsView)) {
+    return;
+  }
+
+  preallocateShadowView(surfaceId, shadowView);
+}
+
+void Binding::schedulerDidCloneShadowNode(
+    SurfaceId surfaceId,
+    const ShadowNode &oldShadowNode,
+    const ShadowNode &newShadowNode) {
+  // This is only necessary if view preallocation was skipped during
+  // createShadowNode
+
+  // We may need to PreAllocate a ShadowNode at this point if this is the
+  // earliest point it is possible to do so:
+  // 1. The revision is exactly 1
+  // 2. At revision 0 (the old node), View Preallocation would have been skipped
+
+  if (newShadowNode.getProps()->revision != 1) {
+    return;
+  }
+  if (oldShadowNode.getProps()->revision != 0) {
+    return;
+  }
+
+  // If the new node is concrete and the old wasn't, we can preallocate
+  if (!oldShadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView) &&
+      newShadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) {
+    auto shadowView = ShadowView(newShadowNode);
+    preallocateShadowView(surfaceId, shadowView);
+  }
+}
+
 void Binding::schedulerDidDispatchCommand(
     const ShadowView &shadowView,
     std::string const &commandName,
@@ -1583,7 +1238,7 @@ void Binding::schedulerDidDispatchCommand(
 
   static auto dispatchCommand =
       jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<void(jint, jstring, ReadableArray::javaobject)>(
+          ->getMethod<void(jint, jint, jstring, ReadableArray::javaobject)>(
               "dispatchCommand");
 
   local_ref<JString> command = make_jstring(commandName);
@@ -1592,62 +1247,92 @@ void Binding::schedulerDidDispatchCommand(
       castReadableArray(ReadableNativeArray::newObjectCxxArgs(args));
 
   dispatchCommand(
-      localJavaUIManager, shadowView.tag, command.get(), argsArray.get());
+      localJavaUIManager,
+      shadowView.surfaceId,
+      shadowView.tag,
+      command.get(),
+      argsArray.get());
 }
 
-void Binding::schedulerDidSetJSResponder(
-    SurfaceId surfaceId,
+void Binding::schedulerDidSendAccessibilityEvent(
     const ShadowView &shadowView,
-    const ShadowView &initialShadowView,
-    bool blockNativeResponder) {
+    std::string const &eventType) {
   jni::global_ref<jobject> localJavaUIManager = getJavaUIManager();
   if (!localJavaUIManager) {
-    LOG(ERROR) << "Binding::schedulerSetJSResponder: JavaUIManager disappeared";
+    LOG(ERROR)
+        << "Binding::schedulerDidDispatchCommand: JavaUIManager disappeared";
     return;
   }
 
-  static auto setJSResponder =
+  local_ref<JString> eventTypeStr = make_jstring(eventType);
+
+  static auto sendAccessibilityEventFromJS =
       jni::findClassStatic(Binding::UIManagerJavaDescriptor)
-          ->getMethod<void(jint, jint, jboolean)>("setJSResponder");
+          ->getMethod<void(jint, jint, jstring)>(
+              "sendAccessibilityEventFromJS");
 
-  setJSResponder(
+  sendAccessibilityEventFromJS(
       localJavaUIManager,
+      shadowView.surfaceId,
       shadowView.tag,
-      initialShadowView.tag,
-      (jboolean)blockNativeResponder);
+      eventTypeStr.get());
 }
 
-void Binding::schedulerDidClearJSResponder() {
+void Binding::schedulerDidSetIsJSResponder(
+    ShadowView const &shadowView,
+    bool isJSResponder,
+    bool blockNativeResponder) {
   jni::global_ref<jobject> localJavaUIManager = getJavaUIManager();
   if (!localJavaUIManager) {
-    LOG(ERROR)
-        << "Binding::schedulerClearJSResponder: JavaUIManager disappeared";
+    LOG(ERROR) << "Binding::schedulerSetJSResponder: JavaUIManager disappeared";
     return;
   }
 
+  static auto setJSResponder =
+      jni::findClassStatic(Binding::UIManagerJavaDescriptor)
+          ->getMethod<void(jint, jint, jint, jboolean)>("setJSResponder");
+
   static auto clearJSResponder =
       jni::findClassStatic(Binding::UIManagerJavaDescriptor)
           ->getMethod<void()>("clearJSResponder");
 
-  clearJSResponder(localJavaUIManager);
+  if (isJSResponder) {
+    setJSResponder(
+        localJavaUIManager,
+        shadowView.surfaceId,
+        shadowView.tag,
+        // The closest non-flattened ancestor of the same value if the node is
+        // not flattened. For now, we don't support the case when the node can
+        // be flattened because the only component that uses this feature -
+        // ScrollView - cannot be flattened.
+        shadowView.tag,
+        (jboolean)blockNativeResponder);
+  } else {
+    clearJSResponder(localJavaUIManager);
+  }
 }
 
 void Binding::registerNatives() {
-  registerHybrid(
-      {makeNativeMethod("initHybrid", Binding::initHybrid),
-       makeNativeMethod(
-           "installFabricUIManager", Binding::installFabricUIManager),
-       makeNativeMethod("startSurface", Binding::startSurface),
-       makeNativeMethod(
-           "startSurfaceWithConstraints", Binding::startSurfaceWithConstraints),
-       makeNativeMethod(
-           "renderTemplateToSurface", Binding::renderTemplateToSurface),
-       makeNativeMethod("stopSurface", Binding::stopSurface),
-       makeNativeMethod("setConstraints", Binding::setConstraints),
-       makeNativeMethod("setPixelDensity", Binding::setPixelDensity),
-       makeNativeMethod("driveCxxAnimations", Binding::driveCxxAnimations),
-       makeNativeMethod(
-           "uninstallFabricUIManager", Binding::uninstallFabricUIManager)});
+  registerHybrid({
+      makeNativeMethod("initHybrid", Binding::initHybrid),
+      makeNativeMethod(
+          "installFabricUIManager", Binding::installFabricUIManager),
+      makeNativeMethod("startSurface", Binding::startSurface),
+      makeNativeMethod(
+          "getInspectorDataForInstance", Binding::getInspectorDataForInstance),
+      makeNativeMethod(
+          "startSurfaceWithConstraints", Binding::startSurfaceWithConstraints),
+      makeNativeMethod(
+          "renderTemplateToSurface", Binding::renderTemplateToSurface),
+      makeNativeMethod("stopSurface", Binding::stopSurface),
+      makeNativeMethod("setConstraints", Binding::setConstraints),
+      makeNativeMethod("setPixelDensity", Binding::setPixelDensity),
+      makeNativeMethod("driveCxxAnimations", Binding::driveCxxAnimations),
+      makeNativeMethod(
+          "uninstallFabricUIManager", Binding::uninstallFabricUIManager),
+      makeNativeMethod("registerSurface", Binding::registerSurface),
+      makeNativeMethod("unregisterSurface", Binding::unregisterSurface),
+  });
 }
 
 } // namespace react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h
index d0f13cc6e9ba28..d3045b0e1b1a43 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h
@@ -15,11 +15,14 @@
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/scheduler/SchedulerDelegate.h>
 #include <react/renderer/uimanager/LayoutAnimationStatusDelegate.h>
+
 #include <memory>
 #include <mutex>
 #include "ComponentFactory.h"
 #include "EventBeatManager.h"
+#include "EventEmitterWrapper.h"
 #include "JBackgroundExecutor.h"
+#include "SurfaceHandlerBinding.h"
 
 namespace facebook {
 namespace react {
@@ -75,6 +78,9 @@ class Binding : public jni::HybridClass<Binding>,
   constexpr static auto UIManagerJavaDescriptor =
       "com/facebook/react/fabric/FabricUIManager";
 
+  constexpr static auto ReactFeatureFlagsJavaDescriptor =
+      "com/facebook/react/config/ReactFeatureFlags";
+
   static void registerNatives();
 
  private:
@@ -92,6 +98,9 @@ class Binding : public jni::HybridClass<Binding>,
       jboolean isRTL,
       jboolean doLeftAndRightSwapInRTL);
 
+  jni::local_ref<ReadableNativeMap::jhybridobject> getInspectorDataForInstance(
+      jni::alias_ref<EventEmitterWrapper::javaobject> eventEmitterWrapper);
+
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
 
   void installFabricUIManager(
@@ -124,25 +133,39 @@ class Binding : public jni::HybridClass<Binding>,
 
   void stopSurface(jint surfaceId);
 
+  void registerSurface(SurfaceHandlerBinding *surfaceHandler);
+
+  void unregisterSurface(SurfaceHandlerBinding *surfaceHandler);
+
   void schedulerDidFinishTransaction(
       MountingCoordinator::Shared const &mountingCoordinator) override;
 
+  void preallocateShadowView(
+      const SurfaceId surfaceId,
+      const ShadowView &shadowView);
+
   void schedulerDidRequestPreliminaryViewAllocation(
       const SurfaceId surfaceId,
-      const ShadowView &shadowView) override;
+      const ShadowNode &shadowNode) override;
+
+  void schedulerDidCloneShadowNode(
+      SurfaceId surfaceId,
+      const ShadowNode &oldShadowNode,
+      const ShadowNode &newShadowNode) override;
 
   void schedulerDidDispatchCommand(
       const ShadowView &shadowView,
       std::string const &commandName,
       folly::dynamic const args) override;
 
-  void schedulerDidSetJSResponder(
-      SurfaceId surfaceId,
+  void schedulerDidSendAccessibilityEvent(
       const ShadowView &shadowView,
-      const ShadowView &initialShadowView,
-      bool blockNativeResponder) override;
+      std::string const &eventType) override;
 
-  void schedulerDidClearJSResponder() override;
+  void schedulerDidSetIsJSResponder(
+      ShadowView const &shadowView,
+      bool isJSResponder,
+      bool blockNativeResponder) override;
 
   void setPixelDensity(float pointScaleFactor);
 
@@ -164,20 +187,18 @@ class Binding : public jni::HybridClass<Binding>,
   std::shared_ptr<Scheduler> scheduler_;
   std::mutex schedulerMutex_;
 
+  better::map<SurfaceId, SurfaceHandler> surfaceHandlerRegistry_{};
+  better::shared_mutex
+      surfaceHandlerRegistryMutex_; // Protects `surfaceHandlerRegistry_`.
+
   std::recursive_mutex commitMutex_;
 
   float pointScaleFactor_ = 1;
 
   std::shared_ptr<const ReactNativeConfig> reactNativeConfig_{nullptr};
-  bool useIntBufferBatchMountItem_{false};
-  bool collapseDeleteCreateMountingInstructions_{false};
   bool disablePreallocateViews_{false};
-  bool disableVirtualNodePreallocation_{false};
   bool enableFabricLogs_{false};
-
- private:
-  void schedulerDidFinishTransactionIntBuffer(
-      MountingCoordinator::Shared const &mountingCoordinator);
+  bool enableEarlyEventEmitterUpdate_{false};
 };
 
 } // namespace react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp
index 560b8eaaa70fb2..f92c84d625c8a9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp
@@ -12,8 +12,6 @@
 #include <fbjni/fbjni.h>
 
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-#include <react/renderer/components/androidpicker/AndroidDialogPickerComponentDescriptor.h>
-#include <react/renderer/components/androidpicker/AndroidDropdownPickerComponentDescriptor.h>
 #include <react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h>
 #include <react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h>
 #include <react/renderer/components/image/ImageComponentDescriptor.h>
@@ -64,14 +62,13 @@ CoreComponentsRegistry::sharedProviderRegistry() {
         concreteComponentDescriptorProvider<SliderComponentDescriptor>());
     providerRegistry->add(
         concreteComponentDescriptorProvider<ScrollViewComponentDescriptor>());
+    providerRegistry->add(
+        concreteComponentDescriptorProvider<
+            AndroidHorizontalScrollContentViewComponentDescriptor>());
     providerRegistry->add(
         concreteComponentDescriptorProvider<ParagraphComponentDescriptor>());
     providerRegistry->add(concreteComponentDescriptorProvider<
                           AndroidDrawerLayoutComponentDescriptor>());
-    providerRegistry->add(concreteComponentDescriptorProvider<
-                          AndroidDialogPickerComponentDescriptor>());
-    providerRegistry->add(concreteComponentDescriptorProvider<
-                          AndroidDropdownPickerComponentDescriptor>());
 
     return providerRegistry;
   }();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp
index 19fe921a46b807..b4e9899057505d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp
@@ -21,14 +21,34 @@ EventEmitterWrapper::initHybrid(jni::alias_ref<jclass>) {
 void EventEmitterWrapper::invokeEvent(
     std::string eventName,
     NativeMap *payload) {
-  eventEmitter->dispatchEvent(
-      eventName, payload->consume(), EventPriority::AsynchronousBatched);
+  // It is marginal, but possible for this to be constructed without a valid
+  // EventEmitter. In those cases, make sure we noop/blackhole events instead of
+  // crashing.
+  if (eventEmitter != nullptr) {
+    eventEmitter->dispatchEvent(
+        eventName, payload->consume(), EventPriority::AsynchronousBatched);
+  }
+}
+
+void EventEmitterWrapper::invokeUniqueEvent(
+    std::string eventName,
+    NativeMap *payload,
+    int customCoalesceKey) {
+  // TODO: customCoalesceKey currently unused
+  // It is marginal, but possible for this to be constructed without a valid
+  // EventEmitter. In those cases, make sure we noop/blackhole events instead of
+  // crashing.
+  if (eventEmitter != nullptr) {
+    eventEmitter->dispatchUniqueEvent(eventName, payload->consume());
+  }
 }
 
 void EventEmitterWrapper::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", EventEmitterWrapper::initHybrid),
       makeNativeMethod("invokeEvent", EventEmitterWrapper::invokeEvent),
+      makeNativeMethod(
+          "invokeUniqueEvent", EventEmitterWrapper::invokeUniqueEvent),
   });
 }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h
index dcc84ea6320e16..bfcc6059758293 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h
@@ -26,6 +26,10 @@ class EventEmitterWrapper : public jni::HybridClass<EventEmitterWrapper> {
   SharedEventEmitter eventEmitter;
 
   void invokeEvent(std::string eventName, NativeMap *params);
+  void invokeUniqueEvent(
+      std::string eventName,
+      NativeMap *params,
+      int customCoalesceKey);
 
  private:
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp
index 03005372a658a1..61fcec3d1c9885 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp
@@ -13,6 +13,7 @@
 #include "EventBeatManager.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
+#include "SurfaceHandlerBinding.h"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
@@ -22,5 +23,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     facebook::react::StateWrapperImpl::registerNatives();
     facebook::react::ComponentFactory::registerNatives();
     facebook::react::CoreComponentsRegistry::registerNatives();
+    facebook::react::SurfaceHandlerBinding::registerNatives();
   });
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp
index afbe9c7155232e..eaa9398de60b07 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp
@@ -8,6 +8,8 @@
 #include "StateWrapperImpl.h"
 #include <fbjni/fbjni.h>
 #include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 
 using namespace facebook::jni;
 
@@ -22,52 +24,37 @@ jni::local_ref<StateWrapperImpl::jhybriddata> StateWrapperImpl::initHybrid(
   return makeCxxInstance();
 }
 
-jni::local_ref<ReadableNativeMap::jhybridobject> StateWrapperImpl::getState() {
+jni::local_ref<ReadableNativeMap::jhybridobject>
+StateWrapperImpl::getStateDataImpl() {
   folly::dynamic map = state_->getDynamic();
   local_ref<ReadableNativeMap::jhybridobject> readableNativeMap =
       ReadableNativeMap::newObjectCxxArgs(map);
   return readableNativeMap;
 }
 
-void StateWrapperImpl::updateStateImpl(NativeMap *map) {
-  // Get folly::dynamic from map
-  auto dynamicMap = map->consume();
-  // Set state
-  state_->updateState(dynamicMap, nullptr);
+jni::local_ref<ReadableMapBuffer::jhybridobject>
+StateWrapperImpl::getStateMapBufferDataImpl() {
+  MapBuffer map = state_->getMapBuffer();
+  auto ReadableMapBuffer =
+      ReadableMapBuffer::createWithContents(std::move(map));
+  return ReadableMapBuffer;
 }
 
-void StateWrapperImpl::updateStateWithFailureCallbackImpl(
-    NativeMap *map,
-    jni::alias_ref<jobject> self,
-    int callbackRefId) {
+void StateWrapperImpl::updateStateImpl(NativeMap *map) {
   // Get folly::dynamic from map
   auto dynamicMap = map->consume();
-  // Turn the alias into a global_ref
-  // Note: this whole thing feels really janky, making StateWrapperImpl.java
-  // pass "this" into a function it's calling on "this". But after struggling
-  // for a while I couldn't figure out how to get a reference to the Java side
-  // of "this" in C++ in a way that's reasonably safe, and it maybe is even
-  // discouraged. Anyway, it might be weird, but this seems to work and be safe.
-  jni::global_ref<jobject> globalSelf = make_global(self);
   // Set state
-  state_->updateState(
-      dynamicMap, [globalSelf = std::move(globalSelf), callbackRefId]() {
-        static auto method =
-            jni::findClassStatic(
-                StateWrapperImpl::StateWrapperImplJavaDescriptor)
-                ->getMethod<void(jint)>("updateStateFailed");
-        method(globalSelf, callbackRefId);
-      });
+  state_->updateState(dynamicMap);
 }
 
 void StateWrapperImpl::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", StateWrapperImpl::initHybrid),
-      makeNativeMethod("getState", StateWrapperImpl::getState),
+      makeNativeMethod("getStateDataImpl", StateWrapperImpl::getStateDataImpl),
       makeNativeMethod("updateStateImpl", StateWrapperImpl::updateStateImpl),
       makeNativeMethod(
-          "updateStateWithFailureCallbackImpl",
-          StateWrapperImpl::updateStateWithFailureCallbackImpl),
+          "getStateMapBufferDataImpl",
+          StateWrapperImpl::getStateMapBufferDataImpl),
   });
 }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h
index 9a88eb0271bc9a..9193efc2518d49 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
+#include <react/common/mapbuffer/ReadableMapBuffer.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/core/State.h>
 
@@ -25,7 +26,8 @@ class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
 
   static void registerNatives();
 
-  jni::local_ref<ReadableNativeMap::jhybridobject> getState();
+  jni::local_ref<ReadableMapBuffer::jhybridobject> getStateMapBufferDataImpl();
+  jni::local_ref<ReadableNativeMap::jhybridobject> getStateDataImpl();
   void updateStateImpl(NativeMap *map);
   void updateStateWithFailureCallbackImpl(
       NativeMap *map,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.cpp
new file mode 100644
index 00000000000000..0df81d2a8992e0
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.cpp
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "SurfaceHandlerBinding.h"
+#include <react/renderer/scheduler/Scheduler.h>
+
+namespace facebook {
+namespace react {
+
+SurfaceHandlerBinding::SurfaceHandlerBinding(
+    SurfaceId surfaceId,
+    std::string const &moduleName)
+    : surfaceHandler_(moduleName, surfaceId) {}
+
+void SurfaceHandlerBinding::setDisplayMode(jint mode) {
+  surfaceHandler_.setDisplayMode(static_cast<DisplayMode>(mode));
+}
+
+void SurfaceHandlerBinding::start() {
+  std::unique_lock<better::shared_mutex> lock(lifecycleMutex_);
+
+  if (surfaceHandler_.getStatus() != SurfaceHandler::Status::Running) {
+    surfaceHandler_.start();
+  }
+}
+
+void SurfaceHandlerBinding::stop() {
+  std::unique_lock<better::shared_mutex> lock(lifecycleMutex_);
+
+  if (surfaceHandler_.getStatus() == SurfaceHandler::Status::Running) {
+    surfaceHandler_.stop();
+  }
+}
+
+jint SurfaceHandlerBinding::getSurfaceId() {
+  return surfaceHandler_.getSurfaceId();
+}
+
+void SurfaceHandlerBinding::setSurfaceId(jint surfaceId) {
+  surfaceHandler_.setSurfaceId(surfaceId);
+}
+
+jboolean SurfaceHandlerBinding::isRunning() {
+  return surfaceHandler_.getStatus() == SurfaceHandler::Status::Running;
+}
+
+jni::local_ref<jstring> SurfaceHandlerBinding::getModuleName() {
+  return jni::make_jstring(surfaceHandler_.getModuleName());
+}
+
+jni::local_ref<SurfaceHandlerBinding::jhybriddata>
+SurfaceHandlerBinding::initHybrid(
+    jni::alias_ref<jclass>,
+    jint surfaceId,
+    jni::alias_ref<jstring> moduleName) {
+  auto env = jni::Environment::current();
+  const char *moduleNameValue =
+      env->GetStringUTFChars(moduleName.get(), JNI_FALSE);
+  env->ReleaseStringUTFChars(moduleName.get(), moduleNameValue);
+
+  return makeCxxInstance(surfaceId, moduleNameValue);
+}
+
+void SurfaceHandlerBinding::setLayoutConstraints(
+    jfloat minWidth,
+    jfloat maxWidth,
+    jfloat minHeight,
+    jfloat maxHeight,
+    jfloat offsetX,
+    jfloat offsetY,
+    jboolean doLeftAndRightSwapInRTL,
+    jboolean isRTL,
+    jfloat pixelDensity) {
+  LayoutConstraints constraints = {};
+  constraints.minimumSize = {minWidth, minHeight};
+  constraints.maximumSize = {maxWidth, maxHeight};
+  constraints.layoutDirection =
+      isRTL ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
+
+  LayoutContext context = {};
+  context.swapLeftAndRightInRTL = doLeftAndRightSwapInRTL;
+  context.pointScaleFactor = pixelDensity;
+  context.viewportOffset = {offsetX, offsetY};
+
+  surfaceHandler_.constraintLayout(constraints, context);
+}
+
+void SurfaceHandlerBinding::setProps(NativeMap *props) {
+  surfaceHandler_.setProps(props->consume());
+}
+
+SurfaceHandler const &SurfaceHandlerBinding::getSurfaceHandler() {
+  return surfaceHandler_;
+}
+
+void SurfaceHandlerBinding::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", SurfaceHandlerBinding::initHybrid),
+      makeNativeMethod(
+          "getSurfaceIdNative", SurfaceHandlerBinding::getSurfaceId),
+      makeNativeMethod(
+          "setSurfaceIdNative", SurfaceHandlerBinding::setSurfaceId),
+      makeNativeMethod("isRunningNative", SurfaceHandlerBinding::isRunning),
+      makeNativeMethod(
+          "getModuleNameNative", SurfaceHandlerBinding::getModuleName),
+      makeNativeMethod("startNative", SurfaceHandlerBinding::start),
+      makeNativeMethod("stopNative", SurfaceHandlerBinding::stop),
+      makeNativeMethod(
+          "setLayoutConstraintsNative",
+          SurfaceHandlerBinding::setLayoutConstraints),
+      makeNativeMethod("setPropsNative", SurfaceHandlerBinding::setProps),
+      makeNativeMethod(
+          "setDisplayModeNative", SurfaceHandlerBinding::setDisplayMode),
+  });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.h
new file mode 100644
index 00000000000000..27158eb2880bb6
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/scheduler/SurfaceHandler.h>
+
+namespace facebook {
+namespace react {
+
+class SurfaceHandlerBinding : public jni::HybridClass<SurfaceHandlerBinding> {
+ public:
+  constexpr static const char *const kJavaDescriptor =
+      "Lcom/facebook/react/fabric/SurfaceHandlerBinding;";
+
+  static void registerNatives();
+
+  SurfaceHandlerBinding(SurfaceId surfaceId, std::string const &moduleName);
+
+  void start();
+  void stop();
+
+  void setDisplayMode(jint mode);
+
+  void registerScheduler(std::shared_ptr<Scheduler> scheduler);
+  void unregisterScheduler(std::shared_ptr<Scheduler> scheduler);
+
+  jint getSurfaceId();
+  void setSurfaceId(jint surfaceId);
+  jni::local_ref<jstring> getModuleName();
+
+  jboolean isRunning();
+
+  void setLayoutConstraints(
+      jfloat minWidth,
+      jfloat maxWidth,
+      jfloat minHeight,
+      jfloat maxHeight,
+      jfloat offsetX,
+      jfloat offsetY,
+      jboolean doLeftAndRightSwapInRTL,
+      jboolean isRTL,
+      jfloat pixelDensity);
+
+  void setProps(NativeMap *props);
+
+  SurfaceHandler const &getSurfaceHandler();
+
+ private:
+  mutable better::shared_mutex lifecycleMutex_;
+  const SurfaceHandler surfaceHandler_;
+
+  jni::alias_ref<SurfaceHandlerBinding::jhybriddata> jhybridobject_;
+
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>,
+      jint surfaceId,
+      jni::alias_ref<jstring> moduleName);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java
new file mode 100644
index 00000000000000..2370e84ba2fa97
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java
@@ -0,0 +1,406 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.fabric.mounting;
+
+import static com.facebook.infer.annotation.ThreadConfined.ANY;
+import static com.facebook.infer.annotation.ThreadConfined.UI;
+import static com.facebook.react.fabric.FabricUIManager.ENABLE_FABRIC_LOGS;
+import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT;
+
+import android.os.SystemClock;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.ThreadConfined;
+import com.facebook.react.bridge.ReactIgnorableMountingException;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
+import com.facebook.react.bridge.RetryableMountingLayerException;
+import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
+import com.facebook.react.fabric.mounting.mountitems.MountItem;
+import com.facebook.react.fabric.mounting.mountitems.PreAllocateViewMountItem;
+import com.facebook.systrace.Systrace;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+public class MountItemDispatcher {
+
+  private static final String TAG = "MountItemDispatcher";
+  private static final int FRAME_TIME_MS = 16;
+  private static final int MAX_TIME_IN_FRAME_FOR_NON_BATCHED_OPERATIONS_MS = 8;
+
+  private final MountingManager mMountingManager;
+  private final ItemDispatchListener mItemDispatchListener;
+
+  @NonNull
+  private final ConcurrentLinkedQueue<DispatchCommandMountItem> mViewCommandMountItems =
+      new ConcurrentLinkedQueue<>();
+
+  @NonNull
+  private final ConcurrentLinkedQueue<MountItem> mMountItems = new ConcurrentLinkedQueue<>();
+
+  @NonNull
+  private final ConcurrentLinkedQueue<PreAllocateViewMountItem> mPreMountItems =
+      new ConcurrentLinkedQueue<>();
+
+  private boolean mInDispatch = false;
+  private int mReDispatchCounter = 0;
+  private long mBatchedExecutionTime = 0L;
+  private long mRunStartTime = 0L;
+
+  public MountItemDispatcher(MountingManager mountingManager, ItemDispatchListener listener) {
+    mMountingManager = mountingManager;
+    mItemDispatchListener = listener;
+  }
+
+  @AnyThread
+  @ThreadConfined(ANY)
+  public void dispatchCommandMountItem(DispatchCommandMountItem command) {
+    addViewCommandMountItem(command);
+  }
+
+  public void addMountItem(MountItem mountItem) {
+    mMountItems.add(mountItem);
+  }
+
+  public void addPreAllocateMountItem(PreAllocateViewMountItem mountItem) {
+    // We do this check only for PreAllocateViewMountItem - and not DispatchMountItem or regular
+    // MountItem - because PreAllocateViewMountItem is not batched, and is relatively more expensive
+    // both to queue, to drain, and to execute.
+    if (!mMountingManager.surfaceIsStopped(mountItem.getSurfaceId())) {
+      mPreMountItems.add(mountItem);
+    } else if (IS_DEVELOPMENT_ENVIRONMENT) {
+      FLog.e(
+          TAG,
+          "Not queueing PreAllocateMountItem: surfaceId stopped: [%d] - %s",
+          mountItem.getSurfaceId(),
+          mountItem.toString());
+    }
+  }
+
+  public void addViewCommandMountItem(DispatchCommandMountItem mountItem) {
+    mViewCommandMountItems.add(mountItem);
+  }
+
+  /**
+   * Try to dispatch MountItems. Returns true if any items were dispatched, false otherwise. A
+   * `false` return value doesn't indicate errors, it may just indicate there was no work to be
+   * done.
+   *
+   * @return
+   */
+  @UiThread
+  @ThreadConfined(UI)
+  public boolean tryDispatchMountItems() {
+    // If we're already dispatching, don't reenter.
+    // Reentrance can potentially happen a lot on Android in Fabric because
+    // `updateState` from the
+    // mounting layer causes mount items to be dispatched synchronously. We want to 1) make sure
+    // we don't reenter in those cases, but 2) still execute those queued instructions
+    // synchronously.
+    // This is a pretty blunt tool, but we might not have better options since we really don't want
+    // to execute anything out-of-order.
+    if (mInDispatch) {
+      return false;
+    }
+
+    final boolean didDispatchItems;
+    try {
+      didDispatchItems = dispatchMountItems();
+    } catch (Throwable e) {
+      mReDispatchCounter = 0;
+      throw e;
+    } finally {
+      // Clean up after running dispatchMountItems - even if an exception was thrown
+      mInDispatch = false;
+    }
+
+    mItemDispatchListener.didDispatchMountItems();
+
+    // Decide if we want to try reentering
+    if (mReDispatchCounter < 10 && didDispatchItems) {
+      // Executing twice in a row is normal. Only log after that point.
+      if (mReDispatchCounter > 2) {
+        ReactSoftExceptionLogger.logSoftException(
+            TAG,
+            new ReactNoCrashSoftException(
+                "Re-dispatched "
+                    + mReDispatchCounter
+                    + " times. This indicates setState (?) is likely being called too many times during mounting."));
+      }
+
+      mReDispatchCounter++;
+      tryDispatchMountItems();
+    }
+    mReDispatchCounter = 0;
+    return didDispatchItems;
+  }
+
+  @UiThread
+  @ThreadConfined(UI)
+  public void dispatchMountItems(Queue<MountItem> mountItems) {
+    while (!mountItems.isEmpty()) {
+      MountItem item = mountItems.poll();
+      try {
+        item.execute(mMountingManager);
+      } catch (RetryableMountingLayerException e) {
+        if (item instanceof DispatchCommandMountItem) {
+          // Only DispatchCommandMountItem supports retries
+          DispatchCommandMountItem mountItem = (DispatchCommandMountItem) item;
+          // Retrying exactly once
+          if (mountItem.getRetries() == 0) {
+            mountItem.incrementRetries();
+            // In case we haven't retried executing this item yet, execute in the next batch of
+            // items
+            dispatchCommandMountItem(mountItem);
+          }
+        } else {
+          printMountItem(
+              item, "dispatchExternalMountItems: mounting failed with " + e.getMessage());
+        }
+      }
+    }
+  }
+
+  @UiThread
+  @ThreadConfined(UI)
+  /** Nothing should call this directly except for `tryDispatchMountItems`. */
+  private boolean dispatchMountItems() {
+    if (mReDispatchCounter == 0) {
+      mBatchedExecutionTime = 0;
+    }
+
+    mRunStartTime = SystemClock.uptimeMillis();
+
+    List<DispatchCommandMountItem> viewCommandMountItemsToDispatch =
+        getAndResetViewCommandMountItems();
+    List<MountItem> mountItemsToDispatch = getAndResetMountItems();
+
+    if (mountItemsToDispatch == null && viewCommandMountItemsToDispatch == null) {
+      return false;
+    }
+
+    // As an optimization, execute all ViewCommands first
+    // This should be:
+    // 1) Performant: ViewCommands are often a replacement for SetNativeProps, which we've always
+    // wanted to be as "synchronous" as possible.
+    // 2) Safer: ViewCommands are inherently disconnected from the tree commit/diff/mount process.
+    // JS imperatively queues these commands.
+    //    If JS has queued a command, it's reasonable to assume that the more time passes, the more
+    // likely it is that the view disappears.
+    //    Thus, by executing ViewCommands early, we should actually avoid a category of
+    // errors/glitches.
+    if (viewCommandMountItemsToDispatch != null) {
+      Systrace.beginSection(
+          Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+          "FabricUIManager::mountViews viewCommandMountItems to execute: "
+              + viewCommandMountItemsToDispatch.size());
+      for (DispatchCommandMountItem command : viewCommandMountItemsToDispatch) {
+        if (ENABLE_FABRIC_LOGS) {
+          printMountItem(command, "dispatchMountItems: Executing viewCommandMountItem");
+        }
+        try {
+          executeOrEnqueue(command);
+        } catch (RetryableMountingLayerException e) {
+          // If the exception is marked as Retryable, we retry the viewcommand exactly once, after
+          // the current batch of mount items has finished executing.
+          if (command.getRetries() == 0) {
+            command.incrementRetries();
+            dispatchCommandMountItem(command);
+          } else {
+            // It's very common for commands to be executed on views that no longer exist - for
+            // example, a blur event on TextInput being fired because of a navigation event away
+            // from the current screen. If the exception is marked as Retryable, we log a soft
+            // exception but never crash in debug.
+            // It's not clear that logging this is even useful, because these events are very
+            // common, mundane, and there's not much we can do about them currently.
+            ReactSoftExceptionLogger.logSoftException(
+                TAG,
+                new ReactNoCrashSoftException(
+                    "Caught exception executing ViewCommand: " + command.toString(), e));
+          }
+        } catch (Throwable e) {
+          // Non-Retryable exceptions are logged as soft exceptions in prod, but crash in Debug.
+          ReactSoftExceptionLogger.logSoftException(
+              TAG,
+              new RuntimeException(
+                  "Caught exception executing ViewCommand: " + command.toString(), e));
+        }
+      }
+
+      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+    }
+
+    // If there are MountItems to dispatch, we make sure all the "pre mount items" are executed
+    // first
+    Collection<PreAllocateViewMountItem> preMountItemsToDispatch = getAndResetPreMountItems();
+
+    if (preMountItemsToDispatch != null) {
+      Systrace.beginSection(
+          Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+          "FabricUIManager::mountViews preMountItems to execute: "
+              + preMountItemsToDispatch.size());
+
+      for (PreAllocateViewMountItem preMountItem : preMountItemsToDispatch) {
+        executeOrEnqueue(preMountItem);
+      }
+
+      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+    }
+
+    if (mountItemsToDispatch != null) {
+      Systrace.beginSection(
+          Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+          "FabricUIManager::mountViews mountItems to execute: " + mountItemsToDispatch.size());
+
+      long batchedExecutionStartTime = SystemClock.uptimeMillis();
+
+      for (MountItem mountItem : mountItemsToDispatch) {
+        if (ENABLE_FABRIC_LOGS) {
+          printMountItem(mountItem, "dispatchMountItems: Executing mountItem");
+        }
+
+        try {
+          executeOrEnqueue(mountItem);
+        } catch (Throwable e) {
+          // If there's an exception, we want to log diagnostics in prod and rethrow.
+          FLog.e(TAG, "dispatchMountItems: caught exception, displaying all MountItems", e);
+          for (MountItem m : mountItemsToDispatch) {
+            printMountItem(m, "dispatchMountItems: mountItem");
+          }
+
+          if (ReactIgnorableMountingException.isIgnorable(e)) {
+            ReactSoftExceptionLogger.logSoftException(TAG, e);
+          } else {
+            throw e;
+          }
+        }
+      }
+      mBatchedExecutionTime += SystemClock.uptimeMillis() - batchedExecutionStartTime;
+    }
+    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+
+    return true;
+  }
+
+  @UiThread
+  @ThreadConfined(UI)
+  public void dispatchPreMountItems(long frameTimeNanos) {
+    Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricUIManager::premountViews");
+
+    // dispatchPreMountItems cannot be reentrant, but we want to prevent dispatchMountItems from
+    // reentering during dispatchPreMountItems
+    mInDispatch = true;
+
+    try {
+      while (true) {
+        if (haveExceededNonBatchedFrameTime(frameTimeNanos)) {
+          break;
+        }
+
+        PreAllocateViewMountItem preMountItemToDispatch = mPreMountItems.poll();
+        // If list is empty, `poll` will return null, or var will never be set
+        if (preMountItemToDispatch == null) {
+          break;
+        }
+
+        if (ENABLE_FABRIC_LOGS) {
+          printMountItem(
+              preMountItemToDispatch,
+              "dispatchPreMountItems: Dispatching PreAllocateViewMountItem");
+        }
+
+        executeOrEnqueue(preMountItemToDispatch);
+      }
+    } finally {
+      mInDispatch = false;
+    }
+
+    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+  }
+
+  private void executeOrEnqueue(MountItem item) {
+    if (mMountingManager.isWaitingForViewAttach(item.getSurfaceId())) {
+      if (ENABLE_FABRIC_LOGS) {
+        FLog.e(
+            TAG,
+            "executeOrEnqueue: Item execution delayed, surface %s is not ready yet",
+            item.getSurfaceId());
+      }
+      SurfaceMountingManager surfaceMountingManager =
+          mMountingManager.getSurfaceManager(item.getSurfaceId());
+      surfaceMountingManager.executeOnViewAttach(item);
+    } else {
+      item.execute(mMountingManager);
+    }
+  }
+
+  @Nullable
+  private static <E extends MountItem> List<E> drainConcurrentItemQueue(
+      ConcurrentLinkedQueue<E> queue) {
+    List<E> result = new ArrayList<>();
+    while (!queue.isEmpty()) {
+      E item = queue.poll();
+      if (item != null) {
+        result.add(item);
+      }
+    }
+    if (result.size() == 0) {
+      return null;
+    }
+    return result;
+  }
+
+  /** Detect if we still have processing time left in this frame. */
+  private static boolean haveExceededNonBatchedFrameTime(long frameTimeNanos) {
+    long timeLeftInFrame = FRAME_TIME_MS - ((System.nanoTime() - frameTimeNanos) / 1000000);
+    return timeLeftInFrame < MAX_TIME_IN_FRAME_FOR_NON_BATCHED_OPERATIONS_MS;
+  }
+
+  @UiThread
+  @ThreadConfined(UI)
+  private List<DispatchCommandMountItem> getAndResetViewCommandMountItems() {
+    return drainConcurrentItemQueue(mViewCommandMountItems);
+  }
+
+  @UiThread
+  @ThreadConfined(UI)
+  private List<MountItem> getAndResetMountItems() {
+    return drainConcurrentItemQueue(mMountItems);
+  }
+
+  private Collection<PreAllocateViewMountItem> getAndResetPreMountItems() {
+    return drainConcurrentItemQueue(mPreMountItems);
+  }
+
+  public long getBatchedExecutionTime() {
+    return mBatchedExecutionTime;
+  }
+
+  public long getRunStartTime() {
+    return mRunStartTime;
+  }
+
+  private static void printMountItem(MountItem mountItem, String prefix) {
+    // If a MountItem description is split across multiple lines, it's because it's a
+    // compound MountItem. Log each line separately.
+    String[] mountItemLines = mountItem.toString().split("\n");
+    for (String m : mountItemLines) {
+      FLog.e(TAG, prefix + ": " + m);
+    }
+  }
+
+  public interface ItemDispatchListener {
+    void didDispatchMountItems();
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
index 74869a0ee45196..7e00a20defd00e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
@@ -10,736 +10,352 @@
 import static com.facebook.infer.annotation.ThreadConfined.ANY;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
 
-import android.content.Context;
+import android.text.Spannable;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
 import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.common.logging.FLog;
-import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.RetryableMountingLayerException;
-import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
-import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.touch.JSResponderHandler;
-import com.facebook.react.uimanager.IllegalViewOperationException;
-import com.facebook.react.uimanager.ReactStylesDiffMap;
-import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewManager;
-import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.facebook.react.views.text.ReactTextViewManagerCallback;
+import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import com.facebook.yoga.YogaMeasureMode;
+import java.util.Map;
+import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Class responsible for actually dispatching view updates enqueued via {@link
- * FabricUIManager#scheduleMountItems(int, MountItem[])} on the UI thread.
+ * FabricUIManager#scheduleMountItem} on the UI thread.
  */
 public class MountingManager {
   public static final String TAG = MountingManager.class.getSimpleName();
-  private static final boolean SHOW_CHANGED_VIEW_HIERARCHIES = ReactBuildConfig.DEBUG && false;
+  private static final int MAX_STOPPED_SURFACE_IDS_LENGTH = 15;
+
+  @NonNull
+  private final ConcurrentHashMap<Integer, SurfaceMountingManager> mSurfaceIdToManager =
+      new ConcurrentHashMap<>(); // any thread
+
+  private final CopyOnWriteArrayList<Integer> mStoppedSurfaceIds = new CopyOnWriteArrayList<>();
+
+  @Nullable private SurfaceMountingManager mMostRecentSurfaceMountingManager;
+  @Nullable private SurfaceMountingManager mLastQueriedSurfaceMountingManager;
 
-  @NonNull private final ConcurrentHashMap<Integer, ViewState> mTagToViewState;
   @NonNull private final JSResponderHandler mJSResponderHandler = new JSResponderHandler();
   @NonNull private final ViewManagerRegistry mViewManagerRegistry;
+  @NonNull private final MountItemExecutor mMountItemExecutor;
   @NonNull private final RootViewManager mRootViewManager = new RootViewManager();
 
-  public MountingManager(@NonNull ViewManagerRegistry viewManagerRegistry) {
-    mTagToViewState = new ConcurrentHashMap<>();
+  public interface MountItemExecutor {
+    @UiThread
+    @ThreadConfined(UI)
+    void executeItems(Queue<MountItem> items);
+  }
+
+  public MountingManager(
+      @NonNull ViewManagerRegistry viewManagerRegistry,
+      @NonNull MountItemExecutor mountItemExecutor) {
     mViewManagerRegistry = viewManagerRegistry;
+    mMountItemExecutor = mountItemExecutor;
   }
 
-  private static void logViewHierarchy(ViewGroup parent, boolean recurse) {
-    int parentTag = parent.getId();
-    FLog.e(TAG, "  <ViewGroup tag=" + parentTag + " class=" + parent.getClass().toString() + ">");
-    for (int i = 0; i < parent.getChildCount(); i++) {
-      FLog.e(
-          TAG,
-          "     <View idx="
-              + i
-              + " tag="
-              + parent.getChildAt(i).getId()
-              + " class="
-              + parent.getChildAt(i).getClass().toString()
-              + ">");
-    }
-    FLog.e(TAG, "  </ViewGroup tag=" + parentTag + ">");
-
-    if (recurse) {
-      FLog.e(TAG, "Displaying Ancestors:");
-      ViewParent ancestor = parent.getParent();
-      while (ancestor != null) {
-        ViewGroup ancestorViewGroup = (ancestor instanceof ViewGroup ? (ViewGroup) ancestor : null);
-        int ancestorId = ancestorViewGroup == null ? View.NO_ID : ancestorViewGroup.getId();
-        FLog.e(
-            TAG,
-            "<ViewParent tag=" + ancestorId + " class=" + ancestor.getClass().toString() + ">");
-        ancestor = ancestor.getParent();
-      }
-    }
+  /** Starts surface and attaches the root view. */
+  @AnyThread
+  public void startSurface(
+      final int surfaceId, @NonNull final View rootView, ThemedReactContext themedReactContext) {
+    SurfaceMountingManager mountingManager = startSurface(surfaceId);
+    mountingManager.attachRootView(rootView, themedReactContext);
   }
 
   /**
-   * This mutates the rootView, which is an Android View, so this should only be called on the UI
-   * thread.
-   *
-   * @param reactRootTag
-   * @param rootView
+   * Starts surface without attaching the view. All view operations executed against that surface
+   * will be queued until the view is attached.
    */
-  @ThreadConfined(UI)
-  public void addRootView(int reactRootTag, @NonNull View rootView) {
-    if (rootView.getId() != View.NO_ID) {
-      throw new IllegalViewOperationException(
-          "Trying to add a root view with an explicit id already set. React Native uses "
-              + "the id field to track react tags and will overwrite this field. If that is fine, "
-              + "explicitly overwrite the id field to View.NO_ID before calling addRootView.");
+  @AnyThread
+  public SurfaceMountingManager startSurface(final int surfaceId) {
+    SurfaceMountingManager surfaceMountingManager =
+        new SurfaceMountingManager(
+            surfaceId,
+            mJSResponderHandler,
+            mViewManagerRegistry,
+            mRootViewManager,
+            mMountItemExecutor);
+
+    // There could technically be a race condition here if addRootView is called twice from
+    // different threads, though this is (probably) extremely unlikely, and likely an error.
+    // This logic to protect against race conditions is a holdover from older code, and we don't
+    // know if it actually happens in practice - so, we're logging soft exceptions for now.
+    // This *will* crash in Debug mode, but not in production.
+    mSurfaceIdToManager.putIfAbsent(surfaceId, surfaceMountingManager);
+    if (mSurfaceIdToManager.get(surfaceId) != surfaceMountingManager) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Called startSurface more than once for the SurfaceId [" + surfaceId + "]"));
     }
 
-    mTagToViewState.put(
-        reactRootTag, new ViewState(reactRootTag, rootView, mRootViewManager, true));
-    rootView.setId(reactRootTag);
+    mMostRecentSurfaceMountingManager = mSurfaceIdToManager.get(surfaceId);
+    return surfaceMountingManager;
   }
 
-  /** Delete rootView and all children/ */
-  @UiThread
-  public void deleteRootView(int reactRootTag) {
-    if (mTagToViewState.containsKey(reactRootTag)) {
-      dropView(mTagToViewState.get(reactRootTag).mView, true);
+  @AnyThread
+  public void attachRootView(
+      final int surfaceId, @NonNull final View rootView, ThemedReactContext themedReactContext) {
+    SurfaceMountingManager surfaceMountingManager =
+        getSurfaceManagerEnforced(surfaceId, "attachView");
+
+    if (surfaceMountingManager.isStopped()) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG, new IllegalStateException("Trying to attach a view to a stopped surface"));
+      return;
     }
-  }
-
-  /** Releases all references to given native View. */
-  @UiThread
-  private void dropView(@NonNull View view, boolean deleteImmediately) {
-    UiThreadUtil.assertOnUiThread();
 
-    final int reactTag = view.getId();
-    ViewState state = getViewState(reactTag);
-    ViewManager viewManager = state.mViewManager;
+    surfaceMountingManager.attachRootView(rootView, themedReactContext);
+  }
 
-    if (!state.mIsRoot && viewManager != null) {
-      // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
-      viewManager.onDropViewInstance(view);
-    }
-    if (view instanceof ViewGroup && viewManager instanceof ViewGroupManager) {
-      final ViewGroup viewGroup = (ViewGroup) view;
-      final ViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(state);
-
-      // As documented elsewhere, sometimes when a child is removed from a parent, that change
-      // is not immediately available in the hierarchy until a future UI tick. This can cause
-      // inconsistent child counts, etc, but it can _also_ cause us to drop views that shouldn't,
-      // because they're removed from the parent but that change isn't immediately visible. So,
-      // we do two things: 1) delay this logic until the next UI thread tick, 2) ignore children
-      // who don't report the expected parent.
-      // For most cases, we _do not_ want this logic to run, anyway, since it either means that we
-      // don't have a correct set of MountingInstructions; or it means that we're tearing down an
-      // entire screen, in which case we can safely delete everything immediately, not having
-      // executed any remove instructions immediately before this.
-      if (deleteImmediately) {
-        dropChildren(reactTag, viewGroup, viewGroupManager);
-      } else {
-        UiThreadUtil.runOnUiThread(
-            new Runnable() {
-              @Override
-              public void run() {
-                dropChildren(reactTag, viewGroup, viewGroupManager);
-              }
-            });
+  @AnyThread
+  public void stopSurface(final int surfaceId) {
+    SurfaceMountingManager surfaceMountingManager = mSurfaceIdToManager.get(surfaceId);
+    if (surfaceMountingManager != null) {
+      // Maximum number of stopped surfaces to keep track of
+      while (mStoppedSurfaceIds.size() >= MAX_STOPPED_SURFACE_IDS_LENGTH) {
+        Integer staleStoppedId = mStoppedSurfaceIds.get(0);
+        mSurfaceIdToManager.remove(staleStoppedId.intValue());
+        mStoppedSurfaceIds.remove(staleStoppedId);
+        FLog.d(TAG, "Removing stale SurfaceMountingManager: [%d]", staleStoppedId.intValue());
       }
-    }
+      mStoppedSurfaceIds.add(surfaceId);
 
-    mTagToViewState.remove(reactTag);
-  }
+      surfaceMountingManager.stopSurface();
 
-  @UiThread
-  private void dropChildren(
-      int reactTag,
-      @NonNull ViewGroup viewGroup,
-      @NonNull ViewGroupManager<ViewGroup> viewGroupManager) {
-    for (int i = viewGroupManager.getChildCount(viewGroup) - 1; i >= 0; i--) {
-      View child = viewGroupManager.getChildAt(viewGroup, i);
-      if (getNullableViewState(child.getId()) != null) {
-        if (SHOW_CHANGED_VIEW_HIERARCHIES) {
-          FLog.e(
-              TAG,
-              "Automatically dropping view that is still attached to a parent being dropped. Parent: ["
-                  + reactTag
-                  + "] child: ["
-                  + child.getId()
-                  + "]");
-        }
-        ViewParent childParent = child.getParent();
-        if (childParent == null || !childParent.equals(viewGroup)) {
-          int childParentId =
-              (childParent == null
-                  ? -1
-                  : (childParent instanceof ViewGroup ? ((ViewGroup) childParent).getId() : -1));
-          FLog.e(
-              TAG,
-              "Recursively deleting children of ["
-                  + reactTag
-                  + "] but parent of child ["
-                  + child.getId()
-                  + "] is ["
-                  + childParentId
-                  + "]");
-        } else {
-          dropView(child, true);
-        }
+      if (surfaceMountingManager == mMostRecentSurfaceMountingManager) {
+        mMostRecentSurfaceMountingManager = null;
       }
-      viewGroupManager.removeViewAt(viewGroup, i);
+    } else {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Cannot call stopSurface on non-existent surface: [" + surfaceId + "]"));
     }
   }
 
-  @UiThread
-  public void addViewAt(final int parentTag, final int tag, final int index) {
-    UiThreadUtil.assertOnUiThread();
-    ViewState parentViewState = getViewState(parentTag);
-    if (!(parentViewState.mView instanceof ViewGroup)) {
-      String message =
-          "Unable to add a view into a view that is not a ViewGroup. ParentTag: "
-              + parentTag
-              + " - Tag: "
-              + tag
-              + " - Index: "
-              + index;
-      FLog.e(TAG, message);
-      throw new IllegalStateException(message);
-    }
-    final ViewGroup parentView = (ViewGroup) parentViewState.mView;
-    ViewState viewState = getViewState(tag);
-    final View view = viewState.mView;
-    if (view == null) {
-      throw new IllegalStateException(
-          "Unable to find view for viewState " + viewState + " and tag " + tag);
-    }
-
-    // Display children before inserting
-    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
-      FLog.e(TAG, "addViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " BEFORE");
-      logViewHierarchy(parentView, false);
+  @Nullable
+  public SurfaceMountingManager getSurfaceManager(int surfaceId) {
+    if (mLastQueriedSurfaceMountingManager != null
+        && mLastQueriedSurfaceMountingManager.getSurfaceId() == surfaceId) {
+      return mLastQueriedSurfaceMountingManager;
     }
 
-    try {
-      getViewGroupManager(parentViewState).addView(parentView, view, index);
-    } catch (IllegalStateException e) {
-      // Wrap error with more context for debugging
-      throw new IllegalStateException(
-          "addViewAt: failed to insert view ["
-              + tag
-              + "] into parent ["
-              + parentTag
-              + "] at index "
-              + index,
-          e);
+    if (mMostRecentSurfaceMountingManager != null
+        && mMostRecentSurfaceMountingManager.getSurfaceId() == surfaceId) {
+      return mMostRecentSurfaceMountingManager;
     }
 
-    // Display children after inserting
-    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
-      UiThreadUtil.runOnUiThread(
-          new Runnable() {
-            @Override
-            public void run() {
-              FLog.e(
-                  TAG, "addViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " AFTER");
-              logViewHierarchy(parentView, false);
-            }
-          });
-    }
+    SurfaceMountingManager surfaceMountingManager = mSurfaceIdToManager.get(surfaceId);
+    mLastQueriedSurfaceMountingManager = surfaceMountingManager;
+    return surfaceMountingManager;
   }
 
   @NonNull
-  private ViewState getViewState(int tag) {
-    ViewState viewState = mTagToViewState.get(tag);
-    if (viewState == null) {
-      throw new RetryableMountingLayerException("Unable to find viewState view for tag " + tag);
-    }
-    return viewState;
-  }
-
-  public boolean getViewExists(int tag) {
-    return mTagToViewState.get(tag) != null;
-  }
-
-  private @Nullable ViewState getNullableViewState(int tag) {
-    return mTagToViewState.get(tag);
-  }
-
-  @Deprecated
-  public void receiveCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
-    ViewState viewState = getNullableViewState(reactTag);
-
-    // It's not uncommon for JS to send events as/after a component is being removed from the
-    // view hierarchy. For example, TextInput may send a "blur" command in response to the view
-    // disappearing. Throw `ReactNoCrashSoftException` so they're logged but don't crash in dev
-    // for now.
-    if (viewState == null) {
-      throw new RetryableMountingLayerException(
-          "Unable to find viewState for tag: " + reactTag + " for commandId: " + commandId);
-    }
+  public SurfaceMountingManager getSurfaceManagerEnforced(int surfaceId, String context) {
+    SurfaceMountingManager surfaceMountingManager = getSurfaceManager(surfaceId);
 
-    if (viewState.mViewManager == null) {
-      throw new RetryableMountingLayerException("Unable to find viewManager for tag " + reactTag);
-    }
-
-    if (viewState.mView == null) {
+    if (surfaceMountingManager == null) {
       throw new RetryableMountingLayerException(
-          "Unable to find viewState view for tag " + reactTag);
+          "Unable to find SurfaceMountingManager for surfaceId: ["
+              + surfaceId
+              + "]. Context: "
+              + context);
     }
 
-    viewState.mViewManager.receiveCommand(viewState.mView, commandId, commandArgs);
+    return surfaceMountingManager;
   }
 
-  public void receiveCommand(
-      int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {
-    ViewState viewState = getNullableViewState(reactTag);
-
-    // It's not uncommon for JS to send events as/after a component is being removed from the
-    // view hierarchy. For example, TextInput may send a "blur" command in response to the view
-    // disappearing. Throw `ReactNoCrashSoftException` so they're logged but don't crash in dev
-    // for now.
-    if (viewState == null) {
-      throw new RetryableMountingLayerException(
-          "Unable to find viewState for tag: " + reactTag + " for commandId: " + commandId);
-    }
-
-    if (viewState.mViewManager == null) {
-      throw new RetryableMountingLayerException(
-          "Unable to find viewState manager for tag " + reactTag);
+  public boolean surfaceIsStopped(int surfaceId) {
+    if (mStoppedSurfaceIds.contains(surfaceId)) {
+      return true;
     }
 
-    if (viewState.mView == null) {
-      throw new RetryableMountingLayerException(
-          "Unable to find viewState view for tag " + reactTag);
+    SurfaceMountingManager surfaceMountingManager = getSurfaceManager(surfaceId);
+    if (surfaceMountingManager != null && surfaceMountingManager.isStopped()) {
+      return true;
     }
 
-    viewState.mViewManager.receiveCommand(viewState.mView, commandId, commandArgs);
+    return false;
   }
 
-  public void sendAccessibilityEvent(int reactTag, int eventType) {
-    ViewState viewState = getViewState(reactTag);
-
-    if (viewState.mViewManager == null) {
-      throw new RetryableMountingLayerException(
-          "Unable to find viewState manager for tag " + reactTag);
+  public boolean isWaitingForViewAttach(int surfaceId) {
+    SurfaceMountingManager mountingManager = getSurfaceManager(surfaceId);
+    if (mountingManager == null) {
+      return false;
     }
 
-    if (viewState.mView == null) {
-      throw new RetryableMountingLayerException(
-          "Unable to find viewState view for tag " + reactTag);
+    if (mountingManager.isStopped()) {
+      return false;
     }
 
-    viewState.mView.sendAccessibilityEvent(eventType);
-  }
-
-  @SuppressWarnings("unchecked") // prevents unchecked conversion warn of the <ViewGroup> type
-  private static @NonNull ViewGroupManager<ViewGroup> getViewGroupManager(
-      @NonNull ViewState viewState) {
-    if (viewState.mViewManager == null) {
-      throw new IllegalStateException("Unable to find ViewManager for view: " + viewState);
-    }
-    return (ViewGroupManager<ViewGroup>) viewState.mViewManager;
+    return !mountingManager.isRootViewAttached();
   }
 
-  @UiThread
-  public void removeViewAt(final int tag, final int parentTag, int index) {
-    UiThreadUtil.assertOnUiThread();
-    ViewState viewState = getNullableViewState(parentTag);
-
-    if (viewState == null) {
-      ReactSoftException.logSoftException(
-          MountingManager.TAG,
-          new IllegalStateException(
-              "Unable to find viewState for tag: " + parentTag + " for removeViewAt"));
-      return;
-    }
-
-    final ViewGroup parentView = (ViewGroup) viewState.mView;
-
-    if (parentView == null) {
-      throw new IllegalStateException("Unable to find view for tag " + parentTag);
-    }
-
-    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
-      // Display children before deleting any
-      FLog.e(TAG, "removeViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " BEFORE");
-      logViewHierarchy(parentView, false);
-    }
-
-    ViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(viewState);
-
-    // Verify that the view we're about to remove has the same tag we expect
-    View view = viewGroupManager.getChildAt(parentView, index);
-    int actualTag = (view != null ? view.getId() : -1);
-    if (actualTag != tag) {
-      int tagActualIndex = -1;
-      int parentChildrenCount = parentView.getChildCount();
-      for (int i = 0; i < parentChildrenCount; i++) {
-        if (parentView.getChildAt(i).getId() == tag) {
-          tagActualIndex = i;
-          break;
+  /**
+   * Get SurfaceMountingManager associated with a ReactTag. Unfortunately, this requires lookups
+   * over N maps, where N is the number of active or recently-stopped Surfaces. Each lookup will
+   * cost `log(M)` operations where M is the number of reactTags in the surface, so the total cost
+   * per lookup is `O(N * log(M))`.
+   *
+   * <p>To mitigate this cost, we attempt to keep track of the "most recent" SurfaceMountingManager
+   * and do lookups in it first. For the vast majority of use-cases, except for events or operations
+   * sent to off-screen surfaces, or use-cases where multiple surfaces are visible and interactable,
+   * this will reduce the lookup time to `O(log(M))`. Someone smarter than me could probably figure
+   * out an amortized time.
+   *
+   * @param reactTag
+   * @return
+   */
+  @Nullable
+  public SurfaceMountingManager getSurfaceManagerForView(int reactTag) {
+    if (mMostRecentSurfaceMountingManager != null
+        && mMostRecentSurfaceMountingManager.getViewExists(reactTag)) {
+      return mMostRecentSurfaceMountingManager;
+    }
+
+    for (Map.Entry<Integer, SurfaceMountingManager> entry : mSurfaceIdToManager.entrySet()) {
+      SurfaceMountingManager smm = entry.getValue();
+      if (smm != mMostRecentSurfaceMountingManager && smm.getViewExists(reactTag)) {
+        if (mMostRecentSurfaceMountingManager == null) {
+          mMostRecentSurfaceMountingManager = smm;
         }
+        return smm;
       }
-
-      // TODO T74425739: previously, we did not do this check and `removeViewAt` would be executed
-      // below, sometimes crashing there. *However*, interestingly enough, `removeViewAt` would not
-      // complain if you removed views from an already-empty parent. This seems necessary currently
-      // for certain ViewManagers that remove their own children - like BottomSheet?
-      // This workaround seems not-great, but for now, we just return here for
-      // backwards-compatibility. Essentially, if a view has already been removed from the
-      // hierarchy, we treat it as a noop.
-      if (tagActualIndex == -1) {
-        FLog.e(
-            TAG,
-            "removeViewAt: ["
-                + tag
-                + "] -> ["
-                + parentTag
-                + "] @"
-                + index
-                + ": view already removed from parent! Children in parent: "
-                + parentChildrenCount);
-        return;
-      }
-
-      // Here we are guaranteed that the view is still in the View hierarchy, just
-      // at a different index. In debug mode we'll crash here; in production, we'll remove
-      // the child from the parent and move on.
-      // This is an issue that is safely recoverable 95% of the time. If this allows corruption
-      // of the view hierarchy and causes bugs or a crash after this point, there will be logs
-      // indicating that this happened.
-      // This is likely *only* necessary because of Fabric's LayoutAnimations implementation.
-      // If we can fix the bug there, or remove the need for LayoutAnimation index adjustment
-      // entirely, we can just throw this exception without regression user experience.
-      logViewHierarchy(parentView, true);
-      ReactSoftException.logSoftException(
-          TAG,
-          new IllegalStateException(
-              "Tried to remove view ["
-                  + tag
-                  + "] of parent ["
-                  + parentTag
-                  + "] at index "
-                  + index
-                  + ", but got view tag "
-                  + actualTag
-                  + " - actual index of view: "
-                  + tagActualIndex));
-      index = tagActualIndex;
-    }
-
-    try {
-      viewGroupManager.removeViewAt(parentView, index);
-    } catch (RuntimeException e) {
-      // Note: `getChildCount` may not always be accurate!
-      // We don't currently have a good explanation other than, in situations where you
-      // would empirically expect to see childCount > 0, the childCount is reported as 0.
-      // This is likely due to a ViewManager overriding getChildCount or some other methods
-      // in a way that is strictly incorrect, but potentially only visible here.
-      // The failure mode is actually that in `removeViewAt`, a NullPointerException is
-      // thrown when we try to perform an operation on a View that doesn't exist, and
-      // is therefore null.
-      // We try to add some extra diagnostics here, but we always try to remove the View
-      // from the hierarchy first because detecting by looking at childCount will not work.
-      //
-      // Note that the lesson here is that `getChildCount` is not /required/ to adhere to
-      // any invariants. If you add 9 children to a parent, the `getChildCount` of the parent
-      // may not be equal to 9. This apparently causes no issues with Android and is common
-      // enough that we shouldn't try to change this invariant, without a lot of thought.
-      int childCount = viewGroupManager.getChildCount(parentView);
-
-      logViewHierarchy(parentView, true);
-
-      throw new IllegalStateException(
-          "Cannot remove child at index "
-              + index
-              + " from parent ViewGroup ["
-              + parentView.getId()
-              + "], only "
-              + childCount
-              + " children in parent. Warning: childCount may be incorrect!",
-          e);
-    }
-
-    // Display children after deleting any
-    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
-      final int finalIndex = index;
-      UiThreadUtil.runOnUiThread(
-          new Runnable() {
-            @Override
-            public void run() {
-              FLog.e(
-                  TAG,
-                  "removeViewAt: ["
-                      + tag
-                      + "] -> ["
-                      + parentTag
-                      + "] idx: "
-                      + finalIndex
-                      + " AFTER");
-              logViewHierarchy(parentView, false);
-            }
-          });
     }
+    return null;
   }
 
-  @UiThread
-  public void createView(
-      @NonNull ThemedReactContext themedReactContext,
-      @NonNull String componentName,
-      int reactTag,
-      @Nullable ReadableMap props,
-      @Nullable StateWrapper stateWrapper,
-      boolean isLayoutable) {
-    if (getNullableViewState(reactTag) != null) {
-      return;
-    }
-
-    View view = null;
-    ViewManager viewManager = null;
-
-    ReactStylesDiffMap propsDiffMap = null;
-    if (props != null) {
-      propsDiffMap = new ReactStylesDiffMap(props);
-    }
+  @NonNull
+  @AnyThread
+  public SurfaceMountingManager getSurfaceManagerForViewEnforced(int reactTag) {
+    SurfaceMountingManager surfaceMountingManager = getSurfaceManagerForView(reactTag);
 
-    if (isLayoutable) {
-      viewManager = mViewManagerRegistry.get(componentName);
-      // View Managers are responsible for dealing with initial state and props.
-      view =
-          viewManager.createView(
-              themedReactContext, propsDiffMap, stateWrapper, mJSResponderHandler);
-      view.setId(reactTag);
+    if (surfaceMountingManager == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find SurfaceMountingManager for tag: [" + reactTag + "]");
     }
 
-    ViewState viewState = new ViewState(reactTag, view, viewManager);
-    viewState.mCurrentProps = propsDiffMap;
-    viewState.mCurrentState = (stateWrapper != null ? stateWrapper.getState() : null);
-
-    mTagToViewState.put(reactTag, viewState);
+    return surfaceMountingManager;
   }
 
-  @UiThread
-  public void updateProps(int reactTag, @Nullable ReadableMap props) {
-    if (props == null) {
-      return;
-    }
-    UiThreadUtil.assertOnUiThread();
-    ViewState viewState = getViewState(reactTag);
-    viewState.mCurrentProps = new ReactStylesDiffMap(props);
-    View view = viewState.mView;
-
-    if (view == null) {
-      throw new IllegalStateException("Unable to find view for tag " + reactTag);
-    }
-
-    Assertions.assertNotNull(viewState.mViewManager)
-        .updateProperties(view, viewState.mCurrentProps);
+  public boolean getViewExists(int reactTag) {
+    return getSurfaceManagerForView(reactTag) != null;
   }
 
-  @UiThread
-  public void updateLayout(int reactTag, int x, int y, int width, int height) {
+  @Deprecated
+  public void receiveCommand(
+      int surfaceId, int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
     UiThreadUtil.assertOnUiThread();
-
-    ViewState viewState = getViewState(reactTag);
-    // Do not layout Root Views
-    if (viewState.mIsRoot) {
-      return;
-    }
-
-    View viewToUpdate = viewState.mView;
-    if (viewToUpdate == null) {
-      throw new IllegalStateException("Unable to find View for tag: " + reactTag);
-    }
-
-    viewToUpdate.measure(
-        View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
-        View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY));
-
-    ViewParent parent = viewToUpdate.getParent();
-    if (parent instanceof RootView) {
-      parent.requestLayout();
-    }
-
-    // TODO: T31905686 Check if the parent of the view has to layout the view, or the child has
-    // to lay itself out. see NativeViewHierarchyManager.updateLayout
-    viewToUpdate.layout(x, y, x + width, y + height);
+    getSurfaceManagerEnforced(surfaceId, "receiveCommand:int")
+        .receiveCommand(reactTag, commandId, commandArgs);
   }
 
-  @UiThread
-  public void updatePadding(int reactTag, int left, int top, int right, int bottom) {
+  public void receiveCommand(
+      int surfaceId, int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {
     UiThreadUtil.assertOnUiThread();
-
-    ViewState viewState = getViewState(reactTag);
-    // Do not layout Root Views
-    if (viewState.mIsRoot) {
-      return;
-    }
-
-    View viewToUpdate = viewState.mView;
-    if (viewToUpdate == null) {
-      throw new IllegalStateException("Unable to find View for tag: " + reactTag);
-    }
-
-    ViewManager viewManager = viewState.mViewManager;
-    if (viewManager == null) {
-      throw new IllegalStateException("Unable to find ViewManager for view: " + viewState);
-    }
-
-    //noinspection unchecked
-    viewManager.setPadding(viewToUpdate, left, top, right, bottom);
+    getSurfaceManagerEnforced(surfaceId, "receiveCommand:string")
+        .receiveCommand(reactTag, commandId, commandArgs);
   }
 
-  @UiThread
-  public void deleteView(int reactTag) {
+  /**
+   * Send an accessibility eventType to a Native View. eventType is any valid `AccessibilityEvent.X`
+   * value.
+   *
+   * <p>Why accept `-1` SurfaceId? Currently there are calls to UIManager.sendAccessibilityEvent
+   * which is a legacy API and accepts only reactTag. We will have to investigate and migrate away
+   * from those calls over time.
+   *
+   * @param surfaceId {@link int} that identifies the surface or -1 to temporarily support backward
+   *     compatibility.
+   * @param reactTag {@link int} that identifies the react Tag of the view.
+   * @param eventType {@link int} that identifies Android eventType. see {@link
+   *     View#sendAccessibilityEvent}
+   */
+  public void sendAccessibilityEvent(int surfaceId, int reactTag, int eventType) {
     UiThreadUtil.assertOnUiThread();
-    ViewState viewState = getNullableViewState(reactTag);
-
-    if (viewState == null) {
-      ReactSoftException.logSoftException(
-          MountingManager.TAG,
-          new IllegalStateException(
-              "Unable to find viewState for tag: " + reactTag + " for deleteView"));
-      return;
-    }
-
-    // To delete we simply remove the tag from the registry.
-    // In the past we called dropView here, but we want to rely on either
-    // (1) the correct set of MountInstructions being sent to the platform
-    // and/or (2) dropView being called by stopSurface.
-    // If Views are orphaned at this stage and leaked, it's a problem in
-    // the differ or LayoutAnimations, not MountingManager.
-    // Additionally, as documented in `dropView`, we cannot always trust a
-    // view's children to be up-to-date.
-    mTagToViewState.remove(reactTag);
-
-    // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
-    ViewManager viewManager = viewState.mViewManager;
-    if (!viewState.mIsRoot && viewManager != null) {
-      viewManager.onDropViewInstance(viewState.mView);
+    if (surfaceId == View.NO_ID) {
+      getSurfaceManagerForViewEnforced(reactTag).sendAccessibilityEvent(reactTag, eventType);
+    } else {
+      getSurfaceManagerEnforced(surfaceId, "sendAccessibilityEvent")
+          .sendAccessibilityEvent(reactTag, eventType);
     }
   }
 
   @UiThread
-  public void updateState(final int reactTag, @Nullable StateWrapper stateWrapper) {
+  public void updateProps(int reactTag, @Nullable ReadableMap props) {
     UiThreadUtil.assertOnUiThread();
-    ViewState viewState = getViewState(reactTag);
-    @Nullable ReadableNativeMap newState = stateWrapper == null ? null : stateWrapper.getState();
-
-    viewState.mCurrentState = newState;
-
-    ViewManager viewManager = viewState.mViewManager;
-
-    if (viewManager == null) {
-      throw new IllegalStateException("Unable to find ViewManager for tag: " + reactTag);
-    }
-    Object extraData =
-        viewManager.updateState(viewState.mView, viewState.mCurrentProps, stateWrapper);
-    if (extraData != null) {
-      viewManager.updateExtraData(viewState.mView, extraData);
-    }
-  }
-
-  @UiThread
-  public void preallocateView(
-      @NonNull ThemedReactContext reactContext,
-      String componentName,
-      int reactTag,
-      @Nullable ReadableMap props,
-      @Nullable StateWrapper stateWrapper,
-      boolean isLayoutable) {
-
-    if (getNullableViewState(reactTag) != null) {
-      throw new IllegalStateException(
-          "View for component " + componentName + " with tag " + reactTag + " already exists.");
+    if (props == null) {
+      return;
     }
 
-    createView(reactContext, componentName, reactTag, props, stateWrapper, isLayoutable);
-  }
-
-  @UiThread
-  public void updateEventEmitter(int reactTag, @NonNull EventEmitterWrapper eventEmitter) {
-    UiThreadUtil.assertOnUiThread();
-    ViewState viewState = mTagToViewState.get(reactTag);
-    if (viewState == null) {
-      // TODO T62717437 - Use a flag to determine that these event emitters belong to virtual nodes
-      // only.
-      viewState = new ViewState(reactTag, null, null);
-      mTagToViewState.put(reactTag, viewState);
-    }
-    viewState.mEventEmitter = eventEmitter;
+    getSurfaceManagerForViewEnforced(reactTag).updateProps(reactTag, props);
   }
 
   /**
-   * Set the JS responder for the view associated with the tags received as a parameter.
-   *
-   * <p>The JSResponder coordinates the return values of the onInterceptTouch method in Android
-   * Views. This allows JS to coordinate when a touch should be handled by JS or by the Android
-   * native views. See {@link JSResponderHandler} for more details.
-   *
-   * <p>This method is going to be executed on the UIThread as soon as it is delivered from JS to
-   * RN.
-   *
-   * <p>Currently, there is no warranty that the view associated with the react tag exists, because
-   * this method is not handled by the react commit process.
-   *
-   * @param reactTag React tag of the first parent of the view that is NOT virtual
-   * @param initialReactTag React tag of the JS view that initiated the touch operation
-   * @param blockNativeResponder If native responder should be blocked or not
+   * Clears the JS Responder specified by {@link #setJSResponder(int, int, int, boolean)}. After
+   * this method is called, all the touch events are going to be handled by JS.
    */
   @UiThread
-  public synchronized void setJSResponder(
-      int reactTag, int initialReactTag, boolean blockNativeResponder) {
-    if (!blockNativeResponder) {
-      mJSResponderHandler.setJSResponder(initialReactTag, null);
-      return;
-    }
-
-    ViewState viewState = getViewState(reactTag);
-    View view = viewState.mView;
-    if (initialReactTag != reactTag && view instanceof ViewParent) {
-      // In this case, initialReactTag corresponds to a virtual/layout-only View, and we already
-      // have a parent of that View in reactTag, so we can use it.
-      mJSResponderHandler.setJSResponder(initialReactTag, (ViewParent) view);
-      return;
-    } else if (view == null) {
-      SoftAssertions.assertUnreachable("Cannot find view for tag " + reactTag + ".");
-      return;
-    }
+  public void clearJSResponder() {
+    // MountingManager and SurfaceMountingManagers all share the same JSResponderHandler.
+    // Must be called on MountingManager instead of SurfaceMountingManager, because we don't
+    // know what surfaceId it's being called for.
+    mJSResponderHandler.clearJSResponder();
+  }
 
-    if (viewState.mIsRoot) {
-      SoftAssertions.assertUnreachable(
-          "Cannot block native responder on " + reactTag + " that is a root view");
+  @AnyThread
+  @ThreadConfined(ANY)
+  public @Nullable EventEmitterWrapper getEventEmitter(int surfaceId, int reactTag) {
+    SurfaceMountingManager surfaceMountingManager =
+        (surfaceId == -1 ? getSurfaceManagerForView(reactTag) : getSurfaceManager(surfaceId));
+    if (surfaceMountingManager == null) {
+      return null;
     }
-    mJSResponderHandler.setJSResponder(initialReactTag, view.getParent());
+    return surfaceMountingManager.getEventEmitter(reactTag);
   }
 
   /**
-   * Clears the JS Responder specified by {@link #setJSResponder(int, int, boolean)}. After this
-   * method is called, all the touch events are going to be handled by JS.
+   * Measure a component, given localData, props, state, and measurement information. This needs to
+   * remain here for now - and not in SurfaceMountingManager - because sometimes measures are made
+   * outside of the context of a Surface; especially from C++ before StartSurface is called.
+   *
+   * @param context
+   * @param componentName
+   * @param localData
+   * @param props
+   * @param state
+   * @param width
+   * @param widthMode
+   * @param height
+   * @param heightMode
+   * @param attachmentsPositions
+   * @return
    */
-  @UiThread
-  public void clearJSResponder() {
-    mJSResponderHandler.clearJSResponder();
-  }
-
   @AnyThread
   public long measure(
-      @NonNull Context context,
+      @NonNull ReactContext context,
       @NonNull String componentName,
       @NonNull ReadableMap localData,
       @NonNull ReadableMap props,
@@ -764,53 +380,50 @@ public long measure(
             attachmentsPositions);
   }
 
-  @AnyThread
-  @ThreadConfined(ANY)
-  public @Nullable EventEmitterWrapper getEventEmitter(int reactTag) {
-    ViewState viewState = getNullableViewState(reactTag);
-    return viewState == null ? null : viewState.mEventEmitter;
-  }
-
   /**
-   * This class holds view state for react tags. Objects of this class are stored into the {@link
-   * #mTagToViewState}, and they should be updated in the same thread.
+   * Measure a component, given localData, props, state, and measurement information. This needs to
+   * remain here for now - and not in SurfaceMountingManager - because sometimes measures are made
+   * outside of the context of a Surface; especially from C++ before StartSurface is called.
+   *
+   * @param context
+   * @param componentName
+   * @param attributedString
+   * @param paragraphAttributes
+   * @param width
+   * @param widthMode
+   * @param height
+   * @param heightMode
+   * @param attachmentsPositions
+   * @return
    */
-  private static class ViewState {
-    @Nullable final View mView;
-    final int mReactTag;
-    final boolean mIsRoot;
-    @Nullable final ViewManager mViewManager;
-    @Nullable public ReactStylesDiffMap mCurrentProps = null;
-    @Nullable public ReadableMap mCurrentLocalData = null;
-    @Nullable public ReadableMap mCurrentState = null;
-    @Nullable public EventEmitterWrapper mEventEmitter = null;
-
-    private ViewState(int reactTag, @Nullable View view, @Nullable ViewManager viewManager) {
-      this(reactTag, view, viewManager, false);
-    }
+  @AnyThread
+  public long measureTextMapBuffer(
+      @NonNull ReactContext context,
+      @NonNull String componentName,
+      @NonNull ReadableMapBuffer attributedString,
+      @NonNull ReadableMapBuffer paragraphAttributes,
+      float width,
+      @NonNull YogaMeasureMode widthMode,
+      float height,
+      @NonNull YogaMeasureMode heightMode,
+      @Nullable float[] attachmentsPositions) {
 
-    private ViewState(int reactTag, @Nullable View view, ViewManager viewManager, boolean isRoot) {
-      mReactTag = reactTag;
-      mView = view;
-      mIsRoot = isRoot;
-      mViewManager = viewManager;
-    }
+    return TextLayoutManagerMapBuffer.measureText(
+        context,
+        attributedString,
+        paragraphAttributes,
+        width,
+        widthMode,
+        height,
+        heightMode,
+        new ReactTextViewManagerCallback() {
+          @Override
+          public void onPostProcessSpannable(Spannable text) {}
+        },
+        attachmentsPositions);
+  }
 
-    @Override
-    public String toString() {
-      boolean isLayoutOnly = mViewManager == null;
-      return "ViewState ["
-          + mReactTag
-          + "] - isRoot: "
-          + mIsRoot
-          + " - props: "
-          + mCurrentProps
-          + " - localData: "
-          + mCurrentLocalData
-          + " - viewManager: "
-          + mViewManager
-          + " - isLayoutOnly: "
-          + isLayoutOnly;
-    }
+  public void initializeViewManager(String componentName) {
+    mViewManagerRegistry.get(componentName);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
new file mode 100644
index 00000000000000..1f05f824c8f6ec
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
@@ -0,0 +1,1008 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.fabric.mounting;
+
+import static com.facebook.infer.annotation.ThreadConfined.ANY;
+import static com.facebook.infer.annotation.ThreadConfined.UI;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
+import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.ThreadConfined;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.RetryableMountingLayerException;
+import com.facebook.react.bridge.SoftAssertions;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
+import com.facebook.react.fabric.mounting.MountingManager.MountItemExecutor;
+import com.facebook.react.fabric.mounting.mountitems.MountItem;
+import com.facebook.react.touch.JSResponderHandler;
+import com.facebook.react.uimanager.IllegalViewOperationException;
+import com.facebook.react.uimanager.ReactRoot;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.react.uimanager.RootView;
+import com.facebook.react.uimanager.RootViewManager;
+import com.facebook.react.uimanager.StateWrapper;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import javax.annotation.Nullable;
+
+public class SurfaceMountingManager {
+  public static final String TAG = SurfaceMountingManager.class.getSimpleName();
+
+  private static final boolean SHOW_CHANGED_VIEW_HIERARCHIES = ReactBuildConfig.DEBUG && false;
+
+  private volatile boolean mIsStopped = false;
+  private volatile boolean mRootViewAttached = false;
+
+  @Nullable private ThemedReactContext mThemedReactContext;
+
+  // These are all non-null, until StopSurface is called
+  private ConcurrentHashMap<Integer, ViewState> mTagToViewState =
+      new ConcurrentHashMap<>(); // any thread
+  private ConcurrentLinkedQueue<MountItem> mOnViewAttachItems = new ConcurrentLinkedQueue<>();
+  private JSResponderHandler mJSResponderHandler;
+  private ViewManagerRegistry mViewManagerRegistry;
+  private RootViewManager mRootViewManager;
+  private MountItemExecutor mMountItemExecutor;
+
+  // This is null *until* StopSurface is called.
+  private Set<Integer> mTagSetForStoppedSurface;
+
+  private final int mSurfaceId;
+
+  public SurfaceMountingManager(
+      int surfaceId,
+      @NonNull JSResponderHandler jsResponderHandler,
+      @NonNull ViewManagerRegistry viewManagerRegistry,
+      @NonNull RootViewManager rootViewManager,
+      @NonNull MountItemExecutor mountItemExecutor) {
+    mSurfaceId = surfaceId;
+
+    mJSResponderHandler = jsResponderHandler;
+    mViewManagerRegistry = viewManagerRegistry;
+    mRootViewManager = rootViewManager;
+    mMountItemExecutor = mountItemExecutor;
+  }
+
+  public boolean isStopped() {
+    return mIsStopped;
+  }
+
+  public void attachRootView(View rootView, ThemedReactContext themedReactContext) {
+    mThemedReactContext = themedReactContext;
+    addRootView(rootView);
+  }
+
+  public int getSurfaceId() {
+    return mSurfaceId;
+  }
+
+  public boolean isRootViewAttached() {
+    return mRootViewAttached;
+  }
+
+  @Nullable
+  public ThemedReactContext getContext() {
+    return mThemedReactContext;
+  }
+
+  private static void logViewHierarchy(ViewGroup parent, boolean recurse) {
+    int parentTag = parent.getId();
+    FLog.e(TAG, "  <ViewGroup tag=" + parentTag + " class=" + parent.getClass().toString() + ">");
+    for (int i = 0; i < parent.getChildCount(); i++) {
+      FLog.e(
+          TAG,
+          "     <View idx="
+              + i
+              + " tag="
+              + parent.getChildAt(i).getId()
+              + " class="
+              + parent.getChildAt(i).getClass().toString()
+              + ">");
+    }
+    FLog.e(TAG, "  </ViewGroup tag=" + parentTag + ">");
+
+    if (recurse) {
+      FLog.e(TAG, "Displaying Ancestors:");
+      ViewParent ancestor = parent.getParent();
+      while (ancestor != null) {
+        ViewGroup ancestorViewGroup = (ancestor instanceof ViewGroup ? (ViewGroup) ancestor : null);
+        int ancestorId = ancestorViewGroup == null ? View.NO_ID : ancestorViewGroup.getId();
+        FLog.e(
+            TAG,
+            "<ViewParent tag=" + ancestorId + " class=" + ancestor.getClass().toString() + ">");
+        ancestor = ancestor.getParent();
+      }
+    }
+  }
+
+  public boolean getViewExists(int tag) {
+    // If Surface stopped, check if tag *was* associated with this Surface, even though it's been
+    // deleted. This helps distinguish between scenarios where an invalid tag is referenced, vs
+    // race conditions where an imperative method is called on a tag during/just after StopSurface.
+    if (mTagSetForStoppedSurface != null && mTagSetForStoppedSurface.contains(tag)) {
+      return true;
+    }
+    if (mTagToViewState == null) {
+      return false;
+    }
+    return mTagToViewState.containsKey(tag);
+  }
+
+  @AnyThread
+  public void executeOnViewAttach(MountItem item) {
+    mOnViewAttachItems.add(item);
+  }
+
+  @AnyThread
+  private void addRootView(@NonNull final View rootView) {
+    if (isStopped()) {
+      return;
+    }
+
+    mTagToViewState.put(mSurfaceId, new ViewState(mSurfaceId, rootView, mRootViewManager, true));
+
+    Runnable runnable =
+        new Runnable() {
+          @Override
+          public void run() {
+            // The CPU has ticked since `addRootView` was called, so the surface could technically
+            // have already stopped here.
+            if (isStopped()) {
+              return;
+            }
+
+            if (rootView.getId() == mSurfaceId) {
+              ReactSoftExceptionLogger.logSoftException(
+                  TAG,
+                  new IllegalViewOperationException(
+                      "Race condition in addRootView detected. Trying to set an id of ["
+                          + mSurfaceId
+                          + "] on the RootView, but that id has already been set. "));
+            } else if (rootView.getId() != View.NO_ID) {
+              FLog.e(
+                  TAG,
+                  "Trying to add RootTag to RootView that already has a tag: existing tag: [%d] new tag: [%d]",
+                  rootView.getId(),
+                  mSurfaceId);
+              throw new IllegalViewOperationException(
+                  "Trying to add a root view with an explicit id already set. React Native uses "
+                      + "the id field to track react tags and will overwrite this field. If that is fine, "
+                      + "explicitly overwrite the id field to View.NO_ID before calling addRootView.");
+            }
+            rootView.setId(mSurfaceId);
+
+            if (rootView instanceof ReactRoot) {
+              ((ReactRoot) rootView).setRootViewTag(mSurfaceId);
+            }
+            mRootViewAttached = true;
+
+            executeViewAttachMountItems();
+          }
+        };
+
+    if (UiThreadUtil.isOnUiThread()) {
+      runnable.run();
+    } else {
+      UiThreadUtil.runOnUiThread(runnable);
+    }
+  }
+
+  @UiThread
+  @ThreadConfined(UI)
+  private void executeViewAttachMountItems() {
+    mMountItemExecutor.executeItems(mOnViewAttachItems);
+  }
+
+  /**
+   * Stop surface and all operations within it. Garbage-collect Views (caller is responsible for
+   * removing RootView from View layer).
+   *
+   * <p>Delete rootView from cache. Since RN does not control the RootView, in a sense, the fragment
+   * is responsible for actually removing the RootView from the hierarchy / tearing down the
+   * fragment.
+   *
+   * <p>In the original version(s) of this function, we recursively went through all children of the
+   * View and dropped those Views as well; ad infinitum. This was before we had a
+   * SurfaceMountingManager, and all tags were in one global map. Doing this was particularly
+   * important in the case of StopSurface, where race conditions between threads meant you couldn't
+   * rely on DELETE instructions actually deleting all Views in the Surface.
+   *
+   * <p>Now that we have SurfaceMountingManager, we can simply drop our local reference to the View.
+   * Since it will be removed from the View hierarchy entirely (outside of the scope of this class),
+   * garbage collection will take care of destroying it and all descendents.
+   */
+  @AnyThread
+  public void stopSurface() {
+    if (isStopped()) {
+      return;
+    }
+
+    // Prevent more views from being created, or the hierarchy from being manipulated at all. This
+    // causes further operations to noop.
+    mIsStopped = true;
+
+    // Reset all StateWrapper objects
+    // Since this can happen on any thread, is it possible to race between StateWrapper destruction
+    // and some accesses from View classes in the UI thread?
+    for (ViewState viewState : mTagToViewState.values()) {
+      if (viewState.mStateWrapper != null) {
+        viewState.mStateWrapper.destroyState();
+        viewState.mStateWrapper = null;
+      }
+      if (ReactFeatureFlags.enableAggressiveEventEmitterCleanup) {
+        if (viewState.mEventEmitter != null) {
+          viewState.mEventEmitter.destroy();
+          viewState.mEventEmitter = null;
+        }
+      }
+    }
+
+    Runnable runnable =
+        new Runnable() {
+          @Override
+          public void run() {
+            // We must call `onDropViewInstance` on all remaining Views
+            for (ViewState viewState : mTagToViewState.values()) {
+              onViewStateDeleted(viewState);
+            }
+
+            // Evict all views from cache and memory
+            mTagSetForStoppedSurface = mTagToViewState.keySet();
+            mTagToViewState = null;
+            mJSResponderHandler = null;
+            mRootViewManager = null;
+            mMountItemExecutor = null;
+            mOnViewAttachItems.clear();
+          }
+        };
+
+    if (UiThreadUtil.isOnUiThread()) {
+      runnable.run();
+    } else {
+      UiThreadUtil.runOnUiThread(runnable);
+    }
+  }
+
+  @UiThread
+  public void addViewAt(final int parentTag, final int tag, final int index) {
+    UiThreadUtil.assertOnUiThread();
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState parentViewState = getViewState(parentTag);
+    if (!(parentViewState.mView instanceof ViewGroup)) {
+      String message =
+          "Unable to add a view into a view that is not a ViewGroup. ParentTag: "
+              + parentTag
+              + " - Tag: "
+              + tag
+              + " - Index: "
+              + index;
+      FLog.e(TAG, message);
+      throw new IllegalStateException(message);
+    }
+    final ViewGroup parentView = (ViewGroup) parentViewState.mView;
+    ViewState viewState = getViewState(tag);
+    final View view = viewState.mView;
+    if (view == null) {
+      throw new IllegalStateException(
+          "Unable to find view for viewState " + viewState + " and tag " + tag);
+    }
+
+    // Display children before inserting
+    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
+      FLog.e(TAG, "addViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " BEFORE");
+      logViewHierarchy(parentView, false);
+    }
+
+    ViewParent viewParent = view.getParent();
+    if (viewParent != null) {
+      int actualParentId =
+          viewParent instanceof ViewGroup ? ((ViewGroup) viewParent).getId() : View.NO_ID;
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "addViewAt: cannot insert view ["
+                  + tag
+                  + "] into parent ["
+                  + parentTag
+                  + "]: View already has a parent: ["
+                  + actualParentId
+                  + "] "
+                  + viewParent.getClass().getSimpleName()));
+    }
+
+    try {
+      getViewGroupManager(parentViewState).addView(parentView, view, index);
+    } catch (IllegalStateException e) {
+      // Wrap error with more context for debugging
+      throw new IllegalStateException(
+          "addViewAt: failed to insert view ["
+              + tag
+              + "] into parent ["
+              + parentTag
+              + "] at index "
+              + index,
+          e);
+    }
+
+    // Display children after inserting
+    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
+      // Why are we calling `runOnUiThread`? We're already on the UI thread, right?!
+      // Yes - but if you get the children of the View here and display them, *it might show you
+      // the previous children*. Without getting too much into Android internals, basically if we
+      // wait a tick, everything is what we expect.
+      // tldr is that `parent.children == []; parent.addView(x); parent.children == []`
+      // and you need to wait a tick for `parent.children == [x]`.
+      UiThreadUtil.runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              FLog.e(
+                  TAG, "addViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " AFTER");
+              logViewHierarchy(parentView, false);
+            }
+          });
+    }
+  }
+
+  @UiThread
+  public void removeViewAt(final int tag, final int parentTag, int index) {
+    if (isStopped()) {
+      return;
+    }
+
+    UiThreadUtil.assertOnUiThread();
+    ViewState parentViewState = getNullableViewState(parentTag);
+
+    // TODO: throw exception here?
+    if (parentViewState == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          MountingManager.TAG,
+          new IllegalStateException(
+              "Unable to find viewState for tag: [" + parentTag + "] for removeViewAt"));
+      return;
+    }
+
+    if (!(parentViewState.mView instanceof ViewGroup)) {
+      String message =
+          "Unable to remove a view from a view that is not a ViewGroup. ParentTag: "
+              + parentTag
+              + " - Tag: "
+              + tag
+              + " - Index: "
+              + index;
+      FLog.e(TAG, message);
+      throw new IllegalStateException(message);
+    }
+
+    final ViewGroup parentView = (ViewGroup) parentViewState.mView;
+
+    if (parentView == null) {
+      throw new IllegalStateException("Unable to find view for tag [" + parentTag + "]");
+    }
+
+    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
+      // Display children before deleting any
+      FLog.e(TAG, "removeViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " BEFORE");
+      logViewHierarchy(parentView, false);
+    }
+
+    ViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(parentViewState);
+
+    // Verify that the view we're about to remove has the same tag we expect
+    View view = viewGroupManager.getChildAt(parentView, index);
+    int actualTag = (view != null ? view.getId() : -1);
+    if (actualTag != tag) {
+      int tagActualIndex = -1;
+      int parentChildrenCount = parentView.getChildCount();
+      for (int i = 0; i < parentChildrenCount; i++) {
+        if (parentView.getChildAt(i).getId() == tag) {
+          tagActualIndex = i;
+          break;
+        }
+      }
+
+      // TODO T74425739: previously, we did not do this check and `removeViewAt` would be executed
+      // below, sometimes crashing there. *However*, interestingly enough, `removeViewAt` would not
+      // complain if you removed views from an already-empty parent. This seems necessary currently
+      // for certain ViewManagers that remove their own children - like BottomSheet?
+      // This workaround seems not-great, but for now, we just return here for
+      // backwards-compatibility. Essentially, if a view has already been removed from the
+      // hierarchy, we treat it as a noop.
+      if (tagActualIndex == -1) {
+        FLog.e(
+            TAG,
+            "removeViewAt: ["
+                + tag
+                + "] -> ["
+                + parentTag
+                + "] @"
+                + index
+                + ": view already removed from parent! Children in parent: "
+                + parentChildrenCount);
+        return;
+      }
+
+      // Here we are guaranteed that the view is still in the View hierarchy, just
+      // at a different index. In debug mode we'll crash here; in production, we'll remove
+      // the child from the parent and move on.
+      // This is an issue that is safely recoverable 95% of the time. If this allows corruption
+      // of the view hierarchy and causes bugs or a crash after this point, there will be logs
+      // indicating that this happened.
+      // This is likely *only* necessary because of Fabric's LayoutAnimations implementation.
+      // If we can fix the bug there, or remove the need for LayoutAnimation index adjustment
+      // entirely, we can just throw this exception without regression user experience.
+      logViewHierarchy(parentView, true);
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Tried to remove view ["
+                  + tag
+                  + "] of parent ["
+                  + parentTag
+                  + "] at index "
+                  + index
+                  + ", but got view tag "
+                  + actualTag
+                  + " - actual index of view: "
+                  + tagActualIndex));
+      index = tagActualIndex;
+    }
+
+    try {
+      viewGroupManager.removeViewAt(parentView, index);
+    } catch (RuntimeException e) {
+      // Note: `getChildCount` may not always be accurate!
+      // We don't currently have a good explanation other than, in situations where you
+      // would empirically expect to see childCount > 0, the childCount is reported as 0.
+      // This is likely due to a ViewManager overriding getChildCount or some other methods
+      // in a way that is strictly incorrect, but potentially only visible here.
+      // The failure mode is actually that in `removeViewAt`, a NullPointerException is
+      // thrown when we try to perform an operation on a View that doesn't exist, and
+      // is therefore null.
+      // We try to add some extra diagnostics here, but we always try to remove the View
+      // from the hierarchy first because detecting by looking at childCount will not work.
+      //
+      // Note that the lesson here is that `getChildCount` is not /required/ to adhere to
+      // any invariants. If you add 9 children to a parent, the `getChildCount` of the parent
+      // may not be equal to 9. This apparently causes no issues with Android and is common
+      // enough that we shouldn't try to change this invariant, without a lot of thought.
+      int childCount = viewGroupManager.getChildCount(parentView);
+
+      logViewHierarchy(parentView, true);
+
+      throw new IllegalStateException(
+          "Cannot remove child at index "
+              + index
+              + " from parent ViewGroup ["
+              + parentView.getId()
+              + "], only "
+              + childCount
+              + " children in parent. Warning: childCount may be incorrect!",
+          e);
+    }
+
+    // Display children after deleting any
+    if (SHOW_CHANGED_VIEW_HIERARCHIES) {
+      final int finalIndex = index;
+      UiThreadUtil.runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              FLog.e(
+                  TAG,
+                  "removeViewAt: ["
+                      + tag
+                      + "] -> ["
+                      + parentTag
+                      + "] idx: "
+                      + finalIndex
+                      + " AFTER");
+              logViewHierarchy(parentView, false);
+            }
+          });
+    }
+  }
+
+  @UiThread
+  public void createView(
+      @NonNull String componentName,
+      int reactTag,
+      @Nullable ReadableMap props,
+      @Nullable StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
+      boolean isLayoutable) {
+    if (isStopped()) {
+      return;
+    }
+    // We treat this as a perf problem and not a logical error. View Preallocation or unexpected
+    // changes to Differ or C++ Binding could cause some redundant Create instructions.
+    // This is a NoCrash soft exception because we know there are cases where preallocation happens
+    // and a node is recreated: if a node is preallocated and then committed with revision 2+,
+    // an extra CREATE instruction will be generated.
+    // This represents a perf issue only, not a correctness issue. In the future we need to
+    // refactor View preallocation to correct the currently incorrect assumptions.
+    if (getNullableViewState(reactTag) != null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Cannot CREATE view with tag [" + reactTag + "], already exists."));
+      return;
+    }
+
+    createViewUnsafe(
+        componentName, reactTag, props, stateWrapper, eventEmitterWrapper, isLayoutable);
+  }
+
+  /**
+   * Perform view creation without any safety checks. You must ensure safety before calling this
+   * method (see existing callsites).
+   *
+   * @param componentName
+   * @param reactTag
+   * @param props
+   * @param stateWrapper
+   * @param eventEmitterWrapper
+   * @param isLayoutable
+   */
+  @UiThread
+  public void createViewUnsafe(
+      @NonNull String componentName,
+      int reactTag,
+      @Nullable ReadableMap props,
+      @Nullable StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
+      boolean isLayoutable) {
+    View view = null;
+    ViewManager viewManager = null;
+
+    ReactStylesDiffMap propsDiffMap = null;
+    if (props != null) {
+      propsDiffMap = new ReactStylesDiffMap(props);
+    }
+
+    if (isLayoutable) {
+      viewManager = mViewManagerRegistry.get(componentName);
+      // View Managers are responsible for dealing with initial state and props.
+      view =
+          viewManager.createView(
+              reactTag, mThemedReactContext, propsDiffMap, stateWrapper, mJSResponderHandler);
+    }
+
+    ViewState viewState = new ViewState(reactTag, view, viewManager);
+    viewState.mCurrentProps = propsDiffMap;
+    viewState.mStateWrapper = stateWrapper;
+    viewState.mEventEmitter = eventEmitterWrapper;
+
+    mTagToViewState.put(reactTag, viewState);
+  }
+
+  public void updateProps(int reactTag, ReadableMap props) {
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getViewState(reactTag);
+    viewState.mCurrentProps = new ReactStylesDiffMap(props);
+    View view = viewState.mView;
+
+    if (view == null) {
+      throw new IllegalStateException("Unable to find view for tag [" + reactTag + "]");
+    }
+
+    Assertions.assertNotNull(viewState.mViewManager)
+        .updateProperties(view, viewState.mCurrentProps);
+  }
+
+  @Deprecated
+  public void receiveCommand(int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getNullableViewState(reactTag);
+
+    // It's not uncommon for JS to send events as/after a component is being removed from the
+    // view hierarchy. For example, TextInput may send a "blur" command in response to the view
+    // disappearing. Throw `ReactNoCrashSoftException` so they're logged but don't crash in dev
+    // for now.
+    if (viewState == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find viewState for tag: [" + reactTag + "] for commandId: " + commandId);
+    }
+
+    if (viewState.mViewManager == null) {
+      throw new RetryableMountingLayerException("Unable to find viewManager for tag " + reactTag);
+    }
+
+    if (viewState.mView == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find viewState view for tag " + reactTag);
+    }
+
+    viewState.mViewManager.receiveCommand(viewState.mView, commandId, commandArgs);
+  }
+
+  public void receiveCommand(
+      int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getNullableViewState(reactTag);
+
+    // It's not uncommon for JS to send events as/after a component is being removed from the
+    // view hierarchy. For example, TextInput may send a "blur" command in response to the view
+    // disappearing. Throw `ReactNoCrashSoftException` so they're logged but don't crash in dev
+    // for now.
+    if (viewState == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find viewState for tag: " + reactTag + " for commandId: " + commandId);
+    }
+
+    if (viewState.mViewManager == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find viewState manager for tag " + reactTag);
+    }
+
+    if (viewState.mView == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find viewState view for tag " + reactTag);
+    }
+
+    viewState.mViewManager.receiveCommand(viewState.mView, commandId, commandArgs);
+  }
+
+  public void sendAccessibilityEvent(int reactTag, int eventType) {
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getViewState(reactTag);
+
+    if (viewState.mViewManager == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find viewState manager for tag " + reactTag);
+    }
+
+    if (viewState.mView == null) {
+      throw new RetryableMountingLayerException(
+          "Unable to find viewState view for tag " + reactTag);
+    }
+
+    viewState.mView.sendAccessibilityEvent(eventType);
+  }
+
+  @UiThread
+  public void updateLayout(int reactTag, int x, int y, int width, int height, int displayType) {
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getViewState(reactTag);
+    // Do not layout Root Views
+    if (viewState.mIsRoot) {
+      return;
+    }
+
+    View viewToUpdate = viewState.mView;
+    if (viewToUpdate == null) {
+      throw new IllegalStateException("Unable to find View for tag: " + reactTag);
+    }
+
+    viewToUpdate.measure(
+        View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
+        View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY));
+
+    ViewParent parent = viewToUpdate.getParent();
+    if (parent instanceof RootView) {
+      parent.requestLayout();
+    }
+
+    // TODO: T31905686 Check if the parent of the view has to layout the view, or the child has
+    // to lay itself out. see NativeViewHierarchyManager.updateLayout
+    viewToUpdate.layout(x, y, x + width, y + height);
+
+    // displayType: 0 represents display: 'none'
+    int visibility = displayType == 0 ? View.INVISIBLE : View.VISIBLE;
+    if (viewToUpdate.getVisibility() != visibility) {
+      viewToUpdate.setVisibility(visibility);
+    }
+  }
+
+  @UiThread
+  public void updatePadding(int reactTag, int left, int top, int right, int bottom) {
+    UiThreadUtil.assertOnUiThread();
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getViewState(reactTag);
+    // Do not layout Root Views
+    if (viewState.mIsRoot) {
+      return;
+    }
+
+    View viewToUpdate = viewState.mView;
+    if (viewToUpdate == null) {
+      throw new IllegalStateException("Unable to find View for tag: " + reactTag);
+    }
+
+    ViewManager viewManager = viewState.mViewManager;
+    if (viewManager == null) {
+      throw new IllegalStateException("Unable to find ViewManager for view: " + viewState);
+    }
+
+    //noinspection unchecked
+    viewManager.setPadding(viewToUpdate, left, top, right, bottom);
+  }
+
+  @UiThread
+  public void updateState(final int reactTag, @Nullable StateWrapper stateWrapper) {
+    UiThreadUtil.assertOnUiThread();
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getViewState(reactTag);
+
+    StateWrapper prevStateWrapper = viewState.mStateWrapper;
+    viewState.mStateWrapper = stateWrapper;
+
+    ViewManager viewManager = viewState.mViewManager;
+
+    if (viewManager == null) {
+      throw new IllegalStateException("Unable to find ViewManager for tag: " + reactTag);
+    }
+    Object extraData =
+        viewManager.updateState(viewState.mView, viewState.mCurrentProps, stateWrapper);
+    if (extraData != null) {
+      viewManager.updateExtraData(viewState.mView, extraData);
+    }
+
+    // Immediately clear native side of previous state wrapper. This causes the State object in C++
+    // to be destroyed immediately instead of waiting for Java GC to kick in.
+    if (prevStateWrapper != null) {
+      prevStateWrapper.destroyState();
+    }
+  }
+
+  @UiThread
+  public void updateEventEmitter(int reactTag, @NonNull EventEmitterWrapper eventEmitter) {
+    UiThreadUtil.assertOnUiThread();
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = mTagToViewState.get(reactTag);
+    if (viewState == null) {
+      // TODO T62717437 - Use a flag to determine that these event emitters belong to virtual nodes
+      // only.
+      viewState = new ViewState(reactTag, null, null);
+      mTagToViewState.put(reactTag, viewState);
+    }
+    EventEmitterWrapper previousEventEmitterWrapper = viewState.mEventEmitter;
+    viewState.mEventEmitter = eventEmitter;
+
+    // Immediately destroy native side of wrapper, instead of waiting for Java GC.
+    if (previousEventEmitterWrapper != eventEmitter && previousEventEmitterWrapper != null) {
+      previousEventEmitterWrapper.destroy();
+    }
+  }
+
+  @UiThread
+  public synchronized void setJSResponder(
+      int reactTag, int initialReactTag, boolean blockNativeResponder) {
+    UiThreadUtil.assertOnUiThread();
+    if (isStopped()) {
+      return;
+    }
+
+    if (!blockNativeResponder) {
+      mJSResponderHandler.setJSResponder(initialReactTag, null);
+      return;
+    }
+
+    ViewState viewState = getViewState(reactTag);
+    View view = viewState.mView;
+    if (initialReactTag != reactTag && view instanceof ViewParent) {
+      // In this case, initialReactTag corresponds to a virtual/layout-only View, and we already
+      // have a parent of that View in reactTag, so we can use it.
+      mJSResponderHandler.setJSResponder(initialReactTag, (ViewParent) view);
+      return;
+    } else if (view == null) {
+      SoftAssertions.assertUnreachable("Cannot find view for tag [" + reactTag + "].");
+      return;
+    }
+
+    if (viewState.mIsRoot) {
+      SoftAssertions.assertUnreachable(
+          "Cannot block native responder on [" + reactTag + "] that is a root view");
+    }
+    mJSResponderHandler.setJSResponder(initialReactTag, view.getParent());
+  }
+
+  @UiThread
+  private void onViewStateDeleted(ViewState viewState) {
+    // Destroy state immediately instead of waiting for Java GC.
+    if (viewState.mStateWrapper != null) {
+      viewState.mStateWrapper.destroyState();
+      viewState.mStateWrapper = null;
+    }
+
+    // Destroy EventEmitterWrapper immediately instead of waiting for Java GC.
+    // Notably, this is also required to ensure that the EventEmitterWrapper is deallocated
+    // before the JS VM is deallocated, since it holds onto a JSI::Pointer.
+    if (viewState.mEventEmitter != null) {
+      viewState.mEventEmitter.destroy();
+      viewState.mEventEmitter = null;
+    }
+
+    // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
+    ViewManager viewManager = viewState.mViewManager;
+    if (!viewState.mIsRoot && viewManager != null) {
+      viewManager.onDropViewInstance(viewState.mView);
+    }
+  }
+
+  @UiThread
+  public void deleteView(int reactTag) {
+    UiThreadUtil.assertOnUiThread();
+    if (isStopped()) {
+      return;
+    }
+
+    ViewState viewState = getNullableViewState(reactTag);
+
+    if (viewState == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          MountingManager.TAG,
+          new IllegalStateException(
+              "Unable to find viewState for tag: " + reactTag + " for deleteView"));
+      return;
+    }
+
+    // To delete we simply remove the tag from the registry.
+    // We want to rely on the correct set of MountInstructions being sent to the platform,
+    // or StopSurface being called, so we do not handle deleting descendents of the View.
+    mTagToViewState.remove(reactTag);
+
+    onViewStateDeleted(viewState);
+  }
+
+  @UiThread
+  public void preallocateView(
+      String componentName,
+      int reactTag,
+      @Nullable ReadableMap props,
+      @Nullable StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
+      boolean isLayoutable) {
+    UiThreadUtil.assertOnUiThread();
+
+    if (isStopped()) {
+      return;
+    }
+    // We treat this as a perf problem and not a logical error. View Preallocation or unexpected
+    // changes to Differ or C++ Binding could cause some redundant Create instructions.
+    if (getNullableViewState(reactTag) != null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Cannot Preallocate view with tag [" + reactTag + "], already exists."));
+      return;
+    }
+
+    createViewUnsafe(
+        componentName, reactTag, props, stateWrapper, eventEmitterWrapper, isLayoutable);
+  }
+
+  @AnyThread
+  @ThreadConfined(ANY)
+  public @Nullable EventEmitterWrapper getEventEmitter(int reactTag) {
+    ViewState viewState = getNullableViewState(reactTag);
+    return viewState == null ? null : viewState.mEventEmitter;
+  }
+
+  @UiThread
+  public View getView(int reactTag) {
+    ViewState state = getNullableViewState(reactTag);
+    View view = state == null ? null : state.mView;
+    if (view == null) {
+      throw new IllegalViewOperationException(
+          "Trying to resolve view with tag " + reactTag + " which doesn't exist");
+    }
+    return view;
+  }
+
+  private @NonNull ViewState getViewState(int tag) {
+    ViewState viewState = mTagToViewState.get(tag);
+    if (viewState == null) {
+      throw new RetryableMountingLayerException("Unable to find viewState for tag " + tag);
+    }
+    return viewState;
+  }
+
+  private @Nullable ViewState getNullableViewState(int tag) {
+    if (mTagToViewState == null) {
+      return null;
+    }
+    return mTagToViewState.get(tag);
+  }
+
+  @SuppressWarnings("unchecked") // prevents unchecked conversion warn of the <ViewGroup> type
+  private static @NonNull ViewGroupManager<ViewGroup> getViewGroupManager(
+      @NonNull ViewState viewState) {
+    if (viewState.mViewManager == null) {
+      throw new IllegalStateException("Unable to find ViewManager for view: " + viewState);
+    }
+    return (ViewGroupManager<ViewGroup>) viewState.mViewManager;
+  }
+
+  /**
+   * This class holds view state for react tags. Objects of this class are stored into the {@link
+   * #mTagToViewState}, and they should be updated in the same thread.
+   */
+  private static class ViewState {
+    @Nullable final View mView;
+    final int mReactTag;
+    final boolean mIsRoot;
+    @Nullable final ViewManager mViewManager;
+    @Nullable public ReactStylesDiffMap mCurrentProps = null;
+    @Nullable public ReadableMap mCurrentLocalData = null;
+    @Nullable public StateWrapper mStateWrapper = null;
+    @Nullable public EventEmitterWrapper mEventEmitter = null;
+
+    private ViewState(int reactTag, @Nullable View view, @Nullable ViewManager viewManager) {
+      this(reactTag, view, viewManager, false);
+    }
+
+    private ViewState(int reactTag, @Nullable View view, ViewManager viewManager, boolean isRoot) {
+      mReactTag = reactTag;
+      mView = view;
+      mIsRoot = isRoot;
+      mViewManager = viewManager;
+    }
+
+    @Override
+    public String toString() {
+      boolean isLayoutOnly = mViewManager == null;
+      return "ViewState ["
+          + mReactTag
+          + "] - isRoot: "
+          + mIsRoot
+          + " - props: "
+          + mCurrentProps
+          + " - localData: "
+          + mCurrentLocalData
+          + " - viewManager: "
+          + mViewManager
+          + " - isLayoutOnly: "
+          + isLayoutOnly;
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java
deleted file mode 100644
index 9a7e573edd0581..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import androidx.annotation.NonNull;
-import com.facebook.common.logging.FLog;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReactMarker;
-import com.facebook.react.bridge.ReactMarkerConstants;
-import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.systrace.Systrace;
-
-/**
- * This class represents a batch of {@link MountItem}s
- *
- * <p>A MountItem batch contains an array of {@link MountItem} and a size. The size determines the
- * amount of items that needs to be processed in the array.
- *
- * <p>The purpose of encapsulating the array of MountItems this way, is to reduce the amount of
- * allocations in C++
- */
-@DoNotStrip
-public class BatchMountItem implements MountItem {
-  static final String TAG = "FabricBatchMountItem";
-
-  private final int mRootTag;
-  @NonNull private final MountItem[] mMountItems;
-
-  private final int mSize;
-
-  private final int mCommitNumber;
-
-  public BatchMountItem(int rootTag, MountItem[] items, int size, int commitNumber) {
-    int itemsLength = (items == null ? 0 : items.length);
-    if (size < 0 || size > itemsLength) {
-      throw new IllegalArgumentException(
-          "Invalid size received by parameter size: " + size + " items.size = " + itemsLength);
-    }
-    mRootTag = rootTag;
-    mMountItems = items;
-    mSize = size;
-    mCommitNumber = commitNumber;
-  }
-
-  private void beginMarkers(String reason) {
-    Systrace.beginSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
-        "FabricUIManager::" + reason + " - " + mSize + " items");
-
-    if (mCommitNumber > 0) {
-      ReactMarker.logFabricMarker(
-          ReactMarkerConstants.FABRIC_BATCH_EXECUTION_START, null, mCommitNumber);
-    }
-  }
-
-  private void endMarkers() {
-    if (mCommitNumber > 0) {
-      ReactMarker.logFabricMarker(
-          ReactMarkerConstants.FABRIC_BATCH_EXECUTION_END, null, mCommitNumber);
-    }
-
-    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    beginMarkers("mountViews");
-
-    int mountItemIndex = 0;
-    try {
-      for (; mountItemIndex < mSize; mountItemIndex++) {
-        mMountItems[mountItemIndex].execute(mountingManager);
-      }
-    } catch (RuntimeException e) {
-      FLog.e(
-          TAG,
-          "Caught exception executing mountItem @"
-              + mountItemIndex
-              + ": "
-              + mMountItems[mountItemIndex].toString(),
-          e);
-      throw e;
-    }
-
-    endMarkers();
-  }
-
-  public int getRootTag() {
-    return mRootTag;
-  }
-
-  public boolean shouldSchedule() {
-    return mSize != 0;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder s = new StringBuilder();
-    for (int i = 0; i < mSize; i++) {
-      if (s.length() > 0) {
-        s.append("\n");
-      }
-      s.append("BatchMountItem [S:" + mRootTag + "] (")
-          .append(i + 1)
-          .append("/")
-          .append(mSize)
-          .append("): ")
-          .append(mMountItems[i]);
-    }
-    return s.toString();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/CreateMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/CreateMountItem.java
deleted file mode 100644
index d96bab3326e086..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/CreateMountItem.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.react.uimanager.StateWrapper;
-import com.facebook.react.uimanager.ThemedReactContext;
-
-public class CreateMountItem implements MountItem {
-
-  @NonNull private final String mComponent;
-  private final int mRootTag;
-  private final int mReactTag;
-  @NonNull private final ThemedReactContext mContext;
-  private final @Nullable ReadableMap mProps;
-  private final @Nullable StateWrapper mStateWrapper;
-  private final boolean mIsLayoutable;
-
-  public CreateMountItem(
-      @Nullable ThemedReactContext context,
-      int rootTag,
-      int reactTag,
-      @NonNull String component,
-      @Nullable ReadableMap props,
-      @NonNull StateWrapper stateWrapper,
-      boolean isLayoutable) {
-    mContext = context;
-    mComponent = component;
-    mRootTag = rootTag;
-    mReactTag = reactTag;
-    mProps = props;
-    mStateWrapper = stateWrapper;
-    mIsLayoutable = isLayoutable;
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    if (mContext == null) {
-      throw new IllegalStateException(
-          "Cannot execute PreAllocateViewMountItem without Context for ReactTag: "
-              + mReactTag
-              + " and rootTag: "
-              + mRootTag);
-    }
-    mountingManager.createView(
-        mContext, mComponent, mReactTag, mProps, mStateWrapper, mIsLayoutable);
-  }
-
-  @Override
-  public String toString() {
-    return "CreateMountItem ["
-        + mReactTag
-        + "] - component: "
-        + mComponent
-        + " - rootTag: "
-        + mRootTag
-        + " - isLayoutable: "
-        + mIsLayoutable;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.java
index 9d525755bfa38e..6f23f9b8779985 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.java
@@ -14,20 +14,27 @@
 
 public class DispatchIntCommandMountItem extends DispatchCommandMountItem {
 
+  private final int mSurfaceId;
   private final int mReactTag;
   private final int mCommandId;
   private final @Nullable ReadableArray mCommandArgs;
 
   public DispatchIntCommandMountItem(
-      int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
+      int surfaceId, int reactTag, int commandId, @Nullable ReadableArray commandArgs) {
+    mSurfaceId = surfaceId;
     mReactTag = reactTag;
     mCommandId = commandId;
     mCommandArgs = commandArgs;
   }
 
+  @Override
+  public int getSurfaceId() {
+    return mSurfaceId;
+  }
+
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.receiveCommand(mReactTag, mCommandId, mCommandArgs);
+    mountingManager.receiveCommand(mSurfaceId, mReactTag, mCommandId, mCommandArgs);
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.java
index 0b04e25f161d0e..1d76091b6ae031 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.java
@@ -14,20 +14,27 @@
 
 public class DispatchStringCommandMountItem extends DispatchCommandMountItem {
 
+  private final int mSurfaceId;
   private final int mReactTag;
   @NonNull private final String mCommandId;
   private final @Nullable ReadableArray mCommandArgs;
 
   public DispatchStringCommandMountItem(
-      int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {
+      int surfaceId, int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {
+    mSurfaceId = surfaceId;
     mReactTag = reactTag;
     mCommandId = commandId;
     mCommandArgs = commandArgs;
   }
 
+  @Override
+  public int getSurfaceId() {
+    return mSurfaceId;
+  }
+
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.receiveCommand(mReactTag, mCommandId, mCommandArgs);
+    mountingManager.receiveCommand(mSurfaceId, mReactTag, mCommandId, mCommandArgs);
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/InsertMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/InsertMountItem.java
deleted file mode 100644
index edfc46ac7109cf..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/InsertMountItem.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import androidx.annotation.NonNull;
-import com.facebook.react.fabric.mounting.MountingManager;
-
-public class InsertMountItem implements MountItem {
-
-  private int mReactTag;
-  private int mParentReactTag;
-  private int mIndex;
-
-  public InsertMountItem(int reactTag, int parentReactTag, int index) {
-    mReactTag = reactTag;
-    mParentReactTag = parentReactTag;
-    mIndex = index;
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.addViewAt(mParentReactTag, mReactTag, mIndex);
-  }
-
-  public int getParentReactTag() {
-    return mParentReactTag;
-  }
-
-  public int getIndex() {
-    return mIndex;
-  }
-
-  @Override
-  public String toString() {
-    return "InsertMountItem ["
-        + mReactTag
-        + "] - parentTag: ["
-        + mParentReactTag
-        + "] - index: "
-        + mIndex;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java
index efaafa11ead5a8..cd4bb8c5f613f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java
@@ -8,10 +8,10 @@
 package com.facebook.react.fabric.mounting.mountitems;
 
 import static com.facebook.react.fabric.FabricComponents.getFabricComponentName;
+import static com.facebook.react.fabric.FabricUIManager.ENABLE_FABRIC_LOGS;
 import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactMarker;
@@ -19,8 +19,8 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager;
+import com.facebook.react.fabric.mounting.SurfaceMountingManager;
 import com.facebook.react.uimanager.StateWrapper;
-import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.systrace.Systrace;
 
 /**
@@ -50,26 +50,18 @@ public class IntBufferBatchMountItem implements MountItem {
   static final int INSTRUCTION_UPDATE_EVENT_EMITTER = 256;
   static final int INSTRUCTION_UPDATE_PADDING = 512;
 
-  private final int mRootTag;
+  private final int mSurfaceId;
   private final int mCommitNumber;
 
-  @NonNull private final ThemedReactContext mContext;
-
   @NonNull private final int[] mIntBuffer;
   @NonNull private final Object[] mObjBuffer;
 
   private final int mIntBufferLen;
   private final int mObjBufferLen;
 
-  public IntBufferBatchMountItem(
-      int rootTag,
-      @Nullable ThemedReactContext context,
-      int[] intBuf,
-      Object[] objBuf,
-      int commitNumber) {
-    mRootTag = rootTag;
+  public IntBufferBatchMountItem(int surfaceId, int[] intBuf, Object[] objBuf, int commitNumber) {
+    mSurfaceId = surfaceId;
     mCommitNumber = commitNumber;
-    mContext = context;
 
     mIntBuffer = intBuf;
     mObjBuffer = objBuf;
@@ -119,13 +111,21 @@ private static EventEmitterWrapper castToEventEmitter(Object obj) {
 
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
-    if (mContext == null) {
+    SurfaceMountingManager surfaceMountingManager = mountingManager.getSurfaceManager(mSurfaceId);
+    if (surfaceMountingManager == null) {
       FLog.e(
           TAG,
-          "Cannot execute batch of %s MountItems; no context. Hopefully this is because StopSurface was called.",
-          TAG);
+          "Skipping batch of MountItems; no SurfaceMountingManager found for [%d].",
+          mSurfaceId);
+      return;
+    }
+    if (surfaceMountingManager.isStopped()) {
+      FLog.e(TAG, "Skipping batch of MountItems; was stopped [%d].", mSurfaceId);
       return;
     }
+    if (ENABLE_FABRIC_LOGS) {
+      FLog.d(TAG, "Executing IntBufferBatchMountItem on surface [%d]", mSurfaceId);
+    }
 
     beginMarkers("mountViews");
 
@@ -137,36 +137,40 @@ public void execute(@NonNull MountingManager mountingManager) {
       for (int k = 0; k < numInstructions; k++) {
         if (type == INSTRUCTION_CREATE) {
           String componentName = getFabricComponentName((String) mObjBuffer[j++]);
-          mountingManager.createView(
-              mContext,
+          surfaceMountingManager.createView(
               componentName,
               mIntBuffer[i++],
               castToProps(mObjBuffer[j++]),
               castToState(mObjBuffer[j++]),
+              castToEventEmitter(mObjBuffer[j++]),
               mIntBuffer[i++] == 1);
         } else if (type == INSTRUCTION_DELETE) {
-          mountingManager.deleteView(mIntBuffer[i++]);
+          surfaceMountingManager.deleteView(mIntBuffer[i++]);
         } else if (type == INSTRUCTION_INSERT) {
           int tag = mIntBuffer[i++];
           int parentTag = mIntBuffer[i++];
-          mountingManager.addViewAt(parentTag, tag, mIntBuffer[i++]);
+          surfaceMountingManager.addViewAt(parentTag, tag, mIntBuffer[i++]);
         } else if (type == INSTRUCTION_REMOVE) {
-          mountingManager.removeViewAt(mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++]);
+          surfaceMountingManager.removeViewAt(mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++]);
         } else if (type == INSTRUCTION_UPDATE_PROPS) {
-          mountingManager.updateProps(mIntBuffer[i++], castToProps(mObjBuffer[j++]));
+          surfaceMountingManager.updateProps(mIntBuffer[i++], castToProps(mObjBuffer[j++]));
         } else if (type == INSTRUCTION_UPDATE_STATE) {
-          mountingManager.updateState(mIntBuffer[i++], castToState(mObjBuffer[j++]));
+          surfaceMountingManager.updateState(mIntBuffer[i++], castToState(mObjBuffer[j++]));
         } else if (type == INSTRUCTION_UPDATE_LAYOUT) {
-          mountingManager.updateLayout(
-              mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++]);
+          int reactTag = mIntBuffer[i++];
+          int x = mIntBuffer[i++];
+          int y = mIntBuffer[i++];
+          int width = mIntBuffer[i++];
+          int height = mIntBuffer[i++];
+          int displayType = mIntBuffer[i++];
+          surfaceMountingManager.updateLayout(reactTag, x, y, width, height, displayType);
 
-          // The final buffer, layoutDirection, seems unused?
-          i++;
         } else if (type == INSTRUCTION_UPDATE_PADDING) {
-          mountingManager.updatePadding(
+          surfaceMountingManager.updatePadding(
               mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++]);
         } else if (type == INSTRUCTION_UPDATE_EVENT_EMITTER) {
-          mountingManager.updateEventEmitter(mIntBuffer[i++], castToEventEmitter(mObjBuffer[j++]));
+          surfaceMountingManager.updateEventEmitter(
+              mIntBuffer[i++], castToEventEmitter(mObjBuffer[j++]));
         } else {
           throw new IllegalArgumentException(
               "Invalid type argument to IntBufferBatchMountItem: " + type + " at index: " + i);
@@ -177,8 +181,9 @@ public void execute(@NonNull MountingManager mountingManager) {
     endMarkers();
   }
 
-  public int getRootTag() {
-    return mRootTag;
+  @Override
+  public int getSurfaceId() {
+    return mSurfaceId;
   }
 
   public boolean shouldSchedule() {
@@ -189,7 +194,7 @@ public boolean shouldSchedule() {
   public String toString() {
     try {
       StringBuilder s = new StringBuilder();
-      s.append("IntBufferBatchMountItem:");
+      s.append(String.format("IntBufferBatchMountItem [surface:%d]:\n", mSurfaceId));
       int i = 0, j = 0;
       while (i < mIntBufferLen) {
         int rawType = mIntBuffer[i++];
@@ -198,7 +203,7 @@ public String toString() {
         for (int k = 0; k < numInstructions; k++) {
           if (type == INSTRUCTION_CREATE) {
             String componentName = getFabricComponentName((String) mObjBuffer[j++]);
-            j += 2;
+            j += 3;
             s.append(
                 String.format(
                     "CREATE [%d] - layoutable:%d - %s\n",
@@ -226,7 +231,7 @@ public String toString() {
           } else if (type == INSTRUCTION_UPDATE_LAYOUT) {
             s.append(
                 String.format(
-                    "UPDATE LAYOUT [%d]: x:%d y:%d w:%d h:%d layoutDirection:%d\n",
+                    "UPDATE LAYOUT [%d]: x:%d y:%d w:%d h:%d displayType:%d\n",
                     mIntBuffer[i++],
                     mIntBuffer[i++],
                     mIntBuffer[i++],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java
index dc053625c2a6de..5ec3aeea571a4d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react.fabric.mounting.mountitems;
 
+import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
 import com.facebook.react.fabric.mounting.MountingManager;
@@ -16,4 +17,7 @@ public interface MountItem {
   /** Execute this {@link MountItem} into the operation queue received by parameter. */
   @UiThread
   void execute(@NonNull MountingManager mountingManager);
+
+  @AnyThread
+  int getSurfaceId();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java
index 0e3c7140eafbf2..5a0f5241bc8f0d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.java
@@ -7,7 +7,6 @@
 
 package com.facebook.react.fabric.mounting.mountitems;
 
-import static com.facebook.react.fabric.FabricUIManager.ENABLE_FABRIC_LOGS;
 import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT;
 import static com.facebook.react.fabric.FabricUIManager.TAG;
 
@@ -15,56 +14,55 @@
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager;
+import com.facebook.react.fabric.mounting.SurfaceMountingManager;
 import com.facebook.react.uimanager.StateWrapper;
-import com.facebook.react.uimanager.ThemedReactContext;
 
 /** {@link MountItem} that is used to pre-allocate views for JS components. */
 public class PreAllocateViewMountItem implements MountItem {
 
   @NonNull private final String mComponent;
-  private final int mRootTag;
+  private final int mSurfaceId;
   private final int mReactTag;
   private final @Nullable ReadableMap mProps;
   private final @Nullable StateWrapper mStateWrapper;
-  private final @NonNull ThemedReactContext mContext;
+  private final @Nullable EventEmitterWrapper mEventEmitterWrapper;
   private final boolean mIsLayoutable;
 
   public PreAllocateViewMountItem(
-      @Nullable ThemedReactContext context,
-      int rootTag,
+      int surfaceId,
       int reactTag,
       @NonNull String component,
       @Nullable ReadableMap props,
       @NonNull StateWrapper stateWrapper,
+      @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
-    mContext = context;
     mComponent = component;
-    mRootTag = rootTag;
+    mSurfaceId = surfaceId;
     mProps = props;
     mStateWrapper = stateWrapper;
+    mEventEmitterWrapper = eventEmitterWrapper;
     mReactTag = reactTag;
     mIsLayoutable = isLayoutable;
   }
 
-  public int getRootTag() {
-    return mRootTag;
+  @Override
+  public int getSurfaceId() {
+    return mSurfaceId;
   }
 
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
-    if (ENABLE_FABRIC_LOGS) {
-      FLog.d(TAG, "Executing pre-allocation of: " + toString());
-    }
-    if (mContext == null) {
-      throw new IllegalStateException(
-          "Cannot execute PreAllocateViewMountItem without Context for ReactTag: "
-              + mReactTag
-              + " and rootTag: "
-              + mRootTag);
+    SurfaceMountingManager surfaceMountingManager = mountingManager.getSurfaceManager(mSurfaceId);
+    if (surfaceMountingManager == null) {
+      FLog.e(
+          TAG,
+          "Skipping View PreAllocation; no SurfaceMountingManager found for [" + mSurfaceId + "]");
+      return;
     }
-    mountingManager.preallocateView(
-        mContext, mComponent, mReactTag, mProps, mStateWrapper, mIsLayoutable);
+    surfaceMountingManager.preallocateView(
+        mComponent, mReactTag, mProps, mStateWrapper, mEventEmitterWrapper, mIsLayoutable);
   }
 
   @Override
@@ -74,8 +72,8 @@ public String toString() {
             .append(mReactTag)
             .append("] - component: ")
             .append(mComponent)
-            .append(" rootTag: ")
-            .append(mRootTag)
+            .append(" surfaceId: ")
+            .append(mSurfaceId)
             .append(" isLayoutable: ")
             .append(mIsLayoutable);
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/RemoveDeleteMultiMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/RemoveDeleteMultiMountItem.java
deleted file mode 100644
index daf3ed5ca75d5e..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/RemoveDeleteMultiMountItem.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import androidx.annotation.NonNull;
-import com.facebook.react.fabric.mounting.MountingManager;
-
-public class RemoveDeleteMultiMountItem implements MountItem {
-
-  // Metadata is an array of ints, grouped into 4 ints per instruction (so the length of metadata
-  // is always divisible by 4):
-  //
-  // `instruction*4 + 0`: react tag of view instruction
-  // `instruction*4 + 1`: react tag of view's parent
-  // `instruction*4 + 2`: index of view in parents' children instruction
-  // `instruction*4 + 3`: flags indicating if the view should be removed, and/or deleted
-  @NonNull private int[] mMetadata;
-
-  // Bitfields of "flag", indicating if a view should be removed and/or deleted
-  private static final int REMOVE_FLAG = 1;
-  private static final int DELETE_FLAG = 2;
-
-  // Indices for each parameter within an "instruction"
-  private static final int INSTRUCTION_FIELDS_LEN = 4;
-  private static final int TAG_INDEX = 0;
-  private static final int PARENT_TAG_INDEX = 1;
-  private static final int VIEW_INDEX_INDEX = 2;
-  private static final int FLAGS_INDEX = 3;
-
-  public RemoveDeleteMultiMountItem(@NonNull int[] metadata) {
-    mMetadata = metadata;
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    // First, go through instructions and remove all views that are marked
-    // for removal.
-    // Not all views that are removed are deleted, and not all deleted views
-    // are removed first.
-    // *All* views must be removed here before we can delete any views.
-    // Removal of a view from a parent is based on indices within the parents' children,
-    // and deletion causes reordering; so we must perform all removals first.
-    for (int i = 0; i < mMetadata.length; i += INSTRUCTION_FIELDS_LEN) {
-      int flags = mMetadata[i + FLAGS_INDEX];
-      if ((flags & REMOVE_FLAG) != 0) {
-        int parentTag = mMetadata[i + PARENT_TAG_INDEX];
-        int tag = mMetadata[i + TAG_INDEX];
-        int index = mMetadata[i + VIEW_INDEX_INDEX];
-        mountingManager.removeViewAt(tag, parentTag, index);
-      }
-    }
-
-    // After removing all views, delete all views marked for deletion.
-    for (int i = 0; i < mMetadata.length; i += 4) {
-      int flags = mMetadata[i + FLAGS_INDEX];
-      if ((flags & DELETE_FLAG) != 0) {
-        int tag = mMetadata[i + TAG_INDEX];
-        mountingManager.deleteView(tag);
-      }
-    }
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder s = new StringBuilder();
-    for (int i = 0; i < mMetadata.length; i += 4) {
-      if (s.length() > 0) {
-        s.append("\n");
-      }
-      s.append("RemoveDeleteMultiMountItem (")
-          .append(i / INSTRUCTION_FIELDS_LEN + 1)
-          .append("/")
-          .append(mMetadata.length / INSTRUCTION_FIELDS_LEN)
-          .append("): [")
-          .append(mMetadata[i + TAG_INDEX])
-          .append("] parent [")
-          .append(mMetadata[i + PARENT_TAG_INDEX])
-          .append("] idx ")
-          .append(mMetadata[i + VIEW_INDEX_INDEX])
-          .append(" ")
-          .append(mMetadata[i + FLAGS_INDEX]);
-    }
-    return s.toString();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java
index 5852ff1a78c643..dc69db7a04ab12 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEvent.java
@@ -8,7 +8,7 @@
 package com.facebook.react.fabric.mounting.mountitems;
 
 import androidx.annotation.NonNull;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.fabric.mounting.MountingManager;
 
@@ -16,10 +16,12 @@ public class SendAccessibilityEvent implements MountItem {
 
   private final String TAG = "Fabric.SendAccessibilityEvent";
 
+  private final int mSurfaceId;
   private final int mReactTag;
   private final int mEventType;
 
-  public SendAccessibilityEvent(int reactTag, int eventType) {
+  public SendAccessibilityEvent(int surfaceId, int reactTag, int eventType) {
+    mSurfaceId = surfaceId;
     mReactTag = reactTag;
     mEventType = eventType;
   }
@@ -27,7 +29,7 @@ public SendAccessibilityEvent(int reactTag, int eventType) {
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
     try {
-      mountingManager.sendAccessibilityEvent(mReactTag, mEventType);
+      mountingManager.sendAccessibilityEvent(mSurfaceId, mReactTag, mEventType);
     } catch (RetryableMountingLayerException e) {
       // Accessibility events are similar to commands in that they're imperative
       // calls from JS, disconnected from the commit lifecycle, and therefore
@@ -36,10 +38,15 @@ public void execute(@NonNull MountingManager mountingManager) {
       // due to race conditions (like the view disappearing after the event is
       // queued and before it executes), we log a soft exception and continue along.
       // Other categories of errors will still cause a hard crash.
-      ReactSoftException.logSoftException(TAG, e);
+      ReactSoftExceptionLogger.logSoftException(TAG, e);
     }
   }
 
+  @Override
+  public int getSurfaceId() {
+    return mSurfaceId;
+  }
+
   @Override
   public String toString() {
     return "SendAccessibilityEvent [" + mReactTag + "] " + mEventType;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java
deleted file mode 100644
index 72331c6b963484..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import androidx.annotation.NonNull;
-import com.facebook.react.fabric.events.EventEmitterWrapper;
-import com.facebook.react.fabric.mounting.MountingManager;
-
-public class UpdateEventEmitterMountItem implements MountItem {
-
-  @NonNull private final EventEmitterWrapper mEventHandler;
-  private final int mReactTag;
-
-  public UpdateEventEmitterMountItem(int reactTag, @NonNull EventEmitterWrapper EventHandler) {
-    mReactTag = reactTag;
-    mEventHandler = EventHandler;
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.updateEventEmitter(mReactTag, mEventHandler);
-  }
-
-  @Override
-  public String toString() {
-    return "UpdateEventEmitterMountItem [" + mReactTag + "]";
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java
deleted file mode 100644
index cd8edd887e205b..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.util.LayoutDirection;
-import androidx.annotation.NonNull;
-import com.facebook.react.fabric.mounting.MountingManager;
-
-public class UpdateLayoutMountItem implements MountItem {
-
-  private final int mReactTag;
-  private final int mX;
-  private final int mY;
-  private final int mWidth;
-  private final int mHeight;
-  private final int mLayoutDirection;
-
-  public UpdateLayoutMountItem(
-      int reactTag, int x, int y, int width, int height, int layoutDirection) {
-    mReactTag = reactTag;
-    mX = x;
-    mY = y;
-    mWidth = width;
-    mHeight = height;
-    mLayoutDirection = convertLayoutDirection(layoutDirection);
-  }
-
-  // TODO move this from here
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  private static int convertLayoutDirection(int layoutDirection) {
-    switch (layoutDirection) {
-      case 0:
-        return LayoutDirection.INHERIT;
-      case 1:
-        return LayoutDirection.LTR;
-      case 2:
-        return LayoutDirection.RTL;
-      default:
-        throw new IllegalArgumentException("Unsupported layout direction: " + layoutDirection);
-    }
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.updateLayout(mReactTag, mX, mY, mWidth, mHeight);
-  }
-
-  public int getX() {
-    return mX;
-  }
-
-  public int getY() {
-    return mY;
-  }
-
-  public int getHeight() {
-    return mHeight;
-  }
-
-  public int getWidth() {
-    return mWidth;
-  }
-
-  public int getLayoutDirection() {
-    return mLayoutDirection;
-  }
-
-  @Override
-  public String toString() {
-    return "UpdateLayoutMountItem ["
-        + mReactTag
-        + "] - x: "
-        + mX
-        + " - y: "
-        + mY
-        + " - height: "
-        + mHeight
-        + " - width: "
-        + mWidth
-        + " - layoutDirection: "
-        + +mLayoutDirection;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePaddingMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePaddingMountItem.java
deleted file mode 100644
index e0403627bbd99d..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePaddingMountItem.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import androidx.annotation.NonNull;
-import com.facebook.react.fabric.mounting.MountingManager;
-
-/**
- * A MountItem that represents setting the padding properties of a view (left, top, right, bottom).
- * This is distinct from layout because it happens far less frequently from layout; so it is a perf
- * optimization to transfer this data and execute the methods strictly less than the layout-related
- * properties.
- */
-public class UpdatePaddingMountItem implements MountItem {
-
-  private final int mReactTag;
-  private final int mLeft;
-  private final int mTop;
-  private final int mRight;
-  private final int mBottom;
-
-  public UpdatePaddingMountItem(int reactTag, int left, int top, int right, int bottom) {
-    mReactTag = reactTag;
-    mLeft = left;
-    mTop = top;
-    mRight = right;
-    mBottom = bottom;
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.updatePadding(mReactTag, mLeft, mTop, mRight, mBottom);
-  }
-
-  @Override
-  public String toString() {
-    return "UpdatePaddingMountItem ["
-        + mReactTag
-        + "] - left: "
-        + mLeft
-        + " - top: "
-        + mTop
-        + " - right: "
-        + mRight
-        + " - bottom: "
-        + mBottom;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePropsMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePropsMountItem.java
deleted file mode 100644
index 8b980705e9dc84..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdatePropsMountItem.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT;
-
-import androidx.annotation.NonNull;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.fabric.mounting.MountingManager;
-
-public class UpdatePropsMountItem implements MountItem {
-
-  private final int mReactTag;
-  @NonNull private final ReadableMap mUpdatedProps;
-
-  public UpdatePropsMountItem(int reactTag, @NonNull ReadableMap updatedProps) {
-    mReactTag = reactTag;
-    mUpdatedProps = updatedProps;
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.updateProps(mReactTag, mUpdatedProps);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder result =
-        new StringBuilder("UpdatePropsMountItem [").append(mReactTag).append("]");
-
-    if (IS_DEVELOPMENT_ENVIRONMENT) {
-      result.append(" props: ").append(mUpdatedProps);
-    }
-
-    return result.toString();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateStateMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateStateMountItem.java
deleted file mode 100644
index 4544e8f935e23e..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateStateMountItem.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.fabric.mounting.mountitems;
-
-import static com.facebook.react.fabric.FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.react.uimanager.StateWrapper;
-
-public class UpdateStateMountItem implements MountItem {
-
-  private final int mReactTag;
-  @Nullable private final StateWrapper mStateWrapper;
-
-  public UpdateStateMountItem(int reactTag, @Nullable StateWrapper stateWrapper) {
-    mReactTag = reactTag;
-    mStateWrapper = stateWrapper;
-  }
-
-  @Override
-  public void execute(@NonNull MountingManager mountingManager) {
-    mountingManager.updateState(mReactTag, mStateWrapper);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder result =
-        new StringBuilder("UpdateStateMountItem [").append(mReactTag).append("]");
-
-    if (IS_DEVELOPMENT_ENVIRONMENT) {
-      result.append(" state: ").append(mStateWrapper != null ? mStateWrapper.getState() : "<null>");
-    }
-
-    return result.toString();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
index c521147677c16d..19a28eee5af259 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
 
-LOCAL_STATIC_LIBRARIES := libjsi libjsireact jscruntime
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni
+LOCAL_STATIC_LIBRARIES :=  libjsireact jscruntime
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
index a1a374ef936b36..d601632a0f3bdb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_nat
 rn_android_library(
     name = "jscexecutor",
     srcs = glob(["*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
index 26444912bf4e73..d5a734f79243ef 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "jstasks",
     srcs = glob(["*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java
index b6f60da4e17781..d31c1371c3c8ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.java
@@ -11,7 +11,7 @@
 import android.util.SparseArray;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.modules.appregistry.AppRegistry;
@@ -107,12 +107,12 @@ private synchronized void startTask(final HeadlessJsTaskConfig taskConfig, int t
     }
     mActiveTasks.add(taskId);
     mActiveTaskConfigs.put(taskId, new HeadlessJsTaskConfig(taskConfig));
-    if (reactContext.hasActiveCatalystInstance()) {
+    if (reactContext.hasActiveReactInstance()) {
       reactContext
           .getJSModule(AppRegistry.class)
           .startHeadlessTask(taskId, taskConfig.getTaskKey(), taskConfig.getData());
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           "HeadlessJsTaskContext",
           new RuntimeException("Cannot start headless task, CatalystInstance not available"));
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
index b213c9d3133a0f..ec9fc4e9e07e9e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "annotations",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
index 85f23a35691b69..22d2f5a6625890 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "model",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java
index 85a2ac54f2eecb..ad148228cd9bc0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java
@@ -56,7 +56,7 @@ public void onChange(boolean selfChange) {
 
         @Override
         public void onChange(boolean selfChange, Uri uri) {
-          if (getReactApplicationContext().hasActiveCatalystInstance()) {
+          if (getReactApplicationContext().hasActiveReactInstance()) {
             AccessibilityInfoModule.this.updateAndSendReduceMotionChangeEvent();
           }
         }
@@ -67,6 +67,7 @@ public void onChange(boolean selfChange, Uri uri) {
   private final ContentResolver mContentResolver;
   private boolean mReduceMotionEnabled = false;
   private boolean mTouchExplorationEnabled = false;
+  private int mRecommendedTimeout;
 
   private static final String REDUCE_MOTION_EVENT_NAME = "reduceMotionDidChange";
   private static final String TOUCH_EXPLORATION_EVENT_NAME = "touchExplorationDidChange";
@@ -163,9 +164,13 @@ public void initialize() {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
-    super.onCatalystInstanceDestroy();
-    getReactApplicationContext().removeLifecycleEventListener(this);
+  public void invalidate() {
+    super.invalidate();
+
+    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
+    if (applicationContext != null) {
+      applicationContext.removeLifecycleEventListener(this);
+    }
   }
 
   @Override
@@ -189,4 +194,16 @@ public void announceForAccessibility(String message) {
   public void setAccessibilityFocus(double reactTag) {
     // iOS only
   }
+
+  @Override
+  public void getRecommendedTimeoutMillis(double originalTimeout, Callback successCallback) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+      successCallback.invoke((int) originalTimeout);
+      return;
+    }
+    mRecommendedTimeout =
+        mAccessibilityManager.getRecommendedTimeoutMillis(
+            (int) originalTimeout, AccessibilityManager.FLAG_CONTENT_CONTROLS);
+    successCallback.invoke(mRecommendedTimeout);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
index 832ee9de355957..7c6b352a8c1dd0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "accessibilityinfo",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -18,5 +19,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
index ed7eba28bfb908..ac20f7869a3db2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "appearance",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -16,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
index d54b2cd82034de..727a8d30d1ee91 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_target", "rn_android_li
 rn_android_library(
     name = "appregistry",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
index 396e525d5f915d..4b5c08a4c31e62 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
@@ -100,7 +100,7 @@ private void sendEvent(String eventName, @Nullable Object data) {
     // We don't gain anything interesting from logging here, and it's an extremely common
     // race condition for an AppState event to be triggered as the Catalyst instance is being
     // set up or torn down. So, just fail silently here.
-    if (!reactApplicationContext.hasActiveCatalystInstance()) {
+    if (!reactApplicationContext.hasActiveReactInstance()) {
       return;
     }
     reactApplicationContext.getJSModule(RCTDeviceEventEmitter.class).emit(eventName, data);
@@ -119,4 +119,14 @@ public void addListener(String eventName) {
   public void removeListeners(double count) {
     // iOS only
   }
+
+  @Override
+  public void invalidate() {
+    super.invalidate();
+
+    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
+    if (applicationContext != null) {
+      applicationContext.removeLifecycleEventListener(this);
+    }
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
index f1b8ad181290c6..d9f4a85e622fa0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "appstate",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
@@ -16,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
index 266f87cf28f7bf..8a675604d8e31a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "blob",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -31,6 +32,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/websocket:websocket"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
index baf039a223128f..96141bafb6a086 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
@@ -20,9 +20,15 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public final class BlobProvider extends ContentProvider {
 
+  private static final int PIPE_CAPACITY = 65536;
+
+  private ExecutorService executor = Executors.newSingleThreadExecutor();
+
   @Override
   public boolean onCreate() {
     return true;
@@ -72,7 +78,7 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx
       throw new RuntimeException("No blob module associated with BlobProvider");
     }
 
-    byte[] data = blobModule.resolve(uri);
+    final byte[] data = blobModule.resolve(uri);
     if (data == null) {
       throw new FileNotFoundException("Cannot open " + uri.toString() + ", blob not found.");
     }
@@ -84,12 +90,34 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx
       return null;
     }
     ParcelFileDescriptor readSide = pipe[0];
-    ParcelFileDescriptor writeSide = pipe[1];
-
-    try (OutputStream outputStream = new ParcelFileDescriptor.AutoCloseOutputStream(writeSide)) {
-      outputStream.write(data);
-    } catch (IOException exception) {
-      return null;
+    final ParcelFileDescriptor writeSide = pipe[1];
+
+    if (data.length <= PIPE_CAPACITY) {
+      // If the blob length is less than or equal to pipe capacity (64 KB),
+      // we can write the data synchronously to the pipe buffer.
+      try (OutputStream outputStream = new ParcelFileDescriptor.AutoCloseOutputStream(writeSide)) {
+        outputStream.write(data);
+      } catch (IOException exception) {
+        return null;
+      }
+    } else {
+      // For blobs larger than 64 KB, a synchronous write would fill up the whole buffer
+      // and block forever, because there are no readers to empty the buffer.
+      // Writing from a separate thread allows us to return the read side descriptor
+      // immediately so that both writer and reader can work concurrently.
+      // Reading from the pipe empties the buffer and allows the next chunks to be written.
+      Runnable writer =
+          new Runnable() {
+            public void run() {
+              try (OutputStream outputStream =
+                  new ParcelFileDescriptor.AutoCloseOutputStream(writeSide)) {
+                outputStream.write(data);
+              } catch (IOException exception) {
+                // no-op
+              }
+            }
+          };
+      executor.submit(writer);
     }
 
     return readSide;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
index 53fb0c2bf557ef..6c5a7224c78a97 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
 
-LOCAL_STATIC_LIBRARIES := libjsi libjsireact
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni
+LOCAL_STATIC_LIBRARIES :=  libjsireact
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK
index 01a57b64d3e326..a6e6c32e3641e8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK
@@ -8,7 +8,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     labels = ["supermodule:xplat/default/public.react_native.infra"],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp
index 8883a318d89629..285e881472aa0c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp
@@ -29,6 +29,7 @@ BlobCollector::~BlobCollector() {
     static auto removeMethod = jni::findClassStatic(kBlobModuleJavaDescriptor)
                                    ->getMethod<void(jstring)>("remove");
     removeMethod(blobModule_, jni::make_jstring(blobId_).get());
+    blobModule_.reset();
   });
 }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
index dcc9cbd7a419b5..a6957bf014ff30 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "bundleloader",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -17,5 +18,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
index 217b26ea0deb36..c75487f88425a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "camera",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -18,6 +19,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
index d755fa2dd9aa55..0e46f8795096e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "clipboard",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
index 47dad24dd0491a..d42deef1d60f4c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "common",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
index c8694abe9810e9..1cd3c671ef7844 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "core",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -21,6 +22,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/util:util"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java
index 8ac7f07606a4a0..b4337d0a512dfa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java
@@ -129,11 +129,14 @@ public void onHeadlessJsTaskFinish(int taskId) {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
+  public void invalidate() {
+    ReactApplicationContext reactApplicationContext = getReactApplicationContext();
+
     HeadlessJsTaskContext headlessJsTaskContext =
-        HeadlessJsTaskContext.getInstance(getReactApplicationContext());
+        HeadlessJsTaskContext.getInstance(reactApplicationContext);
     headlessJsTaskContext.removeTaskEventListener(this);
     mJavaTimerManager.onInstanceDestroy();
+    reactApplicationContext.removeLifecycleEventListener(this);
   }
 
   @VisibleForTesting
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
index 56be88ecc46b9e..80a1af4bb9ac75 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "datepicker",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -22,5 +23,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
index 20cb825893816b..e6971464889241 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
@@ -61,7 +61,7 @@ public DatePickerDialogListener(final Promise promise) {
 
     @Override
     public void onDateSet(DatePicker view, int year, int month, int day) {
-      if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
+      if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
         WritableMap result = new WritableNativeMap();
         result.putString("action", ACTION_DATE_SET);
         result.putInt("year", year);
@@ -74,7 +74,7 @@ public void onDateSet(DatePicker view, int year, int month, int day) {
 
     @Override
     public void onDismiss(DialogInterface dialog) {
-      if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
+      if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
         WritableMap result = new WritableNativeMap();
         result.putString("action", ACTION_DISMISSED);
         mPromise.resolve(result);
@@ -101,7 +101,7 @@ public void onDismiss(DialogInterface dialog) {
    *     If the action is dismiss, year, month and date are undefined.
    */
   @Override
-  public void open(@Nullable final ReadableMap options, Promise promise) {
+  public void open(@Nullable final ReadableMap options, final Promise promise) {
     Activity raw_activity = getCurrentActivity();
     if (raw_activity == null || !(raw_activity instanceof FragmentActivity)) {
       promise.reject(
@@ -112,20 +112,26 @@ public void open(@Nullable final ReadableMap options, Promise promise) {
 
     FragmentActivity activity = (FragmentActivity) raw_activity;
 
-    FragmentManager fragmentManager = activity.getSupportFragmentManager();
+    final FragmentManager fragmentManager = activity.getSupportFragmentManager();
     DialogFragment oldFragment = (DialogFragment) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
     if (oldFragment != null) {
       oldFragment.dismiss();
     }
-    DatePickerDialogFragment fragment = new DatePickerDialogFragment();
-    if (options != null) {
-      final Bundle args = createFragmentArguments(options);
-      fragment.setArguments(args);
-    }
-    final DatePickerDialogListener listener = new DatePickerDialogListener(promise);
-    fragment.setOnDismissListener(listener);
-    fragment.setOnDateSetListener(listener);
-    fragment.show(fragmentManager, FRAGMENT_TAG);
+    activity.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            DatePickerDialogFragment fragment = new DatePickerDialogFragment();
+            if (options != null) {
+              final Bundle args = createFragmentArguments(options);
+              fragment.setArguments(args);
+            }
+            final DatePickerDialogListener listener = new DatePickerDialogListener(promise);
+            fragment.setOnDismissListener(listener);
+            fragment.setOnDateSetListener(listener);
+            fragment.show(fragmentManager, FRAGMENT_TAG);
+          }
+        });
   }
 
   private Bundle createFragmentArguments(ReadableMap options) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
index da69cf93c05ded..b803f0d46b49bc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
@@ -103,7 +103,7 @@ public void stopRecordingFps(double animationStopTimeMs) {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
+  public void invalidate() {
     if (mFrameCallback != null) {
       mFrameCallback.stop();
       mFrameCallback = null;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
index dd5f58313cd3b0..ec954ab8a841cb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "debug",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -23,13 +24,14 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
 
 rn_android_library(
     name = "interfaces",
     srcs = glob(["interfaces/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
index c4f485bd0995f3..f6418a9293641e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "deviceinfo",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -19,6 +20,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
index 083c9c1d9f27b1..8e7b79822104f7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
@@ -13,9 +13,9 @@
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
@@ -54,8 +54,13 @@ public String getName() {
 
   @Override
   public @Nullable Map<String, Object> getTypedExportedConstants() {
+    WritableMap displayMetrics = DisplayMetricsHolder.getDisplayMetricsWritableMap(mFontScale);
+
+    // Cache the initial dimensions for later comparison in emitUpdateDimensionsEvent
+    mPreviousDisplayMetrics = displayMetrics.copy();
+
     HashMap<String, Object> constants = new HashMap<>();
-    constants.put("Dimensions", DisplayMetricsHolder.getDisplayMetricsMap(mFontScale));
+    constants.put("Dimensions", displayMetrics.toHashMap());
     return constants;
   }
 
@@ -83,10 +88,9 @@ public void emitUpdateDimensionsEvent() {
       return;
     }
 
-    if (mReactApplicationContext.hasActiveCatalystInstance()) {
+    if (mReactApplicationContext.hasActiveReactInstance()) {
       // Don't emit an event to JS if the dimensions haven't changed
-      WritableNativeMap displayMetrics =
-          DisplayMetricsHolder.getDisplayMetricsNativeMap(mFontScale);
+      WritableMap displayMetrics = DisplayMetricsHolder.getDisplayMetricsWritableMap(mFontScale);
       if (mPreviousDisplayMetrics == null) {
         mPreviousDisplayMetrics = displayMetrics.copy();
       } else if (!displayMetrics.equals(mPreviousDisplayMetrics)) {
@@ -96,7 +100,7 @@ public void emitUpdateDimensionsEvent() {
             .emit("didUpdateDimensions", displayMetrics);
       }
     } else {
-      ReactSoftException.logSoftException(
+      ReactSoftExceptionLogger.logSoftException(
           NAME,
           new ReactNoCrashSoftException(
               "No active CatalystInstance, cannot emitUpdateDimensionsEvent"));
@@ -104,5 +108,12 @@ public void emitUpdateDimensionsEvent() {
   }
 
   @Override
-  public void invalidate() {}
+  public void invalidate() {
+    super.invalidate();
+
+    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
+    if (applicationContext != null) {
+      applicationContext.removeLifecycleEventListener(this);
+    }
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
index 60eb0750f50825..b6fd3e2ab37ba8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "dialog",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -23,5 +24,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
index 664b359a27b63b..8a111555e5e190 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
@@ -129,8 +129,7 @@ public AlertFragmentListener(Callback callback) {
     @Override
     public void onClick(DialogInterface dialog, int which) {
       if (!mCallbackConsumed) {
-        if (getReactApplicationContext().isBridgeless()
-            || getReactApplicationContext().hasActiveCatalystInstance()) {
+        if (getReactApplicationContext().hasActiveReactInstance()) {
           mCallback.invoke(ACTION_BUTTON_CLICKED, which);
           mCallbackConsumed = true;
         }
@@ -140,8 +139,7 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onDismiss(DialogInterface dialog) {
       if (!mCallbackConsumed) {
-        if (getReactApplicationContext().isBridgeless()
-            || getReactApplicationContext().hasActiveCatalystInstance()) {
+        if (getReactApplicationContext().hasActiveReactInstance()) {
           mCallback.invoke(ACTION_DISMISSED);
           mCallbackConsumed = true;
         }
@@ -240,4 +238,14 @@ public void run() {
     }
     return new FragmentManagerHelper(((FragmentActivity) activity).getSupportFragmentManager());
   }
+
+  @Override
+  public void invalidate() {
+    super.invalidate();
+
+    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
+    if (applicationContext != null) {
+      applicationContext.removeLifecycleEventListener(this);
+    }
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
index f88d3d22465bda..361c17d91f7afb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_target", "rn_android_li
 rn_android_library(
     name = "fabric",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
index a0762971a030ed..5f4e8ce6a5815d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "fresco",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
index ac70eff2adcc19..2dc27d679cc309 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
@@ -194,4 +194,14 @@ private ImagePipeline getImagePipeline() {
     }
     return mImagePipeline;
   }
+
+  @Override
+  public void invalidate() {
+    super.invalidate();
+
+    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
+    if (applicationContext != null) {
+      applicationContext.removeLifecycleEventListener(this);
+    }
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
index 2b7eeb854d9425..b4a4ad13575d96 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
@@ -1,8 +1,9 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "i18nmanager",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -21,5 +22,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
index 9567c145b2a70a..767900d3d0012e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
@@ -8,9 +8,9 @@
 package com.facebook.react.modules.i18nmanager;
 
 import android.content.Context;
-import com.facebook.react.bridge.ContextBaseJavaModule;
+import com.facebook.fbreact.specs.NativeI18nManagerSpec;
 import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
 import java.util.Locale;
@@ -18,13 +18,13 @@
 
 /** {@link NativeModule} that allows JS to set allowRTL and get isRTL status. */
 @ReactModule(name = I18nManagerModule.NAME)
-public class I18nManagerModule extends ContextBaseJavaModule {
+public class I18nManagerModule extends NativeI18nManagerSpec {
 
   public static final String NAME = "I18nManager";
 
   private final I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
 
-  public I18nManagerModule(Context context) {
+  public I18nManagerModule(ReactApplicationContext context) {
     super(context);
   }
 
@@ -34,8 +34,8 @@ public String getName() {
   }
 
   @Override
-  public Map<String, Object> getConstants() {
-    final Context context = getContext();
+  public Map<String, Object> getTypedExportedConstants() {
+    final Context context = getReactApplicationContext();
     final Locale locale = context.getResources().getConfiguration().locale;
 
     final Map<String, Object> constants = MapBuilder.newHashMap();
@@ -46,18 +46,18 @@ public Map<String, Object> getConstants() {
     return constants;
   }
 
-  @ReactMethod
+  @Override
   public void allowRTL(boolean value) {
-    sharedI18nUtilInstance.allowRTL(getContext(), value);
+    sharedI18nUtilInstance.allowRTL(getReactApplicationContext(), value);
   }
 
-  @ReactMethod
+  @Override
   public void forceRTL(boolean value) {
-    sharedI18nUtilInstance.forceRTL(getContext(), value);
+    sharedI18nUtilInstance.forceRTL(getReactApplicationContext(), value);
   }
 
-  @ReactMethod
+  @Override
   public void swapLeftAndRightInRTL(boolean value) {
-    sharedI18nUtilInstance.swapLeftAndRightInRTL(getContext(), value);
+    sharedI18nUtilInstance.swapLeftAndRightInRTL(getReactApplicationContext(), value);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
index 7a5ef484c3d957..7ebd194664fa5d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "image",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -24,6 +25,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/image:image"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
index ef9571e84e6deb..272ca10b507d47 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "intent",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -16,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
index 592da58ca8362b..c7464855ecb0e9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -28,5 +29,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
index a584d4fbcb886e..9c97c468db1461 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
@@ -190,7 +190,7 @@ public String getName() {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
+  public void invalidate() {
     mShuttingDown = true;
     cancelAllRequests();
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
index 38b2a0f961294d..c9cd347831f99f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
@@ -10,8 +10,6 @@
 import android.content.Context;
 import androidx.annotation.Nullable;
 import java.io.File;
-import java.security.Provider;
-import java.security.Security;
 import java.util.concurrent.TimeUnit;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
@@ -62,13 +60,7 @@ public static OkHttpClient.Builder createClientBuilder() {
             .writeTimeout(0, TimeUnit.MILLISECONDS)
             .cookieJar(new ReactCookieJarContainer());
 
-    try {
-      Class ConscryptProvider = Class.forName("org.conscrypt.OpenSSLProvider");
-      Security.insertProviderAt((Provider) ConscryptProvider.newInstance(), 1);
-      return client;
-    } catch (Exception e) {
-      return enableTls12OnPreLollipop(client);
-    }
+    return client;
   }
 
   public static OkHttpClient.Builder createClientBuilder(Context context) {
@@ -88,13 +80,4 @@ public static OkHttpClient.Builder createClientBuilder(Context context, int cach
 
     return client.cache(cache);
   }
-
-  /*
-   On Android 4.1-4.4 (API level 16 to 19) TLS 1.1 and 1.2 are
-   available but not enabled by default. The following method
-   enables it.
-  */
-  public static OkHttpClient.Builder enableTls12OnPreLollipop(OkHttpClient.Builder client) {
-    return client;
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
index 3aa6d043e9e635..78b11364532c3a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "permissions",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
@@ -15,5 +16,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
index 8b788efbcc6319..840c4ec62011fd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "share",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
@@ -15,5 +16,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
index a3a401b9b2bba0..6d99c374a7506b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "sound",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -19,5 +20,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
index fd0d6b732a25fc..100b151cc86ee7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "statusbar",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -24,5 +25,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
index 34890a98ba3aa0..4ba1a4ac2c65d6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
@@ -103,7 +103,7 @@ public void initialize() {
   }
 
   @Override
-  public void onCatalystInstanceDestroy() {
+  public void invalidate() {
     mShuttingDown = true;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
index 5f54664eec412a..56593871d77c6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "storage",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -18,5 +19,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/common:common"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
index 9170b3c036b9c4..5f412e628cbee5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
@@ -6,6 +6,7 @@ rn_android_library(
         "AndroidInfoModule.java",
         "ReactNativeVersion.java",
     ],
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -21,7 +22,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
         ":systeminfo-moduleless",
     ],
 )
@@ -31,6 +32,7 @@ rn_android_library(
     srcs = [
         "AndroidInfoHelpers.java",
     ],
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -43,5 +45,5 @@ rn_android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("res:systeminfo"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index bf6fbe801cae0c..3024ab3dfd41a5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -16,7 +16,7 @@
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
-      "minor", 63,
-      "patch", 3,
+      "minor", 66,
+      "patch", 0,
       "prerelease", null);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
index dc3d6cb5c6a3bd..9a1b43c9ef51dc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "toast",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
@@ -14,5 +15,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
index 40c531ec051ae6..b29994922211c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "vibration",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
@@ -16,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
index 990b45769e2dab..378a5164087840 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_roo
 rn_android_library(
     name = "websocket",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -22,6 +23,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/network:network"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target(":FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
index 3aa924ecad3ad6..76c5775ea9d04e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
@@ -5,6 +5,7 @@ rn_android_library(
     srcs = glob(
         ["**/*.java"],
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
index 99cb114823169a..abbd9256fa7d38 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
@@ -48,7 +48,9 @@ public interface ConnectionCallback {
   private @Nullable ConnectionCallback mConnectionCallback;
 
   public ReconnectingWebSocket(
-      String url, MessageCallback messageCallback, ConnectionCallback connectionCallback) {
+      String url,
+      @Nullable MessageCallback messageCallback,
+      @Nullable ConnectionCallback connectionCallback) {
     super();
     mUrl = url;
     mMessageCallback = messageCallback;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK
index d8d99e703d2b02..3575b09bb06b13 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK
@@ -7,6 +7,7 @@ rn_android_library(
             "*.java",
         ],
     ),
+    autoglob = False,
     labels = [
         "supermodule:xplat/default/public.react_native.infra",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk
index c44496918d50fc..fd0ff0d7fd64b2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk
@@ -13,7 +13,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/reactperflogger
 # Header search path for modules that depend on this module
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_LDLIBS += -landroid
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK
index bd6a96575ac35c..cd3246bef1f5a7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK
@@ -12,7 +12,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbandroid_allow_jni_merging = True,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/BUCK b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/BUCK
new file mode 100644
index 00000000000000..a68079db767f6c
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/BUCK
@@ -0,0 +1,20 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+
+rn_android_library(
+    name = "runtimescheduler",
+    srcs = glob(["**/*.java"]),
+    autoglob = False,
+    is_androidx = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_target("java/com/facebook/react/runtimescheduler/jni:jni"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
+        react_native_dep("libraries/fbjni:java"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/RuntimeSchedulerManager.java b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/RuntimeSchedulerManager.java
new file mode 100644
index 00000000000000..d7846b568c4091
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/RuntimeSchedulerManager.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.runtimescheduler;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.proguard.annotations.DoNotStripAny;
+import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.soloader.SoLoader;
+
+@DoNotStripAny
+public class RuntimeSchedulerManager {
+
+  static {
+    staticInit();
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  private final HybridData mHybridData;
+
+  public RuntimeSchedulerManager(RuntimeExecutor runtimeExecutor) {
+    mHybridData = initHybrid(runtimeExecutor);
+    installJSIBindings();
+  }
+
+  private native HybridData initHybrid(RuntimeExecutor runtimeExecutor);
+
+  private native void installJSIBindings();
+
+  private static void staticInit() {
+    SoLoader.loadLibrary("runtimeschedulerjni");
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/Android.mk
new file mode 100644
index 00000000000000..bb4e32011288ca
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/Android.mk
@@ -0,0 +1,34 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := runtimeschedulerjni
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_SHARED_LIBRARIES := libglog libfb libfbjni libglog_init libreact_render_runtimescheduler librrc_native
+
+LOCAL_STATIC_LIBRARIES :=
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"ReacTNative\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,fbgloginit)
+$(call import-module,fb)
+$(call import-module,fbjni)
+$(call import-module,glog)
+
+$(call import-module,react/renderer/runtimescheduler)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/BUCK
new file mode 100644
index 00000000000000..426b06a139110e
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/BUCK
@@ -0,0 +1,35 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
+
+rn_xplat_cxx_library(
+    name = "jni",
+    srcs = glob(["*.cpp"]),
+    headers = glob(["*.h"]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "**/*.h"),
+        ],
+        prefix = "react/runtimescheduler",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    fbandroid_allow_jni_merging = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    platforms = ANDROID,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    soname = "libruntimeschedulerjni.$(ext)",
+    visibility = ["PUBLIC"],
+    deps = [
+        react_native_xplat_target("react/renderer/runtimescheduler:runtimescheduler"),
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        react_native_target("jni/react/jni:jni"),
+        FBJNI_TARGET,
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/OnLoad.cpp
new file mode 100644
index 00000000000000..189de80dfce801
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/OnLoad.cpp
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fbjni/fbjni.h>
+
+#include "RuntimeSchedulerManager.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(
+      vm, [] { facebook::react::RuntimeSchedulerManager::registerNatives(); });
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.cpp
new file mode 100644
index 00000000000000..2b0d89337035ca
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fbjni/fbjni.h>
+#include <jsi/jsi.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
+
+#include "RuntimeSchedulerManager.h"
+
+namespace facebook {
+namespace react {
+
+RuntimeSchedulerManager::RuntimeSchedulerManager(
+    RuntimeExecutor runtimeExecutor)
+    : runtimeExecutor_(runtimeExecutor) {}
+
+jni::local_ref<RuntimeSchedulerManager::jhybriddata>
+RuntimeSchedulerManager::initHybrid(
+    jni::alias_ref<jclass>,
+    jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor) {
+  return makeCxxInstance(runtimeExecutor->cthis()->get());
+}
+
+void RuntimeSchedulerManager::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", RuntimeSchedulerManager::initHybrid),
+      makeNativeMethod(
+          "installJSIBindings", RuntimeSchedulerManager::installJSIBindings),
+  });
+}
+
+void RuntimeSchedulerManager::installJSIBindings() {
+  runtimeExecutor_([runtimeExecutor = runtimeExecutor_](jsi::Runtime &runtime) {
+    auto runtimeScheduler = std::make_shared<RuntimeScheduler>(runtimeExecutor);
+    RuntimeSchedulerBinding::createAndInstallIfNeeded(
+        runtime, runtimeScheduler);
+  });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.h b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.h
new file mode 100644
index 00000000000000..6456c7176fabf9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/runtimescheduler/jni/RuntimeSchedulerManager.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <ReactCommon/CallInvokerHolder.h>
+#include <ReactCommon/RuntimeExecutor.h>
+#include <fbjni/fbjni.h>
+#include <react/jni/JRuntimeExecutor.h>
+
+namespace facebook {
+namespace react {
+
+class RuntimeSchedulerManager
+    : public facebook::jni::HybridClass<RuntimeSchedulerManager> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/runtimescheduler/RuntimeSchedulerManager;";
+
+  static facebook::jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>,
+      facebook::jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor);
+
+  static void registerNatives();
+
+ private:
+  friend HybridBase;
+  RuntimeExecutor runtimeExecutor_;
+
+  void installJSIBindings();
+
+  explicit RuntimeSchedulerManager(RuntimeExecutor runtimeExecutor);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
index e8e27ee8e2b900..a5bb7403e8f6d5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "shell",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -54,7 +55,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/drawer:drawer"),
         react_native_target("java/com/facebook/react/views/image:image"),
         react_native_target("java/com/facebook/react/views/modal:modal"),
-        react_native_target("java/com/facebook/react/views/picker:picker"),
         react_native_target("java/com/facebook/react/views/progressbar:progressbar"),
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
         react_native_target("java/com/facebook/react/views/slider:slider"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
index 471ba0c833ec41..0dd8f31c54525c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
@@ -43,8 +43,6 @@
 import com.facebook.react.views.drawer.ReactDrawerLayoutManager;
 import com.facebook.react.views.image.ReactImageManager;
 import com.facebook.react.views.modal.ReactModalHostManager;
-import com.facebook.react.views.picker.ReactDialogPickerManager;
-import com.facebook.react.views.picker.ReactDropdownPickerManager;
 import com.facebook.react.views.progressbar.ReactProgressBarViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollContainerViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollViewManager;
@@ -160,9 +158,7 @@ public MainReactPackage(MainPackageConfig config) {
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     List<ViewManager> viewManagers = new ArrayList<>();
 
-    viewManagers.add(new ReactDialogPickerManager());
     viewManagers.add(new ReactDrawerLayoutManager());
-    viewManagers.add(new ReactDropdownPickerManager());
     viewManagers.add(new ReactHorizontalScrollViewManager());
     viewManagers.add(new ReactHorizontalScrollContainerViewManager());
     viewManagers.add(new ReactProgressBarViewManager());
diff --git a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK
index beb35ce40c1055..6a21268b9c579b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 rn_android_library(
     name = "surface",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
index 839bd5beb44bb0..c9d6bbbe59e0a9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "touch",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK
index 721fe18d0cc7f1..5017297bed8148 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK
@@ -8,6 +8,7 @@ rn_android_library(
         ],
         exclude = ["CallInvokerHolderImpl.java"],
     ),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
     visibility = [
@@ -28,7 +29,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/bridge:interfaces"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/config:config"),
-        react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/module/model:model"),
         ":callinvokerholder",
     ],
@@ -40,6 +40,7 @@ rn_android_library(
 rn_android_library(
     name = "callinvokerholder",
     srcs = ["CallInvokerHolderImpl.java"],
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java
index e6e6fcce69e099..6a592ae02fb018 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java
@@ -15,8 +15,8 @@
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.CxxModuleWrapper;
 import com.facebook.react.bridge.JSIModule;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry;
@@ -49,18 +49,19 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
   private final HybridData mHybridData;
 
   public TurboModuleManager(
-      JavaScriptContextHolder jsContext,
+      RuntimeExecutor runtimeExecutor,
       @Nullable final TurboModuleManagerDelegate delegate,
       CallInvokerHolder jsCallInvokerHolder,
       CallInvokerHolder nativeCallInvokerHolder) {
     maybeLoadSoLibrary();
     mHybridData =
         initHybrid(
-            jsContext.get(),
+            runtimeExecutor,
             (CallInvokerHolderImpl) jsCallInvokerHolder,
             (CallInvokerHolderImpl) nativeCallInvokerHolder,
             delegate,
-            false);
+            ReactFeatureFlags.useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+            ReactFeatureFlags.useTurboModuleManagerCallbackCleanupScope);
     installJSIBindings();
 
     mEagerInitModuleNames =
@@ -215,7 +216,7 @@ private TurboModule getModule(
          * NativeModules should be initialized after ReactApplicationContext has been set up.
          * Therefore, we should initialize on the TurboModule now.
          */
-        ((NativeModule) turboModule).initialize();
+        turboModule.initialize();
       }
 
       TurboModulePerfLogger.moduleCreateSetUpEnd(moduleName, moduleHolder.getModuleId());
@@ -289,11 +290,12 @@ public boolean hasModule(String moduleName) {
   }
 
   private native HybridData initHybrid(
-      long jsContext,
+      RuntimeExecutor runtimeExecutor,
       CallInvokerHolderImpl jsCallInvokerHolder,
       CallInvokerHolderImpl nativeCallInvokerHolder,
       TurboModuleManagerDelegate tmmDelegate,
-      boolean enablePromiseAsyncDispatch);
+      boolean useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      boolean useTurboModuleManagerCallbackCleanupScope);
 
   private native void installJSIBindings();
 
@@ -328,8 +330,7 @@ public void onCatalystInstanceDestroy() {
       final TurboModule turboModule = getModule(moduleName, moduleHolder, false);
 
       if (turboModule != null) {
-        // TODO(T48014458): Rename this to invalidate()
-        ((NativeModule) turboModule).onCatalystInstanceDestroy();
+        turboModule.invalidate();
       }
     }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManagerDelegate.java
index b744d110dd969f..9dcd6126e0c3c0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManagerDelegate.java
@@ -9,6 +9,7 @@
 
 import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.CxxModuleWrapper;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import com.facebook.soloader.SoLoader;
@@ -16,6 +17,8 @@
 import java.util.List;
 
 public abstract class TurboModuleManagerDelegate {
+  @DoNotStrip
+  @SuppressWarnings("unused")
   private final HybridData mHybridData;
 
   private static volatile boolean sIsSoLibraryLoaded;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModulePerfLogger.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModulePerfLogger.java
index eb8e49d5dfdae0..36d7d1d010c4de 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModulePerfLogger.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModulePerfLogger.java
@@ -7,10 +7,12 @@
 
 package com.facebook.react.turbomodule.core;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.perflogger.NativeModulePerfLogger;
 import com.facebook.soloader.SoLoader;
 import javax.annotation.Nullable;
 
+@DoNotStrip
 public class TurboModulePerfLogger {
   @Nullable private static NativeModulePerfLogger sNativeModulePerfLogger = null;
   private static boolean sIsSoLibraryLoaded = false;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK
index ad97b93f20d94a..5526d046ddfef7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK
@@ -5,6 +5,7 @@ rn_android_library(
     srcs = glob(
         ["*.java"],
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/TurboModule.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/TurboModule.java
index 13bbe587179846..6c80d059f5a352 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/TurboModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/TurboModule.java
@@ -9,9 +9,9 @@
 
 /** All turbo modules should inherit from this interface */
 public interface TurboModule {
-  /**
-   * When CatalystInstance is destroyed, this method will be called. All implementing TurboModules
-   * can perform cleanup here.
-   */
+  /** Initialize the TurboModule. */
+  void initialize();
+
+  /** Called before React Native is torn down. Clean up after the TurboModule. */
   void invalidate();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
index 955cc86a8b10de..b017546b19db10 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
@@ -17,11 +17,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
 # Header search path for modules that depend on this module
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
-LOCAL_SHARED_LIBRARIES = libfb libfbjni
+LOCAL_SHARED_LIBRARIES = libfb libfbjni libreactnativeutilsjni
 
-LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni
+LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni libruntimeexecutor
 
 # Name of this module.
 LOCAL_MODULE := callinvokerholder
@@ -48,7 +48,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
 # Header search path for modules that depend on this module
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_SHARED_LIBRARIES = libfb libfbjni libreact_nativemodule_core
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
index b0db877eea667d..96ade8eaea043d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
@@ -14,7 +14,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     labels = ["supermodule:xplat/default/public.react_native.infra"],
@@ -35,6 +35,7 @@ rn_xplat_cxx_library(
         ":callinvokerholder",
         react_native_xplat_shared_library_target("jsi:jsi"),
         react_native_xplat_target("react/nativemodule/core:core"),
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_target("java/com/facebook/react/reactperflogger/jni:jni"),
     ],
 )
@@ -51,7 +52,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbandroid_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp
index 131b41b075ecb3..ce7a43e0c91a25 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp
@@ -23,35 +23,58 @@ namespace react {
 
 TurboModuleManager::TurboModuleManager(
     jni::alias_ref<TurboModuleManager::javaobject> jThis,
-    jsi::Runtime *rt,
+    RuntimeExecutor runtimeExecutor,
     std::shared_ptr<CallInvoker> jsCallInvoker,
     std::shared_ptr<CallInvoker> nativeCallInvoker,
-    jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate)
+    jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
+    bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+    bool useTurboModuleManagerCallbackCleanupScope)
     : javaPart_(jni::make_global(jThis)),
-      runtime_(rt),
+      runtimeExecutor_(runtimeExecutor),
       jsCallInvoker_(jsCallInvoker),
       nativeCallInvoker_(nativeCallInvoker),
       delegate_(jni::make_global(delegate)),
-      turboModuleCache_(std::make_shared<TurboModuleCache>()) {}
+      turboModuleCache_(std::make_shared<TurboModuleCache>()) {
+  if (useGlobalCallbackCleanupScopeUsingRetainJSCallback) {
+    longLivedObjectCollection_ = nullptr;
+    retainJSCallback_ = [](jsi::Function &&callback,
+                           jsi::Runtime &runtime,
+                           std::shared_ptr<CallInvoker> jsInvoker) {
+      return CallbackWrapper::createWeak(
+          std::move(callback), runtime, jsInvoker);
+    };
+  } else if (useTurboModuleManagerCallbackCleanupScope) {
+    longLivedObjectCollection_ = std::make_shared<LongLivedObjectCollection>();
+    retainJSCallback_ = [longLivedObjectCollection =
+                             longLivedObjectCollection_](
+                            jsi::Function &&callback,
+                            jsi::Runtime &runtime,
+                            std::shared_ptr<CallInvoker> jsInvoker) {
+      return CallbackWrapper::createWeak(
+          longLivedObjectCollection, std::move(callback), runtime, jsInvoker);
+    };
+  }
+}
 
 jni::local_ref<TurboModuleManager::jhybriddata> TurboModuleManager::initHybrid(
     jni::alias_ref<jhybridobject> jThis,
-    jlong jsContext,
+    jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
     jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder,
     jni::alias_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder,
     jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
-    bool enablePromiseAsyncDispatch) {
+    bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+    bool useTurboModuleManagerCallbackCleanupScope) {
   auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
   auto nativeCallInvoker = nativeCallInvokerHolder->cthis()->getCallInvoker();
 
-  JavaTurboModule::enablePromiseAsyncDispatch(enablePromiseAsyncDispatch);
-
   return makeCxxInstance(
       jThis,
-      (jsi::Runtime *)jsContext,
+      runtimeExecutor->cthis()->get(),
       jsCallInvoker,
       nativeCallInvoker,
-      delegate);
+      delegate,
+      useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      useTurboModuleManagerCallbackCleanupScope);
 }
 
 void TurboModuleManager::registerNatives() {
@@ -63,91 +86,97 @@ void TurboModuleManager::registerNatives() {
 }
 
 void TurboModuleManager::installJSIBindings() {
-  if (!runtime_ || !jsCallInvoker_) {
+  if (!jsCallInvoker_) {
     return; // Runtime doesn't exist when attached to Chrome debugger.
   }
 
-  auto turboModuleProvider =
-      [turboModuleCache_ = std::weak_ptr<TurboModuleCache>(turboModuleCache_),
-       jsCallInvoker_ = std::weak_ptr<CallInvoker>(jsCallInvoker_),
-       nativeCallInvoker_ = std::weak_ptr<CallInvoker>(nativeCallInvoker_),
-       delegate_ = jni::make_weak(delegate_),
-       javaPart_ = jni::make_weak(javaPart_)](
-          const std::string &name,
-          const jsi::Value *schema) -> std::shared_ptr<TurboModule> {
-    auto turboModuleCache = turboModuleCache_.lock();
-    auto jsCallInvoker = jsCallInvoker_.lock();
-    auto nativeCallInvoker = nativeCallInvoker_.lock();
-    auto delegate = delegate_.lockLocal();
-    auto javaPart = javaPart_.lockLocal();
-
-    if (!turboModuleCache || !jsCallInvoker || !nativeCallInvoker ||
-        !delegate || !javaPart) {
-      return nullptr;
-    }
-
-    const char *moduleName = name.c_str();
-
-    TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName);
+  runtimeExecutor_([this](jsi::Runtime &runtime) {
+    auto turboModuleProvider =
+        [turboModuleCache_ = std::weak_ptr<TurboModuleCache>(turboModuleCache_),
+         jsCallInvoker_ = std::weak_ptr<CallInvoker>(jsCallInvoker_),
+         nativeCallInvoker_ = std::weak_ptr<CallInvoker>(nativeCallInvoker_),
+         delegate_ = jni::make_weak(delegate_),
+         javaPart_ = jni::make_weak(javaPart_),
+         retainJSCallback = retainJSCallback_](
+            const std::string &name) -> std::shared_ptr<TurboModule> {
+      auto turboModuleCache = turboModuleCache_.lock();
+      auto jsCallInvoker = jsCallInvoker_.lock();
+      auto nativeCallInvoker = nativeCallInvoker_.lock();
+      auto delegate = delegate_.lockLocal();
+      auto javaPart = javaPart_.lockLocal();
+
+      if (!turboModuleCache || !jsCallInvoker || !nativeCallInvoker ||
+          !delegate || !javaPart) {
+        return nullptr;
+      }
+
+      const char *moduleName = name.c_str();
+
+      TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName);
+
+      auto turboModuleLookup = turboModuleCache->find(name);
+      if (turboModuleLookup != turboModuleCache->end()) {
+        TurboModulePerfLogger::moduleJSRequireBeginningCacheHit(moduleName);
+        TurboModulePerfLogger::moduleJSRequireBeginningEnd(moduleName);
+        return turboModuleLookup->second;
+      }
 
-    auto turboModuleLookup = turboModuleCache->find(name);
-    if (turboModuleLookup != turboModuleCache->end()) {
-      TurboModulePerfLogger::moduleJSRequireBeginningCacheHit(moduleName);
       TurboModulePerfLogger::moduleJSRequireBeginningEnd(moduleName);
-      return turboModuleLookup->second;
-    }
 
-    TurboModulePerfLogger::moduleJSRequireBeginningEnd(moduleName);
+      auto cxxModule = delegate->cthis()->getTurboModule(name, jsCallInvoker);
+      if (cxxModule) {
+        turboModuleCache->insert({name, cxxModule});
+        return cxxModule;
+      }
+
+      static auto getLegacyCxxModule =
+          javaPart->getClass()
+              ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
+                  const std::string &)>("getLegacyCxxModule");
+      auto legacyCxxModule = getLegacyCxxModule(javaPart.get(), name);
+
+      if (legacyCxxModule) {
+        TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
+
+        auto turboModule = std::make_shared<react::TurboCxxModule>(
+            legacyCxxModule->cthis()->getModule(), jsCallInvoker);
+        turboModuleCache->insert({name, turboModule});
+
+        TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
+        return turboModule;
+      }
+
+      static auto getJavaModule =
+          javaPart->getClass()
+              ->getMethod<jni::alias_ref<JTurboModule>(const std::string &)>(
+                  "getJavaModule");
+      auto moduleInstance = getJavaModule(javaPart.get(), name);
+
+      if (moduleInstance) {
+        TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
+        JavaTurboModule::InitParams params = {
+            .moduleName = name,
+            .instance = moduleInstance,
+            .jsInvoker = jsCallInvoker,
+            .nativeInvoker = nativeCallInvoker,
+            .retainJSCallback = retainJSCallback};
+
+        auto turboModule = delegate->cthis()->getTurboModule(name, params);
+        turboModuleCache->insert({name, turboModule});
+        TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
+        return turboModule;
+      }
 
-    auto cxxModule = delegate->cthis()->getTurboModule(name, jsCallInvoker);
-    if (cxxModule) {
-      turboModuleCache->insert({name, cxxModule});
-      return cxxModule;
-    }
-
-    static auto getLegacyCxxModule =
-        javaPart->getClass()
-            ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
-                const std::string &)>("getLegacyCxxModule");
-    auto legacyCxxModule = getLegacyCxxModule(javaPart.get(), name);
-
-    if (legacyCxxModule) {
-      TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-
-      auto turboModule = std::make_shared<react::TurboCxxModule>(
-          legacyCxxModule->cthis()->getModule(), jsCallInvoker);
-      turboModuleCache->insert({name, turboModule});
-
-      TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-      return turboModule;
-    }
+      return nullptr;
+    };
 
-    static auto getJavaModule =
-        javaPart->getClass()
-            ->getMethod<jni::alias_ref<JTurboModule>(const std::string &)>(
-                "getJavaModule");
-    auto moduleInstance = getJavaModule(javaPart.get(), name);
-
-    if (moduleInstance) {
-      TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-      JavaTurboModule::InitParams params = {.moduleName = name,
-                                            .instance = moduleInstance,
-                                            .jsInvoker = jsCallInvoker,
-                                            .nativeInvoker = nativeCallInvoker};
-
-      auto turboModule = delegate->cthis()->getTurboModule(name, params);
-      turboModuleCache->insert({name, turboModule});
-      TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-      return turboModule;
+    if (longLivedObjectCollection_) {
+      TurboModuleBinding::install(
+          runtime, std::move(turboModuleProvider), longLivedObjectCollection_);
+    } else {
+      TurboModuleBinding::install(runtime, std::move(turboModuleProvider));
     }
-
-    return nullptr;
-  };
-
-  jsCallInvoker_->invokeAsync(
-      [this, turboModuleProvider = std::move(turboModuleProvider)]() -> void {
-        TurboModuleBinding::install(*runtime_, std::move(turboModuleProvider));
-      });
+  });
 }
 
 } // namespace react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h
index 899d2a1d1cf8e4..6b8fd0669b8616 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h
@@ -9,12 +9,15 @@
 
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/LongLivedObject.h>
+#include <ReactCommon/RuntimeExecutor.h>
 #include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
 #include <react/jni/CxxModuleWrapper.h>
 #include <react/jni/JMessageQueueThread.h>
+#include <react/jni/JRuntimeExecutor.h>
 #include <memory>
 #include <unordered_map>
 
@@ -27,21 +30,25 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
       "Lcom/facebook/react/turbomodule/core/TurboModuleManager;";
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jhybridobject> jThis,
-      jlong jsContext,
+      jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
       jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder,
       jni::alias_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
-      bool enablePromiseAsyncDispatch);
+      bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      bool useTurboModuleManagerCallbackCleanupScope);
   static void registerNatives();
 
  private:
   friend HybridBase;
   jni::global_ref<TurboModuleManager::javaobject> javaPart_;
-  jsi::Runtime *runtime_;
+  RuntimeExecutor runtimeExecutor_;
   std::shared_ptr<CallInvoker> jsCallInvoker_;
   std::shared_ptr<CallInvoker> nativeCallInvoker_;
   jni::global_ref<TurboModuleManagerDelegate::javaobject> delegate_;
 
+  JSCallbackRetainer retainJSCallback_;
+  std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection_;
+
   using TurboModuleCache =
       std::unordered_map<std::string, std::shared_ptr<react::TurboModule>>;
 
@@ -56,10 +63,12 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
   void installJSIBindings();
   explicit TurboModuleManager(
       jni::alias_ref<TurboModuleManager::jhybridobject> jThis,
-      jsi::Runtime *rt,
+      RuntimeExecutor runtimeExecutor,
       std::shared_ptr<CallInvoker> jsCallInvoker,
       std::shared_ptr<CallInvoker> nativeCallInvoker,
-      jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
+      jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate,
+      bool useGlobalCallbackCleanupScopeUsingRetainJSCallback,
+      bool useTurboModuleManagerCallbackCleanupScope);
 };
 
 } // namespace react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 985aeb4e9ed375..9979f6dfdde5d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -13,6 +13,7 @@ rn_android_library(
             "DisplayMetricsHolder.java",
         ],
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -31,11 +32,14 @@ rn_android_library(
         ":DisplayMetrics",
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/uimanager/jni:jni"),
         react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
@@ -43,7 +47,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager/util:util"),
-        react_native_target("java/com/facebook/react/uimanager/common:common"),
         react_native_target("res:uimanager"),
     ],
     exported_deps = [
@@ -51,6 +54,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/uimanager/common:common"),
+        react_native_target("java/com/facebook/react/uimanager/interfaces:interfaces"),
     ],
 )
 
@@ -59,6 +63,7 @@ rn_android_library(
     srcs = [
         "DisplayMetricsHolder.java",
     ],
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 7ab93dc676f313..25579c4c292f6b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -166,8 +166,22 @@ public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilitySta
     if (accessibilityState == null) {
       return;
     }
+    if (accessibilityState.hasKey("selected")) {
+      boolean prevSelected = view.isSelected();
+      boolean nextSelected = accessibilityState.getBoolean("selected");
+      view.setSelected(nextSelected);
+
+      // For some reason, Android does not announce "unselected" when state changes.
+      // This is inconsistent with other platforms, but also with the "checked" state.
+      // So manually announce this.
+      if (view.isAccessibilityFocused() && prevSelected && !nextSelected) {
+        view.announceForAccessibility(
+            view.getContext().getString(R.string.state_unselected_description));
+      }
+    } else {
+      view.setSelected(false);
+    }
     view.setTag(R.id.accessibility_state, accessibilityState);
-    view.setSelected(false);
     view.setEnabled(true);
 
     // For states which don't have corresponding methods in
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolver.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolver.java
new file mode 100644
index 00000000000000..002477dbdbbc58
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolver.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+import com.facebook.proguard.annotations.DoNotStripAny;
+
+@DoNotStripAny
+public interface ComponentNameResolver {
+
+  /* returns a list of all the component names that are registered in React Native. */
+  String[] getComponentNames();
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolverManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolverManager.java
new file mode 100644
index 00000000000000..9f519114ed7055
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolverManager.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.proguard.annotations.DoNotStripAny;
+import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.soloader.SoLoader;
+
+@DoNotStripAny
+public class ComponentNameResolverManager {
+
+  static {
+    staticInit();
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  private final HybridData mHybridData;
+
+  public ComponentNameResolverManager(
+      RuntimeExecutor runtimeExecutor, Object componentNameResolver) {
+    mHybridData = initHybrid(runtimeExecutor, componentNameResolver);
+    installJSIBindings();
+  }
+
+  private native HybridData initHybrid(
+      RuntimeExecutor runtimeExecutor, Object componentNameResolver);
+
+  private native void installJSIBindings();
+
+  private static void staticInit() {
+    SoLoader.loadLibrary("uimanagerjni");
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
index 8ecd9cdf94221a..3caf9bcf44cb46 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
@@ -13,9 +13,8 @@
 import android.view.WindowManager;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Holds an instance of the current DisplayMetrics so we don't have to thread it through all the
@@ -81,40 +80,20 @@ public static DisplayMetrics getScreenDisplayMetrics() {
     return sScreenDisplayMetrics;
   }
 
-  public static Map<String, Map<String, Object>> getDisplayMetricsMap(double fontScale) {
+  public static WritableMap getDisplayMetricsWritableMap(double fontScale) {
     Assertions.assertCondition(
         sWindowDisplayMetrics != null && sScreenDisplayMetrics != null,
-        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics");
-    final Map<String, Map<String, Object>> result = new HashMap<>();
-    result.put("windowPhysicalPixels", getPhysicalPixelsMap(sWindowDisplayMetrics, fontScale));
-    result.put("screenPhysicalPixels", getPhysicalPixelsMap(sScreenDisplayMetrics, fontScale));
-    return result;
-  }
-
-  public static WritableNativeMap getDisplayMetricsNativeMap(double fontScale) {
-    Assertions.assertCondition(
-        sWindowDisplayMetrics != null && sScreenDisplayMetrics != null,
-        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics");
+        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or"
+            + " initDisplayMetrics");
     final WritableNativeMap result = new WritableNativeMap();
     result.putMap(
-        "windowPhysicalPixels", getPhysicalPixelsNativeMap(sWindowDisplayMetrics, fontScale));
+        "windowPhysicalPixels", getPhysicalPixelsWritableMap(sWindowDisplayMetrics, fontScale));
     result.putMap(
-        "screenPhysicalPixels", getPhysicalPixelsNativeMap(sScreenDisplayMetrics, fontScale));
-    return result;
-  }
-
-  private static Map<String, Object> getPhysicalPixelsMap(
-      DisplayMetrics displayMetrics, double fontScale) {
-    final Map<String, Object> result = new HashMap<>();
-    result.put("width", displayMetrics.widthPixels);
-    result.put("height", displayMetrics.heightPixels);
-    result.put("scale", displayMetrics.density);
-    result.put("fontScale", fontScale);
-    result.put("densityDpi", displayMetrics.densityDpi);
+        "screenPhysicalPixels", getPhysicalPixelsWritableMap(sScreenDisplayMetrics, fontScale));
     return result;
   }
 
-  private static WritableNativeMap getPhysicalPixelsNativeMap(
+  private static WritableMap getPhysicalPixelsWritableMap(
       DisplayMetrics displayMetrics, double fontScale) {
     final WritableNativeMap result = new WritableNativeMap();
     result.putInt("width", displayMetrics.widthPixels);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java
index 073b91122f0338..1a1cdd0764222a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FabricViewStateManager.java
@@ -11,7 +11,6 @@
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.config.ReactFeatureFlags;
 
 /**
  * This is a helper base class for ViewGroups that use Fabric State.
@@ -67,33 +66,20 @@ private void setState(
       return;
     }
 
-    Runnable failureRunnable = null;
-    if (ReactFeatureFlags.enableExperimentalStateUpdateRetry) {
-      failureRunnable =
-          new Runnable() {
-            @Override
-            // Run on the UI thread
-            public void run() {
-              FLog.e(TAG, "UpdateState failed - retrying! " + numTries);
-              setState(stateWrapper, stateUpdateCallback, numTries + 1);
-            }
-          };
-    }
     @Nullable WritableMap stateUpdate = stateUpdateCallback.getStateUpdate();
     if (stateUpdate == null) {
       return;
     }
-    stateWrapper.updateState(
-        stateUpdate,
-        // Failure callback - this is run if the updateState call fails
-        failureRunnable);
+
+    // TODO: State update cannot fail; remove `failureRunnable` and custom retrying logic.
+    stateWrapper.updateState(stateUpdate);
   }
 
   public void setState(final StateUpdateCallback stateUpdateCallback) {
     setState(mStateWrapper, stateUpdateCallback, 0);
   }
 
-  public @Nullable ReadableMap getState() {
-    return mStateWrapper != null ? mStateWrapper.getState() : null;
+  public @Nullable ReadableMap getStateData() {
+    return mStateWrapper != null ? mStateWrapper.getStateData() : null;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
index e103cd3923c8e4..b50f3dafb485a3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
@@ -12,6 +12,7 @@
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.TouchEvent;
 import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper;
@@ -50,6 +51,25 @@ public void onChildStartedNativeGesture(
     mTargetTag = -1;
   }
 
+  /**
+   * See Event.java. By contract, this surfaceId should be a valid SurfaceId in Fabric, and should
+   * ALWAYS return -1 in non-Fabric.
+   *
+   * @return
+   */
+  private int getSurfaceId() {
+    if (mRootViewGroup != null
+        && mRootViewGroup instanceof ReactRoot
+        && ((ReactRoot) mRootViewGroup).getUIManagerType() == UIManagerType.FABRIC) {
+      if (mRootViewGroup.getContext() instanceof ThemedReactContext) {
+        ThemedReactContext context = (ThemedReactContext) mRootViewGroup.getContext();
+        return context.getSurfaceId();
+      }
+      return ((ReactRoot) mRootViewGroup).getRootViewTag();
+    }
+    return -1;
+  }
+
   /**
    * Main catalyst view is responsible for collecting and sending touch events to JS. This method
    * reacts for an incoming android native touch events ({@link MotionEvent}) and calls into {@link
@@ -70,9 +90,11 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
       // this gesture
       mChildIsHandlingNativeGesture = false;
       mGestureStartTime = ev.getEventTime();
+
       mTargetTag = findTargetTagAndSetCoordinates(ev);
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
+              getSurfaceId(),
               mTargetTag,
               TouchEventType.START,
               ev,
@@ -97,6 +119,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
       findTargetTagAndSetCoordinates(ev);
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
+              getSurfaceId(),
               mTargetTag,
               TouchEventType.END,
               ev,
@@ -111,6 +134,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
       findTargetTagAndSetCoordinates(ev);
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
+              getSurfaceId(),
               mTargetTag,
               TouchEventType.MOVE,
               ev,
@@ -122,6 +146,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
       // New pointer goes down, this can only happen after ACTION_DOWN is sent for the first pointer
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
+              getSurfaceId(),
               mTargetTag,
               TouchEventType.START,
               ev,
@@ -133,6 +158,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
       // Exactly onw of the pointers goes up
       eventDispatcher.dispatchEvent(
           TouchEvent.obtain(
+              getSurfaceId(),
               mTargetTag,
               TouchEventType.END,
               ev,
@@ -181,6 +207,7 @@ private void dispatchCancelEvent(MotionEvent androidEvent, EventDispatcher event
     Assertions.assertNotNull(eventDispatcher)
         .dispatchEvent(
             TouchEvent.obtain(
+                getSurfaceId(),
                 mTargetTag,
                 TouchEventType.CANCEL,
                 androidEvent,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index ff1147ad3fe09b..5ca18f60b0579c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -30,7 +30,6 @@
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
@@ -278,17 +277,10 @@ public synchronized void createView(
     try {
       ViewManager viewManager = mViewManagers.get(className);
 
-      View view = viewManager.createView(themedContext, null, null, mJSResponderHandler);
+      View view =
+          viewManager.createView(tag, themedContext, initialProps, null, mJSResponderHandler);
       mTagsToViews.put(tag, view);
       mTagsToViewManagers.put(tag, viewManager);
-
-      // Use android View id field to store React tag. This is possible since we don't inflate
-      // React views from layout xmls. Thus it is easier to just reuse that field instead of
-      // creating another (potentially much more expensive) mapping from view to React tag
-      view.setId(tag);
-      if (initialProps != null) {
-        viewManager.updateProperties(view, initialProps);
-      }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_VIEW);
     }
@@ -859,9 +851,8 @@ public synchronized void dispatchCommand(
               + commandId);
     }
     ViewManager viewManager = resolveViewManager(reactTag);
-    ViewManagerDelegate delegate;
-    if (ReactFeatureFlags.useViewManagerDelegatesForCommands
-        && (delegate = viewManager.getDelegate()) != null) {
+    ViewManagerDelegate delegate = viewManager.getDelegate();
+    if (delegate != null) {
       delegate.receiveCommand(view, commandId, args);
     } else {
       viewManager.receiveCommand(view, commandId, args);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
index 3e196698f24e9d..66e1cb38f3a924 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
@@ -13,7 +13,6 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.config.ReactFeatureFlags;
 
 /**
  * Class responsible for optimizing the native view hierarchy while still respecting the final UI
@@ -425,18 +424,16 @@ private void transitionLayoutOnlyViewToNativeView(
     // Bit of a hack: we need to update the layout of this node's children now that it's no longer
     // layout-only, but we may still receive more layout updates at the end of this batch that we
     // don't want to ignore.
-    if (ReactFeatureFlags.enableTransitionLayoutOnlyViewCleanup) {
-      FLog.i(
-          TAG,
-          "Transitioning LayoutOnlyView - tag: "
-              + node.getReactTag()
-              + " - rootTag: "
-              + node.getRootTag()
-              + " - hasProps: "
-              + (props != null)
-              + " - tagsWithLayout.size: "
-              + mTagsWithLayoutVisited.size());
-    }
+    FLog.i(
+        TAG,
+        "Transitioning LayoutOnlyView - tag: "
+            + node.getReactTag()
+            + " - rootTag: "
+            + node.getRootTag()
+            + " - hasProps: "
+            + (props != null)
+            + " - tagsWithLayout.size: "
+            + mTagsWithLayoutVisited.size());
     Assertions.assertCondition(mTagsWithLayoutVisited.size() == 0);
     applyLayoutBase(node);
     for (int i = 0; i < node.getChildCount(); i++) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
index 1278dc253d00b7..d7eb8de6860c28 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
@@ -7,11 +7,11 @@
 
 package com.facebook.react.uimanager;
 
+import androidx.annotation.Nullable;
 import androidx.core.util.Pools;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event used to notify JS component about changes of its position or dimensions */
 public class OnLayoutEvent extends Event<OnLayoutEvent> {
@@ -21,12 +21,18 @@ public class OnLayoutEvent extends Event<OnLayoutEvent> {
 
   private int mX, mY, mWidth, mHeight;
 
+  @Deprecated
   public static OnLayoutEvent obtain(int viewTag, int x, int y, int width, int height) {
+    return obtain(-1, viewTag, x, y, width, height);
+  }
+
+  public static OnLayoutEvent obtain(
+      int surfaceId, int viewTag, int x, int y, int width, int height) {
     OnLayoutEvent event = EVENTS_POOL.acquire();
     if (event == null) {
       event = new OnLayoutEvent();
     }
-    event.init(viewTag, x, y, width, height);
+    event.init(surfaceId, viewTag, x, y, width, height);
     return event;
   }
 
@@ -37,8 +43,13 @@ public void onDispose() {
 
   private OnLayoutEvent() {}
 
+  @Deprecated
   protected void init(int viewTag, int x, int y, int width, int height) {
-    super.init(viewTag);
+    init(-1, viewTag, x, y, width, height);
+  }
+
+  protected void init(int surfaceId, int viewTag, int x, int y, int width, int height) {
+    super.init(surfaceId, viewTag);
     mX = x;
     mY = y;
     mWidth = width;
@@ -50,8 +61,9 @@ public String getEventName() {
     return "topLayout";
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
+  protected WritableMap getEventData() {
     WritableMap layout = Arguments.createMap();
     layout.putDouble("x", PixelUtil.toDIPFromPixel(mX));
     layout.putDouble("y", PixelUtil.toDIPFromPixel(mY));
@@ -61,7 +73,6 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
     WritableMap event = Arguments.createMap();
     event.putMap("layout", layout);
     event.putInt("target", getViewTag());
-
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), event);
+    return event;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
index 8400527f6fa142..e4d9c7ee2243a0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
@@ -24,11 +24,6 @@ public static float toPixelFromDIP(double value) {
     return toPixelFromDIP((float) value);
   }
 
-  /** Convert from PX to SP */
-  public static float toSPFromPixel(float value) {
-    return value / DisplayMetricsHolder.getScreenDisplayMetrics().scaledDensity;
-  }
-
   /** Convert from SP to PX */
   public static float toPixelFromSP(float value) {
     return toPixelFromSP(value, Float.NaN);
@@ -58,6 +53,6 @@ public static float toDIPFromPixel(float value) {
 
   /** @return {@link float} that represents the density of the display metrics for device screen. */
   public static float getDisplayMetricDensity() {
-    return DisplayMetricsHolder.getScreenDisplayMetrics().density;
+    return DisplayMetricsHolder.getWindowDisplayMetrics().density;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
index 22b82bed0ca1d5..9436df80d3f061 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
@@ -26,7 +26,7 @@
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
@@ -35,7 +35,6 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import java.util.HashMap;
 
 /**
@@ -83,6 +82,7 @@ private void scheduleAccessibilityEventSender(View host) {
   public enum AccessibilityRole {
     NONE,
     BUTTON,
+    TOGGLEBUTTON,
     LINK,
     SEARCH,
     IMAGE,
@@ -107,12 +107,15 @@ public enum AccessibilityRole {
     TAB,
     TABLIST,
     TIMER,
+    LIST,
     TOOLBAR;
 
     public static String getValue(AccessibilityRole role) {
       switch (role) {
         case BUTTON:
           return "android.widget.Button";
+        case TOGGLEBUTTON:
+          return "android.widget.ToggleButton";
         case SEARCH:
           return "android.widget.EditText";
         case IMAGE:
@@ -133,6 +136,8 @@ public static String getValue(AccessibilityRole role) {
           return "android.widget.SpinButton";
         case SWITCH:
           return "android.widget.Switch";
+        case LIST:
+          return "android.widget.AbsListView";
         case NONE:
         case LINK:
         case SUMMARY:
@@ -246,6 +251,15 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCo
         }
       }
     }
+
+    // Expose the testID prop as the resource-id name of the view. Black-box E2E/UI testing
+    // frameworks, which interact with the UI through the accessibility framework, do not have
+    // access to view tags. This allows developers/testers to avoid polluting the
+    // content-description with test identifiers.
+    final String testId = (String) host.getTag(R.id.react_test_id);
+    if (testId != null) {
+      info.setViewIdResourceName(testId);
+    }
   }
 
   @Override
@@ -284,27 +298,28 @@ public boolean performAccessibilityAction(View host, int action, Bundle args) {
       final WritableMap event = Arguments.createMap();
       event.putString("actionName", mAccessibilityActionsMap.get(action));
       ReactContext reactContext = (ReactContext) host.getContext();
-      if (reactContext.hasActiveCatalystInstance()) {
+      if (reactContext.hasActiveReactInstance()) {
         final int reactTag = host.getId();
+        final int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
         UIManager uiManager = UIManagerHelper.getUIManager(reactContext, reactTag);
         if (uiManager != null) {
           uiManager
               .<EventDispatcher>getEventDispatcher()
               .dispatchEvent(
-                  new Event(reactTag) {
+                  new Event(surfaceId, reactTag) {
                     @Override
                     public String getEventName() {
                       return TOP_ACCESSIBILITY_ACTION_EVENT;
                     }
 
                     @Override
-                    public void dispatch(RCTEventEmitter rctEventEmitter) {
-                      rctEventEmitter.receiveEvent(reactTag, TOP_ACCESSIBILITY_ACTION_EVENT, event);
+                    protected WritableMap getEventData() {
+                      return event;
                     }
                   });
         }
       } else {
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG, new ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance"));
       }
 
@@ -373,16 +388,16 @@ public static void setRole(
         spannable.setSpan(new URLSpan(""), 0, spannable.length(), 0);
         nodeInfo.setText(spannable);
       }
-    } else if (role.equals(AccessibilityRole.SEARCH)) {
-      nodeInfo.setRoleDescription(context.getString(R.string.search_description));
     } else if (role.equals(AccessibilityRole.IMAGE)) {
       nodeInfo.setRoleDescription(context.getString(R.string.image_description));
     } else if (role.equals(AccessibilityRole.IMAGEBUTTON)) {
       nodeInfo.setRoleDescription(context.getString(R.string.imagebutton_description));
       nodeInfo.setClickable(true);
     } else if (role.equals(AccessibilityRole.BUTTON)) {
-      nodeInfo.setRoleDescription(context.getString(R.string.button_description));
       nodeInfo.setClickable(true);
+    } else if (role.equals(AccessibilityRole.TOGGLEBUTTON)) {
+      nodeInfo.setClickable(true);
+      nodeInfo.setCheckable(true);
     } else if (role.equals(AccessibilityRole.SUMMARY)) {
       nodeInfo.setRoleDescription(context.getString(R.string.summary_description));
     } else if (role.equals(AccessibilityRole.HEADER)) {
@@ -425,7 +440,8 @@ public static void setDelegate(final View view) {
     if (!ViewCompat.hasAccessibilityDelegate(view)
         && (view.getTag(R.id.accessibility_role) != null
             || view.getTag(R.id.accessibility_state) != null
-            || view.getTag(R.id.accessibility_actions) != null)) {
+            || view.getTag(R.id.accessibility_actions) != null
+            || view.getTag(R.id.react_test_id) != null)) {
       ViewCompat.setAccessibilityDelegate(view, new ReactAccessibilityDelegate());
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingProhibitedView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingProhibitedView.java
new file mode 100644
index 00000000000000..c6ff728e0a4679
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingProhibitedView.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+/**
+ * Some Views may not function if added directly to a ViewGroup that clips them. For example, TTRC
+ * markers may rely on `onDraw` functionality to work properly, and will break if they're clipped
+ * out of the View hierarchy for any resaon.
+ *
+ * <p>This situation can occur more often in Fabric with View Flattening. We may prevent this sort
+ * of View Flattening from occurring in the future, but the connection is not entirely certain.
+ *
+ * <p>This can occur either because ReactViewGroup clips them out, using the ordinarary subview
+ * clipping feature. It is also possible if a View is added directly to a ReactRootView below the
+ * fold of the screen.
+ *
+ * <p>Generally the solution is to prevent View flattening in JS by adding `collapsable=false` to a
+ * parent component of the clipped view, and/or move the View higher up in the hierarchy so it is
+ * always rendered within the first page of the screen.
+ */
+public interface ReactClippingProhibitedView {}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
index 077fcd050860cf..8c9399073af3dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
@@ -8,7 +8,6 @@
 package com.facebook.react.uimanager;
 
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.view.View;
 import android.view.ViewParent;
 import javax.annotation.concurrent.NotThreadSafe;
@@ -44,12 +43,16 @@ public static void calculateClippingRect(View view, Rect outputRect) {
         // Intersect the view with the parent's rectangle
         // This will result in the overlap with coordinates in the parent space
         if (!sHelperRect.intersect(
-            view.getLeft(), view.getTop(), view.getRight(), view.getBottom())) {
+            view.getLeft(),
+            view.getTop() + (int) view.getTranslationY(),
+            view.getRight(),
+            view.getBottom() + (int) view.getTranslationY())) {
           outputRect.setEmpty();
           return;
         }
         // Now we move the coordinates to the View's coordinate space
         sHelperRect.offset(-view.getLeft(), -view.getTop());
+        sHelperRect.offset(-(int) view.getTranslationX(), -(int) view.getTranslationY());
         sHelperRect.offset(view.getScrollX(), view.getScrollY());
         outputRect.set(sHelperRect);
         return;
@@ -57,51 +60,4 @@ public static void calculateClippingRect(View view, Rect outputRect) {
     }
     view.getDrawingRect(outputRect);
   }
-
-  public static boolean getChildVisibleRectHelper(
-      View child, Rect r, android.graphics.Point offset, View parent, String overflow) {
-    // This is based on the Android ViewGroup implementation, modified to clip child rects
-    // if overflow is set to ViewProps.HIDDEN. This effectively solves Issue #23870 which
-    // appears to have been introduced by FLAG_CLIP_CHILDREN being forced false
-    // regardless of whether clipping is desired.
-    final RectF rect = new RectF();
-    rect.set(r);
-
-    child.getMatrix().mapRect(rect);
-
-    final int dx = child.getLeft() - parent.getScrollX();
-    final int dy = child.getTop() - parent.getScrollY();
-
-    rect.offset(dx, dy);
-
-    if (offset != null) {
-      float[] position = new float[2];
-      position[0] = offset.x;
-      position[1] = offset.y;
-      child.getMatrix().mapPoints(position);
-      offset.x = Math.round(position[0]) + dx;
-      offset.y = Math.round(position[1]) + dy;
-    }
-
-    final int width = parent.getRight() - parent.getLeft();
-    final int height = parent.getBottom() - parent.getTop();
-
-    boolean rectIsVisible = true;
-
-    ViewParent grandparent = parent.getParent();
-    if (grandparent == null || ViewProps.HIDDEN.equals(overflow)) {
-      rectIsVisible = rect.intersect(0, 0, width, height);
-    }
-
-    r.set(
-        (int) Math.floor(rect.left),
-        (int) Math.floor(rect.top),
-        (int) Math.ceil(rect.right),
-        (int) Math.ceil(rect.bottom));
-
-    if (rectIsVisible && grandparent != null) {
-      rectIsVisible = grandparent.getChildVisibleRect(parent, r, offset);
-    }
-    return rectIsVisible;
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactOverflowView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactOverflowView.java
new file mode 100644
index 00000000000000..89c437e3869660
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactOverflowView.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+/**
+ * Interface that should be implemented by {@link View} subclasses that support {@code overflow}
+ * style. This allows the overflow information to be used by {@link TouchTargetHelper} to determine
+ * if a View is touchable.
+ */
+public interface ReactOverflowView {
+  /**
+   * Gets the overflow state of a view. If set, this should be one of {@link ViewProps#HIDDEN},
+   * {@link ViewProps#VISIBLE} or {@link ViewProps#SCROLL}.
+   */
+  @Nullable
+  String getOverflow();
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java
index 2fba8c52164c75..9ce17ea680954a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java
@@ -11,10 +11,16 @@
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.common.UIManagerType;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /** Interface for the root native view of a React native application */
 public interface ReactRoot {
 
+  /** This constant represents that ReactRoot hasn't started yet or it has been destroyed. */
+  int STATE_STOPPED = 0;
+  /** This constant represents that ReactRoot has started. */
+  int STATE_STARTED = 1;
+
   /** Return cached launch properties for app */
   @Nullable
   Bundle getAppProperties();
@@ -58,4 +64,12 @@ public interface ReactRoot {
   @Deprecated
   @Nullable
   String getSurfaceID();
+
+  /**
+   * This API is likely to change once the fix of T78832286 is confirmed TODO: T78832286 revisit
+   * this API
+   *
+   * @return an {@link AtomicInteger} that represents the state of the ReactRoot object. WARNING:
+   */
+  AtomicInteger getState();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
index 41bae5be249ae2..2c2e35460b8074 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
@@ -7,8 +7,11 @@
 
 package com.facebook.react.uimanager;
 
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewParent;
+import androidx.annotation.UiThread;
 import com.facebook.infer.annotation.Assertions;
 
 public class RootViewUtil {
@@ -28,4 +31,19 @@ public static RootView getRootView(View reactView) {
       current = (View) next;
     }
   }
+
+  @UiThread
+  public static Point getViewportOffset(View v) {
+    int[] locationInWindow = new int[2];
+    v.getLocationInWindow(locationInWindow);
+
+    // we need to subtract visibleWindowCoords - to subtract possible window insets, split
+    // screen or multi window
+    Rect visibleWindowFrame = new Rect();
+    v.getWindowVisibleDisplayFrame(visibleWindowFrame);
+    locationInWindow[0] -= visibleWindowFrame.left;
+    locationInWindow[1] -= visibleWindowFrame.top;
+
+    return new Point(locationInWindow[0], locationInWindow[1]);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java
index 51bbc14349a446..8bec238604f64d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/StateWrapper.java
@@ -9,6 +9,8 @@
 
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import javax.annotation.Nullable;
 
 /**
  * This is a wrapper that can be used for passing State objects from Fabric C++ core to
@@ -16,14 +18,32 @@
  * by calling updateState, which communicates state back to the C++ layer.
  */
 public interface StateWrapper {
+
+  /**
+   * Get a ReadableMapBuffer object from the C++ layer, which is a K/V map of short keys to values.
+   *
+   * <p>Unstable API - DO NOT USE.
+   */
+  @Nullable
+  ReadableMapBuffer getStatDataMapBuffer();
+
   /**
    * Get a ReadableNativeMap object from the C++ layer, which is a K/V map of string keys to values.
    */
-  ReadableNativeMap getState();
+  @Nullable
+  ReadableNativeMap getStateData();
+
+  /**
+   * Pass a map of values back to the C++ layer. The operation is performed synchronously and cannot
+   * fail.
+   */
+  void updateState(WritableMap map);
 
   /**
-   * Pass a map of values back to the C++ layer. /Last/ runnable passed into updateState is called
-   * if an updateState call fails.
+   * Mark state as unused and clean up in Java and in native. This should be called as early as
+   * possible when you know a StateWrapper will no longer be used. If there's ANY chance of it being
+   * used legitimately, don't destroy it! It is expected that all StateWrappers are destroyed
+   * immediately upon stopSurface.
    */
-  void updateState(WritableMap map, Runnable failureCallback);
+  void destroyState();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
index 834208a962e676..15701d63618a40 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
@@ -27,20 +27,32 @@
 public class ThemedReactContext extends ReactContext {
 
   private final ReactApplicationContext mReactApplicationContext;
-  @Nullable private final String mSurfaceID;
+  @Nullable private final String mModuleName;
+  private final int mSurfaceId;
 
+  @Deprecated
   public ThemedReactContext(ReactApplicationContext reactApplicationContext, Context base) {
-    this(reactApplicationContext, base, null);
+    this(reactApplicationContext, base, null, -1);
   }
 
+  @Deprecated
   public ThemedReactContext(
-      ReactApplicationContext reactApplicationContext, Context base, @Nullable String surfaceID) {
+      ReactApplicationContext reactApplicationContext, Context base, @Nullable String moduleName) {
+    this(reactApplicationContext, base, moduleName, -1);
+  }
+
+  public ThemedReactContext(
+      ReactApplicationContext reactApplicationContext,
+      Context base,
+      @Nullable String moduleName,
+      int surfaceId) {
     super(base);
     if (reactApplicationContext.hasCatalystInstance()) {
       initializeWithInstance(reactApplicationContext.getCatalystInstance());
     }
     mReactApplicationContext = reactApplicationContext;
-    mSurfaceID = surfaceID;
+    mModuleName = moduleName;
+    mSurfaceId = surfaceId;
   }
 
   @Override
@@ -64,11 +76,27 @@ public boolean hasCurrentActivity() {
   }
 
   /**
-   * @return a {@link String} that represents the ID of the js application that is being rendered
-   *     with this {@link ThemedReactContext}
+   * This is misnamed but has some uses out in the wild. It will be deleted in a future release of
+   * RN.
+   *
+   * @return a {@link String} that represents the module name of the js application that is being
+   *     rendered with this {@link ThemedReactContext}
    */
+  @Deprecated
   public @Nullable String getSurfaceID() {
-    return mSurfaceID;
+    return mModuleName;
+  }
+
+  /**
+   * @return a {@link String} that represents the module name of the js application that is being
+   *     rendered with this {@link ThemedReactContext}
+   */
+  public @Nullable String getModuleName() {
+    return mModuleName;
+  }
+
+  public int getSurfaceId() {
+    return mSurfaceId;
   }
 
   public ReactApplicationContext getReactApplicationContext() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
index fbcda93d07cae2..c4e41b2ceeb35a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
@@ -17,6 +17,7 @@
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.touch.ReactHitSlopView;
+import java.util.EnumSet;
 
 /**
  * Class responsible for identifying which react view should handle a given {@link MotionEvent}. It
@@ -80,7 +81,7 @@ public static int findTargetTagAndCoordinatesForTouch(
     // Store eventCoords in array so that they are modified to be relative to the targetView found.
     viewCoords[0] = eventX;
     viewCoords[1] = eventY;
-    View nativeTargetView = findTouchTargetView(viewCoords, viewGroup);
+    View nativeTargetView = findTouchTargetViewWithPointerEvents(viewCoords, viewGroup);
     if (nativeTargetView != null) {
       View reactTargetView = findClosestReactAncestor(nativeTargetView);
       if (reactTargetView != null) {
@@ -100,6 +101,14 @@ private static View findClosestReactAncestor(View view) {
     return view;
   }
 
+  /** Types of allowed return values from {@link #findTouchTargetView}. */
+  private enum TouchTargetReturnType {
+    /** Allow returning the view passed in through the parameters. */
+    SELF,
+    /** Allow returning children of the view passed in through parameters. */
+    CHILD,
+  }
+
   /**
    * Returns the touch target View that is either viewGroup or one if its descendants. This is a
    * recursive DFS since view the entire tree must be parsed until the target is found. If the
@@ -111,20 +120,23 @@ private static View findClosestReactAncestor(View view) {
    * be relative to the current viewGroup. When the method returns, it will contain the eventCoords
    * relative to the targetView found.
    */
-  private static View findTouchTargetView(float[] eventCoords, ViewGroup viewGroup) {
-    int childrenCount = viewGroup.getChildCount();
-    // Consider z-index when determining the touch target.
-    ReactZIndexedViewGroup zIndexedViewGroup =
-        viewGroup instanceof ReactZIndexedViewGroup ? (ReactZIndexedViewGroup) viewGroup : null;
-    for (int i = childrenCount - 1; i >= 0; i--) {
-      int childIndex =
-          zIndexedViewGroup != null ? zIndexedViewGroup.getZIndexMappedChildIndex(i) : i;
-      View child = viewGroup.getChildAt(childIndex);
-      PointF childPoint = mTempPoint;
-      if (isTransformedTouchPointInView(
-          eventCoords[0], eventCoords[1], viewGroup, child, childPoint)) {
-        // If it is contained within the child View, the childPoint value will contain the view
-        // coordinates relative to the child
+  private static View findTouchTargetView(
+      float[] eventCoords, View view, EnumSet<TouchTargetReturnType> allowReturnTouchTargetTypes) {
+    // We prefer returning a child, so we check for a child that can handle the touch first
+    if (allowReturnTouchTargetTypes.contains(TouchTargetReturnType.CHILD)
+        && view instanceof ViewGroup) {
+      ViewGroup viewGroup = (ViewGroup) view;
+      int childrenCount = viewGroup.getChildCount();
+      // Consider z-index when determining the touch target.
+      ReactZIndexedViewGroup zIndexedViewGroup =
+          viewGroup instanceof ReactZIndexedViewGroup ? (ReactZIndexedViewGroup) viewGroup : null;
+      for (int i = childrenCount - 1; i >= 0; i--) {
+        int childIndex =
+            zIndexedViewGroup != null ? zIndexedViewGroup.getZIndexMappedChildIndex(i) : i;
+        View child = viewGroup.getChildAt(childIndex);
+        PointF childPoint = mTempPoint;
+        getChildPoint(eventCoords[0], eventCoords[1], viewGroup, child, childPoint);
+        // The childPoint value will contain the view coordinates relative to the child.
         // We need to store the existing X,Y for the viewGroup away as it is possible this child
         // will not actually be the target and so we restore them if not
         float restoreX = eventCoords[0];
@@ -132,22 +144,64 @@ private static View findTouchTargetView(float[] eventCoords, ViewGroup viewGroup
         eventCoords[0] = childPoint.x;
         eventCoords[1] = childPoint.y;
         View targetView = findTouchTargetViewWithPointerEvents(eventCoords, child);
+
         if (targetView != null) {
-          return targetView;
+          // We don't allow touches on views that are outside the bounds of an `overflow: hidden`
+          // View
+          boolean inOverflowBounds = true;
+          if (viewGroup instanceof ReactOverflowView) {
+            @Nullable String overflow = ((ReactOverflowView) viewGroup).getOverflow();
+            if ((ViewProps.HIDDEN.equals(overflow) || ViewProps.SCROLL.equals(overflow))
+                && !isTouchPointInView(restoreX, restoreY, view)) {
+              inOverflowBounds = false;
+            }
+          }
+          if (inOverflowBounds) {
+            return targetView;
+          }
         }
         eventCoords[0] = restoreX;
         eventCoords[1] = restoreY;
       }
     }
-    return viewGroup;
+
+    // Check if parent can handle the touch after the children
+    if (allowReturnTouchTargetTypes.contains(TouchTargetReturnType.SELF)
+        && isTouchPointInView(eventCoords[0], eventCoords[1], view)) {
+      return view;
+    }
+
+    return null;
   }
 
   /**
-   * Returns whether the touch point is within the child View It is transform aware and will invert
-   * the transform Matrix to find the true local points This code is taken from {@link
+   * Checks whether a touch at {@code x} and {@code y} are within the bounds of the View. Both
+   * {@code x} and {@code y} must be relative to the top-left corner of the view.
+   */
+  private static boolean isTouchPointInView(float x, float y, View view) {
+    if (view instanceof ReactHitSlopView && ((ReactHitSlopView) view).getHitSlopRect() != null) {
+      Rect hitSlopRect = ((ReactHitSlopView) view).getHitSlopRect();
+      if ((x >= -hitSlopRect.left && x < (view.getWidth()) + hitSlopRect.right)
+          && (y >= -hitSlopRect.top && y < (view.getHeight()) + hitSlopRect.bottom)) {
+        return true;
+      }
+
+      return false;
+    } else {
+      if ((x >= 0 && x < (view.getWidth())) && (y >= 0 && y < (view.getHeight()))) {
+        return true;
+      }
+
+      return false;
+    }
+  }
+
+  /**
+   * Returns the coordinates of a touch in the child View. It is transform aware and will invert the
+   * transform Matrix to find the true local points This code is taken from {@link
    * ViewGroup#isTransformedTouchPointInView()}
    */
-  private static boolean isTransformedTouchPointInView(
+  private static void getChildPoint(
       float x, float y, ViewGroup parent, View child, PointF outLocalPoint) {
     float localX = x + parent.getScrollX() - child.getLeft();
     float localY = y + parent.getScrollY() - child.getTop();
@@ -162,26 +216,7 @@ private static boolean isTransformedTouchPointInView(
       localX = localXY[0];
       localY = localXY[1];
     }
-    if (child instanceof ReactHitSlopView && ((ReactHitSlopView) child).getHitSlopRect() != null) {
-      Rect hitSlopRect = ((ReactHitSlopView) child).getHitSlopRect();
-      if ((localX >= -hitSlopRect.left
-              && localX < (child.getRight() - child.getLeft()) + hitSlopRect.right)
-          && (localY >= -hitSlopRect.top
-              && localY < (child.getBottom() - child.getTop()) + hitSlopRect.bottom)) {
-        outLocalPoint.set(localX, localY);
-        return true;
-      }
-
-      return false;
-    } else {
-      if ((localX >= 0 && localX < (child.getRight() - child.getLeft()))
-          && (localY >= 0 && localY < (child.getBottom() - child.getTop()))) {
-        outLocalPoint.set(localX, localY);
-        return true;
-      }
-
-      return false;
-    }
+    outLocalPoint.set(localX, localY);
   }
 
   /**
@@ -211,45 +246,43 @@ private static boolean isTransformedTouchPointInView(
       return null;
 
     } else if (pointerEvents == PointerEvents.BOX_ONLY) {
-      // This view is the target, its children don't matter
-      return view;
+      // This view may be the target, its children don't matter
+      return findTouchTargetView(eventCoords, view, EnumSet.of(TouchTargetReturnType.SELF));
 
     } else if (pointerEvents == PointerEvents.BOX_NONE) {
       // This view can't be the target, but its children might.
-      if (view instanceof ViewGroup) {
-        View targetView = findTouchTargetView(eventCoords, (ViewGroup) view);
-        if (targetView != view) {
-          return targetView;
-        }
+      View targetView =
+          findTouchTargetView(eventCoords, view, EnumSet.of(TouchTargetReturnType.CHILD));
+      if (targetView != null) {
+        return targetView;
+      }
 
-        // PointerEvents.BOX_NONE means that this react element cannot receive pointer events.
-        // However, there might be virtual children that can receive pointer events, in which case
-        // we still want to return this View and dispatch a pointer event to the virtual element.
-        // Note that this currently only applies to Nodes/FlatViewGroup as it's the only class that
-        // is both a ViewGroup and ReactCompoundView (ReactTextView is a ReactCompoundView but not a
-        // ViewGroup).
-        if (view instanceof ReactCompoundView) {
-          int reactTag =
-              ((ReactCompoundView) view).reactTagForTouch(eventCoords[0], eventCoords[1]);
-          if (reactTag != view.getId()) {
-            // make sure we exclude the View itself because of the PointerEvents.BOX_NONE
-            return view;
-          }
+      // PointerEvents.BOX_NONE means that this react element cannot receive pointer events.
+      // However, there might be virtual children that can receive pointer events, in which case
+      // we still want to return this View and dispatch a pointer event to the virtual element.
+      // Note that this currently only applies to Nodes/FlatViewGroup as it's the only class that
+      // is both a ViewGroup and ReactCompoundView (ReactTextView is a ReactCompoundView but not a
+      // ViewGroup).
+      if (view instanceof ReactCompoundView
+          && isTouchPointInView(eventCoords[0], eventCoords[1], view)) {
+        int reactTag = ((ReactCompoundView) view).reactTagForTouch(eventCoords[0], eventCoords[1]);
+        if (reactTag != view.getId()) {
+          // make sure we exclude the View itself because of the PointerEvents.BOX_NONE
+          return view;
         }
       }
+
       return null;
 
     } else if (pointerEvents == PointerEvents.AUTO) {
       // Either this view or one of its children is the target
-      if (view instanceof ReactCompoundViewGroup) {
-        if (((ReactCompoundViewGroup) view).interceptsTouchEvent(eventCoords[0], eventCoords[1])) {
-          return view;
-        }
+      if (view instanceof ReactCompoundViewGroup
+          && isTouchPointInView(eventCoords[0], eventCoords[1], view)
+          && ((ReactCompoundViewGroup) view).interceptsTouchEvent(eventCoords[0], eventCoords[1])) {
+        return view;
       }
-      if (view instanceof ViewGroup) {
-        return findTouchTargetView(eventCoords, (ViewGroup) view);
-      }
-      return view;
+      return findTouchTargetView(
+          eventCoords, view, EnumSet.of(TouchTargetReturnType.SELF, TouchTargetReturnType.CHILD));
 
     } else {
       throw new JSApplicationIllegalArgumentException(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index 16630deff02277..bce8995feeedf4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -21,7 +21,6 @@
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -51,6 +50,13 @@ public class UIImplementation {
   private long mLastCalculateLayoutTime = 0;
   protected @Nullable LayoutUpdateListener mLayoutUpdateListener;
 
+  /**
+   * When react instance is being shutdown, there could be some pending operations queued in the JS
+   * thread. This flag ensures view related operations are not triggered if the Catalyst instance
+   * was destroyed.
+   */
+  private volatile boolean mViewOperationsEnabled = true;
+
   /** Interface definition for a callback to be invoked when the layout has been updated */
   public interface LayoutUpdateListener {
 
@@ -60,7 +66,7 @@ public interface LayoutUpdateListener {
 
   public UIImplementation(
       ReactApplicationContext reactContext,
-      UIManagerModule.ViewManagerResolver viewManagerResolver,
+      ViewManagerResolver viewManagerResolver,
       EventDispatcher eventDispatcher,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
     this(
@@ -234,6 +240,10 @@ public Map<String, Long> getProfiledBatchPerfCounters() {
 
   /** Invoked by React to create a new node with a given tag, class name and properties. */
   public void createView(int tag, String className, int rootViewTag, ReadableMap props) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     synchronized (uiImplementationThreadLock) {
       ReactShadowNode cssNode = createShadowNode(className);
       ReactShadowNode rootNode = mShadowNodeRegistry.getNode(rootViewTag);
@@ -264,6 +274,10 @@ protected void handleCreateView(
 
   /** Invoked by React to create a new node with a given tag has its properties changed. */
   public void updateView(int tag, String className, ReadableMap props) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     ViewManager viewManager = mViewManagers.get(className);
     if (viewManager == null) {
       throw new IllegalViewOperationException("Got unknown view type: " + className);
@@ -314,6 +328,10 @@ public void manageChildren(
       @Nullable ReadableArray addChildTags,
       @Nullable ReadableArray addAtIndices,
       @Nullable ReadableArray removeFrom) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     synchronized (uiImplementationThreadLock) {
       ReactShadowNode cssNodeToManage = mShadowNodeRegistry.getNode(viewTag);
 
@@ -420,6 +438,10 @@ public void manageChildren(
    * @param childrenTags tags of the children
    */
   public void setChildren(int viewTag, ReadableArray childrenTags) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     synchronized (uiImplementationThreadLock) {
       ReactShadowNode cssNodeToManage = mShadowNodeRegistry.getNode(viewTag);
 
@@ -530,6 +552,10 @@ public void viewIsDescendantOf(
    * view and returns the values via an async callback.
    */
   public void measure(int reactTag, Callback callback) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     // This method is called by the implementation of JS touchable interface (see Touchable.js for
     // more details) at the moment of touch activation. That is after user starts the gesture from
     // a touchable view with a given reactTag, or when user drag finger back into the press
@@ -543,6 +569,10 @@ public void measure(int reactTag, Callback callback) {
    * things like the status bar
    */
   public void measureInWindow(int reactTag, Callback callback) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     mOperationsQueue.enqueueMeasureInWindow(reactTag, callback);
   }
 
@@ -554,6 +584,10 @@ public void measureInWindow(int reactTag, Callback callback) {
    */
   public void measureLayout(
       int tag, int ancestorTag, Callback errorCallback, Callback successCallback) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     try {
       measureLayout(tag, ancestorTag, mMeasureBuffer);
       float relativeX = PixelUtil.toDIPFromPixel(mMeasureBuffer[0]);
@@ -571,6 +605,10 @@ public void measureLayout(
    */
   public void measureLayoutRelativeToParent(
       int tag, Callback errorCallback, Callback successCallback) {
+    if (!mViewOperationsEnabled) {
+      return;
+    }
+
     try {
       measureLayoutRelativeToParent(tag, mMeasureBuffer);
       float relativeX = PixelUtil.toDIPFromPixel(mMeasureBuffer[0]);
@@ -747,6 +785,10 @@ public void onHostPause() {
 
   public void onHostDestroy() {}
 
+  public void onCatalystInstanceDestroyed() {
+    mViewOperationsEnabled = false;
+  }
+
   public void setViewHierarchyUpdateDebugListener(
       @Nullable NotThreadSafeViewHierarchyUpdateDebugListener listener) {
     mOperationsQueue.setViewHierarchyUpdateDebugListener(listener);
@@ -913,6 +955,7 @@ protected void applyUpdatesRecursive(ReactShadowNode cssNode, float absoluteX, f
       if (frameDidChange && cssNode.shouldNotifyOnLayout()) {
         mEventDispatcher.dispatchEvent(
             OnLayoutEvent.obtain(
+                -1, /* surfaceId not used in classic renderer */
                 tag,
                 cssNode.getScreenX(),
                 cssNode.getScreenY(),
@@ -921,9 +964,7 @@ protected void applyUpdatesRecursive(ReactShadowNode cssNode, float absoluteX, f
       }
     }
     cssNode.markUpdateSeen();
-    if (ReactFeatureFlags.enableTransitionLayoutOnlyViewCleanup) {
-      mNativeViewHierarchyOptimizer.onViewUpdatesCompleted(cssNode);
-    }
+    mNativeViewHierarchyOptimizer.onViewUpdatesCompleted(cssNode);
   }
 
   public void addUIBlock(UIBlock block) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
index 65b222408f66ad..efc7703918eaae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
@@ -9,6 +9,7 @@
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.systrace.Systrace;
 import java.util.List;
 
 /** Provides UIImplementation to use in {@link UIManagerModule}. */
@@ -17,14 +18,20 @@ public class UIImplementationProvider {
 
   public UIImplementation createUIImplementation(
       ReactApplicationContext reactContext,
-      UIManagerModule.ViewManagerResolver viewManagerResolver,
+      ViewManagerResolver viewManagerResolver,
       EventDispatcher eventDispatcher,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
-    return new UIImplementation(
-        reactContext,
-        viewManagerResolver,
-        eventDispatcher,
-        minTimeLeftInFrameForNonBatchedOperationMs);
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIImplementationProvider.createUIImplementation[1]");
+    try {
+      return new UIImplementation(
+          reactContext,
+          viewManagerResolver,
+          eventDispatcher,
+          minTimeLeftInFrameForNonBatchedOperationMs);
+    } finally {
+      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+    }
   }
 
   public UIImplementation createUIImplementation(
@@ -32,8 +39,17 @@ public UIImplementation createUIImplementation(
       List<ViewManager> viewManagerList,
       EventDispatcher eventDispatcher,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
-    return new UIImplementation(
-        reactContext, viewManagerList, eventDispatcher, minTimeLeftInFrameForNonBatchedOperationMs);
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIImplementationProvider.createUIImplementation[2]");
+    try {
+      return new UIImplementation(
+          reactContext,
+          viewManagerList,
+          eventDispatcher,
+          minTimeLeftInFrameForNonBatchedOperationMs);
+    } finally {
+      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+    }
   }
 
   UIImplementation createUIImplementation(
@@ -41,10 +57,16 @@ UIImplementation createUIImplementation(
       ViewManagerRegistry viewManagerRegistry,
       EventDispatcher eventDispatcher,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
-    return new UIImplementation(
-        reactContext,
-        viewManagerRegistry,
-        eventDispatcher,
-        minTimeLeftInFrameForNonBatchedOperationMs);
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIImplementationProvider.createUIImplementation[3]");
+    try {
+      return new UIImplementation(
+          reactContext,
+          viewManagerRegistry,
+          eventDispatcher,
+          minTimeLeftInFrameForNonBatchedOperationMs);
+    } finally {
+      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java
index 954dfe95edfb3c..9effc356f7f018 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java
@@ -20,7 +20,7 @@
 import com.facebook.react.bridge.JSIModuleType;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -29,6 +29,7 @@
 /** Helper class for {@link UIManager}. */
 public class UIManagerHelper {
 
+  private static final String TAG = UIManagerHelper.class.getName();
   public static final int PADDING_START_INDEX = 0;
   public static final int PADDING_END_INDEX = 1;
   public static final int PADDING_TOP_INDEX = 2;
@@ -52,14 +53,10 @@ private static UIManager getUIManager(
       @UIManagerType int uiManagerType,
       boolean returnNullIfCatalystIsInactive) {
     if (context.isBridgeless()) {
-      @Nullable
-      UIManager uiManager =
-          context.getJSIModule(JSIModuleType.UIManager) != null
-              ? (UIManager) context.getJSIModule(JSIModuleType.UIManager)
-              : null;
+      @Nullable UIManager uiManager = (UIManager) context.getJSIModule(JSIModuleType.UIManager);
       if (uiManager == null) {
-        ReactSoftException.logSoftException(
-            "UIManagerHelper",
+        ReactSoftExceptionLogger.logSoftException(
+            TAG,
             new ReactNoCrashSoftException(
                 "Cannot get UIManager because the instance hasn't been initialized yet."));
         return null;
@@ -68,17 +65,17 @@ private static UIManager getUIManager(
     }
 
     if (!context.hasCatalystInstance()) {
-      ReactSoftException.logSoftException(
-          "UIManagerHelper",
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
           new ReactNoCrashSoftException(
               "Cannot get UIManager because the context doesn't contain a CatalystInstance."));
       return null;
     }
     // TODO T60461551: add tests to verify emission of events when the ReactContext is being turn
     // down.
-    if (!context.hasActiveCatalystInstance()) {
-      ReactSoftException.logSoftException(
-          "UIManagerHelper",
+    if (!context.hasActiveReactInstance()) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
           new ReactNoCrashSoftException(
               "Cannot get UIManager because the context doesn't contain an active CatalystInstance."));
       if (returnNullIfCatalystIsInactive) {
@@ -86,9 +83,18 @@ private static UIManager getUIManager(
       }
     }
     CatalystInstance catalystInstance = context.getCatalystInstance();
-    return uiManagerType == FABRIC
-        ? (UIManager) catalystInstance.getJSIModule(JSIModuleType.UIManager)
-        : catalystInstance.getNativeModule(UIManagerModule.class);
+    try {
+      return uiManagerType == FABRIC
+          ? (UIManager) catalystInstance.getJSIModule(JSIModuleType.UIManager)
+          : catalystInstance.getNativeModule(UIManagerModule.class);
+    } catch (IllegalArgumentException ex) {
+      // TODO T67518514 Clean this up once we migrate everything over to bridgeless mode
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Cannot get UIManager for UIManagerType: " + uiManagerType));
+      return catalystInstance.getNativeModule(UIManagerModule.class);
+    }
   }
 
   /**
@@ -97,7 +103,12 @@ private static UIManager getUIManager(
    */
   @Nullable
   public static EventDispatcher getEventDispatcherForReactTag(ReactContext context, int reactTag) {
-    return getEventDispatcher(context, getUIManagerType(reactTag));
+    EventDispatcher eventDispatcher = getEventDispatcher(context, getUIManagerType(reactTag));
+    if (eventDispatcher == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG, new IllegalStateException("Cannot get EventDispatcher for reactTag " + reactTag));
+    }
+    return eventDispatcher;
   }
 
   /**
@@ -115,7 +126,21 @@ public static EventDispatcher getEventDispatcher(
       return ((EventDispatcherProvider) context).getEventDispatcher();
     }
     UIManager uiManager = getUIManager(context, uiManagerType, false);
-    return uiManager == null ? null : (EventDispatcher) uiManager.getEventDispatcher();
+    if (uiManager == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Unable to find UIManager for UIManagerType " + uiManagerType));
+      return null;
+    }
+    EventDispatcher eventDispatcher = (EventDispatcher) uiManager.getEventDispatcher();
+    if (eventDispatcher == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Cannot get EventDispatcher for UIManagerType " + uiManagerType));
+    }
+    return eventDispatcher;
   }
 
   /**
@@ -134,6 +159,42 @@ public static ReactContext getReactContext(View view) {
     return (ReactContext) context;
   }
 
+  /**
+   * @return Get the ThemedReactContext associated with a View, if possible, and then call
+   *     getSurfaceId on it. See above (getReactContext) for additional context.
+   */
+  public static int getSurfaceId(View view) {
+    int reactTag = view.getId();
+
+    // In non-Fabric we don't have (or use) SurfaceId
+    if (getUIManagerType(reactTag) == UIManagerType.DEFAULT) {
+      return -1;
+    }
+
+    Context context = view.getContext();
+    if (!(context instanceof ThemedReactContext) && context instanceof ContextWrapper) {
+      context = ((ContextWrapper) context).getBaseContext();
+    }
+
+    int surfaceId = getSurfaceId(context);
+
+    // All Fabric-managed Views (should) have a ThemedReactContext attached.
+    if (surfaceId == -1) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Fabric View [" + reactTag + "] does not have SurfaceId associated with it"));
+    }
+    return surfaceId;
+  }
+
+  public static int getSurfaceId(Context context) {
+    if (context instanceof ThemedReactContext) {
+      return ((ThemedReactContext) context).getSurfaceId();
+    }
+    return -1;
+  }
+
   /**
    * @return the default padding used by Android EditText's. This method returns the padding in an
    *     array to avoid extra classloading during hot-path of RN Android.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index c5340ae3b7510a..b034d1c8faf87c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -15,6 +15,7 @@
 import android.content.ComponentCallbacks2;
 import android.content.res.Configuration;
 import android.view.View;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.collection.ArrayMap;
 import com.facebook.common.logging.FLog;
@@ -39,6 +40,7 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
@@ -85,21 +87,7 @@
 @ReactModule(name = UIManagerModule.NAME)
 public class UIManagerModule extends ReactContextBaseJavaModule
     implements OnBatchCompleteListener, LifecycleEventListener, UIManager {
-
-  /** Enables lazy discovery of a specific {@link ViewManager} by its name. */
-  public interface ViewManagerResolver {
-    /**
-     * {@class UIManagerModule} class uses this method to get a ViewManager by its name. This is the
-     * same name that comes from JS by {@code UIManager.ViewManagerName} call.
-     */
-    @Nullable
-    ViewManager getViewManager(String viewManagerName);
-
-    /**
-     * Provides a list of view manager names to register in JS as {@code UIManager.ViewManagerName}
-     */
-    List<String> getViewManagerNames();
-  }
+  public static final String TAG = UIManagerModule.class.getSimpleName();
 
   /** Resolves a name coming from native side to a name of the event that is exposed to JS. */
   public interface CustomEventNamesResolver {
@@ -126,6 +114,7 @@ public interface CustomEventNamesResolver {
   private volatile int mViewManagerConstantsCacheSize;
 
   private int mBatchId = 0;
+  private int mNumRootViews = 0;
 
   @SuppressWarnings("deprecated")
   public UIManagerModule(
@@ -207,7 +196,7 @@ public UIImplementation getUIImplementation() {
   }
 
   @Override
-  public String getName() {
+  public @NonNull String getName() {
     return NAME;
   }
 
@@ -242,8 +231,13 @@ public void onHostDestroy() {
   public void onCatalystInstanceDestroy() {
     super.onCatalystInstanceDestroy();
     mEventDispatcher.onCatalystInstanceDestroyed();
+    mUIImplementation.onCatalystInstanceDestroyed();
 
-    getReactApplicationContext().unregisterComponentCallbacks(mMemoryTrimCallback);
+    ReactApplicationContext reactApplicationContext = getReactApplicationContext();
+    if (ReactFeatureFlags.enableReactContextCleanupFix) {
+      reactApplicationContext.removeLifecycleEventListener(this);
+    }
+    reactApplicationContext.unregisterComponentCallbacks(mMemoryTrimCallback);
     YogaNodePool.get().clear();
     ViewManagerPropertyUpdater.clear();
   }
@@ -291,11 +285,22 @@ private static Map<String, Object> createConstants(
    * Helper method to pre-compute the constants for a view manager. This method ensures that we
    * don't block for getting the constants for view managers during TTI
    *
-   * @deprecated this method will not be available in FabricUIManager class.
+   * @deprecated this method will be removed in the future
    * @param viewManagerNames {@link List<String>} names of ViewManagers
    */
   @Deprecated
-  public void preComputeConstantsForViewManager(List<String> viewManagerNames) {
+  @Override
+  public void preInitializeViewManagers(List<String> viewManagerNames) {
+    if (ReactFeatureFlags.enableExperimentalStaticViewConfigs) {
+      for (String viewManagerName : viewManagerNames) {
+        mUIImplementation.resolveViewManager(viewManagerName);
+      }
+      // When Static view configs are enabled it is not necessary to pre-compute the constants for
+      // viewManagers, although the pre-initialization of viewManager objects is still necessary
+      // for performance reasons.
+      return;
+    }
+
     Map<String, WritableMap> constantsMap = new ArrayMap<>();
     for (String viewManagerName : viewManagerNames) {
       WritableMap constants = computeConstantsForViewManager(viewManagerName);
@@ -406,22 +411,17 @@ public <T extends View> int addRootView(final T rootView) {
    */
   @Override
   public void synchronouslyUpdateViewOnUIThread(int tag, ReadableMap props) {
-    int uiManagerType = ViewUtil.getUIManagerType(tag);
-    if (uiManagerType == FABRIC) {
-      UIManager fabricUIManager =
-          UIManagerHelper.getUIManager(getReactApplicationContext(), uiManagerType);
-      if (fabricUIManager != null) {
-        fabricUIManager.synchronouslyUpdateViewOnUIThread(tag, props);
-      }
-    } else {
-      mUIImplementation.synchronouslyUpdateViewOnUIThread(tag, new ReactStylesDiffMap(props));
-    }
+    mUIImplementation.synchronouslyUpdateViewOnUIThread(tag, new ReactStylesDiffMap(props));
   }
 
   /**
    * Registers a new root view. JS can use the returned tag with manageChildren to add/remove
    * children to this view.
    *
+   * <p>Calling addRootView through UIManagerModule calls addRootView in the non-Fabric renderer,
+   * always. This is deprecated in favor of calling startSurface in Fabric, which must be done
+   * directly through the FabricUIManager.
+   *
    * <p>Note that this must be called after getWidth()/getHeight() actually return something. See
    * CatalystApplicationFragment as an example.
    *
@@ -433,11 +433,17 @@ public <T extends View> int addRootView(
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIManagerModule.addRootView");
     final int tag = ReactRootViewTagGenerator.getNextRootViewTag();
     final ReactApplicationContext reactApplicationContext = getReactApplicationContext();
+
+    // We pass in a surfaceId of -1 here - it is used only in Fabric.
     final ThemedReactContext themedRootContext =
         new ThemedReactContext(
-            reactApplicationContext, rootView.getContext(), ((ReactRoot) rootView).getSurfaceID());
+            reactApplicationContext,
+            rootView.getContext(),
+            ((ReactRoot) rootView).getSurfaceID(),
+            -1);
 
     mUIImplementation.registerRootView(rootView, tag, themedRootContext);
+    mNumRootViews++;
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     return tag;
   }
@@ -461,6 +467,7 @@ public void stopSurface(final int surfaceId) {
   @ReactMethod
   public void removeRootView(int rootViewTag) {
     mUIImplementation.removeRootView(rootViewTag);
+    mNumRootViews--;
   }
 
   public void updateNodeSize(int nodeViewTag, int newWidth, int newHeight) {
@@ -509,25 +516,7 @@ public void updateView(final int tag, final String className, final ReadableMap
       FLog.d(ReactConstants.TAG, message);
       PrinterHolder.getPrinter().logMessage(ReactDebugOverlayTags.UI_MANAGER, message);
     }
-    int uiManagerType = ViewUtil.getUIManagerType(tag);
-    if (uiManagerType == FABRIC) {
-      ReactApplicationContext reactApplicationContext = getReactApplicationContext();
-      if (reactApplicationContext.hasActiveCatalystInstance()) {
-        final UIManager fabricUIManager =
-            UIManagerHelper.getUIManager(reactApplicationContext, uiManagerType);
-        if (fabricUIManager != null) {
-          reactApplicationContext.runOnUiQueueThread(
-              new Runnable() {
-                @Override
-                public void run() {
-                  fabricUIManager.synchronouslyUpdateViewOnUIThread(tag, props);
-                }
-              });
-        }
-      }
-    } else {
-      mUIImplementation.updateView(tag, className, props);
-    }
+    mUIImplementation.updateView(tag, className, props);
   }
 
   /**
@@ -710,8 +699,7 @@ public void clearJSResponder() {
   @ReactMethod
   public void dispatchViewManagerCommand(
       int reactTag, Dynamic commandId, @Nullable ReadableArray commandArgs) {
-    // TODO: this is a temporary approach to support ViewManagerCommands in Fabric until
-    // the dispatchViewManagerCommand() method is supported by Fabric JS API.
+    // Fabric dispatchCommands should go through the JSI API - this will crash in Fabric.
     @Nullable
     UIManager uiManager =
         UIManagerHelper.getUIManager(
@@ -820,7 +808,12 @@ public void onBatchComplete() {
       listener.willDispatchViewUpdates(this);
     }
     try {
-      mUIImplementation.dispatchViewUpdates(batchId);
+      // If there are no RootViews registered, there will be no View updates to dispatch.
+      // This is a hack to prevent this from being called when Fabric is used everywhere.
+      // This should no longer be necessary in Bridgeless Mode.
+      if (mNumRootViews > 0) {
+        mUIImplementation.dispatchViewUpdates(batchId);
+      }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     }
@@ -962,6 +955,7 @@ public void onConfigurationChanged(Configuration newConfig) {}
     public void onLowMemory() {}
   }
 
+  @Override
   public View resolveView(int tag) {
     UiThreadUtil.assertOnUiThread();
     return mUIImplementation
@@ -971,9 +965,16 @@ public View resolveView(int tag) {
   }
 
   @Override
-  public void receiveEvent(int targetTag, String eventName, @Nullable WritableMap event) {
+  public void receiveEvent(int reactTag, String eventName, @Nullable WritableMap event) {
+    receiveEvent(-1, reactTag, eventName, event);
+  }
+
+  @Override
+  public void receiveEvent(
+      int surfaceId, int reactTag, String eventName, @Nullable WritableMap event) {
+    assert ViewUtil.getUIManagerType(reactTag) == DEFAULT;
     getReactApplicationContext()
         .getJSModule(RCTEventEmitter.class)
-        .receiveEvent(targetTag, eventName, event);
+        .receiveEvent(reactTag, eventName, event);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
index 19e887b87cd8be..40a3730b7cba80 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
@@ -31,8 +31,7 @@
    * UIManager.getViewManagerConfig('SpecificViewManager')} call happens. The View Manager is then
    * registered on the JS side with the help of {@code UIManagerModule.getConstantsForViewManager}.
    */
-  /* package */ static Map<String, Object> createConstants(
-      UIManagerModule.ViewManagerResolver resolver) {
+  /* package */ static Map<String, Object> createConstants(ViewManagerResolver resolver) {
     Map<String, Object> constants = UIManagerModuleConstants.getConstants();
     constants.put("ViewManagerNames", resolver.getViewManagerNames());
     constants.put("LazyViewManagersEnabled", true);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
index bb3df5f827e710..289b2774bf915d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
@@ -18,7 +18,7 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.RetryableMountingLayerException;
@@ -118,7 +118,13 @@ public void execute() {
         uiManager
             .getEventDispatcher()
             .dispatchEvent(
-                OnLayoutEvent.obtain(mTag, mScreenX, mScreenY, mScreenWidth, mScreenHeight));
+                OnLayoutEvent.obtain(
+                    -1 /* SurfaceId not used in classic renderer */,
+                    mTag,
+                    mScreenX,
+                    mScreenY,
+                    mScreenWidth,
+                    mScreenHeight));
       }
     }
   }
@@ -307,7 +313,7 @@ public void execute() {
       try {
         mNativeViewHierarchyManager.dispatchCommand(mTag, mCommand, mArgs);
       } catch (Throwable e) {
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG, new RuntimeException("Error dispatching View Command", e));
       }
     }
@@ -348,7 +354,7 @@ public void execute() {
       try {
         mNativeViewHierarchyManager.dispatchCommand(mTag, mCommand, mArgs);
       } catch (Throwable e) {
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG, new RuntimeException("Error dispatching View Command", e));
       }
     }
@@ -886,11 +892,12 @@ public void run() {
                         mViewCommandOperations.add(op);
                       } else {
                         // Retryable exceptions should be logged, but never crash in debug.
-                        ReactSoftException.logSoftException(TAG, new ReactNoCrashSoftException(e));
+                        ReactSoftExceptionLogger.logSoftException(
+                            TAG, new ReactNoCrashSoftException(e));
                       }
                     } catch (Throwable e) {
                       // Non-retryable exceptions should be logged in prod, and crash in Debug.
-                      ReactSoftException.logSoftException(TAG, e);
+                      ReactSoftExceptionLogger.logSoftException(TAG, e);
                     }
                   }
                 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
index a806b87a380a34..6af66a6f080174 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
@@ -15,7 +15,6 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.touch.ReactInterceptingViewGroup;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -39,11 +38,10 @@ public abstract class ViewManager<T extends View, C extends ReactShadowNode>
    *
    * @param viewToUpdate
    * @param props
-   * @param stateWrapper
    */
   public void updateProperties(@NonNull T viewToUpdate, ReactStylesDiffMap props) {
-    final ViewManagerDelegate<T> delegate;
-    if (ReactFeatureFlags.useViewManagerDelegates && (delegate = getDelegate()) != null) {
+    final ViewManagerDelegate<T> delegate = getDelegate();
+    if (delegate != null) {
       ViewManagerPropertyUpdater.updateProps(delegate, viewToUpdate, props);
     } else {
       ViewManagerPropertyUpdater.updateProps(this, viewToUpdate, props);
@@ -68,19 +66,14 @@ protected ViewManagerDelegate<T> getDelegate() {
     return null;
   }
 
-  /** Creates a view and installs event emitters on it. */
-  private final @NonNull T createView(
-      @NonNull ThemedReactContext reactContext, JSResponderHandler jsResponderHandler) {
-    return createView(reactContext, null, null, jsResponderHandler);
-  }
-
   /** Creates a view with knowledge of props and state. */
   public @NonNull T createView(
+      int reactTag,
       @NonNull ThemedReactContext reactContext,
       @Nullable ReactStylesDiffMap props,
       @Nullable StateWrapper stateWrapper,
       JSResponderHandler jsResponderHandler) {
-    T view = createViewInstance(reactContext, props, stateWrapper);
+    T view = createViewInstance(reactTag, reactContext, props, stateWrapper);
     if (view instanceof ReactInterceptingViewGroup) {
       ((ReactInterceptingViewGroup) view).setOnInterceptTouchEventListener(jsResponderHandler);
     }
@@ -128,19 +121,28 @@ public C createShadowNodeInstance() {
   /**
    * Subclasses should return a new View instance of the proper type. This is an optional method
    * that will call createViewInstance for you. Override it if you need props upon creation of the
-   * view.
+   * view, or state.
    *
-   * @param reactContext
+   * <p>If you override this method, you *must* guarantee that you you're handling updateProperties,
+   * view.setId, addEventEmitters, and updateState/updateExtraData properly!
+   *
+   * @param reactTag reactTag that should be set as ID of the view instance
+   * @param reactContext ReactContext used to initialize view instance
+   * @param initialProps initial props for the view instance
+   * @param stateWrapper initial state for the view instance
    */
   protected @NonNull T createViewInstance(
+      int reactTag,
       @NonNull ThemedReactContext reactContext,
       @Nullable ReactStylesDiffMap initialProps,
       @Nullable StateWrapper stateWrapper) {
     T view = createViewInstance(reactContext);
+    view.setId(reactTag);
     addEventEmitters(reactContext, view);
     if (initialProps != null) {
       updateProperties(view, initialProps);
     }
+    // Only present in Fabric; but always present in Fabric.
     if (stateWrapper != null) {
       Object extraData = updateState(view, initialProps, stateWrapper);
       if (extraData != null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
index a6ceb3e395a670..b01234dbb6ddcd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
@@ -19,9 +19,9 @@
 public final class ViewManagerRegistry {
 
   private final Map<String, ViewManager> mViewManagers;
-  private final @Nullable UIManagerModule.ViewManagerResolver mViewManagerResolver;
+  private final @Nullable ViewManagerResolver mViewManagerResolver;
 
-  public ViewManagerRegistry(UIManagerModule.ViewManagerResolver viewManagerResolver) {
+  public ViewManagerRegistry(ViewManagerResolver viewManagerResolver) {
     mViewManagers = MapBuilder.newHashMap();
     mViewManagerResolver = viewManagerResolver;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerResolver.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerResolver.java
new file mode 100644
index 00000000000000..d00b30fe804603
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerResolver.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+import java.util.List;
+import javax.annotation.Nullable;
+
+/** Enables lazy discovery of a specific {@link ViewManager} by its name. */
+public interface ViewManagerResolver {
+  /**
+   * {@class UIManagerModule} class uses this method to get a ViewManager by its name. This is the
+   * same name that comes from JS by {@code UIManager.ViewManagerName} call.
+   */
+  @Nullable
+  ViewManager getViewManager(String viewManagerName);
+
+  /**
+   * Provides a list of view manager names to register in JS as {@code UIManager.ViewManagerName}
+   */
+  List<String> getViewManagerNames();
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
index 6e2a1691fd16c0..f856e85d53cff5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
@@ -325,6 +325,21 @@ public BoxedIntPropSetter(ReactPropGroup prop, Method setter, int index) {
     }
   }
 
+  private static class BoxedColorPropSetter extends PropSetter {
+
+    public BoxedColorPropSetter(ReactProp prop, Method setter) {
+      super(prop, "mixed", setter);
+    }
+
+    @Override
+    protected @Nullable Object getValueOrDefault(Object value, Context context) {
+      if (value != null) {
+        return ColorPropConverter.getColor(value, context);
+      }
+      return null;
+    }
+  }
+
   /*package*/ static Map<String, String> getNativePropsForView(
       Class<? extends ViewManager> viewManagerTopClass,
       Class<? extends ReactShadowNode> shadowNodeTopClass) {
@@ -418,7 +433,7 @@ private static PropSetter createPropSetter(
       return new BoxedBooleanPropSetter(annotation, method);
     } else if (propTypeClass == Integer.class) {
       if ("Color".equals(annotation.customType())) {
-        return new ColorPropSetter(annotation, method);
+        return new BoxedColorPropSetter(annotation, method);
       }
       return new BoxedIntPropSetter(annotation, method);
     } else if (propTypeClass == ReadableArray.class) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
index 11bc3ba33e01ef..b876ba18bc5b23 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "annotations",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
index d8e9532b1a6a6f..6d46fd8953e9c2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "common",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -17,7 +18,6 @@ rn_android_library(
         "PUBLIC",
     ],
     deps = [
-        # react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.java
index 1fce7974087b6a..15abfde7a04268 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.java
@@ -49,6 +49,9 @@ public void removeBatchEventDispatchedListener(BatchEventDispatchedListener list
   @Override
   public void registerEventEmitter(int uiManagerType, RCTEventEmitter eventEmitter) {}
 
+  @Override
+  public void registerEventEmitter(int uiManagerType, RCTModernEventEmitter eventEmitter) {}
+
   @Override
   public void unregisterEventEmitter(int uiManagerType) {}
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java
index a28bd72b12e683..d65c810b095f74 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.java
@@ -19,8 +19,13 @@ public class ContentSizeChangeEvent extends Event<ContentSizeChangeEvent> {
   private final int mWidth;
   private final int mHeight;
 
+  @Deprecated
   public ContentSizeChangeEvent(int viewTag, int width, int height) {
-    super(viewTag);
+    this(-1, viewTag, width, height);
+  }
+
+  public ContentSizeChangeEvent(int surfaceId, int viewTag, int width, int height) {
+    super(surfaceId, viewTag);
     mWidth = width;
     mHeight = height;
   }
@@ -31,10 +36,10 @@ public String getEventName() {
   }
 
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
+  protected WritableMap getEventData() {
     WritableMap data = Arguments.createMap();
     data.putDouble("width", PixelUtil.toDIPFromPixel(mWidth));
     data.putDouble("height", PixelUtil.toDIPFromPixel(mHeight));
-    rctEventEmitter.receiveEvent(getViewTag(), EVENT_NAME, data);
+    return data;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
index 7d36c049ed9df8..a93c0a82d88c06 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
@@ -7,34 +7,84 @@
 
 package com.facebook.react.uimanager.events;
 
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.SystemClock;
+import com.facebook.react.uimanager.IllegalViewOperationException;
+import com.facebook.react.uimanager.common.UIManagerType;
 
 /**
  * A UI event that can be dispatched to JS.
  *
- * <p>For dispatching events {@link EventDispatcher#dispatchEvent} should be used. Once event object
- * is passed to the EventDispatched it should no longer be used as EventDispatcher may decide to
- * recycle that object (by calling {@link #dispose}).
+ * <p>For dispatching events {@code getEventData} should be used. Once event object is passed to the
+ * EventDispatched it should no longer be used as EventDispatcher may decide to recycle that object
+ * (by calling {@link #dispose}).
+ *
+ * <p>If you need advanced customizations and overriding only {@code getEventData} doesn't work for
+ * you, you must override both {@code dispatch} and {@code dispatchModern}. Both of these will be
+ * deleted in the distant future and it is highly recommended to use only {@code getEventData}.
+ *
+ * <p>Old, pre-Fabric Events only used viewTag as the identifier, but Fabric needs surfaceId as well
+ * as viewTag. You may use {@code UIManagerHelper.getSurfaceId} on a Fabric-managed View to get the
+ * surfaceId. Fabric will work without surfaceId - making {@code Event} backwards-compatible - but
+ * Events without SurfaceId are slightly slower to propagate.
  */
 public abstract class Event<T extends Event> {
 
   private static int sUniqueID = 0;
 
   private boolean mInitialized;
+  private @UIManagerType int mUIManagerType;
+  private int mSurfaceId;
   private int mViewTag;
   private long mTimestampMs;
   private int mUniqueID = sUniqueID++;
 
+  // Android native Event times use 'uptimeMillis', and historically we've used `uptimeMillis`
+  // throughout this Event class as the coalescing key for events, and for other purposes.
+  // To get an accurate(ish) absolute UNIX time for the event, we store the initial clock time here.
+  // uptimeMillis can then be added to this to get an accurate UNIX time.
+  // However, we still default to uptimeMillis: you must explicitly request UNIX time if you want
+  // that; see `getUnixTimestampMs`.
+  public static final long sInitialClockTimeUnixOffset =
+      SystemClock.currentTimeMillis() - SystemClock.uptimeMillis();
+
   protected Event() {}
 
+  @Deprecated
   protected Event(int viewTag) {
     init(viewTag);
   }
 
-  /** This method needs to be called before event is sent to event dispatcher. */
+  protected Event(int surfaceId, int viewTag) {
+    init(surfaceId, viewTag);
+  }
+
+  @Deprecated
   protected void init(int viewTag) {
+    init(-1, viewTag);
+  }
+
+  /** This method needs to be called before event is sent to event dispatcher. */
+  protected void init(int surfaceId, int viewTag) {
+    mSurfaceId = surfaceId;
     mViewTag = viewTag;
+
+    // We infer UIManagerType. Even though it's not passed in explicitly, we have a
+    // contract that Fabric events *always* have a SurfaceId passed in, and non-Fabric events
+    // NEVER have a SurfaceId passed in (the default/placeholder of -1 is passed in instead).
+    // Why does this matter?
+    // Events can be sent to Views that are part of the View hierarchy *but not directly managed
+    // by React Native*. For example, embedded custom hierachies, Litho hierachies, etc.
+    // In those cases it's important to konw that the Event should be sent to the Fabric or
+    // non-Fabric UIManager, and we cannot use the ViewTag for inference since it's not controlled
+    // by RN and is essentially a random number.
+    // At some point it would be great to pass the SurfaceContext here instead.
+    mUIManagerType = (surfaceId == -1 ? UIManagerType.DEFAULT : UIManagerType.FABRIC);
+
+    // This is a *relative* time. See `getUnixTimestampMs`.
     mTimestampMs = SystemClock.uptimeMillis();
+
     mInitialized = true;
   }
 
@@ -43,6 +93,11 @@ public final int getViewTag() {
     return mViewTag;
   }
 
+  /** @return the surfaceId for the view that generated this event */
+  public final int getSurfaceId() {
+    return mSurfaceId;
+  }
+
   /**
    * @return the time at which the event happened in the {@link android.os.SystemClock#uptimeMillis}
    *     base.
@@ -51,6 +106,11 @@ public final long getTimestampMs() {
     return mTimestampMs;
   }
 
+  /** @return the time at which the event happened as a UNIX timestamp, in milliseconds. */
+  public final long getUnixTimestampMs() {
+    return sInitialClockTimeUnixOffset + mTimestampMs;
+  }
+
   /** @return false if this Event can *never* be coalesced */
   public boolean canCoalesce() {
     return true;
@@ -97,9 +157,77 @@ public void onDispose() {}
     onDispose();
   }
 
+  public final @UIManagerType int getUIManagerType() {
+    return mUIManagerType;
+  }
+
   /** @return the name of this event as registered in JS */
   public abstract String getEventName();
 
-  /** Dispatch this event to JS using the given event emitter. */
-  public abstract void dispatch(RCTEventEmitter rctEventEmitter);
+  /**
+   * Dispatch this event to JS using the given event emitter. Compatible with old and new renderer.
+   * Instead of using this or dispatchModern, it is recommended that you simply override
+   * `getEventData`. In the future
+   */
+  @Deprecated
+  public void dispatch(RCTEventEmitter rctEventEmitter) {
+    WritableMap eventData = getEventData();
+    if (eventData == null) {
+      throw new IllegalViewOperationException(
+          "Event: you must return a valid, non-null value from `getEventData`, or override `dispatch` and `disatchModern`. Event: "
+              + getEventName());
+    }
+    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
+  }
+
+  /**
+   * Can be overridden by classes to make migrating to RCTModernEventEmitter support easier. If this
+   * class returns null, the RCTEventEmitter interface will be used instead of
+   * RCTModernEventEmitter. In the future, returning null here will be an error.
+   */
+  @Nullable
+  protected WritableMap getEventData() {
+    return null;
+  }
+
+  /**
+   * Dispatch this event to JS using a V2 EventEmitter. If surfaceId is not -1 and `getEventData` is
+   * non-null, this will use the RCTModernEventEmitter API. Otherwise, it falls back to the
+   * old-style dispatch function. For Event classes that need to do something different, this method
+   * can always be overridden entirely, but it is not recommended.
+   */
+  @Deprecated
+  public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
+    if (getSurfaceId() != -1) {
+      WritableMap eventData = getEventData();
+      if (eventData != null) {
+        rctEventEmitter.receiveEvent(getSurfaceId(), getViewTag(), getEventName(), getEventData());
+        return;
+      }
+    }
+    dispatch(rctEventEmitter);
+  }
+
+  /**
+   * Dispatch this event to JS using a V2 version of dispatchModern. See all comments from
+   * `dispatchModern` - all still apply. This method additionally allows C++ to coalesce events
+   * (Fabric only). This will ONLY be called in an experimental path, and in Fabric only.
+   */
+  @Deprecated
+  public void dispatchModernV2(RCTModernEventEmitter rctEventEmitter) {
+    if (getSurfaceId() != -1) {
+      WritableMap eventData = getEventData();
+      if (eventData != null) {
+        rctEventEmitter.receiveEvent(
+            getSurfaceId(),
+            getViewTag(),
+            getEventName(),
+            canCoalesce(),
+            getCoalescingKey(),
+            getEventData());
+        return;
+      }
+    }
+    dispatch(rctEventEmitter);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
index 2ba18340977281..2e9ac90cc2c933 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
@@ -26,8 +26,11 @@ public interface EventDispatcher {
 
   void removeBatchEventDispatchedListener(BatchEventDispatchedListener listener);
 
+  @Deprecated
   void registerEventEmitter(@UIManagerType int uiManagerType, RCTEventEmitter eventEmitter);
 
+  void registerEventEmitter(@UIManagerType int uiManagerType, RCTModernEventEmitter eventEmitter);
+
   void unregisterEventEmitter(@UIManagerType int uiManagerType);
 
   void onCatalystInstanceDestroyed();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java
index 9754b2de085471..a99d6b1eb31699 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -91,7 +90,8 @@ public int compare(Event lhs, Event rhs) {
   private final ArrayList<Event> mEventStaging = new ArrayList<>();
   private final CopyOnWriteArrayList<EventDispatcherListener> mListeners =
       new CopyOnWriteArrayList<>();
-  private final List<BatchEventDispatchedListener> mPostEventDispatchListeners = new ArrayList<>();
+  private final CopyOnWriteArrayList<BatchEventDispatchedListener> mPostEventDispatchListeners =
+      new CopyOnWriteArrayList<>();
   private final ScheduleDispatchFrameCallback mCurrentFrameCallback =
       new ScheduleDispatchFrameCallback();
   private final AtomicInteger mHasDispatchScheduledCount = new AtomicInteger();
@@ -263,6 +263,11 @@ public void registerEventEmitter(@UIManagerType int uiManagerType, RCTEventEmitt
     mReactEventEmitter.register(uiManagerType, eventEmitter);
   }
 
+  public void registerEventEmitter(
+      @UIManagerType int uiManagerType, RCTModernEventEmitter eventEmitter) {
+    mReactEventEmitter.register(uiManagerType, eventEmitter);
+  }
+
   public void unregisterEventEmitter(@UIManagerType int uiManagerType) {
     mReactEventEmitter.unregister(uiManagerType);
   }
@@ -361,7 +366,7 @@ public void run() {
               }
               Systrace.endAsyncFlow(
                   Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, event.getEventName(), event.getUniqueID());
-              event.dispatch(mReactEventEmitter);
+              event.dispatchModern(mReactEventEmitter);
               event.dispose();
             }
             clearEventsToDispatch();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/LockFreeEventDispatcherImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/LockFreeEventDispatcherImpl.java
new file mode 100644
index 00000000000000..3ff83f30800b73
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/LockFreeEventDispatcherImpl.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager.events;
+
+import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.modules.core.ChoreographerCompat;
+import com.facebook.react.modules.core.ReactChoreographer;
+import com.facebook.react.uimanager.common.UIManagerType;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Class responsible for dispatching UI events to JS. The main purpose of this class is to act as an
+ * intermediary between UI code generating events and JS, making sure we don't send more events than
+ * JS can process.
+ *
+ * <p>To use it, create a subclass of {@link Event} and call {@link #dispatchEvent(Event)} whenever
+ * there's a UI event to dispatch.
+ *
+ * <p>This class works by installing a Choreographer frame callback on the main thread. This
+ * callback then enqueues a runnable on the JS thread (if one is not already pending) that is
+ * responsible for actually dispatch events to JS. This implementation depends on the properties
+ * that 1) FrameCallbacks run after UI events have been processed in Choreographer.java 2) when we
+ * enqueue a runnable on the JS queue thread, it won't be called until after any previously enqueued
+ * JS jobs have finished processing
+ *
+ * <p>If JS is taking a long time processing events, then the UI events generated on the UI thread
+ * can be coalesced into fewer events so that when the runnable runs, we don't overload JS with a
+ * ton of events and make it get even farther behind.
+ *
+ * <p>Ideally, we don't need this and JS is fast enough to process all the events each frame, but
+ * bad things happen, including load on CPUs from the system, and we should handle this case well.
+ *
+ * <p>== Event Cookies ==
+ *
+ * <p>An event cookie is made up of the event type id, view tag, and a custom coalescing key. Only
+ * Events that have the same cookie can be coalesced.
+ *
+ * <p>Event Cookie Composition: VIEW_TAG_MASK = 0x00000000ffffffff EVENT_TYPE_ID_MASK =
+ * 0x0000ffff00000000 COALESCING_KEY_MASK = 0xffff000000000000
+ *
+ * <p>This is a copy of EventDispatcherImpl, meant only to remove locking and synchronization.
+ */
+public class LockFreeEventDispatcherImpl implements EventDispatcher, LifecycleEventListener {
+
+  private final boolean DEBUG_MODE = true && ReactBuildConfig.DEBUG;
+  private final String TAG = LockFreeEventDispatcherImpl.class.getSimpleName();
+
+  private final ReactApplicationContext mReactContext;
+  private final CopyOnWriteArrayList<EventDispatcherListener> mListeners =
+      new CopyOnWriteArrayList<>();
+  private final CopyOnWriteArrayList<BatchEventDispatchedListener> mPostEventDispatchListeners =
+      new CopyOnWriteArrayList<>();
+  private final LockFreeEventDispatcherImpl.ScheduleDispatchFrameCallback mCurrentFrameCallback =
+      new LockFreeEventDispatcherImpl.ScheduleDispatchFrameCallback();
+
+  private volatile ReactEventEmitter mReactEventEmitter;
+
+  public LockFreeEventDispatcherImpl(ReactApplicationContext reactContext) {
+    mReactContext = reactContext;
+    mReactContext.addLifecycleEventListener(this);
+    mReactEventEmitter = new ReactEventEmitter(mReactContext);
+  }
+
+  /** Sends the given Event to C++, where it will be flushed to JS ASAP. */
+  public void dispatchEvent(Event event) {
+    Assertions.assertCondition(event.isInitialized(), "Dispatched event hasn't been initialized");
+    Assertions.assertNotNull(mReactEventEmitter);
+
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "dispatchEvent: " + event.toString());
+    }
+
+    for (EventDispatcherListener listener : mListeners) {
+      listener.onEventDispatch(event);
+    }
+
+    event.dispatchModernV2(mReactEventEmitter);
+    event.dispose();
+  }
+
+  public void dispatchAllEvents() {
+    maybePostFrameCallbackFromNonUI();
+  }
+
+  private void maybePostFrameCallbackFromNonUI() {
+    if (mReactEventEmitter != null) {
+      // If the host activity is paused, the frame callback may not be currently
+      // posted. Ensure that it is so that this event gets delivered promptly.
+      mCurrentFrameCallback.maybePostFromNonUI();
+    } else {
+      // No JS application has started yet, or resumed. This can happen when a ReactRootView is
+      // added to view hierarchy, but ReactContext creation has not completed yet. In this case, any
+      // touch event dispatch will hit this codepath, and we simply queue them so that they
+      // are dispatched once ReactContext creation completes and JS app is running.
+    }
+  }
+
+  /** Add a listener to this EventDispatcher. */
+  public void addListener(EventDispatcherListener listener) {
+    mListeners.add(listener);
+  }
+
+  /** Remove a listener from this EventDispatcher. */
+  public void removeListener(EventDispatcherListener listener) {
+    mListeners.remove(listener);
+  }
+
+  public void addBatchEventDispatchedListener(BatchEventDispatchedListener listener) {
+    mPostEventDispatchListeners.add(listener);
+  }
+
+  public void removeBatchEventDispatchedListener(BatchEventDispatchedListener listener) {
+    mPostEventDispatchListeners.remove(listener);
+  }
+
+  @Override
+  public void onHostResume() {
+    maybePostFrameCallbackFromNonUI();
+  }
+
+  @Override
+  public void onHostPause() {
+    stopFrameCallback();
+  }
+
+  @Override
+  public void onHostDestroy() {
+    stopFrameCallback();
+  }
+
+  public void onCatalystInstanceDestroyed() {
+    UiThreadUtil.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            stopFrameCallback();
+          }
+        });
+  }
+
+  private void stopFrameCallback() {
+    UiThreadUtil.assertOnUiThread();
+    mCurrentFrameCallback.stop();
+  }
+
+  public void registerEventEmitter(@UIManagerType int uiManagerType, RCTEventEmitter eventEmitter) {
+    mReactEventEmitter.register(uiManagerType, eventEmitter);
+  }
+
+  public void registerEventEmitter(
+      @UIManagerType int uiManagerType, RCTModernEventEmitter eventEmitter) {
+    mReactEventEmitter.register(uiManagerType, eventEmitter);
+  }
+
+  public void unregisterEventEmitter(@UIManagerType int uiManagerType) {
+    mReactEventEmitter.unregister(uiManagerType);
+  }
+
+  private class ScheduleDispatchFrameCallback extends ChoreographerCompat.FrameCallback {
+    private volatile boolean mIsPosted = false;
+    private boolean mShouldStop = false;
+
+    @Override
+    public void doFrame(long frameTimeNanos) {
+      UiThreadUtil.assertOnUiThread();
+
+      if (mShouldStop) {
+        mIsPosted = false;
+      } else {
+        post();
+      }
+
+      driveEventBeats();
+    }
+
+    public void stop() {
+      mShouldStop = true;
+    }
+
+    public void maybePost() {
+      if (!mIsPosted) {
+        mIsPosted = true;
+        post();
+      }
+    }
+
+    private void post() {
+      ReactChoreographer.getInstance()
+          .postFrameCallback(ReactChoreographer.CallbackType.TIMERS_EVENTS, mCurrentFrameCallback);
+    }
+
+    public void maybePostFromNonUI() {
+      if (mIsPosted) {
+        return;
+      }
+
+      // We should only hit this slow path when we receive events while the host activity is paused.
+      if (mReactContext.isOnUiQueueThread()) {
+        maybePost();
+      } else {
+        mReactContext.runOnUiQueueThread(
+            new Runnable() {
+              @Override
+              public void run() {
+                maybePost();
+              }
+            });
+      }
+    }
+  }
+
+  /**
+   * Is this a misnomer? It's called "driveEventBeats" but then is just calls
+   * `onBatchEventDispatched` listeners? Practically, all that `onBatchEventDispatched` is used for
+   * in Fabric is to drive AsyncEventBeats.
+   *
+   * <p>If this class ships for Fabric, we should remove `driveEventBeats` from here entirely,
+   * because it no longer needs to be connected to this event dispatcher. We should/probably can
+   * also delete `onRequestEventBeat` entirely.
+   */
+  private void driveEventBeats() {
+    for (BatchEventDispatchedListener listener : mPostEventDispatchListeners) {
+      listener.onBatchEventDispatched();
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
index da06d7257d5453..7661d5c57fe76c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
@@ -13,8 +13,18 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 
+/** Deprecated in favor of RCTModernEventEmitter, which extends this interface. */
 @DoNotStrip
+@Deprecated
 public interface RCTEventEmitter extends JavaScriptModule {
+  /**
+   * Deprecated in favor of RCTModernEventEmitter.receiveEvent.
+   *
+   * @param targetTag
+   * @param eventName
+   * @param event
+   */
+  @Deprecated
   void receiveEvent(int targetTag, String eventName, @Nullable WritableMap event);
 
   void receiveTouches(String eventName, WritableArray touches, WritableArray changedIndices);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.java
new file mode 100644
index 00000000000000..47fbd7641658d5
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager.events;
+
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.WritableMap;
+
+/**
+ * This is a transitional replacement for RCTEventEmitter that works with Fabric and non-Fabric
+ * renderers. RCTEventEmitter works with Fabric as well, but there are negative perf implications
+ * and it should be avoided.
+ *
+ * <p>This interface will *also* be deleted in the distant future and be replaced with a new
+ * interface that doesn't need the old `receiveEvent` method at all. But for the foreseeable future,
+ * this is the recommended interface to use for EventEmitters.
+ */
+public interface RCTModernEventEmitter extends RCTEventEmitter {
+  void receiveEvent(int surfaceId, int targetTag, String eventName, @Nullable WritableMap event);
+
+  void receiveEvent(
+      int surfaceId,
+      int targetTag,
+      String eventName,
+      boolean canCoalesceEvent,
+      int customCoalesceKey,
+      @Nullable WritableMap event);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java
index 28931ad83cc2ea..c2b02f42ddee75 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ReactEventEmitter.java
@@ -9,23 +9,26 @@
 
 import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_KEY;
 
-import android.util.SparseArray;
 import androidx.annotation.Nullable;
-import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
 
-public class ReactEventEmitter implements RCTEventEmitter {
+public class ReactEventEmitter implements RCTModernEventEmitter {
 
   private static final String TAG = "ReactEventEmitter";
 
-  private final SparseArray<RCTEventEmitter> mEventEmitters = new SparseArray<>();
+  @Nullable
+  private RCTModernEventEmitter mFabricEventEmitter =
+      null; /* Corresponds to a Fabric EventEmitter */
+
+  @Nullable
+  private RCTEventEmitter mRCTEventEmitter = null; /* Corresponds to a Non-Fabric EventEmitter */
 
   private final ReactApplicationContext mReactContext;
 
@@ -33,48 +36,76 @@ public ReactEventEmitter(ReactApplicationContext reactContext) {
     mReactContext = reactContext;
   }
 
+  public void register(@UIManagerType int uiManagerType, RCTModernEventEmitter eventEmitter) {
+    assert uiManagerType == UIManagerType.FABRIC;
+    mFabricEventEmitter = eventEmitter;
+  }
+
   public void register(@UIManagerType int uiManagerType, RCTEventEmitter eventEmitter) {
-    mEventEmitters.put(uiManagerType, eventEmitter);
+    assert uiManagerType == UIManagerType.DEFAULT;
+    mRCTEventEmitter = eventEmitter;
   }
 
   public void unregister(@UIManagerType int uiManagerType) {
-    mEventEmitters.remove(uiManagerType);
+    if (uiManagerType == UIManagerType.DEFAULT) {
+      mRCTEventEmitter = null;
+    } else {
+      mFabricEventEmitter = null;
+    }
   }
 
   @Override
   public void receiveEvent(int targetReactTag, String eventName, @Nullable WritableMap event) {
-    RCTEventEmitter eventEmitter = getEventEmitter(targetReactTag);
-    if (eventEmitter != null) {
-      eventEmitter.receiveEvent(targetReactTag, eventName, event);
-    }
+    receiveEvent(-1, targetReactTag, eventName, event);
+  }
+
+  @Override
+  public void receiveEvent(
+      int surfaceId,
+      int targetTag,
+      String eventName,
+      boolean canCoalesceEvent,
+      int customCoalesceKey,
+      @Nullable WritableMap event) {
+    // The two additional params here, `canCoalesceEvent` and `customCoalesceKey`, have no
+    // meaning outside of Fabric.
+    receiveEvent(surfaceId, targetTag, eventName, event);
   }
 
   @Override
   public void receiveTouches(
       String eventName, WritableArray touches, WritableArray changedIndices) {
-
     Assertions.assertCondition(touches.size() > 0);
 
     int reactTag = touches.getMap(0).getInt(TARGET_KEY);
-    RCTEventEmitter eventEmitter = getEventEmitter(reactTag);
-    if (eventEmitter != null) {
-      eventEmitter.receiveTouches(eventName, touches, changedIndices);
+    @UIManagerType int uiManagerType = ViewUtil.getUIManagerType(reactTag);
+    if (uiManagerType == UIManagerType.FABRIC && mFabricEventEmitter != null) {
+      mFabricEventEmitter.receiveTouches(eventName, touches, changedIndices);
+    } else if (uiManagerType == UIManagerType.DEFAULT && getEventEmitter(reactTag) != null) {
+      mRCTEventEmitter.receiveTouches(eventName, touches, changedIndices);
+    } else {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Cannot find EventEmitter for receivedTouches: ReactTag["
+                  + reactTag
+                  + "] UIManagerType["
+                  + uiManagerType
+                  + "] EventName["
+                  + eventName
+                  + "]"));
     }
   }
 
   @Nullable
   private RCTEventEmitter getEventEmitter(int reactTag) {
     int type = ViewUtil.getUIManagerType(reactTag);
-    RCTEventEmitter eventEmitter = mEventEmitters.get(type);
-    if (eventEmitter == null) {
-      // TODO T54145494: Refactor RN Event Emitter system to make sure reactTags are always managed
-      // by RN
-      FLog.e(
-          TAG, "Unable to find event emitter for reactTag: %d - uiManagerType: %d", reactTag, type);
-      if (mReactContext.hasActiveCatalystInstance()) {
-        eventEmitter = mReactContext.getJSModule(RCTEventEmitter.class);
+    assert type == UIManagerType.DEFAULT;
+    if (mRCTEventEmitter == null) {
+      if (mReactContext.hasActiveReactInstance()) {
+        mRCTEventEmitter = mReactContext.getJSModule(RCTEventEmitter.class);
       } else {
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG,
             new ReactNoCrashSoftException(
                 "Cannot get RCTEventEmitter from Context for reactTag: "
@@ -84,6 +115,30 @@ private RCTEventEmitter getEventEmitter(int reactTag) {
                     + " - No active Catalyst instance!"));
       }
     }
-    return eventEmitter;
+    return mRCTEventEmitter;
+  }
+
+  @Override
+  public void receiveEvent(
+      int surfaceId, int targetReactTag, String eventName, @Nullable WritableMap event) {
+    @UIManagerType int uiManagerType = ViewUtil.getUIManagerType(targetReactTag);
+    if (uiManagerType == UIManagerType.FABRIC && mFabricEventEmitter != null) {
+      mFabricEventEmitter.receiveEvent(surfaceId, targetReactTag, eventName, event);
+    } else if (uiManagerType == UIManagerType.DEFAULT && getEventEmitter(targetReactTag) != null) {
+      mRCTEventEmitter.receiveEvent(targetReactTag, eventName, event);
+    } else {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new ReactNoCrashSoftException(
+              "Cannot find EventEmitter for receiveEvent: SurfaceId["
+                  + surfaceId
+                  + "] ReactTag["
+                  + targetReactTag
+                  + "] UIManagerType["
+                  + uiManagerType
+                  + "] EventName["
+                  + eventName
+                  + "]"));
+    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
index 1445735f6f57f5..554456ccccce4b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
@@ -11,6 +11,7 @@
 import androidx.annotation.Nullable;
 import androidx.core.util.Pools;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.SoftAssertions;
 
 /**
@@ -22,6 +23,7 @@
  * these coalescing keys are determined.
  */
 public class TouchEvent extends Event<TouchEvent> {
+  private static final String TAG = TouchEvent.class.getSimpleName();
 
   private static final int TOUCH_EVENTS_POOL_SIZE = 3;
 
@@ -30,6 +32,7 @@ public class TouchEvent extends Event<TouchEvent> {
 
   public static final long UNSET = Long.MIN_VALUE;
 
+  @Deprecated
   public static TouchEvent obtain(
       int viewTag,
       TouchEventType touchEventType,
@@ -38,14 +41,35 @@ public static TouchEvent obtain(
       float viewX,
       float viewY,
       TouchEventCoalescingKeyHelper touchEventCoalescingKeyHelper) {
+    return obtain(
+        -1,
+        viewTag,
+        touchEventType,
+        Assertions.assertNotNull(motionEventToCopy),
+        gestureStartTime,
+        viewX,
+        viewY,
+        touchEventCoalescingKeyHelper);
+  }
+
+  public static TouchEvent obtain(
+      int surfaceId,
+      int viewTag,
+      TouchEventType touchEventType,
+      MotionEvent motionEventToCopy,
+      long gestureStartTime,
+      float viewX,
+      float viewY,
+      TouchEventCoalescingKeyHelper touchEventCoalescingKeyHelper) {
     TouchEvent event = EVENTS_POOL.acquire();
     if (event == null) {
       event = new TouchEvent();
     }
     event.init(
+        surfaceId,
         viewTag,
         touchEventType,
-        motionEventToCopy,
+        Assertions.assertNotNull(motionEventToCopy),
         gestureStartTime,
         viewX,
         viewY,
@@ -64,6 +88,7 @@ public static TouchEvent obtain(
   private TouchEvent() {}
 
   private void init(
+      int surfaceId,
       int viewTag,
       TouchEventType touchEventType,
       MotionEvent motionEventToCopy,
@@ -71,7 +96,7 @@ private void init(
       float viewX,
       float viewY,
       TouchEventCoalescingKeyHelper touchEventCoalescingKeyHelper) {
-    super.init(viewTag);
+    super.init(surfaceId, viewTag);
 
     SoftAssertions.assertCondition(
         gestureStartTime != UNSET, "Gesture start time must be initialized");
@@ -106,9 +131,25 @@ private void init(
 
   @Override
   public void onDispose() {
-    Assertions.assertNotNull(mMotionEvent).recycle();
+    MotionEvent motionEvent = mMotionEvent;
     mMotionEvent = null;
-    EVENTS_POOL.release(this);
+    if (motionEvent != null) {
+      motionEvent.recycle();
+    }
+
+    // Either `this` is in the event pool, or motionEvent
+    // is null. It is in theory not possible for a TouchEvent to
+    // be in the EVENTS_POOL but for motionEvent to be null. However,
+    // out of an abundance of caution and to avoid memory leaks or
+    // other crashes at all costs, we attempt to release here and log
+    // a soft exception here if release throws an IllegalStateException
+    // due to `this` being over-released. This may indicate that there is
+    // a logic error in our events system or pooling mechanism.
+    try {
+      EVENTS_POOL.release(this);
+    } catch (IllegalStateException e) {
+      ReactSoftExceptionLogger.logSoftException(TAG, e);
+    }
   }
 
   @Override
@@ -140,8 +181,24 @@ public short getCoalescingKey() {
 
   @Override
   public void dispatch(RCTEventEmitter rctEventEmitter) {
+    if (!hasMotionEvent()) {
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Cannot dispatch a TouchEvent that has no MotionEvent; the TouchEvent has been recycled"));
+      return;
+    }
     TouchesHelper.sendTouchEvent(
-        rctEventEmitter, Assertions.assertNotNull(mTouchEventType), getViewTag(), this);
+        rctEventEmitter,
+        Assertions.assertNotNull(mTouchEventType),
+        getSurfaceId(),
+        getViewTag(),
+        this);
+  }
+
+  @Override
+  public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
+    dispatch(rctEventEmitter);
   }
 
   public MotionEvent getMotionEvent() {
@@ -149,6 +206,10 @@ public MotionEvent getMotionEvent() {
     return mMotionEvent;
   }
 
+  private boolean hasMotionEvent() {
+    return mMotionEvent != null;
+  }
+
   public float getViewX() {
     return mViewX;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
index 0c222ad95022ca..b67f6e3eff06ef 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
@@ -16,6 +16,7 @@
 /** Class responsible for generating catalyst touch events based on android {@link MotionEvent}. */
 public class TouchesHelper {
 
+  public static final String TARGET_SURFACE_KEY = "targetSurface";
   public static final String TARGET_KEY = "target";
   public static final String CHANGED_TOUCHES_KEY = "changedTouches";
   public static final String TOUCHES_KEY = "touches";
@@ -34,7 +35,8 @@ public class TouchesHelper {
    * given {@param event} instance. This method use {@param reactTarget} parameter to set as a
    * target view id associated with current gesture.
    */
-  private static WritableArray createsPointersArray(int reactTarget, TouchEvent event) {
+  private static WritableArray createsPointersArray(
+      int surfaceId, int reactTarget, TouchEvent event) {
     WritableArray touches = Arguments.createArray();
     MotionEvent motionEvent = event.getMotionEvent();
 
@@ -60,8 +62,9 @@ private static WritableArray createsPointersArray(int reactTarget, TouchEvent ev
       float locationY = motionEvent.getY(index) - targetViewCoordinateY;
       touch.putDouble(LOCATION_X_KEY, PixelUtil.toDIPFromPixel(locationX));
       touch.putDouble(LOCATION_Y_KEY, PixelUtil.toDIPFromPixel(locationY));
+      touch.putInt(TARGET_SURFACE_KEY, surfaceId);
       touch.putInt(TARGET_KEY, reactTarget);
-      touch.putDouble(TIMESTAMP_KEY, event.getTimestampMs());
+      touch.putDouble(TIMESTAMP_KEY, event.getUnixTimestampMs());
       touch.putDouble(POINTER_IDENTIFIER_KEY, motionEvent.getPointerId(index));
       touches.pushMap(touch);
     }
@@ -81,10 +84,10 @@ private static WritableArray createsPointersArray(int reactTarget, TouchEvent ev
   public static void sendTouchEvent(
       RCTEventEmitter rctEventEmitter,
       TouchEventType type,
+      int surfaceId,
       int reactTarget,
       TouchEvent touchEvent) {
-
-    WritableArray pointers = createsPointersArray(reactTarget, touchEvent);
+    WritableArray pointers = createsPointersArray(surfaceId, reactTarget, touchEvent);
     MotionEvent motionEvent = touchEvent.getMotionEvent();
 
     // For START and END events send only index of the pointer that is associated with that event
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BUCK
new file mode 100644
index 00000000000000..8922b82d73d756
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BUCK
@@ -0,0 +1,21 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+
+rn_android_library(
+    name = "interfaces",
+    srcs = glob(["*.java"]),
+    autoglob = False,
+    is_androidx = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    provided_deps = [
+        react_native_dep("third-party/android/androidx:annotation"),
+    ],
+    required_for_source_only_abi = True,
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        YOGA_TARGET,
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BaseViewManagerDelegate.java
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BaseViewManagerDelegate.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BaseViewManagerInterface.java
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerInterface.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/BaseViewManagerInterface.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/FloatUtil.java
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/FloatUtil.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/Spacing.java
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/Spacing.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/ViewManagerDelegate.java
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/ViewManagerDelegate.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/ViewProps.java
similarity index 96%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/ViewProps.java
index ac780e8bb4f91b..61151919cc0db5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/ViewProps.java
@@ -9,6 +9,7 @@
 
 import android.graphics.Color;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
 import java.util.Arrays;
 import java.util.HashSet;
 
@@ -81,6 +82,7 @@ public class ViewProps {
   // Props that affect more than just layout
   public static final String ENABLED = "enabled";
   public static final String BACKGROUND_COLOR = "backgroundColor";
+  public static final String FOREGROUND_COLOR = "foregroundColor";
   public static final String COLOR = "color";
   public static final String FONT_SIZE = "fontSize";
   public static final String FONT_WEIGHT = "fontWeight";
@@ -257,8 +259,14 @@ public static boolean isLayoutOnly(ReadableMap map, String prop) {
         // Ignore if explicitly set to default opacity.
         return map.isNull(OPACITY) || map.getDouble(OPACITY) == 1d;
       case BORDER_RADIUS: // Without a background color or border width set, a border won't show.
-        if (map.hasKey(BACKGROUND_COLOR) && map.getInt(BACKGROUND_COLOR) != Color.TRANSPARENT) {
-          return false;
+        if (map.hasKey(BACKGROUND_COLOR)) {
+          ReadableType valueType = map.getType(BACKGROUND_COLOR);
+          if (valueType == ReadableType.Number
+              && map.getInt(BACKGROUND_COLOR) != Color.TRANSPARENT) {
+            return false;
+          } else if (valueType != ReadableType.Null) {
+            return false;
+          }
         }
         if (map.hasKey(BORDER_WIDTH)
             && !map.isNull(BORDER_WIDTH)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
new file mode 100644
index 00000000000000..a4085b466b0fc0
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
@@ -0,0 +1,37 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := uimanagerjni
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_SHARED_LIBRARIES := libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures react_render_componentregistry librrc_native
+
+LOCAL_STATIC_LIBRARIES :=
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"ReacTNative\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,fbgloginit)
+$(call import-module,folly)
+$(call import-module,fb)
+$(call import-module,fbjni)
+$(call import-module,yogajni)
+$(call import-module,glog)
+
+$(call import-module,react/renderer/componentregistry)
+$(call import-module,react/renderer/componentregistry/native)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK
new file mode 100644
index 00000000000000..de2375642909a9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK
@@ -0,0 +1,41 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
+
+rn_xplat_cxx_library(
+    name = "jni",
+    srcs = glob(["*.cpp"]),
+    headers = glob(["*.h"]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "**/*.h"),
+        ],
+        prefix = "react/uimanager/jni",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    fbandroid_allow_jni_merging = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    platforms = ANDROID,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    soname = "libuimanagerjni.$(ext)",
+    visibility = ["PUBLIC"],
+    deps = [
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
+        react_native_xplat_target("react/renderer/componentregistry/native:native"),
+        react_native_target("jni/react/jni:jni"),
+        "//xplat/fbsystrace:fbsystrace",
+        "//xplat/folly:molly",
+        "//xplat/jsi:JSIDynamic",
+        "//xplat/jsi:jsi",
+        "//xplat/third-party/linker_lib:atomic",
+        FBJNI_TARGET,
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
new file mode 100644
index 00000000000000..cbd69e2f4912dc
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <string>
+
+#include <fbjni/fbjni.h>
+#include <jsi/jsi.h>
+
+#include "ComponentNameResolverManager.h"
+
+#include <react/renderer/componentregistry/native/NativeComponentRegistryBinding.h>
+
+namespace facebook {
+namespace react {
+
+using namespace facebook::jni;
+
+ComponentNameResolverManager::ComponentNameResolverManager(
+    jni::alias_ref<ComponentNameResolverManager::javaobject> jThis,
+    RuntimeExecutor runtimeExecutor,
+    jni::alias_ref<jobject> componentNameResolver)
+    : javaPart_(jni::make_global(jThis)),
+      runtimeExecutor_(runtimeExecutor),
+      componentNameResolver_(jni::make_global(componentNameResolver)) {}
+
+jni::local_ref<ComponentNameResolverManager::jhybriddata>
+ComponentNameResolverManager::initHybrid(
+    jni::alias_ref<jhybridobject> jThis,
+    jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
+    jni::alias_ref<jobject> componentNameResolver) {
+  return makeCxxInstance(
+      jThis, runtimeExecutor->cthis()->get(), componentNameResolver);
+}
+
+void ComponentNameResolverManager::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", ComponentNameResolverManager::initHybrid),
+      makeNativeMethod(
+          "installJSIBindings",
+          ComponentNameResolverManager::installJSIBindings),
+  });
+}
+
+void ComponentNameResolverManager::installJSIBindings() {
+  runtimeExecutor_([thizz = this](jsi::Runtime &runtime) {
+    auto viewManagerProvider = [thizz](const std::string &name) -> bool {
+      if (thizz->componentNames_.size() == 0) {
+        static auto getComponentNames =
+            jni::findClassStatic(ComponentNameResolverManager::
+                                     ComponentNameResolverJavaDescriptor)
+                ->getMethod<jni::alias_ref<jtypeArray<jstring>>()>(
+                    "getComponentNames");
+
+        auto componentNamesJArray =
+            getComponentNames(thizz->componentNameResolver_.get());
+        auto len = componentNamesJArray->size();
+        for (size_t i = 0; i < len; i++) {
+          jni::local_ref<jstring> elem = (*componentNamesJArray)[i];
+          auto componentName = elem->toStdString();
+          thizz->componentNames_.insert(componentName);
+        }
+      }
+
+      return thizz->componentNames_.find(name) != thizz->componentNames_.end();
+    };
+
+    react::NativeComponentRegistryBinding::install(
+        runtime, std::move(viewManagerProvider));
+  });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
new file mode 100644
index 00000000000000..e8a12858317139
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <ReactCommon/CallInvokerHolder.h>
+#include <ReactCommon/RuntimeExecutor.h>
+#include <fbjni/fbjni.h>
+#include <react/jni/JRuntimeExecutor.h>
+#include <set>
+
+namespace facebook {
+namespace react {
+
+class ComponentNameResolverManager
+    : public facebook::jni::HybridClass<ComponentNameResolverManager> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/uimanager/ComponentNameResolverManager;";
+
+  constexpr static auto ComponentNameResolverJavaDescriptor =
+      "com/facebook/react/uimanager/ComponentNameResolver";
+
+  static facebook::jni::local_ref<jhybriddata> initHybrid(
+      facebook::jni::alias_ref<jhybridobject> jThis,
+      facebook::jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
+      facebook::jni::alias_ref<jobject> componentNameResolver);
+
+  static void registerNatives();
+
+ private:
+  friend HybridBase;
+  facebook::jni::global_ref<ComponentNameResolverManager::javaobject> javaPart_;
+  RuntimeExecutor runtimeExecutor_;
+
+  facebook::jni::global_ref<jobject> componentNameResolver_;
+
+  std::set<std::string> componentNames_;
+
+  void installJSIBindings();
+
+  explicit ComponentNameResolverManager(
+      facebook::jni::alias_ref<ComponentNameResolverManager::jhybridobject>
+          jThis,
+      RuntimeExecutor runtimeExecutor,
+      facebook::jni::alias_ref<jobject> componentNameResolver);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp
new file mode 100644
index 00000000000000..b7167dfbd9cce1
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fbjni/fbjni.h>
+
+#include "ComponentNameResolverManager.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    facebook::react::ComponentNameResolverManager::registerNatives();
+  });
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
index 6d31563ef3a53f..c8173be0b382a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "util",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
index 679245155e108d..67fc95476d5954 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "util",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java
deleted file mode 100644
index 833ffe265d96f7..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class ActivityIndicatorViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ActivityIndicatorViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public ActivityIndicatorViewManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "hidesWhenStopped":
-        mViewManager.setHidesWhenStopped(view, value == null ? false : (boolean) value);
-        break;
-      case "animating":
-        mViewManager.setAnimating(view, value == null ? false : (boolean) value);
-        break;
-      case "color":
-        mViewManager.setColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "size":
-        mViewManager.setSize(view, (String) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerInterface.java
deleted file mode 100644
index d217b8bc2fdfbe..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerInterface.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-
-public interface ActivityIndicatorViewManagerInterface<T extends View> {
-  void setHidesWhenStopped(T view, boolean value);
-  void setAnimating(T view, boolean value);
-  void setColor(T view, @Nullable Integer value);
-  void setSize(T view, @Nullable String value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerDelegate.java
deleted file mode 100644
index 8147f55a3d5110..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerDelegate.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class AndroidDialogPickerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AndroidDialogPickerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public AndroidDialogPickerManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "color":
-        mViewManager.setColor(view, value == null ? null : ((Double) value).intValue());
-        break;
-      case "backgroundColor":
-        mViewManager.setBackgroundColor(view, value == null ? null : ((Double) value).intValue());
-        break;
-      case "enabled":
-        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
-        break;
-      case "items":
-        mViewManager.setItems(view, (ReadableArray) value);
-        break;
-      case "prompt":
-        mViewManager.setPrompt(view, value == null ? "" : (String) value);
-        break;
-      case "selected":
-        mViewManager.setSelected(view, value == null ? 0 : ((Double) value).intValue());
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerInterface.java
deleted file mode 100644
index fe8986fa6cbaf9..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDialogPickerManagerInterface.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-
-public interface AndroidDialogPickerManagerInterface<T extends View> {
-  void setColor(T view, @Nullable Integer value);
-  void setBackgroundColor(T view, @Nullable Integer value);
-  void setEnabled(T view, boolean value);
-  void setItems(T view, @Nullable ReadableArray value);
-  void setPrompt(T view, @Nullable String value);
-  void setSelected(T view, int value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java
deleted file mode 100644
index aee5f3f9c94820..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class AndroidDrawerLayoutManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AndroidDrawerLayoutManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public AndroidDrawerLayoutManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "keyboardDismissMode":
-        mViewManager.setKeyboardDismissMode(view, (String) value);
-        break;
-      case "drawerBackgroundColor":
-        mViewManager.setDrawerBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "drawerPosition":
-        mViewManager.setDrawerPosition(view, (String) value);
-        break;
-      case "drawerWidth":
-        mViewManager.setDrawerWidth(view, value == null ? null : ((Double) value).floatValue());
-        break;
-      case "drawerLockMode":
-        mViewManager.setDrawerLockMode(view, (String) value);
-        break;
-      case "statusBarBackgroundColor":
-        mViewManager.setStatusBarBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-
-  @Override
-  public void receiveCommand(T view, String commandName, ReadableArray args) {
-    switch (commandName) {
-      case "openDrawer":
-        mViewManager.openDrawer(view);
-        break;
-      case "closeDrawer":
-        mViewManager.closeDrawer(view);
-        break;
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerInterface.java
deleted file mode 100644
index 7654b2d79297a5..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerInterface.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-
-public interface AndroidDrawerLayoutManagerInterface<T extends View> {
-  void setKeyboardDismissMode(T view, @Nullable String value);
-  void setDrawerBackgroundColor(T view, @Nullable Integer value);
-  void setDrawerPosition(T view, @Nullable String value);
-  void setDrawerWidth(T view, @Nullable Float value);
-  void setDrawerLockMode(T view, @Nullable String value);
-  void setStatusBarBackgroundColor(T view, @Nullable Integer value);
-  void openDrawer(T view);
-  void closeDrawer(T view);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerDelegate.java
deleted file mode 100644
index c14ce248b59faf..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerDelegate.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- *
- * @generated by codegen project: GeneratePropsJavaDelegate.js
- */
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class AndroidDropdownPickerManagerDelegate<
-        T extends View,
-        U extends BaseViewManagerInterface<T> & AndroidDropdownPickerManagerInterface<T>>
-    extends BaseViewManagerDelegate<T, U> {
-  public AndroidDropdownPickerManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "color":
-        mViewManager.setColor(view, value == null ? null : ((Double) value).intValue());
-        break;
-      case "enabled":
-        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
-        break;
-      case "items":
-        mViewManager.setItems(view, (ReadableArray) value);
-        break;
-      case "prompt":
-        mViewManager.setPrompt(view, value == null ? "" : (String) value);
-        break;
-      case "selected":
-        mViewManager.setSelected(view, value == null ? 0 : ((Double) value).intValue());
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerInterface.java
deleted file mode 100644
index db599a79056442..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerInterface.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-
-public interface AndroidDropdownPickerManagerInterface<T extends View> {
-  void setColor(T view, @Nullable Integer value);
-  void setEnabled(T view, boolean value);
-  void setItems(T view, @Nullable ReadableArray value);
-  void setPrompt(T view, @Nullable String value);
-  void setSelected(T view, int value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java
deleted file mode 100644
index b0417eed9ce042..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class AndroidProgressBarManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AndroidProgressBarManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public AndroidProgressBarManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "styleAttr":
-        mViewManager.setStyleAttr(view, value == null ? null : (String) value);
-        break;
-      case "typeAttr":
-        mViewManager.setTypeAttr(view, value == null ? null : (String) value);
-        break;
-      case "indeterminate":
-        mViewManager.setIndeterminate(view, value == null ? false : (boolean) value);
-        break;
-      case "progress":
-        mViewManager.setProgress(view, value == null ? 0f : ((Double) value).doubleValue());
-        break;
-      case "animating":
-        mViewManager.setAnimating(view, value == null ? true : (boolean) value);
-        break;
-      case "color":
-        mViewManager.setColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "testID":
-        mViewManager.setTestID(view, value == null ? "" : (String) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerInterface.java
deleted file mode 100644
index 814d8e7f7e14c9..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerInterface.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-
-public interface AndroidProgressBarManagerInterface<T extends View> {
-  void setStyleAttr(T view, @Nullable String value);
-  void setTypeAttr(T view, @Nullable String value);
-  void setIndeterminate(T view, boolean value);
-  void setProgress(T view, double value);
-  void setAnimating(T view, boolean value);
-  void setColor(T view, @Nullable Integer value);
-  void setTestID(T view, @Nullable String value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
deleted file mode 100644
index e5fc3ac7a2c2c2..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class AndroidSwipeRefreshLayoutManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AndroidSwipeRefreshLayoutManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public AndroidSwipeRefreshLayoutManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "enabled":
-        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
-        break;
-      case "colors":
-        mViewManager.setColors(view, (ReadableArray) value);
-        break;
-      case "progressBackgroundColor":
-        mViewManager.setProgressBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "size":
-        mViewManager.setSize(view, value == null ? 1 : ((Double) value).intValue());
-        break;
-      case "progressViewOffset":
-        mViewManager.setProgressViewOffset(view, value == null ? 0f : ((Double) value).floatValue());
-        break;
-      case "refreshing":
-        mViewManager.setRefreshing(view, value == null ? false : (boolean) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-
-  @Override
-  public void receiveCommand(T view, String commandName, ReadableArray args) {
-    switch (commandName) {
-      case "setNativeRefreshing":
-        mViewManager.setNativeRefreshing(view, args.getBoolean(0));
-        break;
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerInterface.java
deleted file mode 100644
index 3e81326b3e8ee0..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerInterface.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-
-public interface AndroidSwipeRefreshLayoutManagerInterface<T extends View> {
-  void setEnabled(T view, boolean value);
-  void setColors(T view, @Nullable ReadableArray value);
-  void setProgressBackgroundColor(T view, @Nullable Integer value);
-  void setSize(T view, int value);
-  void setProgressViewOffset(T view, float value);
-  void setRefreshing(T view, boolean value);
-  void setNativeRefreshing(T view, boolean value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java
deleted file mode 100644
index 1b2f225d390ae7..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class AndroidSwitchManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AndroidSwitchManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public AndroidSwitchManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "disabled":
-        mViewManager.setDisabled(view, value == null ? false : (boolean) value);
-        break;
-      case "enabled":
-        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
-        break;
-      case "thumbColor":
-        mViewManager.setThumbColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "trackColorForFalse":
-        mViewManager.setTrackColorForFalse(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "trackColorForTrue":
-        mViewManager.setTrackColorForTrue(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "value":
-        mViewManager.setValue(view, value == null ? false : (boolean) value);
-        break;
-      case "on":
-        mViewManager.setOn(view, value == null ? false : (boolean) value);
-        break;
-      case "thumbTintColor":
-        mViewManager.setThumbTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "trackTintColor":
-        mViewManager.setTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-
-  @Override
-  public void receiveCommand(T view, String commandName, ReadableArray args) {
-    switch (commandName) {
-      case "setNativeValue":
-        mViewManager.setNativeValue(view, args.getBoolean(0));
-        break;
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerInterface.java
deleted file mode 100644
index 2ff293b3be663a..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerInterface.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-
-public interface AndroidSwitchManagerInterface<T extends View> {
-  void setDisabled(T view, boolean value);
-  void setEnabled(T view, boolean value);
-  void setThumbColor(T view, @Nullable Integer value);
-  void setTrackColorForFalse(T view, @Nullable Integer value);
-  void setTrackColorForTrue(T view, @Nullable Integer value);
-  void setValue(T view, boolean value);
-  void setOn(T view, boolean value);
-  void setThumbTintColor(T view, @Nullable Integer value);
-  void setTrackTintColor(T view, @Nullable Integer value);
-  void setNativeValue(T view, boolean value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/BUCK b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/BUCK
index 039099fb0d634a..33af2c1e53c0b5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "viewmanagers",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerDelegate.java
deleted file mode 100644
index 315e5cd181aebb..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerDelegate.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class MaskedViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MaskedViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public MaskedViewManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    super.setProperty(view, propName, value);
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerInterface.java
deleted file mode 100644
index 0b930ee79c1be0..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/MaskedViewManagerInterface.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-
-public interface MaskedViewManagerInterface<T extends View> {
-  // No props
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerDelegate.java
deleted file mode 100644
index 978224f30f73d5..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerDelegate.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class ModalHostViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ModalHostViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public ModalHostViewManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "animationType":
-        mViewManager.setAnimationType(view, (String) value);
-        break;
-      case "presentationStyle":
-        mViewManager.setPresentationStyle(view, (String) value);
-        break;
-      case "transparent":
-        mViewManager.setTransparent(view, value == null ? false : (boolean) value);
-        break;
-      case "statusBarTranslucent":
-        mViewManager.setStatusBarTranslucent(view, value == null ? false : (boolean) value);
-        break;
-      case "hardwareAccelerated":
-        mViewManager.setHardwareAccelerated(view, value == null ? false : (boolean) value);
-        break;
-      case "animated":
-        mViewManager.setAnimated(view, value == null ? false : (boolean) value);
-        break;
-      case "supportedOrientations":
-        mViewManager.setSupportedOrientations(view, (ReadableArray) value);
-        break;
-      case "identifier":
-        mViewManager.setIdentifier(view, value == null ? 0 : ((Double) value).intValue());
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerInterface.java
deleted file mode 100644
index bf60387d5180c8..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ModalHostViewManagerInterface.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-
-public interface ModalHostViewManagerInterface<T extends View> {
-  void setAnimationType(T view, @Nullable String value);
-  void setPresentationStyle(T view, @Nullable String value);
-  void setTransparent(T view, boolean value);
-  void setStatusBarTranslucent(T view, boolean value);
-  void setHardwareAccelerated(T view, boolean value);
-  void setAnimated(T view, boolean value);
-  void setSupportedOrientations(T view, @Nullable ReadableArray value);
-  void setIdentifier(T view, int value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java
deleted file mode 100644
index df088d4a87f8ba..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class ProgressViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ProgressViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public ProgressViewManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "progressViewStyle":
-        mViewManager.setProgressViewStyle(view, (String) value);
-        break;
-      case "progress":
-        mViewManager.setProgress(view, value == null ? 0f : ((Double) value).floatValue());
-        break;
-      case "progressTintColor":
-        mViewManager.setProgressTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "trackTintColor":
-        mViewManager.setTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "progressImage":
-        mViewManager.setProgressImage(view, (ReadableMap) value);
-        break;
-      case "trackImage":
-        mViewManager.setTrackImage(view, (ReadableMap) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerInterface.java
deleted file mode 100644
index bbfbdf4e31bb02..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerInterface.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableMap;
-
-public interface ProgressViewManagerInterface<T extends View> {
-  void setProgressViewStyle(T view, @Nullable String value);
-  void setProgress(T view, float value);
-  void setProgressTintColor(T view, @Nullable Integer value);
-  void setTrackTintColor(T view, @Nullable Integer value);
-  void setProgressImage(T view, @Nullable ReadableMap value);
-  void setTrackImage(T view, @Nullable ReadableMap value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate.java
deleted file mode 100644
index fdf56b283822cb..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class SafeAreaViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & SafeAreaViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public SafeAreaViewManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "emulateUnlessSupported":
-        mViewManager.setEmulateUnlessSupported(view, value == null ? false : (boolean) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerInterface.java
deleted file mode 100644
index 073e2c01c76826..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SafeAreaViewManagerInterface.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-
-public interface SafeAreaViewManagerInterface<T extends View> {
-  void setEmulateUnlessSupported(T view, boolean value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java
deleted file mode 100644
index 6763a1f1f53f0b..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class SegmentedControlManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & SegmentedControlManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public SegmentedControlManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "values":
-        mViewManager.setValues(view, (ReadableArray) value);
-        break;
-      case "selectedIndex":
-        mViewManager.setSelectedIndex(view, value == null ? 0 : ((Double) value).intValue());
-        break;
-      case "enabled":
-        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
-        break;
-      case "tintColor":
-        mViewManager.setTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "textColor":
-        mViewManager.setTextColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "backgroundColor":
-        mViewManager.setBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "momentary":
-        mViewManager.setMomentary(view, value == null ? false : (boolean) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerInterface.java
deleted file mode 100644
index 0ee9d56850941d..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerInterface.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-
-public interface SegmentedControlManagerInterface<T extends View> {
-  void setValues(T view, @Nullable ReadableArray value);
-  void setSelectedIndex(T view, int value);
-  void setEnabled(T view, boolean value);
-  void setTintColor(T view, @Nullable Integer value);
-  void setTextColor(T view, @Nullable Integer value);
-  void setBackgroundColor(T view, @Nullable Integer value);
-  void setMomentary(T view, boolean value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java
deleted file mode 100644
index 5eb9360ef8e285..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ColorPropConverter;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class SliderManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & SliderManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public SliderManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "disabled":
-        mViewManager.setDisabled(view, value == null ? false : (boolean) value);
-        break;
-      case "enabled":
-        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
-        break;
-      case "maximumTrackImage":
-        mViewManager.setMaximumTrackImage(view, (ReadableMap) value);
-        break;
-      case "maximumTrackTintColor":
-        mViewManager.setMaximumTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "maximumValue":
-        mViewManager.setMaximumValue(view, value == null ? 1f : ((Double) value).doubleValue());
-        break;
-      case "minimumTrackImage":
-        mViewManager.setMinimumTrackImage(view, (ReadableMap) value);
-        break;
-      case "minimumTrackTintColor":
-        mViewManager.setMinimumTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "minimumValue":
-        mViewManager.setMinimumValue(view, value == null ? 0f : ((Double) value).doubleValue());
-        break;
-      case "step":
-        mViewManager.setStep(view, value == null ? 0f : ((Double) value).doubleValue());
-        break;
-      case "testID":
-        mViewManager.setTestID(view, value == null ? "" : (String) value);
-        break;
-      case "thumbImage":
-        mViewManager.setThumbImage(view, (ReadableMap) value);
-        break;
-      case "thumbTintColor":
-        mViewManager.setThumbTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
-      case "trackImage":
-        mViewManager.setTrackImage(view, (ReadableMap) value);
-        break;
-      case "value":
-        mViewManager.setValue(view, value == null ? 0f : ((Double) value).doubleValue());
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerInterface.java
deleted file mode 100644
index 2d5c752f62cbba..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerInterface.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableMap;
-
-public interface SliderManagerInterface<T extends View> {
-  void setDisabled(T view, boolean value);
-  void setEnabled(T view, boolean value);
-  void setMaximumTrackImage(T view, @Nullable ReadableMap value);
-  void setMaximumTrackTintColor(T view, @Nullable Integer value);
-  void setMaximumValue(T view, double value);
-  void setMinimumTrackImage(T view, @Nullable ReadableMap value);
-  void setMinimumTrackTintColor(T view, @Nullable Integer value);
-  void setMinimumValue(T view, double value);
-  void setStep(T view, double value);
-  void setTestID(T view, @Nullable String value);
-  void setThumbImage(T view, @Nullable ReadableMap value);
-  void setThumbTintColor(T view, @Nullable Integer value);
-  void setTrackImage(T view, @Nullable ReadableMap value);
-  void setValue(T view, double value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerDelegate.java
deleted file mode 100644
index f90b2c3b25fa11..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerDelegate.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
-
-public class UnimplementedNativeViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & UnimplementedNativeViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public UnimplementedNativeViewManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "name":
-        mViewManager.setName(view, value == null ? "" : (String) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerInterface.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerInterface.java
deleted file mode 100644
index c76951e2225c1a..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/UnimplementedNativeViewManagerInterface.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-
-public interface UnimplementedNativeViewManagerInterface<T extends View> {
-  void setName(T view, @Nullable String value);
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/Android.mk
deleted file mode 100644
index cc37b42fdbe2e2..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := react_render_viewmanagers
-
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/react/renderer/components/rncore/*.cpp)
-
-LOCAL_SHARED_LIBRARIES := libreact_render_components_view libfolly_json libreact_render_core libreact_render_graphics
-
-LOCAL_STATIC_LIBRARIES :=
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/rncore/
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-
-LOCAL_CFLAGS := \
-  -DLOG_TAG=\"Fabric\"
-
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,react/renderer/components/view)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ComponentDescriptors.h b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ComponentDescriptors.h
deleted file mode 100644
index cc3c195dd3a24f..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ComponentDescriptors.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GenerateComponentDescriptorH.js
- */
-
-#pragma once
-
-#include <react/renderer/components/rncore/ShadowNodes.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-
-namespace facebook {
-namespace react {
-
-using ActivityIndicatorViewComponentDescriptor = ConcreteComponentDescriptor<ActivityIndicatorViewShadowNode>;
-using DatePickerComponentDescriptor = ConcreteComponentDescriptor<DatePickerShadowNode>;
-using AndroidDrawerLayoutComponentDescriptor = ConcreteComponentDescriptor<AndroidDrawerLayoutShadowNode>;
-using RCTMaskedViewComponentDescriptor = ConcreteComponentDescriptor<RCTMaskedViewShadowNode>;
-using RCTProgressViewComponentDescriptor = ConcreteComponentDescriptor<RCTProgressViewShadowNode>;
-using AndroidSwipeRefreshLayoutComponentDescriptor = ConcreteComponentDescriptor<AndroidSwipeRefreshLayoutShadowNode>;
-using PullToRefreshViewComponentDescriptor = ConcreteComponentDescriptor<PullToRefreshViewShadowNode>;
-using RCTSegmentedControlComponentDescriptor = ConcreteComponentDescriptor<RCTSegmentedControlShadowNode>;
-using SwitchComponentDescriptor = ConcreteComponentDescriptor<SwitchShadowNode>;
-using UnimplementedNativeViewComponentDescriptor = ConcreteComponentDescriptor<UnimplementedNativeViewShadowNode>;
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.cpp b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.cpp
deleted file mode 100644
index 68ba41cdd1c633..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GenerateEventEmitterCpp.js
- */
-
-#include <react/renderer/components/rncore/EventEmitters.h>
-
-namespace facebook {
-namespace react {
-
-
-void DatePickerEventEmitter::onChange(OnChange event) const {
-  dispatchEvent("change", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "timestamp", event.timestamp);
-    return payload;
-  });
-}
-void AndroidDrawerLayoutEventEmitter::onDrawerSlide(OnDrawerSlide event) const {
-  dispatchEvent("drawerSlide", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "offset", event.offset);
-    return payload;
-  });
-}
-void AndroidDrawerLayoutEventEmitter::onDrawerStateChanged(OnDrawerStateChanged event) const {
-  dispatchEvent("drawerStateChanged", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "drawerState", event.drawerState);
-    return payload;
-  });
-}
-void AndroidDrawerLayoutEventEmitter::onDrawerOpen(OnDrawerOpen event) const {
-  dispatchEvent("drawerOpen", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void AndroidDrawerLayoutEventEmitter::onDrawerClose(OnDrawerClose event) const {
-  dispatchEvent("drawerClose", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-
-
-
-void AndroidSwipeRefreshLayoutEventEmitter::onRefresh(OnRefresh event) const {
-  dispatchEvent("refresh", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void PullToRefreshViewEventEmitter::onRefresh(OnRefresh event) const {
-  dispatchEvent("refresh", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-
-void RCTSegmentedControlEventEmitter::onChange(OnChange event) const {
-  dispatchEvent("change", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-payload.setProperty(runtime, "selectedSegmentIndex", event.selectedSegmentIndex);
-    return payload;
-  });
-}
-void SliderEventEmitter::onChange(OnChange event) const {
-  dispatchEvent("change", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-payload.setProperty(runtime, "fromUser", event.fromUser);
-    return payload;
-  });
-}
-void SliderEventEmitter::onValueChange(OnValueChange event) const {
-  dispatchEvent("valueChange", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-payload.setProperty(runtime, "fromUser", event.fromUser);
-    return payload;
-  });
-}
-void SliderEventEmitter::onSlidingComplete(OnSlidingComplete event) const {
-  dispatchEvent("slidingComplete", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-payload.setProperty(runtime, "fromUser", event.fromUser);
-    return payload;
-  });
-}
-void AndroidSwitchEventEmitter::onChange(OnChange event) const {
-  dispatchEvent("change", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-    return payload;
-  });
-}
-void SwitchEventEmitter::onChange(OnChange event) const {
-  dispatchEvent("change", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-    return payload;
-  });
-}
-
-
-void ModalHostViewEventEmitter::onRequestClose(OnRequestClose event) const {
-  dispatchEvent("requestClose", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void ModalHostViewEventEmitter::onShow(OnShow event) const {
-  dispatchEvent("show", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void ModalHostViewEventEmitter::onOrientationChange(OnOrientationChange event) const {
-  dispatchEvent("orientationChange", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "orientation", toString(event.orientation));
-    return payload;
-  });
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.h b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.h
deleted file mode 100644
index 412c956aad8770..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/EventEmitters.h
+++ /dev/null
@@ -1,223 +0,0 @@
-
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GenerateEventEmitterH.js
- */
-#pragma once
-
-#include <react/renderer/components/view/ViewEventEmitter.h>
-
-namespace facebook {
-namespace react {
-
-class ActivityIndicatorViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class DatePickerEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnChange {
-      Float timestamp;
-    };
-
-  void onChange(OnChange value) const;
-};
-class AndroidDrawerLayoutEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnDrawerSlide {
-      Float offset;
-    };
-
-  struct OnDrawerStateChanged {
-      int drawerState;
-    };
-
-  struct OnDrawerOpen {
-      
-    };
-
-  struct OnDrawerClose {
-      
-    };
-
-  void onDrawerSlide(OnDrawerSlide value) const;
-
-  void onDrawerStateChanged(OnDrawerStateChanged value) const;
-
-  void onDrawerOpen(OnDrawerOpen value) const;
-
-  void onDrawerClose(OnDrawerClose value) const;
-};
-class RCTMaskedViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class AndroidProgressBarEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class RCTProgressViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class AndroidSwipeRefreshLayoutEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnRefresh {
-      
-    };
-
-  void onRefresh(OnRefresh value) const;
-};
-class PullToRefreshViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnRefresh {
-      
-    };
-
-  void onRefresh(OnRefresh value) const;
-};
-class SafeAreaViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class RCTSegmentedControlEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnChange {
-      int value;
-    int selectedSegmentIndex;
-    };
-
-  void onChange(OnChange value) const;
-};
-class SliderEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnChange {
-      double value;
-    bool fromUser;
-    };
-
-  struct OnValueChange {
-      double value;
-    bool fromUser;
-    };
-
-  struct OnSlidingComplete {
-      double value;
-    bool fromUser;
-    };
-
-  void onChange(OnChange value) const;
-
-  void onValueChange(OnValueChange value) const;
-
-  void onSlidingComplete(OnSlidingComplete value) const;
-};
-class AndroidSwitchEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnChange {
-      bool value;
-    };
-
-  void onChange(OnChange value) const;
-};
-class SwitchEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnChange {
-      bool value;
-    };
-
-  void onChange(OnChange value) const;
-};
-class InputAccessoryEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class UnimplementedNativeViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class ModalHostViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnRequestClose {
-      
-    };
-
-  struct OnShow {
-      
-    };
-
-  enum class OnOrientationChangeOrientation {
-    Portrait,
-    Landscape
-  };
-
-  static char const *toString(const OnOrientationChangeOrientation value) {
-    switch (value) {
-      case OnOrientationChangeOrientation::Portrait: return "portrait";
-      case OnOrientationChangeOrientation::Landscape: return "landscape";
-    }
-  }
-
-  struct OnOrientationChange {
-      OnOrientationChangeOrientation orientation;
-    };
-
-  void onRequestClose(OnRequestClose value) const;
-
-  void onShow(OnShow value) const;
-
-  void onOrientationChange(OnOrientationChange value) const;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.cpp b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.cpp
deleted file mode 100644
index fcce261612f836..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GeneratePropsCpp.js
- */
-
-#include <react/renderer/components/rncore/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/propsConversions.h>
-
-namespace facebook {
-namespace react {
-
-ActivityIndicatorViewProps::ActivityIndicatorViewProps(
-    const ActivityIndicatorViewProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    hidesWhenStopped(convertRawProp(rawProps, "hidesWhenStopped", sourceProps.hidesWhenStopped, {false})),
-    animating(convertRawProp(rawProps, "animating", sourceProps.animating, {false})),
-    color(convertRawProp(rawProps, "color", sourceProps.color, {})),
-    size(convertRawProp(rawProps, "size", sourceProps.size, {ActivityIndicatorViewSize::Small}))
-      {}
-DatePickerProps::DatePickerProps(
-    const DatePickerProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    date(convertRawProp(rawProps, "date", sourceProps.date, {0.0})),
-    initialDate(convertRawProp(rawProps, "initialDate", sourceProps.initialDate, {0.0})),
-    locale(convertRawProp(rawProps, "locale", sourceProps.locale, {})),
-    maximumDate(convertRawProp(rawProps, "maximumDate", sourceProps.maximumDate, {0.0})),
-    minimumDate(convertRawProp(rawProps, "minimumDate", sourceProps.minimumDate, {0.0})),
-    minuteInterval(convertRawProp(rawProps, "minuteInterval", sourceProps.minuteInterval, {DatePickerMinuteInterval::MinuteInterval1})),
-    mode(convertRawProp(rawProps, "mode", sourceProps.mode, {DatePickerMode::Date})),
-    timeZoneOffsetInMinutes(convertRawProp(rawProps, "timeZoneOffsetInMinutes", sourceProps.timeZoneOffsetInMinutes, {0.0}))
-      {}
-AndroidDrawerLayoutProps::AndroidDrawerLayoutProps(
-    const AndroidDrawerLayoutProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    keyboardDismissMode(convertRawProp(rawProps, "keyboardDismissMode", sourceProps.keyboardDismissMode, {AndroidDrawerLayoutKeyboardDismissMode::None})),
-    drawerBackgroundColor(convertRawProp(rawProps, "drawerBackgroundColor", sourceProps.drawerBackgroundColor, {})),
-    drawerPosition(convertRawProp(rawProps, "drawerPosition", sourceProps.drawerPosition, {AndroidDrawerLayoutDrawerPosition::Left})),
-    drawerWidth(convertRawProp(rawProps, "drawerWidth", sourceProps.drawerWidth, {})),
-    drawerLockMode(convertRawProp(rawProps, "drawerLockMode", sourceProps.drawerLockMode, {AndroidDrawerLayoutDrawerLockMode::Unlocked})),
-    statusBarBackgroundColor(convertRawProp(rawProps, "statusBarBackgroundColor", sourceProps.statusBarBackgroundColor, {}))
-      {}
-RCTMaskedViewProps::RCTMaskedViewProps(
-    const RCTMaskedViewProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps)
-
-    
-      {}
-AndroidProgressBarProps::AndroidProgressBarProps(
-    const AndroidProgressBarProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    styleAttr(convertRawProp(rawProps, "styleAttr", sourceProps.styleAttr, {})),
-    typeAttr(convertRawProp(rawProps, "typeAttr", sourceProps.typeAttr, {})),
-    indeterminate(convertRawProp(rawProps, "indeterminate", sourceProps.indeterminate, {false})),
-    progress(convertRawProp(rawProps, "progress", sourceProps.progress, {0.0})),
-    animating(convertRawProp(rawProps, "animating", sourceProps.animating, {true})),
-    color(convertRawProp(rawProps, "color", sourceProps.color, {})),
-    testID(convertRawProp(rawProps, "testID", sourceProps.testID, {""}))
-      {}
-RCTProgressViewProps::RCTProgressViewProps(
-    const RCTProgressViewProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    progressViewStyle(convertRawProp(rawProps, "progressViewStyle", sourceProps.progressViewStyle, {RCTProgressViewProgressViewStyle::Default})),
-    progress(convertRawProp(rawProps, "progress", sourceProps.progress, {0.0})),
-    progressTintColor(convertRawProp(rawProps, "progressTintColor", sourceProps.progressTintColor, {})),
-    trackTintColor(convertRawProp(rawProps, "trackTintColor", sourceProps.trackTintColor, {})),
-    progressImage(convertRawProp(rawProps, "progressImage", sourceProps.progressImage, {})),
-    trackImage(convertRawProp(rawProps, "trackImage", sourceProps.trackImage, {}))
-      {}
-AndroidSwipeRefreshLayoutProps::AndroidSwipeRefreshLayoutProps(
-    const AndroidSwipeRefreshLayoutProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    enabled(convertRawProp(rawProps, "enabled", sourceProps.enabled, {true})),
-    colors(convertRawProp(rawProps, "colors", sourceProps.colors, {})),
-    progressBackgroundColor(convertRawProp(rawProps, "progressBackgroundColor", sourceProps.progressBackgroundColor, {})),
-    size(convertRawProp(rawProps, "size", sourceProps.size, {1})),
-    progressViewOffset(convertRawProp(rawProps, "progressViewOffset", sourceProps.progressViewOffset, {0.0})),
-    refreshing(convertRawProp(rawProps, "refreshing", sourceProps.refreshing, {false}))
-      {}
-PullToRefreshViewProps::PullToRefreshViewProps(
-    const PullToRefreshViewProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    tintColor(convertRawProp(rawProps, "tintColor", sourceProps.tintColor, {})),
-    titleColor(convertRawProp(rawProps, "titleColor", sourceProps.titleColor, {})),
-    title(convertRawProp(rawProps, "title", sourceProps.title, {})),
-    refreshing(convertRawProp(rawProps, "refreshing", sourceProps.refreshing, {false}))
-      {}
-SafeAreaViewProps::SafeAreaViewProps(
-    const SafeAreaViewProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    emulateUnlessSupported(convertRawProp(rawProps, "emulateUnlessSupported", sourceProps.emulateUnlessSupported, {false}))
-      {}
-RCTSegmentedControlProps::RCTSegmentedControlProps(
-    const RCTSegmentedControlProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    values(convertRawProp(rawProps, "values", sourceProps.values, {})),
-    selectedIndex(convertRawProp(rawProps, "selectedIndex", sourceProps.selectedIndex, {0})),
-    enabled(convertRawProp(rawProps, "enabled", sourceProps.enabled, {true})),
-    tintColor(convertRawProp(rawProps, "tintColor", sourceProps.tintColor, {})),
-    textColor(convertRawProp(rawProps, "textColor", sourceProps.textColor, {})),
-    backgroundColor(convertRawProp(rawProps, "backgroundColor", sourceProps.backgroundColor, {})),
-    momentary(convertRawProp(rawProps, "momentary", sourceProps.momentary, {false}))
-      {}
-SliderProps::SliderProps(
-    const SliderProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    disabled(convertRawProp(rawProps, "disabled", sourceProps.disabled, {false})),
-    enabled(convertRawProp(rawProps, "enabled", sourceProps.enabled, {true})),
-    maximumTrackImage(convertRawProp(rawProps, "maximumTrackImage", sourceProps.maximumTrackImage, {})),
-    maximumTrackTintColor(convertRawProp(rawProps, "maximumTrackTintColor", sourceProps.maximumTrackTintColor, {})),
-    maximumValue(convertRawProp(rawProps, "maximumValue", sourceProps.maximumValue, {1.0})),
-    minimumTrackImage(convertRawProp(rawProps, "minimumTrackImage", sourceProps.minimumTrackImage, {})),
-    minimumTrackTintColor(convertRawProp(rawProps, "minimumTrackTintColor", sourceProps.minimumTrackTintColor, {})),
-    minimumValue(convertRawProp(rawProps, "minimumValue", sourceProps.minimumValue, {0.0})),
-    step(convertRawProp(rawProps, "step", sourceProps.step, {0.0})),
-    testID(convertRawProp(rawProps, "testID", sourceProps.testID, {""})),
-    thumbImage(convertRawProp(rawProps, "thumbImage", sourceProps.thumbImage, {})),
-    thumbTintColor(convertRawProp(rawProps, "thumbTintColor", sourceProps.thumbTintColor, {})),
-    trackImage(convertRawProp(rawProps, "trackImage", sourceProps.trackImage, {})),
-    value(convertRawProp(rawProps, "value", sourceProps.value, {0.0}))
-      {}
-AndroidSwitchProps::AndroidSwitchProps(
-    const AndroidSwitchProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    disabled(convertRawProp(rawProps, "disabled", sourceProps.disabled, {false})),
-    enabled(convertRawProp(rawProps, "enabled", sourceProps.enabled, {true})),
-    thumbColor(convertRawProp(rawProps, "thumbColor", sourceProps.thumbColor, {})),
-    trackColorForFalse(convertRawProp(rawProps, "trackColorForFalse", sourceProps.trackColorForFalse, {})),
-    trackColorForTrue(convertRawProp(rawProps, "trackColorForTrue", sourceProps.trackColorForTrue, {})),
-    value(convertRawProp(rawProps, "value", sourceProps.value, {false})),
-    on(convertRawProp(rawProps, "on", sourceProps.on, {false})),
-    thumbTintColor(convertRawProp(rawProps, "thumbTintColor", sourceProps.thumbTintColor, {})),
-    trackTintColor(convertRawProp(rawProps, "trackTintColor", sourceProps.trackTintColor, {}))
-      {}
-SwitchProps::SwitchProps(
-    const SwitchProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    disabled(convertRawProp(rawProps, "disabled", sourceProps.disabled, {false})),
-    value(convertRawProp(rawProps, "value", sourceProps.value, {false})),
-    tintColor(convertRawProp(rawProps, "tintColor", sourceProps.tintColor, {})),
-    onTintColor(convertRawProp(rawProps, "onTintColor", sourceProps.onTintColor, {})),
-    thumbTintColor(convertRawProp(rawProps, "thumbTintColor", sourceProps.thumbTintColor, {})),
-    thumbColor(convertRawProp(rawProps, "thumbColor", sourceProps.thumbColor, {})),
-    trackColorForFalse(convertRawProp(rawProps, "trackColorForFalse", sourceProps.trackColorForFalse, {})),
-    trackColorForTrue(convertRawProp(rawProps, "trackColorForTrue", sourceProps.trackColorForTrue, {}))
-      {}
-InputAccessoryProps::InputAccessoryProps(
-    const InputAccessoryProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    backgroundColor(convertRawProp(rawProps, "backgroundColor", sourceProps.backgroundColor, {}))
-      {}
-UnimplementedNativeViewProps::UnimplementedNativeViewProps(
-    const UnimplementedNativeViewProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    name(convertRawProp(rawProps, "name", sourceProps.name, {""}))
-      {}
-ModalHostViewProps::ModalHostViewProps(
-    const ModalHostViewProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    animationType(convertRawProp(rawProps, "animationType", sourceProps.animationType, {ModalHostViewAnimationType::None})),
-    presentationStyle(convertRawProp(rawProps, "presentationStyle", sourceProps.presentationStyle, {ModalHostViewPresentationStyle::FullScreen})),
-    transparent(convertRawProp(rawProps, "transparent", sourceProps.transparent, {false})),
-    statusBarTranslucent(convertRawProp(rawProps, "statusBarTranslucent", sourceProps.statusBarTranslucent, {false})),
-    hardwareAccelerated(convertRawProp(rawProps, "hardwareAccelerated", sourceProps.hardwareAccelerated, {false})),
-    animated(convertRawProp(rawProps, "animated", sourceProps.animated, {false})),
-    supportedOrientations(convertRawProp(rawProps, "supportedOrientations", sourceProps.supportedOrientations, {static_cast<ModalHostViewSupportedOrientationsMask>(ModalHostViewSupportedOrientations::Portrait)})),
-    identifier(convertRawProp(rawProps, "identifier", sourceProps.identifier, {0}))
-      {}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.h b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.h
deleted file mode 100644
index b968f7e266817e..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/Props.h
+++ /dev/null
@@ -1,529 +0,0 @@
-
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GeneratePropsH.js
- */
-#pragma once
-
-#include <cinttypes>
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/imagemanager/primitives.h>
-#include <vector>
-
-namespace facebook {
-namespace react {
-
-enum class ActivityIndicatorViewSize { Small, Large };
-
-static inline void fromRawValue(const RawValue &value, ActivityIndicatorViewSize &result) {
-  auto string = (std::string)value;
-  if (string == "small") { result = ActivityIndicatorViewSize::Small; return; }
-  if (string == "large") { result = ActivityIndicatorViewSize::Large; return; }
-  abort();
-}
-
-static inline std::string toString(const ActivityIndicatorViewSize &value) {
-  switch (value) {
-    case ActivityIndicatorViewSize::Small: return "small";
-    case ActivityIndicatorViewSize::Large: return "large";
-  }
-}
-
-class ActivityIndicatorViewProps final : public ViewProps {
- public:
-  ActivityIndicatorViewProps() = default;
-  ActivityIndicatorViewProps(const ActivityIndicatorViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  bool hidesWhenStopped{false};
-  bool animating{false};
-  SharedColor color{};
-  ActivityIndicatorViewSize size{ActivityIndicatorViewSize::Small};
-};
-
-enum class DatePickerMinuteInterval { MinuteInterval1 = 1, MinuteInterval2 = 2, MinuteInterval3 = 3, MinuteInterval4 = 4, MinuteInterval5 = 5, MinuteInterval6 = 6, MinuteInterval10 = 10, MinuteInterval12 = 12, MinuteInterval15 = 15, MinuteInterval20 = 20, MinuteInterval30 = 30 };
-
-static inline void fromRawValue(const RawValue &value, DatePickerMinuteInterval &result) {
-  assert(value.hasType<int>());
-  auto integerValue = (int)value;
-  switch (integerValue) {
-    case 1:
-      result = DatePickerMinuteInterval::MinuteInterval1;
-      return;
-    case 2:
-      result = DatePickerMinuteInterval::MinuteInterval2;
-      return;
-    case 3:
-      result = DatePickerMinuteInterval::MinuteInterval3;
-      return;
-    case 4:
-      result = DatePickerMinuteInterval::MinuteInterval4;
-      return;
-    case 5:
-      result = DatePickerMinuteInterval::MinuteInterval5;
-      return;
-    case 6:
-      result = DatePickerMinuteInterval::MinuteInterval6;
-      return;
-    case 10:
-      result = DatePickerMinuteInterval::MinuteInterval10;
-      return;
-    case 12:
-      result = DatePickerMinuteInterval::MinuteInterval12;
-      return;
-    case 15:
-      result = DatePickerMinuteInterval::MinuteInterval15;
-      return;
-    case 20:
-      result = DatePickerMinuteInterval::MinuteInterval20;
-      return;
-    case 30:
-      result = DatePickerMinuteInterval::MinuteInterval30;
-      return;
-  }
-  abort();
-}
-
-static inline std::string toString(const DatePickerMinuteInterval &value) {
-  switch (value) {
-    case DatePickerMinuteInterval::MinuteInterval1: return "1";
-    case DatePickerMinuteInterval::MinuteInterval2: return "2";
-    case DatePickerMinuteInterval::MinuteInterval3: return "3";
-    case DatePickerMinuteInterval::MinuteInterval4: return "4";
-    case DatePickerMinuteInterval::MinuteInterval5: return "5";
-    case DatePickerMinuteInterval::MinuteInterval6: return "6";
-    case DatePickerMinuteInterval::MinuteInterval10: return "10";
-    case DatePickerMinuteInterval::MinuteInterval12: return "12";
-    case DatePickerMinuteInterval::MinuteInterval15: return "15";
-    case DatePickerMinuteInterval::MinuteInterval20: return "20";
-    case DatePickerMinuteInterval::MinuteInterval30: return "30";
-  }
-}
-enum class DatePickerMode { Date, Time, Datetime };
-
-static inline void fromRawValue(const RawValue &value, DatePickerMode &result) {
-  auto string = (std::string)value;
-  if (string == "date") { result = DatePickerMode::Date; return; }
-  if (string == "time") { result = DatePickerMode::Time; return; }
-  if (string == "datetime") { result = DatePickerMode::Datetime; return; }
-  abort();
-}
-
-static inline std::string toString(const DatePickerMode &value) {
-  switch (value) {
-    case DatePickerMode::Date: return "date";
-    case DatePickerMode::Time: return "time";
-    case DatePickerMode::Datetime: return "datetime";
-  }
-}
-
-class DatePickerProps final : public ViewProps {
- public:
-  DatePickerProps() = default;
-  DatePickerProps(const DatePickerProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  Float date{0.0};
-  Float initialDate{0.0};
-  std::string locale{};
-  Float maximumDate{0.0};
-  Float minimumDate{0.0};
-  DatePickerMinuteInterval minuteInterval{DatePickerMinuteInterval::MinuteInterval1};
-  DatePickerMode mode{DatePickerMode::Date};
-  Float timeZoneOffsetInMinutes{0.0};
-};
-
-enum class AndroidDrawerLayoutKeyboardDismissMode { None, OnDrag };
-
-static inline void fromRawValue(const RawValue &value, AndroidDrawerLayoutKeyboardDismissMode &result) {
-  auto string = (std::string)value;
-  if (string == "none") { result = AndroidDrawerLayoutKeyboardDismissMode::None; return; }
-  if (string == "on-drag") { result = AndroidDrawerLayoutKeyboardDismissMode::OnDrag; return; }
-  abort();
-}
-
-static inline std::string toString(const AndroidDrawerLayoutKeyboardDismissMode &value) {
-  switch (value) {
-    case AndroidDrawerLayoutKeyboardDismissMode::None: return "none";
-    case AndroidDrawerLayoutKeyboardDismissMode::OnDrag: return "on-drag";
-  }
-}
-enum class AndroidDrawerLayoutDrawerPosition { Left, Right };
-
-static inline void fromRawValue(const RawValue &value, AndroidDrawerLayoutDrawerPosition &result) {
-  auto string = (std::string)value;
-  if (string == "left") { result = AndroidDrawerLayoutDrawerPosition::Left; return; }
-  if (string == "right") { result = AndroidDrawerLayoutDrawerPosition::Right; return; }
-  abort();
-}
-
-static inline std::string toString(const AndroidDrawerLayoutDrawerPosition &value) {
-  switch (value) {
-    case AndroidDrawerLayoutDrawerPosition::Left: return "left";
-    case AndroidDrawerLayoutDrawerPosition::Right: return "right";
-  }
-}
-enum class AndroidDrawerLayoutDrawerLockMode { Unlocked, LockedClosed, LockedOpen };
-
-static inline void fromRawValue(const RawValue &value, AndroidDrawerLayoutDrawerLockMode &result) {
-  auto string = (std::string)value;
-  if (string == "unlocked") { result = AndroidDrawerLayoutDrawerLockMode::Unlocked; return; }
-  if (string == "locked-closed") { result = AndroidDrawerLayoutDrawerLockMode::LockedClosed; return; }
-  if (string == "locked-open") { result = AndroidDrawerLayoutDrawerLockMode::LockedOpen; return; }
-  abort();
-}
-
-static inline std::string toString(const AndroidDrawerLayoutDrawerLockMode &value) {
-  switch (value) {
-    case AndroidDrawerLayoutDrawerLockMode::Unlocked: return "unlocked";
-    case AndroidDrawerLayoutDrawerLockMode::LockedClosed: return "locked-closed";
-    case AndroidDrawerLayoutDrawerLockMode::LockedOpen: return "locked-open";
-  }
-}
-
-class AndroidDrawerLayoutProps final : public ViewProps {
- public:
-  AndroidDrawerLayoutProps() = default;
-  AndroidDrawerLayoutProps(const AndroidDrawerLayoutProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  AndroidDrawerLayoutKeyboardDismissMode keyboardDismissMode{AndroidDrawerLayoutKeyboardDismissMode::None};
-  SharedColor drawerBackgroundColor{};
-  AndroidDrawerLayoutDrawerPosition drawerPosition{AndroidDrawerLayoutDrawerPosition::Left};
-  Float drawerWidth{};
-  AndroidDrawerLayoutDrawerLockMode drawerLockMode{AndroidDrawerLayoutDrawerLockMode::Unlocked};
-  SharedColor statusBarBackgroundColor{};
-};
-
-class RCTMaskedViewProps final : public ViewProps {
- public:
-  RCTMaskedViewProps() = default;
-  RCTMaskedViewProps(const RCTMaskedViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  
-};
-
-class AndroidProgressBarProps final : public ViewProps {
- public:
-  AndroidProgressBarProps() = default;
-  AndroidProgressBarProps(const AndroidProgressBarProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  std::string styleAttr{};
-  std::string typeAttr{};
-  bool indeterminate{false};
-  double progress{0.0};
-  bool animating{true};
-  SharedColor color{};
-  std::string testID{""};
-};
-
-enum class RCTProgressViewProgressViewStyle { Default, Bar };
-
-static inline void fromRawValue(const RawValue &value, RCTProgressViewProgressViewStyle &result) {
-  auto string = (std::string)value;
-  if (string == "default") { result = RCTProgressViewProgressViewStyle::Default; return; }
-  if (string == "bar") { result = RCTProgressViewProgressViewStyle::Bar; return; }
-  abort();
-}
-
-static inline std::string toString(const RCTProgressViewProgressViewStyle &value) {
-  switch (value) {
-    case RCTProgressViewProgressViewStyle::Default: return "default";
-    case RCTProgressViewProgressViewStyle::Bar: return "bar";
-  }
-}
-
-class RCTProgressViewProps final : public ViewProps {
- public:
-  RCTProgressViewProps() = default;
-  RCTProgressViewProps(const RCTProgressViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  RCTProgressViewProgressViewStyle progressViewStyle{RCTProgressViewProgressViewStyle::Default};
-  Float progress{0.0};
-  SharedColor progressTintColor{};
-  SharedColor trackTintColor{};
-  ImageSource progressImage{};
-  ImageSource trackImage{};
-};
-
-class AndroidSwipeRefreshLayoutProps final : public ViewProps {
- public:
-  AndroidSwipeRefreshLayoutProps() = default;
-  AndroidSwipeRefreshLayoutProps(const AndroidSwipeRefreshLayoutProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  bool enabled{true};
-  std::vector<SharedColor> colors{};
-  SharedColor progressBackgroundColor{};
-  int size{1};
-  Float progressViewOffset{0.0};
-  bool refreshing{false};
-};
-
-class PullToRefreshViewProps final : public ViewProps {
- public:
-  PullToRefreshViewProps() = default;
-  PullToRefreshViewProps(const PullToRefreshViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  SharedColor tintColor{};
-  SharedColor titleColor{};
-  std::string title{};
-  bool refreshing{false};
-};
-
-class SafeAreaViewProps final : public ViewProps {
- public:
-  SafeAreaViewProps() = default;
-  SafeAreaViewProps(const SafeAreaViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  bool emulateUnlessSupported{false};
-};
-
-class RCTSegmentedControlProps final : public ViewProps {
- public:
-  RCTSegmentedControlProps() = default;
-  RCTSegmentedControlProps(const RCTSegmentedControlProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  std::vector<std::string> values{};
-  int selectedIndex{0};
-  bool enabled{true};
-  SharedColor tintColor{};
-  SharedColor textColor{};
-  SharedColor backgroundColor{};
-  bool momentary{false};
-};
-
-class SliderProps final : public ViewProps {
- public:
-  SliderProps() = default;
-  SliderProps(const SliderProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  bool disabled{false};
-  bool enabled{true};
-  ImageSource maximumTrackImage{};
-  SharedColor maximumTrackTintColor{};
-  double maximumValue{1.0};
-  ImageSource minimumTrackImage{};
-  SharedColor minimumTrackTintColor{};
-  double minimumValue{0.0};
-  double step{0.0};
-  std::string testID{""};
-  ImageSource thumbImage{};
-  SharedColor thumbTintColor{};
-  ImageSource trackImage{};
-  double value{0.0};
-};
-
-class AndroidSwitchProps final : public ViewProps {
- public:
-  AndroidSwitchProps() = default;
-  AndroidSwitchProps(const AndroidSwitchProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  bool disabled{false};
-  bool enabled{true};
-  SharedColor thumbColor{};
-  SharedColor trackColorForFalse{};
-  SharedColor trackColorForTrue{};
-  bool value{false};
-  bool on{false};
-  SharedColor thumbTintColor{};
-  SharedColor trackTintColor{};
-};
-
-class SwitchProps final : public ViewProps {
- public:
-  SwitchProps() = default;
-  SwitchProps(const SwitchProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  bool disabled{false};
-  bool value{false};
-  SharedColor tintColor{};
-  SharedColor onTintColor{};
-  SharedColor thumbTintColor{};
-  SharedColor thumbColor{};
-  SharedColor trackColorForFalse{};
-  SharedColor trackColorForTrue{};
-};
-
-class InputAccessoryProps final : public ViewProps {
- public:
-  InputAccessoryProps() = default;
-  InputAccessoryProps(const InputAccessoryProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  SharedColor backgroundColor{};
-};
-
-class UnimplementedNativeViewProps final : public ViewProps {
- public:
-  UnimplementedNativeViewProps() = default;
-  UnimplementedNativeViewProps(const UnimplementedNativeViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  std::string name{""};
-};
-
-enum class ModalHostViewAnimationType { None, Slide, Fade };
-
-static inline void fromRawValue(const RawValue &value, ModalHostViewAnimationType &result) {
-  auto string = (std::string)value;
-  if (string == "none") { result = ModalHostViewAnimationType::None; return; }
-  if (string == "slide") { result = ModalHostViewAnimationType::Slide; return; }
-  if (string == "fade") { result = ModalHostViewAnimationType::Fade; return; }
-  abort();
-}
-
-static inline std::string toString(const ModalHostViewAnimationType &value) {
-  switch (value) {
-    case ModalHostViewAnimationType::None: return "none";
-    case ModalHostViewAnimationType::Slide: return "slide";
-    case ModalHostViewAnimationType::Fade: return "fade";
-  }
-}
-enum class ModalHostViewPresentationStyle { FullScreen, PageSheet, FormSheet, OverFullScreen };
-
-static inline void fromRawValue(const RawValue &value, ModalHostViewPresentationStyle &result) {
-  auto string = (std::string)value;
-  if (string == "fullScreen") { result = ModalHostViewPresentationStyle::FullScreen; return; }
-  if (string == "pageSheet") { result = ModalHostViewPresentationStyle::PageSheet; return; }
-  if (string == "formSheet") { result = ModalHostViewPresentationStyle::FormSheet; return; }
-  if (string == "overFullScreen") { result = ModalHostViewPresentationStyle::OverFullScreen; return; }
-  abort();
-}
-
-static inline std::string toString(const ModalHostViewPresentationStyle &value) {
-  switch (value) {
-    case ModalHostViewPresentationStyle::FullScreen: return "fullScreen";
-    case ModalHostViewPresentationStyle::PageSheet: return "pageSheet";
-    case ModalHostViewPresentationStyle::FormSheet: return "formSheet";
-    case ModalHostViewPresentationStyle::OverFullScreen: return "overFullScreen";
-  }
-}
-using ModalHostViewSupportedOrientationsMask = uint32_t;
-
-enum class ModalHostViewSupportedOrientations: ModalHostViewSupportedOrientationsMask {
-  Portrait = 1 << 0,
-  PortraitUpsideDown = 1 << 1,
-  Landscape = 1 << 2,
-  LandscapeLeft = 1 << 3,
-  LandscapeRight = 1 << 4
-};
-
-constexpr bool operator&(
-  ModalHostViewSupportedOrientationsMask const lhs,
-  enum ModalHostViewSupportedOrientations const rhs) {
-  return lhs & static_cast<ModalHostViewSupportedOrientationsMask>(rhs);
-}
-
-constexpr ModalHostViewSupportedOrientationsMask operator|(
-  ModalHostViewSupportedOrientationsMask const lhs,
-  enum ModalHostViewSupportedOrientations const rhs) {
-  return lhs | static_cast<ModalHostViewSupportedOrientationsMask>(rhs);
-}
-
-constexpr void operator|=(
-  ModalHostViewSupportedOrientationsMask &lhs,
-  enum ModalHostViewSupportedOrientations const rhs) {
-  lhs = lhs | static_cast<ModalHostViewSupportedOrientationsMask>(rhs);
-}
-
-static inline void fromRawValue(const RawValue &value, ModalHostViewSupportedOrientationsMask &result) {
-  auto items = std::vector<std::string>{value};
-  for (const auto &item : items) {
-    if (item == "portrait") {
-      result |= ModalHostViewSupportedOrientations::Portrait;
-      continue;
-    }
-    if (item == "portrait-upside-down") {
-      result |= ModalHostViewSupportedOrientations::PortraitUpsideDown;
-      continue;
-    }
-    if (item == "landscape") {
-      result |= ModalHostViewSupportedOrientations::Landscape;
-      continue;
-    }
-    if (item == "landscape-left") {
-      result |= ModalHostViewSupportedOrientations::LandscapeLeft;
-      continue;
-    }
-    if (item == "landscape-right") {
-      result |= ModalHostViewSupportedOrientations::LandscapeRight;
-      continue;
-    }
-    abort();
-  }
-}
-
-static inline std::string toString(const ModalHostViewSupportedOrientationsMask &value) {
-    auto result = std::string{};
-    auto separator = std::string{", "};
-
-    if (value & ModalHostViewSupportedOrientations::Portrait) {
-      result += "portrait" + separator;
-    }
-    if (value & ModalHostViewSupportedOrientations::PortraitUpsideDown) {
-      result += "portrait-upside-down" + separator;
-    }
-    if (value & ModalHostViewSupportedOrientations::Landscape) {
-      result += "landscape" + separator;
-    }
-    if (value & ModalHostViewSupportedOrientations::LandscapeLeft) {
-      result += "landscape-left" + separator;
-    }
-    if (value & ModalHostViewSupportedOrientations::LandscapeRight) {
-      result += "landscape-right" + separator;
-    }
-    if (!result.empty()) {
-      result.erase(result.length() - separator.length());
-    }
-    return result;
-}
-
-class ModalHostViewProps final : public ViewProps {
- public:
-  ModalHostViewProps() = default;
-  ModalHostViewProps(const ModalHostViewProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  ModalHostViewAnimationType animationType{ModalHostViewAnimationType::None};
-  ModalHostViewPresentationStyle presentationStyle{ModalHostViewPresentationStyle::FullScreen};
-  bool transparent{false};
-  bool statusBarTranslucent{false};
-  bool hardwareAccelerated{false};
-  bool animated{false};
-  ModalHostViewSupportedOrientationsMask supportedOrientations{static_cast<ModalHostViewSupportedOrientationsMask>(ModalHostViewSupportedOrientations::Portrait)};
-  int identifier{0};
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.cpp b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.cpp
deleted file mode 100644
index befdb19c30df35..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GenerateShadowNodeCpp.js
- */
-
-#include <react/renderer/components/rncore/ShadowNodes.h>
-
-namespace facebook {
-namespace react {
-
-extern const char ActivityIndicatorViewComponentName[] = "ActivityIndicatorView";
-extern const char DatePickerComponentName[] = "DatePicker";
-extern const char AndroidDrawerLayoutComponentName[] = "AndroidDrawerLayout";
-extern const char RCTMaskedViewComponentName[] = "RCTMaskedView";
-extern const char RCTProgressViewComponentName[] = "RCTProgressView";
-extern const char AndroidSwipeRefreshLayoutComponentName[] = "AndroidSwipeRefreshLayout";
-extern const char PullToRefreshViewComponentName[] = "PullToRefreshView";
-extern const char RCTSegmentedControlComponentName[] = "RCTSegmentedControl";
-extern const char SwitchComponentName[] = "Switch";
-extern const char UnimplementedNativeViewComponentName[] = "UnimplementedNativeView";
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.h b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.h
deleted file mode 100644
index f8a84f5836b01b..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/jni/react/renderer/components/rncore/ShadowNodes.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @generated by codegen project: GenerateShadowNodeH.js
- */
-
-#pragma once
-
-#include <react/renderer/components/rncore/EventEmitters.h>
-#include <react/renderer/components/rncore/Props.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-extern const char ActivityIndicatorViewComponentName[];
-
-/*
- * `ShadowNode` for <ActivityIndicatorView> component.
- */
-using ActivityIndicatorViewShadowNode = ConcreteViewShadowNode<
-    ActivityIndicatorViewComponentName,
-    ActivityIndicatorViewProps>;
-
-extern const char DatePickerComponentName[];
-
-/*
- * `ShadowNode` for <DatePicker> component.
- */
-using DatePickerShadowNode = ConcreteViewShadowNode<
-    DatePickerComponentName,
-    DatePickerProps,
-DatePickerEventEmitter>;
-
-extern const char AndroidDrawerLayoutComponentName[];
-
-/*
- * `ShadowNode` for <AndroidDrawerLayout> component.
- */
-using AndroidDrawerLayoutShadowNode = ConcreteViewShadowNode<
-    AndroidDrawerLayoutComponentName,
-    AndroidDrawerLayoutProps,
-AndroidDrawerLayoutEventEmitter>;
-
-extern const char RCTMaskedViewComponentName[];
-
-/*
- * `ShadowNode` for <RCTMaskedView> component.
- */
-using RCTMaskedViewShadowNode = ConcreteViewShadowNode<
-    RCTMaskedViewComponentName,
-    RCTMaskedViewProps>;
-
-extern const char RCTProgressViewComponentName[];
-
-/*
- * `ShadowNode` for <RCTProgressView> component.
- */
-using RCTProgressViewShadowNode = ConcreteViewShadowNode<
-    RCTProgressViewComponentName,
-    RCTProgressViewProps>;
-
-extern const char AndroidSwipeRefreshLayoutComponentName[];
-
-/*
- * `ShadowNode` for <AndroidSwipeRefreshLayout> component.
- */
-using AndroidSwipeRefreshLayoutShadowNode = ConcreteViewShadowNode<
-    AndroidSwipeRefreshLayoutComponentName,
-    AndroidSwipeRefreshLayoutProps,
-AndroidSwipeRefreshLayoutEventEmitter>;
-
-extern const char PullToRefreshViewComponentName[];
-
-/*
- * `ShadowNode` for <PullToRefreshView> component.
- */
-using PullToRefreshViewShadowNode = ConcreteViewShadowNode<
-    PullToRefreshViewComponentName,
-    PullToRefreshViewProps,
-PullToRefreshViewEventEmitter>;
-
-extern const char RCTSegmentedControlComponentName[];
-
-/*
- * `ShadowNode` for <RCTSegmentedControl> component.
- */
-using RCTSegmentedControlShadowNode = ConcreteViewShadowNode<
-    RCTSegmentedControlComponentName,
-    RCTSegmentedControlProps,
-RCTSegmentedControlEventEmitter>;
-
-extern const char SwitchComponentName[];
-
-/*
- * `ShadowNode` for <Switch> component.
- */
-using SwitchShadowNode = ConcreteViewShadowNode<
-    SwitchComponentName,
-    SwitchProps,
-SwitchEventEmitter>;
-
-extern const char UnimplementedNativeViewComponentName[];
-
-/*
- * `ShadowNode` for <UnimplementedNativeView> component.
- */
-using UnimplementedNativeViewShadowNode = ConcreteViewShadowNode<
-    UnimplementedNativeViewComponentName,
-    UnimplementedNativeViewProps>;
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
index 2b6f2c1e932a8e..720c0618c0f9a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "common",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
index ac71cc153ec774..a921e7eedcb5b9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
@@ -1,8 +1,9 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "drawer",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -25,6 +26,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
-        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
index 712353eb0a42f2..b3d9cc11bcdc22 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
@@ -20,7 +20,7 @@
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -56,12 +56,13 @@ public ReactDrawerLayoutManager() {
 
   @Override
   protected void addEventEmitters(ThemedReactContext reactContext, ReactDrawerLayout view) {
-    UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-    if (uiManager == null) {
+    EventDispatcher eventDispatcher =
+        UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.getId());
+    if (eventDispatcher == null) {
       return;
     }
 
-    view.addDrawerListener(new DrawerEventEmitter(view, uiManager.getEventDispatcher()));
+    view.addDrawerListener(new DrawerEventEmitter(view, eventDispatcher));
   }
 
   @Override
@@ -252,22 +253,30 @@ public DrawerEventEmitter(DrawerLayout drawerLayout, EventDispatcher eventDispat
 
     @Override
     public void onDrawerSlide(@NonNull View view, float v) {
-      mEventDispatcher.dispatchEvent(new DrawerSlideEvent(mDrawerLayout.getId(), v));
+      mEventDispatcher.dispatchEvent(
+          new DrawerSlideEvent(
+              UIManagerHelper.getSurfaceId(mDrawerLayout), mDrawerLayout.getId(), v));
     }
 
     @Override
     public void onDrawerOpened(@NonNull View view) {
-      mEventDispatcher.dispatchEvent(new DrawerOpenedEvent(mDrawerLayout.getId()));
+      mEventDispatcher.dispatchEvent(
+          new DrawerOpenedEvent(
+              UIManagerHelper.getSurfaceId(mDrawerLayout), mDrawerLayout.getId()));
     }
 
     @Override
     public void onDrawerClosed(@NonNull View view) {
-      mEventDispatcher.dispatchEvent(new DrawerClosedEvent(mDrawerLayout.getId()));
+      mEventDispatcher.dispatchEvent(
+          new DrawerClosedEvent(
+              UIManagerHelper.getSurfaceId(mDrawerLayout), mDrawerLayout.getId()));
     }
 
     @Override
     public void onDrawerStateChanged(int i) {
-      mEventDispatcher.dispatchEvent(new DrawerStateChangedEvent(mDrawerLayout.getId(), i));
+      mEventDispatcher.dispatchEvent(
+          new DrawerStateChangedEvent(
+              UIManagerHelper.getSurfaceId(mDrawerLayout), mDrawerLayout.getId(), i));
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
index e6bd567032fa4a..29c724c1ada911 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
@@ -8,30 +8,29 @@
 package com.facebook.react.views.drawer.events;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 public class DrawerClosedEvent extends Event<DrawerClosedEvent> {
 
   public static final String EVENT_NAME = "topDrawerClose";
 
+  @Deprecated
   public DrawerClosedEvent(int viewId) {
-    super(viewId);
+    this(-1, viewId);
   }
 
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
+  public DrawerClosedEvent(int surfaceId, int viewId) {
+    super(surfaceId, viewId);
   }
 
   @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
+  public String getEventName() {
+    return EVENT_NAME;
   }
 
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), Arguments.createMap());
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
index 2e754dc5207996..d1402f593cecef 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
@@ -8,30 +8,29 @@
 package com.facebook.react.views.drawer.events;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 public class DrawerOpenedEvent extends Event<DrawerOpenedEvent> {
 
   public static final String EVENT_NAME = "topDrawerOpen";
 
+  @Deprecated
   public DrawerOpenedEvent(int viewId) {
-    super(viewId);
+    this(-1, viewId);
   }
 
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
+  public DrawerOpenedEvent(int surfaceId, int viewId) {
+    super(surfaceId, viewId);
   }
 
   @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
+  public String getEventName() {
+    return EVENT_NAME;
   }
 
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), Arguments.createMap());
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
index 7d3a0af18dded5..57f2ef5fa60ac1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
@@ -10,7 +10,6 @@
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by a DrawerLayout as it is being moved open/closed. */
 public class DrawerSlideEvent extends Event<DrawerSlideEvent> {
@@ -19,8 +18,13 @@ public class DrawerSlideEvent extends Event<DrawerSlideEvent> {
 
   private final float mOffset;
 
+  @Deprecated
   public DrawerSlideEvent(int viewId, float offset) {
-    super(viewId);
+    this(-1, viewId, offset);
+  }
+
+  public DrawerSlideEvent(int surfaceId, int viewId, float offset) {
+    super(surfaceId, viewId);
     mOffset = offset;
   }
 
@@ -34,17 +38,7 @@ public String getEventName() {
   }
 
   @Override
-  public short getCoalescingKey() {
-    // All slide events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putDouble("offset", getOffset());
     return eventData;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
index 009217934d3d6d..6a9f8e9fb06d01 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
@@ -10,7 +10,6 @@
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 public class DrawerStateChangedEvent extends Event<DrawerStateChangedEvent> {
 
@@ -18,8 +17,13 @@ public class DrawerStateChangedEvent extends Event<DrawerStateChangedEvent> {
 
   private final int mDrawerState;
 
+  @Deprecated
   public DrawerStateChangedEvent(int viewId, int drawerState) {
-    super(viewId);
+    this(-1, viewId, drawerState);
+  }
+
+  public DrawerStateChangedEvent(int surfaceId, int viewId, int drawerState) {
+    super(surfaceId, viewId);
     mDrawerState = drawerState;
   }
 
@@ -33,17 +37,7 @@ public String getEventName() {
   }
 
   @Override
-  public short getCoalescingKey() {
-    // All events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putDouble("drawerState", getDrawerState());
     return eventData;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
index 663357ac133d7f..40f0d2f5592b3f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
@@ -7,6 +7,7 @@ IMAGE_EVENT_FILES = [
 rn_android_library(
     name = "imageevents",
     srcs = IMAGE_EVENT_FILES,
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -31,6 +32,7 @@ rn_android_library(
         ["*.java"],
         exclude = IMAGE_EVENT_FILES,
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
index 69778f028f5a94..130cb67ad8b60f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
@@ -12,7 +12,6 @@
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -35,8 +34,35 @@ public class ImageLoadEvent extends Event<ImageLoadEvent> {
   private final int mLoaded;
   private final int mTotal;
 
+  @Deprecated
   public static final ImageLoadEvent createLoadStartEvent(int viewId) {
-    return new ImageLoadEvent(viewId, ON_LOAD_START);
+    return createLoadStartEvent(-1, viewId);
+  }
+
+  @Deprecated
+  public static final ImageLoadEvent createProgressEvent(
+      int viewId, @Nullable String imageUri, int loaded, int total) {
+    return createProgressEvent(-1, viewId, imageUri, loaded, total);
+  }
+
+  @Deprecated
+  public static final ImageLoadEvent createLoadEvent(
+      int viewId, @Nullable String imageUri, int width, int height) {
+    return createLoadEvent(-1, viewId, imageUri, width, height);
+  }
+
+  @Deprecated
+  public static final ImageLoadEvent createErrorEvent(int viewId, Throwable throwable) {
+    return createErrorEvent(-1, viewId, throwable);
+  }
+
+  @Deprecated
+  public static final ImageLoadEvent createLoadEndEvent(int viewId) {
+    return createLoadEndEvent(-1, viewId);
+  }
+
+  public static final ImageLoadEvent createLoadStartEvent(int surfaceId, int viewId) {
+    return new ImageLoadEvent(surfaceId, viewId, ON_LOAD_START);
   }
 
   /**
@@ -45,28 +71,31 @@ public static final ImageLoadEvent createLoadStartEvent(int viewId) {
    * @param total Amount that `loaded` will be when the image is fully loaded.
    */
   public static final ImageLoadEvent createProgressEvent(
-      int viewId, @Nullable String imageUri, int loaded, int total) {
-    return new ImageLoadEvent(viewId, ON_PROGRESS, null, imageUri, 0, 0, loaded, total);
+      int surfaceId, int viewId, @Nullable String imageUri, int loaded, int total) {
+    return new ImageLoadEvent(surfaceId, viewId, ON_PROGRESS, null, imageUri, 0, 0, loaded, total);
   }
 
   public static final ImageLoadEvent createLoadEvent(
-      int viewId, @Nullable String imageUri, int width, int height) {
-    return new ImageLoadEvent(viewId, ON_LOAD, null, imageUri, width, height, 0, 0);
+      int surfaceId, int viewId, @Nullable String imageUri, int width, int height) {
+    return new ImageLoadEvent(surfaceId, viewId, ON_LOAD, null, imageUri, width, height, 0, 0);
   }
 
-  public static final ImageLoadEvent createErrorEvent(int viewId, Throwable throwable) {
-    return new ImageLoadEvent(viewId, ON_ERROR, throwable.getMessage(), null, 0, 0, 0, 0);
+  public static final ImageLoadEvent createErrorEvent(
+      int surfaceId, int viewId, Throwable throwable) {
+    return new ImageLoadEvent(
+        surfaceId, viewId, ON_ERROR, throwable.getMessage(), null, 0, 0, 0, 0);
   }
 
-  public static final ImageLoadEvent createLoadEndEvent(int viewId) {
-    return new ImageLoadEvent(viewId, ON_LOAD_END);
+  public static final ImageLoadEvent createLoadEndEvent(int surfaceId, int viewId) {
+    return new ImageLoadEvent(surfaceId, viewId, ON_LOAD_END);
   }
 
-  private ImageLoadEvent(int viewId, @ImageEventType int eventType) {
-    this(viewId, eventType, null, null, 0, 0, 0, 0);
+  private ImageLoadEvent(int surfaceId, int viewId, @ImageEventType int eventType) {
+    this(surfaceId, viewId, eventType, null, null, 0, 0, 0, 0);
   }
 
   private ImageLoadEvent(
+      int surfaceId,
       int viewId,
       @ImageEventType int eventType,
       @Nullable String errorMessage,
@@ -75,7 +104,7 @@ private ImageLoadEvent(
       int height,
       int loaded,
       int total) {
-    super(viewId);
+    super(surfaceId, viewId);
     mEventType = eventType;
     mErrorMessage = errorMessage;
     mSourceUri = sourceUri;
@@ -115,26 +144,23 @@ public short getCoalescingKey() {
   }
 
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    WritableMap eventData = null;
+  protected WritableMap getEventData() {
+    WritableMap eventData = Arguments.createMap();
 
     switch (mEventType) {
       case ON_PROGRESS:
-        eventData = Arguments.createMap();
         eventData.putInt("loaded", mLoaded);
         eventData.putInt("total", mTotal);
         break;
       case ON_LOAD:
-        eventData = Arguments.createMap();
         eventData.putMap("source", createEventDataSource());
         break;
       case ON_ERROR:
-        eventData = Arguments.createMap();
         eventData.putString("error", mErrorMessage);
         break;
     }
 
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
+    return eventData;
   }
 
   private WritableMap createEventDataSource() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java
index 46e9573fdb0ca1..cb1c6a336048ee 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java
@@ -20,9 +20,9 @@ public interface ReactCallerContextFactory {
   /**
    * This method will be called at the time {@link ReactImageManager} creates {@link ReactImageView}
    *
-   * @param surfaceID {@link String} used to log the name of the surface
+   * @param surfaceName {@link String} used to log the name of the surface
    * @return an {@link Object} that represents the CallerContext.
    */
   @Nullable
-  Object getOrCreateCallerContext(@Nullable String surfaceID, @Nullable String analyticTag);
+  Object getOrCreateCallerContext(@Nullable String surfaceName, @Nullable String analyticTag);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
index 397a8378d603f4..646cc5fc59414c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
@@ -31,11 +31,6 @@ public class ReactImageManager extends SimpleViewManager<ReactImageView> {
 
   public static final String REACT_CLASS = "RCTImageView";
 
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
   private @Nullable AbstractDraweeControllerBuilder mDraweeControllerBuilder;
   private @Nullable GlobalImageLoadListener mGlobalImageLoadListener;
   private final @Nullable Object mCallerContext;
@@ -107,12 +102,22 @@ public Object getCallerContext() {
   public ReactImageView createViewInstance(ThemedReactContext context) {
     Object callerContext =
         mCallerContextFactory != null
-            ? mCallerContextFactory.getOrCreateCallerContext(context.getSurfaceID(), null)
+            ? mCallerContextFactory.getOrCreateCallerContext(context.getModuleName(), null)
             : getCallerContext();
     return new ReactImageView(
         context, getDraweeControllerBuilder(), mGlobalImageLoadListener, callerContext);
   }
 
+  @Override
+  public String getName() {
+    return REACT_CLASS;
+  }
+
+  @ReactProp(name = "accessible")
+  public void setAccessible(ReactImageView view, boolean accessible) {
+    view.setFocusable(accessible);
+  }
+
   // In JS this is Image.props.source
   @ReactProp(name = "src")
   public void setSource(ReactImageView view, @Nullable ReadableArray sources) {
@@ -129,7 +134,7 @@ public void setInternal_AnalyticsTag(ReactImageView view, @Nullable String analy
     if (mCallerContextFactory != null) {
       view.updateCallerContext(
           mCallerContextFactory.getOrCreateCallerContext(
-              ((ThemedReactContext) view.getContext()).getSurfaceID(), analyticTag));
+              ((ThemedReactContext) view.getContext()).getModuleName(), analyticTag));
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
index 68ada3dfc70627..a25658a27f2bb0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -23,6 +23,7 @@
 import android.net.Uri;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
+import com.facebook.common.internal.Objects;
 import com.facebook.common.references.CloseableReference;
 import com.facebook.common.util.UriUtil;
 import com.facebook.drawee.controller.AbstractDraweeControllerBuilder;
@@ -90,8 +91,10 @@ public class ReactImageView extends GenericDraweeView {
   private ImageResizeMethod mResizeMethod = ImageResizeMethod.AUTO;
 
   public void updateCallerContext(@Nullable Object callerContext) {
-    mCallerContext = callerContext;
-    mIsDirty = true;
+    if (!Objects.equal(mCallerContext, callerContext)) {
+      mCallerContext = callerContext;
+      mIsDirty = true;
+    }
   }
 
   private class RoundedCornerPostprocessor extends BasePostprocessor {
@@ -229,6 +232,11 @@ public ReactImageView(
   }
 
   public void setShouldNotifyLoadEvents(boolean shouldNotify) {
+    // Skip update if shouldNotify is already in sync with the download listener
+    if (shouldNotify == (mDownloadListener != null)) {
+      return;
+    }
+
     if (!shouldNotify) {
       mDownloadListener = null;
     } else {
@@ -242,12 +250,18 @@ public void onProgressChange(int loaded, int total) {
               // TODO: Somehow get image size and convert `loaded` and `total` to image bytes.
               mEventDispatcher.dispatchEvent(
                   ImageLoadEvent.createProgressEvent(
-                      getId(), mImageSource.getSource(), loaded, total));
+                      UIManagerHelper.getSurfaceId(ReactImageView.this),
+                      getId(),
+                      mImageSource.getSource(),
+                      loaded,
+                      total));
             }
 
             @Override
             public void onSubmit(String id, Object callerContext) {
-              mEventDispatcher.dispatchEvent(ImageLoadEvent.createLoadStartEvent(getId()));
+              mEventDispatcher.dispatchEvent(
+                  ImageLoadEvent.createLoadStartEvent(
+                      UIManagerHelper.getSurfaceId(ReactImageView.this), getId()));
             }
 
             @Override
@@ -256,17 +270,22 @@ public void onFinalImageSet(
               if (imageInfo != null) {
                 mEventDispatcher.dispatchEvent(
                     ImageLoadEvent.createLoadEvent(
+                        UIManagerHelper.getSurfaceId(ReactImageView.this),
                         getId(),
                         mImageSource.getSource(),
                         imageInfo.getWidth(),
                         imageInfo.getHeight()));
-                mEventDispatcher.dispatchEvent(ImageLoadEvent.createLoadEndEvent(getId()));
+                mEventDispatcher.dispatchEvent(
+                    ImageLoadEvent.createLoadEndEvent(
+                        UIManagerHelper.getSurfaceId(ReactImageView.this), getId()));
               }
             }
 
             @Override
             public void onFailure(String id, Throwable throwable) {
-              mEventDispatcher.dispatchEvent(ImageLoadEvent.createErrorEvent(getId(), throwable));
+              mEventDispatcher.dispatchEvent(
+                  ImageLoadEvent.createErrorEvent(
+                      UIManagerHelper.getSurfaceId(ReactImageView.this), getId(), throwable));
             }
           };
     }
@@ -295,18 +314,25 @@ public void setBackgroundColor(int backgroundColor) {
   }
 
   public void setBorderColor(int borderColor) {
-    mBorderColor = borderColor;
-    mIsDirty = true;
+    if (mBorderColor != borderColor) {
+      mBorderColor = borderColor;
+      mIsDirty = true;
+    }
   }
 
   public void setOverlayColor(int overlayColor) {
-    mOverlayColor = overlayColor;
-    mIsDirty = true;
+    if (mOverlayColor != overlayColor) {
+      mOverlayColor = overlayColor;
+      mIsDirty = true;
+    }
   }
 
   public void setBorderWidth(float borderWidth) {
-    mBorderWidth = PixelUtil.toPixelFromDIP(borderWidth);
-    mIsDirty = true;
+    float newBorderWidth = PixelUtil.toPixelFromDIP(borderWidth);
+    if (!FloatUtil.floatsEqual(mBorderWidth, newBorderWidth)) {
+      mBorderWidth = newBorderWidth;
+      mIsDirty = true;
+    }
   }
 
   public void setBorderRadius(float borderRadius) {
@@ -329,32 +355,39 @@ public void setBorderRadius(float borderRadius, int position) {
   }
 
   public void setScaleType(ScalingUtils.ScaleType scaleType) {
-    mScaleType = scaleType;
-    mIsDirty = true;
+    if (mScaleType != scaleType) {
+      mScaleType = scaleType;
+      mIsDirty = true;
+    }
   }
 
   public void setTileMode(Shader.TileMode tileMode) {
-    mTileMode = tileMode;
-    mIsDirty = true;
+    if (mTileMode != tileMode) {
+      mTileMode = tileMode;
+      mIsDirty = true;
+    }
   }
 
   public void setResizeMethod(ImageResizeMethod resizeMethod) {
-    mResizeMethod = resizeMethod;
-    mIsDirty = true;
+    if (mResizeMethod != resizeMethod) {
+      mResizeMethod = resizeMethod;
+      mIsDirty = true;
+    }
   }
 
   public void setSource(@Nullable ReadableArray sources) {
-    mSources.clear();
+    List<ImageSource> tmpSources = new LinkedList<>();
+
     if (sources == null || sources.size() == 0) {
       ImageSource imageSource = new ImageSource(getContext(), REMOTE_TRANSPARENT_BITMAP_URI);
-      mSources.add(imageSource);
+      tmpSources.add(imageSource);
     } else {
       // Optimize for the case where we have just one uri, case in which we don't need the sizes
       if (sources.size() == 1) {
         ReadableMap source = sources.getMap(0);
         String uri = source.getString("uri");
         ImageSource imageSource = new ImageSource(getContext(), uri);
-        mSources.add(imageSource);
+        tmpSources.add(imageSource);
         if (Uri.EMPTY.equals(imageSource.getUri())) {
           warnImageSource(uri);
         }
@@ -365,28 +398,44 @@ public void setSource(@Nullable ReadableArray sources) {
           ImageSource imageSource =
               new ImageSource(
                   getContext(), uri, source.getDouble("width"), source.getDouble("height"));
-          mSources.add(imageSource);
+          tmpSources.add(imageSource);
           if (Uri.EMPTY.equals(imageSource.getUri())) {
             warnImageSource(uri);
           }
         }
       }
     }
+
+    // Don't reset sources and dirty node if sources haven't changed
+    if (mSources.equals(tmpSources)) {
+      return;
+    }
+
+    mSources.clear();
+    for (ImageSource src : tmpSources) {
+      mSources.add(src);
+    }
     mIsDirty = true;
   }
 
   public void setDefaultSource(@Nullable String name) {
-    mDefaultImageDrawable =
+    Drawable newDefaultDrawable =
         ResourceDrawableIdHelper.getInstance().getResourceDrawable(getContext(), name);
-    mIsDirty = true;
+    if (!Objects.equal(mDefaultImageDrawable, newDefaultDrawable)) {
+      mDefaultImageDrawable = newDefaultDrawable;
+      mIsDirty = true;
+    }
   }
 
   public void setLoadingIndicatorSource(@Nullable String name) {
     Drawable drawable =
         ResourceDrawableIdHelper.getInstance().getResourceDrawable(getContext(), name);
-    mLoadingImageDrawable =
+    Drawable newLoadingIndicatorSource =
         drawable != null ? (Drawable) new AutoRotateDrawable(drawable, 1000) : null;
-    mIsDirty = true;
+    if (!Objects.equal(mLoadingImageDrawable, newLoadingIndicatorSource)) {
+      mLoadingImageDrawable = newLoadingIndicatorSource;
+      mIsDirty = true;
+    }
   }
 
   public void setProgressiveRenderingEnabled(boolean enabled) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
index 4e9cafe129a021..3776c3389f849f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
@@ -6,6 +6,7 @@ rn_android_library(
         ["*.java"],
         exclude = ["MultiSourceHelper.java"],
     ),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -21,6 +22,7 @@ rn_android_library(
 rn_android_library(
     name = "withmultisource",
     srcs = ["MultiSourceHelper.java"],
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
index 9f95b5bae9af05..065ebbe636682f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
@@ -11,6 +11,7 @@
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import java.util.Objects;
 
 /** Class describing an image source (network URI or resource) and size. */
 public class ImageSource {
@@ -29,6 +30,22 @@ public ImageSource(Context context, String source, double width, double height)
     mUri = computeUri(context);
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    ImageSource that = (ImageSource) o;
+    return Double.compare(that.mSize, mSize) == 0
+        && isResource == that.isResource
+        && Objects.equals(mUri, that.mUri)
+        && Objects.equals(mSource, that.mSource);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mUri, mSource, mSize, isResource);
+  }
+
   public ImageSource(Context context, String source) {
     this(context, source, 0.0d, 0.0d);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
index 53e6a5a987f584..3eb01b3a51d6ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
@@ -1,8 +1,9 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "modal",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -16,6 +17,8 @@ rn_android_library(
         YOGA_TARGET,
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
@@ -24,7 +27,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/common:common"),
         react_native_target("java/com/facebook/react/views/view:view"),
-        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
         react_native_target("res:modal"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
index 35e1f8b27422bf..d4f3394269c275 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
@@ -91,6 +91,12 @@ public void setHardwareAccelerated(ReactModalHostView view, boolean hardwareAcce
     view.setHardwareAccelerated(hardwareAccelerated);
   }
 
+  @Override
+  @ReactProp(name = "visible")
+  public void setVisible(ReactModalHostView view, boolean visible) {
+    // iOS only
+  }
+
   @Override
   public void setPresentationStyle(ReactModalHostView view, @Nullable String value) {}
 
@@ -104,7 +110,8 @@ public void setSupportedOrientations(ReactModalHostView view, @Nullable Readable
   public void setIdentifier(ReactModalHostView view, int value) {}
 
   @Override
-  protected void addEventEmitters(ThemedReactContext reactContext, final ReactModalHostView view) {
+  protected void addEventEmitters(
+      final ThemedReactContext reactContext, final ReactModalHostView view) {
     final EventDispatcher dispatcher =
         UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.getId());
     if (dispatcher != null) {
@@ -112,16 +119,19 @@ protected void addEventEmitters(ThemedReactContext reactContext, final ReactModa
           new ReactModalHostView.OnRequestCloseListener() {
             @Override
             public void onRequestClose(DialogInterface dialog) {
-              dispatcher.dispatchEvent(new RequestCloseEvent(view.getId()));
+              dispatcher.dispatchEvent(
+                  new RequestCloseEvent(UIManagerHelper.getSurfaceId(reactContext), view.getId()));
             }
           });
       view.setOnShowListener(
           new DialogInterface.OnShowListener() {
             @Override
             public void onShow(DialogInterface dialog) {
-              dispatcher.dispatchEvent(new ShowEvent(view.getId()));
+              dispatcher.dispatchEvent(
+                  new ShowEvent(UIManagerHelper.getSurfaceId(reactContext), view.getId()));
             }
           });
+      view.setEventDispatcher(dispatcher);
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index d1bdd2f6faa595..561b96d13baefb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -23,6 +23,7 @@
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
 import com.facebook.react.bridge.GuardedRunnable;
@@ -61,6 +62,8 @@
 public class ReactModalHostView extends ViewGroup
     implements LifecycleEventListener, FabricViewStateManager.HasFabricViewStateManager {
 
+  private static final String TAG = "ReactModalHost";
+
   // This listener is called when the user presses KeyEvent.KEYCODE_BACK
   // An event is then passed to JS which can either close or not close the Modal by setting the
   // visible property
@@ -202,6 +205,10 @@ protected void setHardwareAccelerated(boolean hardwareAccelerated) {
     mPropertyRequiresNewDialog = true;
   }
 
+  void setEventDispatcher(EventDispatcher eventDispatcher) {
+    mHostView.setEventDispatcher(eventDispatcher);
+  }
+
   @Override
   public void onHostResume() {
     // We show the dialog again when the host resumes
@@ -240,6 +247,15 @@ protected void showOrUpdate() {
     // If the existing Dialog is currently up, we may need to redraw it or we may be able to update
     // the property without having to recreate the dialog
     if (mDialog != null) {
+      Context dialogContext = ContextUtils.findContextOfType(mDialog.getContext(), Activity.class);
+      // TODO(T85755791): remove after investigation
+      FLog.e(
+          TAG,
+          "Updating existing dialog with context: "
+              + dialogContext
+              + "@"
+              + dialogContext.hashCode());
+
       if (mPropertyRequiresNewDialog) {
         dismiss();
       } else {
@@ -265,6 +281,9 @@ protected void showOrUpdate() {
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
 
+    // TODO(T85755791): remove after investigation
+    FLog.e(TAG, "Creating new dialog from context: " + context + "@" + context.hashCode());
+
     mDialog.setContentView(getContentView());
     updateProperties();
 
@@ -274,14 +293,11 @@ protected void showOrUpdate() {
           @Override
           public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
             if (event.getAction() == KeyEvent.ACTION_UP) {
-              // We need to stop the BACK button from closing the dialog by default so we capture
-              // that
-              // event and instead inform JS so that it can make the decision as to whether or not
-              // to
-              // allow the back button to close the dialog.  If it chooses to, it can just set
-              // visible
-              // to false on the Modal and the Modal will go away
-              if (keyCode == KeyEvent.KEYCODE_BACK) {
+              // We need to stop the BACK button and ESCAPE key from closing the dialog by default
+              // so we capture that event and instead inform JS so that it can make the decision as
+              // to whether or not to allow the back/escape key to close the dialog. If it chooses
+              // to, it can just set visible to false on the Modal and the Modal will go away
+              if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
                 Assertions.assertNotNull(
                     mOnRequestCloseListener,
                     "setOnRequestCloseListener must be called by the manager");
@@ -289,9 +305,8 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
                 return true;
               } else {
                 // We redirect the rest of the key events to the current activity, since the
-                // activity
-                // expects to receive those events and react to them, ie. in the case of the dev
-                // menu
+                // activity expects to receive those events and react to them, ie. in the case of
+                // the dev menu
                 Activity currentActivity = ((ReactContext) getContext()).getCurrentActivity();
                 if (currentActivity != null) {
                   return currentActivity.onKeyUp(keyCode, event);
@@ -393,6 +408,7 @@ static class DialogRootViewGroup extends ReactViewGroup
     private boolean hasAdjustedSize = false;
     private int viewWidth;
     private int viewHeight;
+    private EventDispatcher mEventDispatcher;
 
     private final FabricViewStateManager mFabricViewStateManager = new FabricViewStateManager();
 
@@ -402,6 +418,10 @@ public DialogRootViewGroup(Context context) {
       super(context);
     }
 
+    private void setEventDispatcher(EventDispatcher eventDispatcher) {
+      mEventDispatcher = eventDispatcher;
+    }
+
     @Override
     protected void onSizeChanged(final int w, final int h, int oldw, int oldh) {
       super.onSizeChanged(w, h, oldw, oldh);
@@ -447,7 +467,7 @@ public void updateState(final int width, final int height) {
 
       // Check incoming state values. If they're already the correct value, return early to prevent
       // infinite UpdateState/SetState loop.
-      ReadableMap currentState = getFabricViewStateManager().getState();
+      ReadableMap currentState = getFabricViewStateManager().getStateData();
       if (currentState != null) {
         float delta = (float) 0.9;
         float stateScreenHeight =
@@ -494,13 +514,13 @@ private ReactContext getReactContext() {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
-      mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher());
+      mJSTouchDispatcher.handleTouchEvent(event, mEventDispatcher);
       return super.onInterceptTouchEvent(event);
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-      mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher());
+      mJSTouchDispatcher.handleTouchEvent(event, mEventDispatcher);
       super.onTouchEvent(event);
       // In case when there is no children interested in handling touch event, we return true from
       // the root view in order to receive subsequent events related to that gesture
@@ -509,7 +529,7 @@ public boolean onTouchEvent(MotionEvent event) {
 
     @Override
     public void onChildStartedNativeGesture(MotionEvent androidEvent) {
-      mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, getEventDispatcher());
+      mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, mEventDispatcher);
     }
 
     @Override
@@ -518,11 +538,6 @@ public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
       // even when some other view disallow that
     }
 
-    private EventDispatcher getEventDispatcher() {
-      ReactContext reactContext = getReactContext();
-      return reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
-    }
-
     @Override
     public FabricViewStateManager getFabricViewStateManager() {
       return mFabricViewStateManager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
index ba01778ed67a76..aa8ed464e570a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
@@ -7,16 +7,23 @@
 
 package com.facebook.react.views.modal;
 
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** {@link Event} for dismissing a Dialog. */
 /* package */ class RequestCloseEvent extends Event<RequestCloseEvent> {
 
   public static final String EVENT_NAME = "topRequestClose";
 
+  @Deprecated
   protected RequestCloseEvent(int viewTag) {
-    super(viewTag);
+    this(-1, viewTag);
+  }
+
+  protected RequestCloseEvent(int surfaceId, int viewTag) {
+    super(surfaceId, viewTag);
   }
 
   @Override
@@ -24,8 +31,9 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), null);
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
index cccbd347668627..1f126db46830dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
@@ -7,16 +7,23 @@
 
 package com.facebook.react.views.modal;
 
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** {@link Event} for showing a Dialog. */
 /* package */ class ShowEvent extends Event<ShowEvent> {
 
   public static final String EVENT_NAME = "topShow";
 
+  @Deprecated
   protected ShowEvent(int viewTag) {
-    super(viewTag);
+    this(-1, viewTag);
+  }
+
+  protected ShowEvent(int surfaceId, int viewTag) {
+    super(surfaceId, viewTag);
   }
 
   @Override
@@ -24,8 +31,9 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), null);
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK
deleted file mode 100644
index 00b41242092acb..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK
+++ /dev/null
@@ -1,29 +0,0 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
-
-rn_android_library(
-    name = "picker",
-    srcs = glob(["**/*.java"]),
-    is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-        react_native_dep("third-party/android/androidx:appcompat"),
-        react_native_dep("third-party/android/androidx:core"),
-        react_native_dep("third-party/android/androidx:fragment"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
-    ],
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react/bridge:bridge"),
-        react_native_target("java/com/facebook/react/common:common"),
-        react_native_target("java/com/facebook/react/module/annotations:annotations"),
-        react_native_target("java/com/facebook/react/uimanager:uimanager"),
-        react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
-    ],
-)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
deleted file mode 100644
index 133dadf57a3811..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.views.picker;
-
-import android.widget.Spinner;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.viewmanagers.AndroidDialogPickerManagerDelegate;
-import com.facebook.react.viewmanagers.AndroidDialogPickerManagerInterface;
-
-/** {@link ReactPickerManager} for {@link ReactPicker} with {@link Spinner#MODE_DIALOG}. */
-@ReactModule(name = ReactDialogPickerManager.REACT_CLASS)
-public class ReactDialogPickerManager extends ReactPickerManager
-    implements AndroidDialogPickerManagerInterface<ReactPicker> {
-
-  public static final String REACT_CLASS = "AndroidDialogPicker";
-
-  private final ViewManagerDelegate<ReactPicker> mDelegate;
-
-  public ReactDialogPickerManager() {
-    mDelegate = new AndroidDialogPickerManagerDelegate<>(this);
-  }
-
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
-  @Override
-  protected ReactPicker createViewInstance(ThemedReactContext reactContext) {
-    return new ReactPicker(reactContext, Spinner.MODE_DIALOG);
-  }
-
-  @Override
-  protected ViewManagerDelegate<ReactPicker> getDelegate() {
-    return mDelegate;
-  }
-
-  @Override
-  public void setBackgroundColor(@NonNull ReactPicker view, @Nullable Integer backgroundColor) {
-    view.setStagedBackgroundColor(backgroundColor);
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
deleted file mode 100644
index 04b3f3d341d69d..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.views.picker;
-
-import android.widget.Spinner;
-import androidx.annotation.NonNull;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.viewmanagers.AndroidDropdownPickerManagerDelegate;
-import com.facebook.react.viewmanagers.AndroidDropdownPickerManagerInterface;
-
-/** {@link ReactPickerManager} for {@link ReactPicker} with {@link Spinner#MODE_DROPDOWN}. */
-@ReactModule(name = ReactDropdownPickerManager.REACT_CLASS)
-public class ReactDropdownPickerManager extends ReactPickerManager
-    implements AndroidDropdownPickerManagerInterface<ReactPicker> {
-
-  public static final String REACT_CLASS = "AndroidDropdownPicker";
-
-  private final ViewManagerDelegate<ReactPicker> mDelegate;
-
-  public ReactDropdownPickerManager() {
-    mDelegate = new AndroidDropdownPickerManagerDelegate<>(this);
-  }
-
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
-  @Override
-  protected ReactPicker createViewInstance(ThemedReactContext reactContext) {
-    return new ReactPicker(reactContext, Spinner.MODE_DROPDOWN);
-  }
-
-  @Override
-  protected ViewManagerDelegate<ReactPicker> getDelegate() {
-    return mDelegate;
-  }
-
-  @Override
-  public void setBackgroundColor(@NonNull ReactPicker view, int backgroundColor) {
-    view.setStagedBackgroundColor(backgroundColor);
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
deleted file mode 100644
index 8eff2dd4f7bf26..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.views.picker;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Spinner;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatSpinner;
-import androidx.core.view.ViewCompat;
-import com.facebook.react.common.annotations.VisibleForTesting;
-import java.util.List;
-
-public class ReactPicker extends AppCompatSpinner {
-
-  private int mMode = Spinner.MODE_DIALOG;
-  private @Nullable OnSelectListener mOnSelectListener;
-  private @Nullable List<ReactPickerItem> mItems;
-  private @Nullable List<ReactPickerItem> mStagedItems;
-  private @Nullable Integer mStagedSelection;
-  private @Nullable Integer mStagedPrimaryTextColor;
-  private @Nullable Integer mStagedBackgroundColor;
-
-  private final OnItemSelectedListener mItemSelectedListener =
-      new OnItemSelectedListener() {
-        @Override
-        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-          if (mOnSelectListener != null) {
-            mOnSelectListener.onItemSelected(position);
-          }
-        }
-
-        @Override
-        public void onNothingSelected(AdapterView<?> parent) {
-          if (mOnSelectListener != null) {
-            mOnSelectListener.onItemSelected(-1);
-          }
-        }
-      };
-
-  /** Listener interface for ReactPicker events. */
-  public interface OnSelectListener {
-    void onItemSelected(int position);
-  }
-
-  public ReactPicker(Context context) {
-    super(context);
-  }
-
-  public ReactPicker(Context context, int mode) {
-    super(context, mode);
-    mMode = mode;
-  }
-
-  public ReactPicker(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public ReactPicker(Context context, AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-  }
-
-  public ReactPicker(Context context, AttributeSet attrs, int defStyle, int mode) {
-    super(context, attrs, defStyle, mode);
-    mMode = mode;
-  }
-
-  private final Runnable measureAndLayout =
-      new Runnable() {
-        @Override
-        public void run() {
-          measure(
-              MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
-              MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
-          layout(getLeft(), getTop(), getRight(), getBottom());
-        }
-      };
-
-  @Override
-  public void requestLayout() {
-    super.requestLayout();
-
-    // The spinner relies on a measure + layout pass happening after it calls requestLayout().
-    // Without this, the widget never actually changes the selection and doesn't call the
-    // appropriate listeners. Since we override onLayout in our ViewGroups, a layout pass never
-    // happens after a call to requestLayout, so we simulate one here.
-    post(measureAndLayout);
-  }
-
-  @Override
-  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    super.onLayout(changed, left, top, right, bottom);
-
-    // onItemSelected gets fired immediately after layout because checkSelectionChanged() in
-    // AdapterView updates the selection position from the default INVALID_POSITION.
-    // To match iOS behavior, which no onItemSelected during initial layout.
-    // We setup the listener after layout.
-    if (getOnItemSelectedListener() == null) setOnItemSelectedListener(mItemSelectedListener);
-  }
-
-  public void setOnSelectListener(@Nullable OnSelectListener onSelectListener) {
-    mOnSelectListener = onSelectListener;
-  }
-
-  @Nullable
-  public OnSelectListener getOnSelectListener() {
-    return mOnSelectListener;
-  }
-
-  /* package */ void setStagedItems(final @Nullable List<ReactPickerItem> items) {
-    mStagedItems = items;
-  }
-
-  /**
-   * Will cache "selection" value locally and set it only once {@link #commitStagedData} is called
-   */
-  /* package */ void setStagedSelection(int selection) {
-    mStagedSelection = selection;
-  }
-
-  /** Will set the "selection" value immediately as opposed to {@link #setStagedSelection(int)} */
-  /* package */ void setImmediateSelection(int selection) {
-    if (selection != getSelectedItemPosition()) {
-      setOnItemSelectedListener(null);
-      setSelection(selection, false);
-      setOnItemSelectedListener(mItemSelectedListener);
-    }
-  }
-
-  /* package */ void setStagedPrimaryTextColor(@Nullable Integer primaryColor) {
-    mStagedPrimaryTextColor = primaryColor;
-  }
-
-  /* package */ void setStagedBackgroundColor(@Nullable Integer backgroundColor) {
-    mStagedBackgroundColor = backgroundColor;
-  }
-
-  /**
-   * Used to commit staged data into ReactPicker view. During this period, we will disable {@link
-   * OnSelectListener#onItemSelected(int)} temporarily, so we don't get an event when changing the
-   * items/selection ourselves.
-   */
-  /* package */ void commitStagedData() {
-    setOnItemSelectedListener(null);
-
-    ReactPickerAdapter adapter = (ReactPickerAdapter) getAdapter();
-    final int origSelection = getSelectedItemPosition();
-    if (mStagedItems != null && mStagedItems != mItems) {
-      mItems = mStagedItems;
-      mStagedItems = null;
-      if (adapter == null) {
-        adapter = new ReactPickerAdapter(getContext(), mItems);
-        setAdapter(adapter);
-      } else {
-        adapter.clear();
-        adapter.addAll(mItems);
-        adapter.notifyDataSetChanged();
-      }
-    }
-
-    if (mStagedSelection != null && mStagedSelection != origSelection) {
-      setSelection(mStagedSelection, false);
-      mStagedSelection = null;
-    }
-
-    if (mStagedPrimaryTextColor != null
-        && adapter != null
-        && mStagedPrimaryTextColor != adapter.getPrimaryTextColor()) {
-      adapter.setPrimaryTextColor(mStagedPrimaryTextColor);
-      ViewCompat.setBackgroundTintList(this, ColorStateList.valueOf(mStagedPrimaryTextColor));
-      mStagedPrimaryTextColor = null;
-    }
-
-    if (mStagedBackgroundColor != null
-        && adapter != null
-        && mStagedBackgroundColor != adapter.getBackgroundColor()) {
-      adapter.setBackgroundColor(mStagedBackgroundColor);
-      mStagedBackgroundColor = null;
-    }
-
-    setOnItemSelectedListener(mItemSelectedListener);
-  }
-
-  @VisibleForTesting
-  public int getMode() {
-    return mMode;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerAdapter.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerAdapter.java
deleted file mode 100644
index 4f2890e79158c2..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerAdapter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.views.picker;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-import com.facebook.infer.annotation.Assertions;
-import java.util.List;
-
-/* package */
-class ReactPickerAdapter extends ArrayAdapter<ReactPickerItem> {
-
-  private final LayoutInflater mInflater;
-  private @Nullable Integer mPrimaryTextColor;
-  private @Nullable Integer mBackgroundColor;
-
-  public ReactPickerAdapter(Context context, List<ReactPickerItem> data) {
-    super(context, 0, data);
-
-    mInflater =
-        (LayoutInflater)
-            Assertions.assertNotNull(context.getSystemService(Context.LAYOUT_INFLATER_SERVICE));
-  }
-
-  @Override
-  public View getView(int position, View convertView, ViewGroup parent) {
-    return getView(position, convertView, parent, false);
-  }
-
-  @Override
-  public View getDropDownView(int position, View convertView, ViewGroup parent) {
-    return getView(position, convertView, parent, true);
-  }
-
-  private View getView(int position, View convertView, ViewGroup parent, boolean isDropdown) {
-    ReactPickerItem item = getItem(position);
-    boolean isNew = false;
-    if (convertView == null) {
-      int layoutResId =
-          isDropdown
-              ? android.R.layout.simple_spinner_dropdown_item
-              : android.R.layout.simple_spinner_item;
-      convertView = mInflater.inflate(layoutResId, parent, false);
-      // Save original text colors
-      convertView.setTag(((TextView) convertView).getTextColors());
-      isNew = true;
-    }
-
-    TextView textView = (TextView) convertView;
-    textView.setText(item.label);
-    if (!isDropdown && mPrimaryTextColor != null) {
-      textView.setTextColor(mPrimaryTextColor);
-    } else if (item.color != null) {
-      textView.setTextColor(item.color);
-    } else if (textView.getTag() != null && !isNew) {
-      // In case the new item does not set the color prop, go back to the default one
-      textView.setTextColor((ColorStateList) textView.getTag());
-    }
-
-    if (mBackgroundColor != null) {
-      textView.setBackgroundColor(mBackgroundColor);
-    }
-
-    return textView;
-  }
-
-  public @Nullable Integer getPrimaryTextColor() {
-    return mPrimaryTextColor;
-  }
-
-  public @Nullable Integer getBackgroundColor() {
-    return mBackgroundColor;
-  }
-
-  public void setPrimaryTextColor(@Nullable Integer primaryTextColor) {
-    mPrimaryTextColor = primaryTextColor;
-    notifyDataSetChanged();
-  }
-
-  public void setBackgroundColor(@Nullable Integer backgroundColor) {
-    mBackgroundColor = backgroundColor;
-    notifyDataSetChanged();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerItem.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerItem.java
deleted file mode 100644
index 733deb3907022c..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerItem.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.views.picker;
-
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import java.util.ArrayList;
-import java.util.List;
-
-/* package */
-class ReactPickerItem {
-  public final String label;
-  @Nullable public final Integer color;
-
-  public ReactPickerItem(final ReadableMap jsMapData) {
-    label = jsMapData.getString("label");
-
-    if (jsMapData.hasKey("color") && !jsMapData.isNull("color")) {
-      color = jsMapData.getInt("color");
-    } else {
-      color = null;
-    }
-  }
-
-  @Nullable
-  public static List<ReactPickerItem> createFromJsArrayMap(final ReadableArray jsArrayMap) {
-    if (jsArrayMap == null) {
-      return null;
-    }
-
-    final List<ReactPickerItem> items = new ArrayList<>(jsArrayMap.size());
-    for (int i = 0; i < jsArrayMap.size(); ++i) {
-      items.add(new ReactPickerItem(jsArrayMap.getMap(i)));
-    }
-    return items;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
deleted file mode 100644
index ffc46232aa9994..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.views.picker;
-
-import android.widget.Spinner;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.uimanager.SimpleViewManager;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.ViewProps;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.views.picker.events.PickerItemSelectEvent;
-import java.util.List;
-
-/**
- * {@link ViewManager} for the {@link ReactPicker} view. This is abstract because the {@link
- * Spinner} doesn't support setting the mode (dropdown/dialog) outside the constructor, so that is
- * delegated to the separate {@link ReactDropdownPickerManager} and {@link ReactDialogPickerManager}
- * components. These are merged back on the JS side into one React component.
- */
-public abstract class ReactPickerManager extends SimpleViewManager<ReactPicker> {
-
-  @ReactProp(name = "items")
-  public void setItems(ReactPicker view, @Nullable ReadableArray items) {
-    final List<ReactPickerItem> pickerItems = ReactPickerItem.createFromJsArrayMap(items);
-    view.setStagedItems(pickerItems);
-  }
-
-  @ReactProp(name = ViewProps.COLOR, customType = "Color")
-  public void setColor(ReactPicker view, @Nullable Integer color) {
-    view.setStagedPrimaryTextColor(color);
-  }
-
-  @ReactProp(name = "prompt")
-  public void setPrompt(ReactPicker view, @Nullable String prompt) {
-    view.setPrompt(prompt);
-  }
-
-  @ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
-  public void setEnabled(ReactPicker view, boolean enabled) {
-    view.setEnabled(enabled);
-  }
-
-  @ReactProp(name = "selected")
-  public void setSelected(ReactPicker view, int selected) {
-    view.setStagedSelection(selected);
-  }
-
-  @Override
-  protected void onAfterUpdateTransaction(ReactPicker view) {
-    super.onAfterUpdateTransaction(view);
-    view.commitStagedData();
-  }
-
-  @Override
-  protected void addEventEmitters(final ThemedReactContext reactContext, final ReactPicker picker) {
-    picker.setOnSelectListener(
-        new PickerEventEmitter(
-            picker, UIManagerHelper.getEventDispatcherForReactTag(reactContext, picker.getId())));
-  }
-
-  @Override
-  public void receiveCommand(
-      @NonNull ReactPicker view, String commandId, @Nullable ReadableArray args) {
-    switch (commandId) {
-      case "setNativeSelectedPosition":
-        if (args != null) {
-          view.setImmediateSelection(args.getInt(0));
-          break;
-        }
-    }
-  }
-
-  private static class PickerEventEmitter implements ReactPicker.OnSelectListener {
-
-    private final ReactPicker mReactPicker;
-    private final EventDispatcher mEventDispatcher;
-
-    public PickerEventEmitter(ReactPicker reactPicker, EventDispatcher eventDispatcher) {
-      mReactPicker = reactPicker;
-      mEventDispatcher = eventDispatcher;
-    }
-
-    @Override
-    public void onItemSelected(int position) {
-      mEventDispatcher.dispatchEvent(new PickerItemSelectEvent(mReactPicker.getId(), position));
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
deleted file mode 100644
index c64ccda134a7f6..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.views.picker.events;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-public class PickerItemSelectEvent extends Event<PickerItemSelectEvent> {
-  public static final String EVENT_NAME = "topSelect";
-
-  private final int mPosition;
-
-  public PickerItemSelectEvent(int id, int position) {
-    super(id);
-    mPosition = position;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
-    WritableMap eventData = Arguments.createMap();
-    eventData.putInt("position", mPosition);
-    return eventData;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
index af7909efc1e8ee..ca914a3c796524 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
@@ -1,8 +1,9 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "progressbar",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -18,6 +19,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
index 736a73dc537560..4cfccd38148a69 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 rn_android_library(
     name = "scroll",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -29,5 +30,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/view:view"),
+        react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java
index 6db6df6688c4ac..831e4555a590e6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java
@@ -8,7 +8,6 @@
 package com.facebook.react.views.scroll;
 
 import android.content.Context;
-import android.widget.HorizontalScrollView;
 import androidx.core.view.ViewCompat;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.views.view.ReactViewGroup;
@@ -28,6 +27,21 @@ public ReactHorizontalScrollContainerView(Context context) {
     mCurrentWidth = 0;
   }
 
+  @Override
+  public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
+    // Clipping doesn't work well for horizontal scroll views in RTL mode - in both
+    // Fabric and non-Fabric - especially with TextInputs. The behavior you could see
+    // is TextInputs being blurred immediately after being focused. So, for now,
+    // it's easier to just disable this for these specific RTL views.
+    // TODO T86027499: support `setRemoveClippedSubviews` in RTL mode
+    if (mLayoutDirection == LAYOUT_DIRECTION_RTL) {
+      super.setRemoveClippedSubviews(false);
+      return;
+    }
+
+    super.setRemoveClippedSubviews(removeClippedSubviews);
+  }
+
   @Override
   protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
     if (mLayoutDirection == LAYOUT_DIRECTION_RTL) {
@@ -39,11 +53,20 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
       setLeft(newLeft);
       setRight(newRight);
 
-      // Call with the present values in order to re-layout if necessary
-      HorizontalScrollView parent = (HorizontalScrollView) getParent();
-      // Fix the ScrollX position when using RTL language
-      int offsetX = parent.getScrollX() + getWidth() - mCurrentWidth;
-      parent.scrollTo(offsetX, parent.getScrollY());
+      /**
+       * Note: in RTL mode, *when layout width changes*, we adjust the scroll position. Practically,
+       * this means that on the first (meaningful) layout we will go from position 0 to position
+       * (right - screenWidth). In theory this means if the width of the view ever changes during
+       * layout again, scrolling could jump. Which shouldn't happen in theory, but... if you find a
+       * weird product bug that looks related, keep this in mind.
+       */
+      if (mCurrentWidth != getWidth()) {
+        // Call with the present values in order to re-layout if necessary
+        ReactHorizontalScrollView parent = (ReactHorizontalScrollView) getParent();
+        // Fix the ScrollX position when using RTL language
+        int offsetX = parent.getScrollX() + getWidth() - mCurrentWidth - parent.getWidth();
+        parent.scrollTo(offsetX, parent.getScrollY());
+      }
     }
     mCurrentWidth = getWidth();
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
index 57ed5ae6a3962c..ab8ab73ffc8321 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -25,7 +25,6 @@
 import android.widget.HorizontalScrollView;
 import android.widget.OverScroller;
 import androidx.annotation.Nullable;
-import androidx.core.text.TextUtilsCompat;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
@@ -34,28 +33,40 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.uimanager.FabricViewStateManager;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactOverflowView;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 /** Similar to {@link ReactScrollView} but only supports horizontal scrolling. */
 public class ReactHorizontalScrollView extends HorizontalScrollView
-    implements ReactClippingViewGroup, FabricViewStateManager.HasFabricViewStateManager {
+    implements ReactClippingViewGroup,
+        FabricViewStateManager.HasFabricViewStateManager,
+        ReactOverflowView {
+
+  private static boolean DEBUG_MODE = false && ReactBuildConfig.DEBUG;
+  private static String TAG = ReactHorizontalScrollView.class.getSimpleName();
+
+  private static int NO_SCROLL_POSITION = Integer.MIN_VALUE;
 
   private static @Nullable Field sScrollerField;
   private static boolean sTriedToGetScrollerField = false;
   private static final String CONTENT_OFFSET_LEFT = "contentOffsetLeft";
   private static final String CONTENT_OFFSET_TOP = "contentOffsetTop";
+  private static final String SCROLL_AWAY_PADDING_TOP = "scrollAwayPaddingTop";
+  private int mLayoutDirection;
+
+  private int mScrollXAfterMeasure = NO_SCROLL_POSITION;
 
   private static final int UNSET_CONTENT_OFFSET = -1;
 
@@ -125,6 +136,10 @@ public void onInitializeAccessibilityNodeInfo(
         });
 
     mScroller = getOverScrollerFromParent();
+    mLayoutDirection =
+        I18nUtil.getInstance().isRTL(context)
+            ? ViewCompat.LAYOUT_DIRECTION_RTL
+            : ViewCompat.LAYOUT_DIRECTION_LTR;
   }
 
   @Nullable
@@ -138,7 +153,7 @@ private OverScroller getOverScrollerFromParent() {
         sScrollerField.setAccessible(true);
       } catch (NoSuchFieldException e) {
         FLog.w(
-            ReactConstants.TAG,
+            TAG,
             "Failed to get mScroller field for HorizontalScrollView! "
                 + "This app will exhibit the bounce-back scrolling bug :(");
       }
@@ -151,7 +166,7 @@ private OverScroller getOverScrollerFromParent() {
           scroller = (OverScroller) scrollerValue;
         } else {
           FLog.w(
-              ReactConstants.TAG,
+              TAG,
               "Failed to cast mScroller field in HorizontalScrollView (probably due to OEM changes to AOSP)! "
                   + "This app will exhibit the bounce-back scrolling bug :(");
           scroller = null;
@@ -233,8 +248,17 @@ public void setOverflow(String overflow) {
     invalidate();
   }
 
+  @Override
+  public @Nullable String getOverflow() {
+    return mOverflow;
+  }
+
   @Override
   protected void onDraw(Canvas canvas) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "onDraw[%d]", getId());
+    }
+
     getDrawingRect(mRect);
 
     switch (mOverflow) {
@@ -252,12 +276,59 @@ protected void onDraw(Canvas canvas) {
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     MeasureSpecAssertions.assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec);
 
-    setMeasuredDimension(
-        MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec));
+    int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+    int measuredHeight = MeasureSpec.getSize(heightMeasureSpec);
+
+    if (DEBUG_MODE) {
+      FLog.i(
+          TAG,
+          "onMeasure[%d] measured width: %d measured height: %d",
+          getId(),
+          measuredWidth,
+          measuredHeight);
+    }
+
+    boolean measuredHeightChanged = getMeasuredHeight() != measuredHeight;
+
+    setMeasuredDimension(measuredWidth, measuredHeight);
+
+    // See how `mScrollXAfterMeasure` is used in `onLayout`, and why we only enable the
+    // hack if the height has changed.
+    if (measuredHeightChanged && mScroller != null) {
+      mScrollXAfterMeasure = mScroller.getCurrX();
+    }
   }
 
   @Override
   protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "onLayout[%d] l %d t %d r %d b %d", getId(), l, t, r, b);
+    }
+
+    // Has the scrollX changed between the last onMeasure and this layout?
+    // If so, cancel the animation.
+    // Essentially, if the height changes (due to keyboard popping up, for instance) the
+    // underlying View.layout method will in some cases scroll to an incorrect X position -
+    // see also the hacks in `fling`. The order of layout is called in the order of: onMeasure,
+    // layout, onLayout.
+    // We cannot override `layout` but we can detect the sequence of events between onMeasure
+    // and onLayout.
+    if (mScrollXAfterMeasure != NO_SCROLL_POSITION
+        && mScroller != null
+        && mScrollXAfterMeasure != mScroller.getFinalX()
+        && !mScroller.isFinished()) {
+      if (DEBUG_MODE) {
+        FLog.i(
+            TAG,
+            "onLayout[%d] scroll hack enabled: reset to previous scrollX position of %d",
+            getId(),
+            mScrollXAfterMeasure);
+      }
+      mScroller.startScroll(mScrollXAfterMeasure, mScroller.getFinalY(), 0, 0);
+      mScroller.forceFinished(true);
+      mScrollXAfterMeasure = NO_SCROLL_POSITION;
+    }
+
     // Call with the present values in order to re-layout if necessary
     // If a "pending" value has been set, we restore that value.
     // That value gets cleared by reactScrollTo.
@@ -265,7 +336,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
         pendingContentOffsetX != UNSET_CONTENT_OFFSET ? pendingContentOffsetX : getScrollX();
     int scrollToY =
         pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
-    reactScrollTo(scrollToX, scrollToY);
+    scrollTo(scrollToX, scrollToY);
     ReactScrollViewHelper.emitLayoutEvent(this);
   }
 
@@ -341,6 +412,10 @@ private void scrollToChild(View child) {
 
   @Override
   protected void onScrollChanged(int x, int y, int oldX, int oldY) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "onScrollChanged[%d] x %d y %d oldx %d oldy %d", getId(), x, y, oldX, oldY);
+    }
+
     super.onScrollChanged(x, y, oldX, oldY);
 
     mActivelyScrolling = true;
@@ -350,6 +425,12 @@ protected void onScrollChanged(int x, int y, int oldX, int oldY) {
         updateClippingRect();
       }
 
+      // Race an UpdateState with every onScroll. This makes it more likely that, in Fabric,
+      // when JS processes the scroll event, the C++ ShadowNode representation will have a
+      // "more correct" scroll position. It will frequently be /incorrect/ but this decreases
+      // the error as much as possible.
+      updateStateOnScroll();
+
       ReactScrollViewHelper.emitScrollEvent(
           this,
           mOnScrollDispatchHelper.getXFlingVelocity(),
@@ -402,7 +483,7 @@ public boolean arrowScroll(int direction) {
       if (getChildCount() > 0) {
         View currentFocused = findFocus();
         View nextFocused = FocusFinder.getInstance().findNextFocus(this, currentFocused, direction);
-        View rootChild = getChildAt(0);
+        View rootChild = getContentView();
         if (rootChild != null && nextFocused != null && nextFocused.getParent() == rootChild) {
           if (!isScrolledInView(nextFocused) && !isMostlyScrolledInView(nextFocused)) {
             smoothScrollToNextPage(direction);
@@ -459,6 +540,9 @@ public boolean executeKeyEvent(KeyEvent event) {
 
   @Override
   public void fling(int velocityX) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "fling[%d] velocityX %d", getId(), velocityX);
+    }
 
     // Workaround.
     // On Android P if a ScrollView is inverted, we will get a wrong sign for
@@ -533,7 +617,7 @@ public void updateClippingRect() {
     Assertions.assertNotNull(mClippingRect);
 
     ReactClippingViewGroupHelper.calculateClippingRect(this, mClippingRect);
-    View contentView = getChildAt(0);
+    View contentView = getContentView();
     if (contentView instanceof ReactClippingViewGroup) {
       ((ReactClippingViewGroup) contentView).updateClippingRect();
     }
@@ -546,9 +630,7 @@ public void getClippingRect(Rect outClippingRect) {
 
   @Override
   public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
-    return ReactFeatureFlags.clipChildRectsIfOverflowIsHidden
-        ? ReactClippingViewGroupHelper.getChildVisibleRectHelper(child, r, offset, this, mOverflow)
-        : super.getChildVisibleRect(child, r, offset);
+    return super.getChildVisibleRect(child, r, offset);
   }
 
   private int getSnapInterval() {
@@ -558,6 +640,11 @@ private int getSnapInterval() {
     return getWidth();
   }
 
+  private View getContentView() {
+    View contentView = getChildAt(0);
+    return contentView;
+  }
+
   public void setEndFillColor(int color) {
     if (color != mEndFillColor) {
       mEndFillColor = color;
@@ -567,6 +654,17 @@ public void setEndFillColor(int color) {
 
   @Override
   protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {
+    if (DEBUG_MODE) {
+      FLog.i(
+          TAG,
+          "onOverScrolled[%d] scrollX %d scrollY %d clampedX %b clampedY %b",
+          getId(),
+          scrollX,
+          scrollY,
+          clampedX,
+          clampedY);
+    }
+
     if (mScroller != null) {
       // FB SCROLLVIEW CHANGE
 
@@ -611,7 +709,7 @@ private boolean isScrollPerfLoggingEnabled() {
   @Override
   public void draw(Canvas canvas) {
     if (mEndFillColor != Color.TRANSPARENT) {
-      final View content = getChildAt(0);
+      final View content = getContentView();
       if (mEndBackground != null && content != null && content.getRight() < getWidth()) {
         mEndBackground.setBounds(content.getRight(), 0, getWidth(), getHeight());
         mEndBackground.draw(canvas);
@@ -627,6 +725,15 @@ public void draw(Canvas canvas) {
    * runnable that checks if we scrolled in the last frame and if so assumes we are still scrolling.
    */
   private void handlePostTouchScrolling(int velocityX, int velocityY) {
+    if (DEBUG_MODE) {
+      FLog.i(
+          TAG,
+          "handlePostTouchScrolling[%d] velocityX %d velocityY %d",
+          getId(),
+          velocityX,
+          velocityY);
+    }
+
     // Check if we are already handling this which may occur if this is called by both the touch up
     // and a fling call
     if (mPostTouchRunnable != null) {
@@ -740,6 +847,10 @@ private int predictFinalScrollPosition(int velocityX) {
    * scrolling, and handling any momentum scrolling.
    */
   private void smoothScrollAndSnap(int velocity) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "smoothScrollAndSnap[%d] velocity %d", getId(), velocity);
+    }
+
     double interval = (double) getSnapInterval();
     double currentOffset = (double) (getPostAnimationScrollX());
     double targetOffset = (double) predictFinalScrollPosition(velocity);
@@ -785,6 +896,10 @@ private void smoothScrollAndSnap(int velocity) {
   }
 
   private void flingAndSnap(int velocityX) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "smoothScrollAndSnap[%d] velocityX %d", getId(), velocityX);
+    }
+
     if (getChildCount() <= 0) {
       return;
     }
@@ -808,10 +923,7 @@ private void flingAndSnap(int velocityX) {
     int width = getWidth() - ViewCompat.getPaddingStart(this) - ViewCompat.getPaddingEnd(this);
 
     // offsets are from the right edge in RTL layouts
-    boolean isRTL =
-        TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault())
-            == ViewCompat.LAYOUT_DIRECTION_RTL;
-    if (isRTL) {
+    if (mLayoutDirection == LAYOUT_DIRECTION_RTL) {
       targetOffset = maximumOffset - targetOffset;
       velocityX = -velocityX;
     }
@@ -850,7 +962,7 @@ private void flingAndSnap(int velocityX) {
     // if scrolling after the last snap offset and snapping to the
     // end of the list is disabled, then we allow free scrolling
     int currentOffset = getScrollX();
-    if (isRTL) {
+    if (mLayoutDirection == LAYOUT_DIRECTION_RTL) {
       currentOffset = maximumOffset - currentOffset;
     }
     if (!mSnapToEnd && targetOffset >= lastOffset) {
@@ -884,7 +996,7 @@ private void flingAndSnap(int velocityX) {
     // Make sure the new offset isn't out of bounds
     targetOffset = Math.min(Math.max(0, targetOffset), maximumOffset);
 
-    if (isRTL) {
+    if (mLayoutDirection == LAYOUT_DIRECTION_RTL) {
       targetOffset = maximumOffset - targetOffset;
       velocityX = -velocityX;
     }
@@ -921,6 +1033,10 @@ private void flingAndSnap(int velocityX) {
   }
 
   private void smoothScrollToNextPage(int direction) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "smoothScrollToNextPage[%d] direction %d", getId(), direction);
+    }
+
     int width = getWidth();
     int currentX = getScrollX();
 
@@ -975,6 +1091,10 @@ public void setBorderStyle(@Nullable String style) {
    * scroll view and state. Calling raw `smoothScrollTo` doesn't update state.
    */
   public void reactSmoothScrollTo(int x, int y) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "reactSmoothScrollTo[%d] x %d y %d", getId(), x, y);
+    }
+
     // `smoothScrollTo` contains some logic that, if called multiple times in a short amount of
     // time, will treat all calls as part of the same animation and will not lengthen the duration
     // of the animation. This means that, for example, if the user is scrolling rapidly, multiple
@@ -1025,13 +1145,21 @@ public void onAnimationRepeat(Animator animator) {}
   }
 
   /**
-   * Calls `reactScrollTo` and updates state.
+   * Calls `super.scrollTo` and updates state.
+   *
+   * <p>`super.scrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
+   * scroll view and state.
    *
-   * <p>`reactScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
-   * scroll view and state. Calling raw `reactScrollTo` doesn't update state.
+   * <p>Note that while we can override scrollTo, we *cannot* override `smoothScrollTo` because it
+   * is final. See `reactSmoothScrollTo`.
    */
-  public void reactScrollTo(int x, int y) {
-    scrollTo(x, y);
+  @Override
+  public void scrollTo(int x, int y) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "scrollTo[%d] x %d y %d", getId(), x, y);
+    }
+
+    super.scrollTo(x, y);
     updateStateOnScroll(x, y);
     setPendingContentOffsets(x, y);
   }
@@ -1044,7 +1172,10 @@ public void reactScrollTo(int x, int y) {
    * @param y
    */
   private void setPendingContentOffsets(int x, int y) {
-    View child = getChildAt(0);
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "setPendingContentOffsets[%d] x %d y %d", getId(), x, y);
+    }
+    View child = getContentView();
     if (child != null && child.getWidth() != 0 && child.getHeight() != 0) {
       pendingContentOffsetX = UNSET_CONTENT_OFFSET;
       pendingContentOffsetY = UNSET_CONTENT_OFFSET;
@@ -1058,6 +1189,10 @@ private void setPendingContentOffsets(int x, int y) {
    * Called on any stabilized onScroll change to propagate content offset value to a Shadow Node.
    */
   private void updateStateOnScroll(final int scrollX, final int scrollY) {
+    if (DEBUG_MODE) {
+      FLog.i(TAG, "updateStateOnScroll[%d] scrollX %d scrollY %d", getId(), scrollX, scrollY);
+    }
+
     // Dedupe events to reduce JNI traffic
     if (scrollX == mLastStateUpdateScrollX && scrollY == mLastStateUpdateScrollY) {
       return;
@@ -1066,13 +1201,35 @@ private void updateStateOnScroll(final int scrollX, final int scrollY) {
     mLastStateUpdateScrollX = scrollX;
     mLastStateUpdateScrollY = scrollY;
 
+    final int fabricScrollX;
+    if (mLayoutDirection == LAYOUT_DIRECTION_RTL) {
+      // getScrollX returns offset from left even when layout direction is RTL.
+      // The following line calculates offset from right.
+      View child = getContentView();
+      int contentWidth = child != null ? child.getWidth() : 0;
+      fabricScrollX = -(contentWidth - scrollX - getWidth());
+    } else {
+      fabricScrollX = scrollX;
+    }
+
+    if (DEBUG_MODE) {
+      FLog.i(
+          TAG,
+          "updateStateOnScroll[%d] scrollX %d scrollY %d fabricScrollX",
+          getId(),
+          scrollX,
+          scrollY,
+          fabricScrollX);
+    }
+
     mFabricViewStateManager.setState(
         new FabricViewStateManager.StateUpdateCallback() {
           @Override
           public WritableMap getStateUpdate() {
             WritableMap map = new WritableNativeMap();
-            map.putDouble(CONTENT_OFFSET_LEFT, PixelUtil.toDIPFromPixel(scrollX));
+            map.putDouble(CONTENT_OFFSET_LEFT, PixelUtil.toDIPFromPixel(fabricScrollX));
             map.putDouble(CONTENT_OFFSET_TOP, PixelUtil.toDIPFromPixel(scrollY));
+            map.putDouble(SCROLL_AWAY_PADDING_TOP, 0);
             return map;
           }
         });
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
index 9641fc11be9cf9..05112f45e449ad 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
@@ -105,6 +105,11 @@ public void setSnapToInterval(ReactHorizontalScrollView view, float snapToInterv
   @ReactProp(name = "snapToOffsets")
   public void setSnapToOffsets(
       ReactHorizontalScrollView view, @Nullable ReadableArray snapToOffsets) {
+    if (snapToOffsets == null) {
+      view.setSnapOffsets(null);
+      return;
+    }
+
     DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
     List<Integer> offsets = new ArrayList<Integer>();
     for (int i = 0; i < snapToOffsets.size(); i++) {
@@ -193,7 +198,7 @@ public void scrollTo(
     if (data.mAnimated) {
       scrollView.reactSmoothScrollTo(data.mDestX, data.mDestY);
     } else {
-      scrollView.reactScrollTo(data.mDestX, data.mDestY);
+      scrollView.scrollTo(data.mDestX, data.mDestY);
     }
   }
 
@@ -206,7 +211,7 @@ public void scrollToEnd(
     if (data.mAnimated) {
       scrollView.reactSmoothScrollTo(right, scrollView.getScrollY());
     } else {
-      scrollView.reactScrollTo(right, scrollView.getScrollY());
+      scrollView.scrollTo(right, scrollView.getScrollY());
     }
   }
 
@@ -306,9 +311,9 @@ public void setContentOffset(ReactHorizontalScrollView view, ReadableMap value)
     if (value != null) {
       double x = value.hasKey("x") ? value.getDouble("x") : 0;
       double y = value.hasKey("y") ? value.getDouble("y") : 0;
-      view.reactScrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
+      view.scrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
     } else {
-      view.reactScrollTo(0, 0);
+      view.scrollTo(0, 0);
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
index 118579c886f109..9fc5b76829c841 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -20,23 +20,27 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.OverScroller;
 import android.widget.ScrollView;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.R;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.FabricViewStateManager;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactOverflowView;
 import com.facebook.react.uimanager.ViewProps;
+import com.facebook.react.uimanager.common.UIManagerType;
+import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
 import java.lang.reflect.Field;
@@ -53,12 +57,14 @@ public class ReactScrollView extends ScrollView
     implements ReactClippingViewGroup,
         ViewGroup.OnHierarchyChangeListener,
         View.OnLayoutChangeListener,
-        FabricViewStateManager.HasFabricViewStateManager {
+        FabricViewStateManager.HasFabricViewStateManager,
+        ReactOverflowView {
 
   private static @Nullable Field sScrollerField;
   private static boolean sTriedToGetScrollerField = false;
   private static final String CONTENT_OFFSET_LEFT = "contentOffsetLeft";
   private static final String CONTENT_OFFSET_TOP = "contentOffsetTop";
+  private static final String SCROLL_AWAY_PADDING_TOP = "scrollAwayPaddingTop";
 
   private static final int UNSET_CONTENT_OFFSET = -1;
 
@@ -96,6 +102,8 @@ public class ReactScrollView extends ScrollView
   private int mFinalAnimatedPositionScrollX;
   private int mFinalAnimatedPositionScrollY;
 
+  private int mScrollAwayPaddingTop = 0;
+
   private int mLastStateUpdateScrollX = -1;
   private int mLastStateUpdateScrollY = -1;
 
@@ -113,6 +121,20 @@ public ReactScrollView(ReactContext context, @Nullable FpsListener fpsListener)
     setScrollBarStyle(SCROLLBARS_OUTSIDE_OVERLAY);
   }
 
+  @Override
+  public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+    super.onInitializeAccessibilityNodeInfo(info);
+
+    // Expose the testID prop as the resource-id name of the view. Black-box E2E/UI testing
+    // frameworks, which interact with the UI through the accessibility framework, do not have
+    // access to view tags. This allows developers/testers to avoid polluting the
+    // content-description with test identifiers.
+    final String testId = (String) this.getTag(R.id.react_test_id);
+    if (testId != null) {
+      info.setViewIdResourceName(testId);
+    }
+  }
+
   @Nullable
   private OverScroller getOverScrollerFromParent() {
     OverScroller scroller;
@@ -205,6 +227,11 @@ public void setOverflow(String overflow) {
     invalidate();
   }
 
+  @Override
+  public @Nullable String getOverflow() {
+    return mOverflow;
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     MeasureSpecAssertions.assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec);
@@ -222,7 +249,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
         pendingContentOffsetX != UNSET_CONTENT_OFFSET ? pendingContentOffsetX : getScrollX();
     int scrollToY =
         pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
-    reactScrollTo(scrollToX, scrollToY);
+    scrollTo(scrollToX, scrollToY);
     ReactScrollViewHelper.emitLayoutEvent(this);
   }
 
@@ -282,6 +309,12 @@ protected void onScrollChanged(int x, int y, int oldX, int oldY) {
         updateClippingRect();
       }
 
+      // Race an UpdateState with every onScroll. This makes it more likely that, in Fabric,
+      // when JS processes the scroll event, the C++ ShadowNode representation will have a
+      // "more correct" scroll position. It will frequently be /incorrect/ but this decreases
+      // the error as much as possible.
+      updateStateOnScroll();
+
       ReactScrollViewHelper.emitScrollEvent(
           this,
           mOnScrollDispatchHelper.getXFlingVelocity(),
@@ -383,9 +416,7 @@ public void getClippingRect(Rect outClippingRect) {
 
   @Override
   public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
-    return ReactFeatureFlags.clipChildRectsIfOverflowIsHidden
-        ? ReactClippingViewGroupHelper.getChildVisibleRectHelper(child, r, offset, this, mOverflow)
-        : super.getChildVisibleRect(child, r, offset);
+    return super.getChildVisibleRect(child, r, offset);
   }
 
   @Override
@@ -881,9 +912,13 @@ public void onAnimationRepeat(Animator animator) {}
    *
    * <p>`reactScrollTo` changes `contentOffset` and we need to keep `contentOffset` in sync between
    * scroll view and state. Calling raw `reactScrollTo` doesn't update state.
+   *
+   * <p>Note that while we can override scrollTo, we *cannot* override `smoothScrollTo` because it
+   * is final. See `reactSmoothScrollTo`.
    */
-  public void reactScrollTo(int x, int y) {
-    scrollTo(x, y);
+  @Override
+  public void scrollTo(int x, int y) {
+    super.scrollTo(x, y);
     updateStateOnScroll(x, y);
     setPendingContentOffsets(x, y);
   }
@@ -929,7 +964,7 @@ public void onLayoutChange(
     int currentScrollY = getScrollY();
     int maxScrollY = getMaxScrollY();
     if (currentScrollY > maxScrollY) {
-      reactScrollTo(getScrollX(), maxScrollY);
+      scrollTo(getScrollX(), maxScrollY);
     }
   }
 
@@ -958,35 +993,94 @@ public void setBorderStyle(@Nullable String style) {
     mReactBackgroundManager.setBorderStyle(style);
   }
 
+  /**
+   * ScrollAway: This enables a natively-controlled navbar that optionally obscures the top content
+   * of the ScrollView. Whether or not the navbar is obscuring the React Native surface is
+   * determined outside of React Native.
+   *
+   * <p>Note: all ScrollViews and HorizontalScrollViews in React have exactly one child: the
+   * "content" View (see ScrollView.js). That View is non-collapsable so it will never be
+   * View-flattened away. However, it is possible to pass custom styles into that View.
+   *
+   * <p>If you are using this feature it is assumed that you have full control over this ScrollView
+   * and that you are **not** overriding the ScrollView content view to pass in a `translateY`
+   * style. `translateY` must never be set from ReactJS while using this feature!
+   */
+  public void setScrollAwayTopPaddingEnabledUnstable(int topPadding) {
+    int count = getChildCount();
+
+    Assertions.assertCondition(
+        count == 1, "React Native ScrollView always has exactly 1 child; a content View");
+
+    if (count > 0) {
+      for (int i = 0; i < count; i++) {
+        View childView = getChildAt(i);
+        childView.setTranslationY(topPadding);
+      }
+
+      // Add the topPadding value as the bottom padding for the ScrollView.
+      // Otherwise, we'll push down the contents of the scroll view down too
+      // far off screen.
+      setPadding(0, 0, 0, topPadding);
+    }
+
+    updateScrollAwayState(topPadding);
+    setRemoveClippedSubviews(mRemoveClippedSubviews);
+  }
+
   /**
    * Called on any stabilized onScroll change to propagate content offset value to a Shadow Node.
    */
-  private void updateStateOnScroll(final int scrollX, final int scrollY) {
+  private boolean updateStateOnScroll(final int scrollX, final int scrollY) {
+    if (ViewUtil.getUIManagerType(getId()) == UIManagerType.DEFAULT) {
+      return false;
+    }
+
     // Dedupe events to reduce JNI traffic
     if (scrollX == mLastStateUpdateScrollX && scrollY == mLastStateUpdateScrollY) {
-      return;
+      return false;
     }
 
     mLastStateUpdateScrollX = scrollX;
     mLastStateUpdateScrollY = scrollY;
 
+    forceUpdateState();
+
+    return true;
+  }
+
+  private boolean updateStateOnScroll() {
+    return updateStateOnScroll(getScrollX(), getScrollY());
+  }
+
+  private void updateScrollAwayState(int scrollAwayPaddingTop) {
+    if (mScrollAwayPaddingTop == scrollAwayPaddingTop) {
+      return;
+    }
+
+    mScrollAwayPaddingTop = scrollAwayPaddingTop;
+
+    forceUpdateState();
+  }
+
+  private void forceUpdateState() {
+    final int scrollX = mLastStateUpdateScrollX;
+    final int scrollY = mLastStateUpdateScrollY;
+    final int scrollAwayPaddingTop = mScrollAwayPaddingTop;
+
     mFabricViewStateManager.setState(
         new FabricViewStateManager.StateUpdateCallback() {
           @Override
           public WritableMap getStateUpdate() {
-
             WritableMap map = new WritableNativeMap();
             map.putDouble(CONTENT_OFFSET_LEFT, PixelUtil.toDIPFromPixel(scrollX));
             map.putDouble(CONTENT_OFFSET_TOP, PixelUtil.toDIPFromPixel(scrollY));
+            map.putDouble(SCROLL_AWAY_PADDING_TOP, PixelUtil.toDIPFromPixel(scrollAwayPaddingTop));
             return map;
           }
         });
   }
 
-  private void updateStateOnScroll() {
-    updateStateOnScroll(getScrollX(), getScrollY());
-  }
-
   @Override
   public FabricViewStateManager getFabricViewStateManager() {
     return mFabricViewStateManager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
index c10a38ebdb02aa..a9c83ee5069a6b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
@@ -14,8 +14,9 @@
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collections;
+import java.util.Set;
+import java.util.WeakHashMap;
 
 /** Helper class that deals with emitting Scroll Events. */
 public class ReactScrollViewHelper {
@@ -33,7 +34,8 @@ void onScroll(
   }
 
   // Support global native listeners for scroll events
-  private static List<ScrollListener> sScrollListeners = new ArrayList<>();
+  private static Set<ScrollListener> sScrollListeners =
+      Collections.newSetFromMap(new WeakHashMap<ScrollListener, Boolean>());
 
   // If all else fails, this is the hardcoded value in OverScroller.java, in AOSP.
   // The default is defined here (as of this diff):
@@ -81,9 +83,11 @@ private static void emitScrollEvent(
     }
 
     ReactContext reactContext = (ReactContext) scrollView.getContext();
+    int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
     UIManagerHelper.getEventDispatcherForReactTag(reactContext, scrollView.getId())
         .dispatchEvent(
             ScrollEvent.obtain(
+                surfaceId,
                 scrollView.getId(),
                 scrollEventType,
                 scrollView.getScrollX(),
@@ -154,6 +158,19 @@ public void startScroll(int startX, int startY, int dx, int dy, int duration) {
     }
   }
 
+  /**
+   * Adds a scroll listener.
+   *
+   * <p>Note that you must keep a reference to this scroll listener because this class only keeps a
+   * weak reference to it (to prevent memory leaks). This means that code like <code>
+   * addScrollListener(new ScrollListener() {...})</code> won't work, you need to do this instead:
+   * <code>
+   *   mScrollListener = new ScrollListener() {...};
+   *   ReactScrollViewHelper.addScrollListener(mScrollListener);
+   * </code> instead.
+   *
+   * @param listener
+   */
   public static void addScrollListener(ScrollListener listener) {
     sScrollListeners.add(listener);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
index 23ad78a5a880a8..974584cd80768b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
@@ -102,6 +102,11 @@ public void setSnapToInterval(ReactScrollView view, float snapToInterval) {
 
   @ReactProp(name = "snapToOffsets")
   public void setSnapToOffsets(ReactScrollView view, @Nullable ReadableArray snapToOffsets) {
+    if (snapToOffsets == null) {
+      view.setSnapOffsets(null);
+      return;
+    }
+
     DisplayMetrics screenDisplayMetrics = DisplayMetricsHolder.getScreenDisplayMetrics();
     List<Integer> offsets = new ArrayList<Integer>();
     for (int i = 0; i < snapToOffsets.size(); i++) {
@@ -206,7 +211,7 @@ public void scrollTo(
     if (data.mAnimated) {
       scrollView.reactSmoothScrollTo(data.mDestX, data.mDestY);
     } else {
-      scrollView.reactScrollTo(data.mDestX, data.mDestY);
+      scrollView.scrollTo(data.mDestX, data.mDestY);
     }
   }
 
@@ -285,7 +290,7 @@ public void scrollToEnd(
     if (data.mAnimated) {
       scrollView.reactSmoothScrollTo(scrollView.getScrollX(), bottom);
     } else {
-      scrollView.reactScrollTo(scrollView.getScrollX(), bottom);
+      scrollView.scrollTo(scrollView.getScrollX(), bottom);
     }
   }
 
@@ -305,14 +310,14 @@ public void setFadingEdgeLength(ReactScrollView view, int value) {
     }
   }
 
-  @ReactProp(name = "contentOffset")
+  @ReactProp(name = "contentOffset", customType = "Point")
   public void setContentOffset(ReactScrollView view, ReadableMap value) {
     if (value != null) {
       double x = value.hasKey("x") ? value.getDouble("x") : 0;
       double y = value.hasKey("y") ? value.getDouble("y") : 0;
-      view.reactScrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
+      view.scrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
     } else {
-      view.reactScrollTo(0, 0);
+      view.scrollTo(0, 0);
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
index 91876fc2e3b90e..ecefb6067b0074 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
@@ -11,13 +11,14 @@
 import androidx.core.util.Pools;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** A event dispatched from a ScrollView scrolling. */
 public class ScrollEvent extends Event<ScrollEvent> {
+  private static String TAG = ScrollEvent.class.getSimpleName();
 
   private static final Pools.SynchronizedPool<ScrollEvent> EVENTS_POOL =
       new Pools.SynchronizedPool<>(3);
@@ -32,6 +33,7 @@ public class ScrollEvent extends Event<ScrollEvent> {
   private int mScrollViewHeight;
   private @Nullable ScrollEventType mScrollEventType;
 
+  @Deprecated
   public static ScrollEvent obtain(
       int viewTag,
       ScrollEventType scrollEventType,
@@ -43,11 +45,38 @@ public static ScrollEvent obtain(
       int contentHeight,
       int scrollViewWidth,
       int scrollViewHeight) {
+    return obtain(
+        -1,
+        viewTag,
+        scrollEventType,
+        scrollX,
+        scrollY,
+        xVelocity,
+        yVelocity,
+        contentWidth,
+        contentHeight,
+        scrollViewWidth,
+        scrollViewHeight);
+  }
+
+  public static ScrollEvent obtain(
+      int surfaceId,
+      int viewTag,
+      ScrollEventType scrollEventType,
+      int scrollX,
+      int scrollY,
+      float xVelocity,
+      float yVelocity,
+      int contentWidth,
+      int contentHeight,
+      int scrollViewWidth,
+      int scrollViewHeight) {
     ScrollEvent event = EVENTS_POOL.acquire();
     if (event == null) {
       event = new ScrollEvent();
     }
     event.init(
+        surfaceId,
         viewTag,
         scrollEventType,
         scrollX,
@@ -63,12 +92,19 @@ public static ScrollEvent obtain(
 
   @Override
   public void onDispose() {
-    EVENTS_POOL.release(this);
+    try {
+      EVENTS_POOL.release(this);
+    } catch (IllegalStateException e) {
+      // This exception can be thrown when an event is double-released.
+      // This is a problem but won't cause user-visible impact, so it's okay to fail silently.
+      ReactSoftExceptionLogger.logSoftException(TAG, e);
+    }
   }
 
   private ScrollEvent() {}
 
   private void init(
+      int surfaceId,
       int viewTag,
       ScrollEventType scrollEventType,
       int scrollX,
@@ -79,7 +115,7 @@ private void init(
       int contentHeight,
       int scrollViewWidth,
       int scrollViewHeight) {
-    super.init(viewTag);
+    super.init(surfaceId, viewTag);
     mScrollEventType = scrollEventType;
     mScrollX = scrollX;
     mScrollY = scrollY;
@@ -96,12 +132,6 @@ public String getEventName() {
     return ScrollEventType.getJSEventName(Assertions.assertNotNull(mScrollEventType));
   }
 
-  @Override
-  public short getCoalescingKey() {
-    // All scroll events for a given view can be coalesced
-    return 0;
-  }
-
   @Override
   public boolean canCoalesce() {
     // Only SCROLL events can be coalesced, all others can not be
@@ -111,12 +141,9 @@ public boolean canCoalesce() {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap contentInset = Arguments.createMap();
     contentInset.putDouble("top", 0);
     contentInset.putDouble("bottom", 0);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
index 63f1658e470b6f..46109dc64b3fb8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
@@ -1,8 +1,9 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "slider",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
@@ -21,6 +22,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
index 09f764ddb3753d..5b5c85f85925fd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
@@ -39,11 +39,6 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
-  @Override
-  public short getCoalescingKey() {
-    return 0;
-  }
-
   @Override
   public void dispatch(RCTEventEmitter rctEventEmitter) {
     rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
index 9c8bc9ced0bca5..278972551ef99d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
@@ -16,7 +16,6 @@
 import android.view.ViewGroup;
 import android.widget.SeekBar;
 import androidx.annotation.Nullable;
-import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
 import com.facebook.react.bridge.ReactContext;
@@ -24,12 +23,14 @@
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.viewmanagers.SliderManagerDelegate;
 import com.facebook.react.viewmanagers.SliderManagerInterface;
 import com.facebook.yoga.YogaMeasureFunction;
@@ -95,16 +96,13 @@ public long measure(
         @Override
         public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
           ReactContext reactContext = (ReactContext) seekbar.getContext();
-          UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-
-          if (uiManager != null) {
-            uiManager
-                .getEventDispatcher()
-                .dispatchEvent(
-                    new ReactSliderEvent(
-                        seekbar.getId(),
-                        ((ReactSlider) seekbar).toRealProgress(progress),
-                        fromUser));
+          EventDispatcher eventDispatcher =
+              UIManagerHelper.getEventDispatcherForReactTag(reactContext, seekbar.getId());
+
+          if (eventDispatcher != null) {
+            eventDispatcher.dispatchEvent(
+                new ReactSliderEvent(
+                    seekbar.getId(), ((ReactSlider) seekbar).toRealProgress(progress), fromUser));
           }
         }
 
@@ -114,15 +112,15 @@ public void onStartTrackingTouch(SeekBar seekbar) {}
         @Override
         public void onStopTrackingTouch(SeekBar seekbar) {
           ReactContext reactContext = (ReactContext) seekbar.getContext();
-          UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-
-          if (uiManager != null) {
-            uiManager
-                .getEventDispatcher()
-                .dispatchEvent(
-                    new ReactSlidingCompleteEvent(
-                        seekbar.getId(),
-                        ((ReactSlider) seekbar).toRealProgress(seekbar.getProgress())));
+          EventDispatcher eventDispatcher =
+              UIManagerHelper.getEventDispatcherForReactTag(reactContext, seekbar.getId());
+
+          if (eventDispatcher != null) {
+            eventDispatcher.dispatchEvent(
+                new ReactSlidingCompleteEvent(
+                    UIManagerHelper.getSurfaceId(seekbar),
+                    seekbar.getId(),
+                    ((ReactSlider) seekbar).toRealProgress(seekbar.getProgress())));
           }
         }
       };
@@ -151,7 +149,7 @@ public Class getShadowNodeClass() {
   @Override
   protected ReactSlider createViewInstance(ThemedReactContext context) {
     final ReactSlider slider = new ReactSlider(context, null, STYLE);
-    ViewCompat.setAccessibilityDelegate(slider, sAccessibilityDelegate);
+    ViewCompat.setAccessibilityDelegate(slider, new ReactSliderAccessibilityDelegate());
     return slider;
   }
 
@@ -280,8 +278,8 @@ protected ViewManagerDelegate<ReactSlider> getDelegate() {
     return mDelegate;
   }
 
-  protected static class ReactSliderAccessibilityDelegate extends AccessibilityDelegateCompat {
-    private static boolean isSliderAction(int action) {
+  protected class ReactSliderAccessibilityDelegate extends ReactAccessibilityDelegate {
+    private boolean isSliderAction(int action) {
       return (action == AccessibilityActionCompat.ACTION_SCROLL_FORWARD.getId())
           || (action == AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId())
           || (action == AccessibilityActionCompat.ACTION_SET_PROGRESS.getId());
@@ -299,7 +297,4 @@ public boolean performAccessibilityAction(View host, int action, Bundle args) {
       return rv;
     }
   };
-
-  protected static ReactSliderAccessibilityDelegate sAccessibilityDelegate =
-      new ReactSliderAccessibilityDelegate();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
index 2e2e9470707a8e..44832295f071c0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.slider;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted when the user finishes dragging the slider. */
 public class ReactSlidingCompleteEvent extends Event<ReactSlidingCompleteEvent> {
@@ -19,8 +19,13 @@ public class ReactSlidingCompleteEvent extends Event<ReactSlidingCompleteEvent>
 
   private final double mValue;
 
+  @Deprecated
   public ReactSlidingCompleteEvent(int viewId, double value) {
-    super(viewId);
+    this(-1, viewId, value);
+  }
+
+  public ReactSlidingCompleteEvent(int surfaceId, int viewId, double value) {
+    super(surfaceId, viewId);
     mValue = value;
   }
 
@@ -33,25 +38,17 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public short getCoalescingKey() {
-    return 0;
+  protected WritableMap getEventData() {
+    WritableMap eventData = Arguments.createMap();
+    eventData.putInt("target", getViewTag());
+    eventData.putDouble("value", getValue());
+    return eventData;
   }
 
   @Override
   public boolean canCoalesce() {
     return false;
   }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
-    WritableMap eventData = Arguments.createMap();
-    eventData.putInt("target", getViewTag());
-    eventData.putDouble("value", getValue());
-    return eventData;
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
index 528c4af8a55056..73fe27d801b548 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
@@ -1,8 +1,9 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "swiperefresh",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -25,6 +26,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
     ],
     exported_deps = [
-        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
index ca012572e71dbb..85d23cff992d53 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
@@ -7,13 +7,20 @@
 
 package com.facebook.react.views.swiperefresh;
 
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 public class RefreshEvent extends Event<RefreshEvent> {
 
+  @Deprecated
   protected RefreshEvent(int viewTag) {
-    super(viewTag);
+    this(-1, viewTag);
+  }
+
+  protected RefreshEvent(int surfaceId, int viewTag) {
+    super(surfaceId, viewTag);
   }
 
   @Override
@@ -21,8 +28,9 @@ public String getEventName() {
     return "topRefresh";
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), null);
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
index c8462a138ccdc5..888c7d8c0a308c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
@@ -88,11 +88,21 @@ public void setProgressBackgroundColor(ReactSwipeRefreshLayout view, Integer col
   }
 
   // TODO(T46143833): Remove this method once the 'size' prop has been migrated to String in JS.
-  @Override
   public void setSize(ReactSwipeRefreshLayout view, int value) {
     view.setSize(value);
   }
 
+  @Override
+  public void setSize(ReactSwipeRefreshLayout view, String size) {
+    if (size == null || size.equals("default")) {
+      view.setSize(SwipeRefreshLayout.DEFAULT);
+    } else if (size.equals("large")) {
+      view.setSize(SwipeRefreshLayout.LARGE);
+    } else {
+      throw new IllegalArgumentException("Size must be 'default' or 'large', received: " + size);
+    }
+  }
+
   // This prop temporarily takes both 0 and 1 as well as 'default' and 'large'.
   // 0 and 1 are deprecated and will be removed in a future release.
   // See T46143833
@@ -103,15 +113,7 @@ public void setSize(ReactSwipeRefreshLayout view, Dynamic size) {
     } else if (size.getType() == ReadableType.Number) {
       view.setSize(size.asInt());
     } else if (size.getType() == ReadableType.String) {
-      final String sizeStr = size.asString();
-      if (sizeStr.equals("default")) {
-        view.setSize(SwipeRefreshLayout.DEFAULT);
-      } else if (sizeStr.equals("large")) {
-        view.setSize(SwipeRefreshLayout.LARGE);
-      } else {
-        throw new IllegalArgumentException(
-            "Size must be 'default' or 'large', received: " + sizeStr);
-      }
+      setSize(view, size.asString());
     } else {
       throw new IllegalArgumentException("Size must be 'default' or 'large'");
     }
@@ -144,7 +146,8 @@ public void onRefresh() {
             EventDispatcher eventDispatcher =
                 UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.getId());
             if (eventDispatcher != null) {
-              eventDispatcher.dispatchEvent(new RefreshEvent(view.getId()));
+              eventDispatcher.dispatchEvent(
+                  new RefreshEvent(UIManagerHelper.getSurfaceId(view), view.getId()));
             }
           }
         });
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
index cd59cc2b720430..6042b28c9bb104 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
@@ -1,8 +1,9 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "switchview",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
@@ -23,6 +24,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
-        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
index 1a2afde1eede3d..4819bf2abd94e1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
@@ -8,8 +8,11 @@
 package com.facebook.react.views.switchview;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.RippleDrawable;
+import android.os.Build;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
 
@@ -59,6 +62,16 @@ public void setTrackColor(@Nullable Integer color) {
 
   public void setThumbColor(@Nullable Integer color) {
     setColor(super.getThumbDrawable(), color);
+
+    // Set the ripple color with thumb color if >= LOLLIPOP
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      RippleDrawable ripple = (RippleDrawable) super.getBackground();
+      ColorStateList customColorState =
+          new ColorStateList(
+              new int[][] {new int[] {android.R.attr.state_pressed}}, new int[] {color});
+
+      ripple.setColor(customColorState);
+    }
   }
 
   /*package*/ void setOn(boolean on) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
index 9cc34d0e43951a..70f44a0354674b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.switchview;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by a ReactSwitchManager once a switch is fully switched on/off */
 /*package*/ class ReactSwitchEvent extends Event<ReactSwitchEvent> {
@@ -19,8 +19,13 @@
 
   private final boolean mIsChecked;
 
+  @Deprecated
   public ReactSwitchEvent(int viewId, boolean isChecked) {
-    super(viewId);
+    this(-1, viewId, isChecked);
+  }
+
+  public ReactSwitchEvent(int surfaceId, int viewId, boolean isChecked) {
+    super(surfaceId, viewId);
     mIsChecked = isChecked;
   }
 
@@ -33,18 +38,9 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public short getCoalescingKey() {
-    // All switch events for a given view can be coalesced.
-    return 0;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putInt("target", getViewTag());
     eventData.putBoolean("value", getIsChecked());
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
index c2196f3ff142dc..40750ff9ced91b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
@@ -20,7 +20,7 @@
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -81,15 +81,11 @@ public long measure(
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
           ReactContext reactContext = (ReactContext) buttonView.getContext();
 
-          UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-
-          if (uiManager == null) {
-            return;
-          }
-
-          uiManager
-              .getEventDispatcher()
-              .dispatchEvent(new ReactSwitchEvent(buttonView.getId(), isChecked));
+          int reactTag = buttonView.getId();
+          UIManagerHelper.getEventDispatcherForReactTag(reactContext, reactTag)
+              .dispatchEvent(
+                  new ReactSwitchEvent(
+                      UIManagerHelper.getSurfaceId(reactContext), reactTag, isChecked));
         }
       };
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
index ac69e03c258350..cf4fbdd897016a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 rn_android_library(
     name = "text",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
@@ -22,6 +23,7 @@ rn_android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
index cf0c8b141b0073..61900f19f6f2f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
@@ -12,9 +12,10 @@
 import android.graphics.Typeface;
 import android.text.TextPaint;
 import android.text.style.MetricAffectingSpan;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class CustomStyleSpan extends MetricAffectingSpan implements ReactSpan {
 
   /**
@@ -40,7 +41,7 @@ public CustomStyleSpan(
       int fontWeight,
       @Nullable String fontFeatureSettings,
       @Nullable String fontFamily,
-      @NonNull AssetManager assetManager) {
+      AssetManager assetManager) {
     mStyle = fontStyle;
     mWeight = fontWeight;
     mFeatureSettings = fontFeatureSettings;
@@ -54,21 +55,18 @@ public void updateDrawState(TextPaint ds) {
   }
 
   @Override
-  public void updateMeasureState(@NonNull TextPaint paint) {
+  public void updateMeasureState(TextPaint paint) {
     apply(paint, mStyle, mWeight, mFeatureSettings, mFontFamily, mAssetManager);
   }
 
-  /** Returns {@link Typeface#NORMAL} or {@link Typeface#ITALIC}. */
   public int getStyle() {
-    return (mStyle == ReactTextShadowNode.UNSET ? 0 : mStyle);
+    return mStyle == ReactBaseTextShadowNode.UNSET ? Typeface.NORMAL : mStyle;
   }
 
-  /** Returns {@link Typeface#NORMAL} or {@link Typeface#BOLD}. */
   public int getWeight() {
-    return (mWeight == ReactTextShadowNode.UNSET ? 0 : mWeight);
+    return mWeight == ReactBaseTextShadowNode.UNSET ? TypefaceStyle.NORMAL : mWeight;
   }
 
-  /** Returns the font family set for this StyleSpan. */
   public @Nullable String getFontFamily() {
     return mFontFamily;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
index 6835918b587d54..f685bf567b2455 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -178,15 +178,12 @@ private static void buildSpannedFromShadowNode(
             new SetSpanOperation(
                 start, end, new ReactBackgroundColorSpan(textShadowNode.mBackgroundColor)));
       }
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        float effectiveLetterSpacing = textAttributes.getEffectiveLetterSpacing();
-        if (!Float.isNaN(effectiveLetterSpacing)
-            && (parentTextAttributes == null
-                || parentTextAttributes.getEffectiveLetterSpacing() != effectiveLetterSpacing)) {
-          ops.add(
-              new SetSpanOperation(
-                  start, end, new CustomLetterSpacingSpan(effectiveLetterSpacing)));
-        }
+      float effectiveLetterSpacing = textAttributes.getEffectiveLetterSpacing();
+      if (!Float.isNaN(effectiveLetterSpacing)
+          && (parentTextAttributes == null
+              || parentTextAttributes.getEffectiveLetterSpacing() != effectiveLetterSpacing)) {
+        ops.add(
+            new SetSpanOperation(start, end, new CustomLetterSpacingSpan(effectiveLetterSpacing)));
       }
       int effectiveFontSize = textAttributes.getEffectiveFontSize();
       if ( // `getEffectiveFontSize` always returns a value so don't need to check for anything like
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java
index 37f7000a915b9c..bb093d2691ddca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java
@@ -52,7 +52,8 @@ public void onClick(@NonNull View view) {
     EventDispatcher eventDispatcher =
         UIManagerHelper.getEventDispatcherForReactTag(context, mReactTag);
     if (eventDispatcher != null) {
-      eventDispatcher.dispatchEvent(new ViewGroupClickEvent(mReactTag));
+      eventDispatcher.dispatchEvent(
+          new ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), mReactTag));
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
index 32f0219db876d4..077f6006887c34 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
@@ -10,31 +10,39 @@
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Typeface;
-import android.os.Build;
 import android.util.SparseArray;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
+import com.facebook.infer.annotation.Nullsafe;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Class responsible to load and cache Typeface objects. It will first try to load typefaces inside
- * the assets/fonts folder and if it doesn't find the right Typeface in that folder will fall back
- * on the best matching system Typeface The supported custom fonts extensions are .ttf and .otf. For
- * each font family the bold, italic and bold_italic variants are supported. Given a "family" font
- * family the files in the assets/fonts folder need to be family.ttf(.otf) family_bold.ttf(.otf)
- * family_italic.ttf(.otf) and family_bold_italic.ttf(.otf)
+ * Responsible for loading and caching Typeface objects.
+ *
+ * <p>This will first try to load a typeface from the assets/fonts folder. If one is not found in
+ * that folder, this will fallback to the best matching system typeface.
+ *
+ * <p>Custom fonts support the extensions `.ttf` and `.otf` and the variants `bold`, `italic`, and
+ * `bold_italic`. For example, given a font named "ExampleFontFamily", the following are supported:
+ *
+ * <ul>
+ *   <li>ExampleFontFamily.ttf (or .otf)
+ *   <li>ExampleFontFamily_bold.ttf (or .otf)
+ *   <li>ExampleFontFamily_italic.ttf (or .otf)
+ *   <li>ExampleFontFamily_bold_italic.ttf (or .otf)
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactFontManager {
 
+  // NOTE: Indices in `EXTENSIONS` correspond to the `TypeFace` style constants.
   private static final String[] EXTENSIONS = {"", "_bold", "_italic", "_bold_italic"};
   private static final String[] FILE_EXTENSIONS = {".ttf", ".otf"};
   private static final String FONTS_ASSET_PATH = "fonts/";
 
   private static ReactFontManager sReactFontManagerInstance;
 
-  private final Map<String, FontFamily> mFontCache;
+  private final Map<String, AssetFontFamily> mFontCache;
   private final Map<String, Typeface> mCustomTypefaceCache;
 
   private ReactFontManager() {
@@ -49,36 +57,43 @@ public static ReactFontManager getInstance() {
     return sReactFontManagerInstance;
   }
 
-  public @Nullable Typeface getTypeface(
-      String fontFamilyName, int style, AssetManager assetManager) {
-    return getTypeface(fontFamilyName, style, 0, assetManager);
+  public Typeface getTypeface(String fontFamilyName, int style, AssetManager assetManager) {
+    return getTypeface(fontFamilyName, new TypefaceStyle(style), assetManager);
   }
 
-  public @Nullable Typeface getTypeface(
+  public Typeface getTypeface(
+      String fontFamilyName, int weight, boolean italic, AssetManager assetManager) {
+    return getTypeface(fontFamilyName, new TypefaceStyle(weight, italic), assetManager);
+  }
+
+  public Typeface getTypeface(
       String fontFamilyName, int style, int weight, AssetManager assetManager) {
+    return getTypeface(fontFamilyName, new TypefaceStyle(style, weight), assetManager);
+  }
+
+  public Typeface getTypeface(
+      String fontFamilyName, TypefaceStyle typefaceStyle, AssetManager assetManager) {
     if (mCustomTypefaceCache.containsKey(fontFamilyName)) {
-      Typeface typeface = mCustomTypefaceCache.get(fontFamilyName);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && weight >= 100 && weight <= 1000) {
-        return Typeface.create(typeface, weight, (style & Typeface.ITALIC) != 0);
-      }
-      return Typeface.create(typeface, style);
+      // Apply `typefaceStyle` because custom fonts configure variants using `app:fontStyle` and
+      // `app:fontWeight` in their resource XML configuration file.
+      return typefaceStyle.apply(mCustomTypefaceCache.get(fontFamilyName));
     }
 
-    FontFamily fontFamily = mFontCache.get(fontFamilyName);
-    if (fontFamily == null) {
-      fontFamily = new FontFamily();
-      mFontCache.put(fontFamilyName, fontFamily);
+    AssetFontFamily assetFontFamily = mFontCache.get(fontFamilyName);
+    if (assetFontFamily == null) {
+      assetFontFamily = new AssetFontFamily();
+      mFontCache.put(fontFamilyName, assetFontFamily);
     }
 
-    Typeface typeface = fontFamily.getTypeface(style);
-    if (typeface == null) {
-      typeface = createTypeface(fontFamilyName, style, assetManager);
-      if (typeface != null) {
-        fontFamily.setTypeface(style, typeface);
-      }
-    }
+    int style = typefaceStyle.getNearestStyle();
 
-    return typeface;
+    Typeface assetTypeface = assetFontFamily.getTypefaceForStyle(style);
+    if (assetTypeface == null) {
+      assetTypeface = createAssetTypeface(fontFamilyName, style, assetManager);
+      assetFontFamily.setTypefaceForStyle(style, assetTypeface);
+    }
+    // Do not apply `typefaceStyle` because asset font files already incorporate the style.
+    return assetTypeface;
   }
 
   /*
@@ -88,7 +103,7 @@ public static ReactFontManager getInstance() {
    *
    * ReactFontManager.getInstance().addCustomFont(this, "Srisakdi", R.font.srisakdi);
    */
-  public void addCustomFont(@NonNull Context context, @NonNull String fontFamily, int fontId) {
+  public void addCustomFont(Context context, String fontFamily, int fontId) {
     Typeface font = ResourcesCompat.getFont(context, fontId);
     if (font != null) {
       mCustomTypefaceCache.put(fontFamily, font);
@@ -106,16 +121,16 @@ public void addCustomFont(@NonNull Context context, @NonNull String fontFamily,
    */
   public void setTypeface(String fontFamilyName, int style, Typeface typeface) {
     if (typeface != null) {
-      FontFamily fontFamily = mFontCache.get(fontFamilyName);
-      if (fontFamily == null) {
-        fontFamily = new FontFamily();
-        mFontCache.put(fontFamilyName, fontFamily);
+      AssetFontFamily assetFontFamily = mFontCache.get(fontFamilyName);
+      if (assetFontFamily == null) {
+        assetFontFamily = new AssetFontFamily();
+        mFontCache.put(fontFamilyName, assetFontFamily);
       }
-      fontFamily.setTypeface(style, typeface);
+      assetFontFamily.setTypefaceForStyle(style, typeface);
     }
   }
 
-  private static @Nullable Typeface createTypeface(
+  private static Typeface createAssetTypeface(
       String fontFamilyName, int style, AssetManager assetManager) {
     String extension = EXTENSIONS[style];
     for (String fileExtension : FILE_EXTENSIONS) {
@@ -129,27 +144,27 @@ public void setTypeface(String fontFamilyName, int style, Typeface typeface) {
       try {
         return Typeface.createFromAsset(assetManager, fileName);
       } catch (RuntimeException e) {
-        // unfortunately Typeface.createFromAsset throws an exception instead of returning null
-        // if the typeface doesn't exist
+        // If the typeface asset does not exist, try another extension.
+        continue;
       }
     }
-
     return Typeface.create(fontFamilyName, style);
   }
 
-  private static class FontFamily {
+  /** Responsible for caching typefaces for each custom font family. */
+  private static class AssetFontFamily {
 
     private SparseArray<Typeface> mTypefaceSparseArray;
 
-    private FontFamily() {
+    private AssetFontFamily() {
       mTypefaceSparseArray = new SparseArray<>(4);
     }
 
-    public Typeface getTypeface(int style) {
+    public @Nullable Typeface getTypefaceForStyle(int style) {
       return mTypefaceSparseArray.get(style);
     }
 
-    public void setTypeface(int style, Typeface typeface) {
+    public void setTypefaceForStyle(int style, Typeface typeface) {
       mTypefaceSparseArray.put(style, typeface);
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
index 5dbd0796e53363..46bc1e9b50054e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -21,7 +21,7 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
@@ -111,12 +111,12 @@ public long measure(
                     text, layout, sTextPaintInstance, themedReactContext);
             WritableMap event = Arguments.createMap();
             event.putArray("lines", lines);
-            if (themedReactContext.hasActiveCatalystInstance()) {
+            if (themedReactContext.hasActiveReactInstance()) {
               themedReactContext
                   .getJSModule(RCTEventEmitter.class)
                   .receiveEvent(getReactTag(), "topTextLayout", event);
             } else {
-              ReactSoftException.logSoftException(
+              ReactSoftExceptionLogger.logSoftException(
                   "ReactTextShadowNode",
                   new ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance"));
             }
@@ -231,7 +231,14 @@ private Layout measureSpannedText(Spannable text, float width, YogaMeasureMode w
       // than the width of the text.
       layout =
           BoringLayout.make(
-              text, textPaint, boring.width, alignment, 1.f, 0.f, boring, mIncludeFontPadding);
+              text,
+              textPaint,
+              Math.max(boring.width, 0),
+              alignment,
+              1.f,
+              0.f,
+              boring,
+              mIncludeFontPadding);
     } else {
       // Is used for multiline, boring text and the width is known.
 
@@ -320,6 +327,11 @@ public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
               mJustificationMode);
       uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
     }
+
+    if (mAdjustsFontSizeToFit) {
+      // Nodes with `adjustsFontSizeToFit` enabled need to be remeasured on every relayout.
+      markUpdated();
+    }
   }
 
   @ReactProp(name = "onTextLayout")
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
index f7a0a18995fe75..7ce861de7bfdff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -124,6 +124,17 @@ protected void onLayout(
 
     Spanned text = (Spanned) getText();
     Layout layout = getLayout();
+    if (layout == null) {
+      // Text layout is calculated during pre-draw phase, so in some cases it can be empty during
+      // layout phase, which usually happens before drawing.
+      // The text layout is created by private {@link assumeLayout} method, which we can try to
+      // invoke directly through reflection or indirectly through some methods that compute it
+      // (e.g. {@link getExtendedPaddingTop}).
+      // It is safer, however, to just early return here, as next measure/layout passes are way more
+      // likely to have the text layout computed.
+      return;
+    }
+
     TextInlineViewPlaceholderSpan[] placeholders =
         text.getSpans(0, text.length(), TextInlineViewPlaceholderSpan.class);
     ArrayList inlineViewInfoArray =
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
index 7984406e0e7d8f..f4f618c5ef95e3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -14,6 +14,8 @@
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.IViewManagerWithChildren;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
@@ -31,6 +33,12 @@ public class ReactTextViewManager
     extends ReactTextAnchorViewManager<ReactTextView, ReactTextShadowNode>
     implements IViewManagerWithChildren {
 
+  private static final short TX_STATE_KEY_ATTRIBUTED_STRING = 0;
+  private static final short TX_STATE_KEY_PARAGRAPH_ATTRIBUTES = 1;
+  // used for text input
+  private static final short TX_STATE_KEY_HASH = 2;
+  private static final short TX_STATE_KEY_MOST_RECENT_EVENT_COUNT = 3;
+
   @VisibleForTesting public static final String REACT_CLASS = "RCTText";
 
   protected @Nullable ReactTextViewManagerCallback mReactTextViewManagerCallback;
@@ -83,7 +91,22 @@ public boolean needsCustomLayoutForChildren() {
   @Override
   public Object updateState(
       ReactTextView view, ReactStylesDiffMap props, @Nullable StateWrapper stateWrapper) {
-    ReadableNativeMap state = stateWrapper.getState();
+    if (stateWrapper == null) {
+      return null;
+    }
+
+    if (ReactFeatureFlags.isMapBufferSerializationEnabled()) {
+      ReadableMapBuffer stateMapBuffer = stateWrapper.getStatDataMapBuffer();
+      if (stateMapBuffer != null) {
+        return getReactTextUpdate(view, props, stateMapBuffer);
+      }
+    }
+
+    ReadableNativeMap state = stateWrapper.getStateData();
+    if (state == null) {
+      return null;
+    }
+
     ReadableMap attributedString = state.getMap("attributedString");
     ReadableMap paragraphAttributes = state.getMap("paragraphAttributes");
     Spannable spanned =
@@ -103,6 +126,30 @@ public Object updateState(
         TextAttributeProps.getJustificationMode(props));
   }
 
+  private Object getReactTextUpdate(
+      ReactTextView view, ReactStylesDiffMap props, ReadableMapBuffer state) {
+
+    ReadableMapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING);
+    ReadableMapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES);
+    Spannable spanned =
+        TextLayoutManagerMapBuffer.getOrCreateSpannableForText(
+            view.getContext(), attributedString, mReactTextViewManagerCallback);
+    view.setSpanned(spanned);
+
+    int textBreakStrategy =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_TEXT_BREAK_STRATEGY));
+
+    return new ReactTextUpdate(
+        spanned,
+        -1, // UNUSED FOR TEXT
+        false, // TODO add this into local Data
+        TextAttributeProps.getTextAlignment(
+            props, TextLayoutManagerMapBuffer.isRTL(attributedString)),
+        textBreakStrategy,
+        TextAttributeProps.getJustificationMode(props));
+  }
+
   @Override
   public @Nullable Map getExportedCustomDirectEventTypeConstants() {
     return MapBuilder.of(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
index 237fc3ff7bb5c1..85948ef78e8989 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
@@ -11,33 +11,52 @@
 import android.graphics.Typeface;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.ReadableArray;
 import java.util.ArrayList;
 import java.util.List;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactTypefaceUtils {
-  public static final int UNSET = -1;
 
   public static int parseFontWeight(@Nullable String fontWeightString) {
-    int fontWeightNumeric =
-        fontWeightString != null ? parseNumericFontWeight(fontWeightString) : UNSET;
-    int fontWeight = fontWeightNumeric != UNSET ? fontWeightNumeric : Typeface.NORMAL;
-
-    if (fontWeight == 700 || "bold".equals(fontWeightString)) fontWeight = Typeface.BOLD;
-    else if (fontWeight == 400 || "normal".equals(fontWeightString)) fontWeight = Typeface.NORMAL;
-
-    return fontWeight;
+    if (fontWeightString != null) {
+      switch (fontWeightString) {
+        case "100":
+          return 100;
+        case "200":
+          return 200;
+        case "300":
+          return 300;
+        case "normal":
+        case "400":
+          return 400;
+        case "500":
+          return 500;
+        case "600":
+          return 600;
+        case "bold":
+        case "700":
+          return 700;
+        case "800":
+          return 800;
+        case "900":
+          return 900;
+      }
+    }
+    return ReactBaseTextShadowNode.UNSET;
   }
 
   public static int parseFontStyle(@Nullable String fontStyleString) {
-    int fontStyle = UNSET;
-    if ("italic".equals(fontStyleString)) {
-      fontStyle = Typeface.ITALIC;
-    } else if ("normal".equals(fontStyleString)) {
-      fontStyle = Typeface.NORMAL;
+    if (fontStyleString != null) {
+      if ("italic".equals(fontStyleString)) {
+        return Typeface.ITALIC;
+      }
+      if ("normal".equals(fontStyleString)) {
+        return Typeface.NORMAL;
+      }
     }
-
-    return fontStyle;
+    return ReactBaseTextShadowNode.UNSET;
   }
 
   public static @Nullable String parseFontVariant(@Nullable ReadableArray fontVariantArray) {
@@ -77,51 +96,14 @@ public static Typeface applyStyles(
       @Nullable Typeface typeface,
       int style,
       int weight,
-      @Nullable String family,
+      @Nullable String fontFamilyName,
       AssetManager assetManager) {
-    int oldStyle;
-    if (typeface == null) {
-      oldStyle = 0;
-    } else {
-      oldStyle = typeface.getStyle();
-    }
-
-    int want = 0;
-    if ((weight == Typeface.BOLD)
-        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactTextShadowNode.UNSET)) {
-      want |= Typeface.BOLD;
-    }
-
-    if ((style == Typeface.ITALIC)
-        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactTextShadowNode.UNSET)) {
-      want |= Typeface.ITALIC;
-    }
-
-    if (family != null) {
-      typeface = ReactFontManager.getInstance().getTypeface(family, want, weight, assetManager);
-    } else if (typeface != null) {
-      // TODO(t9055065): Fix custom fonts getting applied to text children with different style
-      typeface = Typeface.create(typeface, want);
-    }
-
-    if (typeface != null) {
-      return typeface;
+    TypefaceStyle typefaceStyle = new TypefaceStyle(style, weight);
+    if (fontFamilyName == null) {
+      return typefaceStyle.apply(typeface == null ? Typeface.DEFAULT : typeface);
     } else {
-      return Typeface.defaultFromStyle(want);
+      return ReactFontManager.getInstance()
+          .getTypeface(fontFamilyName, typefaceStyle, assetManager);
     }
   }
-
-  /**
-   * Return -1 if the input string is not a valid numeric fontWeight (100, 200, ..., 900), otherwise
-   * return the weight.
-   */
-  private static int parseNumericFontWeight(String fontWeightString) {
-    // This should be much faster than using regex to verify input and Integer.parseInt
-    return fontWeightString.length() == 3
-            && fontWeightString.endsWith("00")
-            && fontWeightString.charAt(0) <= '9'
-            && fontWeightString.charAt(0) >= '1'
-        ? 100 * (fontWeightString.charAt(0) - '0')
-        : UNSET;
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
index f99e24019e5236..13311fef41bb2d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
@@ -7,27 +7,54 @@
 
 package com.facebook.react.views.text;
 
-import android.graphics.Typeface;
 import android.os.Build;
 import android.text.Layout;
+import android.text.TextUtils;
 import android.util.LayoutDirection;
 import android.view.Gravity;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ViewProps;
-import com.facebook.yoga.YogaDirection;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 // TODO: T63643819 refactor naming of TextAttributeProps to make explicit that this represents
 // TextAttributes and not TextProps. As part of this refactor extract methods that don't belong to
 // TextAttributeProps (e.g. TextAlign)
 public class TextAttributeProps {
 
-  private static final String INLINE_IMAGE_PLACEHOLDER = "I";
+  // constants for Text Attributes serialization
+  public static final short TA_KEY_FOREGROUND_COLOR = 0;
+  public static final short TA_KEY_BACKGROUND_COLOR = 1;
+  public static final short TA_KEY_OPACITY = 2;
+  public static final short TA_KEY_FONT_FAMILY = 3;
+  public static final short TA_KEY_FONT_SIZE = 4;
+  public static final short TA_KEY_FONT_SIZE_MULTIPLIER = 5;
+  public static final short TA_KEY_FONT_WEIGHT = 6;
+  public static final short TA_KEY_FONT_STYLE = 7;
+  public static final short TA_KEY_FONT_VARIANT = 8;
+  public static final short TA_KEY_ALLOW_FONT_SCALING = 9;
+  public static final short TA_KEY_LETTER_SPACING = 10;
+  public static final short TA_KEY_LINE_HEIGHT = 11;
+  public static final short TA_KEY_ALIGNMENT = 12;
+  public static final short TA_KEY_BEST_WRITING_DIRECTION = 13;
+  public static final short TA_KEY_TEXT_DECORATION_COLOR = 14;
+  public static final short TA_KEY_TEXT_DECORATION_LINE = 15;
+  public static final short TA_KEY_TEXT_DECORATION_LINE_STYLE = 16;
+  public static final short TA_KEY_TEXT_DECORATION_LINE_PATTERN = 17;
+  public static final short TA_KEY_TEXT_SHADOW_RAIDUS = 18;
+  public static final short TA_KEY_TEXT_SHADOW_COLOR = 19;
+  public static final short TA_KEY_IS_HIGHLIGHTED = 20;
+  public static final short TA_KEY_LAYOUT_DIRECTION = 21;
+  public static final short TA_KEY_ACCESSIBILITY_ROLE = 22;
+
   public static final int UNSET = -1;
 
   private static final String PROP_SHADOW_OFFSET = "textShadowOffset";
@@ -62,7 +89,7 @@ public class TextAttributeProps {
   // `UNSET` is -1 and is the same as `LayoutDirection.UNDEFINED` but the symbol isn't available.
   protected int mLayoutDirection = UNSET;
 
-  protected TextTransform mTextTransform = TextTransform.UNSET;
+  protected TextTransform mTextTransform = TextTransform.NONE;
 
   protected float mTextShadowOffsetDx = 0;
   protected float mTextShadowOffsetDy = 0;
@@ -76,12 +103,7 @@ public class TextAttributeProps {
   protected @Nullable ReactAccessibilityDelegate.AccessibilityRole mAccessibilityRole = null;
   protected boolean mIsAccessibilityRoleSet = false;
 
-  /**
-   * mFontStyle can be {@link Typeface#NORMAL} or {@link Typeface#ITALIC}. mFontWeight can be {@link
-   * Typeface#NORMAL} or {@link Typeface#BOLD}.
-   */
   protected int mFontStyle = UNSET;
-
   protected int mFontWeight = UNSET;
   /**
    * NB: If a font family is used that does not have a style in a certain Android version (ie.
@@ -112,33 +134,123 @@ public class TextAttributeProps {
   protected boolean mContainsImages = false;
   protected float mHeightOfTallestInlineImage = Float.NaN;
 
-  private final ReactStylesDiffMap mProps;
-
-  public TextAttributeProps(ReactStylesDiffMap props) {
-    mProps = props;
-    setNumberOfLines(getIntProp(ViewProps.NUMBER_OF_LINES, UNSET));
-    setLineHeight(getFloatProp(ViewProps.LINE_HEIGHT, UNSET));
-    setLetterSpacing(getFloatProp(ViewProps.LETTER_SPACING, Float.NaN));
-    setAllowFontScaling(getBooleanProp(ViewProps.ALLOW_FONT_SCALING, true));
-    setFontSize(getFloatProp(ViewProps.FONT_SIZE, UNSET));
-    setColor(props.hasKey(ViewProps.COLOR) ? props.getInt(ViewProps.COLOR, 0) : null);
-    setColor(props.hasKey("foregroundColor") ? props.getInt("foregroundColor", 0) : null);
-    setBackgroundColor(
+  private TextAttributeProps() {}
+
+  /**
+   * Build a TextAttributeProps using data from the {@link ReadableMapBuffer} received as a
+   * parameter.
+   */
+  public static TextAttributeProps fromReadableMapBuffer(ReadableMapBuffer props) {
+    TextAttributeProps result = new TextAttributeProps();
+
+    // TODO T83483191: Review constants that are not being set!
+    Iterator<ReadableMapBuffer.MapBufferEntry> iterator = props.iterator();
+    while (iterator.hasNext()) {
+      ReadableMapBuffer.MapBufferEntry entry = iterator.next();
+      switch (entry.getKey()) {
+        case TA_KEY_FOREGROUND_COLOR:
+          result.setColor(entry.getInt(0));
+          break;
+        case TA_KEY_BACKGROUND_COLOR:
+          result.setBackgroundColor(entry.getInt(0));
+          break;
+        case TA_KEY_OPACITY:
+          break;
+        case TA_KEY_FONT_FAMILY:
+          result.setFontFamily(entry.getString());
+          break;
+        case TA_KEY_FONT_SIZE:
+          result.setFontSize((float) entry.getDouble(UNSET));
+          break;
+        case TA_KEY_FONT_SIZE_MULTIPLIER:
+          break;
+        case TA_KEY_FONT_WEIGHT:
+          result.setFontWeight(entry.getString());
+          break;
+        case TA_KEY_FONT_STYLE:
+          result.setFontStyle(entry.getString());
+          break;
+        case TA_KEY_FONT_VARIANT:
+          result.setFontVariant(entry.getReadableMapBuffer());
+          break;
+        case TA_KEY_ALLOW_FONT_SCALING:
+          result.setAllowFontScaling(entry.getBoolean(true));
+          break;
+        case TA_KEY_LETTER_SPACING:
+          result.setLetterSpacing((float) entry.getDouble(Float.NaN));
+          break;
+        case TA_KEY_LINE_HEIGHT:
+          result.setLineHeight((float) entry.getDouble(UNSET));
+          break;
+        case TA_KEY_ALIGNMENT:
+          break;
+        case TA_KEY_BEST_WRITING_DIRECTION:
+          break;
+        case TA_KEY_TEXT_DECORATION_COLOR:
+          break;
+        case TA_KEY_TEXT_DECORATION_LINE:
+          result.setTextDecorationLine(entry.getString());
+          break;
+        case TA_KEY_TEXT_DECORATION_LINE_STYLE:
+          break;
+        case TA_KEY_TEXT_DECORATION_LINE_PATTERN:
+          break;
+        case TA_KEY_TEXT_SHADOW_RAIDUS:
+          result.setTextShadowRadius(entry.getInt(1));
+          break;
+        case TA_KEY_TEXT_SHADOW_COLOR:
+          result.setTextShadowColor(entry.getInt(DEFAULT_TEXT_SHADOW_COLOR));
+          break;
+        case TA_KEY_IS_HIGHLIGHTED:
+          break;
+        case TA_KEY_LAYOUT_DIRECTION:
+          result.setLayoutDirection(entry.getString());
+          break;
+        case TA_KEY_ACCESSIBILITY_ROLE:
+          result.setAccessibilityRole(entry.getString());
+          break;
+      }
+    }
+
+    // TODO T83483191: Review why the following props are not serialized:
+    // setNumberOfLines
+    // setColor
+    // setIncludeFontPadding
+    // setTextShadowOffset
+    // setTextTransform
+    return result;
+  }
+
+  public static TextAttributeProps fromReadableMap(ReactStylesDiffMap props) {
+    TextAttributeProps result = new TextAttributeProps();
+    result.setNumberOfLines(getIntProp(props, ViewProps.NUMBER_OF_LINES, UNSET));
+    result.setLineHeight(getFloatProp(props, ViewProps.LINE_HEIGHT, UNSET));
+    result.setLetterSpacing(getFloatProp(props, ViewProps.LETTER_SPACING, Float.NaN));
+    result.setAllowFontScaling(getBooleanProp(props, ViewProps.ALLOW_FONT_SCALING, true));
+    result.setFontSize(getFloatProp(props, ViewProps.FONT_SIZE, UNSET));
+    result.setColor(props.hasKey(ViewProps.COLOR) ? props.getInt(ViewProps.COLOR, 0) : null);
+    result.setColor(
+        props.hasKey(ViewProps.FOREGROUND_COLOR)
+            ? props.getInt(ViewProps.FOREGROUND_COLOR, 0)
+            : null);
+    result.setBackgroundColor(
         props.hasKey(ViewProps.BACKGROUND_COLOR)
             ? props.getInt(ViewProps.BACKGROUND_COLOR, 0)
             : null);
-    setFontFamily(getStringProp(ViewProps.FONT_FAMILY));
-    setFontWeight(getStringProp(ViewProps.FONT_WEIGHT));
-    setFontStyle(getStringProp(ViewProps.FONT_STYLE));
-    setFontVariant(getArrayProp(ViewProps.FONT_VARIANT));
-    setIncludeFontPadding(getBooleanProp(ViewProps.INCLUDE_FONT_PADDING, true));
-    setTextDecorationLine(getStringProp(ViewProps.TEXT_DECORATION_LINE));
-    setTextShadowOffset(props.hasKey(PROP_SHADOW_OFFSET) ? props.getMap(PROP_SHADOW_OFFSET) : null);
-    setTextShadowRadius(getIntProp(PROP_SHADOW_RADIUS, 1));
-    setTextShadowColor(getIntProp(PROP_SHADOW_COLOR, DEFAULT_TEXT_SHADOW_COLOR));
-    setTextTransform(getStringProp(PROP_TEXT_TRANSFORM));
-    setLayoutDirection(getStringProp(ViewProps.LAYOUT_DIRECTION));
-    setAccessibilityRole(getStringProp(ViewProps.ACCESSIBILITY_ROLE));
+    result.setFontFamily(getStringProp(props, ViewProps.FONT_FAMILY));
+    result.setFontWeight(getStringProp(props, ViewProps.FONT_WEIGHT));
+    result.setFontStyle(getStringProp(props, ViewProps.FONT_STYLE));
+    result.setFontVariant(getArrayProp(props, ViewProps.FONT_VARIANT));
+    result.setIncludeFontPadding(getBooleanProp(props, ViewProps.INCLUDE_FONT_PADDING, true));
+    result.setTextDecorationLine(getStringProp(props, ViewProps.TEXT_DECORATION_LINE));
+    result.setTextShadowOffset(
+        props.hasKey(PROP_SHADOW_OFFSET) ? props.getMap(PROP_SHADOW_OFFSET) : null);
+    result.setTextShadowRadius(getIntProp(props, PROP_SHADOW_RADIUS, 1));
+    result.setTextShadowColor(getIntProp(props, PROP_SHADOW_COLOR, DEFAULT_TEXT_SHADOW_COLOR));
+    result.setTextTransform(getStringProp(props, PROP_TEXT_TRANSFORM));
+    result.setLayoutDirection(getStringProp(props, ViewProps.LAYOUT_DIRECTION));
+    result.setAccessibilityRole(getStringProp(props, ViewProps.ACCESSIBILITY_ROLE));
+    return result;
   }
 
   public static int getTextAlignment(ReactStylesDiffMap props, boolean isRTL) {
@@ -176,7 +288,8 @@ public static int getJustificationMode(ReactStylesDiffMap props) {
     return DEFAULT_JUSTIFICATION_MODE;
   }
 
-  private boolean getBooleanProp(String name, boolean defaultValue) {
+  private static boolean getBooleanProp(
+      ReactStylesDiffMap mProps, String name, boolean defaultValue) {
     if (mProps.hasKey(name)) {
       return mProps.getBoolean(name, defaultValue);
     } else {
@@ -184,7 +297,7 @@ private boolean getBooleanProp(String name, boolean defaultValue) {
     }
   }
 
-  private String getStringProp(String name) {
+  private static String getStringProp(ReactStylesDiffMap mProps, String name) {
     if (mProps.hasKey(name)) {
       return mProps.getString(name);
     } else {
@@ -192,7 +305,7 @@ private String getStringProp(String name) {
     }
   }
 
-  private int getIntProp(String name, int defaultvalue) {
+  private static int getIntProp(ReactStylesDiffMap mProps, String name, int defaultvalue) {
     if (mProps.hasKey(name)) {
       return mProps.getInt(name, defaultvalue);
     } else {
@@ -200,7 +313,7 @@ private int getIntProp(String name, int defaultvalue) {
     }
   }
 
-  private float getFloatProp(String name, float defaultvalue) {
+  private static float getFloatProp(ReactStylesDiffMap mProps, String name, float defaultvalue) {
     if (mProps.hasKey(name)) {
       return mProps.getFloat(name, defaultvalue);
     } else {
@@ -208,7 +321,7 @@ private float getFloatProp(String name, float defaultvalue) {
     }
   }
 
-  private @Nullable ReadableArray getArrayProp(String name) {
+  private static @Nullable ReadableArray getArrayProp(ReactStylesDiffMap mProps, String name) {
     if (mProps.hasKey(name)) {
       return mProps.getArray(name);
     } else {
@@ -226,11 +339,11 @@ public float getEffectiveLineHeight() {
     return useInlineViewHeight ? mHeightOfTallestInlineImage : mLineHeight;
   }
 
-  public void setNumberOfLines(int numberOfLines) {
+  private void setNumberOfLines(int numberOfLines) {
     mNumberOfLines = numberOfLines == 0 ? UNSET : numberOfLines;
   }
 
-  public void setLineHeight(float lineHeight) {
+  private void setLineHeight(float lineHeight) {
     mLineHeightInput = lineHeight;
     if (lineHeight == UNSET) {
       mLineHeight = Float.NaN;
@@ -242,7 +355,7 @@ public void setLineHeight(float lineHeight) {
     }
   }
 
-  public void setLetterSpacing(float letterSpacing) {
+  private void setLetterSpacing(float letterSpacing) {
     mLetterSpacingInput = letterSpacing;
   }
 
@@ -261,7 +374,7 @@ public float getLetterSpacing() {
     return letterSpacingPixels / mFontSize;
   }
 
-  public void setAllowFontScaling(boolean allowFontScaling) {
+  private void setAllowFontScaling(boolean allowFontScaling) {
     if (allowFontScaling != mAllowFontScaling) {
       mAllowFontScaling = allowFontScaling;
       setFontSize(mFontSizeInput);
@@ -270,7 +383,7 @@ public void setAllowFontScaling(boolean allowFontScaling) {
     }
   }
 
-  public void setFontSize(float fontSize) {
+  private void setFontSize(float fontSize) {
     mFontSizeInput = fontSize;
     if (fontSize != UNSET) {
       fontSize =
@@ -281,14 +394,14 @@ public void setFontSize(float fontSize) {
     mFontSize = (int) fontSize;
   }
 
-  public void setColor(@Nullable Integer color) {
+  private void setColor(@Nullable Integer color) {
     mIsColorSet = (color != null);
     if (mIsColorSet) {
       mColor = color;
     }
   }
 
-  public void setBackgroundColor(Integer color) {
+  private void setBackgroundColor(Integer color) {
     // TODO: Don't apply background color to anchor TextView since it will be applied on the View
     // directly
     // if (!isVirtualAnchor()) {
@@ -299,54 +412,61 @@ public void setBackgroundColor(Integer color) {
     // }
   }
 
-  public void setFontFamily(@Nullable String fontFamily) {
+  private void setFontFamily(@Nullable String fontFamily) {
     mFontFamily = fontFamily;
   }
 
-  public void setFontVariant(@Nullable ReadableArray fontVariant) {
+  private void setFontVariant(@Nullable ReadableArray fontVariant) {
     mFontFeatureSettings = ReactTypefaceUtils.parseFontVariant(fontVariant);
   }
 
-  /**
-   * /* This code is duplicated in ReactTextInputManager /* TODO: Factor into a common place they
-   * can both use
-   */
-  public void setFontWeight(@Nullable String fontWeightString) {
-    int fontWeightNumeric =
-        fontWeightString != null ? parseNumericFontWeight(fontWeightString) : -1;
-    int fontWeight = UNSET;
-    if (fontWeightNumeric >= 500 || "bold".equals(fontWeightString)) {
-      fontWeight = Typeface.BOLD;
-    } else if ("normal".equals(fontWeightString)
-        || (fontWeightNumeric != -1 && fontWeightNumeric < 500)) {
-      fontWeight = Typeface.NORMAL;
+  private void setFontVariant(@Nullable ReadableMapBuffer fontVariant) {
+    if (fontVariant == null || fontVariant.getCount() == 0) {
+      mFontFeatureSettings = null;
+      return;
     }
-    if (fontWeight != mFontWeight) {
-      mFontWeight = fontWeight;
+
+    List<String> features = new ArrayList<>();
+    Iterator<ReadableMapBuffer.MapBufferEntry> iterator = fontVariant.iterator();
+    while (iterator.hasNext()) {
+      ReadableMapBuffer.MapBufferEntry entry = iterator.next();
+      String value = entry.getString();
+      if (value != null) {
+        switch (value) {
+          case "small-caps":
+            features.add("'smcp'");
+            break;
+          case "oldstyle-nums":
+            features.add("'onum'");
+            break;
+          case "lining-nums":
+            features.add("'lnum'");
+            break;
+          case "tabular-nums":
+            features.add("'tnum'");
+            break;
+          case "proportional-nums":
+            features.add("'pnum'");
+            break;
+        }
+      }
     }
+    mFontFeatureSettings = TextUtils.join(", ", features);
   }
 
-  /**
-   * /* This code is duplicated in ReactTextInputManager /* TODO: Factor into a common place they
-   * can both use
-   */
-  public void setFontStyle(@Nullable String fontStyleString) {
-    int fontStyle = UNSET;
-    if ("italic".equals(fontStyleString)) {
-      fontStyle = Typeface.ITALIC;
-    } else if ("normal".equals(fontStyleString)) {
-      fontStyle = Typeface.NORMAL;
-    }
-    if (fontStyle != mFontStyle) {
-      mFontStyle = fontStyle;
-    }
+  private void setFontWeight(@Nullable String fontWeightString) {
+    mFontWeight = ReactTypefaceUtils.parseFontWeight(fontWeightString);
+  }
+
+  private void setFontStyle(@Nullable String fontStyleString) {
+    mFontStyle = ReactTypefaceUtils.parseFontStyle(fontStyleString);
   }
 
-  public void setIncludeFontPadding(boolean includepad) {
+  private void setIncludeFontPadding(boolean includepad) {
     mIncludeFontPadding = includepad;
   }
 
-  public void setTextDecorationLine(@Nullable String textDecorationLineString) {
+  private void setTextDecorationLine(@Nullable String textDecorationLineString) {
     mIsUnderlineTextDecorationSet = false;
     mIsLineThroughTextDecorationSet = false;
     if (textDecorationLineString != null) {
@@ -360,7 +480,7 @@ public void setTextDecorationLine(@Nullable String textDecorationLineString) {
     }
   }
 
-  public void setTextShadowOffset(ReadableMap offsetMap) {
+  private void setTextShadowOffset(ReadableMap offsetMap) {
     mTextShadowOffsetDx = 0;
     mTextShadowOffsetDy = 0;
 
@@ -378,32 +498,38 @@ public void setTextShadowOffset(ReadableMap offsetMap) {
     }
   }
 
-  public void setLayoutDirection(@Nullable String layoutDirection) {
+  public static int getLayoutDirection(@Nullable String layoutDirection) {
+    int androidLayoutDirection;
     if (layoutDirection == null || "undefined".equals(layoutDirection)) {
-      mLayoutDirection = UNSET;
+      androidLayoutDirection = UNSET;
     } else if ("rtl".equals(layoutDirection)) {
-      mLayoutDirection = LayoutDirection.RTL;
+      androidLayoutDirection = LayoutDirection.RTL;
     } else if ("ltr".equals(layoutDirection)) {
-      mLayoutDirection = LayoutDirection.LTR;
+      androidLayoutDirection = LayoutDirection.LTR;
     } else {
       throw new JSApplicationIllegalArgumentException(
           "Invalid layoutDirection: " + layoutDirection);
     }
+    return androidLayoutDirection;
+  }
+
+  private void setLayoutDirection(@Nullable String layoutDirection) {
+    mLayoutDirection = getLayoutDirection(layoutDirection);
   }
 
-  public void setTextShadowRadius(float textShadowRadius) {
+  private void setTextShadowRadius(float textShadowRadius) {
     if (textShadowRadius != mTextShadowRadius) {
       mTextShadowRadius = textShadowRadius;
     }
   }
 
-  public void setTextShadowColor(int textShadowColor) {
+  private void setTextShadowColor(int textShadowColor) {
     if (textShadowColor != mTextShadowColor) {
       mTextShadowColor = textShadowColor;
     }
   }
 
-  public void setTextTransform(@Nullable String textTransform) {
+  private void setTextTransform(@Nullable String textTransform) {
     if (textTransform == null || "none".equals(textTransform)) {
       mTextTransform = TextTransform.NONE;
     } else if ("uppercase".equals(textTransform)) {
@@ -417,7 +543,7 @@ public void setTextTransform(@Nullable String textTransform) {
     }
   }
 
-  public void setAccessibilityRole(@Nullable String accessibilityRole) {
+  private void setAccessibilityRole(@Nullable String accessibilityRole) {
     if (accessibilityRole != null) {
       mIsAccessibilityRoleSet = accessibilityRole != null;
       mAccessibilityRole =
@@ -442,58 +568,4 @@ public static int getTextBreakStrategy(@Nullable String textBreakStrategy) {
     }
     return androidTextBreakStrategy;
   }
-
-  /**
-   * Return -1 if the input string is not a valid numeric fontWeight (100, 200, ..., 900), otherwise
-   * return the weight.
-   *
-   * <p>This code is duplicated in ReactTextInputManager TODO: Factor into a common place they can
-   * both use
-   */
-  private static int parseNumericFontWeight(String fontWeightString) {
-    // This should be much faster than using regex to verify input and Integer.parseInt
-    return fontWeightString.length() == 3
-            && fontWeightString.endsWith("00")
-            && fontWeightString.charAt(0) <= '9'
-            && fontWeightString.charAt(0) >= '1'
-        ? 100 * (fontWeightString.charAt(0) - '0')
-        : -1;
-  }
-
-  // TODO T63645393 remove this from here and add support to RTL
-  private YogaDirection getLayoutDirection() {
-    return YogaDirection.LTR;
-  }
-
-  public float getBottomPadding() {
-    return getPaddingProp(ViewProps.PADDING_BOTTOM);
-  }
-
-  public float getLeftPadding() {
-    return getPaddingProp(ViewProps.PADDING_LEFT);
-  }
-
-  public float getStartPadding() {
-    return getPaddingProp(ViewProps.PADDING_START);
-  }
-
-  public float getEndPadding() {
-    return getPaddingProp(ViewProps.PADDING_END);
-  }
-
-  public float getTopPadding() {
-    return getPaddingProp(ViewProps.PADDING_TOP);
-  }
-
-  public float getRightPadding() {
-    return getPaddingProp(ViewProps.PADDING_RIGHT);
-  }
-
-  private float getPaddingProp(String paddingType) {
-    if (mProps.hasKey(ViewProps.PADDING)) {
-      return PixelUtil.toPixelFromDIP(getFloatProp(ViewProps.PADDING, 0f));
-    }
-
-    return PixelUtil.toPixelFromDIP(getFloatProp(paddingType, 0f));
-  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index 3b10c2c7d1c402..b0715e7d6be174 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -24,12 +24,13 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
@@ -64,20 +65,18 @@ public class TextLayoutManager {
   private static final String INCLUDE_FONT_PADDING_KEY = "includeFontPadding";
   private static final String TEXT_BREAK_STRATEGY_KEY = "textBreakStrategy";
   private static final String MAXIMUM_NUMBER_OF_LINES_KEY = "maximumNumberOfLines";
-  private static final LruCache<String, Spannable> sSpannableCache =
-      new LruCache<>(spannableCacheSize);
-  private static final LruCache<ReadableNativeMap, Spannable> sSpannableCacheV2 =
+  private static final LruCache<ReadableNativeMap, Spannable> sSpannableCache =
       new LruCache<>(spannableCacheSize);
   private static final ConcurrentHashMap<Integer, Spannable> sTagToSpannableCache =
       new ConcurrentHashMap<>();
 
   public static boolean isRTL(ReadableMap attributedString) {
     ReadableArray fragments = attributedString.getArray("fragments");
-    for (int i = 0, length = fragments.size(); i < length; i++) {
+    for (int i = 0; i < fragments.size(); i++) {
       ReadableMap fragment = fragments.getMap(i);
-      ReactStylesDiffMap map = new ReactStylesDiffMap(fragment.getMap("textAttributes"));
-      TextAttributeProps textAttributes = new TextAttributeProps(map);
-      return textAttributes.mLayoutDirection == LayoutDirection.RTL;
+      ReadableMap map = fragment.getMap("textAttributes");
+      return TextAttributeProps.getLayoutDirection(map.getString(ViewProps.LAYOUT_DIRECTION))
+          == LayoutDirection.RTL;
     }
     return false;
   }
@@ -108,7 +107,8 @@ private static void buildSpannableFromFragment(
 
       // ReactRawText
       TextAttributeProps textAttributes =
-          new TextAttributeProps(new ReactStylesDiffMap(fragment.getMap("textAttributes")));
+          TextAttributeProps.fromReadableMap(
+              new ReactStylesDiffMap(fragment.getMap("textAttributes")));
 
       sb.append(TextTransform.apply(fragment.getString("string"), textAttributes.mTextTransform));
 
@@ -139,12 +139,10 @@ private static void buildSpannableFromFragment(
               new SetSpanOperation(
                   start, end, new ReactBackgroundColorSpan(textAttributes.mBackgroundColor)));
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          if (!Float.isNaN(textAttributes.getLetterSpacing())) {
-            ops.add(
-                new SetSpanOperation(
-                    start, end, new CustomLetterSpacingSpan(textAttributes.getLetterSpacing())));
-          }
+        if (!Float.isNaN(textAttributes.getLetterSpacing())) {
+          ops.add(
+              new SetSpanOperation(
+                  start, end, new CustomLetterSpacingSpan(textAttributes.getLetterSpacing())));
         }
         ops.add(
             new SetSpanOperation(start, end, new ReactAbsoluteSizeSpan(textAttributes.mFontSize)));
@@ -197,25 +195,11 @@ public static Spannable getOrCreateSpannableForText(
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
 
     Spannable preparedSpannableText;
-    String attributedStringPayload = "";
-
-    boolean cacheByReadableNativeMap =
-        ReactFeatureFlags.enableSpannableCacheByReadableNativeMapEquality;
-    // TODO: T74600554 Cleanup this experiment once positive impact is confirmed in production
-    if (cacheByReadableNativeMap) {
-      synchronized (sSpannableCacheLock) {
-        preparedSpannableText = sSpannableCacheV2.get((ReadableNativeMap) attributedString);
-        if (preparedSpannableText != null) {
-          return preparedSpannableText;
-        }
-      }
-    } else {
-      attributedStringPayload = attributedString.toString();
-      synchronized (sSpannableCacheLock) {
-        preparedSpannableText = sSpannableCache.get(attributedStringPayload);
-        if (preparedSpannableText != null) {
-          return preparedSpannableText;
-        }
+
+    synchronized (sSpannableCacheLock) {
+      preparedSpannableText = sSpannableCache.get((ReadableNativeMap) attributedString);
+      if (preparedSpannableText != null) {
+        return preparedSpannableText;
       }
     }
 
@@ -223,15 +207,10 @@ public static Spannable getOrCreateSpannableForText(
         createSpannableFromAttributedString(
             context, attributedString, reactTextViewManagerCallback);
 
-    if (cacheByReadableNativeMap) {
-      synchronized (sSpannableCacheLock) {
-        sSpannableCacheV2.put((ReadableNativeMap) attributedString, preparedSpannableText);
-      }
-    } else {
-      synchronized (sSpannableCacheLock) {
-        sSpannableCache.put(attributedStringPayload, preparedSpannableText);
-      }
+    synchronized (sSpannableCacheLock) {
+      sSpannableCache.put((ReadableNativeMap) attributedString, preparedSpannableText);
     }
+
     return preparedSpannableText;
   }
 
@@ -307,13 +286,20 @@ private static Layout createLayout(
       }
 
     } else if (boring != null && (unconstrainedWidth || boring.width <= width)) {
+      int boringLayoutWidth = boring.width;
+      if (boring.width < 0) {
+        ReactSoftExceptionLogger.logSoftException(
+            TAG, new ReactNoCrashSoftException("Text width is invalid: " + boring.width));
+        boringLayoutWidth = 0;
+      }
+
       // Is used for single-line, boring text when the width is either unknown or bigger
       // than the width of the text.
       layout =
           BoringLayout.make(
               text,
               textPaint,
-              boring.width,
+              boringLayoutWidth,
               Layout.Alignment.ALIGN_NORMAL,
               1.f,
               0.f,
@@ -398,10 +384,6 @@ public static long measureText(
     }
 
     BoringLayout.Metrics boring = BoringLayout.isBoring(text, textPaint);
-    float desiredWidth = boring == null ? Layout.getDesiredWidth(text, textPaint) : Float.NaN;
-
-    // technically, width should never be negative, but there is currently a bug in
-    boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
 
     Layout layout =
         createLayout(
@@ -511,16 +493,16 @@ public static long measureText(
 
           // The attachment array returns the positions of each of the attachments as
           attachmentsPositions[attachmentPosition] =
-              PixelUtil.toSPFromPixel(placeholderTopPosition);
+              PixelUtil.toDIPFromPixel(placeholderTopPosition);
           attachmentsPositions[attachmentPosition + 1] =
-              PixelUtil.toSPFromPixel(placeholderLeftPosition);
+              PixelUtil.toDIPFromPixel(placeholderLeftPosition);
           attachmentIndex++;
         }
       }
     }
 
-    float widthInSP = PixelUtil.toSPFromPixel(calculatedWidth);
-    float heightInSP = PixelUtil.toSPFromPixel(calculatedHeight);
+    float widthInSP = PixelUtil.toDIPFromPixel(calculatedWidth);
+    float heightInSP = PixelUtil.toDIPFromPixel(calculatedHeight);
 
     if (ENABLE_MEASURE_LOGGING) {
       FLog.e(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
new file mode 100644
index 00000000000000..1e5287708a0c04
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -0,0 +1,596 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.text;
+
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
+import android.content.Context;
+import android.os.Build;
+import android.text.BoringLayout;
+import android.text.Layout;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.util.LayoutDirection;
+import android.util.LruCache;
+import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactAccessibilityDelegate;
+import com.facebook.yoga.YogaConstants;
+import com.facebook.yoga.YogaMeasureMode;
+import com.facebook.yoga.YogaMeasureOutput;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/** Class responsible of creating {@link Spanned} object for the JS representation of Text */
+public class TextLayoutManagerMapBuffer {
+
+  // constants for AttributedString serialization
+  public static final short AS_KEY_HASH = 0;
+  public static final short AS_KEY_STRING = 1;
+  public static final short AS_KEY_FRAGMENTS = 2;
+  public static final short AS_KEY_CACHE_ID = 3;
+
+  // constants for Fragment serialization
+  public static final short FR_KEY_STRING = 0;
+  public static final short FR_KEY_REACT_TAG = 1;
+  public static final short FR_KEY_IS_ATTACHMENT = 2;
+  public static final short FR_KEY_WIDTH = 3;
+  public static final short FR_KEY_HEIGHT = 4;
+  public static final short FR_KEY_TEXT_ATTRIBUTES = 5;
+
+  // constants for ParagraphAttributes serialization
+  public static final short PA_KEY_MAX_NUMBER_OF_LINES = 0;
+  public static final short PA_KEY_ELLIPSIZE_MODE = 1;
+  public static final short PA_KEY_TEXT_BREAK_STRATEGY = 2;
+  public static final short PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
+  public static final short PA_KEY_INCLUDE_FONT_PADDING = 4;
+
+  private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false;
+
+  private static final String TAG = TextLayoutManagerMapBuffer.class.getSimpleName();
+
+  // It's important to pass the ANTI_ALIAS_FLAG flag to the constructor rather than setting it
+  // later by calling setFlags. This is because the latter approach triggers a bug on Android 4.4.2.
+  // The bug is that unicode emoticons aren't measured properly which causes text to be clipped.
+  private static final TextPaint sTextPaintInstance = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+
+  // Specifies the amount of spannable that are stored into the {@link sSpannableCache}.
+  private static final short spannableCacheSize = 100;
+
+  private static final String INLINE_VIEW_PLACEHOLDER = "0";
+
+  private static final Object sSpannableCacheLock = new Object();
+  private static final boolean DEFAULT_INCLUDE_FONT_PADDING = true;
+  private static final LruCache<ReadableMapBuffer, Spannable> sSpannableCache =
+      new LruCache<>(spannableCacheSize);
+  private static final ConcurrentHashMap<Integer, Spannable> sTagToSpannableCache =
+      new ConcurrentHashMap<>();
+
+  public static void setCachedSpannabledForTag(int reactTag, @NonNull Spannable sp) {
+    if (ENABLE_MEASURE_LOGGING) {
+      FLog.e(TAG, "Set cached spannable for tag[" + reactTag + "]: " + sp.toString());
+    }
+    sTagToSpannableCache.put(reactTag, sp);
+  }
+
+  public static void deleteCachedSpannableForTag(int reactTag) {
+    if (ENABLE_MEASURE_LOGGING) {
+      FLog.e(TAG, "Delete cached spannable for tag[" + reactTag + "]");
+    }
+    sTagToSpannableCache.remove(reactTag);
+  }
+
+  public static boolean isRTL(ReadableMapBuffer attributedString) {
+    ReadableMapBuffer fragments = attributedString.getMapBuffer(AS_KEY_FRAGMENTS);
+    if (fragments.getCount() == 0) {
+      return false;
+    }
+
+    ReadableMapBuffer fragment = fragments.getMapBuffer((short) 0);
+    ReadableMapBuffer textAttributes = fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES);
+    return TextAttributeProps.getLayoutDirection(
+            textAttributes.getString(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION))
+        == LayoutDirection.RTL;
+  }
+
+  private static void buildSpannableFromFragment(
+      Context context,
+      ReadableMapBuffer fragments,
+      SpannableStringBuilder sb,
+      List<SetSpanOperation> ops) {
+
+    for (short i = 0, length = fragments.getCount(); i < length; i++) {
+      ReadableMapBuffer fragment = fragments.getMapBuffer(i);
+      int start = sb.length();
+
+      TextAttributeProps textAttributes =
+          TextAttributeProps.fromReadableMapBuffer(fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES));
+
+      sb.append(
+          TextTransform.apply(fragment.getString(FR_KEY_STRING), textAttributes.mTextTransform));
+
+      int end = sb.length();
+      int reactTag =
+          fragment.hasKey(FR_KEY_REACT_TAG) ? fragment.getInt(FR_KEY_REACT_TAG) : View.NO_ID;
+      if (fragment.hasKey(FR_KEY_IS_ATTACHMENT) && fragment.getBoolean(FR_KEY_IS_ATTACHMENT)) {
+        float width = PixelUtil.toPixelFromSP(fragment.getDouble(FR_KEY_WIDTH));
+        float height = PixelUtil.toPixelFromSP(fragment.getDouble(FR_KEY_HEIGHT));
+        ops.add(
+            new SetSpanOperation(
+                sb.length() - INLINE_VIEW_PLACEHOLDER.length(),
+                sb.length(),
+                new TextInlineViewPlaceholderSpan(reactTag, (int) width, (int) height)));
+      } else if (end >= start) {
+        if (ReactAccessibilityDelegate.AccessibilityRole.LINK.equals(
+            textAttributes.mAccessibilityRole)) {
+          ops.add(
+              new SetSpanOperation(
+                  start, end, new ReactClickableSpan(reactTag, textAttributes.mColor)));
+        } else if (textAttributes.mIsColorSet) {
+          ops.add(
+              new SetSpanOperation(
+                  start, end, new ReactForegroundColorSpan(textAttributes.mColor)));
+        }
+        if (textAttributes.mIsBackgroundColorSet) {
+          ops.add(
+              new SetSpanOperation(
+                  start, end, new ReactBackgroundColorSpan(textAttributes.mBackgroundColor)));
+        }
+        if (!Float.isNaN(textAttributes.getLetterSpacing())) {
+          ops.add(
+              new SetSpanOperation(
+                  start, end, new CustomLetterSpacingSpan(textAttributes.getLetterSpacing())));
+        }
+        ops.add(
+            new SetSpanOperation(start, end, new ReactAbsoluteSizeSpan(textAttributes.mFontSize)));
+        if (textAttributes.mFontStyle != UNSET
+            || textAttributes.mFontWeight != UNSET
+            || textAttributes.mFontFamily != null) {
+          ops.add(
+              new SetSpanOperation(
+                  start,
+                  end,
+                  new CustomStyleSpan(
+                      textAttributes.mFontStyle,
+                      textAttributes.mFontWeight,
+                      textAttributes.mFontFeatureSettings,
+                      textAttributes.mFontFamily,
+                      context.getAssets())));
+        }
+        if (textAttributes.mIsUnderlineTextDecorationSet) {
+          ops.add(new SetSpanOperation(start, end, new ReactUnderlineSpan()));
+        }
+        if (textAttributes.mIsLineThroughTextDecorationSet) {
+          ops.add(new SetSpanOperation(start, end, new ReactStrikethroughSpan()));
+        }
+        if (textAttributes.mTextShadowOffsetDx != 0 || textAttributes.mTextShadowOffsetDy != 0) {
+          ops.add(
+              new SetSpanOperation(
+                  start,
+                  end,
+                  new ShadowStyleSpan(
+                      textAttributes.mTextShadowOffsetDx,
+                      textAttributes.mTextShadowOffsetDy,
+                      textAttributes.mTextShadowRadius,
+                      textAttributes.mTextShadowColor)));
+        }
+        if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
+          ops.add(
+              new SetSpanOperation(
+                  start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
+        }
+
+        ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
+      }
+    }
+  }
+
+  // public because both ReactTextViewManager and ReactTextInputManager need to use this
+  public static Spannable getOrCreateSpannableForText(
+      Context context,
+      ReadableMapBuffer attributedString,
+      @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
+
+    Spannable preparedSpannableText;
+
+    synchronized (sSpannableCacheLock) {
+      preparedSpannableText = sSpannableCache.get(attributedString);
+      if (preparedSpannableText != null) {
+        return preparedSpannableText;
+      }
+    }
+
+    preparedSpannableText =
+        createSpannableFromAttributedString(
+            context, attributedString, reactTextViewManagerCallback);
+
+    synchronized (sSpannableCacheLock) {
+      sSpannableCache.put(attributedString, preparedSpannableText);
+    }
+
+    return preparedSpannableText;
+  }
+
+  private static Spannable createSpannableFromAttributedString(
+      Context context,
+      ReadableMapBuffer attributedString,
+      @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
+
+    SpannableStringBuilder sb = new SpannableStringBuilder();
+
+    // The {@link SpannableStringBuilder} implementation require setSpan operation to be called
+    // up-to-bottom, otherwise all the spannables that are within the region for which one may set
+    // a new spannable will be wiped out
+    List<SetSpanOperation> ops = new ArrayList<>();
+
+    buildSpannableFromFragment(context, attributedString.getMapBuffer(AS_KEY_FRAGMENTS), sb, ops);
+
+    // TODO T31905686: add support for inline Images
+    // While setting the Spans on the final text, we also check whether any of them are images.
+    int priority = 0;
+    for (SetSpanOperation op : ops) {
+      // Actual order of calling {@code execute} does NOT matter,
+      // but the {@code priority} DOES matter.
+      op.execute(sb, priority);
+      priority++;
+    }
+
+    if (reactTextViewManagerCallback != null) {
+      reactTextViewManagerCallback.onPostProcessSpannable(sb);
+    }
+    return sb;
+  }
+
+  private static Layout createLayout(
+      Spannable text,
+      BoringLayout.Metrics boring,
+      float width,
+      YogaMeasureMode widthYogaMeasureMode,
+      boolean includeFontPadding,
+      int textBreakStrategy) {
+    Layout layout;
+    int spanLength = text.length();
+    boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
+    TextPaint textPaint = sTextPaintInstance;
+    float desiredWidth = boring == null ? Layout.getDesiredWidth(text, textPaint) : Float.NaN;
+
+    if (boring == null
+        && (unconstrainedWidth
+            || (!YogaConstants.isUndefined(desiredWidth) && desiredWidth <= width))) {
+      // Is used when the width is not known and the text is not boring, ie. if it contains
+      // unicode characters.
+
+      int hintWidth = (int) Math.ceil(desiredWidth);
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+        layout =
+            new StaticLayout(
+                text,
+                textPaint,
+                hintWidth,
+                Layout.Alignment.ALIGN_NORMAL,
+                1.f,
+                0.f,
+                includeFontPadding);
+      } else {
+        layout =
+            StaticLayout.Builder.obtain(text, 0, spanLength, textPaint, hintWidth)
+                .setAlignment(Layout.Alignment.ALIGN_NORMAL)
+                .setLineSpacing(0.f, 1.f)
+                .setIncludePad(includeFontPadding)
+                .setBreakStrategy(textBreakStrategy)
+                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .build();
+      }
+
+    } else if (boring != null && (unconstrainedWidth || boring.width <= width)) {
+      int boringLayoutWidth = boring.width;
+      if (boring.width < 0) {
+        ReactSoftExceptionLogger.logSoftException(
+            TAG, new ReactNoCrashSoftException("Text width is invalid: " + boring.width));
+        boringLayoutWidth = 0;
+      }
+      // Is used for single-line, boring text when the width is either unknown or bigger
+      // than the width of the text.
+      layout =
+          BoringLayout.make(
+              text,
+              textPaint,
+              boringLayoutWidth,
+              Layout.Alignment.ALIGN_NORMAL,
+              1.f,
+              0.f,
+              boring,
+              includeFontPadding);
+    } else {
+      // Is used for multiline, boring text and the width is known.
+
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+        layout =
+            new StaticLayout(
+                text,
+                textPaint,
+                (int) width,
+                Layout.Alignment.ALIGN_NORMAL,
+                1.f,
+                0.f,
+                includeFontPadding);
+      } else {
+        StaticLayout.Builder builder =
+            StaticLayout.Builder.obtain(text, 0, spanLength, textPaint, (int) width)
+                .setAlignment(Layout.Alignment.ALIGN_NORMAL)
+                .setLineSpacing(0.f, 1.f)
+                .setIncludePad(includeFontPadding)
+                .setBreakStrategy(textBreakStrategy)
+                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+          builder.setUseLineSpacingFromFallbacks(true);
+        }
+
+        layout = builder.build();
+      }
+    }
+    return layout;
+  }
+
+  public static long measureText(
+      Context context,
+      ReadableMapBuffer attributedString,
+      ReadableMapBuffer paragraphAttributes,
+      float width,
+      YogaMeasureMode widthYogaMeasureMode,
+      float height,
+      YogaMeasureMode heightYogaMeasureMode,
+      ReactTextViewManagerCallback reactTextViewManagerCallback,
+      @Nullable float[] attachmentsPositions) {
+
+    // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
+    TextPaint textPaint = sTextPaintInstance;
+    Spannable text;
+    if (attributedString.hasKey(AS_KEY_CACHE_ID)) {
+      int cacheId = attributedString.getInt(AS_KEY_CACHE_ID);
+      if (ENABLE_MEASURE_LOGGING) {
+        FLog.e(TAG, "Get cached spannable for cacheId[" + cacheId + "]");
+      }
+      if (sTagToSpannableCache.containsKey(cacheId)) {
+        text = sTagToSpannableCache.get(cacheId);
+        if (ENABLE_MEASURE_LOGGING) {
+          FLog.e(TAG, "Text for spannable found for cacheId[" + cacheId + "]: " + text.toString());
+        }
+      } else {
+        if (ENABLE_MEASURE_LOGGING) {
+          FLog.e(TAG, "No cached spannable found for cacheId[" + cacheId + "]");
+        }
+        return 0;
+      }
+    } else {
+      text = getOrCreateSpannableForText(context, attributedString, reactTextViewManagerCallback);
+    }
+
+    int textBreakStrategy =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(PA_KEY_TEXT_BREAK_STRATEGY));
+    boolean includeFontPadding =
+        paragraphAttributes.hasKey(PA_KEY_INCLUDE_FONT_PADDING)
+            ? paragraphAttributes.getBoolean(PA_KEY_INCLUDE_FONT_PADDING)
+            : DEFAULT_INCLUDE_FONT_PADDING;
+
+    if (text == null) {
+      throw new IllegalStateException("Spannable element has not been prepared in onBeforeLayout");
+    }
+
+    BoringLayout.Metrics boring = BoringLayout.isBoring(text, textPaint);
+    float desiredWidth = boring == null ? Layout.getDesiredWidth(text, textPaint) : Float.NaN;
+
+    // technically, width should never be negative, but there is currently a bug in
+    boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
+
+    Layout layout =
+        createLayout(
+            text, boring, width, widthYogaMeasureMode, includeFontPadding, textBreakStrategy);
+
+    int maximumNumberOfLines =
+        paragraphAttributes.hasKey(PA_KEY_MAX_NUMBER_OF_LINES)
+            ? paragraphAttributes.getInt(PA_KEY_MAX_NUMBER_OF_LINES)
+            : UNSET;
+
+    int calculatedLineCount =
+        maximumNumberOfLines == UNSET || maximumNumberOfLines == 0
+            ? layout.getLineCount()
+            : Math.min(maximumNumberOfLines, layout.getLineCount());
+
+    // Instead of using `layout.getWidth()` (which may yield a significantly larger width for
+    // text that is wrapping), compute width using the longest line.
+    float calculatedWidth = 0;
+    if (widthYogaMeasureMode == YogaMeasureMode.EXACTLY) {
+      calculatedWidth = width;
+    } else {
+      for (int lineIndex = 0; lineIndex < calculatedLineCount; lineIndex++) {
+        float lineWidth = layout.getLineWidth(lineIndex);
+        if (lineWidth > calculatedWidth) {
+          calculatedWidth = lineWidth;
+        }
+      }
+      if (widthYogaMeasureMode == YogaMeasureMode.AT_MOST && calculatedWidth > width) {
+        calculatedWidth = width;
+      }
+    }
+
+    float calculatedHeight = height;
+    if (heightYogaMeasureMode != YogaMeasureMode.EXACTLY) {
+      calculatedHeight = layout.getLineBottom(calculatedLineCount - 1);
+      if (heightYogaMeasureMode == YogaMeasureMode.AT_MOST && calculatedHeight > height) {
+        calculatedHeight = height;
+      }
+    }
+
+    // Calculate the positions of the attachments (views) that will be rendered inside the
+    // Spanned Text. The following logic is only executed when a text contains views inside.
+    // This follows a similar logic than used in pre-fabric (see ReactTextView.onLayout method).
+    int attachmentIndex = 0;
+    int lastAttachmentFoundInSpan;
+    for (int i = 0; i < text.length(); i = lastAttachmentFoundInSpan) {
+      lastAttachmentFoundInSpan =
+          text.nextSpanTransition(i, text.length(), TextInlineViewPlaceholderSpan.class);
+      TextInlineViewPlaceholderSpan[] placeholders =
+          text.getSpans(i, lastAttachmentFoundInSpan, TextInlineViewPlaceholderSpan.class);
+      for (TextInlineViewPlaceholderSpan placeholder : placeholders) {
+        int start = text.getSpanStart(placeholder);
+        int line = layout.getLineForOffset(start);
+        boolean isLineTruncated = layout.getEllipsisCount(line) > 0;
+        // This truncation check works well on recent versions of Android (tested on 5.1.1 and
+        // 6.0.1) but not on Android 4.4.4. The reason is that getEllipsisCount is buggy on
+        // Android 4.4.4. Specifically, it incorrectly returns 0 if an inline view is the
+        // first thing to be truncated.
+        if (!(isLineTruncated && start >= layout.getLineStart(line) + layout.getEllipsisStart(line))
+            || start >= layout.getLineEnd(line)) {
+          float placeholderWidth = placeholder.getWidth();
+          float placeholderHeight = placeholder.getHeight();
+          // Calculate if the direction of the placeholder character is Right-To-Left.
+          boolean isRtlChar = layout.isRtlCharAt(start);
+          boolean isRtlParagraph = layout.getParagraphDirection(line) == Layout.DIR_RIGHT_TO_LEFT;
+          float placeholderLeftPosition;
+          // There's a bug on Samsung devices where calling getPrimaryHorizontal on
+          // the last offset in the layout will result in an endless loop. Work around
+          // this bug by avoiding getPrimaryHorizontal in that case.
+          if (start == text.length() - 1) {
+            placeholderLeftPosition =
+                isRtlParagraph
+                    // Equivalent to `layout.getLineLeft(line)` but `getLineLeft` returns
+                    // incorrect
+                    // values when the paragraph is RTL and `setSingleLine(true)`.
+                    ? calculatedWidth - layout.getLineWidth(line)
+                    : layout.getLineRight(line) - placeholderWidth;
+          } else {
+            // The direction of the paragraph may not be exactly the direction the string is
+            // heading
+            // in at the
+            // position of the placeholder. So, if the direction of the character is the same
+            // as the
+            // paragraph
+            // use primary, secondary otherwise.
+            boolean characterAndParagraphDirectionMatch = isRtlParagraph == isRtlChar;
+            placeholderLeftPosition =
+                characterAndParagraphDirectionMatch
+                    ? layout.getPrimaryHorizontal(start)
+                    : layout.getSecondaryHorizontal(start);
+            if (isRtlParagraph) {
+              // Adjust `placeholderLeftPosition` to work around an Android bug.
+              // The bug is when the paragraph is RTL and `setSingleLine(true)`, some layout
+              // methods such as `getPrimaryHorizontal`, `getSecondaryHorizontal`, and
+              // `getLineRight` return incorrect values. Their return values seem to be off
+              // by the same number of pixels so subtracting these values cancels out the
+              // error.
+              //
+              // The result is equivalent to bugless versions of
+              // `getPrimaryHorizontal`/`getSecondaryHorizontal`.
+              placeholderLeftPosition =
+                  calculatedWidth - (layout.getLineRight(line) - placeholderLeftPosition);
+            }
+            if (isRtlChar) {
+              placeholderLeftPosition -= placeholderWidth;
+            }
+          }
+          // Vertically align the inline view to the baseline of the line of text.
+          float placeholderTopPosition = layout.getLineBaseline(line) - placeholderHeight;
+          int attachmentPosition = attachmentIndex * 2;
+
+          // The attachment array returns the positions of each of the attachments as
+          attachmentsPositions[attachmentPosition] =
+              PixelUtil.toDIPFromPixel(placeholderTopPosition);
+          attachmentsPositions[attachmentPosition + 1] =
+              PixelUtil.toDIPFromPixel(placeholderLeftPosition);
+          attachmentIndex++;
+        }
+      }
+    }
+
+    float widthInSP = PixelUtil.toDIPFromPixel(calculatedWidth);
+    float heightInSP = PixelUtil.toDIPFromPixel(calculatedHeight);
+
+    if (ENABLE_MEASURE_LOGGING) {
+      FLog.e(
+          TAG,
+          "TextMeasure call ('"
+              + text
+              + "'): w: "
+              + calculatedWidth
+              + " px - h: "
+              + calculatedHeight
+              + " px - w : "
+              + widthInSP
+              + " sp - h: "
+              + heightInSP
+              + " sp");
+    }
+
+    return YogaMeasureOutput.make(widthInSP, heightInSP);
+  }
+
+  public static WritableArray measureLines(
+      @NonNull Context context,
+      ReadableMapBuffer attributedString,
+      ReadableMapBuffer paragraphAttributes,
+      float width) {
+
+    TextPaint textPaint = sTextPaintInstance;
+    Spannable text = getOrCreateSpannableForText(context, attributedString, null);
+    BoringLayout.Metrics boring = BoringLayout.isBoring(text, textPaint);
+
+    int textBreakStrategy =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(PA_KEY_TEXT_BREAK_STRATEGY));
+    boolean includeFontPadding =
+        paragraphAttributes.hasKey(PA_KEY_INCLUDE_FONT_PADDING)
+            ? paragraphAttributes.getBoolean(PA_KEY_INCLUDE_FONT_PADDING)
+            : DEFAULT_INCLUDE_FONT_PADDING;
+
+    Layout layout =
+        createLayout(
+            text, boring, width, YogaMeasureMode.EXACTLY, includeFontPadding, textBreakStrategy);
+    return FontMetricsUtil.getFontMetrics(text, layout, sTextPaintInstance, context);
+  }
+
+  // TODO T31905686: This class should be private
+  public static class SetSpanOperation {
+    protected int start, end;
+    protected ReactSpan what;
+
+    public SetSpanOperation(int start, int end, ReactSpan what) {
+      this.start = start;
+      this.end = end;
+      this.what = what;
+    }
+
+    public void execute(Spannable sb, int priority) {
+      // All spans will automatically extend to the right of the text, but not the left - except
+      // for spans that start at the beginning of the text.
+      int spanFlags = Spannable.SPAN_EXCLUSIVE_INCLUSIVE;
+      if (start == 0) {
+        spanFlags = Spannable.SPAN_INCLUSIVE_INCLUSIVE;
+      }
+
+      spanFlags &= ~Spannable.SPAN_PRIORITY;
+      spanFlags |= (priority << Spannable.SPAN_PRIORITY_SHIFT) & Spannable.SPAN_PRIORITY;
+
+      sb.setSpan(what, start, end, spanFlags);
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TypefaceStyle.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TypefaceStyle.java
new file mode 100644
index 00000000000000..3119ae63afd64c
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TypefaceStyle.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.text;
+
+import android.graphics.Typeface;
+import android.os.Build;
+import com.facebook.infer.annotation.Nullsafe;
+
+/** Responsible for normalizing style and numeric weight for backward compatibility. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
+class TypefaceStyle {
+
+  public static final int BOLD = 700;
+  public static final int NORMAL = 400;
+
+  private static final int MIN_WEIGHT = 1;
+  private static final int MAX_WEIGHT = 1000;
+
+  private final boolean mItalic;
+  private final int mWeight;
+
+  public TypefaceStyle(int weight, boolean italic) {
+    mItalic = italic;
+    mWeight = weight == ReactBaseTextShadowNode.UNSET ? NORMAL : weight;
+  }
+
+  public TypefaceStyle(int style) {
+    if (style == ReactBaseTextShadowNode.UNSET) {
+      style = Typeface.NORMAL;
+    }
+
+    mItalic = (style & Typeface.ITALIC) != 0;
+    mWeight = (style & Typeface.BOLD) != 0 ? BOLD : NORMAL;
+  }
+
+  /**
+   * If `weight` is supplied, it will be combined with the italic bit from `style`. Otherwise, any
+   * existing weight bit in `style` will be used.
+   */
+  public TypefaceStyle(int style, int weight) {
+    if (style == ReactBaseTextShadowNode.UNSET) {
+      style = Typeface.NORMAL;
+    }
+
+    mItalic = (style & Typeface.ITALIC) != 0;
+    mWeight =
+        weight == ReactBaseTextShadowNode.UNSET
+            ? (style & Typeface.BOLD) != 0 ? BOLD : NORMAL
+            : weight;
+  }
+
+  public int getNearestStyle() {
+    if (mWeight < BOLD) {
+      return mItalic ? Typeface.ITALIC : Typeface.NORMAL;
+    } else {
+      return mItalic ? Typeface.BOLD_ITALIC : Typeface.BOLD;
+    }
+  }
+
+  public Typeface apply(Typeface typeface) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+      return Typeface.create(typeface, getNearestStyle());
+    } else {
+      return Typeface.create(typeface, mWeight, mItalic);
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK
index fef31ebea6c4aa..38985bbf96b449 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 rn_android_library(
     name = "frescosupport",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
index 3b408b3d319e69..b8de4f2fe89496 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 rn_android_library(
     name = "textinput",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
@@ -14,6 +15,7 @@ rn_android_library(
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_dep("third-party/android/androidx:autofill"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
index 432347821a9a32..9d0d205a5f23bc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by EditText native view when content size changes. */
 public class ReactContentSizeChangedEvent extends Event<ReactTextChangedEvent> {
@@ -20,8 +20,14 @@ public class ReactContentSizeChangedEvent extends Event<ReactTextChangedEvent> {
   private float mContentWidth;
   private float mContentHeight;
 
+  @Deprecated
   public ReactContentSizeChangedEvent(int viewId, float contentSizeWidth, float contentSizeHeight) {
-    super(viewId);
+    this(-1, viewId, contentSizeWidth, contentSizeHeight);
+  }
+
+  public ReactContentSizeChangedEvent(
+      int surfaceId, int viewId, float contentSizeWidth, float contentSizeHeight) {
+    super(surfaceId, viewId);
     mContentWidth = contentSizeWidth;
     mContentHeight = contentSizeHeight;
   }
@@ -31,12 +37,9 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
 
     WritableMap contentSize = Arguments.createMap();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index db843323724aa0..84d5942d2cfc1a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -36,15 +36,16 @@
 import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
-import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.uimanager.FabricViewStateManager;
+import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.views.text.CustomLetterSpacingSpan;
 import com.facebook.react.views.text.CustomLineHeightSpan;
 import com.facebook.react.views.text.CustomStyleSpan;
@@ -106,8 +107,8 @@ public class ReactEditText extends AppCompatEditText
   private TextAttributes mTextAttributes;
   private boolean mTypefaceDirty = false;
   private @Nullable String mFontFamily = null;
-  private int mFontWeight = ReactTypefaceUtils.UNSET;
-  private int mFontStyle = ReactTypefaceUtils.UNSET;
+  private int mFontWeight = UNSET;
+  private int mFontStyle = UNSET;
   private boolean mAutoFocus = false;
   private boolean mDidAttachToWindow = false;
 
@@ -119,6 +120,7 @@ public class ReactEditText extends AppCompatEditText
   protected boolean mIsSettingTextFromState = false;
 
   private static final KeyListener sKeyListener = QwertyKeyListener.getInstanceForFullKeyboard();
+  private @Nullable EventDispatcher mEventDispatcher;
 
   public ReactEditText(Context context) {
     super(context);
@@ -153,7 +155,7 @@ public ReactEditText(Context context) {
 
     ViewCompat.setAccessibilityDelegate(
         this,
-        new AccessibilityDelegateCompat() {
+        new ReactAccessibilityDelegate() {
           @Override
           public boolean performAccessibilityAction(View host, int action, Bundle args) {
             if (action == AccessibilityNodeInfo.ACTION_CLICK) {
@@ -247,7 +249,8 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
     InputConnection inputConnection = super.onCreateInputConnection(outAttrs);
     if (inputConnection != null && mOnKeyPress) {
       inputConnection =
-          new ReactEditTextInputConnectionWrapper(inputConnection, reactContext, this);
+          new ReactEditTextInputConnectionWrapper(
+              inputConnection, reactContext, this, mEventDispatcher);
     }
 
     if (isMultiline() && getBlurOnSubmit()) {
@@ -328,10 +331,20 @@ public void maybeSetSelection(int eventCounter, int start, int end) {
     }
 
     if (start != UNSET && end != UNSET) {
+      // clamp selection values for safety
+      start = clampToTextLength(start);
+      end = clampToTextLength(end);
+
       setSelection(start, end);
     }
   }
 
+  private int clampToTextLength(int value) {
+    int textLength = getText() == null ? 0 : getText().length();
+
+    return Math.max(0, Math.min(value, textLength));
+  }
+
   @Override
   public void setSelection(int start, int end) {
     if (DEBUG_MODE) {
@@ -419,11 +432,10 @@ public String getReturnKeyType() {
   @Override
   public void setInputType(int type) {
     Typeface tf = super.getTypeface();
-    // Input type password defaults to monospace font, so we need to re-apply the font
-    super.setTypeface(tf);
-
     super.setInputType(type);
     mStagedInputType = type;
+    // Input type password defaults to monospace font, so we need to re-apply the font
+    super.setTypeface(tf);
 
     /**
      * If set forces multiline on input, because of a restriction on Android source that enables
@@ -655,12 +667,10 @@ private void addSpansForMeasurement(Spannable spannable) {
 
     List<TextLayoutManager.SetSpanOperation> ops = new ArrayList<>();
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      if (!Float.isNaN(mTextAttributes.getLetterSpacing())) {
-        ops.add(
-            new TextLayoutManager.SetSpanOperation(
-                start, end, new CustomLetterSpacingSpan(mTextAttributes.getLetterSpacing())));
-      }
+    if (!Float.isNaN(mTextAttributes.getLetterSpacing())) {
+      ops.add(
+          new TextLayoutManager.SetSpanOperation(
+              start, end, new CustomLetterSpacingSpan(mTextAttributes.getLetterSpacing())));
     }
     ops.add(
         new TextLayoutManager.SetSpanOperation(
@@ -734,8 +744,9 @@ private void setIntrinsicContentSize() {
     // wrapper 100% of the time.
     // Since the LocalData object is constructed by getting values from the underlying EditText
     // view, we don't need to construct one or apply it at all - it provides no use in Fabric.
-    if (!mFabricViewStateManager.hasStateWrapper()) {
-      ReactContext reactContext = getReactContext(this);
+    ReactContext reactContext = getReactContext(this);
+
+    if (!mFabricViewStateManager.hasStateWrapper() && !reactContext.isBridgeless()) {
       final ReactTextInputLocalData localData = new ReactTextInputLocalData(this);
       UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
       if (uiManager != null) {
@@ -948,11 +959,9 @@ protected void applyTextAttributes() {
     // `Float.NaN`.
     setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextAttributes.getEffectiveFontSize());
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      float effectiveLetterSpacing = mTextAttributes.getEffectiveLetterSpacing();
-      if (!Float.isNaN(effectiveLetterSpacing)) {
-        setLetterSpacing(effectiveLetterSpacing);
-      }
+    float effectiveLetterSpacing = mTextAttributes.getEffectiveLetterSpacing();
+    if (!Float.isNaN(effectiveLetterSpacing)) {
+      setLetterSpacing(effectiveLetterSpacing);
     }
   }
 
@@ -1026,7 +1035,7 @@ private void updateCachedSpannable(boolean resetStyles) {
       try {
         sb.append(currentText.subSequence(0, currentText.length()));
       } catch (IndexOutOfBoundsException e) {
-        ReactSoftException.logSoftException(TAG, e);
+        ReactSoftExceptionLogger.logSoftException(TAG, e);
       }
     }
 
@@ -1048,6 +1057,10 @@ private void updateCachedSpannable(boolean resetStyles) {
     TextLayoutManager.setCachedSpannabledForTag(getId(), sb);
   }
 
+  void setEventDispatcher(@Nullable EventDispatcher eventDispatcher) {
+    mEventDispatcher = eventDispatcher;
+  }
+
   /**
    * This class will redirect *TextChanged calls to the listeners only in the case where the text is
    * changed by the user, and not explicitly set by JS.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
index 47b4391c327f11..55ae040054b92e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
@@ -12,9 +12,7 @@
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputConnectionWrapper;
 import androidx.annotation.Nullable;
-import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 
 /**
@@ -61,11 +59,12 @@ class ReactEditTextInputConnectionWrapper extends InputConnectionWrapper {
   private @Nullable String mKey = null;
 
   public ReactEditTextInputConnectionWrapper(
-      InputConnection target, final ReactContext reactContext, final ReactEditText editText) {
+      InputConnection target,
+      final ReactContext reactContext,
+      final ReactEditText editText,
+      EventDispatcher eventDispatcher) {
     super(target, false);
-    mEventDispatcher =
-        Assertions.assertNotNull(reactContext.getNativeModule(UIManagerModule.class))
-            .getEventDispatcher();
+    mEventDispatcher = eventDispatcher;
     mEditText = editText;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
index a3c7e1cac12e05..f2cce90c50f033 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /**
  * Event emitted by EditText native view when text changes. VisibleForTesting from {@link
@@ -23,8 +23,13 @@ public class ReactTextChangedEvent extends Event<ReactTextChangedEvent> {
   private String mText;
   private int mEventCount;
 
+  @Deprecated
   public ReactTextChangedEvent(int viewId, String text, int eventCount) {
-    super(viewId);
+    this(-1, viewId, text, eventCount);
+  }
+
+  public ReactTextChangedEvent(int surfaceId, int viewId, String text, int eventCount) {
+    super(surfaceId, viewId);
     mText = text;
     mEventCount = eventCount;
   }
@@ -34,12 +39,9 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putString("text", mText);
     eventData.putInt("eventCount", mEventCount);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
index 5a05bc4440742a..cd6dfca8c39b19 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
@@ -7,18 +7,23 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by EditText native view when it loses focus. */
 /* package */ class ReactTextInputBlurEvent extends Event<ReactTextInputBlurEvent> {
 
   private static final String EVENT_NAME = "topBlur";
 
+  @Deprecated
   public ReactTextInputBlurEvent(int viewId) {
-    super(viewId);
+    this(-1, viewId);
+  }
+
+  public ReactTextInputBlurEvent(int surfaceId, int viewId) {
+    super(surfaceId, viewId);
   }
 
   @Override
@@ -31,12 +36,9 @@ public boolean canCoalesce() {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putInt("target", getViewTag());
     return eventData;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
index 597fa7d13350bd..1fca01b9fa553e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /**
  * Event emitted by EditText native view when text editing ends, because of the user leaving the
@@ -22,8 +22,13 @@ class ReactTextInputEndEditingEvent extends Event<ReactTextInputEndEditingEvent>
 
   private String mText;
 
+  @Deprecated
   public ReactTextInputEndEditingEvent(int viewId, String text) {
-    super(viewId);
+    this(-1, viewId, text);
+  }
+
+  public ReactTextInputEndEditingEvent(int surfaceId, int viewId, String text) {
+    super(surfaceId, viewId);
     mText = text;
   }
 
@@ -37,12 +42,9 @@ public boolean canCoalesce() {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putInt("target", getViewTag());
     eventData.putString("text", mText);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
index 09310782055930..2285fbfafb3e47 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /**
  * Event emitted by EditText native view when text changes. VisibleForTesting from {@link
@@ -25,9 +25,15 @@ public class ReactTextInputEvent extends Event<ReactTextInputEvent> {
   private int mRangeStart;
   private int mRangeEnd;
 
+  @Deprecated
   public ReactTextInputEvent(
       int viewId, String text, String previousText, int rangeStart, int rangeEnd) {
-    super(viewId);
+    this(-1, viewId, text, previousText, rangeStart, rangeEnd);
+  }
+
+  public ReactTextInputEvent(
+      int surfaceId, int viewId, String text, String previousText, int rangeStart, int rangeEnd) {
+    super(surfaceId, viewId);
     mText = text;
     mPreviousText = previousText;
     mRangeStart = rangeStart;
@@ -45,12 +51,9 @@ public boolean canCoalesce() {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     WritableMap range = Arguments.createMap();
     range.putDouble("start", mRangeStart);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
index 0bdaa6c19926f1..61f7250e7cc7bc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
@@ -7,38 +7,40 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by EditText native view when it receives focus. */
 /* package */ class ReactTextInputFocusEvent extends Event<ReactTextInputFocusEvent> {
 
   private static final String EVENT_NAME = "topFocus";
 
+  @Deprecated
   public ReactTextInputFocusEvent(int viewId) {
-    super(viewId);
+    this(-1, viewId);
   }
 
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
+  public ReactTextInputFocusEvent(int surfaceId, int viewId) {
+    super(surfaceId, viewId);
   }
 
   @Override
-  public boolean canCoalesce() {
-    return false;
+  public String getEventName() {
+    return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putInt("target", getViewTag());
     return eventData;
   }
+
+  @Override
+  public boolean canCoalesce() {
+    return false;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
index b4193e984eb5d9..0b85f618027603 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by EditText native view when key pressed */
 public class ReactTextInputKeyPressEvent extends Event<ReactTextInputEvent> {
@@ -19,8 +19,13 @@ public class ReactTextInputKeyPressEvent extends Event<ReactTextInputEvent> {
 
   private String mKey;
 
+  @Deprecated
   ReactTextInputKeyPressEvent(int viewId, final String key) {
-    super(viewId);
+    this(-1, viewId, key);
+  }
+
+  ReactTextInputKeyPressEvent(int surfaceId, int viewId, final String key) {
+    super(surfaceId, viewId);
     mKey = key;
   }
 
@@ -29,21 +34,17 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public boolean canCoalesce() {
-    // We don't want to miss any textinput event, as event data is incremental.
-    return false;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putString("key", mKey);
-
     return eventData;
   }
+
+  @Override
+  public boolean canCoalesce() {
+    // We don't want to miss any textinput event, as event data is incremental.
+    return false;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 3652c324898dcf..0cab4ce1879da7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -30,13 +30,14 @@
 import android.widget.EditText;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
+import androidx.autofill.HintConstants;
 import androidx.core.content.ContextCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
@@ -72,6 +73,7 @@
 import com.facebook.react.views.text.TextTransform;
 import com.facebook.yoga.YogaConstants;
 import java.lang.reflect.Field;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
@@ -84,6 +86,51 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   private static final int[] SPACING_TYPES = {
     Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
   };
+  private static final Map<String, String> REACT_PROPS_AUTOFILL_HINTS_MAP =
+      new HashMap<String, String>() {
+        {
+          put("birthdate-day", HintConstants.AUTOFILL_HINT_BIRTH_DATE_DAY);
+          put("birthdate-full", HintConstants.AUTOFILL_HINT_BIRTH_DATE_FULL);
+          put("birthdate-month", HintConstants.AUTOFILL_HINT_BIRTH_DATE_MONTH);
+          put("birthdate-year", HintConstants.AUTOFILL_HINT_BIRTH_DATE_YEAR);
+          put("cc-csc", HintConstants.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE);
+          put("cc-exp", HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE);
+          put("cc-exp-day", HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY);
+          put("cc-exp-month", HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH);
+          put("cc-exp-year", HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR);
+          put("cc-number", HintConstants.AUTOFILL_HINT_CREDIT_CARD_NUMBER);
+          put("email", HintConstants.AUTOFILL_HINT_EMAIL_ADDRESS);
+          put("gender", HintConstants.AUTOFILL_HINT_GENDER);
+          put("name", HintConstants.AUTOFILL_HINT_PERSON_NAME);
+          put("name-family", HintConstants.AUTOFILL_HINT_PERSON_NAME_FAMILY);
+          put("name-given", HintConstants.AUTOFILL_HINT_PERSON_NAME_GIVEN);
+          put("name-middle", HintConstants.AUTOFILL_HINT_PERSON_NAME_MIDDLE);
+          put("name-middle-initial", HintConstants.AUTOFILL_HINT_PERSON_NAME_MIDDLE_INITIAL);
+          put("name-prefix", HintConstants.AUTOFILL_HINT_PERSON_NAME_PREFIX);
+          put("name-suffix", HintConstants.AUTOFILL_HINT_PERSON_NAME_SUFFIX);
+          put("password", HintConstants.AUTOFILL_HINT_PASSWORD);
+          put("password-new", HintConstants.AUTOFILL_HINT_NEW_PASSWORD);
+          put("postal-address", HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS);
+          put("postal-address-country", HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_COUNTRY);
+          put(
+              "postal-address-extended",
+              HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_ADDRESS);
+          put(
+              "postal-address-extended-postal-code",
+              HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_POSTAL_CODE);
+          put("postal-address-locality", HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_LOCALITY);
+          put("postal-address-region", HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_REGION);
+          put("postal-code", HintConstants.AUTOFILL_HINT_POSTAL_CODE);
+          put("street-address", HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_STREET_ADDRESS);
+          put("sms-otp", HintConstants.AUTOFILL_HINT_SMS_OTP);
+          put("tel", HintConstants.AUTOFILL_HINT_PHONE_NUMBER);
+          put("tel-country-code", HintConstants.AUTOFILL_HINT_PHONE_COUNTRY_CODE);
+          put("tel-national", HintConstants.AUTOFILL_HINT_PHONE_NATIONAL);
+          put("tel-device", HintConstants.AUTOFILL_HINT_PHONE_NUMBER_DEVICE);
+          put("username", HintConstants.AUTOFILL_HINT_USERNAME);
+          put("username-new", HintConstants.AUTOFILL_HINT_NEW_USERNAME);
+        }
+      };
 
   private static final int FOCUS_TEXT_INPUT = 1;
   private static final int BLUR_TEXT_INPUT = 2;
@@ -108,8 +155,18 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   private static final String KEYBOARD_TYPE_NUMBER_PAD = "number-pad";
   private static final String KEYBOARD_TYPE_PHONE_PAD = "phone-pad";
   private static final String KEYBOARD_TYPE_VISIBLE_PASSWORD = "visible-password";
+  private static final String KEYBOARD_TYPE_URI = "url";
   private static final InputFilter[] EMPTY_FILTERS = new InputFilter[0];
   private static final int UNSET = -1;
+  private static final String[] DRAWABLE_FIELDS = {
+    "mCursorDrawable", "mSelectHandleLeft", "mSelectHandleRight", "mSelectHandleCenter"
+  };
+  private static final String[] DRAWABLE_RESOURCES = {
+    "mCursorDrawableRes",
+    "mTextSelectHandleLeftRes",
+    "mTextSelectHandleRightRes",
+    "mTextSelectHandleRes"
+  };
 
   protected @Nullable ReactTextViewManagerCallback mReactTextViewManagerCallback;
 
@@ -280,9 +337,22 @@ public void updateExtraData(ReactEditText view, Object extraData) {
         Spannable spannable = update.getText();
         TextInlineImageSpan.possiblyUpdateInlineImageSpans(spannable, view);
       }
+
+      // Ensure that selection is handled correctly on text update
+      boolean isCurrentSelectionEmpty = view.getSelectionStart() == view.getSelectionEnd();
+      int selectionStart = update.getSelectionStart();
+      int selectionEnd = update.getSelectionEnd();
+      if ((selectionStart == UNSET || selectionEnd == UNSET) && isCurrentSelectionEmpty) {
+        // if selection is not set by state, shift current selection to ensure constant gap to
+        // text end
+        int textLength = view.getText() == null ? 0 : view.getText().length();
+        int selectionOffset = textLength - view.getSelectionStart();
+        selectionStart = update.getText().length() - selectionOffset;
+        selectionEnd = selectionStart;
+      }
+
       view.maybeSetTextFromState(update);
-      view.maybeSetSelection(
-          update.getJsEventCounter(), update.getSelectionStart(), update.getSelectionEnd());
+      view.maybeSetSelection(update.getJsEventCounter(), selectionStart, selectionEnd);
     }
   }
 
@@ -398,7 +468,7 @@ public void setAllowFontScaling(ReactEditText view, boolean allowFontScaling) {
   }
 
   @ReactProp(name = "placeholder")
-  public void setPlaceholder(ReactEditText view, @Nullable String placeholder) {
+  public void setPlaceholder(ReactEditText view, String placeholder) {
     view.setHint(placeholder);
   }
 
@@ -446,34 +516,40 @@ public void setCursorColor(ReactEditText view, @Nullable Integer color) {
     }
 
     // The evil code that follows uses reflection to achieve this on Android 8.1 and below.
-    // Based on
-    // http://stackoverflow.com/questions/25996032/how-to-change-programatically-edittext-cursor-color-in-android.
-    try {
-      // Get the original cursor drawable resource.
-      Field cursorDrawableResField = TextView.class.getDeclaredField("mCursorDrawableRes");
-      cursorDrawableResField.setAccessible(true);
-      int drawableResId = cursorDrawableResField.getInt(view);
-
-      // The view has no cursor drawable.
-      if (drawableResId == 0) {
-        return;
-      }
+    // Based on https://tinyurl.com/3vff8lyu https://tinyurl.com/vehggzs9
+    for (int i = 0; i < DRAWABLE_RESOURCES.length; i++) {
+      try {
+        Field drawableResourceField = TextView.class.getDeclaredField(DRAWABLE_RESOURCES[i]);
+        drawableResourceField.setAccessible(true);
+        int resourceId = drawableResourceField.getInt(view);
+
+        // The view has no cursor drawable.
+        if (resourceId == 0) {
+          return;
+        }
+
+        Drawable drawable = ContextCompat.getDrawable(view.getContext(), resourceId);
 
-      Drawable drawable = ContextCompat.getDrawable(view.getContext(), drawableResId);
-      drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
-      Drawable[] drawables = {drawable, drawable};
-
-      // Update the current cursor drawable with the new one.
-      Field editorField = TextView.class.getDeclaredField("mEditor");
-      editorField.setAccessible(true);
-      Object editor = editorField.get(view);
-      Field cursorDrawableField = editor.getClass().getDeclaredField("mCursorDrawable");
-      cursorDrawableField.setAccessible(true);
-      cursorDrawableField.set(editor, drawables);
-    } catch (NoSuchFieldException ex) {
-      // Ignore errors to avoid crashing if these private fields don't exist on modified
-      // or future android versions.
-    } catch (IllegalAccessException ex) {
+        Drawable drawableCopy = drawable.mutate();
+        drawableCopy.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+
+        Field editorField = TextView.class.getDeclaredField("mEditor");
+        editorField.setAccessible(true);
+        Object editor = editorField.get(view);
+
+        Field cursorDrawableField = editor.getClass().getDeclaredField(DRAWABLE_FIELDS[i]);
+        cursorDrawableField.setAccessible(true);
+        if (DRAWABLE_RESOURCES[i] == "mCursorDrawableRes") {
+          Drawable[] drawables = {drawableCopy, drawableCopy};
+          cursorDrawableField.set(editor, drawables);
+        } else {
+          cursorDrawableField.set(editor, drawableCopy);
+        }
+      } catch (NoSuchFieldException ex) {
+        // Ignore errors to avoid crashing if these private fields don't exist on modified
+        // or future android versions.
+      } catch (IllegalAccessException ex) {
+      }
     }
   }
 
@@ -517,7 +593,7 @@ public void setColor(ReactEditText view, @Nullable Integer color) {
         view.setTextColor(defaultContextTextColor);
       } else {
         Context c = view.getContext();
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG,
             new IllegalStateException(
                 "Could not get default text color from View Context: "
@@ -654,39 +730,16 @@ public void setMaxLength(ReactEditText view, @Nullable Integer maxLength) {
     view.setFilters(newFilters);
   }
 
-  @ReactProp(name = "autoCompleteType")
-  public void setTextContentType(ReactEditText view, @Nullable String autoCompleteType) {
-    if (autoCompleteType == null) {
+  @ReactProp(name = "autoComplete")
+  public void setTextContentType(ReactEditText view, @Nullable String autoComplete) {
+    if (autoComplete == null) {
       setImportantForAutofill(view, View.IMPORTANT_FOR_AUTOFILL_NO);
-    } else if ("username".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_USERNAME);
-    } else if ("password".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_PASSWORD);
-    } else if ("email".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_EMAIL_ADDRESS);
-    } else if ("name".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_NAME);
-    } else if ("tel".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_PHONE);
-    } else if ("street-address".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_POSTAL_ADDRESS);
-    } else if ("postal-code".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_POSTAL_CODE);
-    } else if ("cc-number".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_CREDIT_CARD_NUMBER);
-    } else if ("cc-csc".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE);
-    } else if ("cc-exp".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE);
-    } else if ("cc-exp-month".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH);
-    } else if ("cc-exp-year".equals(autoCompleteType)) {
-      setAutofillHints(view, View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR);
-    } else if ("off".equals(autoCompleteType)) {
+    } else if ("off".equals(autoComplete)) {
       setImportantForAutofill(view, View.IMPORTANT_FOR_AUTOFILL_NO);
+    } else if (REACT_PROPS_AUTOFILL_HINTS_MAP.containsKey(autoComplete)) {
+      setAutofillHints(view, REACT_PROPS_AUTOFILL_HINTS_MAP.get(autoComplete));
     } else {
-      throw new JSApplicationIllegalArgumentException(
-          "Invalid autoCompleteType: " + autoCompleteType);
+      throw new JSApplicationIllegalArgumentException("Invalid autoComplete: " + autoComplete);
     }
   }
 
@@ -775,11 +828,16 @@ public void setKeyboardType(ReactEditText view, @Nullable String keyboardType) {
       // This will supercede secureTextEntry={false}. If it doesn't, due to the way
       //  the flags work out, the underlying field will end up a URI-type field.
       flagsToSet = InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+<<<<<<< HEAD
     } else if ((view.getStagedInputType() & AUTOCAPITALIZE_FLAGS) != 0) {
       // This prevents KEYBOARD_TYPE_FLAGS from being unset when the keyboardType is
       // default, null, or unsupported, and autocapitalize is on.
       // Unsetting these flags breaks the autoCapitalize functionality.
       unsettingFlagsBreaksAutocomplete = true;
+=======
+    } else if (KEYBOARD_TYPE_URI.equalsIgnoreCase(keyboardType)) {
+      flagsToSet = InputType.TYPE_TEXT_VARIATION_URI;
+>>>>>>> v0.66.0
     }
 
     updateStagedInputTypeFlag(view, InputType.TYPE_MASK_CLASS, flagsToSet);
@@ -903,12 +961,14 @@ private class ReactTextInputTextWatcher implements TextWatcher {
     private EventDispatcher mEventDispatcher;
     private ReactEditText mEditText;
     private String mPreviousText;
+    private int mSurfaceId;
 
     public ReactTextInputTextWatcher(
         final ReactContext reactContext, final ReactEditText editText) {
       mEventDispatcher = getEventDispatcher(reactContext, editText);
       mEditText = editText;
       mPreviousText = null;
+      mSurfaceId = UIManagerHelper.getSurfaceId(reactContext);
     }
 
     @Override
@@ -961,10 +1021,14 @@ public WritableMap getStateUpdate() {
       // TODO: t7936714 merge these events
       mEventDispatcher.dispatchEvent(
           new ReactTextChangedEvent(
-              mEditText.getId(), s.toString(), mEditText.incrementAndGetEventCounter()));
+              mSurfaceId,
+              mEditText.getId(),
+              s.toString(),
+              mEditText.incrementAndGetEventCounter()));
 
       mEventDispatcher.dispatchEvent(
-          new ReactTextInputEvent(mEditText.getId(), newText, oldText, start, start + before));
+          new ReactTextInputEvent(
+              mSurfaceId, mEditText.getId(), newText, oldText, start, start + before));
     }
 
     @Override
@@ -974,19 +1038,23 @@ public void afterTextChanged(Editable s) {}
   @Override
   protected void addEventEmitters(
       final ThemedReactContext reactContext, final ReactEditText editText) {
+    editText.setEventDispatcher(getEventDispatcher(reactContext, editText));
     editText.addTextChangedListener(new ReactTextInputTextWatcher(reactContext, editText));
     editText.setOnFocusChangeListener(
         new View.OnFocusChangeListener() {
           public void onFocusChange(View v, boolean hasFocus) {
+            int surfaceId = reactContext.getSurfaceId();
             EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
             if (hasFocus) {
-              eventDispatcher.dispatchEvent(new ReactTextInputFocusEvent(editText.getId()));
+              eventDispatcher.dispatchEvent(
+                  new ReactTextInputFocusEvent(surfaceId, editText.getId()));
             } else {
-              eventDispatcher.dispatchEvent(new ReactTextInputBlurEvent(editText.getId()));
+              eventDispatcher.dispatchEvent(
+                  new ReactTextInputBlurEvent(surfaceId, editText.getId()));
 
               eventDispatcher.dispatchEvent(
                   new ReactTextInputEndEditingEvent(
-                      editText.getId(), editText.getText().toString()));
+                      surfaceId, editText.getId(), editText.getText().toString()));
             }
           }
         });
@@ -1011,7 +1079,9 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent keyEvent) {
               EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
               eventDispatcher.dispatchEvent(
                   new ReactTextInputSubmitEditingEvent(
-                      editText.getId(), editText.getText().toString()));
+                      reactContext.getSurfaceId(),
+                      editText.getId(),
+                      editText.getText().toString()));
 
               if (blurOnSubmit) {
                 editText.clearFocus();
@@ -1044,11 +1114,13 @@ private static class ReactContentSizeWatcher implements ContentSizeWatcher {
     private @Nullable EventDispatcher mEventDispatcher;
     private int mPreviousContentWidth = 0;
     private int mPreviousContentHeight = 0;
+    private int mSurfaceId;
 
     public ReactContentSizeWatcher(ReactEditText editText) {
       mEditText = editText;
       ReactContext reactContext = getReactContext(editText);
       mEventDispatcher = getEventDispatcher(reactContext, editText);
+      mSurfaceId = UIManagerHelper.getSurfaceId(reactContext);
     }
 
     @Override
@@ -1078,6 +1150,7 @@ public void onLayout() {
 
         mEventDispatcher.dispatchEvent(
             new ReactContentSizeChangedEvent(
+                mSurfaceId,
                 mEditText.getId(),
                 PixelUtil.toDIPFromPixel(contentWidth),
                 PixelUtil.toDIPFromPixel(contentHeight)));
@@ -1091,12 +1164,14 @@ private class ReactSelectionWatcher implements SelectionWatcher {
     private EventDispatcher mEventDispatcher;
     private int mPreviousSelectionStart;
     private int mPreviousSelectionEnd;
+    private int mSurfaceId;
 
     public ReactSelectionWatcher(ReactEditText editText) {
       mReactEditText = editText;
 
       ReactContext reactContext = getReactContext(editText);
       mEventDispatcher = getEventDispatcher(reactContext, editText);
+      mSurfaceId = UIManagerHelper.getSurfaceId(reactContext);
     }
 
     @Override
@@ -1112,7 +1187,8 @@ public void onSelectionChanged(int start, int end) {
 
       if (mPreviousSelectionStart != realStart || mPreviousSelectionEnd != realEnd) {
         mEventDispatcher.dispatchEvent(
-            new ReactTextInputSelectionEvent(mReactEditText.getId(), realStart, realEnd));
+            new ReactTextInputSelectionEvent(
+                mSurfaceId, mReactEditText.getId(), realStart, realEnd));
 
         mPreviousSelectionStart = realStart;
         mPreviousSelectionEnd = realEnd;
@@ -1126,11 +1202,13 @@ private static class ReactScrollWatcher implements ScrollWatcher {
     private EventDispatcher mEventDispatcher;
     private int mPreviousHoriz;
     private int mPreviousVert;
+    private int mSurfaceId;
 
     public ReactScrollWatcher(ReactEditText editText) {
       mReactEditText = editText;
       ReactContext reactContext = getReactContext(editText);
       mEventDispatcher = getEventDispatcher(reactContext, editText);
+      mSurfaceId = UIManagerHelper.getSurfaceId(reactContext);
     }
 
     @Override
@@ -1138,6 +1216,7 @@ public void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert) {
       if (mPreviousHoriz != horiz || mPreviousVert != vert) {
         ScrollEvent event =
             ScrollEvent.obtain(
+                mSurfaceId,
                 mReactEditText.getId(),
                 ScrollEventType.SCROLL,
                 horiz,
@@ -1195,7 +1274,15 @@ public Object updateState(
 
     view.getFabricViewStateManager().setStateWrapper(stateWrapper);
 
-    ReadableNativeMap state = stateWrapper.getState();
+    if (stateWrapper == null) {
+      return null;
+    }
+
+    ReadableNativeMap state = stateWrapper.getStateData();
+
+    if (state == null) {
+      return null;
+    }
 
     if (!state.hasKey("attributedString")) {
       return null;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
index 54fc40093f0389..a69ca8766c928b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by EditText native view when the text selection changes. */
 /* package */ class ReactTextInputSelectionEvent extends Event<ReactTextInputSelectionEvent> {
@@ -20,8 +20,14 @@
   private int mSelectionStart;
   private int mSelectionEnd;
 
+  @Deprecated
   public ReactTextInputSelectionEvent(int viewId, int selectionStart, int selectionEnd) {
-    super(viewId);
+    this(-1, viewId, selectionStart, selectionEnd);
+  }
+
+  public ReactTextInputSelectionEvent(
+      int surfaceId, int viewId, int selectionStart, int selectionEnd) {
+    super(surfaceId, viewId);
     mSelectionStart = selectionStart;
     mSelectionEnd = selectionEnd;
   }
@@ -31,12 +37,9 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
 
     WritableMap selectionData = Arguments.createMap();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
index fb717e70a23ab2..0dee36ddfac75c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
@@ -7,10 +7,10 @@
 
 package com.facebook.react.views.textinput;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event emitted by EditText native view when the user submits the text. */
 /* package */ class ReactTextInputSubmitEditingEvent
@@ -20,8 +20,13 @@
 
   private String mText;
 
+  @Deprecated
   public ReactTextInputSubmitEditingEvent(int viewId, String text) {
-    super(viewId);
+    this(-1, viewId, text);
+  }
+
+  public ReactTextInputSubmitEditingEvent(int surfaceId, int viewId, String text) {
+    super(surfaceId, viewId);
     mText = text;
   }
 
@@ -30,20 +35,17 @@ public String getEventName() {
     return EVENT_NAME;
   }
 
+  @Nullable
   @Override
-  public boolean canCoalesce() {
-    return false;
-  }
-
-  @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), serializeEventData());
-  }
-
-  private WritableMap serializeEventData() {
+  protected WritableMap getEventData() {
     WritableMap eventData = Arguments.createMap();
     eventData.putInt("target", getViewTag());
     eventData.putString("text", mText);
     return eventData;
   }
+
+  @Override
+  public boolean canCoalesce() {
+    return false;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK
index 24d0a3f2d916fa..62b23d28001acf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar
 rn_android_library(
     name = "unimplementedview",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
index 66386a0ffbfd5c..8dc27557662720 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 rn_android_library(
     name = "view",
     srcs = glob(["*.java"]),
+    autoglob = False,
     is_androidx = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
index 8f5f8267330932..b4a3feb9418c86 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
@@ -65,11 +65,7 @@ private static int getAttrId(Context context, String attr) {
   }
 
   private static Drawable getDefaultThemeDrawable(Context context) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      return context.getResources().getDrawable(sResolveOutValue.resourceId, context.getTheme());
-    } else {
-      return context.getResources().getDrawable(sResolveOutValue.resourceId);
-    }
+    return context.getResources().getDrawable(sResolveOutValue.resourceId, context.getTheme());
   }
 
   private static RippleDrawable getRippleDrawable(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
index b874a58f17dfc5..8dbe8f8df16bb2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
@@ -89,6 +89,7 @@ private enum BorderStyle {
   private @Nullable Path mOuterClipPathForBorderRadius;
   private @Nullable Path mPathForBorderRadiusOutline;
   private @Nullable Path mPathForBorder;
+  private Path mPathForSingleBorder = new Path();
   private @Nullable Path mCenterDrawPath;
   private @Nullable RectF mInnerClipTempRectForBorderRadius;
   private @Nullable RectF mOuterClipTempRectForBorderRadius;
@@ -960,6 +961,14 @@ private void updatePathEffect() {
     mPaint.setPathEffect(mPathEffectForBorderStyle);
   }
 
+  private void updatePathEffect(int borderWidth) {
+    PathEffect pathEffectForBorderStyle = null;
+    if (mBorderStyle != null) {
+      pathEffectForBorderStyle = BorderStyle.getPathEffect(mBorderStyle, borderWidth);
+    }
+    mPaint.setPathEffect(pathEffectForBorderStyle);
+  }
+
   /** For rounded borders we use default "borderWidth" property. */
   public float getFullBorderWidth() {
     return (mBorderWidth != null && !YogaConstants.isUndefined(mBorderWidth.getRaw(Spacing.ALL)))
@@ -1075,6 +1084,7 @@ private void drawRectangularBackgroundWithBorders(Canvas canvas) {
               colorTop,
               colorRight,
               colorBottom);
+
       if (fastBorderColor != 0) {
         if (Color.alpha(fastBorderColor) != 0) {
           // Border color is not transparent.
@@ -1082,21 +1092,42 @@ private void drawRectangularBackgroundWithBorders(Canvas canvas) {
           int bottom = bounds.bottom;
 
           mPaint.setColor(fastBorderColor);
+          mPaint.setStyle(Paint.Style.STROKE);
           if (borderLeft > 0) {
-            int leftInset = left + borderLeft;
-            canvas.drawRect(left, top, leftInset, bottom - borderBottom, mPaint);
+            mPathForSingleBorder.reset();
+            int width = Math.round(borderWidth.left);
+            updatePathEffect(width);
+            mPaint.setStrokeWidth(width);
+            mPathForSingleBorder.moveTo(left, top - borderWidth.top / 2);
+            mPathForSingleBorder.lineTo(left, bottom + borderWidth.bottom / 2);
+            canvas.drawPath(mPathForSingleBorder, mPaint);
           }
           if (borderTop > 0) {
-            int topInset = top + borderTop;
-            canvas.drawRect(left + borderLeft, top, right, topInset, mPaint);
+            mPathForSingleBorder.reset();
+            int width = Math.round(borderWidth.top);
+            updatePathEffect(width);
+            mPaint.setStrokeWidth(width);
+            mPathForSingleBorder.moveTo(left, top);
+            mPathForSingleBorder.lineTo(right, top);
+            canvas.drawPath(mPathForSingleBorder, mPaint);
           }
           if (borderRight > 0) {
-            int rightInset = right - borderRight;
-            canvas.drawRect(rightInset, top + borderTop, right, bottom, mPaint);
+            mPathForSingleBorder.reset();
+            int width = Math.round(borderWidth.right);
+            updatePathEffect(width);
+            mPaint.setStrokeWidth(width);
+            mPathForSingleBorder.moveTo(right, top - borderWidth.top / 2);
+            mPathForSingleBorder.lineTo(right, bottom + borderWidth.bottom / 2);
+            canvas.drawPath(mPathForSingleBorder, mPaint);
           }
           if (borderBottom > 0) {
-            int bottomInset = bottom - borderBottom;
-            canvas.drawRect(left, bottomInset, right - borderRight, bottom, mPaint);
+            mPathForSingleBorder.reset();
+            int width = Math.round(borderWidth.bottom);
+            updatePathEffect(width);
+            mPaint.setStrokeWidth(width);
+            mPathForSingleBorder.moveTo(left, bottom);
+            mPathForSingleBorder.lineTo(right, bottom);
+            canvas.drawPath(mPathForSingleBorder, mPaint);
           }
         }
       } else {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
index 659a8afb341ed6..03f374a7c377bd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -23,16 +23,16 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.view.ViewStructure;
 import android.view.animation.Animation;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.touch.OnInterceptTouchEventListener;
 import com.facebook.react.touch.ReactHitSlopView;
@@ -40,8 +40,10 @@
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.PointerEvents;
+import com.facebook.react.uimanager.ReactClippingProhibitedView;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactOverflowView;
 import com.facebook.react.uimanager.ReactPointerEventsView;
 import com.facebook.react.uimanager.ReactZIndexedViewGroup;
 import com.facebook.react.uimanager.RootView;
@@ -62,7 +64,8 @@ public class ReactViewGroup extends ViewGroup
         ReactClippingViewGroup,
         ReactPointerEventsView,
         ReactHitSlopView,
-        ReactZIndexedViewGroup {
+        ReactZIndexedViewGroup,
+        ReactOverflowView {
 
   private static final int ARRAY_CAPACITY_INCREMENT = 12;
   private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
@@ -122,7 +125,7 @@ public void onLayoutChange(
   private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable;
   private @Nullable OnInterceptTouchEventListener mOnInterceptTouchEventListener;
   private boolean mNeedsOffscreenAlphaCompositing = false;
-  private final ViewGroupDrawingOrderHelper mDrawingOrderHelper;
+  private @Nullable ViewGroupDrawingOrderHelper mDrawingOrderHelper = null;
   private @Nullable Path mPath;
   private int mLayoutDirection;
   private float mBackfaceOpacity = 1.f;
@@ -131,7 +134,13 @@ public void onLayoutChange(
   public ReactViewGroup(Context context) {
     super(context);
     setClipChildren(false);
-    mDrawingOrderHelper = new ViewGroupDrawingOrderHelper(this);
+  }
+
+  private ViewGroupDrawingOrderHelper getDrawingOrderHelper() {
+    if (mDrawingOrderHelper == null) {
+      mDrawingOrderHelper = new ViewGroupDrawingOrderHelper(this);
+    }
+    return mDrawingOrderHelper;
   }
 
   @Override
@@ -414,9 +423,7 @@ private void updateSubviewClipStatus(View subview) {
 
   @Override
   public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
-    return ReactFeatureFlags.clipChildRectsIfOverflowIsHidden
-        ? ReactClippingViewGroupHelper.getChildVisibleRectHelper(child, r, offset, this, mOverflow)
-        : super.getChildVisibleRect(child, r, offset);
+    return super.getChildVisibleRect(child, r, offset);
   }
 
   @Override
@@ -439,11 +446,7 @@ private boolean customDrawOrderDisabled() {
     if (getId() == NO_ID) {
       return false;
     }
-    if (ViewUtil.getUIManagerType(getId()) != UIManagerType.FABRIC) {
-      return false;
-    }
-
-    return ReactFeatureFlags.disableCustomDrawOrderFabric;
+    return ViewUtil.getUIManagerType(getId()) == UIManagerType.FABRIC;
   }
 
   @Override
@@ -452,8 +455,8 @@ public void addView(View child, int index, ViewGroup.LayoutParams params) {
     // method.
 
     if (!customDrawOrderDisabled()) {
-      mDrawingOrderHelper.handleAddView(child);
-      setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+      getDrawingOrderHelper().handleAddView(child);
+      setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
     } else {
       setChildrenDrawingOrderEnabled(false);
     }
@@ -466,8 +469,8 @@ public void removeView(View view) {
     UiThreadUtil.assertOnUiThread();
 
     if (!customDrawOrderDisabled()) {
-      mDrawingOrderHelper.handleRemoveView(view);
-      setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+      getDrawingOrderHelper().handleRemoveView(view);
+      setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
     } else {
       setChildrenDrawingOrderEnabled(false);
     }
@@ -480,8 +483,8 @@ public void removeViewAt(int index) {
     UiThreadUtil.assertOnUiThread();
 
     if (!customDrawOrderDisabled()) {
-      mDrawingOrderHelper.handleRemoveView(getChildAt(index));
-      setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+      getDrawingOrderHelper().handleRemoveView(getChildAt(index));
+      setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
     } else {
       setChildrenDrawingOrderEnabled(false);
     }
@@ -491,16 +494,25 @@ public void removeViewAt(int index) {
 
   @Override
   protected int getChildDrawingOrder(int childCount, int index) {
-    return mDrawingOrderHelper.getChildDrawingOrder(childCount, index);
+    UiThreadUtil.assertOnUiThread();
+
+    if (!customDrawOrderDisabled()) {
+      return getDrawingOrderHelper().getChildDrawingOrder(childCount, index);
+    } else {
+      return index;
+    }
   }
 
   @Override
   public int getZIndexMappedChildIndex(int index) {
-    if (mDrawingOrderHelper.shouldEnableCustomDrawingOrder()) {
-      return mDrawingOrderHelper.getChildDrawingOrder(getChildCount(), index);
-    } else {
-      return index;
+    UiThreadUtil.assertOnUiThread();
+
+    if (!customDrawOrderDisabled() && getDrawingOrderHelper().shouldEnableCustomDrawingOrder()) {
+      return getDrawingOrderHelper().getChildDrawingOrder(getChildCount(), index);
     }
+
+    // Fabric behavior
+    return index;
   }
 
   @Override
@@ -509,8 +521,8 @@ public void updateDrawingOrder() {
       return;
     }
 
-    mDrawingOrderHelper.update();
-    setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
+    getDrawingOrderHelper().update();
+    setChildrenDrawingOrderEnabled(getDrawingOrderHelper().shouldEnableCustomDrawingOrder());
     invalidate();
   }
 
@@ -542,7 +554,7 @@ protected void dispatchSetPressed(boolean pressed) {
   }
 
   /*package*/ void addViewWithSubviewClippingEnabled(
-      View child, int index, ViewGroup.LayoutParams params) {
+      final View child, int index, ViewGroup.LayoutParams params) {
     Assertions.assertCondition(mRemoveClippedSubviews);
     Assertions.assertNotNull(mClippingRect);
     Assertions.assertNotNull(mAllChildren);
@@ -557,6 +569,29 @@ protected void dispatchSetPressed(boolean pressed) {
     }
     updateSubviewClipStatus(mClippingRect, index, clippedSoFar);
     child.addOnLayoutChangeListener(mChildrenLayoutChangeListener);
+
+    if (child instanceof ReactClippingProhibitedView) {
+      UiThreadUtil.runOnUiThread(
+          new Runnable() {
+            @Override
+            public void run() {
+              if (!child.isShown()) {
+                ReactSoftExceptionLogger.logSoftException(
+                    TAG,
+                    new ReactNoCrashSoftException(
+                        "Child view has been added to Parent view in which it is clipped and not visible."
+                            + " This is not legal for this particular child view. Child: ["
+                            + child.getId()
+                            + "] "
+                            + child.toString()
+                            + " Parent: ["
+                            + getId()
+                            + "] "
+                            + toString()));
+              }
+            }
+          });
+    }
   }
 
   /*package*/ void removeViewWithSubviewClippingEnabled(View view) {
@@ -685,6 +720,7 @@ public void setOverflow(String overflow) {
     invalidate();
   }
 
+  @Override
   public @Nullable String getOverflow() {
     return mOverflow;
   }
@@ -702,48 +738,10 @@ private void updateBackgroundDrawable(Drawable drawable) {
 
   @Override
   protected void dispatchDraw(Canvas canvas) {
-    // TODO T78035906: delete this if we find the root-cause
-    int initialChildCount = getChildCount();
-
     try {
       dispatchOverflowDraw(canvas);
       super.dispatchDraw(canvas);
     } catch (NullPointerException | StackOverflowError e) {
-      // Catch errors and log additional diagnostics to logcat for debugging
-      FLog.e(
-          TAG,
-          "Exception thrown when executing ReactViewGroup.dispatchDraw method on ReactViewGroup["
-              + getId()
-              + "]",
-          e);
-
-      // Log all children of view, if any
-      int childCount = getChildCount();
-      FLog.e(TAG, "Initial Child Count: %d / final: %d", initialChildCount, childCount);
-      FLog.e(TAG, "Child List:");
-      for (int i = 0; i < childCount; i++) {
-        View child = getChildAt(i);
-        FLog.e(
-            TAG,
-            "Child #"
-                + i
-                + ": "
-                + (child != null ? child.getId() : -1337)
-                + " - "
-                + (child != null ? child.toString() : "<null>"));
-      }
-
-      // Log all ancestors of view
-      ViewParent viewParent = getParent();
-      FLog.e(TAG, "Ancestor List:");
-      while (viewParent != null) {
-        ViewGroup parentViewGroup =
-            (viewParent instanceof ViewGroup ? (ViewGroup) viewParent : null);
-        int parentViewGroupId = (parentViewGroup != null ? parentViewGroup.getId() : -1337);
-        FLog.e(TAG, "Ancestor[" + parentViewGroupId + "]: " + viewParent.toString());
-        viewParent = viewParent.getParent();
-      }
-
       // Adding special exception management for StackOverflowError for logging purposes.
       // This will be removed in the future.
       RootView rootView = RootViewUtil.getRootView(ReactViewGroup.this);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index 66aacfcfd157d6..1192b50f2e4cc7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -239,7 +239,9 @@ public void onClick(View v) {
               if (mEventDispatcher == null) {
                 return;
               }
-              mEventDispatcher.dispatchEvent(new ViewGroupClickEvent(view.getId()));
+              mEventDispatcher.dispatchEvent(
+                  new ViewGroupClickEvent(
+                      UIManagerHelper.getSurfaceId(view.getContext()), view.getId()));
             }
           });
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java
index c328752a564172..d7a380802fbb0b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java
@@ -7,16 +7,22 @@
 
 package com.facebook.react.views.view;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Represents a Click on the ReactViewGroup */
 public class ViewGroupClickEvent extends Event<ViewGroupClickEvent> {
   private static final String EVENT_NAME = "topClick";
 
+  @Deprecated
   public ViewGroupClickEvent(int viewId) {
-    super(viewId);
+    this(-1, viewId);
+  }
+
+  public ViewGroupClickEvent(int surfaceId, int viewId) {
+    super(surfaceId, viewId);
   }
 
   @Override
@@ -29,8 +35,9 @@ public boolean canCoalesce() {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), Arguments.createMap());
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
index 21006f1842c39a..ef6249a999177f 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 rn_android_library(
     name = "systrace",
     srcs = glob(["*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 9fc8bac9bbbb05..109172eefc3567 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -9,7 +9,15 @@
 
 import javax.annotation.Nullable;
 
-public abstract class YogaNode {
+public abstract class YogaNode implements YogaProps {
+
+  /** The interface the {@link #getData()} object can optionally implement. */
+  public interface Inputs {
+
+    /** Requests the data object to disable mutations of its inputs. */
+    void freeze(final YogaNode node, final @Nullable YogaNode parent);
+  }
+
   public abstract void reset();
 
   public abstract int getChildCount();
@@ -25,12 +33,10 @@ public abstract class YogaNode {
   public abstract YogaNode removeChildAt(int i);
 
   /**
-   * @returns the {@link YogaNode} that owns this {@link YogaNode}.
-   * The owner is used to identify the YogaTree that a {@link YogaNode} belongs
-   * to.
-   * This method will return the parent of the {@link YogaNode} when the
-   * {@link YogaNode} only belongs to one YogaTree or null when the
-   * {@link YogaNode} is shared between two or more YogaTrees.
+   * @returns the {@link YogaNode} that owns this {@link YogaNode}. The owner is used to identify
+   *     the YogaTree that a {@link YogaNode} belongs to. This method will return the parent of the
+   *     {@link YogaNode} when the {@link YogaNode} only belongs to one YogaTree or null when the
+   *     {@link YogaNode} is shared between two or more YogaTrees.
    */
   @Nullable
   public abstract YogaNode getOwner();
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java
index 7ab391cce51cf7..7efb8ce1dac2df 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java
@@ -83,6 +83,9 @@ public YogaNodeJNIBase getChildAt(int i) {
   }
 
   public void addChildAt(YogaNode c, int i) {
+    if (!(c instanceof YogaNodeJNIBase)) {
+      return;
+    }
     YogaNodeJNIBase child = (YogaNodeJNIBase) c;
     if (child.mOwner != null) {
       throw new IllegalStateException("Child already has a parent, it must be removed first.");
@@ -105,6 +108,9 @@ public boolean isReferenceBaseline() {
   }
 
   public void swapChildAt(YogaNode newChild, int position) {
+    if (!(newChild instanceof YogaNodeJNIBase)) {
+      return;
+    }
     YogaNodeJNIBase child = (YogaNodeJNIBase) newChild;
     mChildren.remove(position);
     mChildren.add(position, child);
@@ -191,12 +197,18 @@ public void calculateLayout(float width, float height) {
     long[] nativePointers = null;
     YogaNodeJNIBase[] nodes = null;
 
+    freeze(null);
+
     ArrayList<YogaNodeJNIBase> n = new ArrayList<>();
     n.add(this);
     for (int i = 0; i < n.size(); ++i) {
-      List<YogaNodeJNIBase> children = n.get(i).mChildren;
+      final YogaNodeJNIBase parent = n.get(i);
+      List<YogaNodeJNIBase> children = parent.mChildren;
       if (children != null) {
-        n.addAll(children);
+        for (YogaNodeJNIBase child : children) {
+          child.freeze(parent);
+          n.add(child);
+        }
       }
     }
 
@@ -209,6 +221,13 @@ public void calculateLayout(float width, float height) {
     YogaNative.jni_YGNodeCalculateLayoutJNI(mNativePointer, width, height, nativePointers, nodes);
   }
 
+  private void freeze(YogaNode parent) {
+    Object data = getData();
+    if (data instanceof Inputs) {
+      ((Inputs) data).freeze(this, parent);
+    }
+  }
+
   public void dirty() {
     YogaNative.jni_YGNodeMarkDirtyJNI(mNativePointer);
   }
@@ -223,6 +242,9 @@ public boolean isDirty() {
 
   @Override
   public void copyStyle(YogaNode srcNode) {
+    if (!(srcNode instanceof YogaNodeJNIBase)) {
+      return;
+    }
     YogaNative.jni_YGNodeCopyStyleJNI(mNativePointer, ((YogaNodeJNIBase) srcNode).mNativePointer);
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java
new file mode 100644
index 00000000000000..9faa520f98d973
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.yoga;
+
+public interface YogaProps {
+
+  /* Width properties */
+
+  void setWidth(float width);
+
+  void setWidthPercent(float percent);
+
+  void setMinWidth(float minWidth);
+
+  void setMinWidthPercent(float percent);
+
+  void setMaxWidth(float maxWidth);
+
+  void setMaxWidthPercent(float percent);
+
+  void setWidthAuto();
+
+  /* Height properties */
+
+  void setHeight(float height);
+
+  void setHeightPercent(float percent);
+
+  void setMinHeight(float minHeight);
+
+  void setMinHeightPercent(float percent);
+
+  void setMaxHeight(float maxHeight);
+
+  void setMaxHeightPercent(float percent);
+
+  void setHeightAuto();
+
+  /* Margin properties */
+
+  void setMargin(YogaEdge edge, float margin);
+
+  void setMarginPercent(YogaEdge edge, float percent);
+
+  void setMarginAuto(YogaEdge edge);
+
+  /* Padding properties */
+
+  void setPadding(YogaEdge edge, float padding);
+
+  void setPaddingPercent(YogaEdge edge, float percent);
+
+  /* Position properties */
+
+  void setPositionType(YogaPositionType positionType);
+
+  void setPosition(YogaEdge edge, float position);
+
+  void setPositionPercent(YogaEdge edge, float percent);
+
+  /* Alignment properties */
+
+  void setAlignContent(YogaAlign alignContent);
+
+  void setAlignItems(YogaAlign alignItems);
+
+  void setAlignSelf(YogaAlign alignSelf);
+
+  /* Flex properties */
+
+  void setFlex(float flex);
+
+  void setFlexBasisAuto();
+
+  void setFlexBasisPercent(float percent);
+
+  void setFlexBasis(float flexBasis);
+
+  void setFlexDirection(YogaFlexDirection direction);
+
+  void setFlexGrow(float flexGrow);
+
+  void setFlexShrink(float flexShrink);
+
+  /* Other properties */
+
+  void setJustifyContent(YogaJustify justifyContent);
+
+  void setDirection(YogaDirection direction);
+
+  void setBorder(YogaEdge edge, float value);
+
+  void setWrap(YogaWrap wrap);
+
+  void setAspectRatio(float aspectRatio);
+
+  void setIsReferenceBaseline(boolean isReferenceBaseline);
+
+  void setMeasureFunction(YogaMeasureFunction measureFunction);
+
+  void setBaselineFunction(YogaBaselineFunction yogaBaselineFunction);
+
+  /* Getters */
+
+  YogaValue getWidth();
+
+  YogaValue getMinWidth();
+
+  YogaValue getMaxWidth();
+
+  YogaValue getHeight();
+
+  YogaValue getMinHeight();
+
+  YogaValue getMaxHeight();
+
+  YogaDirection getStyleDirection();
+
+  YogaFlexDirection getFlexDirection();
+
+  YogaJustify getJustifyContent();
+
+  YogaAlign getAlignItems();
+
+  YogaAlign getAlignSelf();
+
+  YogaAlign getAlignContent();
+
+  YogaPositionType getPositionType();
+
+  float getFlexGrow();
+
+  float getFlexShrink();
+
+  YogaValue getFlexBasis();
+
+  float getAspectRatio();
+
+  YogaValue getMargin(YogaEdge edge);
+
+  YogaValue getPadding(YogaEdge edge);
+
+  YogaValue getPosition(YogaEdge edge);
+
+  float getBorder(YogaEdge edge);
+}
diff --git a/ReactAndroid/src/main/jni/first-party/fb/BUCK b/ReactAndroid/src/main/jni/first-party/fb/BUCK
index 0acfb090124ed2..5575aad44c13ed 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fb/BUCK
@@ -23,6 +23,10 @@ oss_cxx_library(
         "-DDISABLE_CPUCAP",
         "-DDISABLE_XPLAT",
     ],
+    linker_flags = [
+        "-llog",
+    ],
+    preferred_linkage = "static",
     soname = "libfb.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
index 1384b6534a5db3..6b24554ede634d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
@@ -204,7 +204,7 @@ static inline RefPtr<T> adoptRef(T *ptr) {
 }
 
 template <typename T, typename... Args>
-static inline RefPtr<T> createNew(Args &&... arguments) {
+static inline RefPtr<T> createNew(Args &&...arguments) {
   return RefPtr<T>::adoptRef(new T(std::forward<Args>(arguments)...));
 }
 
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
index 839400f13a2787..d5c553423aa4cf 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
@@ -21,7 +21,7 @@ class StaticInitialized {
   constexpr StaticInitialized() : m_instance(nullptr) {}
 
   template <typename... Args>
-  void initialize(Args &&... arguments) {
+  void initialize(Args &&...arguments) {
     FBASSERT(!m_instance);
     m_instance = new T(std::forward<Args>(arguments)...);
   }
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp
index 6534382116eb3c..71fe98f3e75e8a 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp
@@ -367,11 +367,7 @@ static void jni_YGNodeCalculateLayoutJNI(
     void* layoutContext = nullptr;
     auto map = PtrJNodeMapVanilla{};
     if (nativePointers) {
-      size_t nativePointersSize = env->GetArrayLength(nativePointers);
-      jlong result[nativePointersSize];
-      env->GetLongArrayRegion(nativePointers, 0, nativePointersSize, result);
-
-      map = PtrJNodeMapVanilla{result, nativePointersSize, javaNodes};
+      map = PtrJNodeMapVanilla{nativePointers, javaNodes};
       layoutContext = &map;
     }
 
@@ -726,8 +722,7 @@ static void jni_YGNodePrintJNI(JNIEnv* env, jobject obj, jlong nativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   YGNodePrint(
       node,
-      (YGPrintOptions)(
-          YGPrintOptionsStyle | YGPrintOptionsLayout | YGPrintOptionsChildren));
+      (YGPrintOptions) (YGPrintOptionsStyle | YGPrintOptionsLayout | YGPrintOptionsChildren));
 #endif
 }
 
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h
index 8f8c778609ba90..d1202b755fa7bf 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h
@@ -20,11 +20,15 @@ class PtrJNodeMapVanilla {
 
 public:
   PtrJNodeMapVanilla() : ptrsToIdxs_{}, javaNodes_{} {}
-  PtrJNodeMapVanilla(
-      jlong* nativePointers,
-      size_t nativePointersSize,
-      jobjectArray javaNodes)
+  PtrJNodeMapVanilla(jlongArray javaNativePointers, jobjectArray javaNodes)
       : javaNodes_{javaNodes} {
+
+    JNIEnv* env = getCurrentEnv();
+    size_t nativePointersSize = env->GetArrayLength(javaNativePointers);
+    std::vector<jlong> nativePointers(nativePointersSize);
+    env->GetLongArrayRegion(
+        javaNativePointers, 0, nativePointersSize, nativePointers.data());
+
     for (size_t i = 0; i < nativePointersSize; ++i) {
       ptrsToIdxs_[(YGNodeRef) nativePointers[i]] = i;
     }
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index 76c613b0f466e7..82445d00ec04d2 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -39,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor
 LOCAL_MODULE := reactnativeutilsjni
 
 # Compile all local c++ files.
-LOCAL_SRC_FILES := $(wildcard Cxx*.cpp) $(wildcard J*.cpp) $(wildcard M*.cpp) $(wildcard N*.cpp) $(wildcard P*.cpp) $(wildcard R*.cpp) $(wildcard W*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -77,7 +77,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 LOCAL_LDLIBS += -landroid
 
 # The dynamic libraries (.so files) that this module depends on.
-LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga
+LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga logger
 
 # The static libraries (.a files) that this module depends on.
 LOCAL_STATIC_LIBRARIES := libreactnative libruntimeexecutor libcallinvokerholder
@@ -124,6 +124,7 @@ $(call import-module,yogajni)
 $(call import-module,cxxreact)
 $(call import-module,jsi)
 $(call import-module,jsiexecutor)
+$(call import-module,logger)
 $(call import-module,callinvoker)
 $(call import-module,reactperflogger)
 $(call import-module,hermes)
@@ -134,11 +135,8 @@ include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk
 # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
 # Note: Update this only when ready to minimize breaking changes.
 include $(REACT_SRC_DIR)/turbomodule/core/jni/Android.mk
-
-ifeq ($(BUILD_FABRIC),true)
-  include $(REACT_SRC_DIR)/viewmanagers/jni/Android.mk
-  include $(REACT_SRC_DIR)/fabric/jni/Android.mk
-endif
+include $(REACT_SRC_DIR)/fabric/jni/Android.mk
+include $(REACT_SRC_DIR)/common/mapbuffer/jni/Android.mk
 
 # TODO(ramanpreet):
 #   Why doesn't this import-module call generate a jscexecutor.so file?
diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index de79bff729e9cb..dc88910cf425ee 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -54,7 +54,7 @@ rn_xplat_cxx_library(
     visibility = [
         "PUBLIC",
     ],
-    deps = ([
+    deps = [
         "//xplat/third-party/linker_lib:android",
         "//xplat/third-party/linker_lib:atomic",
         "//third-party/glog:glog",
@@ -67,7 +67,8 @@ rn_xplat_cxx_library(
         react_native_xplat_target("cxxreact:module"),
         react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        react_native_xplat_target("logger:logger"),
         react_native_xplat_dep("jsi:jsi"),
         FBJNI_TARGET,
-    ]) if not IS_OSS_BUILD else [],
+    ] if not IS_OSS_BUILD else [],
 )
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index 659c8235a64bbb..d9e5ac34b41124 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -26,9 +26,13 @@
 #include <fb/log.h>
 #include <fbjni/ByteBuffer.h>
 #include <folly/dynamic.h>
+#include <glog/logging.h>
+
+#include <logger/react_native_log.h>
 
 #include "CxxModuleWrapper.h"
 #include "JNativeRunnable.h"
+#include "JReactSoftExceptionLogger.h"
 #include "JavaScriptExecutorHolder.h"
 #include "JniJSModulesUnbundle.h"
 #include "NativeArray.h"
@@ -92,6 +96,10 @@ CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass>) {
 CatalystInstanceImpl::CatalystInstanceImpl()
     : instance_(std::make_unique<Instance>()) {}
 
+void CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse() {
+  CxxNativeModule::setShouldWarnOnUse(true);
+}
+
 void CatalystInstanceImpl::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid),
@@ -127,11 +135,33 @@ void CatalystInstanceImpl::registerNatives() {
           CatalystInstanceImpl::handleMemoryPressure),
       makeNativeMethod(
           "getRuntimeExecutor", CatalystInstanceImpl::getRuntimeExecutor),
+      makeNativeMethod(
+          "warnOnLegacyNativeModuleSystemUse",
+          CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse),
   });
 
   JNativeRunnable::registerNatives();
 }
 
+void log(ReactNativeLogLevel level, const char *message) {
+  switch (level) {
+    case ReactNativeLogLevelInfo:
+      LOG(INFO) << message;
+      break;
+    case ReactNativeLogLevelWarning:
+      LOG(WARNING) << message;
+      JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
+          "react_native_log#warning", message);
+      break;
+    case ReactNativeLogLevelError:
+      LOG(ERROR) << message;
+      break;
+    case ReactNativeLogLevelFatal:
+      LOG(FATAL) << message;
+      break;
+  }
+}
+
 void CatalystInstanceImpl::initializeBridge(
     jni::alias_ref<ReactCallback::javaobject> callback,
     // This executor is actually a factory holder.
@@ -142,6 +172,8 @@ void CatalystInstanceImpl::initializeBridge(
         javaModules,
     jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
         cxxModules) {
+  set_react_native_logfunc(&log);
+
   // TODO mhorowitz: how to assert here?
   // Assertions.assertCondition(mBridge == null, "initializeBridge should be
   // called once");
@@ -227,7 +259,30 @@ void CatalystInstanceImpl::jniLoadScriptFromFile(
     const std::string &fileName,
     const std::string &sourceURL,
     bool loadSynchronously) {
-  if (Instance::isIndexedRAMBundle(fileName.c_str())) {
+  auto reactInstance = instance_;
+  if (reactInstance && Instance::isHBCBundle(fileName.c_str())) {
+    std::unique_ptr<const JSBigFileString> script;
+    RecoverableError::runRethrowingAsRecoverable<std::system_error>(
+        [&fileName, &script]() {
+          script = JSBigFileString::fromPath(fileName);
+        });
+    const char *buffer = script->c_str();
+    uint32_t bufferLength = (uint32_t)script->size();
+    uint32_t offset = 8;
+    while (offset < bufferLength) {
+      uint32_t segment = offset + 4;
+      uint32_t moduleLength =
+          bufferLength < segment ? 0 : *(((uint32_t *)buffer) + offset / 4);
+
+      reactInstance->loadScriptFromString(
+          std::make_unique<const JSBigStdString>(
+              std::string(buffer + segment, buffer + moduleLength + segment)),
+          sourceURL,
+          false);
+
+      offset += ((moduleLength + 3) & ~3) + 4;
+    }
+  } else if (Instance::isIndexedRAMBundle(fileName.c_str())) {
     instance_->loadRAMBundleFromFile(fileName, sourceURL, loadSynchronously);
   } else {
     std::unique_ptr<const JSBigFileString> script;
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
index c40a691232c6a2..cc4006b26b07c4 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -61,6 +61,10 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
       jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
           cxxModules);
 
+  // When called from CatalystInstanceImpl.java, warnings will be logged when
+  // CxxNativeModules are used. Java NativeModule usages log error in Java.
+  void warnOnLegacyNativeModuleSystemUse();
+
   void extendNativeModules(
       jni::alias_ref<jni::JCollection<
           JavaModuleWrapper::javaobject>::javaobject> javaModules,
diff --git a/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.cpp b/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.cpp
new file mode 100644
index 00000000000000..788de6f99abcdb
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "JReactSoftExceptionLogger.h"
+
+using namespace facebook::react;
+
+void JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
+    std::string tag,
+    std::string message) {
+  static const auto logNoThrowSoftExceptionWithMessage =
+      javaClassStatic()
+          ->getStaticMethod<void(std::string tag, std::string message)>(
+              "logNoThrowSoftExceptionWithMessage");
+
+  return logNoThrowSoftExceptionWithMessage(javaClassStatic(), tag, message);
+}
diff --git a/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h b/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h
new file mode 100644
index 00000000000000..6a91ec709af9b6
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <string>
+
+namespace facebook {
+namespace react {
+
+class JReactSoftExceptionLogger
+    : public jni::JavaClass<JReactSoftExceptionLogger> {
+ public:
+  static constexpr const char *kJavaDescriptor =
+      "Lcom/facebook/react/bridge/ReactSoftExceptionLogger;";
+
+  static void logNoThrowSoftExceptionWithMessage(
+      std::string tag,
+      std::string message);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
index 2b07dcb7530b38..c0833d94ac8181 100644
--- a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
@@ -66,7 +66,7 @@ loadScriptFromAssets(AAssetManager *manager, const std::string &assetName) {
 
   throw std::runtime_error(folly::to<std::string>(
       "Unable to load script. Make sure you're "
-      "either running Metro (run 'react-native start') or that your bundle '",
+      "either running Metro (run 'npx react-native start') or that your bundle '",
       assetName,
       "' is packaged correctly for release."));
 }
diff --git a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp
index e8281b8f1cbed2..14aa1b54a57c6e 100644
--- a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp
@@ -152,100 +152,6 @@ MethodCallResult JavaNativeModule::callSerializableNativeHook(
   return method->invoke(instance_, wrapper_->getModule(), params);
 }
 
-NewJavaNativeModule::NewJavaNativeModule(
-    std::weak_ptr<Instance> instance,
-    jni::alias_ref<JavaModuleWrapper::javaobject> wrapper,
-    std::shared_ptr<MessageQueueThread> messageQueueThread)
-    : instance_(std::move(instance)),
-      wrapper_(make_global(wrapper)),
-      module_(make_global(wrapper->getModule())),
-      messageQueueThread_(std::move(messageQueueThread)) {
-  auto descs = wrapper_->getMethodDescriptors();
-  std::string moduleName = getName();
-  methods_.reserve(descs->size());
-
-  for (const auto &desc : *descs) {
-    auto type = desc->getType();
-    auto name = desc->getName();
-    methods_.emplace_back(
-        desc->getMethod(),
-        desc->getName(),
-        desc->getSignature(),
-        moduleName + "." + name,
-        type == "syncHook");
-
-    methodDescriptors_.emplace_back(name, type);
-  }
-}
-
-std::string NewJavaNativeModule::getName() {
-  static auto getNameMethod =
-      wrapper_->getClass()->getMethod<jstring()>("getName");
-  return getNameMethod(wrapper_)->toStdString();
-}
-
-std::vector<MethodDescriptor> NewJavaNativeModule::getMethods() {
-  return methodDescriptors_;
-}
-
-folly::dynamic NewJavaNativeModule::getConstants() {
-  static auto constantsMethod =
-      wrapper_->getClass()->getMethod<NativeMap::javaobject()>("getConstants");
-  auto constants = constantsMethod(wrapper_);
-  if (!constants) {
-    return nullptr;
-  } else {
-    return cthis(constants)->consume();
-  }
-}
-
-void NewJavaNativeModule::invoke(
-    unsigned int reactMethodId,
-    folly::dynamic &&params,
-    int callId) {
-  if (reactMethodId >= methods_.size()) {
-    throw std::invalid_argument(folly::to<std::string>(
-        "methodId ",
-        reactMethodId,
-        " out of range [0..",
-        methods_.size(),
-        "]"));
-  }
-  CHECK(!methods_[reactMethodId].isSyncHook())
-      << "Trying to invoke a synchronous hook asynchronously";
-  messageQueueThread_->runOnQueue(
-      [this, reactMethodId, params = std::move(params), callId]() mutable {
-#ifdef WITH_FBSYSTRACE
-        if (callId != -1) {
-          fbsystrace_end_async_flow(TRACE_TAG_REACT_APPS, "native", callId);
-        }
-#endif
-        invokeInner(reactMethodId, std::move(params));
-      });
-}
-
-MethodCallResult NewJavaNativeModule::callSerializableNativeHook(
-    unsigned int reactMethodId,
-    folly::dynamic &&params) {
-  if (reactMethodId >= methods_.size()) {
-    throw std::invalid_argument(folly::to<std::string>(
-        "methodId ",
-        reactMethodId,
-        " out of range [0..",
-        methods_.size(),
-        "]"));
-  }
-  CHECK(methods_[reactMethodId].isSyncHook())
-      << "Trying to invoke a asynchronous method as synchronous hook";
-  return invokeInner(reactMethodId, std::move(params));
-}
-
-MethodCallResult NewJavaNativeModule::invokeInner(
-    unsigned int reactMethodId,
-    folly::dynamic &&params) {
-  return methods_[reactMethodId].invoke(instance_, module_.get(), params);
-}
-
 jni::local_ref<JReflectMethod::javaobject> JMethodDescriptor::getMethod()
     const {
   static auto method =
diff --git a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h
index f4b46ce66b4ff7..414ee916e863bb 100644
--- a/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h
+++ b/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h
@@ -85,35 +85,5 @@ class JavaNativeModule : public NativeModule {
   std::vector<folly::Optional<MethodInvoker>> syncMethods_;
 };
 
-// Experimental new implementation that uses direct method invocation
-class NewJavaNativeModule : public NativeModule {
- public:
-  NewJavaNativeModule(
-      std::weak_ptr<Instance> instance,
-      jni::alias_ref<JavaModuleWrapper::javaobject> wrapper,
-      std::shared_ptr<MessageQueueThread> messageQueueThread);
-
-  std::string getName() override;
-  std::vector<MethodDescriptor> getMethods() override;
-  folly::dynamic getConstants() override;
-  void invoke(unsigned int reactMethodId, folly::dynamic &&params, int callId)
-      override;
-  MethodCallResult callSerializableNativeHook(
-      unsigned int reactMethodId,
-      folly::dynamic &&params) override;
-
- private:
-  std::weak_ptr<Instance> instance_;
-  jni::global_ref<JavaModuleWrapper::javaobject> wrapper_;
-  jni::global_ref<JBaseJavaModule::javaobject> module_;
-  std::shared_ptr<MessageQueueThread> messageQueueThread_;
-  std::vector<MethodInvoker> methods_;
-  std::vector<MethodDescriptor> methodDescriptors_;
-
-  MethodCallResult invokeInner(
-      unsigned int reactMethodId,
-      folly::dynamic &&params);
-};
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h
index c9eab4170d41f4..d4adbf6d7219d2 100644
--- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h
+++ b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <cxxreact/JSExecutor.h>
+#include <cxxreact/RAMBundleRegistry.h>
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include "OnLoad.h"
diff --git a/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp b/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp
index c1ad15082bebf5..61f686c4404466 100644
--- a/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp
@@ -64,14 +64,15 @@ local_ref<JArrayClass<jstring>> ReadableNativeMap::importKeys() {
     return JArrayClass<jstring>::newArray(0);
   }
   auto pairs = map_.items();
-  for (auto &pair : pairs) {
-    keys_.value().push_back(pair.first.asString());
-  }
-  jint size = keys_.value().size();
+  jint size = map_.size();
   auto jarray = JArrayClass<jstring>::newArray(size);
-  for (jint ii = 0; ii < size; ii++) {
-    (*jarray)[ii] = make_jstring(keys_.value()[ii].getString());
+  jint i = 0;
+  for (auto &pair : pairs) {
+    auto value = pair.first.asString();
+    keys_.value().push_back(value);
+    (*jarray)[i++] = make_jstring(value);
   }
+
   return jarray;
 }
 
diff --git a/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/ReactAndroid/src/main/jni/third-party/boost/Android.mk
index 089e7d84b5a47a..6092d28c5d932a 100644
--- a/ReactAndroid/src/main/jni/third-party/boost/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/boost/Android.mk
@@ -1,9 +1,14 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+# These ASM files are picked from the boost release separately,
+# because the react native version does not include anything outside of headers.
+# They are required for Folly futures to compile successfully.
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH)/*.S)
+
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 
-LOCAL_MODULE    := boost
+LOCAL_MODULE := boost
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/arm/jump_arm_aapcs_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/arm/jump_arm_aapcs_elf_gas.S
new file mode 100644
index 00000000000000..d0f7fa24c6a924
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/arm/jump_arm_aapcs_elf_gas.S
@@ -0,0 +1,86 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/*******************************************************
+ *                                                     *
+ *  -------------------------------------------------  *
+ *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  *
+ *  -------------------------------------------------  *
+ *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c|  *
+ *  -------------------------------------------------  *
+ *  | s16 | s17 | s18 | s19 | s20 | s21 | s22 | s23 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
+ *  -------------------------------------------------  *
+ *  | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c|  *
+ *  -------------------------------------------------  *
+ *  | s24 | s25 | s26 | s27 | s28 | s29 | s30 | s31 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  16 |  17 |  18 |  19 |  20 |  21 |  22 |  23 |  *
+ *  -------------------------------------------------  *
+ *  | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c|  *
+ *  -------------------------------------------------  *
+ *  |hiddn|  v1 |  v2 |  v3 |  v4 |  v5 |  v6 |  v7 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  24 |  25 |  26 |  27 |  28 |  29 |  30 |  31 |  *
+ *  -------------------------------------------------  *
+ *  | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c|  *
+ *  -------------------------------------------------  *
+ *  |  v8 |  lr |  pc | FCTX| DATA|                 |  *
+ *  -------------------------------------------------  *
+ *                                                     *
+ *******************************************************/
+
+.text
+.globl jump_fcontext
+.align 2
+.type jump_fcontext,%function
+jump_fcontext:
+    @ save LR as PC
+    push {lr}
+    @ save hidden,V1-V8,LR
+    push {a1,v1-v8,lr}
+
+    @ prepare stack for FPU
+    sub  sp, sp, #64
+#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+    @ save S16-S31
+    vstmia sp, {d8-d15}
+#endif
+
+    @ store RSP (pointing to context-data) in A1
+    mov  a1, sp
+
+    @ restore RSP (pointing to context-data) from A2
+    mov  sp, a2
+
+#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+    @ restore S16-S31
+    vldmia  sp, {d8-d15}
+#endif
+    @ prepare stack for FPU
+    add  sp, sp, #64
+
+    @ restore hidden,V1-V8,LR
+    pop {a4,v1-v8,lr}
+
+    @ return transfer_t from jump
+    str  a1, [a4, #0]
+    str  a3, [a4, #4]
+    @ pass transfer_t as first arg in context function
+    @ A1 == FCTX, A2 == DATA
+    mov  a2, a3
+
+    @ restore PC
+    pop {pc}
+.size jump_fcontext,.-jump_fcontext
+
+@ Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/arm/make_arm_aapcs_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/arm/make_arm_aapcs_elf_gas.S
new file mode 100644
index 00000000000000..993dac10922244
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/arm/make_arm_aapcs_elf_gas.S
@@ -0,0 +1,79 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/*******************************************************
+ *                                                     *
+ *  -------------------------------------------------  *
+ *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  *
+ *  -------------------------------------------------  *
+ *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c|  *
+ *  -------------------------------------------------  *
+ *  | s16 | s17 | s18 | s19 | s20 | s21 | s22 | s23 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
+ *  -------------------------------------------------  *
+ *  | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c|  *
+ *  -------------------------------------------------  *
+ *  | s24 | s25 | s26 | s27 | s28 | s29 | s30 | s31 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  16 |  17 |  18 |  19 |  20 |  21 |  22 |  23 |  *
+ *  -------------------------------------------------  *
+ *  | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c|  *
+ *  -------------------------------------------------  *
+ *  |hiddn|  v1 |  v2 |  v3 |  v4 |  v5 |  v6 |  v7 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  24 |  25 |  26 |  27 |  28 |  29 |  30 |  31 |  *
+ *  -------------------------------------------------  *
+ *  | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c|  *
+ *  -------------------------------------------------  *
+ *  |  v8 |  lr |  pc | FCTX| DATA|                 |  *
+ *  -------------------------------------------------  *
+ *                                                     *
+ *******************************************************/
+
+.text
+.globl make_fcontext
+.align 2
+.type make_fcontext,%function
+make_fcontext:
+    @ shift address in A1 to lower 16 byte boundary
+    bic  a1, a1, #15
+
+    @ reserve space for context-data on context-stack
+    sub  a1, a1, #128
+
+    @ third arg of make_fcontext() == address of context-function
+    str  a3, [a1, #104]
+
+    @ compute address of returned transfer_t
+    add  a2, a1, #108
+    mov  a3, a2
+    str  a3, [a1, #64]
+
+    @ compute abs address of label finish
+    adr  a2, finish
+    @ save address of finish as return-address for context-function
+    @ will be entered after context-function returns
+    str  a2, [a1, #100]
+
+#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+#endif
+
+    bx  lr @ return pointer to context-data
+
+finish:
+    @ exit code is zero
+    mov  a1, #0
+    @ exit application
+    bl  _exit@PLT
+.size make_fcontext,.-make_fcontext
+
+@ Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/arm/ontop_arm_aapcs_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/arm/ontop_arm_aapcs_elf_gas.S
new file mode 100644
index 00000000000000..9d9198fc552a50
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/arm/ontop_arm_aapcs_elf_gas.S
@@ -0,0 +1,91 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/*******************************************************
+ *                                                     *
+ *  -------------------------------------------------  *
+ *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  *
+ *  -------------------------------------------------  *
+ *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c|  *
+ *  -------------------------------------------------  *
+ *  | s16 | s17 | s18 | s19 | s20 | s21 | s22 | s23 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
+ *  -------------------------------------------------  *
+ *  | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c|  *
+ *  -------------------------------------------------  *
+ *  | s24 | s25 | s26 | s27 | s28 | s29 | s30 | s31 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  16 |  17 |  18 |  19 |  20 |  21 |  22 |  23 |  *
+ *  -------------------------------------------------  *
+ *  | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c|  *
+ *  -------------------------------------------------  *
+ *  |hiddn|  v1 |  v2 |  v3 |  v4 |  v5 |  v6 |  v7 |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  24 |  25 |  26 |  27 |  28 |  29 |  30 |  31 |  *
+ *  -------------------------------------------------  *
+ *  | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c|  *
+ *  -------------------------------------------------  *
+ *  |  v8 |  lr |  pc | FCTX| DATA|                 |  *
+ *  -------------------------------------------------  *
+ *                                                     *
+ *******************************************************/
+
+.text
+.globl ontop_fcontext
+.align 2
+.type ontop_fcontext,%function
+ontop_fcontext:
+    @ save LR as PC
+    push {lr}
+    @ save hidden,V1-V8,LR
+    push {a1,v1-v8,lr}
+
+    @ prepare stack for FPU
+    sub  sp, sp, #64
+#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+    @ save S16-S31
+    vstmia sp, {d8-d15}
+#endif
+
+    @ store RSP (pointing to context-data) in A1
+    mov  a1, sp
+
+    @ restore RSP (pointing to context-data) from A2
+    mov  sp, a2
+
+    @ store parent context in A2
+    mov  a2, a1
+
+#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+    @ restore S16-S31
+    vldmia  sp, {d8-d15}
+#endif
+    @ prepare stack for FPU
+    add  sp, sp, #64
+
+    @ restore hidden,V1-V8,LR
+    pop {a1,v1-v8,lr}
+
+    @ return transfer_t from jump
+    str  a2, [a1, #0]
+    str  a3, [a1, #4]
+    @ pass transfer_t as first arg in context function
+    @ A1 == hidden, A2 == FCTX, A3 == DATA
+
+    @ skip PC
+    add  sp, sp, #4
+
+    @ jump to ontop-function
+    bx  a4
+.size ontop_fcontext,.-ontop_fcontext
+
+@ Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/jump_arm64_aapcs_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/jump_arm64_aapcs_elf_gas.S
new file mode 100644
index 00000000000000..7c0c2fa2f20bff
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/jump_arm64_aapcs_elf_gas.S
@@ -0,0 +1,114 @@
+/*
+       Copyright Edward Nevill + Oliver Kowalke 2015
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+/*******************************************************
+ *                                                     *
+ *  -------------------------------------------------  *
+ *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  *
+ *  -------------------------------------------------  *
+ *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c|  *
+ *  -------------------------------------------------  *
+ *  |    d8     |    d9     |    d10    |    d11    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
+ *  -------------------------------------------------  *
+ *  | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c|  *
+ *  -------------------------------------------------  *
+ *  |    d12    |    d13    |    d14    |    d15    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  16 |  17 |  18 |  19 |  20 |  21 |  22 |  23 |  *
+ *  -------------------------------------------------  *
+ *  | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c|  *
+ *  -------------------------------------------------  *
+ *  |    x19    |    x20    |    x21    |    x22    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  24 |  25 |  26 |  27 |  28 |  29 |  30 |  31 |  *
+ *  -------------------------------------------------  *
+ *  | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c|  *
+ *  -------------------------------------------------  *
+ *  |    x23    |    x24    |    x25    |    x26    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  32 |  33 |  34 |  35 |  36 |  37 |  38 |  39 |  *
+ *  -------------------------------------------------  *
+ *  | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c|  *
+ *  -------------------------------------------------  *
+ *  |    x27    |    x28    |    FP     |     LR    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  40 |  41 |  42 | 43  |           |           |  *
+ *  -------------------------------------------------  *
+ *  | 0xa0| 0xa4| 0xa8| 0xac|           |           |  *
+ *  -------------------------------------------------  *
+ *  |     PC    |   align   |           |           |  *
+ *  -------------------------------------------------  *
+ *                                                     *
+ *******************************************************/
+
+.cpu    generic+fp+simd
+.text
+.align  2
+.global jump_fcontext
+.type   jump_fcontext, %function
+jump_fcontext:
+    # prepare stack for GP + FPU
+    sub  sp, sp, #0xb0
+
+    # save d8 - d15
+    stp  d8,  d9,  [sp, #0x00]
+    stp  d10, d11, [sp, #0x10]
+    stp  d12, d13, [sp, #0x20]
+    stp  d14, d15, [sp, #0x30]
+
+    # save x19-x30
+    stp  x19, x20, [sp, #0x40]
+    stp  x21, x22, [sp, #0x50]
+    stp  x23, x24, [sp, #0x60]
+    stp  x25, x26, [sp, #0x70]
+    stp  x27, x28, [sp, #0x80]
+    stp  x29, x30, [sp, #0x90]
+
+    # save LR as PC
+    str  x30, [sp, #0xa0]
+
+    # store RSP (pointing to context-data) in X0
+    mov  x4, sp
+
+    # restore RSP (pointing to context-data) from X1
+    mov  sp, x0
+
+    # load d8 - d15
+    ldp  d8,  d9,  [sp, #0x00]
+    ldp  d10, d11, [sp, #0x10]
+    ldp  d12, d13, [sp, #0x20]
+    ldp  d14, d15, [sp, #0x30]
+
+    # load x19-x30
+    ldp  x19, x20, [sp, #0x40]
+    ldp  x21, x22, [sp, #0x50]
+    ldp  x23, x24, [sp, #0x60]
+    ldp  x25, x26, [sp, #0x70]
+    ldp  x27, x28, [sp, #0x80]
+    ldp  x29, x30, [sp, #0x90]
+
+    # return transfer_t from jump
+    # pass transfer_t as first arg in context function
+    # X0 == FCTX, X1 == DATA
+    mov x0, x4
+
+    # load pc
+    ldr  x4, [sp, #0xa0]
+
+    # restore stack from GP + FPU
+    add  sp, sp, #0xb0
+
+    ret x4
+.size   jump_fcontext,.-jump_fcontext
+# Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/make_arm64_aapcs_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/make_arm64_aapcs_elf_gas.S
new file mode 100644
index 00000000000000..e71a91cf6f08b9
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/make_arm64_aapcs_elf_gas.S
@@ -0,0 +1,85 @@
+/*
+            Copyright Edward Nevill + Oliver Kowalke 2015
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+/*******************************************************
+ *                                                     *
+ *  -------------------------------------------------  *
+ *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  *
+ *  -------------------------------------------------  *
+ *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c|  *
+ *  -------------------------------------------------  *
+ *  |    d8     |    d9     |    d10    |    d11    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
+ *  -------------------------------------------------  *
+ *  | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c|  *
+ *  -------------------------------------------------  *
+ *  |    d12    |    d13    |    d14    |    d15    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  16 |  17 |  18 |  19 |  20 |  21 |  22 |  23 |  *
+ *  -------------------------------------------------  *
+ *  | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c|  *
+ *  -------------------------------------------------  *
+ *  |    x19    |    x20    |    x21    |    x22    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  24 |  25 |  26 |  27 |  28 |  29 |  30 |  31 |  *
+ *  -------------------------------------------------  *
+ *  | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c|  *
+ *  -------------------------------------------------  *
+ *  |    x23    |    x24    |    x25    |    x26    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  32 |  33 |  34 |  35 |  36 |  37 |  38 |  39 |  *
+ *  -------------------------------------------------  *
+ *  | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c|  *
+ *  -------------------------------------------------  *
+ *  |    x27    |    x28    |    FP     |     LR    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  40 |  41 |  42 | 43  |           |           |  *
+ *  -------------------------------------------------  *
+ *  | 0xa0| 0xa4| 0xa8| 0xac|           |           |  *
+ *  -------------------------------------------------  *
+ *  |     PC    |   align   |           |           |  *
+ *  -------------------------------------------------  *
+ *                                                     *
+ *******************************************************/
+
+.cpu    generic+fp+simd
+.text
+.align  2
+.global make_fcontext
+.type   make_fcontext, %function
+make_fcontext:
+    # shift address in x0 (allocated stack) to lower 16 byte boundary
+    and x0, x0, ~0xF
+
+    # reserve space for context-data on context-stack
+    sub  x0, x0, #0xb0
+
+    # third arg of make_fcontext() == address of context-function
+    # store address as a PC to jump in
+    str  x2, [x0, #0xa0]
+
+    # save address of finish as return-address for context-function
+    # will be entered after context-function returns (LR register)
+    adr  x1, finish
+    str  x1, [x0, #0x98]
+
+    ret  x30 // return pointer to context-data (x0)
+
+finish:
+    # exit code is zero
+    mov  x0, #0
+    # exit application
+    bl  _exit
+
+.size   make_fcontext,.-make_fcontext
+# Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/ontop_arm64_aapcs_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/ontop_arm64_aapcs_elf_gas.S
new file mode 100644
index 00000000000000..7e3b047a22c440
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/arm64/ontop_arm64_aapcs_elf_gas.S
@@ -0,0 +1,113 @@
+/*
+       Copyright Edward Nevill + Oliver Kowalke 2015
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+/*******************************************************
+ *                                                     *
+ *  -------------------------------------------------  *
+ *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  *
+ *  -------------------------------------------------  *
+ *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c|  *
+ *  -------------------------------------------------  *
+ *  |    d8     |    d9     |    d10    |    d11    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
+ *  -------------------------------------------------  *
+ *  | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c|  *
+ *  -------------------------------------------------  *
+ *  |    d12    |    d13    |    d14    |    d15    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  16 |  17 |  18 |  19 |  20 |  21 |  22 |  23 |  *
+ *  -------------------------------------------------  *
+ *  | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c|  *
+ *  -------------------------------------------------  *
+ *  |    x19    |    x20    |    x21    |    x22    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  24 |  25 |  26 |  27 |  28 |  29 |  30 |  31 |  *
+ *  -------------------------------------------------  *
+ *  | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c|  *
+ *  -------------------------------------------------  *
+ *  |    x23    |    x24    |    x25    |    x26    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  32 |  33 |  34 |  35 |  36 |  37 |  38 |  39 |  *
+ *  -------------------------------------------------  *
+ *  | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c|  *
+ *  -------------------------------------------------  *
+ *  |    x27    |    x28    |    FP     |     LR    |  *
+ *  -------------------------------------------------  *
+ *  -------------------------------------------------  *
+ *  |  40 |  41 |  42 | 43  |           |           |  *
+ *  -------------------------------------------------  *
+ *  | 0xa0| 0xa4| 0xa8| 0xac|           |           |  *
+ *  -------------------------------------------------  *
+ *  |     PC    |   align   |           |           |  *
+ *  -------------------------------------------------  *
+ *                                                     *
+ *******************************************************/
+
+.cpu    generic+fp+simd
+.text
+.align  2
+.global ontop_fcontext
+.type   ontop_fcontext, %function
+ontop_fcontext:
+    # prepare stack for GP + FPU
+    sub  sp, sp, #0xb0
+
+    # save d8 - d15
+    stp  d8,  d9,  [sp, #0x00]
+    stp  d10, d11, [sp, #0x10]
+    stp  d12, d13, [sp, #0x20]
+    stp  d14, d15, [sp, #0x30]
+
+    # save x19-x30
+    stp  x19, x20, [sp, #0x40]
+    stp  x21, x22, [sp, #0x50]
+    stp  x23, x24, [sp, #0x60]
+    stp  x25, x26, [sp, #0x70]
+    stp  x27, x28, [sp, #0x80]
+    stp  x29, x30, [sp, #0x90]
+
+    # save LR as PC
+    str  x30, [sp, #0xa0]
+
+    # store RSP (pointing to context-data) in X5
+    mov  x4, sp
+
+    # restore RSP (pointing to context-data) from X1
+    mov  sp, x0
+
+    # load d8 - d15
+    ldp  d8,  d9,  [sp, #0x00]
+    ldp  d10, d11, [sp, #0x10]
+    ldp  d12, d13, [sp, #0x20]
+    ldp  d14, d15, [sp, #0x30]
+
+    # load x19-x30
+    ldp  x19, x20, [sp, #0x40]
+    ldp  x21, x22, [sp, #0x50]
+    ldp  x23, x24, [sp, #0x60]
+    ldp  x25, x26, [sp, #0x70]
+    ldp  x27, x28, [sp, #0x80]
+    ldp  x29, x30, [sp, #0x90]
+
+    # return transfer_t from jump
+    # pass transfer_t as first arg in context function
+    # X0 == FCTX, X1 == DATA
+    mov x0, x4
+
+    # skip pc
+    # restore stack from GP + FPU
+    add  sp, sp, #0xb0
+
+    # jump to ontop-function
+    ret x2
+.size   ontop_fcontext,.-ontop_fcontext
+# Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/x86/jump_i386_sysv_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/x86/jump_i386_sysv_elf_gas.S
new file mode 100644
index 00000000000000..25f01db27d0e04
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/x86/jump_i386_sysv_elf_gas.S
@@ -0,0 +1,78 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/****************************************************************************************
+ *                                                                                      *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  | fc_mxcsr|fc_x87_cw|   EDI   |   ESI   |   EBX    |   EBP   |   EIP   |  hidden |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    8    |    9    |    10   |    11   |    12    |    13   |    14   |    15   |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x20  |   0x24  |                                                            |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    to   |   data  |                                                            |  *
+ *  ----------------------------------------------------------------------------------  *
+ *                                                                                      *
+ ****************************************************************************************/
+
+.text
+.globl jump_fcontext
+.align 2
+.type jump_fcontext,@function
+jump_fcontext:
+    leal  -0x18(%esp), %esp  /* prepare stack */
+
+    stmxcsr  (%esp)     /* save MMX control- and status-word */
+    fnstcw   0x4(%esp)  /* save x87 control-word */
+
+    movl  %edi, 0x8(%esp)  /* save EDI */
+    movl  %esi, 0xc(%esp)  /* save ESI */
+    movl  %ebx, 0x10(%esp)  /* save EBX */
+    movl  %ebp, 0x14(%esp)  /* save EBP */
+
+    /* store ESP (pointing to context-data) in ECX */
+    movl  %esp, %ecx
+
+    /* first arg of jump_fcontext() == fcontext to jump to */
+    movl  0x20(%esp), %eax
+
+    /* second arg of jump_fcontext() == data to be transferred */
+    movl  0x24(%esp), %edx
+
+    /* restore ESP (pointing to context-data) from EAX */
+    movl  %eax, %esp
+
+    /* address of returned transport_t */
+    movl 0x1c(%esp), %eax
+    /* return parent fcontext_t */
+    movl  %ecx, (%eax)
+    /* return data */
+    movl %edx, 0x4(%eax)
+
+    movl  0x18(%esp), %ecx  /* restore EIP */
+
+    ldmxcsr  (%esp)     /* restore MMX control- and status-word */
+    fldcw    0x4(%esp)  /* restore x87 control-word */
+
+    movl  0x8(%esp), %edi  /* restore EDI */
+    movl  0xc(%esp), %esi  /* restore ESI */
+    movl  0x10(%esp), %ebx  /* restore EBX */
+    movl  0x14(%esp), %ebp  /* restore EBP */
+
+    leal  0x20(%esp), %esp  /* prepare stack */
+
+    /* jump to context */
+    jmp *%ecx
+.size jump_fcontext,.-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/x86/make_i386_sysv_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/x86/make_i386_sysv_elf_gas.S
new file mode 100644
index 00000000000000..de77e8834daa7f
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/x86/make_i386_sysv_elf_gas.S
@@ -0,0 +1,106 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/****************************************************************************************
+ *                                                                                      *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  | fc_mxcsr|fc_x87_cw|   EDI   |   ESI   |   EBX    |   EBP   |   EIP   |  hidden |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    8    |    9    |    10   |    11   |    12    |    13   |    14   |    15   |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x20  |   0x24  |                                                            |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    to   |   data  |                                                            |  *
+ *  ----------------------------------------------------------------------------------  *
+ *                                                                                      *
+ ****************************************************************************************/
+
+.text
+.globl make_fcontext
+.align 2
+.type make_fcontext,@function
+make_fcontext:
+    /* first arg of make_fcontext() == top of context-stack */
+    movl  0x4(%esp), %eax
+
+    /* reserve space for first argument of context-function
+       eax might already point to a 16byte border */
+    leal  -0x8(%eax), %eax
+
+    /* shift address in EAX to lower 16 byte boundary */
+    andl  $-16, %eax
+
+    /* reserve space for context-data on context-stack */
+    leal  -0x28(%eax), %eax
+
+    /* third arg of make_fcontext() == address of context-function */
+    /* stored in EBX */
+    movl  0xc(%esp), %ecx
+    movl  %ecx, 0x10(%eax)
+
+    /* save MMX control- and status-word */
+    stmxcsr (%eax)
+    /* save x87 control-word */
+    fnstcw  0x4(%eax)
+
+    /* return transport_t */
+    /* FCTX == EDI, DATA == ESI */
+    leal  0x8(%eax), %ecx
+    movl  %ecx, 0x1c(%eax)
+
+    /* compute abs address of label trampoline */
+    call  1f
+    /* address of trampoline 1 */
+1:  popl  %ecx
+    /* compute abs address of label trampoline */
+    addl  $trampoline-1b, %ecx
+    /* save address of trampoline as return address */
+    /* will be entered after calling jump_fcontext() first time */
+    movl  %ecx, 0x18(%eax)
+
+    /* compute abs address of label finish */
+    call  2f
+    /* address of label 2 */
+2:  popl  %ecx
+    /* compute abs address of label finish */
+    addl  $finish-2b, %ecx
+    /* save address of finish as return-address for context-function */
+    /* will be entered after context-function returns */
+    movl  %ecx, 0x14(%eax) 
+
+    ret /* return pointer to context-data */
+
+trampoline:
+    /* move transport_t for entering context-function */
+    movl  %edi, (%esp)
+    movl  %esi, 0x4(%esp)
+    pushl %ebp
+    /* jump to context-function */
+    jmp *%ebx
+
+finish:
+    call  3f
+    /* address of label 3 */
+3:  popl  %ebx
+    /* compute address of GOT and store it in EBX */
+    addl  $_GLOBAL_OFFSET_TABLE_+[.-3b], %ebx
+
+    /* exit code is zero */
+    xorl  %eax, %eax
+    movl  %eax, (%esp)
+    /* exit application */
+    call  _exit@PLT
+    hlt
+.size make_fcontext,.-make_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/x86/ontop_i386_sysv_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/x86/ontop_i386_sysv_elf_gas.S
new file mode 100644
index 00000000000000..d3a6692ffcaf93
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/x86/ontop_i386_sysv_elf_gas.S
@@ -0,0 +1,85 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/****************************************************************************************
+ *                                                                                      *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  | fc_mxcsr|fc_x87_cw|   EDI   |   ESI   |   EBX    |   EBP   |   EIP   |  hidden |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    8    |    9    |    10   |    11   |    12    |    13   |    14   |    15   |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x20  |   0x24  |                                                            |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    to   |   data  |                                                            |  *
+ *  ----------------------------------------------------------------------------------  *
+ *                                                                                      *
+ ****************************************************************************************/
+
+.text
+.globl ontop_fcontext
+.align 2
+.type ontop_fcontext,@function
+ontop_fcontext:
+    leal  -0x18(%esp), %esp  /* prepare stack */
+
+    stmxcsr  (%esp)     /* save MMX control- and status-word */
+    fnstcw   0x4(%esp)  /* save x87 control-word */
+
+    movl  %edi, 0x8(%esp)  /* save EDI */
+    movl  %esi, 0xc(%esp)  /* save ESI */
+    movl  %ebx, 0x10(%esp)  /* save EBX */
+    movl  %ebp, 0x14(%esp)  /* save EBP */
+
+    /* store ESP (pointing to context-data) in ECX */
+    movl  %esp, %ecx
+
+    /* first arg of ontop_fcontext() == fcontext to jump to */
+    movl  0x20(%esp), %eax
+
+    /* pass parent fcontext_t */
+    movl  %ecx, 0x20(%eax)
+
+    /* second arg of ontop_fcontext() == data to be transferred */
+    movl  0x24(%esp), %ecx
+
+    /* pass data */
+    movl %ecx, 0x24(%eax)
+
+    /* third arg of ontop_fcontext() == ontop-function */
+    movl  0x28(%esp), %ecx
+
+    /* restore ESP (pointing to context-data) from EAX */
+    movl  %eax, %esp
+
+    /* address of returned transport_t */
+    movl 0x1c(%esp), %eax
+    /* return parent fcontext_t */
+    movl  %ecx, (%eax)
+    /* return data */
+    movl %edx, 0x4(%eax)
+
+    ldmxcsr  (%esp)     /* restore MMX control- and status-word */
+    fldcw    0x4(%esp)  /* restore x87 control-word */
+
+    movl  0x8(%esp), %edi  /* restore EDI */
+    movl  0xc(%esp), %esi  /* restore ESI */
+    movl  0x10(%esp), %ebx  /* restore EBX */
+    movl  0x14(%esp), %ebp  /* restore EBP */
+
+    leal  0x18(%esp), %esp  /* prepare stack */
+
+    /* jump to context */
+    jmp *%ecx
+.size ontop_fcontext,.-ontop_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/jump_x86_64_sysv_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/jump_x86_64_sysv_elf_gas.S
new file mode 100644
index 00000000000000..019423886e9bb4
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/jump_x86_64_sysv_elf_gas.S
@@ -0,0 +1,76 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+            http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/****************************************************************************************
+ *                                                                                      *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  | fc_mxcsr|fc_x87_cw|        R12        |         R13        |        R14        |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |        R15        |        RBX        |         RBP        |        RIP        |  *
+ *  ----------------------------------------------------------------------------------  *
+ *                                                                                      *
+ ****************************************************************************************/
+
+.text
+.globl jump_fcontext
+.type jump_fcontext,@function
+.align 16
+jump_fcontext:
+    leaq  -0x38(%rsp), %rsp /* prepare stack */
+
+    stmxcsr  (%rsp)     /* save MMX control- and status-word */
+    fnstcw   0x4(%rsp)  /* save x87 control-word */
+
+    movq  %r12, 0x8(%rsp)  /* save R12 */
+    movq  %r13, 0x10(%rsp)  /* save R13 */
+    movq  %r14, 0x18(%rsp)  /* save R14 */
+    movq  %r15, 0x20(%rsp)  /* save R15 */
+    movq  %rbx, 0x28(%rsp)  /* save RBX */
+    movq  %rbp, 0x30(%rsp)  /* save RBP */
+
+    /* store RSP (pointing to context-data) in RAX */
+    movq  %rsp, %rax
+
+    /* restore RSP (pointing to context-data) from RDI */
+    movq  %rdi, %rsp
+
+    movq  0x38(%rsp), %r8  /* restore return-address */
+
+    ldmxcsr  (%rsp)     /* restore MMX control- and status-word */
+    fldcw    0x4(%rsp)  /* restore x87 control-word */
+
+    movq  0x8(%rsp), %r12  /* restore R12 */
+    movq  0x10(%rsp), %r13  /* restore R13 */
+    movq  0x18(%rsp), %r14  /* restore R14 */
+    movq  0x20(%rsp), %r15  /* restore R15 */
+    movq  0x28(%rsp), %rbx  /* restore RBX */
+    movq  0x30(%rsp), %rbp  /* restore RBP */
+
+    leaq  0x40(%rsp), %rsp /* prepare stack */
+
+    /* return transfer_t from jump */
+    /* RAX == fctx, RDX == data */
+    movq  %rsi, %rdx
+    /* pass transfer_t as first arg in context function */
+    /* RDI == fctx, RSI == data */
+    movq  %rax, %rdi
+
+    /* indirect jump to context */
+    jmp  *%r8
+.size jump_fcontext,.-jump_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/make_x86_64_sysv_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/make_x86_64_sysv_elf_gas.S
new file mode 100644
index 00000000000000..25a0c00177fc90
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/make_x86_64_sysv_elf_gas.S
@@ -0,0 +1,81 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+            http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/****************************************************************************************
+ *                                                                                      *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  | fc_mxcsr|fc_x87_cw|        R12        |         R13        |        R14        |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |        R15        |        RBX        |         RBP        |        RIP        |  *
+ *  ----------------------------------------------------------------------------------  *
+ *                                                                                      *
+ ****************************************************************************************/
+
+.text
+.globl make_fcontext
+.type make_fcontext,@function
+.align 16
+make_fcontext:
+    /* first arg of make_fcontext() == top of context-stack */
+    movq  %rdi, %rax
+
+    /* shift address in RAX to lower 16 byte boundary */
+    andq  $-16, %rax
+
+    /* reserve space for context-data on context-stack */
+    /* on context-function entry: (RSP -0x8) % 16 == 0 */
+    leaq  -0x40(%rax), %rax
+
+    /* third arg of make_fcontext() == address of context-function */
+    /* stored in RBX */
+    movq  %rdx, 0x28(%rax)
+
+    /* save MMX control- and status-word */
+    stmxcsr  (%rax)
+    /* save x87 control-word */
+    fnstcw   0x4(%rax)
+
+    /* compute abs address of label trampoline */
+    leaq  trampoline(%rip), %rcx
+    /* save address of trampoline as return-address for context-function */
+    /* will be entered after calling jump_fcontext() first time */
+    movq  %rcx, 0x38(%rax)
+
+    /* compute abs address of label finish */
+    leaq  finish(%rip), %rcx
+    /* save address of finish as return-address for context-function */
+    /* will be entered after context-function returns */
+    movq  %rcx, 0x30(%rax)
+
+    ret /* return pointer to context-data */
+
+trampoline:
+    /* store return address on stack */
+    /* fix stack alignment */
+    push %rbp
+    /* jump to context-function */
+    jmp *%rbx
+
+finish:
+    /* exit code is zero */
+    xorq  %rdi, %rdi
+    /* exit application */
+    call  _exit@PLT
+    hlt
+.size make_fcontext,.-make_fcontext
+
+/* Mark that we don't need executable stack. */
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/ontop_x86_64_sysv_elf_gas.S b/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/ontop_x86_64_sysv_elf_gas.S
new file mode 100644
index 00000000000000..d2a9373f126040
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/boost/asm/x86_64/ontop_x86_64_sysv_elf_gas.S
@@ -0,0 +1,79 @@
+/*
+            Copyright Oliver Kowalke 2009.
+   Distributed under the Boost Software License, Version 1.0.
+      (See accompanying file LICENSE_1_0.txt or copy at
+            http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/****************************************************************************************
+ *                                                                                      *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  | fc_mxcsr|fc_x87_cw|        R12        |         R13        |        R14        |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
+ *  ----------------------------------------------------------------------------------  *
+ *  |        R15        |        RBX        |         RBP        |        RIP        |  *
+ *  ----------------------------------------------------------------------------------  *
+ *                                                                                      *
+ ****************************************************************************************/
+
+.text
+.globl ontop_fcontext
+.type ontop_fcontext,@function
+.align 16
+ontop_fcontext:
+    /* preserve ontop-function in R8 */
+    movq  %rdx, %r8
+
+    leaq  -0x38(%rsp), %rsp /* prepare stack */
+
+    stmxcsr  (%rsp)     /* save MMX control- and status-word */
+    fnstcw   0x4(%rsp)  /* save x87 control-word */
+
+    movq  %r12, 0x8(%rsp)  /* save R12 */
+    movq  %r13, 0x10(%rsp)  /* save R13 */
+    movq  %r14, 0x18(%rsp)  /* save R14 */
+    movq  %r15, 0x20(%rsp)  /* save R15 */
+    movq  %rbx, 0x28(%rsp)  /* save RBX */
+    movq  %rbp, 0x30(%rsp)  /* save RBP */
+
+    /* store RSP (pointing to context-data) in RAX */
+    movq  %rsp, %rax
+
+    /* restore RSP (pointing to context-data) from RDI */
+    movq  %rdi, %rsp
+
+    ldmxcsr  (%rsp)     /* restore MMX control- and status-word */
+    fldcw    0x4(%rsp)  /* restore x87 control-word */
+
+    movq  0x8(%rsp), %r12  /* restore R12 */
+    movq  0x10(%rsp), %r13  /* restore R13 */
+    movq  0x18(%rsp), %r14  /* restore R14 */
+    movq  0x20(%rsp), %r15  /* restore R15 */
+    movq  0x28(%rsp), %rbx  /* restore RBX */
+    movq  0x30(%rsp), %rbp  /* restore RBP */
+
+    leaq  0x38(%rsp), %rsp /* prepare stack */
+
+    /* return transfer_t from jump */
+    /* RAX == fctx, RDX == data */
+    movq  %rsi, %rdx
+    /* pass transfer_t as first arg in context function */
+    /* RDI == fctx, RSI == data */
+    movq  %rax, %rdi
+
+    /* keep return-address on stack */
+
+    /* indirect jump to context */
+    jmp  *%r8
+.size ontop_fcontext,.-ontop_fcontext
+
+/* Mark that we don't need executable stack.  */
+.section .note.GNU-stack,"",%progbits
diff --git a/ReactAndroid/src/main/jni/third-party/fmt/Android.mk b/ReactAndroid/src/main/jni/third-party/fmt/Android.mk
new file mode 100644
index 00000000000000..11d070286749aa
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/fmt/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := fmt
+
+LOCAL_SRC_FILES := \
+  src/format.cc
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include/
+
+LOCAL_CFLAGS += -std=c++11 -fexceptions
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/third-party/folly/Android.mk b/ReactAndroid/src/main/jni/third-party/folly/Android.mk
index 1bd5c3e9d137af..dacf2118dc66b6 100644
--- a/ReactAndroid/src/main/jni/third-party/folly/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/folly/Android.mk
@@ -15,12 +15,12 @@ LOCAL_SRC_FILES:= \
   folly/json_pointer.cpp \
   folly/lang/CString.cpp \
   folly/lang/SafeAssert.cpp \
-  folly/detail/Demangle.cpp \
   folly/detail/UniqueInstance.cpp \
   folly/hash/SpookyHashV2.cpp \
   folly/container/detail/F14Table.cpp \
   folly/ScopeGuard.cpp \
-  folly/portability/SysUio.cpp
+  folly/portability/SysUio.cpp \
+  folly/lang/ToAscii.cpp
 
 ifeq ($(APP_OPTIM),debug)
   LOCAL_SRC_FILES += \
@@ -35,9 +35,10 @@ LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare
 FOLLY_FLAGS := \
   -DFOLLY_NO_CONFIG=1 \
   -DFOLLY_HAVE_CLOCK_GETTIME=1 \
-  -DFOLLY_HAVE_MEMRCHR=1 \
   -DFOLLY_USE_LIBCPP=1 \
-  -DFOLLY_MOBILE=1
+  -DFOLLY_MOBILE=1 \
+  -DFOLLY_HAVE_RECVMMSG=1 \
+  -DFOLLY_HAVE_PTHREAD=1
 
 # If APP_PLATFORM in Application.mk targets android-23 above, please comment this line.
 # NDK uses GNU style stderror_r() after API 23.
@@ -50,11 +51,7 @@ LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 LOCAL_MODULE := libfolly_json
 
 LOCAL_SHARED_LIBRARIES := libglog libdouble-conversion
-# Boost is header-only library we pretend to link is statically as
-# this way android makefile will automatically setup path to boost header
-# file, but except from that this will have no effect, as no c/cpp files
-# are part of this static library
-LOCAL_STATIC_LIBRARIES := libboost
+LOCAL_STATIC_LIBRARIES := libboost libfmt
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -62,31 +59,56 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
   folly/ExceptionWrapper.cpp \
+  folly/ExceptionString.cpp \
   folly/Executor.cpp \
   folly/SharedMutex.cpp \
+  folly/Singleton.cpp \
+  folly/Try.cpp \
   folly/concurrency/CacheLocality.cpp \
   folly/detail/AsyncTrace.cpp \
   folly/detail/AtFork.cpp \
   folly/detail/Futex.cpp \
   folly/detail/MemoryIdler.cpp \
+  folly/detail/SingletonStackTrace.cpp \
   folly/detail/StaticSingletonManager.cpp \
   folly/detail/ThreadLocalDetail.cpp \
+  folly/fibers/Baton.cpp \
+  folly/fibers/FiberManager.cpp \
+  folly/fibers/Fiber.cpp \
+  folly/fibers/GuardPageAllocator.cpp \
+  folly/futures/detail/Core.cpp \
+  folly/futures/Future.cpp \
+  folly/futures/ThreadWheelTimekeeper.cpp \
   folly/executors/ExecutorWithPriority.cpp \
   folly/executors/InlineExecutor.cpp \
   folly/executors/TimedDrivableExecutor.cpp \
   folly/executors/QueuedImmediateExecutor.cpp \
+  folly/io/async/AsyncTimeout.cpp \
+  folly/io/async/EventBase.cpp \
+  folly/io/async/EventBaseBackendBase.cpp \
+  folly/io/async/EventBaseLocal.cpp \
+  folly/io/async/EventHandler.cpp \
+  folly/io/async/HHWheelTimer.cpp \
   folly/io/async/Request.cpp \
+  folly/io/async/TimeoutManager.cpp \
+  folly/io/async/VirtualEventBase.cpp \
+  folly/lang/Exception.cpp \
   folly/memory/MallctlHelper.cpp \
   folly/portability/SysMembarrier.cpp \
   folly/synchronization/AsymmetricMemoryBarrier.cpp \
   folly/synchronization/Hazptr.cpp \
   folly/synchronization/ParkingLot.cpp \
-  folly/synchronization/WaitOptions.cpp
+  folly/synchronization/WaitOptions.cpp \
+  folly/synchronization/detail/Sleeper.cpp \
+  folly/system/Pid.cpp \
+  folly/system/ThreadId.cpp \
+  folly/system/ThreadName.cpp
+
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare
+LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -Wno-unused-variable
 
 LOCAL_CFLAGS += $(FOLLY_FLAGS)
 
@@ -95,14 +117,12 @@ LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
 LOCAL_MODULE := libfolly_futures
 
 LOCAL_SHARED_LIBRARIES := libglog libdouble-conversion libfolly_json
-# Boost is header-only library we pretend to link is statically as
-# this way android makefile will automatically setup path to boost header
-# file, but except from that this will have no effect, as no c/cpp files
-# are part of this static library
-LOCAL_STATIC_LIBRARIES := libboost
+LOCAL_STATIC_LIBRARIES := libboost libevent libfmt
 
 include $(BUILD_SHARED_LIBRARY)
 
+$(call import-module,libevent)
 $(call import-module,glog)
 $(call import-module,double-conversion)
 $(call import-module,boost)
+$(call import-module,fmt)
diff --git a/ReactAndroid/src/main/jni/third-party/libevent/Android.mk b/ReactAndroid/src/main/jni/third-party/libevent/Android.mk
new file mode 100644
index 00000000000000..e546d1b711f466
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/libevent/Android.mk
@@ -0,0 +1,36 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libevent
+
+LOCAL_SRC_FILES := event.c \
+  	buffer.c \
+	bufferevent.c \
+	bufferevent_filter.c \
+	bufferevent_pair.c \
+	bufferevent_ratelim.c \
+	bufferevent_sock.c \
+	epoll.c \
+	evmap.c \
+	evthread.c \
+	evthread_pthread.c \
+	evutil.c \
+	evutil_rand.c \
+	evutil_time.c \
+	listener.c \
+	log.c \
+	poll.c \
+	signal.c \
+	strlcpy.c \
+	select.c
+
+LOCAL_CFLAGS := -DNDEBUG -O2 -Wno-unused-function -Wno-unneeded-internal-declaration -std=c11
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include/
+
+# link against libc as well
+LOCAL_EXPORT_LDLIBS := -lc
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/third-party/libevent/evconfig-private.h b/ReactAndroid/src/main/jni/third-party/libevent/evconfig-private.h
new file mode 100644
index 00000000000000..f6b08e353e841a
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/libevent/evconfig-private.h
@@ -0,0 +1,49 @@
+/* evconfig-private.h.  Generated from evconfig-private.h.in by configure.  */
+/* evconfig-private.h template - see "Configuration Header Templates" */
+/* in AC manual.  Kevin Bowling <kevin.bowling@kev009.com */
+#ifndef EVCONFIG_PRIVATE_H_INCLUDED_
+#define EVCONFIG_PRIVATE_H_INCLUDED_
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Define to 1 if on MINIX. */
+#ifndef _MINIX
+/* #undef _MINIX */
+#endif
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#ifndef _POSIX_1_SOURCE
+/* #undef _POSIX_1_SOURCE */
+#endif
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#ifndef _POSIX_SOURCE
+/* #undef _POSIX_SOURCE */
+#endif
+
+#endif
diff --git a/ReactAndroid/src/main/jni/third-party/libevent/event-config.h b/ReactAndroid/src/main/jni/third-party/libevent/event-config.h
new file mode 100644
index 00000000000000..8b8aa6f57700f7
--- /dev/null
+++ b/ReactAndroid/src/main/jni/third-party/libevent/event-config.h
@@ -0,0 +1,340 @@
+/* event2/event-config.h
+  *
+  * This file was generated by autoconf when libevent was built, and post-
+  * processed by Libevent so that its macros would have a uniform prefix.
+  *
+  * Do not rely on macros in this file existing in later versions.
+  */
+ #ifndef _EVENT2_EVENT_CONFIG_H_
+ #define _EVENT2_EVENT_CONFIG_H_
+ #include <stddef.h>
+ #include <stdint.h>
+ /* The size of `size_t', as computed by sizeof. */
+ #if SIZE_MAX == UINT64_MAX
+ #define EVENT__SIZEOF_SIZE_T 8
+ #elif SIZE_MAX == UINT32_MAX
+ #define EVENT__SIZEOF_SIZE_T 4
+ #else
+ #error "No way to infer sizeof size_t"
+ #endif
+ #define EVENT__HAVE_UINT64_T 1
+ #define EVENT__HAVE_UINT32_T 1
+ #define EVENT__HAVE_UINT16_T 1
+ #define EVENT__HAVE_UINT8_T 1
+ #define EVENT__HAVE_UINTPTR_T 1
+ /* config.h.  Generated from config.h.in by configure.  */
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ /* Define if libevent should build without support for a debug mode */
+ /* #undef EVENT__DISABLE_DEBUG_MODE */
+ /* Define if libevent should not allow replacing the mm functions */
+ /* #undef EVENT__DISABLE_MM_REPLACEMENT */
+ /* Define if libevent should not be compiled with thread support */
+ /* #undef EVENT__DISABLE_THREAD_SUPPORT */
+ /* Define to 1 if you have the `accept4' function. */
+ #define EVENT__HAVE_ACCEPT4 1
+ /* Define to 1 if you have the `arc4random' function. */
+ #define EVENT__HAVE_ARC4RANDOM 1
+ /* Define to 1 if you have the `arc4random_buf' function. */
+ #define EVENT__HAVE_ARC4RANDOM_BUF 1
+ /* Define to 1 if you have the <arpa/inet.h> header file. */
+ #define EVENT__HAVE_ARPA_INET_H 1
+ /* Define to 1 if you have the `clock_gettime' function. */
+ #define EVENT__HAVE_CLOCK_GETTIME 1
+ /* Define to 1 if you have the declaration of `CTL_KERN', and to 0 if you
+    don't. */
+ /* #undef EVENT__HAVE_DECL_CTL_KERN */
+ /* Define to 1 if you have the declaration of `KERN_ARND', and to 0 if you
+    don't. */
+ /* #undef EVENT__HAVE_DECL_KERN_ARND */
+ /* Define to 1 if you have the declaration of `KERN_RANDOM', and to 0 if you
+    don't. */
+ /* #undef EVENT__HAVE_DECL_KERN_RANDOM */
+ /* Define to 1 if you have the declaration of `RANDOM_UUID', and to 0 if you
+    don't. */
+ /* #undef EVENT__HAVE_DECL_RANDOM_UUID */
+ /* Define if /dev/poll is available */
+ /* #undef EVENT__HAVE_DEVPOLL */
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #define EVENT__HAVE_DLFCN_H 1
+ /* Define if your system supports the epoll system calls */
+ #define EVENT__HAVE_EPOLL 1
+ /* Define to 1 if you have the `epoll_create1' function. */
+ #define EVENT__HAVE_EPOLL_CREATE1 1
+ /* Define to 1 if you have the `epoll_ctl' function. */
+ #define EVENT__HAVE_EPOLL_CTL 1
+ /* Define to 1 if you have the <errno.h> header file. */
+ #define EVENT__HAVE_ERRNO_H 1
+ /* Define to 1 if you have ERR_remove_thread_stat(). */
+ #undef EVENT__HAVE_ERR_REMOVE_THREAD_STATE
+ /* Define to 1 if you have the `eventfd' function. */
+ #define EVENT__HAVE_EVENTFD 1
+ /* Define if your system supports event ports */
+ /* #undef EVENT__HAVE_EVENT_PORTS */
+ /* Define to 1 if you have the `fcntl' function. */
+ #define EVENT__HAVE_FCNTL 1
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #define EVENT__HAVE_FCNTL_H 1
+ /* Define to 1 if the system has the type `fd_mask'. */
+ /* #undef EVENT__HAVE_FD_MASK */
+ /* Do we have getaddrinfo()? */
+ #define EVENT__HAVE_GETADDRINFO 1
+ /* Define to 1 if you have the `getegid' function. */
+ #define EVENT__HAVE_GETEGID 1
+ /* Define to 1 if you have the `geteuid' function. */
+ #define EVENT__HAVE_GETEUID 1
+ /* Define this if you have any gethostbyname_r() */
+ #define EVENT__HAVE_GETHOSTBYNAME_R 1
+ /* Define this if gethostbyname_r takes 3 arguments */
+ /* #undef EVENT__HAVE_GETHOSTBYNAME_R_3_ARG */
+ /* Define this if gethostbyname_r takes 5 arguments */
+ /* #undef EVENT__HAVE_GETHOSTBYNAME_R_5_ARG */
+ /* Define this if gethostbyname_r takes 6 arguments */
+ #define EVENT__HAVE_GETHOSTBYNAME_R_6_ARG 1
+ /* Define to 1 if you have the `getifaddrs' function. */
+ /* #undef EVENT__HAVE_GETIFADDRS */
+ /* Define to 1 if you have the `getnameinfo' function. */
+ #define EVENT__HAVE_GETNAMEINFO 1
+ /* Define to 1 if you have the `getprotobynumber' function. */
+ #define EVENT__HAVE_GETPROTOBYNUMBER 1
+ /* Define to 1 if you have the `getservbyname' function. */
+ /* #undef EVENT__HAVE_GETSERVBYNAME */
+ /* Define to 1 if you have the `gettimeofday' function. */
+ #define EVENT__HAVE_GETTIMEOFDAY 1
+ /* Define to 1 if you have the <ifaddrs.h> header file. */
+ /* #undef EVENT__HAVE_IFADDRS_H */
+ /* Define to 1 if you have the `inet_ntop' function. */
+ #define EVENT__HAVE_INET_NTOP 1
+ /* Define to 1 if you have the `inet_pton' function. */
+ #define EVENT__HAVE_INET_PTON 1
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #define EVENT__HAVE_INTTYPES_H 1
+ /* Define to 1 if you have the `issetugid' function. */
+ /* #undef EVENT__HAVE_ISSETUGID */
+ /* Define to 1 if you have the `kqueue' function. */
+ /* #undef EVENT__HAVE_KQUEUE */
+ /* Define if the system has zlib */
+ #define EVENT__HAVE_LIBZ 1
+ /* Define to 1 if you have the `mach_absolute_time' function. */
+ #undef HAVE_MACH_ABSOLUTE_TIME
+ /* Define to 1 if you have the <mach/mach_time.h> header file. */
+ #undef HAVE_MACH_MACH_TIME_H
+ /* Define to 1 if you have the <memory.h> header file. */
+ #define EVENT__HAVE_MEMORY_H 1
+ /* Define to 1 if you have the `mmap' function. */
+ #define EVENT__HAVE_MMAP 1
+ /* Define to 1 if you have the `nanosleep' function. */
+ #define EVENT__HAVE_NANOSLEEP 1
+ /* Define to 1 if you have the <netdb.h> header file. */
+ #define EVENT__HAVE_NETDB_H 1
+ /* Define to 1 if you have the <netinet/in6.h> header file. */
+ #define EVENT__HAVE_NETINET_IN6_H 1
+ /* Define to 1 if you have the <netinet/in.h> header file. */
+ #define EVENT__HAVE_NETINET_IN_H 1
+ /* Define to 1 if you have the <netinet/tcp.h> header file. */
+ #define EVENT__HAVE_NETINET_TCP_H 1
+ /* Define if the system has openssl */
+ #define EVENT__HAVE_OPENSSL 1
+ /* Define to 1 if you have the `pipe' function. */
+ /* #undef EVENT__HAVE_PIPE */
+ /* Define to 1 if you have the `pipe2' function. */
+ /* #undef EVENT__HAVE_PIPE2 */
+ /* Define to 1 if you have the `poll' function. */
+ #define EVENT__HAVE_POLL 1
+ /* Define to 1 if you have the <poll.h> header file. */
+ #define EVENT__HAVE_POLL_H 1
+ /* Define to 1 if you have the `port_create' function. */
+ /* #undef EVENT__HAVE_PORT_CREATE */
+ /* Define to 1 if you have the <port.h> header file. */
+ /* #undef EVENT__HAVE_PORT_H */
+ /* Define if you have POSIX threads libraries and header files. */
+ /* #undef EVENT__HAVE_PTHREAD */
+ /* Define if we have pthreads on this system */
+ #define EVENT__HAVE_PTHREADS 1
+ /* Define to 1 if you have the `putenv' function. */
+ #define EVENT__HAVE_PUTENV 1
+ /* Define to 1 if the system has the type `sa_family_t'. */
+ #define EVENT__HAVE_SA_FAMILY_T 1
+ /* Define to 1 if you have the `select' function. */
+ #define EVENT__HAVE_SELECT 1
+ /* Define to 1 if you have the `sendfile' function. */
+ #define EVENT__HAVE_SENDFILE 1
+ /* Define to 1 if you have the `setenv' function. */
+ #define EVENT__HAVE_SETENV 1
+ /* Define if F_SETFD is defined in <fcntl.h> */
+ #define EVENT__HAVE_SETFD 1
+ /* Define to 1 if you have the `setrlimit' function. */
+ #define HAVE_SETRLIMIT 1
+ /* Define to 1 if you have the `sigaction' function. */
+ #define EVENT__HAVE_SIGACTION 1
+ /* Define to 1 if you have the `signal' function. */
+ #define EVENT__HAVE_SIGNAL 1
+ /* Define to 1 if you have the `splice' function. */
+ #define EVENT__HAVE_SPLICE 1
+ /* Define to 1 if you have the <stdarg.h> header file. */
+ #define EVENT__HAVE_STDARG_H 1
+ /* Define to 1 if you have the <stddef.h> header file. */
+ #define EVENT__HAVE_STDDEF_H 1
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #define EVENT__HAVE_STDINT_H 1
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #define EVENT__HAVE_STDLIB_H 1
+ /* Define to 1 if you have the <strings.h> header file. */
+ #define EVENT__HAVE_STRINGS_H 1
+ /* Define to 1 if you have the <string.h> header file. */
+ #define EVENT__HAVE_STRING_H 1
+ /* Define to 1 if you have the `strlcpy' function. */
+ #define EVENT__HAVE_STRLCPY 1
+ /* Define to 1 if you have the `strsep' function. */
+ #define EVENT__HAVE_STRSEP 1
+ /* Define to 1 if you have the `strtok_r' function. */
+ #define EVENT__HAVE_STRTOK_R 1
+ /* Define to 1 if you have the `strtoll' function. */
+ #define EVENT__HAVE_STRTOLL 1
+ /* Define to 1 if the system has the type `struct addrinfo'. */
+ #define EVENT__HAVE_STRUCT_ADDRINFO 1
+ /* Define to 1 if the system has the type `struct in6_addr'. */
+ #define EVENT__HAVE_STRUCT_IN6_ADDR 1
+ /* Define to 1 if `s6_addr16' is a member of `struct in6_addr'. */
+ #define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 1
+ /* Define to 1 if `s6_addr32' is a member of `struct in6_addr'. */
+ #define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 1
+ /* Define to 1 if the system has the type `struct sockaddr_in6'. */
+ #define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1
+ /* Define to 1 if `sin6_len' is a member of `struct sockaddr_in6'. */
+ /* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN */
+ /* Define to 1 if `sin_len' is a member of `struct sockaddr_in'. */
+ /* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
+ /* Define to 1 if the system has the type `struct sockaddr_storage'. */
+ #define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1
+ /* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
+ #define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
+ /* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
+ /* #undef EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */
+ /* Define to 1 if the system has the type `struct so_linger'. */
+ #define HAVE_STRUCT_SO_LINGER 1
+ /* Define to 1 if you have the `sysctl' function. */
+ /* #undef EVENT__HAVE_SYSCTL */
+ /* Define to 1 if you have the <sys/devpoll.h> header file. */
+ /* #undef EVENT__HAVE_SYS_DEVPOLL_H */
+ /* Define to 1 if you have the <sys/epoll.h> header file. */
+ #define EVENT__HAVE_SYS_EPOLL_H 1
+ /* Define to 1 if you have the <sys/eventfd.h> header file. */
+ #define EVENT__HAVE_SYS_EVENTFD_H 1
+ /* Define to 1 if you have the <sys/event.h> header file. */
+ /* #undef EVENT__HAVE_SYS_EVENT_H */
+ /* Define to 1 if you have the <sys/ioctl.h> header file. */
+ #define EVENT__HAVE_SYS_IOCTL_H 1
+ /* Define to 1 if you have the <sys/mman.h> header file. */
+ #define EVENT__HAVE_SYS_MMAN_H 1
+ /* Define to 1 if you have the <sys/param.h> header file. */
+ #define EVENT__HAVE_SYS_PARAM_H 1
+ /* Define to 1 if you have the <sys/queue.h> header file. */
+ #define EVENT__HAVE_SYS_QUEUE_H 1
+ /* Define to 1 if you have the <sys/resource.h> header file. */
+ #define HAVE_SYS_RESOURCE_H 1
+ /* Define to 1 if you have the <sys/select.h> header file. */
+ #define EVENT__HAVE_SYS_SELECT_H 1
+ /* Define to 1 if you have the <sys/sendfile.h> header file. */
+ #define EVENT__HAVE_SYS_SENDFILE_H 1
+ /* Define to 1 if you have the <sys/socket.h> header file. */
+ #define EVENT__HAVE_SYS_SOCKET_H 1
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #define EVENT__HAVE_SYS_STAT_H 1
+ /* Define to 1 if you have the <sys/sysctl.h> header file. */
+ /* #undef EVENT__HAVE_SYS_SYSCTL_H */
+ /* Define to 1 if you have the <sys/timerfd.h> header file. */
+ #define HAVE_SYS_TIMERFD_H 1
+ /* Define to 1 if you have the <sys/time.h> header file. */
+ #define EVENT__HAVE_SYS_TIME_H 1
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #define EVENT__HAVE_SYS_TYPES_H 1
+ /* Define to 1 if you have the <sys/uio.h> header file. */
+ #define EVENT__HAVE_SYS_UIO_H 1
+ /* Define to 1 if you have the <sys/wait.h> header file. */
+ #define EVENT__HAVE_SYS_WAIT_H 1
+ /* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
+ /*#define EVENT__HAVE_TAILQFOREACH 1 */
+ /* Define if timeradd is defined in <sys/time.h> */
+ #define EVENT__HAVE_TIMERADD 1
+ /* Define if timerclear is defined in <sys/time.h> */
+ #define EVENT__HAVE_TIMERCLEAR 1
+ /* Define if timercmp is defined in <sys/time.h> */
+ #define EVENT__HAVE_TIMERCMP 1
+ /* Define to 1 if you have the `timerfd_create' function. */
+ #define HAVE_TIMERFD_CREATE 1
+ /* Define if timerisset is defined in <sys/time.h> */
+ #define EVENT__HAVE_TIMERISSET 1
+ /* Define to 1 if the system has the type `uint16_t'. */
+ #define EVENT__HAVE_UINT16_T 1
+ /* Define to 1 if the system has the type `uint32_t'. */
+ #define EVENT__HAVE_UINT32_T 1
+ /* Define to 1 if the system has the type `uint64_t'. */
+ #define EVENT__HAVE_UINT64_T 1
+ /* Define to 1 if the system has the type `uint8_t'. */
+ #define EVENT__HAVE_UINT8_T 1
+ /* Define to 1 if the system has the type `uintptr_t'. */
+ #define EVENT__HAVE_UINTPTR_T 1
+ /* Define to 1 if you have the `umask' function. */
+ #define EVENT__HAVE_UMASK 1
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #define EVENT__HAVE_UNISTD_H 1
+ /* Define to 1 if you have the `unsetenv' function. */
+ #define EVENT__HAVE_UNSETENV 1
+ /* Define to 1 if you have the `usleep' function. */
+ #define HAVE_USLEEP 1
+ /* Define to 1 if you have the `vasprintf' function. */
+ #define EVENT__HAVE_VASPRINTF 1
+ /* Define if waitpid() supports WNOWAIT */
+ #define HAVE_WAITPID_WITH_WNOWAIT 1
+ /* Define if kqueue works correctly with pipes */
+ /* #undef EVENT__HAVE_WORKING_KQUEUE */
+ /* Define to 1 if you have the <zlib.h> header file. */
+ #define EVENT__HAVE_ZLIB_H 1
+ /* Define to the sub-directory in which libtool stores uninstalled libraries.
+  */
+ #define EVENT__LT_OBJDIR ".libs/"
+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+ /* #undef EVENT__NO_MINUS_C_MINUS_O */
+ /* Numeric representation of the version */
+ #define EVENT__NUMERIC_VERSION 0x02010c00
+ /* Name of package */
+ #define EVENT__PACKAGE "libevent"
+ /* Define to the address where bug reports for this package should be sent. */
+ #define EVENT__PACKAGE_BUGREPORT ""
+ /* Define to the full name of this package. */
+ #define EVENT__PACKAGE_NAME ""
+ /* Define to the full name and version of this package. */
+ #define EVENT__PACKAGE_STRING ""
+ /* Define to the one symbol short name of this package. */
+ #define EVENT__PACKAGE_TARNAME ""
+ /* Define to the home page for this package. */
+ #define EVENT__PACKAGE_URL ""
+ /* Define to the version of this package. */
+ #define EVENT__PACKAGE_VERSION ""
+ /* Define to necessary symbol if this constant uses a non-standard name on
+    your system. */
+ /* #undef EVENT__PTHREAD_CREATE_JOINABLE */
+ /* Define to 1 if you have the ANSI C header files. */
+ #define EVENT__STDC_HEADERS 1
+ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+ #define EVENT__TIME_WITH_SYS_TIME 1
+ /* Version number of package */
+ #define EVENT__VERSION "2.1.12p-stable"
+ /* Define to appropriate substitue if compiler doesnt have __func__ */
+ /* #undef EVENT____func__ */
+ /* Define to empty if `const' does not conform to ANSI C. */
+ /* #undef EVENT__const */
+ /* Define to `__inline__' or `__inline' if that's what the C compiler
+    calls it, or to nothing if 'inline' is not supported under any name.  */
+ #ifndef EVENT____cplusplus
+ /* #undef EVENT__inline */
+ #endif
+ /* Define to `int' if <sys/types.h> does not define. */
+ /* #undef EVENT__pid_t */
+ /* Define to `unsigned int' if <sys/types.h> does not define. */
+ /* #undef EVENT__size_t */
+ /* Define to unsigned int if you dont have it */
+ /* #undef EVENT__socklen_t */
+ /* Define to `int' if <sys/types.h> does not define. */
+ /* #undef EVENT__ssize_t */
+ #endif /* event2/event-config.h */
\ No newline at end of file
diff --git a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
index e8c4380c800a5f..e18c8ef06ee157 100644
--- a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
+++ b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
@@ -2,6 +2,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 
 rn_android_library(
     name = "logging",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         react_native_dep("libraries/fresco/fresco-react-native:fbcore"),
diff --git a/ReactAndroid/src/main/libraries/fbjni/BUCK b/ReactAndroid/src/main/libraries/fbjni/BUCK
index db32c1b4a5463d..4d6d134811ab5a 100644
--- a/ReactAndroid/src/main/libraries/fbjni/BUCK
+++ b/ReactAndroid/src/main/libraries/fbjni/BUCK
@@ -15,6 +15,6 @@ fb_native.android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "fbjni-binary-aar",
-    sha1 = "d9e1b6ebbe55fe25f6ee6257ef64588e0f8a8db0",
-    url = "mvn:com.facebook.fbjni:fbjni:aar:0.0.2",
+    sha1 = "b20ae3406d911a28315b6ab53f122075500bfa27",
+    url = "mvn:com.facebook.fbjni:fbjni:aar:0.2.2",
 )
diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
index 830cfd9da3f4f4..7c8afefbb1fc85 100644
--- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
+++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK
@@ -9,8 +9,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "fresco-binary-aar",
-    sha1 = "d473020b37b7cdd3171154942b55021a55a9d990",
-    url = "mvn:com.facebook.fresco:fresco:aar:2.0.0",
+    sha1 = "b768459446d166d148aaf3b8edcdcecd59381190",
+    url = "mvn:com.facebook.fresco:fresco:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -21,18 +21,25 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "drawee-binary-aar",
-    sha1 = "a85bfaeb87a9c8d1521c70edf6ded91ff9999475",
-    url = "mvn:com.facebook.fresco:drawee:aar:2.0.0",
+    sha1 = "06971aca0134eafa61c1b81714c0954cb4eb4e10",
+    url = "mvn:com.facebook.fresco:drawee:aar:2.5.0",
 )
 
 rn_android_library(
     name = "imagepipeline",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         ":bolts",
         ":imagepipeline-base",
         ":imagepipeline-core",
+        ":imagepipeline-native",
+        ":memory-type-ashmem",
+        ":memory-type-java",
+        ":memory-type-native",
         ":native-filters",
+        ":native-transcoder",
+        ":ui-common",
     ],
 )
 
@@ -44,8 +51,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "imagepipeline-base-aar",
-    sha1 = "d27635390665d433f987177c548d25d0473eadbe",
-    url = "mvn:com.facebook.fresco:imagepipeline-base:aar:2.0.0",
+    sha1 = "6839693f5d3b6697cfabbf159d004dae2f465126",
+    url = "mvn:com.facebook.fresco:imagepipeline-base:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -56,8 +63,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "imagepipeline-aar",
-    sha1 = "7bc59327fb4895c465cbfeede700daf349ea56da",
-    url = "mvn:com.facebook.fresco:imagepipeline:aar:2.0.0",
+    sha1 = "dd62dd1607ade4532c1240f137ac3c2d7920c134",
+    url = "mvn:com.facebook.fresco:imagepipeline:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -68,8 +75,20 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "nativeimagefilters-aar",
-    sha1 = "f49525db580abc4d2fb0a74fac771fc6c69f2adb",
-    url = "mvn:com.facebook.fresco:nativeimagefilters:aar:2.0.0",
+    sha1 = "4a30438df8d960000b37b1f8cdba9d7996d57ea9",
+    url = "mvn:com.facebook.fresco:nativeimagefilters:aar:2.5.0",
+)
+
+rn_android_prebuilt_aar(
+    name = "native-transcoder",
+    aar = ":nativeimagetranscoder-aar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+remote_file(
+    name = "nativeimagetranscoder-aar",
+    sha1 = "7db353c68b41e2ad502a959c554387d59e75eb75",
+    url = "mvn:com.facebook.fresco:nativeimagetranscoder:aar:2.5.0",
 )
 
 rn_prebuilt_jar(
@@ -92,8 +111,20 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "fbcore-aar",
-    sha1 = "8de91f71e8aa84a4d9be4dd88d1a0ac51600ad60",
-    url = "mvn:com.facebook.fresco:fbcore:aar:2.0.0",
+    sha1 = "ffe378b572055e0600377c000d390fb46bf278a5",
+    url = "mvn:com.facebook.fresco:fbcore:aar:2.5.0",
+)
+
+rn_android_prebuilt_aar(
+    name = "imagepipeline-native",
+    aar = ":imagepipeline-native-binary-aar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "imagepipeline-native-binary-aar",
+    sha1 = "f8e65e897a883ac4f754d57897aaba0016c8beba",
+    url = "mvn:com.facebook.fresco:imagepipeline-native:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -104,6 +135,54 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "imagepipeline-okhttp3-binary-aar",
-    sha1 = "bc1212ca66cd09678b416894ea8bd04102d26c5f",
-    url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:2.0.0",
+    sha1 = "8e274a77ffbe9f8334e09855b2a811b2a63a5708",
+    url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:2.5.0",
+)
+
+rn_android_prebuilt_aar(
+    name = "memory-type-ashmem",
+    aar = ":memory-type-ashmem-aar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+remote_file(
+    name = "memory-type-ashmem-aar",
+    sha1 = "b43b53aca89569fd2e8e964b71dc7afbf62204e8",
+    url = "mvn:com.facebook.fresco:memory-type-ashmem:aar:2.5.0",
+)
+
+rn_android_prebuilt_aar(
+    name = "memory-type-java",
+    aar = ":memory-type-java-aar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+remote_file(
+    name = "memory-type-java-aar",
+    sha1 = "57537a8b69dbad44fafdaea3067a776e11586465",
+    url = "mvn:com.facebook.fresco:memory-type-java:aar:2.5.0",
+)
+
+rn_android_prebuilt_aar(
+    name = "memory-type-native",
+    aar = ":memory-type-native-aar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+remote_file(
+    name = "memory-type-native-aar",
+    sha1 = "7eb7c52ee2a4d40b7f706c90069549410236aaa5",
+    url = "mvn:com.facebook.fresco:memory-type-native:aar:2.5.0",
+)
+
+rn_android_prebuilt_aar(
+    name = "ui-common",
+    aar = ":ui-common-aar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+remote_file(
+    name = "ui-common-aar",
+    sha1 = "224851cf4c074aeff5dc42861b557870459a9d28",
+    url = "mvn:com.facebook.fresco:ui-common:aar:2.5.0",
 )
diff --git a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
index 3c1ec406b6898a..61fc9b193d3c2f 100644
--- a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
+++ b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
@@ -28,17 +28,17 @@ fb_native.android_prebuilt_aar(
 fb_native.remote_file(
     name = "annotation-binary.jar",
     sha1 = "dc58463712cb3e5f03d8ee5ac9743b9ced9afa77",
-    url = "mvn:com.facebook.soloader:annotation:jar:0.9.0",
+    url = "mvn:com.facebook.soloader:annotation:jar:0.10.1",
 )
 
 fb_native.remote_file(
     name = "nativeloader-binary.jar",
-    sha1 = "677c7fbfcc847d7eb6082048d07b10afd4cff898",
-    url = "mvn:com.facebook.soloader:nativeloader:jar:0.9.0",
+    sha1 = "ba1b31b4b9f65494a90de7c2728b57155344a858",
+    url = "mvn:com.facebook.soloader:nativeloader:jar:0.10.1",
 )
 
 fb_native.remote_file(
     name = "soloader-binary-aar",
-    sha1 = "6e138af1dd29ceabf5bace2d24dc4333f304d104",
-    url = "mvn:com.facebook.soloader:soloader:aar:0.9.0",
+    sha1 = "78e5537c0cdf7c190f6cad9a2490f9f84ee8f041",
+    url = "mvn:com.facebook.soloader:soloader:aar:0.10.1",
 )
diff --git a/ReactAndroid/src/main/res/devsupport/values/strings.xml b/ReactAndroid/src/main/res/devsupport/values/strings.xml
index 3571c835e31690..9ebb11b0830bd4 100644
--- a/ReactAndroid/src/main/res/devsupport/values/strings.xml
+++ b/ReactAndroid/src/main/res/devsupport/values/strings.xml
@@ -16,7 +16,8 @@
   <string name="catalyst_hot_reloading_stop" project="catalyst" translatable="false">Disable Fast Refresh</string>
   <string name="catalyst_hot_reloading_auto_disable" project="catalyst" translatable="false">Disabling Fast Refresh because it requires a development bundle.</string>
   <string name="catalyst_hot_reloading_auto_enable" project="catalyst" translatable="false">Switching to development bundle in order to enable Fast Refresh.</string>
-  <string name="catalyst_inspector" project="catalyst" translatable="false">Toggle Inspector</string>
+  <string name="catalyst_inspector" project="catalyst" translatable="false">Show Element Inspector</string>
+  <string name="catalyst_inspector_stop" project="catalyst" translatable="false">Hide Element Inspector</string>
   <string name="catalyst_perf_monitor" project="catalyst" translatable="false">Show Perf Monitor</string>
   <string name="catalyst_perf_monitor_stop" project="catalyst" translatable="false">Hide Perf Monitor</string>
   <string name="catalyst_settings" project="catalyst" translatable="false">Settings</string>
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml b/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml
index 4c18708bf3ef81..d06603f611372a 100644
--- a/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml
+++ b/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml
@@ -4,18 +4,10 @@
     name="link_description"
     translatable="false"
     >Link</string>
-  <string
-    name="search_description"
-    translatable="false"
-    >Search Field</string>
   <string
     name="image_description"
     translatable="false"
     >Image</string>
-  <string
-    name="button_description"
-    translatable="false"
-    >Button</string>
   <string
     name="imagebutton_description"
     translatable="false"
@@ -92,6 +84,10 @@
     name="state_collapsed_description"
     translatable="false"
     >collapsed</string>
+  <string
+    name="state_unselected_description"
+    translatable="false"
+    >unselected</string>
   <string
     name="state_on_description"
     translatable="false"
diff --git a/ReactAndroid/src/main/third-party/android/androidx/BUCK b/ReactAndroid/src/main/third-party/android/androidx/BUCK
index 2eec208a3e473f..accceafa0c5cc5 100644
--- a/ReactAndroid/src/main/third-party/android/androidx/BUCK
+++ b/ReactAndroid/src/main/third-party/android/androidx/BUCK
@@ -32,6 +32,15 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "autofill",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":autofill-binary",
+        ":core",
+    ],
+)
+
 fb_native.android_library(
     name = "collection",
     visibility = ["PUBLIC"],
@@ -290,6 +299,25 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "test-runner",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":annotation",
+        ":test-monitor",
+        ":test-runner-binary",
+    ],
+)
+
+fb_native.android_library(
+    name = "test-rules",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":test-rules-binary",
+        ":test-runner",
+    ],
+)
+
 fb_native.android_library(
     name = "vectordrawable",
     visibility = ["PUBLIC"],
@@ -342,6 +370,11 @@ fb_native.android_prebuilt_aar(
     aar = ":asynclayoutinflater-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "autofill-binary",
+    aar = ":autofill-binary-aar",
+)
+
 fb_native.prebuilt_jar(
     name = "collection-binary",
     binary_jar = ":collection-binary.jar",
@@ -462,6 +495,16 @@ fb_native.android_prebuilt_aar(
     aar = ":test-monitor-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "test-rules-binary",
+    aar = ":test-rules-binary-aar",
+)
+
+fb_native.android_prebuilt_aar(
+    name = "test-runner-binary",
+    aar = ":test-runner-binary-aar",
+)
+
 fb_native.android_prebuilt_aar(
     name = "vectordrawable-binary",
     aar = ":vectordrawable-binary-aar",
@@ -501,6 +544,12 @@ fb_native.remote_file(
     url = "mvn:androidx.asynclayoutinflater:asynclayoutinflater:aar:1.0.0",
 )
 
+fb_native.remote_file(
+    name = "autofill-binary-aar",
+    sha1 = "d9cdaa22b9c373ba75a35dcc33ee8871543164e5",
+    url = "mvn:androidx.autofill:autofill:aar:1.1.0",
+)
+
 fb_native.remote_file(
     name = "collection-binary.jar",
     sha1 = "42858b26cafdaa69b6149f45dfc2894007bc2c7a",
@@ -645,6 +694,18 @@ fb_native.remote_file(
     url = "mvn:androidx.test:monitor:aar:1.2.0",
 )
 
+fb_native.remote_file(
+    name = "test-rules-binary-aar",
+    sha1 = "91904046e724ac82d9b7fe698e5fe92b871c726e",
+    url = "mvn:androidx.test:rules:aar:1.2.0",
+)
+
+fb_native.remote_file(
+    name = "test-runner-binary-aar",
+    sha1 = "237b061c45b3b450f88dd8cde87375ab22b0496a",
+    url = "mvn:androidx.test:runner:aar:1.2.0",
+)
+
 fb_native.remote_file(
     name = "vectordrawable-binary-aar",
     sha1 = "33d1eb71849dffbad12add134a25eb63cad4a1eb",
diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK
deleted file mode 100644
index 25a3662a1c4703..00000000000000
--- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK
+++ /dev/null
@@ -1,685 +0,0 @@
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-
-fb_native.android_library(
-    name = "lib-support-v4",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":appcompat",
-        ":asynclayoutinflater",
-        ":collection",
-        ":coordinatorlayout",
-        ":core",
-        ":core-common",
-        ":core-runtime",
-        ":cursoradapter",
-        ":customview",
-        ":documentfile",
-        ":drawerlayout",
-        ":fragment",
-        ":interpolator",
-        ":legacy-support-core-ui",
-        ":legacy-support-core-utils",
-        ":lifecycle-common",
-        ":lifecycle-livedata",
-        ":lifecycle-livedata-core",
-        ":lifecycle-runtime",
-        ":lifecycle-viewmodel",
-        ":loader",
-        ":localbroadcastmanager",
-        ":print",
-        ":slidingpanelayout",
-        ":swiperefreshlayout",
-        ":vectordrawable",
-        ":vectordrawable-animated",
-        ":versionedparcelable",
-        ":viewpager",
-    ],
-)
-
-fb_native.prebuilt_jar(
-    name = "annotation",
-    binary_jar = ":annotation.jar",
-    visibility = ["PUBLIC"],
-)
-
-fb_native.android_library(
-    name = "appcompat",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":collection",
-        ":core",
-        ":cursoradapter",
-        ":fragment",
-        ":legacy-support-core-utils",
-        ":vectordrawable",
-        ":vectordrawable-animated",
-    ],
-)
-
-fb_native.android_library(
-    name = "asynclayoutinflater",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":asynclayoutinflater-binary",
-        ":core",
-    ],
-)
-
-fb_native.android_library(
-    name = "collection",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":collection-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "coordinatorlayout",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":coordinatorlayout-binary",
-        ":core",
-        ":customview",
-    ],
-)
-
-fb_native.android_library(
-    name = "core",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":collection",
-        ":core-binary",
-        ":lifecycle-runtime",
-        ":versionedparcelable",
-    ],
-)
-
-fb_native.android_library(
-    name = "core-common",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core-common-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "core-runtime",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":core-common",
-        ":core-runtime-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "cursoradapter",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":cursoradapter-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "customview",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":customview-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "documentfile",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":documentfile-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "drawerlayout",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":customview",
-        ":drawerlayout-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "fragment",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":fragment-binary",
-        ":legacy-support-core-ui",
-        ":legacy-support-core-utils",
-        ":lifecycle-viewmodel",
-        ":loader",
-    ],
-)
-
-fb_native.android_library(
-    name = "interpolator",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":interpolator-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "legacy-support-core-ui",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":asynclayoutinflater",
-        ":coordinatorlayout",
-        ":core",
-        ":cursoradapter",
-        ":customview",
-        ":drawerlayout",
-        ":interpolator",
-        ":legacy-support-core-ui-binary",
-        ":legacy-support-core-utils",
-        ":slidingpanelayout",
-        ":swiperefreshlayout",
-        ":viewpager",
-    ],
-)
-
-fb_native.android_library(
-    name = "legacy-support-core-utils",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":documentfile",
-        ":legacy-support-core-utils-binary",
-        ":loader",
-        ":localbroadcastmanager",
-        ":print",
-    ],
-)
-
-fb_native.android_library(
-    name = "lifecycle-common",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":lifecycle-common-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "lifecycle-livedata",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":core-common",
-        ":core-runtime",
-        ":lifecycle-livedata-binary",
-        ":lifecycle-livedata-core",
-    ],
-)
-
-fb_native.android_library(
-    name = "lifecycle-livedata-core",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":core-common",
-        ":core-runtime",
-        ":lifecycle-common",
-        ":lifecycle-livedata-core-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "lifecycle-runtime",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core-common",
-        ":lifecycle-common",
-        ":lifecycle-runtime-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "lifecycle-viewmodel",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":lifecycle-viewmodel-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "localbroadcastmanager",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":localbroadcastmanager-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "loader",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":lifecycle-livedata",
-        ":lifecycle-viewmodel",
-        ":loader-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "print",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":print-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "slidingpanelayout",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":customview",
-        ":slidingpanelayout-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "swiperefreshlayout",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":interpolator",
-        ":swiperefreshlayout-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "vectordrawable",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":vectordrawable-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "vectordrawable-animated",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":legacy-support-core-ui",
-        ":vectordrawable",
-        ":vectordrawable-animated-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "versionedparcelable",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":collection",
-        ":versionedparcelable-binary",
-    ],
-)
-
-fb_native.android_library(
-    name = "viewpager",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":annotation",
-        ":core",
-        ":customview",
-        ":viewpager-binary",
-    ],
-)
-
-# Internal targets
-fb_native.android_prebuilt_aar(
-    name = "appcompat-binary",
-    aar = ":appcompat-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "asynclayoutinflater-binary",
-    aar = ":asynclayoutinflater-binary-aar",
-)
-
-fb_native.prebuilt_jar(
-    name = "collection-binary",
-    binary_jar = ":collection-binary.jar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "coordinatorlayout-binary",
-    aar = ":coordinatorlayout-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "core-binary",
-    aar = ":core-binary-aar",
-)
-
-fb_native.prebuilt_jar(
-    name = "core-common-binary",
-    binary_jar = ":core-common-binary.jar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "core-runtime-binary",
-    aar = ":core-runtime-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "cursoradapter-binary",
-    aar = ":cursoradapter-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "customview-binary",
-    aar = ":customview-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "documentfile-binary",
-    aar = ":documentfile-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "drawerlayout-binary",
-    aar = ":drawerlayout-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "fragment-binary",
-    aar = ":fragment-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "interpolator-binary",
-    aar = ":interpolator-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "legacy-support-core-ui-binary",
-    aar = ":legacy-support-core-ui-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "legacy-support-core-utils-binary",
-    aar = ":legacy-support-core-utils-binary-aar",
-)
-
-fb_native.prebuilt_jar(
-    name = "lifecycle-common-binary",
-    binary_jar = ":lifecycle-common-binary.jar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "lifecycle-livedata-binary",
-    aar = ":lifecycle-livedata-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "lifecycle-livedata-core-binary",
-    aar = ":lifecycle-livedata-core-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "lifecycle-runtime-binary",
-    aar = ":lifecycle-runtime-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "lifecycle-viewmodel-binary",
-    aar = ":lifecycle-viewmodel-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "loader-binary",
-    aar = ":loader-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "localbroadcastmanager-binary",
-    aar = ":localbroadcastmanager-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "print-binary",
-    aar = ":print-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "slidingpanelayout-binary",
-    aar = ":slidingpanelayout-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "swiperefreshlayout-binary",
-    aar = ":swiperefreshlayout-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "vectordrawable-binary",
-    aar = ":vectordrawable-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "vectordrawable-animated-binary",
-    aar = ":vectordrawable-animated-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "versionedparcelable-binary",
-    aar = ":versionedparcelable-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "viewpager-binary",
-    aar = ":viewpager-binary-aar",
-)
-
-# Remote files
-fb_native.remote_file(
-    name = "annotation.jar",
-    sha1 = "2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f",
-    url = "mvn:androidx.annotation:annotation:jar:1.0.1",
-)
-
-fb_native.remote_file(
-    name = "appcompat-binary-aar",
-    sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae",
-    url = "mvn:androidx.appcompat:appcompat:aar:1.0.2",
-)
-
-fb_native.remote_file(
-    name = "asynclayoutinflater-binary-aar",
-    sha1 = "5ffa788d19a6863799f25cb50d4fdfb0ec649037",
-    url = "mvn:androidx.asynclayoutinflater:asynclayoutinflater:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "collection-binary.jar",
-    sha1 = "42858b26cafdaa69b6149f45dfc2894007bc2c7a",
-    url = "mvn:androidx.collection:collection:jar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "core-binary-aar",
-    sha1 = "263deba7f9c24bd0cefb93c0aaaf402cc50828ee",
-    url = "mvn:androidx.core:core:aar:1.0.1",
-)
-
-fb_native.remote_file(
-    name = "core-common-binary.jar",
-    sha1 = "bb21b9a11761451b51624ac428d1f1bb5deeac38",
-    url = "mvn:androidx.arch.core:core-common:jar:2.0.0",
-)
-
-fb_native.remote_file(
-    name = "core-runtime-binary-aar",
-    sha1 = "c5be9edf9ca9135a465d23939f6e7d0e1cf90b41",
-    url = "mvn:androidx.arch.core:core-runtime:aar:2.0.0",
-)
-
-fb_native.remote_file(
-    name = "coordinatorlayout-binary-aar",
-    sha1 = "7664385a7e39112b780baf8819ee880dcd3c4094",
-    url = "mvn:androidx.coordinatorlayout:coordinatorlayout:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "cursoradapter-binary-aar",
-    sha1 = "74014983a86b83cbce534dec4e7aa9312f5f5d82",
-    url = "mvn:androidx.cursoradapter:cursoradapter:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "customview-binary-aar",
-    sha1 = "30f5ff6075d112f8076e733b24410e68159735b6",
-    url = "mvn:androidx.customview:customview:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "documentfile-binary-aar",
-    sha1 = "66104345c90cd8c2fd5ad2d3aad692b280e10c32",
-    url = "mvn:androidx.documentfile:documentfile:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "drawerlayout-binary-aar",
-    sha1 = "dd02c7e207136e1272b33815cc61e57676ed13a2",
-    url = "mvn:androidx.drawerlayout:drawerlayout:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "fragment-binary-aar",
-    sha1 = "0b40f6a2ae814f72d1e71a5df6dc1283c00cd52f",
-    url = "mvn:androidx.fragment:fragment:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "interpolator-binary-aar",
-    sha1 = "8a01fa254a23b9388571eb6334b03707c7d122d7",
-    url = "mvn:androidx.interpolator:interpolator:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "legacy-support-core-ui-binary-aar",
-    sha1 = "61a264f996046e059f889914050fae1e75d3b702",
-    url = "mvn:androidx.legacy:legacy-support-core-ui:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "legacy-support-core-utils-binary-aar",
-    sha1 = "9b9570042115da8629519090dfeb71df75da59fc",
-    url = "mvn:androidx.legacy:legacy-support-core-utils:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "lifecycle-common-binary.jar",
-    sha1 = "e070ffae07452331bc5684734fce6831d531785c",
-    url = "mvn:androidx.lifecycle:lifecycle-common:jar:2.0.0",
-)
-
-fb_native.remote_file(
-    name = "lifecycle-livedata-binary-aar",
-    sha1 = "c17007cd0b21d6401910b0becdd16c438c68a9af",
-    url = "mvn:androidx.lifecycle:lifecycle-livedata:aar:2.0.0",
-)
-
-fb_native.remote_file(
-    name = "lifecycle-livedata-core-binary-aar",
-    sha1 = "1a7cee84b43fa935231b016f0665cd56a72fa9db",
-    url = "mvn:androidx.lifecycle:lifecycle-livedata-core:aar:2.0.0",
-)
-
-fb_native.remote_file(
-    name = "lifecycle-runtime-binary-aar",
-    sha1 = "ea27e9e79e9a0fbedfa4dbbef5ddccf0e1d9d73f",
-    url = "mvn:androidx.lifecycle:lifecycle-runtime:aar:2.0.0",
-)
-
-fb_native.remote_file(
-    name = "lifecycle-viewmodel-binary-aar",
-    sha1 = "6417c576c458137456d996914c50591e7f4acc24",
-    url = "mvn:androidx.lifecycle:lifecycle-viewmodel:aar:2.0.0",
-)
-
-fb_native.remote_file(
-    name = "loader-binary-aar",
-    sha1 = "8af8b6cec0da85c207d03e15840e0722cbc71e70",
-    url = "mvn:androidx.loader:loader:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "localbroadcastmanager-binary-aar",
-    sha1 = "2734f31c8321e83ce6b60570d14777fc33cc2ece",
-    url = "mvn:androidx.localbroadcastmanager:localbroadcastmanager:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "print-binary-aar",
-    sha1 = "7722094652c48ebe27acc94d74a55e759e4635ff",
-    url = "mvn:androidx.print:print:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "slidingpanelayout-binary-aar",
-    sha1 = "37eba9ccbf09b75cc4aa78a5e182d5b8ba79ad6a",
-    url = "mvn:androidx.slidingpanelayout:slidingpanelayout:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "swiperefreshlayout-binary-aar",
-    sha1 = "4fd265b80a2b0fbeb062ab2bc4b1487521507762",
-    url = "mvn:androidx.swiperefreshlayout:swiperefreshlayout:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "vectordrawable-binary-aar",
-    sha1 = "33d1eb71849dffbad12add134a25eb63cad4a1eb",
-    url = "mvn:androidx.vectordrawable:vectordrawable:aar:1.0.1",
-)
-
-fb_native.remote_file(
-    name = "vectordrawable-animated-binary-aar",
-    sha1 = "0a41681ac4e1747f87237e489699089ad46b7a5e",
-    url = "mvn:androidx.vectordrawable:vectordrawable-animated:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "versionedparcelable-binary-aar",
-    sha1 = "52718baf7e51ccba173b468a1034caba8140752e",
-    url = "mvn:androidx.versionedparcelable:versionedparcelable:aar:1.0.0",
-)
-
-fb_native.remote_file(
-    name = "viewpager-binary-aar",
-    sha1 = "1f90e13820f96c2fb868f9674079a551678d68b2",
-    url = "mvn:androidx.viewpager:viewpager:aar:1.0.0",
-)
diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat/BUCK
deleted file mode 100644
index d2521c4d03ad40..00000000000000
--- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat/BUCK
+++ /dev/null
@@ -1,62 +0,0 @@
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_android_resource", "rn_genrule", "rn_prebuilt_jar")
-
-# This is a bit messy and hopefully a temporary thing
-# The problem is that Gradle extracts appcompat resources into app namespace, com.facebook.react
-# While BUCK behaves properly and extracts them into androidx.appcompat package.
-# We want to support both Gradle and BUCK builds so we hack a bit how BUCK extracts resources.
-# Besides that we still need JAVA classes from appcompat-v7.aar, that is why rn_android_library
-# extracts classes.jar but the trick is that we can't take full appcompat.aar because resources
-# extracted from it by BUCK would conflict with resources we use under Gradelified package
-# All this mumbo jumbo will go away after t10182713
-
-rn_android_library(
-    name = "appcompat",
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        ":res-for-appcompat",
-    ],
-    exported_deps = [
-        ":classes-for-react-native",
-    ],
-)
-
-# still used by appcompat library internally, so we need both during the build
-rn_android_resource(
-    name = "res-for-appcompat",
-    package = "androidx.appcompat",
-    res = ":res-unpacker-cmd",
-    visibility = ["//ReactAndroid/..."],
-)
-
-rn_prebuilt_jar(
-    name = "classes-for-react-native",
-    binary_jar = ":classes-unpacker-cmd",
-    visibility = ["//ReactAndroid/..."],
-)
-
-rn_genrule(
-    name = "classes-unpacker-cmd",
-    out = "classes.jar",
-    cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) classes.jar $OUT",
-)
-
-rn_genrule(
-    name = "res-unpacker-cmd",
-    out = "res",
-    cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) res/ $OUT",
-    visibility = ["//ReactAndroid/..."],
-)
-
-fb_native.python_binary(
-    name = "aar-unpacker",
-    main = "aar-unpacker.py",
-)
-
-fb_native.remote_file(
-    name = "appcompat-binary-aar",
-    sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae",
-    url = "mvn:androidx.appcompat:appcompat:aar:1.0.2",
-)
diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat/aar-unpacker.py b/ReactAndroid/src/main/third-party/android/support/v7/appcompat/aar-unpacker.py
deleted file mode 100644
index ddb65efb21927e..00000000000000
--- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat/aar-unpacker.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import contextlib
-import os
-import shutil
-import sys
-import tempfile
-import zipfile
-
-# Helper that unpacks the contents of an .aar file
-# into given destination.
-
-@contextlib.contextmanager
-def cleanup(path):
-    yield path
-    shutil.rmtree(path)
-
-if __name__ == '__main__':
-    with zipfile.ZipFile(sys.argv[1], 'r') as z:
-        with cleanup(tempfile.mkdtemp()) as temp_path:
-            z.extractall(temp_path, filter(lambda n: n.startswith(sys.argv[2]), z.namelist()))
-            shutil.move(os.path.join(temp_path, sys.argv[2]), sys.argv[3])
diff --git a/ReactAndroid/src/main/third-party/java/asm/BUCK b/ReactAndroid/src/main/third-party/java/asm/BUCK
index f344506a49ca34..5741e1c0ea7998 100644
--- a/ReactAndroid/src/main/third-party/java/asm/BUCK
+++ b/ReactAndroid/src/main/third-party/java/asm/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 
 rn_android_library(
     name = "asm",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         ":asm-analysis",
diff --git a/ReactAndroid/src/main/third-party/java/fest/BUCK b/ReactAndroid/src/main/third-party/java/fest/BUCK
index 10f995f166d306..50285d715060a0 100644
--- a/ReactAndroid/src/main/third-party/java/fest/BUCK
+++ b/ReactAndroid/src/main/third-party/java/fest/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 
 rn_android_library(
     name = "fest",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         ":fest-core",
diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
index 9cf53d29a79beb..2fd4c3bf633f34 100644
--- a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
+++ b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
@@ -9,6 +9,6 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "infer-annotations.jar",
-    sha1 = "f514ff4ca022a579d9cf7524846988b646ae4491",
-    url = "mvn:com.facebook.infer.annotation:infer-annotation:jar:0.11.2",
+    sha1 = "27539793fe93ed7d92b6376281c16cda8278ab2f",
+    url = "mvn:com.facebook.infer.annotation:infer-annotation:jar:0.18.0",
 )
diff --git a/ReactAndroid/src/main/third-party/java/junit/BUCK b/ReactAndroid/src/main/third-party/java/junit/BUCK
index 9f4cbec6221d28..555a01989f107f 100644
--- a/ReactAndroid/src/main/third-party/java/junit/BUCK
+++ b/ReactAndroid/src/main/third-party/java/junit/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 
 rn_android_library(
     name = "junit",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         ":hamcrest",
diff --git a/ReactAndroid/src/main/third-party/java/mockito/BUCK b/ReactAndroid/src/main/third-party/java/mockito/BUCK
index a7f91609227a4c..9fda3bf174d9d6 100644
--- a/ReactAndroid/src/main/third-party/java/mockito/BUCK
+++ b/ReactAndroid/src/main/third-party/java/mockito/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 
 rn_android_library(
     name = "mockito",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         ":mockito-core",
diff --git a/ReactAndroid/src/main/third-party/java/mockito2/BUCK b/ReactAndroid/src/main/third-party/java/mockito2/BUCK
index 4d2ea058b7713f..b5332e4f2ec559 100644
--- a/ReactAndroid/src/main/third-party/java/mockito2/BUCK
+++ b/ReactAndroid/src/main/third-party/java/mockito2/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 
 rn_android_library(
     name = "mockito2",
+    autoglob = False,
     visibility = ["PUBLIC"],
     exported_deps = [
         ":byte-buddy",
diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
index a19336522a9b90..62813049874d1f 100644
--- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK
+++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK
@@ -1,26 +1,46 @@
 load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library", "rn_prebuilt_jar")
 
-rn_prebuilt_jar(
+rn_android_library(
     name = "okhttp3",
-    binary_jar = ":okhttp3-binary.jar",
+    autoglob = False,
+    visibility = ["//ReactAndroid/..."],
+    exported_deps = [
+        ":okhttp3-binary",
+        react_native_dep("third-party/java/okio:okio"),
+        # Forces resolver to use OSS Kotlin version
+        react_native_target("third-party/kotlin:kotlin-stdlib-jdk8"),
+    ],
+)
+
+rn_android_library(
+    name = "okhttp3-urlconnection",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
+    exported_deps = [
+        ":okhttp3",
+        ":okhttp3-urlconnection-binary",
+    ],
+)
+
+rn_prebuilt_jar(
+    name = "okhttp3-binary",
+    binary_jar = ":okhttp3-binary.jar",
 )
 
 fb_native.remote_file(
     name = "okhttp3-binary.jar",
-    sha1 = "d3e1ce1d2b3119adf270b2d00d947beb03fe3321",
-    url = "mvn:com.squareup.okhttp3:okhttp:jar:3.12.12",
+    sha1 = "51215279c3fe472c59b6b7dd7491e6ac2e28a81b",
+    url = "mvn:com.squareup.okhttp3:okhttp:jar:4.9.1",
 )
 
 rn_prebuilt_jar(
-    name = "okhttp3-urlconnection",
+    name = "okhttp3-urlconnection-binary",
     binary_jar = ":okhttp3-urlconnection-binary.jar",
-    visibility = ["//ReactAndroid/..."],
 )
 
 fb_native.remote_file(
     name = "okhttp3-urlconnection-binary.jar",
-    sha1 = "3cfbe11fb8c48d30600a70f90b3283fc858aea72",
-    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.12.12",
+    sha1 = "f45e809215bd0961350148cf5b78707865084e6f",
+    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:4.9.1",
 )
diff --git a/ReactAndroid/src/main/third-party/java/okio/BUCK b/ReactAndroid/src/main/third-party/java/okio/BUCK
index e62ba43e228b15..9f5ff9a60a1ee4 100644
--- a/ReactAndroid/src/main/third-party/java/okio/BUCK
+++ b/ReactAndroid/src/main/third-party/java/okio/BUCK
@@ -1,14 +1,24 @@
 load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_target", "rn_android_library", "rn_prebuilt_jar")
 
-rn_prebuilt_jar(
+rn_android_library(
     name = "okio",
-    binary_jar = ":okio-binary.jar",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
+    exported_deps = [
+        ":okio-binary",
+        # Forces resolver to use OSS Kotlin version
+        react_native_target("third-party/kotlin:kotlin-stdlib"),
+    ],
+)
+
+rn_prebuilt_jar(
+    name = "okio-binary",
+    binary_jar = ":okio-binary.jar",
 )
 
 fb_native.remote_file(
     name = "okio-binary.jar",
-    sha1 = "34336f82f14dde1c0752fd5f0546dbf3c3225aba",
-    url = "mvn:com.squareup.okio:okio:jar:1.17.5",
+    sha1 = "accaddddbb597fb70290fd40358b1ce66b8c2b3d",
+    url = "mvn:com.squareup.okio:okio:jar:2.10.0",
 )
diff --git a/ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK b/ReactAndroid/src/main/third-party/java/robolectric/BUCK
similarity index 99%
rename from ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK
rename to ReactAndroid/src/main/third-party/java/robolectric/BUCK
index 92c97fbfdd329b..39db5c323fe735 100644
--- a/ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK
+++ b/ReactAndroid/src/main/third-party/java/robolectric/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 
 rn_android_library(
     name = "robolectric",
+    autoglob = False,
     visibility = ["PUBLIC"],
     exported_deps = [
         ":android-all-5.0.2_r3-robolectric-r0",
diff --git a/ReactAndroid/src/main/third-party/java/sqlite/BUCK b/ReactAndroid/src/main/third-party/java/sqlite/BUCK
index 7fd47e8a19d975..f93cb4833b10b5 100644
--- a/ReactAndroid/src/main/third-party/java/sqlite/BUCK
+++ b/ReactAndroid/src/main/third-party/java/sqlite/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 
 rn_android_library(
     name = "sqlite",
+    autoglob = False,
     visibility = ["//ReactAndroid/..."],
     exported_deps = [
         ":sqlite4java",
diff --git a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
index 43692052e1fdf1..bdcb72d5fcdbe3 100644
--- a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
+++ b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
@@ -1,36 +1,5 @@
 load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 
-fb_native.android_library(
-    name = "runner",
-    exported_deps = [
-        ":monitor-binary",
-        ":runner-binary",
-    ],
-    visibility = ["PUBLIC"],
-)
-
-fb_native.android_prebuilt_aar(
-    name = "monitor-binary",
-    aar = ":monitor-binary-aar",
-)
-
-fb_native.android_prebuilt_aar(
-    name = "runner-binary",
-    aar = ":runner-binary-aar",
-)
-
-fb_native.remote_file(
-    name = "monitor-binary-aar",
-    sha1 = "443c2f33d4e19f868cd4e4437909ec8dcf43f053",
-    url = "mvn:androidx.test:monitor:aar:1.1.1",
-)
-
-fb_native.remote_file(
-    name = "runner-binary-aar",
-    sha1 = "810a7aacb5106d92cdf648b2497694c4ebf73500",
-    url = "mvn:androidx.test:runner:aar:1.1.1",
-)
-
 fb_native.android_prebuilt_aar(
     name = "exposed-instrumentation-api",
     aar = ":testing-support-instrumentation",
diff --git a/ReactAndroid/src/main/third-party/kotlin/BUCK b/ReactAndroid/src/main/third-party/kotlin/BUCK
new file mode 100644
index 00000000000000..caad9d63e62805
--- /dev/null
+++ b/ReactAndroid/src/main/third-party/kotlin/BUCK
@@ -0,0 +1,91 @@
+load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
+
+rn_android_library(
+    name = "kotlin-stdlib",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":jetbrains-annotations",
+        ":kotlin-stdlib-binary",
+        ":kotlin-stdlib-common",
+    ],
+)
+
+rn_android_library(
+    name = "kotlin-stdlib-jdk7",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":kotlin-stdlib",
+        ":kotlin-stdlib-jdk7-binary",
+    ],
+)
+
+rn_android_library(
+    name = "kotlin-stdlib-jdk8",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":kotlin-stdlib",
+        ":kotlin-stdlib-jdk7",
+        ":kotlin-stdlib-jdk8-binary",
+    ],
+)
+
+rn_prebuilt_jar(
+    name = "jetbrains-annotations",
+    binary_jar = ":jetbrains-annotations.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "jetbrains-annotations.jar",
+    sha1 = "919f0dfe192fb4e063e7dacadee7f8bb9a2672a9",
+    url = "mvn:org.jetbrains:annotations:jar:13.0",
+)
+
+rn_prebuilt_jar(
+    name = "kotlin-stdlib-binary",
+    binary_jar = ":kotlin-stdlib-binary.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "kotlin-stdlib-binary.jar",
+    sha1 = "ea29e063d2bbe695be13e9d044dcfb0c7add398e",
+    url = "mvn:org.jetbrains.kotlin:kotlin-stdlib:jar:1.4.10",
+)
+
+rn_prebuilt_jar(
+    name = "kotlin-stdlib-common",
+    binary_jar = ":kotlin-stdlib-common.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "kotlin-stdlib-common.jar",
+    sha1 = "6229be3465805c99db1142ad75e6c6ddeac0b04c",
+    url = "mvn:org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.4.10",
+)
+
+rn_prebuilt_jar(
+    name = "kotlin-stdlib-jdk7-binary",
+    binary_jar = ":kotlin-stdlib-jdk7-binary.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "kotlin-stdlib-jdk7-binary.jar",
+    sha1 = "30e46450b0bb3dbf43898d2f461be4a942784780",
+    url = "mvn:org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.4.10",
+)
+
+rn_prebuilt_jar(
+    name = "kotlin-stdlib-jdk8-binary",
+    binary_jar = ":kotlin-stdlib-jdk8-binary.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "kotlin-stdlib-jdk8-binary.jar",
+    sha1 = "998caa30623f73223194a8b657abd2baec4880ea",
+    url = "mvn:org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.4.10",
+)
diff --git a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK
index b315429ee1af2a..71326c7077e3b6 100644
--- a/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/common/logging/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 rn_android_library(
     name = "logging",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
index 43a478aa89ad48..c0a28af8f86fb4 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
@@ -111,10 +111,11 @@ public void testTouchEmitter() {
 
     ReactRootView rootView = new ReactRootView(mReactContext);
     rootView.setId(rootViewId);
+    rootView.setRootViewTag(rootViewId);
     rootView.startReactApplication(instanceManager, "");
     rootView.simulateAttachForTesting();
 
-    long ts = SystemClock.uptimeMillis();
+    long ts = SystemClock.currentTimeMillis();
 
     // Test ACTION_DOWN event
     rootView.onTouchEvent(MotionEvent.obtain(100, ts, MotionEvent.ACTION_DOWN, 0, 0, 0));
@@ -149,7 +150,9 @@ public void testTouchEmitter() {
                 "timestamp",
                 (double) ts,
                 "identifier",
-                0.));
+                0.,
+                "targetSurface",
+                -1));
 
     // Test ACTION_UP event
     reset(eventEmitterModuleMock, eventDispatcher);
@@ -185,7 +188,9 @@ public void testTouchEmitter() {
                 "timestamp",
                 (double) ts,
                 "identifier",
-                0.));
+                0.,
+                "targetSurface",
+                -1));
 
     // Test other action
     reset(eventDispatcher);
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
index fc08cc8177bbb4..8c624bb62a71df 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
@@ -90,7 +90,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     mFrameTimeNanos = INITIAL_FRAME_TIME_NANOS;
 
     mReactApplicationContextMock = mock(ReactApplicationContext.class);
-    PowerMockito.when(mReactApplicationContextMock.hasActiveCatalystInstance())
+    PowerMockito.when(mReactApplicationContextMock.hasActiveReactInstance())
         .thenAnswer(
             new Answer<Boolean>() {
               @Override
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
index c774e197673e51..c89522bca2fc88 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
@@ -10,12 +10,13 @@ rn_android_library(
         ["*.java"],
         exclude = STANDARD_TEST_SRCS,
     ),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
-        react_native_dep("third-party/java/robolectric/4.4:robolectric"),
+        react_native_dep("third-party/java/robolectric:robolectric"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_tests_target("java/org/mockito/configuration:configuration"),
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
index ffce9ea596a157..d3ab1b7fe70e5b 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
@@ -52,6 +52,7 @@ public void handleException(Exception e) {
     when(reactInstance.getReactQueueConfiguration()).thenReturn(ReactQueueConfiguration);
     when(reactInstance.getNativeModule(UIManagerModule.class))
         .thenReturn(mock(UIManagerModule.class));
+    when(reactInstance.isDestroyed()).thenReturn(false);
 
     return reactInstance;
   }
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
index f155eebbddd312..53a1340330911a 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
@@ -11,6 +11,7 @@
 
 import com.facebook.react.common.JavascriptException;
 import java.util.HashMap;
+import okhttp3.WebSocket;
 import okio.ByteString;
 import org.junit.Rule;
 import org.junit.Test;
@@ -74,7 +75,8 @@ public void test_executeJSCall_ShouldSendCorrectMessage() throws Exception {
   public void test_onMessage_WithInvalidContentType_ShouldNotTriggerCallbacks() throws Exception {
     JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
 
-    client.onMessage(null, ByteString.encodeUtf8("{\"replyID\":0, \"result\":\"OK\"}"));
+    client.onMessage(
+        mock(WebSocket.class), ByteString.encodeUtf8("{\"replyID\":0, \"result\":\"OK\"}"));
     PowerMockito.verifyPrivate(client, never())
         .invoke("triggerRequestSuccess", anyInt(), nullable(String.class));
     PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestFailure", anyInt(), any());
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
index 750600054fbf23..f50c34f262d139 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
@@ -32,6 +32,7 @@ rn_robolectric_test(
         react_native_target("java/com/facebook/react/modules/common:common"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
+        react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
         react_native_target("java/com/facebook/react/modules/dialog:dialog"),
         react_native_target("java/com/facebook/react/modules/network:network"),
         react_native_target("java/com/facebook/react/modules/share:share"),
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java
new file mode 100644
index 00000000000000..6ed814abb53406
--- /dev/null
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.deviceinfo;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactTestHelper;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.uimanager.DisplayMetricsHolder;
+import java.util.Arrays;
+import java.util.List;
+import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.rule.PowerMockRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+@PrepareForTest({Arguments.class, DisplayMetricsHolder.class})
+@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"})
+public class DeviceInfoModuleTest extends TestCase {
+
+  @Rule public PowerMockRule rule = new PowerMockRule();
+
+  private DeviceInfoModule mDeviceInfoModule;
+  private DeviceEventManagerModule.RCTDeviceEventEmitter mRCTDeviceEventEmitterMock;
+
+  private WritableMap fakePortraitDisplayMetrics;
+  private WritableMap fakeLandscapeDisplayMetrics;
+
+  @Before
+  public void setUp() {
+    initTestData();
+
+    mockStatic(DisplayMetricsHolder.class);
+
+    mRCTDeviceEventEmitterMock = mock(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
+
+    final ReactApplicationContext context =
+        spy(new ReactApplicationContext(RuntimeEnvironment.application));
+    CatalystInstance catalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
+    context.initializeWithInstance(catalystInstanceMock);
+    when(context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class))
+        .thenReturn(mRCTDeviceEventEmitterMock);
+
+    mDeviceInfoModule = new DeviceInfoModule(context);
+  }
+
+  @After
+  public void teardown() {
+    DisplayMetricsHolder.setWindowDisplayMetrics(null);
+    DisplayMetricsHolder.setScreenDisplayMetrics(null);
+  }
+
+  @Test
+  public void test_itDoesNotEmitAnEvent_whenDisplayMetricsNotChanged() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyNoMoreInteractions(mRCTDeviceEventEmitterMock);
+  }
+
+  @Test
+  public void test_itEmitsOneEvent_whenDisplayMetricsChangedOnce() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics);
+  }
+
+  @Test
+  public void test_itEmitsJustOneEvent_whenUpdateRequestedMultipleTimes() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+    mDeviceInfoModule.getTypedExportedConstants();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics);
+  }
+
+  @Test
+  public void test_itEmitsMultipleEvents_whenDisplayMetricsChangedBetweenUpdates() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(
+        mRCTDeviceEventEmitterMock,
+        fakeLandscapeDisplayMetrics,
+        fakePortraitDisplayMetrics,
+        fakeLandscapeDisplayMetrics);
+  }
+
+  private static void givenDisplayMetricsHolderContains(final WritableMap fakeDisplayMetrics) {
+    when(DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)).thenReturn(fakeDisplayMetrics);
+  }
+
+  private static void verifyUpdateDimensionsEventsEmitted(
+      DeviceEventManagerModule.RCTDeviceEventEmitter emitter, WritableMap... expectedEvents) {
+    List<WritableMap> expectedEventList = Arrays.asList(expectedEvents);
+    ArgumentCaptor<WritableMap> captor = ArgumentCaptor.forClass(WritableMap.class);
+    verify(emitter, times(expectedEventList.size()))
+        .emit(eq("didUpdateDimensions"), captor.capture());
+
+    List<WritableMap> actualEvents = captor.getAllValues();
+    assertThat(actualEvents).isEqualTo(expectedEventList);
+  }
+
+  private void initTestData() {
+    mockStatic(Arguments.class);
+    when(Arguments.createMap())
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) throws Throwable {
+                return new JavaOnlyMap();
+              }
+            });
+
+    fakePortraitDisplayMetrics = Arguments.createMap();
+    fakePortraitDisplayMetrics.putInt("width", 100);
+    fakePortraitDisplayMetrics.putInt("height", 200);
+
+    fakeLandscapeDisplayMetrics = Arguments.createMap();
+    fakeLandscapeDisplayMetrics.putInt("width", 200);
+    fakeLandscapeDisplayMetrics.putInt("height", 100);
+  }
+}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
index 619b464d1d7c0b..6f12eee70cecef 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
@@ -60,7 +60,7 @@ public void setUp() throws Exception {
     mActivity = mActivityController.create().start().resume().get();
 
     final ReactApplicationContext context = PowerMockito.mock(ReactApplicationContext.class);
-    PowerMockito.when(context.hasActiveCatalystInstance()).thenReturn(true);
+    PowerMockito.when(context.hasActiveReactInstance()).thenReturn(true);
     PowerMockito.when(context, "getCurrentActivity").thenReturn(mActivity);
 
     mDialogModule = new DialogModule(context);
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
index a6e401ed9b0c8c..eb09e6dee01f9a 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
@@ -76,8 +76,8 @@ public class NetworkingModuleTest {
 
   @Before
   public void prepareModules() {
-    mHttpClient = mock(OkHttpClient.class);
-    when(mHttpClient.cookieJar()).thenReturn(mock(CookieJarContainer.class));
+    mHttpClient = PowerMockito.mock(OkHttpClient.class);
+    PowerMockito.when(mHttpClient.cookieJar()).thenReturn(mock(CookieJarContainer.class));
     when(mHttpClient.newCall(any(Request.class)))
         .thenAnswer(
             new Answer<Object>() {
@@ -87,8 +87,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
                 return callMock;
               }
             });
-    OkHttpClient.Builder clientBuilder = mock(OkHttpClient.Builder.class);
-    when(clientBuilder.build()).thenReturn(mHttpClient);
+    OkHttpClient.Builder clientBuilder = PowerMockito.mock(OkHttpClient.Builder.class);
+    PowerMockito.when(clientBuilder.build()).thenReturn(mHttpClient);
     when(mHttpClient.newBuilder()).thenReturn(clientBuilder);
 
     mEmitter = mock(RCTDeviceEventEmitter.class);
@@ -96,7 +96,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     CatalystInstance reactInstance = mock(CatalystInstance.class);
     ReactApplicationContext reactContext = mock(ReactApplicationContext.class);
     when(reactContext.getCatalystInstance()).thenReturn(reactInstance);
-    when(reactContext.hasActiveCatalystInstance()).thenReturn(true);
+    when(reactContext.hasActiveReactInstance()).thenReturn(true);
     when(reactContext.getJSModule(any(Class.class))).thenReturn(mEmitter);
     mNetworkingModule = new NetworkingModule(reactContext, "", mHttpClient);
   }
@@ -453,7 +453,7 @@ public void testMultipartPostRequestBody() throws Exception {
         .thenCallRealMethod();
     when(inputStream.available()).thenReturn("imageUri".length());
 
-    final MultipartBody.Builder multipartBuilder = mock(MultipartBody.Builder.class);
+    final MultipartBody.Builder multipartBuilder = PowerMockito.mock(MultipartBody.Builder.class);
     PowerMockito.whenNew(MultipartBody.Builder.class)
         .withNoArguments()
         .thenReturn(multipartBuilder);
@@ -545,7 +545,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
   }
 
   @Test
-  public void testCancelAllCallsOnCatalystInstanceDestroy() throws Exception {
+  public void testCancelAllCallsInvalidate() throws Exception {
     PowerMockito.mockStatic(OkHttpCallUtil.class);
     final int requests = 3;
     final Call[] calls = new Call[requests];
@@ -578,7 +578,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     }
     verify(mHttpClient, times(3)).newCall(any(Request.class));
 
-    mNetworkingModule.onCatalystInstanceDestroy();
+    mNetworkingModule.invalidate();
     PowerMockito.verifyStatic(OkHttpCallUtil.class, times(3));
     ArgumentCaptor<OkHttpClient> clientArguments = ArgumentCaptor.forClass(OkHttpClient.class);
     ArgumentCaptor<Integer> requestIdArguments = ArgumentCaptor.forClass(Integer.class);
@@ -591,7 +591,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
   }
 
   @Test
-  public void testCancelSomeCallsOnCatalystInstanceDestroy() throws Exception {
+  public void testCancelSomeCallsInvalidate() throws Exception {
     PowerMockito.mockStatic(OkHttpCallUtil.class);
     final int requests = 3;
     final Call[] calls = new Call[requests];
@@ -634,7 +634,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     // verifyStatic actually does not clear all calls so far, so we have to check for all of them.
     // If `cancelTag` would've been called again for the aborted call, we would have had
     // `requests + 1` calls.
-    mNetworkingModule.onCatalystInstanceDestroy();
+    mNetworkingModule.invalidate();
     PowerMockito.verifyStatic(OkHttpCallUtil.class, times(requests));
     clientArguments = ArgumentCaptor.forClass(OkHttpClient.class);
     requestIdArguments = ArgumentCaptor.forClass(Integer.class);
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
index 7a98a0f2ba86e3..7164b8489af447 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
@@ -75,7 +75,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     CatalystInstance reactInstance = mock(CatalystInstance.class);
     ReactApplicationContext reactContext = mock(ReactApplicationContext.class);
     when(reactContext.getCatalystInstance()).thenReturn(reactInstance);
-    when(reactContext.hasActiveCatalystInstance()).thenReturn(true);
+    when(reactContext.hasActiveReactInstance()).thenReturn(true);
 
     mCurrentTimeNs = 0;
     mPostFrameCallbackHandler = new PostFrameCallbackHandler();
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java
index 3cfc15272b7660..28208b8f8aaee1 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java
@@ -10,19 +10,33 @@
 import static org.fest.assertions.api.Assertions.assertThat;
 
 import com.facebook.react.R;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
 import java.util.Locale;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.rule.PowerMockRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+@PrepareForTest({Arguments.class})
 @RunWith(RobolectricTestRunner.class)
+@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"})
 public class BaseViewManagerTest {
 
+  @Rule public PowerMockRule rule = new PowerMockRule();
+
   private BaseViewManager mViewManager;
   private ReactViewGroup mView;
 
@@ -30,6 +44,15 @@ public class BaseViewManagerTest {
   public void setUp() {
     mViewManager = new ReactViewManager();
     mView = new ReactViewGroup(RuntimeEnvironment.application);
+    PowerMockito.mockStatic(Arguments.class);
+    PowerMockito.when(Arguments.createMap())
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) throws Throwable {
+                return new JavaOnlyMap();
+              }
+            });
   }
 
   @Test
@@ -44,4 +67,13 @@ public void testAccessibilityRoleTurkish() {
     mViewManager.setAccessibilityRole(mView, "image");
     assertThat(mView.getTag(R.id.accessibility_role)).isEqualTo(AccessibilityRole.IMAGE);
   }
+
+  @Test
+  public void testAccessibilityStateSelected() {
+    WritableMap accessibilityState = Arguments.createMap();
+    accessibilityState.putBoolean("selected", true);
+    mViewManager.setViewState(mView, accessibilityState);
+    assertThat(mView.getTag(R.id.accessibility_state)).isEqualTo(accessibilityState);
+    assertThat(mView.isSelected()).isEqualTo(true);
+  }
 }
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
index ed1d23990e437b..91be74945d9c9b 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
@@ -36,6 +36,8 @@ public class SimpleViewPropertyTest {
 
   @Rule public PowerMockRule rule = new PowerMockRule();
 
+  private static int sViewTag = 2;
+
   private static class ConcreteViewManager extends SimpleViewManager<View> {
 
     @ReactProp(name = "foo")
@@ -75,7 +77,9 @@ public ReactStylesDiffMap buildStyles(Object... keysAndValues) {
 
   @Test
   public void testOpacity() {
-    View view = mManager.createView(mThemedContext, buildStyles(), null, new JSResponderHandler());
+    View view =
+        mManager.createView(
+            sViewTag, mThemedContext, buildStyles(), null, new JSResponderHandler());
 
     mManager.updateProperties(view, buildStyles());
     assertThat(view.getAlpha()).isEqualTo(1.0f);
@@ -89,7 +93,9 @@ public void testOpacity() {
 
   @Test
   public void testBackgroundColor() {
-    View view = mManager.createView(mThemedContext, buildStyles(), null, new JSResponderHandler());
+    View view =
+        mManager.createView(
+            sViewTag, mThemedContext, buildStyles(), null, new JSResponderHandler());
 
     mManager.updateProperties(view, buildStyles());
     assertThat(view.getBackground()).isEqualTo(null);
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
index b7d86db7c28ba3..e172c90a3c7902 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
@@ -120,6 +120,14 @@ public void testRoundedCorners() {
     viewManager.updateProperties(view, buildStyles("borderRadius", null));
   }
 
+  @Test
+  public void testAccessibilityFocus() {
+    ReactImageManager viewManager = new ReactImageManager();
+    ReactImageView view = viewManager.createViewInstance(mThemeContext);
+    viewManager.setAccessible(view, true);
+    assertEquals(true, view.isFocusable());
+  }
+
   @Test
   public void testTintColor() {
     ReactImageManager viewManager = new ReactImageManager();
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
index f993878840a7d5..b908654deb6d02 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
@@ -221,6 +221,7 @@ public void testNumLines() {
   public void testKeyboardType() {
     ReactEditText view = mManager.createViewInstance(mThemedContext);
     int numberPadTypeFlags = InputType.TYPE_CLASS_NUMBER;
+    int urlTypeFlags = InputType.TYPE_TEXT_VARIATION_URI;
     int decimalPadTypeFlags = InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL;
     int numericTypeFlags =
         InputType.TYPE_CLASS_NUMBER
@@ -246,6 +247,9 @@ public void testKeyboardType() {
     mManager.updateProperties(view, buildStyles("keyboardType", "number-pad"));
     assertThat(view.getInputType() & generalKeyboardTypeFlags).isEqualTo(numberPadTypeFlags);
 
+    mManager.updateProperties(view, buildStyles("keyboardType", "url"));
+    assertThat(view.getInputType() & generalKeyboardTypeFlags).isEqualTo(urlTypeFlags);
+
     mManager.updateProperties(view, buildStyles("keyboardType", "decimal-pad"));
     assertThat(view.getInputType() & generalKeyboardTypeFlags).isEqualTo(decimalPadTypeFlags);
 
diff --git a/ReactAndroid/src/test/java/org/mockito/configuration/BUCK b/ReactAndroid/src/test/java/org/mockito/configuration/BUCK
index a29174b85a037e..ed96ae2d0653cf 100644
--- a/ReactAndroid/src/test/java/org/mockito/configuration/BUCK
+++ b/ReactAndroid/src/test/java/org/mockito/configuration/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_android_toplevel_dep",
 rn_android_library(
     name = "configuration",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec
index 0bf38ed0c2f62a..67c2330c383edc 100644
--- a/ReactCommon/React-Fabric.podspec
+++ b/ReactCommon/React-Fabric.podspec
@@ -11,14 +11,14 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
-folly_dep_name = 'Folly/Fabric'
+folly_version = '2021.06.28.00-v2'
+folly_dep_name = 'RCT-Folly/Fabric'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -28,13 +28,12 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0" }
+  s.platforms              = { :ios => "11.0" }
   s.source                 = source
-  s.prepare_command        = File.read("../scripts/generate-rncore.sh")
   s.source_files           = "dummyFile.cpp"
   s.library                = "stdc++"
   s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
-                            "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
+                            "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
 
   s.dependency folly_dep_name, folly_version
   s.dependency "React-graphics", version
@@ -44,12 +43,21 @@ Pod::Spec.new do |s|
   s.dependency "ReactCommon/turbomodule/core", version
   s.dependency "React-jsi", version
 
+  s.subspec "animations" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/animations/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/animations/tests"
+    ss.header_dir           = "react/renderer/animations"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
   s.subspec "attributedstring" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "fabric/attributedstring/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/*"
-    ss.header_dir           = "react/attributedstring"
+    ss.source_files         = "react/renderer/attributedstring/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/attributedstring/tests"
+    ss.header_dir           = "react/renderer/attributedstring"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
@@ -57,13 +65,13 @@ Pod::Spec.new do |s|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "better/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/*"
+    ss.exclude_files        = "better/tests"
     ss.header_dir           = "better"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "config" do |ss|
-    ss.source_files         = "config/*.{m,mm,cpp,h}"
+    ss.source_files         = "react/config/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/config"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
   end
@@ -71,121 +79,144 @@ Pod::Spec.new do |s|
   s.subspec "core" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags + ' ' + boost_compiler_flags
-    ss.source_files         = "fabric/core/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/**/*"
-    ss.header_dir           = "react/core"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    ss.source_files         = "react/renderer/core/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/core/tests"
+    ss.header_dir           = "react/renderer/core"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "componentregistry" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/componentregistry/**/*.{m,mm,cpp,h}"
+    ss.header_dir           = "react/renderer/componentregistry"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "componentregistrynative" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/componentregistry/native/**/*.{m,mm,cpp,h}"
+    ss.header_dir           = "react/renderer/componentregistry/native"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "components" do |ss|
     ss.subspec "activityindicator" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/activityindicator/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/activityindicator"
+      sss.source_files         = "react/renderer/components/activityindicator/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/activityindicator/tests"
+      sss.header_dir           = "react/renderer/components/activityindicator"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "image" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/image/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/image"
+      sss.source_files         = "react/renderer/components/image/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/image/tests"
+      sss.header_dir           = "react/renderer/components/image"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    end
+
+    ss.subspec "inputaccessory" do |sss|
+      sss.dependency             folly_dep_name, folly_version
+      sss.compiler_flags       = folly_compiler_flags
+      sss.source_files         = "react/renderer/components/inputaccessory/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/inputaccessory/tests"
+      sss.header_dir           = "react/renderer/components/inputaccessory"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "legacyviewmanagerinterop" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/legacyviewmanagerinterop/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/legacyviewmanagerinterop"
+      sss.source_files         = "react/renderer/components/legacyviewmanagerinterop/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/legacyviewmanagerinterop/tests"
+      sss.header_dir           = "react/renderer/components/legacyviewmanagerinterop"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" }
     end
 
     ss.subspec "modal" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/modal/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/modal"
+      sss.source_files         = "react/renderer/components/modal/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/modal/tests"
+      sss.header_dir           = "react/renderer/components/modal"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "rncore" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/rncore/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*", "fabric/components/rncore/*Tests.{h,cpp}",
-                                 # TODO: These should be re-enabled later when Codegen Native Module support is needed.
-                                 "fabric/components/rncore/rncore-generated.mm", "fabric/components/rncore/NativeModules.{h,cpp}"
-      sss.header_dir           = "react/components/rncore"
+      sss.source_files         = "react/renderer/components/rncore/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/rncore/tests"
+      sss.header_dir           = "react/renderer/components/rncore"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "root" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/root/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/root"
+      sss.source_files         = "react/renderer/components/root/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/root/tests"
+      sss.header_dir           = "react/renderer/components/root"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "safeareaview" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/safeareaview/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/safeareaview"
+      sss.source_files         = "react/renderer/components/safeareaview/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/safeareaview/tests"
+      sss.header_dir           = "react/renderer/components/safeareaview"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "scrollview" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/scrollview/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/scrollview"
+      sss.source_files         = "react/renderer/components/scrollview/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/scrollview/tests"
+      sss.header_dir           = "react/renderer/components/scrollview"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "slider" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/slider/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*",
-                                 "**/android/*"
-      sss.header_dir           = "react/components/slider"
+      sss.source_files         = "react/renderer/components/slider/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/slider/tests/**/*",
+                                 "react/renderer/components/slider/platform/android"
+      sss.header_dir           = "react/renderer/components/slider"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "text" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/text/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/text"
+      sss.source_files         = "react/renderer/components/text/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/text/tests"
+      sss.header_dir           = "react/renderer/components/text"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "textinput" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/textinput/iostextinput/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/iostextinput"
+      sss.source_files         = "react/renderer/components/textinput/iostextinput/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/textinput/iostextinput/tests"
+      sss.header_dir           = "react/renderer/components/iostextinput"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
     ss.subspec "unimplementedview" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/unimplementedview/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/unimplementedview"
+      sss.source_files         = "react/renderer/components/unimplementedview/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/unimplementedview/tests"
+      sss.header_dir           = "react/renderer/components/unimplementedview"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
@@ -193,65 +224,120 @@ Pod::Spec.new do |s|
       sss.dependency             folly_dep_name, folly_version
       sss.dependency             "Yoga"
       sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "fabric/components/view/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "**/tests/*"
-      sss.header_dir           = "react/components/view"
+      sss.source_files         = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/view/tests"
+      sss.header_dir           = "react/renderer/components/view"
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
   end
 
-  s.subspec "debug" do |ss|
+  s.subspec "debug_core" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "fabric/debug/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/*"
+    ss.source_files         = "react/debug/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/debug/tests"
     ss.header_dir           = "react/debug"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
+  s.subspec "debug_renderer" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/debug/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/debug/tests"
+    ss.header_dir           = "react/renderer/debug"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
   s.subspec "imagemanager" do |ss|
     ss.dependency             "React-RCTImage", version
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "fabric/imagemanager/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/*",
-                              "**/android/*",
-                              "**/cxx/*"
-    ss.header_dir           = "react/imagemanager"
+    ss.source_files         = "react/renderer/imagemanager/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/imagemanager/tests",
+                              "react/renderer/imagemanager/platform/android",
+                              "react/renderer/imagemanager/platform/cxx"
+    ss.header_dir           = "react/renderer/imagemanager"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "mounting" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "fabric/mounting/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/*"
-    ss.header_dir           = "react/mounting"
+    ss.source_files         = "react/renderer/mounting/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/mounting/tests"
+    ss.header_dir           = "react/renderer/mounting"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "scheduler" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/scheduler/**/*.{m,mm,cpp,h}"
+    ss.header_dir           = "react/renderer/scheduler"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "templateprocessor" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/templateprocessor/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/templateprocessor/tests"
+    ss.header_dir           = "react/renderer/templateprocessor"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "textlayoutmanager" do |ss|
     ss.dependency             folly_dep_name, folly_version
+    ss.dependency             "React-Fabric/uimanager"
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "fabric/textlayoutmanager/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/*",
-                              "**/android/*",
-                              "**/cxx/*"
-    ss.header_dir           = "react/textlayoutmanager"
+    ss.source_files         = "react/renderer/textlayoutmanager/platform/ios/**/*.{m,mm,cpp,h}",
+                              "react/renderer/textlayoutmanager/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/textlayoutmanager/tests",
+                              "react/renderer/textlayoutmanager/platform/android",
+                              "react/renderer/textlayoutmanager/platform/cxx"
+    ss.header_dir           = "react/renderer/textlayoutmanager"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "uimanager" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
-    ss.source_files         = "fabric/uimanager/**/*.{m,mm,cpp,h}"
-    ss.exclude_files        = "**/tests/*",
-    ss.header_dir           = "react/uimanager"
+    ss.source_files         = "react/renderer/uimanager/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/uimanager/tests"
+    ss.header_dir           = "react/renderer/uimanager"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "telemetry" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/telemetry/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/telemetry/tests"
+    ss.header_dir           = "react/renderer/telemetry"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "leakchecker" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/leakchecker/**/*.{cpp,h}"
+    ss.exclude_files        = "react/renderer/leakchecker/tests"
+    ss.header_dir           = "react/renderer/leakchecker"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "runtimescheduler" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/runtimescheduler/**/*.{cpp,h}"
+    ss.exclude_files        = "react/renderer/runtimescheduler/tests"
+    ss.header_dir           = "react/renderer/runtimescheduler"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "utils" do |ss|
-    ss.source_files         = "utils/*.{m,mm,cpp,h}"
+    ss.source_files         = "react/utils/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/utils"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec
index 771a9084579ab9..b47ee4096fa749 100644
--- a/ReactCommon/ReactCommon.podspec
+++ b/ReactCommon/ReactCommon.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -28,11 +28,11 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
 
@@ -45,6 +45,7 @@ Pod::Spec.new do |s|
     ss.dependency "React-cxxreact", version
     ss.dependency "React-jsi", version
     ss.dependency "RCT-Folly", folly_version
+    s.dependency "React-logger", version
     ss.dependency "DoubleConversion"
     ss.dependency "glog"
 
@@ -53,6 +54,10 @@ Pod::Spec.new do |s|
                          "react/nativemodule/core/platform/ios/**/*.{mm,cpp,h}"
     end
 
+    s.subspec "react_debug_core" do |sss|
+        sss.source_files = "react/debug/*.{cpp,h}"
+    end
+
     ss.subspec "samples" do |sss|
       sss.source_files = "react/nativemodule/samples/ReactCommon/**/*.{cpp,h}",
                          "react/nativemodule/samples/platform/ios/**/*.{mm,cpp,h}"
diff --git a/ReactCommon/better/Android.mk b/ReactCommon/better/Android.mk
index d21a67d8648e96..fed79b0fbbc136 100644
--- a/ReactCommon/better/Android.mk
+++ b/ReactCommon/better/Android.mk
@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Better\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
diff --git a/ReactCommon/better/BUCK b/ReactCommon/better/BUCK
index 53358d1a55679f..1bff7fd85799d9 100644
--- a/ReactCommon/better/BUCK
+++ b/ReactCommon/better/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -6,6 +5,7 @@ load(
     "CXX",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "rn_xplat_cxx_library",
     "subdir_glob",
 )
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
diff --git a/ReactCommon/callinvoker/Android.mk b/ReactCommon/callinvoker/Android.mk
index 040d5d8ef634b8..3cef3d750c8752 100644
--- a/ReactCommon/callinvoker/Android.mk
+++ b/ReactCommon/callinvoker/Android.mk
@@ -13,7 +13,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
 # Header search path for modules that depend on this module
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 # Name of this module.
 LOCAL_MODULE := callinvoker
diff --git a/ReactCommon/callinvoker/BUCK b/ReactCommon/callinvoker/BUCK
index b050d1f025424a..c10ced16f2cdb1 100644
--- a/ReactCommon/callinvoker/BUCK
+++ b/ReactCommon/callinvoker/BUCK
@@ -13,7 +13,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     labels = ["supermodule:xplat/default/public.react_native.infra"],
diff --git a/ReactCommon/callinvoker/React-callinvoker.podspec b/ReactCommon/callinvoker/React-callinvoker.podspec
index 40f6d88f771959..7b4f1559e46654 100644
--- a/ReactCommon/callinvoker/React-callinvoker.podspec
+++ b/ReactCommon/callinvoker/React-callinvoker.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "ReactCommon"
diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk
index a5024364c6088d..392c33b730a4ac 100644
--- a/ReactCommon/cxxreact/Android.mk
+++ b/ReactCommon/cxxreact/Android.mk
@@ -20,7 +20,7 @@ LOCAL_CFLAGS := \
 LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 
 LOCAL_STATIC_LIBRARIES := boost jsi callinvoker reactperflogger runtimeexecutor
-LOCAL_SHARED_LIBRARIES := jsinspector libfolly_json glog
+LOCAL_SHARED_LIBRARIES := jsinspector libfolly_json glog logger
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -34,3 +34,4 @@ $(call import-module,jsi)
 $(call import-module,jsinspector)
 $(call import-module,hermes/inspector)
 $(call import-module,hermes/executor)
+$(call import-module,logger)
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 5e0d7af0a0f32a..095e3d98b2ca7e 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -2,7 +2,7 @@ load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
 load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "get_android_inspector_flags", "get_apple_compiler_flags", "get_apple_inspector_flags", "get_preprocessor_flags_for_build_mode", "react_native_xplat_target", "rn_xplat_cxx_library")
 
 CXX_LIBRARY_COMPILER_FLAGS = [
-    "-std=c++14",
+    "-std=c++17",
     "-Wall",
 ]
 
@@ -46,9 +46,6 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    preprocessor_flags = [
-        "-DWITH_FBREMAP=1",
-    ],
     visibility = [
         "PUBLIC",
     ],
@@ -155,6 +152,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("microprofiler:microprofiler"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
+        react_native_xplat_target("logger:logger"),
         "//third-party/glog:glog",
         "//xplat/folly:optional",
     ],
diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp
index bfbb608553b525..0bcf13657eed9a 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -16,6 +16,8 @@
 #include "MessageQueueThread.h"
 #include "SystraceSection.h"
 
+#include <logger/react_native_log.h>
+
 using facebook::xplat::module::CxxModule;
 namespace facebook {
 namespace react {
@@ -54,6 +56,26 @@ CxxModule::Callback convertCallback(
 
 } // namespace
 
+bool CxxNativeModule::shouldWarnOnUse_ = false;
+
+void CxxNativeModule::setShouldWarnOnUse(bool value) {
+  shouldWarnOnUse_ = value;
+}
+
+void CxxNativeModule::emitWarnIfWarnOnUsage(
+    const std::string &method_name,
+    const std::string &module_name) {
+  if (shouldWarnOnUse_) {
+    std::string message = folly::to<std::string>(
+        "Calling ",
+        method_name,
+        " on Cxx NativeModule (name = \"",
+        module_name,
+        "\").");
+    react_native_log_warn(message.c_str());
+  }
+}
+
 std::string CxxNativeModule::getName() {
   return name_;
 }
@@ -87,6 +109,8 @@ folly::dynamic CxxNativeModule::getConstants() {
     return nullptr;
   }
 
+  emitWarnIfWarnOnUsage("getConstants()", getName());
+
   folly::dynamic constants = folly::dynamic::object();
   for (auto &pair : module_->getConstants()) {
     constants.insert(std::move(pair.first), std::move(pair.second));
@@ -121,6 +145,8 @@ void CxxNativeModule::invoke(
         "Method ", method.name, " is synchronous but invoked asynchronously"));
   }
 
+  emitWarnIfWarnOnUsage(method.name, getName());
+
   if (params.size() < method.callbacks) {
     throw std::invalid_argument(folly::to<std::string>(
         "Expected ",
@@ -204,6 +230,8 @@ MethodCallResult CxxNativeModule::callSerializableNativeHook(
         "Method ", method.name, " is asynchronous but invoked synchronously"));
   }
 
+  emitWarnIfWarnOnUsage(method.name, getName());
+
   return method.syncFunc(std::move(args));
 }
 
diff --git a/ReactCommon/cxxreact/CxxNativeModule.h b/ReactCommon/cxxreact/CxxNativeModule.h
index 9d730ff7942470..a10f0ec5cb0a54 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.h
+++ b/ReactCommon/cxxreact/CxxNativeModule.h
@@ -20,6 +20,8 @@ namespace react {
 class Instance;
 class MessageQueueThread;
 
+typedef void (*WarnOnUsageLogger)(std::string message);
+
 std::function<void(folly::dynamic)> makeCallback(
     std::weak_ptr<Instance> instance,
     const folly::dynamic &callbackId);
@@ -46,6 +48,8 @@ class RN_EXPORT CxxNativeModule : public NativeModule {
       unsigned int hookId,
       folly::dynamic &&args) override;
 
+  static void setShouldWarnOnUse(bool value);
+
  private:
   void lazyInit();
 
@@ -55,6 +59,11 @@ class RN_EXPORT CxxNativeModule : public NativeModule {
   std::shared_ptr<MessageQueueThread> messageQueueThread_;
   std::unique_ptr<xplat::module::CxxModule> module_;
   std::vector<xplat::module::CxxModule::Method> methods_;
+  void emitWarnIfWarnOnUsage(
+      const std::string &method_name,
+      const std::string &module_name);
+
+  static bool shouldWarnOnUse_;
 };
 
 } // namespace react
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index 2f2dc5d448d168..f1150821a9659a 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -7,6 +7,7 @@
 
 #include "Instance.h"
 
+#include "ErrorUtils.h"
 #include "JSBigString.h"
 #include "JSBundleType.h"
 #include "JSExecutor.h"
@@ -108,6 +109,18 @@ void Instance::loadScriptFromString(
   }
 }
 
+bool Instance::isHBCBundle(const char *sourcePath) {
+  std::ifstream bundle_stream(sourcePath, std::ios_base::in);
+  BundleHeader header;
+
+  if (!bundle_stream ||
+      !bundle_stream.read(reinterpret_cast<char *>(&header), sizeof(header))) {
+    return false;
+  }
+
+  return parseTypeFromHeader(header) == ScriptTag::HBCBundle;
+}
+
 bool Instance::isIndexedRAMBundle(const char *sourcePath) {
   std::ifstream bundle_stream(sourcePath, std::ios_base::in);
   BundleHeader header;
@@ -234,7 +247,26 @@ std::shared_ptr<CallInvoker> Instance::getJSCallInvoker() {
 }
 
 RuntimeExecutor Instance::getRuntimeExecutor() {
-  return nativeToJsBridge_->getRuntimeExecutor();
+  std::weak_ptr<NativeToJsBridge> weakNativeToJsBridge = nativeToJsBridge_;
+
+  auto runtimeExecutor =
+      [weakNativeToJsBridge](
+          std::function<void(jsi::Runtime & runtime)> &&callback) {
+        if (auto strongNativeToJsBridge = weakNativeToJsBridge.lock()) {
+          strongNativeToJsBridge->runOnExecutorQueue(
+              [callback = std::move(callback)](JSExecutor *executor) {
+                jsi::Runtime *runtime =
+                    (jsi::Runtime *)executor->getJavaScriptContext();
+                try {
+                  callback(*runtime);
+                  executor->flush();
+                } catch (jsi::JSError &originalError) {
+                  handleJSError(*runtime, originalError, true);
+                }
+              });
+        }
+      };
+  return runtimeExecutor;
 }
 
 std::shared_ptr<CallInvoker> Instance::getDecoratedNativeCallInvoker(
diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h
index f475bf8a7fa72c..7cd11f9bdf50b4 100644
--- a/ReactCommon/cxxreact/Instance.h
+++ b/ReactCommon/cxxreact/Instance.h
@@ -56,6 +56,7 @@ class RN_EXPORT Instance {
       std::unique_ptr<const JSBigString> string,
       std::string sourceURL,
       bool loadSynchronously);
+  static bool isHBCBundle(const char *sourcePath);
   static bool isIndexedRAMBundle(const char *sourcePath);
   static bool isIndexedRAMBundle(std::unique_ptr<const JSBigString> *string);
   void loadRAMBundleFromString(
diff --git a/ReactCommon/cxxreact/JSBundleType.cpp b/ReactCommon/cxxreact/JSBundleType.cpp
index 05bacb4107c7b7..f76610d461a98e 100644
--- a/ReactCommon/cxxreact/JSBundleType.cpp
+++ b/ReactCommon/cxxreact/JSBundleType.cpp
@@ -13,11 +13,14 @@ namespace facebook {
 namespace react {
 
 static uint32_t constexpr RAMBundleMagicNumber = 0xFB0BD1E5;
+static uint32_t constexpr HBCBundleMagicNumber = 0xffe7c3c3;
 
 ScriptTag parseTypeFromHeader(const BundleHeader &header) {
   switch (folly::Endian::little(header.magic)) {
     case RAMBundleMagicNumber:
       return ScriptTag::RAMBundle;
+    case HBCBundleMagicNumber:
+      return ScriptTag::HBCBundle;
     default:
       return ScriptTag::String;
   }
@@ -29,6 +32,8 @@ const char *stringForScriptTag(const ScriptTag &tag) {
       return "String";
     case ScriptTag::RAMBundle:
       return "RAM Bundle";
+    case ScriptTag::HBCBundle:
+      return "HBC Bundle";
   }
   return "";
 }
diff --git a/ReactCommon/cxxreact/JSBundleType.h b/ReactCommon/cxxreact/JSBundleType.h
index 45a9045818897c..be39711dd8d630 100644
--- a/ReactCommon/cxxreact/JSBundleType.h
+++ b/ReactCommon/cxxreact/JSBundleType.h
@@ -27,6 +27,7 @@ namespace react {
 enum struct ScriptTag {
   String = 0,
   RAMBundle,
+  HBCBundle,
 };
 
 /**
diff --git a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
index 72c2d0d2f6b44b..fa76074d0712e5 100644
--- a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
+++ b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
@@ -14,7 +14,7 @@ namespace xplat {
 namespace detail {
 
 template <typename R, typename M, typename... T>
-R jsArg1(const folly::dynamic &arg, M asFoo, const T &... desc) {
+R jsArg1(const folly::dynamic &arg, M asFoo, const T &...desc) {
   try {
     return (arg.*asFoo)();
   } catch (const folly::TypeError &ex) {
@@ -35,7 +35,7 @@ template <typename R, typename... T>
 R jsArg(
     const folly::dynamic &arg,
     R (folly::dynamic::*asFoo)() const,
-    const T &... desc) {
+    const T &...desc) {
   return detail::jsArg1<R>(arg, asFoo, desc...);
 }
 
@@ -43,7 +43,7 @@ template <typename R, typename... T>
 R jsArg(
     const folly::dynamic &arg,
     R (folly::dynamic::*asFoo)() const &,
-    const T &... desc) {
+    const T &...desc) {
   return detail::jsArg1<R>(arg, asFoo, desc...);
 }
 
diff --git a/ReactCommon/cxxreact/JsArgumentHelpers.h b/ReactCommon/cxxreact/JsArgumentHelpers.h
index 7e9f13934f6a15..25702ba845e5ac 100644
--- a/ReactCommon/cxxreact/JsArgumentHelpers.h
+++ b/ReactCommon/cxxreact/JsArgumentHelpers.h
@@ -39,12 +39,12 @@ template <typename R, typename... T>
 R jsArg(
     const folly::dynamic &arg,
     R (folly::dynamic::*asFoo)() const,
-    const T &... desc);
+    const T &...desc);
 template <typename R, typename... T>
 R jsArg(
     const folly::dynamic &arg,
     R (folly::dynamic::*asFoo)() const &,
-    const T &... desc);
+    const T &...desc);
 
 // This is like jsArg, but a operates on a dynamic representing an array of
 // arguments.  The argument n is used both to index the array and build the
diff --git a/ReactCommon/cxxreact/MethodCall.cpp b/ReactCommon/cxxreact/MethodCall.cpp
index f5f541265a5cb5..3a22b8994b9c4b 100644
--- a/ReactCommon/cxxreact/MethodCall.cpp
+++ b/ReactCommon/cxxreact/MethodCall.cpp
@@ -73,8 +73,8 @@ std::vector<MethodCall> parseMethodCalls(folly::dynamic &&jsonData) {
     }
 
     methodCalls.emplace_back(
-        moduleIds[i].asInt(),
-        methodIds[i].asInt(),
+        static_cast<int>(moduleIds[i].asInt()),
+        static_cast<int>(methodIds[i].asInt()),
         std::move(params[i]),
         callId);
 
diff --git a/ReactCommon/cxxreact/ModuleRegistry.cpp b/ReactCommon/cxxreact/ModuleRegistry.cpp
index da75bc5b5857f3..741d97073d36b6 100644
--- a/ReactCommon/cxxreact/ModuleRegistry.cpp
+++ b/ReactCommon/cxxreact/ModuleRegistry.cpp
@@ -48,6 +48,11 @@ void ModuleRegistry::updateModuleNamesFromIndex(size_t index) {
 void ModuleRegistry::registerModules(
     std::vector<std::unique_ptr<NativeModule>> modules) {
   SystraceSection s_("ModuleRegistry::registerModules");
+  // Noop if there are no NativeModules to add
+  if (modules.empty()) {
+    return;
+  }
+
   if (modules_.empty() && unknownModules_.empty()) {
     modules_ = std::move(modules);
   } else {
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index d0c13554f28a13..3a695201057bcb 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -340,26 +340,5 @@ std::shared_ptr<CallInvoker> NativeToJsBridge::getDecoratedNativeCallInvoker(
   return std::make_shared<NativeCallInvoker>(m_delegate, nativeInvoker);
 }
 
-RuntimeExecutor NativeToJsBridge::getRuntimeExecutor() {
-  auto runtimeExecutor =
-      [this, isDestroyed = m_destroyed](
-          std::function<void(jsi::Runtime & runtime)> &&callback) {
-        if (*isDestroyed) {
-          return;
-        }
-        runOnExecutorQueue(
-            [callback = std::move(callback)](JSExecutor *executor) {
-              jsi::Runtime *runtime =
-                  (jsi::Runtime *)executor->getJavaScriptContext();
-              try {
-                callback(*runtime);
-              } catch (jsi::JSError &originalError) {
-                handleJSError(*runtime, originalError, true);
-              }
-            });
-      };
-  return runtimeExecutor;
-}
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.h b/ReactCommon/cxxreact/NativeToJsBridge.h
index d298f9c27960c2..f9548c59509dbd 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.h
+++ b/ReactCommon/cxxreact/NativeToJsBridge.h
@@ -107,12 +107,6 @@ class NativeToJsBridge {
   std::shared_ptr<CallInvoker> getDecoratedNativeCallInvoker(
       std::shared_ptr<CallInvoker> nativeInvoker);
 
-  /**
-   * RuntimeExecutor is used on Android to access the jsi::Runtime from Fabric
-   * and TurboModules
-   */
-  RuntimeExecutor getRuntimeExecutor();
-
  private:
   // This is used to avoid a race condition where a proxyCallback gets queued
   // after ~NativeToJsBridge(), on the same thread. In that case, the callback
diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec
index 94039dd0b7909f..1031f81b7d7d05 100644
--- a/ReactCommon/cxxreact/React-cxxreact.podspec
+++ b/ReactCommon/cxxreact/React-cxxreact.podspec
@@ -12,13 +12,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -28,15 +28,15 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
   s.header_dir             = "cxxreact"
 
-  s.dependency "boost-for-react-native", "1.63.0"
+  s.dependency "boost", "1.76.0"
   s.dependency "DoubleConversion"
   s.dependency "RCT-Folly", folly_version
   s.dependency "glog"
@@ -45,4 +45,5 @@ Pod::Spec.new do |s|
   s.dependency "React-runtimeexecutor", version
   s.dependency "React-perflogger", version
   s.dependency "React-jsi", version
+  s.dependency "React-logger", version
 end
diff --git a/ReactCommon/cxxreact/ReactNativeVersion.h b/ReactCommon/cxxreact/ReactNativeVersion.h
index 6e48cf86dbb3a3..e3a3377e14bd20 100644
--- a/ReactCommon/cxxreact/ReactNativeVersion.h
+++ b/ReactCommon/cxxreact/ReactNativeVersion.h
@@ -16,8 +16,8 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 63;
-  int32_t Patch = 3;
+  int32_t Minor = 66;
+  int32_t Patch = 0;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 
diff --git a/ReactCommon/cxxreact/SystraceSection.h b/ReactCommon/cxxreact/SystraceSection.h
index 97f93af0b60b91..3a59f0ed6118e0 100644
--- a/ReactCommon/cxxreact/SystraceSection.h
+++ b/ReactCommon/cxxreact/SystraceSection.h
@@ -29,7 +29,7 @@ struct ConcreteSystraceSection {
   template <typename... ConvertsToStringPiece>
   explicit ConcreteSystraceSection(
       const char *name,
-      ConvertsToStringPiece &&... args)
+      ConvertsToStringPiece &&...args)
       : m_section(TRACE_TAG_REACT_CXX_BRIDGE, name, args...) {}
 
  private:
@@ -42,7 +42,7 @@ struct DummySystraceSection {
   template <typename... ConvertsToStringPiece>
   explicit DummySystraceSection(
       __unused const char *name,
-      __unused ConvertsToStringPiece &&... args) {}
+      __unused ConvertsToStringPiece &&...args) {}
 };
 using SystraceSection = DummySystraceSection;
 #endif
diff --git a/ReactCommon/cxxreact/re_worker_requirements b/ReactCommon/cxxreact/re_worker_requirements
deleted file mode 100644
index 3b5fff6d2e136a..00000000000000
--- a/ReactCommon/cxxreact/re_worker_requirements
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "bridgeAndroid#android-x86,merge_structure_97d5739e": {
-        "workerSize": "MEDIUM",
-        "platformType": "LINUX"
-    }
-}
\ No newline at end of file
diff --git a/ReactCommon/hermes/React-hermes.podspec b/ReactCommon/hermes/React-hermes.podspec
new file mode 100644
index 00000000000000..b92fdf63904e4f
--- /dev/null
+++ b/ReactCommon/hermes/React-hermes.podspec
@@ -0,0 +1,53 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
+folly_version = '2021.06.28.00-v2'
+boost_compiler_flags = '-Wno-documentation'
+
+Pod::Spec.new do |s|
+  s.name                   = "React-hermes"
+  s.version                = version
+  s.summary                = "-"  # TODO
+  s.homepage               = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Facebook, Inc. and its affiliates"
+  s.platforms              = { :osx => "10.15", :ios => "11.0" }
+  s.source                 = source
+  s.source_files           = "executor/*.{cpp,h}",
+                             "inspector/*.{cpp,h}",
+                             "inspector/chrome/*.{cpp,h}",
+                             "inspector/detail/*.{cpp,h}"
+  s.public_header_files    = "executor/HermesExecutorFactory.h"
+  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.pod_target_xcconfig    = {
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\"",
+                               "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1",
+                             }
+  s.header_dir             = "reacthermes"
+  s.dependency "React-cxxreact", version
+  s.dependency "React-jsi", version
+  s.dependency "React-jsiexecutor", version
+  s.dependency "React-jsinspector", version
+  s.dependency "React-perflogger", version
+  s.dependency "RCT-Folly", folly_version
+  s.dependency "DoubleConversion"
+  s.dependency "glog"
+  s.dependency "RCT-Folly/Futures", folly_version
+  s.dependency "hermes-engine"
+end
diff --git a/ReactCommon/hermes/executor/Android.mk b/ReactCommon/hermes/executor/Android.mk
index 491100c33a99e3..52b4d25085f74e 100644
--- a/ReactCommon/hermes/executor/Android.mk
+++ b/ReactCommon/hermes/executor/Android.mk
@@ -16,8 +16,8 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_STATIC_LIBRARIES := libjsi libjsireact
-LOCAL_SHARED_LIBRARIES := libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact
+LOCAL_SHARED_LIBRARIES := libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_STATIC_LIBRARIES := libjsi libjsireact libhermes-inspector
-LOCAL_SHARED_LIBRARIES := libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact libhermes-inspector
+LOCAL_SHARED_LIBRARIES := libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactCommon/hermes/inspector/Android.mk b/ReactCommon/hermes/inspector/Android.mk
index a6692943e17deb..461b10aaac3323 100644
--- a/ReactCommon/hermes/inspector/Android.mk
+++ b/ReactCommon/hermes/inspector/Android.mk
@@ -21,7 +21,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_ROOT)
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsi
-LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes
+LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes libjsi libglog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactCommon/hermes/inspector/BUCK b/ReactCommon/hermes/inspector/BUCK
index f3ea76a314efc8..0ff039ceb1e37a 100644
--- a/ReactCommon/hermes/inspector/BUCK
+++ b/ReactCommon/hermes/inspector/BUCK
@@ -3,7 +3,7 @@
 load("@fbsource//tools/build_defs:fb_xplat_cxx_binary.bzl", "fb_xplat_cxx_binary")
 load("@fbsource//tools/build_defs:fb_xplat_cxx_library.bzl", "fb_xplat_cxx_library")
 load("@fbsource//tools/build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
-load("@fbsource//tools/build_defs:platform_defs.bzl", "APPLE", "CXX")
+load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
 load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "react_native_xplat_target")
 load("@fbsource//xplat/hermes/defs:hermes.bzl", "hermes_build_mode", "hermes_optimize_flag")
 
@@ -53,6 +53,7 @@ fb_xplat_cxx_library(
     fbobjc_header_path_prefix = "hermes/inspector/chrome",
     labels = ["supermodule:xplat/default/public.hermes"],
     macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":chrome-tests"],
     visibility = [
         "PUBLIC",
@@ -64,7 +65,6 @@ fb_xplat_cxx_library(
         ":inspectorlib",
         "//third-party/glog:glog",
         "//xplat/folly:futures",
-        "//xplat/folly:molly",
         "//xplat/hermes/API:HermesAPI",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
@@ -83,6 +83,7 @@ fb_xplat_cxx_test(
     cxx_deps = [react_native_xplat_target("jsinspector:jsinspector")],
     fbandroid_deps = [react_native_xplat_target("jsinspector:jsinspector")],
     fbobjc_deps = [react_native_xplat_target("jsinspector:jsinspector")],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = [
         "PUBLIC",
     ],
@@ -115,18 +116,19 @@ fb_xplat_cxx_library(
     # no JNI_Onload.
     fbandroid_allow_jni_merging = False,
     fbandroid_deps = [
-        "//fbandroid/native/fb:fb",
+        "//fbandroid/libraries/fbjni:fbjni",
     ],
     fbobjc_header_path_prefix = "hermes/inspector/detail",
     labels = ["supermodule:xplat/default/public.hermes"],
     macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":detail-tests"],
     visibility = [
         "PUBLIC",
     ],
     xcode_public_headers_symlinks = True,
     deps = [
-        "//xplat/folly:molly",
+        "//xplat/folly:executor",
     ],
 )
 
@@ -139,6 +141,7 @@ fb_xplat_cxx_test(
         "detail/tests/*.h",
     ]),
     compiler_flags = CFLAGS_BY_MODE[hermes_build_mode()],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = [
         "PUBLIC",
     ],
@@ -193,6 +196,7 @@ fb_xplat_cxx_library(
     fbobjc_header_path_prefix = "hermes/inspector",
     labels = ["supermodule:xplat/default/public.hermes"],
     macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = [
         "PUBLIC",
     ],
@@ -201,7 +205,6 @@ fb_xplat_cxx_library(
         ":detail",
         "//third-party/glog:glog",
         "//xplat/folly:futures",
-        "//xplat/folly:molly",
         "//xplat/hermes/API:HermesAPI",
         "//xplat/jsi:jsi",
     ],
diff --git a/ReactCommon/hermes/inspector/Inspector.cpp b/ReactCommon/hermes/inspector/Inspector.cpp
index 21b7bd2108de11..1b5a09d356355f 100644
--- a/ReactCommon/hermes/inspector/Inspector.cpp
+++ b/ReactCommon/hermes/inspector/Inspector.cpp
@@ -85,7 +85,7 @@ namespace debugger = ::facebook::hermes::debugger;
  */
 
 // TODO: read this out of an env variable or config
-static constexpr bool kShouldLog = true;
+static constexpr bool kShouldLog = false;
 
 // Logging state transitions is done outside of transition() in a macro so that
 // function and line numbers in the log will be accurate.
@@ -132,7 +132,6 @@ Inspector::Inspector(
 }
 
 Inspector::~Inspector() {
-  // TODO: think about expected detach flow
   debugger_.setEventObserver(nullptr);
 }
 
@@ -186,7 +185,7 @@ void Inspector::installConsoleFunction(
                 auto obj = val.getObject(runtime);
                 if (obj.isFunction(runtime)) {
                   auto func = obj.getFunction(runtime);
-                  func.call(runtime, args, count);
+                  func.callWithThis(runtime, *originalConsole, args, count);
                 }
               }
             }
diff --git a/ReactCommon/hermes/inspector/Inspector.h b/ReactCommon/hermes/inspector/Inspector.h
index 3e4612530ea869..a55f1c45b9cfb0 100644
--- a/ReactCommon/hermes/inspector/Inspector.h
+++ b/ReactCommon/hermes/inspector/Inspector.h
@@ -319,11 +319,6 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
   facebook::hermes::debugger::Debugger &debugger_;
   InspectorObserver &observer_;
 
-  // All client methods (e.g. enable, setBreakpoint, resume, etc.) are executed
-  // on executor_ to prevent deadlocking on mutex_. See the implementation for
-  // more comments on the threading invariants used in this class.
-  std::unique_ptr<folly::Executor> executor_;
-
   // All of the following member variables are guarded by mutex_.
   std::mutex mutex_;
   std::unique_ptr<InspectorState> state_;
@@ -360,6 +355,12 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
   // Are we currently waiting for a debugger to attach, because we
   // requested 'pauseOnFirstStatement'?
   bool awaitingDebuggerOnStart_;
+
+  // All client methods (e.g. enable, setBreakpoint, resume, etc.) are executed
+  // on executor_ to prevent deadlocking on mutex_. See the implementation for
+  // more comments on the threading invariants used in this class.
+  // NOTE: This needs to be declared LAST because it should be destroyed FIRST.
+  std::unique_ptr<folly::Executor> executor_;
 };
 
 } // namespace inspector
diff --git a/ReactCommon/hermes/inspector/InspectorState.cpp b/ReactCommon/hermes/inspector/InspectorState.cpp
index 07e005ede5b497..a52e2ac25f0bbc 100644
--- a/ReactCommon/hermes/inspector/InspectorState.cpp
+++ b/ReactCommon/hermes/inspector/InspectorState.cpp
@@ -299,9 +299,10 @@ void InspectorState::Running::pushPendingEval(
     std::shared_ptr<folly::Promise<debugger::EvalResult>> promise,
     folly::Function<void(const facebook::hermes::debugger::EvalResult &)>
         resultTransformer) {
-  PendingEval pendingEval{debugger::Command::eval(src, frameIndex),
-                          promise,
-                          std::move(resultTransformer)};
+  PendingEval pendingEval{
+      debugger::Command::eval(src, frameIndex),
+      promise,
+      std::move(resultTransformer)};
 
   pendingEvals_.emplace(std::move(pendingEval));
 
@@ -476,9 +477,10 @@ void InspectorState::Paused::pushPendingEval(
     return;
   }
 
-  PendingEval pendingEval{debugger::Command::eval(src, frameIndex),
-                          promise,
-                          std::move(resultTransformer)};
+  PendingEval pendingEval{
+      debugger::Command::eval(src, frameIndex),
+      promise,
+      std::move(resultTransformer)};
   pendingEvals_.emplace(std::move(pendingEval));
   hasPendingWork_.notify_one();
 }
diff --git a/ReactCommon/hermes/inspector/chrome/Connection.cpp b/ReactCommon/hermes/inspector/chrome/Connection.cpp
index 8af32ff530f1cb..572a07cc2826f6 100644
--- a/ReactCommon/hermes/inspector/chrome/Connection.cpp
+++ b/ReactCommon/hermes/inspector/chrome/Connection.cpp
@@ -9,6 +9,7 @@
 
 #include <cstdlib>
 #include <mutex>
+#include <sstream>
 
 #include <folly/Conv.h>
 #include <folly/Executor.h>
@@ -93,7 +94,12 @@ class Connection::Impl : public inspector::InspectorObserver,
       const m::heapProfiler::StartTrackingHeapObjectsRequest &req) override;
   void handle(
       const m::heapProfiler::StopTrackingHeapObjectsRequest &req) override;
+  void handle(const m::heapProfiler::StartSamplingRequest &req) override;
+  void handle(const m::heapProfiler::StopSamplingRequest &req) override;
   void handle(const m::heapProfiler::CollectGarbageRequest &req) override;
+  void handle(
+      const m::heapProfiler::GetObjectByHeapObjectIdRequest &req) override;
+  void handle(const m::heapProfiler::GetHeapObjectIdRequest &req) override;
   void handle(const m::runtime::EvaluateRequest &req) override;
   void handle(const m::runtime::GetPropertiesRequest &req) override;
   void handle(const m::runtime::RunIfWaitingForDebuggerRequest &req) override;
@@ -580,6 +586,45 @@ void Connection::Impl::handle(
       /* stopStackTraceCapture */ true);
 }
 
+void Connection::Impl::handle(
+    const m::heapProfiler::StartSamplingRequest &req) {
+  const auto id = req.id;
+  // This is the same default sampling interval that Chrome uses.
+  // https://chromedevtools.github.io/devtools-protocol/tot/HeapProfiler/#method-startSampling
+  constexpr size_t kDefaultSamplingInterval = 1 << 15;
+  const size_t samplingInterval =
+      req.samplingInterval.value_or(kDefaultSamplingInterval);
+
+  inspector_
+      ->executeIfEnabled(
+          "HeapProfiler.startSampling",
+          [this, samplingInterval](const debugger::ProgramState &) {
+            getRuntime().instrumentation().startHeapSampling(samplingInterval);
+          })
+      .via(executor_.get())
+      .thenValue(
+          [this, id](auto &&) { sendResponseToClient(m::makeOkResponse(id)); })
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
+void Connection::Impl::handle(const m::heapProfiler::StopSamplingRequest &req) {
+  inspector_
+      ->executeIfEnabled(
+          "HeapProfiler.stopSampling",
+          [this, id = req.id](const debugger::ProgramState &) {
+            std::ostringstream stream;
+            getRuntime().instrumentation().stopHeapSampling(stream);
+            folly::dynamic json = folly::parseJson(stream.str());
+            m::heapProfiler::StopSamplingResponse resp;
+            resp.id = id;
+            m::heapProfiler::SamplingHeapProfile profile{json};
+            resp.profile = profile;
+            sendResponseToClient(resp);
+          })
+      .via(executor_.get())
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
 void Connection::Impl::handle(
     const m::heapProfiler::CollectGarbageRequest &req) {
   const auto id = req.id;
@@ -596,6 +641,76 @@ void Connection::Impl::handle(
       .thenError<std::exception>(sendErrorToClient(req.id));
 }
 
+void Connection::Impl::handle(
+    const m::heapProfiler::GetObjectByHeapObjectIdRequest &req) {
+  uint64_t objID = atoi(req.objectId.c_str());
+  folly::Optional<std::string> group = req.objectGroup;
+  auto remoteObjPtr = std::make_shared<m::runtime::RemoteObject>();
+
+  inspector_
+      ->executeIfEnabled(
+          "HeapProfiler.getObjectByHeapObjectId",
+          [this, remoteObjPtr, objID, group](const debugger::ProgramState &) {
+            jsi::Runtime *rt = &getRuntime();
+            if (auto *hermesRT = dynamic_cast<HermesRuntime *>(rt)) {
+              jsi::Value val = hermesRT->getObjectForID(objID);
+              if (val.isNull()) {
+                return;
+              }
+              *remoteObjPtr = m::runtime::makeRemoteObject(
+                  getRuntime(), val, objTable_, group.value_or(""));
+            }
+          })
+      .via(executor_.get())
+      .thenValue([this, id = req.id, remoteObjPtr](auto &&) {
+        if (!remoteObjPtr->type.empty()) {
+          m::heapProfiler::GetObjectByHeapObjectIdResponse resp;
+          resp.id = id;
+          resp.result = *remoteObjPtr;
+          sendResponseToClient(resp);
+        } else {
+          sendResponseToClient(m::makeErrorResponse(
+              id, m::ErrorCode::ServerError, "Object is not available"));
+        }
+      })
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
+void Connection::Impl::handle(
+    const m::heapProfiler::GetHeapObjectIdRequest &req) {
+  // Use a shared_ptr because the stack frame will go away.
+  std::shared_ptr<uint64_t> snapshotID = std::make_shared<uint64_t>(0);
+
+  inspector_
+      ->executeIfEnabled(
+          "HeapProfiler.getHeapObjectId",
+          [this, req, snapshotID](const debugger::ProgramState &) {
+            if (const jsi::Value *valuePtr = objTable_.getValue(req.objectId)) {
+              jsi::Runtime *rt = &getRuntime();
+              if (auto *hermesRT = dynamic_cast<HermesRuntime *>(rt)) {
+                *snapshotID = hermesRT->getUniqueID(*valuePtr);
+              }
+            }
+          })
+      .via(executor_.get())
+      .thenValue([this, id = req.id, snapshotID](auto &&) {
+        if (*snapshotID) {
+          m::heapProfiler::GetHeapObjectIdResponse resp;
+          resp.id = id;
+          // std::to_string is not available on Android, use a std::ostream
+          // instead.
+          std::ostringstream stream;
+          stream << *snapshotID;
+          resp.heapSnapshotObjectId = stream.str();
+          sendResponseToClient(resp);
+        } else {
+          sendResponseToClient(m::makeErrorResponse(
+              id, m::ErrorCode::ServerError, "Object is not available"));
+        }
+      })
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
 void Connection::Impl::handle(const m::runtime::EvaluateRequest &req) {
   auto remoteObjPtr = std::make_shared<m::runtime::RemoteObject>();
 
diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
index 2a71a05640d4c4..484719e130e7b6 100644
--- a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
+++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
@@ -1,5 +1,5 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
-// @generated SignedSource<<e4c911229f0e8cac24dbc3ec8a933d5e>>
+// @generated SignedSource<<522f29c54f207a4f7b5c33af07cf64d0>>
 
 #include "MessageTypes.h"
 
@@ -46,8 +46,16 @@ std::unique_ptr<Request> Request::fromJsonThrowOnError(const std::string &str) {
       {"Debugger.stepOver", makeUnique<debugger::StepOverRequest>},
       {"HeapProfiler.collectGarbage",
        makeUnique<heapProfiler::CollectGarbageRequest>},
+      {"HeapProfiler.getHeapObjectId",
+       makeUnique<heapProfiler::GetHeapObjectIdRequest>},
+      {"HeapProfiler.getObjectByHeapObjectId",
+       makeUnique<heapProfiler::GetObjectByHeapObjectIdRequest>},
+      {"HeapProfiler.startSampling",
+       makeUnique<heapProfiler::StartSamplingRequest>},
       {"HeapProfiler.startTrackingHeapObjects",
        makeUnique<heapProfiler::StartTrackingHeapObjectsRequest>},
+      {"HeapProfiler.stopSampling",
+       makeUnique<heapProfiler::StopSamplingRequest>},
       {"HeapProfiler.stopTrackingHeapObjects",
        makeUnique<heapProfiler::StopTrackingHeapObjectsRequest>},
       {"HeapProfiler.takeHeapSnapshot",
@@ -219,6 +227,53 @@ dynamic debugger::CallFrame::toDynamic() const {
   return obj;
 }
 
+heapProfiler::SamplingHeapProfileNode::SamplingHeapProfileNode(
+    const dynamic &obj) {
+  assign(callFrame, obj, "callFrame");
+  assign(selfSize, obj, "selfSize");
+  assign(id, obj, "id");
+  assign(children, obj, "children");
+}
+
+dynamic heapProfiler::SamplingHeapProfileNode::toDynamic() const {
+  dynamic obj = dynamic::object;
+
+  put(obj, "callFrame", callFrame);
+  put(obj, "selfSize", selfSize);
+  put(obj, "id", id);
+  put(obj, "children", children);
+  return obj;
+}
+
+heapProfiler::SamplingHeapProfileSample::SamplingHeapProfileSample(
+    const dynamic &obj) {
+  assign(size, obj, "size");
+  assign(nodeId, obj, "nodeId");
+  assign(ordinal, obj, "ordinal");
+}
+
+dynamic heapProfiler::SamplingHeapProfileSample::toDynamic() const {
+  dynamic obj = dynamic::object;
+
+  put(obj, "size", size);
+  put(obj, "nodeId", nodeId);
+  put(obj, "ordinal", ordinal);
+  return obj;
+}
+
+heapProfiler::SamplingHeapProfile::SamplingHeapProfile(const dynamic &obj) {
+  assign(head, obj, "head");
+  assign(samples, obj, "samples");
+}
+
+dynamic heapProfiler::SamplingHeapProfile::toDynamic() const {
+  dynamic obj = dynamic::object;
+
+  put(obj, "head", head);
+  put(obj, "samples", samples);
+  return obj;
+}
+
 runtime::ExecutionContextDescription::ExecutionContextDescription(
     const dynamic &obj) {
   assign(id, obj, "id");
@@ -679,6 +734,92 @@ void heapProfiler::CollectGarbageRequest::accept(
   handler.handle(*this);
 }
 
+heapProfiler::GetHeapObjectIdRequest::GetHeapObjectIdRequest()
+    : Request("HeapProfiler.getHeapObjectId") {}
+
+heapProfiler::GetHeapObjectIdRequest::GetHeapObjectIdRequest(const dynamic &obj)
+    : Request("HeapProfiler.getHeapObjectId") {
+  assign(id, obj, "id");
+  assign(method, obj, "method");
+
+  dynamic params = obj.at("params");
+  assign(objectId, params, "objectId");
+}
+
+dynamic heapProfiler::GetHeapObjectIdRequest::toDynamic() const {
+  dynamic params = dynamic::object;
+  put(params, "objectId", objectId);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "method", method);
+  put(obj, "params", std::move(params));
+  return obj;
+}
+
+void heapProfiler::GetHeapObjectIdRequest::accept(
+    RequestHandler &handler) const {
+  handler.handle(*this);
+}
+
+heapProfiler::GetObjectByHeapObjectIdRequest::GetObjectByHeapObjectIdRequest()
+    : Request("HeapProfiler.getObjectByHeapObjectId") {}
+
+heapProfiler::GetObjectByHeapObjectIdRequest::GetObjectByHeapObjectIdRequest(
+    const dynamic &obj)
+    : Request("HeapProfiler.getObjectByHeapObjectId") {
+  assign(id, obj, "id");
+  assign(method, obj, "method");
+
+  dynamic params = obj.at("params");
+  assign(objectId, params, "objectId");
+  assign(objectGroup, params, "objectGroup");
+}
+
+dynamic heapProfiler::GetObjectByHeapObjectIdRequest::toDynamic() const {
+  dynamic params = dynamic::object;
+  put(params, "objectId", objectId);
+  put(params, "objectGroup", objectGroup);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "method", method);
+  put(obj, "params", std::move(params));
+  return obj;
+}
+
+void heapProfiler::GetObjectByHeapObjectIdRequest::accept(
+    RequestHandler &handler) const {
+  handler.handle(*this);
+}
+
+heapProfiler::StartSamplingRequest::StartSamplingRequest()
+    : Request("HeapProfiler.startSampling") {}
+
+heapProfiler::StartSamplingRequest::StartSamplingRequest(const dynamic &obj)
+    : Request("HeapProfiler.startSampling") {
+  assign(id, obj, "id");
+  assign(method, obj, "method");
+
+  dynamic params = obj.at("params");
+  assign(samplingInterval, params, "samplingInterval");
+}
+
+dynamic heapProfiler::StartSamplingRequest::toDynamic() const {
+  dynamic params = dynamic::object;
+  put(params, "samplingInterval", samplingInterval);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "method", method);
+  put(obj, "params", std::move(params));
+  return obj;
+}
+
+void heapProfiler::StartSamplingRequest::accept(RequestHandler &handler) const {
+  handler.handle(*this);
+}
+
 heapProfiler::StartTrackingHeapObjectsRequest::StartTrackingHeapObjectsRequest()
     : Request("HeapProfiler.startTrackingHeapObjects") {}
 
@@ -708,6 +849,26 @@ void heapProfiler::StartTrackingHeapObjectsRequest::accept(
   handler.handle(*this);
 }
 
+heapProfiler::StopSamplingRequest::StopSamplingRequest()
+    : Request("HeapProfiler.stopSampling") {}
+
+heapProfiler::StopSamplingRequest::StopSamplingRequest(const dynamic &obj)
+    : Request("HeapProfiler.stopSampling") {
+  assign(id, obj, "id");
+  assign(method, obj, "method");
+}
+
+dynamic heapProfiler::StopSamplingRequest::toDynamic() const {
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "method", method);
+  return obj;
+}
+
+void heapProfiler::StopSamplingRequest::accept(RequestHandler &handler) const {
+  handler.handle(*this);
+}
+
 heapProfiler::StopTrackingHeapObjectsRequest::StopTrackingHeapObjectsRequest()
     : Request("HeapProfiler.stopTrackingHeapObjects") {}
 
@@ -973,6 +1134,59 @@ dynamic debugger::SetInstrumentationBreakpointResponse::toDynamic() const {
   return obj;
 }
 
+heapProfiler::GetHeapObjectIdResponse::GetHeapObjectIdResponse(
+    const dynamic &obj) {
+  assign(id, obj, "id");
+
+  dynamic res = obj.at("result");
+  assign(heapSnapshotObjectId, res, "heapSnapshotObjectId");
+}
+
+dynamic heapProfiler::GetHeapObjectIdResponse::toDynamic() const {
+  dynamic res = dynamic::object;
+  put(res, "heapSnapshotObjectId", heapSnapshotObjectId);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "result", std::move(res));
+  return obj;
+}
+
+heapProfiler::GetObjectByHeapObjectIdResponse::GetObjectByHeapObjectIdResponse(
+    const dynamic &obj) {
+  assign(id, obj, "id");
+
+  dynamic res = obj.at("result");
+  assign(result, res, "result");
+}
+
+dynamic heapProfiler::GetObjectByHeapObjectIdResponse::toDynamic() const {
+  dynamic res = dynamic::object;
+  put(res, "result", result);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "result", std::move(res));
+  return obj;
+}
+
+heapProfiler::StopSamplingResponse::StopSamplingResponse(const dynamic &obj) {
+  assign(id, obj, "id");
+
+  dynamic res = obj.at("result");
+  assign(profile, res, "profile");
+}
+
+dynamic heapProfiler::StopSamplingResponse::toDynamic() const {
+  dynamic res = dynamic::object;
+  put(res, "profile", profile);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "result", std::move(res));
+  return obj;
+}
+
 runtime::EvaluateResponse::EvaluateResponse(const dynamic &obj) {
   assign(id, obj, "id");
 
diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.h b/ReactCommon/hermes/inspector/chrome/MessageTypes.h
index 7778d88dc365d4..2184a223588e4c 100644
--- a/ReactCommon/hermes/inspector/chrome/MessageTypes.h
+++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.h
@@ -1,5 +1,5 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
-// @generated SignedSource<<e3e5526b8e266b560b9dc9e42cc0d6c5>>
+// @generated SignedSource<<a541d174394c8959b9fb6a7c575e7040>>
 
 #pragma once
 
@@ -72,10 +72,21 @@ using UnserializableValue = std::string;
 namespace heapProfiler {
 struct AddHeapSnapshotChunkNotification;
 struct CollectGarbageRequest;
+struct GetHeapObjectIdRequest;
+struct GetHeapObjectIdResponse;
+struct GetObjectByHeapObjectIdRequest;
+struct GetObjectByHeapObjectIdResponse;
+using HeapSnapshotObjectId = std::string;
 struct HeapStatsUpdateNotification;
 struct LastSeenObjectIdNotification;
 struct ReportHeapSnapshotProgressNotification;
+struct SamplingHeapProfile;
+struct SamplingHeapProfileNode;
+struct SamplingHeapProfileSample;
+struct StartSamplingRequest;
 struct StartTrackingHeapObjectsRequest;
+struct StopSamplingRequest;
+struct StopSamplingResponse;
 struct StopTrackingHeapObjectsRequest;
 struct TakeHeapSnapshotRequest;
 } // namespace heapProfiler
@@ -101,8 +112,13 @@ struct RequestHandler {
   virtual void handle(const debugger::StepOutRequest &req) = 0;
   virtual void handle(const debugger::StepOverRequest &req) = 0;
   virtual void handle(const heapProfiler::CollectGarbageRequest &req) = 0;
+  virtual void handle(const heapProfiler::GetHeapObjectIdRequest &req) = 0;
+  virtual void handle(
+      const heapProfiler::GetObjectByHeapObjectIdRequest &req) = 0;
+  virtual void handle(const heapProfiler::StartSamplingRequest &req) = 0;
   virtual void handle(
       const heapProfiler::StartTrackingHeapObjectsRequest &req) = 0;
+  virtual void handle(const heapProfiler::StopSamplingRequest &req) = 0;
   virtual void handle(
       const heapProfiler::StopTrackingHeapObjectsRequest &req) = 0;
   virtual void handle(const heapProfiler::TakeHeapSnapshotRequest &req) = 0;
@@ -130,8 +146,13 @@ struct NoopRequestHandler : public RequestHandler {
   void handle(const debugger::StepOutRequest &req) override {}
   void handle(const debugger::StepOverRequest &req) override {}
   void handle(const heapProfiler::CollectGarbageRequest &req) override {}
+  void handle(const heapProfiler::GetHeapObjectIdRequest &req) override {}
+  void handle(
+      const heapProfiler::GetObjectByHeapObjectIdRequest &req) override {}
+  void handle(const heapProfiler::StartSamplingRequest &req) override {}
   void handle(
       const heapProfiler::StartTrackingHeapObjectsRequest &req) override {}
+  void handle(const heapProfiler::StopSamplingRequest &req) override {}
   void handle(
       const heapProfiler::StopTrackingHeapObjectsRequest &req) override {}
   void handle(const heapProfiler::TakeHeapSnapshotRequest &req) override {}
@@ -230,6 +251,36 @@ struct debugger::CallFrame : public Serializable {
   folly::Optional<runtime::RemoteObject> returnValue;
 };
 
+struct heapProfiler::SamplingHeapProfileNode : public Serializable {
+  SamplingHeapProfileNode() = default;
+  explicit SamplingHeapProfileNode(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  runtime::CallFrame callFrame{};
+  double selfSize{};
+  int id{};
+  std::vector<heapProfiler::SamplingHeapProfileNode> children;
+};
+
+struct heapProfiler::SamplingHeapProfileSample : public Serializable {
+  SamplingHeapProfileSample() = default;
+  explicit SamplingHeapProfileSample(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  double size{};
+  int nodeId{};
+  double ordinal{};
+};
+
+struct heapProfiler::SamplingHeapProfile : public Serializable {
+  SamplingHeapProfile() = default;
+  explicit SamplingHeapProfile(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  heapProfiler::SamplingHeapProfileNode head{};
+  std::vector<heapProfiler::SamplingHeapProfileSample> samples;
+};
+
 struct runtime::ExecutionContextDescription : public Serializable {
   ExecutionContextDescription() = default;
   explicit ExecutionContextDescription(const folly::dynamic &obj);
@@ -424,6 +475,37 @@ struct heapProfiler::CollectGarbageRequest : public Request {
   void accept(RequestHandler &handler) const override;
 };
 
+struct heapProfiler::GetHeapObjectIdRequest : public Request {
+  GetHeapObjectIdRequest();
+  explicit GetHeapObjectIdRequest(const folly::dynamic &obj);
+
+  folly::dynamic toDynamic() const override;
+  void accept(RequestHandler &handler) const override;
+
+  runtime::RemoteObjectId objectId{};
+};
+
+struct heapProfiler::GetObjectByHeapObjectIdRequest : public Request {
+  GetObjectByHeapObjectIdRequest();
+  explicit GetObjectByHeapObjectIdRequest(const folly::dynamic &obj);
+
+  folly::dynamic toDynamic() const override;
+  void accept(RequestHandler &handler) const override;
+
+  heapProfiler::HeapSnapshotObjectId objectId{};
+  folly::Optional<std::string> objectGroup;
+};
+
+struct heapProfiler::StartSamplingRequest : public Request {
+  StartSamplingRequest();
+  explicit StartSamplingRequest(const folly::dynamic &obj);
+
+  folly::dynamic toDynamic() const override;
+  void accept(RequestHandler &handler) const override;
+
+  folly::Optional<double> samplingInterval;
+};
+
 struct heapProfiler::StartTrackingHeapObjectsRequest : public Request {
   StartTrackingHeapObjectsRequest();
   explicit StartTrackingHeapObjectsRequest(const folly::dynamic &obj);
@@ -434,6 +516,14 @@ struct heapProfiler::StartTrackingHeapObjectsRequest : public Request {
   folly::Optional<bool> trackAllocations;
 };
 
+struct heapProfiler::StopSamplingRequest : public Request {
+  StopSamplingRequest();
+  explicit StopSamplingRequest(const folly::dynamic &obj);
+
+  folly::dynamic toDynamic() const override;
+  void accept(RequestHandler &handler) const override;
+};
+
 struct heapProfiler::StopTrackingHeapObjectsRequest : public Request {
   StopTrackingHeapObjectsRequest();
   explicit StopTrackingHeapObjectsRequest(const folly::dynamic &obj);
@@ -544,6 +634,30 @@ struct debugger::SetInstrumentationBreakpointResponse : public Response {
   debugger::BreakpointId breakpointId{};
 };
 
+struct heapProfiler::GetHeapObjectIdResponse : public Response {
+  GetHeapObjectIdResponse() = default;
+  explicit GetHeapObjectIdResponse(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  heapProfiler::HeapSnapshotObjectId heapSnapshotObjectId{};
+};
+
+struct heapProfiler::GetObjectByHeapObjectIdResponse : public Response {
+  GetObjectByHeapObjectIdResponse() = default;
+  explicit GetObjectByHeapObjectIdResponse(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  runtime::RemoteObject result{};
+};
+
+struct heapProfiler::StopSamplingResponse : public Response {
+  StopSamplingResponse() = default;
+  explicit StopSamplingResponse(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  heapProfiler::SamplingHeapProfile profile{};
+};
+
 struct runtime::EvaluateResponse : public Response {
   EvaluateResponse() = default;
   explicit EvaluateResponse(const folly::dynamic &obj);
diff --git a/ReactCommon/hermes/inspector/chrome/cli/main.cpp b/ReactCommon/hermes/inspector/chrome/cli/main.cpp
index 8a019b8baca5de..3e687be4f36172 100644
--- a/ReactCommon/hermes/inspector/chrome/cli/main.cpp
+++ b/ReactCommon/hermes/inspector/chrome/cli/main.cpp
@@ -156,8 +156,8 @@ static void sendResponse(const std::string &str) {
 
 static std::string readScriptSource(const char *path) {
   std::ifstream stream(path);
-  return std::string{std::istreambuf_iterator<char>(stream),
-                     std::istreambuf_iterator<char>()};
+  return std::string{
+      std::istreambuf_iterator<char>(stream), std::istreambuf_iterator<char>()};
 }
 
 static std::string getUrl(const char *path) {
@@ -228,9 +228,10 @@ static void runScript(const std::string &scriptSource, const std::string &url) {
 
 int main(int argc, char **argv) {
   const char *shortOpts = "l:h";
-  const option longOpts[] = {{"log", 1, nullptr, 'l'},
-                             {"help", 0, nullptr, 'h'},
-                             {nullptr, 0, nullptr, 0}};
+  const option longOpts[] = {
+      {"log", 1, nullptr, 'l'},
+      {"help", 0, nullptr, 'h'},
+      {nullptr, 0, nullptr, 0}};
 
   while (true) {
     int opt = getopt_long(argc, argv, shortOpts, longOpts, nullptr);
diff --git a/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp b/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp
index e4d857aac3f2b1..f579799bbae538 100644
--- a/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp
+++ b/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp
@@ -22,6 +22,7 @@
 #include <hermes/DebuggerAPI.h>
 #include <hermes/hermes.h>
 #include <hermes/inspector/chrome/MessageTypes.h>
+#include <jsi/instrumentation.h>
 
 namespace facebook {
 namespace hermes {
@@ -199,6 +200,12 @@ ResponseType send(SyncConnection &conn, int id) {
   return expectResponse<ResponseType>(conn, id);
 }
 
+template <typename RequestType, typename ResponseType = m::OkResponse>
+ResponseType send(SyncConnection &conn, RequestType req) {
+  conn.send(req.toJson());
+  return expectResponse<ResponseType>(conn, req.id);
+}
+
 void sendRuntimeEvalRequest(
     SyncConnection &conn,
     int id,
@@ -2449,6 +2456,143 @@ TEST(ConnectionTests, runIfWaitingForDebugger) {
   expectNotification<m::debugger::ResumedNotification>(conn);
 }
 
+TEST(ConnectionTests, heapProfilerSampling) {
+  TestContext context;
+  AsyncHermesRuntime &asyncRuntime = context.runtime();
+  SyncConnection &conn = context.conn();
+  int msgId = 1;
+
+  send<m::debugger::EnableRequest>(conn, msgId++);
+  expectExecutionContextCreated(conn);
+
+  asyncRuntime.executeScriptAsync(R"(
+      debugger;
+      function allocator() {
+        // Do some allocation.
+        return new Object;
+      }
+      (function main() {
+        var a = [];
+        for (var i = 0; i < 100; i++) {
+          a[i] = allocator();
+        }
+      })();
+      debugger;
+    )");
+  expectNotification<m::debugger::ScriptParsedNotification>(conn);
+
+  // We should get a pause before the first statement.
+  expectNotification<m::debugger::PausedNotification>(conn);
+
+  {
+    m::heapProfiler::StartSamplingRequest req;
+    req.id = msgId++;
+    // Sample every 256 bytes to ensure there are some samples. The default is
+    // 32768, which is too high for a small example. Note that sampling is a
+    // random process, so there's no guarantee there will be any samples in any
+    // finite number of allocations. In practice the likelihood is so high that
+    // there shouldn't be any issues.
+    req.samplingInterval = 256;
+    send(conn, req);
+  }
+  // Resume, run the allocations, and once it's paused again, stop them.
+  send<m::debugger::ResumeRequest>(conn, msgId++);
+  expectNotification<m::debugger::ResumedNotification>(conn);
+  expectNotification<m::debugger::PausedNotification>(conn);
+  // Send the stop sampling request, expect the value coming back to be JSON.
+  auto resp = send<
+      m::heapProfiler::StopSamplingRequest,
+      m::heapProfiler::StopSamplingResponse>(conn, msgId++);
+  // Make sure there were some samples.
+  EXPECT_NE(resp.profile.samples.size(), 0);
+  // Don't test the content of the JSON, that is tested via the
+  // SamplingHeapProfilerTest.
+
+  // Resume and exit
+  send<m::debugger::ResumeRequest>(conn, msgId++);
+  expectNotification<m::debugger::ResumedNotification>(conn);
+}
+
+TEST(ConnectionTests, heapSnapshotRemoteObject) {
+  TestContext context;
+  AsyncHermesRuntime &asyncRuntime = context.runtime();
+  std::shared_ptr<HermesRuntime> runtime = asyncRuntime.runtime();
+  SyncConnection &conn = context.conn();
+  int msgId = 1;
+
+  send<m::debugger::EnableRequest>(conn, msgId++);
+  expectExecutionContextCreated(conn);
+
+  asyncRuntime.executeScriptAsync(R"(
+    storeValue([1, 2, 3]);
+    debugger;
+  )");
+  expectNotification<m::debugger::ScriptParsedNotification>(conn);
+
+  // We should get a pause before the first statement.
+  expectNotification<m::debugger::PausedNotification>(conn);
+
+  {
+    // Take a heap snapshot first to assign IDs.
+    m::heapProfiler::TakeHeapSnapshotRequest req;
+    req.id = msgId++;
+    req.reportProgress = false;
+    // We don't need the response because we can directly query for object IDs
+    // from the runtime.
+    send(conn, req);
+  }
+
+  const uint64_t globalObjID = runtime->getUniqueID(runtime->global());
+  jsi::Value storedValue = asyncRuntime.awaitStoredValue();
+  const uint64_t storedObjID =
+      runtime->getUniqueID(storedValue.asObject(*runtime));
+
+  auto testObject = [&msgId, &conn](
+                        uint64_t objID,
+                        const char *type,
+                        const char *className,
+                        const char *description,
+                        const char *subtype) {
+    // Get the object by its snapshot ID.
+    m::heapProfiler::GetObjectByHeapObjectIdRequest req;
+    req.id = msgId++;
+    req.objectId = std::to_string(objID);
+    auto resp = send<
+        m::heapProfiler::GetObjectByHeapObjectIdRequest,
+        m::heapProfiler::GetObjectByHeapObjectIdResponse>(conn, req);
+    EXPECT_EQ(resp.result.type, type);
+    EXPECT_EQ(resp.result.className, className);
+    EXPECT_EQ(resp.result.description, description);
+    if (subtype) {
+      EXPECT_EQ(resp.result.subtype, subtype);
+    }
+
+    // Check that fetching the object by heap snapshot ID works.
+    m::heapProfiler::GetHeapObjectIdRequest idReq;
+    idReq.id = msgId++;
+    idReq.objectId = resp.result.objectId.value();
+    auto idResp = send<
+        m::heapProfiler::GetHeapObjectIdRequest,
+        m::heapProfiler::GetHeapObjectIdResponse>(conn, idReq);
+    EXPECT_EQ(atoi(idResp.heapSnapshotObjectId.c_str()), objID);
+  };
+
+  // Test once before a collection.
+  testObject(globalObjID, "object", "Object", "Object", nullptr);
+  testObject(storedObjID, "object", "Array", "Array(3)", "array");
+  // Force a collection to move the heap.
+  runtime->instrumentation().collectGarbage("test");
+  // A collection should not disturb the unique ID lookup, and it should be the
+  // same object as before. Note that it won't have the same remote ID, because
+  // Hermes doesn't do uniquing.
+  testObject(globalObjID, "object", "Object", "Object", nullptr);
+  testObject(storedObjID, "object", "Array", "Array(3)", "array");
+
+  // Resume and exit.
+  send<m::debugger::ResumeRequest>(conn, msgId++);
+  expectNotification<m::debugger::ResumedNotification>(conn);
+}
+
 } // namespace chrome
 } // namespace inspector
 } // namespace hermes
diff --git a/ReactCommon/hermes/inspector/tools/message_types.txt b/ReactCommon/hermes/inspector/tools/message_types.txt
index 5f009532a9f9d6..6267e82ee0ef03 100644
--- a/ReactCommon/hermes/inspector/tools/message_types.txt
+++ b/ReactCommon/hermes/inspector/tools/message_types.txt
@@ -22,8 +22,12 @@ HeapProfiler.reportHeapSnapshotProgress
 HeapProfiler.takeHeapSnapshot
 HeapProfiler.startTrackingHeapObjects
 HeapProfiler.stopTrackingHeapObjects
+HeapProfiler.startSampling
+HeapProfiler.stopSampling
 HeapProfiler.heapStatsUpdate
 HeapProfiler.lastSeenObjectId
+HeapProfiler.getObjectByHeapObjectId
+HeapProfiler.getHeapObjectId
 Runtime.consoleAPICalled
 Runtime.evaluate
 Runtime.executionContextCreated
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/CommandTest.js b/ReactCommon/hermes/inspector/tools/msggen/__tests__/CommandTest.js
index 2b2690ed8745f6..5be283814000a7 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/__tests__/CommandTest.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/__tests__/CommandTest.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-
-import { Command } from '../src/Command.js';
+import {Command} from '../src/Command.js';
 
 test('parses simple command', () => {
   let obj = {
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/EventTest.js b/ReactCommon/hermes/inspector/tools/msggen/__tests__/EventTest.js
index da45f699636711..00cdcb7e42fe8c 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/__tests__/EventTest.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/__tests__/EventTest.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-
-import { Event } from '../src/Event.js';
+import {Event} from '../src/Event.js';
 
 test('parses simple event', () => {
   let obj = {
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/GraphTest.js b/ReactCommon/hermes/inspector/tools/msggen/__tests__/GraphTest.js
index 5e0958ec85671f..5f443e47903ce1 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/__tests__/GraphTest.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/__tests__/GraphTest.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-
-import { Graph } from '../src/Graph.js';
+import {Graph} from '../src/Graph.js';
 
 // graph looks like this before test: https://pxl.cl/9k8t
 let graph = null;
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/HeaderWriterTest.js b/ReactCommon/hermes/inspector/tools/msggen/__tests__/HeaderWriterTest.js
index c6977e358cb59a..44bd13aac1a896 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/__tests__/HeaderWriterTest.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/__tests__/HeaderWriterTest.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-
-import { expectCodeIsEqual, FakeWritable } from '../src/TestHelpers';
+import {expectCodeIsEqual, FakeWritable} from '../src/TestHelpers';
 import {
   emitNotificationDecl,
   emitRequestDecl,
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/ImplementationWriterTest.js b/ReactCommon/hermes/inspector/tools/msggen/__tests__/ImplementationWriterTest.js
index 9f9decb9f15300..4437bb144dccf1 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/__tests__/ImplementationWriterTest.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/__tests__/ImplementationWriterTest.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-
-import { expectCodeIsEqual, FakeWritable } from '../src/TestHelpers';
+import {expectCodeIsEqual, FakeWritable} from '../src/TestHelpers';
 import {
   emitNotificationDef,
   emitRequestDef,
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/PropertyTest.js b/ReactCommon/hermes/inspector/tools/msggen/__tests__/PropertyTest.js
index 6131a14aaaf661..583fcdf737b8a3 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/__tests__/PropertyTest.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/__tests__/PropertyTest.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-
-import { Property } from '../src/Property.js';
+import {Property} from '../src/Property.js';
 
 test('parses required primitive prop', () => {
   let obj = {
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/TypeTest.js b/ReactCommon/hermes/inspector/tools/msggen/__tests__/TypeTest.js
index 509745fac4a5b8..6f5a8649ba1462 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/__tests__/TypeTest.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/__tests__/TypeTest.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-'use strict';
-
-import { Type } from '../src/Type.js';
+import {Type} from '../src/Type.js';
 
 test('parses primitive type', () => {
   let obj = {
diff --git a/ReactCommon/hermes/inspector/tools/msggen/package.json b/ReactCommon/hermes/inspector/tools/msggen/package.json
index a75ddd8384bc2b..226a182e45c20c 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/package.json
+++ b/ReactCommon/hermes/inspector/tools/msggen/package.json
@@ -20,7 +20,7 @@
     "@babel/preset-flow": "^7.2.0",
     "diff": "3.5.0",
     "extend": "3.0.2",
-    "jest": "^24.9.0",
+    "jest": "^26.6.3",
     "nwmatcher": "1.4.4",
     "randomatic": "3.0.0",
     "sshpk": "1.16.1",
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Command.js b/ReactCommon/hermes/inspector/tools/msggen/src/Command.js
index 2d1678f8ef52b1..08b74abcb73a15 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/Command.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/Command.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import {Property} from './Property';
 import {toCppNamespace, toCppType} from './Converters';
 
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Converters.js b/ReactCommon/hermes/inspector/tools/msggen/src/Converters.js
index 277c9fd1631f25..2eb43df111b0ad 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/Converters.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/Converters.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 export function toCppNamespace(domain: string): string {
   return domain.substr(0, 1).toLowerCase() + domain.substr(1);
 }
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Event.js b/ReactCommon/hermes/inspector/tools/msggen/src/Event.js
index 2f2849ba6790c6..7e04311a686728 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/Event.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/Event.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import {Property} from './Property';
 import {toCppNamespace, toCppType} from './Converters';
 
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Graph.js b/ReactCommon/hermes/inspector/tools/msggen/src/Graph.js
index 3ceb3572bc3bfc..98fc5e926dad72 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/Graph.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/Graph.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import invariant from 'assert';
 
 type NodeId = string;
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/HeaderWriter.js b/ReactCommon/hermes/inspector/tools/msggen/src/HeaderWriter.js
index d02a6ab6e28f11..d217c2e86b4f0d 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/HeaderWriter.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/HeaderWriter.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import {Writable} from 'stream';
 
 import {GeneratedHeader} from './GeneratedHeader';
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/ImplementationWriter.js b/ReactCommon/hermes/inspector/tools/msggen/src/ImplementationWriter.js
index dc4c93a17ed406..7dea2bb04d3b42 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/ImplementationWriter.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/ImplementationWriter.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import {Writable} from 'stream';
 
 import {GeneratedHeader} from './GeneratedHeader';
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Property.js b/ReactCommon/hermes/inspector/tools/msggen/src/Property.js
index ab93dd05baeaec..bfcf5d1a23760a 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/Property.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/Property.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import {
   jsTypeToCppType,
   toCppNamespace,
@@ -156,6 +154,7 @@ class RefProperty extends Property {
   constructor(domain: string, obj: any) {
     super(domain, obj);
     this.$ref = obj.$ref;
+    this.recursive = obj.recursive;
   }
 
   getRefDebuggerName(): ?string {
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/TestHelpers.js b/ReactCommon/hermes/inspector/tools/msggen/src/TestHelpers.js
index 2600167e11af44..476dc195734c81 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/TestHelpers.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/TestHelpers.js
@@ -5,9 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
- /*global expect*/
-
-'use strict';
+/*global expect*/
 
 // munges string so that it's nice to look at in a test diff
 function strip(str) {
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Type.js b/ReactCommon/hermes/inspector/tools/msggen/src/Type.js
index 7866ecd09215a2..d91432f45693fe 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/Type.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/Type.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import {Property} from './Property';
 import {jsTypeToCppType, toCppNamespace, toCppType} from './Converters';
 
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/index.js b/ReactCommon/hermes/inspector/tools/msggen/src/index.js
index adcbdea071eda9..b1452d509f91e1 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/index.js
+++ b/ReactCommon/hermes/inspector/tools/msggen/src/index.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import fs from 'fs';
 
 import yargs from 'yargs';
@@ -23,7 +21,7 @@ import {PropsType, Type} from './Type';
 import {HeaderWriter} from './HeaderWriter';
 import {ImplementationWriter} from './ImplementationWriter';
 
-// $FlowFixMe: this isn't a module, just a JSON file.
+// $FlowFixMe[cannot-resolve-module] : this isn't a module, just a JSON file.
 const standard = require('devtools-protocol/json/js_protocol.json');
 
 const custom = require('../src/custom.json');
diff --git a/ReactCommon/hermes/inspector/tools/msggen/yarn.lock b/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
index 47b1dacda9373d..8ba72b6f94882b 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
+++ b/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
@@ -25,6 +25,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
+"@babel/code-frame@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+  dependencies:
+    "@babel/highlight" "^7.12.13"
+
+"@babel/compat-data@^7.13.15":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
+  integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
+
 "@babel/core@^7.1.0", "@babel/core@^7.2.0":
   version "7.7.7"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9"
@@ -45,7 +57,37 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.7.4", "@babel/generator@^7.7.7":
+"@babel/core@^7.7.5":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
+  integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.16"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.13.14"
+    "@babel/helpers" "^7.13.16"
+    "@babel/parser" "^7.13.16"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.15"
+    "@babel/types" "^7.13.16"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
+  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
+  dependencies:
+    "@babel/types" "^7.13.16"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.7.4", "@babel/generator@^7.7.7":
   version "7.7.7"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.7.tgz#859ac733c44c74148e1a72980a64ec84b85f4f45"
   integrity sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==
@@ -79,6 +121,16 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-compilation-targets@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
+  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
+  dependencies:
+    "@babel/compat-data" "^7.13.15"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.0"
+
 "@babel/helper-create-regexp-features-plugin@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
@@ -104,6 +156,15 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-function-name@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
@@ -113,6 +174,13 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-get-function-arity@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
@@ -127,6 +195,13 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-member-expression-to-functions@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
+  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
 "@babel/helper-member-expression-to-functions@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
@@ -134,6 +209,13 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-module-imports@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
 "@babel/helper-module-imports@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
@@ -141,6 +223,20 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-module-transforms@^7.13.14":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
+  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
+  dependencies:
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-simple-access" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.13"
+    "@babel/types" "^7.13.14"
+
 "@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
@@ -153,6 +249,13 @@
     "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-optimise-call-expression@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
@@ -165,6 +268,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
   integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
+"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
 "@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
@@ -183,6 +291,16 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-replace-supers@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
+  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.13.12"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.12"
+
 "@babel/helper-replace-supers@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
@@ -193,6 +311,13 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-simple-access@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
+  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
 "@babel/helper-simple-access@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
@@ -201,6 +326,13 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-split-export-declaration@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
@@ -208,6 +340,16 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+
 "@babel/helper-wrap-function@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
@@ -218,6 +360,15 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helpers@^7.13.16":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
+  integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==
+  dependencies:
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.17"
+    "@babel/types" "^7.13.17"
+
 "@babel/helpers@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
@@ -236,11 +387,25 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4", "@babel/parser@^7.7.7":
+"@babel/highlight@^7.12.13":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.7.4", "@babel/parser@^7.7.7":
   version "7.7.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937"
   integrity sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==
 
+"@babel/parser@^7.12.13", "@babel/parser@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
+  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
+
 "@babel/plugin-proposal-async-generator-functions@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
@@ -297,6 +462,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-syntax-dynamic-import@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
@@ -311,6 +497,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-import-meta@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-json-strings@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
@@ -318,13 +511,48 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.7.4":
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-object-rest-spread@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
   integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-optional-catch-binding@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
@@ -332,6 +560,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-top-level-await@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
@@ -339,6 +581,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-arrow-functions@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
@@ -656,7 +905,16 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-flow-strip-types" "^7.7.4"
 
-"@babel/template@^7.4.0", "@babel/template@^7.7.4":
+"@babel/template@^7.12.13", "@babel/template@^7.3.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
   integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
@@ -665,7 +923,7 @@
     "@babel/parser" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
   integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
@@ -680,7 +938,21 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.4":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
+  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.16"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.16"
+    "@babel/types" "^7.13.17"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
   integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
@@ -689,6 +961,19 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.3":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
+  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    to-fast-properties "^2.0.0"
+
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -697,158 +982,211 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@jest/console@^24.7.1", "@jest/console@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
-  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
-    "@jest/source-map" "^24.9.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    get-package-type "^0.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
 
-"@jest/core@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4"
-  integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/reporters" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
+"@jest/console@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
+  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^26.6.2"
+    jest-util "^26.6.2"
+    slash "^3.0.0"
+
+"@jest/core@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
+  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
+  dependencies:
+    "@jest/console" "^26.6.2"
+    "@jest/reporters" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
     exit "^0.1.2"
-    graceful-fs "^4.1.15"
-    jest-changed-files "^24.9.0"
-    jest-config "^24.9.0"
-    jest-haste-map "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.9.0"
-    jest-resolve-dependencies "^24.9.0"
-    jest-runner "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-snapshot "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
-    jest-watcher "^24.9.0"
-    micromatch "^3.1.10"
-    p-each-series "^1.0.0"
-    realpath-native "^1.1.0"
-    rimraf "^2.5.4"
-    slash "^2.0.0"
-    strip-ansi "^5.0.0"
-
-"@jest/environment@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18"
-  integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==
-  dependencies:
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    jest-mock "^24.9.0"
-
-"@jest/fake-timers@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
-  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-mock "^24.9.0"
-
-"@jest/reporters@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43"
-  integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==
-  dependencies:
-    "@jest/environment" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
+    graceful-fs "^4.2.4"
+    jest-changed-files "^26.6.2"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.6.2"
+    jest-resolve-dependencies "^26.6.3"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
+    jest-watcher "^26.6.2"
+    micromatch "^4.0.2"
+    p-each-series "^2.1.0"
+    rimraf "^3.0.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
+"@jest/environment@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
+  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
+  dependencies:
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    jest-mock "^26.6.2"
+
+"@jest/fake-timers@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
+  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@types/node" "*"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
+
+"@jest/globals@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
+  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
+  dependencies:
+    "@jest/environment" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    expect "^26.6.2"
+
+"@jest/reporters@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
+  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.2"
-    istanbul-lib-coverage "^2.0.2"
-    istanbul-lib-instrument "^3.0.1"
-    istanbul-lib-report "^2.0.4"
-    istanbul-lib-source-maps "^3.0.1"
-    istanbul-reports "^2.2.6"
-    jest-haste-map "^24.9.0"
-    jest-resolve "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.6.0"
-    node-notifier "^5.4.2"
-    slash "^2.0.0"
+    graceful-fs "^4.2.4"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.0.2"
+    jest-haste-map "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
+    slash "^3.0.0"
     source-map "^0.6.0"
-    string-length "^2.0.0"
+    string-length "^4.0.1"
+    terminal-link "^2.0.0"
+    v8-to-istanbul "^7.0.0"
+  optionalDependencies:
+    node-notifier "^8.0.0"
 
-"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
-  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
+"@jest/source-map@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
+  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
   dependencies:
     callsites "^3.0.0"
-    graceful-fs "^4.1.15"
+    graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
-  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+"@jest/test-result@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
+  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
   dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/types" "^24.9.0"
+    "@jest/console" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31"
-  integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==
+"@jest/test-sequencer@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
+  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
   dependencies:
-    "@jest/test-result" "^24.9.0"
-    jest-haste-map "^24.9.0"
-    jest-runner "^24.9.0"
-    jest-runtime "^24.9.0"
+    "@jest/test-result" "^26.6.2"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.6.2"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
 
-"@jest/transform@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
-  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
+"@jest/transform@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
+  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^24.9.0"
-    babel-plugin-istanbul "^5.1.0"
-    chalk "^2.0.1"
+    "@jest/types" "^26.6.2"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.15"
-    jest-haste-map "^24.9.0"
-    jest-regex-util "^24.9.0"
-    jest-util "^24.9.0"
-    micromatch "^3.1.10"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.6.2"
+    jest-regex-util "^26.0.0"
+    jest-util "^26.6.2"
+    micromatch "^4.0.2"
     pirates "^4.0.1"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
     source-map "^0.6.1"
-    write-file-atomic "2.4.1"
+    write-file-atomic "^3.0.0"
 
-"@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
-  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
+"@jest/types@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^13.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+
+"@sinonjs/commons@^1.7.0":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
 
-"@types/babel__core@^7.1.0":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
-  integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
+  version "7.1.14"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
+  integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -878,11 +1216,30 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/babel__traverse@^7.0.4":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639"
+  integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
+"@types/graceful-fs@^4.1.2":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
+  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
   integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
 
+"@types/istanbul-lib-coverage@^2.0.1":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
+
 "@types/istanbul-lib-report@*":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
@@ -890,175 +1247,188 @@
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
   dependencies:
-    "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+"@types/node@*":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.0.tgz#557dd0da4a6dca1407481df3bbacae0cd6f68042"
+  integrity sha512-YN1d+ae2MCb4U0mMa+Zlb5lWTdpFShbAj5nmte6lel27waMMBfivrm0prC16p/Di3DyTrmerrYUT8/145HXxVw==
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/prettier@^2.0.0":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
+  integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==
+
+"@types/stack-utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
+  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
 "@types/yargs-parser@*":
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
   integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
 
-"@types/yargs@^13.0.0":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380"
-  integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==
+"@types/yargs@^15.0.0":
+  version "15.0.13"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
+  integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
-
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
-
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
+
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+
+"@webassemblyjs/helper-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+
+"@webassemblyjs/helper-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
+
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
-
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
+"@webassemblyjs/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
+
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -1071,33 +1441,38 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
-  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+abab@^2.0.3, abab@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
-acorn-globals@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
-  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
+acorn-globals@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
   dependencies:
-    acorn "^6.0.1"
-    acorn-walk "^6.0.1"
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
 
-acorn-walk@^6.0.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
-  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
+acorn-walk@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
+acorn@^6.4.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^5.5.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+acorn@^7.1.1:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^6.0.1, acorn@^6.2.1:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
-  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+acorn@^8.1.0:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb"
+  integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg==
 
 ajv-errors@^1.0.0:
   version "1.0.1"
@@ -1105,35 +1480,37 @@ ajv-errors@^1.0.0:
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ansi-escapes@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+ansi-escapes@^4.2.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1141,6 +1518,13 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1149,11 +1533,26 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@^3.0.3, anymatch@~3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -1169,24 +1568,20 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
 
 asn1@~0.2.3:
   version "0.2.4"
@@ -1213,27 +1608,17 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob@^2.1.1:
+atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
@@ -1248,18 +1633,19 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
   integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
 
-babel-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
-  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
-  dependencies:
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/babel__core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.9.0"
-    chalk "^2.4.2"
-    slash "^2.0.0"
+babel-jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
+  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
+  dependencies:
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/babel__core" "^7.1.7"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^26.6.2"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    slash "^3.0.0"
 
 babel-plugin-dynamic-import-node@^2.3.0:
   version "2.3.0"
@@ -1268,40 +1654,62 @@ babel-plugin-dynamic-import-node@^2.3.0:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-istanbul@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
-  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
+babel-plugin-istanbul@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    find-up "^3.0.0"
-    istanbul-lib-instrument "^3.3.0"
-    test-exclude "^5.2.3"
-
-babel-plugin-jest-hoist@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
-  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
-  dependencies:
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^4.0.0"
+    test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
+  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-preset-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
-  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
-  dependencies:
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.9.0"
+babel-preset-current-node-syntax@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-import-meta" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+
+babel-preset-jest@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
+  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
+  dependencies:
+    babel-plugin-jest-hoist "^26.6.2"
+    babel-preset-current-node-syntax "^1.0.0"
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-js@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base@^0.11.1:
   version "0.11.2"
@@ -1333,6 +1741,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -1345,10 +1758,15 @@ bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
+  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -1374,22 +1792,22 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-brorand@^1.0.1:
+braces@^3.0.1, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-process-hrtime@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
-  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
-
-browser-resolve@^1.11.3:
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
-  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
-  dependencies:
-    resolve "1.1.7"
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
@@ -1422,26 +1840,28 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
   dependencies:
-    bn.js "^4.1.0"
+    bn.js "^5.0.0"
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  dependencies:
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 browserify-zlib@^0.2.0:
   version "0.2.0"
@@ -1450,6 +1870,17 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
+browserslist@^4.14.5:
+  version "4.16.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
+  integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
+  dependencies:
+    caniuse-lite "^1.0.30001214"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.719"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
+
 browserslist@^4.6.0, browserslist@^4.8.2:
   version "4.8.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
@@ -1491,9 +1922,9 @@ builtin-status-codes@^3.0.0:
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 cacache@^12.0.2:
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
-  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
   dependencies:
     bluebird "^3.5.5"
     chownr "^1.1.1"
@@ -1536,11 +1967,21 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+camelcase@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+
 caniuse-lite@^1.0.30001015:
   version "1.0.30001016"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66"
   integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==
 
+caniuse-lite@^1.0.30001214:
+  version "1.0.30001216"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001216.tgz#47418a082a4f952d14d8964ae739e25efb2060a9"
+  integrity sha512-1uU+ww/n5WCJRwUcc9UH/W6925Se5aNnem/G5QaSDga2HzvjYMs8vRbekGUN/PnTZ7ezTHcxxTEb9fgiMYwH6Q==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -1553,7 +1994,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2:
+chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1562,7 +2003,20 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chokidar@^2.0.2, chokidar@^2.1.8:
+chalk@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
+chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -1581,17 +2035,30 @@ chokidar@^2.0.2, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.3.1"
+
 chownr@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
-  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
 ci-info@^2.0.0:
   version "2.0.0"
@@ -1606,6 +2073,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+cjs-module-lexer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
+  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -1625,11 +2097,25 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
+collect-v8-coverage@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
+  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -1645,11 +2131,28 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -1657,7 +2160,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0, commander@~2.20.3:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -1702,7 +2205,7 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -1740,14 +2243,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
   dependencies:
     bn.js "^4.1.0"
-    elliptic "^6.0.0"
+    elliptic "^6.5.3"
 
-create-hash@^1.1.0, create-hash@^1.1.2:
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -1758,7 +2261,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
     ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
@@ -1781,6 +2284,15 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -1798,17 +2310,22 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+cssom@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
-cssstyle@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
-  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+cssstyle@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
   dependencies:
-    cssom "0.3.x"
+    cssom "~0.3.6"
 
 cyclist@^1.0.1:
   version "1.0.1"
@@ -1822,14 +2339,14 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-urls@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
-  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+data-urls@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
   dependencies:
-    abab "^2.0.0"
-    whatwg-mimetype "^2.2.0"
-    whatwg-url "^7.0.0"
+    abab "^2.0.3"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
 
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
@@ -1850,6 +2367,11 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+decimal.js@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
+  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -1860,7 +2382,12 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+define-properties@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -1902,20 +2429,20 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-detect-newline@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+detect-newline@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
 devtools-protocol@0.0.730699:
   version "0.0.730699"
   resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.730699.tgz#4d18f6a9b7fb7cf3f1ffe73bfe14aad66cf3b2ef"
   integrity sha512-dprBpuPzVIIXXL6GevzhvWe2wg836h3d5hY+n6IzzHbKLsUh6QlVmcIy15za0J3MhDFbmEH60s6uYsrw/tgBbw==
 
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
+diff-sequences@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
+  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
 diff@3.5.0:
   version "3.5.0"
@@ -1936,12 +2463,12 @@ domain-browser@^1.1.1:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domexception@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
-  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+domexception@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
   dependencies:
-    webidl-conversions "^4.0.2"
+    webidl-conversions "^5.0.0"
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -1966,28 +2493,43 @@ electron-to-chromium@^1.3.322:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
   integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
 
-elliptic@^6.0.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+electron-to-chromium@^1.3.719:
+  version "1.3.720"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.720.tgz#f5d66df8754d993006b7b2ded15ff7738c58bd94"
+  integrity sha512-B6zLTxxaOFP4WZm6DrvgRk8kLFYWNhQ5TrHMC0l5WtkMXhU5UbnvWoTfeEwqOruUSlNMhVLfYak7REX6oC5Yfw==
+
+elliptic@^6.5.3:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
     hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
+emittery@^0.7.1:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
+  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
@@ -1996,19 +2538,19 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
 errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
@@ -2019,44 +2561,28 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0-next.1:
-  version "1.17.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172"
-  integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.0"
-    string.prototype.trimright "^2.1.0"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escodegen@^1.9.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
-  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+escodegen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
   dependencies:
-    esprima "^3.1.3"
-    estraverse "^4.2.0"
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
@@ -2070,32 +2596,37 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-esprima@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+esprima@^4.0.0, esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
+estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 events@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
-  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
@@ -2123,6 +2654,21 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -2141,17 +2687,17 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
-  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
+expect@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
+  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
   dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-styles "^3.2.0"
-    jest-get-type "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-regex-util "^24.9.0"
+    "@jest/types" "^26.6.2"
+    ansi-styles "^4.0.0"
+    jest-get-type "^26.3.0"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-regex-util "^26.0.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -2197,10 +2743,10 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -2220,9 +2766,9 @@ fb-watchman@^2.0.0:
     bser "2.1.1"
 
 figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
 file-uri-to-path@1.0.0:
   version "1.0.0"
@@ -2239,6 +2785,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -2255,6 +2808,14 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -2318,23 +2879,38 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
-  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
 
+fsevents@^2.1.2, fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -2342,6 +2918,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -2362,6 +2945,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@~5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -2379,38 +2969,27 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.4:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.1.2:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
-  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    ajv "^6.5.5"
+    ajv "^6.12.3"
     har-schema "^2.0.0"
 
 has-flag@^3.0.0:
@@ -2418,7 +2997,12 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -2462,12 +3046,13 @@ has@^1.0.3:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
@@ -2477,7 +3062,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -2491,12 +3076,17 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
   integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
-html-encoding-sniffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
-  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+html-encoding-sniffer@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
   dependencies:
-    whatwg-encoding "^1.0.1"
+    whatwg-encoding "^1.0.5"
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-signature@~1.2.0:
   version "1.2.0"
@@ -2512,6 +3102,11 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -2520,22 +3115,22 @@ iconv-lite@0.4.24:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+import-local@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
+  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
   dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -2555,7 +3150,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -2570,7 +3165,7 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -2603,16 +3198,18 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -2620,6 +3217,13 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-core-module@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
+  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -2634,11 +3238,6 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -2657,6 +3256,11 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-docker@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -2679,6 +3283,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-generator-fn@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
@@ -2691,7 +3300,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -2710,6 +3319,11 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -2717,26 +3331,22 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-regex@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
-  dependencies:
-    has "^1.0.3"
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -2751,6 +3361,13 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2778,404 +3395,419 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
+istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
 
-istanbul-lib-report@^2.0.4:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+istanbul-lib-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
   dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^3.0.0"
+    supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
+istanbul-lib-source-maps@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
+  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
   dependencies:
     debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
+    istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
-  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
-  dependencies:
-    handlebars "^4.1.2"
-
-jest-changed-files@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
-  integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    execa "^1.0.0"
-    throat "^4.0.0"
-
-jest-cli@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af"
-  integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==
-  dependencies:
-    "@jest/core" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
+jest-changed-files@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
+  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    execa "^4.0.0"
+    throat "^5.0.0"
+
+jest-cli@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
+  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
+  dependencies:
+    "@jest/core" "^26.6.3"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    chalk "^4.0.0"
     exit "^0.1.2"
-    import-local "^2.0.0"
+    graceful-fs "^4.2.4"
+    import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
+    jest-config "^26.6.3"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     prompts "^2.0.1"
-    realpath-native "^1.1.0"
-    yargs "^13.3.0"
+    yargs "^15.4.1"
 
-jest-config@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5"
-  integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==
+jest-config@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
+  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    babel-jest "^24.9.0"
-    chalk "^2.0.1"
+    "@jest/test-sequencer" "^26.6.3"
+    "@jest/types" "^26.6.2"
+    babel-jest "^26.6.3"
+    chalk "^4.0.0"
+    deepmerge "^4.2.2"
     glob "^7.1.1"
-    jest-environment-jsdom "^24.9.0"
-    jest-environment-node "^24.9.0"
-    jest-get-type "^24.9.0"
-    jest-jasmine2 "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
-    micromatch "^3.1.10"
-    pretty-format "^24.9.0"
-    realpath-native "^1.1.0"
-
-jest-diff@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
-  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
-  dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-docblock@^24.3.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
-  integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==
-  dependencies:
-    detect-newline "^2.1.0"
-
-jest-each@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05"
-  integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
-    jest-get-type "^24.9.0"
-    jest-util "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-environment-jsdom@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b"
-  integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==
-  dependencies:
-    "@jest/environment" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    jest-mock "^24.9.0"
-    jest-util "^24.9.0"
-    jsdom "^11.5.1"
-
-jest-environment-node@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3"
-  integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==
-  dependencies:
-    "@jest/environment" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    jest-mock "^24.9.0"
-    jest-util "^24.9.0"
-
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
-  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
-
-jest-haste-map@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
-  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    anymatch "^2.0.0"
+    graceful-fs "^4.2.4"
+    jest-environment-jsdom "^26.6.2"
+    jest-environment-node "^26.6.2"
+    jest-get-type "^26.3.0"
+    jest-jasmine2 "^26.6.3"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
+    micromatch "^4.0.2"
+    pretty-format "^26.6.2"
+
+jest-diff@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
+  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^26.6.2"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.6.2"
+
+jest-docblock@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
+  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
+  dependencies:
+    detect-newline "^3.0.0"
+
+jest-each@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
+  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    chalk "^4.0.0"
+    jest-get-type "^26.3.0"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
+
+jest-environment-jsdom@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
+  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
+  dependencies:
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
+    jsdom "^16.4.0"
+
+jest-environment-node@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
+  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
+  dependencies:
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
+
+jest-get-type@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
+
+jest-haste-map@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
+  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
+    anymatch "^3.0.3"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.1.15"
-    invariant "^2.2.4"
-    jest-serializer "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.9.0"
-    micromatch "^3.1.10"
+    graceful-fs "^4.2.4"
+    jest-regex-util "^26.0.0"
+    jest-serializer "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
+    micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
   optionalDependencies:
-    fsevents "^1.2.7"
+    fsevents "^2.1.2"
 
-jest-jasmine2@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
-  integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==
+jest-jasmine2@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
+  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
+    "@jest/environment" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
     co "^4.6.0"
-    expect "^24.9.0"
+    expect "^26.6.2"
     is-generator-fn "^2.0.0"
-    jest-each "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-snapshot "^24.9.0"
-    jest-util "^24.9.0"
-    pretty-format "^24.9.0"
-    throat "^4.0.0"
-
-jest-leak-detector@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a"
-  integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==
-  dependencies:
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-matcher-utils@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
-  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-message-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
-  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
+    jest-each "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
+    throat "^5.0.0"
+
+jest-leak-detector@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
+  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
+  dependencies:
+    jest-get-type "^26.3.0"
+    pretty-format "^26.6.2"
+
+jest-matcher-utils@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
+  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^26.6.2"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.6.2"
+
+jest-message-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
+  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
-
-jest-mock@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
-  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
-  dependencies:
-    "@jest/types" "^24.9.0"
-
-jest-pnp-resolver@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
-  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
-
-jest-regex-util@^24.3.0, jest-regex-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
-  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
-
-jest-resolve-dependencies@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
-  integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-snapshot "^24.9.0"
-
-jest-resolve@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321"
-  integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    browser-resolve "^1.11.3"
-    chalk "^2.0.1"
-    jest-pnp-resolver "^1.2.1"
-    realpath-native "^1.1.0"
-
-jest-runner@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42"
-  integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/environment" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.4.2"
+    "@jest/types" "^26.6.2"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    micromatch "^4.0.2"
+    pretty-format "^26.6.2"
+    slash "^3.0.0"
+    stack-utils "^2.0.2"
+
+jest-mock@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
+  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+
+jest-pnp-resolver@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
+  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
+
+jest-regex-util@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
+  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
+
+jest-resolve-dependencies@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
+  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    jest-regex-util "^26.0.0"
+    jest-snapshot "^26.6.2"
+
+jest-resolve@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
+  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^26.6.2"
+    read-pkg-up "^7.0.1"
+    resolve "^1.18.1"
+    slash "^3.0.0"
+
+jest-runner@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
+  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
+  dependencies:
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.7.1"
     exit "^0.1.2"
-    graceful-fs "^4.1.15"
-    jest-config "^24.9.0"
-    jest-docblock "^24.3.0"
-    jest-haste-map "^24.9.0"
-    jest-jasmine2 "^24.9.0"
-    jest-leak-detector "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-resolve "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.6.0"
+    graceful-fs "^4.2.4"
+    jest-config "^26.6.3"
+    jest-docblock "^26.0.0"
+    jest-haste-map "^26.6.2"
+    jest-leak-detector "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     source-map-support "^0.5.6"
-    throat "^4.0.0"
-
-jest-runtime@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac"
-  integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/environment" "^24.9.0"
-    "@jest/source-map" "^24.3.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/yargs" "^13.0.0"
-    chalk "^2.0.1"
+    throat "^5.0.0"
+
+jest-runtime@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
+  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
+  dependencies:
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/globals" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+    cjs-module-lexer "^0.6.0"
+    collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
-    graceful-fs "^4.1.15"
-    jest-config "^24.9.0"
-    jest-haste-map "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-mock "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.9.0"
-    jest-snapshot "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
-    strip-bom "^3.0.0"
-    yargs "^13.3.0"
-
-jest-serializer@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
-  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
-
-jest-snapshot@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
-  integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==
+    graceful-fs "^4.2.4"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.6.2"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+    yargs "^15.4.1"
+
+jest-serializer@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
+  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
+  dependencies:
+    "@types/node" "*"
+    graceful-fs "^4.2.4"
+
+jest-snapshot@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
+  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
-    expect "^24.9.0"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-resolve "^24.9.0"
-    mkdirp "^0.5.1"
+    "@jest/types" "^26.6.2"
+    "@types/babel__traverse" "^7.0.4"
+    "@types/prettier" "^2.0.0"
+    chalk "^4.0.0"
+    expect "^26.6.2"
+    graceful-fs "^4.2.4"
+    jest-diff "^26.6.2"
+    jest-get-type "^26.3.0"
+    jest-haste-map "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
     natural-compare "^1.4.0"
-    pretty-format "^24.9.0"
-    semver "^6.2.0"
-
-jest-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
-  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
-  dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/source-map" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    callsites "^3.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.15"
+    pretty-format "^26.6.2"
+    semver "^7.3.2"
+
+jest-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
     is-ci "^2.0.0"
-    mkdirp "^0.5.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
+    micromatch "^4.0.2"
 
-jest-validate@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
-  integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==
+jest-validate@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
+  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
   dependencies:
-    "@jest/types" "^24.9.0"
-    camelcase "^5.3.1"
-    chalk "^2.0.1"
-    jest-get-type "^24.9.0"
+    "@jest/types" "^26.6.2"
+    camelcase "^6.0.0"
+    chalk "^4.0.0"
+    jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^24.9.0"
-
-jest-watcher@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b"
-  integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==
-  dependencies:
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/yargs" "^13.0.0"
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    jest-util "^24.9.0"
-    string-length "^2.0.0"
-
-jest-worker@^24.6.0, jest-worker@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
-  dependencies:
+    pretty-format "^26.6.2"
+
+jest-watcher@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
+  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
+  dependencies:
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    jest-util "^26.6.2"
+    string-length "^4.0.1"
+
+jest-worker@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+  dependencies:
+    "@types/node" "*"
     merge-stream "^2.0.0"
-    supports-color "^6.1.0"
+    supports-color "^7.0.0"
 
-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
-  integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==
+jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
+  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
   dependencies:
-    import-local "^2.0.0"
-    jest-cli "^24.9.0"
+    "@jest/core" "^26.6.3"
+    import-local "^3.0.2"
+    jest-cli "^26.6.3"
 
 js-levenshtein@^1.1.3:
   version "1.1.6"
@@ -3187,41 +3819,49 @@ js-levenshtein@^1.1.3:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^11.5.1:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
-  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
-  dependencies:
-    abab "^2.0.0"
-    acorn "^5.5.3"
-    acorn-globals "^4.1.0"
-    array-equal "^1.0.0"
-    cssom ">= 0.3.2 < 0.4.0"
-    cssstyle "^1.0.0"
-    data-urls "^1.0.0"
-    domexception "^1.0.1"
-    escodegen "^1.9.1"
-    html-encoding-sniffer "^1.0.2"
-    left-pad "^1.3.0"
-    nwsapi "^2.0.7"
-    parse5 "4.0.0"
-    pn "^1.1.0"
-    request "^2.87.0"
-    request-promise-native "^1.0.5"
-    sax "^1.2.4"
-    symbol-tree "^3.2.2"
-    tough-cookie "^2.3.4"
-    w3c-hr-time "^1.0.1"
-    webidl-conversions "^4.0.2"
-    whatwg-encoding "^1.0.3"
-    whatwg-mimetype "^2.1.0"
-    whatwg-url "^6.4.1"
-    ws "^5.2.0"
+jsdom@^16.4.0:
+  version "16.5.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136"
+  integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==
+  dependencies:
+    abab "^2.0.5"
+    acorn "^8.1.0"
+    acorn-globals "^6.0.0"
+    cssom "^0.4.4"
+    cssstyle "^2.3.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.1"
+    domexception "^2.0.1"
+    escodegen "^2.0.0"
+    html-encoding-sniffer "^2.0.1"
+    is-potential-custom-element-name "^1.0.0"
+    nwsapi "^2.2.0"
+    parse5 "6.0.1"
+    request "^2.88.2"
+    request-promise-native "^1.0.9"
+    saxes "^5.0.1"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.0.0"
+    w3c-hr-time "^1.0.2"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^6.1.0"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.5.0"
+    ws "^7.4.4"
     xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
@@ -3234,11 +3874,16 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -3268,6 +3913,13 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -3298,20 +3950,15 @@ kind-of@^5.0.0:
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-left-pad@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
-  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -3325,15 +3972,10 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
 loader-runner@^2.4.0:
   version "2.4.0"
@@ -3341,12 +3983,12 @@ loader-runner@^2.4.0:
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
 loader-utils@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
   dependencies:
     big.js "^5.2.2"
-    emojis-list "^2.0.0"
+    emojis-list "^3.0.0"
     json5 "^1.0.1"
 
 locate-path@^3.0.0:
@@ -3357,16 +3999,23 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
 
-lodash@^4.17.13, lodash@^4.17.15:
+lodash@^4.17.13:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.19, lodash@^4.7.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -3381,6 +4030,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -3389,6 +4045,13 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -3396,11 +4059,6 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -3467,6 +4125,14 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -3487,12 +4153,17 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "1.42.0"
 
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -3504,20 +4175,15 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.1, minimist@^1.2.0:
+minimist@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 mississippi@^3.0.0:
   version "3.0.0"
@@ -3543,12 +4209,12 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+mkdirp@^0.5.1, mkdirp@^0.5.3:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -3573,9 +4239,9 @@ ms@^2.1.1:
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 nan@^2.12.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -3599,10 +4265,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+neo-async@^2.5.0, neo-async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -3648,16 +4314,17 @@ node-modules-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
-node-notifier@^5.4.2:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
-  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
+node-notifier@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
+  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
   dependencies:
     growly "^1.3.0"
-    is-wsl "^1.1.0"
-    semver "^5.5.0"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
     shellwords "^0.1.1"
-    which "^1.3.0"
+    uuid "^8.3.0"
+    which "^2.0.2"
 
 node-releases@^1.1.42:
   version "1.1.43"
@@ -3666,7 +4333,12 @@ node-releases@^1.1.42:
   dependencies:
     semver "^6.3.0"
 
-normalize-package-data@^2.3.2:
+node-releases@^1.1.71:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -3683,7 +4355,7 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -3695,12 +4367,19 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
 nwmatcher@1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
   integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==
 
-nwsapi@^2.0.7:
+nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
@@ -3724,12 +4403,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
-
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -3751,14 +4425,6 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -3773,13 +4439,12 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
+    mimic-fn "^2.1.0"
 
 optionator@^0.8.1:
   version "0.8.3"
@@ -3798,22 +4463,20 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-p-each-series@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
-  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
-  dependencies:
-    p-reduce "^1.0.0"
+p-each-series@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
+  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-limit@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+p-limit@^2.0.0, p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
@@ -3824,10 +4487,12 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-reduce@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
-  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -3835,9 +4500,9 @@ p-try@^2.0.0:
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pako@~1.0.5:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
-  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
 parallel-transform@^1.1.0:
   version "1.2.0"
@@ -3848,30 +4513,31 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-parse-asn1@^5.0.0:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
-  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
   dependencies:
-    asn1.js "^4.0.0"
+    asn1.js "^5.2.0"
     browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
+    "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
 
-parse5@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+parse5@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -3893,6 +4559,11 @@ path-exists@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3903,22 +4574,20 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 pbkdf2@^3.0.3:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -3931,10 +4600,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
 
 pify@^4.0.1:
   version "4.0.1"
@@ -3955,10 +4624,12 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pn@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
-  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -3970,15 +4641,15 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
-  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
+pretty-format@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
   dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
+    "@jest/types" "^26.6.2"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^17.0.1"
 
 private@^0.1.6:
   version "0.1.8"
@@ -4013,11 +4684,16 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.24, psl@^1.1.28:
+psl@^1.1.28:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110"
   integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==
 
+psl@^1.1.33:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -4060,7 +4736,7 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
@@ -4094,7 +4770,7 @@ randomatic@3.0.0:
     kind-of "^6.0.0"
     math-random "^1.0.1"
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -4109,32 +4785,34 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-react-is@^16.8.4:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
+react-is@^17.0.1:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
 
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -4144,6 +4822,15 @@ read-pkg@^3.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -4153,12 +4840,12 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-realpath-native@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
-  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
   dependencies:
-    util.promisify "^1.0.0"
+    picomatch "^2.2.1"
 
 regenerate-unicode-properties@^8.1.0:
   version "8.1.0"
@@ -4217,35 +4904,35 @@ remove-trailing-separator@^1.0.1:
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-promise-core@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
-  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+request-promise-core@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
   dependencies:
-    lodash "^4.17.15"
+    lodash "^4.17.19"
 
-request-promise-native@^1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
-  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+request-promise-native@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
   dependencies:
-    request-promise-core "1.1.3"
+    request-promise-core "1.1.4"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.87.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -4254,7 +4941,7 @@ request@^2.87.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -4264,7 +4951,7 @@ request@^2.87.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
@@ -4278,28 +4965,23 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
   dependencies:
-    resolve-from "^3.0.0"
+    resolve-from "^5.0.0"
 
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-
 resolve@^1.10.0, resolve@^1.3.2:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff"
@@ -4307,6 +4989,14 @@ resolve@^1.10.0, resolve@^1.3.2:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.18.1:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -4319,6 +5009,13 @@ rimraf@^2.5.4, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -4339,10 +5036,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -4376,10 +5073,12 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+saxes@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+  dependencies:
+    xmlchars "^2.2.0"
 
 schema-utils@^1.0.0:
   version "1.0.0"
@@ -4400,15 +5099,24 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-serialize-javascript@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
-  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+semver@^7.3.2:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
 
 set-blocking@^2.0.0:
   version "2.0.0"
@@ -4445,11 +5153,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -4470,6 +5190,11 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -4506,17 +5231,17 @@ source-list-map@^2.0.0:
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-support@^0.5.6:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
   integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
@@ -4524,10 +5249,18 @@ source-map-support@^0.5.6, source-map-support@~0.5.12:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
@@ -4539,6 +5272,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 spdx-correct@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -4572,6 +5310,11 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
 sshpk@1.16.1, sshpk@^1.7.0:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -4588,16 +5331,18 @@ sshpk@1.16.1, sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
-stack-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
-  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
+stack-utils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
+  integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+  dependencies:
+    escape-string-regexp "^2.0.0"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -4644,13 +5389,13 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-string-length@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
-  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
+string-length@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
-    astral-regex "^1.0.0"
-    strip-ansi "^4.0.0"
+    char-regex "^1.0.2"
+    strip-ansi "^6.0.0"
 
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
@@ -4661,23 +5406,16 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string.prototype.trimleft@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
-  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
-string.prototype.trimright@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
-  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
   dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
 
-string_decoder@^1.0.0:
+string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
@@ -4691,13 +5429,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -4705,16 +5436,28 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -4722,14 +5465,22 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
+
+supports-hyperlinks@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
+  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
 
-symbol-tree@^3.2.2:
+symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
@@ -4739,44 +5490,51 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
+terminal-link@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    supports-hyperlinks "^2.0.0"
+
 terser-webpack-plugin@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
-  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^2.1.2"
+    serialize-javascript "^4.0.0"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
 terser@^4.1.2:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.3.tgz#401abc52b88869cf904412503b1eb7da093ae2f0"
-  integrity sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
-    glob "^7.1.3"
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
     minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
 
-throat@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
-  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
+throat@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
+  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
 through2@^2.0.0:
   version "2.0.5"
@@ -4787,9 +5545,9 @@ through2@^2.0.0:
     xtend "~4.0.1"
 
 timers-browserify@^2.0.4:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
-  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -4823,6 +5581,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -4833,7 +5598,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@^2.3.3, tough-cookie@^2.3.4:
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -4841,25 +5606,21 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
   dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
 
-tr46@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+tr46@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
   dependencies:
-    punycode "^2.1.0"
-
-tslib@^1.9.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+    punycode "^2.1.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
@@ -4885,19 +5646,38 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-uglify-js@^3.1.4:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9"
-  integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==
-  dependencies:
-    commander "~2.20.3"
-    source-map "~0.6.1"
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -4945,6 +5725,11 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+universalify@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -4959,9 +5744,9 @@ upath@^1.1.1:
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -4983,19 +5768,11 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -5015,6 +5792,20 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
   integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
 
+uuid@^8.3.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+v8-to-istanbul@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.1.tgz#04bfd1026ba4577de5472df4f5e89af49de5edda"
+  integrity sha512-p0BB09E5FRjx0ELN6RgusIPsSPhtgexSRcKETybEs6IGOTXJSZqfwxp7r//55nnu0f1AxltY5VvdVqy2vZf9AA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+    source-map "^0.7.3"
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -5037,12 +5828,19 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-w3c-hr-time@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
-  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+w3c-hr-time@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+  dependencies:
+    browser-process-hrtime "^1.0.0"
+
+w3c-xmlserializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
   dependencies:
-    browser-process-hrtime "^0.1.2"
+    xml-name-validator "^3.0.0"
 
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
@@ -5051,19 +5849,33 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-watchpack@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
+  dependencies:
+    chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
 
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
+webidl-conversions@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 webpack-sources@^1.4.0, webpack-sources@^1.4.1:
   version "1.4.3"
@@ -5074,86 +5886,79 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-map "~0.6.1"
 
 webpack@^4.41.0:
-  version "4.41.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.4.tgz#4bec4125224bdf50efa8be6226c19047599cd034"
-  integrity sha512-Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.2.1"
+  version "4.46.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    acorn "^6.4.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.5.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
     loader-utils "^1.2.3"
     memory-fs "^0.4.1"
     micromatch "^3.1.10"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     neo-async "^2.6.1"
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.0"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
+whatwg-encoding@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
   integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
+whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@^6.4.1:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
-  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"
+  integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
-whatwg-url@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
-  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
+    lodash "^4.7.0"
+    tr46 "^2.0.2"
+    webidl-conversions "^6.1.0"
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.9, which@^1.3.0:
+which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
@@ -5170,54 +5975,64 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
-  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
-    graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
     signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
 
-ws@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^7.4.4:
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
+  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yargs-parser@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yargs-parser@^15.0.0:
   version "15.0.0"
@@ -5227,12 +6042,21 @@ yargs-parser@^15.0.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@^14.2.0:
+  version "14.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.2.tgz#2769564379009ff8597cdd38fba09da9b493c4b5"
+  integrity sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==
   dependencies:
     cliui "^5.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"
@@ -5241,21 +6065,21 @@ yargs@^13.3.0:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+    yargs-parser "^15.0.0"
 
-yargs@^14.2.0:
-  version "14.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.2.tgz#2769564379009ff8597cdd38fba09da9b493c4b5"
-  integrity sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==
+yargs@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
   dependencies:
-    cliui "^5.0.0"
+    cliui "^6.0.0"
     decamelize "^1.2.0"
-    find-up "^3.0.0"
+    find-up "^4.1.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"
     require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^3.0.0"
+    string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^15.0.0"
+    yargs-parser "^18.1.2"
diff --git a/ReactCommon/jsi/Android.mk b/ReactCommon/jsi/Android.mk
index 40c7042c16e375..3fce2059e2d759 100644
--- a/ReactCommon/jsi/Android.mk
+++ b/ReactCommon/jsi/Android.mk
@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 LOCAL_SHARED_LIBRARIES := libfolly_json glog
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
@@ -32,8 +32,8 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 LOCAL_SHARED_LIBRARIES := libfolly_json libjsc glog
 
-ifeq ($(BUILD_FABRIC),true)
-  LOCAL_CFLAGS += -DRN_FABRIC_ENABLED
-endif
+# TODO: Remove this flag when ready.
+# Android has this enabled by default, but the flag is still needed for iOS.
+LOCAL_CFLAGS += -DRN_FABRIC_ENABLED
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/jsi/BUCK b/ReactCommon/jsi/BUCK
index ecaba03aa539cd..1fc3de0f7d8cb9 100644
--- a/ReactCommon/jsi/BUCK
+++ b/ReactCommon/jsi/BUCK
@@ -1,5 +1,3 @@
-# BUILD FILE SYNTAX: SKYLARK
-
 load("//tools/build_defs/oss:rn_defs.bzl", "APPLE", "IOS", "MACOSX", "react_native_xplat_dep", "rn_xplat_cxx_library")
 
 rn_xplat_cxx_library(
@@ -18,7 +16,7 @@ rn_xplat_cxx_library(
         "-O3",
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
         "-Werror",
         "-Wextra",
@@ -79,8 +77,6 @@ rn_xplat_cxx_library(
     fbobjc_frameworks = [
         "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
     ],
-    # TODO (T55502220): Remove when iOS 9.0 deprecation is complete everywhere.
-    fbobjc_target_sdk_version = "9.0",
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     platforms = APPLE,
     visibility = ["PUBLIC"],
diff --git a/ReactCommon/jsi/JSCRuntime.cpp b/ReactCommon/jsi/JSCRuntime.cpp
index b6e6062847cc87..c9465b33dff585 100644
--- a/ReactCommon/jsi/JSCRuntime.cpp
+++ b/ReactCommon/jsi/JSCRuntime.cpp
@@ -50,6 +50,9 @@ class JSCRuntime : public jsi::Runtime {
   jsi::Value evaluateJavaScript(
       const std::shared_ptr<const jsi::Buffer> &buffer,
       const std::string &sourceURL) override;
+
+  bool drainMicrotasks(int maxMicrotasksHint = -1) override;
+
   jsi::Object global() override;
 
   std::string description() override;
@@ -432,6 +435,10 @@ jsi::Value JSCRuntime::evaluateJavaScript(
   return createValue(res);
 }
 
+bool JSCRuntime::drainMicrotasks(int maxMicrotasksHint) {
+  return true;
+}
+
 jsi::Object JSCRuntime::global() {
   return createObject(JSContextGetGlobalObject(ctx_));
 }
diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec
index 2c6223894c6e0e..15247a71cd0013 100644
--- a/ReactCommon/jsi/React-jsi.podspec
+++ b/ReactCommon/jsi/React-jsi.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -27,13 +27,13 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.exclude_files          = "**/test/*"
   s.framework              = "JavaScriptCore"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
   s.header_dir             = "jsi"
   s.default_subspec        = "Default"
 # Microsoft CocoaPod Support [
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
 													   "**/test/*"
 # ] Microsoft CocoaPod Support
 
-  s.dependency "boost-for-react-native", "1.63.0"
+  s.dependency "boost", "1.76.0"
   s.dependency "DoubleConversion"
   s.dependency "RCT-Folly", folly_version
   s.dependency "glog"
diff --git a/ReactCommon/jsi/jsi/CMakeLists.txt b/ReactCommon/jsi/jsi/CMakeLists.txt
index 121d697fd8e76e..acfa48395e518b 100644
--- a/ReactCommon/jsi/jsi/CMakeLists.txt
+++ b/ReactCommon/jsi/jsi/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 if (HERMES_ENABLE_BITCODE)
   list(APPEND jsi_compile_flags "-fembed-bitcode")
 endif ()
-target_compile_options(jsi PUBLIC ${jsi_compile_flags})
+target_compile_options(jsi PRIVATE ${jsi_compile_flags})
 
 install(DIRECTORY "${PROJECT_SOURCE_DIR}/API/jsi/" DESTINATION include
   FILES_MATCHING PATTERN "*.h"
diff --git a/ReactCommon/jsi/jsi/decorator.h b/ReactCommon/jsi/jsi/decorator.h
index 9110145e17788f..be6f4f568b68ec 100644
--- a/ReactCommon/jsi/jsi/decorator.h
+++ b/ReactCommon/jsi/jsi/decorator.h
@@ -126,6 +126,9 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
       const std::shared_ptr<const PreparedJavaScript>& js) override {
     return plain().evaluatePreparedJavaScript(js);
   }
+  bool drainMicrotasks(int maxMicrotasksHint) override {
+    return plain().drainMicrotasks(maxMicrotasksHint);
+  }
   Object global() override {
     return plain().global();
   }
@@ -348,6 +351,14 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     plain().instrumentation().stopTrackingHeapObjectStackTraces();
   }
 
+  void startHeapSampling(size_t samplingInterval) override {
+    plain().instrumentation().startHeapSampling(samplingInterval);
+  }
+
+  void stopHeapSampling(std::ostream& os) override {
+    plain().instrumentation().stopHeapSampling(os);
+  }
+
   void createSnapshotToFile(const std::string& path) override {
     plain().instrumentation().createSnapshotToFile(path);
   }
@@ -483,6 +494,10 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     Around around{with_};
     return RD::evaluatePreparedJavaScript(js);
   }
+  bool drainMicrotasks(int maxMicrotasksHint) override {
+    Around around{with_};
+    return RD::drainMicrotasks(maxMicrotasksHint);
+  }
   Object global() override {
     Around around{with_};
     return RD::global();
diff --git a/ReactCommon/jsi/jsi/instrumentation.h b/ReactCommon/jsi/jsi/instrumentation.h
index 0a9f48abb52b13..a337a7a841510f 100644
--- a/ReactCommon/jsi/jsi/instrumentation.h
+++ b/ReactCommon/jsi/jsi/instrumentation.h
@@ -76,6 +76,19 @@ class JSI_EXPORT Instrumentation {
   /// Stop capture JS stack-traces for JS heap allocated objects.
   virtual void stopTrackingHeapObjectStackTraces() = 0;
 
+  /// Start a heap sampling profiler that will sample heap allocations, and the
+  /// stack trace they were allocated at. Reports a summary of which functions
+  /// allocated the most.
+  /// \param samplingInterval The number of bytes allocated to wait between
+  ///   samples. This will be used as the expected value of a poisson
+  ///   distribution.
+  virtual void startHeapSampling(size_t samplingInterval) = 0;
+
+  /// Turns off the heap sampling profiler previously enabled via
+  /// \c startHeapSampling. Writes the output of the sampling heap profiler to
+  /// \p os. The output is a JSON formatted string.
+  virtual void stopHeapSampling(std::ostream& os) = 0;
+
   /// Captures the heap to a file
   ///
   /// \param path to save the heap capture
diff --git a/ReactCommon/jsi/jsi/jsi.cpp b/ReactCommon/jsi/jsi/jsi.cpp
index 1054057e1fdab5..be38c9787ecd84 100644
--- a/ReactCommon/jsi/jsi/jsi.cpp
+++ b/ReactCommon/jsi/jsi/jsi.cpp
@@ -106,6 +106,9 @@ Instrumentation& Runtime::instrumentation() {
             std::vector<HeapStatsUpdate>)>) override {}
     void stopTrackingHeapObjectStackTraces() override {}
 
+    void startHeapSampling(size_t) override {}
+    void stopHeapSampling(std::ostream&) override {}
+
     void createSnapshotToFile(const std::string&) override {
       throw JSINativeException(
           "Default instrumentation cannot create a heap snapshot");
diff --git a/ReactCommon/jsi/jsi/jsi.h b/ReactCommon/jsi/jsi/jsi.h
index 499b72d3d49a3a..f31f7e7ad3c2d4 100644
--- a/ReactCommon/jsi/jsi/jsi.h
+++ b/ReactCommon/jsi/jsi/jsi.h
@@ -122,7 +122,7 @@ class JSI_EXPORT HostObject {
   virtual void set(Runtime&, const PropNameID& name, const Value& value);
 
   // When JS wants a list of property names for the HostObject, it will
-  // call this method. If it throws an exception, the call will thow a
+  // call this method. If it throws an exception, the call will throw a
   // JS \c Error object. The default implementation returns empty vector.
   virtual std::vector<PropNameID> getPropertyNames(Runtime& rt);
 };
@@ -185,6 +185,35 @@ class JSI_EXPORT Runtime {
   virtual Value evaluatePreparedJavaScript(
       const std::shared_ptr<const PreparedJavaScript>& js) = 0;
 
+  /// Drain the JavaScript VM internal Microtask (a.k.a. Job in ECMA262) queue.
+  ///
+  /// \param maxMicrotasksHint a hint to tell an implementation that it should
+  /// make a best effort not execute more than the given number. It's default
+  /// to -1 for infinity (unbounded execution).
+  /// \return true if the queue is drained or false if there is more work to do.
+  ///
+  /// When there were exceptions thrown from the execution of microtasks,
+  /// implementations shall discard the exceptional jobs. An implementation may
+  /// \throw a \c JSError object to signal the hosts to handle. In that case, an
+  /// implementation may or may not suspend the draining.
+  ///
+  /// Hosts may call this function again to resume the draining if it was
+  /// suspended due to either exceptions or the \p maxMicrotasksHint bound.
+  /// E.g. a host may repetitively invoke this function until the queue is
+  /// drained to implement the "microtask checkpint" defined in WHATWG HTML
+  /// event loop: https://html.spec.whatwg.org/C#perform-a-microtask-checkpoint.
+  ///
+  /// Note that error propagation is only a concern if a host needs to implement
+  /// `queueMicrotask`, a recent API that allows enqueueing aribitary functions
+  /// (hence may throw) as microtasks. Exceptions from ECMA-262 Promise Jobs are
+  /// handled internally to VMs and are never propagrated to hosts.
+  ///
+  /// This API offers some queue management to hosts at its best effort due to
+  /// different behaviors and limitations imposed by different VMs and APIs. By
+  /// the time this is written, An implementation may swallow exceptions (JSC),
+  /// may not pause (V8), and may not support bounded executions.
+  virtual bool drainMicrotasks(int maxMicrotasksHint = -1) = 0;
+
   /// \return the global object
   virtual Object global() = 0;
 
@@ -997,8 +1026,8 @@ class JSI_EXPORT Value {
     return runtime.createValueFromJsonUtf8(json, length);
   }
 
-  /// \return according to the SameValue algorithm see more here:
-  //  https://www.ecma-international.org/ecma-262/5.1/#sec-11.9.4
+  /// \return according to the Strict Equality Comparison algorithm, see:
+  /// https://262.ecma-international.org/11.0/#sec-strict-equality-comparison
   static bool strictEquals(Runtime& runtime, const Value& a, const Value& b);
 
   Value& operator=(Value&& other) {
diff --git a/ReactCommon/jsi/jsi/jsilib-posix.cpp b/ReactCommon/jsi/jsi/jsilib-posix.cpp
index 3ed8d6cdfdb9a0..87b1bdf364d347 100644
--- a/ReactCommon/jsi/jsi/jsilib-posix.cpp
+++ b/ReactCommon/jsi/jsi/jsilib-posix.cpp
@@ -18,15 +18,6 @@
 
 #include <jsi/jsilib.h>
 
-#if __APPLE__
-#include <mach/vm_statistics.h>
-#define MAP_TAG VM_MAKE_TAG(VM_MEMORY_APPLICATION_SPECIFIC_16)
-#endif // __APPLE__
-
-#ifndef MAP_TAG
-#define MAP_TAG 0
-#endif
-
 namespace facebook {
 namespace jsi {
 
@@ -76,8 +67,7 @@ class ScopedFile {
   }
 
   uint8_t* mmap(size_t size) {
-    void* result =
-        ::mmap(nullptr, size, PROT_READ, MAP_PRIVATE | MAP_TAG, fd_, 0);
+    void* result = ::mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd_, 0);
     if (result == MAP_FAILED) {
       throwFormattedError(
           "Could not mmap %s: %s", path_.c_str(), strerror(errno));
diff --git a/ReactCommon/jsi/jsi/test/testlib.cpp b/ReactCommon/jsi/jsi/test/testlib.cpp
index 8cf831d34f7b84..e605b6acead953 100644
--- a/ReactCommon/jsi/jsi/test/testlib.cpp
+++ b/ReactCommon/jsi/jsi/test/testlib.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <jsi/test/testlib.h>
+
 #include <gtest/gtest.h>
 #include <jsi/decorator.h>
 #include <jsi/jsi.h>
diff --git a/ReactCommon/jsiexecutor/Android.mk b/ReactCommon/jsiexecutor/Android.mk
index 74ae7a65cef20e..e0661538e6664c 100644
--- a/ReactCommon/jsiexecutor/Android.mk
+++ b/ReactCommon/jsiexecutor/Android.mk
@@ -16,7 +16,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 
-LOCAL_STATIC_LIBRARIES := libjsi reactnative reactperflogger
-LOCAL_SHARED_LIBRARIES := libfolly_json glog
+LOCAL_STATIC_LIBRARIES := reactnative reactperflogger
+LOCAL_SHARED_LIBRARIES := libfolly_json glog libjsi
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
index ee90076ee3cc5e..cb7baf02c63514 100644
--- a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
+++ b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -27,11 +27,11 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files         = "jsireact/*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
   s.header_dir             = "jsireact"
 
   s.dependency "React-cxxreact", version
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
index f490891446060f..f1d16bacb399ab 100644
--- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -7,6 +7,7 @@
 
 #include "jsireact/JSIExecutor.h"
 
+#include <cxxreact/ErrorUtils.h>
 #include <cxxreact/JSBigString.h>
 #include <cxxreact/ModuleRegistry.h>
 #include <cxxreact/ReactMarker.h>
@@ -204,6 +205,30 @@ void JSIExecutor::registerBundle(
       ReactMarker::REGISTER_JS_SEGMENT_STOP, tag.c_str());
 }
 
+// Looping on \c drainMicrotasks until it completes or hits the retries bound.
+static void performMicrotaskCheckpoint(jsi::Runtime &runtime) {
+  uint8_t retries = 0;
+  // A heuristic number to guard inifinite or absurd numbers of retries.
+  const static unsigned int kRetriesBound = 255;
+
+  while (retries < kRetriesBound) {
+    try {
+      // The default behavior of \c drainMicrotasks is unbounded execution.
+      // We may want to make it bounded in the future.
+      if (runtime.drainMicrotasks()) {
+        break;
+      }
+    } catch (jsi::JSError &error) {
+      handleJSError(runtime, error, true);
+    }
+    retries++;
+  }
+
+  if (retries == kRetriesBound) {
+    throw std::runtime_error("Hits microtasks retries bound.");
+  }
+}
+
 void JSIExecutor::callFunction(
     const std::string &moduleId,
     const std::string &methodId,
@@ -240,6 +265,8 @@ void JSIExecutor::callFunction(
         std::runtime_error("Error calling " + moduleId + "." + methodId));
   }
 
+  performMicrotaskCheckpoint(*runtime_);
+
   callNativeModules(ret, true);
 }
 
@@ -259,6 +286,8 @@ void JSIExecutor::invokeCallback(
         folly::to<std::string>("Error invoking callback ", callbackId)));
   }
 
+  performMicrotaskCheckpoint(*runtime_);
+
   callNativeModules(ret, true);
 }
 
@@ -394,7 +423,9 @@ void JSIExecutor::callNativeModules(const Value &queue, bool isEndOfBatch) {
 void JSIExecutor::flush() {
   SystraceSection s("JSIExecutor::flush");
   if (flushedQueue_) {
-    callNativeModules(flushedQueue_->call(*runtime_), true);
+    Value ret = flushedQueue_->call(*runtime_);
+    performMicrotaskCheckpoint(*runtime_);
+    callNativeModules(ret, true);
     return;
   }
 
@@ -410,7 +441,9 @@ void JSIExecutor::flush() {
     // If calls were made, we bind to the JS bridge methods, and use them to
     // get the pending queue of native calls.
     bindBridge();
-    callNativeModules(flushedQueue_->call(*runtime_), true);
+    Value ret = flushedQueue_->call(*runtime_);
+    performMicrotaskCheckpoint(*runtime_);
+    callNativeModules(ret, true);
   } else if (delegate_) {
     // If we have a delegate, we need to call it; we pass a null list to
     // callNativeModules, since we know there are no native calls, without
@@ -439,7 +472,7 @@ Value JSIExecutor::nativeCallSyncHook(const Value *args, size_t count) {
     throw std::invalid_argument("nativeCallSyncHook arg count must be 3");
   }
 
-  if (!args[2].asObject(*runtime_).isArray(*runtime_)) {
+  if (!args[2].isObject() || !args[2].asObject(*runtime_).isArray(*runtime_)) {
     throw std::invalid_argument(
         folly::to<std::string>("method parameters should be array"));
   }
diff --git a/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp b/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp
index e7c56c206a5f26..0bf27d402e9eec 100644
--- a/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp
+++ b/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp
@@ -89,6 +89,8 @@ folly::Optional<Object> JSINativeModules::createModule(
       valueFromDynamic(rt, result->config),
       static_cast<double>(result->index));
   CHECK(!moduleInfo.isNull()) << "Module returned from genNativeModule is null";
+  CHECK(moduleInfo.isObject())
+      << "Module returned from genNativeModule isn't an Object";
 
   folly::Optional<Object> module(
       moduleInfo.asObject(rt).getPropertyAsObject(rt, "module"));
diff --git a/ReactCommon/jsinspector/BUCK b/ReactCommon/jsinspector/BUCK
index a64c399b567d72..1a7502a5fd634f 100644
--- a/ReactCommon/jsinspector/BUCK
+++ b/ReactCommon/jsinspector/BUCK
@@ -1,4 +1,5 @@
 load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
+load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
 load("//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library")
 
 EXPORTED_HEADERS = [
@@ -32,6 +33,7 @@ rn_xplat_cxx_library(
     ],
     fbandroid_preferred_linkage = "shared",
     labels = ["supermodule:xplat/default/public.react_native.infra"],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactCommon/jsinspector/React-jsinspector.podspec b/ReactCommon/jsinspector/React-jsinspector.podspec
index e18cfd434e7494..684357e367d03d 100644
--- a/ReactCommon/jsinspector/React-jsinspector.podspec
+++ b/ReactCommon/jsinspector/React-jsinspector.podspec
@@ -11,7 +11,7 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.header_dir             = 'jsinspector'
diff --git a/ReactCommon/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK b/ReactCommon/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK
index 2a86bc6af780b5..2a9f6a05bb329b 100644
--- a/ReactCommon/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK
+++ b/ReactCommon/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK
@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_ja
 
 rn_android_library(
     name = "powermock2",
+    autoglob = False,
     visibility = ["PUBLIC"],
     exported_deps = [
         ":javassist-prebuilt",
@@ -20,6 +21,7 @@ rn_android_library(
 
 rn_android_library(
     name = "powermock-reflect",
+    autoglob = False,
     visibility = ["PUBLIC"],
     exported_deps = [
         ":byte-buddy",
diff --git a/ReactCommon/logger/Android.mk b/ReactCommon/logger/Android.mk
new file mode 100644
index 00000000000000..09a29bd3e15856
--- /dev/null
+++ b/ReactCommon/logger/Android.mk
@@ -0,0 +1,23 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := logger
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_CFLAGS += -fexceptions
+
+LOCAL_SHARED_LIBRARIES := glog
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,glog)
diff --git a/ReactCommon/logger/BUCK b/ReactCommon/logger/BUCK
new file mode 100644
index 00000000000000..c40d9fbe170033
--- /dev/null
+++ b/ReactCommon/logger/BUCK
@@ -0,0 +1,43 @@
+load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
+load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library")
+
+EXPORTED_HEADERS = [
+    "react_native_log.h",
+]
+
+rn_xplat_cxx_library(
+    name = "logger",
+    srcs = glob(
+        ["*.cpp"],
+    ),
+    headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        exclude = EXPORTED_HEADERS,
+        prefix = "logger",
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", header)
+            for header in EXPORTED_HEADERS
+        ],
+        prefix = "logger",
+    ),
+    compiler_flags = [
+        "-Wall",
+        "-fexceptions",
+        "-std=c++17",
+    ],
+    fbandroid_preferred_linkage = "shared",
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        "//third-party/glog:glog",
+    ],
+)
diff --git a/ReactCommon/logger/React-logger.podspec b/ReactCommon/logger/React-logger.podspec
new file mode 100644
index 00000000000000..9318446c33cfb4
--- /dev/null
+++ b/ReactCommon/logger/React-logger.podspec
@@ -0,0 +1,40 @@
+# coding: utf-8
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+folly_version = '2021.06.28.00-v2'
+boost_compiler_flags = '-Wno-documentation'
+
+Pod::Spec.new do |s|
+  s.name                   = "React-logger"
+  s.version                = version
+  s.summary                = "-"  # TODO
+  s.homepage               = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Facebook, Inc. and its affiliates"
+  s.platforms              = { :ios => "11.0", :tvos => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
+  s.source                 = source
+  s.source_files           = "*.{cpp,h}"
+  s.exclude_files          = "SampleCxxModule.*"
+  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "" }
+  s.header_dir             = "logger"
+
+  s.dependency "glog"
+end
diff --git a/ReactCommon/logger/react_native_log.cpp b/ReactCommon/logger/react_native_log.cpp
new file mode 100644
index 00000000000000..3b0310432c0767
--- /dev/null
+++ b/ReactCommon/logger/react_native_log.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "react_native_log.h"
+#include <glog/logging.h>
+
+static reactnativelogfunctype _reactnativelogfunc = NULL;
+
+void set_react_native_logfunc(reactnativelogfunctype newlogfunc) {
+  _reactnativelogfunc = newlogfunc;
+}
+void react_native_log_info(const char *message) {
+  _react_native_log(ReactNativeLogLevelInfo, message);
+}
+void react_native_log_warn(const char *message) {
+  _react_native_log(ReactNativeLogLevelWarning, message);
+}
+void react_native_log_error(const char *message) {
+  _react_native_log(ReactNativeLogLevelError, message);
+}
+void react_native_log_fatal(const char *message) {
+  _react_native_log(ReactNativeLogLevelFatal, message);
+}
+
+void _react_native_log(ReactNativeLogLevel level, const char *message) {
+  if (_reactnativelogfunc == NULL) {
+    _react_native_log_default(level, message);
+  } else {
+    _reactnativelogfunc(level, message);
+  }
+}
+
+void _react_native_log_default(ReactNativeLogLevel level, const char *message) {
+  switch (level) {
+    case ReactNativeLogLevelInfo:
+      LOG(INFO) << message;
+      break;
+    case ReactNativeLogLevelWarning:
+      LOG(WARNING) << message;
+      break;
+    case ReactNativeLogLevelError:
+      LOG(ERROR) << message;
+      break;
+    case ReactNativeLogLevelFatal:
+      LOG(FATAL) << message;
+      break;
+  }
+}
diff --git a/ReactCommon/logger/react_native_log.h b/ReactCommon/logger/react_native_log.h
new file mode 100644
index 00000000000000..c64f2025559800
--- /dev/null
+++ b/ReactCommon/logger/react_native_log.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+enum ReactNativeLogLevel {
+  ReactNativeLogLevelInfo = 1,
+  ReactNativeLogLevelWarning = 2,
+  ReactNativeLogLevelError = 3,
+  ReactNativeLogLevelFatal = 4
+};
+
+typedef void (*reactnativelogfunctype)(ReactNativeLogLevel, const char *);
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+void set_react_native_logfunc(reactnativelogfunctype newlogfunc);
+
+void react_native_log_info(const char *text);
+void react_native_log_warn(const char *text);
+void react_native_log_error(const char *text);
+void react_native_log_fatal(const char *text);
+
+void _react_native_log(ReactNativeLogLevel level, const char *text);
+void _react_native_log_default(ReactNativeLogLevel level, const char *text);
+#ifdef __cplusplus
+}
+#endif // __cpusplus
diff --git a/ReactCommon/react/config/Android.mk b/ReactCommon/react/config/Android.mk
index ace2aa69ddf6d0..c7b63c9699ebab 100644
--- a/ReactCommon/react/config/Android.mk
+++ b/ReactCommon/react/config/Android.mk
@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES :=
diff --git a/ReactCommon/react/config/BUCK b/ReactCommon/react/config/BUCK
index 9640ee45c1a529..2cadc9a29790b1 100644
--- a/ReactCommon/react/config/BUCK
+++ b/ReactCommon/react/config/BUCK
@@ -21,7 +21,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
diff --git a/ReactCommon/react/debug/Android.mk b/ReactCommon/react/debug/Android.mk
new file mode 100644
index 00000000000000..8dcbe4f224a8e5
--- /dev/null
+++ b/ReactCommon/react/debug/Android.mk
@@ -0,0 +1,31 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_debug
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
+
+LOCAL_SHARED_LIBRARIES := libfolly_json
+
+LOCAL_LDLIBS := -llog
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"Fabric\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall -llog
+
+LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,folly)
diff --git a/ReactCommon/react/debug/BUCK b/ReactCommon/react/debug/BUCK
new file mode 100644
index 00000000000000..55c5584d266e71
--- /dev/null
+++ b/ReactCommon/react/debug/BUCK
@@ -0,0 +1,69 @@
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "debug",
+    srcs = glob(
+        ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = glob(
+        ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "react/debug",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    exported_platform_linker_flags = [
+        (
+            "^android.*",
+            ["-llog"],
+        ),
+    ],
+    fbandroid_linker_flags = [
+        # for android react_native_assert
+        "-llog",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    force_static = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/fbsystrace:fbsystrace",
+        "//xplat/folly:headers_only",
+        "//xplat/folly:memory",
+        "//xplat/folly:molly",
+    ],
+    exported_deps = [
+        "//third-party/glog:glog",
+    ],
+)
diff --git a/ReactCommon/react/debug/flags.h b/ReactCommon/react/debug/flags.h
new file mode 100644
index 00000000000000..dc09ab36d40a3e
--- /dev/null
+++ b/ReactCommon/react/debug/flags.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+//
+// Enable REACT_NATIVE_DEBUG if NDEBUG is not defined.
+// Due to BUCK defaults in open-source, NDEBUG is always defined for all android
+// builds (if you build without BUCK, this isn't an issue). Thus we introduce
+// REACT_NATIVE_DEBUG that we use internally instead of NDEBUG that we can
+// control and use as a more reliable xplat flag. For any build that doesn't
+// have NDEBUG defined, we enable REACT_NATIVE_DEBUG for convenience.
+#ifndef NDEBUG
+#define REACT_NATIVE_DEBUG 1
+#endif
diff --git a/ReactCommon/react/debug/react_native_assert.cpp b/ReactCommon/react/debug/react_native_assert.cpp
new file mode 100644
index 00000000000000..a72b91aecc6121
--- /dev/null
+++ b/ReactCommon/react/debug/react_native_assert.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#ifdef __ANDROID__
+
+#include <android/log.h>
+
+// Provide a prototype to silence missing prototype warning in release
+// mode.
+extern "C" void react_native_assert_fail(
+    const char *func,
+    const char *file,
+    int line,
+    const char *expr);
+
+extern "C" void react_native_assert_fail(
+    const char *func,
+    const char *file,
+    int line,
+    const char *expr) {
+  // Print as an error so it shows up in logcat before crash....
+  __android_log_print(
+      ANDROID_LOG_ERROR,
+      "ReactNative",
+      "%s:%d: function %s: assertion failed (%s)",
+      file,
+      line,
+      func,
+      expr);
+  // Print as a fatal so it crashes and shows up in uploaded logs
+  __android_log_print(
+      ANDROID_LOG_FATAL,
+      "ReactNative",
+      "%s:%d: function %s: assertion failed (%s)",
+      file,
+      line,
+      func,
+      expr);
+}
+
+#endif // __ANDROID__
diff --git a/ReactCommon/react/debug/react_native_assert.h b/ReactCommon/react/debug/react_native_assert.h
new file mode 100644
index 00000000000000..fc3f97b7bbfc6b
--- /dev/null
+++ b/ReactCommon/react/debug/react_native_assert.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// No header guards since it is legitimately possible to include this file more
+// than once with and without REACT_NATIVE_DEBUG.
+
+// react_native_assert allows us to opt-in to specific asserts on Android and
+// test before moving on. When all issues have been found, maybe we can use
+// `UNDEBUG` flag to disable NDEBUG in debug builds on Android.
+
+#include "flags.h"
+
+#undef react_native_assert
+
+#ifndef REACT_NATIVE_DEBUG
+
+#define react_native_assert(e) ((void)0)
+
+#else // REACT_NATIVE_DEBUG
+
+#ifdef __ANDROID__
+
+#include <android/log.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+void react_native_assert_fail(
+    const char *func,
+    const char *file,
+    int line,
+    const char *expr);
+#ifdef __cplusplus
+}
+#endif // __cpusplus
+
+#define react_native_assert(e) \
+  ((e) ? (void)0 : react_native_assert_fail(__func__, __FILE__, __LINE__, #e))
+
+#else // __ANDROID__
+
+#include <glog/logging.h>
+#include <cassert>
+
+// For all platforms, but iOS+Xcode especially: flush logs because some might be
+// lost on iOS if an assert is hit right after this. If you are trying to debug
+// something actively and have added lots of LOG statements to track down an
+// issue, there is race between flushing the final logs and stopping execution
+// when the assert hits. Thus, if we know an assert will fail, we force flushing
+// to happen right before the assert.
+#define react_native_assert(cond)                           \
+  if (!(cond)) {                                            \
+    LOG(ERROR) << "react_native_assert failure: " << #cond; \
+    google::FlushLogFiles(google::INFO);                    \
+    assert(cond);                                           \
+  }
+
+#endif // platforms besides __ANDROID__
+
+#endif // REACT_NATIVE_DEBUG
diff --git a/ReactCommon/react/nativemodule/core/Android.mk b/ReactCommon/react/nativemodule/core/Android.mk
index 70f7651b4831f4..bb2a0d79c7749c 100644
--- a/ReactCommon/react/nativemodule/core/Android.mk
+++ b/ReactCommon/react/nativemodule/core/Android.mk
@@ -15,14 +15,14 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCA
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/
 
-LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni
+LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni libreact_debug libjsi
 
-LOCAL_STATIC_LIBRARIES := libjsi libreactperflogger
+LOCAL_STATIC_LIBRARIES :=  libreactperflogger
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/ReactCommon/react/nativemodule/core/BUCK b/ReactCommon/react/nativemodule/core/BUCK
index d5c8981664981a..93321356d658a9 100644
--- a/ReactCommon/react/nativemodule/core/BUCK
+++ b/ReactCommon/react/nativemodule/core/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags", "react_native_target", "react_native_xplat_shared_library_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags", "react_native_target", "react_native_xplat_shared_library_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
 
 rn_xplat_cxx_library(
     name = "core",
@@ -15,7 +15,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
         "-Wno-global-constructors",
     ],
@@ -39,7 +39,7 @@ rn_xplat_cxx_library(
         "-fobjc-arc-exceptions",
     ],
     fbobjc_inherited_buck_flags = get_static_library_ios_flags(),
-    fbobjc_preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_preprocessor_flags_for_build_mode(),
+    fbobjc_preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     ios_deps = [
         "//xplat/FBBaseLite:FBBaseLite",
         "//xplat/js/react-native-github:RCTCxxModule",
@@ -79,6 +79,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:module"),
         react_native_xplat_target("callinvoker:callinvoker"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
     ],
     exported_deps = [
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp
index 34683aecb88ee3..40908d3c07ecb2 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp
@@ -43,6 +43,7 @@ void LongLivedObjectCollection::clear() const {
 
 // LongLivedObject
 LongLivedObject::LongLivedObject() {}
+LongLivedObject::~LongLivedObject() {}
 
 void LongLivedObject::allowRelease() {
   LongLivedObjectCollection::get().remove(this);
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.h b/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.h
index 0f33b228fb6334..5173b73d01623b 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.h
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.h
@@ -26,10 +26,11 @@ namespace react {
  */
 class LongLivedObject {
  public:
-  void allowRelease();
+  virtual void allowRelease();
 
  protected:
   LongLivedObject();
+  virtual ~LongLivedObject();
 };
 
 /**
@@ -39,6 +40,7 @@ class LongLivedObjectCollection {
  public:
   static LongLivedObjectCollection &get();
 
+  LongLivedObjectCollection();
   LongLivedObjectCollection(LongLivedObjectCollection const &) = delete;
   void operator=(LongLivedObjectCollection const &) = delete;
 
@@ -47,7 +49,6 @@ class LongLivedObjectCollection {
   void clear() const;
 
  private:
-  LongLivedObjectCollection();
   mutable std::unordered_set<std::shared_ptr<LongLivedObject>> collection_;
   mutable std::mutex collectionMutex_;
 };
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
index fe1f57d2b45abb..f7045b3c89f50c 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
@@ -32,7 +32,7 @@ jsi::Value TurboModule::get(
   return jsi::Function::createFromHostFunction(
       runtime,
       propName,
-      meta.argCount,
+      static_cast<unsigned int>(meta.argCount),
       [this, meta](
           facebook::jsi::Runtime &rt,
           const facebook::jsi::Value &thisVal,
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h
index 8bc8362730ccf0..0772986a76ab66 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h
@@ -64,8 +64,8 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject {
  * An app/platform-specific provider function to get an instance of a module
  * given a name.
  */
-using TurboModuleProviderFunctionType = std::function<std::shared_ptr<
-    TurboModule>(const std::string &name, const jsi::Value *schema)>;
+using TurboModuleProviderFunctionType =
+    std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
index 0b04ac69b10d66..9c339edf36b900 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
@@ -21,9 +21,19 @@ namespace react {
 /**
  * Public API to install the TurboModule system.
  */
+
 TurboModuleBinding::TurboModuleBinding(
     const TurboModuleProviderFunctionType &&moduleProvider)
-    : moduleProvider_(std::move(moduleProvider)) {}
+    : moduleProvider_(std::move(moduleProvider)),
+      longLivedObjectCollection_(nullptr),
+      disableGlobalLongLivedObjectCollection_(false) {}
+
+TurboModuleBinding::TurboModuleBinding(
+    const TurboModuleProviderFunctionType &&moduleProvider,
+    std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection)
+    : moduleProvider_(std::move(moduleProvider)),
+      longLivedObjectCollection_(longLivedObjectCollection),
+      disableGlobalLongLivedObjectCollection_(true) {}
 
 void TurboModuleBinding::install(
     jsi::Runtime &runtime,
@@ -35,6 +45,9 @@ void TurboModuleBinding::install(
           runtime,
           jsi::PropNameID::forAscii(runtime, "__turboModuleProxy"),
           1,
+
+          // Create a TurboModuleBinding that uses the global
+          // LongLivedObjectCollection
           [binding =
                std::make_shared<TurboModuleBinding>(std::move(moduleProvider))](
               jsi::Runtime &rt,
@@ -45,17 +58,48 @@ void TurboModuleBinding::install(
           }));
 }
 
+void TurboModuleBinding::install(
+    jsi::Runtime &runtime,
+    const TurboModuleProviderFunctionType &&moduleProvider,
+    std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection) {
+  runtime.global().setProperty(
+      runtime,
+      "__turboModuleProxy",
+      jsi::Function::createFromHostFunction(
+          runtime,
+          jsi::PropNameID::forAscii(runtime, "__turboModuleProxy"),
+          1,
+          // Create a TurboModuleBinding that doesn't use the global
+          // LongLivedObjectCollection
+          [binding = std::make_shared<TurboModuleBinding>(
+               std::move(moduleProvider), longLivedObjectCollection)](
+              jsi::Runtime &rt,
+              const jsi::Value &thisVal,
+              const jsi::Value *args,
+              size_t count) {
+            return binding->jsProxy(rt, thisVal, args, count);
+          }));
+}
+
 TurboModuleBinding::~TurboModuleBinding() {
+  if (longLivedObjectCollection_ != nullptr) {
+    longLivedObjectCollection_->clear();
+    return;
+  }
+
+  if (disableGlobalLongLivedObjectCollection_) {
+    return;
+  }
+
   LongLivedObjectCollection::get().clear();
 }
 
 std::shared_ptr<TurboModule> TurboModuleBinding::getModule(
-    const std::string &name,
-    const jsi::Value *schema) {
+    const std::string &name) {
   std::shared_ptr<TurboModule> module = nullptr;
   {
     SystraceSection s("TurboModuleBinding::getModule", "module", name);
-    module = moduleProvider_(name, schema);
+    module = moduleProvider_(name);
   }
   return module;
 }
@@ -72,10 +116,7 @@ jsi::Value TurboModuleBinding::jsProxy(
   std::string moduleName = args[0].getString(runtime).utf8(runtime);
   jsi::Value nullSchema = jsi::Value::undefined();
 
-  std::shared_ptr<TurboModule> module =
-      (count >= 2 ? getModule(moduleName, &args[1])
-                  : getModule(moduleName, &nullSchema));
-
+  std::shared_ptr<TurboModule> module = getModule(moduleName);
   if (module == nullptr) {
     return jsi::Value::null();
   }
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
index 2546730959fc12..87679af06bf29e 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
@@ -9,6 +9,7 @@
 
 #include <string>
 
+#include <ReactCommon/LongLivedObject.h>
 #include <ReactCommon/TurboModule.h>
 #include <jsi/jsi.h>
 
@@ -29,16 +30,21 @@ class TurboModuleBinding {
   static void install(
       jsi::Runtime &runtime,
       const TurboModuleProviderFunctionType &&moduleProvider);
+  static void install(
+      jsi::Runtime &runtime,
+      const TurboModuleProviderFunctionType &&moduleProvider,
+      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection);
 
   TurboModuleBinding(const TurboModuleProviderFunctionType &&moduleProvider);
+  TurboModuleBinding(
+      const TurboModuleProviderFunctionType &&moduleProvider,
+      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection);
   virtual ~TurboModuleBinding();
 
   /**
    * Get an TurboModule instance for the given module name.
    */
-  std::shared_ptr<TurboModule> getModule(
-      const std::string &name,
-      const jsi::Value *schema);
+  std::shared_ptr<TurboModule> getModule(const std::string &name);
 
  private:
   /**
@@ -52,6 +58,8 @@ class TurboModuleBinding {
       size_t count);
 
   TurboModuleProviderFunctionType moduleProvider_;
+  std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection_;
+  bool disableGlobalLongLivedObjectCollection_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
index 030d3fac9783de..0dc08136a610d3 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
@@ -10,7 +10,6 @@
 #include <cassert>
 #include <string>
 
-#include <folly/Optional.h>
 #include <jsi/jsi.h>
 
 #include <ReactCommon/CallInvoker.h>
@@ -48,10 +47,25 @@ class CallbackWrapper : public LongLivedObject {
       jsi::Function &&callback,
       jsi::Runtime &runtime,
       std::shared_ptr<CallInvoker> jsInvoker)
-      : callback_(std::move(callback)),
+      : longLivedObjectCollection_(),
+        callback_(std::move(callback)),
         runtime_(runtime),
         jsInvoker_(std::move(jsInvoker)) {}
 
+  CallbackWrapper(
+      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection,
+      jsi::Function &&callback,
+      jsi::Runtime &runtime,
+      std::shared_ptr<CallInvoker> jsInvoker)
+      : longLivedObjectCollection_(longLivedObjectCollection),
+        callback_(std::move(callback)),
+        runtime_(runtime),
+        jsInvoker_(std::move(jsInvoker)) {}
+
+  // Use a weak_ptr to avoid a retain cycle: LongLivedObjectCollection owns all
+  // CallbackWrappers. So, CallbackWrapper cannot own its
+  // LongLivedObjectCollection.
+  std::weak_ptr<LongLivedObjectCollection> longLivedObjectCollection_;
   jsi::Function callback_;
   jsi::Runtime &runtime_;
   std::shared_ptr<CallInvoker> jsInvoker_;
@@ -67,6 +81,17 @@ class CallbackWrapper : public LongLivedObject {
     return wrapper;
   }
 
+  static std::weak_ptr<CallbackWrapper> createWeak(
+      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection,
+      jsi::Function &&callback,
+      jsi::Runtime &runtime,
+      std::shared_ptr<CallInvoker> jsInvoker) {
+    auto wrapper = std::shared_ptr<CallbackWrapper>(new CallbackWrapper(
+        longLivedObjectCollection, std::move(callback), runtime, jsInvoker));
+    longLivedObjectCollection->add(wrapper);
+    return wrapper;
+  }
+
   // Delete the enclosed jsi::Function
   void destroy() {
     allowRelease();
@@ -83,6 +108,34 @@ class CallbackWrapper : public LongLivedObject {
   CallInvoker &jsInvoker() {
     return *(jsInvoker_);
   }
+
+  void allowRelease() override {
+    if (auto longLivedObjectCollection = longLivedObjectCollection_.lock()) {
+      if (longLivedObjectCollection != nullptr) {
+        longLivedObjectCollection->remove(this);
+        return;
+      }
+    }
+    LongLivedObject::allowRelease();
+  }
+};
+
+class RAIICallbackWrapperDestroyer {
+ public:
+  RAIICallbackWrapperDestroyer(std::weak_ptr<CallbackWrapper> callbackWrapper)
+      : callbackWrapper_(callbackWrapper) {}
+
+  ~RAIICallbackWrapperDestroyer() {
+    auto strongWrapper = callbackWrapper_.lock();
+    if (!strongWrapper) {
+      return;
+    }
+
+    strongWrapper->destroy();
+  }
+
+ private:
+  std::weak_ptr<CallbackWrapper> callbackWrapper_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
index f4b3f967e91c48..18abcc3085b3b1 100644
--- a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
+++ b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
@@ -15,6 +15,7 @@
 #include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModulePerfLogger.h>
 #include <jsi/JSIDynamic.h>
+#include <react/debug/react_native_assert.h>
 #include <react/jni/NativeMap.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/jni/WritableNativeMap.h>
@@ -29,7 +30,8 @@ namespace react {
 JavaTurboModule::JavaTurboModule(const InitParams &params)
     : TurboModule(params.moduleName, params.jsInvoker),
       instance_(jni::make_global(params.instance)),
-      nativeInvoker_(params.nativeInvoker) {}
+      nativeInvoker_(params.nativeInvoker),
+      retainJSCallback_(params.retainJSCallback) {}
 
 JavaTurboModule::~JavaTurboModule() {
   /**
@@ -51,22 +53,28 @@ JavaTurboModule::~JavaTurboModule() {
   });
 }
 
-bool JavaTurboModule::isPromiseAsyncDispatchEnabled_ = false;
-void JavaTurboModule::enablePromiseAsyncDispatch(bool enable) {
-  isPromiseAsyncDispatchEnabled_ = enable;
-}
-
 namespace {
 jni::local_ref<JCxxCallbackImpl::JavaPart> createJavaCallbackFromJSIFunction(
+    JSCallbackRetainer retainJSCallback,
     jsi::Function &&function,
     jsi::Runtime &rt,
     std::shared_ptr<CallInvoker> jsInvoker) {
-  auto weakWrapper =
-      react::CallbackWrapper::createWeak(std::move(function), rt, jsInvoker);
+  auto weakWrapper = retainJSCallback != nullptr
+      ? retainJSCallback(std::move(function), rt, jsInvoker)
+      : react::CallbackWrapper::createWeak(std::move(function), rt, jsInvoker);
+
+  // This needs to be a shared_ptr because:
+  // 1. It cannot be unique_ptr. std::function is copyable but unique_ptr is
+  // not.
+  // 2. It cannot be weak_ptr since we need this object to live on.
+  // 3. It cannot be a value, because that would be deleted as soon as this
+  // function returns.
+  auto callbackWrapperOwner =
+      std::make_shared<RAIICallbackWrapperDestroyer>(weakWrapper);
 
   std::function<void(folly::dynamic)> fn =
-      [weakWrapper,
-       wrapperWasCalled = false](folly::dynamic responses) mutable {
+      [weakWrapper, callbackWrapperOwner, wrapperWasCalled = false](
+          folly::dynamic responses) mutable {
         if (wrapperWasCalled) {
           throw std::runtime_error(
               "callback 2 arg cannot be called more than once");
@@ -77,35 +85,37 @@ jni::local_ref<JCxxCallbackImpl::JavaPart> createJavaCallbackFromJSIFunction(
           return;
         }
 
-        strongWrapper->jsInvoker().invokeAsync([weakWrapper, responses]() {
-          auto strongWrapper2 = weakWrapper.lock();
-          if (!strongWrapper2) {
-            return;
-          }
-
-          // TODO (T43155926) valueFromDynamic already returns a Value array.
-          // Don't iterate again
-          jsi::Value args =
-              jsi::valueFromDynamic(strongWrapper2->runtime(), responses);
-          auto argsArray = args.getObject(strongWrapper2->runtime())
-                               .asArray(strongWrapper2->runtime());
-          std::vector<jsi::Value> result;
-          for (size_t i = 0; i < argsArray.size(strongWrapper2->runtime());
-               i++) {
-            result.emplace_back(
-                strongWrapper2->runtime(),
-                argsArray.getValueAtIndex(strongWrapper2->runtime(), i));
-          }
-          strongWrapper2->callback().call(
-              strongWrapper2->runtime(),
-              (const jsi::Value *)result.data(),
-              result.size());
-
-          strongWrapper2->destroy();
-        });
+        strongWrapper->jsInvoker().invokeAsync(
+            [weakWrapper, callbackWrapperOwner, responses]() mutable {
+              auto strongWrapper2 = weakWrapper.lock();
+              if (!strongWrapper2) {
+                return;
+              }
+
+              // TODO (T43155926) valueFromDynamic already returns a Value
+              // array. Don't iterate again
+              jsi::Value args =
+                  jsi::valueFromDynamic(strongWrapper2->runtime(), responses);
+              auto argsArray = args.getObject(strongWrapper2->runtime())
+                                   .asArray(strongWrapper2->runtime());
+              std::vector<jsi::Value> result;
+              for (size_t i = 0; i < argsArray.size(strongWrapper2->runtime());
+                   i++) {
+                result.emplace_back(
+                    strongWrapper2->runtime(),
+                    argsArray.getValueAtIndex(strongWrapper2->runtime(), i));
+              }
+              strongWrapper2->callback().call(
+                  strongWrapper2->runtime(),
+                  (const jsi::Value *)result.data(),
+                  result.size());
+
+              callbackWrapperOwner.reset();
+            });
 
         wrapperWasCalled = true;
       };
+
   return JCxxCallbackImpl::newObjectCxxArgs(fn);
 }
 
@@ -138,7 +148,7 @@ std::string stringifyJSIValue(const jsi::Value &v, jsi::Runtime *rt = nullptr) {
     return "a string (\"" + v.getString(*rt).utf8(*rt) + "\")";
   }
 
-  assert(v.isObject() && "Expecting object.");
+  react_native_assert(v.isObject() && "Expecting object.");
   return rt != nullptr && v.getObject(*rt).isFunction(*rt) ? "a function"
                                                            : "an object";
 }
@@ -244,7 +254,8 @@ JNIArgs JavaTurboModule::convertJSIArgsToJNIArgs(
     const jsi::Value *args,
     size_t count,
     std::shared_ptr<CallInvoker> jsInvoker,
-    TurboModuleMethodValueKind valueKind) {
+    TurboModuleMethodValueKind valueKind,
+    JSCallbackRetainer retainJSCallback) {
   unsigned int expectedArgumentCount = valueKind == PromiseKind
       ? methodArgTypes.size() - 1
       : methodArgTypes.size();
@@ -260,8 +271,7 @@ JNIArgs JavaTurboModule::convertJSIArgsToJNIArgs(
 
   auto makeGlobalIfNecessary =
       [&globalRefs, env, valueKind](jobject obj) -> jobject {
-    if (valueKind == VoidKind ||
-        (valueKind == PromiseKind && isPromiseAsyncDispatchEnabled_)) {
+    if (valueKind == VoidKind || valueKind == PromiseKind) {
       jobject globalObj = env->NewGlobalRef(obj);
       globalRefs.push_back(globalObj);
       env->DeleteLocalRef(obj);
@@ -380,7 +390,8 @@ JNIArgs JavaTurboModule::convertJSIArgsToJNIArgs(
 
       jsi::Function fn = arg->getObject(rt).getFunction(rt);
       jarg->l = makeGlobalIfNecessary(
-          createJavaCallbackFromJSIFunction(std::move(fn), rt, jsInvoker)
+          createJavaCallbackFromJSIFunction(
+              retainJSCallback, std::move(fn), rt, jsInvoker)
               .release());
       continue;
     }
@@ -429,9 +440,7 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
   const char *methodName = methodNameStr.c_str();
   const char *moduleName = name_.c_str();
 
-  bool isMethodSync =
-      !(valueKind == VoidKind ||
-        (valueKind == PromiseKind && isPromiseAsyncDispatchEnabled_));
+  bool isMethodSync = !(valueKind == VoidKind || valueKind == PromiseKind);
 
   if (isMethodSync) {
     TMPL::syncMethodCallStart(moduleName, methodName);
@@ -529,7 +538,8 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
       args,
       argCount,
       jsInvoker_,
-      valueKind);
+      valueKind,
+      retainJSCallback_);
 
   if (isMethodSync && valueKind != PromiseKind) {
     TMPL::syncMethodCallArgConversionEnd(moduleName, methodName);
@@ -690,10 +700,14 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
           [jargs,
            globalRefs,
            methodID,
-           instance_ = instance_,
+           instance_ = jni::make_weak(instance_),
            moduleNameStr = name_,
            methodNameStr,
            id = getUniqueId()]() mutable -> void {
+            auto instance = instance_.lockLocal();
+            if (!instance) {
+              return;
+            }
             /**
              * TODO(ramanpreet): Why do we have to require the environment
              * again? Why does JNI crash when we use the env from the upper
@@ -704,7 +718,7 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
             const char *methodName = methodNameStr.c_str();
 
             TMPL::asyncMethodCallExecutionStart(moduleName, methodName, id);
-            env->CallVoidMethodA(instance_.get(), methodID, jargs.data());
+            env->CallVoidMethodA(instance.get(), methodID, jargs.data());
             try {
               FACEBOOK_JNI_THROW_PENDING_EXCEPTION();
             } catch (...) {
@@ -736,7 +750,8 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
            methodID,
            moduleNameStr = name_,
            methodNameStr,
-           env](
+           env,
+           retainJSCallback = retainJSCallback_](
               jsi::Runtime &runtime,
               const jsi::Value &thisVal,
               const jsi::Value *promiseConstructorArgs,
@@ -753,10 +768,16 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
                     runtime);
 
             auto resolve = createJavaCallbackFromJSIFunction(
-                               std::move(resolveJSIFn), runtime, jsInvoker_)
+                               retainJSCallback,
+                               std::move(resolveJSIFn),
+                               runtime,
+                               jsInvoker_)
                                .release();
             auto reject = createJavaCallbackFromJSIFunction(
-                              std::move(rejectJSIFn), runtime, jsInvoker_)
+                              retainJSCallback,
+                              std::move(rejectJSIFn),
+                              runtime,
+                              jsInvoker_)
                               .release();
 
             jclass jPromiseImpl =
@@ -772,60 +793,53 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
             const char *moduleName = moduleNameStr.c_str();
             const char *methodName = methodNameStr.c_str();
 
-            if (isPromiseAsyncDispatchEnabled_) {
-              jobject globalPromise = env->NewGlobalRef(promise);
-
-              globalRefs.push_back(globalPromise);
-              env->DeleteLocalRef(promise);
-
-              jargs[argCount].l = globalPromise;
-              TMPL::asyncMethodCallArgConversionEnd(moduleName, methodName);
-              TMPL::asyncMethodCallDispatch(moduleName, methodName);
-
-              nativeInvoker_->invokeAsync(
-                  [jargs,
-                   globalRefs,
-                   methodID,
-                   instance_ = instance_,
-                   moduleNameStr,
-                   methodNameStr,
-                   id = getUniqueId()]() mutable -> void {
-                    /**
-                     * TODO(ramanpreet): Why do we have to require the
-                     * environment again? Why does JNI crash when we use the env
-                     * from the upper scope?
-                     */
-                    JNIEnv *env = jni::Environment::current();
-                    const char *moduleName = moduleNameStr.c_str();
-                    const char *methodName = methodNameStr.c_str();
-
-                    TMPL::asyncMethodCallExecutionStart(
-                        moduleName, methodName, id);
-                    env->CallVoidMethodA(
-                        instance_.get(), methodID, jargs.data());
-                    try {
-                      FACEBOOK_JNI_THROW_PENDING_EXCEPTION();
-                    } catch (...) {
-                      TMPL::asyncMethodCallExecutionFail(
-                          moduleName, methodName, id);
-                      throw;
-                    }
-
-                    for (auto globalRef : globalRefs) {
-                      env->DeleteGlobalRef(globalRef);
-                    }
-                    TMPL::asyncMethodCallExecutionEnd(
+            jobject globalPromise = env->NewGlobalRef(promise);
+
+            globalRefs.push_back(globalPromise);
+            env->DeleteLocalRef(promise);
+
+            jargs[argCount].l = globalPromise;
+            TMPL::asyncMethodCallArgConversionEnd(moduleName, methodName);
+            TMPL::asyncMethodCallDispatch(moduleName, methodName);
+
+            nativeInvoker_->invokeAsync(
+                [jargs,
+                 globalRefs,
+                 methodID,
+                 instance_ = jni::make_weak(instance_),
+                 moduleNameStr,
+                 methodNameStr,
+                 id = getUniqueId()]() mutable -> void {
+                  auto instance = instance_.lockLocal();
+
+                  if (!instance) {
+                    return;
+                  }
+                  /**
+                   * TODO(ramanpreet): Why do we have to require the
+                   * environment again? Why does JNI crash when we use the env
+                   * from the upper scope?
+                   */
+                  JNIEnv *env = jni::Environment::current();
+                  const char *moduleName = moduleNameStr.c_str();
+                  const char *methodName = methodNameStr.c_str();
+
+                  TMPL::asyncMethodCallExecutionStart(
+                      moduleName, methodName, id);
+                  env->CallVoidMethodA(instance.get(), methodID, jargs.data());
+                  try {
+                    FACEBOOK_JNI_THROW_PENDING_EXCEPTION();
+                  } catch (...) {
+                    TMPL::asyncMethodCallExecutionFail(
                         moduleName, methodName, id);
-                  });
-
-            } else {
-              jargs[argCount].l = promise;
-              TMPL::syncMethodCallArgConversionEnd(moduleName, methodName);
-              TMPL::syncMethodCallExecutionStart(moduleName, methodName);
-              env->CallVoidMethodA(instance_.get(), methodID, jargs.data());
-              TMPL::syncMethodCallExecutionEnd(moduleName, methodName);
-              TMPL::syncMethodCallReturnConversionStart(moduleName, methodName);
-            }
+                    throw;
+                  }
+
+                  for (auto globalRef : globalRefs) {
+                    env->DeleteGlobalRef(globalRef);
+                  }
+                  TMPL::asyncMethodCallExecutionEnd(moduleName, methodName, id);
+                });
 
             return jsi::Value::undefined();
           });
@@ -834,12 +848,8 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
           Promise.callAsConstructor(runtime, promiseConstructorArg);
       checkJNIErrorForMethodCall();
 
-      if (isPromiseAsyncDispatchEnabled_) {
-        TMPL::asyncMethodCallEnd(moduleName, methodName);
-      } else {
-        TMPL::syncMethodCallReturnConversionEnd(moduleName, methodName);
-        TMPL::syncMethodCallEnd(moduleName, methodName);
-      }
+      TMPL::asyncMethodCallEnd(moduleName, methodName);
+
       return promise;
     }
     default:
diff --git a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h
index 93acda48fcff56..4c5975844763ec 100644
--- a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h
+++ b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h
@@ -7,9 +7,11 @@
 
 #pragma once
 
+#include <functional>
 #include <string>
 #include <unordered_set>
 
+#include <ReactCommon/LongLivedObject.h>
 #include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleUtils.h>
 #include <fbjni/fbjni.h>
@@ -30,6 +32,11 @@ struct JTurboModule : jni::JavaClass<JTurboModule> {
       "Lcom/facebook/react/turbomodule/core/interfaces/TurboModule;";
 };
 
+using JSCallbackRetainer = std::function<std::weak_ptr<CallbackWrapper>(
+    jsi::Function &&callback,
+    jsi::Runtime &runtime,
+    std::shared_ptr<CallInvoker> jsInvoker)>;
+
 class JSI_EXPORT JavaTurboModule : public TurboModule {
  public:
   // TODO(T65603471): Should we unify this with a Fabric abstraction?
@@ -38,10 +45,12 @@ class JSI_EXPORT JavaTurboModule : public TurboModule {
     jni::alias_ref<JTurboModule> instance;
     std::shared_ptr<CallInvoker> jsInvoker;
     std::shared_ptr<CallInvoker> nativeInvoker;
+    JSCallbackRetainer retainJSCallback;
   };
 
   JavaTurboModule(const InitParams &params);
   virtual ~JavaTurboModule();
+
   jsi::Value invokeJavaMethod(
       jsi::Runtime &runtime,
       TurboModuleMethodValueKind valueKind,
@@ -50,16 +59,10 @@ class JSI_EXPORT JavaTurboModule : public TurboModule {
       const jsi::Value *args,
       size_t argCount);
 
-  static void enablePromiseAsyncDispatch(bool enable);
-
  private:
   jni::global_ref<JTurboModule> instance_;
   std::shared_ptr<CallInvoker> nativeInvoker_;
-
-  /**
-   * Experiments
-   */
-  static bool isPromiseAsyncDispatchEnabled_;
+  JSCallbackRetainer retainJSCallback_;
 
   JNIArgs convertJSIArgsToJNIArgs(
       JNIEnv *env,
@@ -69,7 +72,8 @@ class JSI_EXPORT JavaTurboModule : public TurboModule {
       const jsi::Value *args,
       size_t count,
       std::shared_ptr<CallInvoker> jsInvoker,
-      TurboModuleMethodValueKind valueKind);
+      TurboModuleMethodValueKind valueKind,
+      JSCallbackRetainer retainJSCallbacks);
 };
 
 } // namespace react
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.h b/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.h
new file mode 100644
index 00000000000000..38dbd2bee4b7f3
--- /dev/null
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * RCTBlockGuard is designed to be used with obj-c blocks to assist with manual deallocation of C++ resources
+ * tied to lifetime of a block. If C++ resources needs to be manually released at the end of block or when the block
+ * is deallocated, place the clean up code inside constructor and make sure the instace of the class is references in
+ * the block.
+ */
+@interface RCTBlockGuard : NSObject
+
+- (instancetype)initWithCleanup:(void (^)(void))cleanup;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.mm
new file mode 100644
index 00000000000000..54a856a25a768a
--- /dev/null
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.mm
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTBlockGuard.h"
+
+@implementation RCTBlockGuard {
+  void (^_cleanup)(void);
+}
+
+- (instancetype)initWithCleanup:(void (^)(void))cleanup
+{
+  if (self = [super init]) {
+    _cleanup = cleanup;
+  }
+
+  return self;
+}
+
+- (void)dealloc
+{
+  _cleanup();
+}
+
+@end
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h
index bdd94494689284..1cc512c992c2c2 100644
--- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h
@@ -29,6 +29,9 @@ namespace react {
 
 class Instance;
 
+typedef std::weak_ptr<CallbackWrapper> (
+    ^RCTRetainJSCallback)(jsi::Function &&callback, jsi::Runtime &runtime, std::shared_ptr<CallInvoker> jsInvoker);
+
 /**
  * ObjC++ specific TurboModule base class.
  */
@@ -41,6 +44,7 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
     std::shared_ptr<CallInvoker> jsInvoker;
     std::shared_ptr<CallInvoker> nativeInvoker;
     bool isSyncModule;
+    RCTRetainJSCallback retainJSCallback;
   };
 
   ObjCTurboModule(const InitParams &params);
@@ -63,6 +67,8 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
   // Does the NativeModule dispatch async methods to the JS thread?
   const bool isSyncModule_;
 
+  RCTRetainJSCallback retainJSCallback_;
+
   /**
    * TODO(ramanpreet):
    * Investigate an optimization that'll let us get rid of this NSMutableDictionary.
@@ -90,29 +96,15 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
       NSMutableArray *retainedObjectsForInvocation);
 
   using PromiseInvocationBlock = void (^)(RCTPromiseResolveBlock resolveWrapper, RCTPromiseRejectBlock rejectWrapper);
-  jsi::Value
-  createPromise(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> jsInvoker, PromiseInvocationBlock invoke);
+  jsi::Value createPromise(jsi::Runtime &runtime, std::string methodName, PromiseInvocationBlock invoke);
 };
 
 } // namespace react
 } // namespace facebook
 
 @protocol RCTTurboModule <NSObject>
-@optional
-/**
- * Used by TurboModules to get access to other TurboModules.
- *
- * Usage:
- * Place `@synthesize turboModuleRegistry = _turboModuleRegistry`
- * in the @implementation section of your TurboModule.
- */
-@property (nonatomic, weak) id<RCTTurboModuleRegistry> turboModuleRegistry;
-
-@optional
-// This should be required, after migration is done.
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params;
-
 @end
 
 /**
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
index 4c7d3031bfb442..c6e53547a65e1d 100644
--- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
@@ -6,10 +6,12 @@
  */
 
 #import "RCTTurboModule.h"
+#import "RCTBlockGuard.h"
 
 #import <objc/message.h>
 #import <objc/runtime.h>
 #import <atomic>
+#import <iostream>
 #import <sstream>
 #import <vector>
 
@@ -98,28 +100,38 @@ static int32_t getUniqueId()
   return jsi::Value::undefined();
 }
 
-static id
-convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value, std::shared_ptr<CallInvoker> jsInvoker);
+static id convertJSIValueToObjCObject(
+    jsi::Runtime &runtime,
+    const jsi::Value &value,
+    std::shared_ptr<CallInvoker> jsInvoker,
+    RCTRetainJSCallback retainJSCallback);
 static NSString *convertJSIStringToNSString(jsi::Runtime &runtime, const jsi::String &value)
 {
   return [NSString stringWithUTF8String:value.utf8(runtime).c_str()];
 }
 
-static NSArray *
-convertJSIArrayToNSArray(jsi::Runtime &runtime, const jsi::Array &value, std::shared_ptr<CallInvoker> jsInvoker)
+static NSArray *convertJSIArrayToNSArray(
+    jsi::Runtime &runtime,
+    const jsi::Array &value,
+    std::shared_ptr<CallInvoker> jsInvoker,
+    RCTRetainJSCallback retainJSCallback)
 {
   size_t size = value.size(runtime);
   NSMutableArray *result = [NSMutableArray new];
   for (size_t i = 0; i < size; i++) {
     // Insert kCFNull when it's `undefined` value to preserve the indices.
     [result
-        addObject:convertJSIValueToObjCObject(runtime, value.getValueAtIndex(runtime, i), jsInvoker) ?: (id)kCFNull];
+        addObject:convertJSIValueToObjCObject(runtime, value.getValueAtIndex(runtime, i), jsInvoker, retainJSCallback)
+            ?: (id)kCFNull];
   }
   return [result copy];
 }
 
-static NSDictionary *
-convertJSIObjectToNSDictionary(jsi::Runtime &runtime, const jsi::Object &value, std::shared_ptr<CallInvoker> jsInvoker)
+static NSDictionary *convertJSIObjectToNSDictionary(
+    jsi::Runtime &runtime,
+    const jsi::Object &value,
+    std::shared_ptr<CallInvoker> jsInvoker,
+    RCTRetainJSCallback retainJSCallback)
 {
   jsi::Array propertyNames = value.getPropertyNames(runtime);
   size_t size = propertyNames.size(runtime);
@@ -127,7 +139,7 @@ static int32_t getUniqueId()
   for (size_t i = 0; i < size; i++) {
     jsi::String name = propertyNames.getValueAtIndex(runtime, i).getString(runtime);
     NSString *k = convertJSIStringToNSString(runtime, name);
-    id v = convertJSIValueToObjCObject(runtime, value.getProperty(runtime, name), jsInvoker);
+    id v = convertJSIValueToObjCObject(runtime, value.getProperty(runtime, name), jsInvoker, retainJSCallback);
     if (v) {
       result[k] = v;
     }
@@ -135,10 +147,16 @@ static int32_t getUniqueId()
   return [result copy];
 }
 
-static RCTResponseSenderBlock
-convertJSIFunctionToCallback(jsi::Runtime &runtime, const jsi::Function &value, std::shared_ptr<CallInvoker> jsInvoker);
-static id
-convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value, std::shared_ptr<CallInvoker> jsInvoker)
+static RCTResponseSenderBlock convertJSIFunctionToCallback(
+    jsi::Runtime &runtime,
+    const jsi::Function &value,
+    std::shared_ptr<CallInvoker> jsInvoker,
+    RCTRetainJSCallback retainJSCallback);
+static id convertJSIValueToObjCObject(
+    jsi::Runtime &runtime,
+    const jsi::Value &value,
+    std::shared_ptr<CallInvoker> jsInvoker,
+    RCTRetainJSCallback retainJSCallback)
 {
   if (value.isUndefined() || value.isNull()) {
     return nil;
@@ -155,21 +173,33 @@ static int32_t getUniqueId()
   if (value.isObject()) {
     jsi::Object o = value.getObject(runtime);
     if (o.isArray(runtime)) {
-      return convertJSIArrayToNSArray(runtime, o.getArray(runtime), jsInvoker);
+      return convertJSIArrayToNSArray(runtime, o.getArray(runtime), jsInvoker, retainJSCallback);
     }
     if (o.isFunction(runtime)) {
-      return convertJSIFunctionToCallback(runtime, std::move(o.getFunction(runtime)), jsInvoker);
+      return convertJSIFunctionToCallback(runtime, std::move(o.getFunction(runtime)), jsInvoker, retainJSCallback);
     }
-    return convertJSIObjectToNSDictionary(runtime, o, jsInvoker);
+    return convertJSIObjectToNSDictionary(runtime, o, jsInvoker, retainJSCallback);
   }
 
   throw std::runtime_error("Unsupported jsi::jsi::Value kind");
 }
 
-static RCTResponseSenderBlock
-convertJSIFunctionToCallback(jsi::Runtime &runtime, const jsi::Function &value, std::shared_ptr<CallInvoker> jsInvoker)
+static RCTResponseSenderBlock convertJSIFunctionToCallback(
+    jsi::Runtime &runtime,
+    const jsi::Function &value,
+    std::shared_ptr<CallInvoker> jsInvoker,
+    RCTRetainJSCallback retainJSCallback)
 {
-  auto weakWrapper = CallbackWrapper::createWeak(value.getFunction(runtime), runtime, jsInvoker);
+  auto weakWrapper = retainJSCallback != nil
+      ? retainJSCallback(value.getFunction(runtime), runtime, jsInvoker)
+      : CallbackWrapper::createWeak(value.getFunction(runtime), runtime, jsInvoker);
+  RCTBlockGuard *blockGuard = [[RCTBlockGuard alloc] initWithCleanup:^() {
+    auto strongWrapper = weakWrapper.lock();
+    if (strongWrapper) {
+      strongWrapper->destroy();
+    }
+  }];
+
   BOOL __block wrapperWasCalled = NO;
   RCTResponseSenderBlock callback = ^(NSArray *responses) {
     if (wrapperWasCalled) {
@@ -181,7 +211,7 @@ static int32_t getUniqueId()
       return;
     }
 
-    strongWrapper->jsInvoker().invokeAsync([weakWrapper, responses]() {
+    strongWrapper->jsInvoker().invokeAsync([weakWrapper, responses, blockGuard]() {
       auto strongWrapper2 = weakWrapper.lock();
       if (!strongWrapper2) {
         return;
@@ -190,31 +220,28 @@ static int32_t getUniqueId()
       std::vector<jsi::Value> args = convertNSArrayToStdVector(strongWrapper2->runtime(), responses);
       strongWrapper2->callback().call(strongWrapper2->runtime(), (const jsi::Value *)args.data(), args.size());
       strongWrapper2->destroy();
+
+      // Delete the CallbackWrapper when the block gets dealloced without being invoked.
+      (void)blockGuard;
     });
 
     wrapperWasCalled = YES;
   };
 
-  if (RCTTurboModuleBlockCopyEnabled()) {
-    return [callback copy];
-  }
-
-  return callback;
+  return [callback copy];
 }
 
 namespace facebook {
 namespace react {
 
-jsi::Value ObjCTurboModule::createPromise(
-    jsi::Runtime &runtime,
-    std::shared_ptr<CallInvoker> jsInvoker,
-    PromiseInvocationBlock invoke)
+jsi::Value ObjCTurboModule::createPromise(jsi::Runtime &runtime, std::string methodName, PromiseInvocationBlock invoke)
 {
   if (!invoke) {
     return jsi::Value::undefined();
   }
 
   jsi::Function Promise = runtime.global().getPropertyAsFunction(runtime, "Promise");
+  std::string moduleName = name_;
 
   // Note: the passed invoke() block is not retained by default, so let's retain it here to help keep it longer.
   // Otherwise, there's a risk of it getting released before the promise function below executes.
@@ -223,28 +250,50 @@ static int32_t getUniqueId()
       runtime,
       jsi::PropNameID::forAscii(runtime, "fn"),
       2,
-      [invokeCopy, jsInvoker](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
+      [invokeCopy, jsInvoker = jsInvoker_, moduleName, methodName, retainJSCallback = retainJSCallback_](
+          jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
+        std::string moduleMethod = moduleName + "." + methodName + "()";
+
         if (count != 2) {
           throw std::invalid_argument(
-              "Promise must pass constructor function two args. Passed " + std::to_string(count) + " args.");
+              moduleMethod + ": Promise must pass constructor function two args. Passed " + std::to_string(count) +
+              " args.");
         }
         if (!invokeCopy) {
           return jsi::Value::undefined();
         }
 
-        auto weakResolveWrapper = CallbackWrapper::createWeak(args[0].getObject(rt).getFunction(rt), rt, jsInvoker);
-        auto weakRejectWrapper = CallbackWrapper::createWeak(args[1].getObject(rt).getFunction(rt), rt, jsInvoker);
+        auto weakResolveWrapper = retainJSCallback != nil
+            ? retainJSCallback(args[0].getObject(rt).getFunction(rt), rt, jsInvoker)
+            : CallbackWrapper::createWeak(args[0].getObject(rt).getFunction(rt), rt, jsInvoker);
+        auto weakRejectWrapper = retainJSCallback != nil
+            ? retainJSCallback(args[1].getObject(rt).getFunction(rt), rt, jsInvoker)
+            : CallbackWrapper::createWeak(args[1].getObject(rt).getFunction(rt), rt, jsInvoker);
 
         __block BOOL resolveWasCalled = NO;
         __block BOOL rejectWasCalled = NO;
 
+        RCTBlockGuard *blockGuard = [[RCTBlockGuard alloc] initWithCleanup:^() {
+          auto strongResolveWrapper = weakResolveWrapper.lock();
+          if (strongResolveWrapper) {
+            strongResolveWrapper->destroy();
+          }
+
+          auto strongRejectWrapper = weakRejectWrapper.lock();
+          if (strongRejectWrapper) {
+            strongRejectWrapper->destroy();
+          }
+        }];
+
         RCTPromiseResolveBlock resolveBlock = ^(id result) {
           if (rejectWasCalled) {
-            throw std::runtime_error("Tried to resolve a promise after it's already been rejected.");
+            RCTLogError(@"%s: Tried to resolve a promise after it's already been rejected.", moduleMethod.c_str());
+            return;
           }
 
           if (resolveWasCalled) {
-            throw std::runtime_error("Tried to resolve a promise more than once.");
+            RCTLogError(@"%s: Tried to resolve a promise more than once.", moduleMethod.c_str());
+            return;
           }
 
           auto strongResolveWrapper = weakResolveWrapper.lock();
@@ -253,7 +302,7 @@ static int32_t getUniqueId()
             return;
           }
 
-          strongResolveWrapper->jsInvoker().invokeAsync([weakResolveWrapper, weakRejectWrapper, result]() {
+          strongResolveWrapper->jsInvoker().invokeAsync([weakResolveWrapper, weakRejectWrapper, result, blockGuard]() {
             auto strongResolveWrapper2 = weakResolveWrapper.lock();
             auto strongRejectWrapper2 = weakRejectWrapper.lock();
             if (!strongResolveWrapper2 || !strongRejectWrapper2) {
@@ -266,6 +315,7 @@ static int32_t getUniqueId()
 
             strongResolveWrapper2->destroy();
             strongRejectWrapper2->destroy();
+            (void)blockGuard;
           });
 
           resolveWasCalled = YES;
@@ -273,11 +323,13 @@ static int32_t getUniqueId()
 
         RCTPromiseRejectBlock rejectBlock = ^(NSString *code, NSString *message, NSError *error) {
           if (resolveWasCalled) {
-            throw std::runtime_error("Tried to reject a promise after it's already been resolved.");
+            RCTLogError(@"%s: Tried to reject a promise after it's already been resolved.", moduleMethod.c_str());
+            return;
           }
 
           if (rejectWasCalled) {
-            throw std::runtime_error("Tried to reject a promise more than once.");
+            RCTLogError(@"%s: Tried to reject a promise more than once.", moduleMethod.c_str());
+            return;
           }
 
           auto strongResolveWrapper = weakResolveWrapper.lock();
@@ -287,7 +339,7 @@ static int32_t getUniqueId()
           }
 
           NSDictionary *jsError = RCTJSErrorFromCodeMessageAndNSError(code, message, error);
-          strongRejectWrapper->jsInvoker().invokeAsync([weakResolveWrapper, weakRejectWrapper, jsError]() {
+          strongRejectWrapper->jsInvoker().invokeAsync([weakResolveWrapper, weakRejectWrapper, jsError, blockGuard]() {
             auto strongResolveWrapper2 = weakResolveWrapper.lock();
             auto strongRejectWrapper2 = weakRejectWrapper.lock();
             if (!strongResolveWrapper2 || !strongRejectWrapper2) {
@@ -300,6 +352,7 @@ static int32_t getUniqueId()
 
             strongResolveWrapper2->destroy();
             strongRejectWrapper2->destroy();
+            (void)blockGuard;
           });
 
           rejectWasCalled = YES;
@@ -538,7 +591,7 @@ static int32_t getUniqueId()
     /**
      * Convert arg to ObjC objects.
      */
-    id objCArg = convertJSIValueToObjCObject(runtime, *arg, jsInvoker_);
+    id objCArg = convertJSIValueToObjCObject(runtime, *arg, jsInvoker_, retainJSCallback_);
 
     if (objCArg) {
       NSString *methodNameNSString = @(methodName);
@@ -610,7 +663,8 @@ static int32_t getUniqueId()
     : TurboModule(params.moduleName, params.jsInvoker),
       instance_(params.instance),
       nativeInvoker_(params.nativeInvoker),
-      isSyncModule_(params.isSyncModule)
+      isSyncModule_(params.isSyncModule),
+      retainJSCallback_(params.retainJSCallback)
 {
 }
 
@@ -638,15 +692,10 @@ static int32_t getUniqueId()
   jsi::Value returnValue = returnType == PromiseKind
       ? createPromise(
             runtime,
-            jsInvoker_,
+            methodNameStr,
             ^(RCTPromiseResolveBlock resolveBlock, RCTPromiseRejectBlock rejectBlock) {
-              RCTPromiseResolveBlock resolveCopy = resolveBlock;
-              RCTPromiseRejectBlock rejectCopy = rejectBlock;
-
-              if (RCTTurboModuleBlockCopyEnabled()) {
-                resolveCopy = [resolveBlock copy];
-                rejectCopy = [rejectBlock copy];
-              }
+              RCTPromiseResolveBlock resolveCopy = [resolveBlock copy];
+              RCTPromiseRejectBlock rejectCopy = [rejectBlock copy];
 
               [inv setArgument:(void *)&resolveCopy atIndex:count + 2];
               [inv setArgument:(void *)&rejectCopy atIndex:count + 3];
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
index 8ee2eaeefe582e..2b9c4731940179 100644
--- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
@@ -15,16 +15,10 @@
 
 @protocol RCTTurboModuleManagerDelegate <NSObject>
 
-// TODO: Move to xplat codegen.
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                     initParams:
-                                                         (const facebook::react::ObjCTurboModule::InitParams &)params;
 @optional
 - (NSArray<NSString *> *)getEagerInitModuleNames;
 - (NSArray<NSString *> *)getEagerInitMainQueueModuleNames;
 
-@optional
-
 /**
  * Given a module name, return its actual class. If not provided, basic ObjC class lookup is performed.
  */
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
index 223522eb684f4b..92b25a42a87d04 100644
--- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
@@ -18,6 +18,7 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxModule.h>
+#import <React/RCTInitializing.h>
 #import <React/RCTLog.h>
 #import <React/RCTModuleData.h>
 #import <React/RCTPerformanceLogger.h>
@@ -172,6 +173,10 @@ @implementation RCTTurboModuleManager {
   std::shared_timed_mutex _turboModuleHoldersSharedMutex;
   std::mutex _turboModuleHoldersMutex;
   std::atomic<bool> _invalidating;
+
+  RCTModuleRegistry *_moduleRegistry;
+  RCTRetainJSCallback _retainJSCallback;
+  std::shared_ptr<LongLivedObjectCollection> _longLivedObjectCollection;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
@@ -183,6 +188,9 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _delegate = delegate;
     _bridge = bridge;
     _invalidating = false;
+    _moduleRegistry = [RCTModuleRegistry new];
+    [_moduleRegistry setBridge:bridge];
+    [_moduleRegistry setTurboModuleRegistry:self];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(bridgeWillInvalidateModules:)
@@ -192,6 +200,23 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
                                              selector:@selector(bridgeDidInvalidateModules:)
                                                  name:RCTBridgeDidInvalidateModulesNotification
                                                object:_bridge.parentBridge];
+
+    if (RCTGetTurboModuleCleanupMode() == kRCTGlobalScope) {
+      // Use LongLivedObjectCollection singleton regularly
+      _retainJSCallback = nil;
+    } else if (RCTGetTurboModuleCleanupMode() == kRCTGlobalScopeUsingRetainJSCallback) {
+      // Use LongLivedObjectCollection singleton via the _retainJSCallback
+      _retainJSCallback = ^(jsi::Function &&callback, jsi::Runtime &runtime, std::shared_ptr<CallInvoker> jsInvoker2) {
+        return CallbackWrapper::createWeak(std::move(callback), runtime, jsInvoker2);
+      };
+    } else if (RCTGetTurboModuleCleanupMode() == kRCTTurboModuleManagerScope) {
+      // Use a LongLivedObjectCollection scoped to the TurboModuleManager
+      _longLivedObjectCollection = std::make_shared<LongLivedObjectCollection>();
+      __block std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection = _longLivedObjectCollection;
+      _retainJSCallback = ^(jsi::Function &&callback, jsi::Runtime &runtime, std::shared_ptr<CallInvoker> jsInvoker2) {
+        return CallbackWrapper::createWeak(longLivedObjectCollection, std::move(callback), runtime, jsInvoker2);
+      };
+    }
   }
   return self;
 }
@@ -263,6 +288,9 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name
   Class moduleClass = [module class];
 
   dispatch_queue_t methodQueue = (dispatch_queue_t)objc_getAssociatedObject(module, &kAssociatedMethodQueueKey);
+  if (methodQueue == nil) {
+    RCTLogError(@"TurboModule \"%@\" was not associated with a method queue.", moduleClass);
+  }
 
   /**
    * Step 2c: Create and native CallInvoker from the TurboModule's method queue.
@@ -277,23 +305,6 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name
     nativeInvoker = [_bridge decorateNativeCallInvoker:nativeInvoker];
   }
 
-  ObjCTurboModule::InitParams params = {
-      .moduleName = moduleName,
-      .instance = module,
-      .jsInvoker = _jsInvoker,
-      .nativeInvoker = nativeInvoker,
-      .isSyncModule = methodQueue == RCTJSThread,
-  };
-
-  // If RCTTurboModule supports creating its own C++ TurboModule object,
-  // allow it to do so.
-  if ([module respondsToSelector:@selector(getTurboModule:)]) {
-    auto turboModule = [module getTurboModule:params];
-    assert(turboModule != nullptr);
-    _turboModuleCache.insert({moduleName, turboModule});
-    return turboModule;
-  }
-
   /**
    * Step 2d: If the moduleClass is a legacy CxxModule, return a TurboCxxModule instance that
    * wraps CxxModule.
@@ -306,13 +317,23 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name
     return turboModule;
   }
 
+  ObjCTurboModule::InitParams params = {
+      .moduleName = moduleName,
+      .instance = module,
+      .jsInvoker = _jsInvoker,
+      .nativeInvoker = nativeInvoker,
+      .isSyncModule = methodQueue == RCTJSThread,
+      .retainJSCallback = _retainJSCallback,
+  };
+
   /**
    * Step 2e: Return an exact sub-class of ObjC TurboModule
    */
-  auto turboModule = [_delegate getTurboModule:moduleName initParams:params];
-  if (turboModule != nullptr) {
-    _turboModuleCache.insert({moduleName, turboModule});
+  auto turboModule = [module getTurboModule:params];
+  if (turboModule == nullptr) {
+    RCTLogError(@"TurboModule \"%@\"'s getTurboModule: method returned nil.", moduleClass);
   }
+  _turboModuleCache.insert({moduleName, turboModule});
   return turboModule;
 }
 
@@ -353,6 +374,10 @@ - (TurboModuleHolder *)_getOrCreateTurboModuleHolder:(const char *)moduleName
  */
 - (id<RCTTurboModule>)provideRCTTurboModule:(const char *)moduleName
 {
+  if (strncmp("RCT", moduleName, 3) == 0) {
+    moduleName = [[[NSString stringWithUTF8String:moduleName] substringFromIndex:3] UTF8String];
+  }
+
   TurboModuleHolder *moduleHolder = [self _getOrCreateTurboModuleHolder:moduleName];
 
   if (!moduleHolder) {
@@ -495,10 +520,6 @@ - (TurboModuleHolder *)_getOrCreateTurboModuleHolder:(const char *)moduleName
 
   TurboModulePerfLogger::moduleCreateSetUpStart(moduleName, moduleId);
 
-  if ([module respondsToSelector:@selector(setTurboModuleRegistry:)]) {
-    [module setTurboModuleRegistry:self];
-  }
-
   /**
    * It is reasonable for NativeModules to not want/need the bridge.
    * In such cases, they won't have `@synthesize bridge = _bridge` in their
@@ -535,6 +556,25 @@ - (TurboModuleHolder *)_getOrCreateTurboModuleHolder:(const char *)moduleName
     }
   }
 
+  /**
+   * Attach the RCTModuleRegistry to this TurboModule, which allows this TurboModule
+   * To load other NativeModules & TurboModules.
+   *
+   * Usage: In the NativeModule @implementation, include:
+   *   `@synthesize moduleRegistry = _moduleRegistry`
+   */
+  if ([module respondsToSelector:@selector(moduleRegistry)] && _moduleRegistry) {
+    @try {
+      [(id)module setValue:_moduleRegistry forKey:@"moduleRegistry"];
+    } @catch (NSException *exception) {
+      RCTLogError(
+          @"%@ has no setter or ivar for its module registry, which is not "
+           "permitted. You must either @synthesize the moduleRegistry property, "
+           "or provide your own setter method.",
+          RCTBridgeModuleNameForClass([module class]));
+    }
+  }
+
   /**
    * Some modules need their own queues, but don't provide any, so we need to create it for them.
    * These modules typically have the following:
@@ -579,6 +619,20 @@ - (TurboModuleHolder *)_getOrCreateTurboModuleHolder:(const char *)moduleName
     }
   }
 
+  /**
+   * Decorate TurboModules with bridgeless-compatible APIs that call into the bridge.
+   */
+  if (_bridge) {
+    [_bridge attachBridgeAPIsToTurboModule:module];
+  }
+
+  /**
+   * If the TurboModule conforms to RCTInitializing, invoke its initialize method.
+   */
+  if ([module respondsToSelector:@selector(initialize)]) {
+    [(id<RCTInitializing>)module initialize];
+  }
+
   /**
    * Attach method queue to id<RCTTurboModule> object.
    * This is necessary because the id<RCTTurboModule> object can be eagerly created/initialized before the method
@@ -595,7 +649,12 @@ - (TurboModuleHolder *)_getOrCreateTurboModuleHolder:(const char *)moduleName
    * rollout.
    */
   if (_bridge) {
-    RCTModuleData *data = [[RCTModuleData alloc] initWithModuleInstance:(id<RCTBridgeModule>)module bridge:_bridge];
+    RCTModuleData *data = [[RCTModuleData alloc] initWithModuleInstance:(id<RCTBridgeModule>)module
+                                                                 bridge:_bridge
+                                                         moduleRegistry:_moduleRegistry
+                                                viewRegistry_DEPRECATED:nil
+                                                          bundleManager:nil
+                                                      callableJSModules:nil];
     [_bridge registerModuleForFrameUpdates:(id<RCTBridgeModule>)module withModuleData:data];
   }
 
@@ -686,8 +745,7 @@ - (void)installJSBindingWithRuntimeExecutor:(facebook::react::RuntimeExecutor)ru
    * aren't any strong references to it in ObjC. Hence, we give
    * __turboModuleProxy a strong reference to TurboModuleManager.
    */
-  auto turboModuleProvider =
-      [self](const std::string &name, const jsi::Value *schema) -> std::shared_ptr<react::TurboModule> {
+  auto turboModuleProvider = [self](const std::string &name) -> std::shared_ptr<react::TurboModule> {
     auto moduleName = name.c_str();
 
     TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName);
@@ -717,9 +775,17 @@ - (void)installJSBindingWithRuntimeExecutor:(facebook::react::RuntimeExecutor)ru
     return turboModule;
   };
 
-  runtimeExecutor([turboModuleProvider = std::move(turboModuleProvider)](jsi::Runtime &runtime) {
-    react::TurboModuleBinding::install(runtime, std::move(turboModuleProvider));
-  });
+  if (RCTGetTurboModuleCleanupMode() == kRCTGlobalScope ||
+      RCTGetTurboModuleCleanupMode() == kRCTGlobalScopeUsingRetainJSCallback) {
+    runtimeExecutor([turboModuleProvider = std::move(turboModuleProvider)](jsi::Runtime &runtime) {
+      react::TurboModuleBinding::install(runtime, std::move(turboModuleProvider));
+    });
+  } else if (RCTGetTurboModuleCleanupMode() == kRCTTurboModuleManagerScope) {
+    runtimeExecutor([turboModuleProvider = std::move(turboModuleProvider),
+                     longLivedObjectCollection = _longLivedObjectCollection](jsi::Runtime &runtime) {
+      react::TurboModuleBinding::install(runtime, std::move(turboModuleProvider), longLivedObjectCollection);
+    });
+  }
 }
 
 #pragma mark RCTTurboModuleRegistry
@@ -731,6 +797,12 @@ - (id)moduleForName:(const char *)moduleName
 
 - (id)moduleForName:(const char *)moduleName warnOnLookupFailure:(BOOL)warnOnLookupFailure
 {
+  // When the bridge is invalidating, TurboModules will be nil.
+  // Therefore, don't (1) do the lookup, and (2) warn on lookup.
+  if (_invalidating) {
+    return nil;
+  }
+
   id<RCTTurboModule> module = [self provideRCTTurboModule:moduleName];
 
   if (warnOnLookupFailure && !module) {
@@ -778,6 +850,27 @@ - (void)bridgeWillInvalidateModules:(NSNotification *)notification
     return;
   }
 
+  [self _enterInvalidatingState];
+}
+
+- (void)bridgeDidInvalidateModules:(NSNotification *)notification
+{
+  RCTBridge *bridge = notification.userInfo[@"bridge"];
+  if (bridge != _bridge) {
+    return;
+  }
+
+  [self _invalidateModules];
+}
+
+- (void)invalidate
+{
+  [self _enterInvalidatingState];
+  [self _invalidateModules];
+}
+
+- (void)_enterInvalidatingState
+{
   // This should halt all insertions into _turboModuleHolders
   if (RCTTurboModuleSharedMutexInitEnabled()) {
     std::unique_lock<std::shared_timed_mutex> guard(_turboModuleHoldersSharedMutex);
@@ -788,13 +881,8 @@ - (void)bridgeWillInvalidateModules:(NSNotification *)notification
   }
 }
 
-- (void)bridgeDidInvalidateModules:(NSNotification *)notification
+- (void)_invalidateModules
 {
-  RCTBridge *bridge = notification.userInfo[@"bridge"];
-  if (bridge != _bridge) {
-    return;
-  }
-
   // Backward-compatibility: RCTInvalidating handling.
   dispatch_group_t moduleInvalidationGroup = dispatch_group_create();
 
@@ -812,20 +900,31 @@ - (void)bridgeDidInvalidateModules:(NSNotification *)notification
                                                shouldPerfLog:NO];
 
     if ([module respondsToSelector:@selector(invalidate)]) {
-      if ([module respondsToSelector:@selector(methodQueue)]) {
-        dispatch_queue_t methodQueue = [module performSelector:@selector(methodQueue)];
-        if (methodQueue) {
-          dispatch_group_enter(moduleInvalidationGroup);
-          [bridge
-              dispatchBlock:^{
-                [((id<RCTInvalidating>)module) invalidate];
-                dispatch_group_leave(moduleInvalidationGroup);
-              }
-                      queue:methodQueue];
-          continue;
+      dispatch_queue_t methodQueue = (dispatch_queue_t)objc_getAssociatedObject(module, &kAssociatedMethodQueueKey);
+
+      if (methodQueue == nil) {
+        RCTLogError(
+            @"TurboModuleManager: Couldn't invalidate TurboModule \"%@\", because its method queue is nil.",
+            [module class]);
+        continue;
+      }
+
+      dispatch_group_enter(moduleInvalidationGroup);
+      dispatch_block_t invalidateModule = ^{
+        [((id<RCTInvalidating>)module) invalidate];
+        dispatch_group_leave(moduleInvalidationGroup);
+      };
+
+      if (_bridge) {
+        [_bridge dispatchBlock:invalidateModule queue:methodQueue];
+      } else {
+        // Bridgeless mode
+        if (methodQueue == RCTJSThread) {
+          invalidateModule();
+        } else {
+          dispatch_async(methodQueue, invalidateModule);
         }
       }
-      [((id<RCTInvalidating>)module) invalidate];
     }
   }
 
@@ -837,26 +936,4 @@ - (void)bridgeDidInvalidateModules:(NSNotification *)notification
   _turboModuleCache.clear();
 }
 
-- (void)invalidate
-{
-  if (RCTTurboModuleSharedMutexInitEnabled()) {
-    std::unique_lock<std::shared_timed_mutex> guard(_turboModuleHoldersSharedMutex);
-    _invalidating = true;
-  } else {
-    std::lock_guard<std::mutex> guard(_turboModuleHoldersMutex);
-    _invalidating = true;
-  }
-
-  // Backward-compatibility: RCTInvalidating handling, but not adhering to desired methodQueue.
-  for (const auto &p : _turboModuleHolders) {
-    id<RCTTurboModule> module = p.second.getModule();
-    if ([module respondsToSelector:@selector(invalidate)]) {
-      [((id<RCTInvalidating>)module) invalidate];
-    }
-  }
-
-  _turboModuleHolders.clear();
-  _turboModuleCache.clear();
-}
-
 @end
diff --git a/ReactCommon/react/nativemodule/samples/BUCK b/ReactCommon/react/nativemodule/samples/BUCK
index b6b0fe3b974e52..693bf74aaf428d 100644
--- a/ReactCommon/react/nativemodule/samples/BUCK
+++ b/ReactCommon/react/nativemodule/samples/BUCK
@@ -1,5 +1,4 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags")
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "react_native_dep", "react_native_target", "react_native_xplat_target", "rn_android_library", "rn_xplat_cxx_library", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags", "react_native_dep", "react_native_target", "react_native_xplat_target", "rn_android_library", "rn_xplat_cxx_library", "subdir_glob")
 
 rn_xplat_cxx_library(
     name = "samples",
@@ -16,7 +15,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbandroid_deps = [
@@ -39,14 +38,14 @@ rn_xplat_cxx_library(
         "-fobjc-arc-exceptions",
     ],
     fbobjc_inherited_buck_flags = get_static_library_ios_flags(),
-    fbobjc_preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_preprocessor_flags_for_build_mode(),
+    fbobjc_preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     force_static = True,
     ios_deps = [
         "//xplat/FBBaseLite:FBBaseLite",
-        "//xplat/js:RCTLinking",
-        "//xplat/js:RCTPushNotification",
         "//xplat/js/react-native-github:RCTCxxBridge",
         "//xplat/js/react-native-github:RCTCxxModule",
+        "//xplat/js/react-native-github:RCTLinking",
+        "//xplat/js/react-native-github:RCTPushNotification",
         "//xplat/js/react-native-github:ReactInternal",
     ],
     ios_exported_headers = subdir_glob(
@@ -85,6 +84,7 @@ rn_xplat_cxx_library(
 rn_android_library(
     name = "impl",
     srcs = glob(["platform/android/*.java"]),
+    autoglob = False,
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/Android.mk b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
index 46dfd7623ae029..a000332e34c3e9 100644
--- a/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
+++ b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
@@ -10,9 +10,9 @@ LOCAL_MODULE := sampleturbomodule
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libjsi
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java b/ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java
index 8475fbc4711299..f992e5d6ae1c67 100644
--- a/ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java
+++ b/ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java
@@ -42,6 +42,9 @@ public NativeSampleTurboModuleSpec(ReactApplicationContext reactContext) {
   @ReactMethod(isBlockingSynchronousMethod = true)
   public abstract WritableMap getObject(ReadableMap arg);
 
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract WritableMap getUnsafeObject(ReadableMap arg);
+
   @ReactMethod
   public abstract void voidFunc();
 
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java b/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java
index bc357d2baa3d9b..f919eb5bd2dd07 100644
--- a/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java
+++ b/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java
@@ -109,6 +109,16 @@ public WritableMap getObject(ReadableMap arg) {
     return map;
   }
 
+  @DoNotStrip
+  @Override
+  @SuppressWarnings("unused")
+  public WritableMap getUnsafeObject(ReadableMap arg) {
+    WritableNativeMap map = new WritableNativeMap();
+    map.merge(arg);
+    log("getUnsafeObject", arg, map);
+    return map;
+  }
+
   @DoNotStrip
   @SuppressWarnings("unused")
   @Override
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h b/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
index 4738cff8d10ad5..b14289e1cd1baa 100644
--- a/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
+++ b/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
@@ -26,6 +26,7 @@
 - (NSString *)getString:(NSString *)arg;
 - (NSArray<id<NSObject>> *)getArray:(NSArray *)arg;
 - (NSDictionary *)getObject:(NSDictionary *)arg;
+- (NSDictionary *)getUnsafeObject:(NSDictionary *)arg;
 - (NSNumber *)getRootTag:(double)arg;
 - (NSDictionary *)getValue:(double)x y:(NSString *)y z:(NSDictionary *)z;
 - (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm b/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm
index 70f69b107babb3..7337f63d51814f 100644
--- a/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm
+++ b/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm
@@ -70,6 +70,16 @@
       .invokeObjCMethod(rt, ObjectKind, "getObject", @selector(getObject:), args, count);
 }
 
+static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getUnsafeObject(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count)
+{
+  return static_cast<ObjCTurboModule &>(turboModule)
+      .invokeObjCMethod(rt, ObjectKind, "getUnsafeObject", @selector(getUnsafeObject:), args, count);
+}
+
 static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(
     facebook::jsi::Runtime &rt,
     TurboModule &turboModule,
@@ -130,6 +140,7 @@
   methodMap_["getString"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
   methodMap_["getArray"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
   methodMap_["getObject"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
+  methodMap_["getUnsafeObject"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getUnsafeObject};
   methodMap_["getRootTag"] = MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
   methodMap_["getValue"] = MethodMetadata{3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
   methodMap_["getValueWithCallback"] =
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
index 29671c92ba802f..8306c561744e29 100644
--- a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
+++ b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
@@ -28,6 +28,12 @@ @implementation RCTSampleTurboCxxModule_v1
   return nullptr;
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
 
 @implementation RCTSampleTurboCxxModule_v2
@@ -39,4 +45,10 @@ @implementation RCTSampleTurboCxxModule_v2
   return std::make_unique<react::SampleTurboCxxModuleLegacyImpl>();
 }
 
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
 @end
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm
index f59ed56b43abca..6391f544a0b18c 100644
--- a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm
+++ b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm
@@ -17,9 +17,6 @@ @implementation RCTSampleTurboModule
 // Backward-compatible export
 RCT_EXPORT_MODULE()
 
-@synthesize bridge = _bridge;
-@synthesize turboModuleRegistry = _turboModuleRegistry;
-
 // Backward-compatible queue configuration
 + (BOOL)requiresMainQueueSetup
 {
@@ -102,6 +99,11 @@ - (NSDictionary *)constantsToExport
   return arg;
 }
 
+RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, getUnsafeObject : (NSDictionary *)arg)
+{
+  return arg;
+}
+
 RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, getRootTag : (double)arg)
 {
   return @(arg);
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp b/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp
index 5eea42c3d8058a..a66b01ef2c16b2 100644
--- a/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp
+++ b/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp
@@ -69,6 +69,12 @@ std::vector<CxxModule::Method> SampleTurboCxxModuleLegacyImpl::getMethods() {
             return getObject(xplat::jsArgAsObject(args, 0));
           },
           CxxModule::SyncTag),
+      CxxModule::Method(
+          "getUnsafeObject",
+          [this](folly::dynamic args) {
+            return getUnsafeObject(xplat::jsArgAsObject(args, 0));
+          },
+          CxxModule::SyncTag),
       CxxModule::Method(
           "getRootTag",
           [this](folly::dynamic args) {
@@ -126,6 +132,11 @@ folly::dynamic SampleTurboCxxModuleLegacyImpl::getObject(
   return arg;
 }
 
+folly::dynamic SampleTurboCxxModuleLegacyImpl::getUnsafeObject(
+    const folly::dynamic &arg) {
+  return arg;
+}
+
 double SampleTurboCxxModuleLegacyImpl::getRootTag(double arg) {
   return arg;
 }
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h b/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h
index 72d0e3b4adbf49..a3aa44062f5728 100644
--- a/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h
+++ b/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h
@@ -31,6 +31,7 @@ class SampleTurboCxxModuleLegacyImpl
   std::string getString(const std::string &arg);
   folly::dynamic getArray(const folly::dynamic &arg);
   folly::dynamic getObject(const folly::dynamic &arg);
+  folly::dynamic getUnsafeObject(const folly::dynamic &arg);
   double getRootTag(double arg);
   folly::dynamic
   getValue(double x, const std::string &y, const folly::dynamic &z);
diff --git a/ReactCommon/react/renderer/animations/Android.mk b/ReactCommon/react/renderer/animations/Android.mk
index 85e6d3f3ce948a..c637dbb0d6005e 100644
--- a/ReactCommon/react/renderer/animations/Android.mk
+++ b/ReactCommon/react/renderer/animations/Android.mk
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libreact_render_graphics libglog_init glog libruntimeexecutor libyoga libreact_render_components_view libreact_render_uimanager libfolly_futures libreact_render_componentregistry libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug libreact_render_mounting
+LOCAL_SHARED_LIBRARIES := libreact_render_graphics libglog_init glog libruntimeexecutor libyoga librrc_view libreact_render_uimanager libfolly_futures libreact_render_componentregistry libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug libreact_render_mounting libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -39,3 +39,4 @@ $(call import-module,react/renderer/mounting)
 $(call import-module,react/renderer/uimanager)
 $(call import-module,yogajni)
 $(call import-module,runtimeexecutor)
+$(call import-module,react/debug)
diff --git a/ReactCommon/react/renderer/animations/BUCK b/ReactCommon/react/renderer/animations/BUCK
index aef6e64865e7b5..fbf1c6c61393e3 100644
--- a/ReactCommon/react/renderer/animations/BUCK
+++ b/ReactCommon/react/renderer/animations/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -7,6 +6,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
         "-lm",
     ],
@@ -59,6 +59,7 @@ rn_xplat_cxx_library(
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/config:config"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/components/view:view"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -76,7 +77,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
@@ -90,6 +91,7 @@ fb_xplat_cxx_test(
         react_native_xplat_target("react/renderer/components/root:root"),
         react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
         react_native_xplat_target("react/renderer/components/view:view"),
+        react_native_xplat_target("react/test_utils:test_utils"),
         "//xplat/js/react-native-github:generated_components-rncore",
     ],
 )
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
index 4c382f3ead5fd5..1c0888f77388ab 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
@@ -11,7 +11,6 @@
 #include <chrono>
 
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/components/root/RootShadowNode.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/LayoutMetrics.h>
@@ -25,100 +24,11 @@
 #include <react/renderer/mounting/ShadowViewMutation.h>
 
 #include <glog/logging.h>
+#include <react/debug/react_native_assert.h>
 
 namespace facebook {
 namespace react {
 
-static double
-getProgressFromValues(double start, double end, double currentValue) {
-  auto opacityMinmax = std::minmax({start, end});
-  auto min = opacityMinmax.first;
-  auto max = opacityMinmax.second;
-  return (
-      currentValue < min
-          ? 0
-          : (currentValue > max ? 0 : ((max - currentValue) / (max - min))));
-}
-
-/**
- * Given an animation and a ShadowView with properties set on it, detect how
- * far through the animation the ShadowView has progressed.
- *
- * @param mutationsList
- * @param now
- */
-double LayoutAnimationDriver::getProgressThroughAnimation(
-    AnimationKeyFrame const &keyFrame,
-    LayoutAnimation const *layoutAnimation,
-    ShadowView const &animationStateView) const {
-  auto layoutAnimationConfig = layoutAnimation->layoutAnimationConfig;
-  auto const mutationConfig =
-      *(keyFrame.type == AnimationConfigurationType::Delete
-            ? layoutAnimationConfig.deleteConfig
-            : (keyFrame.type == AnimationConfigurationType::Create
-                   ? layoutAnimationConfig.createConfig
-                   : layoutAnimationConfig.updateConfig));
-
-  auto initialProps = keyFrame.viewStart.props;
-  auto finalProps = keyFrame.viewEnd.props;
-
-  if (mutationConfig.animationProperty == AnimationProperty::Opacity) {
-    // Detect progress through opacity animation.
-    const auto &oldViewProps =
-        dynamic_cast<const ViewProps *>(initialProps.get());
-    const auto &newViewProps =
-        dynamic_cast<const ViewProps *>(finalProps.get());
-    const auto &animationStateViewProps =
-        dynamic_cast<const ViewProps *>(animationStateView.props.get());
-    if (oldViewProps != nullptr && newViewProps != nullptr &&
-        animationStateViewProps != nullptr) {
-      return getProgressFromValues(
-          oldViewProps->opacity,
-          newViewProps->opacity,
-          animationStateViewProps->opacity);
-    }
-  } else if (
-      mutationConfig.animationProperty != AnimationProperty::NotApplicable) {
-    // Detect progress through layout animation.
-    LayoutMetrics const &finalLayoutMetrics = keyFrame.viewEnd.layoutMetrics;
-    LayoutMetrics const &baselineLayoutMetrics =
-        keyFrame.viewStart.layoutMetrics;
-    LayoutMetrics const &animationStateLayoutMetrics =
-        animationStateView.layoutMetrics;
-
-    if (baselineLayoutMetrics.frame.size.height !=
-        finalLayoutMetrics.frame.size.height) {
-      return getProgressFromValues(
-          baselineLayoutMetrics.frame.size.height,
-          finalLayoutMetrics.frame.size.height,
-          animationStateLayoutMetrics.frame.size.height);
-    }
-    if (baselineLayoutMetrics.frame.size.width !=
-        finalLayoutMetrics.frame.size.width) {
-      return getProgressFromValues(
-          baselineLayoutMetrics.frame.size.width,
-          finalLayoutMetrics.frame.size.width,
-          animationStateLayoutMetrics.frame.size.width);
-    }
-    if (baselineLayoutMetrics.frame.origin.x !=
-        finalLayoutMetrics.frame.origin.x) {
-      return getProgressFromValues(
-          baselineLayoutMetrics.frame.origin.x,
-          finalLayoutMetrics.frame.origin.x,
-          animationStateLayoutMetrics.frame.origin.x);
-    }
-    if (baselineLayoutMetrics.frame.origin.y !=
-        finalLayoutMetrics.frame.origin.y) {
-      return getProgressFromValues(
-          baselineLayoutMetrics.frame.origin.y,
-          finalLayoutMetrics.frame.origin.y,
-          animationStateLayoutMetrics.frame.origin.y);
-    }
-  }
-
-  return 0;
-}
-
 void LayoutAnimationDriver::animationMutationsForFrame(
     SurfaceId surfaceId,
     ShadowViewMutation::List &mutationsList,
@@ -132,10 +42,7 @@ void LayoutAnimationDriver::animationMutationsForFrame(
     }
 
     int incompleteAnimations = 0;
-    for (const auto &keyframe : animation.keyFrames) {
-      if (keyframe.type == AnimationConfigurationType::Noop) {
-        continue;
-      }
+    for (auto &keyframe : animation.keyFrames) {
       if (keyframe.invalidated) {
         continue;
       }
@@ -146,7 +53,7 @@ void LayoutAnimationDriver::animationMutationsForFrame(
       // The contract with the "keyframes generation" phase is that any animated
       // node will have a valid configuration.
       auto const layoutAnimationConfig = animation.layoutAnimationConfig;
-      auto const mutationConfig =
+      auto const &mutationConfig =
           (keyframe.type == AnimationConfigurationType::Delete
                ? layoutAnimationConfig.deleteConfig
                : (keyframe.type == AnimationConfigurationType::Create
@@ -155,7 +62,7 @@ void LayoutAnimationDriver::animationMutationsForFrame(
 
       // Interpolate
       std::pair<double, double> progress =
-          calculateAnimationProgress(now, animation, *mutationConfig);
+          calculateAnimationProgress(now, animation, mutationConfig);
       double animationTimeProgressLinear = progress.first;
       double animationInterpolationFactor = progress.second;
 
@@ -164,10 +71,19 @@ void LayoutAnimationDriver::animationMutationsForFrame(
 
       // Create the mutation instruction
       auto updateMutation = ShadowViewMutation::UpdateMutation(
-          keyframe.parentView, baselineShadowView, mutatedShadowView, -1);
+          keyframe.viewPrev, mutatedShadowView);
+
+      // All generated Update mutations must have an "old" and "new"
+      // ShadowView. Checking for nonzero tag doesn't guarantee that the views
+      // are valid/correct, just that something is there.
+      react_native_assert(updateMutation.oldChildShadowView.tag > 0);
+      react_native_assert(updateMutation.newChildShadowView.tag > 0);
+
       mutationsList.push_back(updateMutation);
       PrintMutationInstruction("Animation Progress:", updateMutation);
 
+      keyframe.viewPrev = mutatedShadowView;
+
       if (animationTimeProgressLinear < 1) {
         incompleteAnimations++;
       }
@@ -191,38 +107,11 @@ void LayoutAnimationDriver::animationMutationsForFrame(
         if (keyframe.invalidated) {
           continue;
         }
-        if (keyframe.finalMutationForKeyFrame.hasValue()) {
-          auto const &finalMutationForKeyFrame =
-              *keyframe.finalMutationForKeyFrame;
-          PrintMutationInstruction(
-              "Animation Complete: Queuing up Final Mutation:",
-              finalMutationForKeyFrame);
-
-          // Copy so that if something else mutates the inflight animations, it
-          // won't change this mutation after this point.
-          ShadowView oldShadowView{};
-          if (finalMutationForKeyFrame.type !=
-              ShadowViewMutation::Type::Update) {
-            oldShadowView = finalMutationForKeyFrame.oldChildShadowView;
-          }
-          mutationsList.push_back(
-              ShadowViewMutation{finalMutationForKeyFrame.type,
-                                 finalMutationForKeyFrame.parentShadowView,
-                                 oldShadowView,
-                                 finalMutationForKeyFrame.newChildShadowView,
-                                 finalMutationForKeyFrame.index});
-        } else {
-          // Issue a final UPDATE so that the final props object sent to the
-          // mounting layer is the same as the one on the ShadowTree. This is
-          // mostly to make the MountingCoordinator StubViewTree assertions
-          // pass.
-          mutationsList.push_back(
-              ShadowViewMutation{ShadowViewMutation::Type::Update,
-                                 keyframe.parentView,
-                                 {},
-                                 keyframe.viewEnd,
-                                 -1});
-        }
+        queueFinalMutationsForCompletedKeyFrame(
+            keyframe,
+            mutationsList,
+            false,
+            "LayoutAnimationDriver: Animation Completed");
       }
 
       it = inflightAnimations_.erase(it);
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h
index 59033afca14463..48cbc130b8c583 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <react/renderer/core/EventTarget.h>
+#include <react/renderer/debug/flags.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
@@ -35,10 +36,6 @@ class LayoutAnimationDriver : public LayoutAnimationKeyFrameManager {
       SurfaceId surfaceId,
       ShadowViewMutation::List &mutationsList,
       uint64_t now) const override;
-  virtual double getProgressThroughAnimation(
-      AnimationKeyFrame const &keyFrame,
-      LayoutAnimation const *layoutAnimation,
-      ShadowView const &animationStateView) const override;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
index 394a78c5d05aef..928cd1ced07752 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -10,13 +10,16 @@
 #include <algorithm>
 #include <chrono>
 
+#include <react/debug/flags.h>
+#include <react/debug/react_native_assert.h>
+
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/components/root/RootShadowNode.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawValue.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
@@ -57,8 +60,19 @@ static std::string GetMutationInstructionString(
 void PrintMutationInstruction(
     std::string message,
     ShadowViewMutation const &mutation) {
-  LOG(ERROR) << message
-             << " Mutation: " << GetMutationInstructionString(mutation);
+  [&](std::ostream &stream) -> std::ostream & {
+    stream << message
+           << " Mutation: " << GetMutationInstructionString(mutation);
+    if (mutation.oldChildShadowView.tag != 0) {
+      stream << " old hash: ##"
+             << std::hash<ShadowView>{}(mutation.oldChildShadowView);
+    }
+    if (mutation.newChildShadowView.tag != 0) {
+      stream << " new hash: ##"
+             << std::hash<ShadowView>{}(mutation.newChildShadowView);
+    }
+    return stream;
+  }(LOG(ERROR));
 }
 void PrintMutationInstructionRelative(
     std::string message,
@@ -73,22 +87,22 @@ void PrintMutationInstructionRelative(
 
 static better::optional<AnimationType> parseAnimationType(std::string param) {
   if (param == "spring") {
-    return better::optional<AnimationType>(AnimationType::Spring);
+    return AnimationType::Spring;
   }
   if (param == "linear") {
-    return better::optional<AnimationType>(AnimationType::Linear);
+    return AnimationType::Linear;
   }
   if (param == "easeInEaseOut") {
-    return better::optional<AnimationType>(AnimationType::EaseInEaseOut);
+    return AnimationType::EaseInEaseOut;
   }
   if (param == "easeIn") {
-    return better::optional<AnimationType>(AnimationType::EaseIn);
+    return AnimationType::EaseIn;
   }
   if (param == "easeOut") {
-    return better::optional<AnimationType>(AnimationType::EaseOut);
+    return AnimationType::EaseOut;
   }
   if (param == "keyboard") {
-    return better::optional<AnimationType>(AnimationType::Keyboard);
+    return AnimationType::Keyboard;
   }
 
   LOG(ERROR) << "Error parsing animation type: " << param;
@@ -98,16 +112,16 @@ static better::optional<AnimationType> parseAnimationType(std::string param) {
 static better::optional<AnimationProperty> parseAnimationProperty(
     std::string param) {
   if (param == "opacity") {
-    return better::optional<AnimationProperty>(AnimationProperty::Opacity);
+    return AnimationProperty::Opacity;
   }
   if (param == "scaleX") {
-    return better::optional<AnimationProperty>(AnimationProperty::ScaleX);
+    return AnimationProperty::ScaleX;
   }
   if (param == "scaleY") {
-    return better::optional<AnimationProperty>(AnimationProperty::ScaleY);
+    return AnimationProperty::ScaleY;
   }
   if (param == "scaleXY") {
-    return better::optional<AnimationProperty>(AnimationProperty::ScaleXY);
+    return AnimationProperty::ScaleXY;
   }
 
   LOG(ERROR) << "Error parsing animation property: " << param;
@@ -119,13 +133,13 @@ static better::optional<AnimationConfig> parseAnimationConfig(
     double defaultDuration,
     bool parsePropertyType) {
   if (config.empty() || !config.isObject()) {
-    return better::optional<AnimationConfig>(
-        AnimationConfig{AnimationType::Linear,
-                        AnimationProperty::NotApplicable,
-                        defaultDuration,
-                        0,
-                        0,
-                        0});
+    return AnimationConfig{
+        AnimationType::Linear,
+        AnimationProperty::NotApplicable,
+        defaultDuration,
+        0,
+        0,
+        0};
   }
 
   auto const typeIt = config.find("type");
@@ -220,12 +234,13 @@ static better::optional<AnimationConfig> parseAnimationConfig(
     }
   }
 
-  return better::optional<AnimationConfig>(AnimationConfig{*animationType,
-                                                           animationProperty,
-                                                           duration,
-                                                           delay,
-                                                           springDamping,
-                                                           initialVelocity});
+  return better::optional<AnimationConfig>(AnimationConfig{
+      *animationType,
+      animationProperty,
+      duration,
+      delay,
+      springDamping,
+      initialVelocity});
 }
 
 // Parse animation config from JS
@@ -292,14 +307,14 @@ void LayoutAnimationKeyFrameManager::uiManagerDidConfigureNextLayoutAnimation(
   if (layoutAnimationConfig) {
     std::lock_guard<std::mutex> lock(currentAnimationMutex_);
 
-    currentAnimation_ = better::optional<LayoutAnimation>{
-        LayoutAnimation{-1,
-                        0,
-                        false,
-                        *layoutAnimationConfig,
-                        successCallback,
-                        failureCallback,
-                        {}}};
+    uiManagerDidConfigureNextLayoutAnimation(LayoutAnimation{
+        -1,
+        0,
+        false,
+        *layoutAnimationConfig,
+        successCallback,
+        failureCallback,
+        {}});
   } else {
     LOG(ERROR) << "Parsing LayoutAnimationConfig failed: "
                << (folly::dynamic)config;
@@ -308,6 +323,11 @@ void LayoutAnimationKeyFrameManager::uiManagerDidConfigureNextLayoutAnimation(
   }
 }
 
+void LayoutAnimationKeyFrameManager::uiManagerDidConfigureNextLayoutAnimation(
+    LayoutAnimation layoutAnimation) const {
+  currentAnimation_ = better::optional<LayoutAnimation>{layoutAnimation};
+}
+
 void LayoutAnimationKeyFrameManager::setLayoutAnimationStatusDelegate(
     LayoutAnimationStatusDelegate *delegate) const {
   std::lock_guard<std::mutex> lock(layoutAnimationStatusDelegateMutex_);
@@ -324,9 +344,7 @@ void LayoutAnimationKeyFrameManager::stopSurface(SurfaceId surfaceId) {
 }
 
 bool LayoutAnimationKeyFrameManager::shouldAnimateFrame() const {
-  // There is potentially a race here between getting and setting
-  // `currentMutation_`. We don't want to lock around this because then we're
-  // creating contention between pullTransaction and the JS thread.
+  std::lock_guard<std::mutex> lock(currentAnimationMutex_);
   return currentAnimation_ || !inflightAnimations_.empty();
 }
 
@@ -375,8 +393,9 @@ LayoutAnimationKeyFrameManager::calculateAnimationProgress(
   } else if (mutationConfig.animationType == AnimationType::EaseInEaseOut) {
     // This is a combination of accelerate+decelerate.
     // The animation starts and ends slowly, and speeds up in the middle.
-    return {linearTimeProgression,
-            cos((linearTimeProgression + 1.0) * PI) / 2 + 0.5};
+    return {
+        linearTimeProgression,
+        cos((linearTimeProgression + 1.0) * PI) / 2 + 0.5};
   } else if (mutationConfig.animationType == AnimationType::Spring) {
     // Using mSpringDamping in this equation is not really the exact
     // mathematical springDamping, but a good approximation We need to replace
@@ -400,10 +419,11 @@ void LayoutAnimationKeyFrameManager::
         bool skipLastAnimation,
         bool lastAnimationOnly) const {
   bool isRemoveMutation = mutation.type == ShadowViewMutation::Type::Remove;
-  assert(isRemoveMutation || mutation.type == ShadowViewMutation::Type::Insert);
+  react_native_assert(
+      isRemoveMutation || mutation.type == ShadowViewMutation::Type::Insert);
 
   // TODO: turn all of this into a lambda and share code?
-  if (mutatedViewIsVirtual(mutation)) {
+  if (mutation.mutatedViewIsVirtual()) {
     PrintMutationInstruction(
         "[IndexAdjustment] Not calling adjustImmediateMutationIndicesForDelayedMutations, is virtual, for:",
         mutation);
@@ -440,34 +460,30 @@ void LayoutAnimationKeyFrameManager::
       }
 
       // Detect if they're in the same view hierarchy, but not equivalent
-      // (We've already detected direct conflicts and handled them above)
+      // We've already detected direct conflicts and removed them.
       if (animatedKeyFrame.parentView.tag != mutation.parentShadowView.tag) {
         continue;
       }
 
-      if (!animatedKeyFrame.finalMutationForKeyFrame.has_value()) {
-        continue;
-      }
-
-      auto &delayedMutation = *animatedKeyFrame.finalMutationForKeyFrame;
+      for (auto &delayedMutation : animatedKeyFrame.finalMutationsForKeyFrame) {
+        if (delayedMutation.type != ShadowViewMutation::Type::Remove) {
+          continue;
+        }
+        if (delayedMutation.mutatedViewIsVirtual()) {
+          continue;
+        }
+        if (delayedMutation.oldChildShadowView.tag ==
+            (isRemoveMutation ? mutation.oldChildShadowView.tag
+                              : mutation.newChildShadowView.tag)) {
+          continue;
+        }
 
-      if (delayedMutation.type != ShadowViewMutation::Type::Remove) {
-        continue;
-      }
-      if (mutatedViewIsVirtual(delayedMutation)) {
-        continue;
+        PrintMutationInstructionRelative(
+            "[IndexAdjustment] adjustImmediateMutationIndicesForDelayedMutations CANDIDATE for:",
+            mutation,
+            delayedMutation);
+        candidateMutations.push_back(&delayedMutation);
       }
-      if (delayedMutation.oldChildShadowView.tag ==
-          (isRemoveMutation ? mutation.oldChildShadowView.tag
-                            : mutation.newChildShadowView.tag)) {
-        continue;
-      }
-
-      PrintMutationInstructionRelative(
-          "[IndexAdjustment] adjustImmediateMutationIndicesForDelayedMutations CANDIDATE for:",
-          mutation,
-          delayedMutation);
-      candidateMutations.push_back(&delayedMutation);
     }
 
     if (lastAnimationOnly) {
@@ -486,7 +502,8 @@ void LayoutAnimationKeyFrameManager::
         std::remove_if(
             candidateMutations.begin(),
             candidateMutations.end(),
-            [&](ShadowViewMutation *candidateMutation) {
+            [&changed, &mutation, &adjustedDelta, &isRemoveMutation](
+                ShadowViewMutation *candidateMutation) {
               bool indexConflicts =
                   (candidateMutation->index < mutation.index ||
                    (isRemoveMutation &&
@@ -513,9 +530,11 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
     bool skipLastAnimation) const {
   bool isRemoveMutation = mutation.type == ShadowViewMutation::Type::Remove;
   bool isInsertMutation = mutation.type == ShadowViewMutation::Type::Insert;
-  assert(isRemoveMutation || isInsertMutation);
+  auto tag = isRemoveMutation ? mutation.oldChildShadowView.tag
+                              : mutation.newChildShadowView.tag;
+  react_native_assert(isRemoveMutation || isInsertMutation);
 
-  if (mutatedViewIsVirtual(mutation)) {
+  if (mutation.mutatedViewIsVirtual()) {
     PrintMutationInstruction(
         "[IndexAdjustment] Not calling adjustDelayedMutationIndicesForMutation, is virtual, for:",
         mutation);
@@ -554,31 +573,25 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
         continue;
       }
 
-      if (!animatedKeyFrame.finalMutationForKeyFrame.has_value()) {
-        continue;
-      }
-      ShadowViewMutation &finalAnimationMutation =
-          *animatedKeyFrame.finalMutationForKeyFrame;
+      for (auto &finalAnimationMutation :
+           animatedKeyFrame.finalMutationsForKeyFrame) {
+        if (finalAnimationMutation.oldChildShadowView.tag == tag) {
+          continue;
+        }
 
-      if (finalAnimationMutation.oldChildShadowView.tag ==
-          (isRemoveMutation ? mutation.oldChildShadowView.tag
-                            : mutation.newChildShadowView.tag)) {
-        continue;
-      }
+        if (finalAnimationMutation.type != ShadowViewMutation::Type::Remove) {
+          continue;
+        }
+        if (finalAnimationMutation.mutatedViewIsVirtual()) {
+          continue;
+        }
 
-      if (finalAnimationMutation.type != ShadowViewMutation::Type::Remove) {
-        continue;
-      }
-      if (mutatedViewIsVirtual(*animatedKeyFrame.finalMutationForKeyFrame)) {
-        continue;
+        PrintMutationInstructionRelative(
+            "[IndexAdjustment] adjustDelayedMutationIndicesForMutation: CANDIDATE:",
+            mutation,
+            finalAnimationMutation);
+        candidateMutations.push_back(&finalAnimationMutation);
       }
-
-      PrintMutationInstructionRelative(
-          "[IndexAdjustment] adjustDelayedMutationIndicesForMutation: CANDIDATE:",
-          mutation,
-          *animatedKeyFrame.finalMutationForKeyFrame);
-      candidateMutations.push_back(
-          animatedKeyFrame.finalMutationForKeyFrame.get_pointer());
     }
   }
 
@@ -628,25 +641,21 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
   }
 }
 
-std::vector<std::tuple<AnimationKeyFrame, AnimationConfig, LayoutAnimation *>>
-LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
+void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
     SurfaceId surfaceId,
-    ShadowViewMutationList &mutations,
-    bool deletesOnly) const {
-  std::vector<std::tuple<AnimationKeyFrame, AnimationConfig, LayoutAnimation *>>
-      conflictingAnimations{};
-
-  for (auto &mutation : mutations) {
-    if (deletesOnly && mutation.type != ShadowViewMutation::Type::Delete) {
-      continue;
-    }
-    PrintMutationInstruction("getAndEraseConflictingAnimations of: ", mutation);
-
+    ShadowViewMutationList const &mutations,
+    std::vector<AnimationKeyFrame> &conflictingAnimations) const {
+  ShadowViewMutationList localConflictingMutations{};
+  for (auto const &mutation : mutations) {
+    bool mutationIsCreateOrDelete =
+        mutation.type == ShadowViewMutation::Type::Create ||
+        mutation.type == ShadowViewMutation::Type::Delete;
     auto const &baselineShadowView =
         (mutation.type == ShadowViewMutation::Type::Insert ||
          mutation.type == ShadowViewMutation::Type::Create)
         ? mutation.newChildShadowView
         : mutation.oldChildShadowView;
+    auto baselineTag = baselineShadowView.tag;
 
     for (auto &inflightAnimation : inflightAnimations_) {
       if (inflightAnimation.surfaceId != surfaceId) {
@@ -664,53 +673,53 @@ LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
           continue;
         }
 
-        bool conflicting = animatedKeyFrame.tag == baselineShadowView.tag ||
-            ((mutation.type == ShadowViewMutation::Type::Delete ||
-              mutation.type == ShadowViewMutation::Type::Create) &&
-             animatedKeyFrame.parentView.tag == baselineShadowView.tag) /* ||
-             finalMutationTag == baselineShadowView.tag*/
-            ;
+        // A conflict is when either: the animated node itself is mutated
+        // directly; or, the parent of the node is created or deleted. In cases
+        // of reparenting - say, the parent is deleted but the node was moved to
+        // a different parent first - the reparenting (remove/insert) conflict
+        // will be detected before we process the parent DELETE.
+        // Parent deletion is important because deleting a parent recursively
+        // deletes all children. If we previously deferred deletion of a child,
+        // we need to force deletion/removal to happen immediately.
+        bool conflicting = animatedKeyFrame.tag == baselineTag ||
+            (mutationIsCreateOrDelete &&
+             animatedKeyFrame.parentView.tag == baselineTag &&
+             animatedKeyFrame.parentView.tag != 0);
 
         // Conflicting animation detected: if we're mutating a tag under
         // animation, or deleting the parent of a tag under animation, or
         // reparenting.
         if (conflicting) {
-          auto const layoutAnimationConfig =
-              inflightAnimation.layoutAnimationConfig;
-
-          auto const mutationConfig =
-              (animatedKeyFrame.type == AnimationConfigurationType::Delete
-                   ? layoutAnimationConfig.deleteConfig
-                   : (animatedKeyFrame.type ==
-                              AnimationConfigurationType::Create
-                          ? layoutAnimationConfig.createConfig
-                          : layoutAnimationConfig.updateConfig));
-
           animatedKeyFrame.invalidated = true;
 
           // We construct a list of all conflicting animations, whether or not
           // they have a "final mutation" to execute. This is important with,
           // for example, "insert" mutations where the final update needs to set
           // opacity to "1", even if there's no final ShadowNode update.
-          if (!(animatedKeyFrame.finalMutationForKeyFrame.has_value() &&
-                mutatedViewIsVirtual(
-                    *animatedKeyFrame.finalMutationForKeyFrame))) {
-            conflictingAnimations.push_back(std::make_tuple(
-                animatedKeyFrame, *mutationConfig, &inflightAnimation));
-          }
+          // TODO: don't animate virtual views in the first place?
+          bool isVirtual = false;
+          for (const auto &finalMutationForKeyFrame :
+               animatedKeyFrame.finalMutationsForKeyFrame) {
+            isVirtual =
+                isVirtual || finalMutationForKeyFrame.mutatedViewIsVirtual();
 
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-          if (animatedKeyFrame.finalMutationForKeyFrame.has_value()) {
             PrintMutationInstructionRelative(
                 "Found mutation that conflicts with existing in-flight animation:",
                 mutation,
-                *animatedKeyFrame.finalMutationForKeyFrame);
-          } else {
-            PrintMutationInstruction(
-                "Found mutation that conflicts with existing in-flight animation (no final mutation):",
-                mutation);
-          }
+                finalMutationForKeyFrame);
 #endif
+          }
+
+          conflictingAnimations.push_back(animatedKeyFrame);
+          for (const auto &finalMutationForKeyFrame :
+               animatedKeyFrame.finalMutationsForKeyFrame) {
+            if (!isVirtual ||
+                finalMutationForKeyFrame.type ==
+                    ShadowViewMutation::Type::Delete) {
+              localConflictingMutations.push_back(finalMutationForKeyFrame);
+            }
+          }
 
           // Delete from existing animation
           it = inflightAnimation.keyFrames.erase(it);
@@ -721,7 +730,17 @@ LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
     }
   }
 
-  return conflictingAnimations;
+  // Recurse, in case conflicting mutations conflict with other existing
+  // animations
+  if (!localConflictingMutations.empty()) {
+    getAndEraseConflictingAnimations(
+        surfaceId, localConflictingMutations, conflictingAnimations);
+  }
+}
+
+void LayoutAnimationKeyFrameManager::setClockNow(
+    std::function<uint64_t()> now) {
+  now_ = now;
 }
 
 better::optional<MountingTransaction>
@@ -731,10 +750,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
     TransactionTelemetry const &telemetry,
     ShadowViewMutationList mutations) const {
   // Current time in milliseconds
-  uint64_t now =
-      std::chrono::duration_cast<std::chrono::milliseconds>(
-          std::chrono::high_resolution_clock::now().time_since_epoch())
-          .count();
+  uint64_t now = now_();
 
   bool inflightAnimationsExistInitially = !inflightAnimations_.empty();
 
@@ -785,7 +801,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
     LOG(ERROR) << "BEGINNING DISPLAYING ONGOING inflightAnimations_!";
     int i = 0;
     int j = 0;
-    for (auto &inflightAnimation : inflightAnimations_) {
+    for (auto const &inflightAnimation : inflightAnimations_) {
       i++;
       j = 0;
       if (inflightAnimation.completed) {
@@ -796,20 +812,31 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         if (keyframe.invalidated) {
           continue;
         }
-        if (keyframe.finalMutationForKeyFrame &&
-            !mutatedViewIsVirtual(*keyframe.finalMutationForKeyFrame)) {
-          std::string msg = "Animation " + std::to_string(i) + " keyframe " +
-              std::to_string(j) + ": Final Animation";
-          PrintMutationInstruction(msg, *keyframe.finalMutationForKeyFrame);
-        } else {
-          LOG(ERROR) << "Animation " << i << " keyframe " << j << ": on tag: ["
-                     << keyframe.viewStart.tag << "]";
+        for (const auto &finalMutationForKeyFrame :
+             keyframe.finalMutationsForKeyFrame) {
+          if (finalMutationForKeyFrame.mutatedViewIsVirtual()) {
+            std::string msg = "Animation " + std::to_string(i) + " keyframe " +
+                std::to_string(j) + ": Final Animation";
+            PrintMutationInstruction(msg, finalMutationForKeyFrame);
+          } else {
+            LOG(ERROR) << "Animation " << i << " keyframe " << j
+                       << ": on tag: [" << keyframe.viewStart.tag << "]";
+          }
         }
       }
     }
     LOG(ERROR) << "BEGINNING DONE DISPLAYING ONGOING inflightAnimations_!";
 #endif
 
+    // Stub PropsParserContext used for cloneProps.
+    // This is/should be safe because cloning doesn't actually need to
+    // parse props, and just copies them; therefore there should be no
+    // need to actually use anything in the PropsParserContext.
+    // If this ever changes, the LayoutAnimations API will need to change
+    // to pass in a real PropsParserContext.
+    ContextContainer contextContainer{};
+    PropsParserContext propsParserContext{surfaceId, contextContainer};
+
     // What to do if we detect a conflict? Get current value and make
     // that the baseline of the next animation. Scale the remaining time
     // in the animation
@@ -823,10 +850,9 @@ LayoutAnimationKeyFrameManager::pullTransaction(
     // current mutations then these deleted mutations will serve as the baseline
     // for the next animation. If not, the current mutations are executed
     // immediately without issues.
-    std::vector<
-        std::tuple<AnimationKeyFrame, AnimationConfig, LayoutAnimation *>>
-        conflictingAnimations =
-            getAndEraseConflictingAnimations(surfaceId, mutations);
+    std::vector<AnimationKeyFrame> conflictingAnimations{};
+    getAndEraseConflictingAnimations(
+        surfaceId, mutations, conflictingAnimations);
 
     // Are we animating this list of mutations?
     better::optional<LayoutAnimation> currentAnimation{};
@@ -885,23 +911,25 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       std::vector<AnimationKeyFrame> keyFramesToAnimate;
       std::vector<AnimationKeyFrame> movesToAnimate;
       auto const layoutAnimationConfig = animation.layoutAnimationConfig;
-      for (auto &mutation : mutations) {
+      for (auto const &mutation : mutations) {
         ShadowView baselineShadowView =
             (mutation.type == ShadowViewMutation::Type::Delete ||
-                     mutation.type == ShadowViewMutation::Type::Remove
+                     mutation.type == ShadowViewMutation::Type::Remove ||
+                     mutation.type == ShadowViewMutation::Type::Update
                  ? mutation.oldChildShadowView
                  : mutation.newChildShadowView);
+        react_native_assert(baselineShadowView.tag > 0);
         bool haveComponentDescriptor =
             hasComponentDescriptorForShadowView(baselineShadowView);
 
-        bool executeMutationImmediately = false;
+        // Immediately execute any mutations on a root node
+        if (baselineShadowView.traits.check(
+                ShadowNodeTraits::Trait::RootNodeKind)) {
+          immediateMutations.push_back(mutation);
+          continue;
+        }
 
-        auto mutationConfig =
-            (mutation.type == ShadowViewMutation::Type::Delete
-                 ? layoutAnimationConfig.deleteConfig
-                 : (mutation.type == ShadowViewMutation::Type::Insert
-                        ? layoutAnimationConfig.createConfig
-                        : layoutAnimationConfig.updateConfig));
+        better::optional<ShadowViewMutation> executeMutationImmediately{};
 
         bool isRemoveReinserted =
             mutation.type == ShadowViewMutation::Type::Remove &&
@@ -927,7 +955,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         // Inserts that follow a "remove" of the same tag should be treated as
         // an update (move) animation.
         bool wasInsertedTagRemoved = false;
-        bool haveConfiguration = mutationConfig.has_value();
+        auto movedIt = movedTags.end();
         if (mutation.type == ShadowViewMutation::Type::Insert) {
           // If this is a move, we actually don't want to copy this insert
           // instruction to animated instructions - we want to
@@ -935,22 +963,30 @@ LayoutAnimationKeyFrameManager::pullTransaction(
           // the layout.
           // The corresponding Remove and Insert instructions will instead
           // be treated as "immediate" instructions.
-          auto movedIt = movedTags.find(mutation.newChildShadowView.tag);
+          movedIt = movedTags.find(mutation.newChildShadowView.tag);
           wasInsertedTagRemoved = movedIt != movedTags.end();
-          if (wasInsertedTagRemoved) {
-            mutationConfig = layoutAnimationConfig.updateConfig;
-          }
-          haveConfiguration = mutationConfig.has_value();
-
-          if (wasInsertedTagRemoved && haveConfiguration) {
-            movesToAnimate.push_back(
-                AnimationKeyFrame{{},
-                                  AnimationConfigurationType::Update,
-                                  mutation.newChildShadowView.tag,
-                                  mutation.parentShadowView,
-                                  movedIt->second.oldChildShadowView,
-                                  mutation.newChildShadowView});
-          }
+        }
+
+        auto const &mutationConfig =
+            (mutation.type == ShadowViewMutation::Type::Delete ||
+                     (mutation.type == ShadowViewMutation::Type::Remove &&
+                      !wasInsertedTagRemoved)
+                 ? layoutAnimationConfig.deleteConfig
+                 : (mutation.type == ShadowViewMutation::Type::Insert &&
+                            !wasInsertedTagRemoved
+                        ? layoutAnimationConfig.createConfig
+                        : layoutAnimationConfig.updateConfig));
+        bool haveConfiguration =
+            mutationConfig.animationType != AnimationType::None;
+
+        if (wasInsertedTagRemoved && haveConfiguration) {
+          movesToAnimate.push_back(AnimationKeyFrame{
+              {},
+              AnimationConfigurationType::Update,
+              mutation.newChildShadowView.tag,
+              mutation.parentShadowView,
+              movedIt->second.oldChildShadowView,
+              mutation.newChildShadowView});
         }
 
         // Creates and inserts should also be executed immediately.
@@ -959,7 +995,72 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         if (isRemoveReinserted || !haveConfiguration || isReparented ||
             mutation.type == ShadowViewMutation::Type::Create ||
             mutation.type == ShadowViewMutation::Type::Insert) {
-          executeMutationImmediately = true;
+          executeMutationImmediately = mutation;
+
+          // It is possible, especially in the case of "moves", that we have a
+          // sequence of operations like:
+          // UPDATE X
+          // REMOVE X
+          // INSERT X
+          // In these cases, we will have queued up an animation for the UPDATE
+          // and delayed its execution; the REMOVE and INSERT will be executed
+          // first; and then the UPDATE will be animating to/from ShadowViews
+          // that are out-of-sync with what's on the mounting layer. Thus, for
+          // any UPDATE animations already queued up for this tag, we adjust the
+          // "previous" ShadowView.
+          if (mutation.type == ShadowViewMutation::Type::Insert) {
+            for (auto &keyframe : keyFramesToAnimate) {
+              if (keyframe.tag == baselineShadowView.tag) {
+                // If there's already an animation queued up, followed by this
+                // Insert, it *must* be an Update mutation animation. Other
+                // sequences should not be possible.
+                react_native_assert(
+                    keyframe.type == AnimationConfigurationType::Update);
+
+                // The mutation is an "insert", so it must have a
+                // "newChildShadowView"
+                react_native_assert(mutation.newChildShadowView.tag > 0);
+
+                // Those asserts don't run in prod. If there's some edge-case
+                // that we haven't caught yet, we'd crash in debug; make sure we
+                // don't mutate the prevView in prod.
+                if (keyframe.type == AnimationConfigurationType::Update &&
+                    mutation.newChildShadowView.tag > 0) {
+                  keyframe.viewPrev = mutation.newChildShadowView;
+                }
+              }
+            }
+          } else if (mutation.type == ShadowViewMutation::Type::Remove) {
+            for (auto &keyframe : keyFramesToAnimate) {
+              if (keyframe.tag == baselineShadowView.tag) {
+                // If there's already an animation queued up, followed by this
+                // Insert, it *must* be an Update mutation animation. Other
+                // sequences should not be possible.
+                react_native_assert(
+                    keyframe.type == AnimationConfigurationType::Update);
+
+                // The mutation is a "remove", so it must have a
+                // "oldChildShadowView"
+                react_native_assert(mutation.oldChildShadowView.tag > 0);
+
+                // Those asserts don't run in prod. If there's some edge-case
+                // that we haven't caught yet, we'd crash in debug; make sure we
+                // don't mutate the prevView in prod.
+                // Since normally the UPDATE would have been executed first and
+                // now it's deferred, we need to change the `oldChildShadowView`
+                // that is being referenced by the REMOVE mutation.
+                if (keyframe.type == AnimationConfigurationType::Update &&
+                    mutation.oldChildShadowView.tag > 0) {
+                  executeMutationImmediately = ShadowViewMutation{
+                      mutation.type,
+                      mutation.parentShadowView,
+                      keyframe.viewPrev,
+                      {},
+                      mutation.index};
+                }
+              }
+            }
+          }
         }
 
         // Deletes, non-move inserts, updates get animated
@@ -970,112 +1071,126 @@ LayoutAnimationKeyFrameManager::pullTransaction(
               mutation.type == ShadowViewMutation::Type::Insert
                   ? mutation.newChildShadowView
                   : mutation.oldChildShadowView);
+          react_native_assert(viewStart.tag > 0);
           ShadowView viewFinal = ShadowView(
               mutation.type == ShadowViewMutation::Type::Update
                   ? mutation.newChildShadowView
                   : viewStart);
+          react_native_assert(viewFinal.tag > 0);
           ShadowView parent = mutation.parentShadowView;
+          react_native_assert(
+              parent.tag > 0 ||
+              mutation.type == ShadowViewMutation::Type::Update ||
+              mutation.type == ShadowViewMutation::Type::Delete);
           Tag tag = viewStart.tag;
 
           AnimationKeyFrame keyFrame{};
           if (mutation.type == ShadowViewMutation::Type::Insert) {
-            if (mutationConfig->animationProperty ==
+            if (mutationConfig.animationProperty ==
                     AnimationProperty::Opacity &&
                 haveComponentDescriptor) {
               auto props =
                   getComponentDescriptorForShadowView(baselineShadowView)
-                      .cloneProps(viewStart.props, {});
+                      .cloneProps(propsParserContext, viewStart.props, {});
+
+              // Dynamic cast, because - we don't know the type of this
+              // ShadowNode, it could be Image or Text or something else with
+              // different base props.
               const auto viewProps =
                   dynamic_cast<const ViewProps *>(props.get());
               if (viewProps != nullptr) {
                 const_cast<ViewProps *>(viewProps)->opacity = 0;
               }
-              viewStart.props = props;
-            }
-            bool isScaleX = mutationConfig->animationProperty ==
-                    AnimationProperty::ScaleX ||
-                mutationConfig->animationProperty == AnimationProperty::ScaleXY;
-            bool isScaleY = mutationConfig->animationProperty ==
-                    AnimationProperty::ScaleY ||
-                mutationConfig->animationProperty == AnimationProperty::ScaleXY;
-            if ((isScaleX || isScaleY) && haveComponentDescriptor) {
-              auto props =
-                  getComponentDescriptorForShadowView(baselineShadowView)
-                      .cloneProps(viewStart.props, {});
-              const auto viewProps =
-                  dynamic_cast<const ViewProps *>(props.get());
-              if (viewProps != nullptr) {
-                const_cast<ViewProps *>(viewProps)->transform =
-                    Transform::Scale(isScaleX ? 0 : 1, isScaleY ? 0 : 1, 1);
-              }
-              viewStart.props = props;
-            }
 
-            keyFrame = AnimationKeyFrame{{},
-                                         AnimationConfigurationType::Create,
-                                         tag,
-                                         parent,
-                                         viewStart,
-                                         viewFinal,
-                                         0};
-          } else if (mutation.type == ShadowViewMutation::Type::Delete) {
-            if (mutationConfig->animationProperty ==
-                    AnimationProperty::Opacity &&
-                haveComponentDescriptor) {
-              auto props =
-                  getComponentDescriptorForShadowView(baselineShadowView)
-                      .cloneProps(viewFinal.props, {});
-              const auto viewProps =
-                  dynamic_cast<const ViewProps *>(props.get());
-              if (viewProps != nullptr) {
-                const_cast<ViewProps *>(viewProps)->opacity = 0;
+              react_native_assert(props != nullptr);
+              if (props != nullptr) {
+                viewStart.props = props;
               }
-              viewFinal.props = props;
             }
-            bool isScaleX = mutationConfig->animationProperty ==
-                    AnimationProperty::ScaleX ||
-                mutationConfig->animationProperty == AnimationProperty::ScaleXY;
-            bool isScaleY = mutationConfig->animationProperty ==
-                    AnimationProperty::ScaleY ||
-                mutationConfig->animationProperty == AnimationProperty::ScaleXY;
+            bool isScaleX =
+                mutationConfig.animationProperty == AnimationProperty::ScaleX ||
+                mutationConfig.animationProperty == AnimationProperty::ScaleXY;
+            bool isScaleY =
+                mutationConfig.animationProperty == AnimationProperty::ScaleY ||
+                mutationConfig.animationProperty == AnimationProperty::ScaleXY;
             if ((isScaleX || isScaleY) && haveComponentDescriptor) {
               auto props =
                   getComponentDescriptorForShadowView(baselineShadowView)
-                      .cloneProps(viewFinal.props, {});
+                      .cloneProps(propsParserContext, viewStart.props, {});
+
+              // Dynamic cast, because - we don't know the type of this
+              // ShadowNode, it could be Image or Text or something else with
+              // different base props.
               const auto viewProps =
                   dynamic_cast<const ViewProps *>(props.get());
               if (viewProps != nullptr) {
                 const_cast<ViewProps *>(viewProps)->transform =
                     Transform::Scale(isScaleX ? 0 : 1, isScaleY ? 0 : 1, 1);
               }
-              viewFinal.props = props;
+
+              react_native_assert(props != nullptr);
+              if (props != nullptr) {
+                viewStart.props = props;
+              }
             }
 
+            PrintMutationInstruction(
+                "Setting up animation KeyFrame for INSERT mutation (Create animation)",
+                mutation);
+
             keyFrame = AnimationKeyFrame{
-                better::optional<ShadowViewMutation>(mutation),
-                AnimationConfigurationType::Delete,
+                {},
+                AnimationConfigurationType::Create,
                 tag,
                 parent,
                 viewStart,
                 viewFinal,
+                baselineShadowView,
                 0};
+          } else if (mutation.type == ShadowViewMutation::Type::Delete) {
+// This is just for assertion purposes.
+// The NDEBUG check here is to satisfy the compiler in certain environments
+// complaining about correspondingRemoveIt being unused.
+#ifdef REACT_NATIVE_DEBUG
+#ifndef NDEBUG
+// This block is temporarily disabled to fix some internal builds.
+// In some build configurations, we get a compiler error that
+// `correspondingRemoveIt` is unused.
+/*            Tag deleteTag = mutation.oldChildShadowView.tag;
+            auto correspondingRemoveIt = std::find_if(
+                mutations.begin(),
+                mutations.end(),
+                [&deleteTag](auto &mutation) {
+                  return mutation.type == ShadowViewMutation::Type::Remove &&
+                      mutation.oldChildShadowView.tag == deleteTag;
+                });
+            react_native_assert(correspondingRemoveIt != mutations.end());
+*/
+#endif
+#endif
+            continue;
           } else if (mutation.type == ShadowViewMutation::Type::Update) {
             viewFinal = ShadowView(mutation.newChildShadowView);
 
+            PrintMutationInstruction(
+                "Setting up animation KeyFrame for UPDATE mutation (Update animation)",
+                mutation);
+
             keyFrame = AnimationKeyFrame{
-                better::optional<ShadowViewMutation>(mutation),
+                {mutation},
                 AnimationConfigurationType::Update,
                 tag,
                 parent,
                 viewStart,
                 viewFinal,
+                baselineShadowView,
                 0};
           } else {
             // This should just be "Remove" instructions that are not animated
             // (either this is a "move", or there's a corresponding "Delete"
-            // that is animated). We configure it as a Noop animation so it is
-            // executed when all the other animations are completed.
-            assert(mutation.type == ShadowViewMutation::Type::Remove);
+            // that is animated).
+            react_native_assert(
+                mutation.type == ShadowViewMutation::Type::Remove);
 
             Tag removeTag = mutation.oldChildShadowView.tag;
             auto correspondingInsertIt = std::find_if(
@@ -1086,14 +1201,81 @@ LayoutAnimationKeyFrameManager::pullTransaction(
                       mutation.newChildShadowView.tag == removeTag;
                 });
             if (correspondingInsertIt == mutations.end()) {
-              PrintMutationInstruction("Queueing Delayed", mutation);
+              // This is a REMOVE not paired with an INSERT (move), so it must
+              // be paired with a DELETE.
+              auto correspondingDeleteIt = std::find_if(
+                  mutations.begin(),
+                  mutations.end(),
+                  [&removeTag](auto &mutation) {
+                    return mutation.type == ShadowViewMutation::Type::Delete &&
+                        mutation.oldChildShadowView.tag == removeTag;
+                  });
+              react_native_assert(correspondingDeleteIt != mutations.end());
+
+              auto deleteMutation = *correspondingDeleteIt;
+
+              if (mutationConfig.animationProperty ==
+                      AnimationProperty::Opacity &&
+                  haveComponentDescriptor) {
+                auto props =
+                    getComponentDescriptorForShadowView(baselineShadowView)
+                        .cloneProps(propsParserContext, viewFinal.props, {});
+
+                // Dynamic cast, because - we don't know the type of this
+                // ShadowNode, it could be Image or Text or something else with
+                // different base props.
+                const auto viewProps =
+                    dynamic_cast<const ViewProps *>(props.get());
+                if (viewProps != nullptr) {
+                  const_cast<ViewProps *>(viewProps)->opacity = 0;
+                }
+
+                react_native_assert(props != nullptr);
+                if (props != nullptr) {
+                  viewFinal.props = props;
+                }
+              }
+              bool isScaleX = mutationConfig.animationProperty ==
+                      AnimationProperty::ScaleX ||
+                  mutationConfig.animationProperty ==
+                      AnimationProperty::ScaleXY;
+              bool isScaleY = mutationConfig.animationProperty ==
+                      AnimationProperty::ScaleY ||
+                  mutationConfig.animationProperty ==
+                      AnimationProperty::ScaleXY;
+              if ((isScaleX || isScaleY) && haveComponentDescriptor) {
+                auto props =
+                    getComponentDescriptorForShadowView(baselineShadowView)
+                        .cloneProps(propsParserContext, viewFinal.props, {});
+
+                // Dynamic cast, because - we don't know the type of this
+                // ShadowNode, it could be Image or Text or something else with
+                // different base props.
+                const auto viewProps =
+                    dynamic_cast<const ViewProps *>(props.get());
+                if (viewProps != nullptr) {
+                  const_cast<ViewProps *>(viewProps)->transform =
+                      Transform::Scale(isScaleX ? 0 : 1, isScaleY ? 0 : 1, 1);
+                }
+
+                react_native_assert(props != nullptr);
+                if (props != nullptr) {
+                  viewFinal.props = props;
+                }
+              }
+
+              PrintMutationInstruction(
+                  "Setting up animation KeyFrame for REMOVE mutation (Delete animation)",
+                  mutation);
+
               keyFrame = AnimationKeyFrame{
-                  better::optional<ShadowViewMutation>(mutation),
-                  AnimationConfigurationType::Noop,
+                  {mutation, deleteMutation},
+                  AnimationConfigurationType::Delete,
                   tag,
                   parent,
-                  {},
-                  {},
+                  viewStart,
+                  viewFinal,
+                  baselineShadowView,
                   0};
             } else {
               PrintMutationInstruction(
@@ -1105,37 +1287,33 @@ LayoutAnimationKeyFrameManager::pullTransaction(
           }
 
           // Handle conflicting animations
-          for (auto &conflictingKeyframeTuple : conflictingAnimations) {
-            auto &conflictingKeyFrame = std::get<0>(conflictingKeyframeTuple);
+          for (auto &conflictingKeyFrame : conflictingAnimations) {
             auto const &conflictingMutationBaselineShadowView =
                 conflictingKeyFrame.viewStart;
 
             // We've found a conflict.
             if (conflictingMutationBaselineShadowView.tag == tag) {
-              // What's the progress of this ongoing animation?
-              double conflictingAnimationProgress =
-                  calculateAnimationProgress(
-                      now,
-                      *std::get<2>(conflictingKeyframeTuple),
-                      std::get<1>(conflictingKeyframeTuple))
-                      .first;
-
-              // Get a baseline ShadowView at the current progress of the
-              // inflight animation. TODO: handle multiple properties being
-              // animated separately?
-              auto interpolatedInflightShadowView =
-                  createInterpolatedShadowView(
-                      conflictingAnimationProgress,
-                      conflictingKeyFrame.viewStart,
-                      conflictingKeyFrame.viewEnd);
+              conflictingKeyFrame.generateFinalSyntheticMutations = false;
+
+              // Do NOT update viewStart for a CREATE animation.
+              if (keyFrame.type == AnimationConfigurationType::Create) {
+                break;
+              }
 
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
+              LOG(ERROR)
+                  << "Due to conflict, replacing 'viewStart' of animated keyframe: ["
+                  << conflictingKeyFrame.viewPrev.tag << "] with ##"
+                  << std::hash<ShadowView>{}(conflictingKeyFrame.viewPrev);
+#endif
               // Pick a Prop or layout property, depending on the current
               // animation configuration. Figure out how much progress we've
               // already made in the current animation, and start the animation
               // from this point.
-              keyFrame.viewStart = interpolatedInflightShadowView;
-              keyFrame.initialProgress = getProgressThroughAnimation(
-                  keyFrame, &animation, interpolatedInflightShadowView);
+              keyFrame.viewPrev = conflictingKeyFrame.viewPrev;
+              keyFrame.viewStart = conflictingKeyFrame.viewPrev;
+              react_native_assert(keyFrame.viewStart.tag > 0);
+              keyFrame.initialProgress = 0;
 
               // We're guaranteed that a tag only has one animation associated
               // with it, so we can break here. If we support multiple
@@ -1145,11 +1323,22 @@ LayoutAnimationKeyFrameManager::pullTransaction(
             }
           }
 
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
+          LOG(ERROR) << "Checking validity of keyframe: ["
+                     << keyFrame.viewStart.tag << "] [" << keyFrame.viewEnd.tag
+                     << "] [" << keyFrame.viewPrev.tag
+                     << "] animation type: " << (int)keyFrame.type;
+#endif
+          react_native_assert(keyFrame.viewStart.tag > 0);
+          react_native_assert(keyFrame.viewEnd.tag > 0);
+          react_native_assert(keyFrame.viewPrev.tag > 0);
           keyFramesToAnimate.push_back(keyFrame);
         }
 
-        if (executeMutationImmediately) {
-          immediateMutations.push_back(mutation);
+        if (executeMutationImmediately.hasValue()) {
+          PrintMutationInstruction(
+              "Queue Up For Immediate Execution", *executeMutationImmediately);
+          immediateMutations.push_back(*executeMutationImmediately);
         }
       }
 
@@ -1169,11 +1358,12 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       {
         int idx = 0;
         for (const auto &keyframe : keyFramesToAnimate) {
-          if (keyframe.finalMutationForKeyFrame.has_value()) {
+          for (const auto &finalMutationForKeyFrame :
+               keyframe.finalMutationsForKeyFrame) {
             PrintMutationInstruction(
                 std::string("FINAL list: ") + std::to_string(idx) + "/" +
                     std::to_string(keyFramesToAnimate.size()),
-                *keyframe.finalMutationForKeyFrame);
+                finalMutationForKeyFrame);
           }
           idx++;
         }
@@ -1182,46 +1372,64 @@ LayoutAnimationKeyFrameManager::pullTransaction(
 #endif
 
       auto finalConflictingMutations = ShadowViewMutationList{};
-      for (auto &conflictingKeyframeTuple : conflictingAnimations) {
-        auto &keyFrame = std::get<0>(conflictingKeyframeTuple);
-        if (keyFrame.finalMutationForKeyFrame.hasValue()) {
-          auto &mutation = *keyFrame.finalMutationForKeyFrame;
-          if (mutation.type == ShadowViewMutation::Type::Update) {
-            const auto &mutationInstruction =
-                ShadowViewMutation::UpdateMutation(
-                    mutation.parentShadowView,
-                    {},
-                    mutation.newChildShadowView,
-                    mutation.index);
-            PrintMutationInstruction(
-                "Queueing up final mutation instruction - update:",
-                mutationInstruction);
-            finalConflictingMutations.push_back(std::move(mutationInstruction));
-          } else {
-            PrintMutationInstruction(
-                "Queueing up final mutation instruction - non-update",
-                mutation);
-            finalConflictingMutations.push_back(mutation);
+      for (auto &keyFrame : conflictingAnimations) {
+        // Special-case: if we have some (1) ongoing UPDATE animation,
+        // (2) it conflicted with a new MOVE operation (REMOVE+INSERT)
+        // without another corresponding UPDATE, we should re-queue the
+        // keyframe so that its position/props don't suddenly "jump".
+        if (keyFrame.type == AnimationConfigurationType::Update) {
+          auto movedIt = movedTags.find(keyFrame.tag);
+          if (movedIt != movedTags.end()) {
+            auto newKeyFrameForUpdate = std::find_if(
+                keyFramesToAnimate.begin(),
+                keyFramesToAnimate.end(),
+                [&](auto const &newKeyFrame) {
+                  return newKeyFrame.type ==
+                      AnimationConfigurationType::Update &&
+                      newKeyFrame.tag == keyFrame.tag;
+                });
+            if (newKeyFrameForUpdate == keyFramesToAnimate.end()) {
+              keyFrame.invalidated = false;
+
+              // The animation will continue from the current position - we
+              // restart viewStart to make sure there are no sudden jumps
+              keyFrame.viewStart = keyFrame.viewPrev;
+
+              // Find the insert mutation that conflicted with this update
+              for (auto &mutation : immediateMutations) {
+                if (mutation.newChildShadowView.tag == keyFrame.tag &&
+                    (mutation.type == ShadowViewMutation::Insert ||
+                     mutation.type == ShadowViewMutation::Create)) {
+                  keyFrame.viewPrev = mutation.newChildShadowView;
+                  keyFrame.viewEnd = mutation.newChildShadowView;
+                }
+              }
+              keyFramesToAnimate.push_back(keyFrame);
+              continue;
+            }
           }
-        } else {
-          // If there's no final mutation associated, create a mutation that
-          // corresponds to the animation being 100% complete. This is important
-          // for, for example, INSERT mutations being animated from opacity 0
-          // to 1. If the animation is interrupted we must force the View to be
-          // at opacity 1.
-          auto mutatedShadowView = createInterpolatedShadowView(
-              1, keyFrame.viewStart, keyFrame.viewEnd);
-          auto generatedMutation = ShadowViewMutation::UpdateMutation(
-              keyFrame.parentView,
-              keyFrame.viewStart,
-              std::move(mutatedShadowView),
-              -1);
-          PrintMutationInstruction(
-              "Queueing up final mutation instruction - synthetic",
-              generatedMutation);
-          // Create the mutation instruction
-          finalConflictingMutations.push_back(generatedMutation);
         }
+
+        // If the "final" mutation is already accounted for, by previously
+        // setting the correct "viewPrev" of the next conflicting animation, we
+        // don't want to queue up any final UPDATE mutations here.
+        bool shouldGenerateSyntheticMutations =
+            keyFrame.generateFinalSyntheticMutations;
+        bool numFinalMutations = keyFrame.finalMutationsForKeyFrame.size();
+        bool onlyMutationIsUpdate =
+            (numFinalMutations == 1 &&
+             keyFrame.finalMutationsForKeyFrame[0].type ==
+                 ShadowViewMutation::Update);
+        if (!shouldGenerateSyntheticMutations &&
+            (numFinalMutations == 0 || onlyMutationIsUpdate)) {
+          continue;
+        }
+
+        queueFinalMutationsForCompletedKeyFrame(
+            keyFrame,
+            finalConflictingMutations,
+            true,
+            "KeyFrameManager: Finished Conflicting Keyframe");
       }
 
       // Make sure that all operations execute in the proper order, since
@@ -1243,8 +1451,8 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // Knowledge Graph:
       // [ImmediateMutations] -> assumes [FinalConflicting], [FrameDelayed],
       // [Delayed] already executed [FrameDelayed] -> assumes
-      // [FinalConflicting], [Delayed] already executed [FinalConflicting] -> is
-      // adjusted based on [Delayed], no dependency on [FinalConflicting],
+      // [FinalConflicting], [Delayed] already executed [FinalConflicting] ->
+      // is adjusted based on [Delayed], no dependency on [FinalConflicting],
       // [FrameDelayed] [Delayed] -> assumes [FinalConflicting],
       // [ImmediateMutations] not executed yet
 
@@ -1252,8 +1460,8 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // Knowledge Graph:
       // [ImmediateMutations] -> assumes [FinalConflicting], [FrameDelayed],
       // [Delayed] already executed [FrameDelayed] -> assumes
-      // [FinalConflicting], [Delayed] already executed [FinalConflicting] -> is
-      // adjusted based on [Delayed], no dependency on [FinalConflicting],
+      // [FinalConflicting], [Delayed] already executed [FinalConflicting] ->
+      // is adjusted based on [Delayed], no dependency on [FinalConflicting],
       // [FrameDelayed] [Delayed] -> adjusted for [FinalConflicting]; assumes
       // [ImmediateMutations] not executed yet
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
@@ -1271,22 +1479,21 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // [ImmediateExecutions] -> assumes [FinalConflicting], [Delayed],
       // [FrameDelayed] already executed [FrameDelayed] -> adjusted for
       // [Delayed]; assumes [FinalConflicting] already executed
-      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
-      // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
+      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency
+      // on [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
       // [FinalConflicting]; assumes [ImmediateExecutions] not executed yet
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
       LOG(ERROR) << "Adjust [FrameDelayed] based on [Delayed]";
 #endif
       for (auto &keyframe : inflightAnimations_.back().keyFrames) {
-        if (keyframe.finalMutationForKeyFrame.has_value()) {
-          auto &mutation = *keyframe.finalMutationForKeyFrame;
-          if (mutation.type == ShadowViewMutation::Type::Insert ||
-              mutation.type == ShadowViewMutation::Type::Remove) {
+        for (auto &finalMutation : keyframe.finalMutationsForKeyFrame) {
+          if (finalMutation.type == ShadowViewMutation::Type::Insert ||
+              finalMutation.type == ShadowViewMutation::Type::Remove) {
             // When adjusting, skip adjusting against last animation - because
             // all `mutation`s here come from the last animation, so we can't
             // adjust a batch against itself.
             adjustImmediateMutationIndicesForDelayedMutations(
-                surfaceId, mutation, true);
+                surfaceId, finalMutation, true);
           }
         }
       }
@@ -1294,21 +1501,21 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // Adjust [ImmediateExecutions] based on [Delayed]
       // Knowledge Graph:
       // [ImmediateExecutions] -> adjusted for [FrameDelayed], [Delayed];
-      // assumes [FinalConflicting] already executed [FrameDelayed] -> adjusted
-      // for [Delayed]; assumes [FinalConflicting] already executed
-      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
-      // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
+      // assumes [FinalConflicting] already executed [FrameDelayed] ->
+      // adjusted for [Delayed]; assumes [FinalConflicting] already executed
+      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency
+      // on [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
       // [FinalConflicting]; assumes [ImmediateExecutions] not executed yet
       //
       // THEN,
-      // Adjust [Delayed] based on [ImmediateExecutions] and [FinalConflicting]
-      // Knowledge Graph:
-      // [ImmediateExecutions] -> adjusted for [FrameDelayed], [Delayed];
-      // assumes [FinalConflicting] already executed [FrameDelayed] -> adjusted
-      // for [Delayed]; assumes [FinalConflicting] already executed
-      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
-      // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
-      // [FinalConflicting], [ImmediateExecutions]
+      // Adjust [Delayed] based on [ImmediateExecutions] and
+      // [FinalConflicting] Knowledge Graph: [ImmediateExecutions] -> adjusted
+      // for [FrameDelayed], [Delayed]; assumes [FinalConflicting] already
+      // executed [FrameDelayed] -> adjusted for [Delayed]; assumes
+      // [FinalConflicting] already executed [FinalConflicting] -> is adjusted
+      // based on [Delayed], no dependency on [FinalConflicting],
+      // [FrameDelayed] [Delayed] -> adjusted for [FinalConflicting],
+      // [ImmediateExecutions]
       //
       // We do these in the same loop because each immediate execution is
       // impacted by each delayed mutation, and also can impact each delayed
@@ -1320,9 +1527,9 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       for (auto &mutation : immediateMutations) {
         // Note: when adjusting [ImmediateExecutions] based on [FrameDelayed],
         // we need only adjust Inserts. Since inserts are executed
-        // highest-index-first, lower indices being delayed does not impact the
-        // higher-index removals; and conversely, higher indices being delayed
-        // cannot impact lower index removal, regardless of order.
+        // highest-index-first, lower indices being delayed does not impact
+        // the higher-index removals; and conversely, higher indices being
+        // delayed cannot impact lower index removal, regardless of order.
         if (mutation.type == ShadowViewMutation::Type::Insert ||
             mutation.type == ShadowViewMutation::Type::Remove) {
           adjustImmediateMutationIndicesForDelayedMutations(
@@ -1336,56 +1543,36 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         }
       }
 
-      // If the knowledge graph progression above is correct, it is now safe to
-      // execute finalConflictingMutations and immediateMutations in that order,
-      // and to queue the delayed animations from this frame.
+      // If the knowledge graph progression above is correct, it is now safe
+      // to execute finalConflictingMutations and immediateMutations in that
+      // order, and to queue the delayed animations from this frame.
       //
       // Execute the conflicting, delayed operations immediately. Any UPDATE
       // operations that smoothly transition into another animation will be
       // overridden by generated UPDATE operations at the end of the list, and
       // we want any REMOVE or DELETE operations to execute immediately.
-      // Additionally, this should allow us to avoid performing index adjustment
-      // between this list of conflicting animations and the batch we're about
-      // to execute.
+      // Additionally, this should allow us to avoid performing index
+      // adjustment between this list of conflicting animations and the batch
+      // we're about to execute.
       finalConflictingMutations.insert(
           finalConflictingMutations.end(),
           immediateMutations.begin(),
           immediateMutations.end());
       mutations = finalConflictingMutations;
-    } /* if (currentAnimation) */ else {
+    } /* if (currentAnimation) */
+    else {
       // If there's no "next" animation, make sure we queue up "final"
       // operations from all ongoing, conflicting animations.
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
       LOG(ERROR) << "No Animation: Queue up final conflicting animations";
 #endif
       ShadowViewMutationList finalMutationsForConflictingAnimations{};
-      for (auto &conflictingKeyframeTuple : conflictingAnimations) {
-        auto &keyFrame = std::get<0>(conflictingKeyframeTuple);
-        if (keyFrame.finalMutationForKeyFrame.hasValue()) {
-          PrintMutationInstruction(
-              "No Animation: Queueing final mutation instruction",
-              *keyFrame.finalMutationForKeyFrame);
-          finalMutationsForConflictingAnimations.push_back(
-              *keyFrame.finalMutationForKeyFrame);
-        } else {
-          // If there's no final mutation associated, create a mutation that
-          // corresponds to the animation being 100% complete. This is important
-          // for, for example, INSERT mutations being animated from opacity 0
-          // to 1. If the animation is interrupted we must force the View to be
-          // at opacity 1.
-          auto mutatedShadowView = createInterpolatedShadowView(
-              1, keyFrame.viewStart, keyFrame.viewEnd);
-          auto generatedMutation = ShadowViewMutation::UpdateMutation(
-              keyFrame.parentView,
-              keyFrame.viewStart,
-              std::move(mutatedShadowView),
-              -1);
-          PrintMutationInstruction(
-              "Queueing up final mutation instruction - synthetic",
-              generatedMutation);
-          // Create the mutation instruction
-          finalMutationsForConflictingAnimations.push_back(generatedMutation);
-        }
+      for (auto const &keyFrame : conflictingAnimations) {
+        queueFinalMutationsForCompletedKeyFrame(
+            keyFrame,
+            finalMutationsForConflictingAnimations,
+            true,
+            "Conflict with non-animated mutation");
       }
 
       // Make sure that all operations execute in the proper order.
@@ -1399,17 +1586,17 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       LOG(ERROR)
           << "No Animation: Adjust delayed mutations based on all finalMutationsForConflictingAnimations";
 #endif
-      for (auto &mutation : finalMutationsForConflictingAnimations) {
+      for (auto const &mutation : finalMutationsForConflictingAnimations) {
         if (mutation.type == ShadowViewMutation::Type::Remove ||
             mutation.type == ShadowViewMutation::Type::Insert) {
           adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
         }
       }
 
-      // The ShadowTree layer doesn't realize that certain operations have been
-      // delayed, so we must adjust all Remove and Insert operations based on
-      // what else has been deferred, whether we are executing this immediately
-      // or later.
+      // The ShadowTree layer doesn't realize that certain operations have
+      // been delayed, so we must adjust all Remove and Insert operations
+      // based on what else has been deferred, whether we are executing this
+      // immediately or later.
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
       LOG(ERROR)
           << "No Animation: Adjust mutations based on remaining delayed mutations / adjust delayed, based on each";
@@ -1463,7 +1650,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
   LOG(ERROR) << "FINISHING DISPLAYING ONGOING inflightAnimations_!";
   int i = 0;
   int j = 0;
-  for (auto &inflightAnimation : inflightAnimations_) {
+  for (auto const &inflightAnimation : inflightAnimations_) {
     i++;
     j = 0;
     if (inflightAnimation.completed) {
@@ -1474,14 +1661,12 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       if (keyframe.invalidated) {
         continue;
       }
-      if (keyframe.finalMutationForKeyFrame &&
-          !mutatedViewIsVirtual(*keyframe.finalMutationForKeyFrame)) {
-        std::string msg = "Animation " + std::to_string(i) + " keyframe " +
-            std::to_string(j) + ": Final Animation";
-        PrintMutationInstruction(msg, *keyframe.finalMutationForKeyFrame);
-      } else {
-        LOG(ERROR) << "Animation " << i << " keyframe " << j << ": on tag: ["
-                   << keyframe.viewStart.tag << "]";
+      for (auto const &finalMutation : keyframe.finalMutationsForKeyFrame) {
+        if (!finalMutation.mutatedViewIsVirtual()) {
+          std::string msg = "Animation " + std::to_string(i) + " keyframe " +
+              std::to_string(j) + ": Final Animation";
+          PrintMutationInstruction(msg, finalMutation);
+        }
       }
     }
   }
@@ -1507,21 +1692,6 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       surfaceId, transactionNumber, std::move(mutations), telemetry};
 }
 
-bool LayoutAnimationKeyFrameManager::mutatedViewIsVirtual(
-    ShadowViewMutation const &mutation) const {
-  bool viewIsVirtual = false;
-
-  // TODO: extract this into an Android platform-specific class?
-  // Explanation: for "Insert" mutations, oldChildShadowView is always empty.
-  //              for "Remove" mutations, newChildShadowView is always empty.
-#ifdef ANDROID
-  viewIsVirtual =
-      mutation.newChildShadowView.layoutMetrics == EmptyLayoutMetrics &&
-      mutation.oldChildShadowView.layoutMetrics == EmptyLayoutMetrics;
-#endif
-  return viewIsVirtual;
-}
-
 bool LayoutAnimationKeyFrameManager::hasComponentDescriptorForShadowView(
     ShadowView const &shadowView) const {
   return componentDescriptorRegistry_->hasComponentDescriptorAt(
@@ -1552,20 +1722,50 @@ ShadowView LayoutAnimationKeyFrameManager::createInterpolatedShadowView(
     double progress,
     ShadowView startingView,
     ShadowView finalView) const {
+  react_native_assert(startingView.tag > 0);
+  react_native_assert(finalView.tag > 0);
   if (!hasComponentDescriptorForShadowView(startingView)) {
+    LOG(ERROR) << "No ComponentDescriptor for ShadowView being animated: ["
+               << startingView.tag << "]";
+    react_native_assert(false);
     return finalView;
   }
+
+  // Stub PropsParserContext used for interpolateProps.
+  // This is/should be safe because interpolating doesn't actually need to
+  // parse props, and just copies them; therefore there should be no
+  // need to actually use anything in the PropsParserContext.
+  // If this ever changes, the LayoutAnimations API will need to change
+  // to pass in a real PropsParserContext.
+  ContextContainer contextContainer{};
+  PropsParserContext propsParserContext{-1, contextContainer};
+
   ComponentDescriptor const &componentDescriptor =
       getComponentDescriptorForShadowView(startingView);
-  auto mutatedShadowView = ShadowView(startingView);
 
+  // Base the mutated view on the finalView, so that the following stay
+  // consistent:
+  // - state
+  // - eventEmitter
+  // For now, we do not allow interpolation of state. And we probably never
+  // will, so make sure we always keep the mounting layer consistent with the
+  // "final" state.
+  auto mutatedShadowView = ShadowView(finalView);
+  react_native_assert(mutatedShadowView.tag > 0);
+
+  react_native_assert(startingView.props != nullptr);
+  react_native_assert(finalView.props != nullptr);
   if (startingView.props == nullptr || finalView.props == nullptr) {
     return finalView;
   }
 
   // Animate opacity or scale/transform
   mutatedShadowView.props = componentDescriptor.interpolateProps(
-      progress, startingView.props, finalView.props);
+      propsParserContext, progress, startingView.props, finalView.props);
+  react_native_assert(mutatedShadowView.props != nullptr);
+  if (mutatedShadowView.props == nullptr) {
+    return finalView;
+  }
 
   // Interpolate LayoutMetrics
   LayoutMetrics const &finalLayoutMetrics = finalView.layoutMetrics;
@@ -1592,6 +1792,90 @@ ShadowView LayoutAnimationKeyFrameManager::createInterpolatedShadowView(
   return mutatedShadowView;
 }
 
+void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
+    AnimationKeyFrame const &keyframe,
+    ShadowViewMutation::List &mutationsList,
+    bool interrupted,
+    std::string logPrefix) const {
+  if (keyframe.finalMutationsForKeyFrame.size() > 0) {
+    // TODO: modularize this segment, it is repeated 2x in KeyFrameManager
+    // as well.
+    ShadowView prev = keyframe.viewPrev;
+    for (auto const &finalMutation : keyframe.finalMutationsForKeyFrame) {
+      PrintMutationInstruction(
+          logPrefix + ": Queuing up Final Mutation:", finalMutation);
+      // Copy so that if something else mutates the inflight animations,
+      // it won't change this mutation after this point.
+      auto mutation = ShadowViewMutation{
+          finalMutation.type,
+          finalMutation.parentShadowView,
+          prev,
+          finalMutation.newChildShadowView,
+          finalMutation.index};
+      react_native_assert(mutation.oldChildShadowView.tag > 0);
+      react_native_assert(
+          mutation.newChildShadowView.tag > 0 ||
+          finalMutation.type == ShadowViewMutation::Remove ||
+          finalMutation.type == ShadowViewMutation::Delete);
+      mutationsList.push_back(mutation);
+      if (finalMutation.newChildShadowView.tag > 0) {
+        prev = finalMutation.newChildShadowView;
+      }
+    }
+  } else {
+    // If there's no final mutation associated, create a mutation that
+    // corresponds to the animation being 100% complete. This is
+    // important for, for example, INSERT mutations being animated from
+    // opacity 0 to 1. If the animation is interrupted we must force the
+    // View to be at opacity 1. For Android - since it passes along only
+    // deltas, not an entire bag of props - generate an "animation"
+    // frame corresponding to a final update for this view. Only then,
+    // generate an update that will cause the ShadowTree to be
+    // consistent with the Mounting layer by passing viewEnd,
+    // unmodified, to the mounting layer. This helps with, for example,
+    // opacity animations.
+    // This is necessary for INSERT (create) and UPDATE (update) mutations, but
+    // not REMOVE/DELETE mutations ("delete" animations).
+    if (interrupted) {
+      auto mutatedShadowView =
+          createInterpolatedShadowView(1, keyframe.viewStart, keyframe.viewEnd);
+      auto generatedPenultimateMutation = ShadowViewMutation::UpdateMutation(
+          keyframe.viewPrev, mutatedShadowView);
+      react_native_assert(
+          generatedPenultimateMutation.oldChildShadowView.tag > 0);
+      react_native_assert(
+          generatedPenultimateMutation.newChildShadowView.tag > 0);
+      PrintMutationInstruction(
+          "Queueing up penultimate mutation instruction - synthetic",
+          generatedPenultimateMutation);
+      mutationsList.push_back(generatedPenultimateMutation);
+
+      auto generatedMutation = ShadowViewMutation::UpdateMutation(
+          mutatedShadowView, keyframe.viewEnd);
+      react_native_assert(generatedMutation.oldChildShadowView.tag > 0);
+      react_native_assert(generatedMutation.newChildShadowView.tag > 0);
+      PrintMutationInstruction(
+          "Queueing up final mutation instruction - synthetic",
+          generatedMutation);
+      mutationsList.push_back(generatedMutation);
+    } else {
+      auto mutation = ShadowViewMutation{
+          ShadowViewMutation::Type::Update,
+          keyframe.parentView,
+          keyframe.viewPrev,
+          keyframe.viewEnd,
+          -1};
+      PrintMutationInstruction(
+          logPrefix +
+              "Animation Complete: Queuing up Final Synthetic Mutation:",
+          mutation);
+      react_native_assert(mutation.oldChildShadowView.tag > 0);
+      react_native_assert(mutation.newChildShadowView.tag > 0);
+      mutationsList.push_back(mutation);
+    }
+  }
+}
+
 void LayoutAnimationKeyFrameManager::callCallback(
     const LayoutAnimationCallbackWrapper &callback) const {
   if (callback.readyForCleanup()) {
@@ -1622,8 +1906,8 @@ void LayoutAnimationKeyFrameManager::callCallback(
         callbackWrappersPending_.end());
 
     // Hold onto a reference to the callback, only while
-    // LayoutAnimationKeyFrameManager is alive and the callback hasn't completed
-    // yet.
+    // LayoutAnimationKeyFrameManager is alive and the callback hasn't
+    // completed yet.
     callbackWrappersPending_.push_back(std::move(copiedCallback));
   }
 }
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
index 9015aa1b61a95f..eaad96b3abb056 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
@@ -7,16 +7,11 @@
 
 #pragma once
 
-// Enable some or all of these to enable very verbose logging for
-// LayoutAnimations
-//#define LAYOUT_ANIMATION_VERBOSE_LOGGING 1
-//#define RN_SHADOW_TREE_INTROSPECTION
-//#define RN_DEBUG_STRING_CONVERTIBLE 1
-
 #include <ReactCommon/RuntimeExecutor.h>
 #include <better/optional.h>
 #include <react/renderer/core/EventTarget.h>
 #include <react/renderer/core/RawValue.h>
+#include <react/renderer/debug/flags.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
@@ -43,28 +38,22 @@ void PrintMutationInstructionRelative(
 
 // This corresponds exactly with JS.
 enum class AnimationType {
-  None,
-  Spring,
-  Linear,
-  EaseInEaseOut,
-  EaseIn,
-  EaseOut,
-  Keyboard
+  None = 0,
+  Spring = 1,
+  Linear = 2,
+  EaseInEaseOut = 4,
+  EaseIn = 8,
+  EaseOut = 16,
+  Keyboard = 32
 };
 enum class AnimationProperty {
-  NotApplicable,
-  Opacity,
-  ScaleX,
-  ScaleY,
-  ScaleXY
-};
-enum class AnimationConfigurationType {
-  Noop, // for animation placeholders that are not animated, and should be
-  // executed once other animations have completed
-  Create,
-  Update,
-  Delete
+  NotApplicable = 0,
+  Opacity = 1,
+  ScaleX = 2,
+  ScaleY = 4,
+  ScaleXY = 8
 };
+enum class AnimationConfigurationType { Create = 1, Update = 2, Delete = 4 };
 
 // This corresponds exactly with JS.
 struct AnimationConfig {
@@ -81,15 +70,17 @@ struct AnimationConfig {
 // This corresponds exactly with JS.
 struct LayoutAnimationConfig {
   double duration; // ms
-  better::optional<AnimationConfig> createConfig;
-  better::optional<AnimationConfig> updateConfig;
-  better::optional<AnimationConfig> deleteConfig;
+  AnimationConfig createConfig;
+  AnimationConfig updateConfig;
+  AnimationConfig deleteConfig;
 };
 
 struct AnimationKeyFrame {
-  // The mutation that should be executed once the animation completes
-  // (optional).
-  better::optional<ShadowViewMutation> finalMutationForKeyFrame;
+  // The mutation(s) that should be executed once the animation completes.
+  // This maybe empty.
+  // For CREATE/INSERT this will contain CREATE, INSERT in that order.
+  // For REMOVE/DELETE, same.
+  std::vector<ShadowViewMutation> finalMutationsForKeyFrame;
 
   // The type of animation this is (for configuration purposes)
   AnimationConfigurationType type;
@@ -103,11 +94,18 @@ struct AnimationKeyFrame {
   ShadowView viewStart;
   ShadowView viewEnd;
 
+  // ShadowView representing the previous frame of the animation.
+  ShadowView viewPrev;
+
   // If an animation interrupts an existing one, the starting state may actually
   // be halfway through the intended transition.
   double initialProgress;
 
   bool invalidated{false};
+
+  // In the case where some mutation conflicts with this keyframe,
+  // should we generate final synthetic UPDATE mutations for this keyframe?
+  bool generateFinalSyntheticMutations{true};
 };
 
 class LayoutAnimationCallbackWrapper {
@@ -115,7 +113,6 @@ class LayoutAnimationCallbackWrapper {
   LayoutAnimationCallbackWrapper(jsi::Function &&callback)
       : callback_(std::make_shared<jsi::Function>(std::move(callback))) {}
   LayoutAnimationCallbackWrapper() : callback_(nullptr) {}
-  ~LayoutAnimationCallbackWrapper() {}
 
   // Copy and assignment-copy constructors should copy callback_, and not
   // std::move it. Copying is desirable, otherwise the shared_ptr and
@@ -131,7 +128,7 @@ class LayoutAnimationCallbackWrapper {
     }
 
     std::weak_ptr<jsi::Function> callable = callback_;
-    std::shared_ptr<bool> callComplete = callComplete_;
+    std::shared_ptr<std::atomic_bool> callComplete = callComplete_;
 
     runtimeExecutor(
         [=, callComplete = std::move(callComplete)](jsi::Runtime &runtime) {
@@ -147,7 +144,8 @@ class LayoutAnimationCallbackWrapper {
   }
 
  private:
-  std::shared_ptr<bool> callComplete_ = std::make_shared<bool>(false);
+  std::shared_ptr<std::atomic_bool> callComplete_ =
+      std::make_shared<std::atomic_bool>(false);
   std::shared_ptr<jsi::Function> callback_;
 };
 
@@ -168,24 +166,35 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
       RuntimeExecutor runtimeExecutor,
       LayoutAnimationStatusDelegate *delegate)
       : runtimeExecutor_(runtimeExecutor),
-        layoutAnimationStatusDelegate_(delegate) {}
+        layoutAnimationStatusDelegate_(delegate),
+        now_([]() {
+          return std::chrono::duration_cast<std::chrono::milliseconds>(
+                     std::chrono::high_resolution_clock::now()
+                         .time_since_epoch())
+              .count();
+        }) {}
   ~LayoutAnimationKeyFrameManager() {}
 
+#pragma mark UIManagerAnimationDelegate methods
+
   void uiManagerDidConfigureNextLayoutAnimation(
       jsi::Runtime &runtime,
       RawValue const &config,
       const jsi::Value &successCallbackValue,
       const jsi::Value &failureCallbackValue) const override;
+
   void setComponentDescriptorRegistry(SharedComponentDescriptorRegistry const &
                                           componentDescriptorRegistry) override;
 
   // TODO: add SurfaceId to this API as well
   bool shouldAnimateFrame() const override;
 
-  bool shouldOverridePullTransaction() const override;
-
   void stopSurface(SurfaceId surfaceId) override;
 
+#pragma mark MountingOverrideDelegate methods
+
+  bool shouldOverridePullTransaction() const override;
+
   // This is used to "hijack" the diffing process to figure out which mutations
   // should be animated. The mutations returned by this function will be
   // executed immediately.
@@ -195,6 +204,11 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
       TransactionTelemetry const &telemetry,
       ShadowViewMutationList mutations) const override;
 
+  // Exposed for testing.
+ public:
+  void uiManagerDidConfigureNextLayoutAnimation(
+      LayoutAnimation layoutAnimation) const;
+
   // LayoutAnimationStatusDelegate - this is for the platform to get
   // signal when animations start and complete. Setting and resetting this
   // delegate is protected by a mutex; ALL method calls into this delegate are
@@ -209,6 +223,9 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
   mutable std::mutex layoutAnimationStatusDelegateMutex_;
   mutable LayoutAnimationStatusDelegate *layoutAnimationStatusDelegate_{};
 
+  // Function that returns current time in milliseconds
+  std::function<uint64_t()> now_;
+
   void adjustImmediateMutationIndicesForDelayedMutations(
       SurfaceId surfaceId,
       ShadowViewMutation &mutation,
@@ -220,18 +237,15 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
       ShadowViewMutation const &mutation,
       bool skipLastAnimation = false) const;
 
-  std::vector<std::tuple<AnimationKeyFrame, AnimationConfig, LayoutAnimation *>>
-  getAndEraseConflictingAnimations(
+  void getAndEraseConflictingAnimations(
       SurfaceId surfaceId,
-      ShadowViewMutationList &mutations,
-      bool deletesOnly = false) const;
+      ShadowViewMutationList const &mutations,
+      std::vector<AnimationKeyFrame> &conflictingAnimations) const;
 
   mutable std::mutex surfaceIdsToStopMutex_;
   mutable std::vector<SurfaceId> surfaceIdsToStop_{};
 
  protected:
-  bool mutatedViewIsVirtual(ShadowViewMutation const &mutation) const;
-
   bool hasComponentDescriptorForShadowView(ShadowView const &shadowView) const;
   ComponentDescriptor const &getComponentDescriptorForShadowView(
       ShadowView const &shadowView) const;
@@ -252,10 +266,15 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
       ShadowViewMutation::List &mutationsList,
       uint64_t now) const = 0;
 
-  virtual double getProgressThroughAnimation(
-      AnimationKeyFrame const &keyFrame,
-      LayoutAnimation const *layoutAnimation,
-      ShadowView const &animationStateView) const = 0;
+  /**
+   * Queue (and potentially synthesize) final mutations for a finished keyframe.
+   * Keyframe animation may have timed-out, or be canceled due to a conflict.
+   */
+  void queueFinalMutationsForCompletedKeyFrame(
+      AnimationKeyFrame const &keyframe,
+      ShadowViewMutation::List &mutationsList,
+      bool interrupted,
+      std::string logPrefix) const;
 
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
   mutable better::optional<LayoutAnimation> currentAnimation_{};
@@ -275,6 +294,9 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
   mutable std::mutex callbackWrappersPendingMutex_;
   mutable std::vector<std::unique_ptr<LayoutAnimationCallbackWrapper>>
       callbackWrappersPending_{};
+
+ public:
+  void setClockNow(std::function<uint64_t()> now);
 };
 
 static inline bool shouldFirstComeBeforeSecondRemovesOnly(
@@ -300,14 +322,6 @@ static inline bool shouldFirstComeBeforeSecondMutation(
       return true;
     }
 
-    // Update comes last, before deletes
-    if (rhs.type == ShadowViewMutation::Type::Update) {
-      return true;
-    }
-    if (lhs.type == ShadowViewMutation::Type::Update) {
-      return false;
-    }
-
     // Remove comes before insert
     if (lhs.type == ShadowViewMutation::Type::Remove &&
         rhs.type == ShadowViewMutation::Type::Insert) {
@@ -331,9 +345,12 @@ static inline bool shouldFirstComeBeforeSecondMutation(
     // Make sure that removes on the same level are sorted - highest indices
     // must come first.
     if (lhs.type == ShadowViewMutation::Type::Remove &&
-        lhs.parentShadowView.tag == rhs.parentShadowView.tag &&
-        lhs.index > rhs.index) {
-      return true;
+        lhs.parentShadowView.tag == rhs.parentShadowView.tag) {
+      if (lhs.index > rhs.index) {
+        return true;
+      } else {
+        return false;
+      }
     }
   }
 
diff --git a/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp b/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp
new file mode 100644
index 00000000000000..52e07d9d87d4be
--- /dev/null
+++ b/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp
@@ -0,0 +1,544 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <vector>
+
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
+#include <ReactCommon/RuntimeExecutor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+#include <react/renderer/components/root/RootComponentDescriptor.h>
+#include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/mounting/Differentiator.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
+
+#include <react/renderer/mounting/stubs.h>
+#include <react/test_utils/Entropy.h>
+#include <react/test_utils/MockClock.h>
+#include <react/test_utils/shadowTreeGeneration.h>
+
+// Uncomment when random test blocks are uncommented below.
+// #include <algorithm>
+// #include <random>
+
+#include "LayoutAnimationDriver.h"
+
+MockClock::time_point MockClock::time_ = {};
+
+namespace facebook {
+namespace react {
+
+static void testShadowNodeTreeLifeCycleLayoutAnimations(
+    uint_fast32_t seed,
+    int treeSize,
+    int repeats,
+    int stages,
+    int animation_duration,
+    int animation_frames,
+    int delay_ms_between_frames,
+    int delay_ms_between_stages,
+    int delay_ms_between_repeats,
+    bool commits_conflicting_mutations = false,
+    int final_animation_delay = 0) {
+  auto entropy = seed == 0 ? Entropy() : Entropy(seed);
+
+  auto eventDispatcher = EventDispatcher::Shared{};
+  auto contextContainer = std::make_shared<ContextContainer>();
+  auto componentDescriptorParameters =
+      ComponentDescriptorParameters{eventDispatcher, contextContainer, nullptr};
+  auto viewComponentDescriptor =
+      ViewComponentDescriptor(componentDescriptorParameters);
+  auto rootComponentDescriptor =
+      RootComponentDescriptor(componentDescriptorParameters);
+  auto noopEventEmitter =
+      std::make_shared<ViewEventEmitter const>(nullptr, -1, eventDispatcher);
+
+  PropsParserContext parserContext{-1, *contextContainer};
+
+  // Create a RuntimeExecutor
+  RuntimeExecutor runtimeExecutor =
+      [](std::function<void(jsi::Runtime & runtime)> fn) {};
+
+  // Create component descriptor registry for animation driver
+  auto providerRegistry =
+      std::make_shared<ComponentDescriptorProviderRegistry>();
+  auto componentDescriptorRegistry =
+      providerRegistry->createComponentDescriptorRegistry(
+          componentDescriptorParameters);
+  providerRegistry->add(
+      concreteComponentDescriptorProvider<ViewComponentDescriptor>());
+
+  // Create Animation Driver
+  auto animationDriver =
+      std::make_shared<LayoutAnimationDriver>(runtimeExecutor, nullptr);
+  animationDriver->setComponentDescriptorRegistry(componentDescriptorRegistry);
+
+  // Mock animation timers
+  animationDriver->setClockNow([]() {
+    return std::chrono::duration_cast<std::chrono::milliseconds>(
+               MockClock::now().time_since_epoch())
+        .count();
+  });
+
+  auto allNodes = std::vector<ShadowNode::Shared>{};
+
+  for (int i = 0; i < repeats; i++) {
+    allNodes.clear();
+
+    int surfaceIdInt = 1;
+    auto surfaceId = SurfaceId(surfaceIdInt);
+
+    auto family = rootComponentDescriptor.createFamily(
+        {Tag(surfaceIdInt), surfaceId, nullptr}, nullptr);
+
+    // Creating an initial root shadow node.
+    auto emptyRootNode = std::const_pointer_cast<RootShadowNode>(
+        std::static_pointer_cast<RootShadowNode const>(
+            rootComponentDescriptor.createShadowNode(
+                ShadowNodeFragment{RootShadowNode::defaultSharedProps()},
+                family)));
+
+    // Applying size constraints.
+    emptyRootNode = emptyRootNode->clone(
+        parserContext,
+        LayoutConstraints{
+            Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
+        LayoutContext{});
+
+    // Generation of a random tree.
+    auto singleRootChildNode =
+        generateShadowNodeTree(entropy, viewComponentDescriptor, treeSize);
+
+    // Injecting a tree into the root node.
+    auto currentRootNode = std::static_pointer_cast<RootShadowNode const>(
+        emptyRootNode->ShadowNode::clone(ShadowNodeFragment{
+            ShadowNodeFragment::propsPlaceholder(),
+            std::make_shared<SharedShadowNodeList>(
+                SharedShadowNodeList{singleRootChildNode})}));
+
+    // Building an initial view hierarchy.
+    auto viewTree = buildStubViewTreeWithoutUsingDifferentiator(*emptyRootNode);
+    viewTree.mutate(
+        calculateShadowViewMutations(*emptyRootNode, *currentRootNode));
+
+    for (int j = 0; j < stages; j++) {
+      auto nextRootNode = currentRootNode;
+
+      // Mutating the tree.
+      alterShadowTree(
+          entropy,
+          nextRootNode,
+          {
+              &messWithChildren,
+              &messWithYogaStyles,
+              &messWithLayoutableOnlyFlag,
+          });
+
+      std::vector<LayoutableShadowNode const *> affectedLayoutableNodes{};
+      affectedLayoutableNodes.reserve(1024);
+
+      // Laying out the tree.
+      std::const_pointer_cast<RootShadowNode>(nextRootNode)
+          ->layoutIfNeeded(&affectedLayoutableNodes);
+
+      nextRootNode->sealRecursive();
+      allNodes.push_back(nextRootNode);
+
+      // Calculating mutations.
+      auto originalMutations =
+          calculateShadowViewMutations(*currentRootNode, *nextRootNode);
+
+      // If tree randomization produced no changes in the form of mutations,
+      // don't bother trying to animate because this violates a bunch of our
+      // assumptions in this test
+      if (originalMutations.size() == 0) {
+        continue;
+      }
+
+      // If we only mutated the root... also don't bother
+      if (originalMutations.size() == 1 &&
+          (originalMutations[0].oldChildShadowView.tag == 1 ||
+           originalMutations[0].newChildShadowView.tag == 1)) {
+        continue;
+      }
+
+      // Configure animation
+      animationDriver->uiManagerDidConfigureNextLayoutAnimation(
+          {surfaceId,
+           0,
+           false,
+           {(double)animation_duration,
+            {/* Create */ AnimationType::EaseInEaseOut,
+             AnimationProperty::Opacity,
+             (double)animation_duration,
+             0,
+             0,
+             0},
+            {/* Update */ AnimationType::EaseInEaseOut,
+             AnimationProperty::ScaleXY,
+             (double)animation_duration,
+             0,
+             0,
+             0},
+            {/* Delete */ AnimationType::EaseInEaseOut,
+             AnimationProperty::Opacity,
+             (double)animation_duration,
+             0,
+             0,
+             0}},
+           {},
+           {},
+           {}});
+
+      // Get mutations for each frame
+      for (int k = 0; k < animation_frames + 2; k++) {
+        auto mutationsInput = ShadowViewMutation::List{};
+        if (k == 0) {
+          mutationsInput = originalMutations;
+        }
+
+        if (k != (animation_frames + 1)) {
+          EXPECT_TRUE(animationDriver->shouldOverridePullTransaction());
+        } else if (!commits_conflicting_mutations) {
+          EXPECT_FALSE(animationDriver->shouldOverridePullTransaction());
+        }
+
+        auto telemetry = TransactionTelemetry{};
+        telemetry.willLayout();
+        telemetry.willCommit();
+        telemetry.willDiff();
+
+        auto transaction = animationDriver->pullTransaction(
+            surfaceId, 0, telemetry, mutationsInput);
+
+        EXPECT_TRUE(transaction.has_value() || k == animation_frames);
+
+        // We have something to validate.
+        if (transaction.has_value()) {
+          auto mutations = transaction->getMutations();
+
+          // Mutating the view tree.
+          viewTree.mutate(mutations);
+
+          // We don't do any validation on this until all animations are
+          // finished!
+        }
+
+        MockClock::advance_by(
+            std::chrono::milliseconds(delay_ms_between_frames));
+      }
+
+      // After the animation is completed...
+      // Build a view tree to compare with.
+      // After all the synthetic mutations, at the end of the animation,
+      // the mutated and newly-constructed trees should be identical.
+      if (!commits_conflicting_mutations) {
+        auto rebuiltViewTree =
+            buildStubViewTreeWithoutUsingDifferentiator(*nextRootNode);
+
+        // Comparing the newly built tree with the updated one.
+        if (rebuiltViewTree != viewTree) {
+          // Something went wrong.
+
+          LOG(ERROR)
+              << "Entropy seed: " << entropy.getSeed()
+              << ". To see why trees are different, define STUB_VIEW_TREE_VERBOSE and see logging in StubViewTree.cpp.\n";
+
+          EXPECT_TRUE(false);
+        }
+      }
+
+      currentRootNode = nextRootNode;
+
+      MockClock::advance_by(std::chrono::milliseconds(delay_ms_between_stages));
+    }
+
+    // Flush all remaining animations before validating trees
+    if (final_animation_delay > 0) {
+      MockClock::advance_by(std::chrono::milliseconds(final_animation_delay));
+
+      auto telemetry = TransactionTelemetry{};
+      telemetry.willLayout();
+      telemetry.willCommit();
+      telemetry.willDiff();
+
+      auto transaction =
+          animationDriver->pullTransaction(surfaceId, 0, telemetry, {});
+      // We have something to validate.
+      if (transaction.hasValue()) {
+        auto mutations = transaction->getMutations();
+
+        // Mutating the view tree.
+        viewTree.mutate(mutations);
+
+        // We don't do any validation on this until all animations are
+        // finished!
+      }
+    }
+
+    // After all animations are completed...
+    // Build a view tree to compare with.
+    // After all the synthetic mutations, at the end of the animation,
+    // the mutated and newly-constructed trees should be identical.
+    if (commits_conflicting_mutations) {
+      auto rebuiltViewTree =
+          buildStubViewTreeWithoutUsingDifferentiator(*currentRootNode);
+
+      // Comparing the newly built tree with the updated one.
+      if (rebuiltViewTree != viewTree) {
+        // Something went wrong.
+
+        LOG(ERROR)
+            << "Entropy seed: " << entropy.getSeed()
+            << ". To see why trees are different, define STUB_VIEW_TREE_VERBOSE and see logging in StubViewTree.cpp.\n";
+
+        EXPECT_TRUE(false);
+      }
+    }
+
+    MockClock::advance_by(std::chrono::milliseconds(delay_ms_between_repeats));
+  }
+
+  SUCCEED();
+}
+
+} // namespace react
+} // namespace facebook
+
+using namespace facebook::react;
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_NonOverlapping_2029343357) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 2029343357, /* working seed found 5-10-2021 */
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000);
+}
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_NonOverlapping_3619914559) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 3619914559, /* working seed found 5-10-2021 */
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000);
+}
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_NonOverlapping_597132284) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 597132284, /* failing seed found 5-10-2021 */
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000);
+}
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_NonOverlapping_774986518) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 774986518, /* failing seed found 5-10-2021 */
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000);
+}
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_NonOverlapping_1450614414) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 1450614414, /* failing seed found 5-10-2021 */
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000);
+}
+
+TEST(LayoutAnimationTest, stableBiggerTreeFewRepeatsFewStages_NonOverlapping) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 2029343357,
+      /* size */ 512,
+      /* repeats */ 32,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000);
+}
+
+TEST(LayoutAnimationTest, stableBiggerTreeFewRepeatsManyStages_NonOverlapping) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 2029343357,
+      /* size */ 512,
+      /* repeats */ 32,
+      /* stages */ 128,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000);
+}
+
+// You may uncomment this - locally only! - to generate failing seeds.
+// TEST(LayoutAnimationTest, stableSmallerTreeFewRepeatsFewStages_Random) {
+//   std::random_device device;
+//   for (int i = 0; i < 10; i++) {
+//     uint_fast32_t seed = device();
+//     LOG(ERROR) << "Seed: " << seed;
+//     testShadowNodeTreeLifeCycleLayoutAnimations(
+//         /* seed */ seed,
+//         /* size */ 128,
+//         /* repeats */ 128,
+//         /* stages */ 10,
+//         /* animation_duration */ 1000,
+//         /* animation_frames*/ 10,
+//         /* delay_ms_between_frames */ 100,
+//         /* delay_ms_between_stages */ 100,
+//         /* delay_ms_between_repeats */ 2000);
+//   }
+//   // Fail if you want output to get seeds
+//   LOG(ERROR) << "ALL RUNS SUCCESSFUL";
+//   // react_native_assert(false);
+// }
+
+//
+// These tests are "overlapping", meaning that mutations will be committed
+// before the previous animation completes.
+//
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_Overlapping_2029343357) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 2029343357,
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 9, // an animation completes in 10 frames, so this
+                               // causes conflicts
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000,
+      /* commits_conflicting_mutations */ true,
+      /* final_animation_delay */ 10000 + 1);
+}
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_Overlapping_597132284) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 597132284,
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 10,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 9, // an animation completes in 10 frames, so this
+                               // causes conflicts
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000,
+      /* commits_conflicting_mutations */ true,
+      /* final_animation_delay */ 10000 + 1);
+}
+
+TEST(
+    LayoutAnimationTest,
+    stableSmallerTreeFewRepeatsFewStages_Overlapping_ManyConflicts_597132284) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 597132284,
+      /* size */ 128,
+      /* repeats */ 128,
+      /* stages */ 50,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 5, // an animation completes in 10 frames, so this
+                               // causes conflicts. We only animate 5 frames,
+                               // but have 50 stages, so conflicts stack up
+                               // quickly.
+      /* delay_ms_between_frames */ 100,
+      /* delay_ms_between_stages */ 100,
+      /* delay_ms_between_repeats */ 2000,
+      /* commits_conflicting_mutations */ true,
+      /* final_animation_delay */ 50000 + 1);
+}
+
+TEST(
+    LayoutAnimationTest,
+    stableBiggerTreeFewRepeatsManyStages_Overlapping_ManyConflicts_2029343357) {
+  testShadowNodeTreeLifeCycleLayoutAnimations(
+      /* seed */ 2029343357,
+      /* size */ 512,
+      /* repeats */ 32,
+      /* stages */ 128,
+      /* animation_duration */ 1000,
+      /* animation_frames*/ 10,
+      /* delay_ms_between_frames */ 10,
+      /* delay_ms_between_stages */ 10,
+      /* delay_ms_between_repeats */ 2000,
+      /* commits_conflicting_mutations */ true,
+      /* final_animation_delay */ (128 * 1000 + 100));
+}
+
+// You may uncomment this -
+//     locally only !-to generate failing seeds.
+// TEST(
+//     LayoutAnimationTest,
+//     stableSmallerTreeFewRepeatsFewStages_Overlapping_Random) {
+//   std::random_device device;
+//   for (int i = 0; i < 10; i++) {
+//     uint_fast32_t seed = device();
+//     LOG(ERROR) << "Seed: " << seed;
+//     testShadowNodeTreeLifeCycleLayoutAnimations(
+//         /* seed */ seed,
+//         /* size */ 512,
+//         /* repeats */ 32,
+//         /* stages */ 128,
+//         /* animation_duration */ 1000,
+//         /* animation_frames*/ 10,
+//         /* delay_ms_between_frames */ 10,
+//         /* delay_ms_between_stages */ 10,
+//         /* delay_ms_between_repeats */ 2000,
+//         /* commits_conflicting_mutations */ true,
+//         /* final_animation_delay */ (128 * 1000 + 100));
+//   }
+//   // Fail if you want output to get seeds
+//   LOG(ERROR) << "ALL RUNS SUCCESSFUL";
+//   // react_native_assert(false);
+// }
diff --git a/ReactCommon/react/renderer/attributedstring/Android.mk b/ReactCommon/react/renderer/attributedstring/Android.mk
index 87b8da16d2333f..c693f05d16ffcc 100644
--- a/ReactCommon/react/renderer/attributedstring/Android.mk
+++ b/ReactCommon/react/renderer/attributedstring/Android.mk
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libbetter libreact_render_graphics libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_components_view libreact_utils
+LOCAL_SHARED_LIBRARIES := libbetter libreact_render_graphics libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -35,4 +35,6 @@ $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp
index 5983a7fc754518..a73131c9f545d1 100644
--- a/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp
+++ b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp
@@ -7,6 +7,8 @@
 
 #include "AttributedStringBox.h"
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
@@ -24,22 +26,42 @@ AttributedStringBox::AttributedStringBox(
     std::shared_ptr<void> const &opaquePointer)
     : mode_(Mode::OpaquePointer), value_({}), opaquePointer_(opaquePointer) {}
 
+AttributedStringBox::AttributedStringBox(AttributedStringBox &&other) noexcept
+    : mode_(other.mode_),
+      value_(std::move(other.value_)),
+      opaquePointer_(std::move(other.opaquePointer_)) {
+  other.mode_ = AttributedStringBox::Mode::Value;
+  other.value_ = std::make_shared<AttributedString const>(AttributedString{});
+}
+
 AttributedStringBox::Mode AttributedStringBox::getMode() const {
   return mode_;
 }
 
 AttributedString const &AttributedStringBox::getValue() const {
-  assert(mode_ == AttributedStringBox::Mode::Value);
-  assert(value_);
+  react_native_assert(mode_ == AttributedStringBox::Mode::Value);
+  react_native_assert(value_);
   return *value_;
 }
 
 std::shared_ptr<void> AttributedStringBox::getOpaquePointer() const {
-  assert(mode_ == AttributedStringBox::Mode::OpaquePointer);
-  assert(opaquePointer_);
+  react_native_assert(mode_ == AttributedStringBox::Mode::OpaquePointer);
+  react_native_assert(opaquePointer_);
   return opaquePointer_;
 }
 
+AttributedStringBox &AttributedStringBox::operator=(
+    AttributedStringBox &&other) {
+  if (this != &other) {
+    mode_ = other.mode_;
+    value_ = std::move(other.value_);
+    opaquePointer_ = std::move(other.opaquePointer_);
+    other.mode_ = AttributedStringBox::Mode::Value;
+    other.value_ = std::make_shared<AttributedString const>(AttributedString{});
+  }
+  return *this;
+}
+
 bool operator==(
     AttributedStringBox const &lhs,
     AttributedStringBox const &rhs) {
@@ -48,9 +70,9 @@ bool operator==(
   }
 
   switch (lhs.getMode()) {
-    case facebook::react::AttributedStringBox::Mode::Value:
+    case AttributedStringBox::Mode::Value:
       return lhs.getValue() == rhs.getValue();
-    case facebook::react::AttributedStringBox::Mode::OpaquePointer:
+    case AttributedStringBox::Mode::OpaquePointer:
       return lhs.getOpaquePointer() == rhs.getOpaquePointer();
   }
 }
diff --git a/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h
index 7965a7d6d288fd..b8bd96c9caebee 100644
--- a/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h
+++ b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h
@@ -41,9 +41,9 @@ class AttributedStringBox final {
    * Movable, Copyable, Assignable.
    */
   AttributedStringBox(AttributedStringBox const &other) = default;
-  AttributedStringBox(AttributedStringBox &&other) noexcept = default;
+  AttributedStringBox(AttributedStringBox &&other) noexcept;
   AttributedStringBox &operator=(AttributedStringBox const &other) = default;
-  AttributedStringBox &operator=(AttributedStringBox &&other) = default;
+  AttributedStringBox &operator=(AttributedStringBox &&other);
 
   /*
    * Getters.
diff --git a/ReactCommon/react/renderer/attributedstring/BUCK b/ReactCommon/react/renderer/attributedstring/BUCK
index 9ab399565e0078..c6d8371a41456a 100644
--- a/ReactCommon/react/renderer/attributedstring/BUCK
+++ b/ReactCommon/react/renderer/attributedstring/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -7,6 +6,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -34,9 +34,12 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
+    fbandroid_deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
@@ -55,11 +58,12 @@ rn_xplat_cxx_library(
         "//xplat/folly:headers_only",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
-        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
         react_native_xplat_target("react/renderer/mounting:mounting"),
+        react_native_xplat_target("react/utils:utils"),
     ],
 )
 
@@ -70,10 +74,11 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
+    fbandroid_use_instrumentation_test = True,
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":attributedstring",
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
index 5a7de8fbf9ab97..9aaea5aec5a966 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -50,6 +50,9 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   letterSpacing = !std::isnan(textAttributes.letterSpacing)
       ? textAttributes.letterSpacing
       : letterSpacing;
+  textTransform = textAttributes.textTransform.hasValue()
+      ? textAttributes.textTransform
+      : textTransform;
 
   // Paragraph Styles
   lineHeight = !std::isnan(textAttributes.lineHeight)
@@ -120,7 +123,8 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              textShadowColor,
              isHighlighted,
              layoutDirection,
-             accessibilityRole) ==
+             accessibilityRole,
+             textTransform) ==
       std::tie(
              rhs.foregroundColor,
              rhs.backgroundColor,
@@ -139,7 +143,8 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              rhs.textShadowColor,
              rhs.isHighlighted,
              rhs.layoutDirection,
-             rhs.accessibilityRole) &&
+             rhs.accessibilityRole,
+             rhs.textTransform) &&
       floatEquality(opacity, rhs.opacity) &&
       floatEquality(fontSize, rhs.fontSize) &&
       floatEquality(fontSizeMultiplier, rhs.fontSizeMultiplier) &&
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
index f15f11416f364c..87bbffc30e2692 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.h
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
@@ -51,6 +51,7 @@ class TextAttributes : public DebugStringConvertible {
   better::optional<FontVariant> fontVariant{};
   better::optional<bool> allowFontScaling{};
   Float letterSpacing{std::numeric_limits<Float>::quiet_NaN()};
+  better::optional<TextTransform> textTransform{};
 
   // Paragraph Styles
   Float lineHeight{std::numeric_limits<Float>::quiet_NaN()};
@@ -117,6 +118,7 @@ struct hash<facebook::react::TextAttributes> {
         textAttributes.fontVariant,
         textAttributes.allowFontScaling,
         textAttributes.letterSpacing,
+        textAttributes.textTransform,
         textAttributes.lineHeight,
         textAttributes.alignment,
         textAttributes.baseWritingDirection,
diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
index a121a09028e2ea..da688767fcd752 100644
--- a/ReactCommon/react/renderer/attributedstring/conversions.h
+++ b/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -9,12 +9,14 @@
 
 #include <folly/Conv.h>
 #include <folly/dynamic.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/conversions.h>
 #include <react/renderer/core/propsConversions.h>
@@ -22,6 +24,11 @@
 #include <react/renderer/graphics/conversions.h>
 #include <cmath>
 
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
 #include <glog/logging.h>
 
 namespace facebook {
@@ -38,27 +45,43 @@ inline std::string toString(const EllipsizeMode &ellipsisMode) {
     case EllipsizeMode::Middle:
       return "middle";
   }
+
+  LOG(ERROR) << "Unsupported EllipsizeMode value";
+  react_native_assert(false);
+
+  // Sane default in case of parsing errors
+  return "tail";
 }
 
-inline void fromRawValue(const RawValue &value, EllipsizeMode &result) {
-  auto string = (std::string)value;
-  if (string == "clip") {
-    result = EllipsizeMode::Clip;
-    return;
-  }
-  if (string == "head") {
-    result = EllipsizeMode::Head;
-    return;
-  }
-  if (string == "tail") {
-    result = EllipsizeMode::Tail;
-    return;
-  }
-  if (string == "middle") {
-    result = EllipsizeMode::Middle;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    EllipsizeMode &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "clip") {
+      result = EllipsizeMode::Clip;
+    } else if (string == "head") {
+      result = EllipsizeMode::Head;
+    } else if (string == "tail") {
+      result = EllipsizeMode::Tail;
+    } else if (string == "middle") {
+      result = EllipsizeMode::Middle;
+    } else {
+      // sane default
+      LOG(ERROR) << "Unsupported EllipsizeMode value: " << string;
+      react_native_assert(false);
+      result = EllipsizeMode::Tail;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported EllipsizeMode type";
+  react_native_assert(false);
+
+  // Sane default in case of parsing errors
+  result = EllipsizeMode::Tail;
 }
 
 inline std::string toString(const TextBreakStrategy &textBreakStrategy) {
@@ -70,97 +93,114 @@ inline std::string toString(const TextBreakStrategy &textBreakStrategy) {
     case TextBreakStrategy::Balanced:
       return "balanced";
   }
+
+  LOG(ERROR) << "Unsupported TextBreakStrategy value";
+  react_native_assert(false);
+  return "simple";
 }
 
-inline void fromRawValue(const RawValue &value, TextBreakStrategy &result) {
-  auto string = (std::string)value;
-  if (string == "simple") {
-    result = TextBreakStrategy::Simple;
-    return;
-  }
-  if (string == "highQuality") {
-    result = TextBreakStrategy::HighQuality;
-    return;
-  }
-  if (string == "balanced") {
-    result = TextBreakStrategy::Balanced;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    TextBreakStrategy &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "simple") {
+      result = TextBreakStrategy::Simple;
+    } else if (string == "highQuality") {
+      result = TextBreakStrategy::HighQuality;
+    } else if (string == "balanced") {
+      result = TextBreakStrategy::Balanced;
+    } else {
+      // sane default
+      LOG(ERROR) << "Unsupported TextBreakStrategy value: " << string;
+      react_native_assert(false);
+      result = TextBreakStrategy::Simple;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported TextBreakStrategy type";
+  react_native_assert(false);
+  result = TextBreakStrategy::Simple;
 }
 
-inline void fromRawValue(const RawValue &value, FontWeight &result) {
-  auto string = (std::string)value;
-  if (string == "normal") {
-    result = FontWeight::Regular;
-    return;
-  }
-  if (string == "regular") {
-    result = FontWeight::Regular;
-    return;
-  }
-  if (string == "bold") {
-    result = FontWeight::Bold;
-    return;
-  }
-  if (string == "100") {
-    result = FontWeight::Weight100;
-    return;
-  }
-  if (string == "200") {
-    result = FontWeight::Weight200;
-    return;
-  }
-  if (string == "300") {
-    result = FontWeight::Weight300;
-    return;
-  }
-  if (string == "400") {
-    result = FontWeight::Weight400;
-    return;
-  }
-  if (string == "500") {
-    result = FontWeight::Weight500;
-    return;
-  }
-  if (string == "600") {
-    result = FontWeight::Weight600;
-    return;
-  }
-  if (string == "700") {
-    result = FontWeight::Weight700;
-    return;
-  }
-  if (string == "800") {
-    result = FontWeight::Weight800;
-    return;
-  }
-  if (string == "900") {
-    result = FontWeight::Weight900;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    FontWeight &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "normal") {
+      result = FontWeight::Regular;
+    } else if (string == "regular") {
+      result = FontWeight::Regular;
+    } else if (string == "bold") {
+      result = FontWeight::Bold;
+    } else if (string == "100") {
+      result = FontWeight::Weight100;
+    } else if (string == "200") {
+      result = FontWeight::Weight200;
+    } else if (string == "300") {
+      result = FontWeight::Weight300;
+    } else if (string == "400") {
+      result = FontWeight::Weight400;
+    } else if (string == "500") {
+      result = FontWeight::Weight500;
+    } else if (string == "600") {
+      result = FontWeight::Weight600;
+    } else if (string == "700") {
+      result = FontWeight::Weight700;
+    } else if (string == "800") {
+      result = FontWeight::Weight800;
+    } else if (string == "900") {
+      result = FontWeight::Weight900;
+    } else {
+      LOG(ERROR) << "Unsupported FontWeight value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = FontWeight::Regular;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported FontWeight type";
+  react_native_assert(false);
+  result = FontWeight::Regular;
 }
 
 inline std::string toString(const FontWeight &fontWeight) {
   return folly::to<std::string>((int)fontWeight);
 }
 
-inline void fromRawValue(const RawValue &value, FontStyle &result) {
-  auto string = (std::string)value;
-  if (string == "normal") {
-    result = FontStyle::Normal;
-    return;
-  }
-  if (string == "italic") {
-    result = FontStyle::Italic;
-    return;
-  }
-  if (string == "oblique") {
-    result = FontStyle::Oblique;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    FontStyle &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "normal") {
+      result = FontStyle::Normal;
+    } else if (string == "italic") {
+      result = FontStyle::Italic;
+    } else if (string == "oblique") {
+      result = FontStyle::Oblique;
+    } else {
+      LOG(ERROR) << "Unsupported FontStyle value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = FontStyle::Normal;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported FontStyle type";
+  react_native_assert(false);
+  // sane default for prod
+  result = FontStyle::Normal;
 }
 
 inline std::string toString(const FontStyle &fontStyle) {
@@ -172,33 +212,41 @@ inline std::string toString(const FontStyle &fontStyle) {
     case FontStyle::Oblique:
       return "oblique";
   }
+
+  LOG(ERROR) << "Unsupported FontStyle value";
+  react_native_assert(false);
+  // sane default for prod
+  return "normal";
 }
 
-inline void fromRawValue(const RawValue &value, FontVariant &result) {
-  assert(value.hasType<std::vector<std::string>>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    FontVariant &result) {
+  react_native_assert(value.hasType<std::vector<std::string>>());
   result = FontVariant::Default;
-  auto items = std::vector<std::string>{value};
-  for (const auto &item : items) {
-    if (item == "small-caps") {
-      result = (FontVariant)((int)result | (int)FontVariant::SmallCaps);
-      continue;
-    }
-    if (item == "oldstyle-nums") {
-      result = (FontVariant)((int)result | (int)FontVariant::OldstyleNums);
-      continue;
-    }
-    if (item == "lining-nums") {
-      result = (FontVariant)((int)result | (int)FontVariant::LiningNums);
-      continue;
-    }
-    if (item == "tabular-nums") {
-      result = (FontVariant)((int)result | (int)FontVariant::TabularNums);
-      continue;
-    }
-    if (item == "proportional-nums") {
-      result = (FontVariant)((int)result | (int)FontVariant::ProportionalNums);
+  if (value.hasType<std::vector<std::string>>()) {
+    auto items = std::vector<std::string>{value};
+    for (const auto &item : items) {
+      if (item == "small-caps") {
+        result = (FontVariant)((int)result | (int)FontVariant::SmallCaps);
+      } else if (item == "oldstyle-nums") {
+        result = (FontVariant)((int)result | (int)FontVariant::OldstyleNums);
+      } else if (item == "lining-nums") {
+        result = (FontVariant)((int)result | (int)FontVariant::LiningNums);
+      } else if (item == "tabular-nums") {
+        result = (FontVariant)((int)result | (int)FontVariant::TabularNums);
+      } else if (item == "proportional-nums") {
+        result =
+            (FontVariant)((int)result | (int)FontVariant::ProportionalNums);
+      } else {
+        LOG(ERROR) << "Unsupported FontVariant value: " << item;
+        react_native_assert(false);
+      }
       continue;
     }
+  } else {
+    LOG(ERROR) << "Unsupported FontVariant type";
   }
 }
 
@@ -228,35 +276,93 @@ inline std::string toString(const FontVariant &fontVariant) {
   return result;
 }
 
-inline void fromRawValue(const RawValue &value, TextAlignment &result) {
-  auto string = (std::string)value;
-  if (string == "auto") {
-    result = TextAlignment::Natural;
-    return;
-  }
-  if (string == "left") {
-    result = TextAlignment::Left;
-    return;
-  }
-  if (string == "center") {
-    result = TextAlignment::Center;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    TextTransform &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "none") {
+      result = TextTransform::None;
+    } else if (string == "uppercase") {
+      result = TextTransform::Uppercase;
+    } else if (string == "lowercase") {
+      result = TextTransform::Lowercase;
+    } else if (string == "capitalize") {
+      result = TextTransform::Capitalize;
+    } else if (string == "unset") {
+      result = TextTransform::Unset;
+    } else {
+      LOG(ERROR) << "Unsupported TextTransform value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = TextTransform::None;
+    }
     return;
   }
-  if (string == "right") {
-    result = TextAlignment::Right;
-    return;
+
+  LOG(ERROR) << "Unsupported TextTransform type";
+  react_native_assert(false);
+  // sane default for prod
+  result = TextTransform::None;
+}
+
+inline std::string toString(const TextTransform &textTransform) {
+  switch (textTransform) {
+    case TextTransform::None:
+      return "none";
+    case TextTransform::Uppercase:
+      return "uppercase";
+    case TextTransform::Lowercase:
+      return "lowercase";
+    case TextTransform::Capitalize:
+      return "capitalize";
+    case TextTransform::Unset:
+      return "unset";
   }
-  if (string == "justify") {
-    result = TextAlignment::Justified;
+
+  LOG(ERROR) << "Unsupported TextTransform value";
+  react_native_assert(false);
+  // sane default for prod
+  return "none";
+}
+
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    TextAlignment &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "auto") {
+      result = TextAlignment::Natural;
+    } else if (string == "left") {
+      result = TextAlignment::Left;
+    } else if (string == "center") {
+      result = TextAlignment::Center;
+    } else if (string == "right") {
+      result = TextAlignment::Right;
+    } else if (string == "justify") {
+      result = TextAlignment::Justified;
+    } else {
+      LOG(ERROR) << "Unsupported TextAlignment value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = TextAlignment::Natural;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported TextAlignment type";
+  // sane default for prod
+  result = TextAlignment::Natural;
 }
 
 inline std::string toString(const TextAlignment &textAlignment) {
   switch (textAlignment) {
     case TextAlignment::Natural:
-      return "natural";
+      return "auto";
     case TextAlignment::Left:
       return "left";
     case TextAlignment::Center:
@@ -266,62 +372,85 @@ inline std::string toString(const TextAlignment &textAlignment) {
     case TextAlignment::Justified:
       return "justified";
   }
+
+  LOG(ERROR) << "Unsupported TextAlignment value";
+  // sane default for prod
+  return "auto";
 }
 
-inline void fromRawValue(const RawValue &value, WritingDirection &result) {
-  auto string = (std::string)value;
-  if (string == "natural") {
-    result = WritingDirection::Natural;
-    return;
-  }
-  if (string == "ltr") {
-    result = WritingDirection::LeftToRight;
-    return;
-  }
-  if (string == "rtl") {
-    result = WritingDirection::RightToLeft;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    WritingDirection &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "natural" || string == "auto") {
+      result = WritingDirection::Natural;
+    } else if (string == "ltr") {
+      result = WritingDirection::LeftToRight;
+    } else if (string == "rtl") {
+      result = WritingDirection::RightToLeft;
+    } else {
+      LOG(ERROR) << "Unsupported WritingDirection value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = WritingDirection::Natural;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported WritingDirection type";
+  // sane default for prod
+  result = WritingDirection::Natural;
 }
 
 inline std::string toString(const WritingDirection &writingDirection) {
   switch (writingDirection) {
     case WritingDirection::Natural:
-      return "natural";
+      return "auto";
     case WritingDirection::LeftToRight:
       return "ltr";
     case WritingDirection::RightToLeft:
       return "rtl";
   }
+
+  LOG(ERROR) << "Unsupported WritingDirection value";
+  // sane default for prod
+  return "auto";
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextDecorationLineType &result) {
-  auto string = (std::string)value;
-  if (string == "none") {
-    result = TextDecorationLineType::None;
-    return;
-  }
-  if (string == "underline") {
-    result = TextDecorationLineType::Underline;
-    return;
-  }
-
-  // TODO: remove "line-through" after deprecation
-  if (string == "strikethrough" || string == "line-through") {
-    result = TextDecorationLineType::Strikethrough;
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "none") {
+      result = TextDecorationLineType::None;
+    } else if (string == "underline") {
+      result = TextDecorationLineType::Underline;
+    } else if (string == "strikethrough" || string == "line-through") {
+      // TODO: remove "line-through" after deprecation
+      result = TextDecorationLineType::Strikethrough;
+    } else if (
+        string == "underline-strikethrough" ||
+        string == "underline line-through") {
+      // TODO: remove "underline line-through" after "line-through" deprecation
+      result = TextDecorationLineType::UnderlineStrikethrough;
+    } else {
+      LOG(ERROR) << "Unsupported TextDecorationLineType value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = TextDecorationLineType::None;
+    }
     return;
   }
 
-  // TODO: remove "underline line-through" after "line-through" deprecation
-  if (string == "underline-strikethrough" ||
-      string == "underline line-through") {
-    result = TextDecorationLineType::UnderlineStrikethrough;
-    return;
-  }
-  abort();
+  LOG(ERROR) << "Unsupported TextDecorationLineType type";
+  // sane default for prod
+  result = TextDecorationLineType::None;
 }
 
 inline std::string toString(
@@ -336,25 +465,38 @@ inline std::string toString(
     case TextDecorationLineType::UnderlineStrikethrough:
       return "underline-strikethrough";
   }
+
+  LOG(ERROR) << "Unsupported TextDecorationLineType value";
+  react_native_assert(false);
+  // sane default for prod
+  return "none";
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextDecorationLineStyle &result) {
-  auto string = (std::string)value;
-  if (string == "single") {
-    result = TextDecorationLineStyle::Single;
-    return;
-  }
-  if (string == "thick") {
-    result = TextDecorationLineStyle::Thick;
-    return;
-  }
-  if (string == "double") {
-    result = TextDecorationLineStyle::Double;
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "single") {
+      result = TextDecorationLineStyle::Single;
+    } else if (string == "thick") {
+      result = TextDecorationLineStyle::Thick;
+    } else if (string == "double") {
+      result = TextDecorationLineStyle::Double;
+    } else {
+      LOG(ERROR) << "Unsupported TextDecorationLineStyle value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = TextDecorationLineStyle::Single;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported TextDecorationLineStyle type";
+  // sane default for prod
+  result = TextDecorationLineStyle::Single;
 }
 
 inline std::string toString(
@@ -367,33 +509,42 @@ inline std::string toString(
     case TextDecorationLineStyle::Double:
       return "double";
   }
+
+  LOG(ERROR) << "Unsupported TextDecorationLineStyle value";
+  react_native_assert(false);
+  // sane default for prod
+  return "single";
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextDecorationLinePattern &result) {
-  auto string = (std::string)value;
-  if (string == "solid") {
-    result = TextDecorationLinePattern::Solid;
-    return;
-  }
-  if (string == "dot") {
-    result = TextDecorationLinePattern::Dot;
-    return;
-  }
-  if (string == "dash") {
-    result = TextDecorationLinePattern::Dash;
-    return;
-  }
-  if (string == "dash-dot") {
-    result = TextDecorationLinePattern::DashDot;
-    return;
-  }
-  if (string == "dash-dot-dot") {
-    result = TextDecorationLinePattern::DashDotDot;
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "solid") {
+      result = TextDecorationLinePattern::Solid;
+    } else if (string == "dot") {
+      result = TextDecorationLinePattern::Dot;
+    } else if (string == "dash") {
+      result = TextDecorationLinePattern::Dash;
+    } else if (string == "dash-dot") {
+      result = TextDecorationLinePattern::DashDot;
+    } else if (string == "dash-dot-dot") {
+      result = TextDecorationLinePattern::DashDotDot;
+    } else {
+      LOG(ERROR) << "Unsupported TextDecorationLinePattern value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = TextDecorationLinePattern::Solid;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported TextDecorationLineStyle type";
+  // sane default for prod
+  result = TextDecorationLinePattern::Solid;
 }
 
 inline std::string toString(
@@ -410,6 +561,11 @@ inline std::string toString(
     case TextDecorationLinePattern::DashDotDot:
       return "dash-dot-dot";
   }
+
+  LOG(ERROR) << "Unsupported TextDecorationLinePattern value";
+  react_native_assert(false);
+  // sane default for prod
+  return "solid";
 }
 
 inline std::string toString(const AccessibilityRole &accessibilityRole) {
@@ -462,6 +618,8 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) {
       return "switch";
     case AccessibilityRole::Tab:
       return "tab";
+    case AccessibilityRole::TabBar:
+      return "tabbar";
     case AccessibilityRole::Tablist:
       return "tablist";
     case AccessibilityRole::Timer:
@@ -469,158 +627,136 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) {
     case AccessibilityRole::Toolbar:
       return "toolbar";
   }
+
+  LOG(ERROR) << "Unsupported AccessibilityRole value";
+  react_native_assert(false);
+  // sane default for prod
+  return "none";
 }
 
-inline void fromRawValue(const RawValue &value, AccessibilityRole &result) {
-  auto string = (std::string)value;
-  if (string == "none") {
-    result = AccessibilityRole::None;
-    return;
-  }
-  if (string == "button") {
-    result = AccessibilityRole::Button;
-    return;
-  }
-  if (string == "link") {
-    result = AccessibilityRole::Link;
-    return;
-  }
-  if (string == "search") {
-    result = AccessibilityRole::Search;
-    return;
-  }
-  if (string == "image") {
-    result = AccessibilityRole::Image;
-    return;
-  }
-  if (string == "imagebutton") {
-    result = AccessibilityRole::Imagebutton;
-    return;
-  }
-  if (string == "keyboardkey") {
-    result = AccessibilityRole::Keyboardkey;
-    return;
-  }
-  if (string == "text") {
-    result = AccessibilityRole::Text;
-    return;
-  }
-  if (string == "adjustable") {
-    result = AccessibilityRole::Adjustable;
-    return;
-  }
-  if (string == "summary") {
-    result = AccessibilityRole::Summary;
-    return;
-  }
-  if (string == "header") {
-    result = AccessibilityRole::Header;
-    return;
-  }
-  if (string == "alert") {
-    result = AccessibilityRole::Alert;
-    return;
-  }
-  if (string == "checkbox") {
-    result = AccessibilityRole::Checkbox;
-    return;
-  }
-  if (string == "combobox") {
-    result = AccessibilityRole::Combobox;
-    return;
-  }
-  if (string == "menu") {
-    result = AccessibilityRole::Menu;
-    return;
-  }
-  if (string == "menubar") {
-    result = AccessibilityRole::Menubar;
-    return;
-  }
-  if (string == "menuitem") {
-    result = AccessibilityRole::Menuitem;
-    return;
-  }
-  if (string == "progressbar") {
-    result = AccessibilityRole::Progressbar;
-    return;
-  }
-  if (string == "radio") {
-    result = AccessibilityRole::Radio;
-    return;
-  }
-  if (string == "radiogroup") {
-    result = AccessibilityRole::Radiogroup;
-    return;
-  }
-  if (string == "scrollbar") {
-    result = AccessibilityRole::Scrollbar;
-    return;
-  }
-  if (string == "spinbutton") {
-    result = AccessibilityRole::Spinbutton;
-    return;
-  }
-  if (string == "switch") {
-    result = AccessibilityRole::Switch;
-    return;
-  }
-  if (string == "tab") {
-    result = AccessibilityRole::Tab;
-    return;
-  }
-  if (string == "tablist") {
-    result = AccessibilityRole::Tablist;
-    return;
-  }
-  if (string == "timer") {
-    result = AccessibilityRole::Timer;
-    return;
-  }
-  if (string == "toolbar") {
-    result = AccessibilityRole::Toolbar;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    AccessibilityRole &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "none") {
+      result = AccessibilityRole::None;
+    } else if (string == "button") {
+      result = AccessibilityRole::Button;
+    } else if (string == "link") {
+      result = AccessibilityRole::Link;
+    } else if (string == "search") {
+      result = AccessibilityRole::Search;
+    } else if (string == "image") {
+      result = AccessibilityRole::Image;
+    } else if (string == "imagebutton") {
+      result = AccessibilityRole::Imagebutton;
+    } else if (string == "keyboardkey") {
+      result = AccessibilityRole::Keyboardkey;
+    } else if (string == "text") {
+      result = AccessibilityRole::Text;
+    } else if (string == "adjustable") {
+      result = AccessibilityRole::Adjustable;
+    } else if (string == "summary") {
+      result = AccessibilityRole::Summary;
+    } else if (string == "header") {
+      result = AccessibilityRole::Header;
+    } else if (string == "alert") {
+      result = AccessibilityRole::Alert;
+    } else if (string == "checkbox") {
+      result = AccessibilityRole::Checkbox;
+    } else if (string == "combobox") {
+      result = AccessibilityRole::Combobox;
+    } else if (string == "menu") {
+      result = AccessibilityRole::Menu;
+    } else if (string == "menubar") {
+      result = AccessibilityRole::Menubar;
+    } else if (string == "menuitem") {
+      result = AccessibilityRole::Menuitem;
+    } else if (string == "progressbar") {
+      result = AccessibilityRole::Progressbar;
+    } else if (string == "radio") {
+      result = AccessibilityRole::Radio;
+    } else if (string == "radiogroup") {
+      result = AccessibilityRole::Radiogroup;
+    } else if (string == "scrollbar") {
+      result = AccessibilityRole::Scrollbar;
+    } else if (string == "spinbutton") {
+      result = AccessibilityRole::Spinbutton;
+    } else if (string == "switch") {
+      result = AccessibilityRole::Switch;
+    } else if (string == "tab") {
+      result = AccessibilityRole::Tab;
+    } else if (string == "tabbar") {
+      result = AccessibilityRole::TabBar;
+    } else if (string == "tablist") {
+      result = AccessibilityRole::Tablist;
+    } else if (string == "timer") {
+      result = AccessibilityRole::Timer;
+    } else if (string == "toolbar") {
+      result = AccessibilityRole::Toolbar;
+    } else {
+      LOG(ERROR) << "Unsupported AccessibilityRole value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = AccessibilityRole::None;
+    }
     return;
   }
-  abort();
+
+  LOG(ERROR) << "Unsupported AccessibilityRole type";
+  react_native_assert(false);
+  // sane default for prod
+  result = AccessibilityRole::None;
 }
 
 inline ParagraphAttributes convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     ParagraphAttributes const &sourceParagraphAttributes,
     ParagraphAttributes const &defaultParagraphAttributes) {
   auto paragraphAttributes = ParagraphAttributes{};
 
   paragraphAttributes.maximumNumberOfLines = convertRawProp(
+      context,
       rawProps,
       "numberOfLines",
       sourceParagraphAttributes.maximumNumberOfLines,
       defaultParagraphAttributes.maximumNumberOfLines);
   paragraphAttributes.ellipsizeMode = convertRawProp(
+      context,
       rawProps,
       "ellipsizeMode",
       sourceParagraphAttributes.ellipsizeMode,
       defaultParagraphAttributes.ellipsizeMode);
   paragraphAttributes.textBreakStrategy = convertRawProp(
+      context,
       rawProps,
       "textBreakStrategy",
       sourceParagraphAttributes.textBreakStrategy,
       defaultParagraphAttributes.textBreakStrategy);
   paragraphAttributes.adjustsFontSizeToFit = convertRawProp(
+      context,
       rawProps,
       "adjustsFontSizeToFit",
       sourceParagraphAttributes.adjustsFontSizeToFit,
       defaultParagraphAttributes.adjustsFontSizeToFit);
   paragraphAttributes.minimumFontSize = convertRawProp(
+      context,
       rawProps,
       "minimumFontSize",
       sourceParagraphAttributes.minimumFontSize,
       defaultParagraphAttributes.minimumFontSize);
   paragraphAttributes.maximumFontSize = convertRawProp(
+      context,
       rawProps,
       "maximumFontSize",
       sourceParagraphAttributes.maximumFontSize,
       defaultParagraphAttributes.maximumFontSize);
   paragraphAttributes.includeFontPadding = convertRawProp(
+      context,
       rawProps,
       "includeFontPadding",
       sourceParagraphAttributes.includeFontPadding,
@@ -630,6 +766,7 @@ inline ParagraphAttributes convertRawProp(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     RawValue const &value,
     AttributedString::Range &result) {
   auto map = (better::map<std::string, int>)value;
@@ -721,6 +858,9 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   if (!std::isnan(textAttributes.letterSpacing)) {
     _textAttributes("letterSpacing", textAttributes.letterSpacing);
   }
+  if (textAttributes.textTransform.hasValue()) {
+    _textAttributes("textTransform", toString(*textAttributes.textTransform));
+  }
   if (!std::isnan(textAttributes.lineHeight)) {
     _textAttributes("lineHeight", textAttributes.lineHeight);
   }
@@ -808,6 +948,224 @@ inline folly::dynamic toDynamic(AttributedString::Range const &range) {
   return dynamicValue;
 }
 
+// constants for AttributedString serialization
+constexpr static Key AS_KEY_HASH = 0;
+constexpr static Key AS_KEY_STRING = 1;
+constexpr static Key AS_KEY_FRAGMENTS = 2;
+constexpr static Key AS_KEY_CACHE_ID = 3;
+
+// constants for Fragment serialization
+constexpr static Key FR_KEY_STRING = 0;
+constexpr static Key FR_KEY_REACT_TAG = 1;
+constexpr static Key FR_KEY_IS_ATTACHMENT = 2;
+constexpr static Key FR_KEY_WIDTH = 3;
+constexpr static Key FR_KEY_HEIGHT = 4;
+constexpr static Key FR_KEY_TEXT_ATTRIBUTES = 5;
+
+// constants for Text Attributes serialization
+constexpr static Key TA_KEY_FOREGROUND_COLOR = 0;
+constexpr static Key TA_KEY_BACKGROUND_COLOR = 1;
+constexpr static Key TA_KEY_OPACITY = 2;
+constexpr static Key TA_KEY_FONT_FAMILY = 3;
+constexpr static Key TA_KEY_FONT_SIZE = 4;
+constexpr static Key TA_KEY_FONT_SIZE_MULTIPLIER = 5;
+constexpr static Key TA_KEY_FONT_WEIGHT = 6;
+constexpr static Key TA_KEY_FONT_STYLE = 7;
+constexpr static Key TA_KEY_FONT_VARIANT = 8;
+constexpr static Key TA_KEY_ALLOW_FONT_SCALING = 9;
+constexpr static Key TA_KEY_LETTER_SPACING = 10;
+constexpr static Key TA_KEY_LINE_HEIGHT = 11;
+constexpr static Key TA_KEY_ALIGNMENT = 12;
+constexpr static Key TA_KEY_BEST_WRITING_DIRECTION = 13;
+constexpr static Key TA_KEY_TEXT_DECORATION_COLOR = 14;
+constexpr static Key TA_KEY_TEXT_DECORATION_LINE = 15;
+constexpr static Key TA_KEY_TEXT_DECORATION_LINE_STYLE = 16;
+constexpr static Key TA_KEY_TEXT_DECORATION_LINE_PATTERN = 17;
+constexpr static Key TA_KEY_TEXT_SHADOW_RAIDUS = 18;
+constexpr static Key TA_KEY_TEXT_SHADOW_COLOR = 19;
+constexpr static Key TA_KEY_IS_HIGHLIGHTED = 20;
+constexpr static Key TA_KEY_LAYOUT_DIRECTION = 21;
+constexpr static Key TA_KEY_ACCESSIBILITY_ROLE = 22;
+
+// constants for ParagraphAttributes serialization
+constexpr static Key PA_KEY_MAX_NUMBER_OF_LINES = 0;
+constexpr static Key PA_KEY_ELLIPSIZE_MODE = 1;
+constexpr static Key PA_KEY_TEXT_BREAK_STRATEGY = 2;
+constexpr static Key PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
+constexpr static Key PA_KEY_INCLUDE_FONT_PADDING = 4;
+
+inline MapBuffer toMapBuffer(const ParagraphAttributes &paragraphAttributes) {
+  auto builder = MapBufferBuilder();
+  builder.putInt(
+      PA_KEY_MAX_NUMBER_OF_LINES, paragraphAttributes.maximumNumberOfLines);
+  builder.putString(
+      PA_KEY_ELLIPSIZE_MODE, toString(paragraphAttributes.ellipsizeMode));
+  builder.putString(
+      PA_KEY_TEXT_BREAK_STRATEGY,
+      toString(paragraphAttributes.textBreakStrategy));
+  builder.putBool(
+      PA_KEY_ADJUST_FONT_SIZE_TO_FIT, paragraphAttributes.adjustsFontSizeToFit);
+  builder.putBool(
+      PA_KEY_INCLUDE_FONT_PADDING, paragraphAttributes.includeFontPadding);
+
+  return builder.build();
+}
+
+inline MapBuffer toMapBuffer(const FontVariant &fontVariant) {
+  auto builder = MapBufferBuilder();
+  int index = 0;
+  if ((int)fontVariant & (int)FontVariant::SmallCaps) {
+    builder.putString(index++, "small-caps");
+  }
+  if ((int)fontVariant & (int)FontVariant::OldstyleNums) {
+    builder.putString(index++, "oldstyle-nums");
+  }
+  if ((int)fontVariant & (int)FontVariant::LiningNums) {
+    builder.putString(index++, "lining-nums");
+  }
+  if ((int)fontVariant & (int)FontVariant::TabularNums) {
+    builder.putString(index++, "tabular-nums");
+  }
+  if ((int)fontVariant & (int)FontVariant::ProportionalNums) {
+    builder.putString(index++, "proportional-nums");
+  }
+
+  return builder.build();
+}
+
+inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
+  auto builder = MapBufferBuilder();
+  if (textAttributes.foregroundColor) {
+    builder.putInt(
+        TA_KEY_FOREGROUND_COLOR, toMapBuffer(textAttributes.foregroundColor));
+  }
+  if (textAttributes.backgroundColor) {
+    builder.putInt(
+        TA_KEY_BACKGROUND_COLOR, toMapBuffer(textAttributes.backgroundColor));
+  }
+  if (!std::isnan(textAttributes.opacity)) {
+    builder.putDouble(TA_KEY_OPACITY, textAttributes.opacity);
+  }
+  if (!textAttributes.fontFamily.empty()) {
+    builder.putString(TA_KEY_FONT_FAMILY, textAttributes.fontFamily);
+  }
+  if (!std::isnan(textAttributes.fontSize)) {
+    builder.putDouble(TA_KEY_FONT_SIZE, textAttributes.fontSize);
+  }
+  if (!std::isnan(textAttributes.fontSizeMultiplier)) {
+    builder.putDouble(
+        TA_KEY_FONT_SIZE_MULTIPLIER, textAttributes.fontSizeMultiplier);
+  }
+  if (textAttributes.fontWeight.has_value()) {
+    builder.putString(TA_KEY_FONT_WEIGHT, toString(*textAttributes.fontWeight));
+  }
+  if (textAttributes.fontStyle.has_value()) {
+    builder.putString(TA_KEY_FONT_STYLE, toString(*textAttributes.fontStyle));
+  }
+  if (textAttributes.fontVariant.has_value()) {
+    auto fontVariantMap = toMapBuffer(*textAttributes.fontVariant);
+    builder.putMapBuffer(TA_KEY_FONT_VARIANT, fontVariantMap);
+  }
+  if (textAttributes.allowFontScaling.has_value()) {
+    builder.putBool(
+        TA_KEY_ALLOW_FONT_SCALING, *textAttributes.allowFontScaling);
+  }
+  if (!std::isnan(textAttributes.letterSpacing)) {
+    builder.putDouble(TA_KEY_LETTER_SPACING, textAttributes.letterSpacing);
+  }
+  if (!std::isnan(textAttributes.lineHeight)) {
+    builder.putDouble(TA_KEY_LINE_HEIGHT, textAttributes.lineHeight);
+  }
+  if (textAttributes.alignment.has_value()) {
+    builder.putString(TA_KEY_ALIGNMENT, toString(*textAttributes.alignment));
+  }
+  if (textAttributes.baseWritingDirection.has_value()) {
+    builder.putString(
+        TA_KEY_BEST_WRITING_DIRECTION,
+        toString(*textAttributes.baseWritingDirection));
+  }
+  // Decoration
+  if (textAttributes.textDecorationColor) {
+    builder.putInt(
+        TA_KEY_TEXT_DECORATION_COLOR,
+        toMapBuffer(textAttributes.textDecorationColor));
+  }
+  if (textAttributes.textDecorationLineType.has_value()) {
+    builder.putString(
+        TA_KEY_TEXT_DECORATION_LINE,
+        toString(*textAttributes.textDecorationLineType));
+  }
+  if (textAttributes.textDecorationLineStyle.has_value()) {
+    builder.putString(
+        TA_KEY_TEXT_DECORATION_LINE_STYLE,
+        toString(*textAttributes.textDecorationLineStyle));
+  }
+  if (textAttributes.textDecorationLinePattern.has_value()) {
+    builder.putString(
+        TA_KEY_TEXT_DECORATION_LINE_PATTERN,
+        toString(*textAttributes.textDecorationLinePattern));
+  }
+  // Shadow
+  if (!std::isnan(textAttributes.textShadowRadius)) {
+    builder.putDouble(
+        TA_KEY_TEXT_SHADOW_RAIDUS, textAttributes.textShadowRadius);
+  }
+  if (textAttributes.textShadowColor) {
+    builder.putInt(
+        TA_KEY_TEXT_SHADOW_COLOR, toMapBuffer(textAttributes.textShadowColor));
+  }
+  // Special
+  if (textAttributes.isHighlighted.has_value()) {
+    builder.putBool(TA_KEY_IS_HIGHLIGHTED, *textAttributes.isHighlighted);
+  }
+  if (textAttributes.layoutDirection.has_value()) {
+    builder.putString(
+        TA_KEY_LAYOUT_DIRECTION, toString(*textAttributes.layoutDirection));
+  }
+  if (textAttributes.accessibilityRole.has_value()) {
+    builder.putString(
+        TA_KEY_ACCESSIBILITY_ROLE, toString(*textAttributes.accessibilityRole));
+  }
+  return builder.build();
+}
+
+inline MapBuffer toMapBuffer(const AttributedString &attributedString) {
+  auto fragmentsBuilder = MapBufferBuilder();
+
+  int index = 0;
+  for (auto fragment : attributedString.getFragments()) {
+    auto dynamicFragmentBuilder = MapBufferBuilder();
+    dynamicFragmentBuilder.putString(FR_KEY_STRING, fragment.string);
+    if (fragment.parentShadowView.componentHandle) {
+      dynamicFragmentBuilder.putInt(
+          FR_KEY_REACT_TAG, fragment.parentShadowView.tag);
+    }
+    if (fragment.isAttachment()) {
+      dynamicFragmentBuilder.putBool(FR_KEY_IS_ATTACHMENT, true);
+      dynamicFragmentBuilder.putDouble(
+          FR_KEY_WIDTH,
+          fragment.parentShadowView.layoutMetrics.frame.size.width);
+      dynamicFragmentBuilder.putDouble(
+          FR_KEY_HEIGHT,
+          fragment.parentShadowView.layoutMetrics.frame.size.height);
+    }
+    auto textAttributesMap = toMapBuffer(fragment.textAttributes);
+    dynamicFragmentBuilder.putMapBuffer(
+        FR_KEY_TEXT_ATTRIBUTES, textAttributesMap);
+    auto dynamicFragmentMap = dynamicFragmentBuilder.build();
+    fragmentsBuilder.putMapBuffer(index++, dynamicFragmentMap);
+  }
+
+  auto builder = MapBufferBuilder();
+  builder.putInt(
+      AS_KEY_HASH,
+      std::hash<facebook::react::AttributedString>{}(attributedString));
+  builder.putString(AS_KEY_STRING, attributedString.getString());
+  auto fragmentsMap = fragmentsBuilder.build();
+  builder.putMapBuffer(AS_KEY_FRAGMENTS, fragmentsMap);
+  return builder.build();
+}
+
 #endif
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/attributedstring/primitives.h b/ReactCommon/react/renderer/attributedstring/primitives.h
index 13946ec180fc81..cb080f35b83e6c 100644
--- a/ReactCommon/react/renderer/attributedstring/primitives.h
+++ b/ReactCommon/react/renderer/attributedstring/primitives.h
@@ -112,11 +112,20 @@ enum class AccessibilityRole {
   Spinbutton,
   Switch,
   Tab,
+  TabBar,
   Tablist,
   Timer,
   Toolbar,
 };
 
+enum class TextTransform {
+  None,
+  Uppercase,
+  Lowercase,
+  Capitalize,
+  Unset,
+};
+
 } // namespace react
 } // namespace facebook
 
@@ -197,4 +206,11 @@ struct hash<facebook::react::AccessibilityRole> {
     return hash<int>()(static_cast<int>(v));
   }
 };
+
+template <>
+struct hash<facebook::react::TextTransform> {
+  size_t operator()(const facebook::react::TextTransform &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
 } // namespace std
diff --git a/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
new file mode 100644
index 00000000000000..493598b2c42cb5
--- /dev/null
+++ b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <memory>
+
+#include <gtest/gtest.h>
+#include <react/renderer/attributedstring/AttributedStringBox.h>
+
+namespace facebook {
+namespace react {
+
+TEST(AttributedStringBoxTest, testDefaultConstructor) {
+  auto attributedStringBox = AttributedStringBox{};
+
+  EXPECT_EQ(attributedStringBox.getMode(), AttributedStringBox::Mode::Value);
+  EXPECT_EQ(attributedStringBox.getValue(), AttributedString{});
+}
+
+TEST(AttributedStringBoxTest, testValueConstructor) {
+  auto attributedString = AttributedString{};
+  auto fragment = AttributedString::Fragment{};
+  fragment.string = "test string";
+  attributedString.appendFragment(fragment);
+  auto attributedStringBox = AttributedStringBox{attributedString};
+
+  EXPECT_EQ(attributedStringBox.getMode(), AttributedStringBox::Mode::Value);
+  EXPECT_EQ(attributedStringBox.getValue(), attributedString);
+}
+
+TEST(AttributedStringBoxTest, testOpaquePointerConstructor) {
+  auto string = std::make_shared<std::string>("test string");
+  auto attributedStringBox = AttributedStringBox{string};
+
+  EXPECT_EQ(
+      attributedStringBox.getMode(), AttributedStringBox::Mode::OpaquePointer);
+  EXPECT_EQ(attributedStringBox.getOpaquePointer(), string);
+  EXPECT_EQ(string.use_count(), 2);
+}
+
+TEST(AttributedStringBoxTest, testMoveConstructor) {
+  {
+    auto string = std::make_shared<std::string>("test string");
+    auto movedFromAttributedStringBox = AttributedStringBox{string};
+
+    auto moveToAttributedStringBox =
+        AttributedStringBox{std::move(movedFromAttributedStringBox)};
+
+    EXPECT_EQ(
+        moveToAttributedStringBox.getMode(),
+        AttributedStringBox::Mode::OpaquePointer);
+    EXPECT_EQ(moveToAttributedStringBox.getOpaquePointer(), string);
+    EXPECT_EQ(string.use_count(), 2);
+  }
+  {
+    auto attributedString = AttributedString{};
+    auto fragment = AttributedString::Fragment{};
+    fragment.string = "test string";
+    attributedString.appendFragment(fragment);
+    auto movedFromAttributedStringBox = AttributedStringBox{attributedString};
+
+    auto moveToAttributedStringBox =
+        AttributedStringBox{std::move(movedFromAttributedStringBox)};
+
+    EXPECT_EQ(
+        moveToAttributedStringBox.getMode(), AttributedStringBox::Mode::Value);
+    EXPECT_EQ(moveToAttributedStringBox.getValue(), attributedString);
+  }
+}
+
+TEST(AttributedStringBoxTest, testMoveAssignment) {
+  {
+    auto string = std::make_shared<std::string>("test string");
+    auto movedFromAttributedStringBox = AttributedStringBox{string};
+
+    auto movedToAttributedStringBox = AttributedStringBox{};
+    movedToAttributedStringBox = std::move(movedFromAttributedStringBox);
+
+    EXPECT_EQ(
+        movedToAttributedStringBox.getMode(),
+        AttributedStringBox::Mode::OpaquePointer);
+    EXPECT_EQ(movedToAttributedStringBox.getOpaquePointer(), string);
+    EXPECT_EQ(string.use_count(), 2);
+  }
+  {
+    auto attributedString = AttributedString{};
+    auto fragment = AttributedString::Fragment{};
+    fragment.string = "test string";
+    attributedString.appendFragment(fragment);
+    auto movedFromAttributedStringBox = AttributedStringBox{attributedString};
+
+    auto moveToAttributedStringBox = AttributedStringBox{};
+    moveToAttributedStringBox = std::move(movedFromAttributedStringBox);
+
+    EXPECT_EQ(
+        moveToAttributedStringBox.getMode(), AttributedStringBox::Mode::Value);
+    EXPECT_EQ(moveToAttributedStringBox.getValue(), attributedString);
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp
index 9e84969713d080..f0dff668592653 100644
--- a/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp
+++ b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
-
-#include <assert.h>
 #include <gtest/gtest.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/conversions.h>
@@ -20,28 +17,28 @@ namespace react {
 #ifdef ANDROID
 
 TEST(AttributedStringTest, testToDynamic) {
-  auto attString = new AttributedString();
-  auto fragment = new AttributedString::Fragment();
-  fragment->string = "test";
+  auto attributedString = AttributedString{};
+  auto fragment = AttributedString::Fragment{};
+  fragment.string = "test";
 
-  auto text = new TextAttributes();
-  text->foregroundColor = {
+  auto text = TextAttributes{};
+  text.foregroundColor = {
       colorFromComponents({100 / 255.0, 153 / 255.0, 200 / 255.0, 1.0})};
-  text->opacity = 0.5;
-  text->fontStyle = FontStyle::Italic;
-  text->fontWeight = FontWeight::Thin;
-  text->fontVariant = FontVariant::TabularNums;
-  fragment->textAttributes = *text;
+  text.opacity = 0.5;
+  text.fontStyle = FontStyle::Italic;
+  text.fontWeight = FontWeight::Thin;
+  text.fontVariant = FontVariant::TabularNums;
+  fragment.textAttributes = text;
 
-  attString->prependFragment(*fragment);
+  attributedString.appendFragment(fragment);
 
-  auto result = toDynamic(*attString);
-  assert(result["string"] == fragment->string);
+  auto result = toDynamic(attributedString);
+  EXPECT_EQ(result["string"], fragment.string);
   auto textAttribute = result["fragments"][0]["textAttributes"];
-  assert(textAttribute["foregroundColor"] == toDynamic(text->foregroundColor));
-  assert(textAttribute["opacity"] == text->opacity);
-  assert(textAttribute["fontStyle"] == toString(*text->fontStyle));
-  assert(textAttribute["fontWeight"] == toString(*text->fontWeight));
+  EXPECT_EQ(textAttribute["foregroundColor"], toDynamic(text.foregroundColor));
+  EXPECT_EQ(textAttribute["opacity"], text.opacity);
+  EXPECT_EQ(textAttribute["fontStyle"], toString(text.fontStyle.value()));
+  EXPECT_EQ(textAttribute["fontWeight"], toString(text.fontWeight.value()));
 }
 
 #endif
diff --git a/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
index 56378937062f11..8b44e8b9fc2b94 100644
--- a/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
+++ b/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
-
-#include <assert.h>
 #include <gtest/gtest.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/attributedstring/conversions.h>
@@ -19,20 +16,18 @@ namespace react {
 #ifdef ANDROID
 
 TEST(ParagraphAttributesTest, testToDynamic) {
-  auto paragraphAttributes = ParagraphAttributes();
+  auto paragraphAttributes = ParagraphAttributes{};
   paragraphAttributes.maximumNumberOfLines = 2;
   paragraphAttributes.adjustsFontSizeToFit = false;
   paragraphAttributes.ellipsizeMode = EllipsizeMode::Middle;
 
   auto result = toDynamic(paragraphAttributes);
-  assert(
-      result["maximumNumberOfLines"] ==
-      paragraphAttributes.maximumNumberOfLines);
-  assert(
-      result["adjustsFontSizeToFit"] ==
-      paragraphAttributes.adjustsFontSizeToFit);
-  assert(
-      result["ellipsizeMode"] == toString(paragraphAttributes.ellipsizeMode));
+  EXPECT_EQ(
+      result["maximumNumberOfLines"], paragraphAttributes.maximumNumberOfLines);
+  EXPECT_EQ(
+      result["adjustsFontSizeToFit"], paragraphAttributes.adjustsFontSizeToFit);
+  EXPECT_EQ(
+      result["ellipsizeMode"], toString(paragraphAttributes.ellipsizeMode));
 }
 
 #endif
diff --git a/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp
index 7c25e0c7278ad9..7fce2b9a7835b4 100644
--- a/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp
+++ b/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
-
-#include <assert.h>
 #include <gtest/gtest.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/conversions.h>
@@ -20,19 +17,20 @@ namespace react {
 #ifdef ANDROID
 
 TEST(TextAttributesTest, testToDynamic) {
-  auto text = TextAttributes();
-  text.foregroundColor = {
+  auto textAttributes = TextAttributes{};
+  textAttributes.foregroundColor = {
       colorFromComponents({200 / 255.0, 153 / 255.0, 100 / 255.0, 1.0})};
-  text.opacity = 0.5;
-  text.fontStyle = FontStyle::Italic;
-  text.fontWeight = FontWeight::Thin;
-  text.fontVariant = FontVariant::TabularNums;
-
-  auto result = toDynamic(text);
-  assert(result["foregroundColor"] == toDynamic(text.foregroundColor));
-  assert(result["opacity"] == text.opacity);
-  assert(result["fontStyle"] == toString(*text.fontStyle));
-  assert(result["fontWeight"] == toString(*text.fontWeight));
+  textAttributes.opacity = 0.5;
+  textAttributes.fontStyle = FontStyle::Italic;
+  textAttributes.fontWeight = FontWeight::Thin;
+  textAttributes.fontVariant = FontVariant::TabularNums;
+
+  auto result = toDynamic(textAttributes);
+  EXPECT_EQ(
+      result["foregroundColor"], toDynamic(textAttributes.foregroundColor));
+  EXPECT_EQ(result["opacity"], textAttributes.opacity);
+  EXPECT_EQ(result["fontStyle"], toString(textAttributes.fontStyle.value()));
+  EXPECT_EQ(result["fontWeight"], toString(textAttributes.fontWeight.value()));
 }
 
 #endif
diff --git a/ReactCommon/react/renderer/componentregistry/Android.mk b/ReactCommon/react/renderer/componentregistry/Android.mk
index 3ca9726aa4d927..06297c72980580 100644
--- a/ReactCommon/react/renderer/componentregistry/Android.mk
+++ b/ReactCommon/react/renderer/componentregistry/Android.mk
@@ -15,12 +15,12 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libjsi libfolly_futures libfolly_json libreact_render_core libreact_render_debug libreact_utils libglog_init
+LOCAL_SHARED_LIBRARIES := libjsi libfolly_futures libfolly_json libreact_render_core libreact_render_debug libreact_utils libglog_init libreact_debug
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -30,3 +30,4 @@ $(call import-module,jsi)
 $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
diff --git a/ReactCommon/react/renderer/componentregistry/BUCK b/ReactCommon/react/renderer/componentregistry/BUCK
index 7fa21e963dda4a..a9f8d697179ad2 100644
--- a/ReactCommon/react/renderer/componentregistry/BUCK
+++ b/ReactCommon/react/renderer/componentregistry/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -6,6 +5,7 @@ load(
     "CXX",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -16,11 +16,11 @@ APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 rn_xplat_cxx_library(
     name = "componentregistry",
     srcs = glob(
-        ["**/*.cpp"],
+        ["*.cpp"],
         exclude = glob(["tests/**/*.cpp"]),
     ),
     headers = glob(
-        ["**/*.h"],
+        ["*.h"],
         exclude = glob(["tests/**/*.h"]),
     ),
     header_namespace = "",
@@ -33,7 +33,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -55,6 +55,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/utils:utils"),
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h
index c321d4af91691c..99e91a8e9a7c23 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h
@@ -63,10 +63,11 @@ ComponentDescriptorProvider concreteComponentDescriptorProvider() {
       std::is_base_of<ComponentDescriptor, ComponentDescriptorT>::value,
       "ComponentDescriptorT must be a descendant of ComponentDescriptor");
 
-  return {ComponentDescriptorT::ConcreteShadowNode::Handle(),
-          ComponentDescriptorT::ConcreteShadowNode::Name(),
-          nullptr,
-          &concreteComponentDescriptorConstructor<ComponentDescriptorT>};
+  return {
+      ComponentDescriptorT::ConcreteShadowNode::Handle(),
+      ComponentDescriptorT::ConcreteShadowNode::Name(),
+      nullptr,
+      &concreteComponentDescriptorConstructor<ComponentDescriptorT>};
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp
index 4255db72157a07..609316369d39c5 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp
@@ -68,8 +68,8 @@ ComponentDescriptorProviderRegistry::createComponentDescriptorRegistry(
     ComponentDescriptorParameters const &parameters) const {
   std::shared_lock<better::shared_mutex> lock(mutex_);
 
-  auto registry =
-      std::make_shared<ComponentDescriptorRegistry const>(parameters, *this);
+  auto registry = std::make_shared<ComponentDescriptorRegistry const>(
+      parameters, *this, parameters.contextContainer);
 
   for (auto const &pair : componentDescriptorProviders_) {
     registry->add(pair.second);
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h
index 769f0f3b91c7e7..c4d1982b0b0791 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h
@@ -12,6 +12,7 @@
 #include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 #include <react/renderer/core/ComponentDescriptor.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp
index ede6ca809372ea..137fb20cbbfe4b 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp
@@ -7,7 +7,11 @@
 
 #include "ComponentDescriptorRegistry.h"
 
+#include "componentNameByReactViewName.h"
+
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 
 namespace facebook {
@@ -15,8 +19,11 @@ namespace react {
 
 ComponentDescriptorRegistry::ComponentDescriptorRegistry(
     ComponentDescriptorParameters const &parameters,
-    ComponentDescriptorProviderRegistry const &providerRegistry)
-    : parameters_(parameters), providerRegistry_(providerRegistry) {}
+    ComponentDescriptorProviderRegistry const &providerRegistry,
+    ContextContainer::Shared contextContainer)
+    : parameters_(parameters),
+      providerRegistry_(providerRegistry),
+      contextContainer_(contextContainer) {}
 
 void ComponentDescriptorRegistry::add(
     ComponentDescriptorProvider componentDescriptorProvider) const {
@@ -26,10 +33,10 @@ void ComponentDescriptorRegistry::add(
       {parameters_.eventDispatcher,
        parameters_.contextContainer,
        componentDescriptorProvider.flavor});
-  assert(
+  react_native_assert(
       componentDescriptor->getComponentHandle() ==
       componentDescriptorProvider.handle);
-  assert(
+  react_native_assert(
       componentDescriptor->getComponentName() ==
       componentDescriptorProvider.name);
 
@@ -49,65 +56,6 @@ void ComponentDescriptorRegistry::registerComponentDescriptor(
   _registryByName[componentName] = componentDescriptor;
 }
 
-static std::string componentNameByReactViewName(std::string viewName) {
-  // We need this function only for the transition period;
-  // eventually, all names will be unified.
-
-  std::string rctPrefix("RCT");
-  if (std::mismatch(rctPrefix.begin(), rctPrefix.end(), viewName.begin())
-          .first == rctPrefix.end()) {
-    // If `viewName` has "RCT" prefix, remove it.
-    viewName.erase(0, rctPrefix.length());
-  }
-
-  // Fabric uses slightly new names for Text components because of differences
-  // in semantic.
-  if (viewName == "Text") {
-    return "Paragraph";
-  }
-
-  // TODO T63839307: remove this condition after deleting TextInlineImage from
-  // Paper
-  if (viewName == "TextInlineImage") {
-    return "Image";
-  }
-  if (viewName == "VirtualText") {
-    return "Text";
-  }
-
-  if (viewName == "ImageView") {
-    return "Image";
-  }
-
-  if (viewName == "AndroidHorizontalScrollView") {
-    return "ScrollView";
-  }
-
-  if (viewName == "RKShimmeringView") {
-    return "ShimmeringView";
-  }
-
-  if (viewName == "RefreshControl") {
-    return "PullToRefreshView";
-  }
-
-  // We need this temporarily for testing purposes until we have proper
-  // implementation of core components.
-  if (viewName == "ScrollContentView" ||
-      viewName == "AndroidHorizontalScrollContentView" // Android
-  ) {
-    return "View";
-  }
-
-  // iOS-only
-  if (viewName == "MultilineTextInputView" ||
-      viewName == "SinglelineTextInputView") {
-    return "TextInput";
-  }
-
-  return viewName;
-}
-
 ComponentDescriptor const &ComponentDescriptorRegistry::at(
     std::string const &componentName) const {
   std::shared_lock<better::shared_mutex> lock(mutex_);
@@ -116,9 +64,9 @@ ComponentDescriptor const &ComponentDescriptorRegistry::at(
 
   auto it = _registryByName.find(unifiedComponentName);
   if (it == _registryByName.end()) {
-    mutex_.unlock_shared();
+    lock.unlock();
     providerRegistry_.request(unifiedComponentName.c_str());
-    mutex_.lock_shared();
+    lock.lock();
 
     it = _registryByName.find(unifiedComponentName);
 
@@ -185,11 +133,13 @@ SharedShadowNode ComponentDescriptorRegistry::createNode(
   auto unifiedComponentName = componentNameByReactViewName(viewName);
   auto const &componentDescriptor = this->at(unifiedComponentName);
 
-  auto family = componentDescriptor.createFamily(
-      ShadowNodeFamilyFragment{tag, surfaceId, nullptr},
-      std::move(eventTarget));
-  auto const props =
-      componentDescriptor.cloneProps(nullptr, RawProps(propsDynamic));
+  auto const fragment = ShadowNodeFamilyFragment{tag, surfaceId, nullptr};
+  auto family =
+      componentDescriptor.createFamily(fragment, std::move(eventTarget));
+  auto const props = componentDescriptor.cloneProps(
+      PropsParserContext{surfaceId, *contextContainer_.get()},
+      nullptr,
+      RawProps(propsDynamic));
   auto const state =
       componentDescriptor.createInitialState(ShadowNodeFragment{props}, family);
 
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h
index 29dac6f371ef16..e23d41c1461657 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h
@@ -14,6 +14,7 @@
 
 #include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 #include <react/renderer/core/ComponentDescriptor.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {
@@ -37,7 +38,8 @@ class ComponentDescriptorRegistry {
    */
   ComponentDescriptorRegistry(
       ComponentDescriptorParameters const &parameters,
-      ComponentDescriptorProviderRegistry const &providerRegistry);
+      ComponentDescriptorProviderRegistry const &providerRegistry,
+      ContextContainer::Shared contextContainer);
 
   /*
    * This is broken. Please do not use.
@@ -85,6 +87,7 @@ class ComponentDescriptorRegistry {
   ComponentDescriptor::Shared _fallbackComponentDescriptor;
   ComponentDescriptorParameters parameters_{};
   ComponentDescriptorProviderRegistry const &providerRegistry_;
+  ContextContainer::Shared contextContainer_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
new file mode 100644
index 00000000000000..d703dcb549d9cc
--- /dev/null
+++ b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "componentNameByReactViewName.h"
+
+namespace facebook {
+namespace react {
+
+std::string componentNameByReactViewName(std::string viewName) {
+  // We need this function only for the transition period;
+  // eventually, all names will be unified.
+
+  // TODO T97384889: unify component names between JS - Android - iOS - C++
+  std::string rctPrefix("RCT");
+  if (std::mismatch(rctPrefix.begin(), rctPrefix.end(), viewName.begin())
+          .first == rctPrefix.end()) {
+    // If `viewName` has "RCT" prefix, remove it.
+    viewName.erase(0, rctPrefix.length());
+  }
+
+  // Fabric uses slightly new names for Text components because of differences
+  // in semantic.
+  if (viewName == "Text") {
+    return "Paragraph";
+  }
+
+  // TODO T63839307: remove this condition after deleting TextInlineImage from
+  // old renderer code
+  if (viewName == "TextInlineImage") {
+    return "Image";
+  }
+  if (viewName == "VirtualText") {
+    return "Text";
+  }
+
+  if (viewName == "ImageView") {
+    return "Image";
+  }
+
+  if (viewName == "AndroidHorizontalScrollView") {
+    return "ScrollView";
+  }
+
+  if (viewName == "RKShimmeringView") {
+    return "ShimmeringView";
+  }
+
+  if (viewName == "RefreshControl") {
+    return "PullToRefreshView";
+  }
+
+  // We need this temporarily for testing purposes until we have proper
+  // implementation of core components.
+  // iOS-only
+  if (viewName == "ScrollContentView") {
+    return "View";
+  }
+
+  // iOS-only
+  if (viewName == "MultilineTextInputView" ||
+      viewName == "SinglelineTextInputView") {
+    return "TextInput";
+  }
+
+  return viewName;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.cpp b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.h
similarity index 62%
rename from ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.cpp
rename to ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.h
index 2d39cdb106b856..8408b2a2cadc00 100644
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.cpp
+++ b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.h
@@ -5,12 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "PickerShadowNode.h"
+#pragma once
+
+#include <string>
 
 namespace facebook {
 namespace react {
 
-extern const char PickerComponentName[] = "Picker";
+/**
+ * Provides mapping from old view name format to the new format.
+ */
+std::string componentNameByReactViewName(std::string viewName);
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/componentregistry/native/Android.mk b/ReactCommon/react/renderer/componentregistry/native/Android.mk
new file mode 100644
index 00000000000000..f5674482f6bc40
--- /dev/null
+++ b/ReactCommon/react/renderer/componentregistry/native/Android.mk
@@ -0,0 +1,29 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := rrc_native
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
+
+LOCAL_SHARED_LIBRARIES := libjsi libfolly_futures libfolly_json libreact_render_core libreact_render_debug libreact_utils libglog_init libreact_debug
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"Fabric\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,fbgloginit)
+$(call import-module,folly)
+$(call import-module,jsi)
diff --git a/ReactCommon/react/renderer/componentregistry/native/BUCK b/ReactCommon/react/renderer/componentregistry/native/BUCK
new file mode 100644
index 00000000000000..c60fb13920afe1
--- /dev/null
+++ b/ReactCommon/react/renderer/componentregistry/native/BUCK
@@ -0,0 +1,58 @@
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "native",
+    srcs = glob(
+        ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = glob(
+        ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "react/renderer/componentregistry/native",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    force_static = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//third-party/glog:glog",
+        "//xplat/fbsystrace:fbsystrace",
+        "//xplat/folly:headers_only",
+        "//xplat/folly:memory",
+        "//xplat/folly:molly",
+        "//xplat/jsi:JSIDynamic",
+        "//xplat/jsi:jsi",
+    ],
+)
diff --git a/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp b/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp
new file mode 100644
index 00000000000000..47487766304965
--- /dev/null
+++ b/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "NativeComponentRegistryBinding.h"
+
+#include <stdexcept>
+#include <string>
+
+using namespace facebook;
+
+namespace facebook {
+namespace react {
+
+/**
+ * Public API to install the NativeComponentRegistryBinding.
+ */
+NativeComponentRegistryBinding::NativeComponentRegistryBinding(
+    const HasComponentProviderFunctionType &&hasComponentProvider)
+    : hasComponentProvider_(std::move(hasComponentProvider)) {}
+
+void NativeComponentRegistryBinding::install(
+    jsi::Runtime &runtime,
+    const HasComponentProviderFunctionType &&hasComponentProvider) {
+  runtime.global().setProperty(
+      runtime,
+      "__nativeComponentRegistry__hasComponent",
+      jsi::Function::createFromHostFunction(
+          runtime,
+          jsi::PropNameID::forAscii(
+              runtime, "__nativeComponentRegistry__hasComponent"),
+          1,
+          [binding = std::make_shared<NativeComponentRegistryBinding>(
+               std::move(hasComponentProvider))](
+              jsi::Runtime &rt,
+              const jsi::Value &thisVal,
+              const jsi::Value *args,
+              size_t count) {
+            return binding->jsProxy(rt, thisVal, args, count);
+          }));
+}
+
+bool NativeComponentRegistryBinding::hasComponent(const std::string &name) {
+  return hasComponentProvider_(name);
+}
+
+jsi::Value NativeComponentRegistryBinding::jsProxy(
+    jsi::Runtime &runtime,
+    const jsi::Value &thisVal,
+    const jsi::Value *args,
+    size_t count) {
+  if (count != 1) {
+    throw std::invalid_argument(
+        "__nativeComponentRegistry__hasComponent must be called with 1 argument");
+  }
+  std::string moduleName = args[0].getString(runtime).utf8(runtime);
+  jsi::Value nullSchema = jsi::Value::undefined();
+
+  bool result = hasComponent(moduleName);
+
+  return jsi::Value(result);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h b/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h
new file mode 100644
index 00000000000000..403b332342df7a
--- /dev/null
+++ b/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <string>
+
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+/**
+ * An app/platform-specific provider function to determine if a component
+ * is registered in the native platform.
+ */
+using HasComponentProviderFunctionType =
+    std::function<bool(const std::string &name)>;
+
+/**
+ * Represents the JavaScript binding for the HasComponent global function.
+ */
+class NativeComponentRegistryBinding {
+ public:
+  /*
+   * Installs NativeComponentRegistryBinding into JavaScript runtime.
+   * Thread synchronization must be enforced externally.
+   */
+  static void install(
+      jsi::Runtime &runtime,
+      const HasComponentProviderFunctionType &&provider);
+
+  NativeComponentRegistryBinding(
+      const HasComponentProviderFunctionType &&provider);
+
+  /**
+   * Returns if there's a component registered with the name received as a
+   * parameter
+   */
+  bool hasComponent(const std::string &name);
+
+ private:
+  /**
+   * A lookup function exposed to JS to determine if a component is registered
+   * in the native platform.
+   */
+  jsi::Value jsProxy(
+      jsi::Runtime &runtime,
+      const jsi::Value &thisVal,
+      const jsi::Value *args,
+      size_t count);
+
+  HasComponentProviderFunctionType hasComponentProvider_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/image/Android.mk b/ReactCommon/react/renderer/components/image/Android.mk
index 1d0875ec4247b3..8c3fbcabda9c02 100644
--- a/ReactCommon/react/renderer/components/image/Android.mk
+++ b/ReactCommon/react/renderer/components/image/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_image
+LOCAL_MODULE := rrc_image
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view libreact_render_imagemanager
+LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -34,3 +34,5 @@ $(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/imagemanager)
 $(call import-module,react/renderer/components/view)
 $(call import-module,yogajni)
+$(call import-module,react/debug)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/renderer/components/image/BUCK b/ReactCommon/react/renderer/components/image/BUCK
index 205771229aea14..44fbbfe147c69a 100644
--- a/ReactCommon/react/renderer/components/image/BUCK
+++ b/ReactCommon/react/renderer/components/image/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -32,9 +32,12 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
+    fbandroid_deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     labels = ["supermodule:xplat/default/public.react_native.infra"],
@@ -50,6 +53,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:headers_only",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
@@ -65,7 +69,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h b/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
index 1e2b6708649ff2..4366a886c4a177 100644
--- a/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/image/ImageShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/imagemanager/ImageManager.h>
@@ -25,10 +26,10 @@ class ImageComponentDescriptor final
       : ConcreteComponentDescriptor(parameters),
         imageManager_(std::make_shared<ImageManager>(contextContainer_)){};
 
-  void adopt(UnsharedShadowNode shadowNode) const override {
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    assert(std::dynamic_pointer_cast<ImageShadowNode>(shadowNode));
+    react_native_assert(std::dynamic_pointer_cast<ImageShadowNode>(shadowNode));
     auto imageShadowNode =
         std::static_pointer_cast<ImageShadowNode>(shadowNode);
 
diff --git a/ReactCommon/react/renderer/components/image/ImageProps.cpp b/ReactCommon/react/renderer/components/image/ImageProps.cpp
index 4a496bba12d011..b007b4869d4583 100644
--- a/ReactCommon/react/renderer/components/image/ImageProps.cpp
+++ b/ReactCommon/react/renderer/components/image/ImageProps.cpp
@@ -12,26 +12,45 @@
 namespace facebook {
 namespace react {
 
-ImageProps::ImageProps(const ImageProps &sourceProps, const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      sources(convertRawProp(rawProps, "source", sourceProps.sources, {})),
+ImageProps::ImageProps(
+    const PropsParserContext &context,
+    const ImageProps &sourceProps,
+    const RawProps &rawProps)
+    : ViewProps(context, sourceProps, rawProps),
+      sources(
+          convertRawProp(context, rawProps, "source", sourceProps.sources, {})),
       defaultSources(convertRawProp(
+          context,
           rawProps,
           "defaultSource",
           sourceProps.defaultSources,
           {})),
       resizeMode(convertRawProp(
+          context,
           rawProps,
           "resizeMode",
           sourceProps.resizeMode,
           ImageResizeMode::Stretch)),
-      blurRadius(
-          convertRawProp(rawProps, "blurRadius", sourceProps.blurRadius, {})),
-      capInsets(
-          convertRawProp(rawProps, "capInsets", sourceProps.capInsets, {})),
-      tintColor(
-          convertRawProp(rawProps, "tintColor", sourceProps.tintColor, {})),
+      blurRadius(convertRawProp(
+          context,
+          rawProps,
+          "blurRadius",
+          sourceProps.blurRadius,
+          {})),
+      capInsets(convertRawProp(
+          context,
+          rawProps,
+          "capInsets",
+          sourceProps.capInsets,
+          {})),
+      tintColor(convertRawProp(
+          context,
+          rawProps,
+          "tintColor",
+          sourceProps.tintColor,
+          {})),
       internal_analyticTag(convertRawProp(
+          context,
           rawProps,
           "internal_analyticTag",
           sourceProps.internal_analyticTag,
diff --git a/ReactCommon/react/renderer/components/image/ImageProps.h b/ReactCommon/react/renderer/components/image/ImageProps.h
index 7ecfc27b8f7143..b3d9ef36cf53be 100644
--- a/ReactCommon/react/renderer/components/image/ImageProps.h
+++ b/ReactCommon/react/renderer/components/image/ImageProps.h
@@ -6,6 +6,7 @@
  */
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
 
@@ -16,7 +17,10 @@ namespace react {
 class ImageProps final : public ViewProps {
  public:
   ImageProps() = default;
-  ImageProps(const ImageProps &sourceProps, const RawProps &rawProps);
+  ImageProps(
+      const PropsParserContext &context,
+      const ImageProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - Props
 
diff --git a/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp b/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
index fe20bc78845db6..64a1020e2e2178 100644
--- a/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
@@ -25,7 +25,7 @@ void ImageShadowNode::setImageManager(const SharedImageManager &imageManager) {
 void ImageShadowNode::updateStateIfNeeded() {
   ensureUnsealed();
 
-  auto const &imageSource = getImageSource();
+  auto imageSource = getImageSource();
   auto const &currentState = getStateData();
   bool hasSameRadius =
       getConcreteProps().blurRadius == currentState.getBlurRadius();
@@ -35,10 +35,10 @@ void ImageShadowNode::updateStateIfNeeded() {
     return;
   }
 
-  auto state =
-      ImageState{imageSource,
-                 imageManager_->requestImage(imageSource, getSurfaceId()),
-                 getConcreteProps().blurRadius};
+  auto state = ImageState{
+      imageSource,
+      imageManager_->requestImage(imageSource, getSurfaceId()),
+      getConcreteProps().blurRadius};
   setStateData(std::move(state));
 }
 
diff --git a/ReactCommon/react/renderer/components/image/ImageState.h b/ReactCommon/react/renderer/components/image/ImageState.h
index 8dfa5d6f902173..68cdcb681f4fd8 100644
--- a/ReactCommon/react/renderer/components/image/ImageState.h
+++ b/ReactCommon/react/renderer/components/image/ImageState.h
@@ -7,10 +7,14 @@
 
 #pragma once
 
-#include <folly/dynamic.h>
 #include <react/renderer/imagemanager/ImageRequest.h>
 #include <react/renderer/imagemanager/primitives.h>
 
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
 namespace facebook {
 namespace react {
 
@@ -50,6 +54,10 @@ class ImageState final {
   folly::dynamic getDynamic() const {
     return {};
   };
+
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
 #endif
 
  private:
diff --git a/ReactCommon/react/renderer/components/image/conversions.h b/ReactCommon/react/renderer/components/image/conversions.h
index a77d40fad489e1..9449dfe773b278 100644
--- a/ReactCommon/react/renderer/components/image/conversions.h
+++ b/ReactCommon/react/renderer/components/image/conversions.h
@@ -9,13 +9,19 @@
 
 #include <better/map.h>
 #include <folly/dynamic.h>
+#include <glog/logging.h>
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/conversions.h>
 #include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
 
-inline void fromRawValue(const RawValue &value, ImageSource &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    ImageSource &result) {
   if (value.hasType<std::string>()) {
     result = {
         /* .type = */ ImageSource::Type::Remote,
@@ -49,7 +55,7 @@ inline void fromRawValue(const RawValue &value, ImageSource &result) {
         items.at("scale").hasType<Float>()) {
       result.scale = (Float)items.at("scale");
     } else {
-      result.scale = items.find("deprecated") != items.end() ? 0.0 : 1.0;
+      result.scale = items.find("deprecated") != items.end() ? 0.0f : 1.0f;
     }
 
     if (items.find("url") != items.end() &&
@@ -87,30 +93,35 @@ inline std::string toString(const ImageSource &value) {
   return "{uri: " + value.uri + "}";
 }
 
-inline void fromRawValue(const RawValue &value, ImageResizeMode &result) {
-  assert(value.hasType<std::string>());
-  auto stringValue = (std::string)value;
-  if (stringValue == "cover") {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    ImageResizeMode &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (!value.hasType<std::string>()) {
+    LOG(ERROR) << "Unsupported ImageResizeMode type";
+    // "cover" is default in non-Fabric web and iOS
     result = ImageResizeMode::Cover;
     return;
   }
-  if (stringValue == "contain") {
+
+  auto stringValue = (std::string)value;
+  if (stringValue == "cover") {
+    result = ImageResizeMode::Cover;
+  } else if (stringValue == "contain") {
     result = ImageResizeMode::Contain;
-    return;
-  }
-  if (stringValue == "stretch") {
+  } else if (stringValue == "stretch") {
     result = ImageResizeMode::Stretch;
-    return;
-  }
-  if (stringValue == "center") {
+  } else if (stringValue == "center") {
     result = ImageResizeMode::Center;
-    return;
-  }
-  if (stringValue == "repeat") {
+  } else if (stringValue == "repeat") {
     result = ImageResizeMode::Repeat;
-    return;
+  } else {
+    LOG(ERROR) << "Unsupported ImageResizeMode value: " << stringValue;
+    react_native_assert(false);
+    // "cover" is default in non-Fabric web and iOS
+    result = ImageResizeMode::Cover;
   }
-  abort();
 }
 
 inline std::string toString(const ImageResizeMode &value) {
diff --git a/ReactCommon/react/renderer/components/inputaccessory/BUCK b/ReactCommon/react/renderer/components/inputaccessory/BUCK
index c1debab5958b03..3cddfd26afe743 100644
--- a/ReactCommon/react/renderer/components/inputaccessory/BUCK
+++ b/ReactCommon/react/renderer/components/inputaccessory/BUCK
@@ -1,9 +1,9 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "APPLE",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -27,20 +27,21 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (APPLE),
+    platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
     visibility = ["PUBLIC"],
     deps = [
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         "//xplat/js/react-native-github:generated_components-rncore",
     ],
diff --git a/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h
index 99898b2395bae8..cf864d30f050b6 100644
--- a/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/inputaccessory/InputAccessoryShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
@@ -21,12 +22,13 @@ class InputAccessoryComponentDescriptor final
  public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
-  void adopt(UnsharedShadowNode shadowNode) const override {
-    assert(std::dynamic_pointer_cast<InputAccessoryShadowNode>(shadowNode));
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
+    react_native_assert(
+        std::dynamic_pointer_cast<InputAccessoryShadowNode>(shadowNode));
     auto concreteShadowNode =
         std::static_pointer_cast<InputAccessoryShadowNode>(shadowNode);
 
-    assert(std::dynamic_pointer_cast<YogaLayoutableShadowNode>(
+    react_native_assert(std::dynamic_pointer_cast<YogaLayoutableShadowNode>(
         concreteShadowNode));
     auto layoutableShadowNode =
         std::static_pointer_cast<YogaLayoutableShadowNode>(concreteShadowNode);
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK
index 6a76b1098695f2..93ee20de397b7e 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK
@@ -1,9 +1,9 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "APPLE",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -30,14 +30,14 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (APPLE),
+    platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h
index 67d1291a10ef43..089e3ff40cccee 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h
@@ -28,7 +28,7 @@ class LegacyViewManagerInteropComponentDescriptor final
   ComponentName getComponentName() const override;
 
  protected:
-  void adopt(ShadowNode::Unshared shadowNode) const override;
+  void adopt(ShadowNode::Unshared const &shadowNode) const override;
 
  private:
   std::shared_ptr<void> const _coordinator;
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm
index 06f79b844afbe0..8c44bc24653834 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm
@@ -8,8 +8,8 @@
 #include "LegacyViewManagerInteropComponentDescriptor.h"
 #include <React/RCTBridge.h>
 #include <React/RCTComponentData.h>
+#include <React/RCTEventDispatcher.h>
 #include <React/RCTModuleData.h>
-#include <React/RCTUIManager.h>
 #include <react/utils/ContextContainer.h>
 #include <react/utils/ManagedObjectWrapper.h>
 #include "LegacyViewManagerInteropState.h"
@@ -59,8 +59,21 @@
   auto moduleName = moduleNameFromComponentName(componentName);
   Class module = NSClassFromString(RCTNSStringFromString(moduleName));
   assert(module);
-  RCTBridge *bridge = (RCTBridge *)unwrapManagedObjectWeakly(contextContainer->at<std::shared_ptr<void>>("Bridge"));
-  RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:module bridge:bridge];
+  auto optionalBridge = contextContainer->find<std::shared_ptr<void>>("Bridge");
+  RCTBridge *bridge;
+  if (optionalBridge) {
+    bridge = unwrapManagedObjectWeakly(optionalBridge.value());
+  }
+
+  auto optionalEventDispatcher = contextContainer->find<std::shared_ptr<void>>("RCTEventDispatcher");
+  RCTEventDispatcher *eventDispatcher;
+  if (optionalEventDispatcher) {
+    eventDispatcher = unwrapManagedObject(optionalEventDispatcher.value());
+  }
+
+  RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:module
+                                                                            bridge:bridge
+                                                                   eventDispatcher:eventDispatcher];
   return wrapManagedObject([[RCTLegacyViewManagerInteropCoordinator alloc] initWithComponentData:componentData
                                                                                           bridge:bridge]);
 }
@@ -81,7 +94,7 @@
   return std::static_pointer_cast<std::string const>(this->flavor_)->c_str();
 }
 
-void LegacyViewManagerInteropComponentDescriptor::adopt(ShadowNode::Unshared shadowNode) const
+void LegacyViewManagerInteropComponentDescriptor::adopt(ShadowNode::Unshared const &shadowNode) const
 {
   ConcreteComponentDescriptor::adopt(shadowNode);
 
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp
index 891c0e0aecce1e..4676a2c01e1b60 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp
@@ -6,14 +6,19 @@
  */
 
 #include "LegacyViewManagerInteropViewProps.h"
+#include <react/renderer/core/DynamicPropsUtilities.h>
 
 namespace facebook {
 namespace react {
 
 LegacyViewManagerInteropViewProps::LegacyViewManagerInteropViewProps(
+    const PropsParserContext &context,
     const LegacyViewManagerInteropViewProps &sourceProps,
     const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps), otherProps((folly::dynamic)rawProps) {}
+    : ViewProps(context, sourceProps, rawProps),
+      otherProps(
+          mergeDynamicProps(sourceProps.otherProps, (folly::dynamic)rawProps)) {
+}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h
index 9b56571e579b6e..b2645cd7de2d3b 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h
@@ -7,6 +7,7 @@
 
 #include <folly/dynamic.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <unordered_map>
 
 namespace facebook {
@@ -16,6 +17,7 @@ class LegacyViewManagerInteropViewProps final : public ViewProps {
  public:
   LegacyViewManagerInteropViewProps() = default;
   LegacyViewManagerInteropViewProps(
+      const PropsParserContext &context,
       const LegacyViewManagerInteropViewProps &sourceProps,
       const RawProps &rawProps);
 
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h
index f93f959283946e..ca84249cae994e 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h
@@ -20,7 +20,7 @@ typedef void (^InterceptorBlock)(std::string eventName, folly::dynamic event);
 
 - (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(RCTBridge *)bridge;
 
-- (UIView *)paperView;
+- (UIView *)createPaperViewWithTag:(NSInteger)tag;
 
 - (void)addObserveForTag:(NSInteger)tag usingBlock:(InterceptorBlock)block;
 
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
index 3e962334bf9c7f..60ac9786f6594a 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
@@ -12,10 +12,13 @@
 #include <React/RCTEventDispatcherProtocol.h>
 #include <React/RCTFollyConvert.h>
 #include <React/RCTModuleData.h>
+#include <React/RCTModuleMethod.h>
 #include <React/RCTUIManager.h>
 #include <React/RCTUIManagerUtils.h>
 #include <React/RCTUtils.h>
+#include <React/RCTWeakViewHolder.h>
 #include <folly/json.h>
+#include <objc/runtime.h>
 
 using namespace facebook::react;
 
@@ -23,13 +26,20 @@ @implementation RCTLegacyViewManagerInteropCoordinator {
   RCTComponentData *_componentData;
   __weak RCTBridge *_bridge;
   /*
-   Each instnace of `RCTLegacyViewManagerInteropComponentView` registers a block to which events are dispatched.
+   Each instance of `RCTLegacyViewManagerInteropComponentView` registers a block to which events are dispatched.
    This is the container that maps unretained UIView pointer to a block to which the event is dispatched.
    */
   NSMutableDictionary<NSNumber *, InterceptorBlock> *_eventInterceptors;
+
+  /*
+   * In bridgeless mode, instead of using the bridge to look up RCTModuleData,
+   * store that information locally.
+   */
+  NSMutableArray<id<RCTBridgeMethod>> *_moduleMethods;
+  NSMutableDictionary<NSString *, id<RCTBridgeMethod>> *_moduleMethodsByName;
 }
 
-- (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(RCTBridge *)bridge;
+- (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(RCTBridge *)bridge
 {
   if (self = [super init]) {
     _componentData = componentData;
@@ -40,9 +50,11 @@ - (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(
     __weak __typeof(self) weakSelf = self;
     _componentData.eventInterceptor = ^(NSString *eventName, NSDictionary *event, NSNumber *reactTag) {
       __typeof(self) strongSelf = weakSelf;
-      InterceptorBlock block = [strongSelf->_eventInterceptors objectForKey:reactTag];
-      if (block) {
-        block(std::string([RCTNormalizeInputEventName(eventName) UTF8String]), convertIdToFollyDynamic(event ?: @{}));
+      if (strongSelf) {
+        InterceptorBlock block = [strongSelf->_eventInterceptors objectForKey:reactTag];
+        if (block) {
+          block(std::string([RCTNormalizeInputEventName(eventName) UTF8String]), convertIdToFollyDynamic(event ?: @{}));
+        }
       }
     };
   }
@@ -59,10 +71,17 @@ - (void)removeObserveForTag:(NSInteger)tag
   [_eventInterceptors removeObjectForKey:[NSNumber numberWithInteger:tag]];
 }
 
-- (UIView *)paperView
+- (UIView *)createPaperViewWithTag:(NSInteger)tag;
 {
-  // TODO: pass in the right tags?
-  return [_componentData createViewWithTag:NULL rootTag:NULL];
+  UIView *view = [_componentData createViewWithTag:[NSNumber numberWithInteger:tag] rootTag:NULL];
+  if ([_componentData.bridgelessViewManager conformsToProtocol:@protocol(RCTWeakViewHolder)]) {
+    id<RCTWeakViewHolder> weakViewHolder = (id<RCTWeakViewHolder>)_componentData.bridgelessViewManager;
+    if (!weakViewHolder.weakViews) {
+      weakViewHolder.weakViews = [NSMapTable strongToWeakObjectsMapTable];
+    }
+    [weakViewHolder.weakViews setObject:view forKey:[NSNumber numberWithInteger:tag]];
+  }
+  return view;
 }
 
 - (void)setProps:(folly::dynamic const &)props forView:(UIView *)view
@@ -79,12 +98,13 @@ - (NSString *)componentViewName
 - (void)handleCommand:(NSString *)commandName args:(NSArray *)args reactTag:(NSInteger)tag
 {
   Class managerClass = _componentData.managerClass;
+  [self _lookupModuleMethodsIfNecessary];
   RCTModuleData *moduleData = [_bridge.batchedBridge moduleDataForName:RCTBridgeModuleNameForClass(managerClass)];
   id<RCTBridgeMethod> method;
   if ([commandName isKindOfClass:[NSNumber class]]) {
-    method = moduleData.methods[[commandName intValue]];
+    method = moduleData ? moduleData.methods[[commandName intValue]] : _moduleMethods[[commandName intValue]];
   } else if ([commandName isKindOfClass:[NSString class]]) {
-    method = moduleData.methodsByName[commandName];
+    method = moduleData ? moduleData.methodsByName[commandName] : _moduleMethodsByName[commandName];
     if (method == nil) {
       RCTLogError(@"No command found with name \"%@\"", commandName);
     }
@@ -94,12 +114,51 @@ - (void)handleCommand:(NSString *)commandName args:(NSArray *)args reactTag:(NSI
   }
 
   NSArray *newArgs = [@[ [NSNumber numberWithInteger:tag] ] arrayByAddingObjectsFromArray:args];
-  [_bridge.batchedBridge
-      dispatchBlock:^{
-        [method invokeWithBridge:self->_bridge module:self->_componentData.manager arguments:newArgs];
-        [self->_bridge.uiManager setNeedsLayout];
+
+  if (_bridge) {
+    [_bridge.batchedBridge
+        dispatchBlock:^{
+          [method invokeWithBridge:self->_bridge module:self->_componentData.manager arguments:newArgs];
+          [self->_bridge.uiManager setNeedsLayout];
+        }
+                queue:RCTGetUIManagerQueue()];
+  } else {
+    // TODO T86826778 - Figure out which queue this should be dispatched to.
+    [method invokeWithBridge:nil module:self->_componentData.manager arguments:newArgs];
+  }
+}
+
+#pragma mark - Private
+
+// This is copy-pasta from RCTModuleData.
+- (void)_lookupModuleMethodsIfNecessary
+{
+  if (!_bridge && !_moduleMethods) {
+    _moduleMethods = [NSMutableArray new];
+    _moduleMethodsByName = [NSMutableDictionary new];
+
+    unsigned int methodCount;
+    Class cls = _componentData.managerClass;
+    while (cls && cls != [NSObject class] && cls != [NSProxy class]) {
+      Method *methods = class_copyMethodList(object_getClass(cls), &methodCount);
+
+      for (unsigned int i = 0; i < methodCount; i++) {
+        Method method = methods[i];
+        SEL selector = method_getName(method);
+        if ([NSStringFromSelector(selector) hasPrefix:@"__rct_export__"]) {
+          IMP imp = method_getImplementation(method);
+          auto exportedMethod = ((const RCTMethodInfo *(*)(id, SEL))imp)(_componentData.managerClass, selector);
+          id<RCTBridgeMethod> moduleMethod =
+              [[RCTModuleMethod alloc] initWithExportedMethod:exportedMethod moduleClass:_componentData.managerClass];
+          [_moduleMethodsByName setValue:moduleMethod forKey:[NSString stringWithUTF8String:moduleMethod.JSMethodName]];
+          [_moduleMethods addObject:moduleMethod];
+        }
       }
-              queue:RCTGetUIManagerQueue()];
+
+      free(methods);
+      cls = class_getSuperclass(cls);
+    }
+  }
 }
 
 @end
diff --git a/ReactCommon/react/renderer/components/modal/Android.mk b/ReactCommon/react/renderer/components/modal/Android.mk
index dd404e8dbda309..cd0a046e73204b 100644
--- a/ReactCommon/react/renderer/components/modal/Android.mk
+++ b/ReactCommon/react/renderer/components/modal/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_modal
+LOCAL_MODULE := rrc_modal
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_image libreact_render_uimanager libreact_render_imagemanager libreact_render_components_view libreact_render_componentregistry libreact_render_viewmanagers
+LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_image libreact_render_uimanager libreact_render_imagemanager librrc_view libreact_render_componentregistry libreact_codegen_rncore libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -37,3 +37,4 @@ $(call import-module,react/renderer/uimanager)
 $(call import-module,react/renderer/components/image)
 $(call import-module,react/renderer/components/view)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/renderer/components/modal/BUCK b/ReactCommon/react/renderer/components/modal/BUCK
index f2865199207d7f..1b7d859bc13d7f 100644
--- a/ReactCommon/react/renderer/components/modal/BUCK
+++ b/ReactCommon/react/renderer/components/modal/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -7,6 +6,7 @@ load(
     "YOGA_CXX_TARGET",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -34,9 +34,12 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
+    fbandroid_deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbandroid_exported_headers = subdir_glob(
         [
             ("", "*.h"),
@@ -75,6 +78,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/components/image:image"),
diff --git a/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h b/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
index e821c911d38879..4b5adb9c58ed6a 100644
--- a/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <glog/logging.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/modal/ModalHostViewShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
@@ -23,12 +24,13 @@ class ModalHostViewComponentDescriptor final
  public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
-  void adopt(UnsharedShadowNode shadowNode) const override {
-    assert(std::dynamic_pointer_cast<ModalHostViewShadowNode>(shadowNode));
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
+    react_native_assert(
+        std::dynamic_pointer_cast<ModalHostViewShadowNode>(shadowNode));
     auto modalShadowNode =
         std::static_pointer_cast<ModalHostViewShadowNode>(shadowNode);
 
-    assert(
+    react_native_assert(
         std::dynamic_pointer_cast<YogaLayoutableShadowNode>(modalShadowNode));
     auto layoutableShadowNode =
         std::static_pointer_cast<YogaLayoutableShadowNode>(modalShadowNode);
diff --git a/ReactCommon/react/renderer/components/modal/ModalHostViewState.h b/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
index 51e3677ff5459b..b0921864ba7791 100644
--- a/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
+++ b/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
@@ -13,6 +13,8 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook {
@@ -32,14 +34,19 @@ class ModalHostViewState final {
   ModalHostViewState(
       ModalHostViewState const &previousState,
       folly::dynamic data)
-      : screenSize(Size{(Float)data["screenWidth"].getDouble(),
-                        (Float)data["screenHeight"].getDouble()}){};
+      : screenSize(Size{
+            (Float)data["screenWidth"].getDouble(),
+            (Float)data["screenHeight"].getDouble()}){};
 #endif
 
   const Size screenSize{};
 
 #ifdef ANDROID
   folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+
 #endif
 
 #pragma mark - Getters
diff --git a/ReactCommon/react/renderer/components/picker/Android.mk b/ReactCommon/react/renderer/components/picker/Android.mk
deleted file mode 100644
index be55965cece467..00000000000000
--- a/ReactCommon/react/renderer/components/picker/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := react_render_components_picker
-
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidpicker/react/renderer/components/androidpicker/*.cpp)
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/androidpicker/react/renderer/components/androidpicker/
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidpicker/
-
-LOCAL_CFLAGS := \
-  -DLOG_TAG=\"Fabric\"
-
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
-
-LOCAL_STATIC_LIBRARIES :=
-
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_components_view libreact_render_componentregistry libreact_render_viewmanagers
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,glog)
-$(call import-module,folly)
-$(call import-module,fbgloginit)
-$(call import-module,react/renderer/core)
-$(call import-module,react/renderer/componentregistry)
-$(call import-module,react/renderer/debug)
-$(call import-module,react/renderer/graphics)
-$(call import-module,react/renderer/uimanager)
-$(call import-module,react/renderer/components/view)
-$(call import-module,yogajni)
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.cpp
deleted file mode 100644
index 983a7f5dfffaff..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "AndroidDialogPickerEventEmitter.h"
-
-namespace facebook {
-namespace react {
-
-void AndroidDialogPickerEventEmitter::onSelect(
-    AndroidDialogPickerOnSelectStruct event) const {
-  dispatchEvent("select", [event = std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "position", event.position);
-    return payload;
-  });
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.h b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.h
deleted file mode 100644
index 37781f4b5a8e5e..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerEventEmitter.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/view/ViewEventEmitter.h>
-
-namespace facebook {
-namespace react {
-
-struct AndroidDialogPickerOnSelectStruct {
-  int position;
-};
-
-class AndroidDialogPickerEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  void onSelect(AndroidDialogPickerOnSelectStruct value) const;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.cpp
deleted file mode 100644
index c44238843b03e2..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "AndroidDialogPickerProps.h"
-
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/propsConversions.h>
-
-namespace facebook {
-namespace react {
-
-AndroidDialogPickerProps::AndroidDialogPickerProps(
-    const AndroidDialogPickerProps &sourceProps,
-    const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      color(convertRawProp(rawProps, "color", sourceProps.color, {})),
-      enabled(convertRawProp(rawProps, "enabled", sourceProps.enabled, {true})),
-      items(convertRawProp(rawProps, "items", sourceProps.items, {})),
-      prompt(convertRawProp(rawProps, "prompt", sourceProps.prompt, {""})),
-      selected(
-          convertRawProp(rawProps, "selected", sourceProps.selected, {0})) {}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.h b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.h
deleted file mode 100644
index e4868a7f67633a..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerProps.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/imagemanager/primitives.h>
-#include <cinttypes>
-#include <vector>
-
-namespace facebook {
-namespace react {
-
-struct AndroidDialogPickerItemsStruct {
-  std::string label;
-  int color;
-};
-
-static inline void fromRawValue(
-    const RawValue &value,
-    AndroidDialogPickerItemsStruct &result) {
-  auto map = (better::map<std::string, RawValue>)value;
-
-  auto label = map.find("label");
-  if (label != map.end()) {
-    fromRawValue(label->second, result.label);
-  }
-  auto color = map.find("color");
-  // C++ props are not used on Android at the moment, so we can leave
-  // result.color uninitialized if the JS prop has a null value. TODO: revisit
-  // this once we start using C++ props on Android.
-  if (color != map.end() && color->second.hasValue()) {
-    fromRawValue(color->second, result.color);
-  }
-}
-
-static inline std::string toString(
-    const AndroidDialogPickerItemsStruct &value) {
-  return "[Object AndroidDialogPickerItemsStruct]";
-}
-
-static inline void fromRawValue(
-    const RawValue &value,
-    std::vector<AndroidDialogPickerItemsStruct> &result) {
-  auto items = (std::vector<RawValue>)value;
-  for (const auto &item : items) {
-    AndroidDialogPickerItemsStruct newItem;
-    fromRawValue(item, newItem);
-    result.emplace_back(newItem);
-  }
-}
-
-class AndroidDialogPickerProps final : public ViewProps {
- public:
-  AndroidDialogPickerProps() = default;
-
-  AndroidDialogPickerProps(
-      const AndroidDialogPickerProps &sourceProps,
-      const RawProps &rawProps);
-
-#pragma mark - Props
-
-  const SharedColor color{};
-  const bool enabled{true};
-  const std::vector<AndroidDialogPickerItemsStruct> items{};
-  const std::string prompt{""};
-  const int selected{0};
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.cpp
deleted file mode 100644
index e101c71b022914..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "AndroidDialogPickerShadowNode.h"
-
-namespace facebook {
-namespace react {
-
-extern const char AndroidDialogPickerComponentName[] = "AndroidDialogPicker";
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.h b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.h
deleted file mode 100644
index e819b923e80a60..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerShadowNode.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include "AndroidDialogPickerEventEmitter.h"
-#include "AndroidDialogPickerProps.h"
-
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-extern const char AndroidDialogPickerComponentName[];
-
-/*
- * `ShadowNode` for <AndroidDialogPicker> component.
- */
-using AndroidDialogPickerShadowNode = ConcreteViewShadowNode<
-    AndroidDialogPickerComponentName,
-    AndroidDialogPickerProps,
-    AndroidDialogPickerEventEmitter>;
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.cpp
deleted file mode 100644
index df52918bac4ef9..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "AndroidDropdownPickerEventEmitter.h"
-
-namespace facebook {
-namespace react {
-
-void AndroidDropdownPickerEventEmitter::onSelect(
-    AndroidDropdownPickerOnSelectStruct event) const {
-  dispatchEvent("select", [event = std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "position", event.position);
-    return payload;
-  });
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.h b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.h
deleted file mode 100644
index 356203b1c6edf0..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerEventEmitter.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/view/ViewEventEmitter.h>
-
-namespace facebook {
-namespace react {
-
-struct AndroidDropdownPickerOnSelectStruct {
-  int position;
-};
-
-class AndroidDropdownPickerEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  void onSelect(AndroidDropdownPickerOnSelectStruct value) const;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.cpp
deleted file mode 100644
index b305b024210690..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "AndroidDropdownPickerProps.h"
-
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/propsConversions.h>
-
-namespace facebook {
-namespace react {
-
-AndroidDropdownPickerProps::AndroidDropdownPickerProps(
-    const AndroidDropdownPickerProps &sourceProps,
-    const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      color(convertRawProp(rawProps, "color", sourceProps.color, {})),
-      enabled(convertRawProp(rawProps, "enabled", sourceProps.enabled, {true})),
-      items(convertRawProp(rawProps, "items", sourceProps.items, {})),
-      prompt(convertRawProp(rawProps, "prompt", sourceProps.prompt, {""})),
-      selected(
-          convertRawProp(rawProps, "selected", sourceProps.selected, {0})) {}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.h b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.h
deleted file mode 100644
index 3e66603c4ee7b8..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerProps.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/imagemanager/primitives.h>
-#include <cinttypes>
-#include <vector>
-
-namespace facebook {
-namespace react {
-
-struct AndroidDropdownPickerItemsStruct {
-  std::string label;
-  int color;
-};
-
-static inline void fromRawValue(
-    const RawValue &value,
-    AndroidDropdownPickerItemsStruct &result) {
-  auto map = (better::map<std::string, RawValue>)value;
-
-  auto label = map.find("label");
-  if (label != map.end()) {
-    fromRawValue(label->second, result.label);
-  }
-  auto color = map.find("color");
-  // C++ props are not used on Android at the moment, so we can leave
-  // result.color uninitialized if the JS prop has a null value. TODO: revisit
-  // this once we start using C++ props on Android.
-  if (color != map.end() && color->second.hasValue()) {
-    fromRawValue(color->second, result.color);
-  }
-}
-
-static inline std::string toString(
-    const AndroidDropdownPickerItemsStruct &value) {
-  return "[Object AndroidDropdownPickerItemsStruct]";
-}
-
-static inline void fromRawValue(
-    const RawValue &value,
-    std::vector<AndroidDropdownPickerItemsStruct> &result) {
-  auto items = (std::vector<RawValue>)value;
-  for (const auto &item : items) {
-    AndroidDropdownPickerItemsStruct newItem;
-    fromRawValue(item, newItem);
-    result.emplace_back(newItem);
-  }
-}
-
-class AndroidDropdownPickerProps final : public ViewProps {
- public:
-  AndroidDropdownPickerProps() = default;
-
-  AndroidDropdownPickerProps(
-      const AndroidDropdownPickerProps &sourceProps,
-      const RawProps &rawProps);
-
-#pragma mark - Props
-
-  const SharedColor color{};
-  const bool enabled{true};
-  const std::vector<AndroidDropdownPickerItemsStruct> items{};
-  const std::string prompt{""};
-  const int selected{0};
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.cpp
deleted file mode 100644
index 724a2fde03e7e9..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "AndroidDropdownPickerShadowNode.h"
-
-namespace facebook {
-namespace react {
-
-extern const char AndroidDropdownPickerComponentName[] =
-    "AndroidDropdownPicker";
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.h b/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.h
deleted file mode 100644
index 5c4ac182798c0f..00000000000000
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerShadowNode.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include "AndroidDropdownPickerEventEmitter.h"
-#include "AndroidDropdownPickerProps.h"
-
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-extern const char AndroidDropdownPickerComponentName[];
-
-/*
- * `ShadowNode` for <AndroidDropdownPicker> component.
- */
-using AndroidDropdownPickerShadowNode = ConcreteViewShadowNode<
-    AndroidDropdownPickerComponentName,
-    AndroidDropdownPickerProps,
-    AndroidDropdownPickerEventEmitter>;
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h
deleted file mode 100644
index d134689e784623..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/iospicker/PickerShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-
-/*
- * Descriptor for <Picker> component.
- */
-namespace facebook {
-namespace react {
-
-class PickerComponentDescriptor final
-    : public ConcreteComponentDescriptor<PickerShadowNode> {
- public:
-  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp
deleted file mode 100644
index 9e608966063531..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "PickerEventEmitter.h"
-
-namespace facebook {
-namespace react {
-
-void PickerEventEmitter::onChange(PickerIOSChangeEvent event) const {
-  dispatchEvent("change", [event = std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "newValue", event.newValue);
-    payload.setProperty(runtime, "newIndex", event.newIndex);
-    return payload;
-  });
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
deleted file mode 100644
index fea36adf3f699f..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/view/ViewEventEmitter.h>
-
-namespace facebook {
-namespace react {
-
-class PickerEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct PickerIOSChangeEvent {
-    std::string newValue;
-    int newIndex;
-  };
-
-  void onChange(PickerIOSChangeEvent event) const;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
deleted file mode 100644
index b3a06ad0029781..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "PickerProps.h"
-
-#include <react/renderer/attributedstring/conversions.h>
-#include <react/renderer/components/iospicker/conversions.h>
-#include <react/renderer/core/propsConversions.h>
-
-namespace facebook {
-namespace react {
-
-PickerProps::PickerProps(
-    PickerProps const &sourceProps,
-    RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      items(convertRawProp(rawProps, "items", sourceProps.items, {})),
-      selectedIndex(convertRawProp(
-          rawProps,
-          "selectedIndex",
-          sourceProps.selectedIndex,
-          {0})),
-      testID(convertRawProp(rawProps, "testID", sourceProps.testID, {})),
-      accessibilityLabel(convertRawProp(
-          rawProps,
-          "accessibilityLabel",
-          sourceProps.accessibilityLabel,
-          {})){
-
-      };
-
-TextAttributes PickerProps::getEffectiveTextAttributes() const {
-  auto result = TextAttributes::defaultTextAttributes();
-  // Default is left aligned, but Picker wants default to be center aligned.
-  result.alignment = TextAlignment::Center;
-  result.apply(textAttributes);
-  return result;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
deleted file mode 100644
index c87ca2fe4969a7..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/iospicker/primitives.h>
-#include <react/renderer/components/text/BaseTextProps.h>
-#include <react/renderer/components/view/ViewProps.h>
-
-#include <vector>
-
-namespace facebook {
-namespace react {
-
-class PickerProps final : public ViewProps, public BaseTextProps {
- public:
-  PickerProps() = default;
-  PickerProps(PickerProps const &sourceProps, RawProps const &rawProps);
-
-#pragma mark - Props
-
-  std::vector<PickerItemsStruct> items{};
-  int selectedIndex{0};
-  std::string const testID{};
-  std::string const accessibilityLabel{};
-
-#pragma mark - Accessors
-  TextAttributes getEffectiveTextAttributes() const;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h
deleted file mode 100644
index c2c80bc6ae2a03..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/iospicker/PickerEventEmitter.h>
-#include <react/renderer/components/iospicker/PickerProps.h>
-#include <react/renderer/components/iospicker/PickerState.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-
-namespace facebook {
-namespace react {
-
-extern const char PickerComponentName[];
-
-/*
- * `ShadowNode` for <Picker> component.
- */
-class PickerShadowNode final : public ConcreteViewShadowNode<
-                                   PickerComponentName,
-                                   PickerProps,
-                                   PickerEventEmitter,
-                                   PickerState> {
- public:
-  using ConcreteViewShadowNode::ConcreteViewShadowNode;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/conversions.h b/ReactCommon/react/renderer/components/picker/iospicker/conversions.h
deleted file mode 100644
index b39f10431b78bc..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/conversions.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/components/iospicker/primitives.h>
-
-#include <vector>
-
-namespace facebook {
-namespace react {
-
-inline void fromRawValue(
-    const RawValue &value,
-    std::vector<PickerItemsStruct> &items) {
-  assert(value.hasType<std::vector<RawValue>>());
-  auto array = (std::vector<RawValue>)value;
-  items.reserve(array.size());
-
-  for (auto const &val : array) {
-    bool check = val.hasType<better::map<std::string, RawValue>>();
-    assert(check);
-    auto map = (better::map<std::string, RawValue>)val;
-    PickerItemsStruct item;
-
-    if (map.find("label") != map.end()) {
-      assert(map.at("label").hasType<std::string>());
-      item.label = (std::string)map.at("label");
-    }
-    if (map.find("value") != map.end()) {
-      assert(map.at("value").hasType<std::string>());
-      item.value = (std::string)map.at("value");
-    }
-    if (map.find("textColor") != map.end()) {
-      assert(map.at("textColor").hasType<int>());
-      item.textColor = (int)map.at("textColor");
-    }
-    items.push_back(item);
-  }
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/primitives.h b/ReactCommon/react/renderer/components/picker/iospicker/primitives.h
deleted file mode 100644
index d9804aa98868e4..00000000000000
--- a/ReactCommon/react/renderer/components/picker/iospicker/primitives.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/graphics/Color.h>
-
-#include <string>
-
-namespace facebook {
-namespace react {
-
-struct PickerItemsStruct {
-  std::string label;
-  std::string value;
-  SharedColor textColor;
-
-  bool operator==(const PickerItemsStruct &rhs) const {
-    return (
-        label == rhs.label && value == rhs.value && textColor == rhs.textColor);
-  }
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/progressbar/Android.mk b/ReactCommon/react/renderer/components/progressbar/Android.mk
index f17cb34c809c55..b899b97badae11 100644
--- a/ReactCommon/react/renderer/components/progressbar/Android.mk
+++ b/ReactCommon/react/renderer/components/progressbar/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_progressbar
+LOCAL_MODULE := rrc_progressbar
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/android/react/renderer/components/progressbar/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/android/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/ReactCommon/react/renderer/components/progressbar/BUCK b/ReactCommon/react/renderer/components/progressbar/BUCK
index 8afe40dc616d16..f9c4c3ea33709a 100644
--- a/ReactCommon/react/renderer/components/progressbar/BUCK
+++ b/ReactCommon/react/renderer/components/progressbar/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_target",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
@@ -35,7 +35,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_tests = [":tests"],
@@ -85,6 +85,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/components/image:image"),
@@ -104,7 +105,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h b/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h
index 4b3802666a1e2a..8512b2ac917e76 100644
--- a/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include "AndroidProgressBarMeasurementsManager.h"
 #include "AndroidProgressBarShadowNode.h"
@@ -27,10 +28,11 @@ class AndroidProgressBarComponentDescriptor final
             std::make_shared<AndroidProgressBarMeasurementsManager>(
                 contextContainer_)) {}
 
-  void adopt(UnsharedShadowNode shadowNode) const override {
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    assert(std::dynamic_pointer_cast<AndroidProgressBarShadowNode>(shadowNode));
+    react_native_assert(
+        std::dynamic_pointer_cast<AndroidProgressBarShadowNode>(shadowNode));
     auto androidProgressBarShadowNode =
         std::static_pointer_cast<AndroidProgressBarShadowNode>(shadowNode);
 
diff --git a/ReactCommon/react/renderer/components/root/Android.mk b/ReactCommon/react/renderer/components/root/Android.mk
index b100af0f554071..8149fe3f02fde8 100644
--- a/ReactCommon/react/renderer/components/root/Android.mk
+++ b/ReactCommon/react/renderer/components/root/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_root
+LOCAL_MODULE := rrc_root
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -32,4 +32,5 @@ $(call import-module,react/renderer/components/view)
 $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
diff --git a/ReactCommon/react/renderer/components/root/BUCK b/ReactCommon/react/renderer/components/root/BUCK
index 551366f61d5372..b09dc8c12d1197 100644
--- a/ReactCommon/react/renderer/components/root/BUCK
+++ b/ReactCommon/react/renderer/components/root/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -67,7 +67,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
@@ -76,5 +76,6 @@ fb_xplat_cxx_test(
         ":root",
         "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
+        react_native_xplat_target("react/renderer/element:element"),
     ],
 )
diff --git a/ReactCommon/react/renderer/components/root/RootProps.cpp b/ReactCommon/react/renderer/components/root/RootProps.cpp
index beb6af92cbf2d4..3e14c8a73ad07c 100644
--- a/ReactCommon/react/renderer/components/root/RootProps.cpp
+++ b/ReactCommon/react/renderer/components/root/RootProps.cpp
@@ -13,10 +13,20 @@
 namespace facebook {
 namespace react {
 
-RootProps::RootProps(RootProps const &sourceProps, RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps) {}
+// Note that a default/empty context may be passed here from RootShadowNode.
+// If that's a problem and the context is necesary here, refactor RootShadowNode
+// first.
+RootProps::RootProps(
+    const PropsParserContext &context,
+    RootProps const &sourceProps,
+    RawProps const &rawProps)
+    : ViewProps(context, sourceProps, rawProps) {}
 
+// Note that a default/empty context may be passed here from RootShadowNode.
+// If that's a problem and the context is necesary here, refactor RootShadowNode
+// first.
 RootProps::RootProps(
+    const PropsParserContext &context,
     RootProps const &sourceProps,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext)
diff --git a/ReactCommon/react/renderer/components/root/RootProps.h b/ReactCommon/react/renderer/components/root/RootProps.h
index d3e2ea2dc056a1..d28f02837b93d7 100644
--- a/ReactCommon/react/renderer/components/root/RootProps.h
+++ b/ReactCommon/react/renderer/components/root/RootProps.h
@@ -12,6 +12,7 @@
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -19,8 +20,12 @@ namespace react {
 class RootProps final : public ViewProps {
  public:
   RootProps() = default;
-  RootProps(RootProps const &sourceProps, RawProps const &rawProps);
   RootProps(
+      const PropsParserContext &context,
+      RootProps const &sourceProps,
+      RawProps const &rawProps);
+  RootProps(
+      const PropsParserContext &context,
       RootProps const &sourceProps,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext);
diff --git a/ReactCommon/react/renderer/components/root/RootShadowNode.cpp b/ReactCommon/react/renderer/components/root/RootShadowNode.cpp
index 099be0d0b38c1a..5e611de8d61487 100644
--- a/ReactCommon/react/renderer/components/root/RootShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/root/RootShadowNode.cpp
@@ -39,15 +39,21 @@ Transform RootShadowNode::getTransform() const {
 }
 
 RootShadowNode::Unshared RootShadowNode::clone(
+    PropsParserContext const &propsParserContext,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext) const {
   auto props = std::make_shared<RootProps const>(
-      getConcreteProps(), layoutConstraints, layoutContext);
+      propsParserContext, getConcreteProps(), layoutConstraints, layoutContext);
   auto newRootShadowNode = std::make_shared<RootShadowNode>(
       *this,
       ShadowNodeFragment{
           /* .props = */ props,
       });
+
+  if (layoutConstraints != getConcreteProps().layoutConstraints) {
+    newRootShadowNode->dirtyLayout();
+  }
+
   return newRootShadowNode;
 }
 
diff --git a/ReactCommon/react/renderer/components/root/RootShadowNode.h b/ReactCommon/react/renderer/components/root/RootShadowNode.h
index 3625e679718893..8d88ec913389d8 100644
--- a/ReactCommon/react/renderer/components/root/RootShadowNode.h
+++ b/ReactCommon/react/renderer/components/root/RootShadowNode.h
@@ -12,6 +12,7 @@
 #include <react/renderer/components/root/RootProps.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -51,6 +52,7 @@ class RootShadowNode final
    * Clones the node with given `layoutConstraints` and `layoutContext`.
    */
   RootShadowNode::Unshared clone(
+      PropsParserContext const &propsParserContext,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext) const;
 
diff --git a/ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp b/ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp
index 964411c92b57ba..66d67ee817ca86 100644
--- a/ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp
+++ b/ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp
@@ -5,10 +5,42 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
+#include <react/renderer/components/root/RootComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/element/ComponentBuilder.h>
 
 #include <gtest/gtest.h>
+#include <react/renderer/element/Element.h>
+#include <react/renderer/element/testUtils.h>
 
-TEST(RootShadowNodeTest, testSomething) {
-  // TODO
+namespace facebook::react {
+
+TEST(RootShadowNodeTest, cloneWithLayoutConstraints) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  auto builder = simpleComponentBuilder();
+  std::shared_ptr<RootShadowNode> rootShadowNode;
+  LayoutConstraints defaultLayoutConstraints = {};
+
+  auto element =
+      Element<RootShadowNode>().reference(rootShadowNode).tag(1).props([&] {
+        auto sharedProps = std::make_shared<RootProps>();
+        sharedProps->layoutConstraints = defaultLayoutConstraints;
+        return sharedProps;
+      });
+
+  builder.build(element);
+
+  EXPECT_FALSE(rootShadowNode->getIsLayoutClean());
+  EXPECT_TRUE(rootShadowNode->layoutIfNeeded());
+  EXPECT_TRUE(rootShadowNode->getIsLayoutClean());
+
+  auto clonedWithDiffentLayoutConstraints = rootShadowNode->clone(
+      parserContext, LayoutConstraints{{0, 0}, {10, 10}}, {});
+
+  EXPECT_FALSE(clonedWithDiffentLayoutConstraints->getIsLayoutClean());
+  EXPECT_TRUE(clonedWithDiffentLayoutConstraints->layoutIfNeeded());
 }
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/safeareaview/BUCK b/ReactCommon/react/renderer/components/safeareaview/BUCK
index 3c62e99a01a267..fcb7febca179a3 100644
--- a/ReactCommon/react/renderer/components/safeareaview/BUCK
+++ b/ReactCommon/react/renderer/components/safeareaview/BUCK
@@ -1,9 +1,9 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "APPLE",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -27,20 +27,21 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (APPLE),
+    platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
     visibility = ["PUBLIC"],
     deps = [
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         "//xplat/js/react-native-github:generated_components-rncore",
     ],
diff --git a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h
index 55f0ad4e9e1c96..ad10ca8b125ebe 100644
--- a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/safeareaview/SafeAreaViewShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
@@ -19,12 +20,13 @@ namespace react {
 class SafeAreaViewComponentDescriptor final
     : public ConcreteComponentDescriptor<SafeAreaViewShadowNode> {
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
-  void adopt(UnsharedShadowNode shadowNode) const override {
-    assert(std::dynamic_pointer_cast<SafeAreaViewShadowNode>(shadowNode));
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
+    react_native_assert(
+        std::dynamic_pointer_cast<SafeAreaViewShadowNode>(shadowNode));
     auto safeAreaViewShadowNode =
         std::static_pointer_cast<SafeAreaViewShadowNode>(shadowNode);
 
-    assert(std::dynamic_pointer_cast<YogaLayoutableShadowNode>(
+    react_native_assert(std::dynamic_pointer_cast<YogaLayoutableShadowNode>(
         safeAreaViewShadowNode));
     auto layoutableShadowNode =
         std::static_pointer_cast<YogaLayoutableShadowNode>(
diff --git a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h
index 1bd4e47e62ea68..2a27f0ef227c38 100644
--- a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h
+++ b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h
@@ -26,6 +26,13 @@ class SafeAreaViewShadowNode final : public ConcreteViewShadowNode<
                                          ViewEventEmitter,
                                          SafeAreaViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+ public:
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::DirtyYogaNode);
+    return traits;
+  }
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h
index 6b4c0c008059cb..f64b1bb275b6bf 100644
--- a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h
+++ b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h
@@ -17,9 +17,7 @@ namespace react {
  */
 class SafeAreaViewState final {
  public:
-  using Shared = std::shared_ptr<SafeAreaViewState const>;
-
-  EdgeInsets const padding{};
+  EdgeInsets padding{};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/scrollview/Android.mk b/ReactCommon/react/renderer/components/scrollview/Android.mk
index 71ecb660969416..9b02ae73f04215 100644
--- a/ReactCommon/react/renderer/components/scrollview/Android.mk
+++ b/ReactCommon/react/renderer/components/scrollview/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_scrollview
+LOCAL_MODULE := rrc_scrollview
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -32,4 +32,6 @@ $(call import-module,react/renderer/components/view)
 $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/renderer/components/scrollview/BUCK b/ReactCommon/react/renderer/components/scrollview/BUCK
index 20700db5057ed1..f75195782dc1fb 100644
--- a/ReactCommon/react/renderer/components/scrollview/BUCK
+++ b/ReactCommon/react/renderer/components/scrollview/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -35,9 +35,12 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
+    fbandroid_deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
@@ -71,7 +74,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h b/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h
index ce4303c2c94afd..0fab3ae8160e68 100644
--- a/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h
+++ b/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h
@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)flashScrollIndicators;
 - (void)scrollTo:(double)x y:(double)y animated:(BOOL)animated;
 - (void)scrollToEnd:(BOOL)animated;
+- (void)zoomToRect:(CGRect)rect animated:(BOOL)animated;
 @end
 
 RCT_EXTERN inline void
@@ -90,6 +91,43 @@ RCTScrollViewHandleCommand(id<RCTScrollViewProtocol> componentView, NSString con
     [componentView scrollToEnd:animated];
     return;
   }
+
+  if ([commandName isEqualToString:@"zoomToRect"]) {
+#if RCT_DEBUG
+    if ([args count] != 2) {
+      RCTLogError(
+          @"%@ command %@ received %d arguments, expected %d.", @"ScrollView", commandName, (int)[args count], 2);
+      return;
+    }
+#endif
+
+    NSObject *arg0 = args[0];
+
+#if RCT_DEBUG
+    if (!RCTValidateTypeOfViewCommandArgument(
+            arg0, [NSDictionary class], @"dictionary", @"ScrollView", commandName, @"1st")) {
+      return;
+    }
+#endif
+
+    NSDictionary *rectDict = (NSDictionary *)arg0;
+    NSNumber *x = rectDict[@"x"];
+    NSNumber *y = rectDict[@"y"];
+    NSNumber *width = rectDict[@"width"];
+    NSNumber *height = rectDict[@"height"];
+    CGRect rect = CGRectMake(x.doubleValue, y.doubleValue, width.doubleValue, height.doubleValue);
+
+    NSObject *arg1 = args[1];
+#if RCT_DEBUG
+    if (!RCTValidateTypeOfViewCommandArgument(arg1, [NSNumber class], @"boolean", @"ScrollView", commandName, @"2nd")) {
+      return;
+    }
+#endif
+
+    BOOL animated = [(NSNumber *)arg1 boolValue];
+    [componentView zoomToRect:rect animated:animated];
+    return;
+  }
 }
 
 NS_ASSUME_NONNULL_END
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
index c030761da73279..5ac1187937b288 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
@@ -17,155 +17,204 @@ namespace facebook {
 namespace react {
 
 ScrollViewProps::ScrollViewProps(
+    const PropsParserContext &context,
     ScrollViewProps const &sourceProps,
     RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
+    : ViewProps(context, sourceProps, rawProps),
       alwaysBounceHorizontal(convertRawProp(
+          context,
           rawProps,
           "alwaysBounceHorizontal",
           sourceProps.alwaysBounceHorizontal,
           {})),
       alwaysBounceVertical(convertRawProp(
+          context,
           rawProps,
           "alwaysBounceVertical",
           sourceProps.alwaysBounceVertical,
           {})),
-      bounces(convertRawProp(rawProps, "bounces", sourceProps.bounces, true)),
+      bounces(convertRawProp(
+          context,
+          rawProps,
+          "bounces",
+          sourceProps.bounces,
+          true)),
       bouncesZoom(convertRawProp(
+          context,
           rawProps,
           "bouncesZoom",
           sourceProps.bouncesZoom,
           true)),
       canCancelContentTouches(convertRawProp(
+          context,
           rawProps,
           "canCancelContentTouches",
           sourceProps.canCancelContentTouches,
           true)),
       centerContent(convertRawProp(
+          context,
           rawProps,
           "centerContent",
           sourceProps.centerContent,
           {})),
       automaticallyAdjustContentInsets(convertRawProp(
+          context,
           rawProps,
           "automaticallyAdjustContentInsets",
           sourceProps.automaticallyAdjustContentInsets,
           {})),
+      automaticallyAdjustsScrollIndicatorInsets(convertRawProp(
+          context,
+          rawProps,
+          "automaticallyAdjustsScrollIndicatorInsets",
+          sourceProps.automaticallyAdjustsScrollIndicatorInsets,
+          true)),
       decelerationRate(convertRawProp(
+          context,
           rawProps,
           "decelerationRate",
           sourceProps.decelerationRate,
           (Float)0.998)),
       directionalLockEnabled(convertRawProp(
+          context,
           rawProps,
           "directionalLockEnabled",
           sourceProps.directionalLockEnabled,
           {})),
       indicatorStyle(convertRawProp(
+          context,
           rawProps,
           "indicatorStyle",
           sourceProps.indicatorStyle,
           {})),
       keyboardDismissMode(convertRawProp(
+          context,
           rawProps,
           "keyboardDismissMode",
           sourceProps.keyboardDismissMode,
           {})),
       maximumZoomScale(convertRawProp(
+          context,
           rawProps,
           "maximumZoomScale",
           sourceProps.maximumZoomScale,
           (Float)1.0)),
       minimumZoomScale(convertRawProp(
+          context,
           rawProps,
           "minimumZoomScale",
           sourceProps.minimumZoomScale,
           (Float)1.0)),
       scrollEnabled(convertRawProp(
+          context,
           rawProps,
           "scrollEnabled",
           sourceProps.scrollEnabled,
           true)),
       pagingEnabled(convertRawProp(
+          context,
           rawProps,
           "pagingEnabled",
           sourceProps.pagingEnabled,
           {})),
       pinchGestureEnabled(convertRawProp(
+          context,
           rawProps,
           "pinchGestureEnabled",
           sourceProps.pinchGestureEnabled,
           true)),
       scrollsToTop(convertRawProp(
+          context,
           rawProps,
           "scrollsToTop",
           sourceProps.scrollsToTop,
           true)),
       showsHorizontalScrollIndicator(convertRawProp(
+          context,
           rawProps,
           "showsHorizontalScrollIndicator",
           sourceProps.showsHorizontalScrollIndicator,
           true)),
       showsVerticalScrollIndicator(convertRawProp(
+          context,
           rawProps,
           "showsVerticalScrollIndicator",
           sourceProps.showsVerticalScrollIndicator,
           true)),
       scrollEventThrottle(convertRawProp(
+          context,
           rawProps,
           "scrollEventThrottle",
           sourceProps.scrollEventThrottle,
           {})),
       zoomScale(convertRawProp(
+          context,
           rawProps,
           "zoomScale",
           sourceProps.zoomScale,
           (Float)1.0)),
       contentInset(convertRawProp(
+          context,
           rawProps,
           "contentInset",
           sourceProps.contentInset,
           {})),
       contentOffset(convertRawProp(
+          context,
           rawProps,
           "contentOffset",
           sourceProps.contentOffset,
           {})),
       scrollIndicatorInsets(convertRawProp(
+          context,
           rawProps,
           "scrollIndicatorInsets",
           sourceProps.scrollIndicatorInsets,
           {})),
       snapToInterval(convertRawProp(
+          context,
           rawProps,
           "snapToInterval",
           sourceProps.snapToInterval,
           {})),
       snapToAlignment(convertRawProp(
+          context,
           rawProps,
           "snapToAlignment",
           sourceProps.snapToAlignment,
           {})),
       disableIntervalMomentum(convertRawProp(
+          context,
           rawProps,
           "disableIntervalMomentum",
           sourceProps.disableIntervalMomentum,
           {})),
       snapToOffsets(convertRawProp(
+          context,
           rawProps,
           "snapToOffsets",
           sourceProps.snapToOffsets,
           {})),
-      snapToStart(
-          convertRawProp(rawProps, "snapToStart", sourceProps.snapToStart, {})),
-      snapToEnd(
-          convertRawProp(rawProps, "snapToEnd", sourceProps.snapToEnd, {})),
+      snapToStart(convertRawProp(
+          context,
+          rawProps,
+          "snapToStart",
+          sourceProps.snapToStart,
+          true)),
+      snapToEnd(convertRawProp(
+          context,
+          rawProps,
+          "snapToEnd",
+          sourceProps.snapToEnd,
+          true)),
       contentInsetAdjustmentBehavior(convertRawProp(
+          context,
           rawProps,
           "contentInsetAdjustmentBehavior",
           sourceProps.contentInsetAdjustmentBehavior,
           {ContentInsetAdjustmentBehavior::Never})),
       scrollToOverflowEnabled(convertRawProp(
+          context,
           rawProps,
           "scrollToOverflowEnabled",
           sourceProps.scrollToOverflowEnabled,
@@ -203,6 +252,10 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
               "automaticallyAdjustContentInsets",
               automaticallyAdjustContentInsets,
               defaultScrollViewProps.automaticallyAdjustContentInsets),
+          debugStringConvertibleItem(
+              "automaticallyAdjustsScrollIndicatorInsets",
+              automaticallyAdjustsScrollIndicatorInsets,
+              defaultScrollViewProps.automaticallyAdjustsScrollIndicatorInsets),
           debugStringConvertibleItem(
               "decelerationRate",
               decelerationRate,
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
index 09336eec7569b5..2e83cb16a19fde 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/scrollview/primitives.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -17,7 +18,10 @@ namespace react {
 class ScrollViewProps final : public ViewProps {
  public:
   ScrollViewProps() = default;
-  ScrollViewProps(ScrollViewProps const &sourceProps, RawProps const &rawProps);
+  ScrollViewProps(
+      const PropsParserContext &context,
+      ScrollViewProps const &sourceProps,
+      RawProps const &rawProps);
 
 #pragma mark - Props
 
@@ -28,12 +32,13 @@ class ScrollViewProps final : public ViewProps {
   bool canCancelContentTouches{true};
   bool centerContent{};
   bool automaticallyAdjustContentInsets{};
-  Float decelerationRate{0.998};
+  bool automaticallyAdjustsScrollIndicatorInsets{true};
+  Float decelerationRate{0.998f};
   bool directionalLockEnabled{};
   ScrollViewIndicatorStyle indicatorStyle{};
   ScrollViewKeyboardDismissMode keyboardDismissMode{};
-  Float maximumZoomScale{1.0};
-  Float minimumZoomScale{1.0};
+  Float maximumZoomScale{1.0f};
+  Float minimumZoomScale{1.0f};
   bool scrollEnabled{true};
   bool pagingEnabled{};
   bool pinchGestureEnabled{true};
@@ -41,7 +46,7 @@ class ScrollViewProps final : public ViewProps {
   bool showsHorizontalScrollIndicator{true};
   bool showsVerticalScrollIndicator{true};
   Float scrollEventThrottle{};
-  Float zoomScale{1.0};
+  Float zoomScale{1.0f};
   EdgeInsets contentInset{};
   Point contentOffset{};
   EdgeInsets scrollIndicatorInsets{};
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
index a421f8c9de0d00..09c860740f3224 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
@@ -7,6 +7,7 @@
 
 #include "ScrollViewShadowNode.h"
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/LayoutMetrics.h>
 
 namespace facebook {
@@ -30,16 +31,36 @@ void ScrollViewShadowNode::updateStateIfNeeded() {
   }
 }
 
+void ScrollViewShadowNode::updateScrollContentOffsetIfNeeded() {
+#ifndef ANDROID
+  if (getLayoutMetrics().layoutDirection == LayoutDirection::RightToLeft) {
+    // Yoga places `contentView` on the right side of `scrollView` when RTL
+    // layout is enforced. To correct for this, in RTL setting, correct the
+    // frame's origin. React Native Classic does this as well in
+    // `RCTScrollContentShadowView.m`.
+    for (auto layoutableNode : getLayoutableChildNodes()) {
+      auto layoutMetrics = layoutableNode->getLayoutMetrics();
+      if (layoutMetrics.frame.origin.x != 0) {
+        layoutMetrics.frame.origin.x = 0;
+        layoutableNode->setLayoutMetrics(layoutMetrics);
+      }
+    }
+  }
+#endif
+}
+
 #pragma mark - LayoutableShadowNode
 
 void ScrollViewShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
+  updateScrollContentOffsetIfNeeded();
   updateStateIfNeeded();
 }
 
 Point ScrollViewShadowNode::getContentOriginOffset() const {
-  auto contentOffset = getStateData().contentOffset;
-  return {-contentOffset.x, -contentOffset.y};
+  auto stateData = getStateData();
+  auto contentOffset = stateData.contentOffset;
+  return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h
index 19172a9e74be7f..f4d4a5f964bbc7 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h
@@ -36,6 +36,7 @@ class ScrollViewShadowNode final : public ConcreteViewShadowNode<
 
  private:
   void updateStateIfNeeded();
+  void updateScrollContentOffsetIfNeeded();
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp
index 34f59908e1132c..6f368957a6e8fd 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp
@@ -11,7 +11,7 @@ namespace facebook {
 namespace react {
 
 Size ScrollViewState::getContentSize() const {
-  return Size{contentBoundingRect.getMaxX(), contentBoundingRect.getMaxY()};
+  return contentBoundingRect.size;
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h
index d2ec294a239e4f..6d3dd7e632525f 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h
@@ -9,7 +9,11 @@
 
 #include <react/renderer/graphics/Geometry.h>
 
+#ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
 
 namespace facebook {
 namespace react {
@@ -21,6 +25,7 @@ class ScrollViewState final {
  public:
   Point contentOffset;
   Rect contentBoundingRect;
+  int scrollAwayPaddingTop;
 
   /*
    * Returns size of scrollable area.
@@ -30,13 +35,19 @@ class ScrollViewState final {
 #ifdef ANDROID
   ScrollViewState() = default;
   ScrollViewState(ScrollViewState const &previousState, folly::dynamic data)
-      : contentOffset({(Float)data["contentOffsetLeft"].getDouble(),
-                       (Float)data["contentOffsetTop"].getDouble()}),
-        contentBoundingRect({}){};
+      : contentOffset(
+            {(Float)data["contentOffsetLeft"].getDouble(),
+             (Float)data["contentOffsetTop"].getDouble()}),
+        contentBoundingRect({}),
+        scrollAwayPaddingTop((Float)data["scrollAwayPaddingTop"].getDouble()){};
 
   folly::dynamic getDynamic() const {
     return folly::dynamic::object("contentOffsetLeft", contentOffset.x)(
-        "contentOffsetTop", contentOffset.y);
+        "contentOffsetTop", contentOffset.y)(
+        "scrollAwayPaddingTop", scrollAwayPaddingTop);
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
   };
 #endif
 };
diff --git a/ReactCommon/react/renderer/components/scrollview/conversions.h b/ReactCommon/react/renderer/components/scrollview/conversions.h
index 155e914723ef88..710bd8f3b07de9 100644
--- a/ReactCommon/react/renderer/components/scrollview/conversions.h
+++ b/ReactCommon/react/renderer/components/scrollview/conversions.h
@@ -9,11 +9,13 @@
 
 #include <folly/dynamic.h>
 #include <react/renderer/components/scrollview/primitives.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ScrollViewSnapToAlignment &result) {
   auto string = (std::string)value;
@@ -33,6 +35,7 @@ inline void fromRawValue(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ScrollViewIndicatorStyle &result) {
   auto string = (std::string)value;
@@ -52,6 +55,7 @@ inline void fromRawValue(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ScrollViewKeyboardDismissMode &result) {
   auto string = (std::string)value;
@@ -71,6 +75,7 @@ inline void fromRawValue(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ContentInsetAdjustmentBehavior &result) {
   auto string = (std::string)value;
diff --git a/ReactCommon/react/renderer/components/slider/Android.mk b/ReactCommon/react/renderer/components/slider/Android.mk
index 23e58023b81d81..101ed6ee564c16 100644
--- a/ReactCommon/react/renderer/components/slider/Android.mk
+++ b/ReactCommon/react/renderer/components/slider/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_slider
+LOCAL_MODULE := rrc_slider
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/react/renderer/components/slider/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../ $(LOCAL_PATH)/platform/and
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreact_render_imagemanager libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libreact_render_components_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreact_render_imagemanager libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager librrc_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -38,3 +38,4 @@ $(call import-module,react/renderer/components/image)
 $(call import-module,react/renderer/components/view)
 $(call import-module,react/renderer/uimanager)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/renderer/components/slider/BUCK b/ReactCommon/react/renderer/components/slider/BUCK
index 00f0df782327af..dd7d12dc2816cd 100644
--- a/ReactCommon/react/renderer/components/slider/BUCK
+++ b/ReactCommon/react/renderer/components/slider/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_target",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
@@ -36,12 +36,13 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
     fbandroid_exported_headers = subdir_glob(
         [
@@ -83,6 +84,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:headers_only",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/components/image:image"),
@@ -102,7 +104,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h b/ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h
index 687ea411a0c06c..a41089650b87b5 100644
--- a/ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/slider/SliderMeasurementsManager.h>
 #include <react/renderer/components/slider/SliderShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
@@ -28,10 +29,11 @@ class SliderComponentDescriptor final
                 ? std::make_shared<SliderMeasurementsManager>(contextContainer_)
                 : nullptr) {}
 
-  void adopt(UnsharedShadowNode shadowNode) const override {
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    assert(std::dynamic_pointer_cast<SliderShadowNode>(shadowNode));
+    react_native_assert(
+        std::dynamic_pointer_cast<SliderShadowNode>(shadowNode));
     auto sliderShadowNode =
         std::static_pointer_cast<SliderShadowNode>(shadowNode);
 
diff --git a/ReactCommon/react/renderer/components/slider/SliderShadowNode.h b/ReactCommon/react/renderer/components/slider/SliderShadowNode.h
index 82ab4d0b1dc6c2..ebd2eca0483606 100644
--- a/ReactCommon/react/renderer/components/slider/SliderShadowNode.h
+++ b/ReactCommon/react/renderer/components/slider/SliderShadowNode.h
@@ -43,14 +43,15 @@ class SliderShadowNode final : public ConcreteViewShadowNode<
       ShadowNodeFamilyFragment const &familyFragment,
       ComponentDescriptor const &componentDescriptor) {
     auto imageSource = ImageSource{ImageSource::Type::Invalid};
-    return {imageSource,
-            {imageSource, nullptr},
-            imageSource,
-            {imageSource, nullptr},
-            imageSource,
-            {imageSource, nullptr},
-            imageSource,
-            {imageSource, nullptr}};
+    return {
+        imageSource,
+        {imageSource, nullptr},
+        imageSource,
+        {imageSource, nullptr},
+        imageSource,
+        {imageSource, nullptr},
+        imageSource,
+        {imageSource, nullptr}};
   }
 
 #pragma mark - LayoutableShadowNode
diff --git a/ReactCommon/react/renderer/components/slider/SliderState.h b/ReactCommon/react/renderer/components/slider/SliderState.h
index 4aa4927faf64c1..82a338c08f24ee 100644
--- a/ReactCommon/react/renderer/components/slider/SliderState.h
+++ b/ReactCommon/react/renderer/components/slider/SliderState.h
@@ -7,7 +7,12 @@
 
 #pragma once
 
+#ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
 #include <react/renderer/imagemanager/ImageRequest.h>
 #include <react/renderer/imagemanager/primitives.h>
 
@@ -64,6 +69,9 @@ class SliderState final {
   folly::dynamic getDynamic() const {
     return {};
   };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
 #endif
 
  private:
diff --git a/ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.cpp b/ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.cpp
index b7b930825e224d..d23aff739c7aff 100644
--- a/ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.cpp
+++ b/ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.cpp
@@ -7,13 +7,15 @@
 
 #include "SliderMeasurementsManager.h"
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
 Size SliderMeasurementsManager::measure(
     SurfaceId surfaceId,
     LayoutConstraints layoutConstraints) const {
-  assert(false); // should never reach this point
+  react_native_assert(false); // should never reach this point
   return {};
 }
 
diff --git a/ReactCommon/react/renderer/components/switch/Android.mk b/ReactCommon/react/renderer/components/switch/Android.mk
index 65be95635a04d8..ec7b041a63e247 100644
--- a/ReactCommon/react/renderer/components/switch/Android.mk
+++ b/ReactCommon/react/renderer/components/switch/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_switch
+LOCAL_MODULE := rrc_switch
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidswitch/react/renderer/components/androidswitch/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidswitch/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libfbjni libreact_render_viewmanagers libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/ReactCommon/react/renderer/components/switch/BUCK b/ReactCommon/react/renderer/components/switch/BUCK
index fa27ee25fe0f59..f26b6ba660570e 100644
--- a/ReactCommon/react/renderer/components/switch/BUCK
+++ b/ReactCommon/react/renderer/components/switch/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_target",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
@@ -37,7 +37,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_tests = [":tests"],
@@ -78,7 +78,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h b/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h
index 42a249017da917..754ec410eb89cd 100644
--- a/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h
@@ -10,6 +10,7 @@
 #include "AndroidSwitchMeasurementsManager.h"
 #include "AndroidSwitchShadowNode.h"
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
@@ -27,10 +28,11 @@ class AndroidSwitchComponentDescriptor final
         measurementsManager_(std::make_shared<AndroidSwitchMeasurementsManager>(
             contextContainer_)) {}
 
-  void adopt(UnsharedShadowNode shadowNode) const override {
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    assert(std::dynamic_pointer_cast<AndroidSwitchShadowNode>(shadowNode));
+    react_native_assert(
+        std::dynamic_pointer_cast<AndroidSwitchShadowNode>(shadowNode));
     auto androidSwitchShadowNode =
         std::static_pointer_cast<AndroidSwitchShadowNode>(shadowNode);
 
diff --git a/ReactCommon/react/renderer/components/text/Android.mk b/ReactCommon/react/renderer/components/text/Android.mk
index 3e8144673a6073..33bfdb78a96362 100644
--- a/ReactCommon/react/renderer/components/text/Android.mk
+++ b/ReactCommon/react/renderer/components/text/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_text
+LOCAL_MODULE := rrc_text
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting libreact_render_components_view libreact_utils
+LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -37,4 +37,6 @@ $(call import-module,react/renderer/textlayoutmanager)
 $(call import-module,react/renderer/uimanager)
 $(call import-module,react/renderer/components/view)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
+$(call import-module,react/renderer/mapbuffer)
 $(call import-module,yogajni)
diff --git a/ReactCommon/react/renderer/components/text/BUCK b/ReactCommon/react/renderer/components/text/BUCK
index e4962d6f695fec..660a7f2e0f0fa1 100644
--- a/ReactCommon/react/renderer/components/text/BUCK
+++ b/ReactCommon/react/renderer/components/text/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -39,10 +39,13 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_tests = [":tests"],
+    fbandroid_deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
@@ -61,7 +64,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
-        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -71,6 +74,8 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
         react_native_xplat_target("react/renderer/mounting:mounting"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
+        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/renderer/telemetry:telemetry"),
     ],
 )
 
@@ -81,7 +86,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
@@ -97,5 +102,6 @@ fb_xplat_cxx_test(
         ":text",
         "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
+        react_native_xplat_target("react/debug:debug"),
     ],
 )
diff --git a/ReactCommon/react/renderer/components/text/BaseTextProps.cpp b/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
index cae5c975a3d506..d8079cf4b812a9 100644
--- a/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
+++ b/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
@@ -16,6 +16,7 @@ namespace facebook {
 namespace react {
 
 static TextAttributes convertRawProp(
+    const PropsParserContext &context,
     const RawProps &rawProps,
     const TextAttributes sourceTextAttributes,
     const TextAttributes defaultTextAttributes) {
@@ -23,16 +24,19 @@ static TextAttributes convertRawProp(
 
   // Color
   textAttributes.foregroundColor = convertRawProp(
+      context,
       rawProps,
       "color",
       sourceTextAttributes.foregroundColor,
       defaultTextAttributes.foregroundColor);
   textAttributes.backgroundColor = convertRawProp(
+      context,
       rawProps,
       "backgroundColor",
       sourceTextAttributes.backgroundColor,
       defaultTextAttributes.backgroundColor);
   textAttributes.opacity = convertRawProp(
+      context,
       rawProps,
       "opacity",
       sourceTextAttributes.opacity,
@@ -40,58 +44,75 @@ static TextAttributes convertRawProp(
 
   // Font
   textAttributes.fontFamily = convertRawProp(
+      context,
       rawProps,
       "fontFamily",
       sourceTextAttributes.fontFamily,
       defaultTextAttributes.fontFamily);
   textAttributes.fontSize = convertRawProp(
+      context,
       rawProps,
       "fontSize",
       sourceTextAttributes.fontSize,
       defaultTextAttributes.fontSize);
   textAttributes.fontSizeMultiplier = convertRawProp(
+      context,
       rawProps,
       "fontSizeMultiplier",
       sourceTextAttributes.fontSizeMultiplier,
       defaultTextAttributes.fontSizeMultiplier);
   textAttributes.fontWeight = convertRawProp(
+      context,
       rawProps,
       "fontWeight",
       sourceTextAttributes.fontWeight,
       defaultTextAttributes.fontWeight);
   textAttributes.fontStyle = convertRawProp(
+      context,
       rawProps,
       "fontStyle",
       sourceTextAttributes.fontStyle,
       defaultTextAttributes.fontStyle);
   textAttributes.fontVariant = convertRawProp(
+      context,
       rawProps,
       "fontVariant",
       sourceTextAttributes.fontVariant,
       defaultTextAttributes.fontVariant);
   textAttributes.allowFontScaling = convertRawProp(
+      context,
       rawProps,
       "allowFontScaling",
       sourceTextAttributes.allowFontScaling,
       defaultTextAttributes.allowFontScaling);
   textAttributes.letterSpacing = convertRawProp(
+      context,
       rawProps,
       "letterSpacing",
       sourceTextAttributes.letterSpacing,
       defaultTextAttributes.letterSpacing);
+  textAttributes.textTransform = convertRawProp(
+      context,
+      rawProps,
+      "textTransform",
+      sourceTextAttributes.textTransform,
+      defaultTextAttributes.textTransform);
 
   // Paragraph
   textAttributes.lineHeight = convertRawProp(
+      context,
       rawProps,
       "lineHeight",
       sourceTextAttributes.lineHeight,
       defaultTextAttributes.lineHeight);
   textAttributes.alignment = convertRawProp(
+      context,
       rawProps,
       "textAlign",
       sourceTextAttributes.alignment,
       defaultTextAttributes.alignment);
   textAttributes.baseWritingDirection = convertRawProp(
+      context,
       rawProps,
       "baseWritingDirection",
       sourceTextAttributes.baseWritingDirection,
@@ -99,21 +120,25 @@ static TextAttributes convertRawProp(
 
   // Decoration
   textAttributes.textDecorationColor = convertRawProp(
+      context,
       rawProps,
       "textDecorationColor",
       sourceTextAttributes.textDecorationColor,
       defaultTextAttributes.textDecorationColor);
   textAttributes.textDecorationLineType = convertRawProp(
+      context,
       rawProps,
       "textDecorationLine",
       sourceTextAttributes.textDecorationLineType,
       defaultTextAttributes.textDecorationLineType);
   textAttributes.textDecorationLineStyle = convertRawProp(
+      context,
       rawProps,
       "textDecorationLineStyle",
       sourceTextAttributes.textDecorationLineStyle,
       defaultTextAttributes.textDecorationLineStyle);
   textAttributes.textDecorationLinePattern = convertRawProp(
+      context,
       rawProps,
       "textDecorationLinePattern",
       sourceTextAttributes.textDecorationLinePattern,
@@ -121,16 +146,19 @@ static TextAttributes convertRawProp(
 
   // Shadow
   textAttributes.textShadowOffset = convertRawProp(
+      context,
       rawProps,
       "textShadowOffset",
       sourceTextAttributes.textShadowOffset,
       defaultTextAttributes.textShadowOffset);
   textAttributes.textShadowRadius = convertRawProp(
+      context,
       rawProps,
       "textShadowRadius",
       sourceTextAttributes.textShadowRadius,
       defaultTextAttributes.textShadowRadius);
   textAttributes.textShadowColor = convertRawProp(
+      context,
       rawProps,
       "textShadowColor",
       sourceTextAttributes.textShadowColor,
@@ -138,12 +166,14 @@ static TextAttributes convertRawProp(
 
   // Special
   textAttributes.isHighlighted = convertRawProp(
+      context,
       rawProps,
       "isHighlighted",
       sourceTextAttributes.isHighlighted,
       defaultTextAttributes.isHighlighted);
 
   textAttributes.accessibilityRole = convertRawProp(
+      context,
       rawProps,
       "accessibilityRole",
       sourceTextAttributes.accessibilityRole,
@@ -153,9 +183,11 @@ static TextAttributes convertRawProp(
 }
 
 BaseTextProps::BaseTextProps(
+    const PropsParserContext &context,
     const BaseTextProps &sourceProps,
     const RawProps &rawProps)
     : textAttributes(convertRawProp(
+          context,
           rawProps,
           sourceProps.textAttributes,
           TextAttributes{})){};
diff --git a/ReactCommon/react/renderer/components/text/BaseTextProps.h b/ReactCommon/react/renderer/components/text/BaseTextProps.h
index 4e4fefbafe5838..c20d07b6c3e28e 100644
--- a/ReactCommon/react/renderer/components/text/BaseTextProps.h
+++ b/ReactCommon/react/renderer/components/text/BaseTextProps.h
@@ -9,6 +9,7 @@
 
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 
@@ -22,7 +23,10 @@ namespace react {
 class BaseTextProps {
  public:
   BaseTextProps() = default;
-  BaseTextProps(const BaseTextProps &sourceProps, const RawProps &rawProps);
+  BaseTextProps(
+      const PropsParserContext &context,
+      const BaseTextProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - Props
 
diff --git a/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp b/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
index 638317f19a4062..a68e2dca773cae 100644
--- a/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
@@ -33,7 +33,7 @@ void BaseTextShadowNode::buildAttributedString(
   for (auto const &childNode : parentNode.getChildren()) {
     // RawShadowNode
     auto rawTextShadowNode =
-        std::dynamic_pointer_cast<RawTextShadowNode const>(childNode);
+        traitCast<RawTextShadowNode const *>(childNode.get());
     if (rawTextShadowNode) {
       auto fragment = AttributedString::Fragment{};
       fragment.string = rawTextShadowNode->getConcreteProps().text;
@@ -49,8 +49,7 @@ void BaseTextShadowNode::buildAttributedString(
     }
 
     // TextShadowNode
-    auto textShadowNode =
-        std::dynamic_pointer_cast<TextShadowNode const>(childNode);
+    auto textShadowNode = traitCast<TextShadowNode const *>(childNode.get());
     if (textShadowNode) {
       auto localTextAttributes = baseTextAttributes;
       localTextAttributes.apply(
diff --git a/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h b/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
index d2e925f4c8c80a..cd9baf46e57e75 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
@@ -10,6 +10,7 @@
 #include "ParagraphShadowNode.h"
 
 #include <react/config/ReactNativeConfig.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/view/ViewPropsInterpolation.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
@@ -32,10 +33,11 @@ class ParagraphComponentDescriptor final
   }
 
   virtual SharedProps interpolateProps(
+      const PropsParserContext &context,
       float animationProgress,
       const SharedProps &props,
       const SharedProps &newProps) const override {
-    SharedProps interpolatedPropsShared = cloneProps(newProps, {});
+    SharedProps interpolatedPropsShared = cloneProps(context, newProps, {});
 
     interpolateViewProps(
         animationProgress, props, newProps, interpolatedPropsShared);
@@ -44,22 +46,17 @@ class ParagraphComponentDescriptor final
   };
 
  protected:
-  void adopt(UnsharedShadowNode shadowNode) const override {
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    assert(std::dynamic_pointer_cast<ParagraphShadowNode>(shadowNode));
+    react_native_assert(
+        std::dynamic_pointer_cast<ParagraphShadowNode>(shadowNode));
     auto paragraphShadowNode =
         std::static_pointer_cast<ParagraphShadowNode>(shadowNode);
 
     // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content
     // and communicate text rendering metrics to mounting layer.
     paragraphShadowNode->setTextLayoutManager(textLayoutManager_);
-
-    paragraphShadowNode->dirtyLayout();
-
-    // All `ParagraphShadowNode`s must have leaf Yoga nodes with properly
-    // setup measure function.
-    paragraphShadowNode->enableMeasurement();
   }
 
  private:
diff --git a/ReactCommon/react/renderer/components/text/ParagraphProps.cpp b/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
index a578929150c05a..632da3bdcd1a76 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
@@ -18,15 +18,24 @@ namespace facebook {
 namespace react {
 
 ParagraphProps::ParagraphProps(
+    const PropsParserContext &context,
     ParagraphProps const &sourceProps,
     RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      paragraphAttributes(
-          convertRawProp(rawProps, sourceProps.paragraphAttributes, {})),
-      isSelectable(
-          convertRawProp(rawProps, "selectable", sourceProps.isSelectable, {})),
+    : ViewProps(context, sourceProps, rawProps),
+      BaseTextProps(context, sourceProps, rawProps),
+      paragraphAttributes(convertRawProp(
+          context,
+          rawProps,
+          sourceProps.paragraphAttributes,
+          {})),
+      isSelectable(convertRawProp(
+          context,
+          rawProps,
+          "selectable",
+          sourceProps.isSelectable,
+          false)),
       onTextLayout(convertRawProp(
+          context,
           rawProps,
           "onTextLayout",
           sourceProps.onTextLayout,
diff --git a/ReactCommon/react/renderer/components/text/ParagraphProps.h b/ReactCommon/react/renderer/components/text/ParagraphProps.h
index b456586c716362..a82bbb8eb4bd2b 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphProps.h
+++ b/ReactCommon/react/renderer/components/text/ParagraphProps.h
@@ -14,6 +14,7 @@
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -26,7 +27,10 @@ namespace react {
 class ParagraphProps : public ViewProps, public BaseTextProps {
  public:
   ParagraphProps() = default;
-  ParagraphProps(ParagraphProps const &sourceProps, RawProps const &rawProps);
+  ParagraphProps(
+      const PropsParserContext &context,
+      ParagraphProps const &sourceProps,
+      RawProps const &rawProps);
 
 #pragma mark - Props
 
diff --git a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
index 87745126463ca9..46f4098784165c 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
@@ -9,11 +9,12 @@
 
 #include <cmath>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/components/view/ViewShadowNode.h>
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/graphics/rounding.h>
-#include <react/renderer/mounting/TransactionTelemetry.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 
 #include "ParagraphState.h"
 
@@ -77,8 +78,8 @@ Content ParagraphShadowNode::getContentWithMeasuredAttachments(
         laytableShadowNode->measure(layoutContext, localLayoutConstraints);
 
     // Rounding to *next* value on the pixel grid.
-    size.width += 0.01;
-    size.height += 0.01;
+    size.width += 0.01f;
+    size.height += 0.01f;
     size = roundToPixel<&ceil>(size, layoutContext.pointScaleFactor);
 
     auto fragmentLayoutMetrics = LayoutMetrics{};
@@ -102,19 +103,16 @@ void ParagraphShadowNode::updateStateIfNeeded(Content const &content) {
 
   auto &state = getStateData();
 
-  assert(textLayoutManager_);
-  assert(
-      (!state.layoutManager || state.layoutManager == textLayoutManager_) &&
-      "`StateData` refers to a different `TextLayoutManager`");
+  react_native_assert(textLayoutManager_);
 
-  if (state.attributedString == content.attributedString &&
-      state.layoutManager == textLayoutManager_) {
+  if (state.attributedString == content.attributedString) {
     return;
   }
 
-  setStateData(ParagraphState{content.attributedString,
-                              content.paragraphAttributes,
-                              textLayoutManager_});
+  setStateData(ParagraphState{
+      content.attributedString,
+      content.paragraphAttributes,
+      textLayoutManager_});
 }
 
 #pragma mark - LayoutableShadowNode
@@ -138,11 +136,6 @@ Size ParagraphShadowNode::measureContent(
     attributedString.appendFragment({string, textAttributes, {}});
   }
 
-  auto telemetry = TransactionTelemetry::threadLocalTelemetry();
-  if (telemetry) {
-    telemetry->didMeasureText();
-  }
-
   return textLayoutManager_
       ->measure(
           AttributedStringBox{attributedString},
@@ -190,9 +183,10 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   // only to keep it in memory for a while.
   auto paragraphOwningShadowNode = ShadowNode::Unshared{};
 
-  assert(content.attachments.size() == measurement.attachments.size());
+  react_native_assert(
+      content.attachments.size() == measurement.attachments.size());
 
-  for (auto i = 0; i < content.attachments.size(); i++) {
+  for (size_t i = 0; i < content.attachments.size(); i++) {
     auto &attachment = content.attachments.at(i);
 
     if (!traitCast<LayoutableShadowNode const *>(attachment.shadowNode)) {
diff --git a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
index 4a584edb44a51d..5bd8c1b1085caa 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
+++ b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
@@ -28,12 +28,12 @@ extern char const ParagraphComponentName[];
  * containing and displaying text. Text content is represented as nested <Text>
  * and <RawText> components.
  */
-class ParagraphShadowNode : public ConcreteViewShadowNode<
-                                ParagraphComponentName,
-                                ParagraphProps,
-                                ParagraphEventEmitter,
-                                ParagraphState>,
-                            public BaseTextShadowNode {
+class ParagraphShadowNode final : public ConcreteViewShadowNode<
+                                      ParagraphComponentName,
+                                      ParagraphProps,
+                                      ParagraphEventEmitter,
+                                      ParagraphState>,
+                                  public BaseTextShadowNode {
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
@@ -41,6 +41,7 @@ class ParagraphShadowNode : public ConcreteViewShadowNode<
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
     traits.set(ShadowNodeTraits::Trait::TextKind);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
 
 #ifdef ANDROID
     // Unsetting `FormsStackingContext` trait is essential on Android where we
diff --git a/ReactCommon/react/renderer/components/text/ParagraphState.cpp b/ReactCommon/react/renderer/components/text/ParagraphState.cpp
index c91bb6e480f41e..5c15d2a31e6492 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphState.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphState.cpp
@@ -17,6 +17,10 @@ namespace react {
 folly::dynamic ParagraphState::getDynamic() const {
   return toDynamic(*this);
 }
+
+MapBuffer ParagraphState::getMapBuffer() const {
+  return toMapBuffer(*this);
+}
 #endif
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/text/ParagraphState.h b/ReactCommon/react/renderer/components/text/ParagraphState.h
index 8f320af68e6a1f..d4e80fda9cd7c7 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphState.h
+++ b/ReactCommon/react/renderer/components/text/ParagraphState.h
@@ -7,12 +7,14 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
 #endif
 
 namespace facebook {
@@ -39,14 +41,16 @@ class ParagraphState final {
    * `TextLayoutManager` provides a connection to platform-specific
    * text rendering infrastructure which is capable to render the
    * `AttributedString`.
+   * This is not on every platform. This is not used on Android, but is
+   * used on the iOS mounting layer.
    */
-  SharedTextLayoutManager layoutManager;
+  std::weak_ptr<TextLayoutManager const> layoutManager;
 
 #ifdef ANDROID
   ParagraphState(
       AttributedString const &attributedString,
       ParagraphAttributes const &paragraphAttributes,
-      SharedTextLayoutManager const &layoutManager)
+      std::weak_ptr<const TextLayoutManager> const &layoutManager)
       : attributedString(attributedString),
         paragraphAttributes(paragraphAttributes),
         layoutManager(layoutManager) {}
@@ -54,9 +58,10 @@ class ParagraphState final {
   ParagraphState(
       ParagraphState const &previousState,
       folly::dynamic const &data) {
-    assert(false && "Not supported");
+    react_native_assert(false && "Not supported");
   };
   folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const;
 #endif
 };
 
diff --git a/ReactCommon/react/renderer/components/text/RawTextProps.cpp b/ReactCommon/react/renderer/components/text/RawTextProps.cpp
index d54292bc527c6a..3660824907f04a 100644
--- a/ReactCommon/react/renderer/components/text/RawTextProps.cpp
+++ b/ReactCommon/react/renderer/components/text/RawTextProps.cpp
@@ -14,10 +14,11 @@ namespace facebook {
 namespace react {
 
 RawTextProps::RawTextProps(
+    const PropsParserContext &context,
     const RawTextProps &sourceProps,
     const RawProps &rawProps)
-    : Props(sourceProps, rawProps),
-      text(convertRawProp(rawProps, "text", sourceProps.text, {})){};
+    : Props(context, sourceProps, rawProps),
+      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})){};
 
 #pragma mark - DebugStringConvertible
 
diff --git a/ReactCommon/react/renderer/components/text/RawTextProps.h b/ReactCommon/react/renderer/components/text/RawTextProps.h
index 4b98953a0a262d..2516e99b1c4984 100644
--- a/ReactCommon/react/renderer/components/text/RawTextProps.h
+++ b/ReactCommon/react/renderer/components/text/RawTextProps.h
@@ -10,6 +10,7 @@
 #include <memory>
 
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook {
@@ -22,7 +23,10 @@ using SharedRawTextProps = std::shared_ptr<const RawTextProps>;
 class RawTextProps : public Props {
  public:
   RawTextProps() = default;
-  RawTextProps(const RawTextProps &sourceProps, const RawProps &rawProps);
+  RawTextProps(
+      const PropsParserContext &context,
+      const RawTextProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - Props
 
diff --git a/ReactCommon/react/renderer/components/text/RawTextShadowNode.h b/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
index b11297ee3533e8..8dbde86c996e93 100644
--- a/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
+++ b/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
@@ -21,8 +21,42 @@ extern const char RawTextComponentName[];
  * is represented as `<RawText text="Hello!"/>`.
  * <RawText> component must not have any children.
  */
-using RawTextShadowNode =
-    ConcreteShadowNode<RawTextComponentName, ShadowNode, RawTextProps>;
+class RawTextShadowNode : public ConcreteShadowNode<
+                              RawTextComponentName,
+                              ShadowNode,
+                              RawTextProps> {
+ public:
+  using ConcreteShadowNode::ConcreteShadowNode;
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::RawText);
+    return traits;
+  }
+};
+
+template <>
+inline RawTextShadowNode const &traitCast<RawTextShadowNode const &>(
+    ShadowNode const &shadowNode) {
+  bool castable =
+      shadowNode.getTraits().check(ShadowNodeTraits::Trait::RawText);
+  react_native_assert(castable);
+  (void)castable;
+  return static_cast<RawTextShadowNode const &>(shadowNode);
+}
+
+template <>
+inline RawTextShadowNode const *traitCast<RawTextShadowNode const *>(
+    ShadowNode const *shadowNode) {
+  if (!shadowNode) {
+    return nullptr;
+  }
+  bool castable =
+      shadowNode->getTraits().check(ShadowNodeTraits::Trait::RawText);
+  if (!castable) {
+    return nullptr;
+  }
+  return static_cast<RawTextShadowNode const *>(shadowNode);
+}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/components/text/TextProps.cpp b/ReactCommon/react/renderer/components/text/TextProps.cpp
index ac07380c1cdbb0..8e4bc4b0a6e944 100644
--- a/ReactCommon/react/renderer/components/text/TextProps.cpp
+++ b/ReactCommon/react/renderer/components/text/TextProps.cpp
@@ -10,9 +10,12 @@
 namespace facebook {
 namespace react {
 
-TextProps::TextProps(const TextProps &sourceProps, const RawProps &rawProps)
-    : Props(sourceProps, rawProps),
-      BaseTextProps::BaseTextProps(sourceProps, rawProps){};
+TextProps::TextProps(
+    const PropsParserContext &context,
+    const TextProps &sourceProps,
+    const RawProps &rawProps)
+    : Props(context, sourceProps, rawProps),
+      BaseTextProps::BaseTextProps(context, sourceProps, rawProps){};
 
 #pragma mark - DebugStringConvertible
 
diff --git a/ReactCommon/react/renderer/components/text/TextProps.h b/ReactCommon/react/renderer/components/text/TextProps.h
index 31e7be2a84fdf1..9903b05e0d711e 100644
--- a/ReactCommon/react/renderer/components/text/TextProps.h
+++ b/ReactCommon/react/renderer/components/text/TextProps.h
@@ -10,6 +10,7 @@
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 
@@ -19,7 +20,10 @@ namespace react {
 class TextProps : public Props, public BaseTextProps {
  public:
   TextProps() = default;
-  TextProps(const TextProps &sourceProps, const RawProps &rawProps);
+  TextProps(
+      const PropsParserContext &context,
+      const TextProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - DebugStringConvertible
 
diff --git a/ReactCommon/react/renderer/components/text/TextShadowNode.h b/ReactCommon/react/renderer/components/text/TextShadowNode.h
index 15d1fc308c5bcf..57e3f25076ba23 100644
--- a/ReactCommon/react/renderer/components/text/TextShadowNode.h
+++ b/ReactCommon/react/renderer/components/text/TextShadowNode.h
@@ -34,6 +34,7 @@ class TextShadowNode : public ConcreteShadowNode<
 #ifdef ANDROID
     traits.set(ShadowNodeTraits::Trait::FormsView);
 #endif
+    traits.set(ShadowNodeTraits::Trait::Text);
 
     return traits;
   }
@@ -57,5 +58,27 @@ class TextShadowNode : public ConcreteShadowNode<
 #endif
 };
 
+template <>
+inline TextShadowNode const &traitCast<TextShadowNode const &>(
+    ShadowNode const &shadowNode) {
+  bool castable = shadowNode.getTraits().check(ShadowNodeTraits::Trait::Text);
+  react_native_assert(castable);
+  (void)castable;
+  return static_cast<TextShadowNode const &>(shadowNode);
+}
+
+template <>
+inline TextShadowNode const *traitCast<TextShadowNode const *>(
+    ShadowNode const *shadowNode) {
+  if (!shadowNode) {
+    return nullptr;
+  }
+  bool castable = shadowNode->getTraits().check(ShadowNodeTraits::Trait::Text);
+  if (!castable) {
+    return nullptr;
+  }
+  return static_cast<TextShadowNode const *>(shadowNode);
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/components/text/conversions.h b/ReactCommon/react/renderer/components/text/conversions.h
index 0d44cd762143c6..8ea5baeddb7978 100644
--- a/ReactCommon/react/renderer/components/text/conversions.h
+++ b/ReactCommon/react/renderer/components/text/conversions.h
@@ -8,6 +8,10 @@
 #include <folly/dynamic.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/text/ParagraphState.h>
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
 
 namespace facebook {
 namespace react {
@@ -21,6 +25,24 @@ inline folly::dynamic toDynamic(ParagraphState const &paragraphState) {
   newState["hash"] = newState["attributedString"]["hash"];
   return newState;
 }
+
+// constants for Text State serialization
+constexpr static Key TX_STATE_KEY_ATTRIBUTED_STRING = 0;
+constexpr static Key TX_STATE_KEY_PARAGRAPH_ATTRIBUTES = 1;
+// Used for TextInput
+constexpr static Key TX_STATE_KEY_HASH = 2;
+constexpr static Key TX_STATE_KEY_MOST_RECENT_EVENT_COUNT = 3;
+
+inline MapBuffer toMapBuffer(ParagraphState const &paragraphState) {
+  auto builder = MapBufferBuilder();
+  auto attStringMapBuffer = toMapBuffer(paragraphState.attributedString);
+  builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer);
+  auto paMapBuffer = toMapBuffer(paragraphState.paragraphAttributes);
+  builder.putMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES, paMapBuffer);
+  // TODO: Used for TextInput
+  builder.putInt(TX_STATE_KEY_HASH, 1234);
+  return builder.build();
+}
 #endif
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp b/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp
index 24e51148450f3c..f38bfe8de4f8e7 100644
--- a/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp
+++ b/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp
@@ -9,6 +9,7 @@
 
 #include <assert.h>
 #include <gtest/gtest.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/primitives.h>
@@ -40,12 +41,14 @@ TEST(ParagraphLocalDataTest, testSomething) {
 
   auto result = toDynamic(paragraphState)["attributedString"];
 
-  assert(result["string"] == fragment.string);
+  react_native_assert(result["string"] == fragment.string);
   auto textAttribute = result["fragments"][0]["textAttributes"];
-  assert(textAttribute["foregroundColor"] == toDynamic(text.foregroundColor));
-  assert(textAttribute["opacity"] == text.opacity);
-  assert(textAttribute["fontStyle"] == toString(*text.fontStyle));
-  assert(textAttribute["fontWeight"] == toString(*text.fontWeight));
+  react_native_assert(
+      textAttribute["foregroundColor"] == toDynamic(text.foregroundColor));
+  react_native_assert(textAttribute["opacity"] == text.opacity);
+  react_native_assert(textAttribute["fontStyle"] == toString(*text.fontStyle));
+  react_native_assert(
+      textAttribute["fontWeight"] == toString(*text.fontWeight));
 }
 
 #endif
diff --git a/ReactCommon/react/renderer/components/textinput/Android.mk b/ReactCommon/react/renderer/components/textinput/Android.mk
index 80f6bf8fa1aafd..c45affab7b9b83 100644
--- a/ReactCommon/react/renderer/components/textinput/Android.mk
+++ b/ReactCommon/react/renderer/components/textinput/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_textinput
+LOCAL_MODULE := rrc_textinput
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_components_text libreact_render_components_image libreact_render_components_view libreact_utils
+LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -41,4 +41,6 @@ $(call import-module,react/renderer/components/image)
 $(call import-module,react/renderer/components/view)
 $(call import-module,react/renderer/components/text)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/renderer/components/textinput/BUCK b/ReactCommon/react/renderer/components/textinput/BUCK
index 7667e5515de83d..ad12c3b63e57a8 100644
--- a/ReactCommon/react/renderer/components/textinput/BUCK
+++ b/ReactCommon/react/renderer/components/textinput/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -36,10 +36,13 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_tests = [":tests"],
+    fbandroid_deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
@@ -58,7 +61,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
-        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -70,6 +73,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/imagemanager:imagemanager"),
+        react_native_xplat_target("react/utils:utils"),
     ],
 )
 
@@ -80,7 +84,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
index 26abeff7b997ab..8f0591e772d5dd 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -7,14 +7,17 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include "AndroidTextInputShadowNode.h"
 
+#include <fbjni/fbjni.h>
+
 #include <yoga/CompactValue.h>
 #include <yoga/YGEnums.h>
 #include <yoga/YGValue.h>
 
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
 namespace facebook {
 namespace react {
 
@@ -76,7 +79,6 @@ class AndroidTextInputComponentDescriptor final
             {},
             {},
             {},
-            textLayoutManager_,
             ((YGValue)theme[YGEdgeStart]).value,
             ((YGValue)theme[YGEdgeEnd]).value,
             ((YGValue)theme[YGEdgeTop]).value,
@@ -85,8 +87,9 @@ class AndroidTextInputComponentDescriptor final
   }
 
  protected:
-  void adopt(UnsharedShadowNode shadowNode) const override {
-    assert(std::dynamic_pointer_cast<AndroidTextInputShadowNode>(shadowNode));
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
+    react_native_assert(
+        std::dynamic_pointer_cast<AndroidTextInputShadowNode>(shadowNode));
     auto textInputShadowNode =
         std::static_pointer_cast<AndroidTextInputShadowNode>(shadowNode);
 
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
index c3907cd9a70d4f..ce7e24fd476aa3 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
@@ -37,215 +37,182 @@ static bool hasValue(
 }
 
 AndroidTextInputProps::AndroidTextInputProps(
+    const PropsParserContext &context,
     const AndroidTextInputProps &sourceProps,
     const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      autoCompleteType(convertRawProp(
+    : ViewProps(context, sourceProps, rawProps),
+      BaseTextProps(context, sourceProps, rawProps),
+      autoComplete(convertRawProp(
+          context,
           rawProps,
-          "autoCompleteType",
-          sourceProps.autoCompleteType,
+          "autoComplete",
+          sourceProps.autoComplete,
           {})),
-      returnKeyLabel(convertRawProp(
-          rawProps,
+      returnKeyLabel(convertRawProp(context, rawProps,
           "returnKeyLabel",
           sourceProps.returnKeyLabel,
           {})),
-      numberOfLines(convertRawProp(
-          rawProps,
+      numberOfLines(convertRawProp(context, rawProps,
           "numberOfLines",
           sourceProps.numberOfLines,
           {0})),
-      disableFullscreenUI(convertRawProp(
-          rawProps,
+      disableFullscreenUI(convertRawProp(context, rawProps,
           "disableFullscreenUI",
           sourceProps.disableFullscreenUI,
           {false})),
-      textBreakStrategy(convertRawProp(
-          rawProps,
+      textBreakStrategy(convertRawProp(context, rawProps,
           "textBreakStrategy",
           sourceProps.textBreakStrategy,
           {})),
-      underlineColorAndroid(convertRawProp(
-          rawProps,
+      underlineColorAndroid(convertRawProp(context, rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      inlineImageLeft(convertRawProp(
-          rawProps,
+      inlineImageLeft(convertRawProp(context, rawProps,
           "inlineImageLeft",
           sourceProps.inlineImageLeft,
           {})),
-      inlineImagePadding(convertRawProp(
-          rawProps,
+      inlineImagePadding(convertRawProp(context, rawProps,
           "inlineImagePadding",
           sourceProps.inlineImagePadding,
           {0})),
-      importantForAutofill(convertRawProp(
-          rawProps,
+      importantForAutofill(convertRawProp(context, rawProps,
           "importantForAutofill",
           sourceProps.importantForAutofill,
           {})),
-      showSoftInputOnFocus(convertRawProp(
-          rawProps,
+      showSoftInputOnFocus(convertRawProp(context, rawProps,
           "showSoftInputOnFocus",
           sourceProps.showSoftInputOnFocus,
           {false})),
-      autoCapitalize(convertRawProp(
-          rawProps,
+      autoCapitalize(convertRawProp(context, rawProps,
           "autoCapitalize",
           sourceProps.autoCapitalize,
           {})),
-      autoCorrect(convertRawProp(
-          rawProps,
+      autoCorrect(convertRawProp(context, rawProps,
           "autoCorrect",
           sourceProps.autoCorrect,
           {false})),
-      autoFocus(convertRawProp(
-          rawProps,
+      autoFocus(convertRawProp(context, rawProps,
           "autoFocus",
           sourceProps.autoFocus,
           {false})),
-      allowFontScaling(convertRawProp(
-          rawProps,
+      allowFontScaling(convertRawProp(context, rawProps,
           "allowFontScaling",
           sourceProps.allowFontScaling,
           {false})),
-      maxFontSizeMultiplier(convertRawProp(
-          rawProps,
+      maxFontSizeMultiplier(convertRawProp(context, rawProps,
           "maxFontSizeMultiplier",
           sourceProps.maxFontSizeMultiplier,
           {0.0})),
       editable(
-          convertRawProp(rawProps, "editable", sourceProps.editable, {false})),
-      keyboardType(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "editable", sourceProps.editable, {false})),
+      keyboardType(convertRawProp(context, rawProps,
           "keyboardType",
           sourceProps.keyboardType,
           {})),
-      returnKeyType(convertRawProp(
-          rawProps,
+      returnKeyType(convertRawProp(context, rawProps,
           "returnKeyType",
           sourceProps.returnKeyType,
           {})),
       maxLength(
-          convertRawProp(rawProps, "maxLength", sourceProps.maxLength, {0})),
-      multiline(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "maxLength", sourceProps.maxLength, {0})),
+      multiline(convertRawProp(context, rawProps,
           "multiline",
           sourceProps.multiline,
           {false})),
       placeholder(
-          convertRawProp(rawProps, "placeholder", sourceProps.placeholder, {})),
-      placeholderTextColor(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "placeholder", sourceProps.placeholder, {})),
+      placeholderTextColor(convertRawProp(context, rawProps,
           "placeholderTextColor",
           sourceProps.placeholderTextColor,
           {})),
-      secureTextEntry(convertRawProp(
-          rawProps,
+      secureTextEntry(convertRawProp(context, rawProps,
           "secureTextEntry",
           sourceProps.secureTextEntry,
           {false})),
-      selectionColor(convertRawProp(
-          rawProps,
+      selectionColor(convertRawProp(context, rawProps,
           "selectionColor",
           sourceProps.selectionColor,
           {})),
       selection(
-          convertRawProp(rawProps, "selection", sourceProps.selection, {})),
-      value(convertRawProp(rawProps, "value", sourceProps.value, {})),
-      defaultValue(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "selection", sourceProps.selection, {})),
+      value(convertRawProp(context, rawProps, "value", sourceProps.value, {})),
+      defaultValue(convertRawProp(context, rawProps,
           "defaultValue",
           sourceProps.defaultValue,
           {})),
-      selectTextOnFocus(convertRawProp(
-          rawProps,
+      selectTextOnFocus(convertRawProp(context, rawProps,
           "selectTextOnFocus",
           sourceProps.selectTextOnFocus,
           {false})),
-      blurOnSubmit(convertRawProp(
-          rawProps,
+      blurOnSubmit(convertRawProp(context, rawProps,
           "blurOnSubmit",
           sourceProps.blurOnSubmit,
           {false})),
-      caretHidden(convertRawProp(
-          rawProps,
+      caretHidden(convertRawProp(context, rawProps,
           "caretHidden",
           sourceProps.caretHidden,
           {false})),
-      contextMenuHidden(convertRawProp(
-          rawProps,
+      contextMenuHidden(convertRawProp(context, rawProps,
           "contextMenuHidden",
           sourceProps.contextMenuHidden,
           {false})),
-      textShadowColor(convertRawProp(
-          rawProps,
+      textShadowColor(convertRawProp(context, rawProps,
           "textShadowColor",
           sourceProps.textShadowColor,
           {})),
-      textShadowRadius(convertRawProp(
-          rawProps,
+      textShadowRadius(convertRawProp(context, rawProps,
           "textShadowRadius",
           sourceProps.textShadowRadius,
           {0.0})),
-      textDecorationLine(convertRawProp(
-          rawProps,
+      textDecorationLine(convertRawProp(context, rawProps,
           "textDecorationLine",
           sourceProps.textDecorationLine,
           {})),
       fontStyle(
-          convertRawProp(rawProps, "fontStyle", sourceProps.fontStyle, {})),
-      textShadowOffset(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "fontStyle", sourceProps.fontStyle, {})),
+      textShadowOffset(convertRawProp(context, rawProps,
           "textShadowOffset",
           sourceProps.textShadowOffset,
           {})),
-      lineHeight(convertRawProp(
-          rawProps,
+      lineHeight(convertRawProp(context, rawProps,
           "lineHeight",
           sourceProps.lineHeight,
           {0.0})),
-      textTransform(convertRawProp(
-          rawProps,
+      textTransform(convertRawProp(context, rawProps,
           "textTransform",
           sourceProps.textTransform,
           {})),
-      color(convertRawProp(rawProps, "color", sourceProps.color, {0})),
-      letterSpacing(convertRawProp(
-          rawProps,
+      color(0 /*convertRawProp(context, rawProps, "color", sourceProps.color, {0})*/),
+      letterSpacing(convertRawProp(context, rawProps,
           "letterSpacing",
           sourceProps.letterSpacing,
           {0.0})),
       fontSize(
-          convertRawProp(rawProps, "fontSize", sourceProps.fontSize, {0.0})),
+          convertRawProp(context, rawProps, "fontSize", sourceProps.fontSize, {0.0})),
       textAlign(
-          convertRawProp(rawProps, "textAlign", sourceProps.textAlign, {})),
-      includeFontPadding(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "textAlign", sourceProps.textAlign, {})),
+      includeFontPadding(convertRawProp(context, rawProps,
           "includeFontPadding",
           sourceProps.includeFontPadding,
           {false})),
       fontWeight(
-          convertRawProp(rawProps, "fontWeight", sourceProps.fontWeight, {})),
+          convertRawProp(context, rawProps, "fontWeight", sourceProps.fontWeight, {})),
       fontFamily(
-          convertRawProp(rawProps, "fontFamily", sourceProps.fontFamily, {})),
-      textAlignVertical(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "fontFamily", sourceProps.fontFamily, {})),
+      textAlignVertical(convertRawProp(context, rawProps,
           "textAlignVertical",
           sourceProps.textAlignVertical,
           {})),
       cursorColor(
-          convertRawProp(rawProps, "cursorColor", sourceProps.cursorColor, {})),
-      mostRecentEventCount(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "cursorColor", sourceProps.cursorColor, {})),
+      mostRecentEventCount(convertRawProp(context, rawProps,
           "mostRecentEventCount",
           sourceProps.mostRecentEventCount,
           {0})),
-      text(convertRawProp(rawProps, "text", sourceProps.text, {})),
+      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
       paragraphAttributes(
-          convertRawProp(rawProps, sourceProps.paragraphAttributes, {})),
+          convertRawProp(context, rawProps, sourceProps.paragraphAttributes, {})),
       // See AndroidTextInputComponentDescriptor for usage
       // TODO T63008435: can these, and this feature, be removed entirely?
       hasPadding(hasValue(rawProps, sourceProps.hasPadding, "", "padding", "")),
@@ -294,7 +261,7 @@ AndroidTextInputProps::AndroidTextInputProps(
 // TODO T53300085: support this in codegen; this was hand-written
 folly::dynamic AndroidTextInputProps::getDynamic() const {
   folly::dynamic props = folly::dynamic::object();
-  props["autoCompleteType"] = autoCompleteType;
+  props["autoComplete"] = autoComplete;
   props["returnKeyLabel"] = returnKeyLabel;
   props["numberOfLines"] = numberOfLines;
   props["disableFullscreenUI"] = disableFullscreenUI;
@@ -332,7 +299,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["textShadowOffset"] = toDynamic(textShadowOffset);
   props["lineHeight"] = lineHeight;
   props["textTransform"] = textTransform;
-  props["color"] = color;
+  props["color"] = toDynamic(color);
   props["letterSpacing"] = letterSpacing;
   props["fontSize"] = fontSize;
   props["textAlign"] = textAlign;
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
index 18f0bcf4ac60a1..07daa9e2cd0121 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
@@ -16,6 +16,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -31,17 +32,18 @@ struct AndroidTextInputSelectionStruct {
 };
 
 static inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AndroidTextInputSelectionStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto start = map.find("start");
   if (start != map.end()) {
-    fromRawValue(start->second, result.start);
+    fromRawValue(context, start->second, result.start);
   }
   auto end = map.find("end");
   if (end != map.end()) {
-    fromRawValue(end->second, result.end);
+    fromRawValue(context, end->second, result.end);
   }
 }
 
@@ -56,17 +58,18 @@ struct AndroidTextInputTextShadowOffsetStruct {
 };
 
 static inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AndroidTextInputTextShadowOffsetStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto width = map.find("width");
   if (width != map.end()) {
-    fromRawValue(width->second, result.width);
+    fromRawValue(context, width->second, result.width);
   }
   auto height = map.find("height");
   if (height != map.end()) {
-    fromRawValue(height->second, result.height);
+    fromRawValue(context, height->second, result.height);
   }
 }
 
@@ -96,6 +99,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
  public:
   AndroidTextInputProps() = default;
   AndroidTextInputProps(
+      const PropsParserContext &context,
       const AndroidTextInputProps &sourceProps,
       const RawProps &rawProps);
 
@@ -103,7 +107,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
 
 #pragma mark - Props
 
-  const std::string autoCompleteType{};
+  const std::string autoComplete{};
   const std::string returnKeyLabel{};
   const int numberOfLines{0};
   const bool disableFullscreenUI{false};
@@ -141,7 +145,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
   const AndroidTextInputTextShadowOffsetStruct textShadowOffset{};
   const Float lineHeight{0.0};
   const std::string textTransform{};
-  const int color{0};
+  const SharedColor color{0};
   const Float letterSpacing{0.0};
   const Float fontSize{0.0};
   const std::string textAlign{};
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
index 86420fe470da86..1f2e468653e2bd 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -8,6 +8,7 @@
 #include "AndroidTextInputShadowNode.h"
 
 #include <fbjni/fbjni.h>
+#include <react/debug/react_native_assert.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
@@ -118,16 +119,10 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   auto reactTreeAttributedString = getAttributedString();
   auto const &state = getStateData();
 
-  assert(textLayoutManager_);
-  assert(
-      (!state.layoutManager || state.layoutManager == textLayoutManager_) &&
-      "`StateData` refers to a different `TextLayoutManager`");
-
   // Tree is often out of sync with the value of the TextInput.
   // This is by design - don't change the value of the TextInput in the State,
   // and therefore in Java, unless the tree itself changes.
-  if (state.reactTreeAttributedString == reactTreeAttributedString &&
-      state.layoutManager == textLayoutManager_) {
+  if (state.reactTreeAttributedString == reactTreeAttributedString) {
     return;
   }
 
@@ -155,17 +150,17 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
-  setStateData(AndroidTextInputState{newEventCount,
-                                     newAttributedString,
-                                     reactTreeAttributedString,
-                                     getConcreteProps().paragraphAttributes,
-                                     defaultTextAttributes,
-                                     ShadowView(*this),
-                                     textLayoutManager_,
-                                     state.defaultThemePaddingStart,
-                                     state.defaultThemePaddingEnd,
-                                     state.defaultThemePaddingTop,
-                                     state.defaultThemePaddingBottom});
+  setStateData(AndroidTextInputState{
+      newEventCount,
+      newAttributedString,
+      reactTreeAttributedString,
+      getConcreteProps().paragraphAttributes,
+      defaultTextAttributes,
+      ShadowView(*this),
+      state.defaultThemePaddingStart,
+      state.defaultThemePaddingEnd,
+      state.defaultThemePaddingTop,
+      state.defaultThemePaddingBottom});
 }
 
 #pragma mark - LayoutableShadowNode
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h
index ac322666e0f452..2642030d94776f 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h
@@ -24,11 +24,11 @@ extern const char AndroidTextInputComponentName[];
 /*
  * `ShadowNode` for <AndroidTextInput> component.
  */
-class AndroidTextInputShadowNode : public ConcreteViewShadowNode<
-                                       AndroidTextInputComponentName,
-                                       AndroidTextInputProps,
-                                       AndroidTextInputEventEmitter,
-                                       AndroidTextInputState> {
+class AndroidTextInputShadowNode final : public ConcreteViewShadowNode<
+                                             AndroidTextInputComponentName,
+                                             AndroidTextInputProps,
+                                             AndroidTextInputEventEmitter,
+                                             AndroidTextInputState> {
  public:
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
index 70f89eb40e7561..4e51cf0ceef85f 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
@@ -20,7 +20,6 @@ AndroidTextInputState::AndroidTextInputState(
     ParagraphAttributes const &paragraphAttributes,
     TextAttributes const &defaultTextAttributes,
     ShadowView const &defaultParentShadowView,
-    SharedTextLayoutManager const &layoutManager,
     float defaultThemePaddingStart,
     float defaultThemePaddingEnd,
     float defaultThemePaddingTop,
@@ -32,7 +31,6 @@ AndroidTextInputState::AndroidTextInputState(
       paragraphAttributes(paragraphAttributes),
       defaultTextAttributes(defaultTextAttributes),
       defaultParentShadowView(defaultParentShadowView),
-      layoutManager(layoutManager),
       defaultThemePaddingStart(defaultThemePaddingStart),
       defaultThemePaddingEnd(defaultThemePaddingEnd),
       defaultThemePaddingTop(defaultThemePaddingTop),
@@ -54,7 +52,6 @@ AndroidTextInputState::AndroidTextInputState(
       paragraphAttributes(previousState.paragraphAttributes),
       defaultTextAttributes(previousState.defaultTextAttributes),
       defaultParentShadowView(previousState.defaultParentShadowView),
-      layoutManager(previousState.layoutManager),
       defaultThemePaddingStart(data.getDefault(
                                        "themePaddingStart",
                                        previousState.defaultThemePaddingStart)
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
index c97ade9565c5ec..4d3d41ac7a87c6 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
@@ -13,6 +13,8 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook {
@@ -66,13 +68,6 @@ class AndroidTextInputState final {
    */
   ShadowView defaultParentShadowView;
 
-  /*
-   * `TextLayoutManager` provides a connection to platform-specific
-   * text rendering infrastructure which is capable to render the
-   * `AttributedString`.
-   */
-  SharedTextLayoutManager layoutManager{};
-
   /**
    * Communicates Android theme padding back to the ShadowNode / Component
    * Descriptor for layout.
@@ -89,7 +84,6 @@ class AndroidTextInputState final {
       ParagraphAttributes const &paragraphAttributes,
       TextAttributes const &defaultTextAttributes,
       ShadowView const &defaultParentShadowView,
-      SharedTextLayoutManager const &layoutManager,
       float defaultThemePaddingStart,
       float defaultThemePaddingEnd,
       float defaultThemePaddingTop,
@@ -100,6 +94,9 @@ class AndroidTextInputState final {
       AndroidTextInputState const &previousState,
       folly::dynamic const &data);
   folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
index 1f7e87f1340921..b6c933480d4cc0 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -36,7 +36,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_tests = [":tests"],
@@ -58,7 +58,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
-        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -70,6 +70,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/imagemanager:imagemanager"),
+        react_native_xplat_target("react/utils:utils"),
     ],
 )
 
@@ -80,7 +81,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h
index 9614fd5712d5b8..ef36380552acdb 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/iostextinput/TextInputShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
@@ -26,16 +27,15 @@ class TextInputComponentDescriptor final
   }
 
  protected:
-  void adopt(UnsharedShadowNode shadowNode) const override {
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    assert(std::dynamic_pointer_cast<TextInputShadowNode>(shadowNode));
+    react_native_assert(
+        std::dynamic_pointer_cast<TextInputShadowNode>(shadowNode));
     auto concreteShadowNode =
         std::static_pointer_cast<TextInputShadowNode>(shadowNode);
 
     concreteShadowNode->setTextLayoutManager(textLayoutManager_);
-    concreteShadowNode->dirtyLayout();
-    concreteShadowNode->enableMeasurement();
   }
 
  private:
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
index e102f463bf4057..9e13cb97bb0574 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
@@ -16,48 +16,80 @@ namespace facebook {
 namespace react {
 
 TextInputProps::TextInputProps(
+    const PropsParserContext &context,
     TextInputProps const &sourceProps,
     RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      traits(convertRawProp(rawProps, sourceProps.traits, {})),
-      paragraphAttributes(
-          convertRawProp(rawProps, sourceProps.paragraphAttributes, {})),
+    : ViewProps(context, sourceProps, rawProps),
+      BaseTextProps(context, sourceProps, rawProps),
+      traits(convertRawProp(context, rawProps, sourceProps.traits, {})),
+      paragraphAttributes(convertRawProp(
+          context,
+          rawProps,
+          sourceProps.paragraphAttributes,
+          {})),
       defaultValue(convertRawProp(
+          context,
           rawProps,
           "defaultValue",
           sourceProps.defaultValue,
           {})),
-      placeholder(
-          convertRawProp(rawProps, "placeholder", sourceProps.placeholder, {})),
+      placeholder(convertRawProp(
+          context,
+          rawProps,
+          "placeholder",
+          sourceProps.placeholder,
+          {})),
       placeholderTextColor(convertRawProp(
+          context,
           rawProps,
           "placeholderTextColor",
           sourceProps.placeholderTextColor,
           {})),
-      maxLength(
-          convertRawProp(rawProps, "maxLength", sourceProps.maxLength, {})),
-      cursorColor(
-          convertRawProp(rawProps, "cursorColor", sourceProps.cursorColor, {})),
+      maxLength(convertRawProp(
+          context,
+          rawProps,
+          "maxLength",
+          sourceProps.maxLength,
+          {})),
+      cursorColor(convertRawProp(
+          context,
+          rawProps,
+          "cursorColor",
+          sourceProps.cursorColor,
+          {})),
       selectionColor(convertRawProp(
+          context,
           rawProps,
           "selectionColor",
           sourceProps.selectionColor,
           {})),
       underlineColorAndroid(convertRawProp(
+          context,
           rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      text(convertRawProp(rawProps, "text", sourceProps.text, {})),
+      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
       mostRecentEventCount(convertRawProp(
+          context,
           rawProps,
           "mostRecentEventCount",
           sourceProps.mostRecentEventCount,
           {})),
-      autoFocus(
-          convertRawProp(rawProps, "autoFocus", sourceProps.autoFocus, {})),
+      autoFocus(convertRawProp(
+          context,
+          rawProps,
+          "autoFocus",
+          sourceProps.autoFocus,
+          {})),
+      selection(convertRawProp(
+          context,
+          rawProps,
+          "selection",
+          sourceProps.selection,
+          better::optional<Selection>())),
       inputAccessoryViewID(convertRawProp(
+          context,
           rawProps,
           "inputAccessoryViewID",
           sourceProps.inputAccessoryViewID,
@@ -89,13 +121,5 @@ ParagraphAttributes TextInputProps::getEffectiveParagraphAttributes() const {
   return result;
 }
 
-#ifdef ANDROID
-folly::dynamic TextInputProps::getDynamic() const {
-  folly::dynamic props = folly::dynamic::object();
-  props["value"] = value;
-  return props;
-}
-#endif
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h
index a12503ff669998..9fb44a4b2c1724 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h
@@ -14,6 +14,7 @@
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -25,7 +26,10 @@ namespace react {
 class TextInputProps final : public ViewProps, public BaseTextProps {
  public:
   TextInputProps() = default;
-  TextInputProps(TextInputProps const &sourceProps, RawProps const &rawProps);
+  TextInputProps(
+      const PropsParserContext &context,
+      TextInputProps const &sourceProps,
+      RawProps const &rawProps);
 
 #pragma mark - Props
 
@@ -54,6 +58,7 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
   int const mostRecentEventCount{0};
 
   bool autoFocus{false};
+  better::optional<Selection> selection{};
 
   std::string const inputAccessoryViewID{};
 
@@ -62,10 +67,6 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
    */
   TextAttributes getEffectiveTextAttributes(Float fontSizeMultiplier) const;
   ParagraphAttributes getEffectiveParagraphAttributes() const;
-
-#ifdef ANDROID
-  folly::dynamic getDynamic() const;
-#endif
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp
index 4e771d9e5e5780..fb5c0ff7f33bda 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp
@@ -7,6 +7,7 @@
 
 #include "TextInputShadowNode.h"
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -82,8 +83,8 @@ void TextInputShadowNode::updateStateIfNeeded(
   auto reactTreeAttributedString = getAttributedString(layoutContext);
   auto const &state = getStateData();
 
-  assert(textLayoutManager_);
-  assert(
+  react_native_assert(textLayoutManager_);
+  react_native_assert(
       (!state.layoutManager || state.layoutManager == textLayoutManager_) &&
       "`StateData` refers to a different `TextLayoutManager`");
 
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h
index 4924c4f8b6b3b5..ffb370aab03f97 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h
@@ -24,12 +24,12 @@ extern const char TextInputComponentName[];
 /*
  * `ShadowNode` for <TextInput> component.
  */
-class TextInputShadowNode : public ConcreteViewShadowNode<
-                                TextInputComponentName,
-                                TextInputProps,
-                                TextInputEventEmitter,
-                                TextInputState>,
-                            public BaseTextShadowNode {
+class TextInputShadowNode final : public ConcreteViewShadowNode<
+                                      TextInputComponentName,
+                                      TextInputProps,
+                                      TextInputEventEmitter,
+                                      TextInputState>,
+                                  public BaseTextShadowNode {
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
@@ -37,6 +37,7 @@ class TextInputShadowNode : public ConcreteViewShadowNode<
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::TextKind);
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
     return traits;
   }
 
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h
index 31ea9c77a2aa03..fb249f4a840ab3 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h
@@ -13,6 +13,8 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook {
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h
index 85d2fe926e7742..56be93b9da177a 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h
@@ -8,12 +8,14 @@
 #pragma once
 
 #include <react/renderer/components/iostextinput/primitives.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AutocapitalizationType &result) {
   auto string = (std::string)value;
@@ -36,7 +38,10 @@ inline void fromRawValue(
   abort();
 }
 
-inline void fromRawValue(const RawValue &value, KeyboardAppearance &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    KeyboardAppearance &result) {
   auto string = (std::string)value;
   if (string == "default") {
     result = KeyboardAppearance::Default;
@@ -53,7 +58,10 @@ inline void fromRawValue(const RawValue &value, KeyboardAppearance &result) {
   abort();
 }
 
-inline void fromRawValue(const RawValue &value, ReturnKeyType &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    ReturnKeyType &result) {
   auto string = (std::string)value;
   if (string == "default") {
     result = ReturnKeyType::Default;
@@ -119,6 +127,7 @@ inline void fromRawValue(const RawValue &value, ReturnKeyType &result) {
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextInputAccessoryVisibilityMode &result) {
   auto string = (std::string)value;
@@ -141,7 +150,10 @@ inline void fromRawValue(
   abort();
 }
 
-inline void fromRawValue(const RawValue &value, KeyboardType &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    KeyboardType &result) {
   auto string = (std::string)value;
   if (string == "default") {
     result = KeyboardType::Default;
@@ -163,6 +175,10 @@ inline void fromRawValue(const RawValue &value, KeyboardType &result) {
     result = KeyboardType::NumberPad;
     return;
   }
+  if (string == "url") {
+    result = KeyboardType::URL;
+    return;
+  }
   if (string == "decimal-pad") {
     result = KeyboardType::DecimalPad;
     return;
@@ -177,10 +193,6 @@ inline void fromRawValue(const RawValue &value, KeyboardType &result) {
     result = KeyboardType::NumbersAndPunctuation;
     return;
   }
-  if (string == "url") {
-    result = KeyboardType::URL;
-    return;
-  }
   if (string == "name-phone-pad") {
     result = KeyboardType::NamePhonePad;
     return;
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h b/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h
index f13e9b44a32e92..f3b0fc2dfc5899 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h
@@ -77,6 +77,12 @@ enum class KeyboardType {
   VisiblePassword,
 };
 
+class Selection final {
+ public:
+  int start{0};
+  int end{0};
+};
+
 /*
  * Controls features of text inputs.
  */
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h
index 4de4dc98d987ce..162e989112474c 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h
@@ -8,107 +8,135 @@
 #pragma once
 
 #include <react/renderer/components/iostextinput/primitives.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 static TextInputTraits convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     TextInputTraits const &sourceTraits,
     TextInputTraits const &defaultTraits) {
   auto traits = TextInputTraits{};
 
   traits.multiline = convertRawProp(
-      rawProps, "multiline", sourceTraits.multiline, defaultTraits.multiline);
+      context,
+      rawProps,
+      "multiline",
+      sourceTraits.multiline,
+      defaultTraits.multiline);
   traits.autocapitalizationType = convertRawProp(
+      context,
       rawProps,
       "autoCapitalize",
       sourceTraits.autocapitalizationType,
       defaultTraits.autocapitalizationType);
   traits.autoCorrect = convertRawProp(
+      context,
       rawProps,
       "autoCorrect",
       sourceTraits.autoCorrect,
       defaultTraits.autoCorrect);
   traits.contextMenuHidden = convertRawProp(
+      context,
       rawProps,
       "contextMenuHidden",
       sourceTraits.contextMenuHidden,
       defaultTraits.contextMenuHidden);
   traits.editable = convertRawProp(
-      rawProps, "editable", sourceTraits.editable, defaultTraits.editable);
+      context,
+      rawProps,
+      "editable",
+      sourceTraits.editable,
+      defaultTraits.editable);
   traits.enablesReturnKeyAutomatically = convertRawProp(
+      context,
       rawProps,
       "enablesReturnKeyAutomatically",
       sourceTraits.enablesReturnKeyAutomatically,
       defaultTraits.enablesReturnKeyAutomatically);
   traits.keyboardAppearance = convertRawProp(
+      context,
       rawProps,
       "keyboardAppearance",
       sourceTraits.keyboardAppearance,
       defaultTraits.keyboardAppearance);
   traits.spellCheck = convertRawProp(
+      context,
       rawProps,
       "spellCheck",
       sourceTraits.spellCheck,
       defaultTraits.spellCheck);
   traits.caretHidden = convertRawProp(
+      context,
       rawProps,
       "caretHidden",
       sourceTraits.caretHidden,
       defaultTraits.caretHidden);
   traits.clearButtonMode = convertRawProp(
+      context,
       rawProps,
       "clearButtonMode",
       sourceTraits.clearButtonMode,
       defaultTraits.clearButtonMode);
   traits.scrollEnabled = convertRawProp(
+      context,
       rawProps,
       "scrollEnabled",
       sourceTraits.scrollEnabled,
       defaultTraits.scrollEnabled);
   traits.secureTextEntry = convertRawProp(
+      context,
       rawProps,
       "secureTextEntry",
       sourceTraits.secureTextEntry,
       defaultTraits.secureTextEntry);
   traits.blurOnSubmit = convertRawProp(
+      context,
       rawProps,
       "blurOnSubmit",
       sourceTraits.blurOnSubmit,
       defaultTraits.blurOnSubmit);
   traits.clearTextOnFocus = convertRawProp(
+      context,
       rawProps,
       "clearTextOnFocus",
       sourceTraits.clearTextOnFocus,
       defaultTraits.clearTextOnFocus);
   traits.keyboardType = convertRawProp(
+      context,
       rawProps,
       "keyboardType",
       sourceTraits.keyboardType,
       defaultTraits.keyboardType);
   traits.showSoftInputOnFocus = convertRawProp(
+      context,
       rawProps,
       "showSoftInputOnFocus",
       sourceTraits.showSoftInputOnFocus,
       defaultTraits.showSoftInputOnFocus);
   traits.returnKeyType = convertRawProp(
+      context,
       rawProps,
       "returnKeyType",
       sourceTraits.returnKeyType,
       defaultTraits.returnKeyType);
   traits.selectTextOnFocus = convertRawProp(
+      context,
       rawProps,
       "selectTextOnFocus",
       sourceTraits.selectTextOnFocus,
       defaultTraits.selectTextOnFocus);
   traits.textContentType = convertRawProp(
+      context,
       rawProps,
       "textContentType",
       sourceTraits.textContentType,
       defaultTraits.textContentType);
   traits.passwordRules = convertRawProp(
+      context,
       rawProps,
       "passwordRules",
       sourceTraits.passwordRules,
@@ -117,5 +145,38 @@ static TextInputTraits convertRawProp(
   return traits;
 }
 
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    Selection &result) {
+  if (value.hasType<better::map<std::string, int>>()) {
+    auto map = (better::map<std::string, int>)value;
+    for (const auto &pair : map) {
+      if (pair.first == "start") {
+        result.start = pair.second;
+      } else if (pair.first == "end") {
+        result.end = pair.second;
+      } else {
+        LOG(ERROR) << "Unsupported Selection map key: " << pair.first;
+        react_native_assert(false);
+      }
+    }
+    return;
+  }
+
+  react_native_assert(value.hasType<std::vector<int>>());
+  if (value.hasType<std::vector<int>>()) {
+    auto array = (std::vector<int>)value;
+    react_native_assert(array.size() == 2);
+    if (array.size() >= 2) {
+      result = {array.at(0), array.at(1)};
+    } else {
+      result = {0, 0};
+      LOG(ERROR) << "Unsupported Selection vector size: " << array.size();
+    }
+  } else {
+    LOG(ERROR) << "Unsupported Selection type";
+  }
+}
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/components/unimplementedview/Android.mk b/ReactCommon/react/renderer/components/unimplementedview/Android.mk
index ebdb6de7643e0e..959500fb70d131 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/Android.mk
+++ b/ReactCommon/react/renderer/components/unimplementedview/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_unimplementedview
+LOCAL_MODULE := rrc_unimplementedview
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_components_view
+LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -33,3 +33,4 @@ $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
 $(call import-module,yogajni)
+$(call import-module,react/debug)
diff --git a/ReactCommon/react/renderer/components/unimplementedview/BUCK b/ReactCommon/react/renderer/components/unimplementedview/BUCK
index 128195f1d948a8..b3c76b9d7d2070 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/BUCK
+++ b/ReactCommon/react/renderer/components/unimplementedview/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -53,6 +53,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/components/view:view"),
@@ -66,7 +67,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp
index 24946364a4cf1d..375a95c5d945a5 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp
+++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp
@@ -7,6 +7,8 @@
 
 #include "UnimplementedViewComponentDescriptor.h"
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
@@ -20,18 +22,21 @@ ComponentName UnimplementedViewComponentDescriptor::getComponentName() const {
 }
 
 Props::Shared UnimplementedViewComponentDescriptor::cloneProps(
+    PropsParserContext const &context,
     Props::Shared const &props,
     RawProps const &rawProps) const {
   auto clonedProps =
       ConcreteComponentDescriptor<UnimplementedViewShadowNode>::cloneProps(
-          props, rawProps);
-  assert(std::dynamic_pointer_cast<UnimplementedViewProps const>(clonedProps));
+          context, props, rawProps);
+  react_native_assert(
+      std::dynamic_pointer_cast<UnimplementedViewProps const>(clonedProps));
 
   // We have to clone `Props` object one more time to make sure that we have
   // an unshared (and non-`const`) copy of it which we can mutate.
   RawProps emptyRawProps{};
-  emptyRawProps.parse(rawPropsParser_);
+  emptyRawProps.parse(rawPropsParser_, context);
   auto unimplementedViewProps = std::make_shared<UnimplementedViewProps>(
+      context,
       *std::static_pointer_cast<UnimplementedViewProps const>(clonedProps),
       emptyRawProps);
 
diff --git a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h
index b2de61f3b1c935..2f5bfca3a95ddc 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h
@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -32,8 +33,10 @@ class UnimplementedViewComponentDescriptor final
    * In addtion to base implementation, stores a component name inside cloned
    * `Props` object.
    */
-  Props::Shared cloneProps(Props::Shared const &props, RawProps const &rawProps)
-      const override;
+  Props::Shared cloneProps(
+      PropsParserContext const &context,
+      Props::Shared const &props,
+      RawProps const &rawProps) const override;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h
index 637769f62f1a73..c2907a50abc381 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h
+++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h b/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h
index 157aebed39bca4..23999ae4d28f54 100644
--- a/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h
+++ b/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h
@@ -7,7 +7,9 @@
 
 #pragma once
 
+#include <better/optional.h>
 #include <cinttypes>
+#include <string>
 
 namespace facebook {
 namespace react {
@@ -31,6 +33,7 @@ enum class AccessibilityTraits : uint32_t {
   CausesPageTurn = (1 << 14),
   Header = (1 << 15),
   Switch = (1 << 16),
+  TabBar = (1 << 17),
 };
 
 constexpr enum AccessibilityTraits operator|(
@@ -45,6 +48,11 @@ constexpr enum AccessibilityTraits operator&(
   return (enum AccessibilityTraits)((uint32_t)lhs & (uint32_t)rhs);
 }
 
+struct AccessibilityAction {
+  std::string name{""};
+  better::optional<std::string> label{};
+};
+
 struct AccessibilityState {
   bool disabled{false};
   bool selected{false};
@@ -67,6 +75,26 @@ constexpr bool operator!=(
   return !(rhs == lhs);
 }
 
+struct AccessibilityValue {
+  better::optional<int> min;
+  better::optional<int> max;
+  better::optional<int> now;
+  better::optional<std::string> text{};
+};
+
+constexpr bool operator==(
+    AccessibilityValue const &lhs,
+    AccessibilityValue const &rhs) {
+  return lhs.min == rhs.min && lhs.max == rhs.max && lhs.now == rhs.now &&
+      lhs.text == rhs.text;
+}
+
+constexpr bool operator!=(
+    AccessibilityValue const &lhs,
+    AccessibilityValue const &rhs) {
+  return !(rhs == lhs);
+}
+
 enum class ImportantForAccessibility {
   Auto,
   Yes,
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp b/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp
index aa4c1f47795cdd..4dda5214c6dfb5 100644
--- a/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp
+++ b/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp
@@ -16,79 +16,102 @@ namespace facebook {
 namespace react {
 
 AccessibilityProps::AccessibilityProps(
+    const PropsParserContext &context,
     AccessibilityProps const &sourceProps,
     RawProps const &rawProps)
     : accessible(convertRawProp(
+          context,
           rawProps,
           "accessible",
           sourceProps.accessible,
           false)),
       accessibilityTraits(convertRawProp(
+          context,
           rawProps,
           "accessibilityRole",
           sourceProps.accessibilityTraits,
           AccessibilityTraits::None)),
       accessibilityState(convertRawProp(
+          context,
           rawProps,
           "accessibilityState",
           sourceProps.accessibilityState,
           {})),
       accessibilityLabel(convertRawProp(
+          context,
           rawProps,
           "accessibilityLabel",
           sourceProps.accessibilityLabel,
           "")),
       accessibilityHint(convertRawProp(
+          context,
           rawProps,
           "accessibilityHint",
           sourceProps.accessibilityHint,
           "")),
+      accessibilityValue(convertRawProp(
+          context,
+          rawProps,
+          "accessibilityValue",
+          sourceProps.accessibilityValue,
+          {})),
       accessibilityActions(convertRawProp(
+          context,
           rawProps,
           "accessibilityActions",
           sourceProps.accessibilityActions,
           {})),
       accessibilityViewIsModal(convertRawProp(
+          context,
           rawProps,
           "accessibilityViewIsModal",
           sourceProps.accessibilityViewIsModal,
           false)),
       accessibilityElementsHidden(convertRawProp(
+          context,
           rawProps,
           "accessibilityElementsHidden",
           sourceProps.accessibilityElementsHidden,
           false)),
       accessibilityIgnoresInvertColors(convertRawProp(
+          context,
           rawProps,
           "accessibilityIgnoresInvertColors",
           sourceProps.accessibilityIgnoresInvertColors,
           false)),
       onAccessibilityTap(convertRawProp(
+          context,
           rawProps,
           "onAccessibilityTap",
           sourceProps.onAccessibilityTap,
           {})),
       onAccessibilityMagicTap(convertRawProp(
+          context,
           rawProps,
           "onAccessibilityMagicTap",
           sourceProps.onAccessibilityMagicTap,
           {})),
       onAccessibilityEscape(convertRawProp(
+          context,
           rawProps,
           "onAccessibilityEscape",
           sourceProps.onAccessibilityEscape,
           {})),
       onAccessibilityAction(convertRawProp(
+          context,
           rawProps,
           "onAccessibilityAction",
           sourceProps.onAccessibilityAction,
           {})),
       importantForAccessibility(convertRawProp(
+          context,
           rawProps,
           "importantForAccessibility",
           sourceProps.importantForAccessibility,
           ImportantForAccessibility::Auto)),
-      testId(convertRawProp(rawProps, "testId", sourceProps.testId, "")) {}
+      testId(
+          convertRawProp(context, rawProps, "testID", sourceProps.testId, "")) {
+}
 
 #pragma mark - DebugStringConvertible
 
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityProps.h b/ReactCommon/react/renderer/components/view/AccessibilityProps.h
index 4235e7cdd6c4f8..eab78469660526 100644
--- a/ReactCommon/react/renderer/components/view/AccessibilityProps.h
+++ b/ReactCommon/react/renderer/components/view/AccessibilityProps.h
@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/view/AccessibilityPrimitives.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
 
@@ -19,6 +20,7 @@ class AccessibilityProps {
  public:
   AccessibilityProps() = default;
   AccessibilityProps(
+      const PropsParserContext &context,
       AccessibilityProps const &sourceProps,
       RawProps const &rawProps);
 
@@ -29,7 +31,8 @@ class AccessibilityProps {
   AccessibilityState accessibilityState;
   std::string accessibilityLabel{""};
   std::string accessibilityHint{""};
-  std::vector<std::string> accessibilityActions{};
+  AccessibilityValue accessibilityValue;
+  std::vector<AccessibilityAction> accessibilityActions{};
   bool accessibilityViewIsModal{false};
   bool accessibilityElementsHidden{false};
   bool accessibilityIgnoresInvertColors{false};
diff --git a/ReactCommon/react/renderer/components/view/Android.mk b/ReactCommon/react/renderer/components/view/Android.mk
index 8bc37572acb642..1e05d18f6b0250 100644
--- a/ReactCommon/react/renderer/components/view/Android.mk
+++ b/ReactCommon/react/renderer/components/view/Android.mk
@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_view
+LOCAL_MODULE := rrc_view
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics
+LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug logger libjsi
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -31,4 +31,6 @@ $(call import-module,fbgloginit)
 $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
+$(call import-module,logger)
 $(call import-module,yogajni)
+$(call import-module,react/debug)
diff --git a/ReactCommon/react/renderer/components/view/BUCK b/ReactCommon/react/renderer/components/view/BUCK
index b729ca907cea0f..c3640ab3b40692 100644
--- a/ReactCommon/react/renderer/components/view/BUCK
+++ b/ReactCommon/react/renderer/components/view/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -38,7 +38,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -60,9 +60,11 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
+        react_native_xplat_target("logger:logger"),
     ],
 )
 
@@ -73,7 +75,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/components/view/Touch.h b/ReactCommon/react/renderer/components/view/Touch.h
index 91b6db7522b552..5a150b955e321d 100644
--- a/ReactCommon/react/renderer/components/view/Touch.h
+++ b/ReactCommon/react/renderer/components/view/Touch.h
@@ -52,7 +52,38 @@ struct Touch {
   Float force;
 
   /*
-   * The time in seconds when the touch occurred or when it was last mutated.
+   * The time in seconds (with fractional milliseconds) when the touch occurred
+   * or when it was last mutated.
+   *
+   * Whenever possible this should be computed as:
+   * 1. Pick MONO_CLOCK_NOW, a monotonic system clock. Generally, something like
+   * `systemUptimeMillis`.
+   * 2. BASIS_TIME = unix timestamp from unix epoch (ms) - MONO_CLOCK_NOW
+   * 3. Then assign timestamp = BASIS_TIME + MONO_CLOCK_NOW
+   *
+   * The effect should be UNIX timestamp from UNIX epoch, but as a monotonic
+   * clock (if you just assign to current system time, it can move backwards due
+   * to clock adjustements, leap seconds, etc etc). So the vast majority of the
+   * time it will look identical to current UNIX time, but there are some
+   * edge-cases where it can drift.
+   *
+   * If you are not able to use the scheme above for some reason, prefer to use
+   * a monotonic clock. This timestamp MUST be monotonic. Do NOT just pass along
+   * system time.
+   *
+   * The goal is to allow touch latency to be computed in JS. JS does not have
+   * access to something like `systemUptimeMillis`, it generally can only access
+   * the current system time. This *does* mean that the touch latency could be
+   * computed incorrectly in cases of clock drift, so you should only use this
+   * as telemetry to get a decent, but not totally perfect, idea of performance.
+   * Do not use this latency information for anything "mission critical". You
+   * can assume it's probably reasonably accurate 99% of the time.
+   *
+   * Note that we attempt to adhere to the spec of timestamp here:
+   * https://dom.spec.whatwg.org/#dom-event-timestamp
+   * Notably, since `global` is not a Window object in React Native, we have
+   * some flexibility in how we define the time origin:
+   * https://w3c.github.io/hr-time/#dfn-time-origin
    */
   Float timestamp;
 
diff --git a/ReactCommon/react/renderer/components/view/TouchEvent.h b/ReactCommon/react/renderer/components/view/TouchEvent.h
index 4725fa4eec4d32..02f7ab4e636191 100644
--- a/ReactCommon/react/renderer/components/view/TouchEvent.h
+++ b/ReactCommon/react/renderer/components/view/TouchEvent.h
@@ -16,8 +16,6 @@
 namespace facebook {
 namespace react {
 
-using Touches = std::unordered_set<Touch, Touch::Hasher, Touch::Comparator>;
-
 /*
  * Defines the `touchstart`, `touchend`, `touchmove`, and `touchcancel` event
  * types.
diff --git a/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp b/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
index 738dec8d6467c7..1d8ed3e330409f 100644
--- a/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
@@ -12,8 +12,10 @@ namespace react {
 
 #pragma mark - Touches
 
-static jsi::Value touchPayload(jsi::Runtime &runtime, Touch const &touch) {
-  auto object = jsi::Object(runtime);
+static void setTouchPayloadOnObject(
+    jsi::Object &object,
+    jsi::Runtime &runtime,
+    Touch const &touch) {
   object.setProperty(runtime, "locationX", touch.offsetPoint.x);
   object.setProperty(runtime, "locationY", touch.offsetPoint.y);
   object.setProperty(runtime, "pageX", touch.pagePoint.x);
@@ -24,7 +26,6 @@ static jsi::Value touchPayload(jsi::Runtime &runtime, Touch const &touch) {
   object.setProperty(runtime, "target", touch.target);
   object.setProperty(runtime, "timestamp", touch.timestamp * 1000);
   object.setProperty(runtime, "force", touch.force);
-  return object;
 }
 
 static jsi::Value touchesPayload(
@@ -33,7 +34,9 @@ static jsi::Value touchesPayload(
   auto array = jsi::Array(runtime, touches.size());
   int i = 0;
   for (auto const &touch : touches) {
-    array.setValueAtIndex(runtime, i++, touchPayload(runtime, touch));
+    auto object = jsi::Object(runtime);
+    setTouchPayloadOnObject(object, runtime, touch);
+    array.setValueAtIndex(runtime, i++, object);
   }
   return array;
 }
@@ -48,23 +51,34 @@ static jsi::Value touchEventPayload(
       runtime, "changedTouches", touchesPayload(runtime, event.changedTouches));
   object.setProperty(
       runtime, "targetTouches", touchesPayload(runtime, event.targetTouches));
+
+  if (!event.changedTouches.empty()) {
+    auto const &firstChangedTouch = *event.changedTouches.begin();
+    setTouchPayloadOnObject(object, runtime, firstChangedTouch);
+  }
   return object;
 }
 
 void TouchEventEmitter::dispatchTouchEvent(
     std::string const &type,
     TouchEvent const &event,
-    EventPriority const &priority) const {
+    EventPriority priority,
+    RawEvent::Category category) const {
   dispatchEvent(
       type,
       [event](jsi::Runtime &runtime) {
         return touchEventPayload(runtime, event);
       },
-      priority);
+      priority,
+      category);
 }
 
 void TouchEventEmitter::onTouchStart(TouchEvent const &event) const {
-  dispatchTouchEvent("touchStart", event, EventPriority::AsynchronousBatched);
+  dispatchTouchEvent(
+      "touchStart",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousStart);
 }
 
 void TouchEventEmitter::onTouchMove(TouchEvent const &event) const {
@@ -74,11 +88,19 @@ void TouchEventEmitter::onTouchMove(TouchEvent const &event) const {
 }
 
 void TouchEventEmitter::onTouchEnd(TouchEvent const &event) const {
-  dispatchTouchEvent("touchEnd", event, EventPriority::AsynchronousBatched);
+  dispatchTouchEvent(
+      "touchEnd",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousEnd);
 }
 
 void TouchEventEmitter::onTouchCancel(TouchEvent const &event) const {
-  dispatchTouchEvent("touchCancel", event, EventPriority::AsynchronousBatched);
+  dispatchTouchEvent(
+      "touchCancel",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousEnd);
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/view/TouchEventEmitter.h b/ReactCommon/react/renderer/components/view/TouchEventEmitter.h
index 54a29049039994..c225fbb9d6394b 100644
--- a/ReactCommon/react/renderer/components/view/TouchEventEmitter.h
+++ b/ReactCommon/react/renderer/components/view/TouchEventEmitter.h
@@ -33,7 +33,8 @@ class TouchEventEmitter : public EventEmitter {
   void dispatchTouchEvent(
       std::string const &type,
       TouchEvent const &event,
-      EventPriority const &priority) const;
+      EventPriority priority,
+      RawEvent::Category category) const;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h b/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h
index fd078e656c89b1..e9609b75f5febe 100644
--- a/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h
@@ -22,10 +22,19 @@ class ViewComponentDescriptor
       : ConcreteComponentDescriptor<ViewShadowNode>(parameters) {}
 
   virtual SharedProps interpolateProps(
+      const PropsParserContext &context,
       float animationProgress,
       const SharedProps &props,
       const SharedProps &newProps) const override {
-    SharedProps interpolatedPropsShared = cloneProps(newProps, {});
+#ifdef ANDROID
+    // On Android only, the merged props should have the same RawProps as the
+    // final props struct
+    SharedProps interpolatedPropsShared =
+        (newProps != nullptr ? cloneProps(context, newProps, newProps->rawProps)
+                             : cloneProps(context, newProps, {}));
+#else
+    SharedProps interpolatedPropsShared = cloneProps(context, newProps, {});
+#endif
 
     interpolateViewProps(
         animationProgress, props, newProps, interpolatedPropsShared);
diff --git a/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp b/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
index a81f85af595cac..f978934cc239ba 100644
--- a/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
@@ -15,7 +15,7 @@ namespace react {
 void ViewEventEmitter::onAccessibilityAction(const std::string &name) const {
   dispatchEvent("accessibilityAction", [name](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "action", name);
+    payload.setProperty(runtime, "actionName", name);
     return payload;
   });
 }
@@ -35,31 +35,72 @@ void ViewEventEmitter::onAccessibilityEscape() const {
 #pragma mark - Layout
 
 void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
-  // Due to State Reconciliation, `onLayout` can be called potentially many
-  // times with identical layoutMetrics. Ensure that the JS event is only
-  // dispatched when the value changes.
+  // A copy of a shared pointer (`layoutEventState_`) establishes shared
+  // ownership that will be captured by lambda.
+  auto layoutEventState = layoutEventState_;
+
+  // Dispatched `frame` values to JavaScript thread are throttled here.
+  // Basic ideas:
+  //  - Scheduling a lambda with some value that already was dispatched, does
+  //    nothing.
+  //  - If some lambda is already in flight, we don't schedule another;
+  //  - When a lambda is being executed on the JavaScript thread, the *most
+  //    recent* `frame` value is used (not the value that was current at the
+  //    moment of scheduling the lambda).
+  //
+  // This implies the following caveats:
+  //  - Some events can be skipped;
+  //  - When values change rapidly, even events with different values
+  //    can be skipped (only the very last will be delivered).
+  //  - Ordering is preserved.
+
   {
-    std::lock_guard<std::mutex> guard(layoutMetricsMutex_);
-    if (lastLayoutMetrics_ == layoutMetrics) {
+    std::lock_guard<std::mutex> guard(layoutEventState->mutex);
+
+    // If a *particular* `frame` was already dispatched to the JavaScript side,
+    // no other work is required.
+    if (layoutEventState->frame == layoutMetrics.frame &&
+        layoutEventState->wasDispatched) {
+      return;
+    }
+
+    // If the *particular* `frame` was not already dispatched *or*
+    // some *other* `frame` was dispatched before,
+    // we need to schedule the dispatching.
+    layoutEventState->wasDispatched = false;
+    layoutEventState->frame = layoutMetrics.frame;
+
+    // Something is already in flight, dispatching another event is not
+    // required.
+    if (layoutEventState->isDispatching) {
       return;
     }
-    lastLayoutMetrics_ = layoutMetrics;
-  }
 
-  auto expectedEventCount = ++*eventCounter_;
+    layoutEventState->isDispatching = true;
+  }
 
-  // dispatchUniqueEvent only drops consecutive onLayout events to the same
-  // node. We want to drop *any* unprocessed onLayout events when there's a
-  // newer one.
   dispatchEvent(
       "layout",
-      [frame = layoutMetrics.frame,
-       expectedEventCount,
-       eventCounter = eventCounter_](jsi::Runtime &runtime) {
-        auto actualEventCount = eventCounter->load();
-        if (expectedEventCount != actualEventCount) {
-          // Drop stale events
-          return jsi::Value::null();
+      [layoutEventState](jsi::Runtime &runtime) {
+        auto frame = Rect{};
+
+        {
+          std::lock_guard<std::mutex> guard(layoutEventState->mutex);
+
+          layoutEventState->isDispatching = false;
+
+          // If some *particular* `frame` was already dispatched before,
+          // and since then there were no other new values of the `frame`
+          // observed, do nothing.
+          if (layoutEventState->wasDispatched) {
+            return jsi::Value::null();
+          }
+
+          frame = layoutEventState->frame;
+
+          // If some *particular* `frame` was *not* already dispatched before,
+          // it's time to dispatch it and mark as dispatched.
+          layoutEventState->wasDispatched = true;
         }
 
         auto layout = jsi::Object(runtime);
@@ -70,7 +111,8 @@ void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
         auto payload = jsi::Object(runtime);
         payload.setProperty(runtime, "layout", std::move(layout));
         return jsi::Value(std::move(payload));
-      });
+      },
+      EventPriority::AsynchronousUnbatched);
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/view/ViewEventEmitter.h b/ReactCommon/react/renderer/components/view/ViewEventEmitter.h
index c00802431a18c9..1a4e17e84e5151 100644
--- a/ReactCommon/react/renderer/components/view/ViewEventEmitter.h
+++ b/ReactCommon/react/renderer/components/view/ViewEventEmitter.h
@@ -38,11 +38,35 @@ class ViewEventEmitter : public TouchEventEmitter {
   void onLayout(const LayoutMetrics &layoutMetrics) const;
 
  private:
-  mutable std::mutex layoutMetricsMutex_;
-  mutable LayoutMetrics lastLayoutMetrics_;
+  /*
+   * Contains the most recent `frame` and a `mutex` protecting access to it.
+   */
+  struct LayoutEventState {
+    /*
+     * Protects an access to other fields of the struct.
+     */
+    std::mutex mutex;
 
-  mutable std::shared_ptr<std::atomic_uint_fast8_t> eventCounter_{
-      std::make_shared<std::atomic_uint_fast8_t>(0)};
+    /*
+     * Last dispatched `frame` value or value that's being dispatched right now.
+     */
+    Rect frame{};
+
+    /*
+     * Indicates that the `frame` value was already dispatched (and dispatching
+     * of the *same* value is not needed).
+     */
+    bool wasDispatched{false};
+
+    /*
+     * Indicates that some lambda is already being dispatching (and dispatching
+     * another one is not needed).
+     */
+    bool isDispatching{false};
+  };
+
+  mutable std::shared_ptr<LayoutEventState> layoutEventState_{
+      std::make_shared<LayoutEventState>()};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/view/ViewProps.cpp b/ReactCommon/react/renderer/components/view/ViewProps.cpp
index a7c4a4b0b72381..0e1a9976793907 100644
--- a/ReactCommon/react/renderer/components/view/ViewProps.cpp
+++ b/ReactCommon/react/renderer/components/view/ViewProps.cpp
@@ -18,83 +18,131 @@
 namespace facebook {
 namespace react {
 
-ViewProps::ViewProps(ViewProps const &sourceProps, RawProps const &rawProps)
-    : YogaStylableProps(sourceProps, rawProps),
-      AccessibilityProps(sourceProps, rawProps),
-      opacity(
-          convertRawProp(rawProps, "opacity", sourceProps.opacity, (Float)1.0)),
+ViewProps::ViewProps(
+    const PropsParserContext &context,
+    ViewProps const &sourceProps,
+    RawProps const &rawProps)
+    : YogaStylableProps(context, sourceProps, rawProps),
+      AccessibilityProps(context, sourceProps, rawProps),
+      opacity(convertRawProp(
+          context,
+          rawProps,
+          "opacity",
+          sourceProps.opacity,
+          (Float)1.0)),
       foregroundColor(convertRawProp(
+          context,
           rawProps,
           "foregroundColor",
           sourceProps.foregroundColor,
           {})),
       backgroundColor(convertRawProp(
+          context,
           rawProps,
           "backgroundColor",
           sourceProps.backgroundColor,
           {})),
       borderRadii(convertRawProp(
+          context,
           rawProps,
           "border",
           "Radius",
           sourceProps.borderRadii,
           {})),
       borderColors(convertRawProp(
+          context,
           rawProps,
           "border",
           "Color",
           sourceProps.borderColors,
           {})),
       borderStyles(convertRawProp(
+          context,
           rawProps,
           "border",
           "Style",
           sourceProps.borderStyles,
           {})),
-      shadowColor(
-          convertRawProp(rawProps, "shadowColor", sourceProps.shadowColor, {})),
+      shadowColor(convertRawProp(
+          context,
+          rawProps,
+          "shadowColor",
+          sourceProps.shadowColor,
+          {})),
       shadowOffset(convertRawProp(
+          context,
           rawProps,
           "shadowOffset",
           sourceProps.shadowOffset,
           {})),
       shadowOpacity(convertRawProp(
+          context,
           rawProps,
           "shadowOpacity",
           sourceProps.shadowOpacity,
           {})),
       shadowRadius(convertRawProp(
+          context,
           rawProps,
           "shadowRadius",
           sourceProps.shadowRadius,
           {})),
-      transform(
-          convertRawProp(rawProps, "transform", sourceProps.transform, {})),
+      transform(convertRawProp(
+          context,
+          rawProps,
+          "transform",
+          sourceProps.transform,
+          {})),
       backfaceVisibility(convertRawProp(
+          context,
           rawProps,
           "backfaceVisibility",
           sourceProps.backfaceVisibility,
           {})),
       shouldRasterize(convertRawProp(
+          context,
           rawProps,
           "shouldRasterize",
           sourceProps.shouldRasterize,
           {})),
-      zIndex(convertRawProp(rawProps, "zIndex", sourceProps.zIndex, {})),
+      zIndex(
+          convertRawProp(context, rawProps, "zIndex", sourceProps.zIndex, {})),
       pointerEvents(convertRawProp(
+          context,
           rawProps,
           "pointerEvents",
           sourceProps.pointerEvents,
           {})),
-      hitSlop(convertRawProp(rawProps, "hitSlop", sourceProps.hitSlop, {})),
-      onLayout(convertRawProp(rawProps, "onLayout", sourceProps.onLayout, {})),
+      hitSlop(convertRawProp(
+          context,
+          rawProps,
+          "hitSlop",
+          sourceProps.hitSlop,
+          {})),
+      onLayout(convertRawProp(
+          context,
+          rawProps,
+          "onLayout",
+          sourceProps.onLayout,
+          {})),
       collapsable(convertRawProp(
+          context,
           rawProps,
           "collapsable",
           sourceProps.collapsable,
           true)),
-      elevation(
-          convertRawProp(rawProps, "elevation", sourceProps.elevation, {})){};
+      removeClippedSubviews(convertRawProp(
+          context,
+          rawProps,
+          "removeClippedSubviews",
+          sourceProps.removeClippedSubviews,
+          false)),
+      elevation(convertRawProp(
+          context,
+          rawProps,
+          "elevation",
+          sourceProps.elevation,
+          {})){};
 
 #pragma mark - Convenience Methods
 
diff --git a/ReactCommon/react/renderer/components/view/ViewProps.h b/ReactCommon/react/renderer/components/view/ViewProps.h
index 997353b23b7723..b66249a6915c2c 100644
--- a/ReactCommon/react/renderer/components/view/ViewProps.h
+++ b/ReactCommon/react/renderer/components/view/ViewProps.h
@@ -12,6 +12,7 @@
 #include <react/renderer/components/view/primitives.h>
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 #include <react/renderer/graphics/Transform.h>
@@ -26,7 +27,10 @@ using SharedViewProps = std::shared_ptr<ViewProps const>;
 class ViewProps : public YogaStylableProps, public AccessibilityProps {
  public:
   ViewProps() = default;
-  ViewProps(ViewProps const &sourceProps, RawProps const &rawProps);
+  ViewProps(
+      const PropsParserContext &context,
+      ViewProps const &sourceProps,
+      RawProps const &rawProps);
 
 #pragma mark - Props
 
@@ -59,6 +63,8 @@ class ViewProps : public YogaStylableProps, public AccessibilityProps {
 
   bool collapsable{true};
 
+  bool removeClippedSubviews{false};
+
   Float elevation{}; /* Android-only */
 
 #pragma mark - Convenience Methods
diff --git a/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h b/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h
index 0470d696d514cc..c2352460b2f291 100644
--- a/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h
+++ b/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h
@@ -9,6 +9,8 @@
 
 #include "ViewProps.h"
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
@@ -23,15 +25,11 @@ static inline void interpolateViewProps(
     const SharedProps &newPropsShared,
     SharedProps &interpolatedPropsShared) {
   ViewProps const *oldViewProps =
-      dynamic_cast<ViewProps const *>(oldPropsShared.get());
+      static_cast<ViewProps const *>(oldPropsShared.get());
   ViewProps const *newViewProps =
-      dynamic_cast<ViewProps const *>(newPropsShared.get());
+      static_cast<ViewProps const *>(newPropsShared.get());
   ViewProps *interpolatedProps = const_cast<ViewProps *>(
-      dynamic_cast<ViewProps const *>(interpolatedPropsShared.get()));
-
-  assert(
-      oldViewProps != nullptr && newViewProps != nullptr &&
-      interpolatedProps != nullptr);
+      static_cast<ViewProps const *>(interpolatedPropsShared.get()));
 
   interpolatedProps->opacity = oldViewProps->opacity +
       (newViewProps->opacity - oldViewProps->opacity) * animationProgress;
diff --git a/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp
index 124babc4c195a5..f6d10f8699dc80 100644
--- a/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp
@@ -28,14 +28,6 @@ ViewShadowNode::ViewShadowNode(
   initialize();
 }
 
-static bool isColorMeaningful(SharedColor const &color) noexcept {
-  if (!color) {
-    return false;
-  }
-
-  return colorComponentsFromColor(color).alpha > 0;
-}
-
 void ViewShadowNode::initialize() noexcept {
   auto &viewProps = static_cast<ViewProps const &>(*props_);
 
@@ -50,21 +42,16 @@ void ViewShadowNode::initialize() noexcept {
       viewProps.getClipsContentToBounds() ||
       isColorMeaningful(viewProps.shadowColor) ||
       viewProps.accessibilityElementsHidden ||
-      viewProps.importantForAccessibility != ImportantForAccessibility::Auto;
+      viewProps.importantForAccessibility != ImportantForAccessibility::Auto ||
+      viewProps.removeClippedSubviews;
 
   bool formsView = isColorMeaningful(viewProps.backgroundColor) ||
       isColorMeaningful(viewProps.foregroundColor) ||
-      !(viewProps.yogaStyle.border() == YGStyle::Edges{});
+      !(viewProps.yogaStyle.border() == YGStyle::Edges{}) ||
+      !viewProps.testId.empty();
 
   formsView = formsView || formsStackingContext;
 
-#ifdef ANDROID
-  // Force `formsStackingContext` trait for nodes which have `formsView`.
-  // TODO: T63560216 Investigate why/how `formsView` entangled with
-  // `formsStackingContext`.
-  formsStackingContext = formsStackingContext || formsView;
-#endif
-
   if (formsView) {
     traits_.set(ShadowNodeTraits::Trait::FormsView);
   } else {
diff --git a/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp b/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp
index 60f867e1ee00f0..0c5ccdf083c796 100644
--- a/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp
@@ -6,6 +6,9 @@
  */
 
 #include "YogaLayoutableShadowNode.h"
+#include <logger/react_native_log.h>
+#include <react/debug/flags.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -20,25 +23,43 @@
 namespace facebook {
 namespace react {
 
-thread_local LayoutContext threadLocalLayoutContext;
-
-static void applyLayoutConstraints(
-    YGStyle &yogaStyle,
-    LayoutConstraints const &layoutConstraints) {
-  yogaStyle.minDimensions()[YGDimensionWidth] =
-      yogaStyleValueFromFloat(layoutConstraints.minimumSize.width);
-  yogaStyle.minDimensions()[YGDimensionHeight] =
-      yogaStyleValueFromFloat(layoutConstraints.minimumSize.height);
-
-  yogaStyle.maxDimensions()[YGDimensionWidth] =
-      yogaStyleValueFromFloat(layoutConstraints.maximumSize.width);
-  yogaStyle.maxDimensions()[YGDimensionHeight] =
-      yogaStyleValueFromFloat(layoutConstraints.maximumSize.height);
+static int FabricDefaultYogaLog(
+    const YGConfigRef,
+    const YGNodeRef,
+    YGLogLevel level,
+    const char *format,
+    va_list args) {
+  va_list args_copy;
+  va_copy(args_copy, args);
+
+  // Adding 1 to add space for terminating null character.
+  int size_s = vsnprintf(NULL, 0, format, args);
+  auto size = static_cast<size_t>(size_s);
+  std::vector<char> buffer(size);
+
+  vsnprintf(buffer.data(), size, format, args_copy);
+  switch (level) {
+    case YGLogLevelError:
+      react_native_log_error(buffer.data());
+      break;
+    case YGLogLevelFatal:
+      react_native_log_fatal(buffer.data());
+      break;
+    case YGLogLevelWarn:
+      react_native_log_warn(buffer.data());
+      break;
+    case YGLogLevelInfo:
+    case YGLogLevelDebug:
+    case YGLogLevelVerbose:
+    default:
+      react_native_log_info(buffer.data());
+  }
 
-  yogaStyle.direction() =
-      yogaDirectionFromLayoutDirection(layoutConstraints.layoutDirection);
+  return size_s;
 }
 
+thread_local LayoutContext threadLocalLayoutContext;
+
 ShadowNodeTraits YogaLayoutableShadowNode::BaseTraits() {
   auto traits = LayoutableShadowNode::BaseTraits();
   traits.set(ShadowNodeTraits::Trait::YogaLayoutableKind);
@@ -50,7 +71,7 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(
     ShadowNodeFamily::Shared const &family,
     ShadowNodeTraits traits)
     : LayoutableShadowNode(fragment, family, traits),
-      yogaConfig_(nullptr),
+      yogaConfig_(FabricDefaultYogaLog),
       yogaNode_(&initializeYogaConfig(yogaConfig_)) {
   yogaNode_.setContext(this);
 
@@ -58,6 +79,14 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(
   // This is not a default for `YGNode`.
   yogaNode_.setDirty(true);
 
+  if (getTraits().check(ShadowNodeTraits::Trait::MeasurableYogaNode)) {
+    react_native_assert(
+        getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode));
+
+    yogaNode_.setMeasureFunc(
+        YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector);
+  }
+
   updateYogaProps();
   updateYogaChildren();
 
@@ -68,19 +97,31 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(
     ShadowNode const &sourceShadowNode,
     ShadowNodeFragment const &fragment)
     : LayoutableShadowNode(sourceShadowNode, fragment),
-      yogaConfig_(nullptr),
+      yogaConfig_(FabricDefaultYogaLog),
       yogaNode_(
           static_cast<YogaLayoutableShadowNode const &>(sourceShadowNode)
               .yogaNode_,
           &initializeYogaConfig(yogaConfig_)) {
+  // Note, cloned `YGNode` instance (copied using copy-constructor) inherits
+  // dirty flag, measure function, and other properties being set originally in
+  // the `YogaLayoutableShadowNode` constructor above.
+
+  react_native_assert(
+      static_cast<YogaLayoutableShadowNode const &>(sourceShadowNode)
+              .yogaNode_.isDirty() == yogaNode_.isDirty() &&
+      "Yoga node must inherit dirty flag.");
+
   yogaNode_.setContext(this);
   yogaNode_.setOwner(nullptr);
   updateYogaChildrenOwnersIfNeeded();
 
-  // Yoga node must inherit dirty flag.
-  assert(
-      static_cast<YogaLayoutableShadowNode const &>(sourceShadowNode)
-          .yogaNode_.isDirty() == yogaNode_.isDirty());
+  // This is the only legit place where we can dirty cloned Yoga node.
+  // If we do it later, ancestor nodes will not be able to observe this and
+  // dirty (and clone) themselves as a result.
+  if (getTraits().check(ShadowNodeTraits::Trait::DirtyYogaNode) ||
+      getTraits().check(ShadowNodeTraits::Trait::MeasurableYogaNode)) {
+    yogaNode_.setDirty(true);
+  }
 
   if (fragment.props) {
     updateYogaProps();
@@ -116,14 +157,16 @@ void YogaLayoutableShadowNode::enableMeasurement() {
 
 void YogaLayoutableShadowNode::appendYogaChild(ShadowNode const &childNode) {
   // The caller must check this before calling this method.
-  assert(!getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode));
+  react_native_assert(
+      !getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode));
 
   ensureYogaChildrenLookFine();
 
   auto &layoutableChildNode =
       traitCast<YogaLayoutableShadowNode const &>(childNode);
   yogaNode_.insertChild(
-      &layoutableChildNode.yogaNode_, yogaNode_.getChildren().size());
+      &layoutableChildNode.yogaNode_,
+      static_cast<uint32_t>(yogaNode_.getChildren().size()));
 
   ensureYogaChildrenLookFine();
 }
@@ -133,13 +176,14 @@ void YogaLayoutableShadowNode::adoptYogaChild(size_t index) {
   ensureYogaChildrenLookFine();
 
   // The caller must check this before calling this method.
-  assert(!getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode));
+  react_native_assert(
+      !getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode));
 
   auto &children = getChildren();
 
   // Overflow checks.
-  assert(children.size() > index);
-  assert(children.size() >= yogaNode_.getChildren().size());
+  react_native_assert(children.size() > index);
+  react_native_assert(children.size() >= yogaNode_.getChildren().size());
 
   auto &childNode = *children.at(index);
 
@@ -149,13 +193,14 @@ void YogaLayoutableShadowNode::adoptYogaChild(size_t index) {
   // Note, the following (commented out) assert is conceptually valid but still
   // might produce false-positive signals because of the ABA problem (different
   // objects with non-interleaving life-times being allocated on the same
-  // address). assert(layoutableChildNode.yogaNode_.getOwner() != &yogaNode_);
+  // address). react_native_assert(layoutableChildNode.yogaNode_.getOwner() !=
+  // &yogaNode_);
 
   if (layoutableChildNode.yogaNode_.getOwner() == nullptr) {
     // The child node is not owned.
     layoutableChildNode.yogaNode_.setOwner(&yogaNode_);
     // At this point the child yoga node must be already inserted by the caller.
-    // assert(layoutableChildNode.yogaNode_.isDirty());
+    // react_native_assert(layoutableChildNode.yogaNode_.isDirty());
   } else {
     // The child is owned by some other node, we need to clone that.
     auto clonedChildNode = childNode.clone({});
@@ -163,16 +208,18 @@ void YogaLayoutableShadowNode::adoptYogaChild(size_t index) {
         traitCast<YogaLayoutableShadowNode const &>(*clonedChildNode);
 
     // The owner must be nullptr for a newly cloned node.
-    assert(layoutableClonedChildNode.yogaNode_.getOwner() == nullptr);
+    react_native_assert(
+        layoutableClonedChildNode.yogaNode_.getOwner() == nullptr);
 
     // Establishing ownership.
     layoutableClonedChildNode.yogaNode_.setOwner(&yogaNode_);
 
     // Replace the child node with a newly cloned one in the children list.
-    replaceChild(childNode, clonedChildNode, index);
+    replaceChild(childNode, clonedChildNode, static_cast<int>(index));
 
     // Replace the Yoga node inside the Yoga node children list.
-    yogaNode_.replaceChild(&layoutableClonedChildNode.yogaNode_, index);
+    yogaNode_.replaceChild(
+        &layoutableClonedChildNode.yogaNode_, static_cast<int>(index));
   }
 
   ensureYogaChildrenLookFine();
@@ -198,19 +245,26 @@ void YogaLayoutableShadowNode::appendChild(
   yogaNode_.setDirty(true);
 
   // All children of a non-leaf `YogaLayoutableShadowNode` must be a
-  // `YogaLayoutableShadowNode`s.
-  assert(traitCast<YogaLayoutableShadowNode const *>(childNode.get()));
-
-  // Appending the Yoga node.
-  appendYogaChild(*childNode);
-
-  ensureYogaChildrenLookFine();
-  ensureYogaChildrenAlighment();
-
-  // Adopting the Yoga node.
-  adoptYogaChild(getChildren().size() - 1);
-
-  ensureConsistency();
+  // `YogaLayoutableShadowNode`s to be appended. This happens when invalid
+  // string/numeric child is passed which is not YogaLayoutableShadowNode
+  // (e.g. RCTRawText). This used to throw an error, but we are ignoring it
+  // because we want core library components to be fault-tolerant and degrade
+  // gracefully. A soft error will be emitted from JavaScript.
+  if (traitCast<YogaLayoutableShadowNode const *>(childNode.get())) {
+    // Appending the Yoga node.
+    appendYogaChild(*childNode);
+
+    ensureYogaChildrenLookFine();
+    ensureYogaChildrenAlighment();
+
+    // Adopting the Yoga node.
+    adoptYogaChild(getChildren().size() - 1);
+
+    ensureConsistency();
+  } else {
+    react_native_log_error(
+        "Text strings must be rendered within a <Text> component.");
+  }
 }
 
 bool YogaLayoutableShadowNode::doesOwn(
@@ -254,7 +308,7 @@ void YogaLayoutableShadowNode::updateYogaChildren() {
     }
   }
 
-  assert(getChildren().size() == yogaNode_.getChildren().size());
+  react_native_assert(getChildren().size() == yogaNode_.getChildren().size());
 
   yogaNode_.setDirty(!isClean);
 }
@@ -331,7 +385,59 @@ void YogaLayoutableShadowNode::layoutTree(
    */
   yogaConfig_.pointScaleFactor = layoutContext.pointScaleFactor;
 
-  applyLayoutConstraints(yogaNode_.getStyle(), layoutConstraints);
+  auto minimumSize = layoutConstraints.minimumSize;
+  auto maximumSize = layoutConstraints.maximumSize;
+
+  // The caller must ensure that layout constraints make sense.
+  // Values cannot be NaN.
+  react_native_assert(!std::isnan(minimumSize.width));
+  react_native_assert(!std::isnan(minimumSize.height));
+  react_native_assert(!std::isnan(maximumSize.width));
+  react_native_assert(!std::isnan(maximumSize.height));
+  // Values cannot be negative.
+  react_native_assert(minimumSize.width >= 0);
+  react_native_assert(minimumSize.height >= 0);
+  react_native_assert(maximumSize.width >= 0);
+  react_native_assert(maximumSize.height >= 0);
+  // Mimimum size cannot be infinity.
+  react_native_assert(!std::isinf(minimumSize.width));
+  react_native_assert(!std::isinf(minimumSize.height));
+
+  // Internally Yoga uses three different measurement modes controlling layout
+  // constraints: `Undefined`, `Exactly`, and `AtMost`. These modes are an
+  // implementation detail and are not defined in `CSS Flexible Box Layout
+  // Module`. Yoga C++ API (and `YGNodeCalculateLayout` function particularly)
+  // does not allow to specify the measure modes explicitly. Instead, it infers
+  // these from styles associated with the root node.
+  // To pass the actual layout constraints to Yoga we represent them as
+  // `(min/max)(Height/Width)` style properties. Also, we pass `ownerWidth` &
+  // `ownerHeight` to allow proper calculation of relative (e.g. specified in
+  // percents) style values.
+
+  auto &yogaStyle = yogaNode_.getStyle();
+
+  auto ownerWidth = yogaFloatFromFloat(maximumSize.width);
+  auto ownerHeight = yogaFloatFromFloat(maximumSize.height);
+
+  yogaStyle.maxDimensions()[YGDimensionWidth] = std::isfinite(maximumSize.width)
+      ? yogaStyleValueFromFloat(maximumSize.width)
+      : YGValueUndefined;
+
+  yogaStyle.maxDimensions()[YGDimensionHeight] =
+      std::isfinite(maximumSize.height)
+      ? yogaStyleValueFromFloat(maximumSize.height)
+      : YGValueUndefined;
+
+  yogaStyle.minDimensions()[YGDimensionWidth] = minimumSize.width > 0
+      ? yogaStyleValueFromFloat(minimumSize.width)
+      : YGValueUndefined;
+
+  yogaStyle.minDimensions()[YGDimensionHeight] = minimumSize.height > 0
+      ? yogaStyleValueFromFloat(minimumSize.height)
+      : YGValueUndefined;
+
+  auto direction =
+      yogaDirectionFromLayoutDirection(layoutConstraints.layoutDirection);
 
   threadLocalLayoutContext = layoutContext;
 
@@ -341,9 +447,7 @@ void YogaLayoutableShadowNode::layoutTree(
 
   {
     SystraceSection s("YogaLayoutableShadowNode::YGNodeCalculateLayout");
-
-    YGNodeCalculateLayout(
-        &yogaNode_, YGUndefined, YGUndefined, YGDirectionInherit);
+    YGNodeCalculateLayout(&yogaNode_, ownerWidth, ownerHeight, direction);
   }
 
   if (yogaNode_.getHasNewLayout()) {
@@ -372,7 +476,7 @@ static EdgeInsets calculateOverflowInset(
 
 void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) {
   // Reading data from a dirtied node does not make sense.
-  assert(!yogaNode_.isDirty());
+  react_native_assert(!yogaNode_.isDirty());
 
   auto contentFrame = Rect{};
 
@@ -381,17 +485,17 @@ void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) {
         *static_cast<YogaLayoutableShadowNode *>(childYogaNode->getContext());
 
     // Verifying that the Yoga node belongs to the ShadowNode.
-    assert(&childNode.yogaNode_ == childYogaNode);
+    react_native_assert(&childNode.yogaNode_ == childYogaNode);
 
     if (childYogaNode->getHasNewLayout()) {
       childYogaNode->setHasNewLayout(false);
 
       // Reading data from a dirtied node does not make sense.
-      assert(!childYogaNode->isDirty());
+      react_native_assert(!childYogaNode->isDirty());
 
       // We must copy layout metrics from Yoga node only once (when the parent
       // node exclusively ownes the child node).
-      assert(childYogaNode->getOwner() == &yogaNode_);
+      react_native_assert(childYogaNode->getOwner() == &yogaNode_);
 
       // We are about to mutate layout metrics of the node.
       childNode.ensureUnsealed();
@@ -446,9 +550,10 @@ YGNode *YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector(
   auto oldNode =
       static_cast<YogaLayoutableShadowNode *>(oldYogaNode->getContext());
 
-  auto clonedNode = oldNode->clone({ShadowNodeFragment::propsPlaceholder(),
-                                    ShadowNodeFragment::childrenPlaceholder(),
-                                    oldNode->getState()});
+  auto clonedNode = oldNode->clone(
+      {ShadowNodeFragment::propsPlaceholder(),
+       ShadowNodeFragment::childrenPlaceholder(),
+       oldNode->getState()});
   parentNode->replaceChild(*oldNode, clonedNode, childIndex);
   return &static_cast<YogaLayoutableShadowNode &>(*clonedNode).yogaNode_;
 }
@@ -466,8 +571,9 @@ YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector(
       static_cast<YogaLayoutableShadowNode *>(yogaNode->getContext());
 
   auto minimumSize = Size{0, 0};
-  auto maximumSize = Size{std::numeric_limits<Float>::infinity(),
-                          std::numeric_limits<Float>::infinity()};
+  auto maximumSize = Size{
+      std::numeric_limits<Float>::infinity(),
+      std::numeric_limits<Float>::infinity()};
 
   switch (widthMode) {
     case YGMeasureModeUndefined:
@@ -496,32 +602,16 @@ YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector(
   auto size = shadowNodeRawPtr->measureContent(
       threadLocalLayoutContext, {minimumSize, maximumSize});
 
-  return YGSize{yogaFloatFromFloat(size.width),
-                yogaFloatFromFloat(size.height)};
+  return YGSize{
+      yogaFloatFromFloat(size.width), yogaFloatFromFloat(size.height)};
 }
 
-#ifdef RN_DEBUG_YOGA_LOGGER
-static int YogaLog(
-    const YGConfigRef config,
-    const YGNodeRef node,
-    YGLogLevel level,
-    const char *format,
-    va_list args) {
-  int result = vsnprintf(NULL, 0, format, args);
-  std::vector<char> buffer(1 + result);
-  vsnprintf(buffer.data(), buffer.size(), format, args);
-  LOG(INFO) << "RNYogaLogger " << buffer.data();
-  return result;
-}
-#endif
-
 YGConfig &YogaLayoutableShadowNode::initializeYogaConfig(YGConfig &config) {
   config.setCloneNodeCallback(
       YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector);
   config.useLegacyStretchBehaviour = true;
 #ifdef RN_DEBUG_YOGA_LOGGER
   config.printTree = true;
-  config.setLogger(&YogaLog);
 #endif
   return config;
 }
@@ -653,7 +743,7 @@ void YogaLayoutableShadowNode::ensureConsistency() const {
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenOwnersConsistency() const {
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
   // Checking that all Yoga node children have the same `owner`.
   // The owner might be not equal to the `yogaNode_` though.
   auto &yogaChildren = yogaNode_.getChildren();
@@ -661,14 +751,14 @@ void YogaLayoutableShadowNode::ensureYogaChildrenOwnersConsistency() const {
   if (!yogaChildren.empty()) {
     auto owner = yogaChildren.at(0)->getOwner();
     for (auto const &child : yogaChildren) {
-      assert(child->getOwner() == owner);
+      react_native_assert(child->getOwner() == owner);
     }
   }
 #endif
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
   // Checking that the shapes of Yoga node children object look fine.
   // This is the only heuristic that might produce false-positive results
   // (really broken dangled nodes might look fine). This is useful as an early
@@ -676,17 +766,17 @@ void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const {
   auto &yogaChildren = yogaNode_.getChildren();
 
   for (auto const &yogaChild : yogaChildren) {
-    assert(yogaChild->getContext());
-    assert(yogaChild->getChildren().size() < 16384);
+    react_native_assert(yogaChild->getContext());
+    react_native_assert(yogaChild->getChildren().size() < 16384);
     if (!yogaChild->getChildren().empty()) {
-      assert(!yogaChild->hasMeasureFunc());
+      react_native_assert(!yogaChild->hasMeasureFunc());
     }
   }
 #endif
 }
 
 void YogaLayoutableShadowNode::ensureYogaChildrenAlighment() const {
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
   // If the node is not a leaf node, checking that:
   // - All children are `YogaLayoutableShadowNode` subclasses.
   // - All Yoga children are owned/connected to corresponding children of
@@ -696,16 +786,16 @@ void YogaLayoutableShadowNode::ensureYogaChildrenAlighment() const {
   auto &children = getChildren();
 
   if (getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode)) {
-    assert(yogaChildren.empty());
+    react_native_assert(yogaChildren.empty());
     return;
   }
 
-  assert(yogaChildren.size() == children.size());
+  react_native_assert(yogaChildren.size() == children.size());
 
   for (size_t i = 0; i < children.size(); i++) {
     auto &yogaChild = yogaChildren.at(i);
     auto &child = children.at(i);
-    assert(
+    react_native_assert(
         yogaChild->getContext() ==
         traitCast<YogaLayoutableShadowNode const *>(child.get()));
   }
diff --git a/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h b/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h
index 634c839df48150..77ba8131145891 100644
--- a/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h
+++ b/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h
@@ -12,6 +12,7 @@
 
 #include <yoga/YGNode.h>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/view/YogaStylableProps.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
 #include <react/renderer/core/Sealable.h>
@@ -149,8 +150,8 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode {
    * - borderBottom(Left|Right)Radius → borderBottom(Start|End)Radius
    * - border(Left|Right)Width → border(Start|End)Width
    * - border(Left|Right)Color → border(Start|End)Color
-   * This is neccesarry to be backwards compatible with Paper, it swaps the
-   * values as well in https://fburl.com/diffusion/kl7bjr3h
+   * This is neccesarry to be backwards compatible with old renderer, it swaps
+   * the values as well in https://fburl.com/diffusion/kl7bjr3h
    */
   static void swapLeftAndRightInTree(
       YogaLayoutableShadowNode const &shadowNode);
@@ -185,10 +186,7 @@ inline YogaLayoutableShadowNode const &
 traitCast<YogaLayoutableShadowNode const &>(ShadowNode const &shadowNode) {
   bool castable =
       shadowNode.getTraits().check(ShadowNodeTraits::Trait::YogaLayoutableKind);
-  assert(
-      castable ==
-      (dynamic_cast<YogaLayoutableShadowNode const *>(&shadowNode) != nullptr));
-  assert(castable);
+  react_native_assert(castable);
   (void)castable;
   return static_cast<YogaLayoutableShadowNode const &>(shadowNode);
 }
@@ -201,9 +199,6 @@ traitCast<YogaLayoutableShadowNode const *>(ShadowNode const *shadowNode) {
   }
   bool castable = shadowNode->getTraits().check(
       ShadowNodeTraits::Trait::YogaLayoutableKind);
-  assert(
-      castable ==
-      (dynamic_cast<YogaLayoutableShadowNode const *>(shadowNode) != nullptr));
   if (!castable) {
     return nullptr;
   }
diff --git a/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp b/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
index 8fe909a188aced..d8c44f49f5c165 100644
--- a/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
+++ b/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
@@ -20,10 +20,11 @@ namespace facebook {
 namespace react {
 
 YogaStylableProps::YogaStylableProps(
+    const PropsParserContext &context,
     YogaStylableProps const &sourceProps,
     RawProps const &rawProps)
-    : Props(sourceProps, rawProps),
-      yogaStyle(convertRawProp(rawProps, sourceProps.yogaStyle)){};
+    : Props(context, sourceProps, rawProps),
+      yogaStyle(convertRawProp(context, rawProps, sourceProps.yogaStyle)){};
 
 #pragma mark - DebugStringConvertible
 
diff --git a/ReactCommon/react/renderer/components/view/YogaStylableProps.h b/ReactCommon/react/renderer/components/view/YogaStylableProps.h
index d272f0693461b7..3d6e314d6c0fb6 100644
--- a/ReactCommon/react/renderer/components/view/YogaStylableProps.h
+++ b/ReactCommon/react/renderer/components/view/YogaStylableProps.h
@@ -10,6 +10,7 @@
 #include <yoga/YGStyle.h>
 
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook {
@@ -19,6 +20,7 @@ class YogaStylableProps : public Props {
  public:
   YogaStylableProps() = default;
   YogaStylableProps(
+      const PropsParserContext &context,
       YogaStylableProps const &sourceProps,
       RawProps const &rawProps);
 
diff --git a/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h b/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h
index 35a92168e99e64..d06ee6546d9614 100644
--- a/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h
+++ b/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h
@@ -8,7 +8,10 @@
 #pragma once
 
 #include <folly/dynamic.h>
+#include <glog/logging.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/view/AccessibilityPrimitives.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
@@ -19,7 +22,7 @@ inline void fromString(const std::string &string, AccessibilityTraits &result) {
     result = AccessibilityTraits::None;
     return;
   }
-  if (string == "button") {
+  if (string == "button" || string == "togglebutton") {
     result = AccessibilityTraits::Button;
     return;
   }
@@ -91,37 +94,49 @@ inline void fromString(const std::string &string, AccessibilityTraits &result) {
     result = AccessibilityTraits::Switch;
     return;
   }
+  if (string == "tabbar") {
+    result = AccessibilityTraits::TabBar;
+    return;
+  }
   result = AccessibilityTraits::None;
 }
 
-inline void fromRawValue(const RawValue &value, AccessibilityTraits &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    AccessibilityTraits &result) {
   if (value.hasType<std::string>()) {
     fromString((std::string)value, result);
     return;
   }
 
+  result = {};
+
+  react_native_assert(value.hasType<std::vector<std::string>>());
   if (value.hasType<std::vector<std::string>>()) {
-    result = {};
     auto items = (std::vector<std::string>)value;
     for (auto &item : items) {
       AccessibilityTraits itemAccessibilityTraits;
       fromString(item, itemAccessibilityTraits);
       result = result | itemAccessibilityTraits;
     }
+  } else {
+    LOG(ERROR) << "AccessibilityTraits parsing: unsupported type";
   }
-
-  abort();
 }
 
-inline void fromRawValue(const RawValue &value, AccessibilityState &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    AccessibilityState &result) {
   auto map = (better::map<std::string, RawValue>)value;
   auto selected = map.find("selected");
   if (selected != map.end()) {
-    fromRawValue(selected->second, result.selected);
+    fromRawValue(context, selected->second, result.selected);
   }
   auto disabled = map.find("disabled");
   if (disabled != map.end()) {
-    fromRawValue(disabled->second, result.disabled);
+    fromRawValue(context, disabled->second, result.disabled);
   }
   auto checked = map.find("checked");
   if (checked != map.end()) {
@@ -143,11 +158,11 @@ inline void fromRawValue(const RawValue &value, AccessibilityState &result) {
   }
   auto busy = map.find("busy");
   if (busy != map.end()) {
-    fromRawValue(busy->second, result.busy);
+    fromRawValue(context, busy->second, result.busy);
   }
   auto expanded = map.find("expanded");
   if (expanded != map.end()) {
-    fromRawValue(expanded->second, result.expanded);
+    fromRawValue(context, expanded->second, result.expanded);
   }
 }
 
@@ -166,26 +181,82 @@ inline std::string toString(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     ImportantForAccessibility &result) {
-  auto string = (std::string)value;
-  if (string == "auto") {
-    result = ImportantForAccessibility::Auto;
-    return;
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "auto") {
+      result = ImportantForAccessibility::Auto;
+    } else if (string == "yes") {
+      result = ImportantForAccessibility::Yes;
+    } else if (string == "no") {
+      result = ImportantForAccessibility::No;
+    } else if (string == "no-hide-descendants") {
+      result = ImportantForAccessibility::NoHideDescendants;
+    } else {
+      LOG(ERROR) << "Unsupported ImportantForAccessiblity value: " << string;
+      react_native_assert(false);
+    }
+  } else {
+    LOG(ERROR) << "Unsupported ImportantForAccessiblity type";
   }
-  if (string == "yes") {
-    result = ImportantForAccessibility::Yes;
-    return;
+}
+
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    AccessibilityAction &result) {
+  auto map = (better::map<std::string, RawValue>)value;
+
+  auto name = map.find("name");
+  react_native_assert(name != map.end() && name->second.hasType<std::string>());
+  if (name != map.end()) {
+    fromRawValue(context, name->second, result.name);
   }
-  if (string == "no") {
-    result = ImportantForAccessibility::No;
-    return;
+
+  auto label = map.find("label");
+  if (label != map.end()) {
+    if (label->second.hasType<std::string>()) {
+      result.label = (std::string)label->second;
+    }
   }
-  if (string == "no-hide-descendants") {
-    result = ImportantForAccessibility::NoHideDescendants;
-    return;
+}
+
+inline void fromRawValue(
+    const PropsParserContext &,
+    const RawValue &value,
+    AccessibilityValue &result) {
+  auto map = (better::map<std::string, RawValue>)value;
+
+  auto min = map.find("min");
+  if (min != map.end()) {
+    if (min->second.hasType<int>()) {
+      result.min = (int)min->second;
+    }
+  }
+
+  auto max = map.find("max");
+  if (max != map.end()) {
+    if (max->second.hasType<int>()) {
+      result.max = (int)max->second;
+    }
+  }
+
+  auto now = map.find("now");
+  if (now != map.end()) {
+    if (now->second.hasType<int>()) {
+      result.now = (int)now->second;
+    }
+  }
+
+  auto text = map.find("text");
+  if (text != map.end()) {
+    if (text->second.hasType<std::string>()) {
+      result.text = (std::string)text->second;
+    }
   }
-  abort();
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/view/conversions.h b/ReactCommon/react/renderer/components/view/conversions.h
index 93eb658be343e3..36fc9d507f1366 100644
--- a/ReactCommon/react/renderer/components/view/conversions.h
+++ b/ReactCommon/react/renderer/components/view/conversions.h
@@ -12,8 +12,10 @@
 #include <folly/Conv.h>
 #include <folly/dynamic.h>
 #include <glog/logging.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/view/primitives.h>
 #include <react/renderer/core/LayoutMetrics.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Geometry.h>
 #include <react/renderer/graphics/Transform.h>
 #include <stdlib.h>
@@ -47,7 +49,7 @@ inline Float floatFromYogaFloat(float value) {
 }
 
 inline float yogaFloatFromFloat(Float value) {
-  if (std::isinf(value)) {
+  if (!std::isfinite(value)) {
     return YGUndefined;
   }
 
@@ -89,7 +91,7 @@ inline YGFloatOptional yogaOptionalFloatFromFloat(Float value) {
 inline YGValue yogaStyleValueFromFloat(
     const Float &value,
     YGUnit unit = YGUnitPoint) {
-  if (std::isnan(value)) {
+  if (!std::isfinite(value)) {
     return YGValueUndefined;
   }
 
@@ -117,11 +119,13 @@ inline better::optional<Float> optionalFloatFromYogaValue(
 inline LayoutMetrics layoutMetricsFromYogaNode(YGNode &yogaNode) {
   auto layoutMetrics = LayoutMetrics{};
 
-  layoutMetrics.frame =
-      Rect{Point{floatFromYogaFloat(YGNodeLayoutGetLeft(&yogaNode)),
-                 floatFromYogaFloat(YGNodeLayoutGetTop(&yogaNode))},
-           Size{floatFromYogaFloat(YGNodeLayoutGetWidth(&yogaNode)),
-                floatFromYogaFloat(YGNodeLayoutGetHeight(&yogaNode))}};
+  layoutMetrics.frame = Rect{
+      Point{
+          floatFromYogaFloat(YGNodeLayoutGetLeft(&yogaNode)),
+          floatFromYogaFloat(YGNodeLayoutGetTop(&yogaNode))},
+      Size{
+          floatFromYogaFloat(YGNodeLayoutGetWidth(&yogaNode)),
+          floatFromYogaFloat(YGNodeLayoutGetHeight(&yogaNode))}};
 
   layoutMetrics.borderWidth = EdgeInsets{
       floatFromYogaFloat(YGNodeLayoutGetBorder(&yogaNode, YGEdgeLeft)),
@@ -162,8 +166,11 @@ inline YGDirection yogaDirectionFromLayoutDirection(LayoutDirection direction) {
   }
 }
 
-inline void fromRawValue(const RawValue &value, YGDirection &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGDirection &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "inherit") {
     result = YGDirectionInherit;
@@ -178,11 +185,14 @@ inline void fromRawValue(const RawValue &value, YGDirection &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGDirection:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGFlexDirection &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGFlexDirection &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "row") {
     result = YGFlexDirectionRow;
@@ -201,11 +211,14 @@ inline void fromRawValue(const RawValue &value, YGFlexDirection &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGFlexDirection:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGJustify &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGJustify &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "flex-start") {
     result = YGJustifyFlexStart;
@@ -232,11 +245,14 @@ inline void fromRawValue(const RawValue &value, YGJustify &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGJustify:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGAlign &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGAlign &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "auto") {
     result = YGAlignAuto;
@@ -271,11 +287,14 @@ inline void fromRawValue(const RawValue &value, YGAlign &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGAlign:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGPositionType &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGPositionType &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "static") {
     result = YGPositionTypeStatic;
@@ -290,11 +309,14 @@ inline void fromRawValue(const RawValue &value, YGPositionType &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGPositionType:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGWrap &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGWrap &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "nowrap") {
     result = YGWrapNoWrap;
@@ -309,11 +331,14 @@ inline void fromRawValue(const RawValue &value, YGWrap &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGWrap:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGOverflow &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGOverflow &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "visible") {
     result = YGOverflowVisible;
@@ -328,11 +353,14 @@ inline void fromRawValue(const RawValue &value, YGOverflow &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGOverflow:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGDisplay &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGDisplay &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "flex") {
     result = YGDisplayFlex;
@@ -343,10 +371,13 @@ inline void fromRawValue(const RawValue &value, YGDisplay &result) {
     return;
   }
   LOG(FATAL) << "Could not parse YGDisplay:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, YGStyle::ValueRepr &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGStyle::ValueRepr &result) {
   if (value.hasType<Float>()) {
     result = yogaStyleValueFromFloat((Float)value);
     return;
@@ -370,7 +401,10 @@ inline void fromRawValue(const RawValue &value, YGStyle::ValueRepr &result) {
   result = YGValueUndefined;
 }
 
-inline void fromRawValue(const RawValue &value, YGFloatOptional &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    YGFloatOptional &result) {
   if (value.hasType<float>()) {
     result = YGFloatOptional((float)value);
     return;
@@ -382,27 +416,30 @@ inline void fromRawValue(const RawValue &value, YGFloatOptional &result) {
     }
   }
   LOG(FATAL) << "Could not parse YGFloatOptional";
-  assert(false);
+  react_native_assert(false);
 }
 
 inline Float toRadians(const RawValue &value) {
   if (value.hasType<Float>()) {
     return (Float)value;
   }
-  assert(value.hasType<std::string>());
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   char *suffixStart;
   double num = strtod(
       stringValue.c_str(), &suffixStart); // can't use std::stod, probably
                                           // because of old Android NDKs
   if (0 == strncmp(suffixStart, "deg", 3)) {
-    return num * M_PI / 180;
+    return static_cast<Float>(num * M_PI / 180.0f);
   }
-  return num; // assume suffix is "rad"
+  return static_cast<Float>(num); // assume suffix is "rad"
 }
 
-inline void fromRawValue(const RawValue &value, Transform &result) {
-  assert(value.hasType<std::vector<RawValue>>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    Transform &result) {
+  react_native_assert(value.hasType<std::vector<RawValue>>());
   auto transformMatrix = Transform{};
   auto configurations = static_cast<std::vector<RawValue>>(value);
 
@@ -420,9 +457,9 @@ inline void fromRawValue(const RawValue &value, Transform &result) {
     auto &parameters = pair->second;
 
     if (operation == "matrix") {
-      assert(parameters.hasType<std::vector<Float>>());
+      react_native_assert(parameters.hasType<std::vector<Float>>());
       auto numbers = (std::vector<Float>)parameters;
-      assert(numbers.size() == transformMatrix.matrix.size());
+      react_native_assert(numbers.size() == transformMatrix.matrix.size());
       auto i = 0;
       for (auto number : numbers) {
         transformMatrix.matrix[i++] = number;
@@ -476,8 +513,11 @@ inline void fromRawValue(const RawValue &value, Transform &result) {
   result = transformMatrix;
 }
 
-inline void fromRawValue(const RawValue &value, PointerEventsMode &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    PointerEventsMode &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "auto") {
     result = PointerEventsMode::Auto;
@@ -496,11 +536,14 @@ inline void fromRawValue(const RawValue &value, PointerEventsMode &result) {
     return;
   }
   LOG(FATAL) << "Could not parse PointerEventsMode:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, BackfaceVisibility &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    BackfaceVisibility &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "auto") {
     result = BackfaceVisibility::Auto;
@@ -515,11 +558,14 @@ inline void fromRawValue(const RawValue &value, BackfaceVisibility &result) {
     return;
   }
   LOG(FATAL) << "Could not parse BackfaceVisibility:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
-inline void fromRawValue(const RawValue &value, BorderStyle &result) {
-  assert(value.hasType<std::string>());
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    BorderStyle &result) {
+  react_native_assert(value.hasType<std::string>());
   auto stringValue = (std::string)value;
   if (stringValue == "solid") {
     result = BorderStyle::Solid;
@@ -534,7 +580,7 @@ inline void fromRawValue(const RawValue &value, BorderStyle &result) {
     return;
   }
   LOG(FATAL) << "Could not parse BorderStyle:" << stringValue;
-  assert(false);
+  react_native_assert(false);
 }
 
 inline std::string toString(
diff --git a/ReactCommon/react/renderer/components/view/primitives.h b/ReactCommon/react/renderer/components/view/primitives.h
index f50f37e71fa9e3..52e5f3f08c218f 100644
--- a/ReactCommon/react/renderer/components/view/primitives.h
+++ b/ReactCommon/react/renderer/components/view/primitives.h
@@ -38,18 +38,19 @@ struct CascadedRectangleEdges {
   OptionalT all{};
 
   Counterpart resolve(bool isRTL, T defaults) const {
-    const auto leading = isRTL ? end : start;
-    const auto trailing = isRTL ? start : end;
+    const auto leadingEdge = isRTL ? end : start;
+    const auto trailingEdge = isRTL ? start : end;
     const auto horizontalOrAllOrDefault =
         horizontal.value_or(all.value_or(defaults));
     const auto verticalOrAllOrDefault =
         vertical.value_or(all.value_or(defaults));
 
     return {
-        /* .left = */ left.value_or(leading.value_or(horizontalOrAllOrDefault)),
+        /* .left = */
+        left.value_or(leadingEdge.value_or(horizontalOrAllOrDefault)),
         /* .top = */ top.value_or(verticalOrAllOrDefault),
         /* .right = */
-        right.value_or(trailing.value_or(horizontalOrAllOrDefault)),
+        right.value_or(trailingEdge.value_or(horizontalOrAllOrDefault)),
         /* .bottom = */ bottom.value_or(verticalOrAllOrDefault),
     };
   }
diff --git a/ReactCommon/react/renderer/components/view/propsConversions.h b/ReactCommon/react/renderer/components/view/propsConversions.h
index 89acb27348a632..5f91adc5cbdaef 100644
--- a/ReactCommon/react/renderer/components/view/propsConversions.h
+++ b/ReactCommon/react/renderer/components/view/propsConversions.h
@@ -8,12 +8,14 @@
 #pragma once
 
 #include <react/renderer/components/view/conversions.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 static inline YGStyle::Dimensions convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *widthName,
     char const *heightName,
@@ -21,11 +23,13 @@ static inline YGStyle::Dimensions convertRawProp(
     YGStyle::Dimensions const &defaultValue) {
   auto dimensions = defaultValue;
   dimensions[YGDimensionWidth] = convertRawProp(
+      context,
       rawProps,
       widthName,
       sourceValue[YGDimensionWidth],
       defaultValue[YGDimensionWidth]);
   dimensions[YGDimensionHeight] = convertRawProp(
+      context,
       rawProps,
       heightName,
       sourceValue[YGDimensionHeight],
@@ -34,6 +38,7 @@ static inline YGStyle::Dimensions convertRawProp(
 }
 
 static inline YGStyle::Edges convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *prefix,
     char const *suffix,
@@ -41,6 +46,7 @@ static inline YGStyle::Edges convertRawProp(
     YGStyle::Edges const &defaultValue) {
   auto result = defaultValue;
   result[YGEdgeLeft] = convertRawProp(
+      context,
       rawProps,
       "Left",
       sourceValue[YGEdgeLeft],
@@ -48,6 +54,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeTop] = convertRawProp(
+      context,
       rawProps,
       "Top",
       sourceValue[YGEdgeTop],
@@ -55,6 +62,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeRight] = convertRawProp(
+      context,
       rawProps,
       "Right",
       sourceValue[YGEdgeRight],
@@ -62,6 +70,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeBottom] = convertRawProp(
+      context,
       rawProps,
       "Bottom",
       sourceValue[YGEdgeBottom],
@@ -69,6 +78,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeStart] = convertRawProp(
+      context,
       rawProps,
       "Start",
       sourceValue[YGEdgeStart],
@@ -76,6 +86,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeEnd] = convertRawProp(
+      context,
       rawProps,
       "End",
       sourceValue[YGEdgeEnd],
@@ -83,6 +94,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeHorizontal] = convertRawProp(
+      context,
       rawProps,
       "Horizontal",
       sourceValue[YGEdgeHorizontal],
@@ -90,6 +102,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeVertical] = convertRawProp(
+      context,
       rawProps,
       "Vertical",
       sourceValue[YGEdgeVertical],
@@ -97,6 +110,7 @@ static inline YGStyle::Edges convertRawProp(
       prefix,
       suffix);
   result[YGEdgeAll] = convertRawProp(
+      context,
       rawProps,
       "",
       sourceValue[YGEdgeAll],
@@ -107,99 +121,177 @@ static inline YGStyle::Edges convertRawProp(
 }
 
 static inline YGStyle::Edges convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     YGStyle::Edges const &sourceValue,
     YGStyle::Edges const &defaultValue) {
   auto result = defaultValue;
   result[YGEdgeLeft] = convertRawProp(
-      rawProps, "left", sourceValue[YGEdgeLeft], defaultValue[YGEdgeLeft]);
+      context,
+      rawProps,
+      "left",
+      sourceValue[YGEdgeLeft],
+      defaultValue[YGEdgeLeft]);
   result[YGEdgeTop] = convertRawProp(
-      rawProps, "top", sourceValue[YGEdgeTop], defaultValue[YGEdgeTop]);
+      context,
+      rawProps,
+      "top",
+      sourceValue[YGEdgeTop],
+      defaultValue[YGEdgeTop]);
   result[YGEdgeRight] = convertRawProp(
-      rawProps, "right", sourceValue[YGEdgeRight], defaultValue[YGEdgeRight]);
+      context,
+      rawProps,
+      "right",
+      sourceValue[YGEdgeRight],
+      defaultValue[YGEdgeRight]);
   result[YGEdgeBottom] = convertRawProp(
+      context,
       rawProps,
       "bottom",
       sourceValue[YGEdgeBottom],
       defaultValue[YGEdgeBottom]);
   result[YGEdgeStart] = convertRawProp(
-      rawProps, "start", sourceValue[YGEdgeStart], defaultValue[YGEdgeStart]);
+      context,
+      rawProps,
+      "start",
+      sourceValue[YGEdgeStart],
+      defaultValue[YGEdgeStart]);
   result[YGEdgeEnd] = convertRawProp(
-      rawProps, "end", sourceValue[YGEdgeEnd], defaultValue[YGEdgeEnd]);
+      context,
+      rawProps,
+      "end",
+      sourceValue[YGEdgeEnd],
+      defaultValue[YGEdgeEnd]);
   return result;
 }
 
 static inline YGStyle convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     YGStyle const &sourceValue) {
   auto yogaStyle = YGStyle{};
   yogaStyle.direction() = convertRawProp(
-      rawProps, "direction", sourceValue.direction(), yogaStyle.direction());
+      context,
+      rawProps,
+      "direction",
+      sourceValue.direction(),
+      yogaStyle.direction());
   yogaStyle.flexDirection() = convertRawProp(
+      context,
       rawProps,
       "flexDirection",
       sourceValue.flexDirection(),
       yogaStyle.flexDirection());
   yogaStyle.justifyContent() = convertRawProp(
+      context,
       rawProps,
       "justifyContent",
       sourceValue.justifyContent(),
       yogaStyle.justifyContent());
   yogaStyle.alignContent() = convertRawProp(
+      context,
       rawProps,
       "alignContent",
       sourceValue.alignContent(),
       yogaStyle.alignContent());
   yogaStyle.alignItems() = convertRawProp(
-      rawProps, "alignItems", sourceValue.alignItems(), yogaStyle.alignItems());
+      context,
+      rawProps,
+      "alignItems",
+      sourceValue.alignItems(),
+      yogaStyle.alignItems());
   yogaStyle.alignSelf() = convertRawProp(
-      rawProps, "alignSelf", sourceValue.alignSelf(), yogaStyle.alignSelf());
+      context,
+      rawProps,
+      "alignSelf",
+      sourceValue.alignSelf(),
+      yogaStyle.alignSelf());
   yogaStyle.positionType() = convertRawProp(
+      context,
       rawProps,
       "position",
       sourceValue.positionType(),
       yogaStyle.positionType());
   yogaStyle.flexWrap() = convertRawProp(
-      rawProps, "flexWrap", sourceValue.flexWrap(), yogaStyle.flexWrap());
+      context,
+      rawProps,
+      "flexWrap",
+      sourceValue.flexWrap(),
+      yogaStyle.flexWrap());
   yogaStyle.overflow() = convertRawProp(
-      rawProps, "overflow", sourceValue.overflow(), yogaStyle.overflow());
+      context,
+      rawProps,
+      "overflow",
+      sourceValue.overflow(),
+      yogaStyle.overflow());
   yogaStyle.display() = convertRawProp(
-      rawProps, "display", sourceValue.display(), yogaStyle.display());
-  yogaStyle.flex() =
-      convertRawProp(rawProps, "flex", sourceValue.flex(), yogaStyle.flex());
+      context, rawProps, "display", sourceValue.display(), yogaStyle.display());
+  yogaStyle.flex() = convertRawProp(
+      context, rawProps, "flex", sourceValue.flex(), yogaStyle.flex());
   yogaStyle.flexGrow() = convertRawProp(
-      rawProps, "flexGrow", sourceValue.flexGrow(), yogaStyle.flexGrow());
+      context,
+      rawProps,
+      "flexGrow",
+      sourceValue.flexGrow(),
+      yogaStyle.flexGrow());
   yogaStyle.flexShrink() = convertRawProp(
-      rawProps, "flexShrink", sourceValue.flexShrink(), yogaStyle.flexShrink());
+      context,
+      rawProps,
+      "flexShrink",
+      sourceValue.flexShrink(),
+      yogaStyle.flexShrink());
   yogaStyle.flexBasis() = convertRawProp(
-      rawProps, "flexBasis", sourceValue.flexBasis(), yogaStyle.flexBasis());
+      context,
+      rawProps,
+      "flexBasis",
+      sourceValue.flexBasis(),
+      yogaStyle.flexBasis());
   yogaStyle.margin() = convertRawProp(
-      rawProps, "margin", "", sourceValue.margin(), yogaStyle.margin());
-  yogaStyle.position() =
-      convertRawProp(rawProps, sourceValue.position(), yogaStyle.position());
+      context,
+      rawProps,
+      "margin",
+      "",
+      sourceValue.margin(),
+      yogaStyle.margin());
+  yogaStyle.position() = convertRawProp(
+      context, rawProps, sourceValue.position(), yogaStyle.position());
   yogaStyle.padding() = convertRawProp(
-      rawProps, "padding", "", sourceValue.padding(), yogaStyle.padding());
+      context,
+      rawProps,
+      "padding",
+      "",
+      sourceValue.padding(),
+      yogaStyle.padding());
   yogaStyle.border() = convertRawProp(
-      rawProps, "border", "Width", sourceValue.border(), yogaStyle.border());
+      context,
+      rawProps,
+      "border",
+      "Width",
+      sourceValue.border(),
+      yogaStyle.border());
   yogaStyle.dimensions() = convertRawProp(
+      context,
       rawProps,
       "width",
       "height",
       sourceValue.dimensions(),
       yogaStyle.dimensions());
   yogaStyle.minDimensions() = convertRawProp(
+      context,
       rawProps,
       "minWidth",
       "minHeight",
       sourceValue.minDimensions(),
       yogaStyle.minDimensions());
   yogaStyle.maxDimensions() = convertRawProp(
+      context,
       rawProps,
       "maxWidth",
       "maxHeight",
       sourceValue.maxDimensions(),
       yogaStyle.maxDimensions());
   yogaStyle.aspectRatio() = convertRawProp(
+      context,
       rawProps,
       "aspectRatio",
       sourceValue.aspectRatio(),
@@ -209,6 +301,7 @@ static inline YGStyle convertRawProp(
 
 template <typename T>
 static inline CascadedRectangleCorners<T> convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *prefix,
     char const *suffix,
@@ -217,6 +310,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
   CascadedRectangleCorners<T> result;
 
   result.topLeft = convertRawProp(
+      context,
       rawProps,
       "TopLeft",
       sourceValue.topLeft,
@@ -224,6 +318,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.topRight = convertRawProp(
+      context,
       rawProps,
       "TopRight",
       sourceValue.topRight,
@@ -231,6 +326,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomLeft = convertRawProp(
+      context,
       rawProps,
       "BottomLeft",
       sourceValue.bottomLeft,
@@ -238,6 +334,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomRight = convertRawProp(
+      context,
       rawProps,
       "BottomRight",
       sourceValue.bottomRight,
@@ -246,6 +343,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       suffix);
 
   result.topStart = convertRawProp(
+      context,
       rawProps,
       "TopStart",
       sourceValue.topStart,
@@ -253,6 +351,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.topEnd = convertRawProp(
+      context,
       rawProps,
       "TopEnd",
       sourceValue.topEnd,
@@ -260,6 +359,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomStart = convertRawProp(
+      context,
       rawProps,
       "BottomStart",
       sourceValue.bottomStart,
@@ -267,6 +367,7 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       prefix,
       suffix);
   result.bottomEnd = convertRawProp(
+      context,
       rawProps,
       "BottomEnd",
       sourceValue.bottomEnd,
@@ -275,13 +376,14 @@ static inline CascadedRectangleCorners<T> convertRawProp(
       suffix);
 
   result.all = convertRawProp(
-      rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
+      context, rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
 
   return result;
 }
 
 template <typename T>
 static inline CascadedRectangleEdges<T> convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *prefix,
     char const *suffix,
@@ -290,12 +392,31 @@ static inline CascadedRectangleEdges<T> convertRawProp(
   CascadedRectangleEdges<T> result;
 
   result.left = convertRawProp(
-      rawProps, "Left", sourceValue.left, defaultValue.left, prefix, suffix);
+      context,
+      rawProps,
+      "Left",
+      sourceValue.left,
+      defaultValue.left,
+      prefix,
+      suffix);
   result.right = convertRawProp(
-      rawProps, "Right", sourceValue.right, defaultValue.right, prefix, suffix);
+      context,
+      rawProps,
+      "Right",
+      sourceValue.right,
+      defaultValue.right,
+      prefix,
+      suffix);
   result.top = convertRawProp(
-      rawProps, "Top", sourceValue.top, defaultValue.top, prefix, suffix);
+      context,
+      rawProps,
+      "Top",
+      sourceValue.top,
+      defaultValue.top,
+      prefix,
+      suffix);
   result.bottom = convertRawProp(
+      context,
       rawProps,
       "Bottom",
       sourceValue.bottom,
@@ -304,10 +425,23 @@ static inline CascadedRectangleEdges<T> convertRawProp(
       suffix);
 
   result.start = convertRawProp(
-      rawProps, "Start", sourceValue.start, defaultValue.start, prefix, suffix);
+      context,
+      rawProps,
+      "Start",
+      sourceValue.start,
+      defaultValue.start,
+      prefix,
+      suffix);
   result.end = convertRawProp(
-      rawProps, "End", sourceValue.end, defaultValue.end, prefix, suffix);
+      context,
+      rawProps,
+      "End",
+      sourceValue.end,
+      defaultValue.end,
+      prefix,
+      suffix);
   result.horizontal = convertRawProp(
+      context,
       rawProps,
       "Horizontal",
       sourceValue.horizontal,
@@ -315,6 +449,7 @@ static inline CascadedRectangleEdges<T> convertRawProp(
       prefix,
       suffix);
   result.vertical = convertRawProp(
+      context,
       rawProps,
       "Vertical",
       sourceValue.vertical,
@@ -323,7 +458,7 @@ static inline CascadedRectangleEdges<T> convertRawProp(
       suffix);
 
   result.all = convertRawProp(
-      rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
+      context, rawProps, "", sourceValue.all, defaultValue.all, prefix, suffix);
 
   return result;
 }
diff --git a/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp b/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp
index 0b99e92624286a..8da0ed46ea6e30 100644
--- a/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp
+++ b/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp
@@ -14,7 +14,9 @@
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/element/ComponentBuilder.h>
+
 #include <react/renderer/element/Element.h>
 #include <react/renderer/element/testUtils.h>
 
@@ -62,6 +64,10 @@ class YogaDirtyFlagTest : public ::testing::Test {
                 Element<ScrollViewShadowNode>()
                   .reference(scrollViewShadowNode_)
                   .tag(7)
+                  .children({
+                    Element<ViewShadowNode>()
+                      .tag(8)
+                  })
               })
           });
     // clang-format on
@@ -81,14 +87,17 @@ class YogaDirtyFlagTest : public ::testing::Test {
 };
 
 TEST_F(YogaDirtyFlagTest, cloningPropsWithoutChangingThem) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   /*
    * Cloning props without changing them must *not* dirty a Yoga node.
    */
   auto newRootShadowNode = rootShadowNode_->cloneTree(
-      innerShadowNode_->getFamily(), [](ShadowNode const &oldShadowNode) {
+      innerShadowNode_->getFamily(), [&](ShadowNode const &oldShadowNode) {
         auto &componentDescriptor = oldShadowNode.getComponentDescriptor();
         auto props = componentDescriptor.cloneProps(
-            oldShadowNode.getProps(), RawProps());
+            parserContext, oldShadowNode.getProps(), RawProps());
         return oldShadowNode.clone(ShadowNodeFragment{props});
       });
 
@@ -208,9 +217,10 @@ TEST_F(YogaDirtyFlagTest, updatingStateForScrollViewMistNotDirtyYogaNode) {
             oldShadowNode.getFamily(),
             std::make_shared<ScrollViewState>(state));
 
-        return oldShadowNode.clone({ShadowNodeFragment::propsPlaceholder(),
-                                    ShadowNodeFragment::childrenPlaceholder(),
-                                    newState});
+        return oldShadowNode.clone(
+            {ShadowNodeFragment::propsPlaceholder(),
+             ShadowNodeFragment::childrenPlaceholder(),
+             newState});
       });
 
   EXPECT_FALSE(
diff --git a/ReactCommon/react/renderer/core/Android.mk b/ReactCommon/react/renderer/core/Android.mk
index 66912423b0514b..32a8ddf5efe2cb 100644
--- a/ReactCommon/react/renderer/core/Android.mk
+++ b/ReactCommon/react/renderer/core/Android.mk
@@ -15,17 +15,19 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_render_debug libreact_render_graphics
+LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics libglog
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,folly)
 $(call import-module,jsi)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/renderer/core/BUCK b/ReactCommon/react/renderer/core/BUCK
index 13fa6dd9f1daea..8ed779f4283679 100644
--- a/ReactCommon/react/renderer/core/BUCK
+++ b/ReactCommon/react/renderer/core/BUCK
@@ -1,5 +1,4 @@
 load("@fbsource//tools/build_defs:fb_xplat_cxx_binary.bzl", "fb_xplat_cxx_binary")
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -35,7 +35,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -58,6 +58,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/utils:utils"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
@@ -71,7 +72,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
@@ -79,12 +80,14 @@ fb_xplat_cxx_test(
     deps = [
         "//xplat/folly:molly",
         "//xplat/js/react-native-github/ReactCommon/react/renderer/element:element",
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/components/view:view"),
         react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
         react_native_xplat_target("react/renderer/components/text:text"),
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/renderer/components/view:view"),
         ":core",
+        "//xplat/hermes/API:HermesAPI",
     ],
 )
 
@@ -94,7 +97,7 @@ fb_xplat_cxx_binary(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
         "-Wno-unused-variable",
     ],
diff --git a/ReactCommon/react/renderer/core/BatchedEventQueue.cpp b/ReactCommon/react/renderer/core/BatchedEventQueue.cpp
index d8acdd6112b4c1..64d8df3288ce72 100644
--- a/ReactCommon/react/renderer/core/BatchedEventQueue.cpp
+++ b/ReactCommon/react/renderer/core/BatchedEventQueue.cpp
@@ -6,33 +6,17 @@
  */
 
 #include "BatchedEventQueue.h"
-#include <algorithm>
 
 namespace facebook {
 namespace react {
 
-void BatchedEventQueue::onEnqueue() const {
-  EventQueue::onEnqueue();
+BatchedEventQueue::BatchedEventQueue(
+    EventQueueProcessor eventProcessor,
+    std::unique_ptr<EventBeat> eventBeat)
+    : EventQueue(std::move(eventProcessor), std::move(eventBeat)) {}
 
+void BatchedEventQueue::onEnqueue() const {
   eventBeat_->request();
 }
-
-void BatchedEventQueue::enqueueUniqueEvent(const RawEvent &rawEvent) const {
-  {
-    std::lock_guard<std::mutex> lock(queueMutex_);
-    if (!eventQueue_.empty()) {
-      auto const position = eventQueue_.back();
-      if (position.type == rawEvent.type &&
-          position.eventTarget == rawEvent.eventTarget) {
-        eventQueue_.pop_back();
-      }
-    }
-
-    eventQueue_.push_back(rawEvent);
-  }
-
-  onEnqueue();
-}
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/core/BatchedEventQueue.h b/ReactCommon/react/renderer/core/BatchedEventQueue.h
index 2acabd8600b746..ea18dcf3d928b6 100644
--- a/ReactCommon/react/renderer/core/BatchedEventQueue.h
+++ b/ReactCommon/react/renderer/core/BatchedEventQueue.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <react/renderer/core/EventQueue.h>
+#include <react/renderer/core/EventQueueProcessor.h>
 
 namespace facebook {
 namespace react {
@@ -18,16 +19,11 @@ namespace react {
  */
 class BatchedEventQueue final : public EventQueue {
  public:
-  using EventQueue::EventQueue;
+  BatchedEventQueue(
+      EventQueueProcessor eventProcessor,
+      std::unique_ptr<EventBeat> eventBeat);
 
   void onEnqueue() const override;
-
-  /*
-   * Enqueues and (probably later) dispatch a given event.
-   * Deletes last RawEvent from the queu if it has the same type and target.
-   * Can be called on any thread.
-   */
-  void enqueueUniqueEvent(const RawEvent &rawEvent) const;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/ComponentDescriptor.h b/ReactCommon/react/renderer/core/ComponentDescriptor.h
index 04ad7f27bb5658..e0bac0845eadc2 100644
--- a/ReactCommon/react/renderer/core/ComponentDescriptor.h
+++ b/ReactCommon/react/renderer/core/ComponentDescriptor.h
@@ -9,6 +9,7 @@
 
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/State.h>
@@ -40,8 +41,8 @@ class ComponentDescriptor {
    * and `ComponentHandle` (the particular custom implementation might use
    * stored `flavor` to return different values from those virtual methods).
    * Since it's a very niche requirement (e.g. we plan to use it for
-   * an interoperability layer with Paper), we are thinking about removing this
-   * feature completely after it's no longer needed.
+   * an interoperability layer with old renderer), we are thinking about
+   * removing this feature completely after it's no longer needed.
    */
   using Flavor = std::shared_ptr<void const>;
 
@@ -82,7 +83,7 @@ class ComponentDescriptor {
   /*
    * Clones a `ShadowNode` with optionally new `props` and/or `children`.
    */
-  virtual UnsharedShadowNode cloneShadowNode(
+  virtual ShadowNode::Unshared cloneShadowNode(
       const ShadowNode &sourceShadowNode,
       const ShadowNodeFragment &fragment) const = 0;
 
@@ -101,6 +102,7 @@ class ComponentDescriptor {
    * Must return an object which is NOT pointer equal to `props`.
    */
   virtual SharedProps cloneProps(
+      const PropsParserContext &context,
       const SharedProps &props,
       const RawProps &rawProps) const = 0;
 
@@ -109,6 +111,7 @@ class ComponentDescriptor {
    * between `props` and `newProps`.
    */
   virtual SharedProps interpolateProps(
+      const PropsParserContext &context,
       float animationProgress,
       const SharedProps &props,
       const SharedProps &newProps) const = 0;
diff --git a/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
index 497cf561e3d8ca..a66f8e2573b5e4 100644
--- a/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
+++ b/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
@@ -10,9 +10,11 @@
 #include <functional>
 #include <memory>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/core/State.h>
@@ -63,7 +65,8 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   ShadowNode::Shared createShadowNode(
       const ShadowNodeFragment &fragment,
       ShadowNodeFamily::Shared const &family) const override {
-    assert(std::dynamic_pointer_cast<const ConcreteProps>(fragment.props));
+    react_native_assert(
+        std::dynamic_pointer_cast<const ConcreteProps>(fragment.props));
 
     auto shadowNode =
         std::make_shared<ShadowNodeT>(fragment, family, getTraits());
@@ -73,13 +76,9 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
     return shadowNode;
   }
 
-  UnsharedShadowNode cloneShadowNode(
+  ShadowNode::Unshared cloneShadowNode(
       const ShadowNode &sourceShadowNode,
       const ShadowNodeFragment &fragment) const override {
-    assert(
-        dynamic_cast<ConcreteShadowNode const *>(&sourceShadowNode) &&
-        "Provided `sourceShadowNode` has an incompatible type.");
-
     auto shadowNode = std::make_shared<ShadowNodeT>(sourceShadowNode, fragment);
 
     adopt(shadowNode);
@@ -89,10 +88,6 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   void appendChild(
       const ShadowNode::Shared &parentShadowNode,
       const ShadowNode::Shared &childShadowNode) const override {
-    assert(
-        dynamic_cast<ConcreteShadowNode const *>(parentShadowNode.get()) &&
-        "Provided `parentShadowNode` has an incompatible type.");
-
     auto concreteParentShadowNode =
         std::static_pointer_cast<const ShadowNodeT>(parentShadowNode);
     auto concreteNonConstParentShadowNode =
@@ -101,13 +96,9 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   }
 
   virtual SharedProps cloneProps(
+      const PropsParserContext &context,
       const SharedProps &props,
       const RawProps &rawProps) const override {
-    assert(
-        !props ||
-        dynamic_cast<ConcreteProps const *>(props.get()) &&
-            "Provided `props` has an incompatible type.");
-
     // Optimization:
     // Quite often nodes are constructed with default/empty props: the base
     // `props` object is `null` (there no base because it's not cloning) and the
@@ -117,17 +108,26 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
       return ShadowNodeT::defaultSharedProps();
     }
 
-    rawProps.parse(rawPropsParser_);
+    rawProps.parse(rawPropsParser_, context);
 
-    return ShadowNodeT::Props(rawProps, props);
+    return ShadowNodeT::Props(context, rawProps, props);
   };
 
   virtual SharedProps interpolateProps(
+      const PropsParserContext &context,
       float animationProgress,
       const SharedProps &props,
       const SharedProps &newProps) const override {
     // By default, this does nothing.
-    return cloneProps(newProps, {});
+#ifdef ANDROID
+    // On Android only, the merged props should have the same RawProps as the
+    // final props struct
+    if (newProps != nullptr) {
+      return cloneProps(context, newProps, newProps->rawProps);
+    }
+#endif
+
+    return cloneProps(context, newProps, {});
   };
 
   virtual State::Shared createInitialState(
@@ -153,14 +153,14 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
       return nullptr;
     }
 
-    assert(data && "Provided `data` is nullptr.");
+    react_native_assert(data && "Provided `data` is nullptr.");
 
     return std::make_shared<ConcreteState const>(
         std::static_pointer_cast<ConcreteStateData const>(data),
         *family.getMostRecentState());
   }
 
-  virtual ShadowNodeFamily::Shared createFamily(
+  ShadowNodeFamily::Shared createFamily(
       ShadowNodeFamilyFragment const &fragment,
       SharedEventTarget eventTarget) const override {
     auto eventEmitter = std::make_shared<ConcreteEventEmitter const>(
@@ -173,9 +173,10 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   }
 
  protected:
-  virtual void adopt(UnsharedShadowNode shadowNode) const {
+  virtual void adopt(ShadowNode::Unshared const &shadowNode) const {
     // Default implementation does nothing.
-    assert(shadowNode->getComponentHandle() == getComponentHandle());
+    react_native_assert(
+        shadowNode->getComponentHandle() == getComponentHandle());
   }
 };
 
diff --git a/ReactCommon/react/renderer/core/ConcreteShadowNode.h b/ReactCommon/react/renderer/core/ConcreteShadowNode.h
index e6b842f3c820b9..d441f326a0b2c5 100644
--- a/ReactCommon/react/renderer/core/ConcreteShadowNode.h
+++ b/ReactCommon/react/renderer/core/ConcreteShadowNode.h
@@ -7,9 +7,10 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteState.h>
-#include <react/renderer/core/ConcreteStateTeller.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/StateData.h>
 
@@ -49,7 +50,6 @@ class ConcreteShadowNode : public BaseShadowNodeT {
   using SharedConcreteEventEmitter = std::shared_ptr<EventEmitterT const>;
   using SharedConcreteShadowNode = std::shared_ptr<ConcreteShadowNode const>;
   using ConcreteState = ConcreteState<StateDataT>;
-  using ConcreteStateTeller = ConcreteStateTeller<ConcreteState>;
   using ConcreteStateData = StateDataT;
 
   static ComponentName Name() {
@@ -69,9 +69,11 @@ class ConcreteShadowNode : public BaseShadowNodeT {
   }
 
   static SharedConcreteProps Props(
+      const PropsParserContext &context,
       RawProps const &rawProps,
       SharedProps const &baseProps = nullptr) {
     return std::make_shared<PropsT const>(
+        context,
         baseProps ? static_cast<PropsT const &>(*baseProps) : PropsT(),
         rawProps);
   }
@@ -94,8 +96,9 @@ class ConcreteShadowNode : public BaseShadowNodeT {
    * Thread-safe after the node is sealed.
    */
   ConcreteProps const &getConcreteProps() const {
-    assert(BaseShadowNodeT::props_ && "Props must not be `nullptr`.");
-    assert(
+    react_native_assert(
+        BaseShadowNodeT::props_ && "Props must not be `nullptr`.");
+    react_native_assert(
         std::dynamic_pointer_cast<ConcreteProps const>(props_) &&
         "Props must be an instance of ConcreteProps class.");
     return static_cast<ConcreteProps const &>(*props_);
@@ -106,7 +109,7 @@ class ConcreteShadowNode : public BaseShadowNodeT {
    * Thread-safe after the node is sealed.
    */
   ConcreteEventEmitter const &getConcreteEventEmitter() const {
-    assert(
+    react_native_assert(
         std::dynamic_pointer_cast<ConcreteEventEmitter const>(
             BaseShadowNodeT::getEventEmitter()) &&
         "EventEmitter must be an instance of ConcreteEventEmitter class.");
@@ -119,8 +122,8 @@ class ConcreteShadowNode : public BaseShadowNodeT {
    * Thread-safe after the node is sealed.
    */
   ConcreteStateData const &getStateData() const {
-    assert(state_ && "State must not be `nullptr`.");
-    assert(
+    react_native_assert(state_ && "State must not be `nullptr`.");
+    react_native_assert(
         std::dynamic_pointer_cast<ConcreteState const>(state_) &&
         "State must be an instance of ConcreteState class.");
     return static_cast<ConcreteState const *>(state_.get())->getData();
diff --git a/ReactCommon/react/renderer/core/ConcreteState.h b/ReactCommon/react/renderer/core/ConcreteState.h
index 33fa5dac788398..c4f8bef37e1d2b 100644
--- a/ReactCommon/react/renderer/core/ConcreteState.h
+++ b/ReactCommon/react/renderer/core/ConcreteState.h
@@ -10,6 +10,7 @@
 #include <functional>
 #include <memory>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/State.h>
 
 namespace facebook {
@@ -60,55 +61,23 @@ class ConcreteState : public State {
    */
   void updateState(
       Data &&newData,
-      std::function<void()> failureCallback = nullptr,
       EventPriority priority = EventPriority::AsynchronousUnbatched) const {
     updateState(
-        [data = std::move(newData)](Data const &oldData) mutable -> Data && {
-          return std::move(data);
+        [data{std::move(newData)}](Data const &oldData) -> SharedData {
+          return std::make_shared<Data const>(data);
         },
-        failureCallback,
         priority);
   }
 
   /*
    * Initiate a state update process with a given function (that transforms an
-   * old data value to a new one) and priority. The update function can be
-   * called from any thread any moment later. The function can be called only
-   * once or not called at all (in the case where the node was already unmounted
-   * and updating makes no sense). The state update operation might fail in case
-   * of conflict.
+   * old data value to a new one) and priority. The callback function can be
+   * called from any thread any moment later.
+   * In case of a conflict, the `callback` might be called several times until
+   * it succeeded. To cancel the state update operation, the callback needs to
+   * return `nullptr`.
    */
   void updateState(
-      std::function<Data(Data const &oldData)> callback,
-      std::function<void()> failureCallback = nullptr,
-      EventPriority priority = EventPriority::AsynchronousBatched) const {
-    auto family = family_.lock();
-
-    if (!family) {
-      // No more nodes of this family exist anymore,
-      // updating state is impossible.
-      return;
-    }
-
-    auto stateUpdate = StateUpdate{
-        family,
-        [=](StateData::Shared const &oldData) -> StateData::Shared {
-          assert(oldData);
-          return std::make_shared<Data const>(
-              callback(*std::static_pointer_cast<Data const>(oldData)));
-        },
-        failureCallback,
-        false};
-
-    family->dispatchRawState(std::move(stateUpdate), priority);
-  }
-
-  /*
-   * An experimental version of `updateState` function that re-commit the state
-   * update over and over again until it succeeded. To cancel the state update
-   * operation, the state update lambda needs to return `nullptr`.
-   */
-  void updateStateWithAutorepeat(
       std::function<StateData::Shared(Data const &oldData)> callback,
       EventPriority priority = EventPriority::AsynchronousBatched) const {
     auto family = family_.lock();
@@ -120,14 +89,10 @@ class ConcreteState : public State {
     }
 
     auto stateUpdate = StateUpdate{
-        family,
-        [=](StateData::Shared const &oldData) -> StateData::Shared {
-          assert(oldData);
+        family, [=](StateData::Shared const &oldData) -> StateData::Shared {
+          react_native_assert(oldData);
           return callback(*std::static_pointer_cast<Data const>(oldData));
-        },
-        nullptr,
-        true,
-    };
+        }};
 
     family->dispatchRawState(std::move(stateUpdate), priority);
   }
@@ -137,9 +102,11 @@ class ConcreteState : public State {
     return getData().getDynamic();
   }
 
-  void updateState(folly::dynamic data, std::function<void()> failureCallback)
-      const override {
-    updateState(std::move(Data(getData(), data)), failureCallback);
+  void updateState(folly::dynamic data) const override {
+    updateState(std::move(Data(getData(), data)));
+  }
+  MapBuffer getMapBuffer() const override {
+    return getData().getMapBuffer();
   }
 #endif
 };
diff --git a/ReactCommon/react/renderer/core/ConcreteStateTeller.h b/ReactCommon/react/renderer/core/ConcreteStateTeller.h
deleted file mode 100644
index 2354ae0daaf7ee..00000000000000
--- a/ReactCommon/react/renderer/core/ConcreteStateTeller.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <better/optional.h>
-#include <glog/logging.h>
-#include <react/renderer/core/ConcreteState.h>
-
-namespace facebook {
-namespace react {
-
-/*
- * Wrapper for `ConreteState` class designed to make interactions with
- * ConcreteState easier.
- */
-template <typename ConcreteStateT>
-class ConcreteStateTeller {
- public:
-  using Data = typename ConcreteStateT::Data;
-
-  /*
-   * Sets backing `ConcreteState` on which all the methods will be called.
-   * Can be called from any thread.
-   */
-  void setConcreteState(State::Shared const &state) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    concreteState_ = std::static_pointer_cast<ConcreteStateT const>(state);
-  }
-
-  /*
-   * Removes reference to `ConcreteState` previously set in `setConcreteState`.
-   * Can be called from any thread.
-   */
-  void invalidate() {
-    std::lock_guard<std::mutex> lock(mutex_);
-    concreteState_ = nullptr;
-  }
-
-  /*
-   * Returns data if state isn't nullptr.
-   * Can be called from any thread.
-   */
-  better::optional<Data> getData() const {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (concreteState_) {
-      return concreteState_->getData();
-    } else {
-      return {};
-    }
-  }
-
-  /*
-   * Returns true if backing state isn't nullptr, false otherwise.
-   * Can be called from any thread.
-   */
-  bool isValid() const {
-    std::lock_guard<std::mutex> lock(mutex_);
-    return concreteState_ != nullptr;
-  }
-
-  /*
-   * Initiate a state update process with given new data and priority.
-   * This is a simplified convenience version of the method that receives a
-   * function for cases where a new value of data does not depend on an old
-   * value.
-   */
-  void updateState(
-      Data &&newData,
-      EventPriority priority = EventPriority::AsynchronousUnbatched) const {
-    updateState(
-        [data = std::move(newData)](Data const &oldData) -> Data {
-          return std::move(data);
-        },
-        priority);
-  }
-
-  /*
-   * Initiate a state update process with a given function (that transforms an
-   * old data value to a new one) and priority. The update function can be
-   * called from any thread any moment later. The function can be called only
-   * once or not called at all (in the case where the node was already unmounted
-   * and updating makes no sense). The state update operation might fail in case
-   * of conflict.
-   */
-  void updateState(
-      std::function<Data(Data const &oldData)> callback,
-      EventPriority priority = EventPriority::AsynchronousBatched) const {
-    std::shared_ptr<ConcreteStateT const> concreteState;
-    {
-      std::lock_guard<std::mutex> lock(mutex_);
-      if (!concreteState_) {
-        return;
-      }
-      concreteState = concreteState_;
-    }
-
-    concreteState->updateState(
-        callback,
-        [=]() {
-          updateStateRetryIfNecesarry_(concreteState, callback, priority, 1);
-        },
-        priority);
-  }
-
- private:
-  /*
-   * Protected by `mutex_`.
-   */
-  std::shared_ptr<ConcreteStateT const> concreteState_;
-
-  /*
-   * Protects `concreteState_`.
-   */
-  std::mutex mutable mutex_;
-
-  void updateStateRetryIfNecesarry_(
-      std::shared_ptr<ConcreteStateT const> concreteState,
-      std::function<Data(Data const &oldData)> callback,
-      EventPriority priority,
-      int retryCount) const {
-    {
-      std::lock_guard<std::mutex> lock(mutex_);
-
-      if (concreteState != concreteState_) {
-        LOG(WARNING) << "ConcreteState_ changed while retrying";
-        return;
-      }
-    }
-
-    if (retryCount > 60) {
-      LOG(ERROR) << "Exceeded 60 retries";
-      assert(false);
-      return;
-    }
-
-    concreteState->updateState(
-        callback,
-        [=] {
-          updateStateRetryIfNecesarry_(
-              concreteState, callback, priority, retryCount + 1);
-        },
-        priority);
-  }
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/Constants.cpp b/ReactCommon/react/renderer/core/Constants.cpp
new file mode 100644
index 00000000000000..150473be2889b8
--- /dev/null
+++ b/ReactCommon/react/renderer/core/Constants.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "Constants.h"
+
+namespace facebook {
+namespace react {
+
+static bool isPropsForwardingEnabled = false;
+
+void Constants::setPropsForwardingEnabled(bool propsForwardingEnabled) {
+  isPropsForwardingEnabled = propsForwardingEnabled;
+}
+
+bool Constants::getPropsForwardingEnabled() {
+  return isPropsForwardingEnabled;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerComponentDescriptor.h b/ReactCommon/react/renderer/core/Constants.h
similarity index 53%
rename from ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerComponentDescriptor.h
rename to ReactCommon/react/renderer/core/Constants.h
index cbad671add261c..04b2ba57bc09a7 100644
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDropdownPickerComponentDescriptor.h
+++ b/ReactCommon/react/renderer/core/Constants.h
@@ -7,15 +7,17 @@
 
 #pragma once
 
-#include "AndroidDropdownPickerShadowNode.h"
-
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-
 namespace facebook {
 namespace react {
 
-using AndroidDropdownPickerComponentDescriptor =
-    ConcreteComponentDescriptor<AndroidDropdownPickerShadowNode>;
+struct Constants {
+  /*
+      Flag controlling props forwarding when shadow node is cloned on Android.
+      Has no effect on iOS.
+  */
+  static void setPropsForwardingEnabled(bool propsForwardingEnabled);
+  static bool getPropsForwardingEnabled();
+};
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp b/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp
new file mode 100644
index 00000000000000..428ae4f3b83073
--- /dev/null
+++ b/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "DynamicPropsUtilities.h"
+
+namespace facebook {
+namespace react {
+folly::dynamic mergeDynamicProps(
+    folly::dynamic const &source,
+    folly::dynamic const &patch) {
+  auto result = source;
+
+  if (!result.isObject()) {
+    result = folly::dynamic::object();
+  }
+
+  if (!patch.isObject()) {
+    return result;
+  }
+
+  // Note, here we have to preserve sub-prop objects with `null` value as
+  // an indication for the legacy mounting layer that it needs to clean them up.
+  for (auto const &pair : patch.items()) {
+    result[pair.first] = pair.second;
+  }
+
+  return result;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerState.h b/ReactCommon/react/renderer/core/DynamicPropsUtilities.h
similarity index 68%
rename from ReactCommon/react/renderer/components/picker/iospicker/PickerState.h
rename to ReactCommon/react/renderer/core/DynamicPropsUtilities.h
index fa50b38dfdbf6a..9e7283cb8fc331 100644
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerState.h
+++ b/ReactCommon/react/renderer/core/DynamicPropsUtilities.h
@@ -7,13 +7,14 @@
 
 #pragma once
 
+#include <folly/dynamic.h>
+
 namespace facebook {
 namespace react {
 
-/*
- * State for <Picker> component.
- */
-class PickerState final {};
+folly::dynamic mergeDynamicProps(
+    folly::dynamic const &source,
+    folly::dynamic const &patch);
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/core/EventDispatcher.cpp b/ReactCommon/react/renderer/core/EventDispatcher.cpp
index 8ece2ab3a07aff..3cfe35f3e0cf60 100644
--- a/ReactCommon/react/renderer/core/EventDispatcher.cpp
+++ b/ReactCommon/react/renderer/core/EventDispatcher.cpp
@@ -17,31 +17,25 @@ namespace facebook {
 namespace react {
 
 EventDispatcher::EventDispatcher(
-    EventPipe const &eventPipe,
-    StatePipe const &statePipe,
+    EventQueueProcessor eventProcessor,
     EventBeat::Factory const &synchonousEventBeatFactory,
     EventBeat::Factory const &asynchonousEventBeatFactory,
     EventBeat::SharedOwnerBox const &ownerBox)
     : synchronousUnbatchedQueue_(std::make_unique<UnbatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           synchonousEventBeatFactory(ownerBox))),
       synchronousBatchedQueue_(std::make_unique<BatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           synchonousEventBeatFactory(ownerBox))),
       asynchronousUnbatchedQueue_(std::make_unique<UnbatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           asynchonousEventBeatFactory(ownerBox))),
       asynchronousBatchedQueue_(std::make_unique<BatchedEventQueue>(
-          eventPipe,
-          statePipe,
+          eventProcessor,
           asynchonousEventBeatFactory(ownerBox))) {}
 
-void EventDispatcher::dispatchEvent(
-    RawEvent const &rawEvent,
-    EventPriority priority) const {
+void EventDispatcher::dispatchEvent(RawEvent &&rawEvent, EventPriority priority)
+    const {
   getEventQueue(priority).enqueueEvent(std::move(rawEvent));
 }
 
@@ -51,8 +45,8 @@ void EventDispatcher::dispatchStateUpdate(
   getEventQueue(priority).enqueueStateUpdate(std::move(stateUpdate));
 }
 
-void EventDispatcher::dispatchUniqueEvent(RawEvent const &rawEvent) const {
-  asynchronousBatchedQueue_->enqueueUniqueEvent(rawEvent);
+void EventDispatcher::dispatchUniqueEvent(RawEvent &&rawEvent) const {
+  asynchronousBatchedQueue_->enqueueUniqueEvent(std::move(rawEvent));
 }
 
 const EventQueue &EventDispatcher::getEventQueue(EventPriority priority) const {
diff --git a/ReactCommon/react/renderer/core/EventDispatcher.h b/ReactCommon/react/renderer/core/EventDispatcher.h
index d3fb37c132754f..f81ccd7cc26861 100644
--- a/ReactCommon/react/renderer/core/EventDispatcher.h
+++ b/ReactCommon/react/renderer/core/EventDispatcher.h
@@ -7,21 +7,17 @@
 
 #pragma once
 
-#include <array>
-#include <memory>
-
 #include <react/renderer/core/BatchedEventQueue.h>
 #include <react/renderer/core/EventBeat.h>
-#include <react/renderer/core/EventPipe.h>
 #include <react/renderer/core/EventPriority.h>
-#include <react/renderer/core/StatePipe.h>
+#include <react/renderer/core/EventQueueProcessor.h>
 #include <react/renderer/core/StateUpdate.h>
 #include <react/renderer/core/UnbatchedEventQueue.h>
 
 namespace facebook {
 namespace react {
 
-class RawEvent;
+struct RawEvent;
 
 /*
  * Represents event-delivery infrastructure.
@@ -33,8 +29,7 @@ class EventDispatcher {
   using Weak = std::weak_ptr<EventDispatcher const>;
 
   EventDispatcher(
-      EventPipe const &eventPipe,
-      StatePipe const &statePipe,
+      EventQueueProcessor eventProcessor,
       EventBeat::Factory const &synchonousEventBeatFactory,
       EventBeat::Factory const &asynchonousEventBeatFactory,
       EventBeat::SharedOwnerBox const &ownerBox);
@@ -42,14 +37,14 @@ class EventDispatcher {
   /*
    * Dispatches a raw event with given priority using event-delivery pipe.
    */
-  void dispatchEvent(RawEvent const &rawEvent, EventPriority priority) const;
+  void dispatchEvent(RawEvent &&rawEvent, EventPriority priority) const;
 
   /*
    * Dispatches a raw event with asynchronous batched priority. Before the
    * dispatch we make sure that no other RawEvent of same type and same target
    * is on the queue.
    */
-  void dispatchUniqueEvent(RawEvent const &rawEvent) const;
+  void dispatchUniqueEvent(RawEvent &&rawEvent) const;
 
   /*
    * Dispatches a state update with given priority.
diff --git a/ReactCommon/react/renderer/core/EventEmitter.cpp b/ReactCommon/react/renderer/core/EventEmitter.cpp
index 54a0c8154b2acb..f1752192ce7b69 100644
--- a/ReactCommon/react/renderer/core/EventEmitter.cpp
+++ b/ReactCommon/react/renderer/core/EventEmitter.cpp
@@ -26,7 +26,7 @@ static std::string normalizeEventType(const std::string &type) {
   auto prefixedType = type;
   if (type.find("top", 0) != 0) {
     prefixedType.insert(0, "top");
-    prefixedType[3] = toupper(prefixedType[3]);
+    prefixedType[3] = static_cast<char>(toupper(prefixedType[3]));
   }
   return prefixedType;
 }
@@ -52,19 +52,25 @@ EventEmitter::EventEmitter(
 void EventEmitter::dispatchEvent(
     const std::string &type,
     const folly::dynamic &payload,
-    const EventPriority &priority) const {
-  dispatchEvent(
-      type,
-      [payload](jsi::Runtime &runtime) {
-        return valueFromDynamic(runtime, payload);
-      },
-      priority);
+    EventPriority priority) const {
+  dispatchEvent(type, [payload](jsi::Runtime &runtime) {
+    return valueFromDynamic(runtime, payload);
+  });
+}
+
+void EventEmitter::dispatchUniqueEvent(
+    const std::string &type,
+    const folly::dynamic &payload) const {
+  dispatchUniqueEvent(type, [payload](jsi::Runtime &runtime) {
+    return valueFromDynamic(runtime, payload);
+  });
 }
 
 void EventEmitter::dispatchEvent(
     const std::string &type,
     const ValueFactory &payloadFactory,
-    const EventPriority &priority) const {
+    EventPriority priority,
+    RawEvent::Category category) const {
   SystraceSection s("EventEmitter::dispatchEvent");
 
   auto eventDispatcher = eventDispatcher_.lock();
@@ -73,7 +79,8 @@ void EventEmitter::dispatchEvent(
   }
 
   eventDispatcher->dispatchEvent(
-      RawEvent(normalizeEventType(type), payloadFactory, eventTarget_),
+      RawEvent(
+          normalizeEventType(type), payloadFactory, eventTarget_, category),
       priority);
 }
 
@@ -87,8 +94,11 @@ void EventEmitter::dispatchUniqueEvent(
     return;
   }
 
-  eventDispatcher->dispatchUniqueEvent(
-      RawEvent(normalizeEventType(type), payloadFactory, eventTarget_));
+  eventDispatcher->dispatchUniqueEvent(RawEvent(
+      normalizeEventType(type),
+      payloadFactory,
+      eventTarget_,
+      RawEvent::Category::Continuous));
 }
 
 void EventEmitter::setEnabled(bool enabled) const {
diff --git a/ReactCommon/react/renderer/core/EventEmitter.h b/ReactCommon/react/renderer/core/EventEmitter.h
index 55bdf8f040158c..cb3caa465d2ba0 100644
--- a/ReactCommon/react/renderer/core/EventEmitter.h
+++ b/ReactCommon/react/renderer/core/EventEmitter.h
@@ -71,12 +71,17 @@ class EventEmitter {
       const std::string &type,
       const ValueFactory &payloadFactory =
           EventEmitter::defaultPayloadFactory(),
-      const EventPriority &priority = EventPriority::AsynchronousBatched) const;
+      EventPriority priority = EventPriority::AsynchronousBatched,
+      RawEvent::Category category = RawEvent::Category::Unspecified) const;
 
   void dispatchEvent(
       const std::string &type,
       const folly::dynamic &payload,
-      const EventPriority &priority = EventPriority::AsynchronousBatched) const;
+      EventPriority priority = EventPriority::AsynchronousBatched) const;
+
+  void dispatchUniqueEvent(
+      const std::string &type,
+      const folly::dynamic &payload) const;
 
   void dispatchUniqueEvent(
       const std::string &type,
diff --git a/ReactCommon/react/renderer/core/EventPipe.h b/ReactCommon/react/renderer/core/EventPipe.h
index b0264579ae0409..3e9ac127e6bb06 100644
--- a/ReactCommon/react/renderer/core/EventPipe.h
+++ b/ReactCommon/react/renderer/core/EventPipe.h
@@ -12,6 +12,7 @@
 
 #include <jsi/jsi.h>
 #include <react/renderer/core/EventTarget.h>
+#include <react/renderer/core/ReactEventPriority.h>
 #include <react/renderer/core/ValueFactory.h>
 
 namespace facebook {
@@ -21,6 +22,7 @@ using EventPipe = std::function<void(
     jsi::Runtime &runtime,
     const EventTarget *eventTarget,
     const std::string &type,
+    ReactEventPriority priority,
     const ValueFactory &payloadFactory)>;
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/EventPriority.h b/ReactCommon/react/renderer/core/EventPriority.h
index 61e3ad39dbdf5e..8611f105800e0e 100644
--- a/ReactCommon/react/renderer/core/EventPriority.h
+++ b/ReactCommon/react/renderer/core/EventPriority.h
@@ -10,7 +10,7 @@
 namespace facebook {
 namespace react {
 
-enum class EventPriority : int {
+enum class EventPriority {
   SynchronousUnbatched,
   SynchronousBatched,
   AsynchronousUnbatched,
diff --git a/ReactCommon/react/renderer/core/EventQueue.cpp b/ReactCommon/react/renderer/core/EventQueue.cpp
index 2db952292ff9ea..4d10e4c74423ac 100644
--- a/ReactCommon/react/renderer/core/EventQueue.cpp
+++ b/ReactCommon/react/renderer/core/EventQueue.cpp
@@ -14,26 +14,54 @@ namespace facebook {
 namespace react {
 
 EventQueue::EventQueue(
-    EventPipe eventPipe,
-    StatePipe statePipe,
+    EventQueueProcessor eventProcessor,
     std::unique_ptr<EventBeat> eventBeat)
-    : eventPipe_(std::move(eventPipe)),
-      statePipe_(std::move(statePipe)),
+    : eventProcessor_(std::move(eventProcessor)),
       eventBeat_(std::move(eventBeat)) {
   eventBeat_->setBeatCallback(
       std::bind(&EventQueue::onBeat, this, std::placeholders::_1));
 }
 
-void EventQueue::enqueueEvent(const RawEvent &rawEvent) const {
+void EventQueue::enqueueEvent(RawEvent &&rawEvent) const {
   {
     std::lock_guard<std::mutex> lock(queueMutex_);
-    eventQueue_.push_back(rawEvent);
+    eventQueue_.push_back(std::move(rawEvent));
   }
 
   onEnqueue();
 }
 
-void EventQueue::enqueueStateUpdate(const StateUpdate &stateUpdate) const {
+void EventQueue::enqueueUniqueEvent(RawEvent &&rawEvent) const {
+  {
+    std::lock_guard<std::mutex> lock(queueMutex_);
+
+    auto repeatedEvent = eventQueue_.rend();
+
+    for (auto it = eventQueue_.rbegin(); it != eventQueue_.rend(); ++it) {
+      if (it->type == rawEvent.type &&
+          it->eventTarget == rawEvent.eventTarget) {
+        repeatedEvent = it;
+        break;
+      } else if (it->eventTarget == rawEvent.eventTarget) {
+        // It is necessary to maintain order of different event types
+        // for the same target. If the same target has event types A1, B1
+        // in the event queue and event A2 occurs. A1 has to stay in the
+        // queue.
+        break;
+      }
+    }
+
+    if (repeatedEvent == eventQueue_.rend()) {
+      eventQueue_.push_back(std::move(rawEvent));
+    } else {
+      *repeatedEvent = std::move(rawEvent);
+    }
+  }
+
+  onEnqueue();
+}
+
+void EventQueue::enqueueStateUpdate(StateUpdate &&stateUpdate) const {
   {
     std::lock_guard<std::mutex> lock(queueMutex_);
     if (!stateUpdateQueue_.empty()) {
@@ -42,19 +70,15 @@ void EventQueue::enqueueStateUpdate(const StateUpdate &stateUpdate) const {
         stateUpdateQueue_.pop_back();
       }
     }
-    stateUpdateQueue_.push_back(stateUpdate);
+    stateUpdateQueue_.push_back(std::move(stateUpdate));
   }
 
   onEnqueue();
 }
 
-void EventQueue::onEnqueue() const {
-  // Default implementation does nothing.
-}
-
 void EventQueue::onBeat(jsi::Runtime &runtime) const {
-  flushEvents(runtime);
   flushStateUpdates();
+  flushEvents(runtime);
 }
 
 void EventQueue::flushEvents(jsi::Runtime &runtime) const {
@@ -71,30 +95,7 @@ void EventQueue::flushEvents(jsi::Runtime &runtime) const {
     eventQueue_.clear();
   }
 
-  {
-    std::lock_guard<std::mutex> lock(EventEmitter::DispatchMutex());
-
-    for (const auto &event : queue) {
-      if (event.eventTarget) {
-        event.eventTarget->retain(runtime);
-      }
-    }
-  }
-
-  for (const auto &event : queue) {
-    eventPipe_(
-        runtime, event.eventTarget.get(), event.type, event.payloadFactory);
-  }
-
-  // No need to lock `EventEmitter::DispatchMutex()` here.
-  // The mutex protects from a situation when the `instanceHandle` can be
-  // deallocated during accessing, but that's impossible at this point because
-  // we have a strong pointer to it.
-  for (const auto &event : queue) {
-    if (event.eventTarget) {
-      event.eventTarget->release(runtime);
-    }
-  }
+  eventProcessor_.flushEvents(runtime, std::move(queue));
 }
 
 void EventQueue::flushStateUpdates() const {
@@ -111,9 +112,7 @@ void EventQueue::flushStateUpdates() const {
     stateUpdateQueue_.clear();
   }
 
-  for (const auto &stateUpdate : stateUpdateQueue) {
-    statePipe_(stateUpdate);
-  }
+  eventProcessor_.flushStateUpdates(std::move(stateUpdateQueue));
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/EventQueue.h b/ReactCommon/react/renderer/core/EventQueue.h
index ab6bac9ac3bbf2..d0f9da84426dfa 100644
--- a/ReactCommon/react/renderer/core/EventQueue.h
+++ b/ReactCommon/react/renderer/core/EventQueue.h
@@ -13,9 +13,8 @@
 
 #include <jsi/jsi.h>
 #include <react/renderer/core/EventBeat.h>
-#include <react/renderer/core/EventPipe.h>
+#include <react/renderer/core/EventQueueProcessor.h>
 #include <react/renderer/core/RawEvent.h>
-#include <react/renderer/core/StatePipe.h>
 #include <react/renderer/core/StateUpdate.h>
 
 namespace facebook {
@@ -28,8 +27,7 @@ namespace react {
 class EventQueue {
  public:
   EventQueue(
-      EventPipe eventPipe,
-      StatePipe statePipe,
+      EventQueueProcessor eventProcessor,
       std::unique_ptr<EventBeat> eventBeat);
   virtual ~EventQueue() = default;
 
@@ -37,13 +35,20 @@ class EventQueue {
    * Enqueues and (probably later) dispatch a given event.
    * Can be called on any thread.
    */
-  void enqueueEvent(const RawEvent &rawEvent) const;
+  void enqueueEvent(RawEvent &&rawEvent) const;
+
+  /*
+   * Enqueues and (probably later) dispatches a given event.
+   * Deletes last RawEvent from the queue if it has the same type and target.
+   * Can be called on any thread.
+   */
+  void enqueueUniqueEvent(RawEvent &&rawEvent) const;
 
   /*
    * Enqueues and (probably later) dispatch a given state update.
    * Can be called on any thread.
    */
-  void enqueueStateUpdate(const StateUpdate &stateUpdate) const;
+  void enqueueStateUpdate(StateUpdate &&stateUpdate) const;
 
  protected:
   /*
@@ -51,19 +56,20 @@ class EventQueue {
    * Override in subclasses to trigger beat `request` and/or beat `induce`.
    * Default implementation does nothing.
    */
-  virtual void onEnqueue() const;
+  virtual void onEnqueue() const = 0;
   void onBeat(jsi::Runtime &runtime) const;
 
   void flushEvents(jsi::Runtime &runtime) const;
   void flushStateUpdates() const;
 
-  const EventPipe eventPipe_;
-  const StatePipe statePipe_;
+  EventQueueProcessor eventProcessor_;
+
   const std::unique_ptr<EventBeat> eventBeat_;
   // Thread-safe, protected by `queueMutex_`.
   mutable std::vector<RawEvent> eventQueue_;
   mutable std::vector<StateUpdate> stateUpdateQueue_;
   mutable std::mutex queueMutex_;
+  mutable bool hasContinuousEventStarted_{false};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/EventQueueProcessor.cpp b/ReactCommon/react/renderer/core/EventQueueProcessor.cpp
new file mode 100644
index 00000000000000..40b813e155aa93
--- /dev/null
+++ b/ReactCommon/react/renderer/core/EventQueueProcessor.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "EventQueue.h"
+
+#include "EventEmitter.h"
+#include "ShadowNodeFamily.h"
+
+namespace facebook {
+namespace react {
+
+EventQueueProcessor::EventQueueProcessor(
+    EventPipe eventPipe,
+    StatePipe statePipe)
+    : eventPipe_(std::move(eventPipe)), statePipe_(std::move(statePipe)) {}
+
+void EventQueueProcessor::flushEvents(
+    jsi::Runtime &runtime,
+    std::vector<RawEvent> &&events) const {
+  {
+    std::lock_guard<std::mutex> lock(EventEmitter::DispatchMutex());
+
+    for (const auto &event : events) {
+      if (event.eventTarget) {
+        event.eventTarget->retain(runtime);
+      }
+    }
+  }
+
+  for (auto const &event : events) {
+    if (event.category == RawEvent::Category::ContinuousEnd) {
+      hasContinuousEventStarted_ = false;
+    }
+
+    auto reactPriority = hasContinuousEventStarted_
+        ? ReactEventPriority::Default
+        : ReactEventPriority::Discrete;
+
+    if (event.category == RawEvent::Category::Continuous) {
+      reactPriority = ReactEventPriority::Default;
+    }
+
+    if (event.category == RawEvent::Category::Discrete) {
+      reactPriority = ReactEventPriority::Discrete;
+    }
+
+    eventPipe_(
+        runtime,
+        event.eventTarget.get(),
+        event.type,
+        reactPriority,
+        event.payloadFactory);
+
+    if (event.category == RawEvent::Category::ContinuousStart) {
+      hasContinuousEventStarted_ = true;
+    }
+  }
+
+  // No need to lock `EventEmitter::DispatchMutex()` here.
+  // The mutex protects from a situation when the `instanceHandle` can be
+  // deallocated during accessing, but that's impossible at this point because
+  // we have a strong pointer to it.
+  for (const auto &event : events) {
+    if (event.eventTarget) {
+      event.eventTarget->release(runtime);
+    }
+  }
+}
+
+void EventQueueProcessor::flushStateUpdates(
+    std::vector<StateUpdate> &&states) const {
+  for (const auto &stateUpdate : states) {
+    statePipe_(stateUpdate);
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/EventQueueProcessor.h b/ReactCommon/react/renderer/core/EventQueueProcessor.h
new file mode 100644
index 00000000000000..933cc9a207961c
--- /dev/null
+++ b/ReactCommon/react/renderer/core/EventQueueProcessor.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <vector>
+
+#include <jsi/jsi.h>
+#include <react/renderer/core/EventPipe.h>
+#include <react/renderer/core/RawEvent.h>
+#include <react/renderer/core/StatePipe.h>
+#include <react/renderer/core/StateUpdate.h>
+
+namespace facebook {
+namespace react {
+
+class EventQueueProcessor {
+ public:
+  EventQueueProcessor(EventPipe eventPipe, StatePipe statePipe);
+
+  void flushEvents(jsi::Runtime &runtime, std::vector<RawEvent> &&events) const;
+  void flushStateUpdates(std::vector<StateUpdate> &&states) const;
+
+ private:
+  EventPipe const eventPipe_;
+  StatePipe const statePipe_;
+
+  mutable bool hasContinuousEventStarted_{false};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/EventTarget.cpp b/ReactCommon/react/renderer/core/EventTarget.cpp
index 01a5a77bd50f48..b8d84547016ade 100644
--- a/ReactCommon/react/renderer/core/EventTarget.cpp
+++ b/ReactCommon/react/renderer/core/EventTarget.cpp
@@ -7,6 +7,8 @@
 
 #include "EventTarget.h"
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
@@ -38,8 +40,8 @@ void EventTarget::retain(jsi::Runtime &runtime) const {
   // particular implementation of JSI was able to detect this inconsistency and
   // dealt with it, but some JSI implementation may not support this feature and
   // that case will lead to a crash in those environments.
-  assert(!strongInstanceHandle_.isNull());
-  assert(!strongInstanceHandle_.isUndefined());
+  react_native_assert(!strongInstanceHandle_.isNull());
+  react_native_assert(!strongInstanceHandle_.isUndefined());
 }
 
 void EventTarget::release(jsi::Runtime &runtime) const {
diff --git a/ReactCommon/react/renderer/core/LayoutConstraints.h b/ReactCommon/react/renderer/core/LayoutConstraints.h
index 5f838b5e4f2bab..26b4c419e38c6b 100644
--- a/ReactCommon/react/renderer/core/LayoutConstraints.h
+++ b/ReactCommon/react/renderer/core/LayoutConstraints.h
@@ -21,8 +21,9 @@ namespace react {
  */
 struct LayoutConstraints {
   Size minimumSize{0, 0};
-  Size maximumSize{std::numeric_limits<Float>::infinity(),
-                   std::numeric_limits<Float>::infinity()};
+  Size maximumSize{
+      std::numeric_limits<Float>::infinity(),
+      std::numeric_limits<Float>::infinity()};
   LayoutDirection layoutDirection{LayoutDirection::Undefined};
 
   /*
@@ -39,6 +40,12 @@ inline bool operator==(
       std::tie(rhs.minimumSize, rhs.maximumSize, rhs.layoutDirection);
 }
 
+inline bool operator!=(
+    const LayoutConstraints &lhs,
+    const LayoutConstraints &rhs) {
+  return !(lhs == rhs);
+}
+
 } // namespace react
 } // namespace facebook
 
diff --git a/ReactCommon/react/renderer/core/LayoutMetrics.cpp b/ReactCommon/react/renderer/core/LayoutMetrics.cpp
new file mode 100644
index 00000000000000..26a3feaafeb5b9
--- /dev/null
+++ b/ReactCommon/react/renderer/core/LayoutMetrics.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/debug/flags.h>
+
+#include "LayoutMetrics.h"
+
+namespace facebook {
+namespace react {
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+
+std::string getDebugName(LayoutMetrics const &object) {
+  return "LayoutMetrics";
+}
+
+std::vector<DebugStringConvertibleObject> getDebugProps(
+    LayoutMetrics const &object,
+    DebugStringConvertibleOptions options) {
+  return {
+      {"frame",
+       "{x:" + getDebugDescription(object.frame.origin.x, {}) +
+           ",y:" + getDebugDescription(object.frame.origin.y, {}) +
+           ",width:" + getDebugDescription(object.frame.size.width, {}) +
+           ",height:" + getDebugDescription(object.frame.size.height, {}) +
+           "}"},
+      {"contentInsets",
+       "{top:" + getDebugDescription(object.contentInsets.top, {}) +
+           ",right:" + getDebugDescription(object.contentInsets.right, {}) +
+           ",bottom:" + getDebugDescription(object.contentInsets.bottom, {}) +
+           ",left:" + getDebugDescription(object.contentInsets.left, {}) + "}"},
+      {"borderWidth",
+       "{top:" + getDebugDescription(object.borderWidth.top, {}) +
+           ",right:" + getDebugDescription(object.borderWidth.right, {}) +
+           ",bottom:" + getDebugDescription(object.borderWidth.bottom, {}) +
+           ",left:" + getDebugDescription(object.borderWidth.left, {}) + "}"},
+      {"overflowInset",
+       "{top:" + getDebugDescription(object.overflowInset.top, {}) +
+           ",right:" + getDebugDescription(object.overflowInset.right, {}) +
+           ",bottom:" + getDebugDescription(object.overflowInset.bottom, {}) +
+           ",left:" + getDebugDescription(object.overflowInset.left, {}) + "}"},
+      {"displayType",
+       object.displayType == DisplayType::None
+           ? "None"
+           : (object.displayType == DisplayType::Flex ? "Flex" : "Inline")},
+      {"layoutDirection",
+       object.layoutDirection == LayoutDirection::Undefined
+           ? "Undefined"
+           : (object.layoutDirection == LayoutDirection::LeftToRight
+                  ? "LeftToRight"
+                  : "RightToLeft")},
+      {"pointScaleFactor",
+       getDebugDescription(object.pointScaleFactor, options)},
+  };
+}
+
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/LayoutMetrics.h b/ReactCommon/react/renderer/core/LayoutMetrics.h
index 603a56beab867e..f094e2c55276e7 100644
--- a/ReactCommon/react/renderer/core/LayoutMetrics.h
+++ b/ReactCommon/react/renderer/core/LayoutMetrics.h
@@ -7,7 +7,10 @@
 
 #pragma once
 
+#include <folly/Hash.h>
 #include <react/renderer/core/LayoutPrimitives.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/debug/flags.h>
 #include <react/renderer/graphics/Geometry.h>
 
 namespace facebook {
@@ -28,8 +31,9 @@ struct LayoutMetrics {
   Rect getContentFrame() const {
     return Rect{
         Point{contentInsets.left, contentInsets.top},
-        Size{frame.size.width - contentInsets.left - contentInsets.right,
-             frame.size.height - contentInsets.top - contentInsets.bottom}};
+        Size{
+            frame.size.width - contentInsets.left - contentInsets.right,
+            frame.size.height - contentInsets.top - contentInsets.bottom}};
   }
 
   bool operator==(const LayoutMetrics &rhs) const {
@@ -39,14 +43,16 @@ struct LayoutMetrics {
                this->borderWidth,
                this->displayType,
                this->layoutDirection,
-               this->pointScaleFactor) ==
+               this->pointScaleFactor,
+               this->overflowInset) ==
         std::tie(
                rhs.frame,
                rhs.contentInsets,
                rhs.borderWidth,
                rhs.displayType,
                rhs.layoutDirection,
-               rhs.pointScaleFactor);
+               rhs.pointScaleFactor,
+               rhs.overflowInset);
   }
 
   bool operator!=(const LayoutMetrics &rhs) const {
@@ -62,5 +68,33 @@ struct LayoutMetrics {
 static LayoutMetrics const EmptyLayoutMetrics = {
     /* .frame = */ {{0, 0}, {-1.0, -1.0}}};
 
+#ifdef RN_DEBUG_STRING_CONVERTIBLE
+
+std::string getDebugName(LayoutMetrics const &object);
+std::vector<DebugStringConvertibleObject> getDebugProps(
+    LayoutMetrics const &object,
+    DebugStringConvertibleOptions options);
+
+#endif
+
 } // namespace react
 } // namespace facebook
+
+namespace std {
+
+template <>
+struct hash<facebook::react::LayoutMetrics> {
+  size_t operator()(const facebook::react::LayoutMetrics &layoutMetrics) const {
+    return folly::hash::hash_combine(
+        0,
+        layoutMetrics.frame,
+        layoutMetrics.contentInsets,
+        layoutMetrics.borderWidth,
+        layoutMetrics.displayType,
+        layoutMetrics.layoutDirection,
+        layoutMetrics.pointScaleFactor,
+        layoutMetrics.overflowInset);
+  }
+};
+
+} // namespace std
diff --git a/ReactCommon/react/renderer/core/LayoutPrimitives.h b/ReactCommon/react/renderer/core/LayoutPrimitives.h
index 14ae19126480c3..b0981f6f73677f 100644
--- a/ReactCommon/react/renderer/core/LayoutPrimitives.h
+++ b/ReactCommon/react/renderer/core/LayoutPrimitives.h
@@ -18,18 +18,18 @@ namespace react {
  * engine which should be used for laying out the node.
  */
 enum class DisplayType {
-  None,
-  Flex,
-  Inline,
+  None = 0,
+  Flex = 1,
+  Inline = 2,
 };
 
 /*
  * User interface layout direction.
  */
 enum class LayoutDirection {
-  Undefined,
-  LeftToRight,
-  RightToLeft,
+  Undefined = 0,
+  LeftToRight = 1,
+  RightToLeft = 2,
 };
 
 } // namespace react
@@ -42,4 +42,12 @@ struct hash<facebook::react::LayoutDirection> {
     return hash<int>()(static_cast<int>(v));
   }
 };
+
+template <>
+struct hash<facebook::react::DisplayType> {
+  size_t operator()(const facebook::react::DisplayType &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
 } // namespace std
diff --git a/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
index 3809740c83e72d..a1ad4dda15f72f 100644
--- a/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
+++ b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
@@ -159,13 +159,6 @@ Point LayoutableShadowNode::getContentOriginOffset() const {
   return {0, 0};
 }
 
-LayoutMetrics LayoutableShadowNode::getRelativeLayoutMetrics(
-    LayoutableShadowNode const &ancestorLayoutableShadowNode,
-    LayoutInspectingPolicy policy) const {
-  return computeRelativeLayoutMetrics(
-      getFamily(), ancestorLayoutableShadowNode, policy);
-}
-
 LayoutableShadowNode::UnsharedList
 LayoutableShadowNode::getLayoutableChildNodes() const {
   LayoutableShadowNode::UnsharedList layoutableChildren;
@@ -223,7 +216,7 @@ ShadowNode::Shared LayoutableShadowNode::findNodeAtPoint(
     ShadowNode::Shared node,
     Point point) {
   auto layoutableShadowNode =
-      dynamic_cast<const LayoutableShadowNode *>(node.get());
+      traitCast<const LayoutableShadowNode *>(node.get());
 
   if (!layoutableShadowNode) {
     return nullptr;
diff --git a/ReactCommon/react/renderer/core/LayoutableShadowNode.h b/ReactCommon/react/renderer/core/LayoutableShadowNode.h
index 83ad3273a1397b..b816b54a2cfcad 100644
--- a/ReactCommon/react/renderer/core/LayoutableShadowNode.h
+++ b/ReactCommon/react/renderer/core/LayoutableShadowNode.h
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include <better/small_vector.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
@@ -122,21 +123,6 @@ class LayoutableShadowNode : public ShadowNode {
    */
   virtual Point getContentOriginOffset() const;
 
-  /*
-   * Returns layout metrics relatively to the given ancestor node.
-   * Uses `computeRelativeLayoutMetrics()` under the hood.
-   */
-  LayoutMetrics getRelativeLayoutMetrics(
-      ShadowNodeFamily const &descendantNodeFamily,
-      LayoutInspectingPolicy policy) const;
-
-  /*
-   * Returns layout metrics relatively to the given ancestor node.
-   */
-  LayoutMetrics getRelativeLayoutMetrics(
-      LayoutableShadowNode const &ancestorLayoutableShadowNode,
-      LayoutInspectingPolicy policy) const;
-
   /*
    * Sets layout metrics for the shadow node.
    */
@@ -184,10 +170,7 @@ inline LayoutableShadowNode const &traitCast<LayoutableShadowNode const &>(
     ShadowNode const &shadowNode) {
   bool castable =
       shadowNode.getTraits().check(ShadowNodeTraits::Trait::LayoutableKind);
-  assert(
-      castable ==
-      (dynamic_cast<LayoutableShadowNode const *>(&shadowNode) != nullptr));
-  assert(castable);
+  react_native_assert(castable);
   (void)castable;
   return static_cast<LayoutableShadowNode const &>(shadowNode);
 }
@@ -200,9 +183,6 @@ inline LayoutableShadowNode const *traitCast<LayoutableShadowNode const *>(
   }
   bool castable =
       shadowNode->getTraits().check(ShadowNodeTraits::Trait::LayoutableKind);
-  assert(
-      castable ==
-      (dynamic_cast<LayoutableShadowNode const *>(shadowNode) != nullptr));
   if (!castable) {
     return nullptr;
   }
diff --git a/ReactCommon/react/renderer/core/Props.cpp b/ReactCommon/react/renderer/core/Props.cpp
index 79d6777691f368..f502fccfdf241b 100644
--- a/ReactCommon/react/renderer/core/Props.cpp
+++ b/ReactCommon/react/renderer/core/Props.cpp
@@ -13,8 +13,16 @@
 namespace facebook {
 namespace react {
 
-Props::Props(const Props &sourceProps, const RawProps &rawProps)
-    : nativeId(convertRawProp(rawProps, "nativeID", sourceProps.nativeId, {})),
+Props::Props(
+    const PropsParserContext &context,
+    const Props &sourceProps,
+    const RawProps &rawProps)
+    : nativeId(convertRawProp(
+          context,
+          rawProps,
+          "nativeID",
+          sourceProps.nativeId,
+          {})),
       revision(sourceProps.revision + 1)
 #ifdef ANDROID
       ,
diff --git a/ReactCommon/react/renderer/core/Props.h b/ReactCommon/react/renderer/core/Props.h
index 5653509fd7adf3..3321310b433f16 100644
--- a/ReactCommon/react/renderer/core/Props.h
+++ b/ReactCommon/react/renderer/core/Props.h
@@ -9,6 +9,7 @@
 
 #include <folly/dynamic.h>
 
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/Sealable.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
@@ -28,7 +29,10 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible {
   using Shared = std::shared_ptr<Props const>;
 
   Props() = default;
-  Props(Props const &sourceProps, RawProps const &rawProps);
+  Props(
+      const PropsParserContext &context,
+      const Props &sourceProps,
+      RawProps const &rawProps);
   virtual ~Props() = default;
 
   std::string nativeId;
diff --git a/ReactCommon/react/renderer/core/PropsParserContext.h b/ReactCommon/react/renderer/core/PropsParserContext.h
new file mode 100644
index 00000000000000..9b9d10d2dcb2fe
--- /dev/null
+++ b/ReactCommon/react/renderer/core/PropsParserContext.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/utils/ContextContainer.h>
+
+namespace facebook {
+namespace react {
+
+// For props requiring some context to parse, this toolbox can be used.
+// It should be used as infrequently as possible - most props can and should
+// be parsed without any context.
+struct PropsParserContext {
+  // Non-copyable
+  PropsParserContext(const PropsParserContext &) = delete;
+  PropsParserContext &operator=(const PropsParserContext &) = delete;
+
+  int surfaceId; // TODO: use SurfaceId type
+  const ContextContainer &contextContainer;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/RawEvent.cpp b/ReactCommon/react/renderer/core/RawEvent.cpp
index 7782e7cbe8bdfc..3abace5171e2e0 100644
--- a/ReactCommon/react/renderer/core/RawEvent.cpp
+++ b/ReactCommon/react/renderer/core/RawEvent.cpp
@@ -13,10 +13,12 @@ namespace react {
 RawEvent::RawEvent(
     std::string type,
     ValueFactory payloadFactory,
-    SharedEventTarget eventTarget)
+    SharedEventTarget eventTarget,
+    Category category)
     : type(std::move(type)),
       payloadFactory(std::move(payloadFactory)),
-      eventTarget(std::move(eventTarget)) {}
+      eventTarget(std::move(eventTarget)),
+      category(category) {}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/core/RawEvent.h b/ReactCommon/react/renderer/core/RawEvent.h
index 03286a2ac089c4..fc3de781d2b8b3 100644
--- a/ReactCommon/react/renderer/core/RawEvent.h
+++ b/ReactCommon/react/renderer/core/RawEvent.h
@@ -19,16 +19,53 @@ namespace react {
 /*
  * Represents ready-to-dispatch event object.
  */
-class RawEvent {
- public:
+struct RawEvent {
+  /*
+   * Defines category of a native platform event. This is used to deduce types
+   * of events for Concurrent Mode.
+   */
+  enum class Category {
+    /*
+     * Start of a continuous event. To be used with touchStart.
+     */
+    ContinuousStart,
+
+    /*
+     * End of a continuous event. To be used with touchEnd.
+     */
+    ContinuousEnd,
+
+    /*
+     * Priority for this event will be determined from other events in the
+     * queue. If it is triggered by continuous event, its priority will be
+     * default. If it is not triggered by continuous event, its priority will be
+     * discrete.
+     */
+    Unspecified,
+
+    /*
+     * Forces discrete type for the event. Regardless if continuous event is
+     * ongoing.
+     */
+    Discrete,
+
+    /*
+     * Forces continuous type for the event. Regardless if continuous event
+     * isn't ongoing.
+     */
+    Continuous
+  };
+
   RawEvent(
       std::string type,
       ValueFactory payloadFactory,
-      SharedEventTarget eventTarget);
+      SharedEventTarget eventTarget,
+      Category category = Category::Unspecified);
 
   std::string type;
   ValueFactory payloadFactory;
   SharedEventTarget eventTarget;
+  Category category;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/RawProps.cpp b/ReactCommon/react/renderer/core/RawProps.cpp
index fd55f40c0c5a13..4776ce5ac81086 100644
--- a/ReactCommon/react/renderer/core/RawProps.cpp
+++ b/ReactCommon/react/renderer/core/RawProps.cpp
@@ -7,6 +7,7 @@
 
 #include "RawProps.h"
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/RawPropsParser.h>
 
 namespace facebook {
@@ -46,8 +47,9 @@ RawProps::RawProps(folly::dynamic const &dynamic) noexcept {
   dynamic_ = dynamic;
 }
 
-void RawProps::parse(RawPropsParser const &parser) const noexcept {
-  assert(parser_ == nullptr && "A parser was already assigned.");
+void RawProps::parse(RawPropsParser const &parser, const PropsParserContext &)
+    const noexcept {
+  react_native_assert(parser_ == nullptr && "A parser was already assigned.");
   parser_ = &parser;
   parser.preparse(*this);
 }
@@ -84,7 +86,7 @@ const RawValue *RawProps::at(
     char const *name,
     char const *prefix,
     char const *suffix) const noexcept {
-  assert(
+  react_native_assert(
       parser_ &&
       "The object is not parsed. `parse` must be called before `at`.");
   return parser_->at(*this, RawPropsKey{prefix, name, suffix});
diff --git a/ReactCommon/react/renderer/core/RawProps.h b/ReactCommon/react/renderer/core/RawProps.h
index 152f7528f9d216..3cb96eca5fedc4 100644
--- a/ReactCommon/react/renderer/core/RawProps.h
+++ b/ReactCommon/react/renderer/core/RawProps.h
@@ -16,6 +16,7 @@
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawPropsKey.h>
 #include <react/renderer/core/RawPropsPrimitives.h>
 #include <react/renderer/core/RawValue.h>
@@ -74,7 +75,8 @@ class RawProps final {
   RawProps(RawProps const &other) noexcept = delete;
   RawProps &operator=(RawProps const &other) noexcept = delete;
 
-  void parse(RawPropsParser const &parser) const noexcept;
+  void parse(RawPropsParser const &parser, const PropsParserContext &)
+      const noexcept;
 
   /*
    * Deprecated. Do not use.
diff --git a/ReactCommon/react/renderer/core/RawPropsKey.cpp b/ReactCommon/react/renderer/core/RawPropsKey.cpp
index 505eca510eb64f..cdaab91f7d5e20 100644
--- a/ReactCommon/react/renderer/core/RawPropsKey.cpp
+++ b/ReactCommon/react/renderer/core/RawPropsKey.cpp
@@ -10,41 +10,44 @@
 #include <cassert>
 #include <cstring>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/RawPropsPrimitives.h>
 
 namespace facebook {
 namespace react {
 
-void RawPropsKey::render(char *buffer, RawPropsPropNameLength *length) const
-    noexcept {
+void RawPropsKey::render(char *buffer, RawPropsPropNameLength *length)
+    const noexcept {
   *length = 0;
 
   // Prefix
   if (prefix) {
-    auto prefixLength = std::strlen(prefix);
+    auto prefixLength =
+        static_cast<RawPropsPropNameLength>(std::strlen(prefix));
     std::memcpy(buffer, prefix, prefixLength);
     *length = prefixLength;
   }
 
   // Name
-  auto nameLength = std::strlen(name);
+  auto nameLength = static_cast<RawPropsPropNameLength>(std::strlen(name));
   std::memcpy(buffer + *length, name, nameLength);
   *length += nameLength;
 
   // Suffix
   if (suffix) {
-    int suffixLength = std::strlen(suffix);
+    auto suffixLength =
+        static_cast<RawPropsPropNameLength>(std::strlen(suffix));
     std::memcpy(buffer + *length, suffix, suffixLength);
     *length += suffixLength;
   }
-  assert(*length < kPropNameLengthHardCap);
+  react_native_assert(*length < kPropNameLengthHardCap);
 }
 
 RawPropsKey::operator std::string() const noexcept {
   char buffer[kPropNameLengthHardCap];
   RawPropsPropNameLength length = 0;
   render(buffer, &length);
-  assert(length < kPropNameLengthHardCap);
+  react_native_assert(length < kPropNameLengthHardCap);
   return std::string{buffer, length};
 }
 
diff --git a/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp b/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
index 889cdbead36033..af24fdb4a986b7 100644
--- a/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
+++ b/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
@@ -7,6 +7,8 @@
 
 #include "RawPropsKeyMap.h"
 
+#include <react/debug/react_native_assert.h>
+
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>
@@ -61,30 +63,30 @@ void RawPropsKeyMap::reindex() noexcept {
   buckets_.resize(kPropNameLengthHardCap);
 
   auto length = RawPropsPropNameLength{0};
-  for (auto i = 0; i < items_.size(); i++) {
+  for (size_t i = 0; i < items_.size(); i++) {
     auto &item = items_[i];
     if (item.length != length) {
       for (auto j = length; j < item.length; j++) {
-        buckets_[j] = i;
+        buckets_[j] = static_cast<RawPropsPropNameLength>(i);
       }
       length = item.length;
     }
   }
 
   for (auto j = length; j < buckets_.size(); j++) {
-    buckets_[j] = items_.size();
+    buckets_[j] = static_cast<RawPropsPropNameLength>(items_.size());
   }
 }
 
 RawPropsValueIndex RawPropsKeyMap::at(
     char const *name,
     RawPropsPropNameLength length) noexcept {
-  assert(length > 0);
-  assert(length < kPropNameLengthHardCap);
+  react_native_assert(length > 0);
+  react_native_assert(length < kPropNameLengthHardCap);
   // 1. Find the bucket.
   auto lower = int{buckets_[length - 1]};
   auto upper = int{buckets_[length]} - 1;
-  assert(lower - 1 <= upper);
+  react_native_assert(lower - 1 <= upper);
 
   // 2. Binary search in the bucket.
   while (lower <= upper) {
diff --git a/ReactCommon/react/renderer/core/RawPropsParser.cpp b/ReactCommon/react/renderer/core/RawPropsParser.cpp
index 5735302873a645..db098e9fab5bc7 100644
--- a/ReactCommon/react/renderer/core/RawPropsParser.cpp
+++ b/ReactCommon/react/renderer/core/RawPropsParser.cpp
@@ -8,6 +8,7 @@
 #include "RawPropsParser.h"
 
 #include <folly/Likely.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/RawProps.h>
 
 #include <glog/logging.h>
@@ -40,7 +41,7 @@ RawValue const *RawPropsParser::at(
     // This is not thread-safe part; this happens only during initialization of
     // a `ComponentDescriptor` where it is actually safe.
     keys_.push_back(key);
-    nameToIndex_.insert(key, size_);
+    nameToIndex_.insert(key, static_cast<RawPropsValueIndex>(size_));
     size_++;
     return nullptr;
   }
@@ -62,14 +63,14 @@ RawValue const *RawPropsParser::at(
   // the same order every time. This is trivial if you have a simple Props
   // constructor, but difficult or impossible if you have a shared sub-prop
   // Struct that is used by multiple parent Props.
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
   bool resetLoop = false;
 #endif
   do {
     rawProps.keyIndexCursor_++;
 
     if (UNLIKELY(rawProps.keyIndexCursor_ >= size_)) {
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
       if (resetLoop) {
         LOG(ERROR) << "Looked up RawProps key that does not exist: "
                    << (std::string)key;
@@ -106,20 +107,21 @@ void RawPropsParser::preparse(RawProps const &rawProps) const noexcept {
       if (!rawProps.value_.isObject()) {
         LOG(ERROR) << "Preparse props: rawProps value is not object";
       }
-      assert(rawProps.value_.isObject());
+      react_native_assert(rawProps.value_.isObject());
       auto object = rawProps.value_.asObject(runtime);
 
       auto names = object.getPropertyNames(runtime);
       auto count = names.size(runtime);
       auto valueIndex = RawPropsValueIndex{0};
 
-      for (auto i = 0; i < count; i++) {
+      for (size_t i = 0; i < count; i++) {
         auto nameValue = names.getValueAtIndex(runtime, i).getString(runtime);
         auto value = object.getProperty(runtime, nameValue);
 
         auto name = nameValue.utf8(runtime);
 
-        auto keyIndex = nameToIndex_.at(name.data(), name.size());
+        auto keyIndex = nameToIndex_.at(
+            name.data(), static_cast<RawPropsPropNameLength>(name.size()));
         if (keyIndex == kRawPropsValueIndexEmpty) {
           continue;
         }
@@ -140,7 +142,8 @@ void RawPropsParser::preparse(RawProps const &rawProps) const noexcept {
       for (auto const &pair : dynamic.items()) {
         auto name = pair.first.getString();
 
-        auto keyIndex = nameToIndex_.at(name.data(), name.size());
+        auto keyIndex = nameToIndex_.at(
+            name.data(), static_cast<RawPropsPropNameLength>(name.size()));
         if (keyIndex == kRawPropsValueIndexEmpty) {
           continue;
         }
diff --git a/ReactCommon/react/renderer/core/RawPropsParser.h b/ReactCommon/react/renderer/core/RawPropsParser.h
index 4dc557b708f9f4..5d37cefd8c3bac 100644
--- a/ReactCommon/react/renderer/core/RawPropsParser.h
+++ b/ReactCommon/react/renderer/core/RawPropsParser.h
@@ -10,6 +10,7 @@
 #include <better/map.h>
 #include <better/small_vector.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsKey.h>
 #include <react/renderer/core/RawPropsKeyMap.h>
@@ -40,8 +41,16 @@ class RawPropsParser final {
         std::is_base_of<Props, PropsT>::value,
         "PropsT must be a descendant of Props");
     RawProps emptyRawProps{};
-    emptyRawProps.parse(*this);
-    PropsT({}, emptyRawProps);
+
+    // Create a stub parser context.
+    // Since this prepares the parser by passing in
+    // empty props, no prop parsers should actually reference the
+    // ContextContainer or SurfaceId here.
+    ContextContainer contextContainer{};
+    PropsParserContext parserContext{-1, contextContainer};
+
+    emptyRawProps.parse(*this, parserContext);
+    PropsT(parserContext, {}, emptyRawProps);
     postPrepare();
   }
 
@@ -64,8 +73,8 @@ class RawPropsParser final {
   /*
    * To be used by `RawProps` only.
    */
-  RawValue const *at(RawProps const &rawProps, RawPropsKey const &key) const
-      noexcept;
+  RawValue const *at(RawProps const &rawProps, RawPropsKey const &key)
+      const noexcept;
 
   mutable better::small_vector<RawPropsKey, kNumberOfPropsPerComponentSoftCap>
       keys_{};
diff --git a/ReactCommon/react/renderer/core/RawValue.h b/ReactCommon/react/renderer/core/RawValue.h
index 75c2e9527a7cbc..16cab0bd7b9c4a 100644
--- a/ReactCommon/react/renderer/core/RawValue.h
+++ b/ReactCommon/react/renderer/core/RawValue.h
@@ -12,6 +12,8 @@
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
@@ -189,7 +191,7 @@ class RawValue {
     }
 
     for (const auto &item : dynamic.items()) {
-      assert(item.first.isString());
+      react_native_assert(item.first.isString());
       if (!checkValueType(item.second, (T *)nullptr)) {
         return false;
       }
@@ -213,7 +215,7 @@ class RawValue {
   }
 
   static int castValue(const folly::dynamic &dynamic, int *type) noexcept {
-    return dynamic.asInt();
+    return static_cast<int>(dynamic.asInt());
   }
 
   static int64_t castValue(
@@ -223,7 +225,7 @@ class RawValue {
   }
 
   static float castValue(const folly::dynamic &dynamic, float *type) noexcept {
-    return dynamic.asDouble();
+    return static_cast<float>(dynamic.asDouble());
   }
 
   static double castValue(
@@ -242,7 +244,7 @@ class RawValue {
   static std::vector<T> castValue(
       const folly::dynamic &dynamic,
       std::vector<T> *type) noexcept {
-    assert(dynamic.isArray());
+    react_native_assert(dynamic.isArray());
     auto result = std::vector<T>{};
     result.reserve(dynamic.size());
     for (const auto &item : dynamic) {
@@ -255,7 +257,7 @@ class RawValue {
   static std::vector<std::vector<T>> castValue(
       const folly::dynamic &dynamic,
       std::vector<std::vector<T>> *type) noexcept {
-    assert(dynamic.isArray());
+    react_native_assert(dynamic.isArray());
     auto result = std::vector<std::vector<T>>{};
     result.reserve(dynamic.size());
     for (const auto &item : dynamic) {
@@ -268,10 +270,10 @@ class RawValue {
   static better::map<std::string, T> castValue(
       const folly::dynamic &dynamic,
       better::map<std::string, T> *type) noexcept {
-    assert(dynamic.isObject());
+    react_native_assert(dynamic.isObject());
     auto result = better::map<std::string, T>{};
     for (const auto &item : dynamic.items()) {
-      assert(item.first.isString());
+      react_native_assert(item.first.isString());
       result[item.first.getString()] = castValue(item.second, (T *)nullptr);
     }
     return result;
diff --git a/ReactCommon/react/renderer/core/ReactEventPriority.h b/ReactCommon/react/renderer/core/ReactEventPriority.h
new file mode 100644
index 00000000000000..3ef8b5728ebd43
--- /dev/null
+++ b/ReactCommon/react/renderer/core/ReactEventPriority.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace facebook {
+namespace react {
+
+/*
+ * An enum that represents React's event priority.
+ * Used to map Fabric events to React.
+ */
+enum class ReactEventPriority {
+  /*
+   * Event priority is unspecified.
+   */
+  Default,
+
+  /*
+   * User events that happen at discrete times, like
+   * input into text field.
+   */
+  Discrete,
+
+  /*
+   * “fluid” user events that happen many times over a short period of time like
+   * scrolling.
+   */
+  Continuous,
+};
+
+static constexpr std::underlying_type<ReactEventPriority>::type serialize(
+    ReactEventPriority reactEventPriority) {
+  return static_cast<std::underlying_type<ReactEventPriority>::type>(
+      reactEventPriority);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/ReactPrimitives.h b/ReactCommon/react/renderer/core/ReactPrimitives.h
index d72fa25d593010..4954fcfff9b2d0 100644
--- a/ReactCommon/react/renderer/core/ReactPrimitives.h
+++ b/ReactCommon/react/renderer/core/ReactPrimitives.h
@@ -42,5 +42,39 @@ using ComponentHandle = int64_t;
  */
 using ComponentName = char const *;
 
+/*
+ * Defines how visual side effects (views, images, text, and so on) are
+ * mounted (on not) on the screen.
+ */
+enum class DisplayMode {
+  /*
+   * The surface is running normally. All visual side-effects will be rendered
+   * on the screen.
+   */
+  Visible = 0,
+
+  /*
+   * The surface is `Suspended`. All new (committed after switching to the
+   * mode) visual side-effects will *not* be mounted on the screen (the screen
+   * will stop updating).
+   *
+   * The mode can be used for preparing a surface for possible future use.
+   * The surface will be prepared without spending computing resources
+   * on mounting, and then can be instantly mounted if needed.
+   */
+  Suspended = 1,
+
+  /*
+   * The surface is `Hidden`. All previously mounted visual side-effects
+   * will be unmounted, and all new (committed after switching to the mode)
+   * visual side-effects will *not* be mounted on the screen until the mode is
+   * switched back to `normal`.
+   *
+   * The mode can be used for temporarily freeing computing resources of
+   * off-the-screen surfaces.
+   */
+  Hidden = 2,
+};
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/core/Sealable.cpp b/ReactCommon/react/renderer/core/Sealable.cpp
index 5bc35e6908b68b..2326a4ed7b2f70 100644
--- a/ReactCommon/react/renderer/core/Sealable.cpp
+++ b/ReactCommon/react/renderer/core/Sealable.cpp
@@ -7,7 +7,8 @@
 
 #include "Sealable.h"
 
-#include <cassert>
+#include <react/debug/flags.h>
+#include <react/debug/react_native_assert.h>
 
 namespace facebook {
 namespace react {
@@ -24,7 +25,7 @@ namespace react {
  * http://en.cppreference.com/w/cpp/language/rule_of_three
  */
 
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
 
 Sealable::Sealable() : sealed_(false) {}
 
@@ -56,7 +57,7 @@ bool Sealable::getSealed() const {
 }
 
 void Sealable::ensureUnsealed() const {
-  assert(!sealed_ && "Attempt to mutate a sealed object.");
+  react_native_assert(!sealed_ && "Attempt to mutate a sealed object.");
 }
 
 #endif
diff --git a/ReactCommon/react/renderer/core/Sealable.h b/ReactCommon/react/renderer/core/Sealable.h
index 2ca6f64aa65025..f57c42eda5ac2b 100644
--- a/ReactCommon/react/renderer/core/Sealable.h
+++ b/ReactCommon/react/renderer/core/Sealable.h
@@ -9,6 +9,8 @@
 
 #include <atomic>
 
+#include <react/debug/flags.h>
+
 namespace facebook {
 namespace react {
 
@@ -42,8 +44,9 @@ namespace react {
  *      must be prevented.
  */
 
-#ifdef NDEBUG
+#ifndef REACT_NATIVE_DEBUG
 
+// Release-mode, production version
 class Sealable {
  public:
   inline void seal() const {}
@@ -55,6 +58,7 @@ class Sealable {
 
 #else
 
+// Debug version
 class Sealable {
  public:
   Sealable();
diff --git a/ReactCommon/react/renderer/core/ShadowNode.cpp b/ReactCommon/react/renderer/core/ShadowNode.cpp
index a5839fc820d80b..846170e0063828 100644
--- a/ReactCommon/react/renderer/core/ShadowNode.cpp
+++ b/ReactCommon/react/renderer/core/ShadowNode.cpp
@@ -6,10 +6,13 @@
  */
 
 #include "ShadowNode.h"
+#include "Constants.h"
+#include "DynamicPropsUtilities.h"
 #include "ShadowNodeFragment.h"
 
 #include <better/small_vector.h>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
@@ -24,6 +27,32 @@ SharedShadowNodeSharedList ShadowNode::emptySharedShadowNodeSharedList() {
   return emptySharedShadowNodeSharedList;
 }
 
+/*
+ * On iOS, this method returns `props` if provided, `sourceShadowNode`'s props
+ * otherwise. On Android, we forward props in case `sourceShadowNode` hasn't
+ * been mounted. `Props::rawProps` are merged from `props` to a copy of
+ * `sourceShadowNode.props_` and returned. This is necessary to enable
+ * Background Executor and should be removed once reimplementation of JNI layer
+ * is finished.
+ */
+SharedProps ShadowNode::propsForClonedShadowNode(
+    ShadowNode const &sourceShadowNode,
+    Props::Shared const &props) {
+#ifdef ANDROID
+  if (Constants::getPropsForwardingEnabled()) {
+    bool hasBeenMounted = sourceShadowNode.hasBeenMounted_;
+    bool sourceNodeHasRawProps = !sourceShadowNode.getProps()->rawProps.empty();
+    if (!hasBeenMounted && sourceNodeHasRawProps && props) {
+      auto &castedProps = const_cast<Props &>(*props);
+      castedProps.rawProps = mergeDynamicProps(
+          sourceShadowNode.getProps()->rawProps, props->rawProps);
+      return props;
+    }
+  }
+#endif
+  return props ? props : sourceShadowNode.getProps();
+}
+
 bool ShadowNode::sameFamily(const ShadowNode &first, const ShadowNode &second) {
   return first.family_ == second.family_;
 }
@@ -46,8 +75,8 @@ ShadowNode::ShadowNode(
       orderIndex_(0),
       family_(family),
       traits_(traits) {
-  assert(props_);
-  assert(children_);
+  react_native_assert(props_);
+  react_native_assert(children_);
 
   traits_.set(ShadowNodeTraits::Trait::ChildrenAreShared);
 
@@ -60,13 +89,13 @@ ShadowNode::ShadowNode(
 }
 
 ShadowNode::ShadowNode(
-    const ShadowNode &sourceShadowNode,
-    const ShadowNodeFragment &fragment)
+    ShadowNode const &sourceShadowNode,
+    ShadowNodeFragment const &fragment)
     :
 #if RN_DEBUG_STRING_CONVERTIBLE
       revision_(sourceShadowNode.revision_ + 1),
 #endif
-      props_(fragment.props ? fragment.props : sourceShadowNode.props_),
+      props_(propsForClonedShadowNode(sourceShadowNode, fragment.props)),
       children_(
           fragment.children ? fragment.children : sourceShadowNode.children_),
       state_(
@@ -76,8 +105,8 @@ ShadowNode::ShadowNode(
       family_(sourceShadowNode.family_),
       traits_(sourceShadowNode.traits_) {
 
-  assert(props_);
-  assert(children_);
+  react_native_assert(props_);
+  react_native_assert(children_);
 
   traits_.set(ShadowNodeTraits::Trait::ChildrenAreShared);
 
@@ -88,7 +117,8 @@ ShadowNode::ShadowNode(
   }
 }
 
-UnsharedShadowNode ShadowNode::clone(const ShadowNodeFragment &fragment) const {
+ShadowNode::Unshared ShadowNode::clone(
+    const ShadowNodeFragment &fragment) const {
   return family_->componentDescriptor_.cloneShadowNode(*this, fragment);
 }
 
@@ -183,7 +213,7 @@ void ShadowNode::replaceChild(
       *std::const_pointer_cast<ShadowNode::ListOfShared>(children_);
   auto size = children.size();
 
-  if (suggestedIndex != -1 && suggestedIndex < size) {
+  if (suggestedIndex != -1 && static_cast<size_t>(suggestedIndex) < size) {
     // If provided `suggestedIndex` is accurate,
     // replacing in place using the index.
     if (children.at(suggestedIndex).get() == &oldChild) {
@@ -192,14 +222,14 @@ void ShadowNode::replaceChild(
     }
   }
 
-  for (auto index = 0; index < size; index++) {
+  for (size_t index = 0; index < size; index++) {
     if (children.at(index).get() == &oldChild) {
       children[index] = newChild;
       return;
     }
   }
 
-  assert(false && "Child to replace was not found.");
+  react_native_assert(false && "Child to replace was not found.");
 }
 
 void ShadowNode::cloneChildrenIfShared() {
@@ -214,6 +244,7 @@ void ShadowNode::cloneChildrenIfShared() {
 void ShadowNode::setMounted(bool mounted) const {
   if (mounted) {
     family_->setMostRecentState(getState());
+    hasBeenMounted_ = mounted;
   }
 
   family_->eventEmitter_->setEnabled(mounted);
@@ -238,7 +269,7 @@ ShadowNode::Unshared ShadowNode::cloneTree(
 
   auto newShadowNode = callback(*oldShadowNode);
 
-  assert(
+  react_native_assert(
       newShadowNode &&
       "`callback` returned `nullptr` which is not allowed value.");
 
@@ -249,7 +280,8 @@ ShadowNode::Unshared ShadowNode::cloneTree(
     auto childIndex = it->second;
 
     auto children = parentNode.getChildren();
-    assert(ShadowNode::sameFamily(*children.at(childIndex), *childNode));
+    react_native_assert(
+        ShadowNode::sameFamily(*children.at(childIndex), *childNode));
     children[childIndex] = childNode;
 
     childNode = parentNode.clone({
diff --git a/ReactCommon/react/renderer/core/ShadowNode.h b/ReactCommon/react/renderer/core/ShadowNode.h
index 30f5774b7d5f2f..1ef71355f06f1d 100644
--- a/ReactCommon/react/renderer/core/ShadowNode.h
+++ b/ReactCommon/react/renderer/core/ShadowNode.h
@@ -33,7 +33,6 @@ class ShadowNode;
 // Deprecated: Use ShadowNode::Shared instead
 using SharedShadowNode = std::shared_ptr<const ShadowNode>;
 using WeakShadowNode = std::weak_ptr<const ShadowNode>;
-using UnsharedShadowNode = std::shared_ptr<ShadowNode>;
 using SharedShadowNodeList =
     better::small_vector<SharedShadowNode, kShadowNodeChildrenSmallVectorSize>;
 using SharedShadowNodeSharedList = std::shared_ptr<const SharedShadowNodeList>;
@@ -46,8 +45,11 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
   using Unshared = std::shared_ptr<ShadowNode>;
   using ListOfShared =
       better::small_vector<Shared, kShadowNodeChildrenSmallVectorSize>;
+  using ListOfWeak =
+      better::small_vector<Weak, kShadowNodeChildrenSmallVectorSize>;
   using SharedListOfShared = std::shared_ptr<ListOfShared const>;
   using UnsharedListOfShared = std::shared_ptr<ListOfShared>;
+  using UnsharedListOfWeak = std::shared_ptr<ListOfWeak>;
 
   using AncestorList = better::small_vector<
       std::pair<
@@ -101,7 +103,7 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
   /*
    * Clones the shadow node using stored `cloneFunction`.
    */
-  UnsharedShadowNode clone(const ShadowNodeFragment &fragment) const;
+  ShadowNode::Unshared clone(const ShadowNodeFragment &fragment) const;
 
   /*
    * Clones the node (and partially the tree starting from the node) by
@@ -176,8 +178,6 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
    */
   void setMounted(bool mounted) const;
 
-  int getStateRevision() const;
-
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE
@@ -214,6 +214,12 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
    */
   ShadowNodeFamily::Shared family_;
 
+  mutable std::atomic<bool> hasBeenMounted_{false};
+
+  static SharedProps propsForClonedShadowNode(
+      ShadowNode const &sourceShadowNode,
+      Props::Shared const &props);
+
  protected:
   /*
    * Traits associated with the particular `ShadowNode` class and an instance of
@@ -234,5 +240,9 @@ ShadowNodeReferenceT traitCast(ShadowNode const &shadowNode);
 template <typename ShadowNodePointerT>
 ShadowNodePointerT traitCast(ShadowNode const *shadowNode);
 
+template <typename ShadowNodePointerT>
+std::shared_ptr<ShadowNodePointerT const> traitCast(
+    std::shared_ptr<ShadowNode const> shadowNode);
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp b/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp
index c76b3ab8d3aec7..f4c0644255601d 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp
+++ b/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp
@@ -8,6 +8,7 @@
 #include "ShadowNodeFamily.h"
 #include "ShadowNode.h"
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/State.h>
 
@@ -29,7 +30,7 @@ ShadowNodeFamily::ShadowNodeFamily(
       componentName_(componentDescriptor.getComponentName()) {}
 
 void ShadowNodeFamily::setParent(ShadowNodeFamily::Shared const &parent) const {
-  assert(parent_.lock() == nullptr || parent_.lock() == parent);
+  react_native_assert(parent_.lock() == nullptr || parent_.lock() == parent);
   if (hasParent_) {
     return;
   }
diff --git a/ReactCommon/react/renderer/core/ShadowNodeFamily.h b/ReactCommon/react/renderer/core/ShadowNodeFamily.h
index ad3ecf0e36d09d..2f57666c179438 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeFamily.h
+++ b/ReactCommon/react/renderer/core/ShadowNodeFamily.h
@@ -26,7 +26,7 @@ class State;
  * Represents all things that shadow nodes from the same family have in common.
  * To be used inside `ShadowNode` class *only*.
  */
-class ShadowNodeFamily {
+class ShadowNodeFamily final {
  public:
   using Shared = std::shared_ptr<ShadowNodeFamily const>;
   using Weak = std::weak_ptr<ShadowNodeFamily const>;
diff --git a/ReactCommon/react/renderer/core/ShadowNodeTraits.h b/ReactCommon/react/renderer/core/ShadowNodeTraits.h
index 16b7129bd00c71..7c02f4bea94a6a 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeTraits.h
+++ b/ReactCommon/react/renderer/core/ShadowNodeTraits.h
@@ -21,7 +21,7 @@ class ShadowNodeTraits {
  public:
   /*
    * Underlying type for the traits.
-   * The first 16 bits are reserved for Core.
+   * The first 23 bits are reserved for Core.
    */
   enum Trait : int32_t {
     None = 0,
@@ -54,16 +54,25 @@ class ShadowNodeTraits {
     // Nodes with this trait (and all their descendants) will not produce views.
     Hidden = 1 << 6,
 
+    // Indicates that the `YogaLayoutableShadowNode` must set `isDirty` flag for
+    // Yoga node when a `ShadowNode` is being cloned. `ShadowNode`s that modify
+    // Yoga styles in the constructor (or later) *after* the `ShadowNode`
+    // is cloned must set this trait.
+    // Any Yoga node (not only Leaf ones) can have this trait.
+    DirtyYogaNode = 1 << 9,
+
     // Inherits `YogaLayoutableShadowNode` and enforces that the `YGNode` is a
     // leaf.
     LeafYogaNode = 1 << 10,
 
-    // Inherits `LayoutableShadowNode` and calls `measure()`.
-    HasMeasure = 1 << 11,
+    // Inherits `YogaLayoutableShadowNode` and has a custom measure function.
+    // Only Leaf nodes can have this trait.
+    MeasurableYogaNode = 1 << 11,
 
-    // Indicates that the `ShadowNode` must form a stacking context (a level
-    // of the hierarchy; `ShadowView`s formed by descendants the node will be
-    // descendants of a `ShadowView` formed by the node).
+    // Indicates that the `ShadowNode` must form a stacking context.
+    // A Stacking Context forms a level of a `ShadowView` hierarchy (in contrast
+    // with a level of a `ShadowNode` hierarchy).
+    // See W3C standard for more details: https://www.w3.org/TR/CSS2/zindex.html
     FormsStackingContext = 1 << 13,
 
     // Indicates that the node must form a `ShadowView`.
@@ -73,6 +82,22 @@ class ShadowNodeTraits {
     // Indicates that `children` list is shared between nodes and need
     // to be cloned before the first mutation.
     ChildrenAreShared = 1 << 15,
+
+    // Inherits 'RawTextShadowNode'
+    RawText = 1 << 16,
+
+    // Inherits 'TextShadowNode'
+    Text = 1 << 17,
+
+    // Reserved
+    ReservedTrait1 = 1 << 18,
+    ReservedTrait2 = 1 << 19,
+    ReservedTrait3 = 1 << 20,
+    ReservedTrait4 = 1 << 21,
+    ReservedTrait5 = 1 << 22,
+
+    // Unserved - alias these for local usage
+    UnreservedTrait1 = 1 << 23
   };
 
   /*
diff --git a/ReactCommon/react/renderer/core/State.h b/ReactCommon/react/renderer/core/State.h
index ae636f37e421cd..ce5b51fe065e03 100644
--- a/ReactCommon/react/renderer/core/State.h
+++ b/ReactCommon/react/renderer/core/State.h
@@ -9,6 +9,8 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 #include <react/renderer/core/ShadowNodeFamily.h>
@@ -65,9 +67,8 @@ class State {
 
 #ifdef ANDROID
   virtual folly::dynamic getDynamic() const = 0;
-  virtual void updateState(
-      folly::dynamic data,
-      std::function<void()> failureCallback) const = 0;
+  virtual MapBuffer getMapBuffer() const = 0;
+  virtual void updateState(folly::dynamic data) const = 0;
 #endif
 
  protected:
diff --git a/ReactCommon/react/renderer/core/StateData.h b/ReactCommon/react/renderer/core/StateData.h
index b13b5950490b87..36e098d1cd647d 100644
--- a/ReactCommon/react/renderer/core/StateData.h
+++ b/ReactCommon/react/renderer/core/StateData.h
@@ -11,6 +11,8 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook {
@@ -27,6 +29,7 @@ struct StateData final {
   StateData() = default;
   StateData(StateData const &previousState, folly::dynamic data){};
   folly::dynamic getDynamic() const;
+  MapBuffer getMapBuffer() const;
 #endif
 };
 
diff --git a/ReactCommon/react/renderer/core/StateUpdate.h b/ReactCommon/react/renderer/core/StateUpdate.h
index 7931f5e080066f..890e56d141092b 100644
--- a/ReactCommon/react/renderer/core/StateUpdate.h
+++ b/ReactCommon/react/renderer/core/StateUpdate.h
@@ -25,8 +25,6 @@ class StateUpdate {
 
   SharedShadowNodeFamily family;
   Callback callback;
-  FailureCallback failureCallback;
-  bool autorepeat;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp b/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp
index 4de0e8c747d85a..98210411f7482d 100644
--- a/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp
+++ b/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp
@@ -11,8 +11,6 @@ namespace facebook {
 namespace react {
 
 void UnbatchedEventQueue::onEnqueue() const {
-  EventQueue::onEnqueue();
-
   eventBeat_->request();
   eventBeat_->induce();
 }
diff --git a/ReactCommon/react/renderer/core/conversions.h b/ReactCommon/react/renderer/core/conversions.h
index 9dc3daa994fa89..70dda9a9f5589c 100644
--- a/ReactCommon/react/renderer/core/conversions.h
+++ b/ReactCommon/react/renderer/core/conversions.h
@@ -34,6 +34,17 @@ inline int toInt(const LayoutDirection &layoutDirection) {
   }
 }
 
+inline int toInt(const DisplayType &displayType) {
+  switch (displayType) {
+    case DisplayType::None:
+      return 0;
+    case DisplayType::Flex:
+      return 1;
+    case DisplayType::Inline:
+      return 2;
+  }
+}
+
 inline std::string toString(const DisplayType &displayType) {
   switch (displayType) {
     case DisplayType::None:
diff --git a/ReactCommon/react/renderer/core/propsConversions.h b/ReactCommon/react/renderer/core/propsConversions.h
index cb3f1665fc0fb5..55e78f24303ac7 100644
--- a/ReactCommon/react/renderer/core/propsConversions.h
+++ b/ReactCommon/react/renderer/core/propsConversions.h
@@ -10,6 +10,7 @@
 #include <better/optional.h>
 #include <folly/Likely.h>
 #include <folly/dynamic.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
@@ -19,20 +20,26 @@ namespace facebook {
 namespace react {
 
 template <typename T>
-void fromRawValue(RawValue const &rawValue, T &result) {
+void fromRawValue(
+    const PropsParserContext &context,
+    RawValue const &rawValue,
+    T &result) {
   result = (T)rawValue;
 }
 
 template <typename T>
-void fromRawValue(RawValue const &rawValue, std::vector<T> &result) {
+void fromRawValue(
+    const PropsParserContext &context,
+    RawValue const &rawValue,
+    std::vector<T> &result) {
   if (rawValue.hasType<std::vector<RawValue>>()) {
     auto items = (std::vector<RawValue>)rawValue;
     auto length = items.size();
     result.clear();
     result.reserve(length);
-    for (int i = 0; i < length; i++) {
+    for (size_t i = 0; i < length; i++) {
       T itemResult;
-      fromRawValue(items.at(i), itemResult);
+      fromRawValue(context, items.at(i), itemResult);
       result.push_back(itemResult);
     }
     return;
@@ -42,12 +49,13 @@ void fromRawValue(RawValue const &rawValue, std::vector<T> &result) {
   result.clear();
   result.reserve(1);
   T itemResult;
-  fromRawValue(rawValue, itemResult);
+  fromRawValue(context, rawValue, itemResult);
   result.push_back(itemResult);
 }
 
 template <typename T>
 void fromRawValue(
+    const PropsParserContext &context,
     RawValue const &rawValue,
     std::vector<std::vector<T>> &result) {
   if (rawValue.hasType<std::vector<std::vector<RawValue>>>()) {
@@ -57,7 +65,7 @@ void fromRawValue(
     result.reserve(length);
     for (int i = 0; i < length; i++) {
       T itemResult;
-      fromRawValue(items.at(i), itemResult);
+      fromRawValue(context, items.at(i), itemResult);
       result.push_back(itemResult);
     }
     return;
@@ -67,12 +75,13 @@ void fromRawValue(
   result.clear();
   result.reserve(1);
   T itemResult;
-  fromRawValue(rawValue, itemResult);
+  fromRawValue(context, rawValue, itemResult);
   result.push_back(itemResult);
 }
 
 template <typename T, typename U = T>
 T convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *name,
     T const &sourceValue,
@@ -92,12 +101,13 @@ T convertRawProp(
   }
 
   T result;
-  fromRawValue(*rawValue, result);
+  fromRawValue(context, *rawValue, result);
   return result;
 }
 
 template <typename T>
 static better::optional<T> convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     char const *name,
     better::optional<T> const &sourceValue,
@@ -117,7 +127,7 @@ static better::optional<T> convertRawProp(
   }
 
   T result;
-  fromRawValue(*rawValue, result);
+  fromRawValue(context, *rawValue, result);
   return better::optional<T>{result};
 }
 
diff --git a/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp b/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp
index 58baadffb321ab..35a12911b250a1 100644
--- a/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp
@@ -7,6 +7,8 @@
 
 #include <gtest/gtest.h>
 
+#include <react/renderer/core/PropsParserContext.h>
+
 #include "TestComponent.h"
 
 using namespace facebook::react;
@@ -21,8 +23,11 @@ TEST(ComponentDescriptorTest, createShadowNode) {
   EXPECT_STREQ(descriptor->getComponentName(), TestShadowNode::Name());
   EXPECT_STREQ(descriptor->getComponentName(), "Test");
 
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
-  SharedProps props = descriptor->cloneProps(nullptr, raw);
+  SharedProps props = descriptor->cloneProps(parserContext, nullptr, raw);
 
   auto family = descriptor->createFamily(
       ShadowNodeFamilyFragment{
@@ -52,8 +57,11 @@ TEST(ComponentDescriptorTest, cloneShadowNode) {
       std::make_shared<TestComponentDescriptor>(
           ComponentDescriptorParameters{eventDispatcher, nullptr, nullptr});
 
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
-  SharedProps props = descriptor->cloneProps(nullptr, raw);
+  SharedProps props = descriptor->cloneProps(parserContext, nullptr, raw);
   auto family = descriptor->createFamily(
       ShadowNodeFamilyFragment{
           /* .tag = */ 9,
@@ -73,7 +81,8 @@ TEST(ComponentDescriptorTest, cloneShadowNode) {
   EXPECT_EQ(cloned->getSurfaceId(), 1);
   EXPECT_STREQ(cloned->getProps()->nativeId.c_str(), "abc");
 
-  auto clonedButSameProps = descriptor->cloneProps(props, RawProps());
+  auto clonedButSameProps =
+      descriptor->cloneProps(parserContext, props, RawProps());
   EXPECT_NE(clonedButSameProps, props);
 }
 
@@ -83,8 +92,11 @@ TEST(ComponentDescriptorTest, appendChild) {
       std::make_shared<TestComponentDescriptor>(
           ComponentDescriptorParameters{eventDispatcher, nullptr, nullptr});
 
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
-  SharedProps props = descriptor->cloneProps(nullptr, raw);
+  SharedProps props = descriptor->cloneProps(parserContext, nullptr, raw);
   auto family1 = descriptor->createFamily(
       ShadowNodeFamilyFragment{
           /* .tag = */ 1,
diff --git a/ReactCommon/react/renderer/core/tests/ConcreteShadowNodeTest.cpp b/ReactCommon/react/renderer/core/tests/ConcreteShadowNodeTest.cpp
index de48a4b6e7b566..0b2d025d08ad40 100644
--- a/ReactCommon/react/renderer/core/tests/ConcreteShadowNodeTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/ConcreteShadowNodeTest.cpp
@@ -26,7 +26,7 @@ TEST(ConcreteShadowNodeTest, testSetStateData) {
 
   auto shadowNode = builder.build(element);
 
-  shadowNode->setStateData({{10, 11}, {{21, 22}, {301, 302}}});
+  shadowNode->setStateData({{10, 11}, {{21, 22}, {301, 302}}, 0});
 
   EXPECT_NE(
       shadowNode->getState(), shadowNode->getFamily().getMostRecentState());
diff --git a/ReactCommon/react/renderer/core/tests/DynamicPropsUtilitiesTest.cpp b/ReactCommon/react/renderer/core/tests/DynamicPropsUtilitiesTest.cpp
new file mode 100644
index 00000000000000..b6666ad0842a6f
--- /dev/null
+++ b/ReactCommon/react/renderer/core/tests/DynamicPropsUtilitiesTest.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <gtest/gtest.h>
+#include <react/renderer/core/DynamicPropsUtilities.h>
+
+using namespace folly;
+using namespace facebook::react;
+
+/*
+  Tests that verify expected behaviour from `folly::dynamic::merge_patch`.
+  `merge_patch` is used for props forwarding on Android to enable Background
+  Executor and will be removed once JNI layer is reimplmeneted.
+ */
+TEST(DynamicPropsUtilitiesTest, handleNestedObjects) {
+  dynamic map1 = dynamic::object;
+  map1["style"] = dynamic::object("backgroundColor", "red");
+
+  dynamic map2 = dynamic::object;
+  map2["style"] = dynamic::object("backgroundColor", "blue")("color", "black");
+  map2["height"] = 100;
+
+  auto result = mergeDynamicProps(map1, map2);
+
+  EXPECT_TRUE(result["style"].isObject());
+  EXPECT_TRUE(result["style"]["backgroundColor"].isString());
+  EXPECT_TRUE(result["style"]["color"].isString());
+  EXPECT_TRUE(result["height"].isInt());
+
+  EXPECT_EQ(result["style"]["backgroundColor"].asString(), "blue");
+  EXPECT_EQ(result["style"]["color"], "black");
+  EXPECT_EQ(result["height"], 100);
+}
+
+TEST(DynamicPropsUtilitiesTest, handleEmptyObject) {
+  dynamic map1 = dynamic::object;
+
+  dynamic map2 = dynamic::object;
+  map2["height"] = 100;
+
+  auto result = mergeDynamicProps(map1, map2);
+
+  EXPECT_TRUE(result["height"].isInt());
+  EXPECT_EQ(result["height"], 100);
+
+  result = mergeDynamicProps(map1, map2);
+
+  EXPECT_TRUE(result["height"].isInt());
+  EXPECT_EQ(result["height"], 100);
+}
+
+TEST(DynamicPropsUtilitiesTest, handleNull) {
+  dynamic map1 = dynamic::object;
+  map1["height"] = 100;
+
+  dynamic map2 = dynamic::object;
+  map2["height"] = nullptr;
+
+  auto result = mergeDynamicProps(map1, map2);
+
+  EXPECT_TRUE(result["height"].isNull());
+}
diff --git a/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp b/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp
new file mode 100644
index 00000000000000..268a6a0aca903f
--- /dev/null
+++ b/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <gtest/gtest.h>
+#include <hermes/API/hermes/hermes.h>
+#include <jsi/jsi.h>
+#include <react/renderer/core/EventPipe.h>
+#include <react/renderer/core/EventQueueProcessor.h>
+#include <react/renderer/core/StatePipe.h>
+
+#include <memory>
+
+namespace facebook::react {
+
+class EventQueueProcessorTest : public testing::Test {
+ protected:
+  void SetUp() override {
+    runtime_ = facebook::hermes::makeHermesRuntime();
+
+    auto eventPipe = [this](
+                         jsi::Runtime &runtime,
+                         const EventTarget *eventTarget,
+                         const std::string &type,
+                         ReactEventPriority priority,
+                         const ValueFactory &payloadFactory) {
+      eventTypes_.push_back(type);
+      eventPriorities_.push_back(priority);
+    };
+
+    auto dummyStatePipe = [](StateUpdate const &stateUpdate) {};
+
+    eventProcessor_ =
+        std::make_unique<EventQueueProcessor>(eventPipe, dummyStatePipe);
+  }
+
+  std::unique_ptr<facebook::hermes::HermesRuntime> runtime_;
+  std::unique_ptr<EventQueueProcessor> eventProcessor_;
+  std::vector<std::string> eventTypes_;
+  std::vector<ReactEventPriority> eventPriorities_;
+  ValueFactory dummyValueFactory_;
+};
+
+TEST_F(EventQueueProcessorTest, singleUnspecifiedEvent) {
+  eventProcessor_->flushEvents(
+      *runtime_,
+      {RawEvent(
+          "my type",
+          dummyValueFactory_,
+          nullptr,
+          RawEvent::Category::Unspecified)});
+
+  EXPECT_EQ(eventPriorities_.size(), 1);
+  EXPECT_EQ(eventTypes_[0], "my type");
+  EXPECT_EQ(eventPriorities_[0], ReactEventPriority::Discrete);
+}
+
+TEST_F(EventQueueProcessorTest, continiousEvent) {
+  eventProcessor_->flushEvents(
+      *runtime_,
+      {RawEvent(
+           "touchStart",
+           dummyValueFactory_,
+           nullptr,
+           RawEvent::Category::ContinuousStart),
+       RawEvent(
+           "touchMove",
+           dummyValueFactory_,
+           nullptr,
+           RawEvent::Category::Unspecified),
+       RawEvent(
+           "touchEnd",
+           dummyValueFactory_,
+           nullptr,
+           RawEvent::Category::ContinuousEnd),
+       RawEvent(
+           "custom event",
+           dummyValueFactory_,
+           nullptr,
+           RawEvent::Category::Unspecified)});
+
+  EXPECT_EQ(eventPriorities_.size(), 4);
+
+  EXPECT_EQ(eventTypes_[0], "touchStart");
+  EXPECT_EQ(eventPriorities_[0], ReactEventPriority::Discrete);
+
+  EXPECT_EQ(eventTypes_[1], "touchMove");
+  EXPECT_EQ(eventPriorities_[1], ReactEventPriority::Default);
+
+  EXPECT_EQ(eventTypes_[2], "touchEnd");
+  EXPECT_EQ(eventPriorities_[2], ReactEventPriority::Discrete);
+
+  EXPECT_EQ(eventTypes_[3], "custom event");
+  EXPECT_EQ(eventPriorities_[3], ReactEventPriority::Discrete);
+}
+
+TEST_F(EventQueueProcessorTest, alwaysContinuousEvent) {
+  eventProcessor_->flushEvents(
+      *runtime_,
+      {
+          RawEvent(
+              "onScroll",
+              dummyValueFactory_,
+              nullptr,
+              RawEvent::Category::Continuous),
+      });
+
+  EXPECT_EQ(eventPriorities_.size(), 1);
+
+  EXPECT_EQ(eventTypes_[0], "onScroll");
+  EXPECT_EQ(eventPriorities_[0], ReactEventPriority::Default);
+}
+
+TEST_F(EventQueueProcessorTest, alwaysDiscreteEvent) {
+  eventProcessor_->flushEvents(
+      *runtime_,
+      {
+          RawEvent(
+              "onChange",
+              dummyValueFactory_,
+              nullptr,
+              RawEvent::Category::Discrete),
+      });
+
+  EXPECT_EQ(eventPriorities_.size(), 1);
+
+  EXPECT_EQ(eventTypes_[0], "onChange");
+  EXPECT_EQ(eventPriorities_[0], ReactEventPriority::Discrete);
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp b/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp
index 8e02861ae79c97..c6dc5f68b5bfac 100644
--- a/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp
@@ -52,7 +52,8 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetrics) {
   auto parentShadowNode = builder.build(element);
 
   auto relativeLayoutMetrics =
-      childShadowNode->getRelativeLayoutMetrics(*parentShadowNode, {});
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode->getFamily(), *parentShadowNode, {});
 
   // A is a parent to B, A has origin {10, 10}, B has origin {10, 10}.
   // B's relative origin to A should be {10, 10}.
@@ -104,13 +105,14 @@ TEST(LayoutableShadowNodeTest, contentOriginOffset) {
   auto parentShadowNode = builder.build(element);
 
   auto relativeLayoutMetrics =
-      childShadowNode->getRelativeLayoutMetrics(*parentShadowNode, {});
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode->getFamily(), *parentShadowNode, {});
 
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.x, 0);
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.y, 10);
 
-  relativeLayoutMetrics =
-      childShadowNode->getRelativeLayoutMetrics(*parentShadowNode, {false});
+  relativeLayoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics(
+      childShadowNode->getFamily(), *parentShadowNode, {false});
 
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.x, 10);
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.y, 20);
@@ -157,7 +159,8 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnTransformedNode) {
   auto parentShadowNode = builder.build(element);
 
   auto relativeLayoutMetrics =
-      childShadowNode->getRelativeLayoutMetrics(*parentShadowNode, {});
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode->getFamily(), *parentShadowNode, {});
 
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.x, 35);
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.y, 70);
@@ -222,7 +225,8 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnTransformedParent) {
   auto parentShadowNode = builder.build(element);
 
   auto relativeLayoutMetrics =
-      childShadowNode->getRelativeLayoutMetrics(*parentShadowNode, {});
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode->getFamily(), *parentShadowNode, {});
 
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.x, 45);
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.y, 45);
@@ -254,7 +258,8 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnSameNode) {
   auto shadowNode = builder.build(element);
 
   auto relativeLayoutMetrics =
-      shadowNode->getRelativeLayoutMetrics(*shadowNode, {});
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          shadowNode->getFamily(), *shadowNode, {});
 
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.x, 0);
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.y, 0);
@@ -290,7 +295,8 @@ TEST(LayoutableShadowNodeTest, relativeLayoutMetricsOnSameTransformedNode) {
   auto shadowNode = builder.build(element);
 
   auto relativeLayoutMetrics =
-      shadowNode->getRelativeLayoutMetrics(*shadowNode, {});
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          shadowNode->getFamily(), *shadowNode, {});
 
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.x, 0);
   EXPECT_EQ(relativeLayoutMetrics.frame.origin.y, 0);
@@ -332,7 +338,8 @@ TEST(LayoutableShadowNodeTest, relativeLayourMetricsOnClonedNode) {
   parentShadowNode->replaceChild(*childShadowNode, clonedChildShadowNode);
 
   auto newRelativeLayoutMetrics =
-      childShadowNode->getRelativeLayoutMetrics(*parentShadowNode, {});
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode->getFamily(), *parentShadowNode, {});
   EXPECT_EQ(newRelativeLayoutMetrics.frame.size.width, 50);
   EXPECT_EQ(newRelativeLayoutMetrics.frame.size.height, 60);
 }
@@ -379,7 +386,7 @@ TEST(
 
   auto parentShadowNode = builder.build(element);
 
-  auto relativeLayoutMetrics = childShadowNode->getRelativeLayoutMetrics(*parentShadowNode, {});
+  auto relativeLayoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics(childShadowNode->getFamily(), *parentShadowNode, {});
 
   // relativeLayoutMetrics do not include offsset of nodeAA_ because it is a
   // RootKindNode.
@@ -410,13 +417,15 @@ TEST(LayoutableShadowNodeTest, includeViewportOffset) {
 
   // `includeViewportOffset` has to work with `includeTransform` enabled and
   // disabled.
-  auto layoutMetrics = viewShadowNode->getRelativeLayoutMetrics(
+  auto layoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics(
+      viewShadowNode->getFamily(),
       *rootShadowNode,
       {/* includeTransform = */ false, /* includeViewportOffset = */ true});
   EXPECT_EQ(layoutMetrics.frame.origin.x, 10);
   EXPECT_EQ(layoutMetrics.frame.origin.y, 20);
 
-  layoutMetrics = viewShadowNode->getRelativeLayoutMetrics(
+  layoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics(
+      viewShadowNode->getFamily(),
       *rootShadowNode,
       {/* includeTransform = */ true, /* includeViewportOffset = */ true});
   EXPECT_EQ(layoutMetrics.frame.origin.x, 10);
diff --git a/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp b/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp
index 48a8726662b641..e54b623c9984b6 100644
--- a/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp
@@ -8,7 +8,9 @@
 #include <memory>
 
 #include <gtest/gtest.h>
+#include <react/debug/flags.h>
 #include <react/renderer/core/ConcreteShadowNode.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -20,9 +22,11 @@ class PropsSingleFloat : public Props {
  public:
   PropsSingleFloat() = default;
   PropsSingleFloat(
+      const PropsParserContext &context,
       const PropsSingleFloat &sourceProps,
       const RawProps &rawProps)
       : floatValue(convertRawProp(
+            context,
             rawProps,
             "floatValue",
             sourceProps.floatValue,
@@ -36,9 +40,11 @@ class PropsSingleDouble : public Props {
  public:
   PropsSingleDouble() = default;
   PropsSingleDouble(
+      const PropsParserContext &context,
       const PropsSingleDouble &sourceProps,
       const RawProps &rawProps)
       : doubleValue(convertRawProp(
+            context,
             rawProps,
             "doubleValue",
             sourceProps.doubleValue,
@@ -51,9 +57,16 @@ class PropsSingleDouble : public Props {
 class PropsSingleInt : public Props {
  public:
   PropsSingleInt() = default;
-  PropsSingleInt(const PropsSingleInt &sourceProps, const RawProps &rawProps)
-      : intValue(
-            convertRawProp(rawProps, "intValue", sourceProps.intValue, 17)) {}
+  PropsSingleInt(
+      const PropsParserContext &context,
+      const PropsSingleInt &sourceProps,
+      const RawProps &rawProps)
+      : intValue(convertRawProp(
+            context,
+            rawProps,
+            "intValue",
+            sourceProps.intValue,
+            17)) {}
 
  private:
   const int intValue{17};
@@ -63,26 +76,35 @@ class PropsPrimitiveTypes : public Props {
  public:
   PropsPrimitiveTypes() = default;
   PropsPrimitiveTypes(
+      const PropsParserContext &context,
       const PropsPrimitiveTypes &sourceProps,
       const RawProps &rawProps)
-      : intValue(
-            convertRawProp(rawProps, "intValue", sourceProps.intValue, 17)),
+      : intValue(convertRawProp(
+            context,
+            rawProps,
+            "intValue",
+            sourceProps.intValue,
+            17)),
         doubleValue(convertRawProp(
+            context,
             rawProps,
             "doubleValue",
             sourceProps.doubleValue,
             17.56)),
         floatValue(convertRawProp(
+            context,
             rawProps,
             "floatValue",
             sourceProps.floatValue,
             56.75)),
         stringValue(convertRawProp(
+            context,
             rawProps,
             "stringValue",
             sourceProps.stringValue,
             "")),
         boolValue(convertRawProp(
+            context,
             rawProps,
             "boolValue",
             sourceProps.boolValue,
@@ -100,9 +122,11 @@ class PropsMultiLookup : public Props {
  public:
   PropsMultiLookup() = default;
   PropsMultiLookup(
+      const PropsParserContext &context,
       const PropsMultiLookup &sourceProps,
       const RawProps &rawProps)
       : floatValue(convertRawProp(
+            context,
             rawProps,
             "floatValue",
             sourceProps.floatValue,
@@ -111,7 +135,12 @@ class PropsMultiLookup : public Props {
         // pattern that does occur a lot: nested structs that access props we
         // have already accessed populating Props
         derivedFloatValue(
-            convertRawProp(rawProps, "floatValue", sourceProps.floatValue, 40) *
+            convertRawProp(
+                context,
+                rawProps,
+                "floatValue",
+                sourceProps.floatValue,
+                40) *
             2) {}
 
   const float floatValue{17.5};
@@ -119,12 +148,15 @@ class PropsMultiLookup : public Props {
 };
 
 TEST(RawPropsTest, handleProps) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
   auto parser = RawPropsParser();
   parser.prepare<Props>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
-  auto props = std::make_shared<Props>(Props(), raw);
+  auto props = std::make_shared<Props>(parserContext, Props(), raw);
 
   // Props are not sealed after applying raw props.
   EXPECT_FALSE(props->getSealed());
@@ -133,10 +165,13 @@ TEST(RawPropsTest, handleProps) {
 }
 
 TEST(RawPropsTest, handleRawPropsSingleString) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc"));
   auto parser = RawPropsParser();
   parser.prepare<Props>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   std::string value = (std::string)*raw.at("nativeID", nullptr, nullptr);
 
@@ -144,11 +179,14 @@ TEST(RawPropsTest, handleRawPropsSingleString) {
 }
 
 TEST(RawPropsTest, handleRawPropsSingleFloat) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw =
       RawProps(folly::dynamic::object("floatValue", (float)42.42));
   auto parser = RawPropsParser();
   parser.prepare<PropsSingleFloat>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   float value = (float)*raw.at("floatValue", nullptr, nullptr);
 
@@ -156,11 +194,14 @@ TEST(RawPropsTest, handleRawPropsSingleFloat) {
 }
 
 TEST(RawPropsTest, handleRawPropsSingleDouble) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw =
       RawProps(folly::dynamic::object("doubleValue", (double)42.42));
   auto parser = RawPropsParser();
   parser.prepare<PropsSingleDouble>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   double value = (double)*raw.at("doubleValue", nullptr, nullptr);
 
@@ -168,10 +209,13 @@ TEST(RawPropsTest, handleRawPropsSingleDouble) {
 }
 
 TEST(RawPropsTest, handleRawPropsSingleInt) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42.42));
   auto parser = RawPropsParser();
   parser.prepare<PropsSingleInt>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   int value = (int)*raw.at("intValue", nullptr, nullptr);
 
@@ -179,10 +223,13 @@ TEST(RawPropsTest, handleRawPropsSingleInt) {
 }
 
 TEST(RawPropsTest, handleRawPropsSingleIntGetManyTimes) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42.42));
   auto parser = RawPropsParser();
   parser.prepare<PropsSingleInt>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
   EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
@@ -190,13 +237,17 @@ TEST(RawPropsTest, handleRawPropsSingleIntGetManyTimes) {
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypes) {
-  const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42)(
-      "doubleValue", (double)17.42)("floatValue", (float)66.67)(
-      "stringValue", "helloworld")("boolValue", true));
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  const auto &raw = RawProps(
+      folly::dynamic::object("intValue", (int)42)("doubleValue", (double)17.42)(
+          "floatValue",
+          (float)66.67)("stringValue", "helloworld")("boolValue", true));
 
   auto parser = RawPropsParser();
   parser.prepare<PropsPrimitiveTypes>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
   EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
@@ -208,13 +259,17 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypes) {
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetTwice) {
-  const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42)(
-      "doubleValue", (double)17.42)("floatValue", (float)66.67)(
-      "stringValue", "helloworld")("boolValue", true));
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  const auto &raw = RawProps(
+      folly::dynamic::object("intValue", (int)42)("doubleValue", (double)17.42)(
+          "floatValue",
+          (float)66.67)("stringValue", "helloworld")("boolValue", true));
 
   auto parser = RawPropsParser();
   parser.prepare<PropsPrimitiveTypes>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
   EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
@@ -234,13 +289,17 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetTwice) {
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetOutOfOrder) {
-  const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42)(
-      "doubleValue", (double)17.42)("floatValue", (float)66.67)(
-      "stringValue", "helloworld")("boolValue", true));
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  const auto &raw = RawProps(
+      folly::dynamic::object("intValue", (int)42)("doubleValue", (double)17.42)(
+          "floatValue",
+          (float)66.67)("stringValue", "helloworld")("boolValue", true));
 
   auto parser = RawPropsParser();
   parser.prepare<PropsPrimitiveTypes>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
   EXPECT_NEAR((double)*raw.at("doubleValue", nullptr, nullptr), 17.42, 0.0001);
@@ -260,11 +319,14 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetOutOfOrder) {
 }
 
 TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncomplete) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42));
 
   auto parser = RawPropsParser();
   parser.prepare<PropsPrimitiveTypes>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
   EXPECT_EQ(raw.at("doubleValue", nullptr, nullptr), nullptr);
@@ -275,13 +337,16 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncomplete) {
   EXPECT_EQ((int)*raw.at("intValue", nullptr, nullptr), 42);
 }
 
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
 TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncorrectLookup) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42));
 
   auto parser = RawPropsParser();
   parser.prepare<PropsPrimitiveTypes>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
   // Before D18662135, looking up an invalid key would trigger
   // an infinite loop. This is out of contract, so we should only
@@ -292,12 +357,16 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncorrectLookup) {
 #endif
 
 TEST(RawPropsTest, handlePropsMultiLookup) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   const auto &raw = RawProps(folly::dynamic::object("floatValue", (float)10.0));
   auto parser = RawPropsParser();
   parser.prepare<PropsMultiLookup>();
-  raw.parse(parser);
+  raw.parse(parser, parserContext);
 
-  auto props = std::make_shared<PropsMultiLookup>(PropsMultiLookup(), raw);
+  auto props = std::make_shared<PropsMultiLookup>(
+      parserContext, PropsMultiLookup(), raw);
 
   // Props are not sealed after applying raw props.
   EXPECT_FALSE(props->getSealed());
diff --git a/ReactCommon/react/renderer/core/tests/TestComponent.h b/ReactCommon/react/renderer/core/tests/TestComponent.h
index 9943d78a031b49..a396f1ba6217b6 100644
--- a/ReactCommon/react/renderer/core/tests/TestComponent.h
+++ b/ReactCommon/react/renderer/core/tests/TestComponent.h
@@ -14,6 +14,7 @@
 #include <react/renderer/components/view/ViewEventEmitter.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ShadowNode.h>
 
@@ -35,8 +36,11 @@ class TestProps : public ViewProps {
  public:
   TestProps() = default;
 
-  TestProps(const TestProps &sourceProps, const RawProps &rawProps)
-      : ViewProps(sourceProps, rawProps) {}
+  TestProps(
+      const PropsParserContext &context,
+      const TestProps &sourceProps,
+      const RawProps &rawProps)
+      : ViewProps(context, sourceProps, rawProps) {}
 };
 
 using SharedTestProps = std::shared_ptr<const TestProps>;
@@ -45,11 +49,11 @@ class TestShadowNode;
 
 using SharedTestShadowNode = std::shared_ptr<const TestShadowNode>;
 
-class TestShadowNode : public ConcreteViewShadowNode<
-                           TestComponentName,
-                           TestProps,
-                           ViewEventEmitter,
-                           TestState> {
+class TestShadowNode final : public ConcreteViewShadowNode<
+                                 TestComponentName,
+                                 TestProps,
+                                 ViewEventEmitter,
+                                 TestState> {
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
diff --git a/ReactCommon/react/renderer/core/tests/traitCastTest.cpp b/ReactCommon/react/renderer/core/tests/traitCastTest.cpp
index f4af650f4993fb..e68e4b16663357 100644
--- a/ReactCommon/react/renderer/core/tests/traitCastTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/traitCastTest.cpp
@@ -47,6 +47,9 @@ TEST(traitCastTest, testOne) {
 
   auto rootShadowNode = builder.build(element);
 
+  std::shared_ptr<ShadowNode> shadowNodeForRawTextShadowNode{rawTextShadowNode};
+  std::shared_ptr<ShadowNode> shadowNodeForTextShadowNode{textShadowNode};
+
   // Casting `nullptr` returns `nullptrs`.
   EXPECT_FALSE(traitCast<LayoutableShadowNode const *>(nullptr));
   EXPECT_FALSE(traitCast<YogaLayoutableShadowNode const *>(nullptr));
@@ -102,4 +105,32 @@ TEST(traitCastTest, testOne) {
       traitCast<LayoutableShadowNode const &>(*rawTextShadowNode), "");
   EXPECT_DEATH_IF_SUPPORTED(
       traitCast<YogaLayoutableShadowNode const &>(*rawTextShadowNode), "");
+
+  // trait cast to `RawTextShadowNode` works on `RawTextShadowNode`
+  // and not on TextShadowNode or ViewShadowNode
+  EXPECT_TRUE(traitCast<RawTextShadowNode const *>(
+      shadowNodeForRawTextShadowNode.get()));
+  EXPECT_NO_FATAL_FAILURE(
+      traitCast<RawTextShadowNode const &>(*shadowNodeForRawTextShadowNode));
+  EXPECT_FALSE(
+      traitCast<RawTextShadowNode const *>(shadowNodeForTextShadowNode.get()));
+  EXPECT_DEATH_IF_SUPPORTED(
+      traitCast<RawTextShadowNode const &>(*shadowNodeForTextShadowNode), "");
+  EXPECT_FALSE(traitCast<RawTextShadowNode const *>(viewShadowNode.get()));
+  EXPECT_DEATH_IF_SUPPORTED(
+      traitCast<RawTextShadowNode const &>(*viewShadowNode), "");
+
+  // trait cast to `TextShadowNode` works on `TextShadowNode`
+  // and not on RawTextShadowNode or ViewShadowNode
+  EXPECT_TRUE(
+      traitCast<TextShadowNode const *>(shadowNodeForTextShadowNode.get()));
+  EXPECT_NO_FATAL_FAILURE(
+      traitCast<TextShadowNode const &>(*shadowNodeForTextShadowNode));
+  EXPECT_FALSE(
+      traitCast<TextShadowNode const *>(shadowNodeForRawTextShadowNode.get()));
+  EXPECT_DEATH_IF_SUPPORTED(
+      traitCast<TextShadowNode const &>(*shadowNodeForRawTextShadowNode), "");
+  EXPECT_FALSE(traitCast<TextShadowNode const *>(viewShadowNode.get()));
+  EXPECT_DEATH_IF_SUPPORTED(
+      traitCast<TextShadowNode const &>(*viewShadowNode), "");
 }
diff --git a/ReactCommon/react/renderer/debug/Android.mk b/ReactCommon/react/renderer/debug/Android.mk
index 6a86e43ab318ac..e856283cc6a4f6 100644
--- a/ReactCommon/react/renderer/debug/Android.mk
+++ b/ReactCommon/react/renderer/debug/Android.mk
@@ -20,7 +20,7 @@ LOCAL_SHARED_LIBRARIES := libfolly_json
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/ReactCommon/react/renderer/debug/BUCK b/ReactCommon/react/renderer/debug/BUCK
index 9950f239cc5579..26e3e9f793f011 100644
--- a/ReactCommon/react/renderer/debug/BUCK
+++ b/ReactCommon/react/renderer/debug/BUCK
@@ -1,8 +1,4 @@
 load("@fbsource//tools/build_defs:platform_defs.bzl", "CXX")
-load(
-    "@fbsource//tools/build_defs/apple:flag_defs.bzl",
-    "get_preprocessor_flags_for_build_mode",
-)
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -10,6 +6,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -37,7 +34,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -58,6 +55,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         react_native_xplat_target("better:better"),
+        react_native_xplat_target("react/debug:debug"),
     ],
 )
 
@@ -68,7 +66,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/debug/DebugStringConvertible.h b/ReactCommon/react/renderer/debug/DebugStringConvertible.h
index de8ce9c6e5385f..8833211cd2599d 100644
--- a/ReactCommon/react/renderer/debug/DebugStringConvertible.h
+++ b/ReactCommon/react/renderer/debug/DebugStringConvertible.h
@@ -13,25 +13,11 @@
 #include <unordered_set>
 #include <vector>
 
+#include "flags.h"
+
 namespace facebook {
 namespace react {
 
-#ifndef NDEBUG
-#define RN_DEBUG_STRING_CONVERTIBLE 1
-#endif
-
-// To Debug Yoga layout, uncomment the following line.
-// #define RN_DEBUG_YOGA_LOGGER 1
-//
-// Additional logging can be enabled editing yoga.cpp (e.g. gPrintChanges,
-// gPrintSkips)
-
-// To Debug introspection of RN Shadow tree, uncomment the following line:
-// #define RN_SHADOW_TREE_INTROSPECTION 1
-
-// To enable asserts (crashing) when checking stub trees
-// #define RN_VALIDATE_SHADOW_TREE_STUB 1
-
 #if RN_DEBUG_STRING_CONVERTIBLE
 
 class DebugStringConvertible;
@@ -206,16 +192,16 @@ std::string getDebugChildrenDescription(
     return "";
   }
 
-  auto trailing = options.format ? std::string{"\n"} : std::string{""};
+  auto separator = options.format ? std::string{"\n"} : std::string{""};
   auto childrenString = std::string{""};
   options.depth++;
 
   for (auto child : getDebugChildren(object, options)) {
-    childrenString += getDebugDescription(child, options) + trailing;
+    childrenString += getDebugDescription(child, options) + separator;
   }
 
-  if (!childrenString.empty() && !trailing.empty()) {
-    // Removing trailing fragment.
+  if (!childrenString.empty() && !separator.empty()) {
+    // Removing separator fragment.
     childrenString.erase(childrenString.end() - 1);
   }
 
@@ -244,16 +230,16 @@ std::string getDebugDescription(
   auto childrenString = getDebugChildrenDescription(object, options);
   auto propsString = getDebugPropsDescription(object, options);
 
-  auto leading =
+  auto prefix =
       options.format ? std::string(options.depth * 2, ' ') : std::string{""};
-  auto trailing = options.format ? std::string{"\n"} : std::string{""};
+  auto separator = options.format ? std::string{"\n"} : std::string{""};
 
-  return leading + "<" + nameString +
+  return prefix + "<" + nameString +
       (valueString.empty() ? "" : "=" + valueString) +
       (propsString.empty() ? "" : " " + propsString) +
       (childrenString.empty() ? "/>"
-                              : ">" + trailing + childrenString + trailing +
-               leading + "</" + nameString + ">");
+                              : ">" + separator + childrenString + separator +
+               prefix + "</" + nameString + ">");
 }
 
 /*
diff --git a/ReactCommon/react/renderer/debug/SystraceSection.h b/ReactCommon/react/renderer/debug/SystraceSection.h
index a21cd36b2b7263..603c823b4e5132 100644
--- a/ReactCommon/react/renderer/debug/SystraceSection.h
+++ b/ReactCommon/react/renderer/debug/SystraceSection.h
@@ -29,7 +29,7 @@ struct ConcreteSystraceSection {
   template <typename... ConvertsToStringPiece>
   explicit ConcreteSystraceSection(
       const char *name,
-      ConvertsToStringPiece &&... args)
+      ConvertsToStringPiece &&...args)
       : m_section(TRACE_TAG_REACT_CXX_BRIDGE, name, args...) {}
 
  private:
@@ -42,7 +42,7 @@ struct DummySystraceSection {
   template <typename... ConvertsToStringPiece>
   explicit DummySystraceSection(
       const char *name,
-      ConvertsToStringPiece &&... args) {}
+      ConvertsToStringPiece &&...args) {}
 };
 using SystraceSection = DummySystraceSection;
 #endif
diff --git a/ReactCommon/react/renderer/debug/flags.h b/ReactCommon/react/renderer/debug/flags.h
new file mode 100644
index 00000000000000..698c9a55fc528e
--- /dev/null
+++ b/ReactCommon/react/renderer/debug/flags.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/debug/flags.h>
+
+//
+// This file contains flags that should __never__ be enabled for
+// release-mode/production builds, unless explicitly noted. You can enable some
+// of these for debug or local builds to assist in logging / debugging specific
+// features.
+//
+
+// Enables verbose logging for the LayoutAnimations subsystem.
+//#define LAYOUT_ANIMATION_VERBOSE_LOGGING 1
+
+// Logs information before running `assert` in LayoutAnimations. More useful on
+// Android vs other platforms.
+//#define VERBOSE_LAYOUT_ANIMATION_ASSERTS 1
+
+// Enables some Shadow Tree introspection features (maintains a StubViewTree,
+// and logs prev/next tree and mutations if there are any discrepancies). If you
+// define this, also define `RN_DEBUG_STRING_CONVERTIBLE`.
+#ifdef REACT_NATIVE_DEBUG
+#define RN_SHADOW_TREE_INTROSPECTION 1
+#endif
+
+// This enables certain object-to-string debug conversions to be compiled.
+// Enable if `RN_SHADOW_TREE_INTROSPECTION` is enabled.
+#ifdef RN_SHADOW_TREE_INTROSPECTION
+#define RN_DEBUG_STRING_CONVERTIBLE 1
+#endif
+
+// Enables *very* verbose, noisy logs in the differ. Useful for debugging
+// specifically the differ, but not much else.
+//#define DEBUG_LOGS_DIFFER
+
+// Uncomment to enable verbose StubViewTree debug logs. This ensures that errors
+// are logged to console before the `assert` is fired. More useful on Android vs
+// other platforms.
+//#define STUB_VIEW_TREE_VERBOSE 1
+
+// Verbose logging for certain Yoga-related things in the RN codebase (not Yoga
+// codebase). Useful for debugging layout.
+//#define RN_DEBUG_YOGA_LOGGER 1
diff --git a/ReactCommon/react/renderer/element/BUCK b/ReactCommon/react/renderer/element/BUCK
index 1e2ac391114f62..88712f55955302 100644
--- a/ReactCommon/react/renderer/element/BUCK
+++ b/ReactCommon/react/renderer/element/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -7,6 +6,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -72,7 +72,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/element/ComponentBuilder.cpp b/ReactCommon/react/renderer/element/ComponentBuilder.cpp
index 242b8d854e6623..c1438bb63aafd8 100644
--- a/ReactCommon/react/renderer/element/ComponentBuilder.cpp
+++ b/ReactCommon/react/renderer/element/ComponentBuilder.cpp
@@ -45,9 +45,10 @@ ShadowNode::Unshared ComponentBuilder::build(
         *family, elementFragment.stateCallback());
     constShadowNode = componentDescriptor.cloneShadowNode(
         *constShadowNode,
-        ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                           ShadowNodeFragment::childrenPlaceholder(),
-                           newState});
+        ShadowNodeFragment{
+            ShadowNodeFragment::propsPlaceholder(),
+            ShadowNodeFragment::childrenPlaceholder(),
+            newState});
   }
 
   auto shadowNode = std::const_pointer_cast<ShadowNode>(constShadowNode);
diff --git a/ReactCommon/react/renderer/graphics/Android.mk b/ReactCommon/react/renderer/graphics/Android.mk
index 675a27973a5f91..c38de58cec3374 100644
--- a/ReactCommon/react/renderer/graphics/Android.mk
+++ b/ReactCommon/react/renderer/graphics/Android.mk
@@ -11,7 +11,7 @@ LOCAL_MODULE := react_render_graphics
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/graphics/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libfolly_json
+LOCAL_SHARED_LIBRARIES := libfolly_json libreact_debug libfb libfbjni libfolly_json glog
 
 LOCAL_STATIC_LIBRARIES :=
 
@@ -22,8 +22,12 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/cxx/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
+$(call import-module,glog)
+$(call import-module,fbjni)
+$(call import-module,fb)
 $(call import-module,folly)
+$(call import-module,react/debug)
diff --git a/ReactCommon/react/renderer/graphics/BUCK b/ReactCommon/react/renderer/graphics/BUCK
index 87064ce89c0436..7c300c3c3e7771 100644
--- a/ReactCommon/react/renderer/graphics/BUCK
+++ b/ReactCommon/react/renderer/graphics/BUCK
@@ -1,12 +1,14 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
     "APPLE",
     "CXX",
+    "FBJNI_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
+    "react_native_target",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -37,7 +39,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_exported_headers = subdir_glob(
@@ -51,23 +53,32 @@ rn_xplat_cxx_library(
             "platform/cxx/react/renderer/graphics/**/*.cpp",
         ],
     ),
+    fbandroid_allow_jni_merging = True,
+    fbandroid_deps = [
+        FBJNI_TARGET,
+        react_native_target("jni/react/jni:jni"),
+    ],
     fbandroid_exported_headers = subdir_glob(
         [
+            ("platform/android/react/renderer/graphics", "**/*.h"),
             ("platform/cxx/react/renderer/graphics", "**/*.h"),
         ],
+        exclude = ["platform/cxx/react/renderer/graphics/PlatformColorParser.h"],
         prefix = "react/renderer/graphics",
     ),
     fbandroid_srcs = glob(
         [
             "platform/cxx/react/renderer/graphics/**/*.cpp",
+            "platform/android/react/renderer/graphics/**/*.cpp",
         ],
+        exclude = ["platform/cxx/react/renderer/graphics/PlatformColorParser.h"],
     ),
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     ios_deps = [
-        "//xplat/js:RCTImage",
         "//xplat/js/react-native-github:RCTCxxBridge",
+        "//xplat/js/react-native-github:RCTImage",
     ],
     ios_exported_headers = subdir_glob(
         [
@@ -96,6 +107,7 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("better:better"),
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
@@ -112,7 +124,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/graphics/React-graphics.podspec b/ReactCommon/react/renderer/graphics/React-graphics.podspec
index 62a5939f25b085..00ea8743507325 100644
--- a/ReactCommon/react/renderer/graphics/React-graphics.podspec
+++ b/ReactCommon/react/renderer/graphics/React-graphics.podspec
@@ -5,19 +5,19 @@
 
 require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json")))
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
 version = package['version']
 
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -27,16 +27,17 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "9.0" }
+  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
   s.source                 = source
   s.library                = "stdc++"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.source_files           = "**/*.{m,mm,cpp,h}"
-  s.exclude_files          = "**/tests/*",
-                             "**/android/*",
-                             "**/cxx/*"
-  s.header_dir             = "react/graphics"
-  s.pod_target_xcconfig  = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  s.exclude_files          = "tests",
+                             "platform/android",
+                             "platform/cxx"
+  s.header_dir             = "react/renderer/graphics"
+  s.pod_target_xcconfig  = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/../../../\" \"$(PODS_ROOT)/RCT-Folly\"" }
 
   s.dependency "RCT-Folly/Fabric", folly_version
+  s.dependency "React-Core/Default", version
 end
diff --git a/ReactCommon/react/renderer/graphics/Rect.h b/ReactCommon/react/renderer/graphics/Rect.h
index 78b29c4a3b76e3..19db0b44b6ac1f 100644
--- a/ReactCommon/react/renderer/graphics/Rect.h
+++ b/ReactCommon/react/renderer/graphics/Rect.h
@@ -94,9 +94,10 @@ struct Rect {
     rightBottomPoint.y = std::max(rightBottomPoint.y, c.y);
     rightBottomPoint.y = std::max(rightBottomPoint.y, d.y);
 
-    return {leftTopPoint,
-            {rightBottomPoint.x - leftTopPoint.x,
-             rightBottomPoint.y - leftTopPoint.y}};
+    return {
+        leftTopPoint,
+        {rightBottomPoint.x - leftTopPoint.x,
+         rightBottomPoint.y - leftTopPoint.y}};
   }
 };
 
diff --git a/ReactCommon/react/renderer/graphics/RectangleCorners.h b/ReactCommon/react/renderer/graphics/RectangleCorners.h
index c3932cd67620ec..771dc9f24b8e09 100644
--- a/ReactCommon/react/renderer/graphics/RectangleCorners.h
+++ b/ReactCommon/react/renderer/graphics/RectangleCorners.h
@@ -57,8 +57,8 @@ namespace std {
 
 template <typename T>
 struct hash<facebook::react::RectangleCorners<T>> {
-  size_t operator()(facebook::react::RectangleCorners<T> const &corners) const
-      noexcept {
+  size_t operator()(
+      facebook::react::RectangleCorners<T> const &corners) const noexcept {
     return folly::hash::hash_combine(
         0,
         corners.topLeft,
diff --git a/ReactCommon/react/renderer/graphics/RectangleEdges.h b/ReactCommon/react/renderer/graphics/RectangleEdges.h
index b99b8645576a2b..616abe07e7b253 100644
--- a/ReactCommon/react/renderer/graphics/RectangleEdges.h
+++ b/ReactCommon/react/renderer/graphics/RectangleEdges.h
@@ -45,20 +45,22 @@ template <typename T>
 RectangleEdges<T> operator+(
     RectangleEdges<T> const &lhs,
     RectangleEdges<T> const &rhs) noexcept {
-  return RectangleEdges<T>{lhs.left + rhs.left,
-                           lhs.top + rhs.top,
-                           lhs.right + rhs.right,
-                           lhs.bottom + rhs.bottom};
+  return RectangleEdges<T>{
+      lhs.left + rhs.left,
+      lhs.top + rhs.top,
+      lhs.right + rhs.right,
+      lhs.bottom + rhs.bottom};
 }
 
 template <typename T>
 RectangleEdges<T> operator-(
     RectangleEdges<T> const &lhs,
     RectangleEdges<T> const &rhs) noexcept {
-  return RectangleEdges<T>{lhs.left - rhs.left,
-                           lhs.top - rhs.top,
-                           lhs.right - rhs.right,
-                           lhs.bottom - rhs.bottom};
+  return RectangleEdges<T>{
+      lhs.left - rhs.left,
+      lhs.top - rhs.top,
+      lhs.right - rhs.right,
+      lhs.bottom - rhs.bottom};
 }
 
 /*
@@ -70,9 +72,10 @@ using EdgeInsets = RectangleEdges<Float>;
  * Adjusts a rectangle by the given edge insets.
  */
 inline Rect insetBy(Rect const &rect, EdgeInsets const &insets) noexcept {
-  return Rect{{rect.origin.x + insets.left, rect.origin.y + insets.top},
-              {rect.size.width - insets.left - insets.right,
-               rect.size.height - insets.top - insets.bottom}};
+  return Rect{
+      {rect.origin.x + insets.left, rect.origin.y + insets.top},
+      {rect.size.width - insets.left - insets.right,
+       rect.size.height - insets.top - insets.bottom}};
 }
 
 } // namespace react
@@ -82,8 +85,8 @@ namespace std {
 
 template <typename T>
 struct hash<facebook::react::RectangleEdges<T>> {
-  size_t operator()(facebook::react::RectangleEdges<T> const &edges) const
-      noexcept {
+  size_t operator()(
+      facebook::react::RectangleEdges<T> const &edges) const noexcept {
     return folly::hash::hash_combine(
         0, edges.left, edges.right, edges.top, edges.bottom);
   }
diff --git a/ReactCommon/react/renderer/graphics/Transform.cpp b/ReactCommon/react/renderer/graphics/Transform.cpp
index 6caea8e9749869..f99db5fd2b44f9 100644
--- a/ReactCommon/react/renderer/graphics/Transform.cpp
+++ b/ReactCommon/react/renderer/graphics/Transform.cpp
@@ -10,6 +10,7 @@
 #include <cmath>
 
 #include <glog/logging.h>
+#include <react/debug/react_native_assert.h>
 
 namespace facebook {
 namespace react {
@@ -189,7 +190,7 @@ Transform Transform::Interpolate(
   // transform If at any point we hit an "Arbitrary" Transform, return at that
   // point
   Transform result = Transform::Identity();
-  for (int i = 0, j = 0;
+  for (size_t i = 0, j = 0;
        i < lhs.operations.size() || j < rhs.operations.size();) {
     bool haveLHS = i < lhs.operations.size();
     bool haveRHS = j < rhs.operations.size();
@@ -226,8 +227,8 @@ Transform Transform::Interpolate(
         (haveRHS && rhs.operations[j].type == type
              ? rhs.operations[j++]
              : Transform::DefaultTransformOperation(type));
-    assert(type == lhsOp.type);
-    assert(type == rhsOp.type);
+    react_native_assert(type == lhsOp.type);
+    react_native_assert(type == rhsOp.type);
 
     result = result *
         Transform::FromTransformOperation(TransformOperation{
diff --git a/ReactCommon/react/renderer/graphics/conversions.h b/ReactCommon/react/renderer/graphics/conversions.h
index 6fa241a4fa394d..a30d03daf644a5 100644
--- a/ReactCommon/react/renderer/graphics/conversions.h
+++ b/ReactCommon/react/renderer/graphics/conversions.h
@@ -8,41 +8,45 @@
 #pragma once
 
 #include <better/map.h>
-#include <folly/dynamic.h>
+#include <glog/logging.h>
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
+#include <react/renderer/graphics/PlatformColorParser.h>
 
 namespace facebook {
 namespace react {
 
 #pragma mark - Color
 
-inline void fromRawValue(const RawValue &value, SharedColor &result) {
-  float red;
-  float green;
-  float blue;
-  float alpha;
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    SharedColor &result) {
+  ColorComponents colorComponents = {0, 0, 0, 0};
 
   if (value.hasType<int>()) {
     auto argb = (int64_t)value;
     auto ratio = 255.f;
-    alpha = ((argb >> 24) & 0xFF) / ratio;
-    red = ((argb >> 16) & 0xFF) / ratio;
-    green = ((argb >> 8) & 0xFF) / ratio;
-    blue = (argb & 0xFF) / ratio;
+    colorComponents.alpha = ((argb >> 24) & 0xFF) / ratio;
+    colorComponents.red = ((argb >> 16) & 0xFF) / ratio;
+    colorComponents.green = ((argb >> 8) & 0xFF) / ratio;
+    colorComponents.blue = (argb & 0xFF) / ratio;
   } else if (value.hasType<std::vector<float>>()) {
     auto items = (std::vector<float>)value;
     auto length = items.size();
-    assert(length == 3 || length == 4);
-    red = items.at(0);
-    green = items.at(1);
-    blue = items.at(2);
-    alpha = length == 4 ? items.at(3) : 1.0;
+    react_native_assert(length == 3 || length == 4);
+    colorComponents.red = items.at(0);
+    colorComponents.green = items.at(1);
+    colorComponents.blue = items.at(2);
+    colorComponents.alpha = length == 4 ? items.at(3) : 1.0f;
   } else {
-    abort();
+    colorComponents = parsePlatformColor(context, value);
   }
-  result = colorFromComponents({red, green, blue, alpha});
+
+  result = colorFromComponents(colorComponents);
 }
 
 #ifdef ANDROID
@@ -51,10 +55,20 @@ inline folly::dynamic toDynamic(const SharedColor &color) {
   ColorComponents components = colorComponentsFromColor(color);
   auto ratio = 255.f;
   return (
-      ((int)(components.alpha * ratio) & 0xff) << 24 |
-      ((int)(components.red * ratio) & 0xff) << 16 |
-      ((int)(components.green * ratio) & 0xff) << 8 |
-      ((int)(components.blue * ratio) & 0xff));
+      ((int)round(components.alpha * ratio) & 0xff) << 24 |
+      ((int)round(components.red * ratio) & 0xff) << 16 |
+      ((int)round(components.green * ratio) & 0xff) << 8 |
+      ((int)round(components.blue * ratio) & 0xff));
+}
+
+inline int toMapBuffer(const SharedColor &color) {
+  ColorComponents components = colorComponentsFromColor(color);
+  auto ratio = 255.f;
+  return (
+      ((int)round(components.alpha * ratio) & 0xff) << 24 |
+      ((int)round(components.red * ratio) & 0xff) << 16 |
+      ((int)round(components.green * ratio) & 0xff) << 8 |
+      ((int)round(components.blue * ratio) & 0xff));
 }
 
 #endif
@@ -70,7 +84,10 @@ inline std::string toString(const SharedColor &value) {
 
 #pragma mark - Geometry
 
-inline void fromRawValue(const RawValue &value, Point &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    Point &result) {
   if (value.hasType<better::map<std::string, Float>>()) {
     auto map = (better::map<std::string, Float>)value;
     for (const auto &pair : map) {
@@ -83,17 +100,25 @@ inline void fromRawValue(const RawValue &value, Point &result) {
     return;
   }
 
+  react_native_assert(value.hasType<std::vector<Float>>());
   if (value.hasType<std::vector<Float>>()) {
     auto array = (std::vector<Float>)value;
-    assert(array.size() == 2);
-    result = {array.at(0), array.at(1)};
-    return;
+    react_native_assert(array.size() == 2);
+    if (array.size() >= 2) {
+      result = {array.at(0), array.at(1)};
+    } else {
+      result = {0, 0};
+      LOG(ERROR) << "Unsupported Point vector size: " << array.size();
+    }
+  } else {
+    LOG(ERROR) << "Unsupported Point type";
   }
-
-  abort();
 }
 
-inline void fromRawValue(const RawValue &value, Size &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    Size &result) {
   if (value.hasType<better::map<std::string, Float>>()) {
     auto map = (better::map<std::string, Float>)value;
     for (const auto &pair : map) {
@@ -101,22 +126,33 @@ inline void fromRawValue(const RawValue &value, Size &result) {
         result.width = pair.second;
       } else if (pair.first == "height") {
         result.height = pair.second;
+      } else {
+        LOG(ERROR) << "Unsupported Size map key: " << pair.first;
+        react_native_assert(false);
       }
     }
     return;
   }
 
+  react_native_assert(value.hasType<std::vector<Float>>());
   if (value.hasType<std::vector<Float>>()) {
     auto array = (std::vector<Float>)value;
-    assert(array.size() == 2);
-    result = {array.at(0), array.at(1)};
-    return;
+    react_native_assert(array.size() == 2);
+    if (array.size() >= 2) {
+      result = {array.at(0), array.at(1)};
+    } else {
+      result = {0, 0};
+      LOG(ERROR) << "Unsupported Size vector size: " << array.size();
+    }
+  } else {
+    LOG(ERROR) << "Unsupported Size type";
   }
-
-  abort();
 }
 
-inline void fromRawValue(const RawValue &value, EdgeInsets &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    EdgeInsets &result) {
   if (value.hasType<Float>()) {
     auto number = (Float)value;
     result = {number, number, number, number};
@@ -133,25 +169,37 @@ inline void fromRawValue(const RawValue &value, EdgeInsets &result) {
         result.bottom = pair.second;
       } else if (pair.first == "right") {
         result.right = pair.second;
+      } else {
+        LOG(ERROR) << "Unsupported EdgeInsets map key: " << pair.first;
+        react_native_assert(false);
       }
     }
     return;
   }
 
+  react_native_assert(value.hasType<std::vector<Float>>());
   if (value.hasType<std::vector<Float>>()) {
     auto array = (std::vector<Float>)value;
-    assert(array.size() == 4);
-    result = {array.at(0), array.at(1), array.at(2), array.at(3)};
-    return;
+    react_native_assert(array.size() == 4);
+    if (array.size() >= 4) {
+      result = {array.at(0), array.at(1), array.at(2), array.at(3)};
+    } else {
+      result = {0, 0, 0, 0};
+      LOG(ERROR) << "Unsupported EdgeInsets vector size: " << array.size();
+    }
+  } else {
+    LOG(ERROR) << "Unsupported EdgeInsets type";
   }
-
-  abort();
 }
 
-inline void fromRawValue(const RawValue &value, CornerInsets &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    CornerInsets &result) {
   if (value.hasType<Float>()) {
     auto number = (Float)value;
     result = {number, number, number, number};
+    return;
   }
 
   if (value.hasType<better::map<std::string, Float>>()) {
@@ -165,19 +213,29 @@ inline void fromRawValue(const RawValue &value, CornerInsets &result) {
         result.bottomLeft = pair.second;
       } else if (pair.first == "bottomRight") {
         result.bottomRight = pair.second;
+      } else {
+        LOG(ERROR) << "Unsupported CornerInsets map key: " << pair.first;
+        react_native_assert(false);
       }
     }
     return;
   }
 
+  react_native_assert(value.hasType<std::vector<Float>>());
   if (value.hasType<std::vector<Float>>()) {
     auto array = (std::vector<Float>)value;
-    assert(array.size() == 4);
-    result = {array.at(0), array.at(1), array.at(2), array.at(3)};
-    return;
+    react_native_assert(array.size() == 4);
+    if (array.size() >= 4) {
+      result = {array.at(0), array.at(1), array.at(2), array.at(3)};
+    } else {
+      LOG(ERROR) << "Unsupported CornerInsets vector size: " << array.size();
+    }
   }
 
-  abort();
+  // Error case - we should only here if all other supported cases fail
+  // In dev we would crash on assert before this point
+  result = {0, 0, 0, 0};
+  LOG(ERROR) << "Unsupported CornerInsets type";
 }
 
 inline std::string toString(const Point &point) {
diff --git a/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h b/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h
new file mode 100644
index 00000000000000..950dd1ad842642
--- /dev/null
+++ b/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+#include <react/renderer/graphics/ColorComponents.h>
+
+namespace facebook {
+namespace react {
+
+inline ColorComponents parsePlatformColor(
+    const PropsParserContext &context,
+    const RawValue &value) {
+  ColorComponents colorComponents = {0, 0, 0, 0};
+
+  if (value.hasType<better::map<std::string, std::vector<std::string>>>()) {
+    auto map = (better::map<std::string, std::vector<std::string>>)value;
+    auto resourcePaths = map["resource_paths"];
+    auto dynamicResourcePaths = folly::dynamic::array();
+    for (const auto &resourcePath : resourcePaths) {
+      dynamicResourcePaths.push_back(resourcePath);
+    }
+    folly::dynamic dynamicPlatformColor = folly::dynamic::object();
+    dynamicPlatformColor["resource_paths"] = dynamicResourcePaths;
+
+    auto fabricUIManager =
+        context.contextContainer.at<jni::global_ref<jobject>>(
+            "FabricUIManager");
+
+    static auto getColorFromJava =
+        facebook::jni::findClassStatic(
+            "com/facebook/react/fabric/FabricUIManager")
+            ->getMethod<jint(jint, ReadableMap::javaobject)>("getColor");
+
+    jni::local_ref<ReadableNativeMap::javaobject> dynamicPlatformColorRNM =
+        ReadableNativeMap::newObjectCxxArgs(dynamicPlatformColor);
+    jni::local_ref<ReadableMap::javaobject> dynamicPlatformColorRM =
+        jni::make_local(reinterpret_cast<ReadableMap::javaobject>(
+            dynamicPlatformColorRNM.get()));
+
+    auto color = getColorFromJava(
+        fabricUIManager, context.surfaceId, dynamicPlatformColorRM.get());
+
+    dynamicPlatformColorRM.reset();
+    dynamicPlatformColorRNM.reset();
+
+    auto argb = (int64_t)color;
+    auto ratio = 255.f;
+    colorComponents.alpha = ((argb >> 24) & 0xFF) / ratio;
+    colorComponents.red = ((argb >> 16) & 0xFF) / ratio;
+    colorComponents.green = ((argb >> 8) & 0xFF) / ratio;
+    colorComponents.blue = (argb & 0xFF) / ratio;
+  }
+
+  return colorComponents;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp
index c54b57cc503fcd..455ce60dc53718 100644
--- a/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp
+++ b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp
@@ -10,22 +10,31 @@
 namespace facebook {
 namespace react {
 
+bool isColorMeaningful(SharedColor const &color) noexcept {
+  if (!color) {
+    return false;
+  }
+
+  return colorComponentsFromColor(color).alpha > 0;
+}
+
 SharedColor colorFromComponents(ColorComponents components) {
-  float ratio = 255.9999;
+  float ratio = 255;
   return SharedColor(
-      ((int)(components.alpha * ratio) & 0xff) << 24 |
-      ((int)(components.red * ratio) & 0xff) << 16 |
-      ((int)(components.green * ratio) & 0xff) << 8 |
-      ((int)(components.blue * ratio) & 0xff));
+      ((int)round(components.alpha * ratio) & 0xff) << 24 |
+      ((int)round(components.red * ratio) & 0xff) << 16 |
+      ((int)round(components.green * ratio) & 0xff) << 8 |
+      ((int)round(components.blue * ratio) & 0xff));
 }
 
 ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
-  float ratio = 256;
+  float ratio = 255;
   Color color = *sharedColor;
-  return ColorComponents{(float)((color >> 16) & 0xff) / ratio,
-                         (float)((color >> 8) & 0xff) / ratio,
-                         (float)((color >> 0) & 0xff) / ratio,
-                         (float)((color >> 24) & 0xff) / ratio};
+  return ColorComponents{
+      (float)((color >> 16) & 0xff) / ratio,
+      (float)((color >> 8) & 0xff) / ratio,
+      (float)((color >> 0) & 0xff) / ratio,
+      (float)((color >> 24) & 0xff) / ratio};
 }
 
 SharedColor clearColor() {
diff --git a/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.h b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.h
index 86196c6a40487f..34c7f6f53f3eb8 100644
--- a/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.h
+++ b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <cmath>
 #include <functional>
 #include <limits>
 
@@ -58,6 +59,7 @@ class SharedColor {
   Color color_;
 };
 
+bool isColorMeaningful(SharedColor const &color) noexcept;
 SharedColor colorFromComponents(ColorComponents components);
 ColorComponents colorComponentsFromColor(SharedColor color);
 
diff --git a/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h
new file mode 100644
index 00000000000000..c48403ba22ab71
--- /dev/null
+++ b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+#include <react/renderer/graphics/ColorComponents.h>
+
+namespace facebook {
+namespace react {
+
+inline ColorComponents parsePlatformColor(
+    const PropsParserContext &context,
+    const RawValue &value) {
+  float alpha = 0;
+  float red = 0;
+  float green = 0;
+  float blue = 0;
+
+  return {red, green, blue, alpha};
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp b/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
index c1023384cac7bd..0c42253b94e9d5 100644
--- a/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
+++ b/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
@@ -11,13 +11,21 @@
 namespace facebook {
 namespace react {
 
+bool isColorMeaningful(SharedColor const &color) noexcept {
+  if (!color) {
+    return false;
+  }
+
+  return colorComponentsFromColor(color).alpha > 0;
+}
+
 SharedColor colorFromComponents(ColorComponents components) {
-  float ratio = 255.9999;
+  float ratio = 255;
   return SharedColor(
-      ((int)(components.alpha * ratio) & 0xff) << 24 |
-      ((int)(components.red * ratio) & 0xff) << 16 |
-      ((int)(components.green * ratio) & 0xff) << 8 |
-      ((int)(components.blue * ratio) & 0xff));
+      ((int)round(components.alpha * ratio) & 0xff) << 24 |
+      ((int)round(components.red * ratio) & 0xff) << 16 |
+      ((int)round(components.green * ratio) & 0xff) << 8 |
+      ((int)round(components.blue * ratio) & 0xff));
 }
 
 ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
@@ -27,12 +35,13 @@ ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
     return ColorComponents{0, 0, 0, 0};
   }
 
-  float ratio = 256;
+  float ratio = 255;
   Color color = *sharedColor;
-  return ColorComponents{(float)((color >> 16) & 0xff) / ratio,
-                         (float)((color >> 8) & 0xff) / ratio,
-                         (float)((color >> 0) & 0xff) / ratio,
-                         (float)((color >> 24) & 0xff) / ratio};
+  return ColorComponents{
+      (float)((color >> 16) & 0xff) / ratio,
+      (float)((color >> 8) & 0xff) / ratio,
+      (float)((color >> 0) & 0xff) / ratio,
+      (float)((color >> 24) & 0xff) / ratio};
 }
 
 SharedColor clearColor() {
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/Color.h b/ReactCommon/react/renderer/graphics/platform/ios/Color.h
index 0b8ab406b40f50..5078b43f1e4b7f 100644
--- a/ReactCommon/react/renderer/graphics/platform/ios/Color.h
+++ b/ReactCommon/react/renderer/graphics/platform/ios/Color.h
@@ -8,7 +8,9 @@
 #pragma once
 
 #include <better/optional.h>
+#include <cmath>
 
+#include <folly/Hash.h>
 #include <react/renderer/graphics/ColorComponents.h>
 #include <react/renderer/graphics/Float.h>
 
@@ -17,8 +19,42 @@ namespace react {
 
 using Color = int32_t;
 
-using SharedColor = better::optional<Color>;
+class SharedColor {
+ public:
+  static const Color UndefinedColor = std::numeric_limits<Color>::max();
 
+  SharedColor() : color_(UndefinedColor) {}
+
+  SharedColor(const SharedColor &sharedColor) : color_(sharedColor.color_) {}
+
+  SharedColor(Color color) : color_(color) {}
+
+  SharedColor &operator=(const SharedColor &sharedColor) {
+    color_ = sharedColor.color_;
+    return *this;
+  }
+
+  Color operator*() const {
+    return color_;
+  }
+
+  bool operator==(const SharedColor &otherColor) const {
+    return color_ == otherColor.color_;
+  }
+
+  bool operator!=(const SharedColor &otherColor) const {
+    return color_ != otherColor.color_;
+  }
+
+  operator bool() const {
+    return color_ != UndefinedColor;
+  }
+
+ private:
+  Color color_;
+};
+
+bool isColorMeaningful(SharedColor const &color) noexcept;
 SharedColor colorFromComponents(ColorComponents components);
 ColorComponents colorComponentsFromColor(SharedColor color);
 
@@ -28,3 +64,10 @@ SharedColor whiteColor();
 
 } // namespace react
 } // namespace facebook
+
+template <>
+struct std::hash<facebook::react::SharedColor> {
+  std::size_t operator()(facebook::react::SharedColor const &color) const {
+    return hash<int>()(*color);
+  }
+};
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/PlatformColorParser.h b/ReactCommon/react/renderer/graphics/platform/ios/PlatformColorParser.h
new file mode 100644
index 00000000000000..3437b280760d99
--- /dev/null
+++ b/ReactCommon/react/renderer/graphics/platform/ios/PlatformColorParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+#include <react/renderer/graphics/ColorComponents.h>
+#include <react/renderer/graphics/RCTPlatformColorUtils.h>
+
+namespace facebook {
+namespace react {
+
+inline ColorComponents parsePlatformColor(
+    const PropsParserContext &context,
+    const RawValue &value) {
+  if (value.hasType<better::map<std::string, RawValue>>()) {
+    auto items = (better::map<std::string, RawValue>)value;
+    if (items.find("semantic") != items.end() &&
+        items.at("semantic").hasType<std::vector<std::string>>()) {
+      auto semanticItems = (std::vector<std::string>)items.at("semantic");
+      return RCTPlatformColorComponentsFromSemanticItems(semanticItems);
+    }
+  }
+
+  return {0, 0, 0, 0};
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.h b/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.h
new file mode 100644
index 00000000000000..6994c1e0b856e8
--- /dev/null
+++ b/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <react/renderer/graphics/ColorComponents.h>
+#include <vector>
+
+facebook::react::ColorComponents RCTPlatformColorComponentsFromSemanticItems(
+    std::vector<std::string> &semanticItems);
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm b/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm
new file mode 100644
index 00000000000000..baa232423a85b1
--- /dev/null
+++ b/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTPlatformColorUtils.h"
+
+#import <Foundation/Foundation.h>
+#import <React/RCTUtils.h>
+#import <UIKit/UIKit.h>
+
+#include <string>
+
+NS_ASSUME_NONNULL_BEGIN
+
+static NSString *const kColorSuffix = @"Color";
+static NSString *const kFallbackARGBKey = @"fallback-argb";
+
+static NSDictionary<NSString *, NSDictionary *> *_PlatformColorSelectorsDict()
+{
+  static NSDictionary<NSString *, NSDictionary *> *dict;
+  static dispatch_once_t once_token;
+  dispatch_once(&once_token, ^(void) {
+    dict = @{
+      // https://developer.apple.com/documentation/uikit/uicolor/ui_element_colors
+      // Label Colors
+      @"label" : @{
+        kFallbackARGBKey : @(0xFF000000) // iOS 13.0
+      },
+      @"secondaryLabel" : @{
+        kFallbackARGBKey : @(0x993c3c43) // iOS 13.0
+      },
+      @"tertiaryLabel" : @{
+        kFallbackARGBKey : @(0x4c3c3c43) // iOS 13.0
+      },
+      @"quaternaryLabel" : @{
+        kFallbackARGBKey : @(0x2d3c3c43) // iOS 13.0
+      },
+      // Fill Colors
+      @"systemFill" : @{
+        kFallbackARGBKey : @(0x33787880) // iOS 13.0
+      },
+      @"secondarySystemFill" : @{
+        kFallbackARGBKey : @(0x28787880) // iOS 13.0
+      },
+      @"tertiarySystemFill" : @{
+        kFallbackARGBKey : @(0x1e767680) // iOS 13.0
+      },
+      @"quaternarySystemFill" : @{
+        kFallbackARGBKey : @(0x14747480) // iOS 13.0
+      },
+      // Text Colors
+      @"placeholderText" : @{
+        kFallbackARGBKey : @(0x4c3c3c43) // iOS 13.0
+      },
+      // Standard Content Background Colors
+      @"systemBackground" : @{
+        kFallbackARGBKey : @(0xFFffffff) // iOS 13.0
+      },
+      @"secondarySystemBackground" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      @"tertiarySystemBackground" : @{
+        kFallbackARGBKey : @(0xFFffffff) // iOS 13.0
+      },
+      // Grouped Content Background Colors
+      @"systemGroupedBackground" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      @"secondarySystemGroupedBackground" : @{
+        kFallbackARGBKey : @(0xFFffffff) // iOS 13.0
+      },
+      @"tertiarySystemGroupedBackground" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      // Separator Colors
+      @"separator" : @{
+        kFallbackARGBKey : @(0x493c3c43) // iOS 13.0
+      },
+      @"opaqueSeparator" : @{
+        kFallbackARGBKey : @(0xFFc6c6c8) // iOS 13.0
+      },
+      // Link Color
+      @"link" : @{
+        kFallbackARGBKey : @(0xFF007aff) // iOS 13.0
+      },
+      // Nonadaptable Colors
+      @"darkText" : @{},
+      @"lightText" : @{},
+      // https://developer.apple.com/documentation/uikit/uicolor/standard_colors
+      // Adaptable Colors
+      @"systemBlue" : @{},
+      @"systemBrown" : @{
+        kFallbackARGBKey : @(0xFFa2845e) // iOS 13.0
+      },
+      @"systemGreen" : @{},
+      @"systemIndigo" : @{
+        kFallbackARGBKey : @(0xFF5856d6) // iOS 13.0
+      },
+      @"systemOrange" : @{},
+      @"systemPink" : @{},
+      @"systemPurple" : @{},
+      @"systemRed" : @{},
+      @"systemTeal" : @{},
+      @"systemYellow" : @{},
+      // Adaptable Gray Colors
+      @"systemGray" : @{},
+      @"systemGray2" : @{
+        kFallbackARGBKey : @(0xFFaeaeb2) // iOS 13.0
+      },
+      @"systemGray3" : @{
+        kFallbackARGBKey : @(0xFFc7c7cc) // iOS 13.0
+      },
+      @"systemGray4" : @{
+        kFallbackARGBKey : @(0xFFd1d1d6) // iOS 13.0
+      },
+      @"systemGray5" : @{
+        kFallbackARGBKey : @(0xFFe5e5ea) // iOS 13.0
+      },
+      @"systemGray6" : @{
+        kFallbackARGBKey : @(0xFFf2f2f7) // iOS 13.0
+      },
+      // Transparent Color
+      @"clear" : @{
+        kFallbackARGBKey : @(0x00000000) // iOS 13.0
+      },
+    };
+  });
+  return dict;
+}
+
+static UIColor *_UIColorFromHexValue(NSNumber *hexValue)
+{
+  NSUInteger hexIntValue = [hexValue unsignedIntegerValue];
+
+  CGFloat red = ((CGFloat)((hexIntValue & 0xFF000000) >> 24)) / 255.0;
+  CGFloat green = ((CGFloat)((hexIntValue & 0xFF0000) >> 16)) / 255.0;
+  CGFloat blue = ((CGFloat)((hexIntValue & 0xFF00) >> 8)) / 255.0;
+  CGFloat alpha = ((CGFloat)(hexIntValue & 0xFF)) / 255.0;
+
+  return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
+}
+
+static UIColor *_Nullable _UIColorFromSemanticString(NSString *semanticString)
+{
+  NSString *platformColorString = [semanticString hasSuffix:kColorSuffix]
+      ? [semanticString substringToIndex:[semanticString length] - [kColorSuffix length]]
+      : semanticString;
+  NSDictionary<NSString *, NSDictionary *> *platformColorSelectorsDict = _PlatformColorSelectorsDict();
+  NSDictionary<NSString *, id> *colorInfo = platformColorSelectorsDict[platformColorString];
+  if (colorInfo) {
+    SEL objcColorSelector = NSSelectorFromString([platformColorString stringByAppendingString:kColorSuffix]);
+    if (![UIColor respondsToSelector:objcColorSelector]) {
+      NSNumber *fallbackRGB = colorInfo[kFallbackARGBKey];
+      if (fallbackRGB) {
+        return _UIColorFromHexValue(fallbackRGB);
+      }
+    } else {
+      Class uiColorClass = [UIColor class];
+      IMP imp = [uiColorClass methodForSelector:objcColorSelector];
+      id (*getUIColor)(id, SEL) = ((id(*)(id, SEL))imp);
+      id colorObject = getUIColor(uiColorClass, objcColorSelector);
+      if ([colorObject isKindOfClass:[UIColor class]]) {
+        return colorObject;
+      }
+    }
+  }
+  return nil;
+}
+
+static inline NSString *_NSStringFromCString(
+    const std::string &string,
+    const NSStringEncoding &encoding = NSUTF8StringEncoding)
+{
+  return [NSString stringWithCString:string.c_str() encoding:encoding];
+}
+
+static inline facebook::react::ColorComponents _ColorComponentsFromUIColor(UIColor *color)
+{
+  CGFloat rgba[4];
+  RCTGetRGBAColorComponents(color.CGColor, rgba);
+  return {(float)rgba[0], (float)rgba[1], (float)rgba[2], (float)rgba[3]};
+}
+
+facebook::react::ColorComponents RCTPlatformColorComponentsFromSemanticItems(std::vector<std::string> &semanticItems)
+{
+  for (const auto &semanticCString : semanticItems) {
+    if (@available(iOS 11.0, *)) {
+      NSString *semanticNSString = _NSStringFromCString(semanticCString);
+      UIColor *uiColor = [UIColor colorNamed:semanticNSString];
+      if (uiColor != nil) {
+        return _ColorComponentsFromUIColor(uiColor);
+      }
+      uiColor = _UIColorFromSemanticString(semanticNSString);
+      if (uiColor != nil) {
+        return _ColorComponentsFromUIColor(uiColor);
+      }
+    }
+  }
+
+  return {0, 0, 0, 0};
+}
+
+NS_ASSUME_NONNULL_END
diff --git a/ReactCommon/react/renderer/graphics/rounding.h b/ReactCommon/react/renderer/graphics/rounding.h
index 8427303fe8a308..b43b9d494d4b21 100644
--- a/ReactCommon/react/renderer/graphics/rounding.h
+++ b/ReactCommon/react/renderer/graphics/rounding.h
@@ -30,20 +30,23 @@ Float roundToPixel(Float value, Float scaleFactor) {
 
 template <Float (*RoundingFunction)(Float)>
 Point roundToPixel(Point value, Float scaleFactor) {
-  return Point{roundToPixel<RoundingFunction>(value.x, scaleFactor),
-               roundToPixel<RoundingFunction>(value.y, scaleFactor)};
+  return Point{
+      roundToPixel<RoundingFunction>(value.x, scaleFactor),
+      roundToPixel<RoundingFunction>(value.y, scaleFactor)};
 }
 
 template <Float (*RoundingFunction)(Float)>
 Size roundToPixel(Size value, Float scaleFactor) {
-  return Size{roundToPixel<RoundingFunction>(value.width, scaleFactor),
-              roundToPixel<RoundingFunction>(value.height, scaleFactor)};
+  return Size{
+      roundToPixel<RoundingFunction>(value.width, scaleFactor),
+      roundToPixel<RoundingFunction>(value.height, scaleFactor)};
 }
 
 template <Float (*RoundingFunction)(Float)>
 Rect roundToPixel(Rect value, Float scaleFactor) {
-  return Rect{roundToPixel<RoundingFunction>(value.origin),
-              roundToPixel<RoundingFunction>(value.size)};
+  return Rect{
+      roundToPixel<RoundingFunction>(value.origin),
+      roundToPixel<RoundingFunction>(value.size)};
 }
 
 /*
diff --git a/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp b/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp
index c11c0c2b701146..9c40fc341f49e3 100644
--- a/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp
+++ b/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <react/renderer/graphics/Transform.h>
+
 #include <gtest/gtest.h>
 #include <math.h>
 
diff --git a/ReactCommon/react/renderer/imagemanager/Android.mk b/ReactCommon/react/renderer/imagemanager/Android.mk
index 0eca0e748917b9..83f3ae91f45e5c 100644
--- a/ReactCommon/react/renderer/imagemanager/Android.mk
+++ b/ReactCommon/react/renderer/imagemanager/Android.mk
@@ -11,7 +11,7 @@ LOCAL_MODULE := react_render_imagemanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/imagemanager/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_mounting
+LOCAL_SHARED_LIBRARIES := libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_mounting libreact_debug
 
 LOCAL_STATIC_LIBRARIES :=
 
@@ -22,7 +22,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/cxx/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -32,4 +32,5 @@ $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/mounting)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
diff --git a/ReactCommon/react/renderer/imagemanager/BUCK b/ReactCommon/react/renderer/imagemanager/BUCK
index 52f99b3fec6fc0..8227c1dd6806d8 100644
--- a/ReactCommon/react/renderer/imagemanager/BUCK
+++ b/ReactCommon/react/renderer/imagemanager/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
@@ -64,8 +64,8 @@ rn_xplat_cxx_library(
     ],
     force_static = True,
     ios_deps = [
-        "//xplat/js:RCTImage",
         "//xplat/js/react-native-github:RCTCxxBridge",
+        "//xplat/js/react-native-github:RCTImage",
     ],
     ios_exported_headers = subdir_glob(
         [
@@ -105,6 +105,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:headers_only",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/mounting:mounting"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -119,7 +120,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/imagemanager/ImageRequest.h b/ReactCommon/react/renderer/imagemanager/ImageRequest.h
index 48da2253099a11..2c181d3b9b28f5 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageRequest.h
+++ b/ReactCommon/react/renderer/imagemanager/ImageRequest.h
@@ -52,9 +52,7 @@ class ImageRequest final {
   /*
    * Returns the Image Source associated with the request.
    */
-  const ImageSource getImageSource() const {
-    return imageSource_;
-  }
+  const ImageSource &getImageSource() const;
 
   /*
    * Returns stored observer coordinator as a shared pointer.
diff --git a/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp b/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp
index 3f3fd6a5ffbbb4..c75fa5b4c19f79 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp
+++ b/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp
@@ -8,7 +8,8 @@
 #include "ImageResponseObserverCoordinator.h"
 
 #include <algorithm>
-#include <cassert>
+
+#include <react/debug/react_native_assert.h>
 
 namespace facebook {
 namespace react {
@@ -52,7 +53,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseProgress(
     float progress) const {
   mutex_.lock();
   auto observers = observers_;
-  assert(status_ == ImageResponse::Status::Loading);
+  react_native_assert(status_ == ImageResponse::Status::Loading);
   mutex_.unlock();
 
   for (auto observer : observers) {
@@ -65,7 +66,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseComplete(
   mutex_.lock();
   imageData_ = imageResponse.getImage();
   imageMetadata_ = imageResponse.getMetadata();
-  assert(status_ == ImageResponse::Status::Loading);
+  react_native_assert(status_ == ImageResponse::Status::Loading);
   status_ = ImageResponse::Status::Completed;
   auto observers = observers_;
   mutex_.unlock();
@@ -77,7 +78,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseComplete(
 
 void ImageResponseObserverCoordinator::nativeImageResponseFailed() const {
   mutex_.lock();
-  assert(status_ == ImageResponse::Status::Loading);
+  react_native_assert(status_ == ImageResponse::Status::Loading);
   status_ = ImageResponse::Status::Failed;
   auto observers = observers_;
   mutex_.unlock();
diff --git a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
index 43a6134495ecdb..40524e5b0ff0f6 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
+++ b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
@@ -10,17 +10,11 @@
 namespace facebook {
 namespace react {
 
-void ImageTelemetry::willRequestUrl() {
-  assert(willRequestUrlTime_ == kTelemetryUndefinedTimePoint);
-  willRequestUrlTime_ = telemetryTimePointNow();
-}
-
 SurfaceId ImageTelemetry::getSurfaceId() const {
   return surfaceId_;
 }
 
 TelemetryTimePoint ImageTelemetry::getWillRequestUrlTime() const {
-  assert(willRequestUrlTime_ != kTelemetryUndefinedTimePoint);
   return willRequestUrlTime_;
 }
 
diff --git a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
index 3f053dbcf3ea1a..1ffaffd0a4aa0c 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
+++ b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
@@ -15,25 +15,20 @@ namespace react {
 
 /*
  * Represents telemetry data associated with a image request
+ * where the willRequestUrlTime is the time at ImageTelemetry's creation.
  */
 class ImageTelemetry final {
  public:
-  ImageTelemetry(SurfaceId const surfaceId) : surfaceId_(surfaceId) {}
+  ImageTelemetry(SurfaceId const surfaceId) : surfaceId_(surfaceId) {
+    willRequestUrlTime_ = telemetryTimePointNow();
+  }
 
-  /*
-   * Signaling
-   */
-  void willRequestUrl();
-
-  /*
-   * Reading
-   */
   TelemetryTimePoint getWillRequestUrlTime() const;
 
   SurfaceId getSurfaceId() const;
 
  private:
-  TelemetryTimePoint willRequestUrlTime_{kTelemetryUndefinedTimePoint};
+  TelemetryTimePoint willRequestUrlTime_;
 
   const SurfaceId surfaceId_;
 };
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp b/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp
index e9ce8dcb9a02b8..ac01f5b1c1903f 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp
@@ -11,7 +11,7 @@ namespace facebook {
 namespace react {
 
 ImageRequest::ImageRequest(
-    const ImageSource &imageSource,
+    ImageSource const &imageSource,
     std::shared_ptr<const ImageTelemetry> telemetry)
     : imageSource_(imageSource), telemetry_(telemetry) {
   coordinator_ = std::make_shared<ImageResponseObserverCoordinator>();
@@ -24,6 +24,7 @@ ImageRequest::ImageRequest(ImageRequest &&other) noexcept
   other.coordinator_ = nullptr;
   other.cancelRequest_ = nullptr;
   other.telemetry_ = nullptr;
+  other.imageSource_ = {};
 }
 
 ImageRequest::~ImageRequest() {
@@ -37,6 +38,10 @@ void ImageRequest::setCancelationFunction(
   cancelRequest_ = cancelationFunction;
 }
 
+const ImageSource &ImageRequest::getImageSource() const {
+  return imageSource_;
+}
+
 const std::shared_ptr<const ImageTelemetry> &ImageRequest::getSharedTelemetry()
     const {
   return telemetry_;
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
index 3fa8c36b291746..4922b96ef03d3f 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
@@ -44,7 +44,6 @@ - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfa
   std::shared_ptr<ImageTelemetry> telemetry;
   if ([self->_imageLoader shouldEnablePerfLoggingForRequestUrl:request.URL]) {
     telemetry = std::make_shared<ImageTelemetry>(surfaceId);
-    telemetry->willRequestUrl();
   } else {
     telemetry = nullptr;
   }
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
index f769d4d686abed..ec37101afa1b0c 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
@@ -12,19 +12,21 @@
 
 using namespace facebook::react;
 
-inline static RCTResizeMode RCTResizeModeFromImageResizeMode(ImageResizeMode imageResizeMode)
+inline static UIViewContentMode RCTContentModeFromImageResizeMode(ImageResizeMode imageResizeMode)
 {
   switch (imageResizeMode) {
     case ImageResizeMode::Cover:
-      return RCTResizeModeCover;
+      return UIViewContentModeScaleAspectFill;
     case ImageResizeMode::Contain:
-      return RCTResizeModeContain;
+      return UIViewContentModeScaleAspectFit;
     case ImageResizeMode::Stretch:
-      return RCTResizeModeStretch;
+      return UIViewContentModeScaleToFill;
     case ImageResizeMode::Center:
-      return RCTResizeModeCenter;
+      return UIViewContentModeCenter;
     case ImageResizeMode::Repeat:
-      return RCTResizeModeRepeat;
+      // Repeat resize mode is handled by the UIImage. Use scale to fill
+      // so the repeated image fills the UIImageView.
+      return UIViewContentModeScaleToFill;
   }
 }
 
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm
index 7a36d42ea4a283..19aeafdc30094b 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm
@@ -92,7 +92,7 @@ - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfa
 
   auto result = dispatch_group_wait(imageWaitGroup, dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC));
   if (result != 0) {
-    RCTLogError(@"Getting an image timed out");
+    RCTLogError(@"Image timed out in test environment for url: %@", loaderRequest.imageURL);
   }
   return imageRequest;
 }
diff --git a/ReactCommon/react/renderer/leakchecker/Android.mk b/ReactCommon/react/renderer/leakchecker/Android.mk
new file mode 100644
index 00000000000000..48056bc8dd260d
--- /dev/null
+++ b/ReactCommon/react/renderer/leakchecker/Android.mk
@@ -0,0 +1,29 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_render_leakchecker
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
+
+LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core glog
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"Fabric\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,react/renderer/core)
+$(call import-module,glog)
+$(call import-module,runtimeexecutor)
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/BUCK b/ReactCommon/react/renderer/leakchecker/BUCK
similarity index 63%
rename from ReactCommon/react/renderer/components/picker/iospicker/BUCK
rename to ReactCommon/react/renderer/leakchecker/BUCK
index 8e48198de3ea73..a927f7214e9673 100644
--- a/ReactCommon/react/renderer/components/picker/iospicker/BUCK
+++ b/ReactCommon/react/renderer/leakchecker/BUCK
@@ -1,12 +1,11 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -15,30 +14,33 @@ load(
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
-    name = "iospicker",
+    name = "leakchecker",
     srcs = glob(
         ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
     ),
     headers = glob(
         ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
     ),
     header_namespace = "",
     exported_headers = subdir_glob(
         [
             ("", "*.h"),
         ],
-        prefix = "react/renderer/components/iospicker",
+        prefix = "react/renderer/leakchecker",
     ),
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
@@ -46,13 +48,7 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only",
-        YOGA_CXX_TARGET,
-        react_native_xplat_target("react/utils:utils"),
-        react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
-        react_native_xplat_target("react/renderer/graphics:graphics"),
-        react_native_xplat_target("react/renderer/components/text:text"),
-        react_native_xplat_target("react/renderer/components/view:view"),
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
     ],
 )
diff --git a/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp b/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp
new file mode 100644
index 00000000000000..a72e485665f2e1
--- /dev/null
+++ b/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "LeakChecker.h"
+
+#include <glog/logging.h>
+#include <jsi/instrumentation.h>
+
+namespace facebook {
+namespace react {
+
+LeakChecker::LeakChecker(RuntimeExecutor const &runtimeExecutor)
+    : runtimeExecutor_(runtimeExecutor) {}
+
+void LeakChecker::uiManagerDidCreateShadowNodeFamily(
+    ShadowNodeFamily::Shared const &shadowNodeFamily) const {
+  registry_.add(shadowNodeFamily);
+}
+
+void LeakChecker::stopSurface(SurfaceId surfaceId) {
+  if (previouslyStoppedSurface_ > 0) {
+    // Dispatch the check onto JavaScript thread to make sure all other
+    // cleanup code has had chance to run.
+    runtimeExecutor_([previouslySoppedSurface = previouslyStoppedSurface_,
+                      this](jsi::Runtime &runtime) {
+      runtime.instrumentation().collectGarbage("LeakChecker");
+      // For now check the previous surface because React uses double
+      // buffering which keeps the surface that was just stopped in
+      // memory. This is a documented problem in the last point of
+      // https://github.com/facebook/react/issues/16087
+      checkSurfaceForLeaks(previouslySoppedSurface);
+    });
+  }
+
+  previouslyStoppedSurface_ = surfaceId;
+}
+
+void LeakChecker::checkSurfaceForLeaks(SurfaceId surfaceId) const {
+  auto weakFamilies = registry_.weakFamiliesForSurfaceId(surfaceId);
+  unsigned int numberOfLeaks = 0;
+  for (auto const &weakFamily : weakFamilies) {
+    auto strong = weakFamily.lock();
+    if (strong) {
+      ++numberOfLeaks;
+    }
+  }
+  if (numberOfLeaks > 0) {
+    LOG(ERROR) << "[LeakChecker] Surface with id: " << surfaceId
+               << " has leaked " << numberOfLeaks << " components out of "
+               << weakFamilies.size();
+  }
+  registry_.removeFamiliesWithSurfaceId(surfaceId);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/leakchecker/LeakChecker.h b/ReactCommon/react/renderer/leakchecker/LeakChecker.h
new file mode 100644
index 00000000000000..a9bb3dd004096c
--- /dev/null
+++ b/ReactCommon/react/renderer/leakchecker/LeakChecker.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <ReactCommon/RuntimeExecutor.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/core/ShadowNodeFamily.h>
+#include <react/renderer/leakchecker/WeakFamilyRegistry.h>
+#include <vector>
+
+namespace facebook {
+namespace react {
+
+using GarbageCollectionTrigger = std::function<void()>;
+
+class LeakChecker final {
+ public:
+  LeakChecker(RuntimeExecutor const &runtimeExecutor);
+
+  void uiManagerDidCreateShadowNodeFamily(
+      ShadowNodeFamily::Shared const &shadowNodeFamily) const;
+  void stopSurface(SurfaceId surfaceId);
+
+ private:
+  void checkSurfaceForLeaks(SurfaceId surfaceId) const;
+
+  RuntimeExecutor const runtimeExecutor_{};
+
+  WeakFamilyRegistry registry_{};
+  SurfaceId previouslyStoppedSurface_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp b/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp
new file mode 100644
index 00000000000000..ffb2e161d485f6
--- /dev/null
+++ b/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "WeakFamilyRegistry.h"
+
+namespace facebook {
+namespace react {
+
+void WeakFamilyRegistry::add(
+    ShadowNodeFamily::Shared const &shadowNodeFamily) const {
+  std::lock_guard<std::mutex> lock(familiesMutex_);
+  ShadowNodeFamily::Weak weakFamily = shadowNodeFamily;
+  families_[shadowNodeFamily->getSurfaceId()].push_back(weakFamily);
+}
+
+void WeakFamilyRegistry::removeFamiliesWithSurfaceId(
+    SurfaceId surfaceId) const {
+  std::lock_guard<std::mutex> lock(familiesMutex_);
+  families_.erase(surfaceId);
+}
+
+WeakFamilyRegistry::WeakFamilies WeakFamilyRegistry::weakFamiliesForSurfaceId(
+    SurfaceId surfaceId) const {
+  std::lock_guard<std::mutex> lock(familiesMutex_);
+  if (families_.find(surfaceId) != families_.end()) {
+    return families_[surfaceId];
+  } else {
+    return {};
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h b/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h
new file mode 100644
index 00000000000000..702eb05152ec72
--- /dev/null
+++ b/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/core/ShadowNodeFamily.h>
+#include <unordered_map>
+#include <vector>
+
+namespace facebook {
+namespace react {
+
+class WeakFamilyRegistry final {
+ public:
+  using WeakFamilies = std::vector<ShadowNodeFamily::Weak>;
+
+  void add(ShadowNodeFamily::Shared const &shadowNodeFamily) const;
+  void removeFamiliesWithSurfaceId(SurfaceId surfaceId) const;
+  WeakFamilies weakFamiliesForSurfaceId(SurfaceId surfaceId) const;
+
+ private:
+  /**
+   * Mutex protecting `families_` property.
+   */
+  mutable std::mutex familiesMutex_;
+
+  /**
+   * A map of ShadowNodeFamily used on surface.
+   */
+  mutable std::unordered_map<SurfaceId, WeakFamilies> families_{};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/mapbuffer/Android.mk b/ReactCommon/react/renderer/mapbuffer/Android.mk
index f496322b1dde92..57c51b2ec4c915 100644
--- a/ReactCommon/react/renderer/mapbuffer/Android.mk
+++ b/ReactCommon/react/renderer/mapbuffer/Android.mk
@@ -9,19 +9,22 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := react_render_mapbuffer
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
-
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libreact_utils
-
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+LOCAL_STATIC_LIBRARIES :=
+
+LOCAL_SHARED_LIBRARIES := glog libglog_init libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,react/utils)
+$(call import-module,glog)
+$(call import-module,fbgloginit)
+$(call import-module,react/debug)
diff --git a/ReactCommon/react/renderer/mapbuffer/BUCK b/ReactCommon/react/renderer/mapbuffer/BUCK
index 5bd4038921efe8..3c946f02fa4410 100644
--- a/ReactCommon/react/renderer/mapbuffer/BUCK
+++ b/ReactCommon/react/renderer/mapbuffer/BUCK
@@ -2,11 +2,16 @@ load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
     "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
 )
 
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
 rn_xplat_cxx_library(
     name = "mapbuffer",
     srcs = glob(
@@ -22,20 +27,23 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react",
+        prefix = "react/renderer/mapbuffer",
     ),
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     macosx_tests_override = [],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
     ],
     tests = [":tests"],
     visibility = ["PUBLIC"],
@@ -44,7 +52,7 @@ rn_xplat_cxx_library(
         "//xplat/fbsystrace:fbsystrace",
         "//xplat/folly:headers_only",
         "//xplat/folly:memory",
-        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/debug:debug"),
     ],
 )
 
@@ -55,13 +63,15 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = (ANDROID),
+    platforms = ANDROID,
     deps = [
         "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
+        react_native_xplat_target("react/debug:debug"),
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
 )
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
index 085ccae66c975d..80e76dfb4f2e03 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
+++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
@@ -7,12 +7,143 @@
 
 #include "MapBuffer.h"
 
+using namespace facebook::react;
+
 namespace facebook {
 namespace react {
 
-MapBuffer::MapBuffer() {}
+// TODO T83483191: Extend MapBuffer C++ implementation to support basic random
+// access
+MapBuffer::MapBuffer(uint8_t *const data, int32_t dataSize) {
+  react_native_assert(
+      (data != nullptr) && "Error trying to build an invalid MapBuffer");
+
+  // Should we move the memory here or document it?
+  data_ = data;
+
+  count_ = 0;
+  memcpy(
+      reinterpret_cast<uint8_t *>(&count_),
+      reinterpret_cast<const uint8_t *>(data_ + HEADER_COUNT_OFFSET),
+      UINT16_SIZE);
+
+  // TODO T83483191: extract memcpy calls into an inline function to simplify
+  // the code
+  dataSize_ = 0;
+  memcpy(
+      reinterpret_cast<uint8_t *>(&dataSize_),
+      reinterpret_cast<const uint8_t *>(data_ + HEADER_BUFFER_SIZE_OFFSET),
+      INT_SIZE);
+
+  if (dataSize != dataSize_) {
+    LOG(ERROR) << "Error: Data size does not match, expected " << dataSize
+               << " found: " << dataSize_;
+    abort();
+  }
+}
+
+int32_t MapBuffer::getInt(Key key) const {
+  int32_t value = 0;
+  memcpy(
+      reinterpret_cast<uint8_t *>(&value),
+      reinterpret_cast<const uint8_t *>(data_ + getValueOffset(key)),
+      INT_SIZE);
+  return value;
+}
+
+bool MapBuffer::getBool(Key key) const {
+  return getInt(key) != 0;
+}
+
+double MapBuffer::getDouble(Key key) const {
+  // TODO T83483191: extract this code into a "template method" and reuse it for
+  // other types
+  double value = 0;
+  memcpy(
+      reinterpret_cast<uint8_t *>(&value),
+      reinterpret_cast<const uint8_t *>(data_ + getValueOffset(key)),
+      DOUBLE_SIZE);
+  return value;
+}
+
+int32_t MapBuffer::getDynamicDataOffset() const {
+  // The begininig of dynamic data can be calculated as the offset of the next
+  // key in the map
+  return getKeyOffset(count_);
+}
+
+std::string MapBuffer::getString(Key key) const {
+  // TODO T83483191:Add checks to verify that offsets are under the boundaries
+  // of the map buffer
+  int32_t dynamicDataOffset = getDynamicDataOffset();
+  int32_t stringLength = 0;
+  int32_t offset = getInt(key);
+  memcpy(
+      reinterpret_cast<uint8_t *>(&stringLength),
+      reinterpret_cast<const uint8_t *>(data_ + dynamicDataOffset + offset),
+      INT_SIZE);
+
+  char *value = new char[stringLength];
+
+  memcpy(
+      reinterpret_cast<char *>(value),
+      reinterpret_cast<const char *>(
+          data_ + dynamicDataOffset + offset + INT_SIZE),
+      stringLength);
+
+  return std::string(value, 0, stringLength);
+}
+
+MapBuffer MapBuffer::getMapBuffer(Key key) const {
+  // TODO T83483191: Add checks to verify that offsets are under the boundaries
+  // of the map buffer
+  int32_t dynamicDataOffset = getDynamicDataOffset();
+
+  int32_t mapBufferLength = 0;
+  int32_t offset = getInt(key);
+  memcpy(
+      reinterpret_cast<uint8_t *>(&mapBufferLength),
+      reinterpret_cast<const uint8_t *>(data_ + dynamicDataOffset + offset),
+      INT_SIZE);
+
+  uint8_t *value = new Byte[mapBufferLength];
+
+  memcpy(
+      reinterpret_cast<uint8_t *>(value),
+      reinterpret_cast<const uint8_t *>(
+          data_ + dynamicDataOffset + offset + INT_SIZE),
+      mapBufferLength);
+
+  return MapBuffer(value, mapBufferLength);
+}
+
+bool MapBuffer::isNull(Key key) const {
+  return getInt(key) == NULL_VALUE;
+}
+
+int32_t MapBuffer::getBufferSize() const {
+  return dataSize_;
+}
+
+void MapBuffer::copy(uint8_t *output) const {
+  memcpy(output, data_, dataSize_);
+}
+
+uint16_t MapBuffer::getCount() const {
+  uint16_t size = 0;
+
+  memcpy(
+      reinterpret_cast<uint16_t *>(&size),
+      reinterpret_cast<const uint16_t *>(data_ + HEADER_COUNT_OFFSET),
+
+      UINT16_SIZE);
+
+  return size;
+}
 
-MapBuffer::~MapBuffer() {}
+MapBuffer::~MapBuffer() {
+  delete[] data_;
+}
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
index 3ce365990d5250..b3f0c3051f176f 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
+++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
@@ -7,7 +7,11 @@
 
 #pragma once
 
-#include <string>
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/mapbuffer/primitives.h>
+
+#include <stdlib.h>
+#include <limits>
 
 namespace facebook {
 namespace react {
@@ -28,9 +32,43 @@ namespace react {
  * - have minimal APK size and build time impact.
  */
 class MapBuffer {
+ private:
+  // Buffer and its size
+  const uint8_t *data_ = nullptr;
+
+  // amount of bytes in the MapBuffer
+  int32_t dataSize_ = 0;
+
+  // amount of items in the MapBuffer
+  uint16_t count_ = 0;
+
+  // returns the relative offset of the first byte of dynamic data
+  int32_t getDynamicDataOffset() const;
+
  public:
-  MapBuffer();
-  virtual ~MapBuffer();
+  MapBuffer(uint8_t *const data, int32_t dataSize);
+
+  ~MapBuffer();
+
+  int32_t getInt(Key key) const;
+
+  bool getBool(Key key) const;
+
+  double getDouble(Key key) const;
+
+  std::string getString(Key key) const;
+
+  // TODO T83483191: review this declaration
+  MapBuffer getMapBuffer(Key key) const;
+
+  int32_t getBufferSize() const;
+
+  // TODO T83483191: review parameters of copy method
+  void copy(uint8_t *output) const;
+
+  bool isNull(Key key) const;
+
+  uint16_t getCount() const;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
new file mode 100644
index 00000000000000..4ff2f7b5c58807
--- /dev/null
+++ b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "MapBufferBuilder.h"
+
+using namespace facebook::react;
+
+namespace facebook {
+namespace react {
+
+// TODO T83483191: Add asserts to check overflowing on additions
+MapBufferBuilder::MapBufferBuilder()
+    : MapBufferBuilder::MapBufferBuilder(INITIAL_KEY_VALUE_SIZE) {}
+
+MapBuffer MapBufferBuilder::EMPTY() {
+  static auto emptyMap = MapBufferBuilder().build();
+  return emptyMap;
+}
+
+MapBufferBuilder::MapBufferBuilder(uint16_t initialSize) {
+  keyValuesSize_ = initialSize;
+  keyValues_ = new Byte[keyValuesSize_];
+  // First Key should be written right after the header.
+  keyValuesOffset_ = HEADER_SIZE;
+
+  dynamicDataSize_ = 0;
+  dynamicDataValues_ = nullptr;
+  dynamicDataOffset_ = 0;
+}
+
+void MapBufferBuilder::ensureKeyValueSpace() {
+  int32_t oldKeyValuesSize = keyValuesSize_;
+  react_native_assert(
+      (keyValuesSize_ < std::numeric_limits<uint16_t>::max() / 2) &&
+      "Error trying to assign a value beyond the capacity of uint16_t: ");
+  keyValuesSize_ *= 2;
+  uint8_t *newKeyValues = new Byte[keyValuesSize_];
+  uint8_t *oldKeyValues = keyValues_;
+  memcpy(newKeyValues, keyValues_, oldKeyValuesSize);
+  keyValues_ = newKeyValues;
+  delete[] oldKeyValues;
+}
+
+void MapBufferBuilder::storeKeyValue(
+    Key key,
+    uint8_t *value,
+    int32_t valueSize) {
+  if (key < minKeyToStore_) {
+    LOG(ERROR) << "Error: key out of order - key: " << key;
+    abort();
+  }
+  if (valueSize > MAX_VALUE_SIZE) {
+    LOG(ERROR) << "Error: size of value must be <= MAX_VALUE_SIZE. ValueSize: "
+               << valueSize;
+    abort();
+  }
+
+  // TODO T83483191: header.count points to the next index
+  // TODO T83483191: add test to verify storage of sparse keys
+  int32_t keyOffset = getKeyOffset(_header.count);
+  int32_t valueOffset = keyOffset + KEY_SIZE;
+
+  int32_t nextKeyValueOffset = keyOffset + BUCKET_SIZE;
+  if (nextKeyValueOffset >= keyValuesSize_) {
+    ensureKeyValueSpace();
+  }
+
+  memcpy(keyValues_ + keyOffset, &key, KEY_SIZE);
+  memcpy(keyValues_ + valueOffset, value, valueSize);
+
+  _header.count++;
+
+  minKeyToStore_ = key + 1;
+  // Move keyValuesOffset_ to the next available [key, value] position
+  keyValuesOffset_ = std::max(nextKeyValueOffset, keyValuesOffset_);
+}
+
+void MapBufferBuilder::putBool(Key key, bool value) {
+  putInt(key, (int)value);
+}
+
+void MapBufferBuilder::putDouble(Key key, double value) {
+  uint8_t *bytePointer = reinterpret_cast<uint8_t *>(&value);
+  storeKeyValue(key, bytePointer, DOUBLE_SIZE);
+}
+
+void MapBufferBuilder::putNull(Key key) {
+  putInt(key, NULL_VALUE);
+}
+
+void MapBufferBuilder::putInt(Key key, int32_t value) {
+  uint8_t *bytePointer = reinterpret_cast<uint8_t *>(&(value));
+  storeKeyValue(key, bytePointer, INT_SIZE);
+}
+
+void MapBufferBuilder::ensureDynamicDataSpace(int32_t size) {
+  if (dynamicDataValues_ == nullptr) {
+    dynamicDataSize_ = size;
+    dynamicDataValues_ = new Byte[dynamicDataSize_];
+    dynamicDataOffset_ = 0;
+    return;
+  }
+
+  if (dynamicDataOffset_ + size >= dynamicDataSize_) {
+    int32_t oldDynamicDataSize = dynamicDataSize_;
+    react_native_assert(
+        (dynamicDataSize_ < std::numeric_limits<int32_t>::max() / 2) &&
+        "Error: trying to assign a value beyond the capacity of int");
+    dynamicDataSize_ *= dynamicDataSize_;
+
+    react_native_assert(
+        (dynamicDataSize_ < std::numeric_limits<int32_t>::max() - size) &&
+        "Error: trying to assign a value beyond the capacity of int");
+
+    // sum size to ensure that the size always fit into newDynamicDataValues
+    dynamicDataSize_ += size;
+    uint8_t *newDynamicDataValues = new Byte[dynamicDataSize_];
+    uint8_t *oldDynamicDataValues = dynamicDataValues_;
+    memcpy(newDynamicDataValues, dynamicDataValues_, oldDynamicDataSize);
+    dynamicDataValues_ = newDynamicDataValues;
+    delete[] oldDynamicDataValues;
+  }
+}
+
+void MapBufferBuilder::putString(Key key, std::string value) {
+  int32_t strLength = static_cast<int32_t>(value.length());
+  const char *cstring = getCstring(&value);
+
+  // format [lenght of string (int)] + [Array of Characters in the string]
+  int32_t sizeOfLength = INT_SIZE;
+  // TODO T83483191: review if map.getBufferSize() should be an int32_t or long
+  // instead of an int16 (because strings can be longer than int16);
+
+  int32_t sizeOfDynamicData = sizeOfLength + strLength;
+  ensureDynamicDataSpace(sizeOfDynamicData);
+  memcpy(dynamicDataValues_ + dynamicDataOffset_, &strLength, sizeOfLength);
+  memcpy(
+      dynamicDataValues_ + dynamicDataOffset_ + sizeOfLength,
+      cstring,
+      strLength);
+
+  // Store Key and pointer to the string
+  putInt(key, dynamicDataOffset_);
+
+  dynamicDataOffset_ += sizeOfDynamicData;
+}
+
+void MapBufferBuilder::putMapBuffer(Key key, MapBuffer &map) {
+  int32_t mapBufferSize = map.getBufferSize();
+
+  // format [lenght of buffer (int)] + [bytes of MapBuffer]
+  int32_t sizeOfDynamicData = mapBufferSize + INT_SIZE;
+
+  // format [Array of bytes of the mapBuffer]
+  ensureDynamicDataSpace(sizeOfDynamicData);
+
+  memcpy(dynamicDataValues_ + dynamicDataOffset_, &mapBufferSize, INT_SIZE);
+  // Copy the content of the map into dynamicDataValues_
+  map.copy(dynamicDataValues_ + dynamicDataOffset_ + INT_SIZE);
+
+  // Store Key and pointer to the string
+  putInt(key, dynamicDataOffset_);
+
+  dynamicDataOffset_ += sizeOfDynamicData;
+}
+
+MapBuffer MapBufferBuilder::build() {
+  react_native_assert(
+      (keyValues_ != nullptr) &&
+      "Error when building mapbuffer with invalid datastructures.");
+
+  // Create buffer: [header] + [key, values] + [dynamic data]
+  int32_t bufferSize = keyValuesOffset_ + dynamicDataOffset_;
+
+  _header.bufferSize = bufferSize;
+
+  // Copy header at the beginning of "keyValues_"
+  memcpy(keyValues_, &_header, HEADER_SIZE);
+
+  uint8_t *buffer = new Byte[bufferSize];
+
+  memcpy(buffer, keyValues_, keyValuesOffset_);
+
+  if (dynamicDataValues_ != nullptr) {
+    memcpy(buffer + keyValuesOffset_, dynamicDataValues_, dynamicDataOffset_);
+  }
+
+  // TODO T83483191: should we use std::move here?
+  auto map = MapBuffer(buffer, bufferSize);
+
+  // TODO T83483191: we should invalidate the class once the build() method is
+  // called.
+
+  if (keyValues_ != nullptr) {
+    delete[] keyValues_;
+  }
+  keyValues_ = nullptr;
+  keyValuesSize_ = 0;
+  keyValuesOffset_ = 0;
+
+  if (dynamicDataValues_ != nullptr) {
+    delete[] dynamicDataValues_;
+    dynamicDataValues_ = nullptr;
+  }
+  dynamicDataSize_ = 0;
+  dynamicDataOffset_ = 0;
+  _header = {ALIGNMENT, 0, 0};
+
+  return map;
+}
+
+MapBufferBuilder::~MapBufferBuilder() {
+  if (keyValues_ != nullptr) {
+    delete[] keyValues_;
+  }
+  if (dynamicDataValues_ != nullptr) {
+    delete[] dynamicDataValues_;
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
new file mode 100644
index 00000000000000..d46dd8fbea0a5f
--- /dev/null
+++ b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/primitives.h>
+#include <stdlib.h>
+
+namespace facebook {
+namespace react {
+
+// Default initial size for _keyValues array
+// 108 = 10 entries = 10*10 + 8 sizeof(header)
+constexpr uint16_t INITIAL_KEY_VALUE_SIZE = 108;
+
+// Default initial size for _dynamicDataValues array
+constexpr int32_t INITIAL_DYNAMIC_DATA_SIZE = 200;
+
+/**
+ * MapBufferBuilder is a builder class for MapBuffer
+ */
+class MapBufferBuilder {
+ private:
+  Header _header = {ALIGNMENT, 0, 0};
+
+  void ensureKeyValueSpace();
+
+  void ensureDynamicDataSpace(int32_t size);
+
+  void storeKeyValue(Key key, uint8_t *value, int32_t valueSize);
+
+  // Array of [key,value] map entries:
+  // - Key is represented in 2 bytes
+  // - Value is stored into 8 bytes. The 8 bytes of the value will contain the
+  // actual value for the key or a pointer to the actual value (based on the
+  // type)
+  uint8_t *keyValues_ = nullptr;
+
+  // Amount of bytes allocated on _keyValues
+  uint16_t keyValuesSize_ = 0;
+
+  // Relative offset on the _keyValues array.
+  // This represents the first byte that can be written in _keyValues array
+  int32_t keyValuesOffset_ = 0;
+
+  // This array contains data for dynamic values in the MapBuffer.
+  // A dynamic value is a String or another MapBuffer.
+  uint8_t *dynamicDataValues_ = nullptr;
+
+  // Amount of bytes allocated on _dynamicDataValues
+  int32_t dynamicDataSize_ = 0;
+
+  // Relative offset on the _dynamicDataValues array.
+  // This represents the first byte that can be written in _dynamicDataValues
+  // array
+  int32_t dynamicDataOffset_ = 0;
+
+  // Minimmum key to store in the MapBuffer (this is used to guarantee
+  // consistency)
+  uint16_t minKeyToStore_ = 0;
+
+ public:
+  MapBufferBuilder();
+
+  MapBufferBuilder(uint16_t initialSize);
+
+  ~MapBufferBuilder();
+
+  static MapBuffer EMPTY();
+
+  void putInt(Key key, int32_t value);
+
+  void putBool(Key key, bool value);
+
+  void putDouble(Key key, double value);
+
+  void putNull(Key key);
+
+  void putString(Key key, std::string value);
+
+  void putMapBuffer(Key key, MapBuffer &map);
+
+  // TODO T83483191: This should return MapBuffer!
+  MapBuffer build();
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/mapbuffer/primitives.h b/ReactCommon/react/renderer/mapbuffer/primitives.h
new file mode 100644
index 00000000000000..456e0b9e12d1d1
--- /dev/null
+++ b/ReactCommon/react/renderer/mapbuffer/primitives.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <glog/logging.h>
+
+// TODO T83483191: Enable CHECK_CONSISTENCY only in debug mode or test
+// environments (or just in demand) #define CHECK_CONSISTENCY 1
+
+constexpr static int32_t NULL_VALUE = 0;
+
+// Value used to verify if the data is serialized with LittleEndian order
+constexpr static uint16_t ALIGNMENT = 0xFE;
+
+using Key = uint16_t;
+
+using Byte = uint8_t;
+
+namespace facebook {
+namespace react {
+
+struct Header {
+  uint16_t alignment; // alignment of serialization
+  uint16_t count; // amount of items in the map
+  int32_t bufferSize; // Amount of bytes used to store the map in memory
+};
+
+constexpr static int32_t KEY_SIZE = sizeof(Key);
+constexpr static int32_t HEADER_SIZE = sizeof(Header);
+constexpr static int32_t INT_SIZE = sizeof(int32_t);
+constexpr static int32_t DOUBLE_SIZE = sizeof(double);
+constexpr static int32_t UINT8_SIZE = sizeof(uint8_t);
+constexpr static int32_t UINT16_SIZE = sizeof(uint16_t);
+constexpr static int32_t UINT64_SIZE = sizeof(uint64_t);
+constexpr static int32_t HEADER_ALIGNMENT_OFFSET = 0;
+constexpr static int32_t HEADER_COUNT_OFFSET = UINT16_SIZE;
+constexpr static int32_t HEADER_BUFFER_SIZE_OFFSET = UINT16_SIZE * 2;
+
+constexpr static int32_t MAX_VALUE_SIZE = UINT64_SIZE;
+
+// 10 bytes : 2 key + 8 value
+constexpr static int32_t BUCKET_SIZE = KEY_SIZE + UINT64_SIZE;
+
+/**
+ * Returns the offset of the key received by parameter.
+ */
+inline int32_t getKeyOffset(Key key) {
+  return HEADER_SIZE + BUCKET_SIZE * key;
+}
+
+/**
+ * Returns the offset of the value associated to the key received by parameter.
+ */
+inline int32_t getValueOffset(Key key) {
+  return getKeyOffset(key) + KEY_SIZE;
+}
+
+static inline const char *getCstring(const std::string *str) {
+  return str ? str->c_str() : "";
+}
+
+inline void
+checkKeyConsistency(const Header &header, const uint8_t *data, Key key) {
+#ifdef CHECK_CONSISTENCY
+  if (key >= header.count) {
+    LOG(ERROR) << "Error: Key is higher than size of Map - key '" << key
+               << "' - size: '" << header.count << "'";
+    assert(false && "Error while reading key");
+  }
+
+  Key storedKey = 0;
+  memcpy(
+      reinterpret_cast<Key *>(&storedKey),
+      reinterpret_cast<const Key *>(data + getKeyOffset(key)),
+      KEY_SIZE);
+
+  if (storedKey != key) {
+    LOG(ERROR) << "Error while reading key, expecting '" << key << "' found: '"
+               << storedKey << "'";
+    assert(false && "Error while reading key");
+  }
+#endif
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp b/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp
index 4785f09ae7e498..9dd36eeb6df997 100644
--- a/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp
+++ b/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp
@@ -8,7 +8,149 @@
 #include <memory>
 
 #include <gtest/gtest.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 
-TEST(MapBufferTest, testSomething) {
-  // TODO
+using namespace facebook::react;
+
+TEST(MapBufferTest, testSimpleIntMap) {
+  auto builder = MapBufferBuilder();
+
+  builder.putInt(0, 1234);
+  builder.putInt(1, 4321);
+
+  auto map = builder.build();
+
+  EXPECT_EQ(map.getCount(), 2);
+  EXPECT_EQ(map.getInt(0), 1234);
+  EXPECT_EQ(map.getInt(1), 4321);
+}
+
+TEST(MapBufferTest, testMapBufferExtension) {
+  // 26 = 2 buckets: 2*10 + 6 sizeof(header)
+  int initialSize = 26;
+  auto buffer = MapBufferBuilder(initialSize);
+
+  buffer.putInt(0, 1234);
+  buffer.putInt(1, 4321);
+  buffer.putInt(2, 2121);
+  buffer.putInt(3, 1212);
+
+  auto map = buffer.build();
+
+  EXPECT_EQ(map.getCount(), 4);
+
+  EXPECT_EQ(map.getInt(0), 1234);
+  EXPECT_EQ(map.getInt(1), 4321);
+  EXPECT_EQ(map.getInt(2), 2121);
+  EXPECT_EQ(map.getInt(3), 1212);
+}
+
+TEST(MapBufferTest, testBoolEntries) {
+  auto buffer = MapBufferBuilder();
+
+  buffer.putBool(0, true);
+  buffer.putBool(1, false);
+
+  auto map = buffer.build();
+
+  EXPECT_EQ(map.getCount(), 2);
+  EXPECT_EQ(map.getBool(0), true);
+  EXPECT_EQ(map.getBool(1), false);
+}
+
+TEST(MapBufferTest, testNullEntries) {
+  auto buffer = MapBufferBuilder();
+
+  buffer.putNull(0);
+  buffer.putInt(1, 1234);
+
+  auto map = buffer.build();
+
+  EXPECT_EQ(map.getCount(), 2);
+  EXPECT_EQ(map.isNull(0), true);
+  EXPECT_EQ(map.isNull(1), false);
+  // TODO T83483191: serialize null values to be distinguishable from '0'
+  // values
+  // EXPECT_EQ(map.isNull(1),  false);
+  // EXPECT_EQ(map.getBool(1),  false);
+}
+
+TEST(MapBufferTest, testDoubleEntries) {
+  auto buffer = MapBufferBuilder();
+
+  buffer.putDouble(0, 123.4);
+  buffer.putDouble(1, 432.1);
+
+  auto map = buffer.build();
+
+  EXPECT_EQ(map.getCount(), 2);
+
+  EXPECT_EQ(map.getDouble(0), 123.4);
+  EXPECT_EQ(map.getDouble(1), 432.1);
+}
+
+TEST(MapBufferTest, testStringEntries) {
+  auto builder = MapBufferBuilder();
+
+  builder.putString(0, "This is a test");
+  auto map = builder.build();
+
+  EXPECT_EQ(map.getString(0), "This is a test");
+}
+
+TEST(MapBufferTest, testUTFStringEntry) {
+  auto builder = MapBufferBuilder();
+
+  builder.putString(0, "Let's count: 的, 一, 是");
+  auto map = builder.build();
+
+  EXPECT_EQ(map.getString(0), "Let's count: 的, 一, 是");
+}
+
+TEST(MapBufferTest, testUTFStringEntries) {
+  auto builder = MapBufferBuilder();
+
+  builder.putString(0, "Let's count: 的, 一, 是");
+  builder.putString(1, "This is a test");
+  auto map = builder.build();
+
+  EXPECT_EQ(map.getString(0), "Let's count: 的, 一, 是");
+  EXPECT_EQ(map.getString(1), "This is a test");
+}
+
+TEST(MapBufferTest, testEmptyMap) {
+  auto builder = MapBufferBuilder();
+  auto map = builder.build();
+  EXPECT_EQ(map.getCount(), 0);
+}
+
+TEST(MapBufferTest, testEmptyMapConstant) {
+  auto map = MapBufferBuilder::EMPTY();
+  EXPECT_EQ(map.getCount(), 0);
+}
+
+TEST(MapBufferTest, testMapEntries) {
+  auto builder = MapBufferBuilder();
+  builder.putString(0, "This is a test");
+  builder.putInt(1, 1234);
+  auto map = builder.build();
+
+  EXPECT_EQ(map.getCount(), 2);
+  EXPECT_EQ(map.getString(0), "This is a test");
+  EXPECT_EQ(map.getInt(1), 1234);
+
+  auto builder2 = MapBufferBuilder();
+  builder2.putInt(0, 4321);
+  builder2.putMapBuffer(1, map);
+  auto map2 = builder2.build();
+
+  EXPECT_EQ(map2.getCount(), 2);
+  EXPECT_EQ(map2.getInt(0), 4321);
+
+  MapBuffer readMap2 = map2.getMapBuffer(1);
+
+  EXPECT_EQ(readMap2.getCount(), 2);
+  EXPECT_EQ(readMap2.getString(0), "This is a test");
+  EXPECT_EQ(readMap2.getInt(1), 1234);
 }
diff --git a/ReactCommon/react/renderer/mounting/Android.mk b/ReactCommon/react/renderer/mounting/Android.mk
index a4d138d942eb1f..f1383e722e4e91 100644
--- a/ReactCommon/react/renderer/mounting/Android.mk
+++ b/ReactCommon/react/renderer/mounting/Android.mk
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_components_view libreact_render_components_root libreact_utils
+LOCAL_SHARED_LIBRARIES := libjsi libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_telemetry
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -34,4 +34,6 @@ $(call import-module,react/renderer/components/view)
 $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/telemetry)
diff --git a/ReactCommon/react/renderer/mounting/BUCK b/ReactCommon/react/renderer/mounting/BUCK
index fcc289124b8eaa..2d0d42e5855a6f 100644
--- a/ReactCommon/react/renderer/mounting/BUCK
+++ b/ReactCommon/react/renderer/mounting/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -7,6 +6,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -35,7 +35,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -57,10 +57,12 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         react_native_xplat_target("better:better"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/components/root:root"),
         react_native_xplat_target("react/renderer/components/view:view"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
+        react_native_xplat_target("react/renderer/telemetry:telemetry"),
         react_native_xplat_target("react/utils:utils"),
     ],
 )
@@ -72,7 +74,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
@@ -86,5 +88,6 @@ fb_xplat_cxx_test(
         react_native_xplat_target("react/renderer/components/root:root"),
         react_native_xplat_target("react/renderer/components/view:view"),
         react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
+        react_native_xplat_target("react/test_utils:test_utils"),
     ],
 )
diff --git a/ReactCommon/react/renderer/mounting/Differentiator.cpp b/ReactCommon/react/renderer/mounting/Differentiator.cpp
index 1bf8fe6e40d8fe..a37e90758fcb1a 100644
--- a/ReactCommon/react/renderer/mounting/Differentiator.cpp
+++ b/ReactCommon/react/renderer/mounting/Differentiator.cpp
@@ -9,22 +9,35 @@
 
 #include <better/map.h>
 #include <better/small_vector.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <algorithm>
 #include "ShadowView.h"
 
-// Uncomment this to enable verbose diffing logs, which can be useful for
-// debugging.
-// #define DEBUG_LOGS_DIFFER
-
 #ifdef DEBUG_LOGS_DIFFER
 #include <glog/logging.h>
+#define DEBUG_LOGS_BREADCRUMBS 1
 #define DEBUG_LOGS(code) code
 #else
 #define DEBUG_LOGS(code)
 #endif
 
+#ifdef DEBUG_LOGS_BREADCRUMBS
+#define BREADCRUMB_TYPE std::string
+#define DIFF_BREADCRUMB(X) (breadcrumb + " - " + std::string(X))
+#define CREATE_DIFF_BREADCRUMB(X) std::to_string(X)
+#else
+
+enum class NoBreadcrumb {};
+
+#define BREADCRUMB_TYPE NoBreadcrumb const &
+#define DIFF_BREADCRUMB(X) \
+  {}
+#define CREATE_DIFF_BREADCRUMB(X) \
+  {}
+#endif
+
 namespace facebook {
 namespace react {
 
@@ -86,7 +99,7 @@ class TinyMap final {
   inline Iterator find(KeyT key) {
     cleanVector();
 
-    assert(key != 0);
+    react_native_assert(key != 0);
 
     if (begin_() == nullptr) {
       return end();
@@ -102,7 +115,7 @@ class TinyMap final {
   }
 
   inline void insert(Pair pair) {
-    assert(pair.first != 0);
+    react_native_assert(pair.first != 0);
     vector_.push_back(pair);
   }
 
@@ -156,30 +169,31 @@ class TinyMap final {
   }
 
   better::small_vector<Pair, DefaultSize> vector_;
-  int numErased_{0};
-  int erasedAtFront_{0};
+  size_t numErased_{0};
+  size_t erasedAtFront_{0};
 };
 
 /*
  * Sorting comparator for `reorderInPlaceIfNeeded`.
  */
 static bool shouldFirstPairComesBeforeSecondOne(
-    ShadowViewNodePair const &lhs,
-    ShadowViewNodePair const &rhs) noexcept {
-  return lhs.shadowNode->getOrderIndex() < rhs.shadowNode->getOrderIndex();
+    ShadowViewNodePair const *lhs,
+    ShadowViewNodePair const *rhs) noexcept {
+  return lhs->shadowNode->getOrderIndex() < rhs->shadowNode->getOrderIndex();
 }
 
 /*
  * Reorders pairs in-place based on `orderIndex` using a stable sort algorithm.
  */
-static void reorderInPlaceIfNeeded(ShadowViewNodePair::List &pairs) noexcept {
+static void reorderInPlaceIfNeeded(
+    ShadowViewNodePair::NonOwningList &pairs) noexcept {
   if (pairs.size() < 2) {
     return;
   }
 
   auto isReorderNeeded = false;
   for (auto const &pair : pairs) {
-    if (pair.shadowNode->getOrderIndex() != 0) {
+    if (pair->shadowNode->getOrderIndex() != 0) {
       isReorderNeeded = true;
       break;
     }
@@ -193,8 +207,13 @@ static void reorderInPlaceIfNeeded(ShadowViewNodePair::List &pairs) noexcept {
       pairs.begin(), pairs.end(), &shouldFirstPairComesBeforeSecondOne);
 }
 
+static inline bool shadowNodeIsConcrete(ShadowNode const &shadowNode) {
+  return shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView);
+}
+
 static void sliceChildShadowNodeViewPairsRecursivelyV2(
-    ShadowViewNodePair::List &pairList,
+    ShadowViewNodePair::NonOwningList &pairList,
+    ViewNodePairScope &scope,
     Point layoutOffset,
     ShadowNode const &shadowNode) {
   for (auto const &sharedChildShadowNode : shadowNode.getChildren()) {
@@ -218,25 +237,34 @@ static void sliceChildShadowNodeViewPairsRecursivelyV2(
     // This might not be a FormsView, or a FormsStackingContext. We let the
     // differ handle removal of flattened views from the Mounting layer and
     // shuffling their children around.
-    bool isConcreteView =
-        childShadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView);
+    bool isConcreteView = shadowNodeIsConcrete(childShadowNode);
     bool areChildrenFlattened = !childShadowNode.getTraits().check(
         ShadowNodeTraits::Trait::FormsStackingContext);
-    pairList.push_back(
-        {shadowView, &childShadowNode, areChildrenFlattened, isConcreteView});
-
-    if (!childShadowNode.getTraits().check(
-            ShadowNodeTraits::Trait::FormsStackingContext)) {
+    Point storedOrigin = {};
+    if (areChildrenFlattened) {
+      storedOrigin = origin;
+    }
+    scope.push_back(
+        {shadowView,
+         &childShadowNode,
+         areChildrenFlattened,
+         isConcreteView,
+         storedOrigin});
+    pairList.push_back(&scope.back());
+
+    if (areChildrenFlattened) {
       sliceChildShadowNodeViewPairsRecursivelyV2(
-          pairList, origin, childShadowNode);
+          pairList, scope, origin, childShadowNode);
     }
   }
 }
 
-ShadowViewNodePair::List sliceChildShadowNodeViewPairsV2(
+ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairsV2(
     ShadowNode const &shadowNode,
-    bool allowFlattened) {
-  auto pairList = ShadowViewNodePair::List{};
+    ViewNodePairScope &scope,
+    bool allowFlattened,
+    Point layoutOffset) {
+  auto pairList = ShadowViewNodePair::NonOwningList{};
 
   if (!shadowNode.getTraits().check(
           ShadowNodeTraits::Trait::FormsStackingContext) &&
@@ -245,23 +273,41 @@ ShadowViewNodePair::List sliceChildShadowNodeViewPairsV2(
     return pairList;
   }
 
-  sliceChildShadowNodeViewPairsRecursivelyV2(pairList, {0, 0}, shadowNode);
+  sliceChildShadowNodeViewPairsRecursivelyV2(
+      pairList, scope, layoutOffset, shadowNode);
 
   // Sorting pairs based on `orderIndex` if needed.
   reorderInPlaceIfNeeded(pairList);
 
   // Set list and mountIndex for each after reordering
   size_t mountIndex = 0;
-  for (auto &child : pairList) {
-    child.mountIndex = (child.isConcreteView ? mountIndex++ : -1);
+  for (auto child : pairList) {
+    child->mountIndex = (child->isConcreteView ? mountIndex++ : -1);
   }
 
   return pairList;
 }
 
+/**
+ * Prefer calling this over `sliceChildShadowNodeViewPairsV2` directly, when
+ * possible. This can account for adding parent LayoutMetrics that are
+ * important to take into account, but tricky, in (un)flattening cases.
+ */
+static ShadowViewNodePair::NonOwningList
+sliceChildShadowNodeViewPairsFromViewNodePair(
+    ShadowViewNodePair const &shadowViewNodePair,
+    ViewNodePairScope &scope,
+    bool allowFlattened = false) {
+  return sliceChildShadowNodeViewPairsV2(
+      *shadowViewNodePair.shadowNode,
+      scope,
+      allowFlattened,
+      shadowViewNodePair.contextOrigin);
+}
+
 /*
- * Before we start to diff, let's make sure all our core data structures are in
- * good shape to deliver the best performance.
+ * Before we start to diff, let's make sure all our core data structures are
+ * in good shape to deliver the best performance.
  */
 static_assert(
     std::is_move_constructible<ShadowViewMutation>::value,
@@ -273,8 +319,8 @@ static_assert(
     std::is_move_constructible<ShadowViewNodePair>::value,
     "`ShadowViewNodePair` must be `move constructible`.");
 static_assert(
-    std::is_move_constructible<ShadowViewNodePair::List>::value,
-    "`ShadowViewNodePair::List` must be `move constructible`.");
+    std::is_move_constructible<ShadowViewNodePair::NonOwningList>::value,
+    "`ShadowViewNodePair::NonOwningList` must be `move constructible`.");
 
 static_assert(
     std::is_move_assignable<ShadowViewMutation>::value,
@@ -286,29 +332,52 @@ static_assert(
     std::is_move_assignable<ShadowViewNodePair>::value,
     "`ShadowViewNodePair` must be `move assignable`.");
 static_assert(
-    std::is_move_assignable<ShadowViewNodePair::List>::value,
-    "`ShadowViewNodePair::List` must be `move assignable`.");
+    std::is_move_assignable<ShadowViewNodePair::NonOwningList>::value,
+    "`ShadowViewNodePair::NonOwningList` must be `move assignable`.");
 
-// Forward declaration
 static void calculateShadowViewMutationsV2(
+    BREADCRUMB_TYPE breadcrumb,
+    ViewNodePairScope &scope,
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
-    ShadowViewNodePair::List &&oldChildPairs,
-    ShadowViewNodePair::List &&newChildPairs);
+    ShadowViewNodePair::NonOwningList &&oldChildPairs,
+    ShadowViewNodePair::NonOwningList &&newChildPairs);
 
 struct OrderedMutationInstructionContainer {
-  ShadowViewMutation::List &createMutations;
-  ShadowViewMutation::List &deleteMutations;
-  ShadowViewMutation::List &insertMutations;
-  ShadowViewMutation::List &removeMutations;
-  ShadowViewMutation::List &updateMutations;
-  ShadowViewMutation::List &downwardMutations;
-  ShadowViewMutation::List &destructiveDownwardMutations;
+  ShadowViewMutation::List createMutations{};
+  ShadowViewMutation::List deleteMutations{};
+  ShadowViewMutation::List insertMutations{};
+  ShadowViewMutation::List removeMutations{};
+  ShadowViewMutation::List updateMutations{};
+  ShadowViewMutation::List downwardMutations{};
+  ShadowViewMutation::List destructiveDownwardMutations{};
 };
 
+static void updateMatchedPairSubtrees(
+    BREADCRUMB_TYPE breadcrumb,
+    ViewNodePairScope &scope,
+    OrderedMutationInstructionContainer &mutationContainer,
+    TinyMap<Tag, ShadowViewNodePair *> &newRemainingPairs,
+    ShadowViewNodePair::NonOwningList &oldChildPairs,
+    ShadowViewNodePair::NonOwningList &newChildPairs,
+    ShadowView const &parentShadowView,
+    ShadowViewNodePair const &oldPair,
+    ShadowViewNodePair const &newPair);
+
+static void updateMatchedPair(
+    BREADCRUMB_TYPE breadcrumb,
+    OrderedMutationInstructionContainer &mutationContainer,
+    bool oldNodeFoundInOrder,
+    bool newNodeFoundInOrder,
+    ShadowView const &parentShadowView,
+    ShadowViewNodePair const &oldPair,
+    ShadowViewNodePair const &newPair);
+
 static void calculateShadowViewMutationsFlattener(
+    BREADCRUMB_TYPE breadcrumb,
+    ViewNodePairScope &scope,
     ReparentMode reparentMode,
-    OrderedMutationInstructionContainer &mutationInstructionContainer,
+    OrderedMutationInstructionContainer &mutationContainer,
     ShadowView const &parentShadowView,
     TinyMap<Tag, ShadowViewNodePair *> &unvisitedFlattenedNodes,
     ShadowViewNodePair const &node,
@@ -316,15 +385,210 @@ static void calculateShadowViewMutationsFlattener(
     TinyMap<Tag, ShadowViewNodePair *> *parentSubVisitedOtherOldNodes =
         nullptr);
 
+/**
+ * Updates the subtrees of any matched ShadowViewNodePair. This handles
+ * all cases of flattening/unflattening.
+ *
+ * This may modify data-structures passed to it and owned by the caller,
+ * specifically `newRemainingPairs`, and so the caller must also own
+ * the ViewNodePairScope used within.
+ */
+static void updateMatchedPairSubtrees(
+    BREADCRUMB_TYPE breadcrumb,
+    ViewNodePairScope &scope,
+    OrderedMutationInstructionContainer &mutationContainer,
+    TinyMap<Tag, ShadowViewNodePair *> &newRemainingPairs,
+    ShadowViewNodePair::NonOwningList &oldChildPairs,
+    ShadowViewNodePair::NonOwningList &newChildPairs,
+    ShadowView const &parentShadowView,
+    ShadowViewNodePair const &oldPair,
+    ShadowViewNodePair const &newPair) {
+  // Are we flattening or unflattening either one? If node was
+  // flattened in both trees, there's no change, just continue.
+  if (oldPair.flattened && newPair.flattened) {
+    return;
+  }
+
+  // We are either flattening or unflattening this node.
+  if (oldPair.flattened != newPair.flattened) {
+    DEBUG_LOGS({
+      LOG(ERROR)
+          << "Differ: flattening or unflattening in updateMatchedPairSubtrees: ["
+          << oldPair.shadowView.tag << "] [" << newPair.shadowView.tag << "] "
+          << oldPair.flattened << " " << newPair.flattened << " with parent: ["
+          << parentShadowView.tag << "]";
+    });
+
+    // Flattening
+    if (!oldPair.flattened) {
+      // Flatten old tree into new list
+      // At the end of this loop we still want to know which of these
+      // children are visited, so we reuse the `newRemainingPairs`
+      // map.
+      calculateShadowViewMutationsFlattener(
+          DIFF_BREADCRUMB(
+              "Flatten tree " + std::to_string(parentShadowView.tag) +
+              " into list " + std::to_string(oldPair.shadowView.tag)),
+          scope,
+          ReparentMode::Flatten,
+          mutationContainer,
+          parentShadowView,
+          newRemainingPairs,
+          oldPair);
+    }
+    // Unflattening
+    else {
+      // Construct unvisited nodes map
+      auto unvisitedOldChildPairs = TinyMap<Tag, ShadowViewNodePair *>{};
+      // We don't know where all the children of oldChildPair are
+      // within oldChildPairs, but we know that they're in the same
+      // relative order. The reason for this is because of flattening
+      // + zIndex: the children could be listed before the parent,
+      // interwoven with children from other nodes, etc.
+      auto oldFlattenedNodes =
+          sliceChildShadowNodeViewPairsFromViewNodePair(oldPair, scope, true);
+      for (size_t i = 0, j = 0;
+           i < oldChildPairs.size() && j < oldFlattenedNodes.size();
+           i++) {
+        auto &oldChild = *oldChildPairs[i];
+        if (oldChild.shadowView.tag == oldFlattenedNodes[j]->shadowView.tag) {
+          unvisitedOldChildPairs.insert({oldChild.shadowView.tag, &oldChild});
+          j++;
+        }
+      }
+
+      // Unflatten old list into new tree
+      calculateShadowViewMutationsFlattener(
+          DIFF_BREADCRUMB(
+              "Unflatten old list " + std::to_string(parentShadowView.tag) +
+              " into new tree " + std::to_string(newPair.shadowView.tag)),
+          scope,
+          ReparentMode::Unflatten,
+          mutationContainer,
+          parentShadowView,
+          unvisitedOldChildPairs,
+          newPair);
+
+      // If old nodes were not visited, we know that we can delete
+      // them now. They will be removed from the hierarchy by the
+      // outermost loop of this function.
+      // TODO: is this necessary anymore?
+      for (auto &oldFlattenedNodePtr : oldFlattenedNodes) {
+        auto &oldFlattenedNode = *oldFlattenedNodePtr;
+        auto unvisitedOldChildPairIt =
+            unvisitedOldChildPairs.find(oldFlattenedNode.shadowView.tag);
+        if (unvisitedOldChildPairIt == unvisitedOldChildPairs.end()) {
+          // Node was visited - make sure to remove it from
+          // "newRemainingPairs" map
+          auto newRemainingIt =
+              newRemainingPairs.find(oldFlattenedNode.shadowView.tag);
+          if (newRemainingIt != newRemainingPairs.end()) {
+            newRemainingPairs.erase(newRemainingIt);
+          }
+        }
+      }
+    }
+
+    return;
+  }
+
+  // Update subtrees if View is not flattened, and if node addresses
+  // are not equal
+  if (oldPair.shadowNode != newPair.shadowNode) {
+    ViewNodePairScope innerScope{};
+    auto oldGrandChildPairs =
+        sliceChildShadowNodeViewPairsFromViewNodePair(oldPair, innerScope);
+    auto newGrandChildPairs =
+        sliceChildShadowNodeViewPairsFromViewNodePair(newPair, innerScope);
+    calculateShadowViewMutationsV2(
+        DIFF_BREADCRUMB(
+            "Non-trivial update " + std::to_string(oldPair.shadowView.tag)),
+        innerScope,
+        *(newGrandChildPairs.size()
+              ? &mutationContainer.downwardMutations
+              : &mutationContainer.destructiveDownwardMutations),
+        oldPair.shadowView,
+        std::move(oldGrandChildPairs),
+        std::move(newGrandChildPairs));
+  }
+}
+
+/**
+ * Handle updates to a matched node pair, but NOT to their subtrees.
+ *
+ * Here we have (and need) knowledge of whether a node was found during
+ * in-order traversal, or out-of-order via a map lookup. Nodes are only REMOVEd
+ * or INSERTed when they are encountered via in-order-traversal, to ensure
+ * correct ordering of INSERT and REMOVE mutations.
+ */
+static void updateMatchedPair(
+    BREADCRUMB_TYPE breadcrumb,
+    OrderedMutationInstructionContainer &mutationContainer,
+    bool oldNodeFoundInOrder,
+    bool newNodeFoundInOrder,
+    ShadowView const &parentShadowView,
+    ShadowViewNodePair const &oldPair,
+    ShadowViewNodePair const &newPair) {
+  oldPair.otherTreePair = &newPair;
+  newPair.otherTreePair = &oldPair;
+
+  // Check concrete-ness of views
+  // Create/Delete and Insert/Remove if necessary
+  if (oldPair.isConcreteView != newPair.isConcreteView) {
+    if (newPair.isConcreteView) {
+      if (newNodeFoundInOrder) {
+        mutationContainer.insertMutations.push_back(
+            ShadowViewMutation::InsertMutation(
+                parentShadowView,
+                newPair.shadowView,
+                static_cast<int>(newPair.mountIndex)));
+      }
+      mutationContainer.createMutations.push_back(
+          ShadowViewMutation::CreateMutation(newPair.shadowView));
+    } else {
+      if (oldNodeFoundInOrder) {
+        mutationContainer.removeMutations.push_back(
+            ShadowViewMutation::RemoveMutation(
+                parentShadowView,
+                oldPair.shadowView,
+                static_cast<int>(oldPair.mountIndex)));
+      }
+      mutationContainer.deleteMutations.push_back(
+          ShadowViewMutation::DeleteMutation(oldPair.shadowView));
+    }
+  } else if (oldPair.isConcreteView && newPair.isConcreteView) {
+    // If we found the old node by traversing, but not the new node,
+    // it means that there's some reordering requiring a REMOVE mutation.
+    if (oldNodeFoundInOrder && !newNodeFoundInOrder) {
+      mutationContainer.removeMutations.push_back(
+          ShadowViewMutation::RemoveMutation(
+              parentShadowView,
+              newPair.shadowView,
+              static_cast<int>(oldPair.mountIndex)));
+    }
+
+    // Even if node's children are flattened, it might still be a
+    // concrete view. The case where they're different is handled
+    // above.
+    if (oldPair.shadowView != newPair.shadowView) {
+      mutationContainer.updateMutations.push_back(
+          ShadowViewMutation::UpdateMutation(
+              oldPair.shadowView, newPair.shadowView));
+    }
+  }
+}
+
 /**
  * Here we flatten or unflatten a subtree, given an unflattened node in either
  * the old or new tree, and a list of flattened nodes in the other tree.
  *
- * For example: if you are Flattening, the node will be in the old tree and the
+ * For example: if you are Flattening, the node will be in the old tree and
+ the
  * list will be from the new tree. If you are Unflattening, the opposite is
  true.
 
- * It is currently not possible for ReactJS, and therefore React Native, to move
+ * It is currently not possible for ReactJS, and therefore React Native, to
+ move
  * a node *from* one parent to another without an entirely new subtree being
  * created. When we "reparent" in React Native here it is only because
  intermediate
@@ -335,7 +599,8 @@ static void calculateShadowViewMutationsFlattener(
  * expanding vertically in that way.
 
  * Sketch of algorithm:
- * 0. Create a map of nodes in the flattened list. This should be done *before*
+ * 0. Create a map of nodes in the flattened list. This should be done
+ *before*
  *    calling this function.
  * 1. Traverse the Node Subtree; remove elements from the map as they are
  *    visited in the tree.
@@ -346,13 +611,16 @@ static void calculateShadowViewMutationsFlattener(
  *    View if we're flattening.
  *    If a node is in the list but not the map, it means it's been visited and
  *    Update has already been
- *    performed in the subtree. If it *is* in the map, it means the node is not
+ *    performed in the subtree. If it *is* in the map, it means the node is
+ not
  *    * in the Tree, and should be Deleted/Created
  *    **after this function is called**, by the caller.
  */
 static void calculateShadowViewMutationsFlattener(
+    BREADCRUMB_TYPE breadcrumb,
+    ViewNodePairScope &scope,
     ReparentMode reparentMode,
-    OrderedMutationInstructionContainer &mutationInstructionContainer,
+    OrderedMutationInstructionContainer &mutationContainer,
     ShadowView const &parentShadowView,
     TinyMap<Tag, ShadowViewNodePair *> &unvisitedOtherNodes,
     ShadowViewNodePair const &node,
@@ -366,8 +634,8 @@ static void calculateShadowViewMutationsFlattener(
   });
 
   // Step 1: iterate through entire tree
-  ShadowViewNodePair::List treeChildren =
-      sliceChildShadowNodeViewPairsV2(*node.shadowNode);
+  ShadowViewNodePair::NonOwningList treeChildren =
+      sliceChildShadowNodeViewPairsFromViewNodePair(node, scope);
 
   DEBUG_LOGS({
     LOG(ERROR) << "Differ Flattener 1.4: "
@@ -377,9 +645,9 @@ static void calculateShadowViewMutationsFlattener(
     LOG(ERROR) << "Differ Flattener Entry: Child Pairs: ";
     std::string strTreeChildPairs;
     for (size_t k = 0; k < treeChildren.size(); k++) {
-      strTreeChildPairs.append(std::to_string(treeChildren[k].shadowView.tag));
-      strTreeChildPairs.append(treeChildren[k].isConcreteView ? "" : "'");
-      strTreeChildPairs.append(treeChildren[k].flattened ? "*" : "");
+      strTreeChildPairs.append(std::to_string(treeChildren[k]->shadowView.tag));
+      strTreeChildPairs.append(treeChildren[k]->isConcreteView ? "" : "'");
+      strTreeChildPairs.append(treeChildren[k]->flattened ? "*" : "");
       strTreeChildPairs.append(", ");
     }
     std::string strListChildPairs;
@@ -396,7 +664,8 @@ static void calculateShadowViewMutationsFlattener(
                << strListChildPairs;
   });
 
-  // Views in other tree that are visited by sub-flattening or sub-unflattening
+  // Views in other tree that are visited by sub-flattening or
+  // sub-unflattening
   TinyMap<Tag, ShadowViewNodePair *> subVisitedOtherNewNodes{};
   TinyMap<Tag, ShadowViewNodePair *> subVisitedOtherOldNodes{};
   auto subVisitedNewMap =
@@ -413,28 +682,7 @@ static void calculateShadowViewMutationsFlattener(
   for (size_t index = 0;
        index < treeChildren.size() && index < treeChildren.size();
        index++) {
-    // First, remove all children of the tree being flattened, or insert
-    // children into parent tree if they're being unflattened. Then, look up
-    // each node in the "unvisited" list and update the nodes and subtrees if
-    // appropriate.
-    auto &treeChildPair = treeChildren[index];
-
-    //  Caller will take care of the corresponding action in the other tree.
-    if (treeChildPair.isConcreteView) {
-      if (reparentMode == ReparentMode::Flatten) {
-        mutationInstructionContainer.removeMutations.push_back(
-            ShadowViewMutation::RemoveMutation(
-                node.shadowView,
-                treeChildPair.shadowView,
-                treeChildPair.mountIndex));
-      } else {
-        mutationInstructionContainer.insertMutations.push_back(
-            ShadowViewMutation::InsertMutation(
-                node.shadowView,
-                treeChildPair.shadowView,
-                treeChildPair.mountIndex));
-      }
-    }
+    auto &treeChildPair = *treeChildren[index];
 
     // Try to find node in other tree
     auto unvisitedIt = unvisitedOtherNodes.find(treeChildPair.shadowView.tag);
@@ -443,14 +691,129 @@ static void calculateShadowViewMutationsFlattener(
              ? subVisitedNewMap->find(treeChildPair.shadowView.tag)
              : subVisitedNewMap->end());
     auto subVisitedOtherOldIt =
-        (unvisitedIt == unvisitedOtherNodes.end()
+        (unvisitedIt == unvisitedOtherNodes.end() && subVisitedNewMap->end()
              ? subVisitedOldMap->find(treeChildPair.shadowView.tag)
              : subVisitedOldMap->end());
 
-    // Find in other tree
-    if (unvisitedIt != unvisitedOtherNodes.end() ||
+    bool existsInOtherTree = unvisitedIt != unvisitedOtherNodes.end() ||
         subVisitedOtherNewIt != subVisitedNewMap->end() ||
-        subVisitedOtherOldIt != subVisitedOldMap->end()) {
+        subVisitedOtherOldIt != subVisitedOldMap->end();
+
+    auto otherTreeNodePairPtr =
+        (existsInOtherTree
+             ? (unvisitedIt != unvisitedOtherNodes.end()
+                    ? unvisitedIt->second
+                    : (subVisitedOtherNewIt != subVisitedNewMap->end()
+                           ? subVisitedOtherNewIt->second
+                           : subVisitedOtherOldIt->second))
+             : nullptr);
+
+    react_native_assert(
+        !existsInOtherTree ||
+        (unvisitedIt != unvisitedOtherNodes.end() ||
+         subVisitedOtherNewIt != subVisitedNewMap->end() ||
+         subVisitedOtherOldIt != subVisitedOldMap->end()));
+    react_native_assert(
+        unvisitedIt == unvisitedOtherNodes.end() ||
+        unvisitedIt->second->shadowView.tag == treeChildPair.shadowView.tag);
+    react_native_assert(
+        subVisitedOtherNewIt == subVisitedNewMap->end() ||
+        subVisitedOtherNewIt->second->shadowView.tag ==
+            treeChildPair.shadowView.tag);
+    react_native_assert(
+        subVisitedOtherOldIt == subVisitedOldMap->end() ||
+        subVisitedOtherOldIt->second->shadowView.tag ==
+            treeChildPair.shadowView.tag);
+
+    bool alreadyUpdated = false;
+
+    // Find in other tree and updated `otherTreePair` pointers
+    if (existsInOtherTree) {
+      react_native_assert(otherTreeNodePairPtr != nullptr);
+      auto newTreeNodePair =
+          (reparentMode == ReparentMode::Flatten ? otherTreeNodePairPtr
+                                                 : &treeChildPair);
+      auto oldTreeNodePair =
+          (reparentMode == ReparentMode::Flatten ? &treeChildPair
+                                                 : otherTreeNodePairPtr);
+
+      react_native_assert(newTreeNodePair->shadowView.tag != 0);
+      react_native_assert(oldTreeNodePair->shadowView.tag != 0);
+      react_native_assert(
+          oldTreeNodePair->shadowView.tag == newTreeNodePair->shadowView.tag);
+
+      alreadyUpdated =
+          newTreeNodePair->inOtherTree() || oldTreeNodePair->inOtherTree();
+
+      // We want to update these values unconditionally. Always do this
+      // before hitting any "continue" statements.
+      newTreeNodePair->otherTreePair = oldTreeNodePair;
+      oldTreeNodePair->otherTreePair = newTreeNodePair;
+      react_native_assert(treeChildPair.otherTreePair != nullptr);
+    }
+
+    // Remove all children (non-recursively) of tree being flattened, or
+    // insert children into parent tree if they're being unflattened.
+    //  Caller will take care of the corresponding action in the other tree
+    //  (caller will handle DELETE case if we REMOVE here; caller will handle
+    //  CREATE case if we INSERT here).
+    if (treeChildPair.isConcreteView) {
+      if (reparentMode == ReparentMode::Flatten) {
+        // treeChildPair.shadowView represents the "old" view in this case.
+        // If there's a "new" view, an UPDATE new -> old will be generated
+        // and will be executed before the REMOVE. Thus, we must actually
+        // perform a REMOVE (new view) FROM (old index) in this case so that
+        // we don't hit asserts in StubViewTree's REMOVE path.
+        // We also only do this if the "other" (newer) view is concrete. If
+        // it's not concrete, there will be no UPDATE mutation.
+        react_native_assert(existsInOtherTree == treeChildPair.inOtherTree());
+        if (treeChildPair.inOtherTree() &&
+            treeChildPair.otherTreePair->isConcreteView) {
+          mutationContainer.removeMutations.push_back(
+              ShadowViewMutation::RemoveMutation(
+                  node.shadowView,
+                  treeChildPair.otherTreePair->shadowView,
+                  static_cast<int>(treeChildPair.mountIndex)));
+        } else {
+          mutationContainer.removeMutations.push_back(
+              ShadowViewMutation::RemoveMutation(
+                  node.shadowView,
+                  treeChildPair.shadowView,
+                  static_cast<int>(treeChildPair.mountIndex)));
+        }
+      } else {
+        // treeChildParent represents the "new" version of the node, so
+        // we can safely insert it without checking in the other tree
+        mutationContainer.insertMutations.push_back(
+            ShadowViewMutation::InsertMutation(
+                node.shadowView,
+                treeChildPair.shadowView,
+                static_cast<int>(treeChildPair.mountIndex)));
+      }
+    }
+
+    // Find in other tree
+    if (existsInOtherTree) {
+      react_native_assert(otherTreeNodePairPtr != nullptr);
+      auto &otherTreeNodePair = *otherTreeNodePairPtr;
+
+      auto &newTreeNodePair =
+          (reparentMode == ReparentMode::Flatten ? otherTreeNodePair
+                                                 : treeChildPair);
+      auto &oldTreeNodePair =
+          (reparentMode == ReparentMode::Flatten ? treeChildPair
+                                                 : otherTreeNodePair);
+
+      react_native_assert(newTreeNodePair.shadowView.tag != 0);
+      react_native_assert(oldTreeNodePair.shadowView.tag != 0);
+      react_native_assert(
+          oldTreeNodePair.shadowView.tag == newTreeNodePair.shadowView.tag);
+
+      // If we've already done updates, don't repeat it.
+      if (alreadyUpdated) {
+        continue;
+      }
+
       // If we've already done updates on this node, don't repeat.
       if (reparentMode == ReparentMode::Flatten &&
           unvisitedIt == unvisitedOtherNodes.end() &&
@@ -463,47 +826,36 @@ static void calculateShadowViewMutationsFlattener(
         continue;
       }
 
-      auto &otherTreeNodePair =
-          *(unvisitedIt != unvisitedOtherNodes.end()
-                ? unvisitedIt->second
-                : (subVisitedOtherNewIt != subVisitedNewMap->end()
-                       ? subVisitedOtherNewIt->second
-                       : subVisitedOtherOldIt->second));
-
-      // If we've already done updates, don't repeat it.
-      if (treeChildPair.inOtherTree || otherTreeNodePair.inOtherTree) {
-        continue;
-      }
-
-      auto &newTreeNodePair =
-          (reparentMode == ReparentMode::Flatten ? otherTreeNodePair
-                                                 : treeChildPair);
-      auto &oldTreeNodePair =
-          (reparentMode == ReparentMode::Flatten ? treeChildPair
-                                                 : otherTreeNodePair);
-
+      // TODO: compare ShadowNode pointer instead of ShadowView here?
+      // Or ShadowNode ptr comparison before comparing ShadowView, to allow for
+      // short-circuiting? ShadowView comparison is relatively expensive vs
+      // ShadowNode.
       if (newTreeNodePair.shadowView != oldTreeNodePair.shadowView &&
           newTreeNodePair.isConcreteView && oldTreeNodePair.isConcreteView) {
-        mutationInstructionContainer.updateMutations.push_back(
+        mutationContainer.updateMutations.push_back(
             ShadowViewMutation::UpdateMutation(
-                parentShadowView,
-                oldTreeNodePair.shadowView,
-                newTreeNodePair.shadowView,
-                newTreeNodePair.mountIndex));
+                oldTreeNodePair.shadowView, newTreeNodePair.shadowView));
       }
 
       // Update children if appropriate.
       if (!oldTreeNodePair.flattened && !newTreeNodePair.flattened) {
         if (oldTreeNodePair.shadowNode != newTreeNodePair.shadowNode) {
+          ViewNodePairScope innerScope{};
           calculateShadowViewMutationsV2(
-              mutationInstructionContainer.downwardMutations,
+              DIFF_BREADCRUMB(
+                  "(Un)Flattener trivial update of " +
+                  std::to_string(newTreeNodePair.shadowView.tag)),
+              innerScope,
+              mutationContainer.downwardMutations,
               newTreeNodePair.shadowView,
-              sliceChildShadowNodeViewPairsV2(*oldTreeNodePair.shadowNode),
-              sliceChildShadowNodeViewPairsV2(*newTreeNodePair.shadowNode));
+              sliceChildShadowNodeViewPairsFromViewNodePair(
+                  oldTreeNodePair, innerScope),
+              sliceChildShadowNodeViewPairsFromViewNodePair(
+                  newTreeNodePair, innerScope));
         }
       } else if (oldTreeNodePair.flattened != newTreeNodePair.flattened) {
-        // We need to handle one of the children being flattened or unflattened,
-        // in the context of a parent flattening or unflattening.
+        // We need to handle one of the children being flattened or
+        // unflattened, in the context of a parent flattening or unflattening.
         ReparentMode childReparentMode =
             (oldTreeNodePair.flattened ? ReparentMode::Unflatten
                                        : ReparentMode::Flatten);
@@ -512,8 +864,20 @@ static void calculateShadowViewMutationsFlattener(
         // This is a flatten-flatten, or unflatten-unflatten.
         if (childReparentMode == reparentMode) {
           calculateShadowViewMutationsFlattener(
+              DIFF_BREADCRUMB(
+                  std::string(
+                      reparentMode == ReparentMode::Flatten
+                          ? "Flatten-Flatten"
+                          : "Unflatten-Unflatten") +
+                  " new:" +
+                  std::to_string(
+                      reparentMode == ReparentMode::Flatten
+                          ? parentShadowView.tag
+                          : newTreeNodePair.shadowView.tag) +
+                  " old:" + std::to_string(treeChildPair.shadowView.tag)),
+              scope,
               childReparentMode,
-              mutationInstructionContainer,
+              mutationContainer,
               (reparentMode == ReparentMode::Flatten
                    ? parentShadowView
                    : newTreeNodePair.shadowView),
@@ -522,89 +886,72 @@ static void calculateShadowViewMutationsFlattener(
               subVisitedNewMap,
               subVisitedOldMap);
         } else {
-          // Unflatten parent, flatten child
-          if (childReparentMode == ReparentMode::Flatten) {
-            // Construct unvisited nodes map
-            auto unvisitedNewChildPairs = TinyMap<Tag, ShadowViewNodePair *>{};
-            // Memory note: these oldFlattenedNodes all disappear at the end of
-            // this "else" block, including any annotations we put on them.
-            auto newFlattenedNodes = sliceChildShadowNodeViewPairsV2(
-                *newTreeNodePair.shadowNode, true);
-            for (size_t i = 0; i < newFlattenedNodes.size(); i++) {
-              auto &newChild = newFlattenedNodes[i];
-
-              auto unvisitedOtherNodesIt =
-                  unvisitedOtherNodes.find(newChild.shadowView.tag);
-              if (unvisitedOtherNodesIt != unvisitedOtherNodes.end()) {
-                auto &unvisitedItPair = *unvisitedOtherNodesIt->second;
-                unvisitedNewChildPairs.insert(
-                    {unvisitedItPair.shadowView.tag, &unvisitedItPair});
-              } else {
-                unvisitedNewChildPairs.insert(
-                    {newChild.shadowView.tag, &newChild});
-              }
+          // Get flattened nodes from either new or old tree
+          auto flattenedNodes = sliceChildShadowNodeViewPairsFromViewNodePair(
+              (childReparentMode == ReparentMode::Flatten ? newTreeNodePair
+                                                          : oldTreeNodePair),
+              scope,
+              true);
+          // Construct unvisited nodes map
+          auto unvisitedRecursiveChildPairs =
+              TinyMap<Tag, ShadowViewNodePair *>{};
+          for (size_t i = 0; i < flattenedNodes.size(); i++) {
+            auto &newChild = *flattenedNodes[i];
+
+            auto unvisitedOtherNodesIt =
+                unvisitedOtherNodes.find(newChild.shadowView.tag);
+            if (unvisitedOtherNodesIt != unvisitedOtherNodes.end()) {
+              auto unvisitedItPair = *unvisitedOtherNodesIt->second;
+              unvisitedRecursiveChildPairs.insert(
+                  {unvisitedItPair.shadowView.tag, &unvisitedItPair});
+            } else {
+              unvisitedRecursiveChildPairs.insert(
+                  {newChild.shadowView.tag, &newChild});
             }
+          }
 
+          // Unflatten parent, flatten child
+          if (childReparentMode == ReparentMode::Flatten) {
             // Flatten old tree into new list
             // At the end of this loop we still want to know which of these
             // children are visited, so we reuse the `newRemainingPairs` map.
             calculateShadowViewMutationsFlattener(
+                DIFF_BREADCRUMB(
+                    std::string("Flatten old tree into new list; new:") +
+                    std::to_string(
+                        reparentMode == ReparentMode::Flatten
+                            ? parentShadowView.tag
+                            : newTreeNodePair.shadowView.tag) +
+                    " old:" + std::to_string(oldTreeNodePair.shadowView.tag)),
+                scope,
                 ReparentMode::Flatten,
-                mutationInstructionContainer,
+                mutationContainer,
                 (reparentMode == ReparentMode::Flatten
                      ? parentShadowView
                      : newTreeNodePair.shadowView),
-                unvisitedNewChildPairs,
+                unvisitedRecursiveChildPairs,
                 oldTreeNodePair,
                 subVisitedNewMap,
                 subVisitedOldMap);
-
-            for (auto &newFlattenedNode : newFlattenedNodes) {
-              auto unvisitedOldChildPairIt =
-                  unvisitedNewChildPairs.find(newFlattenedNode.shadowView.tag);
-
-              if (unvisitedOldChildPairIt == unvisitedNewChildPairs.end()) {
-                // Node was visited.
-
-                auto deleteCreateIt = deletionCreationCandidatePairs.find(
-                    newFlattenedNode.shadowView.tag);
-                if (deleteCreateIt != deletionCreationCandidatePairs.end()) {
-                  deletionCreationCandidatePairs.erase(deleteCreateIt);
-                }
-              }
-            }
           }
           // Flatten parent, unflatten child
           else {
-            // Construct unvisited nodes map
-            auto unvisitedOldChildPairs = TinyMap<Tag, ShadowViewNodePair *>{};
-            // Memory note: these oldFlattenedNodes all disappear at the end of
-            // this "else" block, including any annotations we put on them.
-            auto oldFlattenedNodes = sliceChildShadowNodeViewPairsV2(
-                *oldTreeNodePair.shadowNode, true);
-            for (size_t i = 0; i < oldFlattenedNodes.size(); i++) {
-              auto &oldChild = oldFlattenedNodes[i];
-
-              auto unvisitedOtherNodesIt =
-                  unvisitedOtherNodes.find(oldChild.shadowView.tag);
-              if (unvisitedOtherNodesIt != unvisitedOtherNodes.end()) {
-                auto &unvisitedItPair = *unvisitedOtherNodesIt->second;
-                unvisitedOldChildPairs.insert(
-                    {unvisitedItPair.shadowView.tag, &unvisitedItPair});
-              } else {
-                unvisitedOldChildPairs.insert(
-                    {oldChild.shadowView.tag, &oldChild});
-              }
-            }
-
             // Unflatten old list into new tree
             calculateShadowViewMutationsFlattener(
+                DIFF_BREADCRUMB(
+                    "Unflatten old list into new tree; old:" +
+                    std::to_string(
+                        reparentMode == ReparentMode::Flatten
+                            ? parentShadowView.tag
+                            : newTreeNodePair.shadowView.tag) +
+                    " new:" + std::to_string(newTreeNodePair.shadowView.tag)),
+                scope,
                 ReparentMode::Unflatten,
-                mutationInstructionContainer,
+                mutationContainer,
                 (reparentMode == ReparentMode::Flatten
                      ? parentShadowView
                      : newTreeNodePair.shadowView),
-                unvisitedOldChildPairs,
+                unvisitedRecursiveChildPairs,
                 newTreeNodePair,
                 subVisitedNewMap,
                 subVisitedOldMap);
@@ -612,45 +959,24 @@ static void calculateShadowViewMutationsFlattener(
             // If old nodes were not visited, we know that we can delete them
             // now. They will be removed from the hierarchy by the outermost
             // loop of this function.
-            for (auto &oldFlattenedNode : oldFlattenedNodes) {
-              auto unvisitedOldChildPairIt =
-                  unvisitedOldChildPairs.find(oldFlattenedNode.shadowView.tag);
-              if (unvisitedOldChildPairIt != unvisitedOldChildPairs.end()) {
-                // Node unvisited - mark the entire subtree for deletion
-                if (oldFlattenedNode.isConcreteView) {
-                  auto tag = oldFlattenedNode.shadowView.tag;
-                  auto oldRemainingChildInListIt = std::find_if(
-                      treeChildren.begin(),
-                      treeChildren.end(),
-                      [&tag](ShadowViewNodePair &nodePair) {
-                        return nodePair.shadowView.tag == tag;
-                      });
-                  if (oldRemainingChildInListIt != treeChildren.end()) {
-                    auto deleteCreateIt = deletionCreationCandidatePairs.find(
-                        oldFlattenedNode.shadowView.tag);
-                    if (deleteCreateIt ==
-                        deletionCreationCandidatePairs.end()) {
-                      deletionCreationCandidatePairs.insert(
-                          {tag, &*oldRemainingChildInListIt});
-                    }
-                  } else {
-                    // TODO: we might want to remove this block. It seems
-                    // impossible to hit this logically (and empirically, after
-                    // testing on lots of randomized and pathologically
-                    // constructed trees) but I'm leaving this here out of an
-                    // abundance of caution.
-                    mutationInstructionContainer.deleteMutations.push_back(
-                        ShadowViewMutation::DeleteMutation(
-                            oldFlattenedNode.shadowView));
-
-                    calculateShadowViewMutationsV2(
-                        mutationInstructionContainer
-                            .destructiveDownwardMutations,
-                        oldFlattenedNode.shadowView,
-                        sliceChildShadowNodeViewPairsV2(
-                            *oldFlattenedNode.shadowNode),
-                        {});
-                  }
+            for (auto unvisitedOldChildPairIt =
+                     unvisitedRecursiveChildPairs.begin();
+                 unvisitedOldChildPairIt != unvisitedRecursiveChildPairs.end();
+                 unvisitedOldChildPairIt++) {
+              if (unvisitedOldChildPairIt->first == 0) {
+                continue;
+              }
+              auto &oldFlattenedNode = *unvisitedOldChildPairIt->second;
+
+              // Node unvisited - mark the entire subtree for deletion
+              if (oldFlattenedNode.isConcreteView &&
+                  !oldFlattenedNode.inOtherTree()) {
+                Tag tag = oldFlattenedNode.shadowView.tag;
+                auto deleteCreateIt = deletionCreationCandidatePairs.find(
+                    oldFlattenedNode.shadowView.tag);
+                if (deleteCreateIt == deletionCreationCandidatePairs.end()) {
+                  deletionCreationCandidatePairs.insert(
+                      {tag, &oldFlattenedNode});
                 }
               } else {
                 // Node was visited - make sure to remove it from
@@ -660,13 +986,6 @@ static void calculateShadowViewMutationsFlattener(
                 if (newRemainingIt != unvisitedOtherNodes.end()) {
                   unvisitedOtherNodes.erase(newRemainingIt);
                 }
-
-                // We also remove it from delete/creation candidates
-                auto deleteCreateIt = deletionCreationCandidatePairs.find(
-                    oldFlattenedNode.shadowView.tag);
-                if (deleteCreateIt != deletionCreationCandidatePairs.end()) {
-                  deletionCreationCandidatePairs.erase(deleteCreateIt);
-                }
               }
             }
           }
@@ -677,35 +996,23 @@ static void calculateShadowViewMutationsFlattener(
       // concrete view. Removing the node from the unvisited list prevents the
       // caller from taking further action on this node, so make sure to
       // delete/create if the Concreteness of the node has changed.
-      if (newTreeNodePair.isConcreteView != oldTreeNodePair.isConcreteView &&
-          !newTreeNodePair.inOtherTree) {
+      if (newTreeNodePair.isConcreteView != oldTreeNodePair.isConcreteView) {
         if (newTreeNodePair.isConcreteView) {
-          mutationInstructionContainer.createMutations.push_back(
+          mutationContainer.createMutations.push_back(
               ShadowViewMutation::CreateMutation(newTreeNodePair.shadowView));
         } else {
-          mutationInstructionContainer.deleteMutations.push_back(
-              ShadowViewMutation::DeleteMutation(newTreeNodePair.shadowView));
+          mutationContainer.deleteMutations.push_back(
+              ShadowViewMutation::DeleteMutation(oldTreeNodePair.shadowView));
         }
       }
 
-      treeChildPair.inOtherTree = true;
-      otherTreeNodePair.inOtherTree = true;
-
-      if (parentSubVisitedOtherNewNodes != nullptr) {
-        parentSubVisitedOtherNewNodes->insert(
-            {newTreeNodePair.shadowView.tag, &newTreeNodePair});
-      }
-      if (parentSubVisitedOtherOldNodes != nullptr) {
-        parentSubVisitedOtherOldNodes->insert(
-            {oldTreeNodePair.shadowView.tag, &oldTreeNodePair});
-      }
-
-      if (unvisitedIt != unvisitedOtherNodes.end()) {
-        unvisitedOtherNodes.erase(unvisitedIt);
-      }
+      subVisitedNewMap->insert(
+          {newTreeNodePair.shadowView.tag, &newTreeNodePair});
+      subVisitedOldMap->insert(
+          {oldTreeNodePair.shadowView.tag, &oldTreeNodePair});
     } else {
       // Node does not in exist in other tree.
-      if (treeChildPair.isConcreteView && !treeChildPair.inOtherTree) {
+      if (treeChildPair.isConcreteView && !treeChildPair.inOtherTree()) {
         auto deletionCreationIt =
             deletionCreationCandidatePairs.find(treeChildPair.shadowView.tag);
         if (deletionCreationIt == deletionCreationCandidatePairs.end()) {
@@ -717,8 +1024,8 @@ static void calculateShadowViewMutationsFlattener(
   }
 
   // Final step: go through creation/deletion candidates and delete/create
-  // subtrees if they were never visited during the execution of the above loop
-  // and recursions.
+  // subtrees if they were never visited during the execution of the above
+  // loop and recursions.
   for (auto it = deletionCreationCandidatePairs.begin();
        it != deletionCreationCandidatePairs.end();
        it++) {
@@ -727,42 +1034,60 @@ static void calculateShadowViewMutationsFlattener(
     }
     auto &treeChildPair = *it->second;
 
-    // If node was visited during a flattening/unflattening recursion.
-    if (treeChildPair.inOtherTree) {
+    // If node was visited during a flattening/unflattening recursion,
+    // and the node in the other tree is concrete, that means it was
+    // already created/deleted and we don't need to do that here.
+    // It is always the responsibility of the matcher to update subtrees when
+    // nodes are matched.
+    if (treeChildPair.inOtherTree()) {
       continue;
     }
 
     if (reparentMode == ReparentMode::Flatten) {
-      mutationInstructionContainer.deleteMutations.push_back(
+      mutationContainer.deleteMutations.push_back(
           ShadowViewMutation::DeleteMutation(treeChildPair.shadowView));
 
       if (!treeChildPair.flattened) {
+        ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            mutationInstructionContainer.destructiveDownwardMutations,
+            DIFF_BREADCRUMB(
+                "Recursively delete tree child pair (flatten case): " +
+                std::to_string(treeChildPair.shadowView.tag)),
+            innerScope,
+            mutationContainer.destructiveDownwardMutations,
             treeChildPair.shadowView,
-            sliceChildShadowNodeViewPairsV2(*treeChildPair.shadowNode),
+            sliceChildShadowNodeViewPairsFromViewNodePair(
+                treeChildPair, innerScope),
             {});
       }
     } else {
-      mutationInstructionContainer.createMutations.push_back(
+      mutationContainer.createMutations.push_back(
           ShadowViewMutation::CreateMutation(treeChildPair.shadowView));
 
       if (!treeChildPair.flattened) {
+        ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            mutationInstructionContainer.downwardMutations,
+            DIFF_BREADCRUMB(
+                "Recursively delete tree child pair (unflatten case): " +
+                std::to_string(treeChildPair.shadowView.tag)),
+            innerScope,
+            mutationContainer.downwardMutations,
             treeChildPair.shadowView,
             {},
-            sliceChildShadowNodeViewPairsV2(*treeChildPair.shadowNode));
+            sliceChildShadowNodeViewPairsFromViewNodePair(
+                treeChildPair, innerScope));
       }
     }
   }
 }
 
 static void calculateShadowViewMutationsV2(
+    BREADCRUMB_TYPE breadcrumb,
+    ViewNodePairScope &scope,
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
-    ShadowViewNodePair::List &&oldChildPairs,
-    ShadowViewNodePair::List &&newChildPairs) {
+    ShadowViewNodePair::NonOwningList &&oldChildPairs,
+    ShadowViewNodePair::NonOwningList &&newChildPairs) {
   if (oldChildPairs.empty() && newChildPairs.empty()) {
     return;
   }
@@ -770,21 +1095,7 @@ static void calculateShadowViewMutationsV2(
   size_t index = 0;
 
   // Lists of mutations
-  auto createMutations = ShadowViewMutation::List{};
-  auto deleteMutations = ShadowViewMutation::List{};
-  auto insertMutations = ShadowViewMutation::List{};
-  auto removeMutations = ShadowViewMutation::List{};
-  auto updateMutations = ShadowViewMutation::List{};
-  auto downwardMutations = ShadowViewMutation::List{};
-  auto destructiveDownwardMutations = ShadowViewMutation::List{};
-  auto mutationInstructionContainer =
-      OrderedMutationInstructionContainer{createMutations,
-                                          deleteMutations,
-                                          insertMutations,
-                                          removeMutations,
-                                          updateMutations,
-                                          downwardMutations,
-                                          destructiveDownwardMutations};
+  auto mutationContainer = OrderedMutationInstructionContainer{};
 
   DEBUG_LOGS({
     LOG(ERROR) << "Differ Entry: Child Pairs of node: [" << parentShadowView.tag
@@ -792,19 +1103,19 @@ static void calculateShadowViewMutationsV2(
     std::string strOldChildPairs;
     for (size_t oldIndex = 0; oldIndex < oldChildPairs.size(); oldIndex++) {
       strOldChildPairs.append(
-          std::to_string(oldChildPairs[oldIndex].shadowView.tag));
+          std::to_string(oldChildPairs[oldIndex]->shadowView.tag));
       strOldChildPairs.append(
-          oldChildPairs[oldIndex].isConcreteView ? "" : "'");
-      strOldChildPairs.append(oldChildPairs[oldIndex].flattened ? "*" : "");
+          oldChildPairs[oldIndex]->isConcreteView ? "" : "'");
+      strOldChildPairs.append(oldChildPairs[oldIndex]->flattened ? "*" : "");
       strOldChildPairs.append(", ");
     }
     std::string strNewChildPairs;
     for (size_t newIndex = 0; newIndex < newChildPairs.size(); newIndex++) {
       strNewChildPairs.append(
-          std::to_string(newChildPairs[newIndex].shadowView.tag));
+          std::to_string(newChildPairs[newIndex]->shadowView.tag));
       strNewChildPairs.append(
-          newChildPairs[newIndex].isConcreteView ? "" : "'");
-      strNewChildPairs.append(newChildPairs[newIndex].flattened ? "*" : "");
+          newChildPairs[newIndex]->isConcreteView ? "" : "'");
+      strNewChildPairs.append(newChildPairs[newIndex]->flattened ? "*" : "");
       strNewChildPairs.append(", ");
     }
     LOG(ERROR) << "Differ Entry: Old Child Pairs: " << strOldChildPairs;
@@ -814,8 +1125,8 @@ static void calculateShadowViewMutationsV2(
   // Stage 1: Collecting `Update` mutations
   for (index = 0; index < oldChildPairs.size() && index < newChildPairs.size();
        index++) {
-    auto &oldChildPair = oldChildPairs[index];
-    auto &newChildPair = newChildPairs[index];
+    auto &oldChildPair = *oldChildPairs[index];
+    auto &newChildPair = *newChildPairs[index];
 
     if (oldChildPair.shadowView.tag != newChildPair.shadowView.tag) {
       DEBUG_LOGS({
@@ -829,8 +1140,8 @@ static void calculateShadowViewMutationsV2(
       break;
     }
 
-    // If either view was flattened, and that has changed this frame, don't try
-    // to update
+    // If either view was flattened, and that has changed this frame, don't
+    // try to update
     if (oldChildPair.flattened != newChildPair.flattened ||
         oldChildPair.isConcreteView != newChildPair.isConcreteView) {
       break;
@@ -849,23 +1160,27 @@ static void calculateShadowViewMutationsV2(
 
     if (newChildPair.isConcreteView &&
         oldChildPair.shadowView != newChildPair.shadowView) {
-      updateMutations.push_back(ShadowViewMutation::UpdateMutation(
-          parentShadowView,
-          oldChildPair.shadowView,
-          newChildPair.shadowView,
-          newChildPair.mountIndex));
+      mutationContainer.updateMutations.push_back(
+          ShadowViewMutation::UpdateMutation(
+              oldChildPair.shadowView, newChildPair.shadowView));
     }
 
     // Recursively update tree if ShadowNode pointers are not equal
     if (!oldChildPair.flattened &&
         oldChildPair.shadowNode != newChildPair.shadowNode) {
-      auto oldGrandChildPairs =
-          sliceChildShadowNodeViewPairsV2(*oldChildPair.shadowNode);
-      auto newGrandChildPairs =
-          sliceChildShadowNodeViewPairsV2(*newChildPair.shadowNode);
+      ViewNodePairScope innerScope{};
+      auto oldGrandChildPairs = sliceChildShadowNodeViewPairsFromViewNodePair(
+          oldChildPair, innerScope);
+      auto newGrandChildPairs = sliceChildShadowNodeViewPairsFromViewNodePair(
+          newChildPair, innerScope);
       calculateShadowViewMutationsV2(
-          *(newGrandChildPairs.size() ? &downwardMutations
-                                      : &destructiveDownwardMutations),
+          DIFF_BREADCRUMB(
+              "Stage 1: Recurse on " +
+              std::to_string(oldChildPair.shadowView.tag)),
+          innerScope,
+          *(newGrandChildPairs.size()
+                ? &mutationContainer.downwardMutations
+                : &mutationContainer.destructiveDownwardMutations),
           oldChildPair.shadowView,
           std::move(oldGrandChildPairs),
           std::move(newGrandChildPairs));
@@ -878,7 +1193,7 @@ static void calculateShadowViewMutationsV2(
     // We've reached the end of the new children. We can delete+remove the
     // rest.
     for (; index < oldChildPairs.size(); index++) {
-      auto const &oldChildPair = oldChildPairs[index];
+      auto const &oldChildPair = *oldChildPairs[index];
 
       DEBUG_LOGS({
         LOG(ERROR) << "Differ Branch 2: Deleting Tag/Tree: ["
@@ -890,24 +1205,32 @@ static void calculateShadowViewMutationsV2(
         continue;
       }
 
-      deleteMutations.push_back(
+      mutationContainer.deleteMutations.push_back(
           ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
-      removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-          parentShadowView, oldChildPair.shadowView, oldChildPair.mountIndex));
+      mutationContainer.removeMutations.push_back(
+          ShadowViewMutation::RemoveMutation(
+              parentShadowView,
+              oldChildPair.shadowView,
+              static_cast<int>(oldChildPair.mountIndex)));
 
       // We also have to call the algorithm recursively to clean up the entire
       // subtree starting from the removed view.
+      ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          destructiveDownwardMutations,
+          DIFF_BREADCRUMB(
+              "Trivial delete " + std::to_string(oldChildPair.shadowView.tag)),
+          innerScope,
+          mutationContainer.destructiveDownwardMutations,
           oldChildPair.shadowView,
-          sliceChildShadowNodeViewPairsV2(*oldChildPair.shadowNode),
+          sliceChildShadowNodeViewPairsFromViewNodePair(
+              oldChildPair, innerScope),
           {});
     }
   } else if (index == oldChildPairs.size()) {
     // If we don't have any more existing children we can choose a fast path
     // since the rest will all be create+insert.
     for (; index < newChildPairs.size(); index++) {
-      auto const &newChildPair = newChildPairs[index];
+      auto const &newChildPair = *newChildPairs[index];
 
       DEBUG_LOGS({
         LOG(ERROR) << "Differ Branch 3: Creating Tag/Tree: ["
@@ -919,16 +1242,24 @@ static void calculateShadowViewMutationsV2(
         continue;
       }
 
-      insertMutations.push_back(ShadowViewMutation::InsertMutation(
-          parentShadowView, newChildPair.shadowView, newChildPair.mountIndex));
-      createMutations.push_back(
+      mutationContainer.insertMutations.push_back(
+          ShadowViewMutation::InsertMutation(
+              parentShadowView,
+              newChildPair.shadowView,
+              static_cast<int>(newChildPair.mountIndex)));
+      mutationContainer.createMutations.push_back(
           ShadowViewMutation::CreateMutation(newChildPair.shadowView));
 
+      ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          downwardMutations,
+          DIFF_BREADCRUMB(
+              "Trivial create " + std::to_string(newChildPair.shadowView.tag)),
+          innerScope,
+          mutationContainer.downwardMutations,
           newChildPair.shadowView,
           {},
-          sliceChildShadowNodeViewPairsV2(*newChildPair.shadowNode));
+          sliceChildShadowNodeViewPairsFromViewNodePair(
+              newChildPair, innerScope));
     }
   } else {
     // Collect map of tags in the new list
@@ -936,7 +1267,7 @@ static void calculateShadowViewMutationsV2(
     auto newInsertedPairs = TinyMap<Tag, ShadowViewNodePair *>{};
     auto deletionCandidatePairs = TinyMap<Tag, ShadowViewNodePair const *>{};
     for (; index < newChildPairs.size(); index++) {
-      auto &newChildPair = newChildPairs[index];
+      auto &newChildPair = *newChildPairs[index];
       newRemainingPairs.insert({newChildPair.shadowView.tag, &newChildPair});
     }
 
@@ -952,8 +1283,8 @@ static void calculateShadowViewMutationsV2(
 
       // Advance both pointers if pointing to the same element
       if (haveNewPair && haveOldPair) {
-        auto const &oldChildPair = oldChildPairs[oldIndex];
-        auto const &newChildPair = newChildPairs[newIndex];
+        auto const &oldChildPair = *oldChildPairs[oldIndex];
+        auto const &newChildPair = *newChildPairs[newIndex];
 
         Tag newTag = newChildPair.shadowView.tag;
         Tag oldTag = oldChildPair.shadowView.tag;
@@ -971,142 +1302,29 @@ static void calculateShadowViewMutationsV2(
                        << " with parent: [" << parentShadowView.tag << "]";
           });
 
-          // Check concrete-ness of views
-          // Create/Delete and Insert/Remove if necessary
-          if (oldChildPair.isConcreteView != newChildPair.isConcreteView) {
-            if (newChildPair.isConcreteView) {
-              insertMutations.push_back(ShadowViewMutation::InsertMutation(
-                  parentShadowView,
-                  newChildPair.shadowView,
-                  newChildPair.mountIndex));
-              createMutations.push_back(
-                  ShadowViewMutation::CreateMutation(newChildPair.shadowView));
-            } else {
-              removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-                  parentShadowView,
-                  oldChildPair.shadowView,
-                  oldChildPair.mountIndex));
-              deleteMutations.push_back(
-                  ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
-            }
-          } else if (
-              oldChildPair.isConcreteView && newChildPair.isConcreteView) {
-            // Even if node's children are flattened, it might still be a
-            // concrete view. The case where they're different is handled above.
-            if (oldChildPair.shadowView != newChildPair.shadowView) {
-              updateMutations.push_back(ShadowViewMutation::UpdateMutation(
-                  parentShadowView,
-                  oldChildPair.shadowView,
-                  newChildPair.shadowView,
-                  newChildPair.mountIndex));
-            }
-
-            // Remove from newRemainingPairs
-            auto newRemainingPairIt = newRemainingPairs.find(oldTag);
-            if (newRemainingPairIt != newRemainingPairs.end()) {
-              newRemainingPairs.erase(newRemainingPairIt);
-            }
-          }
-
-          // Are we flattening or unflattening either one? If node was flattened
-          // in both trees, there's no change, just continue.
-          if (oldChildPair.flattened && newChildPair.flattened) {
-            newIndex++;
-            oldIndex++;
-            continue;
-          }
-          // We are either flattening or unflattening this node.
-          if (oldChildPair.flattened != newChildPair.flattened) {
-            DEBUG_LOGS({
-              LOG(ERROR) << "Differ: flattening or unflattening at branch 6: ["
-                         << oldChildPair.shadowView.tag << "] ["
-                         << newChildPair.shadowView.tag << "] "
-                         << oldChildPair.flattened << " "
-                         << newChildPair.flattened << " with parent: ["
-                         << parentShadowView.tag << "]";
-            });
-
-            // Flattening
-            if (!oldChildPair.flattened) {
-              // Flatten old tree into new list
-              // At the end of this loop we still want to know which of these
-              // children are visited, so we reuse the `newRemainingPairs` map.
-              calculateShadowViewMutationsFlattener(
-                  ReparentMode::Flatten,
-                  mutationInstructionContainer,
-                  parentShadowView,
-                  newRemainingPairs,
-                  oldChildPair);
-            }
-            // Unflattening
-            else {
-              // Construct unvisited nodes map
-              auto unvisitedOldChildPairs =
-                  TinyMap<Tag, ShadowViewNodePair *>{};
-              // We don't know where all the children of oldChildPair are within
-              // oldChildPairs, but we know that they're in the same relative
-              // order. The reason for this is because of flattening + zIndex:
-              // the children could be listed before the parent, interwoven with
-              // children from other nodes, etc.
-              auto oldFlattenedNodes = sliceChildShadowNodeViewPairsV2(
-                  *oldChildPair.shadowNode, true);
-              for (size_t i = 0, j = 0;
-                   i < oldChildPairs.size() && j < oldFlattenedNodes.size();
-                   i++) {
-                auto &oldChild = oldChildPairs[i];
-                if (oldChild.shadowView.tag ==
-                    oldFlattenedNodes[j].shadowView.tag) {
-                  unvisitedOldChildPairs.insert(
-                      {oldChild.shadowView.tag, &oldChild});
-                  j++;
-                }
-              }
-
-              // Unflatten old list into new tree
-              calculateShadowViewMutationsFlattener(
-                  ReparentMode::Unflatten,
-                  mutationInstructionContainer,
-                  parentShadowView,
-                  unvisitedOldChildPairs,
-                  newChildPair);
-
-              // If old nodes were not visited, we know that we can delete them
-              // now. They will be removed from the hierarchy by the outermost
-              // loop of this function.
-              for (auto &oldFlattenedNode : oldFlattenedNodes) {
-                auto unvisitedOldChildPairIt = unvisitedOldChildPairs.find(
-                    oldFlattenedNode.shadowView.tag);
-                if (unvisitedOldChildPairIt == unvisitedOldChildPairs.end()) {
-                  // Node was visited - make sure to remove it from
-                  // "newRemainingPairs" map
-                  auto newRemainingIt =
-                      newRemainingPairs.find(oldFlattenedNode.shadowView.tag);
-                  if (newRemainingIt != newRemainingPairs.end()) {
-                    newRemainingPairs.erase(newRemainingIt);
-                  }
-                }
-              }
-            }
-
-            newIndex++;
-            oldIndex++;
-            continue;
-          }
-
-          // Update subtrees if View is not flattened, and if node addresses are
-          // not equal
-          if (oldChildPair.shadowNode != newChildPair.shadowNode) {
-            auto oldGrandChildPairs =
-                sliceChildShadowNodeViewPairsV2(*oldChildPair.shadowNode);
-            auto newGrandChildPairs =
-                sliceChildShadowNodeViewPairsV2(*newChildPair.shadowNode);
-            calculateShadowViewMutationsV2(
-                *(newGrandChildPairs.size() ? &downwardMutations
-                                            : &destructiveDownwardMutations),
-                oldChildPair.shadowView,
-                std::move(oldGrandChildPairs),
-                std::move(newGrandChildPairs));
-          }
+          updateMatchedPair(
+              DIFF_BREADCRUMB(
+                  "Update Matched Pairs (1): " +
+                  std::to_string(oldChildPair.shadowView.tag)),
+              mutationContainer,
+              true,
+              true,
+              parentShadowView,
+              oldChildPair,
+              newChildPair);
+
+          updateMatchedPairSubtrees(
+              DIFF_BREADCRUMB(
+                  "Update Matched Pair Subtrees (1): " +
+                  std::to_string(oldChildPair.shadowView.tag)),
+              scope,
+              mutationContainer,
+              newRemainingPairs,
+              oldChildPairs,
+              newChildPairs,
+              parentShadowView,
+              oldChildPair,
+              newChildPair);
 
           newIndex++;
           oldIndex++;
@@ -1117,7 +1335,7 @@ static void calculateShadowViewMutationsV2(
       // We have an old pair, but we either don't have any remaining new pairs
       // or we have one but it's not matched up with the old pair
       if (haveOldPair) {
-        auto const &oldChildPair = oldChildPairs[oldIndex];
+        auto const &oldChildPair = *oldChildPairs[oldIndex];
 
         Tag oldTag = oldChildPair.shadowView.tag;
 
@@ -1129,148 +1347,29 @@ static void calculateShadowViewMutationsV2(
         if (insertedIt != newInsertedPairs.end()) {
           auto const &newChildPair = *insertedIt->second;
 
-          // The node has been reordered and we are also flattening or
-          // unflattening
-          if (oldChildPair.flattened != newChildPair.flattened) {
-            DEBUG_LOGS({
-              LOG(ERROR)
-                  << "Differ: branch 7: Flattening or unflattening already-inserted node upon remove (move/reorder operation)."
-                  << oldChildPair.shadowView.tag << " "
-                  << oldChildPair.flattened << " // "
-                  << newChildPair.shadowView.tag << " "
-                  << newChildPair.flattened;
-            });
-
-            // Unflattening.
-            // The node in question was already inserted and we are
-            // *unflattening* it, so we just need to update the subtree nodes
-            // and remove them from the view hierarchy. Any of the unvisited
-            // nodes in the old tree will be deleted.
-            // TODO: can we consolidate this code? It's identical to the first
-            // block above.
-            if (!oldChildPair.flattened) {
-              // Flatten old tree into new list
-              // At the end of this loop we still want to know which of these
-              // children are visited, so we reuse the `newRemainingPairs` map.
-              calculateShadowViewMutationsFlattener(
-                  ReparentMode::Flatten,
-                  mutationInstructionContainer,
-                  parentShadowView,
-                  newRemainingPairs,
-                  oldChildPair);
-            }
-            // Unflattening
-            else {
-              // Construct unvisited nodes map
-              auto unvisitedOldChildPairs =
-                  TinyMap<Tag, ShadowViewNodePair *>{};
-              // We don't know where all the children of oldChildPair are within
-              // oldChildPairs, but we know that they're in the same relative
-              // order. The reason for this is because of flattening + zIndex:
-              // the children could be listed before the parent, interwoven with
-              // children from other nodes, etc.
-              auto oldFlattenedNodes = sliceChildShadowNodeViewPairsV2(
-                  *oldChildPair.shadowNode, true);
-              for (size_t i = 0, j = 0;
-                   i < oldChildPairs.size() && j < oldFlattenedNodes.size();
-                   i++) {
-                auto &oldChild = oldChildPairs[i];
-                if (oldChild.shadowView.tag ==
-                    oldFlattenedNodes[j].shadowView.tag) {
-                  unvisitedOldChildPairs.insert(
-                      {oldChild.shadowView.tag, &oldChild});
-                  j++;
-                }
-              }
-
-              // Unflatten old list into new tree
-              calculateShadowViewMutationsFlattener(
-                  ReparentMode::Unflatten,
-                  mutationInstructionContainer,
-                  parentShadowView,
-                  unvisitedOldChildPairs,
-                  newChildPair);
-
-              // If old nodes were not visited, we know that we can delete them
-              // now. They will be removed from the hierarchy by the outermost
-              // loop of this function. TODO: delete recursively? create
-              // recursively?
-              for (auto &oldFlattenedNode : oldFlattenedNodes) {
-                auto unvisitedOldChildPairIt = unvisitedOldChildPairs.find(
-                    oldFlattenedNode.shadowView.tag);
-                if (unvisitedOldChildPairIt == unvisitedOldChildPairs.end()) {
-                  // Node was visited - make sure to remove it from
-                  // "newRemainingPairs" map
-                  auto newRemainingIt =
-                      newRemainingPairs.find(oldFlattenedNode.shadowView.tag);
-                  if (newRemainingIt != newRemainingPairs.end()) {
-                    newRemainingPairs.erase(newRemainingIt);
-                  }
-                }
-              }
-            }
-          }
-
-          // Check concrete-ness of views
-          // Create/Delete and Insert/Remove if necessary
-          // TODO: document: Insert should already be handled by outermost loop,
-          // but not Remove
-          if (oldChildPair.isConcreteView != newChildPair.isConcreteView) {
-            if (newChildPair.isConcreteView) {
-              createMutations.push_back(
-                  ShadowViewMutation::CreateMutation(newChildPair.shadowView));
-            } else {
-              removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-                  parentShadowView,
-                  oldChildPair.shadowView,
-                  oldChildPair.mountIndex));
-              deleteMutations.push_back(
-                  ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
-            }
-          }
-
-          // We handled this case above. We fall through to check concreteness
-          // of old/new view to remove/insert create/delete above, and then bail
-          // out here.
-          if (oldChildPair.flattened != newChildPair.flattened) {
-            newInsertedPairs.erase(insertedIt);
-            oldIndex++;
-            continue;
-          }
-
-          // old and new child pairs are both either flattened or unflattened at
-          // this point. If they're not views, we don't need to update subtrees.
-          if (oldChildPair.isConcreteView) {
-            // TODO: do we always want to remove here? There are cases where we
-            // might be able to remove this to prevent unnecessary
-            // removes/inserts in cases of (un)flattening + reorders?
-            removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-                parentShadowView,
-                oldChildPair.shadowView,
-                oldChildPair.mountIndex));
-
-            if (oldChildPair.shadowView != newChildPair.shadowView) {
-              updateMutations.push_back(ShadowViewMutation::UpdateMutation(
-                  parentShadowView,
-                  oldChildPair.shadowView,
-                  newChildPair.shadowView,
-                  newChildPair.mountIndex));
-            }
-          }
-          if (!oldChildPair.flattened &&
-              oldChildPair.shadowNode != newChildPair.shadowNode) {
-            // Update subtrees
-            auto oldGrandChildPairs =
-                sliceChildShadowNodeViewPairsV2(*oldChildPair.shadowNode);
-            auto newGrandChildPairs =
-                sliceChildShadowNodeViewPairsV2(*newChildPair.shadowNode);
-            calculateShadowViewMutationsV2(
-                *(newGrandChildPairs.size() ? &downwardMutations
-                                            : &destructiveDownwardMutations),
-                oldChildPair.shadowView,
-                std::move(oldGrandChildPairs),
-                std::move(newGrandChildPairs));
-          }
+          updateMatchedPair(
+              DIFF_BREADCRUMB(
+                  "Update Matched Pairs (2): " +
+                  std::to_string(oldChildPair.shadowView.tag)),
+              mutationContainer,
+              true,
+              false,
+              parentShadowView,
+              oldChildPair,
+              newChildPair);
+
+          updateMatchedPairSubtrees(
+              DIFF_BREADCRUMB(
+                  "Update Matched Pair Subtrees (2): " +
+                  std::to_string(oldChildPair.shadowView.tag)),
+              scope,
+              mutationContainer,
+              newRemainingPairs,
+              oldChildPairs,
+              newChildPairs,
+              parentShadowView,
+              oldChildPair,
+              newChildPair);
 
           newInsertedPairs.erase(insertedIt);
           oldIndex++;
@@ -1282,26 +1381,61 @@ static void calculateShadowViewMutationsV2(
         // generate remove+delete for this node and its subtree.
         auto const newIt = newRemainingPairs.find(oldTag);
         if (newIt == newRemainingPairs.end()) {
+          oldIndex++;
+
+          if (!oldChildPair.isConcreteView) {
+            continue;
+          }
+
+          // From here, we know the oldChildPair is concrete.
+          // We *probably* need to generate a REMOVE mutation (see edge-case
+          // notes below).
+
           DEBUG_LOGS({
             LOG(ERROR)
                 << "Differ Branch 9: Removing tag that was not reinserted: "
                 << oldIndex << ": [" << oldChildPair.shadowView.tag << "]"
                 << (oldChildPair.flattened ? " (flattened)" : "")
                 << (oldChildPair.isConcreteView ? " (concrete)" : "")
-                << " with parent: [" << parentShadowView.tag << "]";
+                << " with parent: [" << parentShadowView.tag << "] "
+                << "node is in other tree? "
+                << (oldChildPair.inOtherTree() ? "yes" : "no");
           });
 
-          if (oldChildPair.isConcreteView) {
-            removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-                parentShadowView,
-                oldChildPair.shadowView,
-                oldChildPair.mountIndex));
-
-            deletionCandidatePairs.insert(
-                {oldChildPair.shadowView.tag, &oldChildPair});
+          // Edge case: node is not found in `newRemainingPairs`, due to
+          // complex (un)flattening cases, but exists in other tree *and* is
+          // concrete.
+          if (oldChildPair.inOtherTree() &&
+              oldChildPair.otherTreePair->isConcreteView) {
+            ShadowView const &otherTreeView =
+                oldChildPair.otherTreePair->shadowView;
+
+            // Remove, but remove using the *new* node, since we know
+            // an UPDATE mutation from old -> new has been generated.
+            // Practically this shouldn't matter for most mounting layer
+            // implementations, but helps adhere to the invariant that
+            // for all mutation instructions, "oldViewShadowNode" == "current
+            // node on mounting layer / stubView".
+            // Here we do *not" need to generate a potential DELETE mutation
+            // because we know the view is concrete, and still in the new
+            // hierarchy.
+            mutationContainer.removeMutations.push_back(
+                ShadowViewMutation::RemoveMutation(
+                    parentShadowView,
+                    otherTreeView,
+                    static_cast<int>(oldChildPair.mountIndex)));
+            continue;
           }
 
-          oldIndex++;
+          mutationContainer.removeMutations.push_back(
+              ShadowViewMutation::RemoveMutation(
+                  parentShadowView,
+                  oldChildPair.shadowView,
+                  static_cast<int>(oldChildPair.mountIndex)));
+
+          deletionCandidatePairs.insert(
+              {oldChildPair.shadowView.tag, &oldChildPair});
+
           continue;
         }
       }
@@ -1309,7 +1443,7 @@ static void calculateShadowViewMutationsV2(
       // At this point, oldTag is -1 or is in the new list, and hasn't been
       // inserted or matched yet. We're not sure yet if the new node is in the
       // old list - generate an insert instruction for the new node.
-      auto &newChildPair = newChildPairs[newIndex];
+      auto &newChildPair = *newChildPairs[newIndex];
       DEBUG_LOGS({
         LOG(ERROR)
             << "Differ Branch 10: Inserting tag/tree that was not (yet?) removed from hierarchy: "
@@ -1320,21 +1454,29 @@ static void calculateShadowViewMutationsV2(
             << " with parent: [" << parentShadowView.tag << "]";
       });
       if (newChildPair.isConcreteView) {
-        insertMutations.push_back(ShadowViewMutation::InsertMutation(
-            parentShadowView,
-            newChildPair.shadowView,
-            newChildPair.mountIndex));
+        mutationContainer.insertMutations.push_back(
+            ShadowViewMutation::InsertMutation(
+                parentShadowView,
+                newChildPair.shadowView,
+                static_cast<int>(newChildPair.mountIndex)));
       }
-      if (!newChildPair.inOtherTree) {
+
+      // `inOtherTree` is only set to true during flattening/unflattening of
+      // parent. If the parent isn't (un)flattened, this will always be
+      // `false`, even if the node is in the other (old) tree. In this case,
+      // we expect the node to be removed from `newInsertedPairs` when we
+      // later encounter it in this loop.
+      if (!newChildPair.inOtherTree()) {
         newInsertedPairs.insert({newChildPair.shadowView.tag, &newChildPair});
       }
+
       newIndex++;
     }
 
     // Penultimate step: generate Delete instructions for entirely deleted
     // subtrees/nodes. We do this here because we need to traverse the entire
-    // list to make sure that a node was not reparented into an unflattened node
-    // that occurs *after* it in the hierarchy, due to zIndex ordering.
+    // list to make sure that a node was not reparented into an unflattened
+    // node that occurs *after* it in the hierarchy, due to zIndex ordering.
     for (auto it = deletionCandidatePairs.begin();
          it != deletionCandidatePairs.end();
          it++) {
@@ -1350,27 +1492,34 @@ static void calculateShadowViewMutationsV2(
             << "[" << oldChildPair.shadowView.tag << "]"
             << (oldChildPair.flattened ? "(flattened)" : "")
             << (oldChildPair.isConcreteView ? "(concrete)" : "")
-            << (oldChildPair.inOtherTree ? "(in other tree)" : "")
-            << " with parent: [" << parentShadowView.tag << "]";
+            << (oldChildPair.inOtherTree() ? "(in other tree)" : "")
+            << " with parent: [" << parentShadowView.tag << "] ##"
+            << std::hash<ShadowView>{}(oldChildPair.shadowView);
       });
 
       // This can happen when the parent is unflattened
-      if (!oldChildPair.inOtherTree) {
-        deleteMutations.push_back(
+      if (!oldChildPair.inOtherTree() && oldChildPair.isConcreteView) {
+        mutationContainer.deleteMutations.push_back(
             ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
 
         // We also have to call the algorithm recursively to clean up the
         // entire subtree starting from the removed view.
+        ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            destructiveDownwardMutations,
+            DIFF_BREADCRUMB(
+                "Non-trivial delete " +
+                std::to_string(oldChildPair.shadowView.tag)),
+            innerScope,
+            mutationContainer.destructiveDownwardMutations,
             oldChildPair.shadowView,
-            sliceChildShadowNodeViewPairsV2(*oldChildPair.shadowNode),
+            sliceChildShadowNodeViewPairsFromViewNodePair(
+                oldChildPair, innerScope),
             {});
       }
     }
 
-    // Final step: generate Create instructions for entirely new subtrees/nodes
-    // that are not the result of flattening or unflattening.
+    // Final step: generate Create instructions for entirely new
+    // subtrees/nodes that are not the result of flattening or unflattening.
     for (auto it = newInsertedPairs.begin(); it != newInsertedPairs.end();
          it++) {
       // Erased elements of a TinyMap will have a Tag/key of 0 - skip those
@@ -1389,61 +1538,70 @@ static void calculateShadowViewMutationsV2(
             << "[" << newChildPair.shadowView.tag << "]"
             << (newChildPair.flattened ? "(flattened)" : "")
             << (newChildPair.isConcreteView ? "(concrete)" : "")
-            << (newChildPair.inOtherTree ? "(in other tree)" : "")
+            << (newChildPair.inOtherTree() ? "(in other tree)" : "")
             << " with parent: [" << parentShadowView.tag << "]";
       });
 
       if (!newChildPair.isConcreteView) {
         continue;
       }
-      if (newChildPair.inOtherTree) {
+      if (newChildPair.inOtherTree()) {
         continue;
       }
 
-      createMutations.push_back(
+      mutationContainer.createMutations.push_back(
           ShadowViewMutation::CreateMutation(newChildPair.shadowView));
 
+      ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          downwardMutations,
+          DIFF_BREADCRUMB(
+              "Non-trivial create " +
+              std::to_string(newChildPair.shadowView.tag)),
+          innerScope,
+          mutationContainer.downwardMutations,
           newChildPair.shadowView,
           {},
-          sliceChildShadowNodeViewPairsV2(*newChildPair.shadowNode));
+          sliceChildShadowNodeViewPairsFromViewNodePair(
+              newChildPair, innerScope));
     }
   }
 
   // All mutations in an optimal order:
   std::move(
-      destructiveDownwardMutations.begin(),
-      destructiveDownwardMutations.end(),
+      mutationContainer.destructiveDownwardMutations.begin(),
+      mutationContainer.destructiveDownwardMutations.end(),
       std::back_inserter(mutations));
   std::move(
-      updateMutations.begin(),
-      updateMutations.end(),
+      mutationContainer.updateMutations.begin(),
+      mutationContainer.updateMutations.end(),
       std::back_inserter(mutations));
   std::move(
-      removeMutations.rbegin(),
-      removeMutations.rend(),
+      mutationContainer.removeMutations.rbegin(),
+      mutationContainer.removeMutations.rend(),
       std::back_inserter(mutations));
   std::move(
-      deleteMutations.begin(),
-      deleteMutations.end(),
+      mutationContainer.deleteMutations.begin(),
+      mutationContainer.deleteMutations.end(),
       std::back_inserter(mutations));
   std::move(
-      createMutations.begin(),
-      createMutations.end(),
+      mutationContainer.createMutations.begin(),
+      mutationContainer.createMutations.end(),
       std::back_inserter(mutations));
   std::move(
-      downwardMutations.begin(),
-      downwardMutations.end(),
+      mutationContainer.downwardMutations.begin(),
+      mutationContainer.downwardMutations.end(),
       std::back_inserter(mutations));
   std::move(
-      insertMutations.begin(),
-      insertMutations.end(),
+      mutationContainer.insertMutations.begin(),
+      mutationContainer.insertMutations.end(),
       std::back_inserter(mutations));
 }
 
-static void sliceChildShadowNodeViewPairsRecursively(
-    ShadowViewNodePair::List &pairList,
+/**
+ * Only used by unit tests currently.
+ */
+static void sliceChildShadowNodeViewPairsRecursivelyLegacy(
+    ShadowViewNodePair::OwningList &pairList,
     Point layoutOffset,
     ShadowNode const &shadowNode) {
   for (auto const &sharedChildShadowNode : shadowNode.getChildren()) {
@@ -1473,15 +1631,18 @@ static void sliceChildShadowNodeViewPairsRecursively(
         pairList.push_back({shadowView, &childShadowNode});
       }
 
-      sliceChildShadowNodeViewPairsRecursively(
+      sliceChildShadowNodeViewPairsRecursivelyLegacy(
           pairList, origin, childShadowNode);
     }
   }
 }
 
-ShadowViewNodePair::List sliceChildShadowNodeViewPairs(
+/**
+ * Only used by unit tests currently.
+ */
+ShadowViewNodePair::OwningList sliceChildShadowNodeViewPairsLegacy(
     ShadowNode const &shadowNode) {
-  auto pairList = ShadowViewNodePair::List{};
+  auto pairList = ShadowViewNodePair::OwningList{};
 
   if (!shadowNode.getTraits().check(
           ShadowNodeTraits::Trait::FormsStackingContext) &&
@@ -1489,367 +1650,23 @@ ShadowViewNodePair::List sliceChildShadowNodeViewPairs(
     return pairList;
   }
 
-  sliceChildShadowNodeViewPairsRecursively(pairList, {0, 0}, shadowNode);
+  sliceChildShadowNodeViewPairsRecursivelyLegacy(pairList, {0, 0}, shadowNode);
 
   return pairList;
 }
 
-static void calculateShadowViewMutations(
-    ShadowViewMutation::List &mutations,
-    ShadowView const &parentShadowView,
-    ShadowViewNodePair::List &&oldChildPairs,
-    ShadowViewNodePair::List &&newChildPairs) {
-  if (oldChildPairs.empty() && newChildPairs.empty()) {
-    return;
-  }
-
-  // Sorting pairs based on `orderIndex` if needed.
-  reorderInPlaceIfNeeded(oldChildPairs);
-  reorderInPlaceIfNeeded(newChildPairs);
-
-  auto index = int{0};
-
-  // Lists of mutations
-  auto createMutations = ShadowViewMutation::List{};
-  auto deleteMutations = ShadowViewMutation::List{};
-  auto insertMutations = ShadowViewMutation::List{};
-  auto removeMutations = ShadowViewMutation::List{};
-  auto updateMutations = ShadowViewMutation::List{};
-  auto downwardMutations = ShadowViewMutation::List{};
-  auto destructiveDownwardMutations = ShadowViewMutation::List{};
-
-  // Stage 1: Collecting `Update` mutations
-  for (index = 0; index < oldChildPairs.size() && index < newChildPairs.size();
-       index++) {
-    auto const &oldChildPair = oldChildPairs[index];
-    auto const &newChildPair = newChildPairs[index];
-
-    if (oldChildPair.shadowView.tag != newChildPair.shadowView.tag) {
-      DEBUG_LOGS({
-        LOG(ERROR) << "Differ Branch 1.1: Tags Different: ["
-                   << oldChildPair.shadowView.tag << "] ["
-                   << newChildPair.shadowView.tag << "]";
-      });
-
-      // Totally different nodes, updating is impossible.
-      break;
-    }
-
-    DEBUG_LOGS({
-      LOG(ERROR) << "Differ Branch 1.2: Same tags, update and recurse: ["
-                 << oldChildPair.shadowView.tag << "]"
-                 << (oldChildPair.flattened ? " (flattened)" : "")
-                 << (oldChildPair.isConcreteView ? " (concrete)" : "") << "["
-                 << newChildPair.shadowView.tag << "]"
-                 << (newChildPair.flattened ? " (flattened)" : "")
-                 << (newChildPair.isConcreteView ? " (concrete)" : "");
-    });
-
-    if (oldChildPair.shadowView != newChildPair.shadowView) {
-      updateMutations.push_back(ShadowViewMutation::UpdateMutation(
-          parentShadowView,
-          oldChildPair.shadowView,
-          newChildPair.shadowView,
-          index));
-    }
-
-    auto oldGrandChildPairs =
-        sliceChildShadowNodeViewPairs(*oldChildPair.shadowNode);
-    auto newGrandChildPairs =
-        sliceChildShadowNodeViewPairs(*newChildPair.shadowNode);
-    calculateShadowViewMutations(
-        *(newGrandChildPairs.size() ? &downwardMutations
-                                    : &destructiveDownwardMutations),
-        oldChildPair.shadowView,
-        std::move(oldGrandChildPairs),
-        std::move(newGrandChildPairs));
-  }
-
-  size_t lastIndexAfterFirstStage = index;
-
-  if (index == newChildPairs.size()) {
-    // We've reached the end of the new children. We can delete+remove the
-    // rest.
-    for (; index < oldChildPairs.size(); index++) {
-      auto const &oldChildPair = oldChildPairs[index];
-
-      DEBUG_LOGS({
-        LOG(ERROR)
-            << "Differ Branch 2: Deleting Tag/Tree (may be reparented): ["
-            << oldChildPair.shadowView.tag << "]";
-      });
-
-      deleteMutations.push_back(
-          ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
-      removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-          parentShadowView, oldChildPair.shadowView, index));
-
-      // We also have to call the algorithm recursively to clean up the entire
-      // subtree starting from the removed view.
-      calculateShadowViewMutations(
-          destructiveDownwardMutations,
-          oldChildPair.shadowView,
-          sliceChildShadowNodeViewPairs(*oldChildPair.shadowNode),
-          {});
-    }
-  } else if (index == oldChildPairs.size()) {
-    // If we don't have any more existing children we can choose a fast path
-    // since the rest will all be create+insert.
-    for (; index < newChildPairs.size(); index++) {
-      auto const &newChildPair = newChildPairs[index];
-
-      DEBUG_LOGS({
-        LOG(ERROR)
-            << "Differ Branch 3: Creating Tag/Tree (may be reparented): ["
-            << newChildPair.shadowView.tag << "]";
-      });
-
-      insertMutations.push_back(ShadowViewMutation::InsertMutation(
-          parentShadowView, newChildPair.shadowView, index));
-      createMutations.push_back(
-          ShadowViewMutation::CreateMutation(newChildPair.shadowView));
-
-      calculateShadowViewMutations(
-          downwardMutations,
-          newChildPair.shadowView,
-          {},
-          sliceChildShadowNodeViewPairs(*newChildPair.shadowNode));
-    }
-  } else {
-    // Collect map of tags in the new list
-    // In the future it would be nice to use TinyMap for newInsertedPairs, but
-    // it's challenging to build an iterator that will work for our use-case
-    // here.
-    auto newRemainingPairs = TinyMap<Tag, ShadowViewNodePair const *>{};
-    auto newInsertedPairs = TinyMap<Tag, ShadowViewNodePair const *>{};
-    for (; index < newChildPairs.size(); index++) {
-      auto const &newChildPair = newChildPairs[index];
-      newRemainingPairs.insert({newChildPair.shadowView.tag, &newChildPair});
-    }
-
-    // Walk through both lists at the same time
-    // We will perform updates, create+insert, remove+delete, remove+insert
-    // (move) here.
-    size_t oldIndex = lastIndexAfterFirstStage,
-           newIndex = lastIndexAfterFirstStage, newSize = newChildPairs.size(),
-           oldSize = oldChildPairs.size();
-    while (newIndex < newSize || oldIndex < oldSize) {
-      bool haveNewPair = newIndex < newSize;
-      bool haveOldPair = oldIndex < oldSize;
-
-      // Advance both pointers if pointing to the same element
-      if (haveNewPair && haveOldPair) {
-        auto const &newChildPair = newChildPairs[newIndex];
-        auto const &oldChildPair = oldChildPairs[oldIndex];
-
-        Tag newTag = newChildPair.shadowView.tag;
-        Tag oldTag = oldChildPair.shadowView.tag;
-
-        if (newTag == oldTag) {
-          DEBUG_LOGS({
-            LOG(ERROR) << "Differ Branch 5: Matched Tags at indices: "
-                       << oldIndex << " " << newIndex << ": ["
-                       << oldChildPair.shadowView.tag << "]["
-                       << newChildPair.shadowView.tag << "]";
-          });
-
-          // Generate Update instructions
-          if (oldChildPair.shadowView != newChildPair.shadowView) {
-            updateMutations.push_back(ShadowViewMutation::UpdateMutation(
-                parentShadowView,
-                oldChildPair.shadowView,
-                newChildPair.shadowView,
-                index));
-          }
-
-          // Remove from newRemainingPairs
-          auto newRemainingPairIt = newRemainingPairs.find(oldTag);
-          if (newRemainingPairIt != newRemainingPairs.end()) {
-            newRemainingPairs.erase(newRemainingPairIt);
-          }
-
-          // Update subtrees
-          if (oldChildPair.shadowNode != newChildPair.shadowNode) {
-            auto oldGrandChildPairs =
-                sliceChildShadowNodeViewPairs(*oldChildPair.shadowNode);
-            auto newGrandChildPairs =
-                sliceChildShadowNodeViewPairs(*newChildPair.shadowNode);
-            calculateShadowViewMutations(
-                *(newGrandChildPairs.size() ? &downwardMutations
-                                            : &destructiveDownwardMutations),
-                oldChildPair.shadowView,
-                std::move(oldGrandChildPairs),
-                std::move(newGrandChildPairs));
-          }
-
-          newIndex++;
-          oldIndex++;
-          continue;
-        }
-      }
-
-      if (haveOldPair) {
-        auto const &oldChildPair = oldChildPairs[oldIndex];
-        Tag oldTag = oldChildPair.shadowView.tag;
-
-        // Was oldTag already inserted? This indicates a reordering, not just
-        // a move. The new node has already been inserted, we just need to
-        // remove the node from its old position now.
-        auto const insertedIt = newInsertedPairs.find(oldTag);
-        if (insertedIt != newInsertedPairs.end()) {
-          DEBUG_LOGS({
-            LOG(ERROR)
-                << "Differ Branch 6: Removing tag that was already inserted: "
-                << oldIndex << ": [" << oldChildPair.shadowView.tag << "]";
-          });
-
-          removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-              parentShadowView, oldChildPair.shadowView, oldIndex));
-
-          // Generate update instruction since we have an iterator ref to the
-          // new node
-          auto const &newChildPair = *insertedIt->second;
-          if (oldChildPair.shadowView != newChildPair.shadowView) {
-            updateMutations.push_back(ShadowViewMutation::UpdateMutation(
-                parentShadowView,
-                oldChildPair.shadowView,
-                newChildPair.shadowView,
-                index));
-          }
-
-          // Update subtrees
-          if (oldChildPair.shadowNode != newChildPair.shadowNode) {
-            auto oldGrandChildPairs =
-                sliceChildShadowNodeViewPairs(*oldChildPair.shadowNode);
-            auto newGrandChildPairs =
-                sliceChildShadowNodeViewPairs(*newChildPair.shadowNode);
-            calculateShadowViewMutations(
-                *(newGrandChildPairs.size() ? &downwardMutations
-                                            : &destructiveDownwardMutations),
-                oldChildPair.shadowView,
-                std::move(oldGrandChildPairs),
-                std::move(newGrandChildPairs));
-          }
-
-          newInsertedPairs.erase(insertedIt);
-          oldIndex++;
-          continue;
-        }
-
-        // Should we generate a delete+remove instruction for the old node?
-        // If there's an old node and it's not found in the "new" list, we
-        // generate remove+delete for this node and its subtree.
-        auto const newIt = newRemainingPairs.find(oldTag);
-        if (newIt == newRemainingPairs.end()) {
-          DEBUG_LOGS({
-            LOG(ERROR)
-                << "Differ Branch 8: Removing tag/tree that was not reinserted (may be reparented): "
-                << oldIndex << ": [" << oldChildPair.shadowView.tag << "]";
-          });
-
-          removeMutations.push_back(ShadowViewMutation::RemoveMutation(
-              parentShadowView, oldChildPair.shadowView, oldIndex));
-
-          deleteMutations.push_back(
-              ShadowViewMutation::DeleteMutation(oldChildPair.shadowView));
-
-          // We also have to call the algorithm recursively to clean up the
-          // entire subtree starting from the removed view.
-          calculateShadowViewMutations(
-              destructiveDownwardMutations,
-              oldChildPair.shadowView,
-              sliceChildShadowNodeViewPairs(*oldChildPair.shadowNode),
-              {});
-
-          oldIndex++;
-          continue;
-        }
-      }
-
-      // At this point, oldTag is -1 or is in the new list, and hasn't been
-      // inserted or matched yet. We're not sure yet if the new node is in the
-      // old list - generate an insert instruction for the new node.
-      auto const &newChildPair = newChildPairs[newIndex];
-      DEBUG_LOGS({
-        LOG(ERROR)
-            << "Differ Branch 9: Inserting tag/tree that was not yet removed from hierarchy (may be reparented): "
-            << newIndex << ": [" << newChildPair.shadowView.tag << "]";
-      });
-      insertMutations.push_back(ShadowViewMutation::InsertMutation(
-          parentShadowView, newChildPair.shadowView, newIndex));
-      newInsertedPairs.insert({newChildPair.shadowView.tag, &newChildPair});
-      newIndex++;
-    }
-
-    // Final step: generate Create instructions for new nodes
-    for (auto it = newInsertedPairs.begin(); it != newInsertedPairs.end();
-         it++) {
-      // Erased elements of a TinyMap will have a Tag/key of 0 - skip those
-      // These *should* be removed by the map; there are currently no KNOWN
-      // cases where TinyMap will do the wrong thing, but there are not yet
-      // any unit tests explicitly for TinyMap, so this is safer for now.
-      if (it->first == 0) {
-        continue;
-      }
-
-      auto const &newChildPair = *it->second;
-
-      DEBUG_LOGS({
-        LOG(ERROR)
-            << "Differ Branch 9: Inserting tag/tree that was not yet removed from hierarchy (may be reparented): "
-            << newIndex << ": [" << newChildPair.shadowView.tag << "]";
-      });
-
-      createMutations.push_back(
-          ShadowViewMutation::CreateMutation(newChildPair.shadowView));
-
-      calculateShadowViewMutations(
-          downwardMutations,
-          newChildPair.shadowView,
-          {},
-          sliceChildShadowNodeViewPairs(*newChildPair.shadowNode));
-    }
-  }
-
-  // All mutations in an optimal order:
-  std::move(
-      destructiveDownwardMutations.begin(),
-      destructiveDownwardMutations.end(),
-      std::back_inserter(mutations));
-  std::move(
-      updateMutations.begin(),
-      updateMutations.end(),
-      std::back_inserter(mutations));
-  std::move(
-      removeMutations.rbegin(),
-      removeMutations.rend(),
-      std::back_inserter(mutations));
-  std::move(
-      deleteMutations.begin(),
-      deleteMutations.end(),
-      std::back_inserter(mutations));
-  std::move(
-      createMutations.begin(),
-      createMutations.end(),
-      std::back_inserter(mutations));
-  std::move(
-      downwardMutations.begin(),
-      downwardMutations.end(),
-      std::back_inserter(mutations));
-  std::move(
-      insertMutations.begin(),
-      insertMutations.end(),
-      std::back_inserter(mutations));
-}
-
 ShadowViewMutation::List calculateShadowViewMutations(
     ShadowNode const &oldRootShadowNode,
-    ShadowNode const &newRootShadowNode,
-    bool enableReparentingDetection) {
+    ShadowNode const &newRootShadowNode) {
   SystraceSection s("calculateShadowViewMutations");
 
   // Root shadow nodes must be belong the same family.
-  assert(ShadowNode::sameFamily(oldRootShadowNode, newRootShadowNode));
+  react_native_assert(
+      ShadowNode::sameFamily(oldRootShadowNode, newRootShadowNode));
+
+  // See explanation of scope in Differentiator.h.
+  ViewNodePairScope viewNodePairScope{};
+  ViewNodePairScope innerViewNodePairScope{};
 
   auto mutations = ShadowViewMutation::List{};
   mutations.reserve(256);
@@ -1859,22 +1676,16 @@ ShadowViewMutation::List calculateShadowViewMutations(
 
   if (oldRootShadowView != newRootShadowView) {
     mutations.push_back(ShadowViewMutation::UpdateMutation(
-        ShadowView(), oldRootShadowView, newRootShadowView, -1));
+        oldRootShadowView, newRootShadowView));
   }
 
-  if (enableReparentingDetection) {
-    calculateShadowViewMutationsV2(
-        mutations,
-        ShadowView(oldRootShadowNode),
-        sliceChildShadowNodeViewPairsV2(oldRootShadowNode),
-        sliceChildShadowNodeViewPairsV2(newRootShadowNode));
-  } else {
-    calculateShadowViewMutations(
-        mutations,
-        ShadowView(oldRootShadowNode),
-        sliceChildShadowNodeViewPairs(oldRootShadowNode),
-        sliceChildShadowNodeViewPairs(newRootShadowNode));
-  }
+  calculateShadowViewMutationsV2(
+      CREATE_DIFF_BREADCRUMB(oldRootShadowView.tag),
+      innerViewNodePairScope,
+      mutations,
+      ShadowView(oldRootShadowNode),
+      sliceChildShadowNodeViewPairsV2(oldRootShadowNode, viewNodePairScope),
+      sliceChildShadowNodeViewPairsV2(newRootShadowNode, viewNodePairScope));
 
   return mutations;
 }
diff --git a/ReactCommon/react/renderer/mounting/Differentiator.h b/ReactCommon/react/renderer/mounting/Differentiator.h
index 762bb43ae6bedd..551173652c8260 100644
--- a/ReactCommon/react/renderer/mounting/Differentiator.h
+++ b/ReactCommon/react/renderer/mounting/Differentiator.h
@@ -8,38 +8,64 @@
 #pragma once
 
 #include <react/renderer/core/ShadowNode.h>
+#include <react/renderer/debug/flags.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
+#include <deque>
 
 namespace facebook {
 namespace react {
 
 enum class ReparentMode { Flatten, Unflatten };
 
+/**
+ * During differ, we need to keep some `ShadowViewNodePair`s in memory.
+ * Some `ShadowViewNodePair`s are referenced from std::vectors returned
+ * by `sliceChildShadowNodeViewPairsV2`; some are referenced in TinyMaps
+ * for view (un)flattening especially; and it is not always clear which
+ * std::vectors will outlive which TinyMaps, and vice-versa, so it doesn't
+ * make sense for the std::vector or TinyMap to own any `ShadowViewNodePair`s.
+ *
+ * Thus, we introduce the concept of a scope.
+ *
+ * For the duration of some operation, we keep a ViewNodePairScope around, such
+ * that: (1) the ViewNodePairScope keeps each
+ * ShadowViewNodePair alive, (2) we have a stable pointer value that we can
+ * use to reference each ShadowViewNodePair (not guaranteed with std::vector,
+ * for example, which may have to resize and move values around).
+ *
+ * As long as we only manipulate the data-structure with push_back, std::deque
+ * both (1) ensures that pointers into the data-structure are never invalidated,
+ * and (2) tries to efficiently allocate storage such that as many objects as
+ * possible are close in memory, but does not guarantee adjacency.
+ */
+using ViewNodePairScope = std::deque<ShadowViewNodePair>;
+
 /*
  * Calculates a list of view mutations which describes how the old
  * `ShadowTree` can be transformed to the new one.
  * The list of mutations might be and might not be optimal.
  */
-ShadowViewMutationList calculateShadowViewMutations(
+ShadowViewMutation::List calculateShadowViewMutations(
     ShadowNode const &oldRootShadowNode,
-    ShadowNode const &newRootShadowNode,
-    bool enableReparentingDetection = false);
-
-/*
- * Generates a list of `ShadowViewNodePair`s that represents a layer of a
- * flattened view hierarchy.
- */
-ShadowViewNodePair::List sliceChildShadowNodeViewPairs(
-    ShadowNode const &shadowNode);
+    ShadowNode const &newRootShadowNode);
 
 /**
  * Generates a list of `ShadowViewNodePair`s that represents a layer of a
  * flattened view hierarchy. The V2 version preserves nodes even if they do
  * not form views and their children are flattened.
  */
-ShadowViewNodePair::List sliceChildShadowNodeViewPairsV2(
+ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairsV2(
     ShadowNode const &shadowNode,
-    bool allowFlattened = false);
+    ViewNodePairScope &viewNodePairScope,
+    bool allowFlattened = false,
+    Point layoutOffset = {0, 0});
+
+/*
+ * Generates a list of `ShadowViewNodePair`s that represents a layer of a
+ * flattened view hierarchy. This is *only* used by unit tests currently.
+ */
+ShadowViewNodePair::OwningList sliceChildShadowNodeViewPairsLegacy(
+    ShadowNode const &shadowNode);
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
index 2c9af008a80447..98001cfa1c1f7a 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
@@ -14,22 +14,19 @@
 
 #include <condition_variable>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
 
 namespace facebook {
 namespace react {
 
-MountingCoordinator::MountingCoordinator(
-    ShadowTreeRevision baseRevision,
-    std::weak_ptr<MountingOverrideDelegate const> delegate,
-    bool enableReparentingDetection)
+MountingCoordinator::MountingCoordinator(ShadowTreeRevision baseRevision)
     : surfaceId_(baseRevision.rootShadowNode->getSurfaceId()),
       baseRevision_(baseRevision),
-      mountingOverrideDelegate_(delegate),
-      telemetryController_(*this),
-      enableReparentingDetection_(enableReparentingDetection) {
+      telemetryController_(*this) {
 #ifdef RN_SHADOW_TREE_INTROSPECTION
-  stubViewTree_ = stubViewTreeFromShadowNode(*baseRevision_.rootShadowNode);
+  stubViewTree_ = buildStubViewTreeWithoutUsingDifferentiator(
+      *baseRevision_.rootShadowNode);
 #endif
 }
 
@@ -41,7 +38,7 @@ void MountingCoordinator::push(ShadowTreeRevision const &revision) const {
   {
     std::lock_guard<std::mutex> lock(mutex_);
 
-    assert(
+    react_native_assert(
         !lastRevision_.has_value() || revision.number != lastRevision_->number);
 
     if (!lastRevision_.has_value() || lastRevision_->number < revision.number) {
@@ -93,9 +90,7 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
     telemetry.willDiff();
 
     auto mutations = calculateShadowViewMutations(
-        *baseRevision_.rootShadowNode,
-        *lastRevision_->rootShadowNode,
-        enableReparentingDetection_);
+        *baseRevision_.rootShadowNode, *lastRevision_->rootShadowNode);
 
     telemetry.didDiff();
 
@@ -142,8 +137,8 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
     // tree therefore we cannot validate the validity of the mutation
     // instructions.
     if (!shouldOverridePullTransaction && lastRevision_.has_value()) {
-      auto stubViewTree =
-          stubViewTreeFromShadowNode(*lastRevision_->rootShadowNode);
+      auto stubViewTree = buildStubViewTreeWithoutUsingDifferentiator(
+          *lastRevision_->rootShadowNode);
 
       bool treesEqual = stubViewTree_ == stubViewTree;
 
@@ -168,7 +163,8 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
         }
       }
 
-      assert((treesEqual) && "Incorrect set of mutations detected.");
+      react_native_assert(
+          (treesEqual) && "Incorrect set of mutations detected.");
     }
   }
 #endif
@@ -184,5 +180,11 @@ TelemetryController const &MountingCoordinator::getTelemetryController() const {
   return telemetryController_;
 }
 
+void MountingCoordinator::setMountingOverrideDelegate(
+    std::weak_ptr<MountingOverrideDelegate const> delegate) const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  mountingOverrideDelegate_ = delegate;
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.h b/ReactCommon/react/renderer/mounting/MountingCoordinator.h
index 4563dc7bd0aa5c..00c12ba06858e6 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.h
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.h
@@ -10,6 +10,7 @@
 #include <better/optional.h>
 #include <chrono>
 
+#include <react/renderer/debug/flags.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/MountingTransaction.h>
@@ -17,10 +18,6 @@
 #include <react/renderer/mounting/TelemetryController.h>
 #include "ShadowTreeRevision.h"
 
-#ifndef NDEBUG
-#define RN_SHADOW_TREE_INTROSPECTION 1
-#endif
-
 #ifdef RN_SHADOW_TREE_INTROSPECTION
 #include <react/renderer/mounting/stubs.h>
 #endif
@@ -43,10 +40,7 @@ class MountingCoordinator final {
    * The constructor is meant to be used only inside `ShadowTree`, and it's
    * `public` only to enable using with `std::make_shared<>`.
    */
-  MountingCoordinator(
-      ShadowTreeRevision baseRevision,
-      std::weak_ptr<MountingOverrideDelegate const> delegate,
-      bool enableReparentingDetection = false);
+  MountingCoordinator(ShadowTreeRevision baseRevision);
 
   /*
    * Returns the id of the surface that the coordinator belongs to.
@@ -85,6 +79,9 @@ class MountingCoordinator final {
   void updateBaseRevision(ShadowTreeRevision const &baseRevision) const;
   void resetLatestRevision() const;
 
+  void setMountingOverrideDelegate(
+      std::weak_ptr<MountingOverrideDelegate const> delegate) const;
+
   /*
    * Methods from this section are meant to be used by `ShadowTree` only.
    */
@@ -110,12 +107,11 @@ class MountingCoordinator final {
   mutable better::optional<ShadowTreeRevision> lastRevision_{};
   mutable MountingTransaction::Number number_{0};
   mutable std::condition_variable signal_;
-  std::weak_ptr<MountingOverrideDelegate const> mountingOverrideDelegate_;
+  mutable std::weak_ptr<MountingOverrideDelegate const>
+      mountingOverrideDelegate_;
 
   TelemetryController telemetryController_;
 
-  bool enableReparentingDetection_{false}; // temporary
-
 #ifdef RN_SHADOW_TREE_INTROSPECTION
   mutable StubViewTree stubViewTree_; // Protected by `mutex_`.
 #endif
diff --git a/ReactCommon/react/renderer/mounting/MountingTransaction.h b/ReactCommon/react/renderer/mounting/MountingTransaction.h
index e7545f2c3390a6..6f0bbee60fe30d 100644
--- a/ReactCommon/react/renderer/mounting/MountingTransaction.h
+++ b/ReactCommon/react/renderer/mounting/MountingTransaction.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <react/renderer/mounting/ShadowViewMutation.h>
-#include <react/renderer/mounting/SurfaceTelemetry.h>
-#include <react/renderer/mounting/TransactionTelemetry.h>
+#include <react/renderer/telemetry/SurfaceTelemetry.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/react/renderer/mounting/MountingTransactionMetadata.h b/ReactCommon/react/renderer/mounting/MountingTransactionMetadata.h
index 974652bd3297dd..176a34c9cda3ad 100644
--- a/ReactCommon/react/renderer/mounting/MountingTransactionMetadata.h
+++ b/ReactCommon/react/renderer/mounting/MountingTransactionMetadata.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <react/renderer/mounting/MountingTransaction.h>
-#include <react/renderer/mounting/TransactionTelemetry.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
index 0cd895fc627b0f..1d3c6fe8dce323 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
@@ -7,6 +7,7 @@
 
 #include "ShadowTree.h"
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
@@ -14,7 +15,7 @@
 #include <react/renderer/debug/SystraceSection.h>
 #include <react/renderer/mounting/ShadowTreeRevision.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
-#include <react/renderer/mounting/TransactionTelemetry.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 
 #include "ShadowTreeDelegate.h"
 
@@ -22,6 +23,7 @@ namespace facebook {
 namespace react {
 
 using CommitStatus = ShadowTree::CommitStatus;
+using CommitMode = ShadowTree::CommitMode;
 
 /*
  * Generates (possibly) a new tree where all nodes with non-obsolete `State`
@@ -176,7 +178,7 @@ static void updateMountedFlag(
     return;
   }
 
-  int index;
+  size_t index;
 
   // Stage 1: Mount and unmount "updated" children.
   for (index = 0; index < oldChildren.size() && index < newChildren.size();
@@ -200,7 +202,7 @@ static void updateMountedFlag(
     updateMountedFlag(oldChild->getChildren(), newChild->getChildren());
   }
 
-  int lastIndexAfterFirstStage = index;
+  size_t lastIndexAfterFirstStage = index;
 
   // State 2: Mount new children.
   for (index = lastIndexAfterFirstStage; index < newChildren.size(); index++) {
@@ -221,35 +223,39 @@ ShadowTree::ShadowTree(
     SurfaceId surfaceId,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext,
-    RootComponentDescriptor const &rootComponentDescriptor,
     ShadowTreeDelegate const &delegate,
-    std::weak_ptr<MountingOverrideDelegate const> mountingOverrideDelegate,
-    bool enableReparentingDetection)
-    : surfaceId_(surfaceId),
-      delegate_(delegate),
-      enableReparentingDetection_(enableReparentingDetection) {
+    ContextContainer const &contextContainer)
+    : surfaceId_(surfaceId), delegate_(delegate) {
   const auto noopEventEmitter = std::make_shared<const ViewEventEmitter>(
       nullptr, -1, std::shared_ptr<const EventDispatcher>());
 
+  static auto globalRootComponentDescriptor =
+      std::make_unique<RootComponentDescriptor const>(
+          ComponentDescriptorParameters{
+              EventDispatcher::Shared{}, nullptr, nullptr});
+
   const auto props = std::make_shared<const RootProps>(
-      *RootShadowNode::defaultSharedProps(), layoutConstraints, layoutContext);
+      PropsParserContext{surfaceId, contextContainer},
+      *RootShadowNode::defaultSharedProps(),
+      layoutConstraints,
+      layoutContext);
 
-  auto family = rootComponentDescriptor.createFamily(
-      ShadowNodeFamilyFragment{surfaceId, surfaceId, noopEventEmitter},
-      nullptr);
+  auto const fragment =
+      ShadowNodeFamilyFragment{surfaceId, surfaceId, noopEventEmitter};
+  auto family = globalRootComponentDescriptor->createFamily(fragment, nullptr);
 
   auto rootShadowNode = std::static_pointer_cast<const RootShadowNode>(
-      rootComponentDescriptor.createShadowNode(
+      globalRootComponentDescriptor->createShadowNode(
           ShadowNodeFragment{
               /* .props = */ props,
           },
           family));
 
   currentRevision_ = ShadowTreeRevision{
-      rootShadowNode, ShadowTreeRevision::Number{0}, TransactionTelemetry{}};
+      rootShadowNode, INITIAL_REVISION, TransactionTelemetry{}};
 
-  mountingCoordinator_ = std::make_shared<MountingCoordinator const>(
-      currentRevision_, mountingOverrideDelegate, enableReparentingDetection);
+  mountingCoordinator_ =
+      std::make_shared<MountingCoordinator const>(currentRevision_);
 }
 
 ShadowTree::~ShadowTree() {
@@ -260,6 +266,31 @@ Tag ShadowTree::getSurfaceId() const {
   return surfaceId_;
 }
 
+void ShadowTree::setCommitMode(CommitMode commitMode) const {
+  auto revision = ShadowTreeRevision{};
+
+  {
+    std::unique_lock<better::shared_mutex> lock(commitMutex_);
+    if (commitMode_ == commitMode) {
+      return;
+    }
+
+    commitMode_ = commitMode;
+    revision = currentRevision_;
+  }
+
+  // initial revision never contains any commits so mounting it here is
+  // incorrect
+  if (commitMode == CommitMode::Normal && revision.number != INITIAL_REVISION) {
+    mount(revision);
+  }
+}
+
+CommitMode ShadowTree::getCommitMode() const {
+  std::shared_lock<better::shared_mutex> lock(commitMutex_);
+  return commitMode_;
+}
+
 MountingCoordinator::Shared ShadowTree::getMountingCoordinator() const {
   return mountingCoordinator_;
 }
@@ -281,7 +312,7 @@ CommitStatus ShadowTree::commit(
 
     // After multiple attempts, we failed to commit the transaction.
     // Something internally went terribly wrong.
-    assert(attempts < 1024);
+    react_native_assert(attempts < 1024);
   }
 }
 
@@ -293,19 +324,22 @@ CommitStatus ShadowTree::tryCommit(
   auto telemetry = TransactionTelemetry{};
   telemetry.willCommit();
 
+  CommitMode commitMode;
   auto oldRevision = ShadowTreeRevision{};
   auto newRevision = ShadowTreeRevision{};
 
   {
     // Reading `currentRevision_` in shared manner.
     std::shared_lock<better::shared_mutex> lock(commitMutex_);
+    commitMode = commitMode_;
     oldRevision = currentRevision_;
   }
 
+  auto oldRootShadowNode = oldRevision.rootShadowNode;
   auto newRootShadowNode = transaction(*oldRevision.rootShadowNode);
 
   if (!newRootShadowNode ||
-      (commitOptions.shouldCancel && commitOptions.shouldCancel())) {
+      (commitOptions.shouldYield && commitOptions.shouldYield())) {
     return CommitStatus::Cancelled;
   }
 
@@ -341,6 +375,14 @@ CommitStatus ShadowTree::tryCommit(
 
     auto newRevisionNumber = oldRevision.number + 1;
 
+    newRootShadowNode = delegate_.shadowTreeWillCommit(
+        *this, oldRootShadowNode, newRootShadowNode);
+
+    if (!newRootShadowNode ||
+        (commitOptions.shouldYield && commitOptions.shouldYield())) {
+      return CommitStatus::Cancelled;
+    }
+
     {
       std::lock_guard<std::mutex> dispatchLock(EventEmitter::DispatchMutex());
 
@@ -350,7 +392,7 @@ CommitStatus ShadowTree::tryCommit(
     }
 
     telemetry.didCommit();
-    telemetry.setRevisionNumber(newRevisionNumber);
+    telemetry.setRevisionNumber(static_cast<int>(newRevisionNumber));
 
     newRevision =
         ShadowTreeRevision{newRootShadowNode, newRevisionNumber, telemetry};
@@ -358,15 +400,11 @@ CommitStatus ShadowTree::tryCommit(
     currentRevision_ = newRevision;
   }
 
-  if (commitOptions.shouldCancel && commitOptions.shouldCancel()) {
-    return CommitStatus::Cancelled;
-  }
-
   emitLayoutEvents(affectedLayoutableNodes);
 
-  mountingCoordinator_->push(newRevision);
-
-  notifyDelegatesOfUpdates();
+  if (commitMode == CommitMode::Normal) {
+    mount(newRevision);
+  }
 
   return CommitStatus::Succeeded;
 }
@@ -376,6 +414,11 @@ ShadowTreeRevision ShadowTree::getCurrentRevision() const {
   return currentRevision_;
 }
 
+void ShadowTree::mount(ShadowTreeRevision const &revision) const {
+  mountingCoordinator_->push(revision);
+  delegate_.shadowTreeDidFinishTransaction(*this, mountingCoordinator_);
+}
+
 void ShadowTree::commitEmptyTree() const {
   commit(
       [](RootShadowNode const &oldRootShadowNode) -> RootShadowNode::Unshared {
diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.h b/ReactCommon/react/renderer/mounting/ShadowTree.h
index 5d208f76aaa705..2553fdc3d310cd 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.h
@@ -18,6 +18,7 @@
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 #include <react/renderer/mounting/ShadowTreeRevision.h>
+#include <react/utils/ContextContainer.h>
 #include "MountingOverrideDelegate.h"
 
 namespace facebook {
@@ -31,17 +32,36 @@ using ShadowTreeCommitTransaction = std::function<RootShadowNode::Unshared(
  */
 class ShadowTree final {
  public:
+  using Unique = std::unique_ptr<ShadowTree>;
+
+  /*
+   * Represents a result of a `commit` operation.
+   */
   enum class CommitStatus {
     Succeeded,
     Failed,
     Cancelled,
   };
 
+  /*
+   * Represents commits' side-effects propagation mode.
+   */
+  enum class CommitMode {
+    // Commits' side-effects are observable via `MountingCoordinator`.
+    // The rendering pipeline fully works end-to-end.
+    Normal,
+
+    // Commits' side-effects are *not* observable via `MountingCoordinator`.
+    // The mounting phase is skipped in the rendering pipeline.
+    Suspended,
+  };
+
   struct CommitOptions {
     bool enableStateReconciliation{false};
-    // Lambda called inside `tryCommit`. If false is returned, commit is
-    // cancelled.
-    std::function<bool()> shouldCancel;
+
+    // Called during `tryCommit` phase. Returning true indicates current commit
+    // should yield to the next commit.
+    std::function<bool()> shouldYield;
   };
 
   /*
@@ -51,10 +71,8 @@ class ShadowTree final {
       SurfaceId surfaceId,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext,
-      RootComponentDescriptor const &rootComponentDescriptor,
       ShadowTreeDelegate const &delegate,
-      std::weak_ptr<MountingOverrideDelegate const> mountingOverrideDelegate,
-      bool enableReparentingDetection = false);
+      ContextContainer const &contextContainer);
 
   ~ShadowTree();
 
@@ -63,6 +81,14 @@ class ShadowTree final {
    */
   SurfaceId getSurfaceId() const;
 
+  /*
+   * Sets and gets the commit mode.
+   * Changing commit mode from `Suspended` to `Normal` will flush all suspended
+   * changes to `MountingCoordinator`.
+   */
+  void setCommitMode(CommitMode commitMode) const;
+  CommitMode getCommitMode() const;
+
   /*
    * Performs commit calling `transaction` function with a `oldRootShadowNode`
    * and expecting a `newRootShadowNode` as a return value.
@@ -99,24 +125,21 @@ class ShadowTree final {
 
   MountingCoordinator::Shared getMountingCoordinator() const;
 
-  /*
-   * Temporary.
-   * Do not use.
-   */
-  void setEnableReparentingDetection(bool value) {
-    enableReparentingDetection_ = value;
-  }
-
  private:
+  constexpr static ShadowTreeRevision::Number INITIAL_REVISION{0};
+
+  void mount(ShadowTreeRevision const &revision) const;
+
   void emitLayoutEvents(
       std::vector<LayoutableShadowNode const *> &affectedLayoutableNodes) const;
 
   SurfaceId const surfaceId_;
   ShadowTreeDelegate const &delegate_;
   mutable better::shared_mutex commitMutex_;
+  mutable CommitMode commitMode_{
+      CommitMode::Normal}; // Protected by `commitMutex_`.
   mutable ShadowTreeRevision currentRevision_; // Protected by `commitMutex_`.
   MountingCoordinator::Shared mountingCoordinator_;
-  bool enableReparentingDetection_{false};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h b/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h
index e7e5880e1de9cc..45e762c5314013 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h
@@ -19,6 +19,17 @@ class ShadowTree;
  */
 class ShadowTreeDelegate {
  public:
+  /*
+   * Called right before a ShadowTree commits a new tree.
+   * The receiver can alter a new (proposed) shadow tree with another tree
+   * by returning the altered tree.
+   * Returning a `nullptr` cancels the commit.
+   */
+  virtual RootShadowNode::Unshared shadowTreeWillCommit(
+      ShadowTree const &shadowTree,
+      RootShadowNode::Shared const &oldRootShadowNode,
+      RootShadowNode::Unshared const &newRootShadowNode) const = 0;
+
   /*
    * Called right after Shadow Tree commit a new state of the tree.
    */
diff --git a/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp b/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp
index 38540ecfd738d5..8c801d82270f8c 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp
@@ -7,11 +7,13 @@
 
 #include "ShadowTreeRegistry.h"
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
 ShadowTreeRegistry::~ShadowTreeRegistry() {
-  assert(
+  react_native_assert(
       registry_.empty() && "Deallocation of non-empty `ShadowTreeRegistry`.");
 }
 
diff --git a/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h
index d58dbd643288d7..50e05ad7741a5b 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h
@@ -13,7 +13,7 @@
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/MountingTransaction.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
-#include <react/renderer/mounting/TransactionTelemetry.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/react/renderer/mounting/ShadowView.cpp b/ReactCommon/react/renderer/mounting/ShadowView.cpp
index f717a28fe669f6..3b4b54f1439b68 100644
--- a/ReactCommon/react/renderer/mounting/ShadowView.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowView.cpp
@@ -7,6 +7,7 @@
 
 #include "ShadowView.h"
 
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
 
 namespace facebook {
@@ -22,7 +23,9 @@ static LayoutMetrics layoutMetricsFromShadowNode(ShadowNode const &shadowNode) {
 ShadowView::ShadowView(const ShadowNode &shadowNode)
     : componentName(shadowNode.getComponentName()),
       componentHandle(shadowNode.getComponentHandle()),
+      surfaceId(shadowNode.getSurfaceId()),
       tag(shadowNode.getTag()),
+      traits(shadowNode.getTraits()),
       props(shadowNode.getProps()),
       eventEmitter(shadowNode.getEventEmitter()),
       layoutMetrics(layoutMetricsFromShadowNode(shadowNode)),
@@ -30,6 +33,7 @@ ShadowView::ShadowView(const ShadowNode &shadowNode)
 
 bool ShadowView::operator==(const ShadowView &rhs) const {
   return std::tie(
+             this->surfaceId,
              this->tag,
              this->componentName,
              this->props,
@@ -37,6 +41,7 @@ bool ShadowView::operator==(const ShadowView &rhs) const {
              this->layoutMetrics,
              this->state) ==
       std::tie(
+             rhs.surfaceId,
              rhs.tag,
              rhs.componentName,
              rhs.props,
@@ -49,7 +54,7 @@ bool ShadowView::operator!=(const ShadowView &rhs) const {
   return !(*this == rhs);
 }
 
-#if RN_DEBUG_STRING_CONVERTIBLE
+#ifdef RN_DEBUG_STRING_CONVERTIBLE
 
 std::string getDebugName(ShadowView const &object) {
   return object.componentHandle == 0 ? "Invalid" : object.componentName;
@@ -59,7 +64,10 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
     ShadowView const &object,
     DebugStringConvertibleOptions options) {
   return {
+      {"surfaceId", getDebugDescription(object.surfaceId, options)},
       {"tag", getDebugDescription(object.tag, options)},
+      {"traits", getDebugDescription(object.traits, options)},
+      {"componentName", object.componentName},
       {"props", getDebugDescription(object.props, options)},
       {"eventEmitter", getDebugDescription(object.eventEmitter, options)},
       {"layoutMetrics", getDebugDescription(object.layoutMetrics, options)},
@@ -77,5 +85,15 @@ bool ShadowViewNodePair::operator!=(const ShadowViewNodePair &rhs) const {
   return !(*this == rhs);
 }
 
+bool ShadowViewNodePairLegacy::operator==(
+    const ShadowViewNodePairLegacy &rhs) const {
+  return this->shadowNode == rhs.shadowNode;
+}
+
+bool ShadowViewNodePairLegacy::operator!=(
+    const ShadowViewNodePairLegacy &rhs) const {
+  return !(*this == rhs);
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/ShadowView.h b/ReactCommon/react/renderer/mounting/ShadowView.h
index 3e65e0262c56ff..614399b2fb0250 100644
--- a/ReactCommon/react/renderer/mounting/ShadowView.h
+++ b/ReactCommon/react/renderer/mounting/ShadowView.h
@@ -14,6 +14,7 @@
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/ShadowNode.h>
+#include <react/renderer/debug/flags.h>
 
 namespace facebook {
 namespace react {
@@ -40,7 +41,9 @@ struct ShadowView final {
 
   ComponentName componentName{};
   ComponentHandle componentHandle{};
+  SurfaceId surfaceId{};
   Tag tag{};
+  ShadowNodeTraits traits{};
   Props::Shared props{};
   EventEmitter::Shared eventEmitter{};
   LayoutMetrics layoutMetrics{EmptyLayoutMetrics};
@@ -62,23 +65,62 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
  *
  */
 struct ShadowViewNodePair final {
-  using List = better::
+  using NonOwningList = better::
+      small_vector<ShadowViewNodePair *, kShadowNodeChildrenSmallVectorSize>;
+  using OwningList = better::
       small_vector<ShadowViewNodePair, kShadowNodeChildrenSmallVectorSize>;
 
   ShadowView shadowView;
   ShadowNode const *shadowNode;
   bool flattened{false};
   bool isConcreteView{true};
+  Point contextOrigin{0, 0};
 
   size_t mountIndex{0};
 
-  bool inOtherTree{false};
+  /**
+   * This is nullptr unless `inOtherTree` is set to true.
+   * We rely on this only for marginal cases. TODO: could we
+   * rely on this more heavily to simplify the diffing algorithm
+   * overall?
+   */
+  mutable ShadowViewNodePair const *otherTreePair{nullptr};
 
   /*
    * The stored pointer to `ShadowNode` represents an identity of the pair.
    */
   bool operator==(const ShadowViewNodePair &rhs) const;
   bool operator!=(const ShadowViewNodePair &rhs) const;
+
+  bool inOtherTree() const {
+    return this->otherTreePair != nullptr;
+  }
+};
+
+/*
+ * Describes pair of a `ShadowView` and a `ShadowNode`.
+ * This is not exposed to the mounting layer.
+ *
+ */
+struct ShadowViewNodePairLegacy final {
+  using OwningList = better::small_vector<
+      ShadowViewNodePairLegacy,
+      kShadowNodeChildrenSmallVectorSize>;
+
+  ShadowView shadowView;
+  ShadowNode const *shadowNode;
+  bool flattened{false};
+  bool isConcreteView{true};
+
+  size_t mountIndex{0};
+
+  bool inOtherTree{false};
+
+  /*
+   * The stored pointer to `ShadowNode` represents an identity of the pair.
+   */
+  bool operator==(const ShadowViewNodePairLegacy &rhs) const;
+  bool operator!=(const ShadowViewNodePairLegacy &rhs) const;
 };
 
 } // namespace react
@@ -91,10 +133,12 @@ struct hash<facebook::react::ShadowView> {
   size_t operator()(const facebook::react::ShadowView &shadowView) const {
     return folly::hash::hash_combine(
         0,
+        shadowView.surfaceId,
         shadowView.componentHandle,
         shadowView.tag,
         shadowView.props,
         shadowView.eventEmitter,
+        shadowView.layoutMetrics,
         shadowView.state);
   }
 };
diff --git a/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp b/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp
index 9b8d966a3c1129..9f0c61d27466d8 100644
--- a/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp
@@ -57,19 +57,33 @@ ShadowViewMutation ShadowViewMutation::RemoveMutation(
 }
 
 ShadowViewMutation ShadowViewMutation::UpdateMutation(
-    ShadowView parentShadowView,
     ShadowView oldChildShadowView,
-    ShadowView newChildShadowView,
-    int index) {
+    ShadowView newChildShadowView) {
   return {
       /* .type = */ Update,
-      /* .parentShadowView = */ parentShadowView,
+      /* .parentShadowView = */ {},
       /* .oldChildShadowView = */ oldChildShadowView,
       /* .newChildShadowView = */ newChildShadowView,
-      /* .index = */ index,
+      /* .index = */ -1,
   };
 }
 
+bool ShadowViewMutation::mutatedViewIsVirtual() const {
+  bool viewIsVirtual = false;
+
+#ifdef ANDROID
+  // Explanation: Even for non-virtual views,
+  //              for "Insert" mutations, oldChildShadowView is always empty.
+  //              for "Remove" mutations, newChildShadowView is always empty.
+  // Thus, to see if a view is virtual, we need to always check both the old and
+  // new View.
+  viewIsVirtual = newChildShadowView.layoutMetrics == EmptyLayoutMetrics &&
+      oldChildShadowView.layoutMetrics == EmptyLayoutMetrics;
+#endif
+
+  return viewIsVirtual;
+}
+
 #if RN_DEBUG_STRING_CONVERTIBLE
 
 std::string getDebugName(ShadowViewMutation const &mutation) {
diff --git a/ReactCommon/react/renderer/mounting/ShadowViewMutation.h b/ReactCommon/react/renderer/mounting/ShadowViewMutation.h
index 07ee6bcaf7e482..6eb7f8f1d3abed 100644
--- a/ReactCommon/react/renderer/mounting/ShadowViewMutation.h
+++ b/ReactCommon/react/renderer/mounting/ShadowViewMutation.h
@@ -55,10 +55,8 @@ struct ShadowViewMutation final {
    * Creates and returns an `Update` mutation.
    */
   static ShadowViewMutation UpdateMutation(
-      ShadowView parentShadowView,
       ShadowView oldChildShadowView,
-      ShadowView newChildShadowView,
-      int index);
+      ShadowView newChildShadowView);
 
 #pragma mark - Type
 
@@ -70,7 +68,15 @@ struct ShadowViewMutation final {
   ShadowView parentShadowView = {};
   ShadowView oldChildShadowView = {};
   ShadowView newChildShadowView = {};
-  int index = {};
+  int index = -1;
+
+ public:
+  // Some platforms can have the notion of virtual views - views that are in the
+  // ShadowTree hierarchy but never are on the platform. Generally this is used
+  // so notify the platform that a view exists so that we can keep EventEmitters
+  // around, to notify JS of something. This mechanism is DEPRECATED and it is
+  // highly recommended that you NOT make use of this in your platform!
+  bool mutatedViewIsVirtual() const;
 };
 
 using ShadowViewMutationList = std::vector<ShadowViewMutation>;
diff --git a/ReactCommon/react/renderer/mounting/StubView.cpp b/ReactCommon/react/renderer/mounting/StubView.cpp
index f476de31184899..cad4ae8a398685 100644
--- a/ReactCommon/react/renderer/mounting/StubView.cpp
+++ b/ReactCommon/react/renderer/mounting/StubView.cpp
@@ -7,12 +7,30 @@
 
 #include "StubView.h"
 
+#ifdef STUB_VIEW_TREE_VERBOSE
+#include <glog/logging.h>
+#endif
+
 namespace facebook {
 namespace react {
 
+StubView::operator ShadowView() const {
+  auto shadowView = ShadowView{};
+  shadowView.componentName = componentName;
+  shadowView.componentHandle = componentHandle;
+  shadowView.surfaceId = surfaceId;
+  shadowView.tag = tag;
+  shadowView.props = props;
+  shadowView.eventEmitter = eventEmitter;
+  shadowView.layoutMetrics = layoutMetrics;
+  shadowView.state = state;
+  return shadowView;
+}
+
 void StubView::update(ShadowView const &shadowView) {
   componentName = shadowView.componentName;
   componentHandle = shadowView.componentHandle;
+  surfaceId = shadowView.surfaceId;
   tag = shadowView.tag;
   props = shadowView.props;
   eventEmitter = shadowView.eventEmitter;
@@ -21,8 +39,23 @@ void StubView::update(ShadowView const &shadowView) {
 }
 
 bool operator==(StubView const &lhs, StubView const &rhs) {
-  return std::tie(lhs.props, lhs.layoutMetrics) ==
-      std::tie(rhs.props, rhs.layoutMetrics);
+  if (lhs.props != rhs.props) {
+#ifdef STUB_VIEW_TREE_VERBOSE
+    LOG(ERROR) << "StubView: props do not match. lhs hash: "
+               << std::hash<ShadowView>{}((ShadowView)lhs)
+               << " rhs hash: " << std::hash<ShadowView>{}((ShadowView)rhs);
+#endif
+    return false;
+  }
+  if (lhs.layoutMetrics != rhs.layoutMetrics) {
+#ifdef STUB_VIEW_TREE_VERBOSE
+    LOG(ERROR) << "StubView: layoutMetrics do not match lhs hash: "
+               << std::hash<ShadowView>{}((ShadowView)lhs)
+               << " rhs hash: " << std::hash<ShadowView>{}((ShadowView)rhs);
+#endif
+    return false;
+  }
+  return true;
 }
 
 bool operator!=(StubView const &lhs, StubView const &rhs) {
@@ -33,14 +66,15 @@ bool operator!=(StubView const &lhs, StubView const &rhs) {
 
 std::string getDebugName(StubView const &stubView) {
   return std::string{"Stub"} +
-      std::string{stubView.componentHandle ? stubView.componentName
-                                           : "[invalid]"};
+      std::string{
+          stubView.componentHandle ? stubView.componentName : "[invalid]"};
 }
 
 std::vector<DebugStringConvertibleObject> getDebugProps(
     StubView const &stubView,
     DebugStringConvertibleOptions options) {
   return {
+      {"surfaceId", getDebugDescription(stubView.surfaceId, options)},
       {"tag", getDebugDescription(stubView.tag, options)},
       {"props", getDebugDescription(stubView.props, options)},
       {"eventEmitter", getDebugDescription(stubView.eventEmitter, options)},
diff --git a/ReactCommon/react/renderer/mounting/StubView.h b/ReactCommon/react/renderer/mounting/StubView.h
index 8546baa157aee5..a721c57c74d210 100644
--- a/ReactCommon/react/renderer/mounting/StubView.h
+++ b/ReactCommon/react/renderer/mounting/StubView.h
@@ -18,6 +18,8 @@
 namespace facebook {
 namespace react {
 
+static const int NO_VIEW_TAG = -1;
+
 class StubView final {
  public:
   using Shared = std::shared_ptr<StubView>;
@@ -25,16 +27,20 @@ class StubView final {
   StubView() = default;
   StubView(StubView const &stubView) = default;
 
+  operator ShadowView() const;
+
   void update(ShadowView const &shadowView);
 
   ComponentName componentName;
   ComponentHandle componentHandle;
+  SurfaceId surfaceId;
   Tag tag;
   SharedProps props;
   SharedEventEmitter eventEmitter;
   LayoutMetrics layoutMetrics;
   State::Shared state;
   std::vector<StubView::Shared> children;
+  Tag parentTag{NO_VIEW_TAG};
 };
 
 bool operator==(StubView const &lhs, StubView const &rhs);
diff --git a/ReactCommon/react/renderer/mounting/StubViewTree.cpp b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
index 0c9dedee025294..6e82ad5028fb1a 100644
--- a/ReactCommon/react/renderer/mounting/StubViewTree.cpp
+++ b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
@@ -8,15 +8,7 @@
 #include "StubViewTree.h"
 
 #include <glog/logging.h>
-
-// Uncomment to enable verbose StubViewTree debug logs
-// #define STUB_VIEW_TREE_VERBOSE 1
-
-#define STUB_VIEW_ASSERT(cond)                 \
-  if (!(cond)) {                               \
-    LOG(ERROR) << "ASSERT FAILURE: " << #cond; \
-  }                                            \
-  assert(cond);
+#include <react/debug/react_native_assert.h>
 
 #ifdef STUB_VIEW_TREE_VERBOSE
 #define STUB_VIEW_LOG(code) code
@@ -38,127 +30,256 @@ StubView const &StubViewTree::getRootStubView() const {
   return *registry.at(rootTag);
 }
 
-/**
- * ignoreDuplicateCreates: when stubs generates "fake" mutation instructions, in
- * some cases it can produce too many "create" instructions. We ignore
- * duplicates and treat them as noops. In the case of verifying actual diffing,
- * that assert is left on.
- *
- * @param mutations
- * @param ignoreDuplicateCreates
- */
-void StubViewTree::mutate(
-    ShadowViewMutationList const &mutations,
-    bool ignoreDuplicateCreates) {
+StubView const &StubViewTree::getStubView(Tag tag) const {
+  return *registry.at(tag);
+}
+
+size_t StubViewTree::size() const {
+  return registry.size();
+}
+
+void StubViewTree::mutate(ShadowViewMutationList const &mutations) {
   STUB_VIEW_LOG({ LOG(ERROR) << "StubView: Mutating Begin"; });
   for (auto const &mutation : mutations) {
     switch (mutation.type) {
       case ShadowViewMutation::Create: {
-        STUB_VIEW_ASSERT(mutation.parentShadowView == ShadowView{});
-        STUB_VIEW_ASSERT(mutation.oldChildShadowView == ShadowView{});
+        react_native_assert(mutation.parentShadowView == ShadowView{});
+        react_native_assert(mutation.oldChildShadowView == ShadowView{});
+        react_native_assert(mutation.newChildShadowView.props);
         auto stubView = std::make_shared<StubView>();
+        stubView->update(mutation.newChildShadowView);
         auto tag = mutation.newChildShadowView.tag;
-        STUB_VIEW_LOG({ LOG(ERROR) << "StubView: Create: " << tag; });
-        if (!ignoreDuplicateCreates) {
-          STUB_VIEW_ASSERT(registry.find(tag) == registry.end());
-        }
+        STUB_VIEW_LOG({
+          LOG(ERROR) << "StubView: Create [" << tag << "] ##"
+                     << std::hash<ShadowView>{}((ShadowView)*stubView);
+        });
+        react_native_assert(registry.find(tag) == registry.end());
         registry[tag] = stubView;
         break;
       }
 
       case ShadowViewMutation::Delete: {
-        STUB_VIEW_LOG(
-            { LOG(ERROR) << "Delete " << mutation.oldChildShadowView.tag; });
-        STUB_VIEW_ASSERT(mutation.parentShadowView == ShadowView{});
-        STUB_VIEW_ASSERT(mutation.newChildShadowView == ShadowView{});
+        STUB_VIEW_LOG({
+          LOG(ERROR) << "StubView: Delete [" << mutation.oldChildShadowView.tag
+                     << "] ##"
+                     << std::hash<ShadowView>{}(mutation.oldChildShadowView);
+        });
+        react_native_assert(mutation.parentShadowView == ShadowView{});
+        react_native_assert(mutation.newChildShadowView == ShadowView{});
         auto tag = mutation.oldChildShadowView.tag;
-        STUB_VIEW_ASSERT(registry.find(tag) != registry.end());
+        react_native_assert(registry.find(tag) != registry.end());
+        auto stubView = registry[tag];
+        if ((ShadowView)(*stubView) != mutation.oldChildShadowView) {
+          LOG(ERROR)
+              << "StubView: ASSERT FAILURE: DELETE mutation assertion failure: oldChildShadowView does not match stubView: ["
+              << mutation.oldChildShadowView.tag << "] stub hash: ##"
+              << std::hash<ShadowView>{}((ShadowView)*stubView)
+              << " old mutation hash: ##"
+              << std::hash<ShadowView>{}(mutation.oldChildShadowView);
+#ifdef RN_DEBUG_STRING_CONVERTIBLE
+          LOG(ERROR) << "StubView: "
+                     << getDebugPropsDescription((ShadowView)*stubView, {});
+          LOG(ERROR) << "OldChildShadowView: "
+                     << getDebugPropsDescription(
+                            mutation.oldChildShadowView, {});
+#endif
+        }
+        react_native_assert(
+            (ShadowView)(*stubView) == mutation.oldChildShadowView);
         registry.erase(tag);
         break;
       }
 
       case ShadowViewMutation::Insert: {
-        STUB_VIEW_ASSERT(mutation.oldChildShadowView == ShadowView{});
-        auto parentTag = mutation.parentShadowView.tag;
-        STUB_VIEW_ASSERT(registry.find(parentTag) != registry.end());
-        auto parentStubView = registry[parentTag];
-        auto childTag = mutation.newChildShadowView.tag;
-        STUB_VIEW_ASSERT(registry.find(childTag) != registry.end());
-        auto childStubView = registry[childTag];
-        childStubView->update(mutation.newChildShadowView);
-        STUB_VIEW_LOG({
-          LOG(ERROR) << "StubView: Insert: " << childTag << " into "
-                     << parentTag << " at " << mutation.index << "("
-                     << parentStubView->children.size() << " children)";
-        });
-        STUB_VIEW_ASSERT(parentStubView->children.size() >= mutation.index);
-        parentStubView->children.insert(
-            parentStubView->children.begin() + mutation.index, childStubView);
+        if (!mutation.mutatedViewIsVirtual()) {
+          react_native_assert(mutation.oldChildShadowView == ShadowView{});
+          auto parentTag = mutation.parentShadowView.tag;
+          auto childTag = mutation.newChildShadowView.tag;
+          if (registry.find(parentTag) == registry.end()) {
+            LOG(ERROR)
+                << "StubView: ASSERT FAILURE: INSERT mutation assertion failure: parentTag not found: ["
+                << parentTag << "] inserting child: [" << childTag << "]";
+          }
+          if (registry.find(childTag) == registry.end()) {
+            LOG(ERROR)
+                << "StubView: ASSERT FAILURE: INSERT mutation assertion failure: childTag not found: ["
+                << parentTag << "] inserting child: [" << childTag << "]";
+          }
+          react_native_assert(registry.find(parentTag) != registry.end());
+          auto parentStubView = registry[parentTag];
+          react_native_assert(registry.find(childTag) != registry.end());
+          auto childStubView = registry[childTag];
+          childStubView->update(mutation.newChildShadowView);
+          STUB_VIEW_LOG({
+            LOG(ERROR) << "StubView: Insert [" << childTag << "] into ["
+                       << parentTag << "] @" << mutation.index << "("
+                       << parentStubView->children.size() << " children)";
+          });
+          react_native_assert(childStubView->parentTag == NO_VIEW_TAG);
+          react_native_assert(
+              mutation.index >= 0 &&
+              parentStubView->children.size() >=
+                  static_cast<size_t>(mutation.index));
+          childStubView->parentTag = parentTag;
+          parentStubView->children.insert(
+              parentStubView->children.begin() + mutation.index, childStubView);
+        } else {
+          auto childTag = mutation.newChildShadowView.tag;
+          react_native_assert(registry.find(childTag) != registry.end());
+          auto childStubView = registry[childTag];
+          childStubView->update(mutation.newChildShadowView);
+        }
         break;
       }
 
       case ShadowViewMutation::Remove: {
-        STUB_VIEW_ASSERT(mutation.newChildShadowView == ShadowView{});
-        auto parentTag = mutation.parentShadowView.tag;
-        STUB_VIEW_ASSERT(registry.find(parentTag) != registry.end());
-        auto parentStubView = registry[parentTag];
-        auto childTag = mutation.oldChildShadowView.tag;
-        STUB_VIEW_LOG({
-          LOG(ERROR) << "StubView: Remove: " << childTag << " from "
-                     << parentTag << " at index " << mutation.index << " with "
-                     << parentStubView->children.size() << " children";
-        });
-        STUB_VIEW_ASSERT(parentStubView->children.size() > mutation.index);
-        STUB_VIEW_ASSERT(registry.find(childTag) != registry.end());
-        auto childStubView = registry[childTag];
-        bool childIsCorrect =
-            parentStubView->children.size() > mutation.index &&
-            parentStubView->children[mutation.index]->tag == childStubView->tag;
-        STUB_VIEW_LOG({
-          std::string strChildList = "";
-          int i = 0;
-          for (auto const &child : parentStubView->children) {
-            strChildList.append(std::to_string(i));
-            strChildList.append(":");
-            strChildList.append(std::to_string(child->tag));
-            strChildList.append(", ");
-            i++;
+        if (!mutation.mutatedViewIsVirtual()) {
+          react_native_assert(mutation.newChildShadowView == ShadowView{});
+          auto parentTag = mutation.parentShadowView.tag;
+          auto childTag = mutation.oldChildShadowView.tag;
+          if (registry.find(parentTag) == registry.end()) {
+            LOG(ERROR)
+                << "StubView: ASSERT FAILURE: REMOVE mutation assertion failure: parentTag not found: ["
+                << parentTag << "] removing child: [" << childTag << "]";
           }
-          LOG(ERROR) << "StubView: BEFORE REMOVE: Children of " << parentTag
-                     << ": " << strChildList;
-        });
-        STUB_VIEW_ASSERT(childIsCorrect);
-        parentStubView->children.erase(
-            parentStubView->children.begin() + mutation.index);
+          react_native_assert(registry.find(parentTag) != registry.end());
+          auto parentStubView = registry[parentTag];
+          STUB_VIEW_LOG({
+            LOG(ERROR) << "StubView: Remove [" << childTag << "] from ["
+                       << parentTag << "] @" << mutation.index << " with "
+                       << parentStubView->children.size() << " children";
+          });
+          react_native_assert(
+              mutation.index >= 0 &&
+              parentStubView->children.size() >
+                  static_cast<size_t>(mutation.index));
+          react_native_assert(registry.find(childTag) != registry.end());
+          auto childStubView = registry[childTag];
+          if ((ShadowView)(*childStubView) != mutation.oldChildShadowView) {
+            LOG(ERROR)
+                << "StubView: ASSERT FAILURE: REMOVE mutation assertion failure: oldChildShadowView does not match oldStubView: ["
+                << mutation.oldChildShadowView.tag << "] stub hash: ##"
+                << std::hash<ShadowView>{}((ShadowView)*childStubView)
+                << " old mutation hash: ##"
+                << std::hash<ShadowView>{}(mutation.oldChildShadowView);
+#ifdef RN_DEBUG_STRING_CONVERTIBLE
+            LOG(ERROR) << "ChildStubView: "
+                       << getDebugPropsDescription(
+                              (ShadowView)*childStubView, {});
+            LOG(ERROR) << "OldChildShadowView: "
+                       << getDebugPropsDescription(
+                              mutation.oldChildShadowView, {});
+#endif
+          }
+          react_native_assert(
+              (ShadowView)(*childStubView) == mutation.oldChildShadowView);
+          react_native_assert(childStubView->parentTag == parentTag);
+          STUB_VIEW_LOG({
+            std::string strChildList = "";
+            int i = 0;
+            for (auto const &child : parentStubView->children) {
+              strChildList.append(std::to_string(i));
+              strChildList.append(":");
+              strChildList.append(std::to_string(child->tag));
+              strChildList.append(", ");
+              i++;
+            }
+            LOG(ERROR) << "StubView: BEFORE REMOVE: Children of " << parentTag
+                       << ": " << strChildList;
+          });
+          react_native_assert(
+              mutation.index >= 0 &&
+              parentStubView->children.size() >
+                  static_cast<size_t>(mutation.index) &&
+              parentStubView->children[mutation.index]->tag ==
+                  childStubView->tag);
+          childStubView->parentTag = NO_VIEW_TAG;
+          parentStubView->children.erase(
+              parentStubView->children.begin() + mutation.index);
+        }
         break;
       }
 
       case ShadowViewMutation::Update: {
         STUB_VIEW_LOG({
-          LOG(ERROR) << "StubView: Update: " << mutation.newChildShadowView.tag;
+          LOG(ERROR) << "StubView: Update [" << mutation.newChildShadowView.tag
+                     << "] old hash: ##"
+                     << std::hash<ShadowView>{}(mutation.oldChildShadowView)
+                     << " new hash: ##"
+                     << std::hash<ShadowView>{}(mutation.newChildShadowView);
         });
+        react_native_assert(mutation.oldChildShadowView.tag != 0);
+        react_native_assert(mutation.newChildShadowView.tag != 0);
+        react_native_assert(mutation.newChildShadowView.props);
+        react_native_assert(
+            mutation.newChildShadowView.tag == mutation.oldChildShadowView.tag);
+        react_native_assert(
+            registry.find(mutation.newChildShadowView.tag) != registry.end());
+        auto oldStubView = registry[mutation.newChildShadowView.tag];
+        react_native_assert(oldStubView->tag != 0);
+        if ((ShadowView)(*oldStubView) != mutation.oldChildShadowView) {
+          LOG(ERROR)
+              << "StubView: ASSERT FAILURE: UPDATE mutation assertion failure: oldChildShadowView does not match oldStubView: ["
+              << mutation.oldChildShadowView.tag << "] old stub hash: ##"
+              << std::hash<ShadowView>{}((ShadowView)*oldStubView)
+              << " old mutation hash: ##"
+              << std::hash<ShadowView>{}(mutation.oldChildShadowView);
+#ifdef RN_DEBUG_STRING_CONVERTIBLE
+          LOG(ERROR) << "OldStubView: "
+                     << getDebugPropsDescription((ShadowView)*oldStubView, {});
+          LOG(ERROR) << "OldChildShadowView: "
+                     << getDebugPropsDescription(
+                            mutation.oldChildShadowView, {});
+#endif
+        }
+        react_native_assert(
+            (ShadowView)(*oldStubView) == mutation.oldChildShadowView);
+        oldStubView->update(mutation.newChildShadowView);
 
-        // We don't have a strict requirement that oldChildShadowView has any
-        // data. In particular, LayoutAnimations can produce UPDATEs with only a
-        // new node.
-        STUB_VIEW_ASSERT(
-            mutation.newChildShadowView.tag ==
-                mutation.oldChildShadowView.tag ||
-            mutation.oldChildShadowView.tag == 0);
+        // Hash for stub view and the ShadowView should be identical - this
+        // tests that StubView and ShadowView hash are equivalent.
+        react_native_assert(
+            std::hash<ShadowView>{}((ShadowView)*oldStubView) ==
+            std::hash<ShadowView>{}(mutation.newChildShadowView));
 
-        STUB_VIEW_ASSERT(
-            registry.find(mutation.newChildShadowView.tag) != registry.end());
-        auto stubView = registry[mutation.newChildShadowView.tag];
-        stubView->update(mutation.newChildShadowView);
         break;
       }
     }
   }
   STUB_VIEW_LOG({ LOG(ERROR) << "StubView: Mutating End"; });
+
+  // For iOS especially: flush logs because some might be lost on iOS if an
+  // assert is hit right after this.
+  google::FlushLogFiles(google::INFO);
 }
 
 bool operator==(StubViewTree const &lhs, StubViewTree const &rhs) {
   if (lhs.registry.size() != rhs.registry.size()) {
+    STUB_VIEW_LOG({
+      LOG(ERROR) << "Registry sizes are different. Sizes: LHS: "
+                 << lhs.registry.size() << " RHS: " << rhs.registry.size();
+
+      [&](std::ostream &stream) -> std::ostream & {
+        stream << "Tags in LHS: ";
+        for (auto const &pair : lhs.registry) {
+          auto &lhsStubView = *lhs.registry.at(pair.first);
+          stream << "[" << lhsStubView.tag << "]##"
+                 << std::hash<ShadowView>{}((ShadowView)lhsStubView) << " ";
+        }
+        return stream;
+      }(LOG(ERROR));
+
+      [&](std::ostream &stream) -> std::ostream & {
+        stream << "Tags in RHS: ";
+        for (auto const &pair : rhs.registry) {
+          auto &rhsStubView = *rhs.registry.at(pair.first);
+          stream << "[" << rhsStubView.tag << "]##"
+                 << std::hash<ShadowView>{}((ShadowView)rhsStubView) << " ";
+        }
+        return stream;
+      }(LOG(ERROR));
+    });
+
     return false;
   }
 
@@ -167,6 +288,13 @@ bool operator==(StubViewTree const &lhs, StubViewTree const &rhs) {
     auto &rhsStubView = *rhs.registry.at(pair.first);
 
     if (lhsStubView != rhsStubView) {
+      STUB_VIEW_LOG({
+        LOG(ERROR) << "Registry entries are different. LHS: ["
+                   << lhsStubView.tag << "] ##"
+                   << std::hash<ShadowView>{}((ShadowView)lhsStubView)
+                   << " RHS: [" << rhsStubView.tag << "] ##"
+                   << std::hash<ShadowView>{}((ShadowView)rhsStubView);
+      });
       return false;
     }
   }
diff --git a/ReactCommon/react/renderer/mounting/StubViewTree.h b/ReactCommon/react/renderer/mounting/StubViewTree.h
index 3dceaba3dc7e97..c3ce25c8fdf10e 100644
--- a/ReactCommon/react/renderer/mounting/StubViewTree.h
+++ b/ReactCommon/react/renderer/mounting/StubViewTree.h
@@ -21,14 +21,26 @@ class StubViewTree {
   StubViewTree() = default;
   StubViewTree(ShadowView const &shadowView);
 
-  void mutate(
-      ShadowViewMutationList const &mutations,
-      bool ignoreDuplicateCreates = false);
+  void mutate(ShadowViewMutationList const &mutations);
 
   StubView const &getRootStubView() const;
 
+  /*
+   * Returns a view with given tag.
+   */
+  StubView const &getStubView(Tag tag) const;
+
+  /*
+   * Returns the total amount of views in the tree.
+   */
+  size_t size() const;
+
+ private:
   Tag rootTag;
   std::unordered_map<Tag, StubView::Shared> registry{};
+
+  friend bool operator==(StubViewTree const &lhs, StubViewTree const &rhs);
+  friend bool operator!=(StubViewTree const &lhs, StubViewTree const &rhs);
 };
 
 bool operator==(StubViewTree const &lhs, StubViewTree const &rhs);
diff --git a/ReactCommon/react/renderer/mounting/TelemetryController.cpp b/ReactCommon/react/renderer/mounting/TelemetryController.cpp
index b058bebcae8ae4..a9e36d9a399637 100644
--- a/ReactCommon/react/renderer/mounting/TelemetryController.cpp
+++ b/ReactCommon/react/renderer/mounting/TelemetryController.cpp
@@ -30,7 +30,7 @@ bool TelemetryController::pullTransaction(
   auto surfaceId = transaction.getSurfaceId();
   auto number = transaction.getNumber();
   auto telemetry = transaction.getTelemetry();
-  auto numberOfMutations = transaction.getMutations().size();
+  auto numberOfMutations = static_cast<int>(transaction.getMutations().size());
 
   mutex_.lock();
   auto compoundTelemetry = compoundTelemetry_;
diff --git a/ReactCommon/react/renderer/mounting/TelemetryController.h b/ReactCommon/react/renderer/mounting/TelemetryController.h
index c0b3d28ddd2513..3911ea30e42258 100644
--- a/ReactCommon/react/renderer/mounting/TelemetryController.h
+++ b/ReactCommon/react/renderer/mounting/TelemetryController.h
@@ -12,7 +12,7 @@
 
 #include <react/renderer/mounting/MountingTransaction.h>
 #include <react/renderer/mounting/MountingTransactionMetadata.h>
-#include <react/renderer/mounting/TransactionTelemetry.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp b/ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp
deleted file mode 100644
index d81ed7c6bf44b1..00000000000000
--- a/ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "TransactionTelemetry.h"
-
-#include <cassert>
-
-namespace facebook {
-namespace react {
-
-thread_local TransactionTelemetry *threadLocalTransactionTelemetry = nullptr;
-
-TransactionTelemetry *TransactionTelemetry::threadLocalTelemetry() {
-  return threadLocalTransactionTelemetry;
-}
-
-void TransactionTelemetry::setAsThreadLocal() {
-  threadLocalTransactionTelemetry = this;
-}
-
-void TransactionTelemetry::unsetAsThreadLocal() {
-  threadLocalTransactionTelemetry = nullptr;
-}
-
-void TransactionTelemetry::willCommit() {
-  assert(commitStartTime_ == kTelemetryUndefinedTimePoint);
-  assert(commitEndTime_ == kTelemetryUndefinedTimePoint);
-  commitStartTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::didCommit() {
-  assert(commitStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(commitEndTime_ == kTelemetryUndefinedTimePoint);
-  commitEndTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::willDiff() {
-  assert(diffStartTime_ == kTelemetryUndefinedTimePoint);
-  assert(diffEndTime_ == kTelemetryUndefinedTimePoint);
-  diffStartTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::didDiff() {
-  assert(diffStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(diffEndTime_ == kTelemetryUndefinedTimePoint);
-  diffEndTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::willLayout() {
-  assert(layoutStartTime_ == kTelemetryUndefinedTimePoint);
-  assert(layoutEndTime_ == kTelemetryUndefinedTimePoint);
-  layoutStartTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::didMeasureText() {
-  numberOfTextMeasurements_++;
-}
-
-void TransactionTelemetry::didLayout() {
-  assert(layoutStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(layoutEndTime_ == kTelemetryUndefinedTimePoint);
-  layoutEndTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::willMount() {
-  assert(mountStartTime_ == kTelemetryUndefinedTimePoint);
-  assert(mountEndTime_ == kTelemetryUndefinedTimePoint);
-  mountStartTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::didMount() {
-  assert(mountStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(mountEndTime_ == kTelemetryUndefinedTimePoint);
-  mountEndTime_ = telemetryTimePointNow();
-}
-
-void TransactionTelemetry::setRevisionNumber(int revisionNumber) {
-  revisionNumber_ = revisionNumber;
-}
-
-TelemetryTimePoint TransactionTelemetry::getDiffStartTime() const {
-  assert(diffStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(diffEndTime_ != kTelemetryUndefinedTimePoint);
-  return diffStartTime_;
-}
-
-TelemetryTimePoint TransactionTelemetry::getDiffEndTime() const {
-  assert(diffStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(diffEndTime_ != kTelemetryUndefinedTimePoint);
-  return diffEndTime_;
-}
-
-TelemetryTimePoint TransactionTelemetry::getCommitStartTime() const {
-  assert(commitStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(commitEndTime_ != kTelemetryUndefinedTimePoint);
-  return commitStartTime_;
-}
-
-TelemetryTimePoint TransactionTelemetry::getCommitEndTime() const {
-  assert(commitStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(commitEndTime_ != kTelemetryUndefinedTimePoint);
-  return commitEndTime_;
-}
-
-TelemetryTimePoint TransactionTelemetry::getLayoutStartTime() const {
-  assert(layoutStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(layoutEndTime_ != kTelemetryUndefinedTimePoint);
-  return layoutStartTime_;
-}
-
-TelemetryTimePoint TransactionTelemetry::getLayoutEndTime() const {
-  assert(layoutStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(layoutEndTime_ != kTelemetryUndefinedTimePoint);
-  return layoutEndTime_;
-}
-
-TelemetryTimePoint TransactionTelemetry::getMountStartTime() const {
-  assert(mountStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(mountEndTime_ != kTelemetryUndefinedTimePoint);
-  return mountStartTime_;
-}
-
-TelemetryTimePoint TransactionTelemetry::getMountEndTime() const {
-  assert(mountStartTime_ != kTelemetryUndefinedTimePoint);
-  assert(mountEndTime_ != kTelemetryUndefinedTimePoint);
-  return mountEndTime_;
-}
-
-int TransactionTelemetry::getNumberOfTextMeasurements() const {
-  return numberOfTextMeasurements_;
-}
-
-int TransactionTelemetry::getRevisionNumber() const {
-  return revisionNumber_;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/stubs.cpp b/ReactCommon/react/renderer/mounting/stubs.cpp
index 47ce20e9e2c400..c5f76beb203e04 100644
--- a/ReactCommon/react/renderer/mounting/stubs.cpp
+++ b/ReactCommon/react/renderer/mounting/stubs.cpp
@@ -14,6 +14,26 @@
 namespace facebook {
 namespace react {
 
+/*
+ * Sorting comparator for `reorderInPlaceIfNeeded`.
+ */
+static bool shouldFirstPairComesBeforeSecondOne(
+    ShadowViewNodePair const &lhs,
+    ShadowViewNodePair const &rhs) noexcept {
+  return lhs.shadowNode->getOrderIndex() < rhs.shadowNode->getOrderIndex();
+}
+
+/*
+ * Reorders pairs in-place based on `orderIndex` using a stable sort algorithm.
+ */
+static void reorderInPlaceIfNeeded(
+    ShadowViewNodePair::OwningList &pairs) noexcept {
+  // This is a simplified version of the function intentionally copied from
+  // `Differentiator.cpp`.
+  std::stable_sort(
+      pairs.begin(), pairs.end(), &shouldFirstPairComesBeforeSecondOne);
+}
+
 /*
  * Generates `create` and `insert` instructions recursively traversing a shadow
  * tree.
@@ -23,38 +43,56 @@ namespace react {
 static void calculateShadowViewMutationsForNewTree(
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
-    ShadowViewNodePair::List const &newChildPairs) {
-  for (auto index = 0; index < newChildPairs.size(); index++) {
+    ShadowViewNodePair::OwningList newChildPairs) {
+  // Sorting pairs based on `orderIndex` if needed.
+  reorderInPlaceIfNeeded(newChildPairs);
+
+  for (size_t index = 0; index < newChildPairs.size(); index++) {
     auto const &newChildPair = newChildPairs[index];
 
     mutations.push_back(
         ShadowViewMutation::CreateMutation(newChildPair.shadowView));
     mutations.push_back(ShadowViewMutation::InsertMutation(
-        parentShadowView, newChildPair.shadowView, index));
+        parentShadowView, newChildPair.shadowView, static_cast<int>(index)));
 
-    auto const newGrandChildPairs =
-        sliceChildShadowNodeViewPairs(*newChildPair.shadowNode);
+    auto newGrandChildPairs =
+        sliceChildShadowNodeViewPairsLegacy(*newChildPair.shadowNode);
 
     calculateShadowViewMutationsForNewTree(
         mutations, newChildPair.shadowView, newGrandChildPairs);
   }
 }
 
-StubViewTree stubViewTreeFromShadowNode(ShadowNode const &rootShadowNode) {
+StubViewTree buildStubViewTreeWithoutUsingDifferentiator(
+    ShadowNode const &rootShadowNode) {
   auto mutations = ShadowViewMutation::List{};
   mutations.reserve(256);
 
   calculateShadowViewMutationsForNewTree(
       mutations,
       ShadowView(rootShadowNode),
-      sliceChildShadowNodeViewPairs(rootShadowNode));
+      sliceChildShadowNodeViewPairsLegacy(rootShadowNode));
+
+  auto emptyRootShadowNode = rootShadowNode.clone(ShadowNodeFragment{
+      ShadowNodeFragment::propsPlaceholder(),
+      ShadowNode::emptySharedShadowNodeSharedList()});
+
+  auto stubViewTree = StubViewTree(ShadowView(*emptyRootShadowNode));
+  stubViewTree.mutate(mutations);
+  return stubViewTree;
+}
+
+StubViewTree buildStubViewTreeUsingDifferentiator(
+    ShadowNode const &rootShadowNode) {
+  auto emptyRootShadowNode = rootShadowNode.clone(ShadowNodeFragment{
+      ShadowNodeFragment::propsPlaceholder(),
+      ShadowNode::emptySharedShadowNodeSharedList()});
 
-  auto emptyRootShadowNode = rootShadowNode.clone(
-      ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                         ShadowNode::emptySharedShadowNodeSharedList()});
+  auto mutations =
+      calculateShadowViewMutations(*emptyRootShadowNode, rootShadowNode);
 
   auto stubViewTree = StubViewTree(ShadowView(*emptyRootShadowNode));
-  stubViewTree.mutate(mutations, true);
+  stubViewTree.mutate(mutations);
   return stubViewTree;
 }
 
diff --git a/ReactCommon/react/renderer/mounting/stubs.h b/ReactCommon/react/renderer/mounting/stubs.h
index 8a7b564c081073..73ac7b1d8ecccf 100644
--- a/ReactCommon/react/renderer/mounting/stubs.h
+++ b/ReactCommon/react/renderer/mounting/stubs.h
@@ -14,7 +14,19 @@
 namespace facebook {
 namespace react {
 
-StubViewTree stubViewTreeFromShadowNode(ShadowNode const &rootShadowNode);
+/*
+ * Builds a ShadowView tree from given root ShadowNode using custom built-in
+ * implementation (*without* using Differentiator).
+ */
+StubViewTree buildStubViewTreeWithoutUsingDifferentiator(
+    ShadowNode const &rootShadowNode);
+
+/*
+ * Builds a ShadowView tree from given root ShadowNode using Differentiator by
+ * generating mutation instructions between empty and final trees.
+ */
+StubViewTree buildStubViewTreeUsingDifferentiator(
+    ShadowNode const &rootShadowNode);
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp b/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp
index 172134fa39c5e6..8ad2395bef7687 100644
--- a/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp
@@ -9,10 +9,11 @@
 
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/stubs.h>
 
-#include "shadowTreeGeneration.h"
+#include <react/test_utils/shadowTreeGeneration.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
@@ -31,8 +32,12 @@ static SharedViewProps nonFlattenedDefaultProps(
   dynamic["nativeId"] = "NativeId";
   dynamic["accessible"] = true;
 
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   return std::static_pointer_cast<ViewProps const>(
-      componentDescriptor.cloneProps(nullptr, RawProps{dynamic}));
+      componentDescriptor.cloneProps(
+          parserContext, nullptr, RawProps{dynamic}));
 }
 
 static ShadowNode::Shared makeNode(
@@ -44,8 +49,8 @@ static ShadowNode::Shared makeNode(
                          : nonFlattenedDefaultProps(componentDescriptor);
 
   return componentDescriptor.createShadowNode(
-      ShadowNodeFragment{props,
-                         std::make_shared<SharedShadowNodeList>(children)},
+      ShadowNodeFragment{
+          props, std::make_shared<SharedShadowNodeList>(children)},
       componentDescriptor.createFamily({tag, SurfaceId(1), nullptr}, nullptr));
 }
 
@@ -78,10 +83,13 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
               ShadowNodeFragment{RootShadowNode::defaultSharedProps()},
               rootFamily)));
 
+  PropsParserContext parserContext{-1, *contextContainer};
+
   // Applying size constraints.
   emptyRootNode = emptyRootNode->clone(
-      LayoutConstraints{Size{512, 0},
-                        Size{512, std::numeric_limits<Float>::infinity()}},
+      parserContext,
+      LayoutConstraints{
+          Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
       LayoutContext{});
 
   auto childA = makeNode(viewComponentDescriptor, 100, {});
@@ -101,22 +109,23 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
 
   // Construct "identical" shadow nodes: they differ only in children.
   auto shadowNodeV1 = viewComponentDescriptor.createShadowNode(
-      ShadowNodeFragment{generateDefaultProps(viewComponentDescriptor),
-                         std::make_shared<SharedShadowNodeList>(
-                             SharedShadowNodeList{childB, childC, childD})},
+      ShadowNodeFragment{
+          generateDefaultProps(viewComponentDescriptor),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{childB, childC, childD})},
       family);
   auto shadowNodeV2 = shadowNodeV1->clone(ShadowNodeFragment{
       generateDefaultProps(viewComponentDescriptor),
       std::make_shared<SharedShadowNodeList>(
           SharedShadowNodeList{childA, childB, childC, childD})});
-  auto shadowNodeV3 = shadowNodeV2->clone(
-      ShadowNodeFragment{generateDefaultProps(viewComponentDescriptor),
-                         std::make_shared<SharedShadowNodeList>(
-                             SharedShadowNodeList{childB, childC, childD})});
-  auto shadowNodeV4 = shadowNodeV3->clone(
-      ShadowNodeFragment{generateDefaultProps(viewComponentDescriptor),
-                         std::make_shared<SharedShadowNodeList>(
-                             SharedShadowNodeList{childB, childD, childE})});
+  auto shadowNodeV3 = shadowNodeV2->clone(ShadowNodeFragment{
+      generateDefaultProps(viewComponentDescriptor),
+      std::make_shared<SharedShadowNodeList>(
+          SharedShadowNodeList{childB, childC, childD})});
+  auto shadowNodeV4 = shadowNodeV3->clone(ShadowNodeFragment{
+      generateDefaultProps(viewComponentDescriptor),
+      std::make_shared<SharedShadowNodeList>(
+          SharedShadowNodeList{childB, childD, childE})});
   auto shadowNodeV5 = shadowNodeV4->clone(ShadowNodeFragment{
       generateDefaultProps(viewComponentDescriptor),
       std::make_shared<SharedShadowNodeList>(
@@ -127,52 +136,53 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
           childB, childA, childD, childF, childE, childC})});
   auto shadowNodeV7 = shadowNodeV6->clone(ShadowNodeFragment{
       generateDefaultProps(viewComponentDescriptor),
-      std::make_shared<SharedShadowNodeList>(SharedShadowNodeList{childF,
-                                                                  childE,
-                                                                  childC,
-                                                                  childD,
-                                                                  childG,
-                                                                  childH,
-                                                                  childI,
-                                                                  childJ,
-                                                                  childK})});
+      std::make_shared<SharedShadowNodeList>(SharedShadowNodeList{
+          childF,
+          childE,
+          childC,
+          childD,
+          childG,
+          childH,
+          childI,
+          childJ,
+          childK})});
 
   // Injecting a tree into the root node.
   auto rootNodeV1 = std::static_pointer_cast<RootShadowNode const>(
-      emptyRootNode->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV1})}));
+      emptyRootNode->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV1})}));
   auto rootNodeV2 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV1->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV2})}));
+      rootNodeV1->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV2})}));
   auto rootNodeV3 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV2->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV3})}));
+      rootNodeV2->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV3})}));
   auto rootNodeV4 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV3->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV4})}));
+      rootNodeV3->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV4})}));
   auto rootNodeV5 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV4->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV5})}));
+      rootNodeV4->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV5})}));
   auto rootNodeV6 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV5->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV6})}));
+      rootNodeV5->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV6})}));
   auto rootNodeV7 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV6->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV7})}));
+      rootNodeV6->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV7})}));
 
   // Layout
   std::vector<LayoutableShadowNode const *> affectedLayoutableNodesV1{};
@@ -240,8 +250,7 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
     }*/
 
   // Calculating mutations.
-  auto mutations1 =
-      calculateShadowViewMutations(*rootNodeV1, *rootNodeV2, false);
+  auto mutations1 = calculateShadowViewMutations(*rootNodeV1, *rootNodeV2);
 
   // The order and exact mutation instructions here may change at any time.
   // This test just ensures that any changes are intentional.
@@ -257,8 +266,7 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
   EXPECT_TRUE(mutations1[1].index == 0);
 
   // Calculating mutations.
-  auto mutations2 =
-      calculateShadowViewMutations(*rootNodeV2, *rootNodeV3, false);
+  auto mutations2 = calculateShadowViewMutations(*rootNodeV2, *rootNodeV3);
 
   // The order and exact mutation instructions here may change at any time.
   // This test just ensures that any changes are intentional.
@@ -274,8 +282,7 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
   EXPECT_TRUE(mutations2[1].oldChildShadowView.tag == 100);
 
   // Calculating mutations.
-  auto mutations3 =
-      calculateShadowViewMutations(*rootNodeV3, *rootNodeV4, false);
+  auto mutations3 = calculateShadowViewMutations(*rootNodeV3, *rootNodeV4);
   LOG(ERROR) << "Num mutations IN OLD TEST mutations3: " << mutations3.size();
 
   // The order and exact mutation instructions here may change at any time.
@@ -297,8 +304,7 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
   EXPECT_TRUE(mutations3[3].index == 2);
 
   // Calculating mutations.
-  auto mutations4 =
-      calculateShadowViewMutations(*rootNodeV4, *rootNodeV5, false);
+  auto mutations4 = calculateShadowViewMutations(*rootNodeV4, *rootNodeV5);
 
   // The order and exact mutation instructions here may change at any time.
   // This test just ensures that any changes are intentional.
@@ -323,8 +329,7 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
   EXPECT_TRUE(mutations4[5].newChildShadowView.tag == 102);
   EXPECT_TRUE(mutations4[5].index == 3);
 
-  auto mutations5 =
-      calculateShadowViewMutations(*rootNodeV5, *rootNodeV6, false);
+  auto mutations5 = calculateShadowViewMutations(*rootNodeV5, *rootNodeV6);
 
   // The order and exact mutation instructions here may change at any time.
   // This test just ensures that any changes are intentional.
@@ -343,8 +348,7 @@ TEST(MountingTest, testReorderingInstructionGeneration) {
   EXPECT_TRUE(mutations5[3].newChildShadowView.tag == 105);
   EXPECT_TRUE(mutations5[3].index == 3);
 
-  auto mutations6 =
-      calculateShadowViewMutations(*rootNodeV6, *rootNodeV7, false);
+  auto mutations6 = calculateShadowViewMutations(*rootNodeV6, *rootNodeV7);
 
   // The order and exact mutation instructions here may change at any time.
   // This test just ensures that any changes are intentional.
@@ -387,10 +391,13 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
               ShadowNodeFragment{RootShadowNode::defaultSharedProps()},
               rootFamily)));
 
+  PropsParserContext parserContext{-1, *contextContainer};
+
   // Applying size constraints.
   emptyRootNode = emptyRootNode->clone(
-      LayoutConstraints{Size{512, 0},
-                        Size{512, std::numeric_limits<Float>::infinity()}},
+      parserContext,
+      LayoutConstraints{
+          Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
       LayoutContext{});
 
   auto childA = makeNode(viewComponentDescriptor, 100, {});
@@ -541,30 +548,30 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
 
   // Injecting a tree into the root node.
   auto rootNodeV1 = std::static_pointer_cast<RootShadowNode const>(
-      emptyRootNode->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV1})}));
+      emptyRootNode->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV1})}));
   auto rootNodeV2 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV1->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV2})}));
+      rootNodeV1->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV2})}));
   auto rootNodeV3 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV2->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV3})}));
+      rootNodeV2->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV3})}));
   auto rootNodeV4 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV3->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV4})}));
+      rootNodeV3->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV4})}));
   auto rootNodeV5 = std::static_pointer_cast<RootShadowNode const>(
-      rootNodeV4->ShadowNode::clone(
-          ShadowNodeFragment{ShadowNodeFragment::propsPlaceholder(),
-                             std::make_shared<SharedShadowNodeList>(
-                                 SharedShadowNodeList{shadowNodeV5})}));
+      rootNodeV4->ShadowNode::clone(ShadowNodeFragment{
+          ShadowNodeFragment::propsPlaceholder(),
+          std::make_shared<SharedShadowNodeList>(
+              SharedShadowNodeList{shadowNodeV5})}));
 
   // Layout
   std::vector<LayoutableShadowNode const *> affectedLayoutableNodesV1{};
@@ -598,8 +605,7 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
   rootNodeV5->sealRecursive();
 
   // Calculating mutations.
-  auto mutations1 =
-      calculateShadowViewMutations(*rootNodeV1, *rootNodeV2, true);
+  auto mutations1 = calculateShadowViewMutations(*rootNodeV1, *rootNodeV2);
 
   EXPECT_EQ(mutations1.size(), 5);
   EXPECT_EQ(mutations1[0].type, ShadowViewMutation::Update);
@@ -613,8 +619,7 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
   EXPECT_EQ(mutations1[4].type, ShadowViewMutation::Insert);
   EXPECT_EQ(mutations1[4].newChildShadowView.tag, 1000);
 
-  auto mutations2 =
-      calculateShadowViewMutations(*rootNodeV2, *rootNodeV3, true);
+  auto mutations2 = calculateShadowViewMutations(*rootNodeV2, *rootNodeV3);
 
   EXPECT_EQ(mutations2.size(), 5);
   EXPECT_EQ(mutations2[0].type, ShadowViewMutation::Update);
@@ -630,8 +635,7 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
   EXPECT_EQ(mutations2[4].type, ShadowViewMutation::Insert);
   EXPECT_EQ(mutations2[4].newChildShadowView.tag, 1000);
 
-  auto mutations3 =
-      calculateShadowViewMutations(*rootNodeV3, *rootNodeV4, true);
+  auto mutations3 = calculateShadowViewMutations(*rootNodeV3, *rootNodeV4);
 
   // between these two trees, lots of new nodes are created and inserted - this
   // is all correct, and this is the minimal amount of mutations
@@ -668,8 +672,7 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
   EXPECT_EQ(mutations3[14].type, ShadowViewMutation::Insert);
   EXPECT_EQ(mutations3[14].newChildShadowView.tag, 1000);
 
-  auto mutations4 =
-      calculateShadowViewMutations(*rootNodeV4, *rootNodeV5, true);
+  auto mutations4 = calculateShadowViewMutations(*rootNodeV4, *rootNodeV5);
 
   EXPECT_EQ(mutations4.size(), 9);
   EXPECT_EQ(mutations4[0].type, ShadowViewMutation::Update);
diff --git a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
index 1ecfd21a69b670..da9806e58dc5c0 100644
--- a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
@@ -12,12 +12,17 @@
 
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
+
 #include <react/renderer/mounting/stubs.h>
+#include <react/test_utils/Entropy.h>
+#include <react/test_utils/shadowTreeGeneration.h>
 
-#include "Entropy.h"
-#include "shadowTreeGeneration.h"
+// Uncomment when random test blocks are uncommented below.
+// #include <algorithm>
+// #include <random>
 
 namespace facebook {
 namespace react {
@@ -26,8 +31,7 @@ static void testShadowNodeTreeLifeCycle(
     uint_fast32_t seed,
     int treeSize,
     int repeats,
-    int stages,
-    bool useFlattener) {
+    int stages) {
   auto entropy = seed == 0 ? Entropy() : Entropy(seed);
 
   auto eventDispatcher = EventDispatcher::Shared{};
@@ -41,6 +45,8 @@ static void testShadowNodeTreeLifeCycle(
   auto noopEventEmitter =
       std::make_shared<ViewEventEmitter const>(nullptr, -1, eventDispatcher);
 
+  PropsParserContext parserContext{-1, *contextContainer};
+
   auto allNodes = std::vector<ShadowNode::Shared>{};
 
   for (int i = 0; i < repeats; i++) {
@@ -58,8 +64,9 @@ static void testShadowNodeTreeLifeCycle(
 
     // Applying size constraints.
     emptyRootNode = emptyRootNode->clone(
-        LayoutConstraints{Size{512, 0},
-                          Size{512, std::numeric_limits<Float>::infinity()}},
+        parserContext,
+        LayoutConstraints{
+            Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
         LayoutContext{});
 
     // Generation of a random tree.
@@ -74,7 +81,7 @@ static void testShadowNodeTreeLifeCycle(
                 SharedShadowNodeList{singleRootChildNode})}));
 
     // Building an initial view hierarchy.
-    auto viewTree = stubViewTreeFromShadowNode(*emptyRootNode);
+    auto viewTree = buildStubViewTreeWithoutUsingDifferentiator(*emptyRootNode);
     viewTree.mutate(
         calculateShadowViewMutations(*emptyRootNode, *currentRootNode));
 
@@ -88,7 +95,7 @@ static void testShadowNodeTreeLifeCycle(
           {
               &messWithChildren,
               &messWithYogaStyles,
-              &messWithLayotableOnlyFlag,
+              &messWithLayoutableOnlyFlag,
           });
 
       std::vector<LayoutableShadowNode const *> affectedLayoutableNodes{};
@@ -102,12 +109,12 @@ static void testShadowNodeTreeLifeCycle(
       allNodes.push_back(nextRootNode);
 
       // Calculating mutations.
-      auto mutations = calculateShadowViewMutations(
-          *currentRootNode, *nextRootNode, useFlattener);
+      auto mutations =
+          calculateShadowViewMutations(*currentRootNode, *nextRootNode);
 
-      // If using flattener: make sure that in a single frame, a DELETE for a
+      // Make sure that in a single frame, a DELETE for a
       // view is not followed by a CREATE for the same view.
-      if (useFlattener) {
+      {
         std::vector<int> deletedTags{};
         for (auto const &mutation : mutations) {
           if (mutation.type == ShadowViewMutation::Type::Delete) {
@@ -122,7 +129,7 @@ static void testShadowNodeTreeLifeCycle(
                     mutation.newChildShadowView.tag) != deletedTags.end()) {
               LOG(ERROR) << "Deleted tag was recreated in mutations list: ["
                          << mutation.newChildShadowView.tag << "]";
-              FAIL();
+              react_native_assert(false);
             }
           }
         }
@@ -132,7 +139,8 @@ static void testShadowNodeTreeLifeCycle(
       viewTree.mutate(mutations);
 
       // Building a view tree to compare with.
-      auto rebuiltViewTree = stubViewTreeFromShadowNode(*nextRootNode);
+      auto rebuiltViewTree =
+          buildStubViewTreeWithoutUsingDifferentiator(*nextRootNode);
 
       // Comparing the newly built tree with the updated one.
       if (rebuiltViewTree != viewTree) {
@@ -142,7 +150,7 @@ static void testShadowNodeTreeLifeCycle(
 
         // There are some issues getting `getDebugDescription` to compile
         // under test on Android for now.
-#ifndef ANDROID
+#ifdef RN_DEBUG_STRING_CONVERTIBLE
         LOG(ERROR) << "Shadow Tree before: \n"
                    << currentRootNode->getDebugDescription();
         LOG(ERROR) << "Shadow Tree after: \n"
@@ -159,7 +167,158 @@ static void testShadowNodeTreeLifeCycle(
                    << getDebugDescription(mutations, {});
 #endif
 
-        FAIL();
+        react_native_assert(false);
+      }
+
+      currentRootNode = nextRootNode;
+    }
+  }
+
+  SUCCEED();
+}
+
+static void testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
+    uint_fast32_t seed,
+    int treeSize,
+    int repeats,
+    int stages) {
+  auto entropy = seed == 0 ? Entropy() : Entropy(seed);
+
+  auto eventDispatcher = EventDispatcher::Shared{};
+  auto contextContainer = std::make_shared<ContextContainer>();
+  auto componentDescriptorParameters =
+      ComponentDescriptorParameters{eventDispatcher, contextContainer, nullptr};
+  auto viewComponentDescriptor =
+      ViewComponentDescriptor(componentDescriptorParameters);
+  auto rootComponentDescriptor =
+      RootComponentDescriptor(componentDescriptorParameters);
+  auto noopEventEmitter =
+      std::make_shared<ViewEventEmitter const>(nullptr, -1, eventDispatcher);
+
+  PropsParserContext parserContext{-1, *contextContainer};
+
+  auto allNodes = std::vector<ShadowNode::Shared>{};
+
+  for (int i = 0; i < repeats; i++) {
+    allNodes.clear();
+
+    auto family = rootComponentDescriptor.createFamily(
+        {Tag(1), SurfaceId(1), nullptr}, nullptr);
+
+    // Creating an initial root shadow node.
+    auto emptyRootNode = std::const_pointer_cast<RootShadowNode>(
+        std::static_pointer_cast<RootShadowNode const>(
+            rootComponentDescriptor.createShadowNode(
+                ShadowNodeFragment{RootShadowNode::defaultSharedProps()},
+                family)));
+
+    // Applying size constraints.
+    emptyRootNode = emptyRootNode->clone(
+        parserContext,
+        LayoutConstraints{
+            Size{512, 0}, Size{512, std::numeric_limits<Float>::infinity()}},
+        LayoutContext{});
+
+    // Generation of a random tree.
+    auto singleRootChildNode =
+        generateShadowNodeTree(entropy, viewComponentDescriptor, treeSize);
+
+    // Injecting a tree into the root node.
+    auto currentRootNode = std::static_pointer_cast<RootShadowNode const>(
+        emptyRootNode->ShadowNode::clone(ShadowNodeFragment{
+            ShadowNodeFragment::propsPlaceholder(),
+            std::make_shared<SharedShadowNodeList>(
+                SharedShadowNodeList{singleRootChildNode})}));
+
+    // Building an initial view hierarchy.
+    auto viewTree = buildStubViewTreeWithoutUsingDifferentiator(*emptyRootNode);
+    viewTree.mutate(
+        calculateShadowViewMutations(*emptyRootNode, *currentRootNode));
+
+    for (int j = 0; j < stages; j++) {
+      auto nextRootNode = currentRootNode;
+
+      // Mutating the tree.
+      alterShadowTree(
+          entropy,
+          nextRootNode,
+          {
+              &messWithYogaStyles,
+              &messWithLayoutableOnlyFlag,
+          });
+      alterShadowTree(entropy, nextRootNode, &messWithNodeFlattenednessFlags);
+      alterShadowTree(entropy, nextRootNode, &messWithChildren);
+
+      std::vector<LayoutableShadowNode const *> affectedLayoutableNodes{};
+      affectedLayoutableNodes.reserve(1024);
+
+      // Laying out the tree.
+      std::const_pointer_cast<RootShadowNode>(nextRootNode)
+          ->layoutIfNeeded(&affectedLayoutableNodes);
+
+      nextRootNode->sealRecursive();
+      allNodes.push_back(nextRootNode);
+
+      // Calculating mutations.
+      auto mutations =
+          calculateShadowViewMutations(*currentRootNode, *nextRootNode);
+
+      // Make sure that in a single frame, a DELETE for a
+      // view is not followed by a CREATE for the same view.
+      {
+        std::vector<int> deletedTags{};
+        for (auto const &mutation : mutations) {
+          if (mutation.type == ShadowViewMutation::Type::Delete) {
+            deletedTags.push_back(mutation.oldChildShadowView.tag);
+          }
+        }
+        for (auto const &mutation : mutations) {
+          if (mutation.type == ShadowViewMutation::Type::Create) {
+            if (std::find(
+                    deletedTags.begin(),
+                    deletedTags.end(),
+                    mutation.newChildShadowView.tag) != deletedTags.end()) {
+              LOG(ERROR) << "Deleted tag was recreated in mutations list: ["
+                         << mutation.newChildShadowView.tag << "]";
+              react_native_assert(false);
+            }
+          }
+        }
+      }
+
+      // Mutating the view tree.
+      viewTree.mutate(mutations);
+
+      // Building a view tree to compare with.
+      auto rebuiltViewTree =
+          buildStubViewTreeWithoutUsingDifferentiator(*nextRootNode);
+
+      // Comparing the newly built tree with the updated one.
+      if (rebuiltViewTree != viewTree) {
+        // Something went wrong.
+
+        LOG(ERROR) << "Entropy seed: " << entropy.getSeed() << "\n";
+
+        // There are some issues getting `getDebugDescription` to compile
+        // under test on Android for now.
+#ifdef RN_DEBUG_STRING_CONVERTIBLE
+        LOG(ERROR) << "Shadow Tree before: \n"
+                   << currentRootNode->getDebugDescription();
+        LOG(ERROR) << "Shadow Tree after: \n"
+                   << nextRootNode->getDebugDescription();
+
+        LOG(ERROR) << "View Tree before: \n"
+                   << getDebugDescription(viewTree.getRootStubView(), {});
+        LOG(ERROR) << "View Tree after: \n"
+                   << getDebugDescription(
+                          rebuiltViewTree.getRootStubView(), {});
+
+        LOG(ERROR) << "Mutations:"
+                   << "\n"
+                   << getDebugDescription(mutations, {});
+#endif
+
+        react_native_assert(false);
       }
 
       currentRootNode = nextRootNode;
@@ -174,47 +333,90 @@ static void testShadowNodeTreeLifeCycle(
 
 using namespace facebook::react;
 
-TEST(MountingTest, stableBiggerTreeFewerIterationsOptimizedMoves) {
+TEST(
+    ShadowTreeLifecyleTest,
+    stableBiggerTreeFewerIterationsOptimizedMovesFlattener) {
   testShadowNodeTreeLifeCycle(
       /* seed */ 0,
       /* size */ 512,
       /* repeats */ 32,
-      /* stages */ 32,
-      false);
+      /* stages */ 32);
 }
 
-TEST(MountingTest, stableSmallerTreeMoreIterationsOptimizedMoves) {
+TEST(
+    ShadowTreeLifecyleTest,
+    stableBiggerTreeFewerIterationsOptimizedMovesFlattener2) {
+  testShadowNodeTreeLifeCycle(
+      /* seed */ 1,
+      /* size */ 512,
+      /* repeats */ 32,
+      /* stages */ 32);
+}
+
+TEST(
+    ShadowTreeLifecyleTest,
+    stableSmallerTreeMoreIterationsOptimizedMovesFlattener) {
   testShadowNodeTreeLifeCycle(
       /* seed */ 0,
       /* size */ 16,
       /* repeats */ 512,
-      /* stages */ 32,
-      false);
+      /* stages */ 32);
 }
 
-TEST(MountingTest, stableBiggerTreeFewerIterationsOptimizedMovesFlattener) {
-  testShadowNodeTreeLifeCycle(
-      /* seed */ 0,
-      /* size */ 512,
+TEST(
+    ShadowTreeLifecyleTest,
+    unstableSmallerTreeFewerIterationsExtensiveFlatteningUnflattening) {
+  testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
+      /* seed */ 1337,
+      /* size */ 32,
       /* repeats */ 32,
-      /* stages */ 32,
-      true);
+      /* stages */ 32);
 }
 
-TEST(MountingTest, stableBiggerTreeFewerIterationsOptimizedMovesFlattener2) {
-  testShadowNodeTreeLifeCycle(
-      /* seed */ 1,
-      /* size */ 512,
+TEST(
+    ShadowTreeLifecyleTest,
+    unstableBiggerTreeFewerIterationsExtensiveFlatteningUnflattening) {
+  testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
+      /* seed */ 1337,
+      /* size */ 256,
       /* repeats */ 32,
-      /* stages */ 32,
-      true);
+      /* stages */ 32);
 }
 
-TEST(MountingTest, stableSmallerTreeMoreIterationsOptimizedMovesFlattener) {
-  testShadowNodeTreeLifeCycle(
-      /* seed */ 0,
-      /* size */ 16,
+TEST(
+    ShadowTreeLifecyleTest,
+    unstableSmallerTreeMoreIterationsExtensiveFlatteningUnflattening) {
+  testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
+      /* seed */ 1337,
+      /* size */ 32,
       /* repeats */ 512,
-      /* stages */ 32,
-      true);
+      /* stages */ 32);
 }
+
+// failing test case found 4-25-2021
+TEST(
+    ShadowTreeLifecyleTest,
+    unstableSmallerTreeMoreIterationsExtensiveFlatteningUnflattening_1167342011) {
+  testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
+      /* seed */ 1167342011,
+      /* size */ 32,
+      /* repeats */ 512,
+      /* stages */ 32);
+}
+
+// You may uncomment this - locally only! - to generate failing seeds.
+// TEST(
+//     ShadowTreeLifecyleTest,
+//     unstableSmallerTreeMoreIterationsExtensiveFlatteningUnflatteningManyRandom)
+//     {
+//   std::random_device device;
+//   for (int i = 0; i < 10; i++) {
+//     uint_fast32_t seed = device();
+//     LOG(ERROR) << "Seed: " << seed;
+//     testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
+//         /* seed */ seed,
+//         /* size */ 32,
+//         /* repeats */ 512,
+//         /* stages */ 32);
+//   }
+// }
diff --git a/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp b/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp
new file mode 100644
index 00000000000000..521d3135d1311f
--- /dev/null
+++ b/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp
@@ -0,0 +1,787 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <algorithm>
+#include <memory>
+
+#include <gtest/gtest.h>
+
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/components/root/RootComponentDescriptor.h>
+#include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
+#include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/element/ComponentBuilder.h>
+#include <react/renderer/element/Element.h>
+#include <react/renderer/element/testUtils.h>
+#include <react/renderer/mounting/Differentiator.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
+#include <react/renderer/mounting/stubs.h>
+
+namespace facebook {
+namespace react {
+
+class StackingContextTest : public ::testing::Test {
+ protected:
+  ComponentBuilder builder_;
+  std::shared_ptr<RootShadowNode> rootShadowNode_;
+  std::shared_ptr<ViewShadowNode> nodeA_;
+  std::shared_ptr<ViewShadowNode> nodeAA_;
+  std::shared_ptr<ViewShadowNode> nodeB_;
+  std::shared_ptr<ViewShadowNode> nodeBA_;
+  std::shared_ptr<ViewShadowNode> nodeBB_;
+  std::shared_ptr<ViewShadowNode> nodeBBA_;
+  std::shared_ptr<ViewShadowNode> nodeBBB_;
+  std::shared_ptr<ViewShadowNode> nodeBC_;
+  std::shared_ptr<ViewShadowNode> nodeBD_;
+
+  std::shared_ptr<RootShadowNode> currentRootShadowNode_;
+  StubViewTree currentStubViewTree_;
+
+  StackingContextTest() : builder_(simpleComponentBuilder()) {
+    //  ┌────────────── (Root) ──────────────┐
+    //  │ ┏━ A (tag: 2) ━━━━━━━━━━━━━━━━━━━┓ │
+    //  │ ┃                                ┃ │
+    //  │ ┃                                ┃ │
+    //  │ ┃                                ┃ │
+    //  │ ┃                                ┃ │
+    //  │ ┃ ┏━ AA (tag: 3) ━━━━━━━━━━━━━━┓ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │
+    //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+    //  │ ┏━ B (tag: 4) ━━━━━━━━━━━━━━━━━━━┓ │
+    //  │ ┃                                ┃ │
+    //  │ ┃                                ┃ │
+    //  │ ┃                                ┃ │
+    //  │ ┃                                ┃ │
+    //  │ ┃ ┏━ BA (tag: 5) ━━━━━━━━━━━━━━┓ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │
+    //  │ ┃ ┏━ BB (tag: 6) ━━━━━━━━━━━━━━┓ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃ ┏━ BBA (tag: 7) ━━━━━━━━━┓ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │
+    //  │ ┃ ┃ ┏━ BBB (tag: 8) ━━━━━━━━━┓ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │
+    //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │
+    //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │
+    //  │ ┃ ┏━ BC (tag: 9) ━━━━━━━━━━━━━━┓ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │
+    //  │ ┃ ┏━ BD (tag: 10) ━━━━━━━━━━━━━┓ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┃                            ┃ ┃ │
+    //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │
+    //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+    //  └────────────────────────────────────┘
+
+    // clang-format off
+    auto element =
+        Element<RootShadowNode>()
+          .reference(rootShadowNode_)
+          .tag(1)
+          .children({
+            Element<ViewShadowNode>()
+              .tag(2)
+              .reference(nodeA_)
+              .children({
+                Element<ViewShadowNode>()
+                  .tag(3)
+                  .reference(nodeAA_)
+              }),
+            Element<ViewShadowNode>()
+              .tag(4)
+              .reference(nodeB_)
+              .children({
+                Element<ViewShadowNode>()
+                  .tag(5)
+                  .reference(nodeBA_),
+                Element<ViewShadowNode>()
+                  .tag(6)
+                  .reference(nodeBB_)
+                  .children({
+                    Element<ViewShadowNode>()
+                      .tag(7)
+                      .reference(nodeBBA_),
+                    Element<ViewShadowNode>()
+                      .tag(8)
+                      .reference(nodeBBB_)
+                  }),
+                Element<ViewShadowNode>()
+                  .tag(9)
+                  .reference(nodeBC_),
+                Element<ViewShadowNode>()
+                  .tag(10)
+                  .reference(nodeBD_)
+              })
+          });
+    // clang-format on
+
+    builder_.build(element);
+
+    currentRootShadowNode_ = rootShadowNode_;
+    currentRootShadowNode_->layoutIfNeeded();
+    currentStubViewTree_ =
+        buildStubViewTreeWithoutUsingDifferentiator(*currentRootShadowNode_);
+  }
+
+  void mutateViewShadowNodeProps_(
+      std::shared_ptr<ViewShadowNode> node,
+      std::function<void(ViewProps &props)> callback) {
+    rootShadowNode_ =
+        std::static_pointer_cast<RootShadowNode>(rootShadowNode_->cloneTree(
+            node->getFamily(), [&](ShadowNode const &oldShadowNode) {
+              auto viewProps = std::make_shared<ViewProps>();
+              callback(*viewProps);
+              return oldShadowNode.clone(ShadowNodeFragment{viewProps});
+            }));
+  }
+
+  void testViewTree_(
+      std::function<void(StubViewTree const &viewTree)> callback) {
+    rootShadowNode_->layoutIfNeeded();
+
+    callback(buildStubViewTreeUsingDifferentiator(*rootShadowNode_));
+    callback(buildStubViewTreeWithoutUsingDifferentiator(*rootShadowNode_));
+
+    auto mutations =
+        calculateShadowViewMutations(*currentRootShadowNode_, *rootShadowNode_);
+    currentRootShadowNode_ = rootShadowNode_;
+    currentStubViewTree_.mutate(mutations);
+    callback(currentStubViewTree_);
+  }
+};
+
+TEST_F(StackingContextTest, defaultPropsMakeEverythingFlattened) {
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 1 view in total.
+    EXPECT_EQ(viewTree.size(), 1);
+
+    // The root view has no subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 0);
+  });
+}
+
+TEST_F(StackingContextTest, mostPropsDoNotForceViewsToMaterialize) {
+  //  ┌────────────── (Root) ──────────────┐    ┌────────── (Root) ───────────┐
+  //  │ ┏━ A (tag: 2) ━━━━━━━━━━━━━━━━━━━┓ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃ ┏━ AA (tag: 3) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃ padding: 10;               ┃ ┃ │    │                             │
+  //  │ ┃ ┃ margin: 9001;              ┃ ┃ │    │                             │
+  //  │ ┃ ┃ position: absolute;        ┃ ┃ │    │                             │
+  //  │ ┃ ┃ shadowRadius: 10;          ┃ ┃ │    │                             │
+  //  │ ┃ ┃ shadowOffset: [42, 42];    ┃ ┃ │    │                             │
+  //  │ ┃ ┃ backgroundColor: clear;    ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │                             │
+  //  │ ┏━ B (tag: 4) ━━━━━━━━━━━━━━━━━━━┓ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃ ┏━ BA (tag: 5) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃ zIndex: 42;                ┃ ┃ │    │                             │
+  //  │ ┃ ┃ margin: 42;                ┃ ┃ │    │                             │
+  //  │ ┃ ┃ shadowColor: clear;        ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BB (tag: 6) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │ No observable side-effects. │
+  //  │ ┃ ┃                            ┃ ┃ │━━━▶│   No views are generated.   │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┏━ BBA (tag: 7) ━━━━━━━━━┓ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ position: relative;    ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ borderRadii: 42;       ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ borderColor: black;    ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┏━ BBB (tag: 8) ━━━━━━━━━┓ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BC (tag: 9) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BD (tag: 10) ━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃ onLayout: true;            ┃ ┃ │    │                             │
+  //  │ ┃ ┃ hitSlop: 42;               ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │                             │
+  //  └────────────────────────────────────┘    └─────────────────────────────┘
+
+  mutateViewShadowNodeProps_(nodeAA_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.padding()[YGEdgeAll] = YGValue{42, YGUnitPoint};
+    yogaStyle.margin()[YGEdgeAll] = YGValue{42, YGUnitPoint};
+    yogaStyle.positionType() = YGPositionTypeAbsolute;
+    props.shadowRadius = 42;
+    props.shadowOffset = Size{42, 42};
+    props.backgroundColor = clearColor();
+  });
+
+  mutateViewShadowNodeProps_(nodeBA_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    props.zIndex = 42;
+    yogaStyle.margin()[YGEdgeAll] = YGValue{42, YGUnitPoint};
+    props.shadowColor = clearColor();
+    props.shadowOpacity = 0.42;
+  });
+
+  mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+
+    props.borderRadii.all = 42;
+    props.borderColors.all = blackColor();
+  });
+
+  mutateViewShadowNodeProps_(nodeBD_, [](ViewProps &props) {
+    props.onLayout = true;
+    props.hitSlop = EdgeInsets{42, 42, 42, 42};
+  });
+
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 1 view in total.
+    EXPECT_EQ(viewTree.size(), 1);
+
+    // The root view has no subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 0);
+  });
+}
+
+TEST_F(StackingContextTest, somePropsForceViewsToMaterialize1) {
+  //  ┌────────────── (Root) ──────────────┐    ┌─────────── (Root) ──────────┐
+  //  │ ┏━ A (tag: 2) ━━━━━━━━━━━━━━━━━━━┓ │    │ ┏━ AA (tag: 3) ━━━━━━━━━━━┓ │
+  //  │ ┃                                ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃                                ┃ │    │ ┃                         ┃ │
+  //  │ ┃                                ┃ │    │ ┃                         ┃ │
+  //  │ ┃                                ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┏━ AA (tag: 3) ━━━━━━━━━━━━━━┓ ┃ │    │ ┏━ BA (tag: 5) ━━━━━━━━━━━┓ │
+  //  │ ┃ ┃ backgroundColor: black;    ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┏━ BBA (tag: 7) ━━━━━━━━━━┓ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │ ┃                         ┃ │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┏━ B (tag: 4) ━━━━━━━━━━━━━━━━━━━┓ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃                                ┃ │    │                             │
+  //  │ ┃ ┏━ BA (tag: 5) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃ backgroundColor: white;    ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BB (tag: 6) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │━━━▶│                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┏━ BBA (tag: 7) ━━━━━━━━━┓ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ shadowColor: black;    ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┏━ BBB (tag: 8) ━━━━━━━━━┓ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BC (tag: 9) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BD (tag: 10) ━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │                             │
+  //  └────────────────────────────────────┘    └─────────────────────────────┘
+
+  mutateViewShadowNodeProps_(
+      nodeAA_, [](ViewProps &props) { props.backgroundColor = blackColor(); });
+
+  mutateViewShadowNodeProps_(
+      nodeBA_, [](ViewProps &props) { props.backgroundColor = whiteColor(); });
+
+  mutateViewShadowNodeProps_(
+      nodeBBA_, [](ViewProps &props) { props.shadowColor = blackColor(); });
+
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 4 views in total.
+    EXPECT_EQ(viewTree.size(), 4);
+
+    // The root view has all 3 subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 3);
+
+    // The root view subviews are [3, 5, 7].
+    EXPECT_EQ(viewTree.getRootStubView().children.at(0)->tag, 3);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(1)->tag, 5);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(2)->tag, 7);
+  });
+}
+
+TEST_F(StackingContextTest, somePropsForceViewsToMaterialize2) {
+  //  ┌────────────── (Root) ──────────────┐    ┌─────────── (Root) ──────────┐
+  //  │ ┏━ A (tag: 2) ━━━━━━━━━━━━━━━━━━━┓ │    │ ┏━ A (tag: 2) ━━━━━━━━━━━━┓ │
+  //  │ ┃ backgroundColor: black;        ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃                                ┃ │    │ ┃                         ┃ │
+  //  │ ┃                                ┃ │    │ ┃                         ┃ │
+  //  │ ┃                                ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┏━ AA (tag: 3) ━━━━━━━━━━━━━━┓ ┃ │    │ ┏━ AA (tag: 3) ━━━━━━━━━━━┓ │
+  //  │ ┃ ┃ pointerEvents: none;       ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┏━ B (tag: 4) ━━━━━━━━━━━━┓ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │ ┃                         ┃ │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┏━ B (tag: 4) ━━━━━━━━━━━━━━━━━━━┓ │    │ ┏━ BA (tag: 5) ━━━━━━━━━━━┓ │
+  //  │ ┃ testId: "42"                   ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃                                ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃                                ┃ │    │ ┃                         ┃ │
+  //  │ ┃                                ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┏━ BA (tag: 5) ━━━━━━━━━━━━━━┓ ┃ │    │ ┏━ BB (tag: 6) ━━━━━━━━━━━┓ │
+  //  │ ┃ ┃ nativeId: "42"             ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │ ┏━ BBA (tag: 7) ━━━━━━━━━━┓ │
+  //  │ ┃ ┏━ BB (tag: 6) ━━━━━━━━━━━━━━┓ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃ foregroundColor: black;    ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │━━━▶│ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┏━ BBB (tag: 8) ━━━━━━━━━━┓ │
+  //  │ ┃ ┃ ┏━ BBA (tag: 7) ━━━━━━━━━┓ ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃ ┃ transform: scale(2);   ┃ ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │ ┏━ BC (tag: 9) ━━━━━━━━━━━┓ │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃ ┏━ BBB (tag: 8) ━━━━━━━━━┓ ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┃ ┃ position: relative;    ┃ ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃ ┃ zIndex: 42;            ┃ ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │ ┏━ BD (tag: 10) ━━━━━━━━━━┓ │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┏━ BC (tag: 9) ━━━━━━━━━━━━━━┓ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃ shadowColor: black;        ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BD (tag: 10) ━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃ opacity: 0.42;             ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │                             │
+  //  └────────────────────────────────────┘    └─────────────────────────────┘
+
+  mutateViewShadowNodeProps_(
+      nodeA_, [](ViewProps &props) { props.backgroundColor = blackColor(); });
+
+  mutateViewShadowNodeProps_(nodeAA_, [](ViewProps &props) {
+    props.pointerEvents = PointerEventsMode::None;
+  });
+
+  mutateViewShadowNodeProps_(
+      nodeB_, [](ViewProps &props) { props.testId = "42"; });
+
+  mutateViewShadowNodeProps_(
+      nodeBA_, [](ViewProps &props) { props.nativeId = "42"; });
+
+  mutateViewShadowNodeProps_(
+      nodeBB_, [](ViewProps &props) { props.foregroundColor = blackColor(); });
+
+  mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps &props) {
+    props.transform = Transform::Scale(2, 2, 2);
+  });
+
+  mutateViewShadowNodeProps_(nodeBBB_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 42;
+  });
+
+  mutateViewShadowNodeProps_(
+      nodeBC_, [](ViewProps &props) { props.shadowColor = blackColor(); });
+
+  mutateViewShadowNodeProps_(
+      nodeBD_, [](ViewProps &props) { props.opacity = 0.42; });
+
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 10 views in total.
+    EXPECT_EQ(viewTree.size(), 10);
+
+    // The root view has all 9 subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 9);
+  });
+}
+
+TEST_F(StackingContextTest, zIndexAndFlattenedNodes) {
+  //  ┌────────────── (Root) ──────────────┐    ┌────────── (Root) ───────────┐
+  //  │ ┏━ A (tag: 2) ━━━━━━━━━━━━━━━━━━━┓ │    │ ┏━ BD (tag: 10) ━━━━━━━━━━┓ │
+  //  │ ┃                                ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃                                ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃                                ┃ │    │ ┃                         ┃ │
+  //  │ ┃                                ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┏━ AA (tag: 3) ━━━━━━━━━━━━━━┓ ┃ │    │ ┏━ BC (tag: 9) ━━━━━━━━━━━┓ │
+  //  │ ┃ ┃ position: relative;        ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃ zIndex: 9001;              ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┏━ BBB (tag: 8) ━━━━━━━━━━┓ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │ ┃                         ┃ │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┏━ B (tag: 4) ━━━━━━━━━━━━━━━━━━━┓ │    │ ┏━ BBA (tag: 7) ━━━━━━━━━━┓ │
+  //  │ ┃                                ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃                                ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃                                ┃ │    │ ┃                         ┃ │
+  //  │ ┃                                ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┏━ BA (tag: 5) ━━━━━━━━━━━━━━┓ ┃ │    │ ┏━ BA (tag: 5) ━━━━━━━━━━━┓ │
+  //  │ ┃ ┃ position: relative;        ┃ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃ zIndex: 9000;              ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │ ┏━ AA (tag: 3) ━━━━━━━━━━━┓ │
+  //  │ ┃ ┏━ BB (tag: 6) ━━━━━━━━━━━━━━┓ ┃ │    │ ┃ #FormsView              ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┃ #FormsStackingContext   ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │━━━▶│ ┃                         ┃ │
+  //  │ ┃ ┃                            ┃ ┃ │    │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┏━ BBA (tag: 7) ━━━━━━━━━┓ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ position: relative;    ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ zIndex: 8999;          ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┏━ BBB (tag: 8) ━━━━━━━━━┓ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ position: relative;    ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃ zIndex: 8998;          ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┃                        ┃ ┃ ┃ │    │                             │
+  //  │ ┃ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BC (tag: 9) ━━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃ position: relative;        ┃ ┃ │    │                             │
+  //  │ ┃ ┃ zIndex: 8997;              ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┃ ┏━ BD (tag: 10) ━━━━━━━━━━━━━┓ ┃ │    │                             │
+  //  │ ┃ ┃ position: relative;        ┃ ┃ │    │                             │
+  //  │ ┃ ┃ zIndex: 8996;              ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┃                            ┃ ┃ │    │                             │
+  //  │ ┃ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ ┃ │    │                             │
+  //  │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │    │                             │
+  //  └────────────────────────────────────┘    └─────────────────────────────┘
+
+  mutateViewShadowNodeProps_(nodeAA_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 9001;
+  });
+
+  mutateViewShadowNodeProps_(nodeBA_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 9000;
+  });
+
+  mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 8999;
+  });
+
+  mutateViewShadowNodeProps_(nodeBBB_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 8998;
+  });
+
+  mutateViewShadowNodeProps_(nodeBC_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 8997;
+  });
+
+  mutateViewShadowNodeProps_(nodeBD_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 8996;
+  });
+
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 7 views in total.
+    EXPECT_EQ(viewTree.size(), 7);
+
+    // The root view has all 6 subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 6);
+
+    // The root view subviews are [10, 9, 8, 7, 5, 3].
+    EXPECT_EQ(viewTree.getRootStubView().children.at(0)->tag, 10);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(1)->tag, 9);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(2)->tag, 8);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(3)->tag, 7);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(4)->tag, 5);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(5)->tag, 3);
+  });
+
+  // And now let's make BB to form a Stacking Context with small order-index.
+
+  //  ┌────────────── (Root) ──────────────┐     ┌────────── (Root) ──────────┐
+  //  │ ┌─ A (tag: 2) ───────────────────┐ │     │ ┏━ BB (tag: 6) ━━━━━━━━━━┓ │
+  //  │ │                                │ │     │ ┃ #View                  ┃ │
+  //  │ │                                │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │                                │ │     │ ┃                        ┃ │
+  //  │ │                                │ │     │ ┃ ┏━ BBB (tag: 8) ━━━━━┓ ┃ │
+  //  │ │ ┌─ AA (tag: 3) ──────────────┐ │ │     │ ┃ ┃ #View              ┃ ┃ │
+  //  │ │ │ position: relative;        │ │ │     │ ┃ ┃ #StackingContext   ┃ ┃ │
+  //  │ │ │ zIndex: 9001;              │ │ │     │ ┃ ┃                    ┃ ┃ │
+  //  │ │ │                            │ │ │     │ ┃ ┗━━━━━━━━━━━━━━━━━━━━┛ ┃ │
+  //  │ │ │                            │ │ │     │ ┃ ┏━ BBA (tag: 7) ━━━━━┓ ┃ │
+  //  │ │ │                            │ │ │     │ ┃ ┃ #View              ┃ ┃ │
+  //  │ │ │                            │ │ │     │ ┃ ┃ #StackingContext   ┃ ┃ │
+  //  │ │ │                            │ │ │     │ ┃ ┃                    ┃ ┃ │
+  //  │ │ └────────────────────────────┘ │ │     │ ┃ ┗━━━━━━━━━━━━━━━━━━━━┛ ┃ │
+  //  │ └────────────────────────────────┘ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┌─ B (tag: 4) ───────────────────┐ │     │ ┏━ BD (tag: 10) ━━━━━━━━━┓ │
+  //  │ │                                │ │     │ ┃ #View                  ┃ │
+  //  │ │                                │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │                                │ │     │ ┃                        ┃ │
+  //  │ │                                │ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ │ ┌─ BA (tag: 5) ──────────────┐ │ │     │ ┏━ BC (tag: 9) ━━━━━━━━━━┓ │
+  //  │ │ │ position: relative;        │ │ │     │ ┃ #View                  ┃ │
+  //  │ │ │ zIndex: 9000;              │ │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │ │                            │ │ │     │ ┃                        ┃ │
+  //  │ │ │                            │ │ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ │ └────────────────────────────┘ │ │     │ ┏━ BA (tag: 5) ━━━━━━━━━━┓ │
+  //  │ │ ╔═ BB (tag: 6) ══════════════╗ │ │     │ ┃ #View                  ┃ │
+  //  │ │ ║ *** position: relative;    ║ │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │ ║ *** zIndex: 42;            ║ │ │━━━━▶│ ┃                        ┃ │
+  //  │ │ ║                            ║ │ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ │ ║                            ║ │ │     │ ┏━ AA (tag: 3) ━━━━━━━━━━┓ │
+  //  │ │ ║ ┌─ BBA (tag: 7) ─────────┐ ║ │ │     │ ┃ #View                  ┃ │
+  //  │ │ ║ │ position: relative;    │ ║ │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │ ║ │ zIndex: 8999;          │ ║ │ │     │ ┃                        ┃ │
+  //  │ │ ║ │                        │ ║ │ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ │ ║ │                        │ ║ │ │     │                            │
+  //  │ │ ║ └────────────────────────┘ ║ │ │     │                            │
+  //  │ │ ║ ┌─ BBB (tag: 8) ─────────┐ ║ │ │     │                            │
+  //  │ │ ║ │ position: relative;    │ ║ │ │     │                            │
+  //  │ │ ║ │ zIndex: 8998;          │ ║ │ │     │                            │
+  //  │ │ ║ │                        │ ║ │ │     │                            │
+  //  │ │ ║ │                        │ ║ │ │     │                            │
+  //  │ │ ║ └────────────────────────┘ ║ │ │     │                            │
+  //  │ │ ╚════════════════════════════╝ │ │     │                            │
+  //  │ │ ┌─ BC (tag: 9) ──────────────┐ │ │     │                            │
+  //  │ │ │ position: relative;        │ │ │     │                            │
+  //  │ │ │ zIndex: 8997;              │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ └────────────────────────────┘ │ │     │                            │
+  //  │ │ ┌─ BD (tag: 10) ─────────────┐ │ │     │                            │
+  //  │ │ │ position: relative;        │ │ │     │                            │
+  //  │ │ │ zIndex: 8996;              │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ └────────────────────────────┘ │ │     │                            │
+  //  │ └────────────────────────────────┘ │     │                            │
+  //  └────────────────────────────────────┘     └────────────────────────────┘
+
+  mutateViewShadowNodeProps_(nodeBB_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeRelative;
+    props.zIndex = 42;
+  });
+
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 8 views in total.
+    EXPECT_EQ(viewTree.size(), 8);
+
+    // The root view has 5 subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 5);
+
+    // The root view subviews are [6, 10, 9, 5, 3].
+    EXPECT_EQ(viewTree.getRootStubView().children.at(0)->tag, 6);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(1)->tag, 10);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(2)->tag, 9);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(3)->tag, 5);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(4)->tag, 3);
+
+    auto &view6 = viewTree.getStubView(6);
+    EXPECT_EQ(view6.children.size(), 2);
+    EXPECT_EQ(view6.children.at(0)->tag, 8);
+    EXPECT_EQ(view6.children.at(1)->tag, 7);
+  });
+
+  // And now, let's revert it back.
+
+  mutateViewShadowNodeProps_(nodeBB_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.positionType() = YGPositionTypeStatic;
+    props.zIndex = {};
+  });
+
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 7 views in total.
+    EXPECT_EQ(viewTree.size(), 7);
+
+    // The root view has all 6 subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 6);
+
+    // The root view subviews are [10, 9, 8, 7, 5, 3].
+    EXPECT_EQ(viewTree.getRootStubView().children.at(0)->tag, 10);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(1)->tag, 9);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(2)->tag, 8);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(3)->tag, 7);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(4)->tag, 5);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(5)->tag, 3);
+  });
+
+  // And now, let's hide BB completety.
+
+  //  ┌────────────── (Root) ──────────────┐     ┌────────── (Root) ──────────┐
+  //  │ ┌─ A (tag: 2) ───────────────────┐ │     │ ┏━ BD (tag: 10) ━━━━━━━━━┓ │
+  //  │ │                                │ │     │ ┃ #View                  ┃ │
+  //  │ │                                │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │                                │ │     │ ┃                        ┃ │
+  //  │ │                                │ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ │ ┌─ AA (tag: 3) ──────────────┐ │ │     │ ┏━ BC (tag: 9) ━━━━━━━━━━┓ │
+  //  │ │ │ position: relative;        │ │ │     │ ┃ #View                  ┃ │
+  //  │ │ │ zIndex: 9001;              │ │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │ │                            │ │ │     │ ┃                        ┃ │
+  //  │ │ │                            │ │ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ │ │                            │ │ │     │ ┏━ BA (tag: 5) ━━━━━━━━━━┓ │
+  //  │ │ │                            │ │ │     │ ┃ #View                  ┃ │
+  //  │ │ │                            │ │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │ └────────────────────────────┘ │ │     │ ┃                        ┃ │
+  //  │ └────────────────────────────────┘ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ ┌─ B (tag: 4) ───────────────────┐ │     │ ┏━ AA (tag: 3) ━━━━━━━━━━┓ │
+  //  │ │                                │ │     │ ┃ #View                  ┃ │
+  //  │ │                                │ │     │ ┃ #StackingContext       ┃ │
+  //  │ │                                │ │     │ ┃                        ┃ │
+  //  │ │                                │ │     │ ┗━━━━━━━━━━━━━━━━━━━━━━━━┛ │
+  //  │ │ ┌─ BA (tag: 5) ──────────────┐ │ │     │                            │
+  //  │ │ │ position: relative;        │ │ │     │                            │
+  //  │ │ │ zIndex: 9000;              │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ └────────────────────────────┘ │ │     │                            │
+  //  │ │ ╔═ BB (tag: 6) ══════════════╗ │ │     │                            │
+  //  │ │ ║ *** display: none;         ║ │ │     │                            │
+  //  │ │ ║                            ║ │ │━━━━▶│                            │
+  //  │ │ ║                            ║ │ │     │                            │
+  //  │ │ ║                            ║ │ │     │                            │
+  //  │ │ ║ ┌─ BBA (tag: 7) ─────────┐ ║ │ │     │                            │
+  //  │ │ ║ │ position: relative;    │ ║ │ │     │                            │
+  //  │ │ ║ │ zIndex: 8999;          │ ║ │ │     │                            │
+  //  │ │ ║ │                        │ ║ │ │     │                            │
+  //  │ │ ║ │                        │ ║ │ │     │                            │
+  //  │ │ ║ └────────────────────────┘ ║ │ │     │                            │
+  //  │ │ ║ ┌─ BBB (tag: 8) ─────────┐ ║ │ │     │                            │
+  //  │ │ ║ │ position: relative;    │ ║ │ │     │                            │
+  //  │ │ ║ │ zIndex: 8998;          │ ║ │ │     │                            │
+  //  │ │ ║ │                        │ ║ │ │     │                            │
+  //  │ │ ║ │                        │ ║ │ │     │                            │
+  //  │ │ ║ └────────────────────────┘ ║ │ │     │                            │
+  //  │ │ ╚════════════════════════════╝ │ │     │                            │
+  //  │ │ ┌─ BC (tag: 9) ──────────────┐ │ │     │                            │
+  //  │ │ │ position: relative;        │ │ │     │                            │
+  //  │ │ │ zIndex: 8997;              │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ └────────────────────────────┘ │ │     │                            │
+  //  │ │ ┌─ BD (tag: 10) ─────────────┐ │ │     │                            │
+  //  │ │ │ position: relative;        │ │ │     │                            │
+  //  │ │ │ zIndex: 8996;              │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ │                            │ │ │     │                            │
+  //  │ │ └────────────────────────────┘ │ │     │                            │
+  //  │ └────────────────────────────────┘ │     │                            │
+  //  └────────────────────────────────────┘     └────────────────────────────┘
+
+  mutateViewShadowNodeProps_(nodeBB_, [](ViewProps &props) {
+    auto &yogaStyle = props.yogaStyle;
+    yogaStyle.display() = YGDisplayNone;
+  });
+
+  testViewTree_([](StubViewTree const &viewTree) {
+    // 5 views in total.
+    EXPECT_EQ(viewTree.size(), 5);
+
+    // The root view has all 4 subviews.
+    EXPECT_EQ(viewTree.getRootStubView().children.size(), 4);
+
+    // The root view subviews are [10, 9, 5, 3].
+    EXPECT_EQ(viewTree.getRootStubView().children.at(0)->tag, 10);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(1)->tag, 9);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(2)->tag, 5);
+    EXPECT_EQ(viewTree.getRootStubView().children.at(3)->tag, 3);
+  });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
index 088814a2a13a81..b88ec2c33f781c 100644
--- a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
@@ -10,20 +10,27 @@
 #include <gtest/gtest.h>
 
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/element/ComponentBuilder.h>
 #include <react/renderer/element/Element.h>
-#include <react/renderer/element/testUtils.h>
-
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTree.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 
+#include <react/renderer/element/testUtils.h>
+
 using namespace facebook::react;
 
 class DummyShadowTreeDelegate : public ShadowTreeDelegate {
  public:
+  virtual RootShadowNode::Unshared shadowTreeWillCommit(
+      ShadowTree const &shadowTree,
+      RootShadowNode::Shared const &oldRootShadowNode,
+      RootShadowNode::Unshared const &newRootShadowNode) const override {
+    return newRootShadowNode;
+  };
+
   virtual void shadowTreeDidFinishTransaction(
       ShadowTree const &shadowTree,
       MountingCoordinator::Shared const &mountingCoordinator) const override{};
@@ -71,15 +78,20 @@ TEST(StateReconciliationTest, testStateReconciliation) {
             .reference(shadowNodeAB)
             .children({
               Element<ViewShadowNode>()
-                .reference(shadowNodeABA),
-              Element<ViewShadowNode>()
-                .reference(shadowNodeABB),
-              Element<ViewShadowNode>()
-                .reference(shadowNodeABC)
+              .children({
+                Element<ViewShadowNode>()
+                  .reference(shadowNodeABA),
+                Element<ViewShadowNode>()
+                  .reference(shadowNodeABB),
+                Element<ViewShadowNode>()
+                  .reference(shadowNodeABC)
+              })
             })
         });
   // clang-format on
 
+  ContextContainer contextContainer{};
+
   auto shadowNode = builder.build(element);
 
   auto rootShadowNodeState1 = shadowNode->ShadowNode::clone({});
@@ -88,15 +100,12 @@ TEST(StateReconciliationTest, testStateReconciliation) {
   auto &family = shadowNodeAB->getFamily();
   auto state1 = shadowNodeAB->getState();
   auto shadowTreeDelegate = DummyShadowTreeDelegate{};
-  auto eventDispatcher = EventDispatcher::Shared{};
-  auto rootComponentDescriptor =
-      ComponentDescriptorParameters{eventDispatcher, nullptr, nullptr};
-  ShadowTree shadowTree{SurfaceId{11},
-                        LayoutConstraints{},
-                        LayoutContext{},
-                        rootComponentDescriptor,
-                        shadowTreeDelegate,
-                        {}};
+  ShadowTree shadowTree{
+      SurfaceId{11},
+      LayoutConstraints{},
+      LayoutContext{},
+      shadowTreeDelegate,
+      contextContainer};
 
   shadowTree.commit(
       [&](RootShadowNode const &oldRootShadowNode) {
@@ -114,9 +123,10 @@ TEST(StateReconciliationTest, testStateReconciliation) {
 
   auto rootShadowNodeState2 =
       shadowNode->cloneTree(family, [&](ShadowNode const &oldShadowNode) {
-        return oldShadowNode.clone({ShadowNodeFragment::propsPlaceholder(),
-                                    ShadowNodeFragment::childrenPlaceholder(),
-                                    state2});
+        return oldShadowNode.clone(
+            {ShadowNodeFragment::propsPlaceholder(),
+             ShadowNodeFragment::childrenPlaceholder(),
+             state2});
       });
 
   EXPECT_EQ(
@@ -136,9 +146,10 @@ TEST(StateReconciliationTest, testStateReconciliation) {
 
   auto rootShadowNodeState3 = rootShadowNodeState2->cloneTree(
       family, [&](ShadowNode const &oldShadowNode) {
-        return oldShadowNode.clone({ShadowNodeFragment::propsPlaceholder(),
-                                    ShadowNodeFragment::childrenPlaceholder(),
-                                    state3});
+        return oldShadowNode.clone(
+            {ShadowNodeFragment::propsPlaceholder(),
+             ShadowNodeFragment::childrenPlaceholder(),
+             state3});
       });
 
   EXPECT_EQ(
diff --git a/ReactCommon/react/renderer/mounting/tests/TransactionTelemetryTest.cpp b/ReactCommon/react/renderer/mounting/tests/TransactionTelemetryTest.cpp
deleted file mode 100644
index 51e459441759eb..00000000000000
--- a/ReactCommon/react/renderer/mounting/tests/TransactionTelemetryTest.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <chrono>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include <react/renderer/mounting/TransactionTelemetry.h>
-#include <react/utils/Telemetry.h>
-
-using namespace facebook::react;
-
-#define EXPECT_EQ_WITH_THRESHOLD(a, b, threshold) \
-  EXPECT_TRUE((a >= b - threshold) && (a <= b + threshold))
-
-template <typename ClockT>
-void sleep(double durationInSeconds) {
-  auto timepoint = ClockT::now() +
-      std::chrono::milliseconds((long long)(durationInSeconds * 1000));
-  while (ClockT::now() < timepoint) {
-  }
-}
-
-TEST(TransactionTelemetryTest, timepoints) {
-  auto threshold = int64_t{70};
-
-  auto timepointA = telemetryTimePointNow();
-  sleep<TelemetryClock>(0.1);
-  auto timepointB = telemetryTimePointNow();
-
-  auto duration = telemetryDurationToMilliseconds(timepointB - timepointA);
-
-  EXPECT_EQ_WITH_THRESHOLD(duration, 100, threshold);
-}
-
-TEST(TransactionTelemetryTest, normalUseCase) {
-  auto threshold = int64_t{70};
-  auto telemetry = TransactionTelemetry{};
-
-  telemetry.setAsThreadLocal();
-
-  telemetry.willCommit();
-  sleep<TelemetryClock>(0.1);
-  telemetry.willLayout();
-  sleep<TelemetryClock>(0.2);
-
-  telemetry.didMeasureText();
-  TransactionTelemetry::threadLocalTelemetry()->didMeasureText();
-  TransactionTelemetry::threadLocalTelemetry()->didMeasureText();
-
-  telemetry.didLayout();
-  sleep<TelemetryClock>(0.1);
-  telemetry.didCommit();
-
-  telemetry.setRevisionNumber(42);
-
-  telemetry.unsetAsThreadLocal();
-
-  sleep<TelemetryClock>(0.3);
-
-  telemetry.willMount();
-  sleep<TelemetryClock>(0.1);
-  telemetry.didMount();
-
-  auto commitDuration = telemetryDurationToMilliseconds(
-      telemetry.getCommitEndTime() - telemetry.getCommitStartTime());
-  auto layoutDuration = telemetryDurationToMilliseconds(
-      telemetry.getLayoutEndTime() - telemetry.getLayoutStartTime());
-  auto mountDuration = telemetryDurationToMilliseconds(
-      telemetry.getMountEndTime() - telemetry.getMountStartTime());
-
-  EXPECT_EQ_WITH_THRESHOLD(commitDuration, 400, threshold);
-  EXPECT_EQ_WITH_THRESHOLD(layoutDuration, 200, threshold);
-  EXPECT_EQ_WITH_THRESHOLD(mountDuration, 100, threshold);
-
-  EXPECT_EQ(telemetry.getNumberOfTextMeasurements(), 3);
-  EXPECT_EQ(telemetry.getRevisionNumber(), 42);
-}
-
-TEST(TransactionTelemetryTest, abnormalUseCases) {
-  // Calling `did` before `will` should crash.
-  EXPECT_DEATH_IF_SUPPORTED(
-      {
-        auto telemetry = TransactionTelemetry{};
-        telemetry.didDiff();
-      },
-      "diffStartTime_");
-
-  EXPECT_DEATH_IF_SUPPORTED(
-      {
-        auto telemetry = TransactionTelemetry{};
-        telemetry.didCommit();
-      },
-      "commitStartTime_");
-
-  EXPECT_DEATH_IF_SUPPORTED(
-      {
-        auto telemetry = TransactionTelemetry{};
-        telemetry.didMount();
-      },
-      "mountStartTime_");
-
-  // Getting `start` *or* `end` timepoints before a pair of `will` and `did`
-  // should crash.
-  EXPECT_DEATH_IF_SUPPORTED(
-      {
-        auto telemetry = TransactionTelemetry{};
-        telemetry.willCommit();
-        telemetry.getCommitStartTime();
-      },
-      "commitEndTime_");
-
-  EXPECT_DEATH_IF_SUPPORTED(
-      {
-        auto telemetry = TransactionTelemetry{};
-        telemetry.willCommit();
-        telemetry.getCommitEndTime();
-      },
-      "commitEndTime_");
-}
diff --git a/ReactCommon/react/renderer/runtimescheduler/Android.mk b/ReactCommon/react/renderer/runtimescheduler/Android.mk
new file mode 100644
index 00000000000000..010cced3849e6b
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/Android.mk
@@ -0,0 +1,27 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_render_runtimescheduler
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
+
+LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug libjsi
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"Fabric\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,runtimeexecutor)
diff --git a/ReactCommon/react/renderer/runtimescheduler/BUCK b/ReactCommon/react/renderer/runtimescheduler/BUCK
new file mode 100644
index 00000000000000..7cdf02a7637560
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/BUCK
@@ -0,0 +1,77 @@
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "runtimescheduler",
+    srcs = glob(
+        ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = glob(
+        ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "react/renderer/runtimescheduler",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    force_static = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [":tests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        react_native_xplat_target("react/renderer/debug:debug"),
+        react_native_xplat_target("better:better"),
+    ],
+)
+
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/*.cpp"]),
+    headers = glob(["tests/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    platforms = (ANDROID, APPLE, CXX),
+    deps = [
+        react_native_xplat_target("react/renderer/runtimescheduler:runtimescheduler"),
+        "//xplat/hermes/API:HermesAPI",
+        "//xplat/third-party/gmock:gtest",
+    ],
+)
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
new file mode 100644
index 00000000000000..d1550bc85b1acc
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RuntimeScheduler.h"
+
+namespace facebook::react {
+
+#pragma mark - Public
+
+RuntimeScheduler::RuntimeScheduler(
+    RuntimeExecutor const &runtimeExecutor,
+    std::function<RuntimeSchedulerTimePoint()> now)
+    : runtimeExecutor_(runtimeExecutor), now_(now) {}
+
+void RuntimeScheduler::scheduleWork(
+    std::function<void(jsi::Runtime &)> callback) const {
+  if (enableYielding_) {
+    shouldYield_ = true;
+    runtimeExecutor_(
+        [this, callback = std::move(callback)](jsi::Runtime &runtime) {
+          shouldYield_ = false;
+          callback(runtime);
+          startWorkLoop(runtime);
+        });
+  } else {
+    runtimeExecutor_([callback = std::move(callback)](jsi::Runtime &runtime) {
+      callback(runtime);
+    });
+  }
+}
+
+std::shared_ptr<Task> RuntimeScheduler::scheduleTask(
+    SchedulerPriority priority,
+    jsi::Function callback) {
+  auto expirationTime = now() + timeoutForSchedulerPriority(priority);
+  auto task =
+      std::make_shared<Task>(priority, std::move(callback), expirationTime);
+  taskQueue_.push(task);
+
+  if (!isCallbackScheduled_ && !isPerformingWork_) {
+    isCallbackScheduled_ = true;
+    runtimeExecutor_([this](jsi::Runtime &runtime) {
+      isCallbackScheduled_ = false;
+      startWorkLoop(runtime);
+    });
+  }
+
+  return task;
+}
+
+bool RuntimeScheduler::getShouldYield() const noexcept {
+  return shouldYield_;
+}
+
+void RuntimeScheduler::cancelTask(const std::shared_ptr<Task> &task) noexcept {
+  task->callback.reset();
+}
+
+SchedulerPriority RuntimeScheduler::getCurrentPriorityLevel() const noexcept {
+  return currentPriority_;
+}
+
+RuntimeSchedulerTimePoint RuntimeScheduler::now() const noexcept {
+  return now_();
+}
+
+void RuntimeScheduler::setEnableYielding(bool enableYielding) {
+  enableYielding_ = enableYielding;
+}
+
+void RuntimeScheduler::executeNowOnTheSameThread(
+    std::function<void(jsi::Runtime &runtime)> callback) const {
+  shouldYield_ = true;
+  executeSynchronouslyOnSameThread_CAN_DEADLOCK(
+      runtimeExecutor_,
+      [callback = std::move(callback)](jsi::Runtime &runtime) {
+        callback(runtime);
+      });
+  shouldYield_ = false;
+}
+
+#pragma mark - Private
+
+void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const {
+  auto previousPriority = currentPriority_;
+  isPerformingWork_ = true;
+  while (!taskQueue_.empty()) {
+    auto topPriorityTask = taskQueue_.top();
+    auto now = now_();
+    auto didUserCallbackTimeout = topPriorityTask->expirationTime <= now;
+
+    if (!didUserCallbackTimeout && shouldYield_) {
+      // This task hasn't expired and we need to yield.
+      break;
+    }
+    currentPriority_ = topPriorityTask->priority;
+    auto result = topPriorityTask->execute(runtime);
+
+    if (result.isObject() && result.getObject(runtime).isFunction(runtime)) {
+      topPriorityTask->callback =
+          result.getObject(runtime).getFunction(runtime);
+    } else {
+      if (taskQueue_.top() == topPriorityTask) {
+        taskQueue_.pop();
+      }
+    }
+  }
+  currentPriority_ = previousPriority;
+  isPerformingWork_ = false;
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h
new file mode 100644
index 00000000000000..b5dad38ae2ad0b
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <ReactCommon/RuntimeExecutor.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerClock.h>
+#include <react/renderer/runtimescheduler/Task.h>
+#include <atomic>
+#include <memory>
+#include <queue>
+
+namespace facebook::react {
+
+class RuntimeScheduler final {
+ public:
+  RuntimeScheduler(
+      RuntimeExecutor const &runtimeExecutor,
+      std::function<RuntimeSchedulerTimePoint()> now =
+          RuntimeSchedulerClock::now);
+  /*
+   * Not copyable.
+   */
+  RuntimeScheduler(RuntimeScheduler const &) = delete;
+  RuntimeScheduler &operator=(RuntimeScheduler const &) = delete;
+
+  /*
+   * Not movable.
+   */
+  RuntimeScheduler(RuntimeScheduler &&) = delete;
+  RuntimeScheduler &operator=(RuntimeScheduler &&) = delete;
+
+  void scheduleWork(std::function<void(jsi::Runtime &)> callback) const;
+
+  /*
+   * Grants access to the runtime synchronously on the caller's thread.
+   *
+   * Shouldn't be called directly. it is expected to be used
+   * by dispatching a synchronous event via event emitter in your native
+   * component.
+   */
+  void executeNowOnTheSameThread(
+      std::function<void(jsi::Runtime &runtime)> callback) const;
+
+  std::shared_ptr<Task> scheduleTask(
+      SchedulerPriority priority,
+      jsi::Function callback);
+
+  void cancelTask(std::shared_ptr<Task> const &task) noexcept;
+
+  bool getShouldYield() const noexcept;
+
+  SchedulerPriority getCurrentPriorityLevel() const noexcept;
+
+  RuntimeSchedulerTimePoint now() const noexcept;
+
+  void setEnableYielding(bool enableYielding);
+
+ private:
+  mutable std::priority_queue<
+      std::shared_ptr<Task>,
+      std::vector<std::shared_ptr<Task>>,
+      TaskPriorityComparer>
+      taskQueue_;
+
+  RuntimeExecutor const runtimeExecutor_;
+  mutable SchedulerPriority currentPriority_{SchedulerPriority::NormalPriority};
+  mutable std::atomic_bool shouldYield_{false};
+
+  void startWorkLoop(jsi::Runtime &runtime) const;
+
+  /*
+   * Returns a time point representing the current point in time. May be called
+   * from multiple threads.
+   */
+  std::function<RuntimeSchedulerTimePoint()> now_;
+
+  /*
+   * Flag indicating if callback on JavaScript queue has been
+   * scheduled.
+   */
+  std::atomic_bool isCallbackScheduled_{false};
+
+  /*
+   * Flag indicating if yielding is enabled.
+   *
+   * If set to true and Concurrent Mode is enabled on the surface,
+   * React Native will ask React to yield in case any work has been scheduled.
+   * Default value is false
+   */
+  bool enableYielding_{false};
+
+  /*
+   * This flag is set while performing work, to prevent re-entrancy.
+   */
+  mutable bool isPerformingWork_{false};
+};
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
new file mode 100644
index 00000000000000..05a3d3395a4c8a
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RuntimeSchedulerBinding.h"
+#include "SchedulerPriority.h"
+#include "primitives.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <chrono>
+#include <memory>
+
+namespace facebook::react {
+
+std::shared_ptr<RuntimeSchedulerBinding>
+RuntimeSchedulerBinding::createAndInstallIfNeeded(
+    jsi::Runtime &runtime,
+    std::shared_ptr<RuntimeScheduler> const &runtimeScheduler) {
+  auto runtimeSchedulerModuleName = "nativeRuntimeScheduler";
+
+  auto runtimeSchedulerValue =
+      runtime.global().getProperty(runtime, runtimeSchedulerModuleName);
+  if (runtimeSchedulerValue.isUndefined()) {
+    // The global namespace does not have an instance of the binding;
+    // we need to create, install and return it.
+    auto runtimeSchedulerBinding =
+        std::make_shared<RuntimeSchedulerBinding>(runtimeScheduler);
+    auto object =
+        jsi::Object::createFromHostObject(runtime, runtimeSchedulerBinding);
+    runtime.global().setProperty(
+        runtime, runtimeSchedulerModuleName, std::move(object));
+    return runtimeSchedulerBinding;
+  }
+
+  // The global namespace already has an instance of the binding;
+  // we need to return that.
+  auto runtimeSchedulerObject = runtimeSchedulerValue.asObject(runtime);
+  return runtimeSchedulerObject.getHostObject<RuntimeSchedulerBinding>(runtime);
+}
+
+RuntimeSchedulerBinding::RuntimeSchedulerBinding(
+    std::shared_ptr<RuntimeScheduler> const &runtimeScheduler)
+    : runtimeScheduler_(runtimeScheduler) {}
+
+jsi::Value RuntimeSchedulerBinding::get(
+    jsi::Runtime &runtime,
+    jsi::PropNameID const &name) {
+  auto propertyName = name.utf8(runtime);
+
+  if (propertyName == "unstable_scheduleCallback") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        3,
+        [this](
+            jsi::Runtime &runtime,
+            jsi::Value const &,
+            jsi::Value const *arguments,
+            size_t) noexcept -> jsi::Value {
+          SchedulerPriority priority = fromRawValue(arguments[0].getNumber());
+          auto callback = arguments[1].getObject(runtime).getFunction(runtime);
+
+          auto task =
+              runtimeScheduler_->scheduleTask(priority, std::move(callback));
+
+          return valueFromTask(runtime, task);
+        });
+  }
+
+  if (propertyName == "unstable_cancelCallback") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        1,
+        [this](
+            jsi::Runtime &runtime,
+            jsi::Value const &,
+            jsi::Value const *arguments,
+            size_t) noexcept -> jsi::Value {
+          runtimeScheduler_->cancelTask(taskFromValue(runtime, arguments[0]));
+          return jsi::Value::undefined();
+        });
+  }
+
+  if (propertyName == "unstable_shouldYield") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        0,
+        [this](
+            jsi::Runtime &,
+            jsi::Value const &,
+            jsi::Value const *,
+            size_t) noexcept -> jsi::Value {
+          auto shouldYield = runtimeScheduler_->getShouldYield();
+          return jsi::Value(shouldYield);
+        });
+  }
+
+  if (propertyName == "unstable_requestPaint") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        0,
+        [](jsi::Runtime &,
+           jsi::Value const &,
+           jsi::Value const *,
+           size_t) noexcept -> jsi::Value {
+          // RequestPaint is left empty by design.
+          return jsi::Value::undefined();
+        });
+  }
+
+  if (propertyName == "unstable_now") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        0,
+        [this](
+            jsi::Runtime &,
+            jsi::Value const &,
+            jsi::Value const *,
+            size_t) noexcept -> jsi::Value {
+          auto now = runtimeScheduler_->now();
+          auto asDouble =
+              std::chrono::duration<double, std::milli>(now.time_since_epoch())
+                  .count();
+          return jsi::Value(asDouble);
+        });
+  }
+
+  if (propertyName == "unstable_getCurrentPriorityLevel") {
+    auto currentPriorityLevel = runtimeScheduler_->getCurrentPriorityLevel();
+    return jsi::Value(runtime, serialize(currentPriorityLevel));
+  }
+
+  if (propertyName == "unstable_ImmediatePriority") {
+    return jsi::Value(runtime, serialize(SchedulerPriority::ImmediatePriority));
+  }
+
+  if (propertyName == "unstable_UserBlockingPriority") {
+    return jsi::Value(
+        runtime, serialize(SchedulerPriority::UserBlockingPriority));
+  }
+
+  if (propertyName == "unstable_NormalPriority") {
+    return jsi::Value(runtime, serialize(SchedulerPriority::NormalPriority));
+  }
+
+  if (propertyName == "unstable_LowPriority") {
+    return jsi::Value(runtime, serialize(SchedulerPriority::LowPriority));
+  }
+
+  if (propertyName == "unstable_IdlePriority") {
+    return jsi::Value(runtime, serialize(SchedulerPriority::IdlePriority));
+  }
+
+  if (propertyName == "$$typeof") {
+    return jsi::Value::undefined();
+  }
+
+  react_native_assert(false && "undefined property");
+  return jsi::Value::undefined();
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h
new file mode 100644
index 00000000000000..cc4544d6a8f17b
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+
+namespace facebook::react {
+
+/*
+ * Exposes RuntimeScheduler to JavaScript realm.
+ */
+class RuntimeSchedulerBinding : public jsi::HostObject {
+ public:
+  RuntimeSchedulerBinding(
+      std::shared_ptr<RuntimeScheduler> const &runtimeScheduler);
+
+  /*
+   * Installs RuntimeSchedulerBinding into JavaScript runtime if needed.
+   * Creates and sets `RuntimeSchedulerBinding` into the global namespace.
+   * In case if the global namespace already has a `RuntimeSchedulerBinding`
+   * installed, returns that.
+   */
+  static std::shared_ptr<RuntimeSchedulerBinding> createAndInstallIfNeeded(
+      jsi::Runtime &runtime,
+      std::shared_ptr<RuntimeScheduler> const &runtimeScheduler);
+
+  /*
+   * `jsi::HostObject` specific overloads.
+   */
+  jsi::Value get(jsi::Runtime &runtime, jsi::PropNameID const &name) override;
+
+ private:
+  std::shared_ptr<RuntimeScheduler> runtimeScheduler_;
+};
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h
new file mode 100644
index 00000000000000..25e8b327db8f89
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <chrono>
+
+namespace facebook::react {
+
+/*
+ * Represents a monotonic clock suitable for measuring intervals.
+ */
+using RuntimeSchedulerClock = std::chrono::steady_clock;
+
+using RuntimeSchedulerTimePoint = RuntimeSchedulerClock::time_point;
+using RuntimeSchedulerDuration = RuntimeSchedulerClock::duration;
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h b/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h
new file mode 100644
index 00000000000000..4b5a1b7eab2f4e
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <chrono>
+
+namespace facebook::react {
+
+enum class SchedulerPriority : int {
+  ImmediatePriority = 1,
+  UserBlockingPriority = 2,
+  NormalPriority = 3,
+  LowPriority = 4,
+  IdlePriority = 5,
+};
+
+static constexpr std::underlying_type<SchedulerPriority>::type serialize(
+    SchedulerPriority schedulerPriority) {
+  return static_cast<std::underlying_type<SchedulerPriority>::type>(
+      schedulerPriority);
+}
+
+static inline SchedulerPriority fromRawValue(double value) {
+  switch ((int)value) {
+    case 1:
+      return SchedulerPriority::ImmediatePriority;
+    case 2:
+      return SchedulerPriority::UserBlockingPriority;
+    case 3:
+      return SchedulerPriority::NormalPriority;
+    case 4:
+      return SchedulerPriority::LowPriority;
+    case 5:
+      return SchedulerPriority::IdlePriority;
+    default:
+      react_native_assert(false && "Unsupported SchedulerPriority value");
+      return SchedulerPriority::NormalPriority;
+  }
+}
+
+static inline std::chrono::milliseconds timeoutForSchedulerPriority(
+    SchedulerPriority schedulerPriority) {
+  switch (schedulerPriority) {
+    case SchedulerPriority::ImmediatePriority:
+      return std::chrono::milliseconds(-1);
+    case SchedulerPriority::UserBlockingPriority:
+      return std::chrono::milliseconds(250);
+    case SchedulerPriority::NormalPriority:
+      return std::chrono::milliseconds(5000);
+    case SchedulerPriority::LowPriority:
+      return std::chrono::milliseconds(10'000);
+    case SchedulerPriority::IdlePriority:
+      return std::chrono::milliseconds::max();
+  }
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/Task.cpp b/ReactCommon/react/renderer/runtimescheduler/Task.cpp
new file mode 100644
index 00000000000000..b44d9719a10d3d
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/Task.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RuntimeScheduler.h"
+
+namespace facebook::react {
+
+Task::Task(
+    SchedulerPriority priority,
+    jsi::Function callback,
+    std::chrono::steady_clock::time_point expirationTime)
+    : priority(priority),
+      callback(std::move(callback)),
+      expirationTime(expirationTime) {}
+
+jsi::Value Task::execute(jsi::Runtime &runtime) {
+  auto result = jsi::Value::undefined();
+  // Cancelled task doesn't have a callback.
+  if (callback) {
+    // Callback in JavaScript is expecting a single bool parameter.
+    // React team plans to remove it and it is safe to pass in
+    // hardcoded false value.
+    result = callback.value().call(runtime, {false});
+
+    // Destroying callback to prevent calling it twice.
+    callback.reset();
+  }
+  return result;
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/Task.h b/ReactCommon/react/renderer/runtimescheduler/Task.h
new file mode 100644
index 00000000000000..74c387636e78d2
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/Task.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <better/optional.h>
+#include <jsi/jsi.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerClock.h>
+#include <react/renderer/runtimescheduler/SchedulerPriority.h>
+
+namespace facebook::react {
+
+class RuntimeScheduler;
+class TaskPriorityComparer;
+
+struct Task final {
+  Task(
+      SchedulerPriority priority,
+      jsi::Function callback,
+      std::chrono::steady_clock::time_point expirationTime);
+
+ private:
+  friend RuntimeScheduler;
+  friend TaskPriorityComparer;
+
+  SchedulerPriority priority;
+  better::optional<jsi::Function> callback;
+  RuntimeSchedulerClock::time_point expirationTime;
+
+  jsi::Value execute(jsi::Runtime &runtime);
+};
+
+class TaskPriorityComparer {
+ public:
+  inline bool operator()(
+      std::shared_ptr<Task> const &lhs,
+      std::shared_ptr<Task> const &rhs) {
+    return lhs->expirationTime > rhs->expirationTime;
+  }
+};
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/primitives.h b/ReactCommon/react/renderer/runtimescheduler/primitives.h
new file mode 100644
index 00000000000000..76794941452ee1
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/primitives.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <jsi/jsi.h>
+#include <react/renderer/runtimescheduler/Task.h>
+
+namespace facebook::react {
+
+struct TaskWrapper : public jsi::HostObject {
+  TaskWrapper(std::shared_ptr<Task> const &task) : task(task) {}
+
+  std::shared_ptr<Task> task;
+};
+
+inline static jsi::Value valueFromTask(
+    jsi::Runtime &runtime,
+    std::shared_ptr<Task> const &task) {
+  return jsi::Object::createFromHostObject(
+      runtime, std::make_shared<TaskWrapper>(task));
+}
+
+inline static std::shared_ptr<Task> taskFromValue(
+    jsi::Runtime &runtime,
+    jsi::Value const &value) {
+  if (value.isNull()) {
+    return nullptr;
+  }
+
+  return value.getObject(runtime).getHostObject<TaskWrapper>(runtime)->task;
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp b/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
new file mode 100644
index 00000000000000..abb6a96b4824ce
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
@@ -0,0 +1,472 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <gtest/gtest.h>
+#include <hermes/API/hermes/hermes.h>
+#include <jsi/jsi.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#include <memory>
+#include "StubClock.h"
+#include "StubQueue.h"
+
+namespace facebook::react {
+
+using namespace std::chrono_literals;
+
+class RuntimeSchedulerTest : public testing::Test {
+ protected:
+  void SetUp() override {
+    hostFunctionCallCount_ = 0;
+    runtime_ = facebook::hermes::makeHermesRuntime();
+    stubQueue_ = std::make_unique<StubQueue>();
+
+    RuntimeExecutor runtimeExecutor =
+        [this](
+            std::function<void(facebook::jsi::Runtime & runtime)> &&callback) {
+          stubQueue_->runOnQueue([this, callback = std::move(callback)]() {
+            callback(*runtime_);
+          });
+        };
+
+    stubClock_ = std::make_unique<StubClock>(StubClock());
+
+    auto stubNow = [this]() -> RuntimeSchedulerTimePoint {
+      return stubClock_->getNow();
+    };
+
+    runtimeScheduler_ =
+        std::make_unique<RuntimeScheduler>(runtimeExecutor, stubNow);
+  }
+
+  jsi::Function createHostFunctionFromLambda(
+      std::function<jsi::Value(bool)> callback) {
+    return jsi::Function::createFromHostFunction(
+        *runtime_,
+        jsi::PropNameID::forUtf8(*runtime_, ""),
+        3,
+        [this, callback = std::move(callback)](
+            jsi::Runtime &,
+            jsi::Value const &,
+            jsi::Value const *arguments,
+            size_t) noexcept -> jsi::Value {
+          ++hostFunctionCallCount_;
+          auto didUserCallbackTimeout = arguments[0].getBool();
+          return callback(didUserCallbackTimeout);
+        });
+  }
+
+  uint hostFunctionCallCount_;
+
+  std::unique_ptr<facebook::hermes::HermesRuntime> runtime_;
+  std::unique_ptr<StubClock> stubClock_;
+  std::unique_ptr<StubQueue> stubQueue_;
+  std::unique_ptr<RuntimeScheduler> runtimeScheduler_;
+};
+
+TEST_F(RuntimeSchedulerTest, now) {
+  stubClock_->setTimePoint(1ms);
+
+  EXPECT_EQ(runtimeScheduler_->now(), RuntimeSchedulerTimePoint(1ms));
+
+  stubClock_->advanceTimeBy(10ms);
+
+  EXPECT_EQ(runtimeScheduler_->now(), RuntimeSchedulerTimePoint(11ms));
+
+  stubClock_->advanceTimeBy(6s);
+
+  EXPECT_EQ(runtimeScheduler_->now(), RuntimeSchedulerTimePoint(6011ms));
+}
+
+TEST_F(RuntimeSchedulerTest, getShouldYield) {
+  // Always returns false for now.
+  EXPECT_FALSE(runtimeScheduler_->getShouldYield());
+}
+
+TEST_F(RuntimeSchedulerTest, scheduleSingleTask) {
+  bool didRunTask = false;
+  auto callback =
+      createHostFunctionFromLambda([&didRunTask](bool didUserCallbackTimeout) {
+        didRunTask = true;
+        EXPECT_FALSE(didUserCallbackTimeout);
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callback));
+
+  EXPECT_FALSE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_TRUE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, scheduleImmediatePriorityTask) {
+  bool didRunTask = false;
+  auto callback =
+      createHostFunctionFromLambda([&didRunTask](bool didUserCallbackTimeout) {
+        didRunTask = true;
+        EXPECT_FALSE(didUserCallbackTimeout);
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::ImmediatePriority, std::move(callback));
+
+  EXPECT_FALSE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_TRUE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, taskExpiration) {
+  bool didRunTask = false;
+  auto callback =
+      createHostFunctionFromLambda([&didRunTask](bool didUserCallbackTimeout) {
+        didRunTask = true;
+        // Task has timed out but the parameter is deprecated and `false` is
+        // hardcoded.
+        EXPECT_FALSE(didUserCallbackTimeout);
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callback));
+
+  // Task with normal priority has 5s timeout.
+  stubClock_->advanceTimeBy(6s);
+
+  EXPECT_FALSE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_TRUE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithSamePriority) {
+  uint firstTaskCallOrder;
+  auto callbackOne =
+      createHostFunctionFromLambda([this, &firstTaskCallOrder](bool) {
+        firstTaskCallOrder = hostFunctionCallCount_;
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callbackOne));
+
+  uint secondTaskCallOrder;
+  auto callbackTwo =
+      createHostFunctionFromLambda([this, &secondTaskCallOrder](bool) {
+        secondTaskCallOrder = hostFunctionCallCount_;
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callbackTwo));
+
+  EXPECT_EQ(firstTaskCallOrder, 0);
+  EXPECT_EQ(secondTaskCallOrder, 0);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_EQ(firstTaskCallOrder, 1);
+  EXPECT_EQ(secondTaskCallOrder, 2);
+  EXPECT_EQ(stubQueue_->size(), 0);
+  EXPECT_EQ(hostFunctionCallCount_, 2);
+}
+
+TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithDifferentPriorities) {
+  uint lowPriorityTaskCallOrder;
+  auto callbackOne =
+      createHostFunctionFromLambda([this, &lowPriorityTaskCallOrder](bool) {
+        lowPriorityTaskCallOrder = hostFunctionCallCount_;
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::LowPriority, std::move(callbackOne));
+
+  uint userBlockingPriorityTaskCallOrder;
+  auto callbackTwo = createHostFunctionFromLambda(
+      [this, &userBlockingPriorityTaskCallOrder](bool) {
+        userBlockingPriorityTaskCallOrder = hostFunctionCallCount_;
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::UserBlockingPriority, std::move(callbackTwo));
+
+  EXPECT_EQ(lowPriorityTaskCallOrder, 0);
+  EXPECT_EQ(userBlockingPriorityTaskCallOrder, 0);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_EQ(lowPriorityTaskCallOrder, 2);
+  EXPECT_EQ(userBlockingPriorityTaskCallOrder, 1);
+  EXPECT_EQ(stubQueue_->size(), 0);
+  EXPECT_EQ(hostFunctionCallCount_, 2);
+}
+
+TEST_F(RuntimeSchedulerTest, cancelTask) {
+  bool didRunTask = false;
+  auto callback = createHostFunctionFromLambda([&didRunTask](bool) {
+    didRunTask = true;
+    return jsi::Value::undefined();
+  });
+
+  auto task = runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callback));
+
+  EXPECT_FALSE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  runtimeScheduler_->cancelTask(task);
+
+  stubQueue_->tick();
+
+  EXPECT_FALSE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, continuationTask) {
+  bool didRunTask = false;
+  bool didContinuationTask = false;
+
+  auto callback = createHostFunctionFromLambda([&](bool) {
+    didRunTask = true;
+    return jsi::Function::createFromHostFunction(
+        *runtime_,
+        jsi::PropNameID::forUtf8(*runtime_, ""),
+        1,
+        [&](jsi::Runtime &runtime,
+            jsi::Value const &,
+            jsi::Value const *arguments,
+            size_t) noexcept -> jsi::Value {
+          didContinuationTask = true;
+          return jsi::Value::undefined();
+        });
+  });
+
+  auto task = runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callback));
+
+  EXPECT_FALSE(didRunTask);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_TRUE(didRunTask);
+  EXPECT_TRUE(didContinuationTask);
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) {
+  auto callback =
+      createHostFunctionFromLambda([this](bool didUserCallbackTimeout) {
+        EXPECT_EQ(
+            runtimeScheduler_->getCurrentPriorityLevel(),
+            SchedulerPriority::ImmediatePriority);
+        return jsi::Value::undefined();
+      });
+
+  EXPECT_EQ(
+      runtimeScheduler_->getCurrentPriorityLevel(),
+      SchedulerPriority::NormalPriority);
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::ImmediatePriority, std::move(callback));
+
+  stubQueue_->tick();
+
+  EXPECT_EQ(
+      runtimeScheduler_->getCurrentPriorityLevel(),
+      SchedulerPriority::NormalPriority);
+
+  callback = createHostFunctionFromLambda([this](bool didUserCallbackTimeout) {
+    EXPECT_EQ(
+        runtimeScheduler_->getCurrentPriorityLevel(),
+        SchedulerPriority::IdlePriority);
+    return jsi::Value::undefined();
+  });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::IdlePriority, std::move(callback));
+
+  stubQueue_->tick();
+
+  EXPECT_EQ(
+      runtimeScheduler_->getCurrentPriorityLevel(),
+      SchedulerPriority::NormalPriority);
+}
+
+TEST_F(RuntimeSchedulerTest, scheduleWork) {
+  bool wasCalled = false;
+  runtimeScheduler_->scheduleWork(
+      [&](jsi::Runtime const &) { wasCalled = true; });
+
+  EXPECT_FALSE(wasCalled);
+
+  EXPECT_FALSE(runtimeScheduler_->getShouldYield());
+
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_TRUE(wasCalled);
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, scheduleWorkWithYielding) {
+  runtimeScheduler_->setEnableYielding(true);
+  bool wasCalled = false;
+  runtimeScheduler_->scheduleWork(
+      [&](jsi::Runtime const &) { wasCalled = true; });
+
+  EXPECT_FALSE(wasCalled);
+
+  EXPECT_TRUE(runtimeScheduler_->getShouldYield());
+
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_TRUE(wasCalled);
+  EXPECT_FALSE(runtimeScheduler_->getShouldYield());
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, normalTaskYieldsToPlatformEvent) {
+  runtimeScheduler_->setEnableYielding(true);
+
+  bool didRunJavaScriptTask = false;
+  bool didRunPlatformWork = false;
+
+  auto callback = createHostFunctionFromLambda([&](bool) {
+    didRunJavaScriptTask = true;
+    EXPECT_TRUE(didRunPlatformWork);
+    return jsi::Value::undefined();
+  });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callback));
+
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+    didRunPlatformWork = true;
+    EXPECT_FALSE(didRunJavaScriptTask);
+    EXPECT_FALSE(runtimeScheduler_->getShouldYield());
+  });
+
+  EXPECT_TRUE(runtimeScheduler_->getShouldYield());
+  EXPECT_EQ(stubQueue_->size(), 2);
+
+  stubQueue_->flush();
+
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, expiredTaskDoesntYieldToPlatformEvent) {
+  runtimeScheduler_->setEnableYielding(true);
+
+  bool didRunJavaScriptTask = false;
+  bool didRunPlatformWork = false;
+
+  auto callback = createHostFunctionFromLambda([&](bool) {
+    didRunJavaScriptTask = true;
+    EXPECT_FALSE(didRunPlatformWork);
+    return jsi::Value::undefined();
+  });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(callback));
+
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+    didRunPlatformWork = true;
+    EXPECT_TRUE(didRunJavaScriptTask);
+  });
+
+  EXPECT_TRUE(runtimeScheduler_->getShouldYield());
+  EXPECT_EQ(stubQueue_->size(), 2);
+
+  stubClock_->advanceTimeBy(6s);
+
+  stubQueue_->flush();
+
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, immediateTaskDoesntYieldToPlatformEvent) {
+  runtimeScheduler_->setEnableYielding(true);
+
+  bool didRunJavaScriptTask = false;
+  bool didRunPlatformWork = false;
+
+  auto callback = createHostFunctionFromLambda([&](bool) {
+    didRunJavaScriptTask = true;
+    EXPECT_FALSE(didRunPlatformWork);
+    return jsi::Value::undefined();
+  });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::ImmediatePriority, std::move(callback));
+
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+    didRunPlatformWork = true;
+    EXPECT_TRUE(didRunJavaScriptTask);
+  });
+
+  EXPECT_TRUE(runtimeScheduler_->getShouldYield());
+  EXPECT_EQ(stubQueue_->size(), 2);
+
+  stubQueue_->flush();
+
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+TEST_F(RuntimeSchedulerTest, scheduleTaskFromTask) {
+  bool didRunFirstTask = false;
+  bool didRunSecondTask = false;
+  auto firstCallback = createHostFunctionFromLambda(
+      [this, &didRunFirstTask, &didRunSecondTask](bool didUserCallbackTimeout) {
+        didRunFirstTask = true;
+        EXPECT_FALSE(didUserCallbackTimeout);
+
+        auto secondCallback = createHostFunctionFromLambda(
+            [&didRunSecondTask](bool didUserCallbackTimeout) {
+              didRunSecondTask = true;
+              EXPECT_FALSE(didUserCallbackTimeout);
+              return jsi::Value::undefined();
+            });
+
+        runtimeScheduler_->scheduleTask(
+            SchedulerPriority::ImmediatePriority, std::move(secondCallback));
+        return jsi::Value::undefined();
+      });
+
+  runtimeScheduler_->scheduleTask(
+      SchedulerPriority::NormalPriority, std::move(firstCallback));
+
+  EXPECT_FALSE(didRunFirstTask);
+  EXPECT_FALSE(didRunSecondTask);
+  EXPECT_EQ(stubQueue_->size(), 1);
+
+  stubQueue_->tick();
+
+  EXPECT_TRUE(didRunFirstTask);
+  EXPECT_TRUE(didRunSecondTask);
+  EXPECT_EQ(stubQueue_->size(), 0);
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/tests/SchedulerPriorityTest.cpp b/ReactCommon/react/renderer/runtimescheduler/tests/SchedulerPriorityTest.cpp
new file mode 100644
index 00000000000000..4139e2f0c16cbb
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/tests/SchedulerPriorityTest.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <gtest/gtest.h>
+#include <react/renderer/runtimescheduler/Task.h>
+#include <chrono>
+
+using namespace facebook::react;
+
+TEST(SchedulerPriorityTest, fromRawValue) {
+  EXPECT_EQ(SchedulerPriority::ImmediatePriority, fromRawValue(1.0));
+  EXPECT_EQ(SchedulerPriority::UserBlockingPriority, fromRawValue(2.0));
+  EXPECT_EQ(SchedulerPriority::NormalPriority, fromRawValue(3.0));
+  EXPECT_EQ(SchedulerPriority::LowPriority, fromRawValue(4.0));
+  EXPECT_EQ(SchedulerPriority::IdlePriority, fromRawValue(5.0));
+}
+
+TEST(SchedulerPriorityTest, serialize) {
+  EXPECT_EQ(serialize(SchedulerPriority::ImmediatePriority), 1);
+  EXPECT_EQ(serialize(SchedulerPriority::UserBlockingPriority), 2);
+  EXPECT_EQ(serialize(SchedulerPriority::NormalPriority), 3);
+  EXPECT_EQ(serialize(SchedulerPriority::LowPriority), 4);
+  EXPECT_EQ(serialize(SchedulerPriority::IdlePriority), 5);
+}
+
+TEST(SchedulerPriorityTest, timeoutForSchedulerPriority) {
+  EXPECT_EQ(
+      timeoutForSchedulerPriority(SchedulerPriority::ImmediatePriority),
+      std::chrono::milliseconds(-1));
+  EXPECT_EQ(
+      timeoutForSchedulerPriority(SchedulerPriority::UserBlockingPriority),
+      std::chrono::milliseconds(250));
+  EXPECT_EQ(
+      timeoutForSchedulerPriority(SchedulerPriority::NormalPriority),
+      std::chrono::seconds(5));
+  EXPECT_EQ(
+      timeoutForSchedulerPriority(SchedulerPriority::LowPriority),
+      std::chrono::seconds(10));
+  EXPECT_EQ(
+      timeoutForSchedulerPriority(SchedulerPriority::IdlePriority),
+      std::chrono::milliseconds::max());
+}
diff --git a/ReactCommon/react/renderer/runtimescheduler/tests/StubClock.h b/ReactCommon/react/renderer/runtimescheduler/tests/StubClock.h
new file mode 100644
index 00000000000000..6ac977fd7d536a
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/tests/StubClock.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/runtimescheduler/RuntimeSchedulerClock.h>
+#include <chrono>
+
+namespace facebook::react {
+
+class StubClock {
+ public:
+  RuntimeSchedulerTimePoint getNow() const {
+    return timePoint_;
+  }
+
+  void setTimePoint(RuntimeSchedulerTimePoint timePoint) {
+    timePoint_ = timePoint;
+  }
+
+  void setTimePoint(RuntimeSchedulerDuration duration) {
+    timePoint_ = RuntimeSchedulerTimePoint(duration);
+  }
+
+  RuntimeSchedulerTimePoint getTimePoint() {
+    return timePoint_;
+  }
+
+  void advanceTimeBy(RuntimeSchedulerDuration duration) {
+    timePoint_ += duration;
+  }
+
+ private:
+  RuntimeSchedulerTimePoint timePoint_;
+};
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h b/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h
new file mode 100644
index 00000000000000..272be4833b0069
--- /dev/null
+++ b/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <queue>
+
+class StubQueue {
+ public:
+  void runOnQueue(std::function<void()> &&func) {
+    callbackQueue_.push(func);
+  }
+
+  void flush() {
+    while (!callbackQueue_.empty()) {
+      tick();
+    }
+  }
+
+  void tick() {
+    if (!callbackQueue_.empty()) {
+      auto callback = callbackQueue_.front();
+      callback();
+      callbackQueue_.pop();
+    }
+  }
+
+  int size() {
+    return callbackQueue_.size();
+  }
+
+ private:
+  std::queue<std::function<void()>> callbackQueue_;
+};
diff --git a/ReactCommon/react/renderer/scheduler/Android.mk b/ReactCommon/react/renderer/scheduler/Android.mk
index e1599588bba3c7..32b8f71dd04780 100644
--- a/ReactCommon/react/renderer/scheduler/Android.mk
+++ b/ReactCommon/react/renderer/scheduler/Android.mk
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga libreact_render_components_view libreact_utils libreact_render_templateprocessor libreact_render_graphics libreact_render_uimanager libfolly_futures libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug libreact_render_components_root libreact_render_mounting
+LOCAL_SHARED_LIBRARIES := libyoga librrc_view libreact_utils libreact_render_templateprocessor libreact_render_graphics libreact_render_uimanager libfolly_futures libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug librrc_root libreact_render_mounting libreact_debug libreact_render_runtimescheduler
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -37,6 +37,8 @@ $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/mounting)
 $(call import-module,react/renderer/uimanager)
+$(call import-module,react/renderer/runtimescheduler)
 $(call import-module,react/renderer/templateprocessor)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
diff --git a/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp
index 2649227d327ffd..e625afe059bbf8 100644
--- a/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp
+++ b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp
@@ -7,8 +7,9 @@
 
 #include "AsynchronousEventBeat.h"
 
-namespace facebook {
-namespace react {
+#include <react/debug/react_native_assert.h>
+
+namespace facebook::react {
 
 AsynchronousEventBeat::AsynchronousEventBeat(
     RunLoopObserver::Unique uiRunLoopObserver,
@@ -22,34 +23,36 @@ AsynchronousEventBeat::AsynchronousEventBeat(
 
 void AsynchronousEventBeat::activityDidChange(
     RunLoopObserver::Delegate const *delegate,
-    RunLoopObserver::Activity activity) const noexcept {
-  assert(delegate == this);
+    RunLoopObserver::Activity) const noexcept {
+  react_native_assert(delegate == this);
   induce();
 }
 
 void AsynchronousEventBeat::induce() const {
-  if (!isRequested_) {
+  if (!isRequested_ || isBeatCallbackScheduled_) {
     return;
   }
 
+  isRequested_ = false;
+
   // Here we know that `this` object exists because the caller has a strong
   // pointer to `owner`. To ensure the object will exist inside
   // `runtimeExecutor_` callback, we need to copy the  pointer there.
   auto weakOwner = uiRunLoopObserver_->getOwner();
 
-  runtimeExecutor_([this, weakOwner](jsi::Runtime &runtime) mutable {
+  isBeatCallbackScheduled_ = true;
+
+  runtimeExecutor_([this, weakOwner](jsi::Runtime &runtime) {
+    isBeatCallbackScheduled_ = false;
+
     auto owner = weakOwner.lock();
     if (!owner) {
       return;
     }
 
-    if (!isRequested_) {
-      return;
+    if (beatCallback_) {
+      beatCallback_(runtime);
     }
-
-    this->beat(runtime);
   });
 }
-
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h
index 1acdcbb02d038c..c6751a087912be 100644
--- a/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h
+++ b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h
@@ -9,8 +9,7 @@
 #include <react/renderer/core/EventBeat.h>
 #include <react/utils/RunLoopObserver.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Event beat associated with JavaScript runtime.
@@ -35,7 +34,8 @@ class AsynchronousEventBeat : public EventBeat,
  private:
   RunLoopObserver::Unique uiRunLoopObserver_;
   RuntimeExecutor runtimeExecutor_;
+
+  mutable std::atomic<bool> isBeatCallbackScheduled_{false};
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/scheduler/BUCK b/ReactCommon/react/renderer/scheduler/BUCK
index 8c525383da0616..be576471252b1b 100644
--- a/ReactCommon/react/renderer/scheduler/BUCK
+++ b/ReactCommon/react/renderer/scheduler/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -6,6 +5,7 @@ load(
     "CXX",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -33,7 +33,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -55,11 +55,13 @@ rn_xplat_cxx_library(
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
+        react_native_xplat_target("react/config:config"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/mounting:mounting"),
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
+        react_native_xplat_target("react/renderer/runtimescheduler:runtimescheduler"),
         react_native_xplat_target("react/renderer/templateprocessor:templateprocessor"),
-        react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/components/root:root"),
diff --git a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerComponentDescriptor.h b/ReactCommon/react/renderer/scheduler/InspectorData.h
similarity index 51%
rename from ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerComponentDescriptor.h
rename to ReactCommon/react/renderer/scheduler/InspectorData.h
index 0c5622241fca7a..ac77165b0dd0e2 100644
--- a/ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerComponentDescriptor.h
+++ b/ReactCommon/react/renderer/scheduler/InspectorData.h
@@ -5,17 +5,20 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#pragma once
-
-#include "AndroidDialogPickerShadowNode.h"
-
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <vector>
 
 namespace facebook {
 namespace react {
 
-using AndroidDialogPickerComponentDescriptor =
-    ConcreteComponentDescriptor<AndroidDialogPickerShadowNode>;
+struct InspectorData {
+  std::vector<std::string> hierarchy;
+  int selectedIndex;
+  std::string fileName;
+  int lineNumber;
+  int columnNumber;
+  // TODO T97216348: remove folly::dynamic from InspectorData struct
+  folly::dynamic props;
+};
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
index 1f0c617ef8d58a..2d5e153505a4ca 100644
--- a/ReactCommon/react/renderer/scheduler/Scheduler.cpp
+++ b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -10,11 +10,15 @@
 #include <glog/logging.h>
 #include <jsi/jsi.h>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+#include <react/renderer/core/Constants.h>
+#include <react/renderer/core/EventQueueProcessor.h>
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
 #include <react/renderer/templateprocessor/UITemplateProcessor.h>
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
@@ -32,16 +36,18 @@ Scheduler::Scheduler(
     UIManagerAnimationDelegate *animationDelegate,
     SchedulerDelegate *delegate) {
   runtimeExecutor_ = schedulerToolbox.runtimeExecutor;
+  contextContainer_ = schedulerToolbox.contextContainer;
 
   reactNativeConfig_ =
-      schedulerToolbox.contextContainer
-          ->at<std::shared_ptr<const ReactNativeConfig>>("ReactNativeConfig");
+      contextContainer_->at<std::shared_ptr<const ReactNativeConfig>>(
+          "ReactNativeConfig");
 
   // Creating a container for future `EventDispatcher` instance.
   eventDispatcher_ =
       std::make_shared<better::optional<EventDispatcher const>>();
 
-  auto uiManager = std::make_shared<UIManager>();
+  auto uiManager = std::make_shared<UIManager>(
+      runtimeExecutor_, schedulerToolbox.backgroundExecutor, contextContainer_);
   auto eventOwnerBox = std::make_shared<EventBeat::OwnerBox>();
   eventOwnerBox->owner = eventDispatcher_;
 
@@ -49,11 +55,14 @@ Scheduler::Scheduler(
                        jsi::Runtime &runtime,
                        const EventTarget *eventTarget,
                        const std::string &type,
+                       ReactEventPriority priority,
                        const ValueFactory &payloadFactory) {
-    uiManager->visitBinding([&](UIManagerBinding const &uiManagerBinding) {
-      uiManagerBinding.dispatchEvent(
-          runtime, eventTarget, type, payloadFactory);
-    });
+    uiManager->visitBinding(
+        [&](UIManagerBinding const &uiManagerBinding) {
+          uiManagerBinding.dispatchEvent(
+              runtime, eventTarget, type, priority, payloadFactory);
+        },
+        runtime);
   };
 
   auto statePipe = [uiManager](StateUpdate const &stateUpdate) {
@@ -63,8 +72,7 @@ Scheduler::Scheduler(
   // Creating an `EventDispatcher` instance inside the already allocated
   // container (inside the optional).
   eventDispatcher_->emplace(
-      eventPipe,
-      statePipe,
+      EventQueueProcessor(eventPipe, statePipe),
       schedulerToolbox.synchronousEventBeatFactory,
       schedulerToolbox.asynchronousEventBeatFactory,
       eventOwnerBox);
@@ -74,31 +82,34 @@ Scheduler::Scheduler(
       EventDispatcher::Shared{eventDispatcher_, &eventDispatcher_->value()};
 
   componentDescriptorRegistry_ = schedulerToolbox.componentRegistryFactory(
-      eventDispatcher, schedulerToolbox.contextContainer);
+      eventDispatcher, contextContainer_);
 
-  rootComponentDescriptor_ = std::make_unique<const RootComponentDescriptor>(
-      ComponentDescriptorParameters{eventDispatcher, nullptr, nullptr});
-
-  uiManager->setBackgroundExecutor(schedulerToolbox.backgroundExecutor);
   uiManager->setDelegate(this);
   uiManager->setComponentDescriptorRegistry(componentDescriptorRegistry_);
 
-  runtimeExecutor_([=](jsi::Runtime &runtime) {
-    auto uiManagerBinding = UIManagerBinding::createAndInstallIfNeeded(runtime);
+  runtimeExecutor_([uiManager,
+                    runtimeExecutor = runtimeExecutor_](jsi::Runtime &runtime) {
+    auto uiManagerBinding =
+        UIManagerBinding::createAndInstallIfNeeded(runtime, runtimeExecutor);
     uiManagerBinding->attach(uiManager);
   });
 
   auto componentDescriptorRegistryKey =
       "ComponentDescriptorRegistry_DO_NOT_USE_PRETTY_PLEASE";
-  schedulerToolbox.contextContainer->erase(componentDescriptorRegistryKey);
-  schedulerToolbox.contextContainer->insert(
+  contextContainer_->erase(componentDescriptorRegistryKey);
+  contextContainer_->insert(
       componentDescriptorRegistryKey,
       std::weak_ptr<ComponentDescriptorRegistry const>(
           componentDescriptorRegistry_));
 
   delegate_ = delegate;
+  commitHooks_ = schedulerToolbox.commitHooks;
   uiManager_ = uiManager;
 
+  for (auto commitHook : commitHooks_) {
+    uiManager->registerCommitHook(*commitHook);
+  }
+
   if (animationDelegate != nullptr) {
     animationDelegate->setComponentDescriptorRegistry(
         componentDescriptorRegistry_);
@@ -106,21 +117,13 @@ Scheduler::Scheduler(
   uiManager_->setAnimationDelegate(animationDelegate);
 
 #ifdef ANDROID
-  enableReparentingDetection_ = reactNativeConfig_->getBool(
-      "react_fabric:enable_reparenting_detection_android");
   removeOutstandingSurfacesOnDestruction_ = reactNativeConfig_->getBool(
       "react_fabric:remove_outstanding_surfaces_on_destruction_android");
-  uiManager_->experimentEnableStateUpdateWithAutorepeat =
-      reactNativeConfig_->getBool(
-          "react_fabric:enable_state_update_with_autorepeat_android");
+  Constants::setPropsForwardingEnabled(reactNativeConfig_->getBool(
+      "react_fabric:enable_props_forwarding_android"));
 #else
-  enableReparentingDetection_ = reactNativeConfig_->getBool(
-      "react_fabric:enable_reparenting_detection_ios");
   removeOutstandingSurfacesOnDestruction_ = reactNativeConfig_->getBool(
       "react_fabric:remove_outstanding_surfaces_on_destruction_ios");
-  uiManager_->experimentEnableStateUpdateWithAutorepeat =
-      reactNativeConfig_->getBool(
-          "react_fabric:enable_state_update_with_autorepeat_ios");
 #endif
 }
 
@@ -128,6 +131,10 @@ Scheduler::~Scheduler() {
   LOG(WARNING) << "Scheduler::~Scheduler() was called (address: " << this
                << ").";
 
+  for (auto commitHook : commitHooks_) {
+    uiManager_->unregisterCommitHook(*commitHook);
+  }
+
   // All Surfaces must be explicitly stopped before destroying `Scheduler`.
   // The idea is that `UIManager` is allowed to call `Scheduler` only if the
   // corresponding `ShadowTree` instance exists.
@@ -143,9 +150,10 @@ Scheduler::~Scheduler() {
         surfaceIds.push_back(shadowTree.getSurfaceId());
       });
 
-  assert(
-      surfaceIds.empty() &&
-      "Scheduler was destroyed with outstanding Surfaces.");
+  // TODO(T88046056): Fix Android memory leak before uncommenting changes
+  //  react_native_assert(
+  //      surfaceIds.empty() &&
+  //      "Scheduler was destroyed with outstanding Surfaces.");
 
   if (surfaceIds.empty()) {
     return;
@@ -175,35 +183,46 @@ Scheduler::~Scheduler() {
   }
 }
 
-void Scheduler::startSurface(
-    SurfaceId surfaceId,
-    const std::string &moduleName,
-    const folly::dynamic &initialProps,
-    const LayoutConstraints &layoutConstraints,
-    const LayoutContext &layoutContext,
-    std::weak_ptr<MountingOverrideDelegate const> mountingOverrideDelegate)
-    const {
-  SystraceSection s("Scheduler::startSurface");
-
-  auto shadowTree = std::make_unique<ShadowTree>(
-      surfaceId,
-      layoutConstraints,
-      layoutContext,
-      *rootComponentDescriptor_,
-      *uiManager_,
-      mountingOverrideDelegate,
-      enableReparentingDetection_);
-
-  auto uiManager = uiManager_;
-
-  uiManager->getShadowTreeRegistry().add(std::move(shadowTree));
-
-  runtimeExecutor_([=](jsi::Runtime &runtime) {
-    uiManager->visitBinding([&](UIManagerBinding const &uiManagerBinding) {
-      uiManagerBinding.startSurface(
-          runtime, surfaceId, moduleName, initialProps);
-    });
-  });
+void Scheduler::registerSurface(
+    SurfaceHandler const &surfaceHandler) const noexcept {
+  surfaceHandler.setContextContainer(getContextContainer());
+  surfaceHandler.setUIManager(uiManager_.get());
+}
+
+InspectorData Scheduler::getInspectorDataForInstance(
+    SharedEventEmitter eventEmitter) const noexcept {
+  return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
+      runtimeExecutor_, [=](jsi::Runtime &runtime) -> InspectorData {
+        auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
+        auto value = uiManagerBinding->getInspectorDataForInstance(
+            runtime, eventEmitter);
+
+        // TODO T97216348: avoid transforming jsi into folly::dynamic
+        auto dynamic = jsi::dynamicFromValue(runtime, value);
+        auto source = dynamic["source"];
+
+        InspectorData result = {};
+        result.fileName =
+            source["fileName"].isNull() ? "" : source["fileName"].c_str();
+        result.lineNumber = (int)source["lineNumber"].getDouble();
+        result.columnNumber = (int)source["columnNumber"].getDouble();
+        result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
+        // TODO T97216348: remove folly::dynamic from InspectorData struct
+        result.props = dynamic["props"];
+        auto hierarchy = dynamic["hierarchy"];
+        for (size_t i = 0; i < hierarchy.size(); i++) {
+          auto viewHierarchyValue = hierarchy[i]["name"];
+          if (!viewHierarchyValue.isNull()) {
+            result.hierarchy.push_back(viewHierarchyValue.c_str());
+          }
+        }
+        return result;
+      });
+}
+
+void Scheduler::unregisterSurface(
+    SurfaceHandler const &surfaceHandler) const noexcept {
+  surfaceHandler.setUIManager(nullptr);
 }
 
 void Scheduler::renderTemplateToSurface(
@@ -243,77 +262,6 @@ void Scheduler::renderTemplateToSurface(
   }
 }
 
-void Scheduler::stopSurface(SurfaceId surfaceId) const {
-  SystraceSection s("Scheduler::stopSurface");
-
-  // Stop any ongoing animations.
-  uiManager_->stopSurfaceForAnimationDelegate(surfaceId);
-
-  // Waiting for all concurrent commits to be finished and unregistering the
-  // `ShadowTree`.
-  auto shadowTree = uiManager_->getShadowTreeRegistry().remove(surfaceId);
-
-  // As part of stopping a Surface, we need to properly destroy all
-  // mounted views, so we need to commit an empty tree to trigger all
-  // side-effects (including destroying and removing mounted views).
-  if (shadowTree) {
-    shadowTree->commitEmptyTree();
-  }
-
-  // We execute JavaScript/React part of the process at the very end to minimize
-  // any visible side-effects of stopping the Surface. Any possible commits from
-  // the JavaScript side will not be able to reference a `ShadowTree` and will
-  // fail silently.
-  auto uiManager = uiManager_;
-  runtimeExecutor_([=](jsi::Runtime &runtime) {
-    uiManager->visitBinding([&](UIManagerBinding const &uiManagerBinding) {
-      uiManagerBinding.stopSurface(runtime, surfaceId);
-    });
-  });
-}
-
-Size Scheduler::measureSurface(
-    SurfaceId surfaceId,
-    const LayoutConstraints &layoutConstraints,
-    const LayoutContext &layoutContext) const {
-  SystraceSection s("Scheduler::measureSurface");
-
-  auto currentRootShadowNode = RootShadowNode::Shared{};
-  uiManager_->getShadowTreeRegistry().visit(
-      surfaceId, [&](const ShadowTree &shadowTree) {
-        currentRootShadowNode = shadowTree.getCurrentRevision().rootShadowNode;
-      });
-
-  auto rootShadowNode =
-      currentRootShadowNode->clone(layoutConstraints, layoutContext);
-  rootShadowNode->layoutIfNeeded();
-  return rootShadowNode->getLayoutMetrics().frame.size;
-}
-
-MountingCoordinator::Shared Scheduler::findMountingCoordinator(
-    SurfaceId surfaceId) const {
-  MountingCoordinator::Shared mountingCoordinator = nullptr;
-  uiManager_->getShadowTreeRegistry().visit(
-      surfaceId, [&](const ShadowTree &shadowTree) {
-        mountingCoordinator = shadowTree.getMountingCoordinator();
-      });
-  return mountingCoordinator;
-}
-
-void Scheduler::constraintSurfaceLayout(
-    SurfaceId surfaceId,
-    const LayoutConstraints &layoutConstraints,
-    const LayoutContext &layoutContext) const {
-  SystraceSection s("Scheduler::constraintSurfaceLayout");
-
-  uiManager_->getShadowTreeRegistry().visit(
-      surfaceId, [&](ShadowTree const &shadowTree) {
-        shadowTree.commit([&](RootShadowNode const &oldRootShadowNode) {
-          return oldRootShadowNode.clone(layoutConstraints, layoutContext);
-        });
-      });
-}
-
 ComponentDescriptor const *
 Scheduler::findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN(
     ComponentHandle handle) const {
@@ -347,14 +295,23 @@ void Scheduler::uiManagerDidFinishTransaction(
     delegate_->schedulerDidFinishTransaction(mountingCoordinator);
   }
 }
-void Scheduler::uiManagerDidCreateShadowNode(
-    const ShadowNode::Shared &shadowNode) {
+void Scheduler::uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) {
   SystraceSection s("Scheduler::uiManagerDidCreateShadowNode");
 
   if (delegate_) {
-    auto shadowView = ShadowView(*shadowNode);
     delegate_->schedulerDidRequestPreliminaryViewAllocation(
-        shadowNode->getSurfaceId(), shadowView);
+        shadowNode.getSurfaceId(), shadowNode);
+  }
+}
+
+void Scheduler::uiManagerDidCloneShadowNode(
+    const ShadowNode &oldShadowNode,
+    const ShadowNode &newShadowNode) {
+  SystraceSection s("Scheduler::uiManagerDidCloneShadowNode");
+
+  if (delegate_) {
+    delegate_->schedulerDidCloneShadowNode(
+        newShadowNode.getSurfaceId(), oldShadowNode, newShadowNode);
   }
 }
 
@@ -370,30 +327,33 @@ void Scheduler::uiManagerDidDispatchCommand(
   }
 }
 
-/*
- * Set JS responder for a view
- */
-void Scheduler::uiManagerDidSetJSResponder(
-    SurfaceId surfaceId,
+void Scheduler::uiManagerDidSendAccessibilityEvent(
     const ShadowNode::Shared &shadowNode,
-    bool blockNativeResponder) {
+    std::string const &eventType) {
+  SystraceSection s("Scheduler::uiManagerDidSendAccessibilityEvent");
+
   if (delegate_) {
-    // TODO: the first shadowView paramenter, should be the first parent that
-    // is non virtual.
     auto shadowView = ShadowView(*shadowNode);
-    delegate_->schedulerDidSetJSResponder(
-        surfaceId, shadowView, shadowView, blockNativeResponder);
+    delegate_->schedulerDidSendAccessibilityEvent(shadowView, eventType);
   }
 }
 
 /*
- * Clear the JSResponder for a view
+ * Set JS responder for a view.
  */
-void Scheduler::uiManagerDidClearJSResponder() {
+void Scheduler::uiManagerDidSetIsJSResponder(
+    ShadowNode::Shared const &shadowNode,
+    bool isJSResponder,
+    bool blockNativeResponder) {
   if (delegate_) {
-    delegate_->schedulerDidClearJSResponder();
+    delegate_->schedulerDidSetIsJSResponder(
+        ShadowView(*shadowNode), isJSResponder, blockNativeResponder);
   }
 }
 
+ContextContainer::Shared Scheduler::getContextContainer() const {
+  return contextContainer_;
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/scheduler/Scheduler.h b/ReactCommon/react/renderer/scheduler/Scheduler.h
index 3b5693cb724093..e604c4adacaba6 100644
--- a/ReactCommon/react/renderer/scheduler/Scheduler.h
+++ b/ReactCommon/react/renderer/scheduler/Scheduler.h
@@ -15,10 +15,13 @@
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
+#include <react/renderer/scheduler/InspectorData.h>
 #include <react/renderer/scheduler/SchedulerDelegate.h>
 #include <react/renderer/scheduler/SchedulerToolbox.h>
+#include <react/renderer/scheduler/SurfaceHandler.h>
 #include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
 #include <react/renderer/uimanager/UIManagerDelegate.h>
@@ -40,50 +43,30 @@ class Scheduler final : public UIManagerDelegate {
 
 #pragma mark - Surface Management
 
-  void startSurface(
-      SurfaceId surfaceId,
-      const std::string &moduleName,
-      const folly::dynamic &initialProps,
-      const LayoutConstraints &layoutConstraints = {},
-      const LayoutContext &layoutContext = {},
-      std::weak_ptr<MountingOverrideDelegate const> mountingOverrideDelegate =
-          {}) const;
+  /*
+   * Registers and unregisters a `SurfaceHandler` object in the `Scheduler`.
+   * All registered `SurfaceHandler` objects must be unregistered
+   * (with the same `Scheduler`) before their deallocation.
+   */
+  void registerSurface(SurfaceHandler const &surfaceHandler) const noexcept;
+  void unregisterSurface(SurfaceHandler const &surfaceHandler) const noexcept;
+
+  InspectorData getInspectorDataForInstance(
+      SharedEventEmitter eventEmitter) const noexcept;
 
   void renderTemplateToSurface(
       SurfaceId surfaceId,
       const std::string &uiTemplate);
 
-  void stopSurface(SurfaceId surfaceId) const;
-
-  Size measureSurface(
-      SurfaceId surfaceId,
-      const LayoutConstraints &layoutConstraints,
-      const LayoutContext &layoutContext) const;
-
-  /*
-   * Applies given `layoutConstraints` and `layoutContext` to a Surface.
-   * The user interface will be relaid out as a result. The operation will be
-   * performed synchronously (including mounting) if the method is called
-   * on the main thread.
-   * Can be called from any thread.
-   */
-  void constraintSurfaceLayout(
-      SurfaceId surfaceId,
-      const LayoutConstraints &layoutConstraints,
-      const LayoutContext &layoutContext) const;
-
   /*
    * This is broken. Please do not use.
    * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,
-   * there is no any garantees about their lifetime.
+   * there is no any guarantees about their lifetime.
    */
   ComponentDescriptor const *
   findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN(
       ComponentHandle handle) const;
 
-  MountingCoordinator::Shared findMountingCoordinator(
-      SurfaceId surfaceId) const;
-
 #pragma mark - Delegate
 
   /*
@@ -105,26 +88,36 @@ class Scheduler final : public UIManagerDelegate {
 
   void uiManagerDidFinishTransaction(
       MountingCoordinator::Shared const &mountingCoordinator) override;
-  void uiManagerDidCreateShadowNode(
-      const ShadowNode::Shared &shadowNode) override;
+  void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) override;
+  void uiManagerDidCloneShadowNode(
+      const ShadowNode &oldShadowNode,
+      const ShadowNode &newShadowNode) override;
   void uiManagerDidDispatchCommand(
       const ShadowNode::Shared &shadowNode,
       std::string const &commandName,
       folly::dynamic const args) override;
-  void uiManagerDidSetJSResponder(
-      SurfaceId surfaceId,
-      const ShadowNode::Shared &shadowView,
+  void uiManagerDidSendAccessibilityEvent(
+      const ShadowNode::Shared &shadowNode,
+      std::string const &eventType) override;
+  void uiManagerDidSetIsJSResponder(
+      ShadowNode::Shared const &shadowView,
+      bool isJSResponder,
       bool blockNativeResponder) override;
-  void uiManagerDidClearJSResponder() override;
+
+#pragma mark - ContextContainer
+  ContextContainer::Shared getContextContainer() const;
 
  private:
+  friend class SurfaceHandler;
+
   SchedulerDelegate *delegate_;
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
-  std::unique_ptr<const RootComponentDescriptor> rootComponentDescriptor_;
   RuntimeExecutor runtimeExecutor_;
   std::shared_ptr<UIManager> uiManager_;
   std::shared_ptr<const ReactNativeConfig> reactNativeConfig_;
 
+  std::vector<std::shared_ptr<UIManagerCommitHook const>> commitHooks_;
+
   /*
    * At some point, we have to have an owning shared pointer to something that
    * will become an `EventDispatcher` a moment later. That's why we have it as a
@@ -134,10 +127,15 @@ class Scheduler final : public UIManagerDelegate {
    */
   std::shared_ptr<better::optional<EventDispatcher const>> eventDispatcher_;
 
+  /**
+   * Hold onto ContextContainer. See SchedulerToolbox.
+   * Must not be nullptr.
+   */
+  ContextContainer::Shared contextContainer_;
+
   /*
    * Temporary flags.
    */
-  bool enableReparentingDetection_{false};
   bool removeOutstandingSurfacesOnDestruction_{false};
 };
 
diff --git a/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h b/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
index 33be7dcb6e3d10..cfd41c5d30d189 100644
--- a/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
+++ b/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
@@ -34,26 +34,32 @@ class SchedulerDelegate {
    */
   virtual void schedulerDidRequestPreliminaryViewAllocation(
       SurfaceId surfaceId,
-      const ShadowView &shadowView) = 0;
+      const ShadowNode &shadowView) = 0;
+
+  /*
+   * Called right after a ShadowNode is cloned.
+   */
+  virtual void schedulerDidCloneShadowNode(
+      SurfaceId surfaceId,
+      const ShadowNode &oldShadowNode,
+      const ShadowNode &newShadowNode) = 0;
 
   virtual void schedulerDidDispatchCommand(
       const ShadowView &shadowView,
       std::string const &commandName,
       folly::dynamic const args) = 0;
 
-  /*
-   * Set JS responder for a view
-   */
-  virtual void schedulerDidSetJSResponder(
-      SurfaceId surfaceId,
+  virtual void schedulerDidSendAccessibilityEvent(
       const ShadowView &shadowView,
-      const ShadowView &initialShadowView,
-      bool blockNativeResponder) = 0;
+      std::string const &eventType) = 0;
 
   /*
-   * Clear the JSResponder for a view
+   * Set JS responder for a view
    */
-  virtual void schedulerDidClearJSResponder() = 0;
+  virtual void schedulerDidSetIsJSResponder(
+      ShadowView const &shadowView,
+      bool isJSResponder,
+      bool blockNativeResponder) = 0;
 
   virtual ~SchedulerDelegate() noexcept = default;
 };
diff --git a/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h b/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
index a98d450f37323a..c6c2c179e0e7f5 100644
--- a/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
+++ b/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
@@ -7,9 +7,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include <ReactCommon/RuntimeExecutor.h>
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/core/EventBeat.h>
+#include <react/renderer/leakchecker/LeakChecker.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#include <react/renderer/uimanager/UIManagerCommitHook.h>
 #include <react/renderer/uimanager/primitives.h>
 #include <react/utils/ContextContainer.h>
 #include <react/utils/RunLoopObserver.h>
@@ -60,6 +65,11 @@ struct SchedulerToolbox final {
    * the call back synchronously if the executor is invoked on the main thread.
    */
   BackgroundExecutor backgroundExecutor;
+
+  /*
+   * A list of `UIManagerCommitHook`s that should be registered in `UIManager`.
+   */
+  std::vector<std::shared_ptr<UIManagerCommitHook const>> commitHooks;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp b/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp
new file mode 100644
index 00000000000000..9e36696803347c
--- /dev/null
+++ b/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp
@@ -0,0 +1,317 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "SurfaceHandler.h"
+
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/debug/SystraceSection.h>
+#include <react/renderer/scheduler/Scheduler.h>
+#include <react/renderer/uimanager/UIManager.h>
+
+namespace facebook {
+namespace react {
+
+using Status = SurfaceHandler::Status;
+
+SurfaceHandler::SurfaceHandler(
+    std::string const &moduleName,
+    SurfaceId surfaceId) noexcept {
+  parameters_.moduleName = moduleName;
+  parameters_.surfaceId = surfaceId;
+}
+
+SurfaceHandler::SurfaceHandler(SurfaceHandler &&other) noexcept {
+  operator=(std::move(other));
+}
+
+SurfaceHandler &SurfaceHandler::operator=(SurfaceHandler &&other) noexcept {
+  std::unique_lock<better::shared_mutex> lock1(linkMutex_, std::defer_lock);
+  std::unique_lock<better::shared_mutex> lock2(
+      parametersMutex_, std::defer_lock);
+  std::unique_lock<better::shared_mutex> lock3(
+      other.linkMutex_, std::defer_lock);
+  std::unique_lock<better::shared_mutex> lock4(
+      other.parametersMutex_, std::defer_lock);
+  std::lock(lock1, lock2, lock3, lock4);
+
+  link_ = other.link_;
+  parameters_ = other.parameters_;
+
+  other.link_ = Link{};
+  other.parameters_ = Parameters{};
+  other.parameters_.contextContainer = parameters_.contextContainer;
+  return *this;
+}
+
+#pragma mark - Surface Life-Cycle Management
+
+void SurfaceHandler::setContextContainer(
+    ContextContainer::Shared contextContainer) const noexcept {
+  parameters_.contextContainer = contextContainer;
+}
+
+Status SurfaceHandler::getStatus() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(linkMutex_);
+  return link_.status;
+}
+
+void SurfaceHandler::start() const noexcept {
+  SystraceSection s("SurfaceHandler::start");
+  std::unique_lock<better::shared_mutex> lock(linkMutex_);
+  react_native_assert(
+      link_.status == Status::Registered && "Surface must be registered.");
+  react_native_assert(
+      getLayoutConstraints().layoutDirection != LayoutDirection::Undefined &&
+      "layoutDirection must be set.");
+  react_native_assert(
+      parameters_.contextContainer && "ContextContainer must be set.");
+
+  auto parameters = Parameters{};
+  {
+    SystraceSection s2("SurfaceHandler::start::paramsLock");
+    std::shared_lock<better::shared_mutex> parametersLock(parametersMutex_);
+    parameters = parameters_;
+  }
+
+  auto shadowTree = std::make_unique<ShadowTree>(
+      parameters.surfaceId,
+      parameters.layoutConstraints,
+      parameters.layoutContext,
+      *link_.uiManager,
+      *parameters.contextContainer);
+
+  link_.shadowTree = shadowTree.get();
+
+  link_.uiManager->startSurface(
+      std::move(shadowTree),
+      parameters.moduleName,
+      parameters.props,
+      parameters_.displayMode);
+
+  link_.status = Status::Running;
+
+  applyDisplayMode(parameters.displayMode);
+}
+
+void SurfaceHandler::stop() const noexcept {
+  auto shadowTree = ShadowTree::Unique{};
+  {
+    std::unique_lock<better::shared_mutex> lock(linkMutex_);
+    react_native_assert(
+        link_.status == Status::Running && "Surface must be running.");
+
+    link_.status = Status::Registered;
+    link_.shadowTree = nullptr;
+    shadowTree = link_.uiManager->stopSurface(parameters_.surfaceId);
+  }
+
+  // As part of stopping a Surface, we need to properly destroy all
+  // mounted views, so we need to commit an empty tree to trigger all
+  // side-effects (including destroying and removing mounted views).
+  react_native_assert(shadowTree && "`shadowTree` must not be null.");
+  shadowTree->commitEmptyTree();
+}
+
+void SurfaceHandler::setDisplayMode(DisplayMode displayMode) const noexcept {
+  {
+    std::unique_lock<better::shared_mutex> lock(parametersMutex_);
+    if (parameters_.displayMode == displayMode) {
+      return;
+    }
+
+    parameters_.displayMode = displayMode;
+  }
+
+  {
+    std::shared_lock<better::shared_mutex> lock(linkMutex_);
+
+    if (link_.status != Status::Running) {
+      return;
+    }
+
+    link_.uiManager->setSurfaceProps(
+        parameters_.surfaceId,
+        parameters_.moduleName,
+        parameters_.props,
+        parameters_.displayMode);
+
+    applyDisplayMode(displayMode);
+  }
+}
+
+DisplayMode SurfaceHandler::getDisplayMode() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(parametersMutex_);
+  return parameters_.displayMode;
+}
+
+#pragma mark - Accessors
+
+SurfaceId SurfaceHandler::getSurfaceId() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(parametersMutex_);
+  return parameters_.surfaceId;
+}
+
+void SurfaceHandler::setSurfaceId(SurfaceId surfaceId) const noexcept {
+  std::unique_lock<better::shared_mutex> lock(parametersMutex_);
+  parameters_.surfaceId = surfaceId;
+}
+
+std::string SurfaceHandler::getModuleName() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(parametersMutex_);
+  return parameters_.moduleName;
+}
+
+void SurfaceHandler::setProps(folly::dynamic const &props) const noexcept {
+  SystraceSection s("SurfaceHandler::setProps");
+  std::unique_lock<better::shared_mutex> lock(parametersMutex_);
+  parameters_.props = props;
+}
+
+folly::dynamic SurfaceHandler::getProps() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(parametersMutex_);
+  return parameters_.props;
+}
+
+std::shared_ptr<MountingCoordinator const>
+SurfaceHandler::getMountingCoordinator() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(linkMutex_);
+  react_native_assert(
+      link_.status != Status::Unregistered && "Surface must be registered.");
+  react_native_assert(
+      link_.shadowTree && "`link_.shadowTree` must not be null.");
+  return link_.shadowTree->getMountingCoordinator();
+}
+
+#pragma mark - Layout
+
+Size SurfaceHandler::measure(
+    LayoutConstraints const &layoutConstraints,
+    LayoutContext const &layoutContext) const noexcept {
+  std::shared_lock<better::shared_mutex> lock(linkMutex_);
+
+  if (link_.status != Status::Running) {
+    return layoutConstraints.clamp({0, 0});
+  }
+
+  react_native_assert(
+      link_.shadowTree && "`link_.shadowTree` must not be null.");
+
+  auto currentRootShadowNode =
+      link_.shadowTree->getCurrentRevision().rootShadowNode;
+
+  PropsParserContext propsParserContext{
+      parameters_.surfaceId, *parameters_.contextContainer.get()};
+
+  auto rootShadowNode = currentRootShadowNode->clone(
+      propsParserContext, layoutConstraints, layoutContext);
+  rootShadowNode->layoutIfNeeded();
+  return rootShadowNode->getLayoutMetrics().frame.size;
+}
+
+void SurfaceHandler::constraintLayout(
+    LayoutConstraints const &layoutConstraints,
+    LayoutContext const &layoutContext) const noexcept {
+  SystraceSection s("SurfaceHandler::constraintLayout");
+  {
+    std::unique_lock<better::shared_mutex> lock(parametersMutex_);
+
+    if (parameters_.layoutConstraints == layoutConstraints &&
+        parameters_.layoutContext == layoutContext) {
+      return;
+    }
+
+    parameters_.layoutConstraints = layoutConstraints;
+    parameters_.layoutContext = layoutContext;
+  }
+
+  {
+    std::shared_lock<better::shared_mutex> lock(linkMutex_);
+
+    if (link_.status != Status::Running) {
+      return;
+    }
+
+    PropsParserContext propsParserContext{
+        parameters_.surfaceId, *parameters_.contextContainer.get()};
+
+    react_native_assert(
+        link_.shadowTree && "`link_.shadowTree` must not be null.");
+    link_.shadowTree->commit([&](RootShadowNode const &oldRootShadowNode) {
+      return oldRootShadowNode.clone(
+          propsParserContext, layoutConstraints, layoutContext);
+    });
+  }
+}
+
+LayoutConstraints SurfaceHandler::getLayoutConstraints() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(parametersMutex_);
+  return parameters_.layoutConstraints;
+}
+
+LayoutContext SurfaceHandler::getLayoutContext() const noexcept {
+  std::shared_lock<better::shared_mutex> lock(parametersMutex_);
+  return parameters_.layoutContext;
+}
+
+#pragma mark - Private
+
+void SurfaceHandler::applyDisplayMode(DisplayMode displayMode) const noexcept {
+  SystraceSection s("SurfaceHandler::applyDisplayMode");
+  react_native_assert(
+      link_.status == Status::Running && "Surface must be running.");
+  react_native_assert(
+      link_.shadowTree && "`link_.shadowTree` must not be null.");
+
+  switch (displayMode) {
+    case DisplayMode::Visible:
+      link_.shadowTree->setCommitMode(ShadowTree::CommitMode::Normal);
+      break;
+    case DisplayMode::Suspended:
+      link_.shadowTree->setCommitMode(ShadowTree::CommitMode::Suspended);
+      break;
+    case DisplayMode::Hidden:
+      link_.shadowTree->setCommitMode(ShadowTree::CommitMode::Normal);
+      // Getting a current revision.
+      auto revision = link_.shadowTree->getCurrentRevision();
+      // Committing an empty tree to force mounting to disassemble view
+      // hierarchy.
+      link_.shadowTree->commitEmptyTree();
+      link_.shadowTree->setCommitMode(ShadowTree::CommitMode::Suspended);
+      // Committing the current revision back. It will be mounted only when
+      // `DisplayMode` is changed back to `Normal`.
+      link_.shadowTree->commit([&](RootShadowNode const &oldRootShadowNode) {
+        return std::static_pointer_cast<RootShadowNode>(
+            revision.rootShadowNode->ShadowNode::clone(ShadowNodeFragment{}));
+      });
+      break;
+  }
+}
+
+void SurfaceHandler::setUIManager(UIManager const *uiManager) const noexcept {
+  std::unique_lock<better::shared_mutex> lock(linkMutex_);
+
+  react_native_assert(
+      link_.status != Status::Running && "Surface must not be running.");
+
+  if (link_.uiManager == uiManager) {
+    return;
+  }
+
+  link_.uiManager = uiManager;
+  link_.status = uiManager ? Status::Registered : Status::Unregistered;
+}
+
+SurfaceHandler::~SurfaceHandler() noexcept {
+  // TODO(T88046056): Fix Android memory leak before uncommenting changes
+  //  react_native_assert(
+  //      link_.status == Status::Unregistered &&
+  //      "`SurfaceHandler` must be unregistered (or moved-from) before
+  //      deallocation.");
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/scheduler/SurfaceHandler.h b/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
new file mode 100644
index 00000000000000..a606167c370960
--- /dev/null
+++ b/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/utils/ContextContainer.h>
+
+namespace facebook {
+namespace react {
+
+class Scheduler;
+class ShadowTree;
+class MountingCoordinator;
+class UIManager;
+
+/*
+ * Represents a running React Native surface and provides control over it.
+ * The instances of this class are movable only.
+ * The instances of this class can be safely deallocated only if `status` is
+ * `Unregistered`; this is a way to enforce internal consistency and
+ * deallocation ordering constraints the core relies on.
+ *
+ *
+ * Even though all methods of the class are thread-safe, the consumer side must
+ * ensure the logical consistency of some methods (e.g. calling `stop` for
+ * non-running surface will crash).
+ */
+class SurfaceHandler final {
+ public:
+  /*
+   * Represents a status of the `SurfaceHandler` instance.
+   */
+  enum class Status {
+    /*
+     * Newly created, moved-from, or already-unregistered instances. The only
+     * state in which the object can be safely deallocated.
+     */
+    Unregistered = 0,
+
+    /*
+     * Registered instances that have an internal reference to a `UIManager`
+     * instance and ready to start a surface.
+     */
+    Registered = 1,
+
+    /*
+     * Registered and running instances.
+     */
+    Running = 2,
+  };
+
+  /*
+   * Can be constructed anytime with a `moduleName` and a `surfaceId`.
+   */
+  SurfaceHandler(std::string const &moduleName, SurfaceId surfaceId) noexcept;
+  ~SurfaceHandler() noexcept;
+
+  /*
+   * Movable-only.
+   */
+  SurfaceHandler(SurfaceHandler &&SurfaceHandler) noexcept;
+  SurfaceHandler(SurfaceHandler const &SurfaceHandler) noexcept = delete;
+  SurfaceHandler &operator=(SurfaceHandler &&other) noexcept;
+  SurfaceHandler &operator=(SurfaceHandler const &other) noexcept = delete;
+
+#pragma mark - Surface Life-Cycle Management
+
+  /*
+   * Must be called before surface is started.
+   */
+  void setContextContainer(
+      ContextContainer::Shared contextContainer) const noexcept;
+
+  /*
+   * Returns a momentum value of the status.
+   */
+  Status getStatus() const noexcept;
+
+  /*
+   * Starts or stops the surface.
+   * Can not be called when the status is `Unregistered`.
+   * `start()` must not be called for a running surface, and `stop()` must not
+   * be called for a not running surface.
+   */
+  void start() const noexcept;
+  void stop() const noexcept;
+
+  /*
+   * Sets (and gets) the runnnig mode.
+   * The running mode can be changed anytime (even for `Unregistered` surface).
+   */
+  void setDisplayMode(DisplayMode displayMode) const noexcept;
+  DisplayMode getDisplayMode() const noexcept;
+
+#pragma mark - Accessors
+
+  SurfaceId getSurfaceId() const noexcept;
+  void setSurfaceId(SurfaceId surfaceId) const noexcept;
+  std::string getModuleName() const noexcept;
+
+  /*
+   * Provides access for surface props.
+   * Props can be changed anytime (even for `Unregistered` surface).
+   */
+  void setProps(folly::dynamic const &props) const noexcept;
+  folly::dynamic getProps() const noexcept;
+
+  /*
+   * Returns a `MountingCoordinator` instance associated with a running surface.
+   * Can be not be called when the status is `Unregistered`.
+   * The returning value cannot be `nullptr`.
+   */
+  std::shared_ptr<MountingCoordinator const> getMountingCoordinator()
+      const noexcept;
+
+#pragma mark - Layout
+
+  /*
+   * Measures the surface with given layout constraints and layout context.
+   * Returns zero size if called on the stopped or unregistered surface.
+   */
+  Size measure(
+      LayoutConstraints const &layoutConstraints,
+      LayoutContext const &layoutContext) const noexcept;
+
+  /*
+   * Sets layout constraints and layout context for the surface.
+   */
+  void constraintLayout(
+      LayoutConstraints const &layoutConstraints,
+      LayoutContext const &layoutContext) const noexcept;
+
+  /*
+   * Returns layout constraints and layout context associated with the surface.
+   */
+  LayoutConstraints getLayoutConstraints() const noexcept;
+  LayoutContext getLayoutContext() const noexcept;
+
+ private:
+  friend class Scheduler;
+
+  /*
+   * Must be called by `Scheduler` during registration process.
+   */
+  void setUIManager(UIManager const *uiManager) const noexcept;
+
+  void applyDisplayMode(DisplayMode displayMode) const noexcept;
+
+#pragma mark - Link & Parameters
+
+  /*
+   * All data members of the class are split into two groups (`Link` and
+   * `Parameters`) that require separate synchronization. This way it's easier
+   * to see that proper lock is acquired. Separate synchronization is needed to
+   * prevent deadlocks.
+   */
+
+  /*
+   * Represents parameters of the surface. Parameters can be changed
+   * independently from controlling the running state
+   * (registering/unregistering, starting/stopping) of the surface.
+   * Changing parameters requires acquiring a unique lock; reading needs only
+   * a shared lock.
+   */
+  struct Parameters {
+    std::string moduleName{};
+    SurfaceId surfaceId{};
+    DisplayMode displayMode{DisplayMode::Visible};
+    folly::dynamic props{};
+    LayoutConstraints layoutConstraints{};
+    LayoutContext layoutContext{};
+    ContextContainer::Shared contextContainer{};
+  };
+
+  /*
+   * Represents an underlying link to a `ShadowTree` and an `UIMananger`.
+   * Registering, unregistering, starting, and stopping the surface requires
+   * acquiring a unique lock; other access needs only a shared lock.
+   */
+  struct Link {
+    Status status{Status::Unregistered};
+    UIManager const *uiManager{};
+    ShadowTree const *shadowTree{};
+  };
+
+  /*
+   * `link_` and `linkMutex_` pair.
+   */
+  mutable better::shared_mutex linkMutex_;
+  mutable Link link_;
+
+  /*
+   * `parameters_` and `parametersMutex_` pair.
+   */
+  mutable better::shared_mutex parametersMutex_;
+  mutable Parameters parameters_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp b/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
new file mode 100644
index 00000000000000..a6f8a537f92c53
--- /dev/null
+++ b/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "SurfaceManager.h"
+
+#include <react/renderer/scheduler/Scheduler.h>
+
+namespace facebook {
+namespace react {
+
+SurfaceManager::SurfaceManager(Scheduler const &scheduler) noexcept
+    : scheduler_(scheduler) {}
+
+void SurfaceManager::startSurface(
+    SurfaceId surfaceId,
+    std::string const &moduleName,
+    folly::dynamic const &props,
+    LayoutConstraints const &layoutConstraints,
+    LayoutContext const &layoutContext) const noexcept {
+  {
+    std::unique_lock<better::shared_mutex> lock(mutex_);
+    auto surfaceHandler = SurfaceHandler{moduleName, surfaceId};
+    surfaceHandler.setContextContainer(scheduler_.getContextContainer());
+    registry_.emplace(surfaceId, std::move(surfaceHandler));
+  }
+
+  visit(surfaceId, [&](SurfaceHandler const &surfaceHandler) {
+    surfaceHandler.setProps(props);
+    surfaceHandler.constraintLayout(layoutConstraints, layoutContext);
+
+    scheduler_.registerSurface(surfaceHandler);
+
+    surfaceHandler.start();
+  });
+}
+
+void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept {
+  visit(surfaceId, [&](SurfaceHandler const &surfaceHandler) {
+    surfaceHandler.stop();
+    scheduler_.unregisterSurface(surfaceHandler);
+  });
+
+  {
+    std::unique_lock<better::shared_mutex> lock(mutex_);
+
+    auto iterator = registry_.find(surfaceId);
+    registry_.erase(iterator);
+  }
+}
+
+Size SurfaceManager::measureSurface(
+    SurfaceId surfaceId,
+    LayoutConstraints const &layoutConstraints,
+    LayoutContext const &layoutContext) const noexcept {
+  auto size = Size{};
+
+  visit(surfaceId, [&](SurfaceHandler const &surfaceHandler) {
+    size = surfaceHandler.measure(layoutConstraints, layoutContext);
+  });
+
+  return size;
+}
+
+MountingCoordinator::Shared SurfaceManager::findMountingCoordinator(
+    SurfaceId surfaceId) const noexcept {
+  auto mountingCoordinator = MountingCoordinator::Shared{};
+
+  visit(surfaceId, [&](SurfaceHandler const &surfaceHandler) {
+    mountingCoordinator = surfaceHandler.getMountingCoordinator();
+  });
+
+  return mountingCoordinator;
+}
+
+void SurfaceManager::constraintSurfaceLayout(
+    SurfaceId surfaceId,
+    LayoutConstraints const &layoutConstraints,
+    LayoutContext const &layoutContext) const noexcept {
+  visit(surfaceId, [=](SurfaceHandler const &surfaceHandler) {
+    surfaceHandler.constraintLayout(layoutConstraints, layoutContext);
+  });
+}
+
+void SurfaceManager::visit(
+    SurfaceId surfaceId,
+    std::function<void(SurfaceHandler const &surfaceHandler)> callback)
+    const noexcept {
+  std::shared_lock<better::shared_mutex> lock(mutex_);
+
+  auto iterator = registry_.find(surfaceId);
+
+  if (iterator == registry_.end()) {
+    return;
+  }
+
+  callback(iterator->second);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/scheduler/SurfaceManager.h b/ReactCommon/react/renderer/scheduler/SurfaceManager.h
new file mode 100644
index 00000000000000..83052f1855d776
--- /dev/null
+++ b/ReactCommon/react/renderer/scheduler/SurfaceManager.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <better/map.h>
+#include <mutex>
+
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/mounting/MountingCoordinator.h>
+#include <react/renderer/scheduler/SurfaceHandler.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * `SurfaceManager` allows controlling React Native Surfaces via
+ * `SurfaceHandler` without using `SurfaceHandler` directly. `SurfaceManager`
+ * maintains a registry of `SurfaceHandler`s and allows to reference to them via
+ * a `SurfaceId`.
+ * The is supposed to be used during the transition period only.
+ */
+class SurfaceManager final {
+ public:
+  SurfaceManager(Scheduler const &scheduler) noexcept;
+
+#pragma mark - Surface Management
+
+  void startSurface(
+      SurfaceId surfaceId,
+      std::string const &moduleName,
+      folly::dynamic const &props,
+      LayoutConstraints const &layoutConstraints = {},
+      LayoutContext const &layoutContext = {}) const noexcept;
+
+  void stopSurface(SurfaceId surfaceId) const noexcept;
+
+  Size measureSurface(
+      SurfaceId surfaceId,
+      LayoutConstraints const &layoutConstraints,
+      LayoutContext const &layoutContext) const noexcept;
+
+  void constraintSurfaceLayout(
+      SurfaceId surfaceId,
+      LayoutConstraints const &layoutConstraints,
+      LayoutContext const &layoutContext) const noexcept;
+
+  MountingCoordinator::Shared findMountingCoordinator(
+      SurfaceId surfaceId) const noexcept;
+
+ private:
+  void visit(
+      SurfaceId surfaceId,
+      std::function<void(SurfaceHandler const &surfaceHandler)> callback)
+      const noexcept;
+
+  Scheduler const &scheduler_;
+  mutable better::shared_mutex mutex_; // Protects `registry_`.
+  mutable better::map<SurfaceId, SurfaceHandler> registry_{};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp
index 245e07b463bcdf..66d6c8c8a0f5f0 100644
--- a/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp
+++ b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp
@@ -7,15 +7,19 @@
 
 #include "SynchronousEventBeat.h"
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
 SynchronousEventBeat::SynchronousEventBeat(
     RunLoopObserver::Unique uiRunLoopObserver,
-    RuntimeExecutor runtimeExecutor)
+    RuntimeExecutor runtimeExecutor,
+    std::shared_ptr<RuntimeScheduler> const &runtimeScheduler)
     : EventBeat({}),
       uiRunLoopObserver_(std::move(uiRunLoopObserver)),
-      runtimeExecutor_(std::move(runtimeExecutor)) {
+      runtimeExecutor_(std::move(runtimeExecutor)),
+      runtimeScheduler_(runtimeScheduler) {
   uiRunLoopObserver_->setDelegate(this);
   uiRunLoopObserver_->enable();
 }
@@ -23,7 +27,7 @@ SynchronousEventBeat::SynchronousEventBeat(
 void SynchronousEventBeat::activityDidChange(
     RunLoopObserver::Delegate const *delegate,
     RunLoopObserver::Activity activity) const noexcept {
-  assert(delegate == this);
+  react_native_assert(delegate == this);
   lockExecutorAndBeat();
 }
 
@@ -42,8 +46,13 @@ void SynchronousEventBeat::lockExecutorAndBeat() const {
     return;
   }
 
-  executeSynchronouslyOnSameThread_CAN_DEADLOCK(
-      runtimeExecutor_, [this](jsi::Runtime &runtime) { beat(runtime); });
+  if (runtimeScheduler_) {
+    runtimeScheduler_->executeNowOnTheSameThread(
+        [this](jsi::Runtime &runtime) { beat(runtime); });
+  } else {
+    executeSynchronouslyOnSameThread_CAN_DEADLOCK(
+        runtimeExecutor_, [this](jsi::Runtime &runtime) { beat(runtime); });
+  }
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h
index 109a6ddf0b625d..a3e2d6489d18db 100644
--- a/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h
+++ b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h
@@ -9,6 +9,7 @@
 
 #include <ReactCommon/RuntimeExecutor.h>
 #include <react/renderer/core/EventBeat.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <react/utils/RunLoopObserver.h>
 
 namespace facebook {
@@ -23,7 +24,8 @@ class SynchronousEventBeat final : public EventBeat,
  public:
   SynchronousEventBeat(
       RunLoopObserver::Unique uiRunLoopObserver,
-      RuntimeExecutor runtimeExecutor);
+      RuntimeExecutor runtimeExecutor,
+      std::shared_ptr<RuntimeScheduler> const &runtimeScheduler);
 
   void induce() const override;
 
@@ -38,6 +40,7 @@ class SynchronousEventBeat final : public EventBeat,
 
   RunLoopObserver::Unique uiRunLoopObserver_;
   RuntimeExecutor runtimeExecutor_;
+  std::shared_ptr<RuntimeScheduler> runtimeScheduler_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/telemetry/Android.mk b/ReactCommon/react/renderer/telemetry/Android.mk
new file mode 100644
index 00000000000000..990ec538ff5fc7
--- /dev/null
+++ b/ReactCommon/react/renderer/telemetry/Android.mk
@@ -0,0 +1,31 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_render_telemetry
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"Fabric\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
+
+LOCAL_STATIC_LIBRARIES :=
+
+LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,better)
+$(call import-module,glog)
+$(call import-module,folly)
+$(call import-module,react/utils)
diff --git a/ReactCommon/react/renderer/telemetry/BUCK b/ReactCommon/react/renderer/telemetry/BUCK
new file mode 100644
index 00000000000000..3ec301b4839def
--- /dev/null
+++ b/ReactCommon/react/renderer/telemetry/BUCK
@@ -0,0 +1,84 @@
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "telemetry",
+    srcs = glob(
+        ["**/*.cpp"],
+        exclude = glob(["tests/**/*.cpp"]),
+    ),
+    headers = glob(
+        ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+            ("stubs", "*.h"),
+        ],
+        prefix = "react/renderer/telemetry",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    force_static = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [":tests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//third-party/glog:glog",
+        "//xplat/fbsystrace:fbsystrace",
+        "//xplat/folly:headers_only",
+        "//xplat/folly:memory",
+        "//xplat/folly:molly",
+        react_native_xplat_target("better:better"),
+        react_native_xplat_target("react/debug:debug"),
+        react_native_xplat_target("react/utils:utils"),
+    ],
+)
+
+fb_xplat_cxx_test(
+    name = "tests",
+    srcs = glob(["tests/**/*.cpp"]),
+    headers = glob(["tests/**/*.h"]),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    fbandroid_use_instrumentation_test = True,
+    platforms = (ANDROID, APPLE, CXX),
+    deps = [
+        ":telemetry",
+        "//xplat/folly:molly",
+        "//xplat/third-party/gmock:gtest",
+        react_native_xplat_target("react/test_utils:test_utils"),
+    ],
+)
diff --git a/ReactCommon/react/renderer/mounting/SurfaceTelemetry.cpp b/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp
similarity index 93%
rename from ReactCommon/react/renderer/mounting/SurfaceTelemetry.cpp
rename to ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp
index 6b8a8047bdb6bc..5d836b7006ea30 100644
--- a/ReactCommon/react/renderer/mounting/SurfaceTelemetry.cpp
+++ b/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp
@@ -16,6 +16,7 @@ void SurfaceTelemetry::incorporate(
     TransactionTelemetry const &telemetry,
     int numberOfMutations) {
   layoutTime_ += telemetry.getLayoutEndTime() - telemetry.getLayoutStartTime();
+  textMeasureTime_ += telemetry.getTextMeasureTime();
   commitTime_ += telemetry.getCommitEndTime() - telemetry.getCommitStartTime();
   diffTime_ += telemetry.getDiffEndTime() - telemetry.getDiffStartTime();
   mountTime_ += telemetry.getMountEndTime() - telemetry.getMountStartTime();
@@ -37,6 +38,10 @@ TelemetryDuration SurfaceTelemetry::getLayoutTime() const {
   return layoutTime_;
 }
 
+TelemetryDuration SurfaceTelemetry::getTextMeasureTime() const {
+  return textMeasureTime_;
+}
+
 TelemetryDuration SurfaceTelemetry::getCommitTime() const {
   return commitTime_;
 }
diff --git a/ReactCommon/react/renderer/mounting/SurfaceTelemetry.h b/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h
similarity index 91%
rename from ReactCommon/react/renderer/mounting/SurfaceTelemetry.h
rename to ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h
index 02c8fbe964659e..6a72636120002b 100644
--- a/ReactCommon/react/renderer/mounting/SurfaceTelemetry.h
+++ b/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h
@@ -10,7 +10,7 @@
 #include <better/small_vector.h>
 #include <vector>
 
-#include <react/renderer/mounting/TransactionTelemetry.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 #include <react/utils/Telemetry.h>
 
 namespace facebook {
@@ -28,6 +28,7 @@ class SurfaceTelemetry final {
    * Metrics
    */
   TelemetryDuration getLayoutTime() const;
+  TelemetryDuration getTextMeasureTime() const;
   TelemetryDuration getCommitTime() const;
   TelemetryDuration getDiffTime() const;
   TelemetryDuration getMountTime() const;
@@ -50,6 +51,7 @@ class SurfaceTelemetry final {
  private:
   TelemetryDuration layoutTime_{};
   TelemetryDuration commitTime_{};
+  TelemetryDuration textMeasureTime_{};
   TelemetryDuration diffTime_{};
   TelemetryDuration mountTime_{};
 
diff --git a/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp b/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp
new file mode 100644
index 00000000000000..b7b5fe37c033d7
--- /dev/null
+++ b/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "TransactionTelemetry.h"
+
+#include <react/debug/react_native_assert.h>
+
+namespace facebook {
+namespace react {
+
+thread_local TransactionTelemetry *threadLocalTransactionTelemetry = nullptr;
+
+TransactionTelemetry::TransactionTelemetry()
+    : TransactionTelemetry(telemetryTimePointNow) {}
+
+TransactionTelemetry::TransactionTelemetry(
+    std::function<TelemetryTimePoint()> now)
+    : now_{now} {}
+
+TransactionTelemetry *TransactionTelemetry::threadLocalTelemetry() {
+  return threadLocalTransactionTelemetry;
+}
+
+void TransactionTelemetry::setAsThreadLocal() {
+  threadLocalTransactionTelemetry = this;
+}
+
+void TransactionTelemetry::unsetAsThreadLocal() {
+  threadLocalTransactionTelemetry = nullptr;
+}
+
+void TransactionTelemetry::willCommit() {
+  react_native_assert(commitStartTime_ == kTelemetryUndefinedTimePoint);
+  react_native_assert(commitEndTime_ == kTelemetryUndefinedTimePoint);
+  commitStartTime_ = now_();
+}
+
+void TransactionTelemetry::didCommit() {
+  react_native_assert(commitStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(commitEndTime_ == kTelemetryUndefinedTimePoint);
+  commitEndTime_ = now_();
+}
+
+void TransactionTelemetry::willDiff() {
+  react_native_assert(diffStartTime_ == kTelemetryUndefinedTimePoint);
+  react_native_assert(diffEndTime_ == kTelemetryUndefinedTimePoint);
+  diffStartTime_ = now_();
+}
+
+void TransactionTelemetry::didDiff() {
+  react_native_assert(diffStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(diffEndTime_ == kTelemetryUndefinedTimePoint);
+  diffEndTime_ = now_();
+}
+
+void TransactionTelemetry::willLayout() {
+  react_native_assert(layoutStartTime_ == kTelemetryUndefinedTimePoint);
+  react_native_assert(layoutEndTime_ == kTelemetryUndefinedTimePoint);
+  layoutStartTime_ = now_();
+}
+
+void TransactionTelemetry::willMeasureText() {
+  react_native_assert(
+      lastTextMeasureStartTime_ == kTelemetryUndefinedTimePoint);
+  lastTextMeasureStartTime_ = now_();
+}
+
+void TransactionTelemetry::didMeasureText() {
+  numberOfTextMeasurements_++;
+  react_native_assert(
+      lastTextMeasureStartTime_ != kTelemetryUndefinedTimePoint);
+  textMeasureTime_ += now_() - lastTextMeasureStartTime_;
+  lastTextMeasureStartTime_ = kTelemetryUndefinedTimePoint;
+}
+
+void TransactionTelemetry::didLayout() {
+  react_native_assert(layoutStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(layoutEndTime_ == kTelemetryUndefinedTimePoint);
+  layoutEndTime_ = now_();
+}
+
+void TransactionTelemetry::willMount() {
+  react_native_assert(mountStartTime_ == kTelemetryUndefinedTimePoint);
+  react_native_assert(mountEndTime_ == kTelemetryUndefinedTimePoint);
+  mountStartTime_ = now_();
+}
+
+void TransactionTelemetry::didMount() {
+  react_native_assert(mountStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(mountEndTime_ == kTelemetryUndefinedTimePoint);
+  mountEndTime_ = now_();
+}
+
+void TransactionTelemetry::setRevisionNumber(int revisionNumber) {
+  revisionNumber_ = revisionNumber;
+}
+
+TelemetryTimePoint TransactionTelemetry::getDiffStartTime() const {
+  react_native_assert(diffStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(diffEndTime_ != kTelemetryUndefinedTimePoint);
+  return diffStartTime_;
+}
+
+TelemetryTimePoint TransactionTelemetry::getDiffEndTime() const {
+  react_native_assert(diffStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(diffEndTime_ != kTelemetryUndefinedTimePoint);
+  return diffEndTime_;
+}
+
+TelemetryTimePoint TransactionTelemetry::getCommitStartTime() const {
+  react_native_assert(commitStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(commitEndTime_ != kTelemetryUndefinedTimePoint);
+  return commitStartTime_;
+}
+
+TelemetryTimePoint TransactionTelemetry::getCommitEndTime() const {
+  react_native_assert(commitStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(commitEndTime_ != kTelemetryUndefinedTimePoint);
+  return commitEndTime_;
+}
+
+TelemetryTimePoint TransactionTelemetry::getLayoutStartTime() const {
+  react_native_assert(layoutStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(layoutEndTime_ != kTelemetryUndefinedTimePoint);
+  return layoutStartTime_;
+}
+
+TelemetryTimePoint TransactionTelemetry::getLayoutEndTime() const {
+  react_native_assert(layoutStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(layoutEndTime_ != kTelemetryUndefinedTimePoint);
+  return layoutEndTime_;
+}
+
+TelemetryTimePoint TransactionTelemetry::getMountStartTime() const {
+  react_native_assert(mountStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(mountEndTime_ != kTelemetryUndefinedTimePoint);
+  return mountStartTime_;
+}
+
+TelemetryTimePoint TransactionTelemetry::getMountEndTime() const {
+  react_native_assert(mountStartTime_ != kTelemetryUndefinedTimePoint);
+  react_native_assert(mountEndTime_ != kTelemetryUndefinedTimePoint);
+  return mountEndTime_;
+}
+
+TelemetryDuration TransactionTelemetry::getTextMeasureTime() const {
+  return textMeasureTime_;
+}
+
+int TransactionTelemetry::getNumberOfTextMeasurements() const {
+  return numberOfTextMeasurements_;
+}
+
+int TransactionTelemetry::getRevisionNumber() const {
+  return revisionNumber_;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/TransactionTelemetry.h b/ReactCommon/react/renderer/telemetry/TransactionTelemetry.h
similarity index 85%
rename from ReactCommon/react/renderer/mounting/TransactionTelemetry.h
rename to ReactCommon/react/renderer/telemetry/TransactionTelemetry.h
index 88ef2a23b0e3c4..ab3a398d78537d 100644
--- a/ReactCommon/react/renderer/mounting/TransactionTelemetry.h
+++ b/ReactCommon/react/renderer/telemetry/TransactionTelemetry.h
@@ -9,6 +9,7 @@
 
 #include <chrono>
 #include <cstdint>
+#include <functional>
 
 #include <react/utils/Telemetry.h>
 
@@ -25,6 +26,10 @@ class TransactionTelemetry final {
    * Thread-local Telemetry instance
    */
   static TransactionTelemetry *threadLocalTelemetry();
+
+  TransactionTelemetry();
+  TransactionTelemetry(std::function<TelemetryTimePoint()> now);
+
   void setAsThreadLocal();
   void unsetAsThreadLocal();
 
@@ -36,6 +41,7 @@ class TransactionTelemetry final {
   void willCommit();
   void didCommit();
   void willLayout();
+  void willMeasureText();
   void didMeasureText();
   void didLayout();
   void willMount();
@@ -55,6 +61,7 @@ class TransactionTelemetry final {
   TelemetryTimePoint getMountStartTime() const;
   TelemetryTimePoint getMountEndTime() const;
 
+  TelemetryDuration getTextMeasureTime() const;
   int getNumberOfTextMeasurements() const;
   int getRevisionNumber() const;
 
@@ -68,8 +75,12 @@ class TransactionTelemetry final {
   TelemetryTimePoint mountStartTime_{kTelemetryUndefinedTimePoint};
   TelemetryTimePoint mountEndTime_{kTelemetryUndefinedTimePoint};
 
+  TelemetryTimePoint lastTextMeasureStartTime_{kTelemetryUndefinedTimePoint};
+  TelemetryDuration textMeasureTime_{0};
+
   int numberOfTextMeasurements_{0};
   int revisionNumber_{0};
+  std::function<TelemetryTimePoint()> now_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/telemetry/tests/TransactionTelemetryTest.cpp b/ReactCommon/react/renderer/telemetry/tests/TransactionTelemetryTest.cpp
new file mode 100644
index 00000000000000..95c6dfcf1b0785
--- /dev/null
+++ b/ReactCommon/react/renderer/telemetry/tests/TransactionTelemetryTest.cpp
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <chrono>
+#include <thread>
+
+#include <gtest/gtest.h>
+
+#include <react/renderer/telemetry/TransactionTelemetry.h>
+#include <react/test_utils/MockClock.h>
+#include <react/utils/Telemetry.h>
+
+using namespace facebook::react;
+
+MockClock::time_point MockClock::time_ = {};
+
+/**
+ * Ensures that the at least the specified time passes on a real clock.
+ * Why at least? Because operating systems provide no guarantee that our thread
+ * gets processing time after the specified time. What about using a busywait?
+ * Busywait are also affected by the non-deterministic OS process scheduling.
+ * The OS might decide right before the specified time elapsed to schedule
+ * another thread/process, with the result that more time passes in reality than
+ * the caller intended. Prefer the `MockClock` and only use this function to
+ * verify that at least the specifid time has passed but wihtout making exact
+ * verifications.
+ */
+static void sleepAtLeast(double durationInSeconds) {
+  std::this_thread::sleep_for(
+      std::chrono::milliseconds((long long)(durationInSeconds * 1000)));
+}
+
+TEST(TransactionTelemetryTest, timepoints) {
+  auto timepointA = telemetryTimePointNow();
+  sleepAtLeast(0.1);
+  auto timepointB = telemetryTimePointNow();
+
+  auto duration = telemetryDurationToMilliseconds(timepointB - timepointA);
+
+  EXPECT_GE(duration, 100);
+}
+
+TEST(TransactionTelemetryTest, normalUseCase) {
+  auto telemetry = TransactionTelemetry{[]() { return MockClock::now(); }};
+
+  telemetry.setAsThreadLocal();
+
+  telemetry.willCommit();
+  MockClock::advance_by(std::chrono::milliseconds(100));
+  telemetry.willLayout();
+  MockClock::advance_by(std::chrono::milliseconds(200));
+
+  TransactionTelemetry::threadLocalTelemetry()->willMeasureText();
+  MockClock::advance_by(std::chrono::milliseconds(100));
+  TransactionTelemetry::threadLocalTelemetry()->didMeasureText();
+
+  TransactionTelemetry::threadLocalTelemetry()->willMeasureText();
+  MockClock::advance_by(std::chrono::milliseconds(200));
+  TransactionTelemetry::threadLocalTelemetry()->didMeasureText();
+
+  TransactionTelemetry::threadLocalTelemetry()->willMeasureText();
+  MockClock::advance_by(std::chrono::milliseconds(300));
+  TransactionTelemetry::threadLocalTelemetry()->didMeasureText();
+
+  telemetry.didLayout();
+  MockClock::advance_by(std::chrono::milliseconds(100));
+  telemetry.didCommit();
+
+  telemetry.setRevisionNumber(42);
+
+  telemetry.unsetAsThreadLocal();
+
+  MockClock::advance_by(std::chrono::milliseconds(300));
+
+  telemetry.willMount();
+  MockClock::advance_by(std::chrono::milliseconds(100));
+  telemetry.didMount();
+
+  auto commitDuration = telemetryDurationToMilliseconds(
+      telemetry.getCommitEndTime() - telemetry.getCommitStartTime());
+  auto layoutDuration = telemetryDurationToMilliseconds(
+      telemetry.getLayoutEndTime() - telemetry.getLayoutStartTime());
+  auto mountDuration = telemetryDurationToMilliseconds(
+      telemetry.getMountEndTime() - telemetry.getMountStartTime());
+
+  EXPECT_EQ(commitDuration, 1000);
+  EXPECT_EQ(layoutDuration, 800);
+  EXPECT_EQ(mountDuration, 100);
+
+  EXPECT_EQ(telemetry.getNumberOfTextMeasurements(), 3);
+  EXPECT_EQ(
+      telemetryDurationToMilliseconds(telemetry.getTextMeasureTime()), 600);
+  EXPECT_EQ(telemetry.getRevisionNumber(), 42);
+}
+
+TEST(TransactionTelemetryTest, defaultImplementation) {
+  auto telemetry = TransactionTelemetry{};
+
+  telemetry.setAsThreadLocal();
+
+  telemetry.willCommit();
+  sleepAtLeast(0.1);
+  telemetry.willLayout();
+  sleepAtLeast(0.2);
+
+  TransactionTelemetry::threadLocalTelemetry()->willMeasureText();
+  sleepAtLeast(0.1);
+  TransactionTelemetry::threadLocalTelemetry()->didMeasureText();
+
+  telemetry.didLayout();
+  sleepAtLeast(0.1);
+  telemetry.didCommit();
+
+  telemetry.unsetAsThreadLocal();
+
+  telemetry.willMount();
+  sleepAtLeast(0.1);
+  telemetry.didMount();
+
+  auto commitDuration = telemetryDurationToMilliseconds(
+      telemetry.getCommitEndTime() - telemetry.getCommitStartTime());
+  auto layoutDuration = telemetryDurationToMilliseconds(
+      telemetry.getLayoutEndTime() - telemetry.getLayoutStartTime());
+  auto mountDuration = telemetryDurationToMilliseconds(
+      telemetry.getMountEndTime() - telemetry.getMountStartTime());
+
+  EXPECT_GE(commitDuration, 500);
+  EXPECT_GE(layoutDuration, 300);
+  EXPECT_GE(mountDuration, 100);
+}
+
+TEST(TransactionTelemetryTest, abnormalUseCases) {
+  // Calling `did` before `will` should crash.
+  EXPECT_DEATH_IF_SUPPORTED(
+      {
+        auto telemetry = TransactionTelemetry{};
+        telemetry.didDiff();
+      },
+      "diffStartTime_");
+
+  EXPECT_DEATH_IF_SUPPORTED(
+      {
+        auto telemetry = TransactionTelemetry{};
+        telemetry.didCommit();
+      },
+      "commitStartTime_");
+
+  EXPECT_DEATH_IF_SUPPORTED(
+      {
+        auto telemetry = TransactionTelemetry{};
+        telemetry.didMount();
+      },
+      "mountStartTime_");
+
+  // Getting `start` *or* `end` timepoints before a pair of `will` and `did`
+  // should crash.
+  EXPECT_DEATH_IF_SUPPORTED(
+      {
+        auto telemetry = TransactionTelemetry{};
+        telemetry.willCommit();
+        telemetry.getCommitStartTime();
+      },
+      "commitEndTime_");
+
+  EXPECT_DEATH_IF_SUPPORTED(
+      {
+        auto telemetry = TransactionTelemetry{};
+        telemetry.willCommit();
+        telemetry.getCommitEndTime();
+      },
+      "commitEndTime_");
+}
diff --git a/ReactCommon/react/renderer/templateprocessor/Android.mk b/ReactCommon/react/renderer/templateprocessor/Android.mk
index b40bb579ddf665..23ebd6b9a606b1 100644
--- a/ReactCommon/react/renderer/templateprocessor/Android.mk
+++ b/ReactCommon/react/renderer/templateprocessor/Android.mk
@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
diff --git a/ReactCommon/react/renderer/templateprocessor/BUCK b/ReactCommon/react/renderer/templateprocessor/BUCK
index ea7ad4415ccc46..1f106c4b944de7 100644
--- a/ReactCommon/react/renderer/templateprocessor/BUCK
+++ b/ReactCommon/react/renderer/templateprocessor/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -7,6 +6,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -73,7 +73,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp
index 22d506efdcfda7..d9f4e44d1dc8b4 100644
--- a/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp
+++ b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp
@@ -44,14 +44,14 @@ SharedShadowNode UITemplateProcessor::runCommand(
   const int tagOffset = 420000;
   // TODO: change to integer codes and a switch statement
   if (opcode == "createNode") {
-    int tag = command[1].asInt();
+    Tag tag = static_cast<Tag>(command[1].asInt());
     const auto &type = command[2].asString();
     const auto parentTag = command[3].asInt();
     const auto &props = command[4];
     nodes[tag] = componentDescriptorRegistry.createNode(
         tag + tagOffset, type, surfaceId, props, nullptr);
     if (parentTag > -1) { // parentTag == -1 indicates root node
-      auto parentShadowNode = nodes[parentTag];
+      auto parentShadowNode = nodes[static_cast<size_t>(parentTag)];
       auto const &componentDescriptor = componentDescriptorRegistry.at(
           parentShadowNode->getComponentHandle());
       componentDescriptor.appendChild(parentShadowNode, nodes[tag]);
@@ -61,13 +61,13 @@ SharedShadowNode UITemplateProcessor::runCommand(
       LOG(INFO)
           << "(stop) UITemplateProcessor inject serialized 'server rendered' view tree";
     }
-    return nodes[command[1].asInt()];
+    return nodes[static_cast<Tag>(command[1].asInt())];
   } else if (opcode == "loadNativeBool") {
-    int registerNumber = command[1].asInt();
+    auto registerNumber = static_cast<size_t>(command[1].asInt());
     std::string param = command[4][0].asString();
     registers[registerNumber] = reactNativeConfig->getBool(param);
   } else if (opcode == "conditional") {
-    int registerNumber = command[1].asInt();
+    auto registerNumber = static_cast<size_t>(command[1].asInt());
     auto conditionDynamic = registers[registerNumber];
     if (conditionDynamic.isNull()) {
       // TODO: provide original command or command line?
diff --git a/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp b/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
index 5c7220f52a44bf..add08294321f05 100644
--- a/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
+++ b/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
@@ -89,8 +89,8 @@ TEST(UITemplateProcessorTest, testSimpleBytecode) {
   auto nativeModuleRegistry = buildNativeModuleRegistry();
 
   auto bytecode = R"delim({"version":0.1,"commands":[
-    ["createNode",2,"RCTView",-1,{"opacity": 0.5, "testId": "root"}],
-    ["createNode",4,"RCTView",2,{"testId": "child"}],
+    ["createNode",2,"RCTView",-1,{"opacity": 0.5, "testID": "root"}],
+    ["createNode",4,"RCTView",2,{"testID": "child"}],
     ["returnRoot",2]
   ]})delim";
 
@@ -124,11 +124,11 @@ TEST(UITemplateProcessorTest, testConditionalBytecode) {
   auto nativeModuleRegistry = buildNativeModuleRegistry();
 
   auto bytecode = R"delim({"version":0.1,"commands":[
-    ["createNode",2,"RCTView",-1,{"testId": "root"}],
+    ["createNode",2,"RCTView",-1,{"testID": "root"}],
     ["loadNativeBool",1,"MobileConfig","getBool",["qe:simple_test"]],
     ["conditional",1,
-      [["createNode",4,"RCTView",2,{"testId": "cond_true"}]],
-      [["createNode",4,"RCTView",2,{"testId": "cond_false"}]]
+      [["createNode",4,"RCTView",2,{"testID": "cond_true"}]],
+      [["createNode",4,"RCTView",2,{"testID": "cond_false"}]]
     ],
     ["returnRoot",2]
   ]})delim";
diff --git a/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/ReactCommon/react/renderer/textlayoutmanager/Android.mk
index d048ec00061327..0d216e572762ba 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/Android.mk
+++ b/ReactCommon/react/renderer/textlayoutmanager/Android.mk
@@ -11,7 +11,7 @@ LOCAL_MODULE := react_render_textlayoutmanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativeutilsjni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libfolly_json libyoga libfolly_json libreact_render_core libreact_render_debug libreact_render_graphics
+LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativeutilsjni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libreact_render_mounting glog libfolly_json libglog_init libyoga libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
 
 LOCAL_STATIC_LIBRARIES :=
 
@@ -22,7 +22,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/platform/androi
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -34,7 +34,10 @@ $(call import-module,react/renderer/componentregistry)
 $(call import-module,react/renderer/core)
 $(call import-module,react/renderer/attributedstring)
 $(call import-module,react/renderer/debug)
+$(call import-module,react/renderer/mounting)
 $(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/uimanager)
 $(call import-module,react/utils)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/mapbuffer)
+$(call import-module,react/renderer/telemetry)
diff --git a/ReactCommon/react/renderer/textlayoutmanager/BUCK b/ReactCommon/react/renderer/textlayoutmanager/BUCK
index 6b1fa35b9049de..18a9ddeb0f33bb 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/BUCK
+++ b/ReactCommon/react/renderer/textlayoutmanager/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_target",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
@@ -39,7 +39,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_exported_headers = subdir_glob(
@@ -62,6 +62,7 @@ rn_xplat_cxx_library(
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
     fbandroid_exported_headers = subdir_glob(
         [
@@ -129,6 +130,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
+        react_native_xplat_target("react/renderer/mounting:mounting"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
     ],
 )
@@ -140,7 +142,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
index d3d9845f93c518..76bbc45c963404 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
@@ -12,11 +12,11 @@ namespace react {
 
 static Rect rectFromDynamic(folly::dynamic const &data) {
   Point origin;
-  origin.x = data.getDefault("x", 0).getDouble();
-  origin.y = data.getDefault("y", 0).getDouble();
+  origin.x = static_cast<Float>(data.getDefault("x", 0).getDouble());
+  origin.y = static_cast<Float>(data.getDefault("y", 0).getDouble());
   Size size;
-  size.width = data.getDefault("width", 0).getDouble();
-  size.height = data.getDefault("height", 0).getDouble();
+  size.width = static_cast<Float>(data.getDefault("width", 0).getDouble());
+  size.height = static_cast<Float>(data.getDefault("height", 0).getDouble());
   Rect frame;
   frame.origin = origin;
   frame.size = size;
@@ -34,15 +34,18 @@ LineMeasurement::LineMeasurement(
       frame(frame),
       descender(descender),
       capHeight(capHeight),
-      ascender(ascender) {}
+      ascender(ascender),
+      xHeight(xHeight) {}
 
 LineMeasurement::LineMeasurement(folly::dynamic const &data)
     : text(data.getDefault("text", "").getString()),
       frame(rectFromDynamic(data)),
-      descender(data.getDefault("descender", 0).getDouble()),
-      capHeight(data.getDefault("capHeight", 0).getDouble()),
-      ascender(data.getDefault("ascender", 0).getDouble()),
-      xHeight(data.getDefault("xHeight", 0).getDouble()) {}
+      descender(
+          static_cast<Float>(data.getDefault("descender", 0).getDouble())),
+      capHeight(
+          static_cast<Float>(data.getDefault("capHeight", 0).getDouble())),
+      ascender(static_cast<Float>(data.getDefault("ascender", 0).getDouble())),
+      xHeight(static_cast<Float>(data.getDefault("xHeight", 0).getDouble())) {}
 
 bool LineMeasurement::operator==(LineMeasurement const &rhs) const {
   return std::tie(
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
index 56a72d3881fed0..439fdb369af70b 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
@@ -7,9 +7,13 @@
 
 #include "TextLayoutManager.h"
 
+#include <limits>
+
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/core/conversions.h>
+#include <react/renderer/telemetry/TransactionTelemetry.h>
+#include <react/utils/LayoutManager.h>
 
 using namespace facebook::jni;
 
@@ -28,77 +32,60 @@ TextMeasurement TextLayoutManager::measure(
     LayoutConstraints layoutConstraints) const {
   auto &attributedString = attributedStringBox.getValue();
 
-  return measureCache_.get(
+  auto measurement = measureCache_.get(
       {attributedString, paragraphAttributes, layoutConstraints},
       [&](TextMeasureCacheKey const &key) {
-        return doMeasure(
-            attributedString, paragraphAttributes, layoutConstraints);
+        auto telemetry = TransactionTelemetry::threadLocalTelemetry();
+        if (telemetry) {
+          telemetry->willMeasureText();
+        }
+
+        auto measurement = mapBufferSerializationEnabled_
+            ? doMeasureMapBuffer(
+                  attributedString, paragraphAttributes, layoutConstraints)
+            : doMeasure(
+                  attributedString, paragraphAttributes, layoutConstraints);
+
+        if (telemetry) {
+          telemetry->didMeasureText();
+        }
+
+        return measurement;
       });
+
+  measurement.size = layoutConstraints.clamp(measurement.size);
+  return measurement;
 }
 
 TextMeasurement TextLayoutManager::measureCachedSpannableById(
     int64_t cacheId,
     ParagraphAttributes paragraphAttributes,
     LayoutConstraints layoutConstraints) const {
-  const jni::global_ref<jobject> &fabricUIManager =
-      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-
   auto env = Environment::current();
   auto attachmentPositions = env->NewFloatArray(0);
-
-  static auto measure =
-      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-          ->getMethod<jlong(
-              jint,
-              jstring,
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              jfloat,
-              jfloat,
-              jfloat,
-              jfloat,
-              jfloatArray)>("measure");
-
   auto minimumSize = layoutConstraints.minimumSize;
   auto maximumSize = layoutConstraints.maximumSize;
 
-  local_ref<JString> componentName = make_jstring("RCTText");
   folly::dynamic cacheIdMap = folly::dynamic::object;
   cacheIdMap["cacheId"] = cacheId;
-  local_ref<ReadableNativeMap::javaobject> attributedStringRNM =
-      ReadableNativeMap::newObjectCxxArgs(cacheIdMap);
-  local_ref<ReadableNativeMap::javaobject> paragraphAttributesRNM =
-      ReadableNativeMap::newObjectCxxArgs(toDynamic(paragraphAttributes));
 
-  local_ref<ReadableMap::javaobject> attributedStringRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(attributedStringRNM.get()));
-  local_ref<ReadableMap::javaobject> paragraphAttributesRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(paragraphAttributesRNM.get()));
-  auto size = yogaMeassureToSize(measure(
-      fabricUIManager,
+  auto size = measureAndroidComponent(
+      contextContainer_,
       -1, // TODO: we should pass rootTag in
-      componentName.get(),
-      attributedStringRM.get(),
-      paragraphAttributesRM.get(),
+      "RCTText",
+      cacheIdMap,
+      toDynamic(paragraphAttributes),
       nullptr,
       minimumSize.width,
       maximumSize.width,
       minimumSize.height,
       maximumSize.height,
-      attachmentPositions));
+      attachmentPositions);
 
   // Clean up allocated ref - it still takes up space in the JNI ref table even
   // though it's 0 length
   env->DeleteLocalRef(attachmentPositions);
 
-  // Explicitly release smart pointers to free up space faster in JNI tables
-  componentName.reset();
-  attributedStringRM.reset();
-  attributedStringRNM.reset();
-  paragraphAttributesRM.reset();
-  paragraphAttributesRNM.reset();
-
   // TODO: currently we do not support attachments for cached IDs - should we?
   auto attachments = TextMeasurement::Attachments{};
 
@@ -109,6 +96,10 @@ LinesMeasurements TextLayoutManager::measureLines(
     AttributedString attributedString,
     ParagraphAttributes paragraphAttributes,
     Size size) const {
+  if (mapBufferSerializationEnabled_) {
+    return measureLinesMapBuffer(attributedString, paragraphAttributes, size);
+  }
+
   const jni::global_ref<jobject> &fabricUIManager =
       contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
   static auto measureLines =
@@ -155,12 +146,52 @@ LinesMeasurements TextLayoutManager::measureLines(
   return lineMeasurements;
 }
 
-TextMeasurement TextLayoutManager::doMeasure(
+LinesMeasurements TextLayoutManager::measureLinesMapBuffer(
     AttributedString attributedString,
     ParagraphAttributes paragraphAttributes,
-    LayoutConstraints layoutConstraints) const {
+    Size size) const {
   const jni::global_ref<jobject> &fabricUIManager =
       contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+  static auto measureLines =
+      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<NativeArray::javaobject(
+              ReadableMapBuffer::javaobject,
+              ReadableMapBuffer::javaobject,
+              jfloat,
+              jfloat)>("measureLinesMapBuffer");
+
+  auto attributedStringMB =
+      ReadableMapBuffer::createWithContents(toMapBuffer(attributedString));
+  auto paragraphAttributesMB =
+      ReadableMapBuffer::createWithContents(toMapBuffer(paragraphAttributes));
+
+  auto array = measureLines(
+      fabricUIManager,
+      attributedStringMB.get(),
+      paragraphAttributesMB.get(),
+      size.width,
+      size.height);
+
+  auto dynamicArray = cthis(array)->consume();
+  LinesMeasurements lineMeasurements;
+  lineMeasurements.reserve(dynamicArray.size());
+
+  for (auto const &data : dynamicArray) {
+    lineMeasurements.push_back(LineMeasurement(data));
+  }
+
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  attributedStringMB.reset();
+  paragraphAttributesMB.reset();
+
+  return lineMeasurements;
+}
+
+TextMeasurement TextLayoutManager::doMeasure(
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  layoutConstraints.maximumSize.height = std::numeric_limits<Float>::infinity();
 
   int attachmentsCount = 0;
   for (auto fragment : attributedString.getFragments()) {
@@ -171,46 +202,22 @@ TextMeasurement TextLayoutManager::doMeasure(
   auto env = Environment::current();
   auto attachmentPositions = env->NewFloatArray(attachmentsCount * 2);
 
-  static auto measure =
-      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-          ->getMethod<jlong(
-              jint,
-              jstring,
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              jfloat,
-              jfloat,
-              jfloat,
-              jfloat,
-              jfloatArray)>("measure");
-
   auto minimumSize = layoutConstraints.minimumSize;
   auto maximumSize = layoutConstraints.maximumSize;
 
   auto serializedAttributedString = toDynamic(attributedString);
-  local_ref<JString> componentName = make_jstring("RCTText");
-  local_ref<ReadableNativeMap::javaobject> attributedStringRNM =
-      ReadableNativeMap::newObjectCxxArgs(serializedAttributedString);
-  local_ref<ReadableNativeMap::javaobject> paragraphAttributesRNM =
-      ReadableNativeMap::newObjectCxxArgs(toDynamic(paragraphAttributes));
-
-  local_ref<ReadableMap::javaobject> attributedStringRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(attributedStringRNM.get()));
-  local_ref<ReadableMap::javaobject> paragraphAttributesRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(paragraphAttributesRNM.get()));
-  auto size = yogaMeassureToSize(measure(
-      fabricUIManager,
+  auto size = measureAndroidComponent(
+      contextContainer_,
       -1, // TODO: we should pass rootTag in
-      componentName.get(),
-      attributedStringRM.get(),
-      paragraphAttributesRM.get(),
+      "RCTText",
+      serializedAttributedString,
+      toDynamic(paragraphAttributes),
       nullptr,
       minimumSize.width,
       maximumSize.width,
       minimumSize.height,
       maximumSize.height,
-      attachmentPositions));
+      attachmentPositions);
 
   jfloat *attachmentData = env->GetFloatArrayElements(attachmentPositions, 0);
 
@@ -226,8 +233,8 @@ TextMeasurement TextLayoutManager::doMeasure(
         float width = (float)fragment["width"].getDouble();
         float height = (float)fragment["height"].getDouble();
 
-        auto rect = facebook::react::Rect{{left, top},
-                                          facebook::react::Size{width, height}};
+        auto rect = facebook::react::Rect{
+            {left, top}, facebook::react::Size{width, height}};
         attachments.push_back(TextMeasurement::Attachment{rect, false});
         attachmentIndex++;
       }
@@ -239,12 +246,67 @@ TextMeasurement TextLayoutManager::doMeasure(
       attachmentPositions, attachmentData, JNI_ABORT);
   env->DeleteLocalRef(attachmentPositions);
 
-  // Explicitly release smart pointers to free up space faster in JNI tables
-  componentName.reset();
-  attributedStringRM.reset();
-  attributedStringRNM.reset();
-  paragraphAttributesRM.reset();
-  paragraphAttributesRNM.reset();
+  return TextMeasurement{size, attachments};
+}
+
+TextMeasurement TextLayoutManager::doMeasureMapBuffer(
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  layoutConstraints.maximumSize.height = std::numeric_limits<Float>::infinity();
+
+  int attachmentsCount = 0;
+  for (auto fragment : attributedString.getFragments()) {
+    if (fragment.isAttachment()) {
+      attachmentsCount++;
+    }
+  }
+  auto env = Environment::current();
+  auto attachmentPositions = env->NewFloatArray(attachmentsCount * 2);
+
+  auto minimumSize = layoutConstraints.minimumSize;
+  auto maximumSize = layoutConstraints.maximumSize;
+
+  auto attributedStringMap = toMapBuffer(attributedString);
+  auto paragraphAttributesMap = toMapBuffer(paragraphAttributes);
+
+  auto size = measureAndroidComponentMapBuffer(
+      contextContainer_,
+      -1, // TODO: we should pass rootTag in
+      "RCTText",
+      attributedStringMap,
+      paragraphAttributesMap,
+      minimumSize.width,
+      maximumSize.width,
+      minimumSize.height,
+      maximumSize.height,
+      attachmentPositions);
+
+  jfloat *attachmentData = env->GetFloatArrayElements(attachmentPositions, 0);
+
+  auto attachments = TextMeasurement::Attachments{};
+  if (attachmentsCount > 0) {
+    int attachmentIndex = 0;
+    for (auto fragment : attributedString.getFragments()) {
+      if (fragment.isAttachment()) {
+        float top = attachmentData[attachmentIndex * 2];
+        float left = attachmentData[attachmentIndex * 2 + 1];
+        float width = fragment.parentShadowView.layoutMetrics.frame.size.width;
+        float height =
+            fragment.parentShadowView.layoutMetrics.frame.size.height;
+
+        auto rect = facebook::react::Rect{
+            {left, top}, facebook::react::Size{width, height}};
+        attachments.push_back(TextMeasurement::Attachment{rect, false});
+        attachmentIndex++;
+      }
+    }
+  }
+
+  // Clean up allocated ref
+  env->ReleaseFloatArrayElements(
+      attachmentPositions, attachmentData, JNI_ABORT);
+  env->DeleteLocalRef(attachmentPositions);
 
   return TextMeasurement{size, attachments};
 }
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
index 681c54e22fb793..19ae11b2a7d62c 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/config/ReactNativeConfig.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -26,7 +27,11 @@ using SharedTextLayoutManager = std::shared_ptr<const TextLayoutManager>;
 class TextLayoutManager {
  public:
   TextLayoutManager(const ContextContainer::Shared &contextContainer)
-      : contextContainer_(contextContainer){};
+      : contextContainer_(contextContainer) {
+    static auto value =
+        contextContainer->at<bool>("MapBufferSerializationEnabled");
+    mapBufferSerializationEnabled_ = value;
+  }
   ~TextLayoutManager();
 
   /*
@@ -67,8 +72,19 @@ class TextLayoutManager {
       ParagraphAttributes paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
+  TextMeasurement doMeasureMapBuffer(
+      AttributedString attributedString,
+      ParagraphAttributes paragraphAttributes,
+      LayoutConstraints layoutConstraints) const;
+
+  LinesMeasurements measureLinesMapBuffer(
+      AttributedString attributedString,
+      ParagraphAttributes paragraphAttributes,
+      Size size) const;
+
   void *self_;
   ContextContainer::Shared contextContainer_;
+  bool mapBufferSerializationEnabled_;
   TextMeasureCache measureCache_{};
 };
 
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp b/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp
index ffdfeae66d547e..6d7f07ea6d1edb 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp
@@ -13,15 +13,29 @@ namespace react {
 TextLayoutManager::~TextLayoutManager() {}
 
 void *TextLayoutManager::getNativeTextLayoutManager() const {
-  return self_;
+  return (void *)this;
 }
 
 TextMeasurement TextLayoutManager::measure(
     AttributedStringBox attributedStringBox,
     ParagraphAttributes paragraphAttributes,
     LayoutConstraints layoutConstraints) const {
-  return TextMeasurement{{0, 0}, {}};
+  TextMeasurement::Attachments attachments;
+  for (auto const &fragment : attributedStringBox.getValue().getFragments()) {
+    if (fragment.isAttachment()) {
+      attachments.push_back(
+          TextMeasurement::Attachment{{{0, 0}, {0, 0}}, false});
+    }
+  }
+  return TextMeasurement{{0, 0}, attachments};
 }
 
+LinesMeasurements TextLayoutManager::measureLines(
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    Size size) const {
+  return {};
+};
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h
index 7033cdeafe3b41..87c6fdf4bfeca7 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h
@@ -28,8 +28,7 @@ using SharedTextLayoutManager = std::shared_ptr<const TextLayoutManager>;
  */
 class TextLayoutManager {
  public:
-  TextLayoutManager(const ContextContainer::Shared &contextContainer)
-      : contextContainer_(contextContainer){};
+  TextLayoutManager(const ContextContainer::Shared &contextContainer) {}
   ~TextLayoutManager();
 
   /*
@@ -40,16 +39,20 @@ class TextLayoutManager {
       ParagraphAttributes paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
+  /*
+   * Measures lines of `attributedString` using native text rendering
+   * infrastructure.
+   */
+  LinesMeasurements measureLines(
+      AttributedString attributedString,
+      ParagraphAttributes paragraphAttributes,
+      Size size) const;
+
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
    * Is used on a native views layer to delegate text rendering to the manager.
    */
   void *getNativeTextLayoutManager() const;
-
- private:
-  void *self_;
-
-  ContextContainer::Shared contextContainer_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
index 0f23297ad4afb9..5df0cd9cad7385 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
@@ -41,15 +41,16 @@ inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)
   assert(fontWeight > 50);
   assert(fontWeight < 950);
 
-  static UIFontWeight weights[] = {/* ~100 */ UIFontWeightUltraLight,
-                                   /* ~200 */ UIFontWeightThin,
-                                   /* ~300 */ UIFontWeightLight,
-                                   /* ~400 */ UIFontWeightRegular,
-                                   /* ~500 */ UIFontWeightMedium,
-                                   /* ~600 */ UIFontWeightSemibold,
-                                   /* ~700 */ UIFontWeightBold,
-                                   /* ~800 */ UIFontWeightHeavy,
-                                   /* ~900 */ UIFontWeightBlack};
+  static UIFontWeight weights[] = {
+      /* ~100 */ UIFontWeightUltraLight,
+      /* ~200 */ UIFontWeightThin,
+      /* ~300 */ UIFontWeightLight,
+      /* ~400 */ UIFontWeightRegular,
+      /* ~500 */ UIFontWeightMedium,
+      /* ~600 */ UIFontWeightSemibold,
+      /* ~700 */ UIFontWeightBold,
+      /* ~800 */ UIFontWeightHeavy,
+      /* ~900 */ UIFontWeightBlack};
   // The expression is designed to convert something like 760 or 830 to 7.
   return weights[(fontWeight + 50) / 100 - 1];
 }
@@ -287,6 +288,9 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
       case AccessibilityRole::Tab:
         attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tab");
         break;
+      case AccessibilityRole::TabBar:
+        attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tabbar");
+        break;
       case AccessibilityRole::Tablist:
         attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tablist");
         break;
@@ -319,8 +323,9 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
 
     if (fragment.isAttachment()) {
       auto layoutMetrics = fragment.parentShadowView.layoutMetrics;
-      CGRect bounds = {.origin = {.x = layoutMetrics.frame.origin.x, .y = layoutMetrics.frame.origin.y},
-                       .size = {.width = layoutMetrics.frame.size.width, .height = layoutMetrics.frame.size.height}};
+      CGRect bounds = {
+          .origin = {.x = layoutMetrics.frame.origin.x, .y = layoutMetrics.frame.origin.y},
+          .size = {.width = layoutMetrics.frame.size.width, .height = layoutMetrics.frame.size.height}};
 
       NSTextAttachment *attachment = [NSTextAttachment new];
       attachment.image = placeholderImage;
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm
index 13ca3c5ae2cd58..3cd00abda54dac 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm
@@ -75,12 +75,14 @@ - (TextMeasurement)measureNSAttributedString:(NSAttributedString *)attributedStr
 
                 UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:range.location effectiveRange:nil];
 
-                CGRect frame = {{glyphRect.origin.x,
-                                 glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender},
-                                attachmentSize};
+                CGRect frame = {
+                    {glyphRect.origin.x,
+                     glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender},
+                    attachmentSize};
 
-                auto rect = facebook::react::Rect{facebook::react::Point{frame.origin.x, frame.origin.y},
-                                                  facebook::react::Size{frame.size.width, frame.size.height}};
+                auto rect = facebook::react::Rect{
+                    facebook::react::Point{frame.origin.x, frame.origin.y},
+                    facebook::react::Size{frame.size.width, frame.size.height}};
 
                 attachments.push_back(TextMeasurement::Attachment{rect, false});
               }];
@@ -156,12 +158,13 @@ - (LinesMeasurements)getLinesForAttributedString:(facebook::react::AttributedStr
                                             auto rect = facebook::react::Rect{
                                                 facebook::react::Point{usedRect.origin.x, usedRect.origin.y},
                                                 facebook::react::Size{usedRect.size.width, usedRect.size.height}};
-                                            auto line = LineMeasurement{std::string([renderedString UTF8String]),
-                                                                        rect,
-                                                                        -font.descender,
-                                                                        font.capHeight,
-                                                                        font.ascender,
-                                                                        font.xHeight};
+                                            auto line = LineMeasurement{
+                                                std::string([renderedString UTF8String]),
+                                                rect,
+                                                -font.descender,
+                                                font.capHeight,
+                                                font.ascender,
+                                                font.xHeight};
                                             blockParagraphLines->push_back(line);
                                           }];
   return paragraphLines;
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm
index 881bcf90b47a27..887f3726bac397 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm
@@ -6,6 +6,7 @@
  */
 
 #include "TextLayoutManager.h"
+#include <react/renderer/telemetry/TransactionTelemetry.h>
 #include <react/utils/ManagedObjectWrapper.h>
 
 #import "RCTTextLayoutManager.h"
@@ -39,9 +40,20 @@
 
       measurement = measureCache_.get(
           {attributedString, paragraphAttributes, layoutConstraints}, [&](TextMeasureCacheKey const &key) {
-            return [textLayoutManager measureAttributedString:attributedString
-                                          paragraphAttributes:paragraphAttributes
-                                            layoutConstraints:layoutConstraints];
+            auto telemetry = TransactionTelemetry::threadLocalTelemetry();
+            if (telemetry) {
+              telemetry->willMeasureText();
+            }
+
+            auto measurement = [textLayoutManager measureAttributedString:attributedString
+                                                      paragraphAttributes:paragraphAttributes
+                                                        layoutConstraints:layoutConstraints];
+
+            if (telemetry) {
+              telemetry->didMeasureText();
+            }
+
+            return measurement;
           });
       break;
     }
@@ -50,9 +62,19 @@
       NSAttributedString *nsAttributedString =
           (NSAttributedString *)unwrapManagedObject(attributedStringBox.getOpaquePointer());
 
+      auto telemetry = TransactionTelemetry::threadLocalTelemetry();
+      if (telemetry) {
+        telemetry->willMeasureText();
+      }
+
       measurement = [textLayoutManager measureNSAttributedString:nsAttributedString
                                              paragraphAttributes:paragraphAttributes
                                                layoutConstraints:layoutConstraints];
+
+      if (telemetry) {
+        telemetry->didMeasureText();
+      }
+
       break;
     }
   }
diff --git a/ReactCommon/react/renderer/components/picker/BUCK b/ReactCommon/react/renderer/timeline/BUCK
similarity index 52%
rename from ReactCommon/react/renderer/components/picker/BUCK
rename to ReactCommon/react/renderer/timeline/BUCK
index 9c0661e9370b2d..448ca1201db6b5 100644
--- a/ReactCommon/react/renderer/components/picker/BUCK
+++ b/ReactCommon/react/renderer/timeline/BUCK
@@ -4,11 +4,9 @@ load(
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
-    "react_native_target",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -17,57 +15,52 @@ load(
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
-    name = "androidpicker",
+    name = "timeline",
     srcs = glob(
-        ["androidpicker/**/*.cpp"],
+        ["**/*.cpp"],
         exclude = glob(["tests/**/*.cpp"]),
     ),
     headers = glob(
-        ["androidpicker/**/*.h"],
+        ["**/*.h"],
         exclude = glob(["tests/**/*.h"]),
     ),
     header_namespace = "",
     exported_headers = subdir_glob(
         [
             ("", "*.h"),
-            ("androidpicker/react/renderer/components/androidpicker", "*.h"),
         ],
-        prefix = "react/renderer/components/androidpicker",
+        prefix = "react/renderer/timeline",
     ),
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
-    cxx_tests = [":tests"],
-    fbandroid_deps = [
-        react_native_target("jni/react/jni:jni"),
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_labels = ["supermodule:ios/isolation/infra.react_native"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
+        "fbsource//xplat/fbsystrace:fbsystrace",
+        "fbsource//xplat/folly:headers_only",
+        "fbsource//xplat/folly:memory",
+        "fbsource//xplat/folly:molly",
         "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        YOGA_CXX_TARGET,
+        react_native_xplat_target("react/utils:utils"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
-        react_native_xplat_target("react/renderer/graphics:graphics"),
-        react_native_xplat_target("react/renderer/components/view:view"),
+        react_native_xplat_target("react/renderer/components/root:root"),
+        react_native_xplat_target("react/renderer/mounting:mounting"),
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
-        react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
-        "//xplat/js/react-native-github:generated_components-rncore",
     ],
 )
 
@@ -78,21 +71,14 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = (
-        # `Apple` and `Android` flavors are disabled because the module depends on `textlayoutmanager` which requires real an Emulator/Simulator to run.
-        #  At the same time, the code of tests does not rely on the simulator capabilities and it would be wasteful to add `fbandroid_use_instrumentation_test = True`.
-        # (Beware of this option though.)
-        # ANDROID,
-        # APPLE,
-        CXX
-    ),
+    platforms = (ANDROID, APPLE, CXX),
     deps = [
-        ":androidpicker",
-        "//xplat/folly:molly",
-        "//xplat/third-party/gmock:gtest",
+        "fbsource//xplat/folly:molly",
+        "fbsource//xplat/third-party/gmock:gtest",
+        ":timeline",
     ],
 )
diff --git a/ReactCommon/react/renderer/timeline/Timeline.cpp b/ReactCommon/react/renderer/timeline/Timeline.cpp
new file mode 100644
index 00000000000000..11dd457d8888a1
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/Timeline.cpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "Timeline.h"
+
+#include <react/renderer/uimanager/UIManager.h>
+
+namespace facebook {
+namespace react {
+
+Timeline::Timeline(ShadowTree const &shadowTree) : shadowTree_(&shadowTree) {
+  record(shadowTree.getCurrentRevision().rootShadowNode);
+};
+
+#pragma mark - Public
+
+SurfaceId Timeline::getSurfaceId() const noexcept {
+  return shadowTree_->getSurfaceId();
+}
+
+void Timeline::pause() const noexcept {
+  std::lock_guard<std::recursive_mutex> lock(mutex_);
+  assert(!paused_ && "");
+  paused_ = true;
+}
+
+void Timeline::resume() const noexcept {
+  std::lock_guard<std::recursive_mutex> lock(mutex_);
+
+  if (snapshots_.size() > 0) {
+    rewind(snapshots_.at(snapshots_.size() - 1));
+  }
+
+  assert(paused_ && "");
+  paused_ = false;
+}
+
+bool Timeline::isPaused() const noexcept {
+  std::lock_guard<std::recursive_mutex> lock(mutex_);
+  return paused_;
+}
+
+TimelineFrame::List Timeline::getFrames() const noexcept {
+  std::lock_guard<std::recursive_mutex> lock(mutex_);
+
+  auto frames = TimelineFrame::List{};
+  frames.reserve(snapshots_.size());
+  for (auto const &snapshot : snapshots_) {
+    frames.push_back(snapshot.getFrame());
+  }
+  return frames;
+}
+
+TimelineFrame Timeline::getCurrentFrame() const noexcept {
+  assert(snapshots_.size() > currentSnapshotIndex_);
+  return snapshots_.at(currentSnapshotIndex_).getFrame();
+}
+
+void Timeline::rewind(TimelineFrame const &frame) const noexcept {
+  std::lock_guard<std::recursive_mutex> lock(mutex_);
+  rewind(snapshots_.at(frame.getIndex()));
+}
+
+RootShadowNode::Unshared Timeline::shadowTreeWillCommit(
+    ShadowTree const &shadowTree,
+    RootShadowNode::Shared const &oldRootShadowNode,
+    RootShadowNode::Unshared const &newRootShadowNode) const noexcept {
+  std::lock_guard<std::recursive_mutex> lock(mutex_);
+
+  if (rewinding_) {
+    return newRootShadowNode;
+  }
+
+  record(newRootShadowNode);
+
+  if (paused_) {
+    return nullptr;
+  }
+
+  return newRootShadowNode;
+}
+
+#pragma mark - Private & Internal
+
+void Timeline::record(
+    RootShadowNode::Shared const &rootShadowNode) const noexcept {
+  auto index = (int)snapshots_.size();
+  snapshots_.push_back(TimelineSnapshot{rootShadowNode, index});
+
+  if (!paused_) {
+    currentSnapshotIndex_ = index;
+  }
+}
+
+void Timeline::rewind(TimelineSnapshot const &snapshot) const noexcept {
+  std::lock_guard<std::recursive_mutex> lock(mutex_);
+
+  currentSnapshotIndex_ = snapshot.getFrame().getIndex();
+
+  assert(!rewinding_ && "");
+  rewinding_ = true;
+
+  auto rootShadowNode = snapshot.getRootShadowNode();
+
+  shadowTree_->commit(
+      [&](RootShadowNode const &oldRootShadowNode) -> RootShadowNode::Unshared {
+        return std::static_pointer_cast<RootShadowNode>(
+            rootShadowNode->ShadowNode::clone({}));
+      });
+
+  assert(rewinding_ && "");
+  rewinding_ = false;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/Timeline.h b/ReactCommon/react/renderer/timeline/Timeline.h
new file mode 100644
index 00000000000000..8eaaf226776731
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/Timeline.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include <better/mutex.h>
+
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/timeline/TimelineSnapshot.h>
+#include <react/renderer/uimanager/UIManagerCommitHook.h>
+
+namespace facebook {
+namespace react {
+
+class UIManager;
+
+class Timeline final {
+  friend class TimelineHandler;
+  friend class TimelineController;
+
+ public:
+  Timeline(ShadowTree const &shadowTree);
+
+ private:
+#pragma mark - Private methods to be used by `TimelineHandler`.
+
+  void pause() const noexcept;
+  void resume() const noexcept;
+  bool isPaused() const noexcept;
+  TimelineFrame::List getFrames() const noexcept;
+  TimelineFrame getCurrentFrame() const noexcept;
+  void rewind(TimelineFrame const &frame) const noexcept;
+  SurfaceId getSurfaceId() const noexcept;
+
+#pragma mark - Private methods to be used by `TimelineController`.
+
+  RootShadowNode::Unshared shadowTreeWillCommit(
+      ShadowTree const &shadowTree,
+      RootShadowNode::Shared const &oldRootShadowNode,
+      RootShadowNode::Unshared const &newRootShadowNode) const noexcept;
+
+#pragma mark - Private & Internal
+
+  void record(RootShadowNode::Shared const &rootShadowNode) const noexcept;
+  void rewind(TimelineSnapshot const &snapshot) const noexcept;
+
+  mutable std::recursive_mutex mutex_;
+  mutable ShadowTree const *shadowTree_{nullptr};
+  mutable int currentSnapshotIndex_{0};
+  mutable TimelineSnapshot::List snapshots_{};
+  mutable bool paused_{false};
+  mutable bool rewinding_{false};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineController.cpp b/ReactCommon/react/renderer/timeline/TimelineController.cpp
new file mode 100644
index 00000000000000..153650ae092f3d
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineController.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "TimelineController.h"
+
+#include <react/renderer/mounting/ShadowTree.h>
+#include <react/renderer/uimanager/UIManager.h>
+
+namespace facebook {
+namespace react {
+
+TimelineHandler TimelineController::enable(SurfaceId surfaceId) const {
+  assert(uiManager_);
+
+  auto shadowTreePtr = (ShadowTree const *){};
+
+  uiManager_->getShadowTreeRegistry().visit(
+      surfaceId,
+      [&](ShadowTree const &shadowTree) { shadowTreePtr = &shadowTree; });
+
+  assert(shadowTreePtr);
+
+  {
+    std::unique_lock<better::shared_mutex> lock(timelinesMutex_);
+
+    auto timeline = std::make_unique<Timeline>(*shadowTreePtr);
+    auto handler = TimelineHandler{*timeline};
+    timelines_.emplace(surfaceId, std::move(timeline));
+    return handler;
+  }
+}
+
+void TimelineController::disable(TimelineHandler &&handler) const {
+  std::unique_lock<better::shared_mutex> lock(timelinesMutex_);
+
+  auto iterator = timelines_.find(handler.getSurfaceId());
+  assert(iterator != timelines_.end());
+  timelines_.erase(iterator);
+  handler.release();
+}
+
+void TimelineController::commitHookWasRegistered(
+    UIManager const &uiManager) const noexcept {
+  uiManager_ = &uiManager;
+}
+
+void TimelineController::commitHookWasUnregistered(
+    UIManager const &uiManager) const noexcept {
+  uiManager_ = nullptr;
+}
+
+RootShadowNode::Unshared TimelineController::shadowTreeWillCommit(
+    ShadowTree const &shadowTree,
+    RootShadowNode::Shared const &oldRootShadowNode,
+    RootShadowNode::Unshared const &newRootShadowNode) const noexcept {
+  std::shared_lock<better::shared_mutex> lock(timelinesMutex_);
+
+  assert(uiManager_ && "`uiManager_` must not be `nullptr`.");
+
+  lastUpdatedSurface_ = shadowTree.getSurfaceId();
+
+  auto iterator = timelines_.find(shadowTree.getSurfaceId());
+  if (iterator == timelines_.end()) {
+    return newRootShadowNode;
+  }
+
+  auto &timeline = *iterator->second;
+  return timeline.shadowTreeWillCommit(
+      shadowTree, oldRootShadowNode, newRootShadowNode);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineController.h b/ReactCommon/react/renderer/timeline/TimelineController.h
new file mode 100644
index 00000000000000..0cfed408e7c79b
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineController.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <better/map.h>
+
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/timeline/Timeline.h>
+#include <react/renderer/timeline/TimelineHandler.h>
+#include <react/renderer/uimanager/UIManagerCommitHook.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Provides tools for introspecting the series of commits and associated
+ * side-effects, allowing to "rewind" UI to any particular commit from the past.
+ */
+class TimelineController final : public UIManagerCommitHook {
+ public:
+  using Shared = std::shared_ptr<TimelineController const>;
+
+  /*
+   * Creates a `TimelineHandler` associated with given `SurfaceId` and starts
+   * the introspection process.
+   */
+  TimelineHandler enable(SurfaceId surfaceId) const;
+
+  /*
+   * Consumes and destroys a `TimelineHandler` instance triggering the
+   * destruction of all associated resources and stoping the introspection
+   * process.
+   */
+  void disable(TimelineHandler &&handler) const;
+
+  /*
+   * TO BE DELETED.
+   */
+  SurfaceId lastUpdatedSurface() const {
+    return lastUpdatedSurface_;
+  }
+
+#pragma mark - UIManagerCommitHook
+
+  RootShadowNode::Unshared shadowTreeWillCommit(
+      ShadowTree const &shadowTree,
+      RootShadowNode::Shared const &oldRootShadowNode,
+      RootShadowNode::Unshared const &newRootShadowNode)
+      const noexcept override;
+
+  void commitHookWasRegistered(
+      UIManager const &uiManager) const noexcept override;
+
+  void commitHookWasUnregistered(
+      UIManager const &uiManager) const noexcept override;
+
+ private:
+  /*
+   * Protects all the data members.
+   */
+  mutable better::shared_mutex timelinesMutex_;
+
+  /*
+   * Owning collection of all running `Timeline` instances.
+   */
+  mutable better::map<SurfaceId, std::unique_ptr<Timeline>> timelines_;
+
+  mutable UIManager const *uiManager_;
+  mutable SurfaceId lastUpdatedSurface_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineFrame.cpp b/ReactCommon/react/renderer/timeline/TimelineFrame.cpp
new file mode 100644
index 00000000000000..6b6f7883021fff
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineFrame.cpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "TimelineFrame.h"
+
+namespace facebook {
+namespace react {
+
+TimelineFrame::TimelineFrame(int index, TelemetryTimePoint timePoint) noexcept
+    : index_(index), timePoint_(timePoint) {}
+
+int TimelineFrame::getIndex() const noexcept {
+  return index_;
+}
+
+TelemetryTimePoint TimelineFrame::getTimePoint() const noexcept {
+  return timePoint_;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineFrame.h b/ReactCommon/react/renderer/timeline/TimelineFrame.h
new file mode 100644
index 00000000000000..a6374cb509a61a
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineFrame.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/LayoutPrimitives.h>
+#include <react/renderer/uimanager/UIManagerCommitHook.h>
+#include <react/utils/Telemetry.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Represents a reference to a commit from the past.
+ * The reference can be safely used to address a particular commit from non-core
+ * code.
+ */
+class TimelineFrame final {
+  friend class TimelineSnapshot;
+
+  /*
+   * Constructor is private and must be called by `TimelineSnapshot` only.
+   */
+  TimelineFrame(int index, TelemetryTimePoint timePoint) noexcept;
+
+ public:
+  using List = std::vector<TimelineFrame>;
+
+  TimelineFrame() = delete;
+  TimelineFrame(TimelineFrame const &timelineFrame) noexcept = default;
+  TimelineFrame &operator=(TimelineFrame const &other) noexcept = default;
+
+  int getIndex() const noexcept;
+  TelemetryTimePoint getTimePoint() const noexcept;
+
+ private:
+  int index_;
+  TelemetryTimePoint timePoint_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineHandler.cpp b/ReactCommon/react/renderer/timeline/TimelineHandler.cpp
new file mode 100644
index 00000000000000..953e305d80b84a
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineHandler.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "TimelineHandler.h"
+
+#include <algorithm>
+
+#include <react/renderer/timeline/Timeline.h>
+
+namespace facebook {
+namespace react {
+
+TimelineHandler::TimelineHandler(Timeline const &timeline) noexcept
+    : timeline_(&timeline) {}
+
+TimelineHandler::TimelineHandler(TimelineHandler &&other) noexcept {
+  this->operator=(std::move(other));
+}
+
+TimelineHandler::~TimelineHandler() noexcept {
+  if (timeline_ != nullptr) {
+    // Improper deallocation indicates a severe error in application logic:
+    abort();
+  }
+}
+
+TimelineHandler &TimelineHandler::operator=(TimelineHandler &&other) noexcept {
+  assert(other.timeline_ && "Moving from an empty `TimelineHandler`.");
+  timeline_ = other.timeline_;
+  other.timeline_ = nullptr;
+  return *this;
+}
+
+#pragma mark - Public
+
+void TimelineHandler::pause() const noexcept {
+  ensureNotEmpty();
+  timeline_->pause();
+}
+
+void TimelineHandler::resume() const noexcept {
+  ensureNotEmpty();
+  timeline_->resume();
+}
+
+bool TimelineHandler::isPaused() const noexcept {
+  ensureNotEmpty();
+  return timeline_->isPaused();
+}
+
+TimelineFrame TimelineHandler::getCurrentFrame() const noexcept {
+  ensureNotEmpty();
+  return timeline_->getCurrentFrame();
+}
+
+TimelineFrame::List TimelineHandler::getFrames() const noexcept {
+  ensureNotEmpty();
+  return timeline_->getFrames();
+}
+
+void TimelineHandler::rewind(TimelineFrame const &frame) const noexcept {
+  ensureNotEmpty();
+  return timeline_->rewind(frame);
+}
+
+void TimelineHandler::seek(int delta) const noexcept {
+  ensureNotEmpty();
+  auto frames = timeline_->getFrames();
+  auto currentFrame = timeline_->getCurrentFrame();
+  auto seekFrameIndex = currentFrame.getIndex() + delta;
+  seekFrameIndex =
+      std::min((int)frames.size() - 1, std::max(0, seekFrameIndex));
+  timeline_->rewind(frames.at(seekFrameIndex));
+}
+
+#pragma mark - Private
+
+SurfaceId TimelineHandler::getSurfaceId() const noexcept {
+  return timeline_->getSurfaceId();
+}
+
+void TimelineHandler::release() noexcept {
+  timeline_ = nullptr;
+}
+
+void TimelineHandler::ensureNotEmpty() const noexcept {
+  if (!timeline_) {
+    abort();
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineHandler.h b/ReactCommon/react/renderer/timeline/TimelineHandler.h
new file mode 100644
index 00000000000000..3065eefa7fec01
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineHandler.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/LayoutPrimitives.h>
+#include <react/renderer/timeline/TimelineFrame.h>
+#include <react/renderer/uimanager/UIManagerCommitHook.h>
+
+namespace facebook {
+namespace react {
+
+class Timeline;
+
+class TimelineHandler final {
+ public:
+  ~TimelineHandler() noexcept;
+
+  /*
+   * Movable, not copyable.
+   */
+  TimelineHandler(TimelineHandler &&timelineHandler) noexcept;
+  TimelineHandler(TimelineHandler const &timelineHandler) = delete;
+  TimelineHandler &operator=(TimelineHandler &&other) noexcept;
+  TimelineHandler &operator=(TimelineHandler const &other) = delete;
+
+  /*
+   * Stops (or resumes) mounting of new commits.
+   * A surface has to be paused to allow rewinding the UI to some past commit.
+   */
+  void pause() const noexcept;
+  void resume() const noexcept;
+  bool isPaused() const noexcept;
+
+  /*
+   * Provides access to recorded frames.
+   */
+  TimelineFrame::List getFrames() const noexcept;
+  TimelineFrame getCurrentFrame() const noexcept;
+
+  /*
+   * Rewinds the UI to a given frame.
+   */
+  void rewind(TimelineFrame const &frame) const noexcept;
+
+  /*
+   * Rewinds the UI for a given number of frames back or forward.
+   */
+  void seek(int delta) const noexcept;
+
+ private:
+  friend class TimelineController;
+
+  /*
+   * Can only be constructed by `TimelineController`.
+   */
+  TimelineHandler(Timeline const &timeline) noexcept;
+
+  /*
+   * Must be called before deallocation to make it not crash.
+   * Must be only called by `TimelineController`.
+   */
+  void release() noexcept;
+
+  /*
+   * Returns a `SurfaceId` of the assigned Surface.
+   */
+  SurfaceId getSurfaceId() const noexcept;
+
+  void ensureNotEmpty() const noexcept;
+
+  Timeline const *timeline_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp b/ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp
new file mode 100644
index 00000000000000..fd460b1ef22f2b
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "TimelineSnapshot.h"
+
+#include <react/utils/Telemetry.h>
+
+namespace facebook {
+namespace react {
+
+TimelineSnapshot::TimelineSnapshot(
+    RootShadowNode::Shared const &rootShadowNode,
+    int index) noexcept
+    : rootShadowNode_(rootShadowNode),
+      frame_(TimelineFrame{index, telemetryTimePointNow()}) {}
+
+RootShadowNode::Shared TimelineSnapshot::getRootShadowNode() const noexcept {
+  return rootShadowNode_;
+}
+
+TimelineFrame TimelineSnapshot::getFrame() const noexcept {
+  return frame_;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/timeline/TimelineSnapshot.h b/ReactCommon/react/renderer/timeline/TimelineSnapshot.h
new file mode 100644
index 00000000000000..59d022b3f18d6f
--- /dev/null
+++ b/ReactCommon/react/renderer/timeline/TimelineSnapshot.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/root/RootShadowNode.h>
+#include <react/renderer/timeline/TimelineFrame.h>
+
+namespace facebook {
+namespace react {
+
+/*
+ * Represents a reference to a commit from the past used by `Timeline`.
+ */
+class TimelineSnapshot final {
+ public:
+  using List = std::vector<TimelineSnapshot>;
+
+  TimelineSnapshot(
+      RootShadowNode::Shared const &rootShadowNode,
+      int index) noexcept;
+
+  TimelineFrame getFrame() const noexcept;
+  RootShadowNode::Shared getRootShadowNode() const noexcept;
+
+ private:
+  RootShadowNode::Shared rootShadowNode_;
+  TimelineFrame frame_;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/uimanager/Android.mk b/ReactCommon/react/renderer/uimanager/Android.mk
index 45f45b827b291f..47975cd7dad251 100644
--- a/ReactCommon/react/renderer/uimanager/Android.mk
+++ b/ReactCommon/react/renderer/uimanager/Android.mk
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libreact_render_graphics libfolly_futures libruntimeexecutor libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug libreact_render_components_view libreact_render_components_root libreact_render_mounting
+LOCAL_SHARED_LIBRARIES := libreact_render_graphics libfolly_futures libruntimeexecutor libreact_render_componentregistry glog libreactconfig libfolly_json libjsi libreact_render_core libreact_render_debug librrc_view librrc_root libreact_render_mounting libreact_debug libreact_render_leakchecker
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -33,7 +33,9 @@ $(call import-module,react/renderer/components/root)
 $(call import-module,react/renderer/components/view)
 $(call import-module,react/renderer/componentregistry)
 $(call import-module,react/renderer/core)
+$(call import-module,react/renderer/leakchecker)
 $(call import-module,react/renderer/debug)
 $(call import-module,react/renderer/graphics)
 $(call import-module,react/renderer/mounting)
+$(call import-module,react/debug)
 $(call import-module,runtimeexecutor)
diff --git a/ReactCommon/react/renderer/uimanager/BUCK b/ReactCommon/react/renderer/uimanager/BUCK
index 494f606a0531b5..4a583781475517 100644
--- a/ReactCommon/react/renderer/uimanager/BUCK
+++ b/ReactCommon/react/renderer/uimanager/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -7,6 +6,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -58,9 +58,11 @@ rn_xplat_cxx_library(
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/config:config"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/components/view:view"),
         react_native_xplat_target("react/renderer/mounting:mounting"),
         react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/leakchecker:leakchecker"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
@@ -74,7 +76,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
diff --git a/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h b/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h
index b87b96f68f73cc..cad196eb98230a 100644
--- a/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h
@@ -7,8 +7,7 @@
 
 #pragma once
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class LayoutAnimationStatusDelegate {
  public:
@@ -26,5 +25,4 @@ class LayoutAnimationStatusDelegate {
   virtual void onAllAnimationsComplete() = 0;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp
index 8a55d7e58822f5..56bb2bad80afaa 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -7,14 +7,35 @@
 
 #include "UIManager.h"
 
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <react/renderer/graphics/Geometry.h>
+#include <react/renderer/uimanager/UIManagerBinding.h>
+#include <react/renderer/uimanager/UIManagerCommitHook.h>
 
 #include <glog/logging.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
+
+static std::unique_ptr<LeakChecker> constructLeakCheckerIfNeeded(
+    RuntimeExecutor const &runtimeExecutor) {
+#ifdef REACT_NATIVE_DEBUG
+  return std::make_unique<LeakChecker>(runtimeExecutor);
+#else
+  return {};
+#endif
+}
+
+UIManager::UIManager(
+    RuntimeExecutor const &runtimeExecutor,
+    BackgroundExecutor const &backgroundExecutor,
+    ContextContainer::Shared contextContainer)
+    : runtimeExecutor_(runtimeExecutor),
+      backgroundExecutor_(backgroundExecutor),
+      contextContainer_(contextContainer),
+      leakChecker_(constructLeakCheckerIfNeeded(runtimeExecutor)) {}
 
 UIManager::~UIManager() {
   LOG(WARNING) << "UIManager::~UIManager() was called (address: " << this
@@ -33,10 +54,13 @@ SharedShadowNode UIManager::createNode(
   auto fallbackDescriptor =
       componentDescriptorRegistry_->getFallbackComponentDescriptor();
 
-  auto family = componentDescriptor.createFamily(
-      ShadowNodeFamilyFragment{tag, surfaceId, nullptr},
-      std::move(eventTarget));
-  auto const props = componentDescriptor.cloneProps(nullptr, rawProps);
+  PropsParserContext propsParserContext{surfaceId, *contextContainer_.get()};
+
+  auto const fragment = ShadowNodeFamilyFragment{tag, surfaceId, nullptr};
+  auto family =
+      componentDescriptor.createFamily(fragment, std::move(eventTarget));
+  auto const props =
+      componentDescriptor.cloneProps(propsParserContext, nullptr, rawProps);
   auto const state =
       componentDescriptor.createInitialState(ShadowNodeFragment{props}, family);
 
@@ -47,7 +71,9 @@ SharedShadowNode UIManager::createNode(
                   fallbackDescriptor->getComponentHandle() ==
                       componentDescriptor.getComponentHandle()
               ? componentDescriptor.cloneProps(
-                    props, RawProps(folly::dynamic::object("name", name)))
+                    propsParserContext,
+                    props,
+                    RawProps(folly::dynamic::object("name", name)))
               : props,
           /* .children = */ ShadowNodeFragment::childrenPlaceholder(),
           /* .state = */ state,
@@ -55,7 +81,10 @@ SharedShadowNode UIManager::createNode(
       family);
 
   if (delegate_) {
-    delegate_->uiManagerDidCreateShadowNode(shadowNode);
+    delegate_->uiManagerDidCreateShadowNode(*shadowNode.get());
+  }
+  if (leakChecker_) {
+    leakChecker_->uiManagerDidCreateShadowNodeFamily(family);
   }
 
   return shadowNode;
@@ -67,17 +96,25 @@ SharedShadowNode UIManager::cloneNode(
     const RawProps *rawProps) const {
   SystraceSection s("UIManager::cloneNode");
 
+  PropsParserContext propsParserContext{
+      shadowNode->getFamily().getSurfaceId(), *contextContainer_.get()};
+
   auto &componentDescriptor = shadowNode->getComponentDescriptor();
   auto clonedShadowNode = componentDescriptor.cloneShadowNode(
       *shadowNode,
       {
           /* .props = */
           rawProps ? componentDescriptor.cloneProps(
-                         shadowNode->getProps(), *rawProps)
+                         propsParserContext, shadowNode->getProps(), *rawProps)
                    : ShadowNodeFragment::propsPlaceholder(),
           /* .children = */ children,
       });
 
+  if (delegate_) {
+    delegate_->uiManagerDidCloneShadowNode(
+        *shadowNode.get(), *clonedShadowNode.get());
+  }
+
   return clonedShadowNode;
 }
 
@@ -110,33 +147,88 @@ void UIManager::completeSurface(
   });
 }
 
-void UIManager::setJSResponder(
-    const ShadowNode::Shared &shadowNode,
-    const bool blockNativeResponder) const {
+void UIManager::setIsJSResponder(
+    ShadowNode::Shared const &shadowNode,
+    bool isJSResponder,
+    bool blockNativeResponder) const {
   if (delegate_) {
-    delegate_->uiManagerDidSetJSResponder(
-        shadowNode->getSurfaceId(), shadowNode, blockNativeResponder);
+    delegate_->uiManagerDidSetIsJSResponder(
+        shadowNode, isJSResponder, blockNativeResponder);
   }
 }
 
-void UIManager::clearJSResponder() const {
-  if (delegate_) {
-    delegate_->uiManagerDidClearJSResponder();
+void UIManager::startSurface(
+    ShadowTree::Unique &&shadowTree,
+    std::string const &moduleName,
+    folly::dynamic const &props,
+    DisplayMode displayMode) const {
+  SystraceSection s("UIManager::startSurface");
+
+  auto surfaceId = shadowTree->getSurfaceId();
+  shadowTreeRegistry_.add(std::move(shadowTree));
+
+  runtimeExecutor_([=](jsi::Runtime &runtime) {
+    SystraceSection s("UIManager::startSurface::onRuntime");
+    auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
+    if (!uiManagerBinding) {
+      return;
+    }
+
+    uiManagerBinding->startSurface(
+        runtime, surfaceId, moduleName, props, displayMode);
+  });
+}
+
+void UIManager::setSurfaceProps(
+    SurfaceId surfaceId,
+    std::string const &moduleName,
+    folly::dynamic const &props,
+    DisplayMode displayMode) const {
+  SystraceSection s("UIManager::setSurfaceProps");
+
+  runtimeExecutor_([=](jsi::Runtime &runtime) {
+    auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
+    if (!uiManagerBinding) {
+      return;
+    }
+
+    uiManagerBinding->setSurfaceProps(
+        runtime, surfaceId, moduleName, props, displayMode);
+  });
+}
+
+ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const {
+  SystraceSection s("UIManager::stopSurface");
+
+  // Stop any ongoing animations.
+  stopSurfaceForAnimationDelegate(surfaceId);
+
+  // Waiting for all concurrent commits to be finished and unregistering the
+  // `ShadowTree`.
+  auto shadowTree = getShadowTreeRegistry().remove(surfaceId);
+
+  // We execute JavaScript/React part of the process at the very end to minimize
+  // any visible side-effects of stopping the Surface. Any possible commits from
+  // the JavaScript side will not be able to reference a `ShadowTree` and will
+  // fail silently.
+  runtimeExecutor_([=](jsi::Runtime &runtime) {
+    auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
+    if (!uiManagerBinding) {
+      return;
+    }
+
+    uiManagerBinding->stopSurface(runtime, surfaceId);
+  });
+
+  if (leakChecker_) {
+    leakChecker_->stopSurface(surfaceId);
   }
+
+  return shadowTree;
 }
 
 ShadowNode::Shared UIManager::getNewestCloneOfShadowNode(
     ShadowNode const &shadowNode) const {
-  auto findNewestChildInParent =
-      [&](auto const &parentNode) -> ShadowNode::Shared {
-    for (auto const &child : parentNode.getChildren()) {
-      if (ShadowNode::sameFamily(*child, shadowNode)) {
-        return child;
-      }
-    }
-    return nullptr;
-  };
-
   auto ancestorShadowNode = ShadowNode::Shared{};
   shadowTreeRegistry_.visit(
       shadowNode.getSurfaceId(), [&](ShadowTree const &shadowTree) {
@@ -153,7 +245,8 @@ ShadowNode::Shared UIManager::getNewestCloneOfShadowNode(
     return nullptr;
   }
 
-  return findNewestChildInParent(ancestors.rbegin()->first.get());
+  auto pair = ancestors.rbegin();
+  return pair->first.get().getChildren().at(pair->second);
 }
 
 ShadowNode::Shared UIManager::findNodeAtPoint(
@@ -199,8 +292,7 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics(
       shadowNode.getFamily(), *layoutableAncestorShadowNode, policy);
 }
 
-void UIManager::updateStateWithAutorepeat(
-    StateUpdate const &stateUpdate) const {
+void UIManager::updateState(StateUpdate const &stateUpdate) const {
   auto &callback = stateUpdate.callback;
   auto &family = stateUpdate.family;
   auto &componentDescriptor = family->getComponentDescriptor();
@@ -238,43 +330,6 @@ void UIManager::updateStateWithAutorepeat(
       });
 }
 
-void UIManager::updateState(StateUpdate const &stateUpdate) const {
-  if (stateUpdate.autorepeat || experimentEnableStateUpdateWithAutorepeat) {
-    updateStateWithAutorepeat(stateUpdate);
-    return;
-  }
-
-  auto &callback = stateUpdate.callback;
-  auto &family = stateUpdate.family;
-  auto &componentDescriptor = family->getComponentDescriptor();
-
-  shadowTreeRegistry_.visit(
-      family->getSurfaceId(), [&](ShadowTree const &shadowTree) {
-        auto status = shadowTree.tryCommit([&](RootShadowNode const
-                                                   &oldRootShadowNode) {
-          return std::static_pointer_cast<RootShadowNode>(
-              oldRootShadowNode.cloneTree(
-                  *family, [&](ShadowNode const &oldShadowNode) {
-                    auto newData =
-                        callback(oldShadowNode.getState()->getDataPointer());
-                    auto newState =
-                        componentDescriptor.createState(*family, newData);
-
-                    return oldShadowNode.clone({
-                        /* .props = */ ShadowNodeFragment::propsPlaceholder(),
-                        /* .children = */
-                        ShadowNodeFragment::childrenPlaceholder(),
-                        /* .state = */ newState,
-                    });
-                  }));
-        });
-        if (status != ShadowTree::CommitStatus::Succeeded &&
-            stateUpdate.failureCallback) {
-          stateUpdate.failureCallback();
-        }
-      });
-}
-
 void UIManager::dispatchCommand(
     const ShadowNode::Shared &shadowNode,
     std::string const &commandName,
@@ -284,6 +339,14 @@ void UIManager::dispatchCommand(
   }
 }
 
+void UIManager::sendAccessibilityEvent(
+    const ShadowNode::Shared &shadowNode,
+    std::string const &eventType) {
+  if (delegate_) {
+    delegate_->uiManagerDidSendAccessibilityEvent(shadowNode, eventType);
+  }
+}
+
 void UIManager::configureNextLayoutAnimation(
     jsi::Runtime &runtime,
     RawValue const &config,
@@ -311,27 +374,56 @@ UIManagerDelegate *UIManager::getDelegate() {
   return delegate_;
 }
 
-void UIManager::setBackgroundExecutor(
-    BackgroundExecutor const &backgroundExecutor) {
-  backgroundExecutor_ = backgroundExecutor;
-}
-
 void UIManager::visitBinding(
-    std::function<void(UIManagerBinding const &uiManagerBinding)> callback)
-    const {
-  if (!uiManagerBinding_) {
-    return;
+    std::function<void(UIManagerBinding const &uiManagerBinding)> callback,
+    jsi::Runtime &runtime) const {
+  auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
+  if (uiManagerBinding) {
+    callback(*uiManagerBinding);
   }
-
-  callback(*uiManagerBinding_);
 }
 
 ShadowTreeRegistry const &UIManager::getShadowTreeRegistry() const {
   return shadowTreeRegistry_;
 }
 
+void UIManager::registerCommitHook(
+    UIManagerCommitHook const &commitHook) const {
+  std::unique_lock<better::shared_mutex> lock(commitHookMutex_);
+  react_native_assert(
+      std::find(commitHooks_.begin(), commitHooks_.end(), &commitHook) ==
+      commitHooks_.end());
+  commitHook.commitHookWasRegistered(*this);
+  commitHooks_.push_back(&commitHook);
+}
+
+void UIManager::unregisterCommitHook(
+    UIManagerCommitHook const &commitHook) const {
+  std::unique_lock<better::shared_mutex> lock(commitHookMutex_);
+  auto iterator =
+      std::find(commitHooks_.begin(), commitHooks_.end(), &commitHook);
+  react_native_assert(iterator != commitHooks_.end());
+  commitHooks_.erase(iterator);
+  commitHook.commitHookWasUnregistered(*this);
+}
+
 #pragma mark - ShadowTreeDelegate
 
+RootShadowNode::Unshared UIManager::shadowTreeWillCommit(
+    ShadowTree const &shadowTree,
+    RootShadowNode::Shared const &oldRootShadowNode,
+    RootShadowNode::Unshared const &newRootShadowNode) const {
+  std::shared_lock<better::shared_mutex> lock(commitHookMutex_);
+
+  auto resultRootShadowNode = newRootShadowNode;
+  for (auto const *commitHook : commitHooks_) {
+    resultRootShadowNode = commitHook->shadowTreeWillCommit(
+        shadowTree, oldRootShadowNode, resultRootShadowNode);
+  }
+
+  return resultRootShadowNode;
+}
+
 void UIManager::shadowTreeDidFinishTransaction(
     ShadowTree const &shadowTree,
     MountingCoordinator::Shared const &mountingCoordinator) const {
@@ -348,7 +440,7 @@ void UIManager::setAnimationDelegate(UIManagerAnimationDelegate *delegate) {
   animationDelegate_ = delegate;
 }
 
-void UIManager::stopSurfaceForAnimationDelegate(SurfaceId surfaceId) {
+void UIManager::stopSurfaceForAnimationDelegate(SurfaceId surfaceId) const {
   if (animationDelegate_ != nullptr) {
     animationDelegate_->stopSurface(surfaceId);
   }
@@ -364,5 +456,4 @@ void UIManager::animationTick() {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.h b/ReactCommon/react/renderer/uimanager/UIManager.h
index 6eb517fd9dc824..e24434cc9bcc7c 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.h
+++ b/ReactCommon/react/renderer/uimanager/UIManager.h
@@ -10,24 +10,33 @@
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 
+#include <ReactCommon/RuntimeExecutor.h>
+
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 #include <react/renderer/core/RawValue.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/StateData.h>
+#include <react/renderer/leakchecker/LeakChecker.h>
 #include <react/renderer/mounting/ShadowTree.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 #include <react/renderer/mounting/ShadowTreeRegistry.h>
 #include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
 #include <react/renderer/uimanager/UIManagerDelegate.h>
 #include <react/renderer/uimanager/primitives.h>
+#include <react/utils/ContextContainer.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class UIManagerBinding;
+class UIManagerCommitHook;
 
 class UIManager final : public ShadowTreeDelegate {
  public:
+  UIManager(
+      RuntimeExecutor const &runtimeExecutor,
+      BackgroundExecutor const &backgroundExecutor,
+      ContextContainer::Shared contextContainer);
+
   ~UIManager();
 
   void setComponentDescriptorRegistry(
@@ -41,8 +50,6 @@ class UIManager final : public ShadowTreeDelegate {
   void setDelegate(UIManagerDelegate *delegate);
   UIManagerDelegate *getDelegate();
 
-  void setBackgroundExecutor(BackgroundExecutor const &backgroundExecutor);
-
   /**
    * Sets and gets the UIManager's Animation APIs delegate.
    * The delegate is stored as a raw pointer, so the owner must null
@@ -53,7 +60,7 @@ class UIManager final : public ShadowTreeDelegate {
   /**
    * Execute stopSurface on any UIMAnagerAnimationDelegate.
    */
-  void stopSurfaceForAnimationDelegate(SurfaceId surfaceId);
+  void stopSurfaceForAnimationDelegate(SurfaceId surfaceId) const;
 
   void animationTick();
 
@@ -64,8 +71,33 @@ class UIManager final : public ShadowTreeDelegate {
    * The callback is called synchronously on the same thread.
    */
   void visitBinding(
-      std::function<void(UIManagerBinding const &uiManagerBinding)> callback)
-      const;
+      std::function<void(UIManagerBinding const &uiManagerBinding)> callback,
+      jsi::Runtime &runtime) const;
+
+  /*
+   * Registers and unregisters a commit hook.
+   */
+  void registerCommitHook(UIManagerCommitHook const &commitHook) const;
+  void unregisterCommitHook(UIManagerCommitHook const &commitHook) const;
+
+  ShadowNode::Shared getNewestCloneOfShadowNode(
+      ShadowNode const &shadowNode) const;
+
+#pragma mark - Surface Start & Stop
+
+  void startSurface(
+      ShadowTree::Unique &&shadowTree,
+      std::string const &moduleName,
+      folly::dynamic const &props,
+      DisplayMode displayMode) const;
+
+  void setSurfaceProps(
+      SurfaceId surfaceId,
+      std::string const &moduleName,
+      folly::dynamic const &props,
+      DisplayMode displayMode) const;
+
+  ShadowTree::Unique stopSurface(SurfaceId surfaceId) const;
 
 #pragma mark - ShadowTreeDelegate
 
@@ -73,14 +105,18 @@ class UIManager final : public ShadowTreeDelegate {
       ShadowTree const &shadowTree,
       MountingCoordinator::Shared const &mountingCoordinator) const override;
 
-  /*
-   * Temporary flags.
-   */
-  bool experimentEnableStateUpdateWithAutorepeat{false};
+  RootShadowNode::Unshared shadowTreeWillCommit(
+      ShadowTree const &shadowTree,
+      RootShadowNode::Shared const &oldRootShadowNode,
+      RootShadowNode::Unshared const &newRootShadowNode) const override;
 
  private:
   friend class UIManagerBinding;
   friend class Scheduler;
+  friend class SurfaceHandler;
+
+  // `TimelineController` needs to call private `getShadowTreeRegistry()`.
+  friend class TimelineController;
 
   ShadowNode::Shared createNode(
       Tag tag,
@@ -103,19 +139,15 @@ class UIManager final : public ShadowTreeDelegate {
       SharedShadowNodeUnsharedList const &rootChildren,
       ShadowTree::CommitOptions commitOptions) const;
 
-  void setJSResponder(
-      const ShadowNode::Shared &shadowNode,
-      const bool blockNativeResponder) const;
-
-  void clearJSResponder() const;
+  void setIsJSResponder(
+      ShadowNode::Shared const &shadowNode,
+      bool isJSResponder,
+      bool blockNativeResponder) const;
 
   ShadowNode::Shared findNodeAtPoint(
       ShadowNode::Shared const &shadowNode,
       Point point) const;
 
-  ShadowNode::Shared getNewestCloneOfShadowNode(
-      ShadowNode const &shadowNode) const;
-
   /*
    * Returns layout metrics of given `shadowNode` relative to
    * `ancestorShadowNode` (relative to the root node in case if provided
@@ -131,13 +163,16 @@ class UIManager final : public ShadowTreeDelegate {
    * and performs a commit.
    */
   void updateState(StateUpdate const &stateUpdate) const;
-  void updateStateWithAutorepeat(StateUpdate const &stateUpdate) const;
 
   void dispatchCommand(
       const ShadowNode::Shared &shadowNode,
       std::string const &commandName,
       folly::dynamic const args) const;
 
+  void sendAccessibilityEvent(
+      const ShadowNode::Shared &shadowNode,
+      std::string const &eventType);
+
   /**
    * Configure a LayoutAnimation to happen on the next commit.
    * This API configures a global LayoutAnimation starting from the root node.
@@ -153,16 +188,15 @@ class UIManager final : public ShadowTreeDelegate {
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
   UIManagerDelegate *delegate_;
   UIManagerAnimationDelegate *animationDelegate_{nullptr};
-  UIManagerBinding *uiManagerBinding_;
+  RuntimeExecutor const runtimeExecutor_{};
   ShadowTreeRegistry shadowTreeRegistry_{};
-  BackgroundExecutor backgroundExecutor_{};
+  BackgroundExecutor const backgroundExecutor_{};
+  ContextContainer::Shared contextContainer_;
+
+  mutable better::shared_mutex commitHookMutex_;
+  mutable std::vector<UIManagerCommitHook const *> commitHooks_;
 
-  // Used only when BackgroundExecutor is enabled.
-  // Property is used to keep count of `completeRoot` events to
-  // determine whether a commit should be cancelled. Only to be used
-  // inside UIManagerBinding.
-  std::atomic_uint_fast8_t completeRootEventCounter_{0};
+  std::unique_ptr<LeakChecker> leakChecker_;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
index 9e55d1f3862e91..0aa7ca225cd7ba 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
@@ -12,8 +12,7 @@
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/core/RawValue.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class UIManagerAnimationDelegate {
  public:
@@ -48,5 +47,4 @@ class UIManagerAnimationDelegate {
   virtual void stopSurface(SurfaceId surfaceId) = 0;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
index 9dac8a1cce9180..c926765ec85539 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
@@ -7,15 +7,16 @@
 
 #include "UIManagerBinding.h"
 
-#include <react/renderer/debug/SystraceSection.h>
-
 #include <glog/logging.h>
 #include <jsi/JSIDynamic.h>
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/LayoutableShadowNode.h>
+#include <react/renderer/debug/SystraceSection.h>
+#include <react/renderer/uimanager/primitives.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-static jsi::Object getModule(
+static jsi::Value getModule(
     jsi::Runtime &runtime,
     std::string const &moduleName) {
   auto batchedBridge =
@@ -29,12 +30,36 @@ static jsi::Object getModule(
   if (!moduleAsValue.isObject()) {
     LOG(ERROR) << "getModule of " << moduleName << " is not an object";
   }
-  assert(moduleAsValue.isObject());
-  return moduleAsValue.asObject(runtime);
+  react_native_assert(moduleAsValue.isObject());
+  return moduleAsValue;
+}
+
+static bool checkBatchedBridgeIsActive(jsi::Runtime &runtime) {
+  if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge")) {
+    LOG(ERROR)
+        << "getPropertyAsObject: property '__fbBatchedBridge' is undefined, expected an Object";
+    return false;
+  }
+  return true;
+}
+
+static bool checkGetCallableModuleIsActive(jsi::Runtime &runtime) {
+  if (!checkBatchedBridgeIsActive(runtime)) {
+    return false;
+  }
+  auto batchedBridge =
+      runtime.global().getPropertyAsObject(runtime, "__fbBatchedBridge");
+  if (!batchedBridge.hasProperty(runtime, "getCallableModule")) {
+    LOG(ERROR)
+        << "getPropertyAsFunction: function 'getCallableModule' is undefined, expected a Function";
+    return false;
+  }
+  return true;
 }
 
 std::shared_ptr<UIManagerBinding> UIManagerBinding::createAndInstallIfNeeded(
-    jsi::Runtime &runtime) {
+    jsi::Runtime &runtime,
+    RuntimeExecutor const &runtimeExecutor) {
   auto uiManagerModuleName = "nativeFabricUIManager";
 
   auto uiManagerValue =
@@ -42,7 +67,7 @@ std::shared_ptr<UIManagerBinding> UIManagerBinding::createAndInstallIfNeeded(
   if (uiManagerValue.isUndefined()) {
     // The global namespace does not have an instance of the binding;
     // we need to create, install and return it.
-    auto uiManagerBinding = std::make_shared<UIManagerBinding>();
+    auto uiManagerBinding = std::make_shared<UIManagerBinding>(runtimeExecutor);
     auto object = jsi::Object::createFromHostObject(runtime, uiManagerBinding);
     runtime.global().setProperty(
         runtime, uiManagerModuleName, std::move(object));
@@ -55,35 +80,89 @@ std::shared_ptr<UIManagerBinding> UIManagerBinding::createAndInstallIfNeeded(
   return uiManagerObject.getHostObject<UIManagerBinding>(runtime);
 }
 
+std::shared_ptr<UIManagerBinding> UIManagerBinding::getBinding(
+    jsi::Runtime &runtime) {
+  auto uiManagerModuleName = "nativeFabricUIManager";
+
+  auto uiManagerValue =
+      runtime.global().getProperty(runtime, uiManagerModuleName);
+  if (uiManagerValue.isUndefined()) {
+    return nullptr;
+  }
+
+  auto uiManagerObject = uiManagerValue.asObject(runtime);
+  return uiManagerObject.getHostObject<UIManagerBinding>(runtime);
+}
+
+UIManagerBinding::UIManagerBinding(RuntimeExecutor const &runtimeExecutor)
+    : runtimeExecutor_(runtimeExecutor) {}
+
 UIManagerBinding::~UIManagerBinding() {
   LOG(WARNING) << "UIManagerBinding::~UIManagerBinding() was called (address: "
                << this << ").";
-
-  // We must detach the `UIBinding` on deallocation to prevent accessing
-  // deallocated `UIManagerBinding`.
-  // Since `UIManagerBinding` retains `UIManager`, `UIManager` always overlive
-  // `UIManagerBinding`, therefore we don't need similar logic in `UIManager`'s
-  // destructor.
-  attach(nullptr);
 }
 
 void UIManagerBinding::attach(std::shared_ptr<UIManager> const &uiManager) {
-  if (uiManager_) {
-    uiManager_->uiManagerBinding_ = nullptr;
+  uiManager_ = uiManager;
+}
+
+static jsi::Value callMethodOfModule(
+    jsi::Runtime &runtime,
+    std::string const &moduleName,
+    std::string const &methodName,
+    std::initializer_list<jsi::Value> args) {
+  if (checkGetCallableModuleIsActive(runtime)) {
+    auto module = getModule(runtime, moduleName.c_str());
+    if (module.isObject()) {
+      jsi::Object object = module.asObject(runtime);
+      react_native_assert(object.hasProperty(runtime, methodName.c_str()));
+      if (object.hasProperty(runtime, methodName.c_str())) {
+        auto method = object.getPropertyAsFunction(runtime, methodName.c_str());
+        return method.callWithThis(runtime, object, args);
+      } else {
+        LOG(ERROR) << "getPropertyAsFunction: property '" << methodName
+                   << "' is undefined, expected a Function";
+      }
+    }
   }
 
-  uiManager_ = uiManager;
+  return jsi::Value::undefined();
+}
+
+jsi::Value UIManagerBinding::getInspectorDataForInstance(
+    jsi::Runtime &runtime,
+    SharedEventEmitter eventEmitter) const {
+  auto eventTarget = eventEmitter->eventTarget_;
+  EventEmitter::DispatchMutex().lock();
 
-  if (uiManager_) {
-    uiManager_->uiManagerBinding_ = this;
+  if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
+      !eventTarget) {
+    return jsi::Value::undefined();
   }
+
+  eventTarget->retain(runtime);
+  auto instanceHandle = eventTarget->getInstanceHandle(runtime);
+  eventTarget->release(runtime);
+  EventEmitter::DispatchMutex().unlock();
+
+  if (instanceHandle.isUndefined()) {
+    return jsi::Value::undefined();
+  }
+
+  return callMethodOfModule(
+      runtime,
+      "ReactFabric",
+      "getInspectorDataForInstance",
+      {std::move(instanceHandle)});
 }
 
 void UIManagerBinding::startSurface(
     jsi::Runtime &runtime,
     SurfaceId surfaceId,
     std::string const &moduleName,
-    folly::dynamic const &initalProps) const {
+    folly::dynamic const &initalProps,
+    DisplayMode displayMode) const {
+  SystraceSection s("UIManagerBinding::startSurface");
   folly::dynamic parameters = folly::dynamic::object();
   parameters["rootTag"] = surfaceId;
   parameters["initialProps"] = initalProps;
@@ -98,31 +177,70 @@ void UIManagerBinding::startSurface(
     method.call(
         runtime,
         {jsi::String::createFromUtf8(runtime, moduleName),
-         jsi::valueFromDynamic(runtime, parameters)});
+         jsi::valueFromDynamic(runtime, parameters),
+         jsi::Value(runtime, displayModeToInt(displayMode))});
   } else {
-    auto module = getModule(runtime, "AppRegistry");
-    auto method = module.getPropertyAsFunction(runtime, "runApplication");
+    callMethodOfModule(
+        runtime,
+        "AppRegistry",
+        "runApplication",
+        {jsi::String::createFromUtf8(runtime, moduleName),
+         jsi::valueFromDynamic(runtime, parameters),
+         jsi::Value(runtime, displayModeToInt(displayMode))});
+  }
+}
+
+void UIManagerBinding::setSurfaceProps(
+    jsi::Runtime &runtime,
+    SurfaceId surfaceId,
+    std::string const &moduleName,
+    folly::dynamic const &initalProps,
+    DisplayMode displayMode) const {
+  SystraceSection s("UIManagerBinding::setSurfaceProps");
+  folly::dynamic parameters = folly::dynamic::object();
+  parameters["rootTag"] = surfaceId;
+  parameters["initialProps"] = initalProps;
+  parameters["fabric"] = true;
 
-    method.callWithThis(
+  if (moduleName.compare("LogBox") != 0 &&
+      runtime.global().hasProperty(runtime, "RN$SurfaceRegistry")) {
+    auto registry =
+        runtime.global().getPropertyAsObject(runtime, "RN$SurfaceRegistry");
+    auto method = registry.getPropertyAsFunction(runtime, "setSurfaceProps");
+
+    method.call(
+        runtime,
+        {jsi::String::createFromUtf8(runtime, moduleName),
+         jsi::valueFromDynamic(runtime, parameters),
+         jsi::Value(runtime, displayModeToInt(displayMode))});
+  } else {
+    callMethodOfModule(
         runtime,
-        module,
+        "AppRegistry",
+        "setSurfaceProps",
         {jsi::String::createFromUtf8(runtime, moduleName),
-         jsi::valueFromDynamic(runtime, parameters)});
+         jsi::valueFromDynamic(runtime, parameters),
+         jsi::Value(runtime, displayModeToInt(displayMode))});
   }
 }
 
 void UIManagerBinding::stopSurface(jsi::Runtime &runtime, SurfaceId surfaceId)
     const {
-  if (runtime.global().hasProperty(runtime, "RN$stopSurface")) {
-    auto method =
-        runtime.global().getPropertyAsFunction(runtime, "RN$stopSurface");
-    method.call(runtime, {jsi::Value{surfaceId}});
+  auto global = runtime.global();
+  if (global.hasProperty(runtime, "RN$Bridgeless")) {
+    if (!global.hasProperty(runtime, "RN$stopSurface")) {
+      // ReactFabric module has not been loaded yet; there's no surface to stop.
+      return;
+    }
+    // Bridgeless mode uses a custom JSI binding instead of callable module.
+    global.getPropertyAsFunction(runtime, "RN$stopSurface")
+        .call(runtime, {jsi::Value{surfaceId}});
   } else {
-    auto module = getModule(runtime, "ReactFabric");
-    auto method =
-        module.getPropertyAsFunction(runtime, "unmountComponentAtNode");
-
-    method.callWithThis(runtime, module, {jsi::Value{surfaceId}});
+    callMethodOfModule(
+        runtime,
+        "ReactFabric",
+        "unmountComponentAtNode",
+        {jsi::Value{surfaceId}});
   }
 }
 
@@ -130,6 +248,7 @@ void UIManagerBinding::dispatchEvent(
     jsi::Runtime &runtime,
     EventTarget const *eventTarget,
     std::string const &type,
+    ReactEventPriority priority,
     ValueFactory const &payloadFactory) const {
   SystraceSection s("UIManagerBinding::dispatchEvent");
 
@@ -151,7 +270,7 @@ void UIManagerBinding::dispatchEvent(
       if (!payload.isObject()) {
         LOG(ERROR) << "payload for dispatchEvent is not an object: " << eventTarget->getTag();
       }
-      assert(payload.isObject());
+      react_native_assert(payload.isObject());
       payload.asObject(runtime).setProperty(runtime, "target", eventTarget->getTag());
       return instanceHandle;
     }()
@@ -160,11 +279,13 @@ void UIManagerBinding::dispatchEvent(
   auto &eventHandlerWrapper =
       static_cast<EventHandlerWrapper const &>(*eventHandler_);
 
+  currentEventPriority_ = priority;
   eventHandlerWrapper.callback.call(
       runtime,
       {std::move(instanceHandle),
        jsi::String::createFromUtf8(runtime, type),
        std::move(payload)});
+  currentEventPriority_ = ReactEventPriority::Default;
 }
 
 void UIManagerBinding::invalidate() const {
@@ -175,6 +296,7 @@ jsi::Value UIManagerBinding::get(
     jsi::Runtime &runtime,
     jsi::PropNameID const &name) {
   auto methodName = name.utf8(runtime);
+  SystraceSection s("UIManagerBinding::get", "name", methodName);
 
   // Convert shared_ptr<UIManager> to a raw ptr
   // Why? Because:
@@ -212,18 +334,24 @@ jsi::Value UIManagerBinding::get(
         name,
         5,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
+          auto eventTarget =
+              eventTargetFromValue(runtime, arguments[4], arguments[0]);
+          if (!eventTarget) {
+            react_native_assert(false);
+            return jsi::Value::undefined();
+          }
           return valueFromShadowNode(
               runtime,
               uiManager->createNode(
-                  tagFromValue(runtime, arguments[0]),
+                  tagFromValue(arguments[0]),
                   stringFromValue(runtime, arguments[1]),
                   surfaceIdFromValue(runtime, arguments[2]),
                   RawProps(runtime, arguments[3]),
-                  eventTargetFromValue(runtime, arguments[4], arguments[0])));
+                  eventTarget));
         });
   }
 
@@ -234,29 +362,30 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(shadowNodeFromValue(runtime, arguments[0])));
         });
   }
 
-  if (methodName == "setJSResponder") {
+  if (methodName == "setIsJSResponder") {
     return jsi::Function::createFromHostFunction(
         runtime,
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
-          uiManager->setJSResponder(
+            size_t count) noexcept -> jsi::Value {
+          uiManager->setIsJSResponder(
               shadowNodeFromValue(runtime, arguments[0]),
-              arguments[1].getBool());
+              arguments[1].getBool(),
+              arguments[2].getBool());
 
           return jsi::Value::undefined();
         });
@@ -268,10 +397,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           auto node = shadowNodeFromValue(runtime, arguments[0]);
           auto locationX = (Float)arguments[1].getNumber();
           auto locationY = (Float)arguments[2].getNumber();
@@ -292,22 +421,6 @@ jsi::Value UIManagerBinding::get(
         });
   }
 
-  if (methodName == "clearJSResponder") {
-    return jsi::Function::createFromHostFunction(
-        runtime,
-        name,
-        0,
-        [uiManager](
-            jsi::Runtime & runtime,
-            jsi::Value const &thisValue,
-            jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
-          uiManager->clearJSResponder();
-
-          return jsi::Value::undefined();
-        });
-  }
-
   // Semantic: Clones the node with *same* props and *empty* children.
   if (methodName == "cloneNodeWithNewChildren") {
     return jsi::Function::createFromHostFunction(
@@ -315,10 +428,10 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
@@ -334,10 +447,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
@@ -355,10 +468,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
@@ -375,10 +488,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           uiManager->appendChild(
               shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]));
@@ -391,10 +504,10 @@ jsi::Value UIManagerBinding::get(
         runtime,
         name,
         1,
-        [](jsi::Runtime & runtime,
+        [](jsi::Runtime &runtime,
            jsi::Value const &thisValue,
            jsi::Value const *arguments,
-           size_t count) noexcept->jsi::Value {
+           size_t count) noexcept -> jsi::Value {
           auto shadowNodeList =
               std::make_shared<SharedShadowNodeList>(SharedShadowNodeList({}));
           return valueFromShadowNodeList(runtime, shadowNodeList);
@@ -406,10 +519,10 @@ jsi::Value UIManagerBinding::get(
         runtime,
         name,
         2,
-        [](jsi::Runtime & runtime,
+        [](jsi::Runtime &runtime,
            jsi::Value const &thisValue,
            jsi::Value const *arguments,
-           size_t count) noexcept->jsi::Value {
+           size_t count) noexcept -> jsi::Value {
           auto shadowNodeList = shadowNodeListFromValue(runtime, arguments[0]);
           auto shadowNode = shadowNodeFromValue(runtime, arguments[1]);
           shadowNodeList->push_back(shadowNode);
@@ -419,43 +532,45 @@ jsi::Value UIManagerBinding::get(
 
   if (methodName == "completeRoot") {
     if (uiManager->backgroundExecutor_) {
+      std::weak_ptr<UIManager> weakUIManager = uiManager_;
       // Enhanced version of the method that uses `backgroundExecutor` and
       // captures a shared pointer to `UIManager`.
       return jsi::Function::createFromHostFunction(
           runtime,
           name,
           2,
-          [ uiManager, sharedUIManager = uiManager_ ](
-              jsi::Runtime & runtime,
+          [weakUIManager, uiManager](
+              jsi::Runtime &runtime,
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
-              size_t count) noexcept->jsi::Value {
+              size_t count) noexcept -> jsi::Value {
             auto surfaceId = surfaceIdFromValue(runtime, arguments[0]);
-            auto shadowNodeList =
-                shadowNodeListFromValue(runtime, arguments[1]);
-
-            if (sharedUIManager->backgroundExecutor_) {
-              sharedUIManager->completeRootEventCounter_ += 1;
-              sharedUIManager->backgroundExecutor_(
-                  [sharedUIManager,
-                   surfaceId,
-                   shadowNodeList,
-                   eventCount =
-                       sharedUIManager->completeRootEventCounter_.load()] {
-                    auto shouldCancel = [eventCount,
-                                         sharedUIManager]() -> bool {
-                      // If `eventCounter_` was incremented, another
-                      // `completeSurface` call has been scheduled and current
-                      // `completeSurface` should be cancelled.
-                      return sharedUIManager->completeRootEventCounter_ >
-                          eventCount;
-                    };
-                    sharedUIManager->completeSurface(
-                        surfaceId, shadowNodeList, {true, shouldCancel});
-                  });
-            } else {
-              uiManager->completeSurface(surfaceId, shadowNodeList, {true, {}});
-            }
+            auto weakShadowNodeList =
+                weakShadowNodeListFromValue(runtime, arguments[1]);
+            static std::atomic_uint_fast8_t completeRootEventCounter{0};
+            static std::atomic_uint_fast32_t mostRecentSurfaceId{0};
+            completeRootEventCounter += 1;
+            mostRecentSurfaceId = surfaceId;
+            uiManager->backgroundExecutor_(
+                [weakUIManager,
+                 weakShadowNodeList,
+                 surfaceId,
+                 eventCount = completeRootEventCounter.load()] {
+                  auto shouldYield = [=]() -> bool {
+                    // If `completeRootEventCounter` was incremented, another
+                    // `completeSurface` call has been scheduled and current
+                    // `completeSurface` should yield to it.
+                    return completeRootEventCounter > eventCount &&
+                        mostRecentSurfaceId == surfaceId;
+                  };
+                  auto shadowNodeList =
+                      shadowNodeListFromWeakList(weakShadowNodeList);
+                  auto strongUIManager = weakUIManager.lock();
+                  if (shadowNodeList && strongUIManager) {
+                    strongUIManager->completeSurface(
+                        surfaceId, shadowNodeList, {true, shouldYield});
+                  }
+                });
 
             return jsi::Value::undefined();
           });
@@ -467,10 +582,10 @@ jsi::Value UIManagerBinding::get(
           name,
           2,
           [uiManager](
-              jsi::Runtime & runtime,
+              jsi::Runtime &runtime,
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
-              size_t count) noexcept->jsi::Value {
+              size_t count) noexcept -> jsi::Value {
             uiManager->completeSurface(
                 surfaceIdFromValue(runtime, arguments[0]),
                 shadowNodeListFromValue(runtime, arguments[1]),
@@ -487,10 +602,10 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [this](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           auto eventHandler =
               arguments[0].getObject(runtime).getFunction(runtime);
           eventHandler_ =
@@ -505,10 +620,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -529,15 +644,17 @@ jsi::Value UIManagerBinding::get(
         name,
         3,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
-          uiManager->dispatchCommand(
-              shadowNodeFromValue(runtime, arguments[0]),
-              stringFromValue(runtime, arguments[1]),
-              commandArgsFromValue(runtime, arguments[2]));
-
+            size_t count) noexcept -> jsi::Value {
+          auto shadowNode = shadowNodeFromValue(runtime, arguments[0]);
+          if (shadowNode) {
+            uiManager->dispatchCommand(
+                shadowNodeFromValue(runtime, arguments[0]),
+                stringFromValue(runtime, arguments[1]),
+                commandArgsFromValue(runtime, arguments[2]));
+          }
           return jsi::Value::undefined();
         });
   }
@@ -549,10 +666,10 @@ jsi::Value UIManagerBinding::get(
         name,
         4,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -585,14 +702,13 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
+          auto shadowNode = shadowNodeFromValue(runtime, arguments[0]);
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
-              *shadowNodeFromValue(runtime, arguments[0]),
-              nullptr,
-              {/* .includeTransform = */ true});
+              *shadowNode, nullptr, {/* .includeTransform = */ true});
           auto onSuccessFunction =
               arguments[1].getObject(runtime).getFunction(runtime);
 
@@ -600,12 +716,20 @@ jsi::Value UIManagerBinding::get(
             onSuccessFunction.call(runtime, {0, 0, 0, 0, 0, 0});
             return jsi::Value::undefined();
           }
+          auto newestCloneOfShadowNode =
+              uiManager->getNewestCloneOfShadowNode(*shadowNode);
+
+          auto layoutableShadowNode = traitCast<LayoutableShadowNode const *>(
+              newestCloneOfShadowNode.get());
+          Point originRelativeToParent = layoutableShadowNode
+              ? layoutableShadowNode->getLayoutMetrics().frame.origin
+              : Point();
 
           auto frame = layoutMetrics.frame;
           onSuccessFunction.call(
               runtime,
-              {0,
-               0,
+              {jsi::Value{runtime, (double)originRelativeToParent.x},
+               jsi::Value{runtime, (double)originRelativeToParent.y},
                jsi::Value{runtime, (double)frame.size.width},
                jsi::Value{runtime, (double)frame.size.height},
                jsi::Value{runtime, (double)frame.origin.x},
@@ -620,10 +744,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               nullptr,
@@ -649,16 +773,34 @@ jsi::Value UIManagerBinding::get(
         });
   }
 
+  if (methodName == "sendAccessibilityEvent") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        2,
+        [uiManager](
+            jsi::Runtime &runtime,
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
+          uiManager->sendAccessibilityEvent(
+              shadowNodeFromValue(runtime, arguments[0]),
+              stringFromValue(runtime, arguments[1]));
+
+          return jsi::Value::undefined();
+        });
+  }
+
   if (methodName == "configureNextLayoutAnimation") {
     return jsi::Function::createFromHostFunction(
         runtime,
         name,
         3,
         [uiManager](
-            jsi::Runtime & runtime,
+            jsi::Runtime &runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept->jsi::Value {
+            size_t count) noexcept -> jsi::Value {
           uiManager->configureNextLayoutAnimation(
               runtime,
               // TODO: pass in JSI value instead of folly::dynamic to RawValue
@@ -669,8 +811,29 @@ jsi::Value UIManagerBinding::get(
         });
   }
 
+  if (methodName == "unstable_getCurrentEventPriority") {
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        name,
+        0,
+        [this](
+            jsi::Runtime &,
+            jsi::Value const &,
+            jsi::Value const *,
+            size_t) noexcept -> jsi::Value {
+          return jsi::Value(serialize(currentEventPriority_));
+        });
+  }
+
+  if (methodName == "unstable_DefaultEventPriority") {
+    return jsi::Value(serialize(ReactEventPriority::Default));
+  }
+
+  if (methodName == "unstable_DiscreteEventPriority") {
+    return jsi::Value(serialize(ReactEventPriority::Discrete));
+  }
+
   return jsi::Value::undefined();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
index d5616310716a19..7b160990465d2b 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
@@ -7,14 +7,14 @@
 
 #pragma once
 
+#include <ReactCommon/RuntimeExecutor.h>
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 #include <react/renderer/core/RawValue.h>
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/primitives.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Exposes UIManager to JavaScript realm.
@@ -29,7 +29,16 @@ class UIManagerBinding : public jsi::HostObject {
    * Thread synchronization must be enforced externally.
    */
   static std::shared_ptr<UIManagerBinding> createAndInstallIfNeeded(
-      jsi::Runtime &runtime);
+      jsi::Runtime &runtime,
+      RuntimeExecutor const &runtimeExecutor);
+
+  /*
+   * Returns a pointer to UIManagerBinding previously installed into a runtime.
+   * Thread synchronization must be enforced externally.
+   */
+  static std::shared_ptr<UIManagerBinding> getBinding(jsi::Runtime &runtime);
+
+  UIManagerBinding(RuntimeExecutor const &runtimeExecutor);
 
   ~UIManagerBinding();
 
@@ -48,7 +57,24 @@ class UIManagerBinding : public jsi::HostObject {
       jsi::Runtime &runtime,
       SurfaceId surfaceId,
       std::string const &moduleName,
-      folly::dynamic const &initalProps) const;
+      folly::dynamic const &initalProps,
+      DisplayMode displayMode) const;
+
+  /*
+   * Updates the React Native Surface identified with surfaceId and moduleName
+   * with the given props.
+   * Thread synchronization must be enforced externally.
+   */
+  void setSurfaceProps(
+      jsi::Runtime &runtime,
+      SurfaceId surfaceId,
+      std::string const &moduleName,
+      folly::dynamic const &props,
+      DisplayMode displayMode) const;
+
+  jsi::Value getInspectorDataForInstance(
+      jsi::Runtime &runtime,
+      SharedEventEmitter eventEmitter) const;
 
   /*
    * Stops React Native Surface with given id.
@@ -64,6 +90,7 @@ class UIManagerBinding : public jsi::HostObject {
       jsi::Runtime &runtime,
       EventTarget const *eventTarget,
       std::string const &type,
+      ReactEventPriority priority,
       ValueFactory const &payloadFactory) const;
 
   /*
@@ -83,7 +110,9 @@ class UIManagerBinding : public jsi::HostObject {
  private:
   std::shared_ptr<UIManager> uiManager_;
   std::unique_ptr<EventHandler const> eventHandler_;
+  mutable ReactEventPriority currentEventPriority_;
+
+  RuntimeExecutor runtimeExecutor_;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h b/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
new file mode 100644
index 00000000000000..50fa5ebb667894
--- /dev/null
+++ b/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/root/RootShadowNode.h>
+
+namespace facebook::react {
+
+class ShadowTree;
+class UIManager;
+
+/*
+ * Implementing a commit hook allows to observe and alter Shadow Tree commits.
+ */
+class UIManagerCommitHook {
+ public:
+  /*
+   * Called right after the commit hook is registered or unregistered.
+   */
+  virtual void commitHookWasRegistered(
+      UIManager const &uiManager) const noexcept = 0;
+  virtual void commitHookWasUnregistered(
+      UIManager const &uiManager) const noexcept = 0;
+
+  /*
+   * Called right before a `ShadowTree` commits a new tree.
+   * The semantic of the method corresponds to a method of the same name
+   * from `ShadowTreeDelegate`.
+   */
+  virtual RootShadowNode::Unshared shadowTreeWillCommit(
+      ShadowTree const &shadowTree,
+      RootShadowNode::Shared const &oldRootShadowNode,
+      RootShadowNode::Unshared const &newRootShadowNode) const noexcept = 0;
+
+  virtual ~UIManagerCommitHook() noexcept = default;
+};
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
index ad0c9e27f5b54a..91d8bf55107423 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
@@ -11,8 +11,7 @@
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Abstract class for UIManager's delegate.
@@ -31,8 +30,16 @@ class UIManagerDelegate {
    * might use this to optimistically allocate a new native view
    * instances.
    */
-  virtual void uiManagerDidCreateShadowNode(
-      const ShadowNode::Shared &shadowNode) = 0;
+  virtual void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) = 0;
+
+  /*
+   * Called each time when UIManager clones a Shadow Node. Receiver
+   * might use this to optimistically allocate a new native view
+   * instances.
+   */
+  virtual void uiManagerDidCloneShadowNode(
+      const ShadowNode &oldShadowNode,
+      const ShadowNode &newShadowNode) = 0;
 
   /*
    * Called when UIManager wants to dispatch a command to the mounting layer.
@@ -43,20 +50,23 @@ class UIManagerDelegate {
       folly::dynamic const args) = 0;
 
   /*
-   * Set JS responder for a view
+   * Called when UIManager wants to dispatch some accessibility event
+   * to the mounting layer. eventType is platform-specific and not all
+   * platforms will necessarily implement the same set of events.
    */
-  virtual void uiManagerDidSetJSResponder(
-      SurfaceId surfaceId,
-      ShadowNode::Shared const &shadowView,
-      bool blockNativeResponder) = 0;
+  virtual void uiManagerDidSendAccessibilityEvent(
+      const ShadowNode::Shared &shadowNode,
+      std::string const &eventType) = 0;
 
   /*
-   * Clear the JSResponder for a view
+   * Set JS responder for a view.
    */
-  virtual void uiManagerDidClearJSResponder() = 0;
+  virtual void uiManagerDidSetIsJSResponder(
+      ShadowNode::Shared const &shadowNode,
+      bool isJSResponder,
+      bool blockNativeResponder) = 0;
 
   virtual ~UIManagerDelegate() noexcept = default;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/primitives.h b/ReactCommon/react/renderer/uimanager/primitives.h
index 9fb2ea92786844..749fca7f28105e 100644
--- a/ReactCommon/react/renderer/uimanager/primitives.h
+++ b/ReactCommon/react/renderer/uimanager/primitives.h
@@ -10,11 +10,11 @@
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/EventHandler.h>
 #include <react/renderer/core/ShadowNode.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using BackgroundExecutor =
     std::function<void(std::function<void()> &&callback)>;
@@ -43,6 +43,10 @@ struct ShadowNodeListWrapper : public jsi::HostObject {
 inline static ShadowNode::Shared shadowNodeFromValue(
     jsi::Runtime &runtime,
     jsi::Value const &value) {
+  if (value.isNull()) {
+    return nullptr;
+  }
+
   return value.getObject(runtime)
       .getHostObject<ShadowNodeWrapper>(runtime)
       ->shadowNode;
@@ -63,6 +67,34 @@ inline static SharedShadowNodeUnsharedList shadowNodeListFromValue(
       ->shadowNodeList;
 }
 
+inline static ShadowNode::UnsharedListOfShared shadowNodeListFromWeakList(
+    ShadowNode::UnsharedListOfWeak const &weakShadowNodeList) {
+  auto result = std::make_shared<ShadowNode::ListOfShared>();
+  for (auto const &weakShadowNode : *weakShadowNodeList) {
+    auto sharedShadowNode = weakShadowNode.lock();
+    if (!sharedShadowNode) {
+      return nullptr;
+    }
+    result->push_back(sharedShadowNode);
+  }
+  return result;
+}
+
+inline static ShadowNode::UnsharedListOfWeak weakShadowNodeListFromValue(
+    jsi::Runtime &runtime,
+    jsi::Value const &value) {
+  auto shadowNodeList = value.getObject(runtime)
+                            .getHostObject<ShadowNodeListWrapper>(runtime)
+                            ->shadowNodeList;
+
+  auto weakShadowNodeList = std::make_shared<ShadowNode::ListOfWeak>();
+  for (auto const &shadowNode : *shadowNodeList) {
+    weakShadowNodeList->push_back(shadowNode);
+  }
+
+  return weakShadowNodeList;
+}
+
 inline static jsi::Value valueFromShadowNodeList(
     jsi::Runtime &runtime,
     const SharedShadowNodeUnsharedList &shadowNodeList) {
@@ -70,16 +102,20 @@ inline static jsi::Value valueFromShadowNodeList(
       runtime, std::make_unique<ShadowNodeListWrapper>(shadowNodeList));
 }
 
+inline static Tag tagFromValue(jsi::Value const &value) {
+  return (Tag)value.getNumber();
+}
+
 inline static SharedEventTarget eventTargetFromValue(
     jsi::Runtime &runtime,
     jsi::Value const &eventTargetValue,
     jsi::Value const &tagValue) {
+  react_native_assert(!eventTargetValue.isNull());
+  if (eventTargetValue.isNull()) {
+    return nullptr;
+  }
   return std::make_shared<EventTarget>(
-      runtime, eventTargetValue, tagValue.getNumber());
-}
-
-inline static Tag tagFromValue(jsi::Runtime &runtime, jsi::Value const &value) {
-  return (Tag)value.getNumber();
+      runtime, eventTargetValue, tagFromValue(tagValue));
 }
 
 inline static SurfaceId surfaceIdFromValue(
@@ -88,6 +124,19 @@ inline static SurfaceId surfaceIdFromValue(
   return (SurfaceId)value.getNumber();
 }
 
+inline static int displayModeToInt(DisplayMode const value) {
+  // the result of this method should be in sync with
+  // Libraries/ReactNative/DisplayMode.js
+  switch (value) {
+    case DisplayMode::Visible:
+      return 1;
+    case DisplayMode::Suspended:
+      return 2;
+    case DisplayMode::Hidden:
+      return 3;
+  }
+}
+
 inline static std::string stringFromValue(
     jsi::Runtime &runtime,
     jsi::Value const &value) {
@@ -100,5 +149,4 @@ inline static folly::dynamic commandArgsFromValue(
   return jsi::dynamicFromValue(runtime, value);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/test_utils/BUCK b/ReactCommon/react/test_utils/BUCK
new file mode 100644
index 00000000000000..52bae03fe6c520
--- /dev/null
+++ b/ReactCommon/react/test_utils/BUCK
@@ -0,0 +1,54 @@
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "test_utils",
+    srcs = [],
+    headers = glob(
+        ["**/*.h"],
+        exclude = glob(["tests/**/*.h"]),
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "react/test_utils",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++17",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_frameworks = ["Foundation"],
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    force_static = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    macosx_tests_override = [],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    tests = [],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/jsi:jsi",
+        react_native_xplat_target("better:better"),
+        react_native_xplat_target("react/debug:debug"),
+    ],
+)
diff --git a/ReactCommon/react/renderer/mounting/tests/Entropy.h b/ReactCommon/react/test_utils/Entropy.h
similarity index 96%
rename from ReactCommon/react/renderer/mounting/tests/Entropy.h
rename to ReactCommon/react/test_utils/Entropy.h
index 54a87118bb179f..7bbaf91012f2e2 100644
--- a/ReactCommon/react/renderer/mounting/tests/Entropy.h
+++ b/ReactCommon/react/test_utils/Entropy.h
@@ -75,6 +75,10 @@ class Entropy final {
     result = generator() % 10000 < 10000 * ratio;
   }
 
+  void generateRandomValue(Generator &generator, int &result) const {
+    result = generator();
+  }
+
   void generateRandomValue(Generator &generator, int &result, int min, int max)
       const {
     std::uniform_int_distribution<int> distribution(min, max);
diff --git a/ReactCommon/react/test_utils/MockClock.h b/ReactCommon/react/test_utils/MockClock.h
new file mode 100644
index 00000000000000..a5155207b2078a
--- /dev/null
+++ b/ReactCommon/react/test_utils/MockClock.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <chrono>
+
+class MockClock {
+ public:
+  typedef std::chrono::
+      time_point<std::chrono::steady_clock, std::chrono::nanoseconds>
+          time_point;
+
+  static time_point now() noexcept {
+    return time_;
+  }
+
+  template <typename TDuration>
+  static void advance_by(const TDuration duration) {
+    time_ += duration;
+  }
+
+ private:
+  static time_point time_;
+};
diff --git a/ReactCommon/react/renderer/mounting/tests/shadowTreeGeneration.h b/ReactCommon/react/test_utils/shadowTreeGeneration.h
similarity index 74%
rename from ReactCommon/react/renderer/mounting/tests/shadowTreeGeneration.h
rename to ReactCommon/react/test_utils/shadowTreeGeneration.h
index 8a2c326d157efe..f2897cb5e18791 100644
--- a/ReactCommon/react/renderer/mounting/tests/shadowTreeGeneration.h
+++ b/ReactCommon/react/test_utils/shadowTreeGeneration.h
@@ -13,6 +13,7 @@
 #include <memory>
 #include <random>
 
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/stubs.h>
 
@@ -116,12 +117,16 @@ static inline ShadowNode::Unshared messWithChildren(
        std::make_shared<ShadowNode::ListOfShared const>(children)});
 }
 
-static inline ShadowNode::Unshared messWithLayotableOnlyFlag(
+static inline ShadowNode::Unshared messWithLayoutableOnlyFlag(
     Entropy const &entropy,
     ShadowNode const &shadowNode) {
   auto oldProps = shadowNode.getProps();
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   auto newProps = shadowNode.getComponentDescriptor().cloneProps(
-      oldProps, RawProps(folly::dynamic::object()));
+      parserContext, oldProps, RawProps(folly::dynamic::object()));
 
   auto &viewProps =
       const_cast<ViewProps &>(static_cast<ViewProps const &>(*newProps));
@@ -150,7 +155,7 @@ static inline ShadowNode::Unshared messWithLayotableOnlyFlag(
   }
 
   if (entropy.random<bool>(0.1)) {
-    viewProps.zIndex = entropy.random<bool>() ? 1 : 0;
+    viewProps.zIndex = entropy.random<int>();
   }
 
   if (entropy.random<bool>(0.1)) {
@@ -163,6 +168,51 @@ static inline ShadowNode::Unshared messWithLayotableOnlyFlag(
                                                  : Transform::Perspective(42);
   }
 
+  if (entropy.random<bool>(0.1)) {
+    viewProps.elevation = entropy.random<bool>() ? 1 : 0;
+  }
+
+  return shadowNode.clone({newProps});
+}
+
+// Similar to `messWithLayoutableOnlyFlag` but has a 50/50 chance of flattening
+// (or unflattening) a node's children.
+static inline ShadowNode::Unshared messWithNodeFlattenednessFlags(
+    Entropy const &entropy,
+    ShadowNode const &shadowNode) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  auto oldProps = shadowNode.getProps();
+  auto newProps = shadowNode.getComponentDescriptor().cloneProps(
+      parserContext, oldProps, RawProps(folly::dynamic::object()));
+
+  auto &viewProps =
+      const_cast<ViewProps &>(static_cast<ViewProps const &>(*newProps));
+
+  if (entropy.random<bool>(0.5)) {
+    viewProps.nativeId = "";
+    viewProps.collapsable = true;
+    viewProps.backgroundColor = SharedColor();
+    viewProps.foregroundColor = SharedColor();
+    viewProps.shadowColor = SharedColor();
+    viewProps.accessible = false;
+    viewProps.zIndex = {};
+    viewProps.pointerEvents = PointerEventsMode::Auto;
+    viewProps.transform = Transform::Identity();
+    viewProps.elevation = 0;
+  } else {
+    viewProps.nativeId = "42";
+    viewProps.backgroundColor = whiteColor();
+    viewProps.foregroundColor = blackColor();
+    viewProps.shadowColor = blackColor();
+    viewProps.accessible = true;
+    viewProps.zIndex = {entropy.random<int>()};
+    viewProps.pointerEvents = PointerEventsMode::None;
+    viewProps.transform = Transform::Perspective(entropy.random<int>());
+    viewProps.elevation = entropy.random<int>();
+  }
+
   return shadowNode.clone({newProps});
 }
 
@@ -189,9 +239,12 @@ static inline ShadowNode::Unshared messWithYogaStyles(
     }
   }
 
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   auto oldProps = shadowNode.getProps();
   auto newProps = shadowNode.getComponentDescriptor().cloneProps(
-      oldProps, RawProps(dynamic));
+      parserContext, oldProps, RawProps(dynamic));
   return shadowNode.clone({newProps});
 }
 
@@ -221,8 +274,11 @@ static inline void alterShadowTree(
 
 static SharedViewProps generateDefaultProps(
     ComponentDescriptor const &componentDescriptor) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
   return std::static_pointer_cast<ViewProps const>(
-      componentDescriptor.cloneProps(nullptr, RawProps{}));
+      componentDescriptor.cloneProps(parserContext, nullptr, RawProps{}));
 }
 
 static inline ShadowNode::Shared generateShadowNodeTree(
@@ -250,8 +306,9 @@ static inline ShadowNode::Shared generateShadowNodeTree(
   auto family = componentDescriptor.createFamily(
       {generateReactTag(), SurfaceId(1), nullptr}, nullptr);
   return componentDescriptor.createShadowNode(
-      ShadowNodeFragment{generateDefaultProps(componentDescriptor),
-                         std::make_shared<SharedShadowNodeList>(children)},
+      ShadowNodeFragment{
+          generateDefaultProps(componentDescriptor),
+          std::make_shared<SharedShadowNodeList>(children)},
       family);
 }
 
diff --git a/ReactCommon/react/utils/Android.mk b/ReactCommon/react/utils/Android.mk
index 8a8cfca179728a..471b15e6cff373 100644
--- a/ReactCommon/react/utils/Android.mk
+++ b/ReactCommon/react/utils/Android.mk
@@ -11,15 +11,20 @@ LOCAL_MODULE := react_utils
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
-LOCAL_SHARED_LIBRARIES :=
+LOCAL_SHARED_LIBRARIES := libreact_debug libreact_render_mapbuffer libglog libglog_init
 
 include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,react/debug)
+$(call import-module,fbgloginit)
+$(call import-module,glog)
+$(call import-module,react/renderer/mapbuffer)
diff --git a/ReactCommon/react/utils/BUCK b/ReactCommon/react/utils/BUCK
index 9b525a1f1e037a..3d4bfde9b0f483 100644
--- a/ReactCommon/react/utils/BUCK
+++ b/ReactCommon/react/utils/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -6,6 +5,8 @@ load(
     "CXX",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
+    "react_native_target",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -36,9 +37,13 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
+    fbandroid_deps = [
+        react_native_target("java/com/facebook/react/common/mapbuffer/jni:jni"),
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_frameworks = ["Foundation"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
@@ -53,11 +58,13 @@ rn_xplat_cxx_library(
     tests = [],
     visibility = ["PUBLIC"],
     deps = [
+        "//third-party/glog:glog",
         "//xplat/folly:container_evicting_cache_map",
         "//xplat/folly:headers_only",
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         "//xplat/jsi:jsi",
         react_native_xplat_target("better:better"),
+        react_native_xplat_target("react/debug:debug"),
     ],
 )
diff --git a/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h b/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h
index b6d31707d139cc..4d4d2c0d056d96 100644
--- a/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h
+++ b/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h
@@ -7,6 +7,8 @@
 
 #include <functional>
 
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
@@ -31,7 +33,7 @@ class CalledOnceMovableOnlyFunction {
   }
 
   ~CalledOnceMovableOnlyFunction() {
-    assert(
+    react_native_assert(
         (wasCalled_ || wasMovedFrom_) &&
         "`CalledOnceMovableOnlyFunction` is destroyed before being called.");
   }
@@ -57,7 +59,7 @@ class CalledOnceMovableOnlyFunction {
 
   CalledOnceMovableOnlyFunction &operator=(
       CalledOnceMovableOnlyFunction &&other) noexcept {
-    assert(
+    react_native_assert(
         (wasCalled_ || wasMovedFrom_) &&
         "`CalledOnceMovableOnlyFunction` is re-assigned before being called.");
     wasCalled_ = false;
@@ -71,10 +73,10 @@ class CalledOnceMovableOnlyFunction {
    * Callable.
    */
   ReturnT operator()(ArgumentT... args) {
-    assert(
+    react_native_assert(
         !wasMovedFrom_ &&
         "`CalledOnceMovableOnlyFunction` is called after being moved from.");
-    assert(
+    react_native_assert(
         !wasCalled_ &&
         "`CalledOnceMovableOnlyFunction` is called more than once.");
 
diff --git a/ReactCommon/react/utils/ContextContainer.h b/ReactCommon/react/utils/ContextContainer.h
index a8d09655660995..f0e2613fdb9931 100644
--- a/ReactCommon/react/utils/ContextContainer.h
+++ b/ReactCommon/react/utils/ContextContainer.h
@@ -15,6 +15,9 @@
 #include <better/mutex.h>
 #include <better/optional.h>
 
+#include <react/debug/flags.h>
+#include <react/debug/react_native_assert.h>
+
 namespace facebook {
 namespace react {
 
@@ -43,7 +46,7 @@ class ContextContainer final {
 
     instances_.insert({key, std::make_shared<T>(instance)});
 
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
     typeNames_.insert({key, typeid(T).name()});
 #endif
   }
@@ -57,7 +60,7 @@ class ContextContainer final {
 
     instances_.erase(key);
 
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
     typeNames_.erase(key);
 #endif
   }
@@ -73,7 +76,7 @@ class ContextContainer final {
     for (auto const &pair : contextContainer.instances_) {
       instances_.erase(pair.first);
       instances_.insert(pair);
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
       typeNames_.erase(pair.first);
       typeNames_.insert(
           {pair.first, contextContainer.typeNames_.at(pair.first)});
@@ -90,12 +93,14 @@ class ContextContainer final {
   T at(std::string const &key) const {
     std::shared_lock<better::shared_mutex> lock(mutex_);
 
-    assert(
+    react_native_assert(
         instances_.find(key) != instances_.end() &&
         "ContextContainer doesn't have an instance for given key.");
-    assert(
+#ifdef REACT_NATIVE_DEBUG
+    react_native_assert(
         typeNames_.at(key) == typeid(T).name() &&
         "ContextContainer stores an instance of different type for given key.");
+#endif
     return *std::static_pointer_cast<T>(instances_.at(key));
   }
 
@@ -113,9 +118,11 @@ class ContextContainer final {
       return {};
     }
 
-    assert(
+#ifdef REACT_NATIVE_DEBUG
+    react_native_assert(
         typeNames_.at(key) == typeid(T).name() &&
         "ContextContainer stores an instance of different type for given key.");
+#endif
 
     return *std::static_pointer_cast<T>(iterator->second);
   }
@@ -124,7 +131,7 @@ class ContextContainer final {
   mutable better::shared_mutex mutex_;
   // Protected by mutex_`.
   mutable better::map<std::string, std::shared_ptr<void>> instances_;
-#ifndef NDEBUG
+#ifdef REACT_NATIVE_DEBUG
   mutable better::map<std::string, std::string> typeNames_;
 #endif
 };
diff --git a/ReactCommon/react/utils/LayoutManager.h b/ReactCommon/react/utils/LayoutManager.h
new file mode 100644
index 00000000000000..bc901971a3cbb2
--- /dev/null
+++ b/ReactCommon/react/utils/LayoutManager.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/core/LayoutPrimitives.h>
+#include <react/renderer/core/conversions.h>
+#ifdef ANDROID
+#include <react/common/mapbuffer/ReadableMapBuffer.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+#include <string>
+
+namespace facebook {
+namespace react {
+
+#ifdef ANDROID
+
+using namespace facebook::jni;
+
+Size measureAndroidComponent(
+    const ContextContainer::Shared &contextContainer,
+    Tag rootTag,
+    std::string componentName,
+    folly::dynamic localData,
+    folly::dynamic props,
+    folly::dynamic state,
+    float minWidth,
+    float maxWidth,
+    float minHeight,
+    float maxHeight,
+    jfloatArray attachmentPositions) {
+  const jni::global_ref<jobject> &fabricUIManager =
+      contextContainer->at<jni::global_ref<jobject>>("FabricUIManager");
+
+  static auto measure =
+      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<jlong(
+              jint,
+              jstring,
+              ReadableMap::javaobject,
+              ReadableMap::javaobject,
+              ReadableMap::javaobject,
+              jfloat,
+              jfloat,
+              jfloat,
+              jfloat,
+              jfloatArray)>("measure");
+
+  auto componentNameRef = make_jstring(componentName);
+  local_ref<ReadableNativeMap::javaobject> localDataRNM =
+      ReadableNativeMap::newObjectCxxArgs(localData);
+  local_ref<ReadableNativeMap::javaobject> propsRNM =
+      ReadableNativeMap::newObjectCxxArgs(props);
+  local_ref<ReadableNativeMap::javaobject> stateRNM =
+      ReadableNativeMap::newObjectCxxArgs(state);
+
+  local_ref<ReadableMap::javaobject> localDataRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(localDataRNM.get()));
+  local_ref<ReadableMap::javaobject> propsRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
+  local_ref<ReadableMap::javaobject> stateRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(stateRNM.get()));
+
+  auto size = yogaMeassureToSize(measure(
+      fabricUIManager,
+      rootTag,
+      componentNameRef.get(),
+      localDataRM.get(),
+      propsRM.get(),
+      stateRM.get(),
+      minWidth,
+      maxWidth,
+      minHeight,
+      maxHeight,
+      attachmentPositions));
+
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  componentNameRef.reset();
+  localDataRM.reset();
+  localDataRNM.reset();
+  propsRM.reset();
+  propsRNM.reset();
+  stateRM.reset();
+  stateRNM.reset();
+
+  return size;
+}
+
+Size measureAndroidComponentMapBuffer(
+    const ContextContainer::Shared &contextContainer,
+    Tag rootTag,
+    std::string componentName,
+    MapBuffer &localData,
+    MapBuffer &props,
+    float minWidth,
+    float maxWidth,
+    float minHeight,
+    float maxHeight,
+    jfloatArray attachmentPositions) {
+  const jni::global_ref<jobject> &fabricUIManager =
+      contextContainer->at<jni::global_ref<jobject>>("FabricUIManager");
+  auto componentNameRef = make_jstring(componentName);
+
+  static auto measure =
+      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<jlong(
+              jint,
+              jstring,
+              ReadableMapBuffer::javaobject,
+              ReadableMapBuffer::javaobject,
+              jfloat,
+              jfloat,
+              jfloat,
+              jfloat,
+              jfloatArray)>("measureMapBuffer");
+
+  auto localDataMap =
+      ReadableMapBuffer::createWithContents(std::move(localData));
+  auto propsMap = ReadableMapBuffer::createWithContents(std::move(props));
+
+  auto size = yogaMeassureToSize(measure(
+      fabricUIManager,
+      rootTag,
+      componentNameRef.get(),
+      localDataMap.get(),
+      propsMap.get(),
+      minWidth,
+      maxWidth,
+      minHeight,
+      maxHeight,
+      attachmentPositions));
+
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  componentNameRef.reset();
+  localDataMap.reset();
+  propsMap.reset();
+  return size;
+}
+
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/utils/ManagedObjectWrapper.h b/ReactCommon/react/utils/ManagedObjectWrapper.h
index 623158015740d5..f91cd3e99d81d2 100644
--- a/ReactCommon/react/utils/ManagedObjectWrapper.h
+++ b/ReactCommon/react/utils/ManagedObjectWrapper.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <react/debug/react_native_assert.h>
+
 #if defined(__OBJC__) && defined(__cplusplus)
 #if TARGET_OS_MAC && TARGET_OS_IPHONE
 
@@ -65,7 +67,7 @@ inline std::shared_ptr<void> wrapManagedObjectWeakly(id object) noexcept
 inline id unwrapManagedObjectWeakly(std::shared_ptr<void> const &object) noexcept
 {
   RCTInternalGenericWeakWrapper *weakWrapper = (RCTInternalGenericWeakWrapper *)unwrapManagedObject(object);
-  assert(weakWrapper && "`RCTInternalGenericWeakWrapper` instance must not be `nil`.");
+  react_native_assert(weakWrapper && "`RCTInternalGenericWeakWrapper` instance must not be `nil`.");
   return weakWrapper.object;
 }
 
diff --git a/ReactCommon/react/utils/RunLoopObserver.cpp b/ReactCommon/react/utils/RunLoopObserver.cpp
index bca81b6664d7b5..d24c3ede72bb13 100644
--- a/ReactCommon/react/utils/RunLoopObserver.cpp
+++ b/ReactCommon/react/utils/RunLoopObserver.cpp
@@ -7,7 +7,7 @@
 
 #include "RunLoopObserver.h"
 
-#include <cassert>
+#include <react/debug/react_native_assert.h>
 
 namespace facebook {
 namespace react {
@@ -19,8 +19,9 @@ RunLoopObserver::RunLoopObserver(
 
 void RunLoopObserver::setDelegate(Delegate const *delegate) const noexcept {
   // We need these constraints to ensure basic thread-safety.
-  assert(delegate && "A delegate must not be `nullptr`.");
-  assert(!delegate_ && "`RunLoopObserver::setDelegate` must be called once.");
+  react_native_assert(delegate && "A delegate must not be `nullptr`.");
+  react_native_assert(
+      !delegate_ && "`RunLoopObserver::setDelegate` must be called once.");
   delegate_ = delegate;
 }
 
@@ -47,7 +48,7 @@ void RunLoopObserver::activityDidChange(Activity activity) const noexcept {
     return;
   }
 
-  assert(
+  react_native_assert(
       !owner_.expired() &&
       "`owner_` is null. The caller must `lock` the owner and check it for being not null.");
 
diff --git a/ReactCommon/reactperflogger/Android.mk b/ReactCommon/reactperflogger/Android.mk
index f2c15a8027e325..a65bfd18ee02fb 100644
--- a/ReactCommon/reactperflogger/Android.mk
+++ b/ReactCommon/reactperflogger/Android.mk
@@ -13,7 +13,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/reactperflogger
 # Header search path for modules that depend on this module
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 # Name of this module.
 LOCAL_MODULE := reactperflogger
diff --git a/ReactCommon/reactperflogger/BUCK b/ReactCommon/reactperflogger/BUCK
index 9724f144272352..09928787c7ee1d 100644
--- a/ReactCommon/reactperflogger/BUCK
+++ b/ReactCommon/reactperflogger/BUCK
@@ -11,7 +11,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
         "-Wno-global-constructors",
     ],
diff --git a/ReactCommon/reactperflogger/React-perflogger.podspec b/ReactCommon/reactperflogger/React-perflogger.podspec
index a2f47038c42908..16ace175027137 100644
--- a/ReactCommon/reactperflogger/React-perflogger.podspec
+++ b/ReactCommon/reactperflogger/React-perflogger.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#774)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#774)
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "reactperflogger"
diff --git a/ReactCommon/runtimeexecutor/Android.mk b/ReactCommon/runtimeexecutor/Android.mk
index b22071ecdab708..6b39530804dfa6 100644
--- a/ReactCommon/runtimeexecutor/Android.mk
+++ b/ReactCommon/runtimeexecutor/Android.mk
@@ -14,6 +14,6 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/runtimeexecutor/BUCK b/ReactCommon/runtimeexecutor/BUCK
index 08ee7f4c232722..60dc08ebb13435 100644
--- a/ReactCommon/runtimeexecutor/BUCK
+++ b/ReactCommon/runtimeexecutor/BUCK
@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -6,6 +5,7 @@ load(
     "CXX",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "rn_xplat_cxx_library",
 )
 
@@ -31,7 +31,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
diff --git a/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec b/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec
index 83a68c472a5ee7..5c4385c118cf47 100644
--- a/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec
+++ b/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "ReactCommon"
diff --git a/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h b/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h
index 90139a6a99cfea..3e06081e45a862 100644
--- a/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h
+++ b/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h
@@ -39,9 +39,9 @@ using RuntimeExecutor =
 inline static void executeAsynchronously(
     RuntimeExecutor const &runtimeExecutor,
     std::function<void(jsi::Runtime &runtime)> &&callback) noexcept {
-  std::thread{[callback = std::move(callback), runtimeExecutor]() mutable {
+  std::thread([callback = std::move(callback), runtimeExecutor]() mutable {
     runtimeExecutor(std::move(callback));
-  }};
+  }).detach();
 }
 
 /*
@@ -113,5 +113,17 @@ inline static void executeSynchronouslyOnSameThread_CAN_DEADLOCK(
   mutex3.lock();
 }
 
+template <typename DataT>
+inline static DataT executeSynchronouslyOnSameThread_CAN_DEADLOCK(
+    RuntimeExecutor const &runtimeExecutor,
+    std::function<DataT(jsi::Runtime &runtime)> &&callback) noexcept {
+  DataT data;
+
+  executeSynchronouslyOnSameThread_CAN_DEADLOCK(
+      runtimeExecutor,
+      [&](jsi::Runtime &runtime) { data = callback(runtime); });
+
+  return data;
+}
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/yoga/Yoga.podspec b/ReactCommon/yoga/Yoga.podspec
index 34f4ea25696505..9fb830ac1392d7 100644
--- a/ReactCommon/yoga/Yoga.podspec
+++ b/ReactCommon/yoga/Yoga.podspec
@@ -9,7 +9,7 @@ version = package['version']
 source = { :git => ENV['INSTALL_YOGA_FROM_LOCATION'] || 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
@@ -43,7 +43,7 @@ Pod::Spec.new do |spec|
   ]
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "10.0", :osx => "10.14" }
+  spec.platforms = { :ios => "11.0", :osx => "10.15" }
 
   # Set this environment variable when *not* using the `:path` option to install the pod.
   # E.g. when publishing this spec to a spec repo.
@@ -51,7 +51,7 @@ Pod::Spec.new do |spec|
   source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.source_files = source_files
 
-  header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+  header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
   header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.public_header_files = header_files
 end
diff --git a/ReactCommon/yoga/yoga/BitUtils.h b/ReactCommon/yoga/yoga/BitUtils.h
index 1c32e9ecc35561..2161effc7bb6fe 100644
--- a/ReactCommon/yoga/yoga/BitUtils.h
+++ b/ReactCommon/yoga/yoga/BitUtils.h
@@ -45,8 +45,9 @@ void setEnumData(uint32_t& flags, size_t index, int newValue) {
 
 template <typename Enum>
 void setEnumData(uint8_t& flags, size_t index, int newValue) {
-  flags = (flags & ~mask(bitWidthFn<Enum>(), index)) |
-      ((newValue << index) & (mask(bitWidthFn<Enum>(), index)));
+  flags = (flags & ~static_cast<uint8_t>(mask(bitWidthFn<Enum>(), index))) |
+      ((newValue << index) &
+       (static_cast<uint8_t>(mask(bitWidthFn<Enum>(), index))));
 }
 
 constexpr bool getBooleanData(int flags, size_t index) {
diff --git a/ReactCommon/yoga/yoga/CompactValue.h b/ReactCommon/yoga/yoga/CompactValue.h
index be933a16eab858..f398668e2e1389 100644
--- a/ReactCommon/yoga/yoga/CompactValue.h
+++ b/ReactCommon/yoga/yoga/CompactValue.h
@@ -125,8 +125,8 @@ class YOGA_EXPORT CompactValue {
     data.repr &= ~PERCENT_BIT;
     data.repr += BIAS;
 
-    return YGValue{data.value,
-                   payload_.repr & 0x40000000 ? YGUnitPercent : YGUnitPoint};
+    return YGValue{
+        data.value, payload_.repr & 0x40000000 ? YGUnitPercent : YGUnitPoint};
   }
 
   bool isUndefined() const noexcept {
diff --git a/ReactCommon/yoga/yoga/Utils.cpp b/ReactCommon/yoga/yoga/Utils.cpp
index edb198d25441e7..eaa74b0629ac23 100644
--- a/ReactCommon/yoga/yoga/Utils.cpp
+++ b/ReactCommon/yoga/yoga/Utils.cpp
@@ -55,7 +55,7 @@ bool YGFloatsEqual(const float a, const float b) {
 
 bool YGDoubleEqual(const double a, const double b) {
   if (!yoga::isUndefined(a) && !yoga::isUndefined(b)) {
-    return fabs(a - b) < 0.0001f;
+    return fabs(a - b) < 0.0001;
   }
   return yoga::isUndefined(a) && yoga::isUndefined(b);
 }
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index 1ee1bde626e8a6..f4c14bf3d8c9b8 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -50,89 +50,111 @@ void YGNode::print(void* printContext) {
   }
 }
 
-YGFloatOptional YGNode::getLeadingPosition(
-    const YGFlexDirection axis,
-    const float axisSize) const {
-  if (YGFlexDirectionIsRow(axis)) {
-    auto leadingPosition = YGComputedEdgeValue(
-        style_.position(), YGEdgeStart, CompactValue::ofUndefined());
-    if (!leadingPosition.isUndefined()) {
-      return YGResolveValue(leadingPosition, axisSize);
-    }
+CompactValue YGNode::computeEdgeValueForRow(
+    const YGStyle::Edges& edges,
+    YGEdge rowEdge,
+    YGEdge edge,
+    CompactValue defaultValue) {
+  if (!edges[rowEdge].isUndefined()) {
+    return edges[rowEdge];
+  } else if (!edges[edge].isUndefined()) {
+    return edges[edge];
+  } else if (!edges[YGEdgeHorizontal].isUndefined()) {
+    return edges[YGEdgeHorizontal];
+  } else if (!edges[YGEdgeAll].isUndefined()) {
+    return edges[YGEdgeAll];
+  } else {
+    return defaultValue;
   }
+}
 
-  auto leadingPosition = YGComputedEdgeValue(
-      style_.position(), leading[axis], CompactValue::ofUndefined());
+CompactValue YGNode::computeEdgeValueForColumn(
+    const YGStyle::Edges& edges,
+    YGEdge edge,
+    CompactValue defaultValue) {
+  if (!edges[edge].isUndefined()) {
+    return edges[edge];
+  } else if (!edges[YGEdgeVertical].isUndefined()) {
+    return edges[YGEdgeVertical];
+  } else if (!edges[YGEdgeAll].isUndefined()) {
+    return edges[YGEdgeAll];
+  } else {
+    return defaultValue;
+  }
+}
 
-  return leadingPosition.isUndefined()
-      ? YGFloatOptional{0}
-      : YGResolveValue(leadingPosition, axisSize);
+YGFloatOptional YGNode::getLeadingPosition(
+    const YGFlexDirection axis,
+    const float axisSize) const {
+  auto leadingPosition = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.position(),
+            YGEdgeStart,
+            leading[axis],
+            CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.position(), leading[axis], CompactValue::ofZero());
+  return YGResolveValue(leadingPosition, axisSize);
 }
 
 YGFloatOptional YGNode::getTrailingPosition(
     const YGFlexDirection axis,
     const float axisSize) const {
-  if (YGFlexDirectionIsRow(axis)) {
-    auto trailingPosition = YGComputedEdgeValue(
-        style_.position(), YGEdgeEnd, CompactValue::ofUndefined());
-    if (!trailingPosition.isUndefined()) {
-      return YGResolveValue(trailingPosition, axisSize);
-    }
-  }
-
-  auto trailingPosition = YGComputedEdgeValue(
-      style_.position(), trailing[axis], CompactValue::ofUndefined());
-
-  return trailingPosition.isUndefined()
-      ? YGFloatOptional{0}
-      : YGResolveValue(trailingPosition, axisSize);
+  auto trailingPosition = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.position(),
+            YGEdgeEnd,
+            trailing[axis],
+            CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.position(), trailing[axis], CompactValue::ofZero());
+  return YGResolveValue(trailingPosition, axisSize);
 }
 
 bool YGNode::isLeadingPositionDefined(const YGFlexDirection axis) const {
-  return (YGFlexDirectionIsRow(axis) &&
-          !YGComputedEdgeValue(
-               style_.position(), YGEdgeStart, CompactValue::ofUndefined())
-               .isUndefined()) ||
-      !YGComputedEdgeValue(
-           style_.position(), leading[axis], CompactValue::ofUndefined())
-           .isUndefined();
+  auto leadingPosition = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.position(),
+            YGEdgeStart,
+            leading[axis],
+            CompactValue::ofUndefined())
+      : computeEdgeValueForColumn(
+            style_.position(), leading[axis], CompactValue::ofUndefined());
+  return !leadingPosition.isUndefined();
 }
 
 bool YGNode::isTrailingPosDefined(const YGFlexDirection axis) const {
-  return (YGFlexDirectionIsRow(axis) &&
-          !YGComputedEdgeValue(
-               style_.position(), YGEdgeEnd, CompactValue::ofUndefined())
-               .isUndefined()) ||
-      !YGComputedEdgeValue(
-           style_.position(), trailing[axis], CompactValue::ofUndefined())
-           .isUndefined();
+  auto trailingPosition = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.position(),
+            YGEdgeEnd,
+            trailing[axis],
+            CompactValue::ofUndefined())
+      : computeEdgeValueForColumn(
+            style_.position(), trailing[axis], CompactValue::ofUndefined());
+  return !trailingPosition.isUndefined();
 }
 
 YGFloatOptional YGNode::getLeadingMargin(
     const YGFlexDirection axis,
     const float widthSize) const {
-  if (YGFlexDirectionIsRow(axis) &&
-      !style_.margin()[YGEdgeStart].isUndefined()) {
-    return YGResolveValueMargin(style_.margin()[YGEdgeStart], widthSize);
-  }
-
-  return YGResolveValueMargin(
-      YGComputedEdgeValue(
-          style_.margin(), leading[axis], CompactValue::ofZero()),
-      widthSize);
+  auto leadingMargin = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.margin(), YGEdgeStart, leading[axis], CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.margin(), leading[axis], CompactValue::ofZero());
+  return YGResolveValueMargin(leadingMargin, widthSize);
 }
 
 YGFloatOptional YGNode::getTrailingMargin(
     const YGFlexDirection axis,
     const float widthSize) const {
-  if (YGFlexDirectionIsRow(axis) && !style_.margin()[YGEdgeEnd].isUndefined()) {
-    return YGResolveValueMargin(style_.margin()[YGEdgeEnd], widthSize);
-  }
-
-  return YGResolveValueMargin(
-      YGComputedEdgeValue(
-          style_.margin(), trailing[axis], CompactValue::ofZero()),
-      widthSize);
+  auto trailingMargin = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.margin(), YGEdgeEnd, trailing[axis], CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.margin(), trailing[axis], CompactValue::ofZero());
+  return YGResolveValueMargin(trailingMargin, widthSize);
 }
 
 YGFloatOptional YGNode::getMarginForAxis(
@@ -147,7 +169,6 @@ YGSize YGNode::measure(
     float height,
     YGMeasureMode heightMode,
     void* layoutContext) {
-
   return facebook::yoga::detail::getBooleanData(flags, measureUsesContext_)
       ? measure_.withContext(
             this, width, widthMode, height, heightMode, layoutContext)
@@ -448,68 +469,48 @@ bool YGNode::isNodeFlexible() {
 }
 
 float YGNode::getLeadingBorder(const YGFlexDirection axis) const {
-  YGValue leadingBorder;
-  if (YGFlexDirectionIsRow(axis) &&
-      !style_.border()[YGEdgeStart].isUndefined()) {
-    leadingBorder = style_.border()[YGEdgeStart];
-    if (leadingBorder.value >= 0) {
-      return leadingBorder.value;
-    }
-  }
-
-  leadingBorder = YGComputedEdgeValue(
-      style_.border(), leading[axis], CompactValue::ofZero());
-  return YGFloatMax(leadingBorder.value, 0.0f);
+  YGValue leadingBorder = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.border(), YGEdgeStart, leading[axis], CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.border(), leading[axis], CompactValue::ofZero());
+  return fmaxf(leadingBorder.value, 0.0f);
 }
 
-float YGNode::getTrailingBorder(const YGFlexDirection flexDirection) const {
-  YGValue trailingBorder;
-  if (YGFlexDirectionIsRow(flexDirection) &&
-      !style_.border()[YGEdgeEnd].isUndefined()) {
-    trailingBorder = style_.border()[YGEdgeEnd];
-    if (trailingBorder.value >= 0.0f) {
-      return trailingBorder.value;
-    }
-  }
-
-  trailingBorder = YGComputedEdgeValue(
-      style_.border(), trailing[flexDirection], CompactValue::ofZero());
-  return YGFloatMax(trailingBorder.value, 0.0f);
+float YGNode::getTrailingBorder(const YGFlexDirection axis) const {
+  YGValue trailingBorder = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.border(), YGEdgeEnd, trailing[axis], CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.border(), trailing[axis], CompactValue::ofZero());
+  return fmaxf(trailingBorder.value, 0.0f);
 }
 
 YGFloatOptional YGNode::getLeadingPadding(
     const YGFlexDirection axis,
     const float widthSize) const {
-  const YGFloatOptional paddingEdgeStart =
-      YGResolveValue(style_.padding()[YGEdgeStart], widthSize);
-  if (YGFlexDirectionIsRow(axis) &&
-      !style_.padding()[YGEdgeStart].isUndefined() &&
-      !paddingEdgeStart.isUndefined() && paddingEdgeStart.unwrap() >= 0.0f) {
-    return paddingEdgeStart;
-  }
-
-  YGFloatOptional resolvedValue = YGResolveValue(
-      YGComputedEdgeValue(
-          style_.padding(), leading[axis], CompactValue::ofZero()),
-      widthSize);
-  return YGFloatOptionalMax(resolvedValue, YGFloatOptional(0.0f));
+  auto leadingPadding = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.padding(),
+            YGEdgeStart,
+            leading[axis],
+            CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.padding(), leading[axis], CompactValue::ofZero());
+  return YGFloatOptionalMax(
+      YGResolveValue(leadingPadding, widthSize), YGFloatOptional(0.0f));
 }
 
 YGFloatOptional YGNode::getTrailingPadding(
     const YGFlexDirection axis,
     const float widthSize) const {
-  const YGFloatOptional paddingEdgeEnd =
-      YGResolveValue(style_.padding()[YGEdgeEnd], widthSize);
-  if (YGFlexDirectionIsRow(axis) && paddingEdgeEnd >= YGFloatOptional{0.0f}) {
-    return paddingEdgeEnd;
-  }
-
-  YGFloatOptional resolvedValue = YGResolveValue(
-      YGComputedEdgeValue(
-          style_.padding(), trailing[axis], CompactValue::ofZero()),
-      widthSize);
-
-  return YGFloatOptionalMax(resolvedValue, YGFloatOptional(0.0f));
+  auto trailingPadding = YGFlexDirectionIsRow(axis)
+      ? computeEdgeValueForRow(
+            style_.padding(), YGEdgeEnd, trailing[axis], CompactValue::ofZero())
+      : computeEdgeValueForColumn(
+            style_.padding(), trailing[axis], CompactValue::ofZero());
+  return YGFloatOptionalMax(
+      YGResolveValue(trailingPadding, widthSize), YGFloatOptional(0.0f));
 }
 
 YGFloatOptional YGNode::getLeadingPaddingAndBorder(
diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h
index 63d98fe3a1a816..4b6e6277af8aa7 100644
--- a/ReactCommon/yoga/yoga/YGNode.h
+++ b/ReactCommon/yoga/yoga/YGNode.h
@@ -193,6 +193,17 @@ struct YOGA_EXPORT YGNode {
     return resolvedDimensions_[index];
   }
 
+  static CompactValue computeEdgeValueForColumn(
+      const YGStyle::Edges& edges,
+      YGEdge edge,
+      CompactValue defaultValue);
+
+  static CompactValue computeEdgeValueForRow(
+      const YGStyle::Edges& edges,
+      YGEdge rowEdge,
+      YGEdge edge,
+      CompactValue defaultValue);
+
   // Methods related to positions, margin, padding and border
   YGFloatOptional getLeadingPosition(
       const YGFlexDirection axis,
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.cpp b/ReactCommon/yoga/yoga/YGNodePrint.cpp
index 26efa4858b6885..72d147dbb7b29f 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.cpp
+++ b/ReactCommon/yoga/yoga/YGNodePrint.cpp
@@ -104,10 +104,13 @@ static void appendEdgeIfNotUndefined(
     const string& str,
     const YGStyle::Edges& edges,
     const YGEdge edge) {
-  appendNumberIfNotUndefined(
-      base,
-      str,
-      YGComputedEdgeValue(edges, edge, detail::CompactValue::ofUndefined()));
+  // TODO: this doesn't take RTL / YGEdgeStart / YGEdgeEnd into account
+  auto value = (edge == YGEdgeLeft || edge == YGEdgeRight)
+      ? YGNode::computeEdgeValueForRow(
+            edges, edge, edge, detail::CompactValue::ofUndefined())
+      : YGNode::computeEdgeValueForColumn(
+            edges, edge, detail::CompactValue::ofUndefined());
+  appendNumberIfNotUndefined(base, str, value);
 }
 
 void YGNodeToString(
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index 1a22f24c9c147b..acd173be83f2ff 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -33,6 +33,10 @@ inline bool isUndefined(float value) {
   return std::isnan(value);
 }
 
+inline bool isUndefined(double value) {
+  return std::isnan(value);
+}
+
 } // namespace yoga
 } // namespace facebook
 
@@ -144,8 +148,3 @@ static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;
 
 extern bool YGFloatsEqual(const float a, const float b);
-extern facebook::yoga::detail::CompactValue YGComputedEdgeValue(
-    const facebook::yoga::detail::Values<
-        facebook::yoga::enums::count<YGEdge>()>& edges,
-    YGEdge edge,
-    facebook::yoga::detail::CompactValue defaultValue);
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index 97e640754d89f1..2c68674a742933 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -106,38 +106,12 @@ static int YGDefaultLog(
 #undef YG_UNUSED
 #endif
 
-YOGA_EXPORT bool YGFloatIsUndefined(const float value) {
+static inline bool YGDoubleIsUndefined(const double value) {
   return facebook::yoga::isUndefined(value);
 }
 
-detail::CompactValue YGComputedEdgeValue(
-    const YGStyle::Edges& edges,
-    YGEdge edge,
-    detail::CompactValue defaultValue) {
-  if (!edges[edge].isUndefined()) {
-    return edges[edge];
-  }
-
-  if ((edge == YGEdgeTop || edge == YGEdgeBottom) &&
-      !edges[YGEdgeVertical].isUndefined()) {
-    return edges[YGEdgeVertical];
-  }
-
-  if ((edge == YGEdgeLeft || edge == YGEdgeRight || edge == YGEdgeStart ||
-       edge == YGEdgeEnd) &&
-      !edges[YGEdgeHorizontal].isUndefined()) {
-    return edges[YGEdgeHorizontal];
-  }
-
-  if (!edges[YGEdgeAll].isUndefined()) {
-    return edges[YGEdgeAll];
-  }
-
-  if (edge == YGEdgeStart || edge == YGEdgeEnd) {
-    return detail::CompactValue::ofUndefined();
-  }
-
-  return defaultValue;
+YOGA_EXPORT bool YGFloatIsUndefined(const float value) {
+  return facebook::yoga::isUndefined(value);
 }
 
 YOGA_EXPORT void* YGNodeGetContext(YGNodeRef node) {
@@ -1681,40 +1655,33 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(
     availableHeight = YGUndefined;
   }
 
-  const float paddingAndBorderAxisRow =
-      YGNodePaddingAndBorderForAxis(node, YGFlexDirectionRow, ownerWidth);
-  const float paddingAndBorderAxisColumn =
-      YGNodePaddingAndBorderForAxis(node, YGFlexDirectionColumn, ownerWidth);
-  const float marginAxisRow =
-      node->getMarginForAxis(YGFlexDirectionRow, ownerWidth).unwrap();
-  const float marginAxisColumn =
-      node->getMarginForAxis(YGFlexDirectionColumn, ownerWidth).unwrap();
+  const auto& padding = node->getLayout().padding;
+  const auto& border = node->getLayout().border;
+  const float paddingAndBorderAxisRow = padding[YGEdgeLeft] +
+      padding[YGEdgeRight] + border[YGEdgeLeft] + border[YGEdgeRight];
+  const float paddingAndBorderAxisColumn = padding[YGEdgeTop] +
+      padding[YGEdgeBottom] + border[YGEdgeTop] + border[YGEdgeBottom];
 
   // We want to make sure we don't call measure with negative size
   const float innerWidth = YGFloatIsUndefined(availableWidth)
       ? availableWidth
-      : YGFloatMax(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
+      : YGFloatMax(0, availableWidth - paddingAndBorderAxisRow);
   const float innerHeight = YGFloatIsUndefined(availableHeight)
       ? availableHeight
-      : YGFloatMax(
-            0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn);
+      : YGFloatMax(0, availableHeight - paddingAndBorderAxisColumn);
 
   if (widthMeasureMode == YGMeasureModeExactly &&
       heightMeasureMode == YGMeasureModeExactly) {
     // Don't bother sizing the text if both dimensions are already defined.
     node->setLayoutMeasuredDimension(
         YGNodeBoundAxis(
-            node,
-            YGFlexDirectionRow,
-            availableWidth - marginAxisRow,
-            ownerWidth,
-            ownerWidth),
+            node, YGFlexDirectionRow, availableWidth, ownerWidth, ownerWidth),
         YGDimensionWidth);
     node->setLayoutMeasuredDimension(
         YGNodeBoundAxis(
             node,
             YGFlexDirectionColumn,
-            availableHeight - marginAxisColumn,
+            availableHeight,
             ownerHeight,
             ownerWidth),
         YGDimensionHeight);
@@ -1751,7 +1718,7 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(
             (widthMeasureMode == YGMeasureModeUndefined ||
              widthMeasureMode == YGMeasureModeAtMost)
                 ? measuredSize.width + paddingAndBorderAxisRow
-                : availableWidth - marginAxisRow,
+                : availableWidth,
             ownerWidth,
             ownerWidth),
         YGDimensionWidth);
@@ -1763,7 +1730,7 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(
             (heightMeasureMode == YGMeasureModeUndefined ||
              heightMeasureMode == YGMeasureModeAtMost)
                 ? measuredSize.height + paddingAndBorderAxisColumn
-                : availableHeight - marginAxisColumn,
+                : availableHeight,
             ownerHeight,
             ownerWidth),
         YGDimensionHeight);
@@ -1780,37 +1747,28 @@ static void YGNodeEmptyContainerSetMeasuredDimensions(
     const YGMeasureMode heightMeasureMode,
     const float ownerWidth,
     const float ownerHeight) {
-  const float paddingAndBorderAxisRow =
-      YGNodePaddingAndBorderForAxis(node, YGFlexDirectionRow, ownerWidth);
-  const float paddingAndBorderAxisColumn =
-      YGNodePaddingAndBorderForAxis(node, YGFlexDirectionColumn, ownerWidth);
-  const float marginAxisRow =
-      node->getMarginForAxis(YGFlexDirectionRow, ownerWidth).unwrap();
-  const float marginAxisColumn =
-      node->getMarginForAxis(YGFlexDirectionColumn, ownerWidth).unwrap();
-
+  const auto& padding = node->getLayout().padding;
+  const auto& border = node->getLayout().border;
+
+  float width = availableWidth;
+  if (widthMeasureMode == YGMeasureModeUndefined ||
+      widthMeasureMode == YGMeasureModeAtMost) {
+    width = padding[YGEdgeLeft] + padding[YGEdgeRight] + border[YGEdgeLeft] +
+        border[YGEdgeRight];
+  }
   node->setLayoutMeasuredDimension(
-      YGNodeBoundAxis(
-          node,
-          YGFlexDirectionRow,
-          (widthMeasureMode == YGMeasureModeUndefined ||
-           widthMeasureMode == YGMeasureModeAtMost)
-              ? paddingAndBorderAxisRow
-              : availableWidth - marginAxisRow,
-          ownerWidth,
-          ownerWidth),
+      YGNodeBoundAxis(node, YGFlexDirectionRow, width, ownerWidth, ownerWidth),
       YGDimensionWidth);
 
+  float height = availableHeight;
+  if (heightMeasureMode == YGMeasureModeUndefined ||
+      heightMeasureMode == YGMeasureModeAtMost) {
+    height = padding[YGEdgeTop] + padding[YGEdgeBottom] + border[YGEdgeTop] +
+        border[YGEdgeBottom];
+  }
   node->setLayoutMeasuredDimension(
       YGNodeBoundAxis(
-          node,
-          YGFlexDirectionColumn,
-          (heightMeasureMode == YGMeasureModeUndefined ||
-           heightMeasureMode == YGMeasureModeAtMost)
-              ? paddingAndBorderAxisColumn
-              : availableHeight - marginAxisColumn,
-          ownerHeight,
-          ownerWidth),
+          node, YGFlexDirectionColumn, height, ownerHeight, ownerWidth),
       YGDimensionHeight);
 }
 
@@ -1828,11 +1786,6 @@ static bool YGNodeFixedSizeSetMeasuredDimensions(
        heightMeasureMode == YGMeasureModeAtMost && availableHeight <= 0.0f) ||
       (widthMeasureMode == YGMeasureModeExactly &&
        heightMeasureMode == YGMeasureModeExactly)) {
-    auto marginAxisColumn =
-        node->getMarginForAxis(YGFlexDirectionColumn, ownerWidth).unwrap();
-    auto marginAxisRow =
-        node->getMarginForAxis(YGFlexDirectionRow, ownerWidth).unwrap();
-
     node->setLayoutMeasuredDimension(
         YGNodeBoundAxis(
             node,
@@ -1841,7 +1794,7 @@ static bool YGNodeFixedSizeSetMeasuredDimensions(
                     (widthMeasureMode == YGMeasureModeAtMost &&
                      availableWidth < 0.0f)
                 ? 0.0f
-                : availableWidth - marginAxisRow,
+                : availableWidth,
             ownerWidth,
             ownerWidth),
         YGDimensionWidth);
@@ -1854,7 +1807,7 @@ static bool YGNodeFixedSizeSetMeasuredDimensions(
                     (heightMeasureMode == YGMeasureModeAtMost &&
                      availableHeight < 0.0f)
                 ? 0.0f
-                : availableHeight - marginAxisColumn,
+                : availableHeight,
             ownerHeight,
             ownerWidth),
         YGDimensionHeight);
@@ -1878,21 +1831,11 @@ static void YGZeroOutLayoutRecursivly(
 
 static float YGNodeCalculateAvailableInnerDim(
     const YGNodeConstRef node,
-    YGFlexDirection axis,
-    float availableDim,
-    float ownerDim,
-    float ownerDimForMarginPadding) {
-  YGFlexDirection direction =
-      YGFlexDirectionIsRow(axis) ? YGFlexDirectionRow : YGFlexDirectionColumn;
-  YGDimension dimension =
-      YGFlexDirectionIsRow(axis) ? YGDimensionWidth : YGDimensionHeight;
-
-  const float margin =
-      node->getMarginForAxis(direction, ownerDimForMarginPadding).unwrap();
-  const float paddingAndBorder =
-      YGNodePaddingAndBorderForAxis(node, direction, ownerDimForMarginPadding);
-
-  float availableInnerDim = availableDim - margin - paddingAndBorder;
+    const YGDimension dimension,
+    const float availableDim,
+    const float paddingAndBorder,
+    const float ownerDim) {
+  float availableInnerDim = availableDim - paddingAndBorder;
   // Max dimension overrides predefined dimension value; Min dimension in turn
   // overrides both of the above
   if (!YGFloatIsUndefined(availableInnerDim)) {
@@ -2779,16 +2722,22 @@ static void YGNodelayoutImpl(
   const YGEdge startEdge =
       direction == YGDirectionLTR ? YGEdgeLeft : YGEdgeRight;
   const YGEdge endEdge = direction == YGDirectionLTR ? YGEdgeRight : YGEdgeLeft;
-  node->setLayoutMargin(
-      node->getLeadingMargin(flexRowDirection, ownerWidth).unwrap(), startEdge);
-  node->setLayoutMargin(
-      node->getTrailingMargin(flexRowDirection, ownerWidth).unwrap(), endEdge);
-  node->setLayoutMargin(
-      node->getLeadingMargin(flexColumnDirection, ownerWidth).unwrap(),
-      YGEdgeTop);
-  node->setLayoutMargin(
-      node->getTrailingMargin(flexColumnDirection, ownerWidth).unwrap(),
-      YGEdgeBottom);
+
+  const float marginRowLeading =
+      node->getLeadingMargin(flexRowDirection, ownerWidth).unwrap();
+  node->setLayoutMargin(marginRowLeading, startEdge);
+  const float marginRowTrailing =
+      node->getTrailingMargin(flexRowDirection, ownerWidth).unwrap();
+  node->setLayoutMargin(marginRowTrailing, endEdge);
+  const float marginColumnLeading =
+      node->getLeadingMargin(flexColumnDirection, ownerWidth).unwrap();
+  node->setLayoutMargin(marginColumnLeading, YGEdgeTop);
+  const float marginColumnTrailing =
+      node->getTrailingMargin(flexColumnDirection, ownerWidth).unwrap();
+  node->setLayoutMargin(marginColumnTrailing, YGEdgeBottom);
+
+  const float marginAxisRow = marginRowLeading + marginRowTrailing;
+  const float marginAxisColumn = marginColumnLeading + marginColumnTrailing;
 
   node->setLayoutBorder(node->getLeadingBorder(flexRowDirection), startEdge);
   node->setLayoutBorder(node->getTrailingBorder(flexRowDirection), endEdge);
@@ -2811,8 +2760,8 @@ static void YGNodelayoutImpl(
   if (node->hasMeasureFunc()) {
     YGNodeWithMeasureFuncSetMeasuredDimensions(
         node,
-        availableWidth,
-        availableHeight,
+        availableWidth - marginAxisRow,
+        availableHeight - marginAxisColumn,
         widthMeasureMode,
         heightMeasureMode,
         ownerWidth,
@@ -2827,8 +2776,8 @@ static void YGNodelayoutImpl(
   if (childCount == 0) {
     YGNodeEmptyContainerSetMeasuredDimensions(
         node,
-        availableWidth,
-        availableHeight,
+        availableWidth - marginAxisRow,
+        availableHeight - marginAxisColumn,
         widthMeasureMode,
         heightMeasureMode,
         ownerWidth,
@@ -2841,8 +2790,8 @@ static void YGNodelayoutImpl(
   if (!performLayout &&
       YGNodeFixedSizeSetMeasuredDimensions(
           node,
-          availableWidth,
-          availableHeight,
+          availableWidth - marginAxisRow,
+          availableHeight - marginAxisColumn,
           widthMeasureMode,
           heightMeasureMode,
           ownerWidth,
@@ -2866,12 +2815,14 @@ static void YGNodelayoutImpl(
   const float mainAxisownerSize = isMainAxisRow ? ownerWidth : ownerHeight;
   const float crossAxisownerSize = isMainAxisRow ? ownerHeight : ownerWidth;
 
-  const float leadingPaddingAndBorderCross =
-      node->getLeadingPaddingAndBorder(crossAxis, ownerWidth).unwrap();
   const float paddingAndBorderAxisMain =
       YGNodePaddingAndBorderForAxis(node, mainAxis, ownerWidth);
+  const float leadingPaddingAndBorderCross =
+      node->getLeadingPaddingAndBorder(crossAxis, ownerWidth).unwrap();
+  const float trailingPaddingAndBorderCross =
+      node->getTrailingPaddingAndBorder(crossAxis, ownerWidth).unwrap();
   const float paddingAndBorderAxisCross =
-      YGNodePaddingAndBorderForAxis(node, crossAxis, ownerWidth);
+      leadingPaddingAndBorderCross + trailingPaddingAndBorderCross;
 
   YGMeasureMode measureModeMainDim =
       isMainAxisRow ? widthMeasureMode : heightMeasureMode;
@@ -2883,35 +2834,20 @@ static void YGNodelayoutImpl(
   const float paddingAndBorderAxisColumn =
       isMainAxisRow ? paddingAndBorderAxisCross : paddingAndBorderAxisMain;
 
-  const float marginAxisRow =
-      node->getMarginForAxis(YGFlexDirectionRow, ownerWidth).unwrap();
-  const float marginAxisColumn =
-      node->getMarginForAxis(YGFlexDirectionColumn, ownerWidth).unwrap();
-
-  const auto& minDimensions = node->getStyle().minDimensions();
-  const auto& maxDimensions = node->getStyle().maxDimensions();
-  const float minInnerWidth =
-      YGResolveValue(minDimensions[YGDimensionWidth], ownerWidth).unwrap() -
-      paddingAndBorderAxisRow;
-  const float maxInnerWidth =
-      YGResolveValue(maxDimensions[YGDimensionWidth], ownerWidth).unwrap() -
-      paddingAndBorderAxisRow;
-  const float minInnerHeight =
-      YGResolveValue(minDimensions[YGDimensionHeight], ownerHeight).unwrap() -
-      paddingAndBorderAxisColumn;
-  const float maxInnerHeight =
-      YGResolveValue(maxDimensions[YGDimensionHeight], ownerHeight).unwrap() -
-      paddingAndBorderAxisColumn;
-
-  const float minInnerMainDim = isMainAxisRow ? minInnerWidth : minInnerHeight;
-  const float maxInnerMainDim = isMainAxisRow ? maxInnerWidth : maxInnerHeight;
-
   // STEP 2: DETERMINE AVAILABLE SIZE IN MAIN AND CROSS DIRECTIONS
 
   float availableInnerWidth = YGNodeCalculateAvailableInnerDim(
-      node, YGFlexDirectionRow, availableWidth, ownerWidth, ownerWidth);
+      node,
+      YGDimensionWidth,
+      availableWidth - marginAxisRow,
+      paddingAndBorderAxisRow,
+      ownerWidth);
   float availableInnerHeight = YGNodeCalculateAvailableInnerDim(
-      node, YGFlexDirectionColumn, availableHeight, ownerHeight, ownerWidth);
+      node,
+      YGDimensionHeight,
+      availableHeight - marginAxisColumn,
+      paddingAndBorderAxisColumn,
+      ownerHeight);
 
   float availableInnerMainDim =
       isMainAxisRow ? availableInnerWidth : availableInnerHeight;
@@ -2983,6 +2919,28 @@ static void YGNodelayoutImpl(
     // If we don't measure with exact main dimension we want to ensure we don't
     // violate min and max
     if (measureModeMainDim != YGMeasureModeExactly) {
+      const auto& minDimensions = node->getStyle().minDimensions();
+      const auto& maxDimensions = node->getStyle().maxDimensions();
+      const float minInnerWidth =
+          YGResolveValue(minDimensions[YGDimensionWidth], ownerWidth).unwrap() -
+          paddingAndBorderAxisRow;
+      const float maxInnerWidth =
+          YGResolveValue(maxDimensions[YGDimensionWidth], ownerWidth).unwrap() -
+          paddingAndBorderAxisRow;
+      const float minInnerHeight =
+          YGResolveValue(minDimensions[YGDimensionHeight], ownerHeight)
+              .unwrap() -
+          paddingAndBorderAxisColumn;
+      const float maxInnerHeight =
+          YGResolveValue(maxDimensions[YGDimensionHeight], ownerHeight)
+              .unwrap() -
+          paddingAndBorderAxisColumn;
+
+      const float minInnerMainDim =
+          isMainAxisRow ? minInnerWidth : minInnerHeight;
+      const float maxInnerMainDim =
+          isMainAxisRow ? maxInnerWidth : maxInnerHeight;
+
       if (!YGFloatIsUndefined(minInnerMainDim) &&
           collectedFlexItemsValues.sizeConsumedOnCurrentLine <
               minInnerMainDim) {
@@ -3531,8 +3489,8 @@ static void YGNodelayoutImpl(
                 YGNodeBoundAxisWithinMinAndMax(
                     node,
                     crossAxis,
-                    YGFloatOptional{totalLineCrossDim +
-                                    paddingAndBorderAxisCross},
+                    YGFloatOptional{
+                        totalLineCrossDim + paddingAndBorderAxisCross},
                     crossAxisownerSize)
                     .unwrap()),
             paddingAndBorderAxisCross),
@@ -3557,7 +3515,8 @@ static void YGNodelayoutImpl(
   if (performLayout) {
     // STEP 10: SIZING AND POSITIONING ABSOLUTE CHILDREN
     for (auto child : node->getChildren()) {
-      if (child->getStyle().positionType() != YGPositionTypeAbsolute) {
+      if (child->getStyle().display() == YGDisplayNone ||
+          child->getStyle().positionType() != YGPositionTypeAbsolute) {
         continue;
       }
       YGNodeAbsoluteLayoutChild(
@@ -3665,10 +3624,10 @@ YOGA_EXPORT float YGRoundValueToPixelGrid(
     const double pointScaleFactor,
     const bool forceCeil,
     const bool forceFloor) {
-  double scaledValue = ((double) value) * pointScaleFactor;
+  double scaledValue = value * pointScaleFactor;
   // We want to calculate `fractial` such that `floor(scaledValue) = scaledValue
   // - fractial`.
-  double fractial = fmod(scaledValue, 1.0f);
+  double fractial = fmod(scaledValue, 1.0);
   if (fractial < 0) {
     // This branch is for handling negative numbers for `value`.
     //
@@ -3690,25 +3649,25 @@ YOGA_EXPORT float YGRoundValueToPixelGrid(
   if (YGDoubleEqual(fractial, 0)) {
     // First we check if the value is already rounded
     scaledValue = scaledValue - fractial;
-  } else if (YGDoubleEqual(fractial, 1.0f)) {
-    scaledValue = scaledValue - fractial + 1.0f;
+  } else if (YGDoubleEqual(fractial, 1.0)) {
+    scaledValue = scaledValue - fractial + 1.0;
   } else if (forceCeil) {
     // Next we check if we need to use forced rounding
-    scaledValue = scaledValue - fractial + 1.0f;
+    scaledValue = scaledValue - fractial + 1.0;
   } else if (forceFloor) {
     scaledValue = scaledValue - fractial;
   } else {
     // Finally we just round the value
     scaledValue = scaledValue - fractial +
-        (!YGFloatIsUndefined(fractial) &&
-                 (fractial > 0.5f || YGDoubleEqual(fractial, 0.5f))
-             ? 1.0f
-             : 0.0f);
+        (!YGDoubleIsUndefined(fractial) &&
+                 (fractial > 0.5 || YGDoubleEqual(fractial, 0.5))
+             ? 1.0
+             : 0.0);
   }
-  return (YGFloatIsUndefined(scaledValue) ||
-          YGFloatIsUndefined(pointScaleFactor))
+  return (YGDoubleIsUndefined(scaledValue) ||
+          YGDoubleIsUndefined(pointScaleFactor))
       ? YGUndefined
-      : scaledValue / pointScaleFactor;
+      : (float) (scaledValue / pointScaleFactor);
 }
 
 YOGA_EXPORT bool YGNodeCanUseCachedMeasurement(
@@ -4235,9 +4194,7 @@ YOGA_EXPORT void YGNodeCalculateLayoutWithContext(
     if (node->getConfig()->printTree) {
       YGNodePrint(
           node,
-          (YGPrintOptions)(
-              YGPrintOptionsLayout | YGPrintOptionsChildren |
-              YGPrintOptionsStyle));
+          (YGPrintOptions) (YGPrintOptionsLayout | YGPrintOptionsChildren | YGPrintOptionsStyle));
     }
 #endif
   }
@@ -4297,9 +4254,7 @@ YOGA_EXPORT void YGNodeCalculateLayoutWithContext(
       if (nodeWithoutLegacyFlag->getConfig()->printTree) {
         YGNodePrint(
             nodeWithoutLegacyFlag,
-            (YGPrintOptions)(
-                YGPrintOptionsLayout | YGPrintOptionsChildren |
-                YGPrintOptionsStyle));
+            (YGPrintOptions) (YGPrintOptionsLayout | YGPrintOptionsChildren | YGPrintOptionsStyle));
       }
 #endif
     }
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index 87901a280ee84a..86cd65e2f08f07 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -107,7 +107,7 @@ WIN_EXPORT void YGNodeMarkDirty(YGNodeRef node);
 
 // Marks the current node and all its descendants as dirty.
 //
-// Intended to be used for Uoga benchmarks. Don't use in production, as calling
+// Intended to be used for Yoga benchmarks. Don't use in production, as calling
 // `YGCalculateLayout` will cause the recalculation of each and every node.
 WIN_EXPORT void YGNodeMarkDirtyAndPropogateToDescendants(YGNodeRef node);
 
diff --git a/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec b/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec
index 8fecb219b26c29..94db33ef54833c 100644
--- a/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec
+++ b/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec
@@ -4,7 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-TurboModuleCxx-RNW"
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://github.com/microsoft/react-native-windows"
   s.license                = package["license"]
   s.author                 = "Microsoft Corporation"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" }
+  s.platforms              = { :ios => "11.0", :osx => "10.15" }
   s.compiler_flags         = folly_compiler_flags
   s.source                 = { :git => 'https://github.com/microsoft/react-native-windows.git',
                                :commit => "d9077991441889ddaa18a8af6a2cc8514ca7714d" }
diff --git a/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec b/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec
index 0412b925cda1e9..58fec0a9cbf0a7 100644
--- a/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec
+++ b/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec
@@ -4,7 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 source = { :git => 'https://github.com/microsoft/react-native-macos.git' }
 if version == '1000.0.0'
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://github.com/microsoft/react-native-macos"
   s.license                = package["license"]
   s.author                 = "Microsoft Corporation"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" }
+  s.platforms              = { :ios => "11.0", :osx => "10.15" }
   s.compiler_flags         = folly_compiler_flags
   s.source                 = source
 
diff --git a/Releases.md b/Releases.md
index ce5e162ac0cc95..7d744d942a837b 100644
--- a/Releases.md
+++ b/Releases.md
@@ -4,7 +4,7 @@ This document serves as guide for release coordinators. You can find a list of r
 
 ## Release schedule
 
-React Native follows a monthly release train. Every month, a new branch created off master enters the Release Candidate phase, and the previous Release Candidate branch is released and considered stable.
+React Native follows a monthly release train. Every month, a new branch created off `main` enters the Release Candidate phase, and the previous Release Candidate branch is released and considered stable.
 
 ------------------
 
@@ -14,7 +14,7 @@ React Native follows a monthly release train. Every month, a new branch created
 
 The following are required for the local test suite to run:
 
-- macOS with [Android dev environment set up](https://github.com/facebook/react-native/blob/master/ReactAndroid/README.md)
+- macOS with [Android dev environment set up](https://github.com/facebook/react-native/blob/HEAD/ReactAndroid/README.md)
 - [react-native-cli](https://www.npmjs.com/package/react-native-cli) installed globally (v0.2.0 or newer)
 
 ### Step 1: Check everything works
@@ -76,13 +76,13 @@ Once everything is ready, create a new release at https://github.com/facebook/re
 
 ### Step 4: Update `Breaking Changes` document
 
-Once the release is cut, go to the [page](https://github.com/facebook/react-native/wiki/Breaking-Changes) where all breaking changes are listed and create section for the release. Don't forget to move all breaking changes from `master` that are now part of the release.
+Once the release is cut, go to the [page](https://github.com/facebook/react-native/wiki/Breaking-Changes) where all breaking changes are listed and create section for the release. Don't forget to move all breaking changes from `main` that are now part of the release.
 
 When finished and there are breaking changes, include them in the release notes you just created.
 
 ### Step 5: Tweet about the RC release
 
-Tweet about it! Link to release notes and say "please report issues" and link to the master issue to track bugs you created.
+Tweet about it! Link to release notes and say "please report issues" and link to the main issue to track bugs you created.
 
 ### Step 6: IMPORTANT: Track bug reports from the community during the following month, ping owners to get them fixed
 
@@ -92,7 +92,7 @@ Now that the release is out in the open, go ahead and create a GitHub issue titl
 
 ## How to release an RC update (e.g. 0.57.0-rc.1, 0.57.0-rc.2)
 
-The release is now in the open, people are finding bugs, and fixes have landed in master. People have been nominating fixes in the issue you created above. Use your best judgment to decide which commits merit an RC update. It's a good idea to do a new RC release when several small and non-risky bugs have been fixed. Having a few RC releases can also help people bisect in case we cherry-pick a bad commit by mistake.
+The release is now in the open, people are finding bugs, and fixes have landed in `main`. People have been nominating fixes in the issue you created above. Use your best judgment to decide which commits merit an RC update. It's a good idea to do a new RC release when several small and non-risky bugs have been fixed. Having a few RC releases can also help people bisect in case we cherry-pick a bad commit by mistake.
 
 **Only cherry-pick small and non-risky bug fixes**. **Don't pick new features into the release** as this greatly increases the risk of something breaking. The main point of the RC is to let people to use it for a month and fix the most serious bugs.
 
diff --git a/android-patches/patches/Build/ReactAndroid/NuGet.Config b/android-patches/patches/Build/ReactAndroid/NuGet.Config
index 0d8ca637501ce8..afd863fc35d552 100644
--- a/android-patches/patches/Build/ReactAndroid/NuGet.Config
+++ b/android-patches/patches/Build/ReactAndroid/NuGet.Config
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\NuGet.Config"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\NuGet.Config"	2020-10-13 21:24:33.415491000 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/NuGet.Config	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,13 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<configuration>
diff --git a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
index 109878ed6ee0d0..a2fecb1fda31ed 100644
--- a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
+++ b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
@@ -1,5 +1,5 @@
---- "E:\\gh\\react-native-macos2\\ReactAndroid\\ReactAndroid.nuspec"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec"	2021-10-16 13:47:24.356639200 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/ReactAndroid.nuspec	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,242 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
diff --git a/android-patches/patches/Build/ReactAndroid/build.gradle b/android-patches/patches/Build/ReactAndroid/build.gradle
index ed8865cc4dd8be..2aa88f4748fc3c 100644
--- a/android-patches/patches/Build/ReactAndroid/build.gradle
+++ b/android-patches/patches/Build/ReactAndroid/build.gradle
@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\build.gradle"	2020-10-27 20:26:16.652167500 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\build.gradle"	2020-10-13 22:03:22.833541000 -0700
-@@ -43,6 +43,8 @@
+--- ./ReactAndroid/build.gradle	2022-01-11 17:41:28.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/build.gradle	2022-01-12 15:51:37.000000000 -0800
+@@ -39,6 +39,8 @@
  // and the build will use that.
  def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
  
@@ -9,7 +9,7 @@
  // Setup build type for NDK, supported values: {debug, release}
  def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release"
  
-@@ -92,11 +94,22 @@
+@@ -89,11 +91,22 @@
      dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
  }
  
@@ -32,7 +32,7 @@
      includeEmptyDirs = false
      into("$thirdPartyNdkDir/folly")
  }
-@@ -119,6 +132,14 @@
+@@ -161,6 +174,14 @@
      into "$thirdPartyNdkDir/hermes"
  }
  
@@ -47,16 +47,16 @@
  task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
      src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
      onlyIfNewer(true)
-@@ -303,7 +324,7 @@
+@@ -354,7 +375,7 @@
  }
  
  def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
--    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
-+    dependsOn(prepareJSC, prepareHermes, prepareV8, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
+-    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractAARHeaders, extractJNIFiles)
++    dependsOn(prepareJSC, prepareHermes, prepareV8, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractAARHeaders, extractJNIFiles)
      dependsOn("generateCodegenArtifactsFromSchema");
-
+ 
      inputs.dir("$projectDir/../ReactCommon")
-@@ -314,6 +335,7 @@
+@@ -370,6 +391,7 @@
              "NDK_OUT=" + temporaryDir,
              "NDK_LIBS_OUT=$buildDir/react-ndk/all",
              "THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
@@ -64,7 +64,7 @@
              "REACT_COMMON_DIR=$projectDir/../ReactCommon",
              "REACT_GENERATED_SRC_DIR=$buildDir/generated/source",
              "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
-@@ -329,6 +351,7 @@
+@@ -384,6 +406,7 @@
      commandLine(getNdkBuildFullPath(),
              "NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk",
              "THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
@@ -72,7 +72,7 @@
              "REACT_COMMON_DIR=$projectDir/../ReactCommon",
              "-C", file("src/main/jni/react/jni").absolutePath,
              "clean")
-@@ -341,10 +364,16 @@
+@@ -395,10 +418,16 @@
  
  def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) {
      dependsOn(buildReactNdkLib)
diff --git a/android-patches/patches/Build/ReactAndroid/gradle.properties b/android-patches/patches/Build/ReactAndroid/gradle.properties
index 36cc598161d0b2..327798c4312fd7 100644
--- a/android-patches/patches/Build/ReactAndroid/gradle.properties
+++ b/android-patches/patches/Build/ReactAndroid/gradle.properties
@@ -1,11 +1,11 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\gradle.properties"	2020-10-27 20:26:16.652167500 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\gradle.properties"	2020-10-13 21:23:43.852166500 -0700
-@@ -17,7 +17,7 @@
- OKHTTP_VERSION=3.12.12
- SO_LOADER_VERSION=0.9.0
+--- ./ReactAndroid/gradle.properties	2022-01-11 17:41:28.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/gradle.properties	2022-01-12 15:04:31.000000000 -0800
+@@ -15,7 +15,7 @@
+ OKHTTP_VERSION=4.9.1
+ SO_LOADER_VERSION=0.10.1
  
 -BOOST_VERSION=1_63_0
 +BOOST_VERSION=1_68_0
  DOUBLE_CONVERSION_VERSION=1.1.6
- FOLLY_VERSION=2020.01.13.00
- GLOG_VERSION=0.3.5
+ FOLLY_VERSION=2021.06.28.00
+ FMT_VERSION=6.2.1
diff --git a/android-patches/patches/Build/ReactAndroid/packages.config b/android-patches/patches/Build/ReactAndroid/packages.config
index 8731165cc76faa..6bd47bcb0a3893 100644
--- a/android-patches/patches/Build/ReactAndroid/packages.config
+++ b/android-patches/patches/Build/ReactAndroid/packages.config
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\packages.config"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\packages.config"	2020-10-13 21:24:33.373490200 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/packages.config	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,5 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<packages>
diff --git a/android-patches/patches/Build/ReactAndroid/release.gradle b/android-patches/patches/Build/ReactAndroid/release.gradle
deleted file mode 100644
index ed6ab89d7ce85e..00000000000000
--- a/android-patches/patches/Build/ReactAndroid/release.gradle
+++ /dev/null
@@ -1,10 +0,0 @@
---- /home/mganandraj/github/rnm-64-vanilla/ReactAndroid/release.gradle	2021-10-11 17:51:44.286455263 -0700
-+++ /home/mganandraj/github/rnm-64/ReactAndroid/release.gradle	2021-10-07 16:35:28.636536900 -0700
-@@ -74,6 +74,7 @@
- afterEvaluate { project ->
- 
-     task androidJavadoc(type: Javadoc) {
-+        failOnError false
-         source = android.sourceSets.main.java.srcDirs
-         classpath += files(android.bootClasspath)
-         classpath += files(project.getConfigurations().getByName("compile").asList())
diff --git a/android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk
index 40e37961f9f206..9a0b5c9f0793ea 100644
--- a/android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk
+++ b/android-patches/patches/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk
@@ -1,13 +1,13 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\third-party\\boost\\Android.mk"	2020-10-27 20:26:17.038172200 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\third-party\\boost\\Android.mk"	2020-10-13 21:52:15.163202200 -0700
-@@ -1,8 +1,8 @@
- LOCAL_PATH:= $(call my-dir)
- include $(CLEAR_VARS)
+--- ./ReactAndroid/src/main/jni/third-party/boost/Android.mk	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/src/main/jni/third-party/boost/Android.mk	2022-01-12 15:51:16.000000000 -0800
+@@ -6,8 +6,8 @@
+ # They are required for Folly futures to compile successfully.
+ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH)/*.S)
  
 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 +LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_68_0
 +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_68_0
  
- LOCAL_MODULE    := boost
+ LOCAL_MODULE := boost
  
diff --git a/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js b/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
index 650827975a4e20..db1d0d4a34ed58 100644
--- a/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
+++ b/android-patches/patches/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
@@ -1,8 +1,6 @@
-diff --git a/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js b/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
-index ad2542dfa..b6d868022 100644
---- a/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
-+++ b/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js
-@@ -19,6 +19,12 @@ const ReactNativeViewViewConfigAndroid = {
+--- ./Libraries/Components/View/ReactNativeViewViewConfigAndroid.js	2021-11-08 14:22:26.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/Libraries/Components/View/ReactNativeViewViewConfigAndroid.js	2022-01-12 15:04:31.000000000 -0800
+@@ -19,6 +19,12 @@
          captured: 'onSelectCapture',
        },
      },
diff --git a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java
index e179a2b8d22bd1..24f4ed68de6c73 100644
--- a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java
+++ b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactClippingViewManager.java"	2020-10-27 20:26:16.991167000 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactClippingViewManager.java"	2020-10-13 21:41:45.084843900 -0700
+--- ./ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java	2021-10-25 12:38:05.000000000 -0700
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java	2022-01-12 15:04:31.000000000 -0800
 @@ -7,7 +7,10 @@
  
  package com.facebook.react.views.view;
diff --git a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java
index 14950e420a30af..16741f4bd4c91e 100644
--- a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java
+++ b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewFocusEvent.java"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\views\\view\\ReactViewFocusEvent.java"	2020-10-13 21:42:27.709385000 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewFocusEvent.java	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,49 @@
 +/**
 + * Copyright (c) 2015-present, Facebook, Inc.
diff --git a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index 3900a74d85bf05..39d89aa74480ef 100644
--- a/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/android-patches/patches/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -1,8 +1,6 @@
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
-index 851ec10c6..4fe93de49 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
-@@ -25,6 +25,7 @@ import com.facebook.react.uimanager.PointerEvents;
+--- ./ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Focus/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java	2022-01-12 15:04:31.000000000 -0800
+@@ -25,6 +25,7 @@
  import com.facebook.react.uimanager.Spacing;
  import com.facebook.react.uimanager.ThemedReactContext;
  import com.facebook.react.uimanager.UIManagerHelper;
@@ -10,7 +8,7 @@
  import com.facebook.react.uimanager.ViewProps;
  import com.facebook.react.uimanager.annotations.ReactProp;
  import com.facebook.react.uimanager.annotations.ReactPropGroup;
-@@ -48,8 +49,13 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -48,8 +49,13 @@
      Spacing.START,
      Spacing.END,
    };
@@ -26,7 +24,7 @@
    private static final String HOTSPOT_UPDATE_KEY = "hotspotUpdate";
  
    @ReactProp(name = "accessible")
-@@ -120,6 +126,36 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -120,6 +126,36 @@
      }
    }
  
@@ -63,7 +61,7 @@
    @ReactProp(name = "borderStyle")
    public void setBorderStyle(ReactViewGroup view, @Nullable String borderStyle) {
      view.setBorderStyle(borderStyle);
-@@ -287,7 +323,7 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -289,7 +325,7 @@
  
    @Override
    public Map<String, Integer> getCommandsMap() {
@@ -72,7 +70,7 @@ public Map<String, Integer> getCommandsMap() {
    }
  
    @Override
-@@ -303,6 +339,16 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -305,6 +341,16 @@
            handleSetPressed(root, args);
            break;
          }
@@ -89,7 +87,7 @@ public Map<String, Integer> getCommandsMap() {
      }
    }
  
-@@ -319,6 +365,16 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
+@@ -321,6 +367,16 @@
            handleSetPressed(root, args);
            break;
          }
diff --git a/android-patches/patches/ImageColor/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/android-patches/patches/ImageColor/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
index 6d59e245d9c9db..e69de29bb2d1d6 100644
--- a/android-patches/patches/ImageColor/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
+++ b/android-patches/patches/ImageColor/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
@@ -1,35 +0,0 @@
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
-index 6e2a1691fd..f856e85d53 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java
-@@ -325,6 +325,21 @@ import java.util.Map;
-     }
-   }
- 
-+  private static class BoxedColorPropSetter extends PropSetter {
-+
-+    public BoxedColorPropSetter(ReactProp prop, Method setter) {
-+      super(prop, "mixed", setter);
-+    }
-+
-+    @Override
-+    protected @Nullable Object getValueOrDefault(Object value, Context context) {
-+      if (value != null) {
-+        return ColorPropConverter.getColor(value, context);
-+      }
-+      return null;
-+    }
-+  }
-+
-   /*package*/ static Map<String, String> getNativePropsForView(
-       Class<? extends ViewManager> viewManagerTopClass,
-       Class<? extends ReactShadowNode> shadowNodeTopClass) {
-@@ -418,7 +433,7 @@ import java.util.Map;
-       return new BoxedBooleanPropSetter(annotation, method);
-     } else if (propTypeClass == Integer.class) {
-       if ("Color".equals(annotation.customType())) {
--        return new ColorPropSetter(annotation, method);
-+        return new BoxedColorPropSetter(annotation, method);
-       }
-       return new BoxedIntPropSetter(annotation, method);
-     } else if (propTypeClass == ReadableArray.class) {
diff --git a/android-patches/patches/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java b/android-patches/patches/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java
index 84e6c96614a361..579478331d0851 100644
--- a/android-patches/patches/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java
+++ b/android-patches/patches/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java
@@ -1,12 +1,12 @@
---- "E:\\gh\\react-native-macos2\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java"	2021-08-31 19:52:47.502468000 -0700
-+++ "E:\\gh\\react-native-macos\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\modules\\debug\\DevSettingsModule.java"	2021-10-20 19:29:11.611192200 -0700
+--- ./ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java	2021-01-28 10:24:44.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/MAC/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java	2022-01-12 15:04:31.000000000 -0800
 @@ -118,4 +118,9 @@
-   public void removeListeners(double count) {
-     // iOS only
-   }
+   public void removeListeners(double count) {
+     // iOS only
+   }
 +
 +  @Override
 +  public void setIsSecondaryClickToShowDevMenuEnabled(boolean enabled) {
 +    // macOS only.
 +  }
- }
+ }
diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index ff1144a330b1c1..6898046db23fb7 100644
--- a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1,24 +1,22 @@
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
-index 63ac2ec11..26fee8860 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
-@@ -51,6 +51,7 @@ import com.facebook.infer.annotation.ThreadConfined;
+--- ./ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java	2022-01-12 15:04:31.000000000 -0800
+@@ -52,6 +52,7 @@
  import com.facebook.infer.annotation.ThreadSafe;
  import com.facebook.react.bridge.Arguments;
  import com.facebook.react.bridge.CatalystInstance;
 +import com.facebook.react.bridge.CatalystInstance.CatalystInstanceEventListener;
  import com.facebook.react.bridge.CatalystInstanceImpl;
  import com.facebook.react.bridge.JSBundleLoader;
- import com.facebook.react.bridge.JSIModule;
-@@ -173,6 +174,7 @@ public class ReactInstanceManager {
-   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
+ import com.facebook.react.bridge.JSIModulePackage;
+@@ -182,6 +183,7 @@
    private final @Nullable JSIModulePackage mJSIModulePackage;
+   private final @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
    private List<ViewManager> mViewManagers;
 +  private @Nullable CatalystInstanceEventListener mCatalystInstanceEventListener;
  
    private class ReactContextInitParams {
      private final JavaScriptExecutorFactory mJsExecutorFactory;
-@@ -193,6 +195,15 @@ public class ReactInstanceManager {
+@@ -202,6 +204,15 @@
      }
    }
  
@@ -34,7 +32,7 @@ private class ReactContextInitParams {
    /** Creates a builder that is capable of creating an instance of {@link ReactInstanceManager}. */
    public static ReactInstanceManagerBuilder builder() {
      return new ReactInstanceManagerBuilder();
-@@ -1245,7 +1257,8 @@ public class ReactInstanceManager {
+@@ -1292,7 +1303,8 @@
              .setJSExecutor(jsExecutor)
              .setRegistry(nativeModuleRegistry)
              .setJSBundleLoader(jsBundleLoader)
diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 7e85254d113c91..b8d3c1598f249d 100644
--- a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java"	2020-10-27 20:26:16.742190400 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\CatalystInstance.java"	2020-10-13 21:28:17.283848100 -0700
+--- ./ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java	2021-11-08 14:22:26.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java	2022-01-12 15:04:31.000000000 -0800
 @@ -131,4 +131,11 @@
     * hasNativeModule, and getNativeModules can also return TurboModules.
     */
diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index b4ef3f8cb29d37..e714f519764f1a 100644
--- a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -1,8 +1,6 @@
-diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
-index dae969346..4b60fd1a7 100644
---- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
-+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
-@@ -121,7 +121,8 @@ public class CatalystInstanceImpl implements CatalystInstance {
+--- ./ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java	2022-01-12 16:18:35.000000000 -0800
+@@ -119,7 +119,8 @@
        final JavaScriptExecutor jsExecutor,
        final NativeModuleRegistry nativeModuleRegistry,
        final JSBundleLoader jsBundleLoader,
@@ -12,7 +10,7 @@
      FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
      Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstanceImpl");
  
-@@ -139,15 +140,21 @@ public class CatalystInstanceImpl implements CatalystInstance {
+@@ -137,6 +138,15 @@
      mTraceListener = new JSProfilerTraceListener(this);
      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
  
@@ -27,6 +25,8 @@
 +
      FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
      Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "initializeCxxBridge");
+ 
+@@ -147,10 +157,7 @@
      initializeBridge(
          new BridgeCallback(this),
          jsExecutor,
@@ -38,7 +38,7 @@
      FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
  
-@@ -208,13 +215,15 @@ public class CatalystInstanceImpl implements CatalystInstance {
+@@ -211,15 +218,17 @@
    private native void jniExtendNativeModules(
        Collection<JavaModuleWrapper> javaModules, Collection<ModuleHolder> cxxModules);
  
@@ -47,6 +47,8 @@ private native void jniExtendNativeModules(
 +    Collection<JavaModuleWrapper> javaModules,
 +    Collection<ModuleHolder> cxxModules);
 +
+   private native void warnOnLegacyNativeModuleSystemUse();
+ 
    private native void initializeBridge(
        ReactCallback callback,
        JavaScriptExecutor jsExecutor,
@@ -58,7 +60,7 @@ private native void initializeBridge(
  
    @Override
    public void setSourceURLs(String deviceURL, String remoteURL) {
-@@ -395,7 +401,8 @@ public class CatalystInstanceImpl implements CatalystInstance {
+@@ -400,7 +409,8 @@
                                              mJavaScriptContextHolder.clear();
  
                                              mHybridData.resetNative();
@@ -68,7 +70,7 @@ public void setSourceURLs(String deviceURL, String remoteURL) {
                                              FLog.d(
                                                  ReactConstants.TAG,
                                                  "CatalystInstanceImpl.destroy() end");
-@@ -565,6 +572,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
+@@ -569,6 +579,7 @@
    }
  
    private native long getJavaScriptContext();
@@ -76,7 +78,7 @@ public void setSourceURLs(String deviceURL, String remoteURL) {
  
    private void incrementPendingJSCalls() {
      int oldPendingCalls = mPendingJSCalls.getAndIncrement();
-@@ -668,6 +676,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
+@@ -672,6 +683,7 @@
      private @Nullable NativeModuleRegistry mRegistry;
      private @Nullable JavaScriptExecutor mJSExecutor;
      private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
@@ -84,7 +86,7 @@ private void incrementPendingJSCalls() {
  
      public Builder setReactQueueConfigurationSpec(
          ReactQueueConfigurationSpec ReactQueueConfigurationSpec) {
-@@ -695,13 +704,20 @@ public class CatalystInstanceImpl implements CatalystInstance {
+@@ -699,13 +711,20 @@
        return this;
      }
  
diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index 623c191bb20a03..2b0f26ba8d8f8d 100644
--- a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp"	2020-10-27 20:26:17.024172000 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp"	2020-10-13 21:50:14.117742800 -0700
-@@ -95,6 +95,7 @@
+--- ./ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp	2022-01-12 16:43:26.000000000 -0800
+@@ -103,6 +103,7 @@
  void CatalystInstanceImpl::registerNatives() {
    registerHybrid({
        makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid),
@@ -8,13 +8,15 @@
        makeNativeMethod(
            "initializeBridge", CatalystInstanceImpl::initializeBridge),
        makeNativeMethod(
-@@ -127,26 +128,39 @@
+@@ -135,6 +136,7 @@
            CatalystInstanceImpl::handleMemoryPressure),
        makeNativeMethod(
-           "getRuntimeExecutor", CatalystInstanceImpl::getRuntimeExecutor),           
+           "getRuntimeExecutor", CatalystInstanceImpl::getRuntimeExecutor),
 +      makeNativeMethod("getPointerOfInstancePointer", CatalystInstanceImpl::getPointerOfInstancePointer)
-   });
- 
+       makeNativeMethod(
+           "warnOnLegacyNativeModuleSystemUse",
+           CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse),
+@@ -143,6 +145,23 @@
    JNativeRunnable::registerNatives();
  }
  
@@ -35,7 +37,10 @@
 +  instance_->setModuleRegistry(moduleRegistry_);
 +}
 +
- void CatalystInstanceImpl::initializeBridge(
+ void log(ReactNativeLogLevel level, const char *message) {
+   switch (level) {
+     case ReactNativeLogLevelInfo:
+@@ -166,19 +185,14 @@
      jni::alias_ref<ReactCallback::javaobject> callback,
      // This executor is actually a factory holder.
      JavaScriptExecutorHolder *jseh,
@@ -46,6 +51,8 @@
 -    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
 -        cxxModules) {
 +    jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue) {
+   set_react_native_logfunc(&log);
+ 
    // TODO mhorowitz: how to assert here?
    // Assertions.assertCondition(mBridge == null, "initializeBridge should be
    // called once");
@@ -56,7 +63,7 @@
  
    // This used to be:
    //
-@@ -165,12 +179,13 @@
+@@ -197,12 +211,13 @@
    // don't need jsModuleDescriptions any more, all the way up and down the
    // stack.
  
@@ -75,7 +82,7 @@
    instance_->initializeBridge(
        std::make_unique<JInstanceCallback>(callback, moduleMessageQueue_),
        jseh->getExecutorFactory(),
-@@ -280,6 +295,10 @@
+@@ -335,6 +350,10 @@
    instance_->handleMemoryPressure(pressureLevel);
  }
  
diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
index 54aff948758208..17cd9c5348a787 100644
--- a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
+++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h"	2020-10-27 20:26:17.024172000 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h"	2020-10-13 21:51:15.981376100 -0700
+--- ./ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h	2022-01-12 15:04:31.000000000 -0800
 @@ -49,17 +49,16 @@
  
    CatalystInstanceImpl();
@@ -22,9 +22,9 @@
 -          cxxModules);
 +      jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue);
  
-   void extendNativeModules(
-       jni::alias_ref<jni::JCollection<
-@@ -97,6 +96,7 @@
+   // When called from CatalystInstanceImpl.java, warnings will be logged when
+   // CxxNativeModules are used. Java NativeModule usages log error in Java.
+@@ -101,6 +100,7 @@
    void setGlobalVariable(std::string propName, std::string &&jsonValue);
    jlong getJavaScriptContext();
    void handleMemoryPressure(int pressureLevel);
diff --git a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxModule.h b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxModule.h
index 60908685ed952a..c4bb8388785a42 100644
--- a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxModule.h
+++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxModule.h
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\CxxModule.h"	2020-10-27 20:26:17.181166900 -0700
-+++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\CxxModule.h"	2020-10-13 21:54:08.861279000 -0700
+--- ./ReactCommon/cxxreact/CxxModule.h	2021-10-25 12:38:05.000000000 -0700
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactCommon/cxxreact/CxxModule.h	2022-01-12 15:04:31.000000000 -0800
 @@ -14,8 +14,6 @@
  
  #include <folly/dynamic.h>
diff --git a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp
index 09ecb9f296b2b7..f78445c43b0f9d 100644
--- a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\CxxNativeModule.cpp"	2020-10-27 20:26:17.181166900 -0700
-+++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\CxxNativeModule.cpp"	2020-10-13 21:55:00.437153500 -0700
-@@ -209,5 +209,18 @@
+--- ./ReactCommon/cxxreact/CxxNativeModule.cpp	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.cpp	2022-01-12 15:04:31.000000000 -0800
+@@ -249,5 +249,18 @@
    }
  }
  
diff --git a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h
index d8866ad220dc8c..c69a5fecba67df 100644
--- a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h
+++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h
@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\CxxNativeModule.h"	2020-10-27 20:26:17.181166900 -0700
-+++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\CxxNativeModule.h"	2020-10-13 21:55:26.637861300 -0700
-@@ -45,6 +45,12 @@
+--- ./ReactCommon/cxxreact/CxxNativeModule.h	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactCommon/cxxreact/CxxNativeModule.h	2022-01-12 16:48:12.000000000 -0800
+@@ -48,6 +48,12 @@
        unsigned int hookId,
        folly::dynamic &&args) override;
  
@@ -10,6 +10,6 @@
 +                                               xplat::module::CxxModule::Provider provider,
 +                                               std::shared_ptr<MessageQueueThread> messageQueueThread);
 +
-  private:
-   void lazyInit();
+   static void setShouldWarnOnUse(bool value);
  
+  private:
diff --git a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp
index 4bfcdb11465b52..cbce5e708c3268 100644
--- a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp
+++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp
@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\Instance.cpp"	2020-10-27 20:26:17.182168000 -0700
-+++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\Instance.cpp"	2020-10-13 21:55:46.414313400 -0700
-@@ -39,6 +39,11 @@
+--- ./ReactCommon/cxxreact/Instance.cpp	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactCommon/cxxreact/Instance.cpp	2022-01-12 15:04:31.000000000 -0800
+@@ -40,6 +40,11 @@
    }
  }
  
diff --git a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h
index 1c31aafd804617..2792adeb842685 100644
--- a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h
+++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/Instance.h
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\Instance.h"	2020-10-27 20:26:17.182168000 -0700
-+++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\Instance.h"	2020-10-13 21:56:09.532647200 -0700
+--- ./ReactCommon/cxxreact/Instance.h	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactCommon/cxxreact/Instance.h	2022-01-12 15:04:31.000000000 -0800
 @@ -42,6 +42,8 @@
  class RN_EXPORT Instance {
   public:
diff --git a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h
index bf76616972806a..1f0edaa51d66b6 100644
--- a/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h
+++ b/android-patches/patches/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\PlatformBundleInfo.h"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\PlatformBundleInfo.h"	2020-10-13 21:56:36.835848700 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/OfficeRNHost/ReactCommon/cxxreact/PlatformBundleInfo.h	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,15 @@
 +#pragma once
 +
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index 0a7078a01da333..406fa4760d30d2 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -1,5 +1,5 @@
---- "E:\\gh\\react-native-macos2\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManagerBuilder.java"	2021-10-12 13:33:12.881732000 -0700
-+++ "E:\\gh\\react-native-macos\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\ReactInstanceManagerBuilder.java"	2021-10-12 13:26:43.722189600 -0700
+--- ./ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java	2022-01-12 15:04:31.000000000 -0800
 @@ -26,6 +26,7 @@
  import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
  import com.facebook.react.devsupport.interfaces.DevSupportManager;
@@ -8,9 +8,9 @@
  import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
  import com.facebook.react.packagerconnection.RequestHandler;
  import com.facebook.react.uimanager.UIImplementationProvider;
-@@ -59,8 +60,21 @@
-   private @Nullable JSIModulePackage mJSIModulesPackage;
+@@ -60,8 +61,21 @@
    private @Nullable Map<String, RequestHandler> mCustomPackagerCommandHandlers;
+   private @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
  
 +  public enum JSEngine {
 +    Hermes,
@@ -30,7 +30,7 @@
    /** Sets a provider of {@link UIImplementation}. Uses default provider if null is passed. */
    public ReactInstanceManagerBuilder setUIImplementationProvider(
        @Nullable UIImplementationProvider uiImplementationProvider) {
-@@ -291,40 +305,10 @@
+@@ -299,40 +313,10 @@
  
    private JavaScriptExecutorFactory getDefaultJSExecutorFactory(
        String appName, String deviceName, Context applicationContext) {
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index 6ff479686ee300..be1a0f37c80f9c 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -1,11 +1,12 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java"	2020-10-27 20:26:16.764168100 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java"	2020-10-13 21:38:34.972566300 -0700
-@@ -109,5 +109,8 @@
+--- ./ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java	2022-01-12 17:07:55.000000000 -0800
+@@ -115,6 +115,9 @@
    FABRIC_BATCH_EXECUTION_END,
    FABRIC_UPDATE_UI_MAIN_THREAD_START,
    FABRIC_UPDATE_UI_MAIN_THREAD_END,
 +  BYTECODE_CREATION_FAILED,
 +  BYTECODE_READ_FAILED,
 +  BYTECODE_WRITE_FAILED,
-   // New markers used by bridgeless RN below this line
-   REACT_INSTANCE_INIT_START,
+   // New markers used by bridge and bridgeless loading below this line
+   REACT_BRIDGE_LOADING_START,
+   REACT_BRIDGE_LOADING_END,
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk
index 894461dc50c2e6..ecf8931e330abf 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\Android.mk"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\Android.mk"	2020-10-13 21:39:46.668978500 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/Android.mk	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,21 @@
 +# Copyright (c) Facebook, Inc. and its affiliates.
 +#
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp
index a14248f351fd77..e3740cf83e17c7 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\OnLoad.cpp"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\OnLoad.cpp"	2020-10-13 21:39:46.686975700 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/OnLoad.cpp	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,51 @@
 +//  Copyright (c) Facebook, Inc. and its affiliates.
 +//
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java
index 7618956047d114..d8ef7766ba9eef 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8Executor.java"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8Executor.java"	2020-10-13 21:39:46.702978300 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8Executor.java	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,32 @@
 +/**
 + * Copyright (c) 2015-present, Facebook, Inc.
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp
index 12d5346f82c64d..645a44d22bb083 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.cpp"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.cpp"	2020-10-13 21:39:46.712977300 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.cpp	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,35 @@
 +#include <jsi/jsi.h>
 +#include <jsi/V8Runtime.h>
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h
index df513f30fb0c70..db8e12315f3a4a 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.h"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.h"	2020-10-13 21:39:46.729978100 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.h	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,17 @@
 +#include <folly/dynamic.h>
 +#include <jsiexecutor/jsireact/JSIExecutor.h>
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java
index 79ad39a9e6ea0e..f3d24bc938836a 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.java"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\v8executor\\V8ExecutorFactory.java"	2020-10-13 21:39:46.743977500 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/java/com/facebook/react/v8executor/V8ExecutorFactory.java	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,93 @@
 +/*
 + * Copyright (c) 2015-present, Facebook, Inc.
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk
index e3319f92b4c050..d6c0dfc6287024 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -1,8 +1,6 @@
-diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
-index 38a51019e..7425e65a5 100644
---- a/ReactAndroid/src/main/jni/react/jni/Android.mk
-+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
-@@ -128,6 +128,7 @@ $(call import-module,callinvoker)
+--- ./ReactAndroid/src/main/jni/react/jni/Android.mk	2022-01-11 17:41:29.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/jni/react/jni/Android.mk	2022-01-12 15:04:31.000000000 -0800
+@@ -129,6 +129,7 @@
  $(call import-module,reactperflogger)
  $(call import-module,hermes)
  $(call import-module,runtimeexecutor)
@@ -10,8 +8,10 @@ index 38a51019e..7425e65a5 100644
  $(call import-module,react/nativemodule/core)
  
  include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk
-@@ -148,3 +149,4 @@ include $(REACT_SRC_DIR)/jscexecutor/Android.mk
+@@ -146,5 +147,6 @@
  include $(REACT_SRC_DIR)/../hermes/reactexecutor/Android.mk
  include $(REACT_SRC_DIR)/../hermes/instrumentation/Android.mk
  include $(REACT_SRC_DIR)/modules/blob/jni/Android.mk
 +include $(REACT_SRC_DIR)/v8executor/Android.mk
+ 
+ include $(REACT_GENERATED_SRC_DIR)/codegen/jni/Android.mk
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
index 30cc728996bae9..747e4b3213a9a3 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
+++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\JReactMarker.cpp"	2020-10-27 20:26:17.027172300 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\JReactMarker.cpp"	2020-10-13 21:51:47.447172900 -0700
-@@ -75,6 +75,15 @@
+--- ./ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp	2021-11-08 14:22:26.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp	2022-01-12 15:04:31.000000000 -0800
+@@ -92,6 +92,15 @@
      case ReactMarker::REACT_INSTANCE_INIT_STOP:
        // These are not used on Android.
        break;
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk
index 676e0cac7ae96b..42e17226fb6cf8 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk
+++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\third-party\\v8jsi\\Android.mk"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\third-party\\v8jsi\\Android.mk"	2020-10-10 23:55:24.716175200 -0700
+--- /dev/null	2022-01-12 17:14:59.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactAndroid/src/main/jni/third-party/v8jsi/Android.mk	2022-01-12 15:04:31.000000000 -0800
 @@ -0,0 +1,17 @@
 +LOCAL_PATH:= $(call my-dir)
 +include $(CLEAR_VARS)
diff --git a/android-patches/patches/V8/ReactCommon/cxxreact/ReactMarker.h b/android-patches/patches/V8/ReactCommon/cxxreact/ReactMarker.h
index 3bb8ab6290a4cf..f9c8d102f2988b 100644
--- a/android-patches/patches/V8/ReactCommon/cxxreact/ReactMarker.h
+++ b/android-patches/patches/V8/ReactCommon/cxxreact/ReactMarker.h
@@ -1,5 +1,5 @@
---- "E:\\github\\rnm-63-fresh\\ReactCommon\\cxxreact\\ReactMarker.h"	2020-10-27 20:26:17.189168300 -0700
-+++ "E:\\github\\rnm-63\\ReactCommon\\cxxreact\\ReactMarker.h"	2020-10-13 21:57:00.685554800 -0700
+--- ./ReactCommon/cxxreact/ReactMarker.h	2021-11-08 14:22:26.000000000 -0800
++++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/V8/ReactCommon/cxxreact/ReactMarker.h	2022-01-12 15:04:31.000000000 -0800
 @@ -28,7 +28,10 @@
    REGISTER_JS_SEGMENT_START,
    REGISTER_JS_SEGMENT_STOP,
diff --git a/bots/README.md b/bots/README.md
index d108148033d413..884a2ab55c6e36 100644
--- a/bots/README.md
+++ b/bots/README.md
@@ -15,7 +15,7 @@ DANGER_GITHUB_API_TOKEN=[ENV_ABOVE] yarn danger pr https://github.com/facebook/r
 The code analysis bot provides lint and other results as inline reviews on GitHub. It runs as part of the Circle CI analysis workflow.
 
 If you want to test changes to the Code Analysis Bot, I'd recommend checking out an existing PR and then running the `analyze pr` command.
-You'll need a GitHub token. You can re-use this one: `78a72af35445ca3f8180` `b1a98e0bbd56ff1ccba1` (just remove the space).
+You'll need a GitHub token. You can re-use this one: `312d354b5c36f082cfe9` `07973d757026bdd9f196` (just remove the space).
 So, for example:
 
 ```
diff --git a/bots/code-analysis-bot.js b/bots/code-analysis-bot.js
index 55a80a9edecc30..5da10c52175f31 100644
--- a/bots/code-analysis-bot.js
+++ b/bots/code-analysis-bot.js
@@ -34,6 +34,8 @@ const converterSummary = {
     '`flow` found some issues. Run `yarn flow check` to analyze your code and address any errors.',
   shellcheck:
     '`shellcheck` found some issues. Run `yarn shellcheck` to analyze shell scripts.',
+  'google-java-format':
+    '`google-java-format` found some issues. See https://github.com/google/google-java-format',
 };
 
 /**
@@ -57,6 +59,24 @@ const converters = {
     }
   },
 
+  'google-java-format': function(output, input) {
+    if (!input) {
+      return;
+    }
+
+    input.forEach(function(change) {
+      push(output, change.file, {
+        message: `\`google-java-format\` suggested changes:
+\`\`\`diff
+${change.description}
+\`\`\`
+`,
+        line: change.line,
+        converter: 'google-java-format',
+      });
+    });
+  },
+
   flow: function(output, input) {
     if (!input || !input.errors) {
       return;
@@ -113,30 +133,6 @@ const converters = {
   },
 };
 
-function getShaFromPullRequest(octokit, owner, repo, number, callback) {
-  octokit.pullRequests.get({owner, repo, number}, (error, res) => {
-    if (error) {
-      console.error(error);
-      return;
-    }
-
-    callback(res.data.head.sha);
-  });
-}
-
-function getFilesFromPullRequest(octokit, owner, repo, number, callback) {
-  octokit.pullRequests.listFiles(
-    {owner, repo, number, per_page: 100},
-    (error, res) => {
-      if (error) {
-        console.error(error);
-        return;
-      }
-      callback(res.data);
-    },
-  );
-}
-
 /**
  * Sadly we can't just give the line number to github, we have to give the
  * line number relative to the patch file which is super annoying. This
@@ -166,7 +162,15 @@ function getLineMapFromPatch(patchString) {
   return lineMap;
 }
 
-function sendReview(octokit, owner, repo, number, commit_id, body, comments) {
+async function sendReview(
+  octokit,
+  owner,
+  repo,
+  pull_number,
+  commit_id,
+  body,
+  comments,
+) {
   if (process.env.GITHUB_TOKEN) {
     if (comments.length === 0) {
       // Do not leave an empty review.
@@ -181,19 +185,14 @@ function sendReview(octokit, owner, repo, number, commit_id, body, comments) {
     const opts = {
       owner,
       repo,
-      number,
+      pull_number,
       commit_id,
       body,
       event,
       comments,
     };
 
-    octokit.pullRequests.createReview(opts, function(error, res) {
-      if (error) {
-        console.error(error);
-        return;
-      }
-    });
+    await octokit.pulls.createReview(opts);
   } else {
     if (comments.length === 0) {
       console.log('No issues found.');
@@ -216,7 +215,7 @@ function sendReview(octokit, owner, repo, number, commit_id, body, comments) {
   }
 }
 
-function main(messages, owner, repo, number) {
+async function main(messages, owner, repo, pull_number) {
   // No message, we don't need to do anything :)
   if (Object.keys(messages).length === 0) {
     return;
@@ -234,40 +233,54 @@ function main(messages, owner, repo, number) {
     auth: process.env.GITHUB_TOKEN,
   });
 
-  getShaFromPullRequest(octokit, owner, repo, number, sha => {
-    getFilesFromPullRequest(octokit, owner, repo, number, files => {
-      let comments = [];
-      let convertersUsed = [];
-      files
-        .filter(file => messages[file.filename])
-        .forEach(file => {
-          // github api sometimes does not return a patch on large commits
-          if (!file.patch) {
-            return;
-          }
-          const lineMap = getLineMapFromPatch(file.patch);
-          messages[file.filename].forEach(message => {
-            if (lineMap[message.line]) {
-              const comment = {
-                path: file.filename,
-                position: lineMap[message.line],
-                body: message.message,
-              };
-              convertersUsed.push(message.converter);
-              comments.push(comment);
-            }
-          }); // forEach
-        }); // filter
-
-      let body = '**Code analysis results:**\n\n';
-      const uniqueconvertersUsed = [...new Set(convertersUsed)];
-      uniqueconvertersUsed.forEach(converter => {
-        body += '* ' + converterSummary[converter] + '\n';
-      });
+  const opts = {
+    owner,
+    repo,
+    pull_number,
+  };
 
-      sendReview(octokit, owner, repo, number, sha, body, comments);
-    }); // getFilesFromPullRequest
-  }); // getShaFromPullRequest
+  const {data: pull} = await octokit.pulls.get(opts);
+  const {data: files} = await octokit.pulls.listFiles(opts);
+
+  const comments = [];
+  const convertersUsed = [];
+
+  files
+    .filter(file => messages[file.filename])
+    .forEach(file => {
+      // github api sometimes does not return a patch on large commits
+      if (!file.patch) {
+        return;
+      }
+      const lineMap = getLineMapFromPatch(file.patch);
+      messages[file.filename].forEach(message => {
+        if (lineMap[message.line]) {
+          const comment = {
+            path: file.filename,
+            position: lineMap[message.line],
+            body: message.message,
+          };
+          convertersUsed.push(message.converter);
+          comments.push(comment);
+        }
+      }); // forEach
+    }); // filter
+
+  let body = '**Code analysis results:**\n\n';
+  const uniqueconvertersUsed = [...new Set(convertersUsed)];
+  uniqueconvertersUsed.forEach(converter => {
+    body += '* ' + converterSummary[converter] + '\n';
+  });
+
+  await sendReview(
+    octokit,
+    owner,
+    repo,
+    pull_number,
+    pull.head.sha,
+    body,
+    comments,
+  );
 }
 
 let content = '';
@@ -331,6 +344,7 @@ process.stdin.on('end', function() {
 
   const number = process.env.GITHUB_PR_NUMBER;
 
-  // intentional lint warning to make sure that the bot is working :)
-  main(messages, owner, repo, number);
+  (async () => {
+    await main(messages, owner, repo, number);
+  })();
 });
diff --git a/bots/dangerfile.js b/bots/dangerfile.js
index 4e954ea270fc83..e3cc1fd75c1e02 100644
--- a/bots/dangerfile.js
+++ b/bots/dangerfile.js
@@ -79,17 +79,17 @@ if (!includesChangelog) {
 }
 
 // Warns if the PR is opened against stable, as commits need to be cherry picked and tagged by a release maintainer.
-// Fails if the PR is opened against anything other than `master` or `-stable`.
-const isMergeRefMaster = danger.github.pr.base.ref === 'master';
+// Fails if the PR is opened against anything other than `main` or `-stable`.
+const isMergeRefMaster = danger.github.pr.base.ref === 'main';
 const isMergeRefStable = danger.github.pr.base.ref.indexOf('-stable') !== -1;
 if (!isMergeRefMaster && isMergeRefStable) {
   const title = ':grey_question: Base Branch';
   const idea =
-    'The base branch for this PR is something other than `master`. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on `master` first and then cherry-pick the commits into the branch for that release. The [Releases Guide](https://github.com/facebook/react-native/blob/master/Releases.md) has more information.';
+    'The base branch for this PR is something other than `main`. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on `main` first and then cherry-pick the commits into the branch for that release. The [Releases Guide](https://github.com/facebook/react-native/blob/HEAD/Releases.md) has more information.';
   warn(`${title} - <i>${idea}</i>`);
 } else if (!isMergeRefMaster && !isMergeRefStable) {
   const title = ':exclamation: Base Branch';
   const idea =
-    'The base branch for this PR is something other than `master`. [Are you sure you want to target something other than the `master` branch?](https://reactnative.dev/docs/contributing.html#pull-requests)';
+    'The base branch for this PR is something other than `main`. [Are you sure you want to target something other than the `main` branch?](https://reactnative.dev/docs/contributing.html#pull-requests)';
   fail(`${title} - <i>${idea}</i>`);
 }
diff --git a/bots/report-bundle-size.js b/bots/report-bundle-size.js
index 29e03d60a85b78..e70004d44e37e4 100644
--- a/bots/report-bundle-size.js
+++ b/bots/report-bundle-size.js
@@ -25,7 +25,7 @@ const datastore = require('./datastore');
 const {createOrUpdateComment} = require('./make-comment');
 
 /**
- * Generates and submits a comment. If this is run on master branch, data is
+ * Generates and submits a comment. If this is run on main branch, data is
  * committed to the store instead.
  * @param {{
       'android-hermes-arm64-v8a'?: number;
@@ -47,7 +47,7 @@ async function reportSizeStats(stats, replacePattern) {
   );
   const collection = datastore.getBinarySizesCollection(store);
 
-  if (GITHUB_REF === 'master') {
+  if (GITHUB_REF === 'main') {
     // Ensure we only store numbers greater than zero.
     const validatedStats = Object.keys(stats).reduce((validated, key) => {
       const value = stats[key];
diff --git a/build.gradle.kts b/build.gradle.kts
index 4d2c53b0189eb3..8c17661ba0fbaa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,12 +9,13 @@ buildscript {
     repositories {
         mavenLocal()
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
-        classpath("de.undercouch:gradle-download-task:4.0.2")
-
+        val kotlin_version: String by project
+        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("de.undercouch:gradle-download-task:4.1.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -32,6 +33,13 @@ allprojects {
         }
         mavenLocal()
         google()
-        jcenter()
+        mavenCentral()
+    }
+
+    // used to override ndk path/version from env variables on CI
+    ext["ANDROID_NDK_PATH"] = null
+    if (System.getenv("LOCAL_ANDROID_NDK_VERSION") != null) {
+        setProperty("ANDROID_NDK_VERSION", System.getenv("LOCAL_ANDROID_NDK_VERSION"))
+        ext["ANDROID_NDK_PATH"] =  System.getenv("ANDROID_NDK")
     }
 }
diff --git a/flow-typed/npm/promise_v8.x.x.js b/flow-typed/npm/promise_v8.x.x.js
index bdb0f5a0e022a2..f7eb92e4d12d22 100644
--- a/flow-typed/npm/promise_v8.x.x.js
+++ b/flow-typed/npm/promise_v8.x.x.js
@@ -4,15 +4,15 @@
  */
 
 declare module 'promise/setimmediate/es6-extensions' {
-  declare module.exports: Class<Promise>;
+  declare module.exports: typeof Promise;
 }
 
 declare module 'promise/setimmediate/done' {
-  declare module.exports: Class<Promise>;
+  declare module.exports: typeof Promise;
 }
 
 declare module 'promise/setimmediate/finally' {
-  declare module.exports: Class<Promise>;
+  declare module.exports: typeof Promise;
 }
 
 declare module 'promise/setimmediate/rejection-tracking' {
diff --git a/flow-typed/npm/react-test-renderer_v16.x.x.js b/flow-typed/npm/react-test-renderer_v16.x.x.js
new file mode 100644
index 00000000000000..44dc3e2c71f2de
--- /dev/null
+++ b/flow-typed/npm/react-test-renderer_v16.x.x.js
@@ -0,0 +1,79 @@
+// flow-typed signature: 7bac6c05f7415881918d3d510109e739
+// flow-typed version: fce74493f0/react-test-renderer_v16.x.x/flow_>=v0.104.x
+
+// Type definitions for react-test-renderer 16.x.x
+// Ported from: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-test-renderer
+
+type ReactComponentInstance = React$Component<any>;
+
+type ReactTestRendererJSON = {
+  type: string,
+  props: { [propName: string]: any, ... },
+  children: null | ReactTestRendererJSON[],
+  ...
+};
+
+type ReactTestRendererTree = ReactTestRendererJSON & {
+  nodeType: "component" | "host",
+  instance: ?ReactComponentInstance,
+  rendered: null | ReactTestRendererTree,
+  ...
+};
+
+type ReactTestInstance = {
+  instance: ?ReactComponentInstance,
+  type: string,
+  props: { [propName: string]: any, ... },
+  parent: null | ReactTestInstance,
+  children: Array<ReactTestInstance | string>,
+  find(predicate: (node: ReactTestInstance) => boolean): ReactTestInstance,
+  findByType(type: React$ElementType): ReactTestInstance,
+  findByProps(props: { [propName: string]: any, ... }): ReactTestInstance,
+  findAll(
+    predicate: (node: ReactTestInstance) => boolean,
+    options?: { deep: boolean, ... }
+  ): ReactTestInstance[],
+  findAllByType(
+    type: React$ElementType,
+    options?: { deep: boolean, ... }
+  ): ReactTestInstance[],
+  findAllByProps(
+    props: { [propName: string]: any, ... },
+    options?: { deep: boolean, ... }
+  ): ReactTestInstance[],
+  ...
+};
+
+type TestRendererOptions = { createNodeMock(element: React$Element<any>): any, ... };
+
+declare module "react-test-renderer" {
+  declare export type ReactTestRenderer = {
+    toJSON(): null | ReactTestRendererJSON,
+    toTree(): null | ReactTestRendererTree,
+    unmount(nextElement?: React$Element<any>): void,
+    update(nextElement: React$Element<any>): void,
+    getInstance(): ?ReactComponentInstance,
+    root: ReactTestInstance,
+    ...
+  };
+
+  declare type Thenable = { then(resolve: () => mixed, reject?: () => mixed): mixed, ... };
+
+  declare function create(
+    nextElement: React$Element<any>,
+    options?: TestRendererOptions
+  ): ReactTestRenderer;
+
+  declare function act(callback: () => void | Promise<void>): Thenable;
+}
+
+declare module "react-test-renderer/shallow" {
+  declare export default class ShallowRenderer {
+    static createRenderer(): ShallowRenderer;
+    getMountedInstance(): ReactTestInstance;
+    getRenderOutput<E: React$Element<any>>(): E;
+    getRenderOutput(): React$Element<any>;
+    render(element: React$Element<any>, context?: any): void;
+    unmount(): void;
+  }
+}
diff --git a/flow/HermesInternalType.js b/flow/HermesInternalType.js
new file mode 100644
index 00000000000000..c9d11b1d0f56cb
--- /dev/null
+++ b/flow/HermesInternalType.js
@@ -0,0 +1,114 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+// Declarations for functionality exposed by the Hermes VM.
+//
+// For backwards-compatibility, code that uses such functionality must also
+// check explicitly at run-time whether the object(s) and method(s) exist, and
+// fail safely if not.
+
+/**
+ * HermesInternalType is an object containing functions used to interact with
+ * the VM in a way that is not standardized by the JS spec.
+ * There are limited guarantees about these functions, and they should not be
+ * widely used. Consult with the Hermes team before using any of these.
+ * There may be other visible properties on this object; however, those are
+ * only exposed for testing purposes: do not use them.
+ */
+declare type $HermesInternalType = {
+  // All members are optional because they may not exist when OTA'd to older
+  // VMs.
+
+  +getNumGCs?: () => number,
+  +getGCTime?: () => number,
+  +getNativeCallTime?: () => number,
+  +getNativeCallCount?: () => number,
+  +getGCCPUTime?: () => number,
+
+  /**
+   * Hermes can embed an "epilogue" to the bytecode file with arbitrary bytes.
+   * At most one epilogue will exist per bytecode module (which can be
+   * different than a JS module).
+   * Calling this function will return all such epilogues and convert the
+   * bytes to numbers in the range of 0-255.
+   */
+  +getEpilogues?: () => Array<Array<number>>,
+
+  /**
+   * Query the VM for various statistics about performance.
+   * There are no guarantees about what keys exist in it, but they can be
+   * printed for informational purposes.
+   * @return An object that maps strings to various types of performance
+   *    statistics.
+   */
+  +getInstrumentedStats?: () => {[string]: number | string, ...},
+
+  /**
+   * Query the VM for any sort of runtime properties that it wants to report.
+   * There are no guarantees about what keys exist in it, but they can be
+   * printed for informational purposes.
+   * @return An object that maps strings to various types of runtime properties.
+   */
+  +getRuntimeProperties?: () => {
+    'OSS Release Version': string,
+    Build: string,
+    [string]: mixed,
+  },
+
+  /**
+   * Tell Hermes that at this point the surface has transitioned from TTI to
+   * post-TTI. The VM can change some of its internal behavior to optimize for
+   * post-TTI scenarios.
+   * This can be called several times but will have no effect after the first
+   * call.
+   */
+  +ttiReached?: () => void,
+
+  /**
+   * Tell Hermes that at this point the surface has transitioned from TTRC to
+   * post-TTRC. The VM can change some of its internal behavior to optimize for
+   * post-TTRC scenarios.
+   * This can be called several times but will have no effect after the first
+   * call.
+   */
+  +ttrcReached?: () => void,
+
+  /**
+   * Query the VM to see whether or not it enabled Promise.
+   */
+  +hasPromise?: () => boolean,
+
+  /**
+   * Enable promise rejection tracking with the given options.
+   * The API mirrored the `promise` npm package, therefore it's typed same as
+   * the `enable` function of module `promise/setimmediate/rejection-tracking`
+   * declared in ./flow-typed/npm/promise_v8.x.x.js.
+   */
+  +enablePromiseRejectionTracker?: (
+    options: ?{
+      whitelist?: ?Array<mixed>,
+      allRejections?: ?boolean,
+      onUnhandled?: ?(number, mixed) => void,
+      onHandled?: ?(number, mixed) => void,
+    },
+  ) => void,
+
+  /**
+   * Query the VM to see whether or not it use the engine Job queue.
+   */
+  +useEngineQueue?: () => boolean,
+
+  /**
+   * Enqueue a JavaScript callback function as a Job into the engine Job queue.
+   */
+  +enqueueJob?: <TArguments: Array<mixed>>(
+    jobCallback: (...args: TArguments) => mixed,
+  ) => void,
+};
diff --git a/flow/global.js b/flow/global.js
new file mode 100644
index 00000000000000..3c32ec6796c84e
--- /dev/null
+++ b/flow/global.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+/**
+ * `global` is a object containing all the global variables for React Native.
+ *
+ * NOTE: Consider cross-platform as well as JS environments compatibility
+ * when defining the types here. Consider both presence (`?`) as well as
+ * writeability (`+`) when defining types.
+ */
+declare var global: {
+  +HermesInternal: ?$HermesInternalType,
+
+  // Undeclared properties are implicitly `any`.
+  [string | symbol]: any,
+};
diff --git a/gradle.properties b/gradle.properties
index f0a3fdf5d79fed..e785ec12c912ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,3 +3,7 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
+
+ANDROID_NDK_VERSION=21.4.7075529
+android.useAndroidX=true
+kotlin_version=1.4.21
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 14e30f7416a55e..7665b0fa93ae75 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/index.js b/index.js
index 454e6c43dfe75f..3ecf66aa5ed7e4 100644
--- a/index.js
+++ b/index.js
@@ -24,8 +24,6 @@ import typeof InputAccessoryView from './Libraries/Components/TextInput/InputAcc
 import typeof KeyboardAvoidingView from './Libraries/Components/Keyboard/KeyboardAvoidingView';
 import typeof MaskedViewIOS from './Libraries/Components/MaskedView/MaskedViewIOS';
 import typeof Modal from './Libraries/Modal/Modal';
-import typeof Picker from './Libraries/Components/Picker/Picker';
-import typeof PickerIOS from './Libraries/Components/Picker/PickerIOS';
 import typeof Pressable from './Libraries/Components/Pressable/Pressable';
 import typeof ProgressBarAndroid from './Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
 import typeof ProgressViewIOS from './Libraries/Components/ProgressViewIOS/ProgressViewIOS';
@@ -81,7 +79,6 @@ import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
 import typeof PushNotificationIOS from './Libraries/PushNotificationIOS/PushNotificationIOS';
 import typeof Settings from './Libraries/Settings/Settings';
 import typeof Share from './Libraries/Share/Share';
-import typeof StatusBarIOS from './Libraries/Components/StatusBar/StatusBarIOS';
 import typeof StyleSheet from './Libraries/StyleSheet/StyleSheet';
 import typeof Systrace from './Libraries/Performance/Systrace';
 import typeof ToastAndroid from './Libraries/Components/ToastAndroid/ToastAndroid';
@@ -94,9 +91,9 @@ import typeof Vibration from './Libraries/Vibration/Vibration';
 import typeof YellowBox from './Libraries/YellowBox/YellowBoxDeprecated';
 
 // Plugins
-import typeof {ColorWithSystemEffectMacOS} from './Libraries/StyleSheet/PlatformColorValueTypesMacOS'; // TODO(macOS GH#750)
 import typeof {DynamicColorIOS} from './Libraries/StyleSheet/PlatformColorValueTypesIOS';
 import typeof {DynamicColorMacOS} from './Libraries/StyleSheet/PlatformColorValueTypesMacOS'; // TODO(macOS GH#774)
+import typeof {ColorWithSystemEffectMacOS} from './Libraries/StyleSheet/PlatformColorValueTypesMacOS'; // TODO(macOS GH#750)
 import typeof NativeModules from './Libraries/BatchedBridge/NativeModules';
 import typeof Platform from './Libraries/Utilities/Platform';
 import typeof {PlatformColor} from './Libraries/StyleSheet/PlatformColorValueTypes';
@@ -121,7 +118,8 @@ const warnOnce = require('./Libraries/Utilities/warnOnce');
 module.exports = {
   // Components
   get AccessibilityInfo(): AccessibilityInfo {
-    return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo');
+    return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
+      .default;
   },
   get ActivityIndicator(): ActivityIndicator {
     return require('./Libraries/Components/ActivityIndicator/ActivityIndicator');
@@ -135,7 +133,7 @@ module.exports = {
       'DatePickerIOS-merged',
       'DatePickerIOS has been merged with DatePickerAndroid and will be removed in a future release. ' +
         "It can now be installed and imported from '@react-native-community/datetimepicker' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/datetimepicker',
+        'See https://github.com/react-native-datetimepicker/datetimepicker',
     );
     return require('./Libraries/Components/DatePicker/DatePickerIOS');
   },
@@ -167,39 +165,21 @@ module.exports = {
     return require('./Libraries/Components/TextInput/InputAccessoryView');
   },
   get KeyboardAvoidingView(): KeyboardAvoidingView {
-    return require('./Libraries/Components/Keyboard/KeyboardAvoidingView');
+    return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
+      .default;
   },
   get MaskedViewIOS(): MaskedViewIOS {
     warnOnce(
       'maskedviewios-moved',
       'MaskedViewIOS has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-community/masked-view' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/react-native-masked-view',
+        "It can now be installed and imported from '@react-native-masked-view/masked-view' instead of 'react-native'. " +
+        'See https://github.com/react-native-masked-view/masked-view',
     );
     return require('./Libraries/Components/MaskedView/MaskedViewIOS');
   },
   get Modal(): Modal {
     return require('./Libraries/Modal/Modal');
   },
-  get Picker(): Picker {
-    warnOnce(
-      'picker-moved',
-      'Picker has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-community/picker' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/react-native-picker',
-    );
-    return require('./Libraries/Components/Picker/Picker');
-  },
-  // $FlowFixMe[value-as-type]
-  get PickerIOS(): PickerIOS {
-    warnOnce(
-      'pickerios-moved',
-      'PickerIOS has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-community/picker' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/react-native-picker',
-    );
-    return require('./Libraries/Components/Picker/PickerIOS');
-  },
   get Pressable(): Pressable {
     return require('./Libraries/Components/Pressable/Pressable').default;
   },
@@ -209,7 +189,7 @@ module.exports = {
       'progress-bar-android-moved',
       'ProgressBarAndroid has been extracted from react-native core and will be removed in a future release. ' +
         "It can now be installed and imported from '@react-native-community/progress-bar-android' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/progress-bar-android',
+        'See https://github.com/react-native-progress-view/progress-bar-android',
     );
     return require('./Libraries/Components/ProgressBarAndroid/ProgressBarAndroid');
   },
@@ -219,7 +199,7 @@ module.exports = {
       'progress-view-ios-moved',
       'ProgressViewIOS has been extracted from react-native core and will be removed in a future release. ' +
         "It can now be installed and imported from '@react-native-community/progress-view' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/progress-view',
+        'See https://github.com/react-native-progress-view/progress-view',
     );
     return require('./Libraries/Components/ProgressViewIOS/ProgressViewIOS');
   },
@@ -227,21 +207,21 @@ module.exports = {
     return require('./Libraries/Components/RefreshControl/RefreshControl');
   },
   get SafeAreaView(): SafeAreaView {
-    return require('./Libraries/Components/SafeAreaView/SafeAreaView');
+    return require('./Libraries/Components/SafeAreaView/SafeAreaView').default;
   },
   get ScrollView(): ScrollView {
     return require('./Libraries/Components/ScrollView/ScrollView');
   },
   get SectionList(): SectionList {
-    return require('./Libraries/Lists/SectionList');
+    return require('./Libraries/Lists/SectionList').default;
   },
   // $FlowFixMe[value-as-type]
   get SegmentedControlIOS(): SegmentedControlIOS {
     warnOnce(
       'segmented-control-ios-moved',
       'SegmentedControlIOS has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-community/segmented-control' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/segmented-control',
+        "It can now be installed and imported from '@react-native-segmented-control/segmented-control' instead of 'react-native'. " +
+        'See https://github.com/react-native-segmented-control/segmented-control',
     );
     return require('./Libraries/Components/SegmentedControlIOS/SegmentedControlIOS');
   },
@@ -250,7 +230,7 @@ module.exports = {
       'slider-moved',
       'Slider has been extracted from react-native core and will be removed in a future release. ' +
         "It can now be installed and imported from '@react-native-community/slider' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/react-native-slider',
+        'See https://github.com/callstack/react-native-slider',
     );
     return require('./Libraries/Components/Slider/Slider');
   },
@@ -258,7 +238,7 @@ module.exports = {
     return require('./Libraries/Components/StatusBar/StatusBar');
   },
   get Switch(): Switch {
-    return require('./Libraries/Components/Switch/Switch');
+    return require('./Libraries/Components/Switch/Switch').default;
   },
   get Text(): Text {
     return require('./Libraries/Text/Text');
@@ -325,8 +305,8 @@ module.exports = {
     warnOnce(
       'async-storage-moved',
       'AsyncStorage has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-community/async-storage' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/async-storage',
+        "It can now be installed and imported from '@react-native-async-storage/async-storage' instead of 'react-native'. " +
+        'See https://github.com/react-native-async-storage/async-storage',
     );
     return require('./Libraries/Storage/AsyncStorage');
   },
@@ -337,8 +317,8 @@ module.exports = {
     warnOnce(
       'clipboard-moved',
       'Clipboard has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-community/clipboard' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/clipboard',
+        "It can now be installed and imported from '@react-native-clipboard/clipboard' instead of 'react-native'. " +
+        'See https://github.com/react-native-clipboard/clipboard',
     );
     return require('./Libraries/Components/Clipboard/Clipboard');
   },
@@ -347,7 +327,7 @@ module.exports = {
       'DatePickerAndroid-merged',
       'DatePickerAndroid has been merged with DatePickerIOS and will be removed in a future release. ' +
         "It can now be installed and imported from '@react-native-community/datetimepicker' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/datetimepicker',
+        'See https://github.com/react-native-datetimepicker/datetimepicker',
     );
     return require('./Libraries/Components/DatePickerAndroid/DatePickerAndroid');
   },
@@ -375,7 +355,7 @@ module.exports = {
       'ImagePickerIOS has been extracted from react-native core and will be removed in a future release. ' +
         "Please upgrade to use either '@react-native-community/react-native-image-picker' or 'expo-image-picker'. " +
         "If you cannot upgrade to a different library, please install the deprecated '@react-native-community/image-picker-ios' package. " +
-        'See https://github.com/react-native-community/react-native-image-picker-ios',
+        'See https://github.com/rnc-archive/react-native-image-picker-ios',
     );
     return require('./Libraries/Image/ImagePickerIOS');
   },
@@ -418,7 +398,7 @@ module.exports = {
       'pushNotificationIOS-moved',
       'PushNotificationIOS has been extracted from react-native core and will be removed in a future release. ' +
         "It can now be installed and imported from '@react-native-community/push-notification-ios' instead of 'react-native'. " +
-        'See https://github.com/react-native-community/push-notification-ios',
+        'See https://github.com/react-native-push-notification-ios/push-notification-ios',
     );
     return require('./Libraries/PushNotificationIOS/PushNotificationIOS');
   },
@@ -428,13 +408,6 @@ module.exports = {
   get Share(): Share {
     return require('./Libraries/Share/Share');
   },
-  get StatusBarIOS(): StatusBarIOS {
-    warnOnce(
-      'StatusBarIOS-merged',
-      'StatusBarIOS has been merged with StatusBar and will be removed in a future release. Use StatusBar for mutating the status bar',
-    );
-    return require('./Libraries/Components/StatusBar/StatusBarIOS');
-  },
   get StyleSheet(): StyleSheet {
     return require('./Libraries/StyleSheet/StyleSheet');
   },
@@ -513,7 +486,7 @@ module.exports = {
   ) => HostComponent<T> {
     return require('./Libraries/ReactNative/requireNativeComponent');
   },
-  get unstable_RootTagContext(): RootTagContext {
+  get RootTagContext(): RootTagContext {
     return require('./Libraries/ReactNative/RootTag').RootTagContext;
   },
   get unstable_enableLogBox(): () => void {
@@ -539,7 +512,10 @@ module.exports = {
 };
 
 if (__DEV__) {
-  // $FlowFixMe This is intentional: Flow will error when attempting to access ART.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access ART. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access ART. */
   Object.defineProperty(module.exports, 'ART', {
     configurable: true,
     get() {
@@ -547,12 +523,15 @@ if (__DEV__) {
         false,
         'ART has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/art' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/art',
+          'See https://github.com/react-native-art/art',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access ListView.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access ListView. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access ListView. */
   Object.defineProperty(module.exports, 'ListView', {
     configurable: true,
     get() {
@@ -565,7 +544,10 @@ if (__DEV__) {
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access SwipeableListView.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access SwipeableListView. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access SwipeableListView. */
   Object.defineProperty(module.exports, 'SwipeableListView', {
     configurable: true,
     get() {
@@ -578,7 +560,10 @@ if (__DEV__) {
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access WebView.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access WebView. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access WebView. */
   Object.defineProperty(module.exports, 'WebView', {
     configurable: true,
     get() {
@@ -586,12 +571,15 @@ if (__DEV__) {
         false,
         'WebView has been removed from React Native. ' +
           "It can now be installed and imported from 'react-native-webview' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/react-native-webview',
+          'See https://github.com/react-native-webview/react-native-webview',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access NetInfo.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access NetInfo. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access NetInfo. */
   Object.defineProperty(module.exports, 'NetInfo', {
     configurable: true,
     get() {
@@ -599,12 +587,15 @@ if (__DEV__) {
         false,
         'NetInfo has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/netinfo' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/react-native-netinfo',
+          'See https://github.com/react-native-netinfo/react-native-netinfo',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access CameraRoll.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access CameraRoll. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access CameraRoll. */
   Object.defineProperty(module.exports, 'CameraRoll', {
     configurable: true,
     get() {
@@ -612,12 +603,15 @@ if (__DEV__) {
         false,
         'CameraRoll has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/cameraroll' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/react-native-cameraroll',
+          'See https://github.com/react-native-cameraroll/react-native-cameraroll',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access ImageStore.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access ImageStore. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access ImageStore. */
   Object.defineProperty(module.exports, 'ImageStore', {
     configurable: true,
     get() {
@@ -631,7 +625,10 @@ if (__DEV__) {
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access ImageEditor.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access ImageEditor. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access ImageEditor. */
   Object.defineProperty(module.exports, 'ImageEditor', {
     configurable: true,
     get() {
@@ -639,12 +636,15 @@ if (__DEV__) {
         false,
         'ImageEditor has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/image-editor' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/react-native-image-editor',
+          'See https://github.com/callstack/react-native-image-editor',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access TimePickerAndroid.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access TimePickerAndroid. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access TimePickerAndroid. */
   Object.defineProperty(module.exports, 'TimePickerAndroid', {
     configurable: true,
     get() {
@@ -652,12 +652,15 @@ if (__DEV__) {
         false,
         'TimePickerAndroid has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/datetimepicker' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/datetimepicker',
+          'See https://github.com/react-native-datetimepicker/datetimepicker',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access ToolbarAndroid.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access ToolbarAndroid. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access ToolbarAndroid. */
   Object.defineProperty(module.exports, 'ToolbarAndroid', {
     configurable: true,
     get() {
@@ -665,12 +668,15 @@ if (__DEV__) {
         false,
         'ToolbarAndroid has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/toolbar-android' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/toolbar-android',
+          'See https://github.com/react-native-toolbar-android/toolbar-android',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access ViewPagerAndroid.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access ViewPagerAndroid. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access ViewPagerAndroid. */
   Object.defineProperty(module.exports, 'ViewPagerAndroid', {
     configurable: true,
     get() {
@@ -678,12 +684,15 @@ if (__DEV__) {
         false,
         'ViewPagerAndroid has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/viewpager' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/react-native-viewpager',
+          'See https://github.com/callstack/react-native-viewpager',
       );
     },
   });
 
-  // $FlowFixMe This is intentional: Flow will error when attempting to access CheckBox.
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access CheckBox. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access CheckBox. */
   Object.defineProperty(module.exports, 'CheckBox', {
     configurable: true,
     get() {
@@ -691,7 +700,55 @@ if (__DEV__) {
         false,
         'CheckBox has been removed from React Native. ' +
           "It can now be installed and imported from '@react-native-community/checkbox' instead of 'react-native'. " +
-          'See https://github.com/react-native-community/react-native-checkbox',
+          'See https://github.com/react-native-checkbox/react-native-checkbox',
+      );
+    },
+  });
+
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access StatusBarIOS. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access StatusBarIOS. */
+  Object.defineProperty(module.exports, 'StatusBarIOS', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'StatusBarIOS has been removed from React Native. ' +
+          'Has been merged with StatusBar. ' +
+          'See https://reactnative.dev/docs/statusbar',
+      );
+    },
+  });
+
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access PickerIOS. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access PickerIOS. */
+  Object.defineProperty(module.exports, 'PickerIOS', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'PickerIOS has been removed from React Native. ' +
+          "It can now be installed and imported from '@react-native-picker/picker' instead of 'react-native'. " +
+          'See https://github.com/react-native-picker/picker',
+      );
+    },
+  });
+
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access Picker. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access Picker. */
+  Object.defineProperty(module.exports, 'Picker', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'Picker has been removed from React Native. ' +
+          "It can now be installed and imported from '@react-native-picker/picker' instead of 'react-native'. " +
+          'See https://github.com/react-native-picker/picker',
       );
     },
   });
diff --git a/interface.js b/interface.js
index a5e7987fe744ee..22337a98731be1 100644
--- a/interface.js
+++ b/interface.js
@@ -15,11 +15,3 @@ declare var __DEV__: boolean;
 declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: any; /*?{
   inject: ?((stuff: Object) => void)
 };*/
-
-declare var fetch: any;
-declare var Headers: any;
-declare var Request: any;
-declare var Response: any;
-declare module requestAnimationFrame {
-  declare module.exports: (callback: any) => any;
-}
diff --git a/jest/mockNativeComponent.js b/jest/mockNativeComponent.js
new file mode 100644
index 00000000000000..e6080b7d1498e7
--- /dev/null
+++ b/jest/mockNativeComponent.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+'use strict';
+
+const React = require('react');
+
+module.exports = viewName => {
+  const Component = class extends React.Component {
+    render() {
+      return React.createElement(viewName, this.props, this.props.children);
+    }
+
+    // The methods that exist on host components
+    blur = jest.fn();
+    focus = jest.fn();
+    measure = jest.fn();
+    measureInWindow = jest.fn();
+    measureLayout = jest.fn();
+    setNativeProps = jest.fn();
+  };
+
+  if (viewName === 'RCTView') {
+    Component.displayName = 'View';
+  } else {
+    Component.displayName = viewName;
+  }
+
+  return Component;
+};
diff --git a/jest/preprocessor.js b/jest/preprocessor.js
index 7e8ed8de0eaa0b..e209750d697334 100644
--- a/jest/preprocessor.js
+++ b/jest/preprocessor.js
@@ -13,10 +13,42 @@
 'use strict';
 
 const babelRegisterOnly = require('metro-babel-register');
+const nullthrows = require('nullthrows');
 const createCacheKeyFunction = require('@jest/create-cache-key-function')
   .default;
+const t = require('@babel/types');
+const {statements} = require('@babel/template').default;
 
-const {transformSync: babelTransformSync} = require('@babel/core');
+const importDefault = '__importDefault__';
+const importAll = '__importAll__';
+
+// prelude
+const importPrelude = statements(`
+  function ${importDefault}(moduleId) {
+    const exports = require(moduleId);
+
+    if (exports && exports.__esModule) {
+      return exports.default;
+    }
+
+    return exports;
+  };
+
+  function ${importAll}(moduleId) {
+    const exports = require(moduleId);
+
+    if (exports && exports.__esModule) {
+      return exports;
+    }
+
+    return Object.assign({}, exports, {default: exports});
+  };
+`);
+
+const {
+  transformSync: babelTransformSync,
+  transformFromAstSync: babelTransformFromAstSync,
+} = require('@babel/core');
 const generate = require('@babel/generator').default;
 
 const nodeFiles = new RegExp(
@@ -41,13 +73,13 @@ module.exports = {
       }).code;
     }
 
-    const {ast} = transformer.transform({
+    let {ast} = transformer.transform({
       filename: file,
       options: {
         ast: true, // needed for open source (?) https://github.com/facebook/react-native/commit/f8d6b97140cffe8d18b2558f94570c8d1b410d5c#r28647044
         dev: true,
         enableBabelRuntime: false,
-        experimentalImportSupport: false,
+        experimentalImportSupport: true,
         globalPrefix: '',
         hot: false,
         inlineRequires: true,
@@ -79,10 +111,6 @@ module.exports = {
         [require('@babel/plugin-transform-regenerator')],
         [require('@babel/plugin-transform-sticky-regex')],
         [require('@babel/plugin-transform-unicode-regex')],
-        [
-          require('@babel/plugin-transform-modules-commonjs'),
-          {strict: false, allowTopLevelThis: true},
-        ],
         [require('@babel/plugin-transform-classes')],
         [require('@babel/plugin-transform-arrow-functions')],
         [require('@babel/plugin-transform-spread')],
@@ -99,8 +127,49 @@ module.exports = {
       ],
     });
 
+    // We're not using @babel/plugin-transform-modules-commonjs so
+    // we need to add 'use strict' manually
+    const directives = ast.program.directives;
+
+    if (
+      ast.program.sourceType === 'module' &&
+      (directives == null ||
+        directives.findIndex(d => d.value.value === 'use strict') === -1)
+    ) {
+      ast.program.directives = [
+        ...(directives || []),
+        t.directive(t.directiveLiteral('use strict')),
+      ];
+    }
+
+    // Postprocess the transformed module to handle ESM and inline requires.
+    // We need to do this in a separate pass to avoid issues tracking references.
+    const babelTransformResult = babelTransformFromAstSync(ast, src, {
+      ast: true,
+      retainLines: true,
+      plugins: [
+        [
+          require('metro-transform-plugins').importExportPlugin,
+          {importDefault, importAll},
+        ],
+        [
+          require('babel-preset-fbjs/plugins/inline-requires.js'),
+          {inlineableCalls: [importDefault, importAll]},
+        ],
+      ],
+      sourceType: 'module',
+    });
+
+    ast = nullthrows(babelTransformResult.ast);
+
+    // Inject import helpers *after* running the inline-requires transform,
+    // because otherwise it will assume they are user code and bail out of
+    // inlining calls to them.
+    ast.program.body.unshift(...importPrelude());
+
     return generate(
       ast,
+      // $FlowFixMe[prop-missing] Error found when improving flow typing for libs
       {
         code: true,
         comments: false,
diff --git a/jest/renderer.js b/jest/renderer.js
index 64d56830cf4be0..04b5674c26872c 100644
--- a/jest/renderer.js
+++ b/jest/renderer.js
@@ -9,16 +9,10 @@
  * @flow
  */
 
-'use strict';
+import * as React from 'react';
+import TestRenderer from 'react-test-renderer';
+import ShallowRenderer from 'react-shallow-renderer';
 
-const React = require('react');
-
-const ShallowRenderer = require('react-shallow-renderer');
-const TestRenderer = require('react-test-renderer');
-
-/* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.125.1 was deployed. To see the error, delete this comment
- * and run Flow. */
 const renderer = new ShallowRenderer();
 
 export const shallow = (Component: React.Element<any>): any => {
diff --git a/jest/setup.js b/jest/setup.js
index bc27b00e23abf0..912b5f78dcee58 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -12,7 +12,7 @@
 const MockNativeMethods = jest.requireActual('./MockNativeMethods');
 const mockComponent = jest.requireActual('./mockComponent');
 
-jest.requireActual('@react-native/polyfills/Object.es7');
+jest.requireActual('@react-native/polyfills/Object.es8');
 jest.requireActual('@react-native/polyfills/error-guard');
 
 global.__DEV__ = true;
@@ -23,6 +23,7 @@ global.performance = {
 
 global.Promise = jest.requireActual('promise');
 global.regeneratorRuntime = jest.requireActual('regenerator-runtime/runtime');
+global.window = global;
 
 global.requestAnimationFrame = function(callback) {
   return setTimeout(callback, 0);
@@ -69,6 +70,9 @@ jest
         };
       }
     }),
+    hasViewManagerConfig: jest.fn(name => {
+      return name === 'AndroidDrawerLayout';
+    }),
     measure: jest.fn(),
     manageChildren: jest.fn(),
     removeSubviewsFromContainerWithID: jest.fn(),
@@ -113,17 +117,21 @@ jest
     mockComponent('../Libraries/Components/View/View', MockNativeMethods),
   )
   .mock('../Libraries/Components/AccessibilityInfo/AccessibilityInfo', () => ({
-    addEventListener: jest.fn(),
-    announceForAccessibility: jest.fn(),
-    fetch: jest.fn(),
-    isBoldTextEnabled: jest.fn(),
-    isGrayscaleEnabled: jest.fn(),
-    isInvertColorsEnabled: jest.fn(),
-    isReduceMotionEnabled: jest.fn(),
-    isReduceTransparencyEnabled: jest.fn(),
-    isScreenReaderEnabled: jest.fn(() => Promise.resolve(false)),
-    removeEventListener: jest.fn(),
-    setAccessibilityFocus: jest.fn(),
+    __esModule: true,
+    default: {
+      addEventListener: jest.fn(),
+      announceForAccessibility: jest.fn(),
+      isBoldTextEnabled: jest.fn(),
+      isGrayscaleEnabled: jest.fn(),
+      isInvertColorsEnabled: jest.fn(),
+      isReduceMotionEnabled: jest.fn(),
+      isReduceTransparencyEnabled: jest.fn(),
+      isScreenReaderEnabled: jest.fn(() => Promise.resolve(false)),
+      removeEventListener: jest.fn(),
+      setAccessibilityFocus: jest.fn(),
+      sendAccessibilityEvent_unstable: jest.fn(),
+      getRecommendedTimeoutMillis: jest.fn(),
+    },
   }))
   .mock('../Libraries/Components/RefreshControl/RefreshControl', () =>
     jest.requireActual(
@@ -156,8 +164,9 @@ jest
     ),
   )
   .mock('../Libraries/AppState/AppState', () => ({
-    addEventListener: jest.fn(),
-    removeEventListener: jest.fn(),
+    addEventListener: jest.fn(() => ({
+      remove: jest.fn(),
+    })),
   }))
   .mock('../Libraries/Linking/Linking', () => ({
     openURL: jest.fn(),
@@ -325,33 +334,20 @@ jest
       }),
     },
   }))
-  .mock('../Libraries/ReactNative/requireNativeComponent', () => {
-    const React = require('react');
-
-    return viewName => {
-      const Component = class extends React.Component {
-        render() {
-          return React.createElement(viewName, this.props, this.props.children);
-        }
-
-        // The methods that exist on host components
-        blur = jest.fn();
-        focus = jest.fn();
-        measure = jest.fn();
-        measureInWindow = jest.fn();
-        measureLayout = jest.fn();
-        setNativeProps = jest.fn();
-      };
-
-      if (viewName === 'RCTView') {
-        Component.displayName = 'View';
-      } else {
-        Component.displayName = viewName;
-      }
-
-      return Component;
+  .mock('../Libraries/NativeComponent/NativeComponentRegistry', () => {
+    return {
+      get: jest.fn((name, viewConfigProvider) => {
+        return jest.requireActual('./mockNativeComponent')(name);
+      }),
+      getWithFallback_DEPRECATED: jest.fn((name, viewConfigProvider) => {
+        return jest.requireActual('./mockNativeComponent')(name);
+      }),
+      setRuntimeConfigProvider: jest.fn(),
     };
   })
+  .mock('../Libraries/ReactNative/requireNativeComponent', () => {
+    return jest.requireActual('./mockNativeComponent');
+  })
   .mock(
     '../Libraries/Utilities/verifyComponentAttributeEquivalence',
     () => function() {},
diff --git a/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj b/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj
index 933b32730bceb2..a55f1c2a6bf1d9 100644
--- a/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj
+++ b/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj
@@ -465,7 +465,7 @@
 				DEAD_CODE_STRIPPING = NO;
 				INFOPLIST_FILE = "HelloWorld-macos/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -485,7 +485,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				INFOPLIST_FILE = "HelloWorld-macos/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/local-cli/generator-macos/templates/macos/Podfile b/local-cli/generator-macos/templates/macos/Podfile
index b0c122413b3fe3..59bdd0268b837e 100644
--- a/local-cli/generator-macos/templates/macos/Podfile
+++ b/local-cli/generator-macos/templates/macos/Podfile
@@ -2,7 +2,7 @@ require_relative '../node_modules/react-native-macos/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 target 'HelloWorld-macOS' do
-  platform :macos, '10.14'
+  platform :macos, '10.15'
   use_native_modules!
   use_react_native!(
     :path => '../node_modules/react-native-macos',
@@ -18,7 +18,7 @@ target 'HelloWorld-macOS' do
 end
 
 target 'HelloWorld-iOS' do
-  platform :ios, '10'
+  platform :ios, '11'
   use_native_modules!
   use_react_native!(:path => '../node_modules/react-native-macos')
 
@@ -27,9 +27,11 @@ target 'HelloWorld-iOS' do
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable these next few lines.
   use_flipper!
+
   post_install do |installer|
     flipper_post_install(installer)
+    react_native_post_install(installer)
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
-
   # Pods specifically for iOS target
 end
diff --git a/metro.config.js b/metro.config.js
index efd4736cf0f086..fb98b42489855c 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -22,8 +22,6 @@ const config = {
   },
   resolver: {
     platforms: ['ios', 'macos', 'android'],
-    // $FlowFixMe[signature-verification-failure] Can't infer RegExp type.
-    blacklistRE: /buck-out/,
     extraNodeModules: {
       'react-native': __dirname,
     },
diff --git a/package.json b/package.json
index 4116abcca8fa1c..210c663dc9bfc7 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "!template/node_modules",
     "!template/package-lock.json",
     "!template/yarn.lock",
+    "android",
     "cli.js",
     "flow",
     "flow-typed",
@@ -38,9 +39,10 @@
     "README.md",
     "rn-get-polyfills.js",
     "scripts/compose-source-maps.js",
+    "scripts/find-node.sh",
     "scripts/fixmacscripts.sh",
-    "scripts/generate-native-modules-specs.sh",
-    "scripts/generate-native-modules-specs-cli.js",
+    "scripts/generate-specs.sh",
+    "scripts/generate-specs-cli.js",
     "scripts/ios-configure-glog.sh",
     "scripts/launchPackager.bat",
     "scripts/launchPackager.command",
@@ -64,13 +66,14 @@
     "flow-check-android": "flow check --flowconfig-name .flowconfig.android",
     "lint": "eslint .",
     "lint-ci": "./scripts/circleci/analyze_code.sh && yarn shellcheck",
+    "lint-java": "node ./scripts/lint-java.js",
     "shellcheck": "./scripts/circleci/analyze_scripts.sh",
     "clang-format": "clang-format -i --glob=*/**/*.{h,cpp,m,mm}",
     "format": "npm run prettier && npm run clang-format",
     "prettier": "prettier --write \"./**/*.{js,md,yml}\"",
     "format-check": "prettier --list-different \"./**/*.{js,md,yml}\"",
     "update-lock": "npx yarn-deduplicate",
-    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:2.1",
+    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:4.0",
     "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
     "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",
@@ -89,43 +92,83 @@
     "repo-config"
   ],
   "peerDependencies": {
-    "react": "17.0.1"
+    "react": "17.0.2"
   },
   "dependencies": {
-    "@jest/create-cache-key-function": "^26.5.0",
-    "@react-native-community/cli": "^4.13.0",
-    "@react-native-community/cli-platform-android": "^4.13.0",
-    "@react-native-community/cli-platform-ios": "^4.13.0",
+    "@jest/create-cache-key-function": "^27.0.1",
+    "@react-native-community/cli": "^6.0.0",
+    "@react-native-community/cli-platform-android": "^6.0.0",
+    "@react-native-community/cli-platform-ios": "^6.0.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
-    "@react-native/polyfills": "1.0.0",
+    "@react-native/polyfills": "2.0.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
     "event-target-shim": "^5.0.1",
-    "hermes-engine": "~0.7.0",
+    "hermes-engine": "~0.9.0",
     "invariant": "^2.2.4",
-    "jsc-android": "^245459.0.0",
-    "metro-babel-register": "0.63.0",
-    "metro-react-native-babel-transformer": "0.63.0",
-    "metro-runtime": "0.63.0",
-    "metro-source-map": "0.63.0",
+    "jsc-android": "^250230.2.1",
+    "metro-babel-register": "0.66.2",
+    "metro-react-native-babel-transformer": "0.66.2",
+    "metro-runtime": "0.66.2",
+    "metro-source-map": "0.66.2",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "prop-types": "^15.7.2",
-    "react-devtools-core": "^4.6.0",
+    "react-devtools-core": "^4.13.0",
+    "react-native-codegen": "^0.0.7",
     "react-refresh": "^0.4.0",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.20.1",
+    "scheduler": "^0.20.2",
     "stacktrace-parser": "^0.1.3",
     "use-subscription": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "flow-bin": "^0.137.0",
-    "react": "17.0.1"
+    "flow-bin": "^0.158.0",
+    "react": "17.0.2",
+    "@babel/core": "^7.14.0",
+    "@babel/generator": "^7.14.0",
+    "@babel/template": "^7.0.0",
+    "@babel/types": "^7.0.0",
+    "@react-native-community/eslint-plugin": "*",
+    "@reactions/component": "^2.0.2",
+    "async": "^2.4.0",
+    "babel-eslint": "^10.1.0",
+    "babel-preset-fbjs": "^3.4.0",
+    "clang-format": "^1.2.4",
+    "connect": "^3.6.5",
+    "coveralls": "^3.0.2",
+    "detox": "16.7.2",
+    "eslint": "7.12.0",
+    "eslint-config-fb-strict": "^24.9.0",
+    "eslint-config-fbjs": "2.1.0",
+    "eslint-config-prettier": "^6.0.0",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-eslint-comments": "^3.1.1",
+    "eslint-plugin-flowtype": "2.50.3",
+    "eslint-plugin-jest": "22.4.1",
+    "eslint-plugin-jsx-a11y": "6.2.1",
+    "eslint-plugin-prettier": "2.6.2",
+    "eslint-plugin-react": "7.21.5",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-react-native": "3.10.0",
+    "eslint-plugin-relay": "1.8.1",
+    "jest": "^26.6.3",
+    "jest-junit": "^10.0.0",
+    "jscodeshift": "^0.11.0",
+    "metro-transform-plugins": "^0.66.0",
+    "mkdirp": "^0.5.1",
+    "prettier": "1.19.1",
+    "react-shallow-renderer": "16.14.1",
+    "react-test-renderer": "17.0.2",
+    "shelljs": "^0.7.8",
+    "signedsource": "^1.0.0",
+    "ws": "^6.1.4",
+    "yargs": "^15.3.1"
   },
   "detox": {
     "test-runner": "jest",
@@ -167,4 +210,4 @@
   "beachball": {
     "shouldPublish": false
   }
-}
+}
\ No newline at end of file
diff --git a/packages/assets/BUCK b/packages/assets/BUCK
index fa6f04f440ac24..424f33a0003ce6 100644
--- a/packages/assets/BUCK
+++ b/packages/assets/BUCK
@@ -11,7 +11,6 @@ rn_library(
     labels = ["supermodule:xplat/default/public.react_native.core"],
     skip_processors = True,
     visibility = ["PUBLIC"],
-    worker = "//xplat/js:experimental-packager",
 )
 
 yarn_workspace(
diff --git a/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap b/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap
index 85c8e4580aa169..54d4e46fd900cd 100644
--- a/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap
+++ b/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap
@@ -22,13 +22,14 @@ interface NativeCommands {
   +scrollTo: (viewRef: React.ElementRef<NativeType>, y: Int32, animated: boolean) => void,
 }
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
 const {
   dispatchCommand
 } = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
 
-const ModuleViewConfig = {
+let nativeComponentName = 'RCTModule';
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'RCTModule',
   bubblingEventTypes: {
     topBubblingEventDefinedInlineNull: {
@@ -48,11 +49,7 @@ const ModuleViewConfig = {
     onDirectEventDefinedInlineNull: true,
     onBubblingEventDefinedInlineNull: true
   }
-};
-let nativeComponentName = 'RCTModule';
-registerGeneratedViewConfig(nativeComponentName, ModuleViewConfig);
-export const __INTERNAL_VIEW_CONFIG = ModuleViewConfig;
-export default nativeComponentName;
+}));
 export const Commands = {
   hotspotUpdate(ref, x, y) {
     dispatchCommand(ref, \\"hotspotUpdate\\", [x, y]);
@@ -87,13 +84,14 @@ interface NativeCommands {
   +scrollTo: (viewRef: React.ElementRef<NativeType>, y: Int32, animated: boolean) => void,
 }
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
 const {
   dispatchCommand
 } = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
 
-const ModuleViewConfig = {
+let nativeComponentName = 'RCTModule';
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'RCTModule',
   bubblingEventTypes: {
     topBubblingEventDefinedInlineNull: {
@@ -113,11 +111,7 @@ const ModuleViewConfig = {
     onDirectEventDefinedInlineNull: true,
     onBubblingEventDefinedInlineNull: true
   }
-};
-let nativeComponentName = 'RCTModule';
-registerGeneratedViewConfig(nativeComponentName, ModuleViewConfig);
-export const __INTERNAL_VIEW_CONFIG = ModuleViewConfig;
-export default nativeComponentName;
+}));
 export const Commands = {
   hotspotUpdate(ref, x, y) {
     dispatchCommand(ref, \\"hotspotUpdate\\", [x, y]);
@@ -139,32 +133,32 @@ export default 'Not a view config';"
 exports[`Babel plugin inline view configs fails on inline config for CommandsExportedWithDifferentNameNativeComponent.js 1`] = `
 "/CommandsExportedWithDifferentNameNativeComponent.js: Native commands must be exported with the name 'Commands'
   17 | }
-  18 | 
+  18 |
 > 19 | export const Foo = codegenNativeCommands<NativeCommands>();
      | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  20 | 
+  20 |
   21 | export default (codegenNativeComponent<ModuleProps>('Module'): NativeType);
-  22 | "
+  22 |"
 `;
 
 exports[`Babel plugin inline view configs fails on inline config for CommandsExportedWithShorthandNativeComponent.js 1`] = `
 "/CommandsExportedWithShorthandNativeComponent.js: 'Commands' is a reserved export and may only be used to export the result of codegenNativeCommands.
   19 | const Commands = 4;
-  20 | 
+  20 |
 > 21 | export {Commands};
      | ^^^^^^^^^^^^^^^^^^
-  22 | 
+  22 |
   23 | export default (codegenNativeComponent<ModuleProps>('Module'): NativeType);
-  24 | "
+  24 |"
 `;
 
 exports[`Babel plugin inline view configs fails on inline config for OtherCommandsExportNativeComponent.js 1`] = `
 "/OtherCommandsExportNativeComponent.js: 'Commands' is a reserved export and may only be used to export the result of codegenNativeCommands.
   17 | }
-  18 | 
+  18 |
 > 19 | export const Commands = 4;
      | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-  20 | 
+  20 |
   21 | export default (codegenNativeComponent<ModuleProps>('Module'): NativeType);
-  22 | "
+  22 |"
 `;
diff --git a/packages/babel-plugin-codegen/__tests__/index-test.js b/packages/babel-plugin-codegen/__tests__/index-test.js
index a62d5eb0dfa6dd..06b9ad76dfe469 100644
--- a/packages/babel-plugin-codegen/__tests__/index-test.js
+++ b/packages/babel-plugin-codegen/__tests__/index-test.js
@@ -17,6 +17,7 @@ const failures = require('../__test_fixtures__/failures.js');
 const transform = (fixture, filename) =>
   babelTransform(fixture, {
     babelrc: false,
+    browserslistConfigFile: false,
     cwd: '/',
     filename: filename,
     highlightCode: false,
diff --git a/packages/babel-plugin-codegen/index.js b/packages/babel-plugin-codegen/index.js
index 1a80f9c60b4580..235eb66796944d 100644
--- a/packages/babel-plugin-codegen/index.js
+++ b/packages/babel-plugin-codegen/index.js
@@ -53,7 +53,7 @@ function isCodegenDeclaration(declaration) {
   return false;
 }
 
-module.exports = function(context) {
+module.exports = function({parse, types: t}) {
   return {
     pre(state) {
       this.code = state.code;
@@ -118,12 +118,17 @@ module.exports = function(context) {
           this.defaultExport = path;
         }
       },
+
       Program: {
-        exit() {
+        exit(path) {
           if (this.defaultExport) {
             const viewConfig = generateViewConfig(this.filename, this.code);
             this.defaultExport.replaceWithMultiple(
-              context.parse(viewConfig).program.body,
+              parse(viewConfig, {
+                babelrc: false,
+                browserslistConfigFile: false,
+                configFile: false,
+              }).program.body,
             );
             if (this.commandsExport != null) {
               this.commandsExport.remove();
diff --git a/packages/babel-plugin-codegen/package.json b/packages/babel-plugin-codegen/package.json
index b2dc0f85bd63ee..30552e1493b9c5 100644
--- a/packages/babel-plugin-codegen/package.json
+++ b/packages/babel-plugin-codegen/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.5",
+  "version": "0.0.6",
   "name": "@react-native/babel-plugin-codegen",
   "description": "Babel plugin to generate native module and view manager code for React Native.",
   "repository": {
@@ -11,7 +11,7 @@
     "react-native-codegen": "*"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.14.0"
   },
   "license": "MIT",
   "beachball": {
diff --git a/packages/eslint-config-react-native-community/index.js b/packages/eslint-config-react-native-community/index.js
index 3302717db60fcb..320ef4daf2b16c 100644
--- a/packages/eslint-config-react-native-community/index.js
+++ b/packages/eslint-config-react-native-community/index.js
@@ -72,6 +72,7 @@ module.exports = {
       },
       rules: {
         'react-native/no-inline-styles': 0,
+        quotes: [1, 'single', {avoidEscape: true, allowTemplateLiterals: true}],
       },
     },
   ],
@@ -81,6 +82,7 @@ module.exports = {
     __DEV__: true,
     __dirname: false,
     __fbBatchedBridgeConfig: false,
+    AbortController: false,
     alert: false,
     cancelAnimationFrame: false,
     cancelIdleCallback: false,
@@ -95,6 +97,7 @@ module.exports = {
     EventTarget: false,
     exports: false,
     fetch: false,
+    FileReader: false,
     FormData: false,
     global: false,
     Headers: false,
@@ -285,7 +288,7 @@ module.exports = {
 
     'react/display-name': 0,
     'react/jsx-boolean-value': 0,
-    'react/jsx-no-comment-textnodes': 1,
+    'react/jsx-no-comment-textnodes': 2,
     'react/jsx-no-duplicate-props': 2,
     'react/jsx-no-undef': 2,
     'react/jsx-sort-props': 0,
diff --git a/packages/eslint-config-react-native-community/package.json b/packages/eslint-config-react-native-community/package.json
index 860112def9cb14..ef00ef62dff922 100644
--- a/packages/eslint-config-react-native-community/package.json
+++ b/packages/eslint-config-react-native-community/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/eslint-config",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "ESLint config for React Native",
   "main": "index.js",
   "license": "MIT",
@@ -9,11 +9,11 @@
     "url": "git@github.com:facebook/react-native.git",
     "directory": "packages/eslint-config-react-native-community"
   },
-  "homepage": "https://github.com/facebook/react-native/tree/master/packages/eslint-config-react-native-community#readme",
+  "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/eslint-config-react-native-community#readme",
   "dependencies": {
     "@react-native-community/eslint-plugin": "^1.1.0",
-    "@typescript-eslint/eslint-plugin": "^3.1.0",
-    "@typescript-eslint/parser": "^3.1.0",
+    "@typescript-eslint/eslint-plugin": "^4.22.1",
+    "@typescript-eslint/parser": "^4.22.1",
     "babel-eslint": "^10.1.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-eslint-comments": "^3.1.2",
@@ -22,16 +22,13 @@
     "eslint-plugin-prettier": "3.1.2",
     "eslint-plugin-react": "^7.20.0",
     "eslint-plugin-react-hooks": "^4.0.7",
-    "eslint-plugin-react-native": "^3.8.1",
+    "eslint-plugin-react-native": "^3.10.0",
     "prettier": "^2.0.2"
   },
   "peerDependencies": {
-    "eslint": ">=6"
+    "eslint": ">=7"
   },
   "devDependencies": {
-    "eslint": "^6.5.1"
-  },
-  "beachball": {
-    "shouldPublish": false
+    "eslint": "7.12.0"
   }
 }
diff --git a/packages/eslint-config-react-native-community/yarn.lock b/packages/eslint-config-react-native-community/yarn.lock
index b4d6255c4cd3f0..2029c4ca41a92a 100644
--- a/packages/eslint-config-react-native-community/yarn.lock
+++ b/packages/eslint-config-react-native-community/yarn.lock
@@ -2,80 +2,63 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
-  dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
-    "@babel/highlight" "^7.8.3"
+    "@babel/highlight" "^7.10.4"
 
-"@babel/generator@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce"
-  integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==
+"@babel/generator@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460"
+  integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==
   dependencies:
-    "@babel/types" "^7.9.0"
+    "@babel/types" "^7.12.10"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.10"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+"@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.11.0"
 
-"@babel/helper-validator-identifier@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
-  integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
   dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
     chalk "^2.0.0"
-    esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
-  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
+"@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
+  integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
 
 "@babel/runtime-corejs3@^7.8.3":
   version "7.9.2"
@@ -85,39 +68,76 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
-"@babel/traverse@^7.7.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
-  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.0"
+"@babel/template@^7.10.4":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
+
+"@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"
+  integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.12.10"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.12.10"
+    "@babel/types" "^7.12.10"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
-"@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
-  integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==
+"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.10", "@babel/types@^7.12.7", "@babel/types@^7.7.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
+  integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@eslint/eslintrc@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
+  integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    lodash "^4.17.19"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.4"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.4"
+    fastq "^1.6.0"
+
 "@react-native-community/eslint-plugin@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.1.0.tgz#e42b1bef12d2415411519fd528e64b593b1363dc"
@@ -128,96 +148,105 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
-"@types/eslint-visitor-keys@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
-  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
-
 "@types/json-schema@^7.0.3":
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
-"@typescript-eslint/eslint-plugin@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.1.0.tgz#4ac00ecca3bbea740c577f1843bc54fa69c3def2"
-  integrity sha512-D52KwdgkjYc+fmTZKW7CZpH5ZBJREJKZXRrveMiRCmlzZ+Rw9wRVJ1JAmHQ9b/+Ehy1ZeaylofDB9wwXUt83wg==
+"@typescript-eslint/eslint-plugin@^4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543"
+  integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "3.1.0"
+    "@typescript-eslint/experimental-utils" "4.22.1"
+    "@typescript-eslint/scope-manager" "4.22.1"
+    debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
+    lodash "^4.17.15"
     regexpp "^3.0.0"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.1.0.tgz#2d5dba7c2ac2a3da3bfa3f461ff64de38587a872"
-  integrity sha512-Zf8JVC2K1svqPIk1CB/ehCiWPaERJBBokbMfNTNRczCbQSlQXaXtO/7OfYz9wZaecNvdSvVADt6/XQuIxhC79w==
+"@typescript-eslint/experimental-utils@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497"
+  integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "3.1.0"
+    "@typescript-eslint/scope-manager" "4.22.1"
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/typescript-estree" "4.22.1"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/parser@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.1.0.tgz#9c02ba5d88ad2355672f39e6cd4176f172dd47f8"
-  integrity sha512-NcDSJK8qTA2tPfyGiPes9HtVKLbksmuYjlgGAUs7Ld2K0swdWibnCq9IJx9kJN8JJdgUJSorFiGaPHBgH81F/Q==
+"@typescript-eslint/parser@^4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc"
+  integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw==
   dependencies:
-    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "3.1.0"
-    "@typescript-eslint/typescript-estree" "3.1.0"
-    eslint-visitor-keys "^1.1.0"
+    "@typescript-eslint/scope-manager" "4.22.1"
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/typescript-estree" "4.22.1"
+    debug "^4.1.1"
 
-"@typescript-eslint/typescript-estree@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.1.0.tgz#eaff52d31e615e05b894f8b9d2c3d8af152a5dd2"
-  integrity sha512-+4nfYauqeQvK55PgFrmBWFVYb6IskLyOosYEmhH3mSVhfBp9AIJnjExdgDmKWoOBHRcPM8Ihfm2BFpZf0euUZQ==
+"@typescript-eslint/scope-manager@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
+  integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g==
   dependencies:
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/visitor-keys" "4.22.1"
+
+"@typescript-eslint/types@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
+  integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
+
+"@typescript-eslint/typescript-estree@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
+  integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A==
+  dependencies:
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/visitor-keys" "4.22.1"
     debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
-    glob "^7.1.6"
+    globby "^11.0.1"
     is-glob "^4.0.1"
-    lodash "^4.17.15"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
+"@typescript-eslint/visitor-keys@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
+  integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ==
+  dependencies:
+    "@typescript-eslint/types" "4.22.1"
+    eslint-visitor-keys "^2.0.0"
+
 acorn-jsx@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
   integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
-acorn@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
-  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-ajv@^6.10.0:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.9.1:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.9.1:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
-  dependencies:
-    type-fest "^0.11.0"
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-regex@^4.1.0:
   version "4.1.0"
@@ -251,15 +280,7 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
-
-array-includes@^3.1.1:
+array-includes@^3.0.3, array-includes@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
   integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
@@ -268,6 +289,11 @@ array-includes@^3.1.1:
     es-abstract "^1.17.0"
     is-string "^1.0.5"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -298,12 +324,19 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 callsites@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
   integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
 
-chalk@^2.0.0, chalk@^2.1.0:
+chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -312,31 +345,14 @@ chalk@^2.0.0, chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+chalk@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -371,16 +387,14 @@ core-js-pure@^3.0.0:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
   integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
 
-cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
 debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
@@ -389,7 +403,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -401,6 +415,13 @@ define-properties@^1.1.2, define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -420,10 +441,12 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
 
 es-abstract@^1.17.0, es-abstract@^1.17.0-next.1:
   version "1.17.5"
@@ -442,27 +465,6 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.1:
     string.prototype.trimleft "^2.1.1"
     string.prototype.trimright "^2.1.1"
 
-es-abstract@^1.7.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
-  dependencies:
-    es-to-primitive "^1.2.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
-
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -521,11 +523,12 @@ eslint-plugin-react-native-globals@^0.1.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"
   integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==
 
-eslint-plugin-react-native@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz#92811e37191ecb0d29c0f0a0c9e5c943ee573821"
-  integrity sha512-6Z4s4nvgFRdda/1s1+uu4a6EMZwEjjJ9Bk/1yBImv0fd9U2CsGu2cUakAtV83cZKhizbWhSouXoaK4JtlScdFg==
+eslint-plugin-react-native@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.10.0.tgz#240f7e6979a908af3dfd9ba9652434c33f4d64cd"
+  integrity sha512-4f5+hHYYq5wFhB5eptkPEAR7FfvqbS7AzScUOANfAMZtYw5qgnCxRq45bpfBaQF+iyPMim5Q8pubcpvLv75NAg==
   dependencies:
+    "@babel/traverse" "^7.7.4"
     eslint-plugin-react-native-globals "^0.1.1"
 
 eslint-plugin-react@^7.20.0:
@@ -545,54 +548,49 @@ eslint-plugin-react@^7.20.0:
     string.prototype.matchall "^4.0.2"
     xregexp "^4.3.0"
 
-eslint-scope@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
-  integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
+eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^6.5.1:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+eslint@7.12.0:
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.0.tgz#7b6a85f87a9adc239e979bb721cde5ce0dc27da6"
+  integrity sha512-n5pEU27DRxCSlOhJ2rO57GDLcNsxO0LPpAbpFdh7xmcDmjmlGUfoyrsB3I7yYdQXO5N3gkSTiDrPSPNFiiirXA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
+    "@eslint/eslintrc" "^0.2.0"
     ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
+    enquirer "^2.3.5"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.0"
+    esquery "^1.2.0"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
@@ -601,77 +599,66 @@ eslint@^6.5.1:
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
     is-glob "^4.0.0"
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
+    levn "^0.4.1"
+    lodash "^4.17.19"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.3"
+    optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
     table "^5.2.3"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+espree@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
+  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
   dependencies:
-    acorn "^7.1.1"
+    acorn "^7.4.0"
     acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
+    eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+esquery@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
   integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
-external-editor@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
 fast-deep-equal@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@@ -682,22 +669,34 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
+fast-glob@^3.1.1:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+fastq@^1.6.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
   dependencies:
-    escape-string-regexp "^1.0.5"
+    reusify "^1.0.4"
 
 file-entry-cache@^5.0.1:
   version "5.0.1"
@@ -706,6 +705,13 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -747,19 +753,14 @@ glob-parent@^5.0.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob-parent@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+    is-glob "^4.0.1"
 
-glob@^7.1.6:
+glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -783,6 +784,18 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
+globby@^11.0.1:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -793,30 +806,18 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has-symbols@^1.0.1:
+has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has@^1.0.1, has@^1.0.3:
+has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
-iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -827,10 +828,15 @@ ignore@^5.0.5:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.5.tgz#c663c548d6ce186fb33616a8ccb5d46e56bdbbf9"
   integrity sha512-kOC8IUb8HSDMVcYrDVezCxpJkzSQWTAzf3olpKM6o9rM5zpojx23O0Fl8Wr4+qJ6ZbPEHqf1fdwev/DS7v7pmA==
 
-import-fresh@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
-  integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
+ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -853,25 +859,6 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-inquirer@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
-  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^3.0.0"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.5.3"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
 internal-slot@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
@@ -881,12 +868,7 @@ internal-slot@^1.0.2:
     has "^1.0.3"
     side-channel "^1.0.2"
 
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-
-is-callable@^1.1.5:
+is-callable@^1.1.4, is-callable@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
@@ -906,11 +888,6 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
 is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -918,17 +895,10 @@ is-glob@^4.0.0, is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
-  dependencies:
-    has "^1.0.1"
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-regex@^1.0.5:
   version "1.0.5"
@@ -990,23 +960,18 @@ jsx-ast-utils@^2.2.3:
     array-includes "^3.0.3"
     object.assign "^4.1.0"
 
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-lodash@^4.17.10, lodash@^4.17.11:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
 
-lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
 loose-envify@^1.4.0:
   version "1.4.0"
@@ -1015,10 +980,18 @@ loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.2:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
 
 minimatch@^3.0.4:
   version "3.0.4"
@@ -1044,21 +1017,11 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
 object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -1069,16 +1032,11 @@ object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
-object-keys@^1.0.11, object-keys@^1.1.1:
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-keys@^1.0.12:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
-
 object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
@@ -1126,29 +1084,17 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-optionator@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
   dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
 
 parent-module@^1.0.0:
   version "1.0.0"
@@ -1162,20 +1108,30 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
@@ -1208,6 +1164,11 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 react-is@^16.8.1:
   version "16.8.4"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
@@ -1226,42 +1187,27 @@ regexp.prototype.flags@^1.3.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-regexpp@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
-  integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
+regexpp@^3.0.0, regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
-  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.15.1:
+resolve@^1.12.0, resolve@^1.15.1:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
   integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rimraf@2.6.3:
   version "2.6.3"
@@ -1270,51 +1216,29 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-run-async@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
-  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
-  dependencies:
-    is-promise "^2.1.0"
-
-rxjs@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
-    tslib "^1.9.0"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver@^5.5.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
-semver@^6.1.2:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+    queue-microtask "^1.2.2"
 
-semver@^7.3.2:
+semver@^7.2.1, semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
-    shebang-regex "^1.0.0"
+    shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 side-channel@^1.0.2:
   version "1.0.2"
@@ -1324,10 +1248,10 @@ side-channel@^1.0.2:
     es-abstract "^1.17.0-next.1"
     object-inspect "^1.7.0"
 
-signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@^2.1.0:
   version "2.1.0"
@@ -1357,15 +1281,6 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
 string.prototype.matchall@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
@@ -1401,13 +1316,6 @@ strip-ansi@^5.1.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
 strip-ansi@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@ -1415,10 +1323,10 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-json-comments@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -1449,24 +1357,19 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
-tslib@^1.8.1, tslib@^1.9.0:
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
@@ -1478,17 +1381,12 @@ tsutils@^3.17.1:
   dependencies:
     tslib "^1.8.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
-    prelude-ls "~1.1.2"
-
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+    prelude-ls "^1.2.1"
 
 type-fest@^0.8.1:
   version "0.8.1"
@@ -1507,14 +1405,14 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@~1.2.3:
+word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
diff --git a/packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js b/packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js
index 5e9913a365ca28..7591ffb86a8d82 100644
--- a/packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js
+++ b/packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js
@@ -18,117 +18,35 @@ const NATIVE_MODULES_DIR = __dirname;
 
 const eslintTester = new ESLintTester();
 
-const VALID_SPECS = [];
-
-const INVALID_SPECS = [
-  // Untyped NativeModule require
+const VALID_SPECS = [
   {
     code: `
 import {TurboModuleRegistry, type TurboModule} from 'react-native';
-export interface Spec extends TurboModule {
-  func1(a: string): {||},
-}
-export default TurboModuleRegistry.get<Spec>('XYZ');
-      `,
-    filename: `${NATIVE_MODULES_DIR}/XYZ.js`,
-    errors: [
-      {
-        message: rule.errors.misnamedHasteModule('XYZ'),
-      },
-    ],
-  },
+import type {UnsafeObject} from 'react-native/Libraries/Types/CodegenTypes';
 
-  // Untyped NativeModule require
-  {
-    code: `
-import {TurboModuleRegistry, type TurboModule} from 'react-native';
 export interface Spec extends TurboModule {
-  func1(a: string): {||},
+  func1(a: string): UnsafeObject,
 }
-export default TurboModuleRegistry.get('XYZ');
-      `,
-    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
-    errors: [
-      {
-        message: rule.errors.untypedModuleRequire('NativeXYZ', 'get'),
-      },
-    ],
-  },
-
-  // Incorrectly typed NativeModule require: 0 types
-  {
-    code: `
-import {TurboModuleRegistry, type TurboModule} from 'react-native';
-export interface Spec extends TurboModule {
-  func1(a: string): {||},
-}
-export default TurboModuleRegistry.get<>('XYZ');
-      `,
-    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
-    errors: [
-      {
-        message: rule.errors.incorrectlyTypedModuleRequire('NativeXYZ', 'get'),
-      },
-    ],
-  },
-
-  // Incorrectly typed NativeModule require: > 1 type
-  {
-    code: `
-import {TurboModuleRegistry, type TurboModule} from 'react-native';
-export interface Spec extends TurboModule {
-  func1(a: string): {||},
-}
-export default TurboModuleRegistry.get<Spec, 'test'>('XYZ');
-      `,
-    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
-    errors: [
-      {
-        message: rule.errors.incorrectlyTypedModuleRequire('NativeXYZ', 'get'),
-      },
-    ],
-  },
-
-  // More than one TurboModuleRegistry call
-  {
-    code: `
-import {TurboModuleRegistry, type TurboModule} from 'react-native';
-export interface Spec extends TurboModule {
-  func1(a: string): {||},
-}
-const NativeModule1 = TurboModuleRegistry.get<Spec>('XYZ1');
-const NativeModule2 = TurboModuleRegistry.get<Spec>('XYZ2');
-export default NativeModule1 || NativeModule2;
-      `,
+export default TurboModuleRegistry.get<Spec>('XYZ');
+    `,
     filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
-    errors: [
-      {
-        message: rule.errors.multipleModuleRequires('NativeXYZ', 2),
-      },
-      {
-        message: rule.errors.multipleModuleRequires('NativeXYZ', 2),
-      },
-    ],
   },
+];
 
-  // Called TurboModuleRegistry.getEnforcing with a variable
+const INVALID_SPECS = [
+  // Untyped NativeModule require
   {
     code: `
 import {TurboModuleRegistry, type TurboModule} from 'react-native';
 export interface Spec extends TurboModule {
   func1(a: string): {||},
 }
-const moduleName = 'foo';
-export default TurboModuleRegistry.get<Spec>(moduleName);
+export default TurboModuleRegistry.get<Spec>('XYZ');
       `,
-    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    filename: `${NATIVE_MODULES_DIR}/XYZ.js`,
     errors: [
       {
-        message: rule.errors.calledModuleRequireWithWrongType(
-          'NativeXYZ',
-          'get',
-          'Identifier',
-        ),
+        message: rule.errors.misnamedHasteModule('XYZ'),
       },
     ],
   },
diff --git a/packages/eslint-plugin-codegen/package.json b/packages/eslint-plugin-codegen/package.json
index bb0c49d193183f..f82575f74cb036 100644
--- a/packages/eslint-plugin-codegen/package.json
+++ b/packages/eslint-plugin-codegen/package.json
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-plugin-codegen"
   },
   "dependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.14.0",
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
     "flow-parser": "^0.121.0",
     "make-dir": "^2.1.0",
diff --git a/packages/eslint-plugin-codegen/react-native-modules.js b/packages/eslint-plugin-codegen/react-native-modules.js
index 1f294224932fa0..476624d024b705 100644
--- a/packages/eslint-plugin-codegen/react-native-modules.js
+++ b/packages/eslint-plugin-codegen/react-native-modules.js
@@ -17,26 +17,6 @@ const ERRORS = {
   misnamedHasteModule(hasteModuleName) {
     return `Module ${hasteModuleName}: All files using TurboModuleRegistry must start with Native.`;
   },
-  untypedModuleRequire(hasteModuleName, requireMethodName) {
-    return `Module ${hasteModuleName}: Please type parameterize the Module require: TurboModuleRegistry.${requireMethodName}<Spec>().`;
-  },
-  incorrectlyTypedModuleRequire(hasteModuleName, requireMethodName) {
-    return `Module ${hasteModuleName}: Type parameter of Module require must be 'Spec': TurboModuleRegistry.${requireMethodName}<Spec>().`;
-  },
-  multipleModuleRequires(hasteModuleName, numCalls) {
-    return `Module ${hasteModuleName}: Module spec must contain exactly one call into TurboModuleRegistry, detected ${numCalls}.`;
-  },
-  calledModuleRequireWithWrongType(hasteModuleName, requireMethodName, type) {
-    const a = /[aeiouy]/.test(type.toLowerCase()) ? 'an' : 'a';
-    return `Module ${hasteModuleName}: TurboModuleRegistry.${requireMethodName}<Spec>() must be called with a string literal, detected ${a} '${type}'.`;
-  },
-  calledModuleRequireWithWrongLiteral(
-    hasteModuleName,
-    requireMethodName,
-    literal,
-  ) {
-    return `Module ${hasteModuleName}: TurboModuleRegistry.${requireMethodName}<Spec>() must be called with a string literal, detected ${literal}`;
-  },
 };
 
 let RNModuleParser;
@@ -116,23 +96,11 @@ function rule(context) {
     return {};
   }
 
-  let moduleRequires = [];
+  let isModule = false;
+
   return {
     'Program:exit': function(node) {
-      if (moduleRequires.length === 0) {
-        return;
-      }
-
-      if (moduleRequires.length > 1) {
-        moduleRequires.forEach(callExpressionNode => {
-          context.report({
-            node: callExpressionNode,
-            message: ERRORS.multipleModuleRequires(
-              hasteModuleName,
-              moduleRequires.length,
-            ),
-          });
-        });
+      if (!isModule) {
         return;
       }
 
@@ -150,15 +118,21 @@ function rule(context) {
       } = requireModuleParser();
       const flowParser = require('flow-parser');
 
-      const [parsingErrors, guard] = createParserErrorCapturer();
+      const [parsingErrors, tryParse] = createParserErrorCapturer();
 
       const sourceCode = context.getSourceCode().getText();
       const ast = flowParser.parse(sourceCode);
-      guard(() => buildModuleSchema(hasteModuleName, [], ast, guard));
+
+      tryParse(() => {
+        buildModuleSchema(hasteModuleName, ast, tryParse);
+      });
+
       parsingErrors.forEach(error => {
-        context.report({
-          loc: error.node.loc,
-          message: error.message,
+        error.nodes.forEach(flowNode => {
+          context.report({
+            loc: flowNode.loc,
+            message: error.message,
+          });
         });
       });
     },
@@ -167,82 +141,14 @@ function rule(context) {
         return;
       }
 
-      moduleRequires.push(node);
-
-      /**
-       * Validate that NativeModule requires are typed
-       */
-
-      const {typeArguments} = node;
-
-      if (typeArguments == null) {
-        const methodName = node.callee.property.name;
-        context.report({
-          node,
-          message: ERRORS.untypedModuleRequire(hasteModuleName, methodName),
-        });
-        return;
-      }
-
-      if (typeArguments.type !== 'TypeParameterInstantiation') {
-        return;
-      }
-
-      const [param] = typeArguments.params;
-
-      /**
-       * Validate that NativeModule requires are correctly typed
-       */
-
-      if (
-        typeArguments.params.length !== 1 ||
-        param.type !== 'GenericTypeAnnotation' ||
-        param.id.name !== 'Spec'
-      ) {
-        const methodName = node.callee.property.name;
-        context.report({
-          node,
-          message: ERRORS.incorrectlyTypedModuleRequire(
-            hasteModuleName,
-            methodName,
-          ),
-        });
+      isModule = true;
+    },
+    InterfaceExtends(node) {
+      if (node.id.name !== 'TurboModule') {
         return;
       }
 
-      /**
-       * Validate the TurboModuleRegistry.get<Spec>(...) argument
-       */
-
-      if (node.arguments.length === 1) {
-        const methodName = node.callee.property.name;
-
-        if (node.arguments[0].type !== 'Literal') {
-          context.report({
-            node: node.arguments[0],
-            message: ERRORS.calledModuleRequireWithWrongType(
-              hasteModuleName,
-              methodName,
-              node.arguments[0].type,
-            ),
-          });
-          return;
-        }
-
-        if (typeof node.arguments[0].value !== 'string') {
-          context.report({
-            node: node.arguments[0],
-            message: ERRORS.calledModuleRequireWithWrongLiteral(
-              hasteModuleName,
-              methodName,
-              node.arguments[0].value,
-            ),
-          });
-          return;
-        }
-      }
-
-      return true;
+      isModule = true;
     },
   };
 }
diff --git a/packages/eslint-plugin-react-native-community/README.md b/packages/eslint-plugin-react-native-community/README.md
index d911b282f5f020..0ae562692f5dd1 100644
--- a/packages/eslint-plugin-react-native-community/README.md
+++ b/packages/eslint-plugin-react-native-community/README.md
@@ -1,6 +1,6 @@
 # eslint-plugin-react-native-community
 
-This plugin is intended to be used in [`@react-native-community/eslint-config`](https://github.com/facebook/react-native/tree/master/packages/eslint-config-react-native-community). You probably want to install that package instead.
+This plugin is intended to be used in [`@react-native-community/eslint-config`](https://github.com/facebook/react-native/tree/HEAD/packages/eslint-config-react-native-community). You probably want to install that package instead.
 
 ## Installation
 
diff --git a/packages/eslint-plugin-react-native-community/platform-colors.js b/packages/eslint-plugin-react-native-community/platform-colors.js
index d2d720527e64a6..12e8f908f90a5d 100644
--- a/packages/eslint-plugin-react-native-community/platform-colors.js
+++ b/packages/eslint-plugin-react-native-community/platform-colors.js
@@ -60,7 +60,6 @@ module.exports = {
           const properties = args[0].properties;
           if (
             !(
-              properties.length === 2 &&
               properties[0].type === 'Property' &&
               properties[0].key.name === 'light' &&
               properties[1].type === 'Property' &&
diff --git a/packages/normalize-color/BUCK b/packages/normalize-color/BUCK
index 50fab1d885b8ab..e99164634de048 100644
--- a/packages/normalize-color/BUCK
+++ b/packages/normalize-color/BUCK
@@ -11,7 +11,6 @@ rn_library(
     labels = ["supermodule:xplat/default/public.react_native.core"],
     skip_processors = True,
     visibility = ["PUBLIC"],
-    worker = "//xplat/js:experimental-packager",
 )
 
 yarn_workspace(
diff --git a/packages/normalize-color/base.js b/packages/normalize-color/base.js
index 295fd2c7c33b53..b8e88e942065d0 100644
--- a/packages/normalize-color/base.js
+++ b/packages/normalize-color/base.js
@@ -40,7 +40,9 @@ function normalizeColorBase(color: ?string | number): null | number {
     return (
       // b
       ((parse255(match[1]) << 24) | // r
+      // $FlowFixMe[incompatible-use]
       (parse255(match[2]) << 16) | // g
+        // $FlowFixMe[incompatible-use]
         (parse255(match[3]) << 8) |
         0x000000ff) >>> // a
       0
@@ -51,8 +53,11 @@ function normalizeColorBase(color: ?string | number): null | number {
     return (
       // b
       ((parse255(match[1]) << 24) | // r
+      // $FlowFixMe[incompatible-use]
       (parse255(match[2]) << 16) | // g
+        // $FlowFixMe[incompatible-use]
         (parse255(match[3]) << 8) |
+        // $FlowFixMe[incompatible-use]
         parse1(match[4])) >>> // a
       0
     );
@@ -98,7 +103,9 @@ function normalizeColorBase(color: ?string | number): null | number {
     return (
       (hslToRgb(
         parse360(match[1]), // h
+        // $FlowFixMe[incompatible-use]
         parsePercentage(match[2]), // s
+        // $FlowFixMe[incompatible-use]
         parsePercentage(match[3]), // l
       ) |
         0x000000ff) >>> // a
@@ -110,9 +117,12 @@ function normalizeColorBase(color: ?string | number): null | number {
     return (
       (hslToRgb(
         parse360(match[1]), // h
+        // $FlowFixMe[incompatible-use]
         parsePercentage(match[2]), // s
+        // $FlowFixMe[incompatible-use]
         parsePercentage(match[3]), // l
       ) |
+        // $FlowFixMe[incompatible-use]
         parse1(match[4])) >>> // a
       0
     );
diff --git a/packages/polyfills/BUCK b/packages/polyfills/BUCK
index 2d48cbf752c053..a19feef73d5986 100644
--- a/packages/polyfills/BUCK
+++ b/packages/polyfills/BUCK
@@ -1,4 +1,5 @@
 load("@fbsource//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace")
+load("@fbsource//xplat/js:JS_DEFS.bzl", "relative_path_to_js_root", "rn_library")
 
 yarn_workspace(
     name = "yarn-workspace",
@@ -18,3 +19,14 @@ yarn_workspace(
     ),
     visibility = ["PUBLIC"],
 )
+
+rn_library(
+    name = "polyfills",
+    base_path = relative_path_to_js_root() + "node_modules/@react-native/polyfills/",
+    is_polyfill = True,
+    labels = ["supermodule:xplat/default/public.react_native.core"],
+    node_modules_check_enabled = False,
+    skip_processors = True,  #  Don't anticipate routes or fbicon here
+    visibility = ["PUBLIC"],
+    deps = [],
+)
diff --git a/packages/polyfills/Object.es7.js b/packages/polyfills/Object.es8.js
similarity index 100%
rename from packages/polyfills/Object.es7.js
rename to packages/polyfills/Object.es8.js
diff --git a/packages/polyfills/__tests__/Object.es7-test.js b/packages/polyfills/__tests__/Object.es8-test.js
similarity index 98%
rename from packages/polyfills/__tests__/Object.es7-test.js
rename to packages/polyfills/__tests__/Object.es8-test.js
index c51c32c7f9ae76..b52771226eb16e 100644
--- a/packages/polyfills/__tests__/Object.es7-test.js
+++ b/packages/polyfills/__tests__/Object.es8-test.js
@@ -10,12 +10,12 @@
 
 'use strict';
 
-describe('Object (ES7)', () => {
+describe('Object (ES8)', () => {
   beforeEach(() => {
     delete Object.entries;
     delete Object.values;
     jest.resetModules();
-    require('../Object.es7');
+    require('../Object.es8');
   });
 
   describe('Object.entries', () => {
diff --git a/packages/polyfills/error-guard.js b/packages/polyfills/error-guard.js
index 5b968d18a35e4b..d642961ba34f25 100644
--- a/packages/polyfills/error-guard.js
+++ b/packages/polyfills/error-guard.js
@@ -59,7 +59,10 @@ const ErrorUtils = {
   ): ?TOut {
     try {
       _inGuard++;
-      // $FlowFixMe: TODO T48204745 (1) apply(context, null) is fine. (2) array -> rest array should work
+      /* $FlowFixMe[incompatible-call] : TODO T48204745 (1) apply(context,
+       * null) is fine. (2) array -> rest array should work */
+      /* $FlowFixMe[incompatible-type] : TODO T48204745 (1) apply(context,
+       * null) is fine. (2) array -> rest array should work */
       return fun.apply(context, args);
     } catch (e) {
       ErrorUtils.reportError(e);
@@ -74,7 +77,10 @@ const ErrorUtils = {
     args?: ?TArgs,
   ): ?TOut {
     if (ErrorUtils.inGuard()) {
-      // $FlowFixMe: TODO T48204745 (1) apply(context, null) is fine. (2) array -> rest array should work
+      /* $FlowFixMe[incompatible-call] : TODO T48204745 (1) apply(context,
+       * null) is fine. (2) array -> rest array should work */
+      /* $FlowFixMe[incompatible-type] : TODO T48204745 (1) apply(context,
+       * null) is fine. (2) array -> rest array should work */
       return fun.apply(context, args);
     } else {
       ErrorUtils.applyWithGuard(fun, context, args);
diff --git a/packages/polyfills/index.js b/packages/polyfills/index.js
index b4dd4b63c6754c..4b515f6a755cb1 100644
--- a/packages/polyfills/index.js
+++ b/packages/polyfills/index.js
@@ -12,5 +12,5 @@
 module.exports = () => [
   require.resolve('./console.js'),
   require.resolve('./error-guard.js'),
-  require.resolve('./Object.es7.js'),
+  require.resolve('./Object.es8.js'),
 ];
diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json
index 6f00c64c7fca72..58a2b3a70494eb 100644
--- a/packages/polyfills/package.json
+++ b/packages/polyfills/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native/polyfills",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Polyfills for React Native.",
   "repository": {
     "type": "git",
diff --git a/packages/react-native-codegen/BUCK b/packages/react-native-codegen/BUCK
index 0dccaccecc50f9..c0c516ad621c6b 100644
--- a/packages/react-native-codegen/BUCK
+++ b/packages/react-native-codegen/BUCK
@@ -9,22 +9,6 @@ SETUP_ENV_DEPS = [] if IS_OSS_BUILD else [
     "//xplat/js:setup_env",
 ]
 
-fb_native.sh_binary(
-    name = "codegen_rn_modules_tests",
-    main = "src/cli/verify_with_old_codegen.sh",
-    visibility = ["PUBLIC"],
-    resources = [
-        "src/cli/verify_with_old_codegen.js",
-        "src/cli/verify_with_old_codegen.sh",
-    ] + SETUP_ENV_DEPS,
-)
-
-fb_native.sh_test(
-    name = "verify_all_modules_with_old_codegen",
-    test = "src/cli/verify_all_modules_with_old_codegen.sh",
-    visibility = ["PUBLIC"],
-)
-
 fb_native.genrule(
     name = "codegen_tests_schema",
     srcs = glob(
@@ -43,17 +27,18 @@ rn_codegen_components(
 )
 
 rn_codegen_modules(
-    name = "codegen_tests",
-    native_module_spec_name = "FBReactNativeTestSpec",
+    name = "FBReactNativeTestSpec",
+    android_package_name = "com.facebook.fbreact.specs",
+    ios_assume_nonnull = False,
     schema_target = ":codegen_tests_schema",
 )
 
 rn_android_library(
     name = "rn_codegen_library_java",
     srcs = glob(
-        ["**/*.java"],
-        exclude = ["android/gradlePlugin-build/**/*"],
+        ["buck_tests/*.java"],
     ),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
@@ -73,7 +58,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     platforms = (ANDROID, APPLE),
@@ -97,10 +82,10 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
-    platforms = (APPLE),
+    platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
@@ -109,8 +94,8 @@ rn_xplat_cxx_library(
         "PUBLIC",
     ],
     deps = [
+        ":FBReactNativeTestSpec",
         ":generated_components-codegen_tests",
-        ":generated_objcpp_modules-codegen_tests",
     ],
 )
 
diff --git a/packages/react-native-codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl
index 606db2c3eb86fd..43ac82e0aebc12 100644
--- a/packages/react-native-codegen/DEFS.bzl
+++ b/packages/react-native-codegen/DEFS.bzl
@@ -103,22 +103,29 @@ def rn_codegen_cli():
         )
 
 def rn_codegen_modules(
-        native_module_spec_name,
-        name = "",
+        name,
+        android_package_name,
+        ios_assume_nonnull,
         library_labels = [],
         schema_target = ""):
-    generate_fixtures_rule_name = "generate_fixtures_modules-{}".format(name)
-    generate_module_hobjcpp_name = "generate_module_hobjcpp-{}".format(name)
-    generate_module_mm_name = "generate_module_mm-{}".format(name)
-    generate_module_java_name = "generate_module_java-{}".format(name)
-    generate_module_java_zip_name = "generate_module_java_zip-{}".format(name)
-    generate_module_jni_h_name = "generate_module_jni_h-{}".format(name)
-    generate_module_jni_cpp_name = "generate_module_jni_cpp-{}".format(name)
+    generate_fixtures_rule_name = "{}-codegen-modules".format(name)
+    generate_module_hobjcpp_name = "{}-codegen-modules-hobjcpp".format(name)
+    generate_module_mm_name = "{}-codegen-modules-mm".format(name)
+    generate_module_java_name = "{}-codegen-modules-java".format(name)
+    generate_module_java_zip_name = "{}-codegen-modules-java_zip".format(name)
+    generate_module_jni_h_name = "{}-codegen-modules-jni_h".format(name)
+    generate_module_jni_cpp_name = "{}-codegen-modules-jni_cpp".format(name)
 
     fb_native.genrule(
         name = generate_fixtures_rule_name,
         srcs = native.glob(["src/generators/**/*.js"]),
-        cmd = "$(exe {}) $(location {}) {} $OUT {}".format(react_native_root_target("packages/react-native-codegen:generate_all_from_schema"), schema_target, name, native_module_spec_name),
+        cmd = "$(exe {generator_script}) $(location {schema_target}) {library_name} $OUT {android_package_name} {ios_assume_nonnull}".format(
+            generator_script = react_native_root_target("packages/react-native-codegen:generate_all_from_schema"),
+            schema_target = schema_target,
+            library_name = name,
+            android_package_name = android_package_name,
+            ios_assume_nonnull = ios_assume_nonnull,
+        ),
         out = "codegenfiles-{}".format(name),
         labels = ["codegen_rule"],
     )
@@ -128,7 +135,10 @@ def rn_codegen_modules(
     ##################
     fb_native.genrule(
         name = generate_module_java_name,
-        cmd = "cp -r $(location :{})/java $OUT/".format(generate_fixtures_rule_name),
+        cmd = "mkdir -p $OUT/{spec_path} && cp -r $(location {generator_target})/java/{spec_path}/* $OUT/{spec_path}/".format(
+            spec_path = android_package_name.replace(".", "/"),
+            generator_target = ":" + generate_fixtures_rule_name,
+        ),
         out = "src",
         labels = ["codegen_rule"],
     )
@@ -142,23 +152,24 @@ def rn_codegen_modules(
 
     fb_native.genrule(
         name = generate_module_jni_h_name,
-        cmd = "cp $(location :{})/jni/{}.h $OUT".format(generate_fixtures_rule_name, native_module_spec_name),
-        out = "{}.h".format(native_module_spec_name),
+        cmd = "cp $(location :{})/jni/{}.h $OUT".format(generate_fixtures_rule_name, name),
+        out = "{}.h".format(name),
         labels = ["codegen_rule"],
     )
 
     fb_native.genrule(
         name = generate_module_jni_cpp_name,
-        cmd = "cp $(location :{})/jni/{}-generated.cpp $OUT".format(generate_fixtures_rule_name, native_module_spec_name),
-        out = "{}-generated.cpp".format(native_module_spec_name),
+        cmd = "cp $(location :{})/jni/{}-generated.cpp $OUT".format(generate_fixtures_rule_name, name),
+        out = "{}-generated.cpp".format(name),
         labels = ["codegen_rule"],
     )
 
     rn_android_library(
-        name = "generated_java_modules-{}".format(name),
+        name = "{}".format(name),
         srcs = [
             ":{}".format(generate_module_java_zip_name),
         ],
+        autoglob = False,
         labels = library_labels + ["codegen_rule"],
         visibility = ["PUBLIC"],
         deps = [
@@ -173,7 +184,7 @@ def rn_codegen_modules(
     )
 
     rn_xplat_cxx_library(
-        name = "generated_java_modules-{}-jni".format(name),
+        name = "{}-jni".format(name),
         srcs = [
             ":{}".format(generate_module_jni_cpp_name),
         ],
@@ -182,7 +193,7 @@ def rn_codegen_modules(
             ":{}".format(generate_module_jni_h_name),
         ],
         exported_headers = {
-            "{}/{}.h".format(native_module_spec_name, native_module_spec_name): ":{}".format(generate_module_jni_h_name),
+            "{}/{}.h".format(name, name): ":{}".format(generate_module_jni_h_name),
         },
         compiler_flags = [
             "-fexceptions",
@@ -190,6 +201,7 @@ def rn_codegen_modules(
             "-std=c++14",
             "-Wall",
         ],
+        force_static = True,
         preprocessor_flags = [
             "-DLOG_TAG=\"ReactNative\"",
             "-DWITH_FBSYSTRACE=1",
@@ -213,20 +225,20 @@ def rn_codegen_modules(
         # iOS Buck build isn't fully working in OSS, so let's skip it for OSS for now.
         fb_native.genrule(
             name = generate_module_hobjcpp_name,
-            cmd = "cp $(location :{})/{}.h $OUT".format(generate_fixtures_rule_name, native_module_spec_name),
-            out = "{}.h".format(native_module_spec_name),
+            cmd = "cp $(location :{})/{}.h $OUT".format(generate_fixtures_rule_name, name),
+            out = "{}.h".format(name),
             labels = ["codegen_rule"],
         )
 
         fb_native.genrule(
             name = generate_module_mm_name,
-            cmd = "cp $(location :{})/{}-generated.mm $OUT".format(generate_fixtures_rule_name, native_module_spec_name),
-            out = "{}-generated.mm".format(native_module_spec_name),
+            cmd = "cp $(location :{})/{}-generated.mm $OUT".format(generate_fixtures_rule_name, name),
+            out = "{}-generated.mm".format(name),
             labels = ["codegen_rule"],
         )
 
         rn_apple_library(
-            name = "generated_objcpp_modules-{}Apple".format(name),
+            name = "{}Apple".format(name),
             extension_api_only = True,
             header_namespace = "",
             sdks = (IOS),
@@ -234,7 +246,7 @@ def rn_codegen_modules(
                 "-Wno-unused-private-field",
             ],
             exported_headers = {
-                "{}/{}.h".format(native_module_spec_name, native_module_spec_name): ":{}".format(generate_module_hobjcpp_name),
+                "{}/{}.h".format(name, name): ":{}".format(generate_module_hobjcpp_name),
             },
             headers = [
                 ":{}".format(generate_module_hobjcpp_name),
@@ -242,6 +254,7 @@ def rn_codegen_modules(
             srcs = [
                 ":{}".format(generate_module_mm_name),
             ],
+            autoglob = False,
             labels = library_labels + ["codegen_rule"],
             visibility = ["PUBLIC"],
             exported_deps = [
@@ -253,7 +266,8 @@ def rn_codegen_modules(
 
 def rn_codegen_components(
         name = "",
-        schema_target = ""):
+        schema_target = "",
+        library_labels = []):
     generate_fixtures_rule_name = "generate_fixtures_components-{}".format(name)
     generate_component_descriptor_h_name = "generate_component_descriptor_h-{}".format(name)
     generate_component_hobjcpp_name = "generate_component_hobjcpp-{}".format(name)
@@ -272,7 +286,7 @@ def rn_codegen_components(
     fb_native.genrule(
         name = generate_fixtures_rule_name,
         srcs = native.glob(["src/generators/**/*.js"]),
-        cmd = "$(exe {}) $(location {}) {} $OUT {}".format(react_native_root_target("packages/react-native-codegen:generate_all_from_schema"), schema_target, name, name),
+        cmd = "$(exe {}) $(location {}) {} $OUT".format(react_native_root_target("packages/react-native-codegen:generate_all_from_schema"), schema_target, name),
         out = "codegenfiles-{}".format(name),
         labels = ["codegen_rule"],
     )
@@ -328,7 +342,9 @@ def rn_codegen_components(
 
     fb_native.genrule(
         name = copy_generated_java_files,
-        cmd = "mkdir $OUT && find $(location :{}) -name '*.java' -exec cp {{}} $OUT \\;".format(generate_fixtures_rule_name),
+        # TODO: support different package name internally.
+        # Right now, it's hardcoded to `com.facebook.react.viewmanagers`.
+        cmd = "mkdir -p $OUT/com/facebook/react/viewmanagers && cp -R $(location :{})/java/com/facebook/react/viewmanagers/* $OUT/com/facebook/react/viewmanagers".format(generate_fixtures_rule_name),
         out = "java",
         labels = ["codegen_rule"],
     )
@@ -371,85 +387,117 @@ def rn_codegen_components(
         labels = ["codegen_rule"],
     )
 
-    # libs
-    if is_running_buck_project():
-        rn_xplat_cxx_library(name = "generated_components-{}".format(name), visibility = ["PUBLIC"])
-    else:
-        rn_xplat_cxx_library(
-            name = "generated_components-{}".format(name),
-            srcs = [
-                ":{}".format(generate_event_emitter_cpp_name),
-                ":{}".format(generate_props_cpp_name),
-                ":{}".format(generate_shadow_node_cpp_name),
-            ],
-            headers = [
-                ":{}".format(generate_component_descriptor_h_name),
-                ":{}".format(generate_event_emitter_h_name),
-                ":{}".format(generate_props_h_name),
-                ":{}".format(generate_shadow_node_h_name),
+    ##############
+    # iOS handling
+    ##############
+    if not IS_OSS_BUILD:
+        # iOS Buck build isn't fully working in OSS, so let's skip it for OSS for now.
+        if is_running_buck_project():
+            rn_xplat_cxx_library(name = "generated_components-{}".format(name), visibility = ["PUBLIC"])
+        else:
+            rn_xplat_cxx_library(
+                name = "generated_components-{}".format(name),
+                srcs = [
+                    ":{}".format(generate_event_emitter_cpp_name),
+                    ":{}".format(generate_props_cpp_name),
+                    ":{}".format(generate_shadow_node_cpp_name),
+                ],
+                headers = [
+                    ":{}".format(generate_component_descriptor_h_name),
+                    ":{}".format(generate_event_emitter_h_name),
+                    ":{}".format(generate_props_h_name),
+                    ":{}".format(generate_shadow_node_h_name),
+                ],
+                header_namespace = "react/renderer/components/{}".format(name),
+                exported_headers = {
+                    "ComponentDescriptors.h": ":{}".format(generate_component_descriptor_h_name),
+                    "EventEmitters.h": ":{}".format(generate_event_emitter_h_name),
+                    "Props.h": ":{}".format(generate_props_h_name),
+                    "RCTComponentViewHelpers.h": ":{}".format(generate_component_hobjcpp_name),
+                    "ShadowNodes.h": ":{}".format(generate_shadow_node_h_name),
+                },
+                compiler_flags = [
+                    "-fexceptions",
+                    "-frtti",
+                    "-std=c++14",
+                    "-Wall",
+                ],
+                fbobjc_compiler_flags = get_apple_compiler_flags(),
+                fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+                ios_exported_headers = {
+                    "ComponentViewHelpers.h": ":{}".format(generate_component_hobjcpp_name),
+                },
+                ios_headers = [
+                    ":{}".format(generate_component_hobjcpp_name),
+                ],
+                labels = library_labels + ["codegen_rule"],
+                platforms = (ANDROID, APPLE, CXX),
+                preprocessor_flags = [
+                    "-DLOG_TAG=\"ReactNative\"",
+                    "-DWITH_FBSYSTRACE=1",
+                ],
+                tests = [":generated_tests-{}".format(name)],
+                visibility = ["PUBLIC"],
+                deps = [
+                    "//third-party/glog:glog",
+                    "//xplat/fbsystrace:fbsystrace",
+                    "//xplat/folly:headers_only",
+                    "//xplat/folly:memory",
+                    "//xplat/folly:molly",
+                    YOGA_CXX_TARGET,
+                    react_native_xplat_target("react/renderer/debug:debug"),
+                    react_native_xplat_target("react/renderer/core:core"),
+                    react_native_xplat_target("react/renderer/graphics:graphics"),
+                    react_native_xplat_target("react/renderer/components/image:image"),
+                    react_native_xplat_target("react/renderer/imagemanager:imagemanager"),
+                    react_native_xplat_target("react/renderer/components/view:view"),
+                ],
+            )
+
+        # Tests
+        fb_xplat_cxx_test(
+            name = "generated_tests-{}".format(name),
+            # TODO T96844980: Fix and enable generated_tests-codegen_testsAndroid
+            srcs = [] if ANDROID else [
+                ":{}".format(generate_tests_cpp_name),
             ],
-            header_namespace = "react/renderer/components/{}".format(name),
-            exported_headers = {
-                "ComponentDescriptors.h": ":{}".format(generate_component_descriptor_h_name),
-                "EventEmitters.h": ":{}".format(generate_event_emitter_h_name),
-                "Props.h": ":{}".format(generate_props_h_name),
-                "RCTComponentViewHelpers.h": ":{}".format(generate_component_hobjcpp_name),
-                "ShadowNodes.h": ":{}".format(generate_shadow_node_h_name),
-            },
+            apple_sdks = (IOS, MACOSX),
+            fbandroid_use_instrumentation_test = True,
             compiler_flags = [
                 "-fexceptions",
                 "-frtti",
                 "-std=c++14",
                 "-Wall",
             ],
-            fbobjc_compiler_flags = get_apple_compiler_flags(),
-            fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
-            ios_exported_headers = {
-                "ComponentViewHelpers.h": ":{}".format(generate_component_hobjcpp_name),
-            },
-            ios_headers = [
-                ":{}".format(generate_component_hobjcpp_name),
-            ],
-            labels = ["codegen_rule"],
+            contacts = ["oncall+react_native@xmail.facebook.com"],
+            labels = library_labels + ["codegen_rule"],
             platforms = (ANDROID, APPLE, CXX),
-            preprocessor_flags = [
-                "-DLOG_TAG=\"ReactNative\"",
-                "-DWITH_FBSYSTRACE=1",
-            ],
-            tests = [":generated_tests-{}".format(name)],
-            visibility = ["PUBLIC"],
             deps = [
-                "//third-party/glog:glog",
-                "//xplat/fbsystrace:fbsystrace",
-                "//xplat/folly:headers_only",
-                "//xplat/folly:memory",
-                "//xplat/folly:molly",
                 YOGA_CXX_TARGET,
-                react_native_xplat_target("react/renderer/debug:debug"),
                 react_native_xplat_target("react/renderer/core:core"),
-                react_native_xplat_target("react/renderer/graphics:graphics"),
-                react_native_xplat_target("react/renderer/components/image:image"),
-                react_native_xplat_target("react/renderer/imagemanager:imagemanager"),
-                react_native_xplat_target("react/renderer/components/view:view"),
+                "//xplat/third-party/gmock:gtest",
+                ":generated_components-{}".format(name),
             ],
         )
 
+    ##################
+    # Android handling
+    ##################
     if is_running_buck_project():
-        rn_android_library(name = "generated_components_java-{}".format(name))
+        rn_android_library(name = "generated_components_java-{}".format(name), autoglob = False)
     else:
         rn_android_library(
             name = "generated_components_java-{}".format(name),
             srcs = [
                 ":{}".format(zip_generated_java_files),
             ],
-            labels = ["codegen_rule"],
+            autoglob = False,
+            labels = library_labels + ["codegen_rule"],
             visibility = ["PUBLIC"],
             deps = [
                 react_native_dep("third-party/android/androidx:annotation"),
                 react_native_target("java/com/facebook/react/bridge:bridge"),
-                react_native_target("java/com/facebook/react/common:common"),
-                react_native_target("java/com/facebook/react/turbomodule/core:core"),
-                react_native_target("java/com/facebook/react/uimanager:uimanager"),
+                react_native_target("java/com/facebook/react/uimanager/interfaces:interfaces"),
             ],
         )
 
@@ -458,7 +506,8 @@ def rn_codegen_components(
             srcs = [
                 ":{}".format(zip_generated_cxx_files),
             ],
-            labels = ["codegen_rule"],
+            autoglob = False,
+            labels = library_labels + ["codegen_rule"],
             visibility = ["PUBLIC"],
             deps = [
                 react_native_dep("third-party/android/androidx:annotation"),
@@ -469,28 +518,6 @@ def rn_codegen_components(
             ],
         )
 
-    # Tests
-    fb_xplat_cxx_test(
-        name = "generated_tests-{}".format(name),
-        srcs = [
-            ":{}".format(generate_tests_cpp_name),
-        ],
-        apple_sdks = (IOS, MACOSX),
-        compiler_flags = [
-            "-fexceptions",
-            "-frtti",
-            "-std=c++14",
-            "-Wall",
-        ],
-        contacts = ["oncall+react_native@xmail.facebook.com"],
-        labels = ["codegen_rule"],
-        platforms = (ANDROID, APPLE, CXX),
-        deps = [
-            "//xplat/third-party/gmock:gtest",
-            ":generated_components-{}".format(name),
-        ],
-    )
-
 def rn_codegen_cxx_modules(
         name = "",
         schema_target = ""):
diff --git a/packages/react-native-codegen/android/build.gradle b/packages/react-native-codegen/android/build.gradle
index e34e9df6c999de..ddb8615512f05b 100644
--- a/packages/react-native-codegen/android/build.gradle
+++ b/packages/react-native-codegen/android/build.gradle
@@ -5,22 +5,32 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-buildscript {
-    repositories {
-        mavenLocal()
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
-    }
+import org.apache.tools.ant.taskdefs.condition.Os
+
+plugins {
+    id 'java-gradle-plugin'
+}
+
+repositories {
+    mavenLocal()
+    google()
+    mavenCentral()
 }
 
-allprojects {
-    repositories {
-        mavenLocal()
-        google()
-        jcenter()
+dependencies {
+    implementation 'com.android.tools.build:gradle:4.2.2'
+    // Use the same Gson version that `com.android.tools.build:gradle` depends on.
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'com.squareup:javapoet:1.13.0'
+}
+
+gradlePlugin {
+    plugins {
+        codegen {
+            id = 'com.facebook.react.codegen'
+            implementationClass = 'com.facebook.react.codegen.plugin.CodegenPlugin'
+        }
     }
 }
 
@@ -42,5 +52,23 @@ task('buildCodegenCLI', type: Exec) {
     nodeModulesDir.mkdirs();
     outputs.dirs(libDir, nodeModulesDir)
 
-    commandLine("$codegenRoot/scripts/oss/build.sh")
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+      // Convert path to Linux format: use canonical path to strip it off relative elements in the middle of the string.
+      // Then replace baskslashes with slashes, remove leading colon, add leading slash.
+      // Eg. D:\path1\sub2/.. -> /D/path1/path2
+      String canonicalPath = new File(codegenRoot).getCanonicalPath()
+      String linuxPath = canonicalPath.replace('\\', '/');
+      linuxPath = linuxPath.replace(':', '')
+      linuxPath = '/' + linuxPath
+
+      // Get the location of bash in the system; assume environment variable created to store it.
+      String bashHome = "$System.env.REACT_WINDOWS_BASH"
+      if (bashHome == null) {
+        throw new GradleException("REACT_WINDOWS_BASH is not defined.")
+      }
+      commandLine(bashHome, "-c", "$linuxPath/scripts/oss/build.sh")
+    }
+    else {
+        commandLine("$codegenRoot/scripts/oss/build.sh")
+    }
 }
diff --git a/packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties
index 14e30f7416a55e..7665b0fa93ae75 100644
--- a/packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
deleted file mode 100644
index 2eb21ffdc01217..00000000000000
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-plugins {
-    id 'java-gradle-plugin'
-}
-
-gradlePlugin {
-    plugins {
-        greeting {
-            id = 'com.facebook.react.codegen'
-            implementationClass = 'com.facebook.react.codegen.plugin.CodegenPlugin'
-        }
-    }
-}
-
-dependencies {
-    implementation 'com.android.tools.build:gradle:4.1.0'
-    // Use the same Gson version that `com.android.tools.build:gradle` depends on.
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.google.guava:guava:29.0-jre'
-    implementation 'com.squareup:javapoet:1.13.0'
-}
diff --git a/packages/react-native-codegen/android/settings.gradle b/packages/react-native-codegen/android/settings.gradle
index 4beec1548b8cee..f399ad57e35901 100644
--- a/packages/react-native-codegen/android/settings.gradle
+++ b/packages/react-native-codegen/android/settings.gradle
@@ -13,8 +13,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = 'react-native-codegen'
-
-include(":generator")
-
-includeBuild("gradlePlugin-build")
+rootProject.name = 'react-native-codegen-android'
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/StringType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/StringType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/StringType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/StringType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Type.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Type.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Type.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Type.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java
similarity index 98%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java
index 2a7468ce11e242..7896494eebb2f4 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java
+++ b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java
@@ -103,6 +103,8 @@ public MethodSpec getGeneratedMethodWithReactAnnotation(String methodName) {
     // React methods need special `@ReactMethod` annotation for now.
     methodBuilder.addAnnotation(annotationBuilder.build());
 
+    // TODO(T82242829) Add @DoNotStrip annotation
+
     return methodBuilder.build();
   }
 
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java
similarity index 100%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
similarity index 95%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
index 54e3758fa245c3..dc760c3f17088c 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
+++ b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
@@ -33,6 +33,8 @@ public void apply(final Project project) {
     final File generatedSchemaFile = new File(generatedSrcDir, "schema.json");
 
     // 2. Task: produce schema from JS files.
+    String os = System.getProperty("os.name").toLowerCase();
+
     project
         .getTasks()
         .register(
@@ -62,7 +64,7 @@ public void apply(final Project project) {
 
               ImmutableList<String> execCommands =
                   new ImmutableList.Builder<String>()
-                      .add("yarn")
+                      .add(os.contains("windows") ? "yarn.cmd" : "yarn")
                       .addAll(ImmutableList.copyOf(extension.nodeExecutableAndArgs))
                       .add(extension.codegenGenerateSchemaCLI().getAbsolutePath())
                       .add(generatedSchemaFile.getAbsolutePath())
@@ -82,6 +84,7 @@ public void apply(final Project project) {
 
               task.getInputs()
                   .files(project.fileTree(ImmutableMap.of("dir", extension.codegenDir())));
+              task.getInputs().files(extension.codegenGenerateNativeModuleSpecsCLI());
               task.getInputs().files(generatedSchemaFile);
               task.getOutputs().dir(generatedSrcDir);
 
@@ -95,7 +98,7 @@ public void apply(final Project project) {
 
               ImmutableList<String> execCommands =
                   new ImmutableList.Builder<String>()
-                      .add("yarn")
+                      .add(os.contains("windows") ? "yarn.cmd" : "yarn")
                       .addAll(ImmutableList.copyOf(extension.nodeExecutableAndArgs))
                       .add(extension.codegenGenerateNativeModuleSpecsCLI().getAbsolutePath())
                       .add("android")
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
similarity index 94%
rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
index eecb4b88f861f9..4d734a1da7decc 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
+++ b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
@@ -34,7 +34,7 @@ public File codegenGenerateSchemaCLI() {
   }
 
   public File codegenGenerateNativeModuleSpecsCLI() {
-    return new File(this.reactNativeRootDir, "scripts/generate-native-modules-specs-cli.js");
+    return new File(this.reactNativeRootDir, "scripts/generate-specs-cli.js");
   }
 
   private String projectPathToLibraryName(final String projectPath) {
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js
index 63b0bbeefb74d9..6c9a09da677727 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {
   PointValue,
   EdgeInsetsValue,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js
index bb17f3cfa6f4c8..289b6ff1003b2f 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes';
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js
index c00a934f6a814b..b8dcdaf96dbd87 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet';
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js
index 17f26c5588a40c..bad3a5a982592a 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {EdgeInsetsValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js
index ae9a9212c31981..72b1f5952fb636 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes';
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js
index 028d22ab7d6b12..a12ed0ce45f7c7 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {
   Int32,
   BubblingEventHandler,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js
index 0fafc1c36722da..8de54ec1db11b5 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {
   Int32,
   Float,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js
index 18a4648904458f..a0a31bf3de68a4 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {
   WithDefault,
   Float,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js
index 27b29d526febbc..63b4a98a9e7d14 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ImageSource} from '../../../../../Libraries/Image/ImageSource';
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js
index cd2d6e53633ac2..1718b8877bdd79 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {
   WithDefault,
   Int32,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js
index 657e836e15da06..aa33dfd4c8145f 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {
   BubblingEventHandler,
   WithDefault,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js
index 6965813f5ddf5e..675ddf1942cf00 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {PointValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
 import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet';
 import type {ImageSource} from '../../../../../Libraries/Image/ImageSource';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js
index 67d78b943a099c..d5b821db8f6aba 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js
index cfaf7d8b4bf0ef..d39dbb5eb0f13f 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import type {ImageSource} from '../../../../../Libraries/Image/ImageSource';
 import type {PointValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js
index 5b71252f433b47..0d450b8acd972f 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {PointValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js
index dfdb145c611be3..2da62e34fbd92c 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes';
 import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
 import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js
index cd21a54d719397..291f0f6887a729 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js
index fe3b3efad9c8f4..4c417f55164ddb 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js
index 6e8a30a0ca740a..753547d8cf4639 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js
index 3ccc8876b45df4..4272eb381f0c27 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js
index a8c648185ffecf..1efc1b632138e1 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js
index 6400942e175f2a..ea7782d9710dda 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js
index 02784457c3bdfb..2408df34d5d3ca 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js
index 3b9ba540dc5800..34a75f6e369e78 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js
index c950ed9e288972..bda6ca6a9130cf 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {
   RootTag,
   TurboModule,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js
index fce6f7c0f0fb6a..7ee503fdce5a02 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {
   RootTag,
   TurboModule,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js
index ac7b57e386a2d0..1c174e7f9a8e9f 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {
   RootTag,
   TurboModule,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js
index 29e54d8a5c3693..7863aef425698c 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {
   RootTag,
   TurboModule,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js
index 9f12225a2d883b..52343aebb423a6 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {
   RootTag,
   TurboModule,
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js
index 8810cb33540cb4..684a867d695c56 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/BUCK b/packages/react-native-codegen/e2e/__tests__/modules/BUCK
deleted file mode 100644
index 29df252313e6ea..00000000000000
--- a/packages/react-native-codegen/e2e/__tests__/modules/BUCK
+++ /dev/null
@@ -1,11 +0,0 @@
-load("@fbsource//xplat/js/RKJSModules/Libraries/NativeModules:defs.bzl", "react_native_module_flow_types_library")
-
-react_native_module_flow_types_library(
-    name = "RNCodegenModuleFixtures",
-    android_package_name = "com.facebook.fbreact.specs",
-    js_srcs = glob(
-        [
-            "../../__test_fixtures__/modules/*.js",
-        ],
-    ),
-)
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js b/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
index 2b2deec0b0fe33..62f923d9581d23 100644
--- a/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
@@ -38,13 +38,19 @@ function getModules(): SchemaType {
 describe('GenerateModuleObjCpp', () => {
   it('can generate a header file NativeModule specs', () => {
     const libName = 'RNCodegenModuleFixtures';
-    const output = generator.generate(libName, getModules(), libName);
+    const output = generator.generate(libName, getModules(), undefined, false);
+    expect(output.get(libName + '.h')).toMatchSnapshot();
+  });
+
+  it('can generate a header file NativeModule specs with assume nonnull enabled', () => {
+    const libName = 'RNCodegenModuleFixtures';
+    const output = generator.generate(libName, getModules(), undefined, true);
     expect(output.get(libName + '.h')).toMatchSnapshot();
   });
 
   it('can generate an implementation file NativeModule specs', () => {
     const libName = 'RNCodegenModuleFixtures';
-    const output = generator.generate(libName, getModules(), libName);
+    const output = generator.generate(libName, getModules(), undefined, false);
     expect(output.get(libName + '-generated.mm')).toMatchSnapshot();
   });
 });
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
index 91e62c8d05bdbc..72435804ab9543 100644
--- a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
+++ b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
@@ -1111,7 +1111,7 @@ inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(const Inpu
   auto const3 = i.const3.get();
   d[@\\"const3\\"] = RCTConvertVecToArray(const3, ^id(NSString * el_) { return el_; });
   auto id_ = i.id_;
-  d[@\\"id_\\"] = RCTConvertOptionalVecToArray(id_, ^id(folly::Optional<JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder> el_) { return el_.hasValue() ? el_.value().buildUnsafeRawValue() : nil; });
+  d[@\\"id\\"] = RCTConvertOptionalVecToArray(id_, ^id(folly::Optional<JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder> el_) { return el_.hasValue() ? el_.value().buildUnsafeRawValue() : nil; });
   return d;
 }) {}
 inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(Constants i) : _factory(^{
@@ -1190,6 +1190,1199 @@ inline JS::NativeSampleTurboModuleOptional::Constants::Builder::Builder(Constant
 "
 `;
 
+exports[`GenerateModuleObjCpp can generate a header file NativeModule specs with assume nonnull enabled 1`] = `
+"/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
+ */
+
+#ifndef __cplusplus
+#error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
+#endif
+#import <Foundation/Foundation.h>
+#import <RCTRequired/RCTRequired.h>
+#import <RCTTypeSafety/RCTConvertHelpers.h>
+#import <RCTTypeSafety/RCTTypedModuleConstants.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTCxxConvert.h>
+#import <React/RCTManagedPointer.h>
+#import <ReactCommon/RCTTurboModule.h>
+#import <folly/Optional.h>
+#import <vector>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol NativeArrayTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSArray<NSString *> *)getArray:(NSArray *)a;
+- (NSArray<NSString *> *)getReadOnlyArray:(NSArray *)a;
+- (NSArray<NSString *> *)getArrayWithAlias:(NSArray *)a
+                                         b:(NSArray *)b;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeArrayTurboModule'
+     */
+    class JSI_EXPORT NativeArrayTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeArrayTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+@protocol NativeBooleanTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSNumber *)getBoolean:(BOOL)arg;
+- (NSNumber *)getBooleanWithAlias:(BOOL)arg;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeBooleanTurboModule'
+     */
+    class JSI_EXPORT NativeBooleanTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeBooleanTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+@protocol NativeCallbackTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithCallbackWithAlias:(RCTResponseSenderBlock)c;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeCallbackTurboModule'
+     */
+    class JSI_EXPORT NativeCallbackTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeCallbackTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+@protocol NativeNullableTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSNumber * _Nullable)getBool:(NSNumber *)a;
+- (NSNumber * _Nullable)getNumber:(NSNumber *)a;
+- (NSString * _Nullable)getString:(NSNumber *)a;
+- (NSArray<id<NSObject>> * _Nullable)getArray:(NSArray * _Nullable)a;
+- (NSDictionary * _Nullable)getObject:(NSDictionary * _Nullable)a;
+- (void)getValueWithPromise:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeNullableTurboModule'
+     */
+    class JSI_EXPORT NativeNullableTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeNullableTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+@protocol NativeNumberTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSNumber *)getNumber:(double)arg;
+- (NSNumber *)getNumberWithAlias:(double)arg;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeNumberTurboModule'
+     */
+    class JSI_EXPORT NativeNumberTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeNumberTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct SpecDifficultObjectAE {
+      bool D() const;
+      double E() const;
+      NSString *F() const;
+
+      SpecDifficultObjectAE(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectAE)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectAE:(id)json;
+@end
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct SpecDifficultObjectA {
+      bool D() const;
+      JS::NativeObjectTurboModule::SpecDifficultObjectAE E() const;
+      NSString *F() const;
+
+      SpecDifficultObjectA(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectA)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectA:(id)json;
+@end
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct ConstantsEEE {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<double> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEEE */
+        Builder(ConstantsEEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct ConstantsEE {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<JS::NativeObjectTurboModule::ConstantsEEE::Builder> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEE */
+        Builder(ConstantsEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct ConstantsE {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<JS::NativeObjectTurboModule::ConstantsEE::Builder> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsE */
+        Builder(ConstantsE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<JS::NativeObjectTurboModule::ConstantsE::Builder> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeObjectTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSDictionary *)getGenericObject:(NSDictionary *)arg;
+- (NSDictionary *)getGenericObjectReadOnly:(NSDictionary *)arg;
+- (NSDictionary *)getGenericObjectWithAlias:(NSDictionary *)arg;
+- (NSDictionary *)difficultObject:(JS::NativeObjectTurboModule::SpecDifficultObjectA &)A;
+- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeObjectTurboModule'
+     */
+    class JSI_EXPORT NativeObjectTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct ConstantsEEE {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          folly::Optional<double> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEEE */
+        Builder(ConstantsEEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct ConstantsEE {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          folly::Optional<JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEE */
+        Builder(ConstantsEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct ConstantsE {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          folly::Optional<JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsE */
+        Builder(ConstantsE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          id<NSObject> _Nullable  A;
+          folly::Optional<JS::NativeOptionalObjectTurboModule::ConstantsE::Builder> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeOptionalObjectTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeOptionalObjectTurboModule'
+     */
+    class JSI_EXPORT NativeOptionalObjectTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeOptionalObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+@protocol NativePromiseTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)getValueWithPromise:(BOOL)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (void)getValueWithPromiseWithAlias:(NSString *)arg
+                             resolve:(RCTPromiseResolveBlock)resolve
+                              reject:(RCTPromiseRejectBlock)reject;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativePromiseTurboModule'
+     */
+    class JSI_EXPORT NativePromiseTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativePromiseTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+namespace JS {
+  namespace NativeSampleTurboModule {
+    struct SpecGetObjectShapeArg {
+      double prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModule_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetObjectShapeArg:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModule {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModule_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_Animal:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModule {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> const1;
+          RCTRequired<double> const2;
+          RCTRequired<NSString *> const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber *)getBool:(BOOL)arg;
+- (NSNumber *)getNumber:(double)arg;
+- (NSString *)getString:(NSString *)arg;
+- (NSArray<id<NSObject>> *)getArray:(NSArray *)arg;
+- (NSDictionary *)getObject:(NSDictionary *)arg;
+- (NSDictionary *)getObjectShape:(JS::NativeSampleTurboModule::SpecGetObjectShapeArg &)arg;
+- (NSDictionary *)getAlias:(JS::NativeSampleTurboModule::Animal &)arg;
+- (NSNumber *)getRootTag:(double)arg;
+- (NSDictionary *)getValue:(double)x
+getValuegetValuegetValuegetValuegetValuey:(NSString *)getValuegetValuegetValuegetValuegetValuey
+                         z:(NSDictionary *)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(BOOL)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeSampleTurboModule'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+namespace JS {
+  namespace NativeSampleTurboModuleArrays {
+    struct ConstantsIdElement {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<double> prop;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsIdElement */
+        Builder(ConstantsIdElement i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsIdElement fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsIdElement(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+namespace JS {
+  namespace NativeSampleTurboModuleArrays {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<std::vector<bool>> const1;
+          RCTRequired<std::vector<double>> const2;
+          RCTRequired<std::vector<NSString *>> const3;
+          folly::Optional<std::vector<folly::Optional<JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder>>> id_;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleArraysSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSArray<NSNumber *> *)getBool:(NSArray *)id;
+- (NSArray<NSNumber *> *)getNumber:(NSArray *)arg;
+- (NSArray<NSString *> *)getString:(NSArray *)arg;
+- (NSArray<NSArray<id<NSObject>> *> *)getArray:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getObject:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getObjectShape:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getAlias:(NSArray *)arg;
+- (NSArray<NSNumber *> *)getRootTag:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getValue:(NSArray *)x
+                                    y:(NSArray *)y
+                                    z:(NSArray *)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSArray *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeSampleTurboModuleArrays'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleArraysSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleArraysSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+namespace JS {
+  namespace NativeSampleTurboModuleNullable {
+    struct SpecGetObjectShapeArg {
+      folly::Optional<double> prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullable_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_SpecGetObjectShapeArg:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModuleNullable {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullable_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_Animal:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModuleNullable {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<folly::Optional<bool>> const1;
+          RCTRequired<folly::Optional<double>> const2;
+          RCTRequired<NSString *> const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleNullableSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber * _Nullable)getBool:(NSNumber *)arg;
+- (NSNumber * _Nullable)getNumber:(NSNumber *)arg;
+- (NSString * _Nullable)getString:(NSString * _Nullable)arg;
+- (NSArray<id<NSObject>> * _Nullable)getArray:(NSArray * _Nullable)arg;
+- (NSDictionary * _Nullable)getObject:(NSDictionary * _Nullable)arg;
+- (NSDictionary * _Nullable)getObjectShape:(JS::NativeSampleTurboModuleNullable::SpecGetObjectShapeArg &)arg;
+- (NSDictionary * _Nullable)getAlias:(JS::NativeSampleTurboModuleNullable::Animal &)arg;
+- (NSNumber * _Nullable)getRootTag:(NSNumber *)arg;
+- (NSDictionary * _Nullable)getValue:(NSNumber *)x
+                                   y:(NSString * _Nullable)y
+                                   z:(NSDictionary * _Nullable)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSNumber *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeSampleTurboModuleNullable'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleNullableSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleNullableSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+namespace JS {
+  namespace NativeSampleTurboModuleNullableAndOptional {
+    struct SpecGetObjectShapeArg {
+      folly::Optional<double> prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModuleNullableAndOptional {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_Animal:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModuleNullableAndOptional {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> const1;
+          folly::Optional<double> const2;
+          NSString *const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleNullableAndOptionalSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber * _Nullable)getBool:(NSNumber *)arg;
+- (NSNumber * _Nullable)getNumber:(NSNumber *)arg;
+- (NSString * _Nullable)getString:(NSString * _Nullable)arg;
+- (NSArray<id<NSObject>> * _Nullable)getArray:(NSArray * _Nullable)arg;
+- (NSDictionary * _Nullable)getObject:(NSDictionary * _Nullable)arg;
+- (NSDictionary *)getObjectShape:(JS::NativeSampleTurboModuleNullableAndOptional::SpecGetObjectShapeArg &)arg;
+- (NSDictionary * _Nullable)getAlias:(JS::NativeSampleTurboModuleNullableAndOptional::Animal &)arg;
+- (NSNumber * _Nullable)getRootTag:(NSNumber *)arg;
+- (NSDictionary * _Nullable)getValue:(NSNumber *)x
+                                   y:(NSString * _Nullable)y
+                                   z:(NSDictionary * _Nullable)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSNumber *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeSampleTurboModuleNullableAndOptional'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleNullableAndOptionalSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleNullableAndOptionalSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+namespace JS {
+  namespace NativeSampleTurboModuleOptional {
+    struct SpecGetObjectShapeArg {
+      folly::Optional<double> prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleOptional_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_SpecGetObjectShapeArg:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModuleOptional {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleOptional_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_Animal:(id)json;
+@end
+namespace JS {
+  namespace NativeSampleTurboModuleOptional {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> const1;
+          folly::Optional<double> const2;
+          NSString *const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleOptionalSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber *)getBool:(NSNumber *)arg;
+- (NSNumber *)getNumber:(NSNumber *)arg;
+- (NSString *)getString:(NSString *)arg;
+- (NSArray<id<NSObject>> *)getArray:(NSArray *)arg;
+- (NSDictionary *)getObject:(NSDictionary *)arg;
+- (NSDictionary *)getObjectShape:(JS::NativeSampleTurboModuleOptional::SpecGetObjectShapeArg &)arg;
+- (NSDictionary *)getAlias:(JS::NativeSampleTurboModuleOptional::Animal &)arg;
+- (NSNumber *)getRootTag:(NSNumber *)arg;
+- (NSDictionary *)getValue:(NSNumber *)x
+                         y:(NSString *)y
+                         z:(NSDictionary *)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSNumber *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeSampleTurboModuleOptional'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleOptionalSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleOptionalSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+@protocol NativeStringTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSString *)getString:(NSString *)arg;
+- (NSString *)getStringWithAlias:(NSString *)arg;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NativeStringTurboModule'
+     */
+    class JSI_EXPORT NativeStringTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeStringTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+
+
+inline bool JS::NativeObjectTurboModule::SpecDifficultObjectAE::D() const
+{
+  id const p = _v[@\\"D\\"];
+  return RCTBridgingToBool(p);
+}
+inline double JS::NativeObjectTurboModule::SpecDifficultObjectAE::E() const
+{
+  id const p = _v[@\\"E\\"];
+  return RCTBridgingToDouble(p);
+}
+inline NSString *JS::NativeObjectTurboModule::SpecDifficultObjectAE::F() const
+{
+  id const p = _v[@\\"F\\"];
+  return RCTBridgingToString(p);
+}
+inline bool JS::NativeObjectTurboModule::SpecDifficultObjectA::D() const
+{
+  id const p = _v[@\\"D\\"];
+  return RCTBridgingToBool(p);
+}
+inline JS::NativeObjectTurboModule::SpecDifficultObjectAE JS::NativeObjectTurboModule::SpecDifficultObjectA::E() const
+{
+  id const p = _v[@\\"E\\"];
+  return JS::NativeObjectTurboModule::SpecDifficultObjectAE(p);
+}
+inline NSString *JS::NativeObjectTurboModule::SpecDifficultObjectA::F() const
+{
+  id const p = _v[@\\"F\\"];
+  return RCTBridgingToString(p);
+}
+inline JS::NativeObjectTurboModule::ConstantsEEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = @(E);
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsEEE::Builder::Builder(ConstantsEEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = E.buildUnsafeRawValue();
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsEE::Builder::Builder(ConstantsEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = E.buildUnsafeRawValue();
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsE::Builder::Builder(ConstantsE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeObjectTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = E.buildUnsafeRawValue();
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? @((double)E.value()) : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder::Builder(ConstantsEEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? E.value().buildUnsafeRawValue() : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder::Builder(ConstantsEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? E.value().buildUnsafeRawValue() : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsE::Builder::Builder(ConstantsE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeOptionalObjectTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto A = i.A;
+  d[@\\"A\\"] = A;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? E.value().buildUnsafeRawValue() : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline double JS::NativeSampleTurboModule::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToDouble(p);
+}
+inline NSString *JS::NativeSampleTurboModule::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToString(p);
+}
+inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1.get();
+  d[@\\"const1\\"] = @(const1);
+  auto const2 = i.const2.get();
+  d[@\\"const2\\"] = @(const2);
+  auto const3 = i.const3.get();
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto prop = i.prop.get();
+  d[@\\"prop\\"] = @(prop);
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder::Builder(ConstantsIdElement i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1.get();
+  d[@\\"const1\\"] = RCTConvertVecToArray(const1, ^id(bool el_) { return @(el_); });
+  auto const2 = i.const2.get();
+  d[@\\"const2\\"] = RCTConvertVecToArray(const2, ^id(double el_) { return @(el_); });
+  auto const3 = i.const3.get();
+  d[@\\"const3\\"] = RCTConvertVecToArray(const3, ^id(NSString * el_) { return el_; });
+  auto id_ = i.id_;
+  d[@\\"id\\"] = RCTConvertOptionalVecToArray(id_, ^id(folly::Optional<JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder> el_) { return el_.hasValue() ? el_.value().buildUnsafeRawValue() : nil; });
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline folly::Optional<double> JS::NativeSampleTurboModuleNullable::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToOptionalDouble(p);
+}
+inline NSString *JS::NativeSampleTurboModuleNullable::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToOptionalString(p);
+}
+inline JS::NativeSampleTurboModuleNullable::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1.get();
+  d[@\\"const1\\"] = const1.hasValue() ? @((BOOL)const1.value()) : nil;
+  auto const2 = i.const2.get();
+  d[@\\"const2\\"] = const2.hasValue() ? @((double)const2.value()) : nil;
+  auto const3 = i.const3.get();
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleNullable::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline folly::Optional<double> JS::NativeSampleTurboModuleNullableAndOptional::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToOptionalDouble(p);
+}
+inline NSString *JS::NativeSampleTurboModuleNullableAndOptional::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToOptionalString(p);
+}
+inline JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1;
+  d[@\\"const1\\"] = const1.hasValue() ? @((BOOL)const1.value()) : nil;
+  auto const2 = i.const2;
+  d[@\\"const2\\"] = const2.hasValue() ? @((double)const2.value()) : nil;
+  auto const3 = i.const3;
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+inline folly::Optional<double> JS::NativeSampleTurboModuleOptional::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToOptionalDouble(p);
+}
+inline NSString *JS::NativeSampleTurboModuleOptional::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToOptionalString(p);
+}
+inline JS::NativeSampleTurboModuleOptional::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1;
+  d[@\\"const1\\"] = const1.hasValue() ? @((BOOL)const1.value()) : nil;
+  auto const2 = i.const2;
+  d[@\\"const2\\"] = const2.hasValue() ? @((double)const2.value()) : nil;
+  auto const3 = i.const3;
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleOptional::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+NS_ASSUME_NONNULL_END
+"
+`;
+
 exports[`GenerateModuleObjCpp can generate an implementation file NativeModule specs 1`] = `
 "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
@@ -1241,11 +2434,11 @@ namespace facebook {
   namespace react {
     
     static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI_getBoolean(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBoolean\\", @selector(getBoolean:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBoolean\\", @selector(getBoolean:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI_getBooleanWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBooleanWithAlias\\", @selector(getBooleanWithAlias:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBooleanWithAlias\\", @selector(getBooleanWithAlias:), args, count);
     }
 
     NativeBooleanTurboModuleSpecJSI::NativeBooleanTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
@@ -1287,7 +2480,7 @@ namespace facebook {
   namespace react {
     
     static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -1470,7 +2663,7 @@ namespace facebook {
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -1681,7 +2874,7 @@ namespace facebook {
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -1792,7 +2985,7 @@ namespace facebook {
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -1903,7 +3096,7 @@ namespace facebook {
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
diff --git a/packages/react-native-codegen/package.json b/packages/react-native-codegen/package.json
index f310d669cb2b2e..4578b6ce999f35 100644
--- a/packages/react-native-codegen/package.json
+++ b/packages/react-native-codegen/package.json
@@ -1,8 +1,8 @@
 {
   "name": "react-native-codegen",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "⚛️ Code generation tools for React Native",
-  "homepage": "https://github.com/facebook/react-native/tree/master/packages/react-native-codegen",
+  "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-codegen",
   "repository": {
     "type": "git",
     "url": "git@github.com:facebook/react-native.git",
@@ -26,7 +26,7 @@
     "shouldPublish": false
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.14.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
diff --git a/packages/react-native-codegen/scripts/oss/build.sh b/packages/react-native-codegen/scripts/oss/build.sh
index 7092fdf1aa739d..b5913f9f1d6a1e 100755
--- a/packages/react-native-codegen/scripts/oss/build.sh
+++ b/packages/react-native-codegen/scripts/oss/build.sh
@@ -11,9 +11,51 @@ THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOUR
 set -e
 set -u
 
-pushd "$THIS_DIR/../.." >/dev/null
+CODEGEN_DIR="$THIS_DIR/../.."
 
-yarn install 2> >(grep -v '^warning' 1>&2)
-yarn run build
+rm -rf "${CODEGEN_DIR:?}/lib" "${CODEGEN_DIR:?}/node_modules"
 
-popd >/dev/null
+# Fallback to npm if yarn is not available
+if [ -x "$(command -v yarn)" ]; then
+  YARN_OR_NPM=$(command -v yarn)
+else
+  YARN_OR_NPM=$(command -v npm)
+fi
+YARN_BINARY="${YARN_BINARY:-$YARN_OR_NPM}"
+
+if [[ ${FBSOURCE_ENV:-0} -eq 1 ]]; then
+  # Custom FB-specific setup
+  pushd "$CODEGEN_DIR" >/dev/null
+
+  "$YARN_BINARY" install 2> >(grep -v '^warning' 1>&2)
+  # Note: Within FBSOURCE_ENV, this has to explicitly run build.
+  "$YARN_BINARY" run build
+
+  popd >/dev/null
+
+else
+  # Run yarn install in a separate tmp dir to avoid conflict with the rest of the repo.
+  # Note: OSS-only.
+  TMP_DIR=$(mktemp -d)
+
+  # On Windows this script gets run by a seprate Git Bash instance, which cannot perform the copy
+  # due to file locks created by the host process. Need to exclude .lock files while copying.
+  # Using in-memory tar operation because piping `find` and `grep` doesn't preserve folder structure
+  # during recursive copying, and `rsync` is not installed by default in Git Bash.
+  # As an added benefit, blob copy is faster.
+  if [ "$OSTYPE" = "msys" ] || [ "$OSTYPE" = "cygwin" ]; then
+    tar cf - --exclude='*.lock' "$CODEGEN_DIR" | (cd "$TMP_DIR" && tar xvf - );
+  else
+    cp -R "$CODEGEN_DIR/." "$TMP_DIR";
+  fi
+
+  pushd "$TMP_DIR" >/dev/null
+
+  # Note: this automatically runs build as well.
+  "$YARN_BINARY" install 2> >(grep -v '^warning' 1>&2)
+
+  popd >/dev/null
+
+  mv "$TMP_DIR/lib" "$TMP_DIR/node_modules" "$CODEGEN_DIR"
+  rm -rf "$TMP_DIR"
+fi
diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 358033306d91f3..241017d53c0309 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -12,210 +12,77 @@
 
 export type PlatformType = 'iOS' | 'android';
 
-export type CommandsFunctionTypeAnnotation = $ReadOnly<{|
-  type: 'FunctionTypeAnnotation',
-  params: $ReadOnlyArray<CommandsFunctionTypeParamAnnotation>,
-|}>;
-
-export type CommandsFunctionTypeParamAnnotation = $ReadOnly<{|
-  name: string,
-  typeAnnotation: CommandsTypeAnnotation,
-|}>;
-
-export type CommandsTypeAnnotation =
-  | ReservedFunctionValueTypeAnnotation
-  | BooleanTypeAnnotation
-  | Int32TypeAnnotation
-  | DoubleTypeAnnotation
-  | FloatTypeAnnotation
-  | StringTypeAnnotation;
-
-type ReservedFunctionValueTypeAnnotation = $ReadOnly<{|
-  type: 'ReservedFunctionValueTypeAnnotation',
-  name: ReservedFunctionValueTypeName,
-|}>;
+export type SchemaType = $ReadOnly<{
+  modules: $ReadOnly<{
+    [hasteModuleName: string]: ComponentSchema | NativeModuleSchema,
+  }>,
+}>;
 
-export type DoubleTypeAnnotation = $ReadOnly<{|
+/**
+ * Component Type Annotations
+ */
+export type DoubleTypeAnnotation = $ReadOnly<{
   type: 'DoubleTypeAnnotation',
-|}>;
+}>;
 
-export type FloatTypeAnnotation = $ReadOnly<{|
+export type FloatTypeAnnotation = $ReadOnly<{
   type: 'FloatTypeAnnotation',
-|}>;
+}>;
 
-export type BooleanTypeAnnotation = $ReadOnly<{|
+export type BooleanTypeAnnotation = $ReadOnly<{
   type: 'BooleanTypeAnnotation',
-|}>;
+}>;
 
-export type Int32TypeAnnotation = $ReadOnly<{|
+export type Int32TypeAnnotation = $ReadOnly<{
   type: 'Int32TypeAnnotation',
-|}>;
+}>;
 
-export type StringTypeAnnotation = $ReadOnly<{|
+export type StringTypeAnnotation = $ReadOnly<{
   type: 'StringTypeAnnotation',
-|}>;
+}>;
 
-export type EventObjectPropertyType =
-  | $ReadOnly<{|
-      type: 'BooleanTypeAnnotation',
-      name: string,
-      optional: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'StringTypeAnnotation',
-      name: string,
-      optional: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'DoubleTypeAnnotation',
-      name: string,
-      optional: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'FloatTypeAnnotation',
-      name: string,
-      optional: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'Int32TypeAnnotation',
-      name: string,
-      optional: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'StringEnumTypeAnnotation',
-      name: string,
-      optional: boolean,
-      options: $ReadOnlyArray<{|
-        name: string,
-      |}>,
-    |}>
-  | $ReadOnly<{|
-      type: 'ObjectTypeAnnotation',
-      name: string,
-      optional: boolean,
-      properties: $ReadOnlyArray<EventObjectPropertyType>,
-    |}>;
-
-type PropTypeTypeAnnotation =
-  | $ReadOnly<{|
-      type: 'BooleanTypeAnnotation',
-      default: boolean | null,
-    |}>
-  | $ReadOnly<{|
-      type: 'StringTypeAnnotation',
-      default: string | null,
-    |}>
-  | $ReadOnly<{|
-      type: 'DoubleTypeAnnotation',
-      default: number,
-    |}>
-  | $ReadOnly<{|
-      type: 'FloatTypeAnnotation',
-      default: number | null,
-    |}>
-  | $ReadOnly<{|
-      type: 'Int32TypeAnnotation',
-      default: number,
-    |}>
-  | $ReadOnly<{|
-      type: 'StringEnumTypeAnnotation',
-      default: string,
-      options: $ReadOnlyArray<{|
-        name: string,
-      |}>,
-    |}>
-  | $ReadOnly<{|
-      type: 'Int32EnumTypeAnnotation',
-      default: number,
-      options: $ReadOnlyArray<{|
-        value: number,
-      |}>,
-    |}>
-  | $ReadOnly<{|
-      type: 'ReservedPropTypeAnnotation',
-      name:
-        | 'ColorPrimitive'
-        | 'ImageSourcePrimitive'
-        | 'PointPrimitive'
-        | 'EdgeInsetsPrimitive',
-    |}>
-  | $ReadOnly<{|
-      type: 'ObjectTypeAnnotation',
-      properties: $ReadOnlyArray<PropTypeShape>,
-    |}>
-  | $ReadOnly<{|
-      type: 'ArrayTypeAnnotation',
-      elementType:
-        | $ReadOnly<{|
-            type: 'BooleanTypeAnnotation',
-          |}>
-        | $ReadOnly<{|
-            type: 'StringTypeAnnotation',
-          |}>
-        | $ReadOnly<{|
-            type: 'DoubleTypeAnnotation',
-          |}>
-        | $ReadOnly<{|
-            type: 'FloatTypeAnnotation',
-          |}>
-        | $ReadOnly<{|
-            type: 'Int32TypeAnnotation',
-          |}>
-        | $ReadOnly<{|
-            type: 'StringEnumTypeAnnotation',
-            default: string,
-            options: $ReadOnlyArray<{|
-              name: string,
-            |}>,
-          |}>
-        | $ReadOnly<{|
-            type: 'ObjectTypeAnnotation',
-            properties: $ReadOnlyArray<PropTypeShape>,
-          |}>
-        | $ReadOnly<{|
-            type: 'ReservedPropTypeAnnotation',
-            name:
-              | 'ColorPrimitive'
-              | 'ImageSourcePrimitive'
-              | 'PointPrimitive'
-              | 'EdgeInsetsPrimitive',
-          |}>
-        | $ReadOnly<{|
-            type: 'ArrayTypeAnnotation',
-            elementType: $ReadOnly<{|
-              type: 'ObjectTypeAnnotation',
-              properties: $ReadOnlyArray<PropTypeShape>,
-            |}>,
-          |}>,
-    |}>;
-
-export type PropTypeShape = $ReadOnly<{|
-  name: string,
-  optional: boolean,
-  typeAnnotation: PropTypeTypeAnnotation,
-|}>;
+export type StringEnumTypeAnnotation = $ReadOnly<{
+  type: 'StringEnumTypeAnnotation',
+  options: $ReadOnlyArray<string>,
+}>;
 
-export type EventTypeShape = $ReadOnly<{|
-  name: string,
-  bubblingType: 'direct' | 'bubble',
-  optional: boolean,
-  paperTopLevelNameDeprecated?: string,
-  typeAnnotation: $ReadOnly<{|
-    type: 'EventTypeAnnotation',
-    argument?: $ReadOnly<{|
-      type: 'ObjectTypeAnnotation',
-      properties: $ReadOnlyArray<EventObjectPropertyType>,
-    |}>,
-  |}>,
-|}>;
-
-export type CommandTypeShape = $ReadOnly<{|
+export type VoidTypeAnnotation = $ReadOnly<{
+  type: 'VoidTypeAnnotation',
+}>;
+
+export type ObjectTypeAnnotation<+T> = $ReadOnly<{
+  type: 'ObjectTypeAnnotation',
+  properties: $ReadOnlyArray<NamedShape<T>>,
+}>;
+
+type FunctionTypeAnnotation<+P, +R> = $ReadOnly<{
+  type: 'FunctionTypeAnnotation',
+  params: $ReadOnlyArray<NamedShape<P>>,
+  returnTypeAnnotation: R,
+}>;
+
+export type NamedShape<+T> = $ReadOnly<{
   name: string,
   optional: boolean,
-  typeAnnotation: CommandsFunctionTypeAnnotation,
-|}>;
+  typeAnnotation: T,
+}>;
 
-export type OptionsShape = $ReadOnly<{|
+export type ComponentSchema = $ReadOnly<{
+  type: 'Component',
+  components: $ReadOnly<{
+    [componentName: string]: ComponentShape,
+  }>,
+}>;
+
+export type ComponentShape = $ReadOnly<{
+  ...OptionsShape,
+  extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
+  events: $ReadOnlyArray<EventTypeShape>,
+  props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
+  commands: $ReadOnlyArray<NamedShape<CommandTypeAnnotation>>,
+}>;
+
+export type OptionsShape = $ReadOnly<{
   interfaceOnly?: boolean,
 
   // Use for components with no current paper rename in progress
@@ -228,33 +95,113 @@ export type OptionsShape = $ReadOnly<{|
   // Use for components currently being renamed in paper
   // Will use new name if it is available and fallback to this name
   paperComponentNameDeprecated?: string,
-|}>;
+}>;
 
-export type ExtendsPropsShape = $ReadOnly<{|
+export type ExtendsPropsShape = $ReadOnly<{
   type: 'ReactNativeBuiltInType',
   knownTypeName: 'ReactNativeCoreViewProps',
-|}>;
+}>;
 
-export type ComponentShape = $ReadOnly<{|
-  ...OptionsShape,
-  extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
-  events: $ReadOnlyArray<EventTypeShape>,
-  props: $ReadOnlyArray<PropTypeShape>,
-  commands: $ReadOnlyArray<CommandTypeShape>,
-|}>;
+export type EventTypeShape = $ReadOnly<{
+  name: string,
+  bubblingType: 'direct' | 'bubble',
+  optional: boolean,
+  paperTopLevelNameDeprecated?: string,
+  typeAnnotation: $ReadOnly<{
+    type: 'EventTypeAnnotation',
+    argument?: ObjectTypeAnnotation<EventTypeAnnotation>,
+  }>,
+}>;
 
-export type SchemaType = $ReadOnly<{|
-  modules: $ReadOnly<{|
-    [hasteModuleName: string]: ComponentSchema | NativeModuleSchema,
-  |}>,
-|}>;
+export type EventTypeAnnotation =
+  | BooleanTypeAnnotation
+  | StringTypeAnnotation
+  | DoubleTypeAnnotation
+  | FloatTypeAnnotation
+  | Int32TypeAnnotation
+  | StringEnumTypeAnnotation
+  | ObjectTypeAnnotation<EventTypeAnnotation>;
 
-export type ComponentSchema = $ReadOnly<{|
-  type: 'Component',
-  components: $ReadOnly<{|
-    [componentName: string]: ComponentShape,
-  |}>,
-|}>;
+export type PropTypeAnnotation =
+  | $ReadOnly<{
+      type: 'BooleanTypeAnnotation',
+      default: boolean | null,
+    }>
+  | $ReadOnly<{
+      type: 'StringTypeAnnotation',
+      default: string | null,
+    }>
+  | $ReadOnly<{
+      type: 'DoubleTypeAnnotation',
+      default: number,
+    }>
+  | $ReadOnly<{
+      type: 'FloatTypeAnnotation',
+      default: number | null,
+    }>
+  | $ReadOnly<{
+      type: 'Int32TypeAnnotation',
+      default: number,
+    }>
+  | $ReadOnly<{
+      type: 'StringEnumTypeAnnotation',
+      default: string,
+      options: $ReadOnlyArray<string>,
+    }>
+  | $ReadOnly<{
+      type: 'Int32EnumTypeAnnotation',
+      default: number,
+      options: $ReadOnlyArray<number>,
+    }>
+  | ReservedPropTypeAnnotation
+  | ObjectTypeAnnotation<PropTypeAnnotation>
+  | $ReadOnly<{
+      type: 'ArrayTypeAnnotation',
+      elementType:
+        | BooleanTypeAnnotation
+        | StringTypeAnnotation
+        | DoubleTypeAnnotation
+        | FloatTypeAnnotation
+        | Int32TypeAnnotation
+        | $ReadOnly<{
+            type: 'StringEnumTypeAnnotation',
+            default: string,
+            options: $ReadOnlyArray<string>,
+          }>
+        | ObjectTypeAnnotation<PropTypeAnnotation>
+        | ReservedPropTypeAnnotation
+        | $ReadOnly<{
+            type: 'ArrayTypeAnnotation',
+            elementType: ObjectTypeAnnotation<PropTypeAnnotation>,
+          }>,
+    }>;
+
+export type ReservedPropTypeAnnotation = $ReadOnly<{
+  type: 'ReservedPropTypeAnnotation',
+  name:
+    | 'ColorPrimitive'
+    | 'ImageSourcePrimitive'
+    | 'PointPrimitive'
+    | 'EdgeInsetsPrimitive',
+}>;
+
+export type CommandTypeAnnotation = FunctionTypeAnnotation<
+  CommandParamTypeAnnotation,
+  VoidTypeAnnotation,
+>;
+
+export type CommandParamTypeAnnotation =
+  | ReservedTypeAnnotation
+  | BooleanTypeAnnotation
+  | Int32TypeAnnotation
+  | DoubleTypeAnnotation
+  | FloatTypeAnnotation
+  | StringTypeAnnotation;
+
+export type ReservedTypeAnnotation = $ReadOnly<{
+  type: 'ReservedTypeAnnotation',
+  name: 'RootTag', // Union with more custom types.
+}>;
 
 /**
  * NativeModule Types
@@ -263,14 +210,12 @@ export type Nullable<+T: NativeModuleTypeAnnotation> =
   | NullableTypeAnnotation<T>
   | T;
 
-export type NullableTypeAnnotation<
-  +T: NativeModuleTypeAnnotation,
-> = $ReadOnly<{|
+export type NullableTypeAnnotation<+T: NativeModuleTypeAnnotation> = $ReadOnly<{
   type: 'NullableTypeAnnotation',
   typeAnnotation: T,
-|}>;
+}>;
 
-export type NativeModuleSchema = $ReadOnly<{|
+export type NativeModuleSchema = $ReadOnly<{
   type: 'NativeModule',
   aliases: NativeModuleAliasMap,
   spec: NativeModuleSpec,
@@ -279,101 +224,76 @@ export type NativeModuleSchema = $ReadOnly<{|
   // TODO: It's clearer to define `restrictedToPlatforms` instead, but
   // `excludedPlatforms` is used here to be consistent with ComponentSchema.
   excludedPlatforms?: $ReadOnlyArray<PlatformType>,
-|}>;
+}>;
 
-type NativeModuleSpec = $ReadOnly<{|
-  properties: $ReadOnlyArray<NativeModulePropertySchema>,
-|}>;
+type NativeModuleSpec = $ReadOnly<{
+  properties: $ReadOnlyArray<NativeModulePropertyShape>,
+}>;
 
-export type NativeModulePropertySchema = $ReadOnly<{|
-  name: string,
-  optional: boolean,
-  typeAnnotation: Nullable<NativeModuleFunctionTypeAnnotation>,
-|}>;
+export type NativeModulePropertyShape = NamedShape<
+  Nullable<NativeModuleFunctionTypeAnnotation>,
+>;
 
-export type NativeModuleAliasMap = $ReadOnly<{|
+export type NativeModuleAliasMap = $ReadOnly<{
   [aliasName: string]: NativeModuleObjectTypeAnnotation,
-|}>;
-
-export type NativeModuleFunctionTypeAnnotation = $ReadOnly<{|
-  type: 'FunctionTypeAnnotation',
-  params: $ReadOnlyArray<NativeModuleMethodParamSchema>,
-  returnTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
-|}>;
-
-export type NativeModuleMethodParamSchema = $ReadOnly<{|
-  name: string,
-  optional: boolean,
-  typeAnnotation: Nullable<NativeModuleParamTypeAnnotation>,
-|}>;
+}>;
 
-export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
-  type: 'ObjectTypeAnnotation',
-  properties: $ReadOnlyArray<NativeModuleObjectTypeAnnotationPropertySchema>,
-|}>;
+export type NativeModuleFunctionTypeAnnotation = FunctionTypeAnnotation<
+  Nullable<NativeModuleParamTypeAnnotation>,
+  Nullable<NativeModuleReturnTypeAnnotation>,
+>;
 
-export type NativeModuleObjectTypeAnnotationPropertySchema = $ReadOnly<{|
-  name: string,
-  optional: boolean,
-  typeAnnotation: Nullable<NativeModuleBaseTypeAnnotation>,
-|}>;
+export type NativeModuleObjectTypeAnnotation = ObjectTypeAnnotation<
+  Nullable<NativeModuleBaseTypeAnnotation>,
+>;
 
 export type NativeModuleArrayTypeAnnotation<
   +T: Nullable<NativeModuleBaseTypeAnnotation>,
-> = $ReadOnly<{|
+> = $ReadOnly<{
   type: 'ArrayTypeAnnotation',
   /**
    * TODO(T72031674): Migrate all our NativeModule specs to not use
    * invalid Array ElementTypes. Then, make the elementType required.
    */
   elementType?: T,
-|}>;
+}>;
 
-export type NativeModuleStringTypeAnnotation = $ReadOnly<{|
+export type NativeModuleStringTypeAnnotation = $ReadOnly<{
   type: 'StringTypeAnnotation',
-|}>;
+}>;
 
-export type NativeModuleNumberTypeAnnotation = $ReadOnly<{|
+export type NativeModuleNumberTypeAnnotation = $ReadOnly<{
   type: 'NumberTypeAnnotation',
-|}>;
+}>;
 
-export type NativeModuleInt32TypeAnnotation = $ReadOnly<{|
+export type NativeModuleInt32TypeAnnotation = $ReadOnly<{
   type: 'Int32TypeAnnotation',
-|}>;
+}>;
 
-export type NativeModuleDoubleTypeAnnotation = $ReadOnly<{|
+export type NativeModuleDoubleTypeAnnotation = $ReadOnly<{
   type: 'DoubleTypeAnnotation',
-|}>;
+}>;
 
-export type NativeModuleFloatTypeAnnotation = $ReadOnly<{|
+export type NativeModuleFloatTypeAnnotation = $ReadOnly<{
   type: 'FloatTypeAnnotation',
-|}>;
+}>;
 
-export type NativeModuleBooleanTypeAnnotation = $ReadOnly<{|
+export type NativeModuleBooleanTypeAnnotation = $ReadOnly<{
   type: 'BooleanTypeAnnotation',
-|}>;
+}>;
 
-export type NativeModuleGenericObjectTypeAnnotation = $ReadOnly<{|
+export type NativeModuleGenericObjectTypeAnnotation = $ReadOnly<{
   type: 'GenericObjectTypeAnnotation',
-|}>;
-
-export type NativeModuleReservedFunctionValueTypeAnnotation = $ReadOnly<{|
-  type: 'ReservedFunctionValueTypeAnnotation',
-  name: ReservedFunctionValueTypeName,
-|}>;
+}>;
 
-export type NativeModuleTypeAliasTypeAnnotation = $ReadOnly<{|
+export type NativeModuleTypeAliasTypeAnnotation = $ReadOnly<{
   type: 'TypeAliasTypeAnnotation',
   name: string,
-|}>;
+}>;
 
-export type NativeModulePromiseTypeAnnotation = $ReadOnly<{|
+export type NativeModulePromiseTypeAnnotation = $ReadOnly<{
   type: 'PromiseTypeAnnotation',
-|}>;
-
-export type NativeModuleVoidTypeAnnotation = $ReadOnly<{|
-  type: 'VoidTypeAnnotation',
-|}>;
+}>;
 
 export type NativeModuleBaseTypeAnnotation =
   | NativeModuleStringTypeAnnotation
@@ -383,7 +303,7 @@ export type NativeModuleBaseTypeAnnotation =
   | NativeModuleFloatTypeAnnotation
   | NativeModuleBooleanTypeAnnotation
   | NativeModuleGenericObjectTypeAnnotation
-  | NativeModuleReservedFunctionValueTypeAnnotation
+  | ReservedTypeAnnotation
   | NativeModuleTypeAliasTypeAnnotation
   | NativeModuleArrayTypeAnnotation<Nullable<NativeModuleBaseTypeAnnotation>>
   | NativeModuleObjectTypeAnnotation;
@@ -404,6 +324,4 @@ export type NativeModuleTypeAnnotation =
 type NativeModuleParamOnlyTypeAnnotation = NativeModuleFunctionTypeAnnotation;
 type NativeModuleReturnOnlyTypeAnnotation =
   | NativeModulePromiseTypeAnnotation
-  | NativeModuleVoidTypeAnnotation;
-
-export type ReservedFunctionValueTypeName = 'RootTag'; // Union with more custom types.
+  | VoidTypeAnnotation;
diff --git a/packages/react-native-codegen/src/cli/generators/generate-all.js b/packages/react-native-codegen/src/cli/generators/generate-all.js
index 613eec58c0bf48..202c13eff9e43c 100644
--- a/packages/react-native-codegen/src/cli/generators/generate-all.js
+++ b/packages/react-native-codegen/src/cli/generators/generate-all.js
@@ -19,7 +19,7 @@ const fs = require('fs');
 const mkdirp = require('mkdirp');
 
 const args = process.argv.slice(2);
-if (args.length !== 4) {
+if (args.length < 3) {
   throw new Error(
     `Expected to receive path to schema, library name, output directory and module spec name. Received ${args.join(
       ', ',
@@ -30,8 +30,8 @@ if (args.length !== 4) {
 const schemaPath = args[0];
 const libraryName = args[1];
 const outputDirectory = args[2];
-const moduleSpecName = args[3];
-const packageName = args[4];
+const packageName = args[3];
+const assumeNonnull = args[4] === 'true' || args[4] === 'True';
 
 const schemaText = fs.readFileSync(schemaPath, 'utf-8');
 
@@ -49,7 +49,7 @@ try {
 }
 
 RNCodegen.generate(
-  {libraryName, schema, outputDirectory, moduleSpecName, packageName},
+  {libraryName, schema, outputDirectory, packageName, assumeNonnull},
   {
     generators: [
       'descriptors',
diff --git a/packages/react-native-codegen/src/cli/verify_with_old_codegen.js b/packages/react-native-codegen/src/cli/verify_with_old_codegen.js
deleted file mode 100755
index 60192bfab7d852..00000000000000
--- a/packages/react-native-codegen/src/cli/verify_with_old_codegen.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-const fs = require('fs');
-const [first, second] = process.argv.slice(2);
-
-const contents1 = fs.readFileSync(first, 'utf8');
-const contents2 = fs.readFileSync(second, 'utf8');
-
-function traverse(t) {
-  return t
-    .replace(/\).invoke/g, ')\n.invoke') // in old codegen it was in one line
-    .split('\n')
-    .map(l => l.trim()) // no whitespaces
-    .filter(Boolean) // no empty lines
-    .filter(
-      l =>
-        !l.startsWith('namespace') && // no namespaces
-        !l.startsWith('}') && // after removing openign namespaces we need to remove all closings
-        !l.startsWith('/**') && // all comments
-        !l.startsWith('#') && // imports
-        !l.startsWith('//') && // comments
-        !l.startsWith('importing it, you must change') && // comment in old codegen
-        !l.startsWith('*'), //comments
-    )
-    .map(l => l.replace(/ /g, '')) // remove rest whitespaces
-    .sort(); // sort alphabetically lines
-}
-
-const t1 = traverse(contents1);
-const t2 = traverse(contents2);
-
-if (t1.length !== t2.length) {
-  throw new Error('Old and new codegen produces output of different size');
-} else {
-  for (let i = 0; i < t1.length; i++) {
-    if (t1[i] !== t2[i]) {
-      throw new Error(
-        `Old and new codegen does not produce similar output! ${i}  ${t1[i]} | ${t2[i]}`,
-      );
-    }
-  }
-}
diff --git a/packages/react-native-codegen/src/cli/verify_with_old_codegen.sh b/packages/react-native-codegen/src/cli/verify_with_old_codegen.sh
deleted file mode 100755
index 7399c20dcb6294..00000000000000
--- a/packages/react-native-codegen/src/cli/verify_with_old_codegen.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-set -e
-set -u
-
-THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
-
-# shellcheck source=xplat/js/env-utils/setup_env_vars.sh
-source "$THIS_DIR/../../../../../env-utils/setup_env_vars.sh"
-
-pushd "$JS_DIR" >/dev/null
-  "$INSTALL_NODE_MODULES"
-popd >/dev/null
-
-exec "$FLOW_NODE_BINARY" "$THIS_DIR/verify_with_old_codegen.js" "$@"
diff --git a/packages/react-native-codegen/src/generators/RNCodegen.js b/packages/react-native-codegen/src/generators/RNCodegen.js
index 113fb98c962c87..1343c598c7de43 100644
--- a/packages/react-native-codegen/src/generators/RNCodegen.js
+++ b/packages/react-native-codegen/src/generators/RNCodegen.js
@@ -40,15 +40,17 @@ const schemaValidator = require('../SchemaValidator.js');
 
 import type {SchemaType} from '../CodegenSchema';
 
-type Options = $ReadOnly<{|
+type Options = $ReadOnly<{
   libraryName: string,
   schema: SchemaType,
   outputDirectory: string,
-  moduleSpecName: string,
   packageName?: string, // Some platforms have a notion of package, which should be configurable.
-|}>;
+  assumeNonnull: boolean,
+}>;
 
 type Generators =
+  | 'componentsAndroid'
+  | 'componentsIOS'
   | 'descriptors'
   | 'events'
   | 'props'
@@ -58,10 +60,10 @@ type Generators =
   | 'modulesCxx'
   | 'modulesIOS';
 
-type Config = $ReadOnly<{|
+type Config = $ReadOnly<{
   generators: Array<Generators>,
   test?: boolean,
-|}>;
+}>;
 
 const GENERATORS = {
   descriptors: [generateComponentDescriptorH.generate],
@@ -74,6 +76,29 @@ const GENERATORS = {
     generatePropsJavaDelegate.generate,
   ],
   // TODO: Refactor this to consolidate various C++ output variation instead of forking per platform.
+  componentsAndroid: [
+    // JNI/C++ files
+    generateComponentDescriptorH.generate,
+    generateEventEmitterCpp.generate,
+    generateEventEmitterH.generate,
+    generatePropsCpp.generate,
+    generatePropsH.generate,
+    generateShadowNodeCpp.generate,
+    generateShadowNodeH.generate,
+    // Java files
+    generatePropsJavaInterface.generate,
+    generatePropsJavaDelegate.generate,
+  ],
+  componentsIOS: [
+    generateComponentDescriptorH.generate,
+    generateEventEmitterCpp.generate,
+    generateEventEmitterH.generate,
+    generateComponentHObjCpp.generate,
+    generatePropsCpp.generate,
+    generatePropsH.generate,
+    generateShadowNodeCpp.generate,
+    generateShadowNodeH.generate,
+  ],
   modulesAndroid: [
     GenerateModuleJniCpp.generate,
     GenerateModuleJniH.generate,
@@ -128,13 +153,7 @@ function checkFilesForChanges(
 
 module.exports = {
   generate(
-    {
-      libraryName,
-      schema,
-      outputDirectory,
-      moduleSpecName,
-      packageName,
-    }: Options,
+    {libraryName, schema, outputDirectory, packageName, assumeNonnull}: Options,
     {generators, test}: Config,
   ): boolean {
     schemaValidator.validate(schema);
@@ -143,7 +162,7 @@ module.exports = {
     for (const name of generators) {
       for (const generator of GENERATORS[name]) {
         generatedFiles.push(
-          ...generator(libraryName, schema, moduleSpecName, packageName),
+          ...generator(libraryName, schema, packageName, assumeNonnull),
         );
       }
     }
diff --git a/Libraries/Components/Picker/PickerIOS.android.js b/packages/react-native-codegen/src/generators/Utils.js
similarity index 58%
rename from Libraries/Components/Picker/PickerIOS.android.js
rename to packages/react-native-codegen/src/generators/Utils.js
index b7d047ba5de0d9..68c128360e15e7 100644
--- a/Libraries/Components/Picker/PickerIOS.android.js
+++ b/packages/react-native-codegen/src/generators/Utils.js
@@ -4,11 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict
  * @format
  */
 
-// This is a controlled component version of RCTPickerIOS.
-
 'use strict';
 
-module.exports = require('../UnimplementedViews/UnimplementedView');
+function capitalize(string: string): string {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+module.exports = {
+  capitalize,
+};
diff --git a/packages/react-native-codegen/src/generators/components/CppHelpers.js b/packages/react-native-codegen/src/generators/components/CppHelpers.js
index f6e7077a416942..bbf8a48347b3f8 100644
--- a/packages/react-native-codegen/src/generators/components/CppHelpers.js
+++ b/packages/react-native-codegen/src/generators/components/CppHelpers.js
@@ -9,7 +9,7 @@
  */
 
 'use strict';
-import type {PropTypeShape} from '../../CodegenSchema';
+import type {NamedShape, PropTypeAnnotation} from '../../CodegenSchema';
 
 function upperCaseFirst(inString: string): string {
   if (inString.length === 0) {
@@ -55,7 +55,9 @@ function getCppTypeForAnnotation(
   }
 }
 
-function getImports(properties: $ReadOnlyArray<PropTypeShape>): Set<string> {
+function getImports(
+  properties: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
+): Set<string> {
   const imports: Set<string> = new Set();
 
   function addImportsForNativeName(name) {
@@ -91,6 +93,7 @@ function getImports(properties: $ReadOnlyArray<PropTypeShape>): Set<string> {
 
     if (typeAnnotation.type === 'ObjectTypeAnnotation') {
       const objectImports = getImports(typeAnnotation.properties);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       objectImports.forEach(imports.add, imports);
     }
   });
@@ -122,7 +125,7 @@ function getEnumMaskName(enumName: string): string {
 
 function convertDefaultTypeToString(
   componentName: string,
-  prop: PropTypeShape,
+  prop: NamedShape<PropTypeAnnotation>,
 ): string {
   const typeAnnotation = prop.typeAnnotation;
   switch (typeAnnotation.type) {
diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
index cf3d0e03fbb0da..7e670d98e386c3 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
@@ -47,8 +47,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const fileName = 'ComponentDescriptors.h';
 
diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentHObjCpp.js b/packages/react-native-codegen/src/generators/components/GenerateComponentHObjCpp.js
index 978c46887ec78f..d664e3c2b8a38e 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateComponentHObjCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateComponentHObjCpp.js
@@ -11,10 +11,11 @@
 'use strict';
 
 import type {
-  CommandTypeShape,
+  NamedShape,
+  CommandTypeAnnotation,
   ComponentShape,
   SchemaType,
-  CommandsFunctionTypeParamAnnotation,
+  CommandParamTypeAnnotation,
 } from '../../CodegenSchema';
 
 type FilesOutput = Map<string, string>;
@@ -103,11 +104,13 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 `.trim();
 
-function getObjCParamType(param: CommandsFunctionTypeParamAnnotation): string {
+type Param = NamedShape<CommandParamTypeAnnotation>;
+
+function getObjCParamType(param: Param): string {
   const {typeAnnotation} = param;
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return 'double';
@@ -131,13 +134,11 @@ function getObjCParamType(param: CommandsFunctionTypeParamAnnotation): string {
   }
 }
 
-function getObjCExpectedKindParamType(
-  param: CommandsFunctionTypeParamAnnotation,
-): string {
+function getObjCExpectedKindParamType(param: Param): string {
   const {typeAnnotation} = param;
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return '[NSNumber class]';
@@ -161,13 +162,11 @@ function getObjCExpectedKindParamType(
   }
 }
 
-function getReadableExpectedKindParamType(
-  param: CommandsFunctionTypeParamAnnotation,
-): string {
+function getReadableExpectedKindParamType(param: Param): string {
   const {typeAnnotation} = param;
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return 'double';
@@ -192,13 +191,13 @@ function getReadableExpectedKindParamType(
 }
 
 function getObjCRightHandAssignmentParamType(
-  param: CommandsFunctionTypeParamAnnotation,
+  param: Param,
   index: number,
 ): string {
   const {typeAnnotation} = param;
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return `[(NSNumber *)arg${index} doubleValue]`;
@@ -252,7 +251,7 @@ function generateProtocol(
 }
 
 function generateConvertAndValidateParam(
-  param: CommandsFunctionTypeParamAnnotation,
+  param: Param,
   index: number,
   componentName: string,
 ): string {
@@ -273,7 +272,7 @@ function generateConvertAndValidateParam(
 }
 
 function generateCommandIfCase(
-  command: CommandTypeShape,
+  command: NamedShape<CommandTypeAnnotation>,
   componentName: string,
 ) {
   const params = command.typeAnnotation.params;
@@ -324,8 +323,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const fileName = 'RCTComponentViewHelpers.h';
 
diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js
index f1e20d59070e06..4702ed5614b929 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js
@@ -14,7 +14,8 @@ const {generateEventStructName} = require('./CppHelpers.js');
 
 import type {
   ComponentShape,
-  EventObjectPropertyType,
+  NamedShape,
+  EventTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
 
@@ -81,16 +82,37 @@ function generateEnumSetter(variableName, propertyName, propertyParts) {
 
 function generateSetters(
   parentPropertyName: string,
-  properties: $ReadOnlyArray<EventObjectPropertyType>,
+  properties: $ReadOnlyArray<NamedShape<EventTypeAnnotation>>,
   propertyParts: $ReadOnlyArray<string>,
 ): string {
   const propSetters = properties
     .map(eventProperty => {
-      switch (eventProperty.type) {
+      const {typeAnnotation} = eventProperty;
+      switch (typeAnnotation.type) {
         case 'BooleanTypeAnnotation':
+          return generateSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+          );
         case 'StringTypeAnnotation':
+          return generateSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+          );
         case 'Int32TypeAnnotation':
+          return generateSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+          );
         case 'DoubleTypeAnnotation':
+          return generateSetter(
+            parentPropertyName,
+            eventProperty.name,
+            propertyParts,
+          );
         case 'FloatTypeAnnotation':
           return generateSetter(
             parentPropertyName,
@@ -110,7 +132,7 @@ function generateSetters(
               auto ${propertyName} = jsi::Object(runtime);
               ${generateSetters(
                 propertyName,
-                eventProperty.properties,
+                typeAnnotation.properties,
                 propertyParts.concat([propertyName]),
               )}
 
@@ -118,7 +140,7 @@ function generateSetters(
             }
           `.trim();
         default:
-          (eventProperty: empty);
+          (typeAnnotation.type: empty);
           throw new Error('Received invalid event property type');
       }
     })
@@ -167,8 +189,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const moduleComponents: ComponentCollection = Object.keys(schema.modules)
       .map(moduleName => {
diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
index b9d6c3204c0e10..65b4fc631087a1 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
@@ -21,7 +21,8 @@ const {
 import type {
   ComponentShape,
   EventTypeShape,
-  EventObjectPropertyType,
+  NamedShape,
+  EventTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
 
@@ -99,10 +100,10 @@ function indent(nice: string, spaces: number) {
 
 function getNativeTypeFromAnnotation(
   componentName: string,
-  eventProperty: EventObjectPropertyType,
+  eventProperty: NamedShape<EventTypeAnnotation>,
   nameParts: $ReadOnlyArray<string>,
 ): string {
-  const type = eventProperty.type;
+  const {type} = eventProperty.typeAnnotation;
 
   switch (type) {
     case 'BooleanTypeAnnotation':
@@ -123,15 +124,13 @@ function getNativeTypeFromAnnotation(
 function generateEnum(structs, options, nameParts) {
   const structName = generateEventStructName(nameParts);
   const fields = options
-    .map((option, index) => `${toSafeCppString(option.name)}`)
+    .map((option, index) => `${toSafeCppString(option)}`)
     .join(',\n  ');
 
   const toCases = options
     .map(
       option =>
-        `case ${structName}::${toSafeCppString(option.name)}: return "${
-          option.name
-        }";`,
+        `case ${structName}::${toSafeCppString(option)}: return "${option}";`,
     )
     .join('\n' + '    ');
 
@@ -148,7 +147,7 @@ function generateStruct(
   structs: StructsMap,
   componentName: string,
   nameParts: $ReadOnlyArray<string>,
-  properties: $ReadOnlyArray<EventObjectPropertyType>,
+  properties: $ReadOnlyArray<NamedShape<EventTypeAnnotation>>,
 ): void {
   const structNameParts = nameParts;
   const structName = generateEventStructName(structNameParts);
@@ -163,13 +162,17 @@ function generateStruct(
     })
     .join('\n' + '  ');
 
-  properties.forEach((property: EventObjectPropertyType) => {
-    const name = property.name;
-    switch (property.type) {
+  properties.forEach(property => {
+    const {name, typeAnnotation} = property;
+    switch (typeAnnotation.type) {
       case 'BooleanTypeAnnotation':
+        return;
       case 'StringTypeAnnotation':
+        return;
       case 'Int32TypeAnnotation':
+        return;
       case 'DoubleTypeAnnotation':
+        return;
       case 'FloatTypeAnnotation':
         return;
       case 'ObjectTypeAnnotation':
@@ -177,16 +180,16 @@ function generateStruct(
           structs,
           componentName,
           nameParts.concat([name]),
-          nullthrows(property.properties),
+          nullthrows(typeAnnotation.properties),
         );
         return;
       case 'StringEnumTypeAnnotation':
-        generateEnum(structs, property.options, nameParts.concat([name]));
+        generateEnum(structs, typeAnnotation.options, nameParts.concat([name]));
         return;
       default:
-        (property: empty);
+        (typeAnnotation.type: empty);
         throw new Error(
-          `Received invalid event property type ${property.type}`,
+          `Received invalid event property type ${typeAnnotation.type}`,
         );
     }
   });
@@ -235,8 +238,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const moduleComponents: ComponentCollection = Object.keys(schema.modules)
       .map(moduleName => {
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js b/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js
index 1380c768102c1c..b29fdf7adf9ddf 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js
@@ -40,6 +40,7 @@ namespace react {
 
 const componentTemplate = `
 ::_CLASSNAME_::::::_CLASSNAME_::(
+    const PropsParserContext &context,
     const ::_CLASSNAME_:: &sourceProps,
     const RawProps &rawProps):::_EXTEND_CLASSES_::
 
@@ -51,7 +52,7 @@ function generatePropsString(componentName: string, component: ComponentShape) {
   return component.props
     .map(prop => {
       const defaultValue = convertDefaultTypeToString(componentName, prop);
-      return `${prop.name}(convertRawProp(rawProps, "${prop.name}", sourceProps.${prop.name}, {${defaultValue}}))`;
+      return `${prop.name}(convertRawProp(context, rawProps, "${prop.name}", sourceProps.${prop.name}, {${defaultValue}}))`;
     })
     .join(',\n' + '    ');
 }
@@ -65,7 +66,7 @@ function getClassExtendString(component): string {
           case 'ReactNativeBuiltInType':
             switch (extendProps.knownTypeName) {
               case 'ReactNativeCoreViewProps':
-                return 'ViewProps(sourceProps, rawProps)';
+                return 'ViewProps(context, sourceProps, rawProps)';
               default:
                 (extendProps.knownTypeName: empty);
                 throw new Error('Invalid knownTypeName');
@@ -85,12 +86,13 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const fileName = 'Props.cpp';
     const allImports: Set<string> = new Set([
       '#include <react/renderer/core/propsConversions.h>',
+      '#include <react/renderer/core/PropsParserContext.h>',
     ]);
 
     const componentProps = Object.keys(schema.modules)
@@ -122,6 +124,7 @@ module.exports = {
             const extendString = getClassExtendString(component);
 
             const imports = getImports(component.props);
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             imports.forEach(allImports.add, allImports);
 
             const replacedTemplate = componentTemplate
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
index b84793ca440ca5..bdbd5886294784 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
@@ -23,7 +23,8 @@ const {
 
 import type {
   ExtendsPropsShape,
-  PropTypeShape,
+  NamedShape,
+  PropTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
 
@@ -59,7 +60,7 @@ const classTemplate = `
 class ::_CLASSNAME_:: final::_EXTEND_CLASSES_:: {
  public:
   ::_CLASSNAME_::() = default;
-  ::_CLASSNAME_::(const ::_CLASSNAME_:: &sourceProps, const RawProps &rawProps);
+  ::_CLASSNAME_::(const PropsParserContext& context, const ::_CLASSNAME_:: &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -70,7 +71,7 @@ class ::_CLASSNAME_:: final::_EXTEND_CLASSES_:: {
 const enumTemplate = `
 enum class ::_ENUM_NAME_:: { ::_VALUES_:: };
 
-static inline void fromRawValue(const RawValue &value, ::_ENUM_NAME_:: &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ::_ENUM_NAME_:: &result) {
   auto string = (std::string)value;
   ::_FROM_CASES_::
   abort();
@@ -86,7 +87,7 @@ static inline std::string toString(const ::_ENUM_NAME_:: &value) {
 const intEnumTemplate = `
 enum class ::_ENUM_NAME_:: { ::_VALUES_:: };
 
-static inline void fromRawValue(const RawValue &value, ::_ENUM_NAME_:: &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ::_ENUM_NAME_:: &result) {
   assert(value.hasType<int>());
   auto integerValue = (int)value;
   switch (integerValue) {::_FROM_CASES_::
@@ -105,7 +106,7 @@ const structTemplate = `struct ::_STRUCT_NAME_:: {
   ::_FIELDS_::
 };
 
-static inline void fromRawValue(const RawValue &value, ::_STRUCT_NAME_:: &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ::_STRUCT_NAME_:: &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   ::_FROM_CASES_::
@@ -116,23 +117,23 @@ static inline std::string toString(const ::_STRUCT_NAME_:: &value) {
 }
 `.trim();
 
-const arrayConversionFunction = `static inline void fromRawValue(const RawValue &value, std::vector<::_STRUCT_NAME_::> &result) {
+const arrayConversionFunction = `static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<::_STRUCT_NAME_::> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
     ::_STRUCT_NAME_:: newItem;
-    fromRawValue(item, newItem);
+    fromRawValue(context, item, newItem);
     result.emplace_back(newItem);
   }
 }
 `;
 
-const doubleArrayConversionFunction = `static inline void fromRawValue(const RawValue &value, std::vector<std::vector<::_STRUCT_NAME_::>> &result) {
+const doubleArrayConversionFunction = `static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<std::vector<::_STRUCT_NAME_::>> &result) {
   auto items = (std::vector<std::vector<RawValue>>)value;
   for (const std::vector<RawValue> &item : items) {
     auto nestedArray = std::vector<::_STRUCT_NAME_::>{};
     for (const RawValue &nestedItem : item) {
       ::_STRUCT_NAME_:: newItem;
-      fromRawValue(nestedItem, newItem);
+      fromRawValue(context, nestedItem, newItem);
       nestedArray.emplace_back(newItem);
     }
     result.emplace_back(nestedArray);
@@ -165,7 +166,7 @@ constexpr void operator|=(
   lhs = lhs | static_cast<::_ENUM_MASK_::>(rhs);
 }
 
-static inline void fromRawValue(const RawValue &value, ::_ENUM_MASK_:: &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ::_ENUM_MASK_:: &result) {
   auto items = std::vector<std::string>{value};
   for (const auto &item : items) {
     ::_FROM_CASES_::
@@ -289,9 +290,8 @@ function convertValueToEnumOption(value: string): string {
 function generateArrayEnumString(
   componentName: string,
   name: string,
-  enumOptions,
+  options: $ReadOnlyArray<string>,
 ): string {
-  const options = enumOptions.map(option => option.name);
   const enumName = getEnumName(componentName, name);
 
   const values = options
@@ -328,9 +328,7 @@ function generateArrayEnumString(
 function generateStringEnum(componentName, prop) {
   const typeAnnotation = prop.typeAnnotation;
   if (typeAnnotation.type === 'StringEnumTypeAnnotation') {
-    const values: $ReadOnlyArray<string> = typeAnnotation.options.map(
-      option => option.name,
-    );
+    const values: $ReadOnlyArray<string> = typeAnnotation.options;
     const enumName = getEnumName(componentName, prop.name);
 
     const fromCases = values
@@ -364,9 +362,7 @@ function generateStringEnum(componentName, prop) {
 function generateIntEnum(componentName, prop) {
   const typeAnnotation = prop.typeAnnotation;
   if (typeAnnotation.type === 'Int32EnumTypeAnnotation') {
-    const values: $ReadOnlyArray<number> = typeAnnotation.options.map(
-      option => option.value,
-    );
+    const values: $ReadOnlyArray<number> = typeAnnotation.options;
     const enumName = getEnumName(componentName, prop.name);
 
     const fromCases = values
@@ -447,7 +443,7 @@ function generateEnumString(componentName: string, component): string {
 
 function generatePropsString(
   componentName: string,
-  props: $ReadOnlyArray<PropTypeShape>,
+  props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 ) {
   return props
     .map(prop => {
@@ -464,6 +460,8 @@ function getExtendsImports(
 ): Set<string> {
   const imports: Set<string> = new Set();
 
+  imports.add('#include <react/renderer/core/PropsParserContext.h>');
+
   extendsProps.forEach(extendProps => {
     switch (extendProps.type) {
       case 'ReactNativeBuiltInType':
@@ -487,7 +485,7 @@ function getExtendsImports(
 }
 
 function getLocalImports(
-  properties: $ReadOnlyArray<PropTypeShape>,
+  properties: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 ): Set<string> {
   const imports: Set<string> = new Set();
 
@@ -539,7 +537,9 @@ function getLocalImports(
       const objectProps = typeAnnotation.elementType.properties;
       const objectImports = getImports(objectProps);
       const localImports = getLocalImports(objectProps);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       objectImports.forEach(imports.add, imports);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       localImports.forEach(imports.add, imports);
     }
 
@@ -547,7 +547,9 @@ function getLocalImports(
       imports.add('#include <react/renderer/core/propsConversions.h>');
       const objectImports = getImports(typeAnnotation.properties);
       const localImports = getLocalImports(typeAnnotation.properties);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       objectImports.forEach(imports.add, imports);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       localImports.forEach(imports.add, imports);
     }
   });
@@ -677,7 +679,7 @@ function generateStruct(
   structs: StructsMap,
   componentName: string,
   nameParts: $ReadOnlyArray<string>,
-  properties: $ReadOnlyArray<PropTypeShape>,
+  properties: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 ): void {
   const structNameParts = nameParts;
   const structName = generateStructName(componentName, structNameParts);
@@ -692,7 +694,7 @@ function generateStruct(
     })
     .join('\n' + '  ');
 
-  properties.forEach((property: PropTypeShape) => {
+  properties.forEach((property: NamedShape<PropTypeAnnotation>) => {
     const name = property.name;
     switch (property.typeAnnotation.type) {
       case 'BooleanTypeAnnotation':
@@ -737,7 +739,7 @@ function generateStruct(
       const variable = property.name;
       return `auto ${variable} = map.find("${property.name}");
   if (${variable} != map.end()) {
-    fromRawValue(${variable}->second, result.${variable});
+    fromRawValue(context, ${variable}->second, result.${variable});
   }`;
     })
     .join('\n  ');
@@ -755,8 +757,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const fileName = 'Props.h';
 
@@ -800,7 +802,9 @@ module.exports = {
             const extendsImports = getExtendsImports(component.extendsProps);
             const imports = getLocalImports(component.props);
 
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             extendsImports.forEach(allImports.add, allImports);
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             imports.forEach(allImports.add, allImports);
 
             const replacedTemplate = classTemplate
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
index e1bb022ba4efe1..9f35f8e575464f 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
@@ -11,9 +11,10 @@
 'use strict';
 
 import type {
-  CommandTypeShape,
+  NamedShape,
+  CommandTypeAnnotation,
   ComponentShape,
-  PropTypeShape,
+  PropTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
 const {
@@ -35,7 +36,7 @@ const template = `/**
 * ${'@'}generated by codegen project: GeneratePropsJavaDelegate.js
 */
 
-package com.facebook.react.viewmanagers;
+package ::_PACKAGE_NAME_::;
 
 ::_IMPORTS_::
 
@@ -64,7 +65,7 @@ const commandsTemplate = `
 `;
 
 function getJavaValueForProp(
-  prop: PropTypeShape,
+  prop: NamedShape<PropTypeAnnotation>,
   componentName: string,
 ): string {
   const typeAnnotation = prop.typeAnnotation;
@@ -157,7 +158,7 @@ function getCommandArgJavaType(param, index) {
   const {typeAnnotation} = param;
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return `args.getDouble(${index})`;
@@ -181,7 +182,9 @@ function getCommandArgJavaType(param, index) {
   }
 }
 
-function getCommandArguments(command: CommandTypeShape): string {
+function getCommandArguments(
+  command: NamedShape<CommandTypeAnnotation>,
+): string {
   return [
     'view',
     ...command.typeAnnotation.params.map(getCommandArgJavaType),
@@ -242,7 +245,6 @@ function getDelegateImports(component) {
   imports.add('import androidx.annotation.Nullable;');
   imports.add('import com.facebook.react.uimanager.BaseViewManagerDelegate;');
   imports.add('import com.facebook.react.uimanager.BaseViewManagerInterface;');
-  imports.add('import com.facebook.react.uimanager.LayoutShadowNode;');
 
   return imports;
 }
@@ -262,9 +264,13 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
+    // TODO: This doesn't support custom package name yet.
+    const normalizedPackageName = 'com.facebook.react.viewmanagers';
+    const outputDir = `java/${normalizedPackageName.replace(/\./g, '/')}`;
+
     const files = new Map();
     Object.keys(schema.modules).forEach(moduleName => {
       const module = schema.modules[moduleName];
@@ -290,7 +296,6 @@ module.exports = {
           const component = components[componentName];
           const className = getDelegateJavaClassName(componentName);
           const interfaceClassName = getInterfaceJavaClassName(componentName);
-          const fileName = `${className}.java`;
 
           const imports = getDelegateImports(component);
           const propsString = generatePropCasesString(component, componentName);
@@ -307,6 +312,7 @@ module.exports = {
                 .sort()
                 .join('\n'),
             )
+            .replace(/::_PACKAGE_NAME_::/g, normalizedPackageName)
             .replace(/::_CLASSNAME_::/g, className)
             .replace('::_EXTEND_CLASSES_::', extendString)
             .replace('::_PROP_CASES_::', propsString)
@@ -316,7 +322,7 @@ module.exports = {
             )
             .replace(/::_INTERFACE_CLASSNAME_::/g, interfaceClassName);
 
-          files.set(fileName, replacedTemplate);
+          files.set(`${outputDir}/${className}.java`, replacedTemplate);
         });
     });
 
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js
index a357470ce2987c..fd4e891dea5d58 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js
@@ -11,9 +11,10 @@
 'use strict';
 
 import type {
-  CommandTypeShape,
+  NamedShape,
+  CommandTypeAnnotation,
   ComponentShape,
-  PropTypeShape,
+  PropTypeAnnotation,
   SchemaType,
 } from '../../CodegenSchema';
 const {
@@ -34,7 +35,7 @@ const template = `/**
 * ${'@'}generated by codegen project: GeneratePropsJavaInterface.js
 */
 
-package com.facebook.react.viewmanagers;
+package ::_PACKAGE_NAME_::;
 
 ::_IMPORTS_::
 
@@ -47,7 +48,10 @@ function addNullable(imports) {
   imports.add('import androidx.annotation.Nullable;');
 }
 
-function getJavaValueForProp(prop: PropTypeShape, imports): string {
+function getJavaValueForProp(
+  prop: NamedShape<PropTypeAnnotation>,
+  imports,
+): string {
   const typeAnnotation = prop.typeAnnotation;
 
   switch (typeAnnotation.type) {
@@ -128,7 +132,7 @@ function getCommandArgJavaType(param) {
   const {typeAnnotation} = param;
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return 'double';
@@ -153,7 +157,7 @@ function getCommandArgJavaType(param) {
 }
 
 function getCommandArguments(
-  command: CommandTypeShape,
+  command: NamedShape<CommandTypeAnnotation>,
   componentName: string,
 ): string {
   return [
@@ -208,9 +212,13 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
+    // TODO: This doesn't support custom package name yet.
+    const normalizedPackageName = 'com.facebook.react.viewmanagers';
+    const outputDir = `java/${normalizedPackageName.replace(/\./g, '/')}`;
+
     const files = new Map();
     Object.keys(schema.modules).forEach(moduleName => {
       const module = schema.modules[moduleName];
@@ -236,7 +244,6 @@ module.exports = {
         .forEach(componentName => {
           const component = components[componentName];
           const className = getInterfaceJavaClassName(componentName);
-          const fileName = `${className}.java`;
 
           const imports = getImports(component, 'interface');
           const propsString = generatePropsString(component, imports);
@@ -253,6 +260,7 @@ module.exports = {
                 .sort()
                 .join('\n'),
             )
+            .replace(/::_PACKAGE_NAME_::/g, normalizedPackageName)
             .replace(/::_CLASSNAME_::/g, className)
             .replace('::_EXTEND_CLASSES_::', extendString)
             .replace(
@@ -261,7 +269,7 @@ module.exports = {
             )
             .replace('::_COMMAND_HANDLERS_::', commandsString);
 
-          files.set(fileName, replacedTemplate);
+          files.set(`${outputDir}/${className}.java`, replacedTemplate);
         });
     });
 
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/PojoCollector.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/PojoCollector.js
new file mode 100644
index 00000000000000..f80ad58863f7c3
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/PojoCollector.js
@@ -0,0 +1,187 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {
+  ReservedPropTypeAnnotation,
+  NamedShape,
+  ObjectTypeAnnotation,
+  BooleanTypeAnnotation,
+  StringTypeAnnotation,
+  DoubleTypeAnnotation,
+  FloatTypeAnnotation,
+  Int32TypeAnnotation,
+  PropTypeAnnotation,
+} from '../../../CodegenSchema';
+
+const {capitalize} = require('../../Utils');
+
+export type Pojo = {
+  name: string,
+  namespace: string,
+  properties: $ReadOnlyArray<PojoProperty>,
+};
+
+export type PojoProperty = NamedShape<PojoTypeAnnotation>;
+
+export type PojoTypeAliasAnnotation = {
+  type: 'PojoTypeAliasTypeAnnotation',
+  name: string,
+};
+
+export type PojoTypeAnnotation =
+  | $ReadOnly<{
+      type: 'BooleanTypeAnnotation',
+      default: boolean | null,
+    }>
+  | $ReadOnly<{
+      type: 'StringTypeAnnotation',
+      default: string | null,
+    }>
+  | $ReadOnly<{
+      type: 'DoubleTypeAnnotation',
+      default: number,
+    }>
+  | $ReadOnly<{
+      type: 'FloatTypeAnnotation',
+      default: number | null,
+    }>
+  | $ReadOnly<{
+      type: 'Int32TypeAnnotation',
+      default: number,
+    }>
+  | $ReadOnly<{
+      type: 'StringEnumTypeAnnotation',
+      default: string,
+      options: $ReadOnlyArray<string>,
+    }>
+  | $ReadOnly<{
+      type: 'Int32EnumTypeAnnotation',
+      default: number,
+      options: $ReadOnlyArray<number>,
+    }>
+  | ReservedPropTypeAnnotation
+  | PojoTypeAliasAnnotation
+  | $ReadOnly<{
+      type: 'ArrayTypeAnnotation',
+      elementType:
+        | BooleanTypeAnnotation
+        | StringTypeAnnotation
+        | DoubleTypeAnnotation
+        | FloatTypeAnnotation
+        | Int32TypeAnnotation
+        | $ReadOnly<{
+            type: 'StringEnumTypeAnnotation',
+            default: string,
+            options: $ReadOnlyArray<string>,
+          }>
+        | PojoTypeAliasAnnotation
+        | ReservedPropTypeAnnotation
+        | $ReadOnly<{
+            type: 'ArrayTypeAnnotation',
+            elementType: PojoTypeAliasAnnotation,
+          }>,
+    }>;
+
+class PojoCollector {
+  _pojos: Map<string, Pojo> = new Map();
+  process(
+    namespace: string,
+    pojoName: string,
+    typeAnnotation: PropTypeAnnotation,
+  ): PojoTypeAnnotation {
+    switch (typeAnnotation.type) {
+      case 'ObjectTypeAnnotation': {
+        this._insertPojo(namespace, pojoName, typeAnnotation);
+        return {
+          type: 'PojoTypeAliasTypeAnnotation',
+          name: pojoName,
+        };
+      }
+      case 'ArrayTypeAnnotation': {
+        const arrayTypeAnnotation = typeAnnotation;
+        // TODO: Flow assumes elementType can be any. Fix this.
+        const elementType: $PropertyType<
+          typeof arrayTypeAnnotation,
+          'elementType',
+        > = arrayTypeAnnotation.elementType;
+
+        const pojoElementType = (() => {
+          switch (elementType.type) {
+            case 'ObjectTypeAnnotation': {
+              this._insertPojo(namespace, `${pojoName}Element`, elementType);
+              return {
+                type: 'PojoTypeAliasTypeAnnotation',
+                name: `${pojoName}Element`,
+              };
+            }
+            case 'ArrayTypeAnnotation': {
+              const {elementType: objectTypeAnnotation} = elementType;
+              this._insertPojo(
+                namespace,
+                `${pojoName}ElementElement`,
+                objectTypeAnnotation,
+              );
+              return {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'PojoTypeAliasTypeAnnotation',
+                  name: `${pojoName}ElementElement`,
+                },
+              };
+            }
+            default: {
+              return elementType;
+            }
+          }
+        })();
+
+        return {
+          type: 'ArrayTypeAnnotation',
+          elementType: pojoElementType,
+        };
+      }
+      default:
+        return typeAnnotation;
+    }
+  }
+
+  _insertPojo(
+    namespace: string,
+    pojoName: string,
+    objectTypeAnnotation: ObjectTypeAnnotation<PropTypeAnnotation>,
+  ) {
+    const properties = objectTypeAnnotation.properties.map(property => {
+      const propertyPojoName = pojoName + capitalize(property.name);
+
+      return {
+        ...property,
+        typeAnnotation: this.process(
+          namespace,
+          propertyPojoName,
+          property.typeAnnotation,
+        ),
+      };
+    });
+
+    this._pojos.set(pojoName, {
+      name: pojoName,
+      namespace,
+      properties,
+    });
+  }
+
+  getAllPojos(): $ReadOnlyArray<Pojo> {
+    return [...this._pojos.values()];
+  }
+}
+
+module.exports = PojoCollector;
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/index.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/index.js
new file mode 100644
index 00000000000000..f5fa8c77f01f17
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/index.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {SchemaType} from '../../../CodegenSchema';
+
+const PojoCollector = require('./PojoCollector');
+const {capitalize} = require('../../Utils');
+const {serializePojo} = require('./serializePojo');
+
+type FilesOutput = Map<string, string>;
+
+module.exports = {
+  generate(
+    libraryName: string,
+    schema: SchemaType,
+    packageName?: string,
+  ): FilesOutput {
+    const pojoCollector = new PojoCollector();
+    const basePackageName = 'com.facebook.react.viewmanagers';
+
+    Object.keys(schema.modules).forEach(hasteModuleName => {
+      const module = schema.modules[hasteModuleName];
+      if (module.type !== 'Component') {
+        return;
+      }
+
+      const {components} = module;
+      // No components in this module
+      if (components == null) {
+        return null;
+      }
+
+      Object.keys(components)
+        .filter(componentName => {
+          const component = components[componentName];
+          return !(
+            component.excludedPlatforms &&
+            component.excludedPlatforms.includes('android')
+          );
+        })
+        .forEach(componentName => {
+          const component = components[componentName];
+          if (component == null) {
+            return;
+          }
+
+          const {props} = component;
+
+          pojoCollector.process(
+            capitalize(hasteModuleName),
+            `${capitalize(componentName)}Props`,
+            {
+              type: 'ObjectTypeAnnotation',
+              properties: props,
+            },
+          );
+        });
+    });
+
+    const pojoDir = basePackageName.split('.').join('/');
+
+    return new Map(
+      pojoCollector.getAllPojos().map(pojo => {
+        return [
+          `java/${pojoDir}/${pojo.namespace}/${pojo.name}.java`,
+          serializePojo(pojo, basePackageName),
+        ];
+      }),
+    );
+  },
+};
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
new file mode 100644
index 00000000000000..72829ec3dd5d6e
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
@@ -0,0 +1,285 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {Pojo, PojoProperty, PojoTypeAnnotation} from './PojoCollector';
+const {capitalize} = require('../../Utils');
+
+type ImportCollector = ($import: string) => void;
+
+function toJavaType(
+  typeAnnotation: PojoTypeAnnotation,
+  addImport: ImportCollector,
+): string {
+  const importNullable = () => addImport('androidx.annotation.Nullable');
+  const importReadableMap = () =>
+    addImport('com.facebook.react.bridge.ReadableMap');
+  const importArrayList = () => addImport('java.util.ArrayList');
+  switch (typeAnnotation.type) {
+    /**
+     * Primitives
+     */
+    case 'BooleanTypeAnnotation': {
+      if (typeAnnotation.default === null) {
+        importNullable();
+        return '@Nullable Boolean';
+      } else {
+        return 'boolean';
+      }
+    }
+    case 'StringTypeAnnotation': {
+      importNullable();
+      return '@Nullable String';
+    }
+    case 'DoubleTypeAnnotation': {
+      return 'double';
+    }
+    case 'FloatTypeAnnotation': {
+      if (typeAnnotation.default === null) {
+        importNullable();
+        return '@Nullable Float';
+      } else {
+        return 'float';
+      }
+    }
+    case 'Int32TypeAnnotation': {
+      return 'int';
+    }
+
+    /**
+     * Enums
+     */
+    // TODO: Make StringEnumTypeAnnotation type-safe?
+    case 'StringEnumTypeAnnotation':
+      importNullable();
+      return '@Nullable String';
+    // TODO: Make Int32EnumTypeAnnotation type-safe?
+    case 'Int32EnumTypeAnnotation':
+      importNullable();
+      return '@Nullable Integer';
+
+    /**
+     * Reserved types
+     */
+    case 'ReservedPropTypeAnnotation': {
+      switch (typeAnnotation.name) {
+        case 'ColorPrimitive':
+          importNullable();
+          return '@Nullable Integer';
+
+        // TODO: Make ImageSourcePrimitive type-safe
+        case 'ImageSourcePrimitive':
+          importNullable();
+          importReadableMap();
+          return '@Nullable ReadableMap';
+
+        // TODO: Make PointPrimitive type-safe
+        case 'PointPrimitive':
+          importNullable();
+          importReadableMap();
+          return '@Nullable ReadableMap';
+
+        // TODO: Make EdgeInsetsPrimitive type-safe
+        case 'EdgeInsetsPrimitive':
+          importNullable();
+          importReadableMap();
+          return '@Nullable ReadableMap';
+        default:
+          (typeAnnotation.name: empty);
+          throw new Error(
+            `Received unknown ReservedPropTypeAnnotation ${typeAnnotation.name}`,
+          );
+      }
+    }
+
+    /**
+     * Other Pojo objects
+     */
+    case 'PojoTypeAliasTypeAnnotation': {
+      return typeAnnotation.name;
+    }
+
+    /**
+     * Arrays
+     */
+    case 'ArrayTypeAnnotation': {
+      const {elementType} = typeAnnotation;
+
+      const elementTypeString = (() => {
+        switch (elementType.type) {
+          /**
+           * Primitives
+           */
+          case 'BooleanTypeAnnotation': {
+            return 'Boolean';
+          }
+          case 'StringTypeAnnotation': {
+            return 'String';
+          }
+          case 'DoubleTypeAnnotation': {
+            return 'Double';
+          }
+          case 'FloatTypeAnnotation': {
+            return 'Float';
+          }
+          case 'Int32TypeAnnotation': {
+            return 'Integer';
+          }
+
+          /**
+           * Enums
+           */
+          // TODO: Make StringEnums type-safe in Pojos
+          case 'StringEnumTypeAnnotation': {
+            return 'String';
+          }
+
+          /**
+           * Other Pojo objects
+           */
+          case 'PojoTypeAliasTypeAnnotation': {
+            return elementType.name;
+          }
+
+          /**
+           * Reserved types
+           */
+          case 'ReservedPropTypeAnnotation': {
+            switch (elementType.name) {
+              case 'ColorPrimitive':
+                return 'Integer';
+
+              // TODO: Make ImageSourcePrimitive type-safe
+              case 'ImageSourcePrimitive':
+                importReadableMap();
+                return 'ReadableMap';
+
+              // TODO: Make PointPrimitive type-safe
+              case 'PointPrimitive':
+                importReadableMap();
+                return 'ReadableMap';
+
+              // TODO: Make EdgeInsetsPrimitive type-safe
+              case 'EdgeInsetsPrimitive':
+                importReadableMap();
+                return 'ReadableMap';
+              default:
+                (elementType.name: empty);
+                throw new Error(
+                  `Received unknown ReservedPropTypeAnnotation ${elementType.name}`,
+                );
+            }
+          }
+
+          // Arrays
+          case 'ArrayTypeAnnotation': {
+            const {elementType: pojoTypeAliasTypeAnnotation} = elementType;
+
+            importArrayList();
+            return `ArrayList<${pojoTypeAliasTypeAnnotation.name}>`;
+          }
+          default: {
+            (elementType.type: empty);
+            throw new Error(
+              `Unrecognized PojoTypeAnnotation Array element type annotation '${typeAnnotation.type}'`,
+            );
+          }
+        }
+      })();
+
+      importArrayList();
+      return `ArrayList<${elementTypeString}>`;
+    }
+
+    default: {
+      (typeAnnotation.type: empty);
+      throw new Error(
+        `Unrecognized PojoTypeAnnotation '${typeAnnotation.type}'`,
+      );
+    }
+  }
+}
+
+function toJavaMemberName(property: PojoProperty): string {
+  return `m${capitalize(property.name)}`;
+}
+
+function toJavaMemberDeclaration(
+  property: PojoProperty,
+  addImport: ImportCollector,
+): string {
+  const type = toJavaType(property.typeAnnotation, addImport);
+  const memberName = toJavaMemberName(property);
+  return `private ${type} ${memberName};`;
+}
+
+function toJavaGetter(property: PojoProperty, addImport: ImportCollector) {
+  const type = toJavaType(property.typeAnnotation, addImport);
+  const getterName = `get${capitalize(property.name)}`;
+  const memberName = toJavaMemberName(property);
+
+  addImport('com.facebook.proguard.annotations.DoNotStrip');
+  return `@DoNotStrip
+public ${type} ${getterName}() {
+  return ${memberName};
+}`;
+}
+
+function serializePojo(pojo: Pojo, basePackageName: string): string {
+  const importSet: Set<string> = new Set();
+  const addImport = ($import: string) => {
+    importSet.add($import);
+  };
+
+  addImport('com.facebook.proguard.annotations.DoNotStrip');
+
+  const indent = ' '.repeat(2);
+
+  const members = pojo.properties
+    .map(property => toJavaMemberDeclaration(property, addImport))
+    .map(member => `${indent}${member}`)
+    .join('\n');
+
+  const getters = pojo.properties
+    .map(property => toJavaGetter(property, addImport))
+    .map(getter =>
+      getter
+        .split('\n')
+        .map(line => `${indent}${line}`)
+        .join('\n'),
+    )
+    .join('\n');
+
+  const imports = [...importSet]
+    .map($import => `import ${$import};`)
+    .sort()
+    .join('\n');
+
+  return `/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* ${'@'}generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package ${basePackageName}.${pojo.namespace};
+${imports === '' ? '' : `\n${imports}\n`}
+@DoNotStrip
+public class ${pojo.name} {
+${members}
+${getters}
+}
+`;
+}
+
+module.exports = {serializePojo};
diff --git a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js
index 2644808cac19d8..4c11da440c3806 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js
@@ -44,8 +44,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const fileName = 'ShadowNodes.cpp';
 
diff --git a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js
index 1855b379d447f8..c976955ce0f36e 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js
@@ -54,8 +54,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const fileName = 'ShadowNodes.h';
 
diff --git a/packages/react-native-codegen/src/generators/components/GenerateTests.js b/packages/react-native-codegen/src/generators/components/GenerateTests.js
index ab8e00e4534590..1681fd9922faa8 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateTests.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateTests.js
@@ -16,12 +16,12 @@ const {getImports, toSafeCppString} = require('./CppHelpers');
 type FilesOutput = Map<string, string>;
 type PropValueType = string | number | boolean;
 
-type TestCase = $ReadOnly<{|
+type TestCase = $ReadOnly<{
   propName: string,
   propValue: ?PropValueType,
   testName?: string,
   raw?: boolean,
-|}>;
+}>;
 
 const fileTemplate = `
 /**
@@ -34,6 +34,7 @@ const fileTemplate = `
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/::_LIBRARY_NAME_::/Props.h>
 ::_IMPORTS_::
 
@@ -47,8 +48,12 @@ TEST(::_COMPONENT_NAME_::_::_TEST_NAME_::, etc) {
   propParser.prepare<::_COMPONENT_NAME_::>();
   auto const &sourceProps = ::_COMPONENT_NAME_::();
   auto const &rawProps = RawProps(folly::dynamic::object("::_PROP_NAME_::", ::_PROP_VALUE_::));
-  rawProps.parse(propParser);
-  ::_COMPONENT_NAME_::(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ::_COMPONENT_NAME_::(parserContext, sourceProps, rawProps);
 }
 `;
 
@@ -58,8 +63,8 @@ function getTestCasesForProp(propName, typeAnnotation) {
     typeAnnotation.options.forEach(option =>
       cases.push({
         propName,
-        testName: `${propName}_${toSafeCppString(option.name)}`,
-        propValue: option.name,
+        testName: `${propName}_${toSafeCppString(option)}`,
+        propValue: option,
       }),
     );
   } else if (typeAnnotation.type === 'StringTypeAnnotation') {
@@ -139,8 +144,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const fileName = 'Tests.cpp';
     const allImports = new Set([
@@ -167,6 +172,7 @@ module.exports = {
             const name = `${componentName}Props`;
 
             const imports = getImports(component.props);
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             imports.forEach(allImports.add, allImports);
 
             return generateTestsString(name, component);
diff --git a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js
index 63f6dc7892cd16..a95cce35fe0c90 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js
@@ -94,24 +94,18 @@ function getReactDiffProcessValue(typeAnnotation) {
 }
 
 const componentTemplate = `
-const ::_COMPONENT_NAME_::ViewConfig = VIEW_CONFIG;
-
 let nativeComponentName = '::_COMPONENT_NAME_WITH_COMPAT_SUPPORT_::';
 ::_DEPRECATION_CHECK_::
-registerGeneratedViewConfig(nativeComponentName, ::_COMPONENT_NAME_::ViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ::_COMPONENT_NAME_::ViewConfig;
-
-export default nativeComponentName;
+export default NativeComponentRegistry.get(nativeComponentName, () => VIEW_CONFIG);
 `.trim();
 
 const deprecatedComponentTemplate = `
 if (UIManager.getViewManagerConfig('::_COMPONENT_NAME_::')) {
   nativeComponentName = '::_COMPONENT_NAME_::';
-} else if (UIManager.getViewManagerConfig('::_COMPONENT_NAME_DEPRECATED_::')){
+} else if (UIManager.getViewManagerConfig('::_COMPONENT_NAME_DEPRECATED_::')) {
   nativeComponentName = '::_COMPONENT_NAME_DEPRECATED_::';
 } else {
-  throw new Error('Failed to find native component for either "::_COMPONENT_NAME_::" or "::_COMPONENT_NAME_DEPRECATED_::"')
+  throw new Error('Failed to find native component for either "::_COMPONENT_NAME_::" or "::_COMPONENT_NAME_DEPRECATED_::"');
 }
 `.trim();
 
@@ -183,7 +177,7 @@ function buildViewConfig(
         switch (extendProps.knownTypeName) {
           case 'ReactNativeCoreViewProps':
             imports.add(
-              "const registerGeneratedViewConfig = require('registerGeneratedViewConfig');",
+              "const NativeComponentRegistry = require('NativeComponentRegistry');",
             );
 
             return;
diff --git a/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js
index 233254e8011281..69529644cc4298 100644
--- a/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js
@@ -58,9 +58,11 @@ const INTERFACE_ONLY: SchemaType = {
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
-                      type: 'BooleanTypeAnnotation',
                       name: 'value',
                       optional: false,
+                      typeAnnotation: {
+                        type: 'BooleanTypeAnnotation',
+                      },
                     },
                   ],
                 },
@@ -110,9 +112,11 @@ const EVENTS_WITH_PAPER_NAME: SchemaType = {
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
-                      type: 'BooleanTypeAnnotation',
                       name: 'value',
                       optional: false,
+                      typeAnnotation: {
+                        type: 'BooleanTypeAnnotation',
+                      },
                     },
                   ],
                 },
@@ -129,9 +133,11 @@ const EVENTS_WITH_PAPER_NAME: SchemaType = {
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
-                      type: 'BooleanTypeAnnotation',
                       name: 'value',
                       optional: false,
+                      typeAnnotation: {
+                        type: 'BooleanTypeAnnotation',
+                      },
                     },
                   ],
                 },
@@ -615,14 +621,7 @@ const ARRAY_PROPS: SchemaType = {
                 elementType: {
                   type: 'StringEnumTypeAnnotation',
                   default: 'small',
-                  options: [
-                    {
-                      name: 'small',
-                    },
-                    {
-                      name: 'large',
-                    },
-                  ],
+                  options: ['small', 'large'],
                 },
               },
             },
@@ -837,11 +836,7 @@ const OBJECT_PROPS: SchemaType = {
                     typeAnnotation: {
                       type: 'StringEnumTypeAnnotation',
                       default: 'option1',
-                      options: [
-                        {
-                          name: 'option1',
-                        },
-                      ],
+                      options: ['option1'],
                     },
                   },
                   {
@@ -850,11 +845,7 @@ const OBJECT_PROPS: SchemaType = {
                     typeAnnotation: {
                       type: 'Int32EnumTypeAnnotation',
                       default: 0,
-                      options: [
-                        {
-                          value: 0,
-                        },
-                      ],
+                      options: [0],
                     },
                   },
                   {
@@ -1049,17 +1040,7 @@ const STRING_ENUM_PROP: SchemaType = {
               typeAnnotation: {
                 type: 'StringEnumTypeAnnotation',
                 default: 'center',
-                options: [
-                  {
-                    name: 'top',
-                  },
-                  {
-                    name: 'center',
-                  },
-                  {
-                    name: 'bottom-right',
-                  },
-                ],
+                options: ['top', 'center', 'bottom-right'],
               },
             },
           ],
@@ -1090,17 +1071,7 @@ const INT32_ENUM_PROP: SchemaType = {
               typeAnnotation: {
                 type: 'Int32EnumTypeAnnotation',
                 default: 0,
-                options: [
-                  {
-                    value: 0,
-                  },
-                  {
-                    value: 1,
-                  },
-                  {
-                    value: 2,
-                  },
-                ],
+                options: [0, 1, 2],
               },
             },
           ],
@@ -1134,24 +1105,32 @@ const EVENT_PROPS: SchemaType = {
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
-                      type: 'BooleanTypeAnnotation',
                       name: 'value',
                       optional: false,
+                      typeAnnotation: {
+                        type: 'BooleanTypeAnnotation',
+                      },
                     },
                     {
-                      type: 'StringTypeAnnotation',
                       name: 'source',
                       optional: true,
+                      typeAnnotation: {
+                        type: 'StringTypeAnnotation',
+                      },
                     },
                     {
-                      type: 'Int32TypeAnnotation',
                       name: 'progress',
                       optional: true,
+                      typeAnnotation: {
+                        type: 'Int32TypeAnnotation',
+                      },
                     },
                     {
-                      type: 'FloatTypeAnnotation',
                       name: 'scale',
                       optional: true,
+                      typeAnnotation: {
+                        type: 'FloatTypeAnnotation',
+                      },
                     },
                   ],
                 },
@@ -1167,9 +1146,11 @@ const EVENT_PROPS: SchemaType = {
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
-                      type: 'BooleanTypeAnnotation',
                       name: 'value',
                       optional: false,
+                      typeAnnotation: {
+                        type: 'BooleanTypeAnnotation',
+                      },
                     },
                   ],
                 },
@@ -1185,17 +1166,12 @@ const EVENT_PROPS: SchemaType = {
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
-                      type: 'StringEnumTypeAnnotation',
                       name: 'orientation',
                       optional: false,
-                      options: [
-                        {
-                          name: 'landscape',
-                        },
-                        {
-                          name: 'portrait',
-                        },
-                      ],
+                      typeAnnotation: {
+                        type: 'StringEnumTypeAnnotation',
+                        options: ['landscape', 'portrait'],
+                      },
                     },
                   ],
                 },
@@ -1250,33 +1226,43 @@ const EVENT_NESTED_OBJECT_PROPS: SchemaType = {
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
-                      type: 'ObjectTypeAnnotation',
                       name: 'location',
                       optional: false,
-                      properties: [
-                        {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'source',
-                          optional: false,
-                          properties: [
-                            {
-                              type: 'StringTypeAnnotation',
-                              name: 'url',
-                              optional: false,
+                      typeAnnotation: {
+                        type: 'ObjectTypeAnnotation',
+                        properties: [
+                          {
+                            name: 'source',
+                            optional: false,
+                            typeAnnotation: {
+                              type: 'ObjectTypeAnnotation',
+                              properties: [
+                                {
+                                  name: 'url',
+                                  optional: false,
+                                  typeAnnotation: {
+                                    type: 'StringTypeAnnotation',
+                                  },
+                                },
+                              ],
                             },
-                          ],
-                        },
-                        {
-                          type: 'Int32TypeAnnotation',
-                          name: 'x',
-                          optional: false,
-                        },
-                        {
-                          type: 'Int32TypeAnnotation',
-                          name: 'y',
-                          optional: false,
-                        },
-                      ],
+                          },
+                          {
+                            name: 'x',
+                            optional: false,
+                            typeAnnotation: {
+                              type: 'Int32TypeAnnotation',
+                            },
+                          },
+                          {
+                            name: 'y',
+                            optional: false,
+                            typeAnnotation: {
+                              type: 'Int32TypeAnnotation',
+                            },
+                          },
+                        ],
+                      },
                     },
                   ],
                 },
@@ -1428,6 +1414,9 @@ const COMMANDS: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 params: [],
+                returnTypeAnnotation: {
+                  type: 'VoidTypeAnnotation',
+                },
               },
             },
             {
@@ -1438,35 +1427,43 @@ const COMMANDS: SchemaType = {
                 params: [
                   {
                     name: 'x',
+                    optional: false,
                     typeAnnotation: {
                       type: 'Int32TypeAnnotation',
                     },
                   },
                   {
                     name: 'y',
+                    optional: false,
                     typeAnnotation: {
                       type: 'FloatTypeAnnotation',
                     },
                   },
                   {
                     name: 'z',
+                    optional: false,
                     typeAnnotation: {
                       type: 'DoubleTypeAnnotation',
                     },
                   },
                   {
                     name: 'message',
+                    optional: false,
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
                     },
                   },
                   {
                     name: 'animated',
+                    optional: false,
                     typeAnnotation: {
                       type: 'BooleanTypeAnnotation',
                     },
                   },
                 ],
+                returnTypeAnnotation: {
+                  type: 'VoidTypeAnnotation',
+                },
               },
             },
           ],
@@ -1508,12 +1505,16 @@ const COMMANDS_AND_PROPS: SchemaType = {
                 params: [
                   {
                     name: 'rootTag',
+                    optional: false,
                     typeAnnotation: {
-                      type: 'ReservedFunctionValueTypeAnnotation',
+                      type: 'ReservedTypeAnnotation',
                       name: 'RootTag',
                     },
                   },
                 ],
+                returnTypeAnnotation: {
+                  type: 'VoidTypeAnnotation',
+                },
               },
             },
             {
@@ -1524,17 +1525,22 @@ const COMMANDS_AND_PROPS: SchemaType = {
                 params: [
                   {
                     name: 'x',
+                    optional: false,
                     typeAnnotation: {
                       type: 'Int32TypeAnnotation',
                     },
                   },
                   {
                     name: 'y',
+                    optional: false,
                     typeAnnotation: {
                       type: 'Int32TypeAnnotation',
                     },
                   },
                 ],
+                returnTypeAnnotation: {
+                  type: 'VoidTypeAnnotation',
+                },
               },
             },
           ],
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js
index c73dd315c8bf95..02133c76f90539 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js
@@ -21,9 +21,7 @@ describe('GenerateComponentDescriptorH', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js
index 44528dbbb02a37..52b638973aae82 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js
@@ -21,9 +21,7 @@ describe('GenerateComponentHObjCpp', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js
index 5a17690e597b8f..14ac106e959b4d 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js
@@ -21,9 +21,7 @@ describe('GenerateEventEmitterCpp', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js
index 3b1974f66539f1..2b6a26422aa306 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js
@@ -21,9 +21,7 @@ describe('GenerateEventEmitterH', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js
index 284c5457acadcb..f9b9332a1259ca 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js
@@ -21,9 +21,7 @@ describe('GeneratePropsCpp', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js
index 23f8769ebeb814..77305fc2c4a077 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js
@@ -21,9 +21,7 @@ describe('GeneratePropsH', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js
index b9c5724c914e6a..36f1f9e8a5ca1a 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js
@@ -21,9 +21,7 @@ describe('GeneratePropsJavaDelegate', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js
index a14ac875cc7b9a..cc1eadab41ab78 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js
@@ -21,9 +21,7 @@ describe('GeneratePropsJavaInterface', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js
new file mode 100644
index 00000000000000..80b2df4dd042b9
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+react_native
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+const fixtures = require('../__test_fixtures__/fixtures.js');
+const generator = require('../GeneratePropsJavaPojo');
+
+describe('GeneratePropsJavaPojo', () => {
+  Object.keys(fixtures)
+    .sort()
+    .forEach(fixtureName => {
+      const fixture = fixtures[fixtureName];
+
+      it(`can generate fixture ${fixtureName}`, () => {
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
+      });
+    });
+});
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js
index 3edd5e3695fdab..ea704d4773d614 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js
@@ -21,9 +21,7 @@ describe('GenerateShadowNodeH', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js
index 8b9f066b0c18b4..6961d0b1754ee1 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js
@@ -21,9 +21,7 @@ describe('GenerateTests', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
-        ).toMatchSnapshot();
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
       });
     });
 });
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
index 3dabcf8bdcb5ef..3e5a5b031f972f 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
@@ -14,26 +14,28 @@ Map {
 
 #include <react/renderer/components/ARRAY_PROPS/Props.h>
 #include <react/renderer/components/image/conversions.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 ArrayPropsNativeComponentProps::ArrayPropsNativeComponentProps(
+    const PropsParserContext &context,
     const ArrayPropsNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    names(convertRawProp(rawProps, \\"names\\", sourceProps.names, {})),
-    disableds(convertRawProp(rawProps, \\"disableds\\", sourceProps.disableds, {})),
-    progress(convertRawProp(rawProps, \\"progress\\", sourceProps.progress, {})),
-    radii(convertRawProp(rawProps, \\"radii\\", sourceProps.radii, {})),
-    colors(convertRawProp(rawProps, \\"colors\\", sourceProps.colors, {})),
-    srcs(convertRawProp(rawProps, \\"srcs\\", sourceProps.srcs, {})),
-    points(convertRawProp(rawProps, \\"points\\", sourceProps.points, {})),
-    sizes(convertRawProp(rawProps, \\"sizes\\", sourceProps.sizes, {static_cast<ArrayPropsNativeComponentSizesMask>(ArrayPropsNativeComponentSizes::Small)})),
-    object(convertRawProp(rawProps, \\"object\\", sourceProps.object, {})),
-    array(convertRawProp(rawProps, \\"array\\", sourceProps.array, {})),
-    arrayOfArrayOfObject(convertRawProp(rawProps, \\"arrayOfArrayOfObject\\", sourceProps.arrayOfArrayOfObject, {}))
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    names(convertRawProp(context, rawProps, \\"names\\", sourceProps.names, {})),
+    disableds(convertRawProp(context, rawProps, \\"disableds\\", sourceProps.disableds, {})),
+    progress(convertRawProp(context, rawProps, \\"progress\\", sourceProps.progress, {})),
+    radii(convertRawProp(context, rawProps, \\"radii\\", sourceProps.radii, {})),
+    colors(convertRawProp(context, rawProps, \\"colors\\", sourceProps.colors, {})),
+    srcs(convertRawProp(context, rawProps, \\"srcs\\", sourceProps.srcs, {})),
+    points(convertRawProp(context, rawProps, \\"points\\", sourceProps.points, {})),
+    sizes(convertRawProp(context, rawProps, \\"sizes\\", sourceProps.sizes, {static_cast<ArrayPropsNativeComponentSizesMask>(ArrayPropsNativeComponentSizes::Small)})),
+    object(convertRawProp(context, rawProps, \\"object\\", sourceProps.object, {})),
+    array(convertRawProp(context, rawProps, \\"array\\", sourceProps.array, {})),
+    arrayOfArrayOfObject(convertRawProp(context, rawProps, \\"arrayOfArrayOfObject\\", sourceProps.arrayOfArrayOfObject, {}))
       {}
 
 } // namespace react
@@ -55,16 +57,18 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 ArrayPropsNativeComponentProps::ArrayPropsNativeComponentProps(
+    const PropsParserContext &context,
     const ArrayPropsNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    nativePrimitives(convertRawProp(rawProps, \\"nativePrimitives\\", sourceProps.nativePrimitives, {}))
+    nativePrimitives(convertRawProp(context, rawProps, \\"nativePrimitives\\", sourceProps.nativePrimitives, {}))
       {}
 
 } // namespace react
@@ -86,16 +90,18 @@ Map {
  */
 
 #include <react/renderer/components/BOOLEAN_PROP/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 BooleanPropNativeComponentProps::BooleanPropNativeComponentProps(
+    const PropsParserContext &context,
     const BooleanPropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    disabled(convertRawProp(rawProps, \\"disabled\\", sourceProps.disabled, {false}))
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false}))
       {}
 
 } // namespace react
@@ -117,16 +123,18 @@ Map {
  */
 
 #include <react/renderer/components/COLOR_PROP/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 ColorPropNativeComponentProps::ColorPropNativeComponentProps(
+    const PropsParserContext &context,
     const ColorPropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    tintColor(convertRawProp(rawProps, \\"tintColor\\", sourceProps.tintColor, {}))
+    tintColor(convertRawProp(context, rawProps, \\"tintColor\\", sourceProps.tintColor, {}))
       {}
 
 } // namespace react
@@ -148,14 +156,16 @@ Map {
  */
 
 #include <react/renderer/components/COMMANDS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 CommandNativeComponentProps::CommandNativeComponentProps(
+    const PropsParserContext &context,
     const CommandNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps)
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps)
 
     
       {}
@@ -179,16 +189,18 @@ Map {
  */
 
 #include <react/renderer/components/COMMANDS_AND_PROPS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 CommandNativeComponentProps::CommandNativeComponentProps(
+    const PropsParserContext &context,
     const CommandNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    accessibilityHint(convertRawProp(rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"}))
+    accessibilityHint(convertRawProp(context, rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"}))
       {}
 
 } // namespace react
@@ -210,21 +222,23 @@ Map {
  */
 
 #include <react/renderer/components/DOUBLE_PROPS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 DoublePropNativeComponentProps::DoublePropNativeComponentProps(
+    const PropsParserContext &context,
     const DoublePropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    blurRadius(convertRawProp(rawProps, \\"blurRadius\\", sourceProps.blurRadius, {0.0})),
-    blurRadius2(convertRawProp(rawProps, \\"blurRadius2\\", sourceProps.blurRadius2, {0.001})),
-    blurRadius3(convertRawProp(rawProps, \\"blurRadius3\\", sourceProps.blurRadius3, {2.1})),
-    blurRadius4(convertRawProp(rawProps, \\"blurRadius4\\", sourceProps.blurRadius4, {0.0})),
-    blurRadius5(convertRawProp(rawProps, \\"blurRadius5\\", sourceProps.blurRadius5, {1.0})),
-    blurRadius6(convertRawProp(rawProps, \\"blurRadius6\\", sourceProps.blurRadius6, {0.0}))
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    blurRadius(convertRawProp(context, rawProps, \\"blurRadius\\", sourceProps.blurRadius, {0.0})),
+    blurRadius2(convertRawProp(context, rawProps, \\"blurRadius2\\", sourceProps.blurRadius2, {0.001})),
+    blurRadius3(convertRawProp(context, rawProps, \\"blurRadius3\\", sourceProps.blurRadius3, {2.1})),
+    blurRadius4(convertRawProp(context, rawProps, \\"blurRadius4\\", sourceProps.blurRadius4, {0.0})),
+    blurRadius5(convertRawProp(context, rawProps, \\"blurRadius5\\", sourceProps.blurRadius5, {1.0})),
+    blurRadius6(convertRawProp(context, rawProps, \\"blurRadius6\\", sourceProps.blurRadius6, {0.0}))
       {}
 
 } // namespace react
@@ -246,16 +260,18 @@ Map {
  */
 
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 EventsNestedObjectNativeComponentProps::EventsNestedObjectNativeComponentProps(
+    const PropsParserContext &context,
     const EventsNestedObjectNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    disabled(convertRawProp(rawProps, \\"disabled\\", sourceProps.disabled, {false}))
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false}))
       {}
 
 } // namespace react
@@ -277,16 +293,18 @@ Map {
  */
 
 #include <react/renderer/components/EVENT_PROPS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 EventsNativeComponentProps::EventsNativeComponentProps(
+    const PropsParserContext &context,
     const EventsNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    disabled(convertRawProp(rawProps, \\"disabled\\", sourceProps.disabled, {false}))
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false}))
       {}
 
 } // namespace react
@@ -308,14 +326,16 @@ Map {
  */
 
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 InterfaceOnlyComponentProps::InterfaceOnlyComponentProps(
+    const PropsParserContext &context,
     const InterfaceOnlyComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps)
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps)
 
     
       {}
@@ -339,14 +359,16 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_ANDROID/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 ExcludedAndroidComponentProps::ExcludedAndroidComponentProps(
+    const PropsParserContext &context,
     const ExcludedAndroidComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps)
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps)
 
     
       {}
@@ -370,6 +392,7 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
@@ -396,21 +419,23 @@ Map {
  */
 
 #include <react/renderer/components/FLOAT_PROPS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 FloatPropNativeComponentProps::FloatPropNativeComponentProps(
+    const PropsParserContext &context,
     const FloatPropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
-
-    blurRadius(convertRawProp(rawProps, \\"blurRadius\\", sourceProps.blurRadius, {0.0})),
-    blurRadius2(convertRawProp(rawProps, \\"blurRadius2\\", sourceProps.blurRadius2, {0.001})),
-    blurRadius3(convertRawProp(rawProps, \\"blurRadius3\\", sourceProps.blurRadius3, {2.1})),
-    blurRadius4(convertRawProp(rawProps, \\"blurRadius4\\", sourceProps.blurRadius4, {0.0})),
-    blurRadius5(convertRawProp(rawProps, \\"blurRadius5\\", sourceProps.blurRadius5, {1.0})),
-    blurRadius6(convertRawProp(rawProps, \\"blurRadius6\\", sourceProps.blurRadius6, {0.0}))
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    blurRadius(convertRawProp(context, rawProps, \\"blurRadius\\", sourceProps.blurRadius, {0.0})),
+    blurRadius2(convertRawProp(context, rawProps, \\"blurRadius2\\", sourceProps.blurRadius2, {0.001})),
+    blurRadius3(convertRawProp(context, rawProps, \\"blurRadius3\\", sourceProps.blurRadius3, {2.1})),
+    blurRadius4(convertRawProp(context, rawProps, \\"blurRadius4\\", sourceProps.blurRadius4, {0.0})),
+    blurRadius5(convertRawProp(context, rawProps, \\"blurRadius5\\", sourceProps.blurRadius5, {1.0})),
+    blurRadius6(convertRawProp(context, rawProps, \\"blurRadius6\\", sourceProps.blurRadius6, {0.0}))
       {}
 
 } // namespace react
@@ -433,16 +458,18 @@ Map {
 
 #include <react/renderer/components/IMAGE_PROP/Props.h>
 #include <react/renderer/components/image/conversions.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 ImagePropNativeComponentProps::ImagePropNativeComponentProps(
+    const PropsParserContext &context,
     const ImagePropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    thumbImage(convertRawProp(rawProps, \\"thumbImage\\", sourceProps.thumbImage, {}))
+    thumbImage(convertRawProp(context, rawProps, \\"thumbImage\\", sourceProps.thumbImage, {}))
       {}
 
 } // namespace react
@@ -464,16 +491,18 @@ Map {
  */
 
 #include <react/renderer/components/INSETS_PROP/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 InsetsPropNativeComponentProps::InsetsPropNativeComponentProps(
+    const PropsParserContext &context,
     const InsetsPropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    contentInset(convertRawProp(rawProps, \\"contentInset\\", sourceProps.contentInset, {}))
+    contentInset(convertRawProp(context, rawProps, \\"contentInset\\", sourceProps.contentInset, {}))
       {}
 
 } // namespace react
@@ -495,16 +524,18 @@ Map {
  */
 
 #include <react/renderer/components/INT32_ENUM_PROP/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 Int32EnumPropsNativeComponentProps::Int32EnumPropsNativeComponentProps(
+    const PropsParserContext &context,
     const Int32EnumPropsNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    maxInterval(convertRawProp(rawProps, \\"maxInterval\\", sourceProps.maxInterval, {Int32EnumPropsNativeComponentMaxInterval::MaxInterval0}))
+    maxInterval(convertRawProp(context, rawProps, \\"maxInterval\\", sourceProps.maxInterval, {Int32EnumPropsNativeComponentMaxInterval::MaxInterval0}))
       {}
 
 } // namespace react
@@ -526,18 +557,20 @@ Map {
  */
 
 #include <react/renderer/components/INTEGER_PROPS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 IntegerPropNativeComponentProps::IntegerPropNativeComponentProps(
+    const PropsParserContext &context,
     const IntegerPropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    progress1(convertRawProp(rawProps, \\"progress1\\", sourceProps.progress1, {0})),
-    progress2(convertRawProp(rawProps, \\"progress2\\", sourceProps.progress2, {-1})),
-    progress3(convertRawProp(rawProps, \\"progress3\\", sourceProps.progress3, {10}))
+    progress1(convertRawProp(context, rawProps, \\"progress1\\", sourceProps.progress1, {0})),
+    progress2(convertRawProp(context, rawProps, \\"progress2\\", sourceProps.progress2, {-1})),
+    progress3(convertRawProp(context, rawProps, \\"progress3\\", sourceProps.progress3, {10}))
       {}
 
 } // namespace react
@@ -559,16 +592,18 @@ Map {
  */
 
 #include <react/renderer/components/INTERFACE_ONLY/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 InterfaceOnlyComponentProps::InterfaceOnlyComponentProps(
+    const PropsParserContext &context,
     const InterfaceOnlyComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    accessibilityHint(convertRawProp(rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"}))
+    accessibilityHint(convertRawProp(context, rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"}))
       {}
 
 } // namespace react
@@ -591,19 +626,21 @@ Map {
 
 #include <react/renderer/components/MULTI_NATIVE_PROP/Props.h>
 #include <react/renderer/components/image/conversions.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 ImageColorPropNativeComponentProps::ImageColorPropNativeComponentProps(
+    const PropsParserContext &context,
     const ImageColorPropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    thumbImage(convertRawProp(rawProps, \\"thumbImage\\", sourceProps.thumbImage, {})),
-    color(convertRawProp(rawProps, \\"color\\", sourceProps.color, {})),
-    thumbTintColor(convertRawProp(rawProps, \\"thumbTintColor\\", sourceProps.thumbTintColor, {})),
-    point(convertRawProp(rawProps, \\"point\\", sourceProps.point, {}))
+    thumbImage(convertRawProp(context, rawProps, \\"thumbImage\\", sourceProps.thumbImage, {})),
+    color(convertRawProp(context, rawProps, \\"color\\", sourceProps.color, {})),
+    thumbTintColor(convertRawProp(context, rawProps, \\"thumbTintColor\\", sourceProps.thumbTintColor, {})),
+    point(convertRawProp(context, rawProps, \\"point\\", sourceProps.point, {}))
       {}
 
 } // namespace react
@@ -625,14 +662,16 @@ Map {
  */
 
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 NoPropsNoEventsComponentProps::NoPropsNoEventsComponentProps(
+    const PropsParserContext &context,
     const NoPropsNoEventsComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps)
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps)
 
     
       {}
@@ -657,16 +696,18 @@ Map {
 
 #include <react/renderer/components/OBJECT_PROPS/Props.h>
 #include <react/renderer/components/image/conversions.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 ObjectPropsProps::ObjectPropsProps(
+    const PropsParserContext &context,
     const ObjectPropsProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    objectProp(convertRawProp(rawProps, \\"objectProp\\", sourceProps.objectProp, {}))
+    objectProp(convertRawProp(context, rawProps, \\"objectProp\\", sourceProps.objectProp, {}))
       {}
 
 } // namespace react
@@ -688,16 +729,18 @@ Map {
  */
 
 #include <react/renderer/components/POINT_PROP/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 PointPropNativeComponentProps::PointPropNativeComponentProps(
+    const PropsParserContext &context,
     const PointPropNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    startPoint(convertRawProp(rawProps, \\"startPoint\\", sourceProps.startPoint, {}))
+    startPoint(convertRawProp(context, rawProps, \\"startPoint\\", sourceProps.startPoint, {}))
       {}
 
 } // namespace react
@@ -719,16 +762,18 @@ Map {
  */
 
 #include <react/renderer/components/STRING_ENUM_PROP/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 StringEnumPropsNativeComponentProps::StringEnumPropsNativeComponentProps(
+    const PropsParserContext &context,
     const StringEnumPropsNativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    alignment(convertRawProp(rawProps, \\"alignment\\", sourceProps.alignment, {StringEnumPropsNativeComponentAlignment::Center}))
+    alignment(convertRawProp(context, rawProps, \\"alignment\\", sourceProps.alignment, {StringEnumPropsNativeComponentAlignment::Center}))
       {}
 
 } // namespace react
@@ -750,17 +795,19 @@ Map {
  */
 
 #include <react/renderer/components/STRING_PROP/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 StringPropComponentProps::StringPropComponentProps(
+    const PropsParserContext &context,
     const StringPropComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    accessibilityHint(convertRawProp(rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"})),
-    accessibilityRole(convertRawProp(rawProps, \\"accessibilityRole\\", sourceProps.accessibilityRole, {}))
+    accessibilityHint(convertRawProp(context, rawProps, \\"accessibilityHint\\", sourceProps.accessibilityHint, {\\"\\"})),
+    accessibilityRole(convertRawProp(context, rawProps, \\"accessibilityRole\\", sourceProps.accessibilityRole, {}))
       {}
 
 } // namespace react
@@ -782,22 +829,25 @@ Map {
  */
 
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 MultiFile1NativeComponentProps::MultiFile1NativeComponentProps(
+    const PropsParserContext &context,
     const MultiFile1NativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    disabled(convertRawProp(rawProps, \\"disabled\\", sourceProps.disabled, {false}))
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false}))
       {}
 MultiFile2NativeComponentProps::MultiFile2NativeComponentProps(
+    const PropsParserContext &context,
     const MultiFile2NativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    disabled(convertRawProp(rawProps, \\"disabled\\", sourceProps.disabled, {true}))
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {true}))
       {}
 
 } // namespace react
@@ -819,22 +869,25 @@ Map {
  */
 
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 MultiComponent1NativeComponentProps::MultiComponent1NativeComponentProps(
+    const PropsParserContext &context,
     const MultiComponent1NativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    disabled(convertRawProp(rawProps, \\"disabled\\", sourceProps.disabled, {false}))
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {false}))
       {}
 MultiComponent2NativeComponentProps::MultiComponent2NativeComponentProps(
+    const PropsParserContext &context,
     const MultiComponent2NativeComponentProps &sourceProps,
-    const RawProps &rawProps): ViewProps(sourceProps, rawProps),
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
-    disabled(convertRawProp(rawProps, \\"disabled\\", sourceProps.disabled, {true}))
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {true}))
       {}
 
 } // namespace react
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
index 3fed947a715bea..707ce40d932b44 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
@@ -15,6 +15,7 @@ Map {
 
 #include <cinttypes>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -48,7 +49,7 @@ constexpr void operator|=(
   lhs = lhs | static_cast<ArrayPropsNativeComponentSizesMask>(rhs);
 }
 
-static inline void fromRawValue(const RawValue &value, ArrayPropsNativeComponentSizesMask &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentSizesMask &result) {
   auto items = std::vector<std::string>{value};
   for (const auto &item : items) {
     if (item == \\"small\\") {
@@ -82,12 +83,12 @@ struct ArrayPropsNativeComponentObjectStruct {
   std::string stringProp;
 };
 
-static inline void fromRawValue(const RawValue &value, ArrayPropsNativeComponentObjectStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentObjectStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto stringProp = map.find(\\"stringProp\\");
   if (stringProp != map.end()) {
-    fromRawValue(stringProp->second, result.stringProp);
+    fromRawValue(context, stringProp->second, result.stringProp);
   }
 }
 
@@ -95,11 +96,11 @@ static inline std::string toString(const ArrayPropsNativeComponentObjectStruct &
   return \\"[Object ArrayPropsNativeComponentObjectStruct]\\";
 }
 
-static inline void fromRawValue(const RawValue &value, std::vector<ArrayPropsNativeComponentObjectStruct> &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentObjectStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
     ArrayPropsNativeComponentObjectStruct newItem;
-    fromRawValue(item, newItem);
+    fromRawValue(context, item, newItem);
     result.emplace_back(newItem);
   }
 }
@@ -109,12 +110,12 @@ struct ArrayPropsNativeComponentArrayObjectStruct {
   std::string stringProp;
 };
 
-static inline void fromRawValue(const RawValue &value, ArrayPropsNativeComponentArrayObjectStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayObjectStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto stringProp = map.find(\\"stringProp\\");
   if (stringProp != map.end()) {
-    fromRawValue(stringProp->second, result.stringProp);
+    fromRawValue(context, stringProp->second, result.stringProp);
   }
 }
 
@@ -122,11 +123,11 @@ static inline std::string toString(const ArrayPropsNativeComponentArrayObjectStr
   return \\"[Object ArrayPropsNativeComponentArrayObjectStruct]\\";
 }
 
-static inline void fromRawValue(const RawValue &value, std::vector<ArrayPropsNativeComponentArrayObjectStruct> &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentArrayObjectStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
     ArrayPropsNativeComponentArrayObjectStruct newItem;
-    fromRawValue(item, newItem);
+    fromRawValue(context, item, newItem);
     result.emplace_back(newItem);
   }
 }
@@ -136,12 +137,12 @@ struct ArrayPropsNativeComponentArrayStruct {
   std::vector<ArrayPropsNativeComponentArrayObjectStruct> object;
 };
 
-static inline void fromRawValue(const RawValue &value, ArrayPropsNativeComponentArrayStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto object = map.find(\\"object\\");
   if (object != map.end()) {
-    fromRawValue(object->second, result.object);
+    fromRawValue(context, object->second, result.object);
   }
 }
 
@@ -149,11 +150,11 @@ static inline std::string toString(const ArrayPropsNativeComponentArrayStruct &v
   return \\"[Object ArrayPropsNativeComponentArrayStruct]\\";
 }
 
-static inline void fromRawValue(const RawValue &value, std::vector<ArrayPropsNativeComponentArrayStruct> &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentArrayStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
     ArrayPropsNativeComponentArrayStruct newItem;
-    fromRawValue(item, newItem);
+    fromRawValue(context, item, newItem);
     result.emplace_back(newItem);
   }
 }
@@ -163,12 +164,12 @@ struct ArrayPropsNativeComponentArrayOfArrayOfObjectStruct {
   std::string stringProp;
 };
 
-static inline void fromRawValue(const RawValue &value, ArrayPropsNativeComponentArrayOfArrayOfObjectStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayOfArrayOfObjectStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto stringProp = map.find(\\"stringProp\\");
   if (stringProp != map.end()) {
-    fromRawValue(stringProp->second, result.stringProp);
+    fromRawValue(context, stringProp->second, result.stringProp);
   }
 }
 
@@ -176,13 +177,13 @@ static inline std::string toString(const ArrayPropsNativeComponentArrayOfArrayOf
   return \\"[Object ArrayPropsNativeComponentArrayOfArrayOfObjectStruct]\\";
 }
 
-static inline void fromRawValue(const RawValue &value, std::vector<std::vector<ArrayPropsNativeComponentArrayOfArrayOfObjectStruct>> &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<std::vector<ArrayPropsNativeComponentArrayOfArrayOfObjectStruct>> &result) {
   auto items = (std::vector<std::vector<RawValue>>)value;
   for (const std::vector<RawValue> &item : items) {
     auto nestedArray = std::vector<ArrayPropsNativeComponentArrayOfArrayOfObjectStruct>{};
     for (const RawValue &nestedItem : item) {
       ArrayPropsNativeComponentArrayOfArrayOfObjectStruct newItem;
-      fromRawValue(nestedItem, newItem);
+      fromRawValue(context, nestedItem, newItem);
       nestedArray.emplace_back(newItem);
     }
     result.emplace_back(nestedArray);
@@ -192,7 +193,7 @@ static inline void fromRawValue(const RawValue &value, std::vector<std::vector<A
 class ArrayPropsNativeComponentProps final : public ViewProps {
  public:
   ArrayPropsNativeComponentProps() = default;
-  ArrayPropsNativeComponentProps(const ArrayPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
+  ArrayPropsNativeComponentProps(const PropsParserContext& context, const ArrayPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -230,6 +231,7 @@ Map {
 
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -244,20 +246,20 @@ struct ArrayPropsNativeComponentNativePrimitivesStruct {
   std::vector<Point> points;
 };
 
-static inline void fromRawValue(const RawValue &value, ArrayPropsNativeComponentNativePrimitivesStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentNativePrimitivesStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto colors = map.find(\\"colors\\");
   if (colors != map.end()) {
-    fromRawValue(colors->second, result.colors);
+    fromRawValue(context, colors->second, result.colors);
   }
   auto srcs = map.find(\\"srcs\\");
   if (srcs != map.end()) {
-    fromRawValue(srcs->second, result.srcs);
+    fromRawValue(context, srcs->second, result.srcs);
   }
   auto points = map.find(\\"points\\");
   if (points != map.end()) {
-    fromRawValue(points->second, result.points);
+    fromRawValue(context, points->second, result.points);
   }
 }
 
@@ -265,11 +267,11 @@ static inline std::string toString(const ArrayPropsNativeComponentNativePrimitiv
   return \\"[Object ArrayPropsNativeComponentNativePrimitivesStruct]\\";
 }
 
-static inline void fromRawValue(const RawValue &value, std::vector<ArrayPropsNativeComponentNativePrimitivesStruct> &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentNativePrimitivesStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
     ArrayPropsNativeComponentNativePrimitivesStruct newItem;
-    fromRawValue(item, newItem);
+    fromRawValue(context, item, newItem);
     result.emplace_back(newItem);
   }
 }
@@ -277,7 +279,7 @@ static inline void fromRawValue(const RawValue &value, std::vector<ArrayPropsNat
 class ArrayPropsNativeComponentProps final : public ViewProps {
  public:
   ArrayPropsNativeComponentProps() = default;
-  ArrayPropsNativeComponentProps(const ArrayPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
+  ArrayPropsNativeComponentProps(const PropsParserContext& context, const ArrayPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -304,6 +306,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -311,7 +314,7 @@ namespace react {
 class BooleanPropNativeComponentProps final : public ViewProps {
  public:
   BooleanPropNativeComponentProps() = default;
-  BooleanPropNativeComponentProps(const BooleanPropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  BooleanPropNativeComponentProps(const PropsParserContext& context, const BooleanPropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -338,6 +341,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 
 namespace facebook {
@@ -346,7 +350,7 @@ namespace react {
 class ColorPropNativeComponentProps final : public ViewProps {
  public:
   ColorPropNativeComponentProps() = default;
-  ColorPropNativeComponentProps(const ColorPropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  ColorPropNativeComponentProps(const PropsParserContext& context, const ColorPropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -373,6 +377,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -380,7 +385,7 @@ namespace react {
 class CommandNativeComponentProps final : public ViewProps {
  public:
   CommandNativeComponentProps() = default;
-  CommandNativeComponentProps(const CommandNativeComponentProps &sourceProps, const RawProps &rawProps);
+  CommandNativeComponentProps(const PropsParserContext& context, const CommandNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -407,6 +412,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -414,7 +420,7 @@ namespace react {
 class CommandNativeComponentProps final : public ViewProps {
  public:
   CommandNativeComponentProps() = default;
-  CommandNativeComponentProps(const CommandNativeComponentProps &sourceProps, const RawProps &rawProps);
+  CommandNativeComponentProps(const PropsParserContext& context, const CommandNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -441,6 +447,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -448,7 +455,7 @@ namespace react {
 class DoublePropNativeComponentProps final : public ViewProps {
  public:
   DoublePropNativeComponentProps() = default;
-  DoublePropNativeComponentProps(const DoublePropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  DoublePropNativeComponentProps(const PropsParserContext& context, const DoublePropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -480,6 +487,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -487,7 +495,7 @@ namespace react {
 class EventsNestedObjectNativeComponentProps final : public ViewProps {
  public:
   EventsNestedObjectNativeComponentProps() = default;
-  EventsNestedObjectNativeComponentProps(const EventsNestedObjectNativeComponentProps &sourceProps, const RawProps &rawProps);
+  EventsNestedObjectNativeComponentProps(const PropsParserContext& context, const EventsNestedObjectNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -514,6 +522,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -521,7 +530,7 @@ namespace react {
 class EventsNativeComponentProps final : public ViewProps {
  public:
   EventsNativeComponentProps() = default;
-  EventsNativeComponentProps(const EventsNativeComponentProps &sourceProps, const RawProps &rawProps);
+  EventsNativeComponentProps(const PropsParserContext& context, const EventsNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -548,6 +557,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -555,7 +565,7 @@ namespace react {
 class InterfaceOnlyComponentProps final : public ViewProps {
  public:
   InterfaceOnlyComponentProps() = default;
-  InterfaceOnlyComponentProps(const InterfaceOnlyComponentProps &sourceProps, const RawProps &rawProps);
+  InterfaceOnlyComponentProps(const PropsParserContext& context, const InterfaceOnlyComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -582,6 +592,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -589,7 +600,7 @@ namespace react {
 class ExcludedAndroidComponentProps final : public ViewProps {
  public:
   ExcludedAndroidComponentProps() = default;
-  ExcludedAndroidComponentProps(const ExcludedAndroidComponentProps &sourceProps, const RawProps &rawProps);
+  ExcludedAndroidComponentProps(const PropsParserContext& context, const ExcludedAndroidComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -642,6 +653,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -649,7 +661,7 @@ namespace react {
 class FloatPropNativeComponentProps final : public ViewProps {
  public:
   FloatPropNativeComponentProps() = default;
-  FloatPropNativeComponentProps(const FloatPropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  FloatPropNativeComponentProps(const PropsParserContext& context, const FloatPropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -681,6 +693,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {
@@ -689,7 +702,7 @@ namespace react {
 class ImagePropNativeComponentProps final : public ViewProps {
  public:
   ImagePropNativeComponentProps() = default;
-  ImagePropNativeComponentProps(const ImagePropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  ImagePropNativeComponentProps(const PropsParserContext& context, const ImagePropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -716,6 +729,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Geometry.h>
 
 namespace facebook {
@@ -724,7 +738,7 @@ namespace react {
 class InsetsPropNativeComponentProps final : public ViewProps {
  public:
   InsetsPropNativeComponentProps() = default;
-  InsetsPropNativeComponentProps(const InsetsPropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  InsetsPropNativeComponentProps(const PropsParserContext& context, const InsetsPropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -751,13 +765,14 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
 
 enum class Int32EnumPropsNativeComponentMaxInterval { MaxInterval0 = 0, MaxInterval1 = 1, MaxInterval2 = 2 };
 
-static inline void fromRawValue(const RawValue &value, Int32EnumPropsNativeComponentMaxInterval &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, Int32EnumPropsNativeComponentMaxInterval &result) {
   assert(value.hasType<int>());
   auto integerValue = (int)value;
   switch (integerValue) {
@@ -785,7 +800,7 @@ static inline std::string toString(const Int32EnumPropsNativeComponentMaxInterva
 class Int32EnumPropsNativeComponentProps final : public ViewProps {
  public:
   Int32EnumPropsNativeComponentProps() = default;
-  Int32EnumPropsNativeComponentProps(const Int32EnumPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
+  Int32EnumPropsNativeComponentProps(const PropsParserContext& context, const Int32EnumPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -812,6 +827,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -819,7 +835,7 @@ namespace react {
 class IntegerPropNativeComponentProps final : public ViewProps {
  public:
   IntegerPropNativeComponentProps() = default;
-  IntegerPropNativeComponentProps(const IntegerPropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  IntegerPropNativeComponentProps(const PropsParserContext& context, const IntegerPropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -848,6 +864,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -855,7 +872,7 @@ namespace react {
 class InterfaceOnlyComponentProps final : public ViewProps {
  public:
   InterfaceOnlyComponentProps() = default;
-  InterfaceOnlyComponentProps(const InterfaceOnlyComponentProps &sourceProps, const RawProps &rawProps);
+  InterfaceOnlyComponentProps(const PropsParserContext& context, const InterfaceOnlyComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -882,6 +899,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -892,7 +910,7 @@ namespace react {
 class ImageColorPropNativeComponentProps final : public ViewProps {
  public:
   ImageColorPropNativeComponentProps() = default;
-  ImageColorPropNativeComponentProps(const ImageColorPropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  ImageColorPropNativeComponentProps(const PropsParserContext& context, const ImageColorPropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -922,6 +940,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -929,7 +948,7 @@ namespace react {
 class NoPropsNoEventsComponentProps final : public ViewProps {
  public:
   NoPropsNoEventsComponentProps() = default;
-  NoPropsNoEventsComponentProps(const NoPropsNoEventsComponentProps &sourceProps, const RawProps &rawProps);
+  NoPropsNoEventsComponentProps(const PropsParserContext& context, const NoPropsNoEventsComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -957,6 +976,7 @@ Map {
 
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
@@ -968,7 +988,7 @@ namespace react {
 
 enum class ObjectPropsStringEnumProp { Option1 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsStringEnumProp &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsStringEnumProp &result) {
   auto string = (std::string)value;
   if (string == \\"option1\\") { result = ObjectPropsStringEnumProp::Option1; return; }
   abort();
@@ -981,7 +1001,7 @@ static inline std::string toString(const ObjectPropsStringEnumProp &value) {
 }
 enum class ObjectPropsIntEnumProp { IntEnumProp0 = 0 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsIntEnumProp &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsIntEnumProp &result) {
   assert(value.hasType<int>());
   auto integerValue = (int)value;
   switch (integerValue) {
@@ -1001,12 +1021,12 @@ struct ObjectPropsObjectPropObjectArrayPropStruct {
   std::vector<std::string> array;
 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsObjectPropObjectArrayPropStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropObjectArrayPropStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto array = map.find(\\"array\\");
   if (array != map.end()) {
-    fromRawValue(array->second, result.array);
+    fromRawValue(context, array->second, result.array);
   }
 }
 
@@ -1020,20 +1040,20 @@ struct ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct {
   Point point;
 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto image = map.find(\\"image\\");
   if (image != map.end()) {
-    fromRawValue(image->second, result.image);
+    fromRawValue(context, image->second, result.image);
   }
   auto color = map.find(\\"color\\");
   if (color != map.end()) {
-    fromRawValue(color->second, result.color);
+    fromRawValue(context, color->second, result.color);
   }
   auto point = map.find(\\"point\\");
   if (point != map.end()) {
-    fromRawValue(point->second, result.point);
+    fromRawValue(context, point->second, result.point);
   }
 }
 
@@ -1045,12 +1065,12 @@ struct ObjectPropsObjectPropNestedPropANestedPropBStruct {
   std::string nestedPropC;
 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsObjectPropNestedPropANestedPropBStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedPropANestedPropBStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto nestedPropC = map.find(\\"nestedPropC\\");
   if (nestedPropC != map.end()) {
-    fromRawValue(nestedPropC->second, result.nestedPropC);
+    fromRawValue(context, nestedPropC->second, result.nestedPropC);
   }
 }
 
@@ -1062,12 +1082,12 @@ struct ObjectPropsObjectPropNestedPropAStruct {
   ObjectPropsObjectPropNestedPropANestedPropBStruct nestedPropB;
 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsObjectPropNestedPropAStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedPropAStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto nestedPropB = map.find(\\"nestedPropB\\");
   if (nestedPropB != map.end()) {
-    fromRawValue(nestedPropB->second, result.nestedPropB);
+    fromRawValue(context, nestedPropB->second, result.nestedPropB);
   }
 }
 
@@ -1079,12 +1099,12 @@ struct ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct {
   std::string stringProp;
 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto stringProp = map.find(\\"stringProp\\");
   if (stringProp != map.end()) {
-    fromRawValue(stringProp->second, result.stringProp);
+    fromRawValue(context, stringProp->second, result.stringProp);
   }
 }
 
@@ -1092,11 +1112,11 @@ static inline std::string toString(const ObjectPropsObjectPropNestedArrayAsPrope
   return \\"[Object ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct]\\";
 }
 
-static inline void fromRawValue(const RawValue &value, std::vector<ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct> &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct> &result) {
   auto items = (std::vector<RawValue>)value;
   for (const auto &item : items) {
     ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct newItem;
-    fromRawValue(item, newItem);
+    fromRawValue(context, item, newItem);
     result.emplace_back(newItem);
   }
 }
@@ -1106,12 +1126,12 @@ struct ObjectPropsObjectPropNestedArrayAsPropertyStruct {
   std::vector<ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct> arrayProp;
 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto arrayProp = map.find(\\"arrayProp\\");
   if (arrayProp != map.end()) {
-    fromRawValue(arrayProp->second, result.arrayProp);
+    fromRawValue(context, arrayProp->second, result.arrayProp);
   }
 }
 
@@ -1132,48 +1152,48 @@ struct ObjectPropsObjectPropStruct {
   ObjectPropsObjectPropNestedArrayAsPropertyStruct nestedArrayAsProperty;
 };
 
-static inline void fromRawValue(const RawValue &value, ObjectPropsObjectPropStruct &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto stringProp = map.find(\\"stringProp\\");
   if (stringProp != map.end()) {
-    fromRawValue(stringProp->second, result.stringProp);
+    fromRawValue(context, stringProp->second, result.stringProp);
   }
   auto booleanProp = map.find(\\"booleanProp\\");
   if (booleanProp != map.end()) {
-    fromRawValue(booleanProp->second, result.booleanProp);
+    fromRawValue(context, booleanProp->second, result.booleanProp);
   }
   auto floatProp = map.find(\\"floatProp\\");
   if (floatProp != map.end()) {
-    fromRawValue(floatProp->second, result.floatProp);
+    fromRawValue(context, floatProp->second, result.floatProp);
   }
   auto intProp = map.find(\\"intProp\\");
   if (intProp != map.end()) {
-    fromRawValue(intProp->second, result.intProp);
+    fromRawValue(context, intProp->second, result.intProp);
   }
   auto stringEnumProp = map.find(\\"stringEnumProp\\");
   if (stringEnumProp != map.end()) {
-    fromRawValue(stringEnumProp->second, result.stringEnumProp);
+    fromRawValue(context, stringEnumProp->second, result.stringEnumProp);
   }
   auto intEnumProp = map.find(\\"intEnumProp\\");
   if (intEnumProp != map.end()) {
-    fromRawValue(intEnumProp->second, result.intEnumProp);
+    fromRawValue(context, intEnumProp->second, result.intEnumProp);
   }
   auto objectArrayProp = map.find(\\"objectArrayProp\\");
   if (objectArrayProp != map.end()) {
-    fromRawValue(objectArrayProp->second, result.objectArrayProp);
+    fromRawValue(context, objectArrayProp->second, result.objectArrayProp);
   }
   auto objectPrimitiveRequiredProp = map.find(\\"objectPrimitiveRequiredProp\\");
   if (objectPrimitiveRequiredProp != map.end()) {
-    fromRawValue(objectPrimitiveRequiredProp->second, result.objectPrimitiveRequiredProp);
+    fromRawValue(context, objectPrimitiveRequiredProp->second, result.objectPrimitiveRequiredProp);
   }
   auto nestedPropA = map.find(\\"nestedPropA\\");
   if (nestedPropA != map.end()) {
-    fromRawValue(nestedPropA->second, result.nestedPropA);
+    fromRawValue(context, nestedPropA->second, result.nestedPropA);
   }
   auto nestedArrayAsProperty = map.find(\\"nestedArrayAsProperty\\");
   if (nestedArrayAsProperty != map.end()) {
-    fromRawValue(nestedArrayAsProperty->second, result.nestedArrayAsProperty);
+    fromRawValue(context, nestedArrayAsProperty->second, result.nestedArrayAsProperty);
   }
 }
 
@@ -1183,7 +1203,7 @@ static inline std::string toString(const ObjectPropsObjectPropStruct &value) {
 class ObjectPropsProps final : public ViewProps {
  public:
   ObjectPropsProps() = default;
-  ObjectPropsProps(const ObjectPropsProps &sourceProps, const RawProps &rawProps);
+  ObjectPropsProps(const PropsParserContext& context, const ObjectPropsProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -1210,6 +1230,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Geometry.h>
 
 namespace facebook {
@@ -1218,7 +1239,7 @@ namespace react {
 class PointPropNativeComponentProps final : public ViewProps {
  public:
   PointPropNativeComponentProps() = default;
-  PointPropNativeComponentProps(const PointPropNativeComponentProps &sourceProps, const RawProps &rawProps);
+  PointPropNativeComponentProps(const PropsParserContext& context, const PointPropNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -1245,13 +1266,14 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
 
 enum class StringEnumPropsNativeComponentAlignment { Top, Center, BottomRight };
 
-static inline void fromRawValue(const RawValue &value, StringEnumPropsNativeComponentAlignment &result) {
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, StringEnumPropsNativeComponentAlignment &result) {
   auto string = (std::string)value;
   if (string == \\"top\\") { result = StringEnumPropsNativeComponentAlignment::Top; return; }
   if (string == \\"center\\") { result = StringEnumPropsNativeComponentAlignment::Center; return; }
@@ -1270,7 +1292,7 @@ static inline std::string toString(const StringEnumPropsNativeComponentAlignment
 class StringEnumPropsNativeComponentProps final : public ViewProps {
  public:
   StringEnumPropsNativeComponentProps() = default;
-  StringEnumPropsNativeComponentProps(const StringEnumPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
+  StringEnumPropsNativeComponentProps(const PropsParserContext& context, const StringEnumPropsNativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -1297,6 +1319,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -1304,7 +1327,7 @@ namespace react {
 class StringPropComponentProps final : public ViewProps {
  public:
   StringPropComponentProps() = default;
-  StringPropComponentProps(const StringPropComponentProps &sourceProps, const RawProps &rawProps);
+  StringPropComponentProps(const PropsParserContext& context, const StringPropComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -1332,6 +1355,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -1339,7 +1363,7 @@ namespace react {
 class MultiFile1NativeComponentProps final : public ViewProps {
  public:
   MultiFile1NativeComponentProps() = default;
-  MultiFile1NativeComponentProps(const MultiFile1NativeComponentProps &sourceProps, const RawProps &rawProps);
+  MultiFile1NativeComponentProps(const PropsParserContext& context, const MultiFile1NativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -1349,7 +1373,7 @@ class MultiFile1NativeComponentProps final : public ViewProps {
 class MultiFile2NativeComponentProps final : public ViewProps {
  public:
   MultiFile2NativeComponentProps() = default;
-  MultiFile2NativeComponentProps(const MultiFile2NativeComponentProps &sourceProps, const RawProps &rawProps);
+  MultiFile2NativeComponentProps(const PropsParserContext& context, const MultiFile2NativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -1376,6 +1400,7 @@ Map {
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -1383,7 +1408,7 @@ namespace react {
 class MultiComponent1NativeComponentProps final : public ViewProps {
  public:
   MultiComponent1NativeComponentProps() = default;
-  MultiComponent1NativeComponentProps(const MultiComponent1NativeComponentProps &sourceProps, const RawProps &rawProps);
+  MultiComponent1NativeComponentProps(const PropsParserContext& context, const MultiComponent1NativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
@@ -1393,7 +1418,7 @@ class MultiComponent1NativeComponentProps final : public ViewProps {
 class MultiComponent2NativeComponentProps final : public ViewProps {
  public:
   MultiComponent2NativeComponentProps() = default;
-  MultiComponent2NativeComponentProps(const MultiComponent2NativeComponentProps &sourceProps, const RawProps &rawProps);
+  MultiComponent2NativeComponentProps(const PropsParserContext& context, const MultiComponent2NativeComponentProps &sourceProps, const RawProps &rawProps);
 
 #pragma mark - Props
 
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
index fda2e0e535ed63..2b062c4f906bc0 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`GeneratePropsJavaDelegate can generate fixture ARRAY_PROPS 1`] = `
 Map {
-  "ArrayPropsNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -18,7 +18,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class ArrayPropsNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ArrayPropsNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public ArrayPropsNativeComponentManagerDelegate(U viewManager) {
@@ -71,7 +70,7 @@ public class ArrayPropsNativeComponentManagerDelegate<T extends View, U extends
 
 exports[`GeneratePropsJavaDelegate can generate fixture ARRAY_PROPS_WITH_NESTED_OBJECT 1`] = `
 Map {
-  "ArrayPropsNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -87,7 +86,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class ArrayPropsNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ArrayPropsNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public ArrayPropsNativeComponentManagerDelegate(U viewManager) {
@@ -110,7 +108,7 @@ public class ArrayPropsNativeComponentManagerDelegate<T extends View, U extends
 
 exports[`GeneratePropsJavaDelegate can generate fixture BOOLEAN_PROP 1`] = `
 Map {
-  "BooleanPropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -125,7 +123,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class BooleanPropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & BooleanPropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public BooleanPropNativeComponentManagerDelegate(U viewManager) {
@@ -148,7 +145,7 @@ public class BooleanPropNativeComponentManagerDelegate<T extends View, U extends
 
 exports[`GeneratePropsJavaDelegate can generate fixture COLOR_PROP 1`] = `
 Map {
-  "ColorPropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -164,7 +161,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class ColorPropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ColorPropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public ColorPropNativeComponentManagerDelegate(U viewManager) {
@@ -187,7 +183,7 @@ public class ColorPropNativeComponentManagerDelegate<T extends View, U extends B
 
 exports[`GeneratePropsJavaDelegate can generate fixture COMMANDS 1`] = `
 Map {
-  "CommandNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -203,7 +199,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class CommandNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & CommandNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public CommandNativeComponentManagerDelegate(U viewManager) {
@@ -232,7 +227,7 @@ public class CommandNativeComponentManagerDelegate<T extends View, U extends Bas
 
 exports[`GeneratePropsJavaDelegate can generate fixture COMMANDS_AND_PROPS 1`] = `
 Map {
-  "CommandNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -248,7 +243,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class CommandNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & CommandNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public CommandNativeComponentManagerDelegate(U viewManager) {
@@ -283,7 +277,7 @@ public class CommandNativeComponentManagerDelegate<T extends View, U extends Bas
 
 exports[`GeneratePropsJavaDelegate can generate fixture DOUBLE_PROPS 1`] = `
 Map {
-  "DoublePropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/DoublePropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -298,7 +292,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class DoublePropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & DoublePropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public DoublePropNativeComponentManagerDelegate(U viewManager) {
@@ -336,7 +329,7 @@ public class DoublePropNativeComponentManagerDelegate<T extends View, U extends
 
 exports[`GeneratePropsJavaDelegate can generate fixture EVENT_NESTED_OBJECT_PROPS 1`] = `
 Map {
-  "EventsNestedObjectNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/EventsNestedObjectNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -351,7 +344,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class EventsNestedObjectNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & EventsNestedObjectNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public EventsNestedObjectNativeComponentManagerDelegate(U viewManager) {
@@ -374,7 +366,7 @@ public class EventsNestedObjectNativeComponentManagerDelegate<T extends View, U
 
 exports[`GeneratePropsJavaDelegate can generate fixture EVENT_PROPS 1`] = `
 Map {
-  "EventsNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/EventsNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -389,7 +381,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class EventsNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & EventsNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public EventsNativeComponentManagerDelegate(U viewManager) {
@@ -412,7 +403,7 @@ public class EventsNativeComponentManagerDelegate<T extends View, U extends Base
 
 exports[`GeneratePropsJavaDelegate can generate fixture EVENTS_WITH_PAPER_NAME 1`] = `
 Map {
-  "InterfaceOnlyComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -427,7 +418,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class InterfaceOnlyComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & InterfaceOnlyComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public InterfaceOnlyComponentManagerDelegate(U viewManager) {
@@ -448,7 +438,7 @@ exports[`GeneratePropsJavaDelegate can generate fixture EXCLUDE_ANDROID_IOS 1`]
 
 exports[`GeneratePropsJavaDelegate can generate fixture FLOAT_PROPS 1`] = `
 Map {
-  "FloatPropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/FloatPropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -463,7 +453,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class FloatPropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & FloatPropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public FloatPropNativeComponentManagerDelegate(U viewManager) {
@@ -501,7 +490,7 @@ public class FloatPropNativeComponentManagerDelegate<T extends View, U extends B
 
 exports[`GeneratePropsJavaDelegate can generate fixture IMAGE_PROP 1`] = `
 Map {
-  "ImagePropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -517,7 +506,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class ImagePropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ImagePropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public ImagePropNativeComponentManagerDelegate(U viewManager) {
@@ -540,7 +528,7 @@ public class ImagePropNativeComponentManagerDelegate<T extends View, U extends B
 
 exports[`GeneratePropsJavaDelegate can generate fixture INSETS_PROP 1`] = `
 Map {
-  "InsetsPropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/InsetsPropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -556,7 +544,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class InsetsPropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & InsetsPropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public InsetsPropNativeComponentManagerDelegate(U viewManager) {
@@ -579,7 +566,7 @@ public class InsetsPropNativeComponentManagerDelegate<T extends View, U extends
 
 exports[`GeneratePropsJavaDelegate can generate fixture INT32_ENUM_PROP 1`] = `
 Map {
-  "Int32EnumPropsNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/Int32EnumPropsNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -594,7 +581,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class Int32EnumPropsNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & Int32EnumPropsNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public Int32EnumPropsNativeComponentManagerDelegate(U viewManager) {
@@ -617,7 +603,7 @@ public class Int32EnumPropsNativeComponentManagerDelegate<T extends View, U exte
 
 exports[`GeneratePropsJavaDelegate can generate fixture INTEGER_PROPS 1`] = `
 Map {
-  "IntegerPropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -632,7 +618,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class IntegerPropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & IntegerPropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public IntegerPropNativeComponentManagerDelegate(U viewManager) {
@@ -661,7 +646,7 @@ public class IntegerPropNativeComponentManagerDelegate<T extends View, U extends
 
 exports[`GeneratePropsJavaDelegate can generate fixture INTERFACE_ONLY 1`] = `
 Map {
-  "InterfaceOnlyComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -676,7 +661,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class InterfaceOnlyComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & InterfaceOnlyComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public InterfaceOnlyComponentManagerDelegate(U viewManager) {
@@ -699,7 +683,7 @@ public class InterfaceOnlyComponentManagerDelegate<T extends View, U extends Bas
 
 exports[`GeneratePropsJavaDelegate can generate fixture MULTI_NATIVE_PROP 1`] = `
 Map {
-  "ImageColorPropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/ImageColorPropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -716,7 +700,6 @@ import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class ImageColorPropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ImageColorPropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public ImageColorPropNativeComponentManagerDelegate(U viewManager) {
@@ -748,7 +731,7 @@ public class ImageColorPropNativeComponentManagerDelegate<T extends View, U exte
 
 exports[`GeneratePropsJavaDelegate can generate fixture NO_PROPS_NO_EVENTS 1`] = `
 Map {
-  "NoPropsNoEventsComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/NoPropsNoEventsComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -763,7 +746,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class NoPropsNoEventsComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & NoPropsNoEventsComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public NoPropsNoEventsComponentManagerDelegate(U viewManager) {
@@ -780,7 +762,7 @@ public class NoPropsNoEventsComponentManagerDelegate<T extends View, U extends B
 
 exports[`GeneratePropsJavaDelegate can generate fixture OBJECT_PROPS 1`] = `
 Map {
-  "ObjectPropsManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/ObjectPropsManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -796,7 +778,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class ObjectPropsManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ObjectPropsManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public ObjectPropsManagerDelegate(U viewManager) {
@@ -819,7 +800,7 @@ public class ObjectPropsManagerDelegate<T extends View, U extends BaseViewManage
 
 exports[`GeneratePropsJavaDelegate can generate fixture POINT_PROP 1`] = `
 Map {
-  "PointPropNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/PointPropNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -835,7 +816,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class PointPropNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & PointPropNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public PointPropNativeComponentManagerDelegate(U viewManager) {
@@ -858,7 +838,7 @@ public class PointPropNativeComponentManagerDelegate<T extends View, U extends B
 
 exports[`GeneratePropsJavaDelegate can generate fixture STRING_ENUM_PROP 1`] = `
 Map {
-  "StringEnumPropsNativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/StringEnumPropsNativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -873,7 +853,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class StringEnumPropsNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & StringEnumPropsNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public StringEnumPropsNativeComponentManagerDelegate(U viewManager) {
@@ -896,7 +875,7 @@ public class StringEnumPropsNativeComponentManagerDelegate<T extends View, U ext
 
 exports[`GeneratePropsJavaDelegate can generate fixture STRING_PROP 1`] = `
 Map {
-  "StringPropComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/StringPropComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -911,7 +890,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class StringPropComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & StringPropComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public StringPropComponentManagerDelegate(U viewManager) {
@@ -937,7 +915,7 @@ public class StringPropComponentManagerDelegate<T extends View, U extends BaseVi
 
 exports[`GeneratePropsJavaDelegate can generate fixture TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
 Map {
-  "MultiFile1NativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiFile1NativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -952,7 +930,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class MultiFile1NativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MultiFile1NativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public MultiFile1NativeComponentManagerDelegate(U viewManager) {
@@ -970,7 +947,7 @@ public class MultiFile1NativeComponentManagerDelegate<T extends View, U extends
   }
 }
 ",
-  "MultiFile2NativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiFile2NativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -985,7 +962,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class MultiFile2NativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MultiFile2NativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public MultiFile2NativeComponentManagerDelegate(U viewManager) {
@@ -1008,7 +984,7 @@ public class MultiFile2NativeComponentManagerDelegate<T extends View, U extends
 
 exports[`GeneratePropsJavaDelegate can generate fixture TWO_COMPONENTS_SAME_FILE 1`] = `
 Map {
-  "MultiComponent1NativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiComponent1NativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -1023,7 +999,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class MultiComponent1NativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MultiComponent1NativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public MultiComponent1NativeComponentManagerDelegate(U viewManager) {
@@ -1041,7 +1016,7 @@ public class MultiComponent1NativeComponentManagerDelegate<T extends View, U ext
   }
 }
 ",
-  "MultiComponent2NativeComponentManagerDelegate.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiComponent2NativeComponentManagerDelegate.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -1056,7 +1031,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
-import com.facebook.react.uimanager.LayoutShadowNode;
 
 public class MultiComponent2NativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MultiComponent2NativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public MultiComponent2NativeComponentManagerDelegate(U viewManager) {
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap
index b064446f35b63a..2add98876ce447 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`GeneratePropsJavaInterface can generate fixture ARRAY_PROPS 1`] = `
 Map {
-  "ArrayPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -36,7 +36,7 @@ public interface ArrayPropsNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture ARRAY_PROPS_WITH_NESTED_OBJECT 1`] = `
 Map {
-  "ArrayPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ArrayPropsNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -60,7 +60,7 @@ public interface ArrayPropsNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture BOOLEAN_PROP 1`] = `
 Map {
-  "BooleanPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/BooleanPropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -82,7 +82,7 @@ public interface BooleanPropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture COLOR_PROP 1`] = `
 Map {
-  "ColorPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ColorPropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -105,7 +105,7 @@ public interface ColorPropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture COMMANDS 1`] = `
 Map {
-  "CommandNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -129,7 +129,7 @@ public interface CommandNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture COMMANDS_AND_PROPS 1`] = `
 Map {
-  "CommandNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/CommandNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -154,7 +154,7 @@ public interface CommandNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture DOUBLE_PROPS 1`] = `
 Map {
-  "DoublePropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/DoublePropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -181,7 +181,7 @@ public interface DoublePropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture EVENT_NESTED_OBJECT_PROPS 1`] = `
 Map {
-  "EventsNestedObjectNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/EventsNestedObjectNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -203,7 +203,7 @@ public interface EventsNestedObjectNativeComponentManagerInterface<T extends Vie
 
 exports[`GeneratePropsJavaInterface can generate fixture EVENT_PROPS 1`] = `
 Map {
-  "EventsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/EventsNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -225,7 +225,7 @@ public interface EventsNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture EVENTS_WITH_PAPER_NAME 1`] = `
 Map {
-  "InterfaceOnlyComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -251,7 +251,7 @@ exports[`GeneratePropsJavaInterface can generate fixture EXCLUDE_ANDROID_IOS 1`]
 
 exports[`GeneratePropsJavaInterface can generate fixture FLOAT_PROPS 1`] = `
 Map {
-  "FloatPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/FloatPropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -278,7 +278,7 @@ public interface FloatPropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture IMAGE_PROP 1`] = `
 Map {
-  "ImagePropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ImagePropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -302,7 +302,7 @@ public interface ImagePropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture INSETS_PROP 1`] = `
 Map {
-  "InsetsPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/InsetsPropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -326,7 +326,7 @@ public interface InsetsPropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture INT32_ENUM_PROP 1`] = `
 Map {
-  "Int32EnumPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/Int32EnumPropsNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -349,7 +349,7 @@ public interface Int32EnumPropsNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture INTEGER_PROPS 1`] = `
 Map {
-  "IntegerPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/IntegerPropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -373,7 +373,7 @@ public interface IntegerPropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture INTERFACE_ONLY 1`] = `
 Map {
-  "InterfaceOnlyComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/InterfaceOnlyComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -396,7 +396,7 @@ public interface InterfaceOnlyComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture MULTI_NATIVE_PROP 1`] = `
 Map {
-  "ImageColorPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ImageColorPropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -423,7 +423,7 @@ public interface ImageColorPropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture NO_PROPS_NO_EVENTS 1`] = `
 Map {
-  "NoPropsNoEventsComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/NoPropsNoEventsComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -445,7 +445,7 @@ public interface NoPropsNoEventsComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture OBJECT_PROPS 1`] = `
 Map {
-  "ObjectPropsManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/ObjectPropsManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -469,7 +469,7 @@ public interface ObjectPropsManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture POINT_PROP 1`] = `
 Map {
-  "PointPropNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/PointPropNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -493,7 +493,7 @@ public interface PointPropNativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture STRING_ENUM_PROP 1`] = `
 Map {
-  "StringEnumPropsNativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/StringEnumPropsNativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -516,7 +516,7 @@ public interface StringEnumPropsNativeComponentManagerInterface<T extends View>
 
 exports[`GeneratePropsJavaInterface can generate fixture STRING_PROP 1`] = `
 Map {
-  "StringPropComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/StringPropComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -540,7 +540,7 @@ public interface StringPropComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
 Map {
-  "MultiFile1NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiFile1NativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -557,7 +557,7 @@ public interface MultiFile1NativeComponentManagerInterface<T extends View> {
   void setDisabled(T view, boolean value);
 }
 ",
-  "MultiFile2NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiFile2NativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -579,7 +579,7 @@ public interface MultiFile2NativeComponentManagerInterface<T extends View> {
 
 exports[`GeneratePropsJavaInterface can generate fixture TWO_COMPONENTS_SAME_FILE 1`] = `
 Map {
-  "MultiComponent1NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiComponent1NativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -596,7 +596,7 @@ public interface MultiComponent1NativeComponentManagerInterface<T extends View>
   void setDisabled(T view, boolean value);
 }
 ",
-  "MultiComponent2NativeComponentManagerInterface.java" => "/**
+  "java/com/facebook/react/viewmanagers/MultiComponent2NativeComponentManagerInterface.java" => "/**
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
new file mode 100644
index 00000000000000..bc6b90358a268a
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
@@ -0,0 +1,1177 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GeneratePropsJavaPojo can generate fixture ARRAY_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Slider/ArrayPropsNativeComponentPropsObjectElement.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ArrayPropsNativeComponentPropsObjectElement {
+  private @Nullable String mStringProp;
+  @DoNotStrip
+  public @Nullable String getStringProp() {
+    return mStringProp;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/Slider/ArrayPropsNativeComponentPropsArrayElementObjectElement.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ArrayPropsNativeComponentPropsArrayElementObjectElement {
+  private @Nullable String mStringProp;
+  @DoNotStrip
+  public @Nullable String getStringProp() {
+    return mStringProp;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/Slider/ArrayPropsNativeComponentPropsArrayElement.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.util.ArrayList;
+
+@DoNotStrip
+public class ArrayPropsNativeComponentPropsArrayElement {
+  private ArrayList<ArrayPropsNativeComponentPropsArrayElementObjectElement> mObject;
+  @DoNotStrip
+  public ArrayList<ArrayPropsNativeComponentPropsArrayElementObjectElement> getObject() {
+    return mObject;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/Slider/ArrayPropsNativeComponentPropsArrayOfArrayOfObjectElementElement.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ArrayPropsNativeComponentPropsArrayOfArrayOfObjectElementElement {
+  private @Nullable String mStringProp;
+  @DoNotStrip
+  public @Nullable String getStringProp() {
+    return mStringProp;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/Slider/ArrayPropsNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReadableMap;
+import java.util.ArrayList;
+
+@DoNotStrip
+public class ArrayPropsNativeComponentProps {
+  private ArrayList<String> mNames;
+  private ArrayList<Boolean> mDisableds;
+  private ArrayList<Integer> mProgress;
+  private ArrayList<Float> mRadii;
+  private ArrayList<Integer> mColors;
+  private ArrayList<ReadableMap> mSrcs;
+  private ArrayList<ReadableMap> mPoints;
+  private ArrayList<String> mSizes;
+  private ArrayList<ArrayPropsNativeComponentPropsObjectElement> mObject;
+  private ArrayList<ArrayPropsNativeComponentPropsArrayElement> mArray;
+  private ArrayList<ArrayList<ArrayPropsNativeComponentPropsArrayOfArrayOfObjectElementElement>> mArrayOfArrayOfObject;
+  @DoNotStrip
+  public ArrayList<String> getNames() {
+    return mNames;
+  }
+  @DoNotStrip
+  public ArrayList<Boolean> getDisableds() {
+    return mDisableds;
+  }
+  @DoNotStrip
+  public ArrayList<Integer> getProgress() {
+    return mProgress;
+  }
+  @DoNotStrip
+  public ArrayList<Float> getRadii() {
+    return mRadii;
+  }
+  @DoNotStrip
+  public ArrayList<Integer> getColors() {
+    return mColors;
+  }
+  @DoNotStrip
+  public ArrayList<ReadableMap> getSrcs() {
+    return mSrcs;
+  }
+  @DoNotStrip
+  public ArrayList<ReadableMap> getPoints() {
+    return mPoints;
+  }
+  @DoNotStrip
+  public ArrayList<String> getSizes() {
+    return mSizes;
+  }
+  @DoNotStrip
+  public ArrayList<ArrayPropsNativeComponentPropsObjectElement> getObject() {
+    return mObject;
+  }
+  @DoNotStrip
+  public ArrayList<ArrayPropsNativeComponentPropsArrayElement> getArray() {
+    return mArray;
+  }
+  @DoNotStrip
+  public ArrayList<ArrayList<ArrayPropsNativeComponentPropsArrayOfArrayOfObjectElementElement>> getArrayOfArrayOfObject() {
+    return mArrayOfArrayOfObject;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture ARRAY_PROPS_WITH_NESTED_OBJECT 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Slider/ArrayPropsNativeComponentPropsNativePrimitivesElement.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReadableMap;
+import java.util.ArrayList;
+
+@DoNotStrip
+public class ArrayPropsNativeComponentPropsNativePrimitivesElement {
+  private ArrayList<Integer> mColors;
+  private ArrayList<ReadableMap> mSrcs;
+  private ArrayList<ReadableMap> mPoints;
+  @DoNotStrip
+  public ArrayList<Integer> getColors() {
+    return mColors;
+  }
+  @DoNotStrip
+  public ArrayList<ReadableMap> getSrcs() {
+    return mSrcs;
+  }
+  @DoNotStrip
+  public ArrayList<ReadableMap> getPoints() {
+    return mPoints;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/Slider/ArrayPropsNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.util.ArrayList;
+
+@DoNotStrip
+public class ArrayPropsNativeComponentProps {
+  private ArrayList<ArrayPropsNativeComponentPropsNativePrimitivesElement> mNativePrimitives;
+  @DoNotStrip
+  public ArrayList<ArrayPropsNativeComponentPropsNativePrimitivesElement> getNativePrimitives() {
+    return mNativePrimitives;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture BOOLEAN_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/BooleanPropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class BooleanPropNativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture COLOR_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/ColorPropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ColorPropNativeComponentProps {
+  private @Nullable Integer mTintColor;
+  @DoNotStrip
+  public @Nullable Integer getTintColor() {
+    return mTintColor;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture COMMANDS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/CommandNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class CommandNativeComponentProps {
+
+
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture COMMANDS_AND_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/CommandNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class CommandNativeComponentProps {
+  private @Nullable String mAccessibilityHint;
+  @DoNotStrip
+  public @Nullable String getAccessibilityHint() {
+    return mAccessibilityHint;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture DOUBLE_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/DoublePropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class DoublePropNativeComponentProps {
+  private double mBlurRadius;
+  private double mBlurRadius2;
+  private double mBlurRadius3;
+  private double mBlurRadius4;
+  private double mBlurRadius5;
+  private double mBlurRadius6;
+  @DoNotStrip
+  public double getBlurRadius() {
+    return mBlurRadius;
+  }
+  @DoNotStrip
+  public double getBlurRadius2() {
+    return mBlurRadius2;
+  }
+  @DoNotStrip
+  public double getBlurRadius3() {
+    return mBlurRadius3;
+  }
+  @DoNotStrip
+  public double getBlurRadius4() {
+    return mBlurRadius4;
+  }
+  @DoNotStrip
+  public double getBlurRadius5() {
+    return mBlurRadius5;
+  }
+  @DoNotStrip
+  public double getBlurRadius6() {
+    return mBlurRadius6;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture EVENT_NESTED_OBJECT_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/EventsNestedObjectNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class EventsNestedObjectNativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture EVENT_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/EventsNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class EventsNativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture EVENTS_WITH_PAPER_NAME 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/InterfaceOnlyComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class InterfaceOnlyComponentProps {
+
+
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture EXCLUDE_ANDROID 1`] = `Map {}`;
+
+exports[`GeneratePropsJavaPojo can generate fixture EXCLUDE_ANDROID_IOS 1`] = `Map {}`;
+
+exports[`GeneratePropsJavaPojo can generate fixture FLOAT_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/FloatPropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class FloatPropNativeComponentProps {
+  private float mBlurRadius;
+  private float mBlurRadius2;
+  private float mBlurRadius3;
+  private float mBlurRadius4;
+  private float mBlurRadius5;
+  private float mBlurRadius6;
+  @DoNotStrip
+  public float getBlurRadius() {
+    return mBlurRadius;
+  }
+  @DoNotStrip
+  public float getBlurRadius2() {
+    return mBlurRadius2;
+  }
+  @DoNotStrip
+  public float getBlurRadius3() {
+    return mBlurRadius3;
+  }
+  @DoNotStrip
+  public float getBlurRadius4() {
+    return mBlurRadius4;
+  }
+  @DoNotStrip
+  public float getBlurRadius5() {
+    return mBlurRadius5;
+  }
+  @DoNotStrip
+  public float getBlurRadius6() {
+    return mBlurRadius6;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture IMAGE_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Slider/ImagePropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReadableMap;
+
+@DoNotStrip
+public class ImagePropNativeComponentProps {
+  private @Nullable ReadableMap mThumbImage;
+  @DoNotStrip
+  public @Nullable ReadableMap getThumbImage() {
+    return mThumbImage;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture INSETS_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/ScrollView/InsetsPropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ScrollView;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReadableMap;
+
+@DoNotStrip
+public class InsetsPropNativeComponentProps {
+  private @Nullable ReadableMap mContentInset;
+  @DoNotStrip
+  public @Nullable ReadableMap getContentInset() {
+    return mContentInset;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture INT32_ENUM_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/Int32EnumPropsNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class Int32EnumPropsNativeComponentProps {
+  private @Nullable Integer mMaxInterval;
+  @DoNotStrip
+  public @Nullable Integer getMaxInterval() {
+    return mMaxInterval;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture INTEGER_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/IntegerPropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class IntegerPropNativeComponentProps {
+  private int mProgress1;
+  private int mProgress2;
+  private int mProgress3;
+  @DoNotStrip
+  public int getProgress1() {
+    return mProgress1;
+  }
+  @DoNotStrip
+  public int getProgress2() {
+    return mProgress2;
+  }
+  @DoNotStrip
+  public int getProgress3() {
+    return mProgress3;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture INTERFACE_ONLY 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/InterfaceOnlyComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class InterfaceOnlyComponentProps {
+  private @Nullable String mAccessibilityHint;
+  @DoNotStrip
+  public @Nullable String getAccessibilityHint() {
+    return mAccessibilityHint;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture MULTI_NATIVE_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Slider/ImageColorPropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Slider;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReadableMap;
+
+@DoNotStrip
+public class ImageColorPropNativeComponentProps {
+  private @Nullable ReadableMap mThumbImage;
+  private @Nullable Integer mColor;
+  private @Nullable Integer mThumbTintColor;
+  private @Nullable ReadableMap mPoint;
+  @DoNotStrip
+  public @Nullable ReadableMap getThumbImage() {
+    return mThumbImage;
+  }
+  @DoNotStrip
+  public @Nullable Integer getColor() {
+    return mColor;
+  }
+  @DoNotStrip
+  public @Nullable Integer getThumbTintColor() {
+    return mThumbTintColor;
+  }
+  @DoNotStrip
+  public @Nullable ReadableMap getPoint() {
+    return mPoint;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture NO_PROPS_NO_EVENTS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/NoPropsNoEvents/NoPropsNoEventsComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.NoPropsNoEvents;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class NoPropsNoEventsComponentProps {
+
+
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture OBJECT_PROPS 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsPropsObjectPropObjectArrayProp.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.util.ArrayList;
+
+@DoNotStrip
+public class ObjectPropsPropsObjectPropObjectArrayProp {
+  private ArrayList<String> mArray;
+  @DoNotStrip
+  public ArrayList<String> getArray() {
+    return mArray;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsPropsObjectPropObjectPrimitiveRequiredProp.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReadableMap;
+
+@DoNotStrip
+public class ObjectPropsPropsObjectPropObjectPrimitiveRequiredProp {
+  private @Nullable ReadableMap mImage;
+  private @Nullable Integer mColor;
+  private @Nullable ReadableMap mPoint;
+  @DoNotStrip
+  public @Nullable ReadableMap getImage() {
+    return mImage;
+  }
+  @DoNotStrip
+  public @Nullable Integer getColor() {
+    return mColor;
+  }
+  @DoNotStrip
+  public @Nullable ReadableMap getPoint() {
+    return mPoint;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsPropsObjectPropNestedPropANestedPropB.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ObjectPropsPropsObjectPropNestedPropANestedPropB {
+  private @Nullable String mNestedPropC;
+  @DoNotStrip
+  public @Nullable String getNestedPropC() {
+    return mNestedPropC;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsPropsObjectPropNestedPropA.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ObjectPropsPropsObjectPropNestedPropA {
+  private ObjectPropsPropsObjectPropNestedPropANestedPropB mNestedPropB;
+  @DoNotStrip
+  public ObjectPropsPropsObjectPropNestedPropANestedPropB getNestedPropB() {
+    return mNestedPropB;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsPropsObjectPropNestedArrayAsPropertyArrayPropElement.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ObjectPropsPropsObjectPropNestedArrayAsPropertyArrayPropElement {
+  private @Nullable String mStringProp;
+  @DoNotStrip
+  public @Nullable String getStringProp() {
+    return mStringProp;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsPropsObjectPropNestedArrayAsProperty.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import java.util.ArrayList;
+
+@DoNotStrip
+public class ObjectPropsPropsObjectPropNestedArrayAsProperty {
+  private ArrayList<ObjectPropsPropsObjectPropNestedArrayAsPropertyArrayPropElement> mArrayProp;
+  @DoNotStrip
+  public ArrayList<ObjectPropsPropsObjectPropNestedArrayAsPropertyArrayPropElement> getArrayProp() {
+    return mArrayProp;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsPropsObjectProp.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ObjectPropsPropsObjectProp {
+  private @Nullable String mStringProp;
+  private boolean mBooleanProp;
+  private float mFloatProp;
+  private int mIntProp;
+  private @Nullable String mStringEnumProp;
+  private @Nullable Integer mIntEnumProp;
+  private ObjectPropsPropsObjectPropObjectArrayProp mObjectArrayProp;
+  private ObjectPropsPropsObjectPropObjectPrimitiveRequiredProp mObjectPrimitiveRequiredProp;
+  private ObjectPropsPropsObjectPropNestedPropA mNestedPropA;
+  private ObjectPropsPropsObjectPropNestedArrayAsProperty mNestedArrayAsProperty;
+  @DoNotStrip
+  public @Nullable String getStringProp() {
+    return mStringProp;
+  }
+  @DoNotStrip
+  public boolean getBooleanProp() {
+    return mBooleanProp;
+  }
+  @DoNotStrip
+  public float getFloatProp() {
+    return mFloatProp;
+  }
+  @DoNotStrip
+  public int getIntProp() {
+    return mIntProp;
+  }
+  @DoNotStrip
+  public @Nullable String getStringEnumProp() {
+    return mStringEnumProp;
+  }
+  @DoNotStrip
+  public @Nullable Integer getIntEnumProp() {
+    return mIntEnumProp;
+  }
+  @DoNotStrip
+  public ObjectPropsPropsObjectPropObjectArrayProp getObjectArrayProp() {
+    return mObjectArrayProp;
+  }
+  @DoNotStrip
+  public ObjectPropsPropsObjectPropObjectPrimitiveRequiredProp getObjectPrimitiveRequiredProp() {
+    return mObjectPrimitiveRequiredProp;
+  }
+  @DoNotStrip
+  public ObjectPropsPropsObjectPropNestedPropA getNestedPropA() {
+    return mNestedPropA;
+  }
+  @DoNotStrip
+  public ObjectPropsPropsObjectPropNestedArrayAsProperty getNestedArrayAsProperty() {
+    return mNestedArrayAsProperty;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ObjectPropsNativeComponent/ObjectPropsProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ObjectPropsProps {
+  private ObjectPropsPropsObjectProp mObjectProp;
+  @DoNotStrip
+  public ObjectPropsPropsObjectProp getObjectProp() {
+    return mObjectProp;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture POINT_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/PointPropNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReadableMap;
+
+@DoNotStrip
+public class PointPropNativeComponentProps {
+  private @Nullable ReadableMap mStartPoint;
+  @DoNotStrip
+  public @Nullable ReadableMap getStartPoint() {
+    return mStartPoint;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture STRING_ENUM_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/StringEnumPropsNativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class StringEnumPropsNativeComponentProps {
+  private @Nullable String mAlignment;
+  @DoNotStrip
+  public @Nullable String getAlignment() {
+    return mAlignment;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture STRING_PROP 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/Switch/StringPropComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.Switch;
+
+import androidx.annotation.Nullable;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class StringPropComponentProps {
+  private @Nullable String mAccessibilityHint;
+  private @Nullable String mAccessibilityRole;
+  @DoNotStrip
+  public @Nullable String getAccessibilityHint() {
+    return mAccessibilityHint;
+  }
+  @DoNotStrip
+  public @Nullable String getAccessibilityRole() {
+    return mAccessibilityRole;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/ComponentFile1/MultiFile1NativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ComponentFile1;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class MultiFile1NativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/ComponentFile2/MultiFile2NativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ComponentFile2;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class MultiFile2NativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+}
+`;
+
+exports[`GeneratePropsJavaPojo can generate fixture TWO_COMPONENTS_SAME_FILE 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/MyComponents/MultiComponent1NativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.MyComponents;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class MultiComponent1NativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/MyComponents/MultiComponent2NativeComponentProps.java" => "/**
+* Copyright (c) Facebook, Inc. and its affiliates.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.MyComponents;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class MultiComponent2NativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+}
+`;
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
index c4add04c8956e4..a7981270dcde24 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
@@ -12,6 +12,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/ARRAY_PROPS/Props.h>
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/RawProps.h>
@@ -25,8 +26,12 @@ TEST(ArrayPropsNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<ArrayPropsNativeComponentProps>();
   auto const &sourceProps = ArrayPropsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ArrayPropsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ArrayPropsNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -43,6 +48,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -55,8 +61,12 @@ TEST(ArrayPropsNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<ArrayPropsNativeComponentProps>();
   auto const &sourceProps = ArrayPropsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ArrayPropsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ArrayPropsNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -73,6 +83,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/BOOLEAN_PROP/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -85,8 +96,12 @@ TEST(BooleanPropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<BooleanPropNativeComponentProps>();
   auto const &sourceProps = BooleanPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  BooleanPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  BooleanPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(BooleanPropNativeComponentProps_disabled, etc) {
@@ -94,8 +109,12 @@ TEST(BooleanPropNativeComponentProps_disabled, etc) {
   propParser.prepare<BooleanPropNativeComponentProps>();
   auto const &sourceProps = BooleanPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", false));
-  rawProps.parse(propParser);
-  BooleanPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  BooleanPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -112,6 +131,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/COLOR_PROP/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -124,8 +144,12 @@ TEST(ColorPropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<ColorPropNativeComponentProps>();
   auto const &sourceProps = ColorPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ColorPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ColorPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(ColorPropNativeComponentProps_tintColor, etc) {
@@ -133,8 +157,12 @@ TEST(ColorPropNativeComponentProps_tintColor, etc) {
   propParser.prepare<ColorPropNativeComponentProps>();
   auto const &sourceProps = ColorPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"tintColor\\", 1));
-  rawProps.parse(propParser);
-  ColorPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ColorPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -151,6 +179,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/COMMANDS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -163,8 +192,12 @@ TEST(CommandNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<CommandNativeComponentProps>();
   auto const &sourceProps = CommandNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  CommandNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  CommandNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -181,6 +214,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/COMMANDS_AND_PROPS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -193,8 +227,12 @@ TEST(CommandNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<CommandNativeComponentProps>();
   auto const &sourceProps = CommandNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  CommandNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  CommandNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(CommandNativeComponentProps_accessibilityHint, etc) {
@@ -202,8 +240,12 @@ TEST(CommandNativeComponentProps_accessibilityHint, etc) {
   propParser.prepare<CommandNativeComponentProps>();
   auto const &sourceProps = CommandNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"accessibilityHint\\", \\"foo\\"));
-  rawProps.parse(propParser);
-  CommandNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  CommandNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -220,6 +262,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/DOUBLE_PROPS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -232,8 +275,12 @@ TEST(DoublePropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<DoublePropNativeComponentProps>();
   auto const &sourceProps = DoublePropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  DoublePropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  DoublePropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -250,6 +297,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -262,8 +310,12 @@ TEST(EventsNestedObjectNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<EventsNestedObjectNativeComponentProps>();
   auto const &sourceProps = EventsNestedObjectNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  EventsNestedObjectNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  EventsNestedObjectNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(EventsNestedObjectNativeComponentProps_disabled, etc) {
@@ -271,8 +323,12 @@ TEST(EventsNestedObjectNativeComponentProps_disabled, etc) {
   propParser.prepare<EventsNestedObjectNativeComponentProps>();
   auto const &sourceProps = EventsNestedObjectNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", false));
-  rawProps.parse(propParser);
-  EventsNestedObjectNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  EventsNestedObjectNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -289,6 +345,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/EVENT_PROPS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -301,8 +358,12 @@ TEST(EventsNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<EventsNativeComponentProps>();
   auto const &sourceProps = EventsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  EventsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  EventsNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(EventsNativeComponentProps_disabled, etc) {
@@ -310,8 +371,12 @@ TEST(EventsNativeComponentProps_disabled, etc) {
   propParser.prepare<EventsNativeComponentProps>();
   auto const &sourceProps = EventsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", false));
-  rawProps.parse(propParser);
-  EventsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  EventsNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -328,6 +393,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -340,8 +406,12 @@ TEST(InterfaceOnlyComponentProps_DoesNotDie, etc) {
   propParser.prepare<InterfaceOnlyComponentProps>();
   auto const &sourceProps = InterfaceOnlyComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  InterfaceOnlyComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  InterfaceOnlyComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -358,6 +428,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/EXCLUDE_ANDROID/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -370,8 +441,12 @@ TEST(ExcludedAndroidComponentProps_DoesNotDie, etc) {
   propParser.prepare<ExcludedAndroidComponentProps>();
   auto const &sourceProps = ExcludedAndroidComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ExcludedAndroidComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ExcludedAndroidComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -388,6 +463,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -400,8 +476,12 @@ TEST(ExcludedAndroidIosComponentProps_DoesNotDie, etc) {
   propParser.prepare<ExcludedAndroidIosComponentProps>();
   auto const &sourceProps = ExcludedAndroidIosComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ExcludedAndroidIosComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ExcludedAndroidIosComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -418,6 +498,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/FLOAT_PROPS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -430,8 +511,12 @@ TEST(FloatPropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<FloatPropNativeComponentProps>();
   auto const &sourceProps = FloatPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  FloatPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  FloatPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(FloatPropNativeComponentProps_blurRadius, etc) {
@@ -439,8 +524,12 @@ TEST(FloatPropNativeComponentProps_blurRadius, etc) {
   propParser.prepare<FloatPropNativeComponentProps>();
   auto const &sourceProps = FloatPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius\\", 0));
-  rawProps.parse(propParser);
-  FloatPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  FloatPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(FloatPropNativeComponentProps_blurRadius2, etc) {
@@ -448,8 +537,12 @@ TEST(FloatPropNativeComponentProps_blurRadius2, etc) {
   propParser.prepare<FloatPropNativeComponentProps>();
   auto const &sourceProps = FloatPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius2\\", 0.001));
-  rawProps.parse(propParser);
-  FloatPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  FloatPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(FloatPropNativeComponentProps_blurRadius3, etc) {
@@ -457,8 +550,12 @@ TEST(FloatPropNativeComponentProps_blurRadius3, etc) {
   propParser.prepare<FloatPropNativeComponentProps>();
   auto const &sourceProps = FloatPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius3\\", 2.1));
-  rawProps.parse(propParser);
-  FloatPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  FloatPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(FloatPropNativeComponentProps_blurRadius4, etc) {
@@ -466,8 +563,12 @@ TEST(FloatPropNativeComponentProps_blurRadius4, etc) {
   propParser.prepare<FloatPropNativeComponentProps>();
   auto const &sourceProps = FloatPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius4\\", 0));
-  rawProps.parse(propParser);
-  FloatPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  FloatPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(FloatPropNativeComponentProps_blurRadius5, etc) {
@@ -475,8 +576,12 @@ TEST(FloatPropNativeComponentProps_blurRadius5, etc) {
   propParser.prepare<FloatPropNativeComponentProps>();
   auto const &sourceProps = FloatPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius5\\", 1));
-  rawProps.parse(propParser);
-  FloatPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  FloatPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(FloatPropNativeComponentProps_blurRadius6, etc) {
@@ -484,8 +589,12 @@ TEST(FloatPropNativeComponentProps_blurRadius6, etc) {
   propParser.prepare<FloatPropNativeComponentProps>();
   auto const &sourceProps = FloatPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius6\\", 0));
-  rawProps.parse(propParser);
-  FloatPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  FloatPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -502,6 +611,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/IMAGE_PROP/Props.h>
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/RawProps.h>
@@ -515,8 +625,12 @@ TEST(ImagePropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<ImagePropNativeComponentProps>();
   auto const &sourceProps = ImagePropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ImagePropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ImagePropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(ImagePropNativeComponentProps_thumbImage, etc) {
@@ -524,8 +638,12 @@ TEST(ImagePropNativeComponentProps_thumbImage, etc) {
   propParser.prepare<ImagePropNativeComponentProps>();
   auto const &sourceProps = ImagePropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"thumbImage\\", folly::dynamic::object(\\"url\\", \\"testurl\\")));
-  rawProps.parse(propParser);
-  ImagePropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ImagePropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -542,6 +660,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/INSETS_PROP/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -554,8 +673,12 @@ TEST(InsetsPropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<InsetsPropNativeComponentProps>();
   auto const &sourceProps = InsetsPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  InsetsPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  InsetsPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -572,6 +695,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/INT32_ENUM_PROP/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -584,8 +708,12 @@ TEST(Int32EnumPropsNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<Int32EnumPropsNativeComponentProps>();
   auto const &sourceProps = Int32EnumPropsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  Int32EnumPropsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  Int32EnumPropsNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -602,6 +730,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/INTEGER_PROPS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -614,8 +743,12 @@ TEST(IntegerPropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<IntegerPropNativeComponentProps>();
   auto const &sourceProps = IntegerPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  IntegerPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  IntegerPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -632,6 +765,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/INTERFACE_ONLY/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -644,8 +778,12 @@ TEST(InterfaceOnlyComponentProps_DoesNotDie, etc) {
   propParser.prepare<InterfaceOnlyComponentProps>();
   auto const &sourceProps = InterfaceOnlyComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  InterfaceOnlyComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  InterfaceOnlyComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(InterfaceOnlyComponentProps_accessibilityHint, etc) {
@@ -653,8 +791,12 @@ TEST(InterfaceOnlyComponentProps_accessibilityHint, etc) {
   propParser.prepare<InterfaceOnlyComponentProps>();
   auto const &sourceProps = InterfaceOnlyComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"accessibilityHint\\", \\"foo\\"));
-  rawProps.parse(propParser);
-  InterfaceOnlyComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  InterfaceOnlyComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -671,6 +813,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/MULTI_NATIVE_PROP/Props.h>
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/RawProps.h>
@@ -684,8 +827,12 @@ TEST(ImageColorPropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<ImageColorPropNativeComponentProps>();
   auto const &sourceProps = ImageColorPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ImageColorPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ImageColorPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(ImageColorPropNativeComponentProps_thumbImage, etc) {
@@ -693,8 +840,12 @@ TEST(ImageColorPropNativeComponentProps_thumbImage, etc) {
   propParser.prepare<ImageColorPropNativeComponentProps>();
   auto const &sourceProps = ImageColorPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"thumbImage\\", folly::dynamic::object(\\"url\\", \\"testurl\\")));
-  rawProps.parse(propParser);
-  ImageColorPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ImageColorPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(ImageColorPropNativeComponentProps_color, etc) {
@@ -702,8 +853,12 @@ TEST(ImageColorPropNativeComponentProps_color, etc) {
   propParser.prepare<ImageColorPropNativeComponentProps>();
   auto const &sourceProps = ImageColorPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"color\\", 1));
-  rawProps.parse(propParser);
-  ImageColorPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ImageColorPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(ImageColorPropNativeComponentProps_thumbTintColor, etc) {
@@ -711,8 +866,12 @@ TEST(ImageColorPropNativeComponentProps_thumbTintColor, etc) {
   propParser.prepare<ImageColorPropNativeComponentProps>();
   auto const &sourceProps = ImageColorPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"thumbTintColor\\", 1));
-  rawProps.parse(propParser);
-  ImageColorPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ImageColorPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(ImageColorPropNativeComponentProps_point, etc) {
@@ -720,8 +879,12 @@ TEST(ImageColorPropNativeComponentProps_point, etc) {
   propParser.prepare<ImageColorPropNativeComponentProps>();
   auto const &sourceProps = ImageColorPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"point\\", folly::dynamic::object(\\"x\\", 1)(\\"y\\", 1)));
-  rawProps.parse(propParser);
-  ImageColorPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ImageColorPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -738,6 +901,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -750,8 +914,12 @@ TEST(NoPropsNoEventsComponentProps_DoesNotDie, etc) {
   propParser.prepare<NoPropsNoEventsComponentProps>();
   auto const &sourceProps = NoPropsNoEventsComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  NoPropsNoEventsComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  NoPropsNoEventsComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -768,6 +936,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/OBJECT_PROPS/Props.h>
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/RawProps.h>
@@ -781,8 +950,12 @@ TEST(ObjectPropsProps_DoesNotDie, etc) {
   propParser.prepare<ObjectPropsProps>();
   auto const &sourceProps = ObjectPropsProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  ObjectPropsProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ObjectPropsProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -799,6 +972,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/POINT_PROP/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -811,8 +985,12 @@ TEST(PointPropNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<PointPropNativeComponentProps>();
   auto const &sourceProps = PointPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  PointPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  PointPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(PointPropNativeComponentProps_startPoint, etc) {
@@ -820,8 +998,12 @@ TEST(PointPropNativeComponentProps_startPoint, etc) {
   propParser.prepare<PointPropNativeComponentProps>();
   auto const &sourceProps = PointPropNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"startPoint\\", folly::dynamic::object(\\"x\\", 1)(\\"y\\", 1)));
-  rawProps.parse(propParser);
-  PointPropNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  PointPropNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -838,6 +1020,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/STRING_ENUM_PROP/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -850,8 +1033,12 @@ TEST(StringEnumPropsNativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<StringEnumPropsNativeComponentProps>();
   auto const &sourceProps = StringEnumPropsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  StringEnumPropsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  StringEnumPropsNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(StringEnumPropsNativeComponentProps_alignment_Top, etc) {
@@ -859,8 +1046,12 @@ TEST(StringEnumPropsNativeComponentProps_alignment_Top, etc) {
   propParser.prepare<StringEnumPropsNativeComponentProps>();
   auto const &sourceProps = StringEnumPropsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"alignment\\", \\"top\\"));
-  rawProps.parse(propParser);
-  StringEnumPropsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  StringEnumPropsNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(StringEnumPropsNativeComponentProps_alignment_Center, etc) {
@@ -868,8 +1059,12 @@ TEST(StringEnumPropsNativeComponentProps_alignment_Center, etc) {
   propParser.prepare<StringEnumPropsNativeComponentProps>();
   auto const &sourceProps = StringEnumPropsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"alignment\\", \\"center\\"));
-  rawProps.parse(propParser);
-  StringEnumPropsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  StringEnumPropsNativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(StringEnumPropsNativeComponentProps_alignment_BottomRight, etc) {
@@ -877,8 +1072,12 @@ TEST(StringEnumPropsNativeComponentProps_alignment_BottomRight, etc) {
   propParser.prepare<StringEnumPropsNativeComponentProps>();
   auto const &sourceProps = StringEnumPropsNativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"alignment\\", \\"bottom-right\\"));
-  rawProps.parse(propParser);
-  StringEnumPropsNativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  StringEnumPropsNativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -895,6 +1094,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/STRING_PROP/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -907,8 +1107,12 @@ TEST(StringPropComponentProps_DoesNotDie, etc) {
   propParser.prepare<StringPropComponentProps>();
   auto const &sourceProps = StringPropComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  StringPropComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  StringPropComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(StringPropComponentProps_accessibilityHint, etc) {
@@ -916,8 +1120,12 @@ TEST(StringPropComponentProps_accessibilityHint, etc) {
   propParser.prepare<StringPropComponentProps>();
   auto const &sourceProps = StringPropComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"accessibilityHint\\", \\"foo\\"));
-  rawProps.parse(propParser);
-  StringPropComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  StringPropComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(StringPropComponentProps_accessibilityRole, etc) {
@@ -925,8 +1133,12 @@ TEST(StringPropComponentProps_accessibilityRole, etc) {
   propParser.prepare<StringPropComponentProps>();
   auto const &sourceProps = StringPropComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"accessibilityRole\\", \\"foo\\"));
-  rawProps.parse(propParser);
-  StringPropComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  StringPropComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -943,6 +1155,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -955,8 +1168,12 @@ TEST(MultiFile1NativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<MultiFile1NativeComponentProps>();
   auto const &sourceProps = MultiFile1NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  MultiFile1NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiFile1NativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(MultiFile1NativeComponentProps_disabled, etc) {
@@ -964,8 +1181,12 @@ TEST(MultiFile1NativeComponentProps_disabled, etc) {
   propParser.prepare<MultiFile1NativeComponentProps>();
   auto const &sourceProps = MultiFile1NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", false));
-  rawProps.parse(propParser);
-  MultiFile1NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiFile1NativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(MultiFile2NativeComponentProps_DoesNotDie, etc) {
@@ -973,8 +1194,12 @@ TEST(MultiFile2NativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<MultiFile2NativeComponentProps>();
   auto const &sourceProps = MultiFile2NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  MultiFile2NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiFile2NativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(MultiFile2NativeComponentProps_disabled, etc) {
@@ -982,8 +1207,12 @@ TEST(MultiFile2NativeComponentProps_disabled, etc) {
   propParser.prepare<MultiFile2NativeComponentProps>();
   auto const &sourceProps = MultiFile2NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", true));
-  rawProps.parse(propParser);
-  MultiFile2NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiFile2NativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
@@ -1000,6 +1229,7 @@ Map {
  * */
 
 #include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/Props.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
@@ -1012,8 +1242,12 @@ TEST(MultiComponent1NativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<MultiComponent1NativeComponentProps>();
   auto const &sourceProps = MultiComponent1NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  MultiComponent1NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiComponent1NativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(MultiComponent1NativeComponentProps_disabled, etc) {
@@ -1021,8 +1255,12 @@ TEST(MultiComponent1NativeComponentProps_disabled, etc) {
   propParser.prepare<MultiComponent1NativeComponentProps>();
   auto const &sourceProps = MultiComponent1NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", false));
-  rawProps.parse(propParser);
-  MultiComponent1NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiComponent1NativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(MultiComponent2NativeComponentProps_DoesNotDie, etc) {
@@ -1030,8 +1268,12 @@ TEST(MultiComponent2NativeComponentProps_DoesNotDie, etc) {
   propParser.prepare<MultiComponent2NativeComponentProps>();
   auto const &sourceProps = MultiComponent2NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
-  rawProps.parse(propParser);
-  MultiComponent2NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiComponent2NativeComponentProps(parserContext, sourceProps, rawProps);
 }
 
 TEST(MultiComponent2NativeComponentProps_disabled, etc) {
@@ -1039,8 +1281,12 @@ TEST(MultiComponent2NativeComponentProps_disabled, etc) {
   propParser.prepare<MultiComponent2NativeComponentProps>();
   auto const &sourceProps = MultiComponent2NativeComponentProps();
   auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", true));
-  rawProps.parse(propParser);
-  MultiComponent2NativeComponentProps(sourceProps, rawProps);
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiComponent2NativeComponentProps(parserContext, sourceProps, rawProps);
 }",
 }
 `;
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
index 27bf707c6a83ff..099c42e270fb58 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
@@ -16,9 +16,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const ArrayPropsNativeComponentViewConfig = {
+let nativeComponentName = 'ArrayPropsNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'ArrayPropsNativeComponent',
 
   validAttributes: {
@@ -38,15 +40,7 @@ const ArrayPropsNativeComponentViewConfig = {
     array: true,
     arrayOfArrayOfObject: true,
   },
-};
-
-let nativeComponentName = 'ArrayPropsNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, ArrayPropsNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ArrayPropsNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -67,23 +61,17 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const ArrayPropsNativeComponentViewConfig = {
+let nativeComponentName = 'ArrayPropsNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'ArrayPropsNativeComponent',
 
   validAttributes: {
     nativePrimitives: true,
   },
-};
-
-let nativeComponentName = 'ArrayPropsNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, ArrayPropsNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ArrayPropsNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -104,23 +92,17 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'BooleanPropNativeComponent';
 
-const BooleanPropNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'BooleanPropNativeComponent',
 
   validAttributes: {
     disabled: true,
   },
-};
-
-let nativeComponentName = 'BooleanPropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, BooleanPropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = BooleanPropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -141,9 +123,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'ColorPropNativeComponent';
 
-const ColorPropNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'ColorPropNativeComponent',
 
   validAttributes: {
@@ -151,15 +135,7 @@ const ColorPropNativeComponentViewConfig = {
       process: require('processColor'),
     },
   },
-};
-
-let nativeComponentName = 'ColorPropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, ColorPropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ColorPropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -180,21 +156,15 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 const {dispatchCommand} = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
 
-const CommandNativeComponentViewConfig = {
-  uiViewClassName: 'CommandNativeComponent',
-  validAttributes: {},
-};
-
 let nativeComponentName = 'CommandNativeComponent';
 
-registerGeneratedViewConfig(nativeComponentName, CommandNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = CommandNativeComponentViewConfig;
-
-export default nativeComponentName;
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
+  uiViewClassName: 'CommandNativeComponent',
+  validAttributes: {},
+}));
 
 export const Commands = {
     flashScrollIndicators(ref) {
@@ -225,24 +195,18 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 const {dispatchCommand} = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
 
-const CommandNativeComponentViewConfig = {
+let nativeComponentName = 'CommandNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'CommandNativeComponent',
 
   validAttributes: {
     accessibilityHint: true,
   },
-};
-
-let nativeComponentName = 'CommandNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, CommandNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = CommandNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 
 export const Commands = {
     handleRootTag(ref, rootTag) {
@@ -273,9 +237,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'DoublePropNativeComponent';
 
-const DoublePropNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'DoublePropNativeComponent',
 
   validAttributes: {
@@ -286,15 +252,7 @@ const DoublePropNativeComponentViewConfig = {
     blurRadius5: true,
     blurRadius6: true,
   },
-};
-
-let nativeComponentName = 'DoublePropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, DoublePropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = DoublePropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -315,9 +273,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'EventsNestedObjectNativeComponent';
 
-const EventsNestedObjectNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'EventsNestedObjectNativeComponent',
 
   bubblingEventTypes: {
@@ -333,15 +293,7 @@ const EventsNestedObjectNativeComponentViewConfig = {
     disabled: true,
     onChange: true,
   },
-};
-
-let nativeComponentName = 'EventsNestedObjectNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, EventsNestedObjectNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = EventsNestedObjectNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -362,9 +314,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const EventsNativeComponentViewConfig = {
+let nativeComponentName = 'EventsNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'EventsNativeComponent',
 
   bubblingEventTypes: {
@@ -400,15 +354,7 @@ const EventsNativeComponentViewConfig = {
     onOrientationChange: true,
     onEnd: true,
   },
-};
-
-let nativeComponentName = 'EventsNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, EventsNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = EventsNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -429,9 +375,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const InterfaceOnlyComponentViewConfig = {
+let nativeComponentName = 'RCTInterfaceOnlyComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'RCTInterfaceOnlyComponent',
 
   bubblingEventTypes: {
@@ -464,15 +412,7 @@ const InterfaceOnlyComponentViewConfig = {
     onChange: true,
     onDire tChange: true,
   },
-};
-
-let nativeComponentName = 'RCTInterfaceOnlyComponent';
-
-registerGeneratedViewConfig(nativeComponentName, InterfaceOnlyComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = InterfaceOnlyComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -493,20 +433,14 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
-
-const ExcludedAndroidComponentViewConfig = {
-  uiViewClassName: 'ExcludedAndroidComponent',
-  validAttributes: {},
-};
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
 let nativeComponentName = 'ExcludedAndroidComponent';
 
-registerGeneratedViewConfig(nativeComponentName, ExcludedAndroidComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ExcludedAndroidComponentViewConfig;
-
-export default nativeComponentName;
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
+  uiViewClassName: 'ExcludedAndroidComponent',
+  validAttributes: {},
+}));
 ",
 }
 `;
@@ -527,20 +461,14 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
-
-const ExcludedAndroidIosComponentViewConfig = {
-  uiViewClassName: 'ExcludedAndroidIosComponent',
-  validAttributes: {},
-};
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
 let nativeComponentName = 'ExcludedAndroidIosComponent';
 
-registerGeneratedViewConfig(nativeComponentName, ExcludedAndroidIosComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ExcludedAndroidIosComponentViewConfig;
-
-export default nativeComponentName;
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
+  uiViewClassName: 'ExcludedAndroidIosComponent',
+  validAttributes: {},
+}));
 ",
 }
 `;
@@ -561,9 +489,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const FloatPropNativeComponentViewConfig = {
+let nativeComponentName = 'FloatPropNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'FloatPropNativeComponent',
 
   validAttributes: {
@@ -574,15 +504,7 @@ const FloatPropNativeComponentViewConfig = {
     blurRadius5: true,
     blurRadius6: true,
   },
-};
-
-let nativeComponentName = 'FloatPropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, FloatPropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = FloatPropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -603,9 +525,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const ImagePropNativeComponentViewConfig = {
+let nativeComponentName = 'ImagePropNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'ImagePropNativeComponent',
 
   validAttributes: {
@@ -613,15 +537,7 @@ const ImagePropNativeComponentViewConfig = {
       process: require('resolveAssetSource'),
     },
   },
-};
-
-let nativeComponentName = 'ImagePropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, ImagePropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ImagePropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -642,9 +558,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'InsetsPropNativeComponent';
 
-const InsetsPropNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'InsetsPropNativeComponent',
 
   validAttributes: {
@@ -652,15 +570,7 @@ const InsetsPropNativeComponentViewConfig = {
       diff: require('insetsDiffer'),
     },
   },
-};
-
-let nativeComponentName = 'InsetsPropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, InsetsPropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = InsetsPropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -681,23 +591,17 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'Int32EnumPropsNativeComponent';
 
-const Int32EnumPropsNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'Int32EnumPropsNativeComponent',
 
   validAttributes: {
     maxInterval: true,
   },
-};
-
-let nativeComponentName = 'Int32EnumPropsNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, Int32EnumPropsNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = Int32EnumPropsNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -718,9 +622,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const IntegerPropNativeComponentViewConfig = {
+let nativeComponentName = 'IntegerPropNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'IntegerPropNativeComponent',
 
   validAttributes: {
@@ -728,15 +634,7 @@ const IntegerPropNativeComponentViewConfig = {
     progress2: true,
     progress3: true,
   },
-};
-
-let nativeComponentName = 'IntegerPropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, IntegerPropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = IntegerPropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -757,9 +655,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const InterfaceOnlyComponentViewConfig = {
+let nativeComponentName = 'RCTInterfaceOnlyComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'RCTInterfaceOnlyComponent',
 
   bubblingEventTypes: {
@@ -775,15 +675,7 @@ const InterfaceOnlyComponentViewConfig = {
     accessibilityHint: true,
     onChange: true,
   },
-};
-
-let nativeComponentName = 'RCTInterfaceOnlyComponent';
-
-registerGeneratedViewConfig(nativeComponentName, InterfaceOnlyComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = InterfaceOnlyComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -804,9 +696,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'ImageColorPropNativeComponent';
 
-const ImageColorPropNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'ImageColorPropNativeComponent',
 
   validAttributes: {
@@ -826,15 +720,7 @@ const ImageColorPropNativeComponentViewConfig = {
       diff: require('pointsDiffer'),
     },
   },
-};
-
-let nativeComponentName = 'ImageColorPropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, ImageColorPropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ImageColorPropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -855,20 +741,14 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
-
-const NoPropsNoEventsComponentViewConfig = {
-  uiViewClassName: 'NoPropsNoEventsComponent',
-  validAttributes: {},
-};
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
 let nativeComponentName = 'NoPropsNoEventsComponent';
 
-registerGeneratedViewConfig(nativeComponentName, NoPropsNoEventsComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = NoPropsNoEventsComponentViewConfig;
-
-export default nativeComponentName;
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
+  uiViewClassName: 'NoPropsNoEventsComponent',
+  validAttributes: {},
+}));
 ",
 }
 `;
@@ -889,23 +769,17 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const ObjectPropsViewConfig = {
+let nativeComponentName = 'ObjectProps';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'ObjectProps',
 
   validAttributes: {
     objectProp: true,
   },
-};
-
-let nativeComponentName = 'ObjectProps';
-
-registerGeneratedViewConfig(nativeComponentName, ObjectPropsViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = ObjectPropsViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -926,9 +800,11 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 
-const PointPropNativeComponentViewConfig = {
+let nativeComponentName = 'PointPropNativeComponent';
+
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'PointPropNativeComponent',
 
   validAttributes: {
@@ -936,15 +812,7 @@ const PointPropNativeComponentViewConfig = {
       diff: require('pointsDiffer'),
     },
   },
-};
-
-let nativeComponentName = 'PointPropNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, PointPropNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = PointPropNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -965,23 +833,17 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'StringEnumPropsNativeComponent';
 
-const StringEnumPropsNativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'StringEnumPropsNativeComponent',
 
   validAttributes: {
     alignment: true,
   },
-};
-
-let nativeComponentName = 'StringEnumPropsNativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, StringEnumPropsNativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = StringEnumPropsNativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -1002,24 +864,18 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'StringPropComponent';
 
-const StringPropComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'StringPropComponent',
 
   validAttributes: {
     accessibilityHint: true,
     accessibilityRole: true,
   },
-};
-
-let nativeComponentName = 'StringPropComponent';
-
-registerGeneratedViewConfig(nativeComponentName, StringPropComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = StringPropComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -1040,39 +896,27 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'MultiFile1NativeComponent';
 
-const MultiFile1NativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'MultiFile1NativeComponent',
 
   validAttributes: {
     disabled: true,
   },
-};
-
-let nativeComponentName = 'MultiFile1NativeComponent';
+}));
 
-registerGeneratedViewConfig(nativeComponentName, MultiFile1NativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = MultiFile1NativeComponentViewConfig;
-
-export default nativeComponentName;
+let nativeComponentName = 'MultiFile2NativeComponent';
 
-const MultiFile2NativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'MultiFile2NativeComponent',
 
   validAttributes: {
     disabled: true,
   },
-};
-
-let nativeComponentName = 'MultiFile2NativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, MultiFile2NativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = MultiFile2NativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -1093,39 +937,27 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
+
+let nativeComponentName = 'MultiComponent1NativeComponent';
 
-const MultiComponent1NativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'MultiComponent1NativeComponent',
 
   validAttributes: {
     disabled: true,
   },
-};
-
-let nativeComponentName = 'MultiComponent1NativeComponent';
+}));
 
-registerGeneratedViewConfig(nativeComponentName, MultiComponent1NativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = MultiComponent1NativeComponentViewConfig;
-
-export default nativeComponentName;
+let nativeComponentName = 'MultiComponent2NativeComponent';
 
-const MultiComponent2NativeComponentViewConfig = {
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
   uiViewClassName: 'MultiComponent2NativeComponent',
 
   validAttributes: {
     disabled: true,
   },
-};
-
-let nativeComponentName = 'MultiComponent2NativeComponent';
-
-registerGeneratedViewConfig(nativeComponentName, MultiComponent2NativeComponentViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = MultiComponent2NativeComponentViewConfig;
-
-export default nativeComponentName;
+}));
 ",
 }
 `;
@@ -1146,27 +978,21 @@ Map {
 
 'use strict';
 
-const registerGeneratedViewConfig = require('registerGeneratedViewConfig');
+const NativeComponentRegistry = require('NativeComponentRegistry');
 const {UIManager} = require(\\"react-native\\")
 
-const NativeComponentNameViewConfig = {
-  uiViewClassName: 'NativeComponentName',
-  validAttributes: {},
-};
-
 let nativeComponentName = 'NativeComponentName';
 if (UIManager.getViewManagerConfig('NativeComponentName')) {
   nativeComponentName = 'NativeComponentName';
-} else if (UIManager.getViewManagerConfig('DeprecatedNativeComponentName')){
+} else if (UIManager.getViewManagerConfig('DeprecatedNativeComponentName')) {
   nativeComponentName = 'DeprecatedNativeComponentName';
 } else {
-  throw new Error('Failed to find native component for either \\"NativeComponentName\\" or \\"DeprecatedNativeComponentName\\"')
+  throw new Error('Failed to find native component for either \\"NativeComponentName\\" or \\"DeprecatedNativeComponentName\\"');
 }
-registerGeneratedViewConfig(nativeComponentName, NativeComponentNameViewConfig);
-
-export const __INTERNAL_VIEW_CONFIG = NativeComponentNameViewConfig;
-
-export default nativeComponentName;
+export default NativeComponentRegistry.get(nativeComponentName, () => ({
+  uiViewClassName: 'NativeComponentName',
+  validAttributes: {},
+}));
 ",
 }
 `;
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
index 48f70b5b7af896..27eba9c32f1e7b 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
@@ -12,8 +12,9 @@
 
 import type {
   SchemaType,
-  NativeModulePropertySchema,
-  NativeModuleMethodParamSchema,
+  Nullable,
+  NamedShape,
+  NativeModulePropertyShape,
   NativeModuleFunctionTypeAnnotation,
   NativeModuleParamTypeAnnotation,
 } from '../../CodegenSchema';
@@ -50,14 +51,12 @@ const ModuleTemplate = ({
   hostFunctions,
   moduleName,
   methods,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   hostFunctions: $ReadOnlyArray<string>,
   moduleName: string,
-  methods: $ReadOnlyArray<
-    $ReadOnly<{|methodName: string, paramCount: number|}>,
-  >,
-|}>) => {
+  methods: $ReadOnlyArray<$ReadOnly<{methodName: string, paramCount: number}>>,
+}>) => {
   return `${hostFunctions.join('\n')}
 
 ${hasteModuleName}CxxSpecJSI::${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
@@ -99,8 +98,10 @@ ${modules}
 `;
 };
 
+type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
+
 function serializeArg(
-  arg: NativeModuleMethodParamSchema,
+  arg: Param,
   index: number,
   resolveAlias: AliasResolver,
 ): string {
@@ -118,7 +119,7 @@ function serializeArg(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return wrap('.getNumber()');
@@ -158,7 +159,7 @@ function serializeArg(
 
 function serializePropertyIntoHostFunction(
   hasteModuleName: string,
-  property: NativeModulePropertySchema,
+  property: NativeModulePropertyShape,
   resolveAlias: AliasResolver,
 ): string {
   const [
@@ -183,8 +184,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const nativeModules = getModules(schema);
 
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
index 1f37cc08365dee..fe919e910cefb7 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -26,7 +26,7 @@ type FilesOutput = Map<string, string>;
 const ModuleClassDeclarationTemplate = ({
   hasteModuleName,
   moduleProperties,
-}: $ReadOnly<{|hasteModuleName: string, moduleProperties: string|}>) => {
+}: $ReadOnly<{hasteModuleName: string, moduleProperties: string}>) => {
   return `class JSI_EXPORT ${hasteModuleName}CxxSpecJSI : public TurboModule {
 protected:
   ${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -39,9 +39,9 @@ ${moduleProperties}
 
 const FileTemplate = ({
   modules,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   modules: string,
-|}>) => {
+}>) => {
   return `/**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
@@ -78,7 +78,7 @@ function translatePrimitiveJSTypeToCpp(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return 'double';
@@ -123,8 +123,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const nativeModules = getModules(schema);
 
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
index dcb39b11ebd32f..e5d5ecb141b1f5 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
@@ -12,9 +12,9 @@
 
 import type {
   Nullable,
+  NamedShape,
   SchemaType,
-  NativeModulePropertySchema,
-  NativeModuleMethodParamSchema,
+  NativeModulePropertyShape,
   NativeModuleReturnTypeAnnotation,
   NativeModuleFunctionTypeAnnotation,
   NativeModuleParamTypeAnnotation,
@@ -27,12 +27,12 @@ const {unwrapNullable} = require('../../parsers/flow/modules/utils');
 type FilesOutput = Map<string, string>;
 
 function FileTemplate(
-  config: $ReadOnly<{|
+  config: $ReadOnly<{
     packageName: string,
     className: string,
     methods: string,
     imports: string,
-  |}>,
+  }>,
 ): string {
   const {packageName, className, methods, imports} = config;
   return `
@@ -62,14 +62,14 @@ ${methods}
 }
 
 function MethodTemplate(
-  config: $ReadOnly<{|
+  config: $ReadOnly<{
     abstract: boolean,
     methodBody: ?string,
     methodJavaAnnotation: string,
     methodName: string,
     translatedReturnType: string,
     traversedArgs: Array<string>,
-  |}>,
+  }>,
 ): string {
   const {
     abstract,
@@ -91,8 +91,10 @@ function MethodTemplate(
   )})${methodClosing}`;
 }
 
+type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
+
 function translateFunctionParamToJavaType(
-  param: NativeModuleMethodParamSchema,
+  param: Param,
   createErrorMessage: (typeName: string) => string,
   resolveAlias: AliasResolver,
   imports: Set<string>,
@@ -118,7 +120,7 @@ function translateFunctionParamToJavaType(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return !isRequired ? 'Double' : 'double';
@@ -188,7 +190,7 @@ function translateFunctionReturnTypeToJavaType(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return nullable ? 'Double' : 'double';
@@ -245,7 +247,7 @@ function getFalsyReturnStatementFromReturnType(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return 'return 0.0;';
@@ -283,7 +285,7 @@ function getFalsyReturnStatementFromReturnType(
 
 // Build special-cased runtime check for getConstants().
 function buildGetConstantsMethod(
-  method: NativeModulePropertySchema,
+  method: NativeModulePropertyShape,
   imports: Set<string>,
 ): string {
   const [
@@ -337,6 +339,7 @@ function buildGetConstantsMethod(
     return `  protected abstract Map<String, Object> getTypedExportedConstants();
 
   @Override
+  @DoNotStrip
   public final @Nullable Map<String, Object> getConstants() {
     Map<String, Object> constants = getTypedExportedConstants();
     if (ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD) {
@@ -365,14 +368,15 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const files = new Map();
+    const nativeModules = getModules(schema);
+
     const normalizedPackageName =
-      packageName != null ? packageName : 'com.facebook.fbreact.specs';
+      packageName == null ? 'com.facebook.fbreact.specs' : packageName;
     const outputDir = `java/${normalizedPackageName.replace(/\./g, '/')}`;
-    const nativeModules = getModules(schema);
 
     Object.keys(nativeModules).forEach(hasteModuleName => {
       const {
@@ -393,6 +397,7 @@ module.exports = {
         'com.facebook.react.bridge.ReactMethod',
         'com.facebook.react.bridge.ReactModuleWithSpec',
         'com.facebook.react.turbomodule.core.interfaces.TurboModule',
+        'com.facebook.proguard.annotations.DoNotStrip',
       ]);
 
       const methods = properties.map(method => {
@@ -441,7 +446,7 @@ module.exports = {
 
         const methodJavaAnnotation = `@ReactMethod${
           isSyncMethod ? '(isBlockingSynchronousMethod = true)' : ''
-        }`;
+        }\n  @DoNotStrip`;
         const methodBody = method.optional
           ? getFalsyReturnStatementFromReturnType(
               methodTypeAnnotation.returnTypeAnnotation,
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
index f13c8ee54ca047..60b7274b786846 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
@@ -12,9 +12,9 @@
 
 import type {
   Nullable,
+  NamedShape,
   SchemaType,
-  NativeModulePropertySchema,
-  NativeModuleMethodParamSchema,
+  NativeModulePropertyShape,
   NativeModuleReturnTypeAnnotation,
   NativeModuleParamTypeAnnotation,
   NativeModuleFunctionTypeAnnotation,
@@ -40,12 +40,12 @@ const HostFunctionTemplate = ({
   propertyName,
   jniSignature,
   jsReturnType,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   propertyName: string,
   jniSignature: string,
   jsReturnType: JSReturnType,
-|}>) => {
+}>) => {
   return `static facebook::jsi::Value __hostFunction_${hasteModuleName}SpecJSI_${propertyName}(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, ${jsReturnType}, "${propertyName}", "${jniSignature}", args, count);
 }`;
@@ -54,13 +54,13 @@ const HostFunctionTemplate = ({
 const ModuleClassConstructorTemplate = ({
   hasteModuleName,
   methods,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
-  methods: $ReadOnlyArray<{|
+  methods: $ReadOnlyArray<{
     propertyName: string,
     argCount: number,
-  |}>,
-|}>) => {
+  }>,
+}>) => {
   return `
 ${hasteModuleName}SpecJSI::${hasteModuleName}SpecJSI(const JavaTurboModule::InitParams &params)
   : JavaTurboModule(params) {
@@ -75,7 +75,7 @@ ${methods
 const ModuleLookupTemplate = ({
   moduleName,
   hasteModuleName,
-}: $ReadOnly<{|moduleName: string, hasteModuleName: string|}>) => {
+}: $ReadOnly<{moduleName: string, hasteModuleName: string}>) => {
   return `  if (moduleName == "${moduleName}") {
     return std::make_shared<${hasteModuleName}SpecJSI>(params);
   }`;
@@ -86,17 +86,17 @@ const FileTemplate = ({
   include,
   modules,
   moduleLookups,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   libraryName: string,
   include: string,
   modules: string,
   moduleLookups: $ReadOnlyArray<
-    $ReadOnly<{|
+    $ReadOnly<{
       hasteModuleName: string,
       moduleName: string,
-    |}>,
+    }>,
   >,
-|}>) => {
+}>) => {
   return `
 /**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
@@ -137,7 +137,7 @@ function translateReturnTypeToKind(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return 'NumberKind';
@@ -177,8 +177,10 @@ function translateReturnTypeToKind(
   }
 }
 
+type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
+
 function translateParamTypeToJniType(
-  param: NativeModuleMethodParamSchema,
+  param: Param,
   resolveAlias: AliasResolver,
 ): string {
   const {optional, typeAnnotation: nullableTypeAnnotation} = param;
@@ -194,7 +196,7 @@ function translateParamTypeToJniType(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return !isRequired ? 'Ljava/lang/Double;' : 'D';
@@ -207,7 +209,7 @@ function translateParamTypeToJniType(
     case 'StringTypeAnnotation':
       return 'Ljava/lang/String;';
     case 'BooleanTypeAnnotation':
-      return !isRequired ? 'Ljava/lang/Boolean' : 'Z';
+      return !isRequired ? 'Ljava/lang/Boolean;' : 'Z';
     case 'NumberTypeAnnotation':
       return !isRequired ? 'Ljava/lang/Double;' : 'D';
     case 'DoubleTypeAnnotation':
@@ -244,7 +246,7 @@ function translateReturnTypeToJniType(
   }
 
   switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
           return nullable ? 'Ljava/lang/Double;' : 'D';
@@ -259,7 +261,7 @@ function translateReturnTypeToJniType(
     case 'StringTypeAnnotation':
       return 'Ljava/lang/String;';
     case 'BooleanTypeAnnotation':
-      return nullable ? 'Ljava/lang/Boolean' : 'Z';
+      return nullable ? 'Ljava/lang/Boolean;' : 'Z';
     case 'NumberTypeAnnotation':
       return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'DoubleTypeAnnotation':
@@ -285,7 +287,7 @@ function translateReturnTypeToJniType(
 }
 
 function translateMethodTypeToJniSignature(
-  property: NativeModulePropertySchema,
+  property: NativeModulePropertyShape,
   resolveAlias: AliasResolver,
 ): string {
   const {name, typeAnnotation} = property;
@@ -325,7 +327,7 @@ function translateMethodTypeToJniSignature(
 
 function translateMethodForImplementation(
   hasteModuleName: string,
-  property: NativeModulePropertySchema,
+  property: NativeModulePropertyShape,
   resolveAlias: AliasResolver,
 ): string {
   const [
@@ -355,8 +357,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const nativeModules = getModules(schema);
 
@@ -419,6 +421,7 @@ module.exports = {
       })
       .join('\n');
 
+    // $FlowFixMe[missing-type-arg]
     const moduleLookups = Object.keys(nativeModules)
       .filter(hasteModuleName => {
         const module = nativeModules[hasteModuleName];
@@ -439,7 +442,7 @@ module.exports = {
         }
         return 0;
       })
-      .flatMap<{|moduleName: string, hasteModuleName: string|}>(
+      .flatMap<{moduleName: string, hasteModuleName: string}>(
         (hasteModuleName: string) => {
           const {moduleNames} = nativeModules[hasteModuleName];
           return moduleNames.map(moduleName => ({
@@ -449,12 +452,12 @@ module.exports = {
         },
       );
 
-    const fileName = `${moduleSpecName}-generated.cpp`;
+    const fileName = `${libraryName}-generated.cpp`;
     const replacedTemplate = FileTemplate({
       modules: modules,
       libraryName: libraryName.replace(/-/g, '_'),
       moduleLookups,
-      include: `"${moduleSpecName}.h"`,
+      include: `"${libraryName}.h"`,
     });
     return new Map([[`jni/${fileName}`, replacedTemplate]]);
   },
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 83618968675d4f..a893fea829f116 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -18,7 +18,7 @@ const {getModules} = require('./Utils');
 
 const ModuleClassDeclarationTemplate = ({
   hasteModuleName,
-}: $ReadOnly<{|hasteModuleName: string|}>) => {
+}: $ReadOnly<{hasteModuleName: string}>) => {
   return `/**
  * JNI C++ class for module '${hasteModuleName}'
  */
@@ -32,7 +32,7 @@ public:
 const HeaderFileTemplate = ({
   modules,
   libraryName,
-}: $ReadOnly<{|modules: string, libraryName: string|}>) => {
+}: $ReadOnly<{modules: string, libraryName: string}>) => {
   return `
 /**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
@@ -61,6 +61,7 @@ std::shared_ptr<TurboModule> ${libraryName}_ModuleProvider(const std::string mod
 `;
 };
 
+// Note: this Android.mk template includes dependencies for both NativeModule and components.
 const AndroidMkTemplate = ({libraryName}: $ReadOnly<{libraryName: string}>) => {
   return `# Copyright (c) Facebook, Inc. and its affiliates.
 #
@@ -71,17 +72,15 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := ${libraryName}
+LOCAL_MODULE := react_codegen_${libraryName}
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/${libraryName}/*.cpp)
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/${libraryName}
 
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
-
-LOCAL_STATIC_LIBRARIES := libjsi
+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
 
 LOCAL_CFLAGS := \\
   -DLOG_TAG=\\"ReactNative\\"
@@ -96,8 +95,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean = false,
   ): FilesOutput {
     const nativeModules = getModules(schema);
     const modules = Object.keys(nativeModules)
@@ -112,7 +111,7 @@ module.exports = {
       .map(hasteModuleName => ModuleClassDeclarationTemplate({hasteModuleName}))
       .join('\n');
 
-    const fileName = `${moduleSpecName}.h`;
+    const fileName = `${libraryName}.h`;
     const replacedTemplate = HeaderFileTemplate({
       modules: modules,
       libraryName: libraryName.replace(/-/g, '_'),
@@ -122,7 +121,7 @@ module.exports = {
       [
         'jni/Android.mk',
         AndroidMkTemplate({
-          libraryName: `react_codegen_${libraryName.toLowerCase()}`,
+          libraryName: `${libraryName.toLowerCase()}`,
         }),
       ],
     ]);
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
index 13c3c1031abff4..e92bcb66eb3da8 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
@@ -20,7 +20,7 @@ import type {
   NativeModuleFloatTypeAnnotation,
   NativeModuleBooleanTypeAnnotation,
   NativeModuleGenericObjectTypeAnnotation,
-  NativeModuleReservedFunctionValueTypeAnnotation,
+  ReservedTypeAnnotation,
   NativeModuleTypeAliasTypeAnnotation,
   NativeModuleArrayTypeAnnotation,
   NativeModuleBaseTypeAnnotation,
@@ -28,7 +28,7 @@ import type {
 
 import type {AliasResolver} from '../Utils';
 
-const {capitalize} = require('./Utils');
+const {capitalize} = require('../../Utils');
 const {
   unwrapNullable,
   wrapNullable,
@@ -36,25 +36,25 @@ const {
 
 type StructContext = 'CONSTANTS' | 'REGULAR';
 
-export type RegularStruct = $ReadOnly<{|
+export type RegularStruct = $ReadOnly<{
   context: 'REGULAR',
   name: string,
   properties: $ReadOnlyArray<StructProperty>,
-|}>;
+}>;
 
-export type ConstantsStruct = $ReadOnly<{|
+export type ConstantsStruct = $ReadOnly<{
   context: 'CONSTANTS',
   name: string,
   properties: $ReadOnlyArray<StructProperty>,
-|}>;
+}>;
 
 export type Struct = RegularStruct | ConstantsStruct;
 
-export type StructProperty = $ReadOnly<{|
+export type StructProperty = $ReadOnly<{
   name: string,
   optional: boolean,
   typeAnnotation: Nullable<StructTypeAnnotation>,
-|}>;
+}>;
 
 export type StructTypeAnnotation =
   | NativeModuleStringTypeAnnotation
@@ -64,7 +64,7 @@ export type StructTypeAnnotation =
   | NativeModuleFloatTypeAnnotation
   | NativeModuleBooleanTypeAnnotation
   | NativeModuleGenericObjectTypeAnnotation
-  | NativeModuleReservedFunctionValueTypeAnnotation
+  | ReservedTypeAnnotation
   | NativeModuleTypeAliasTypeAnnotation
   | NativeModuleArrayTypeAnnotation<Nullable<StructTypeAnnotation>>;
 
@@ -144,6 +144,7 @@ class StructCollector {
     resolveAlias: AliasResolver,
     objectTypeAnnotation: NativeModuleObjectTypeAnnotation,
   ): void {
+    // $FlowFixMe[missing-type-arg]
     const properties = objectTypeAnnotation.properties.map<
       $ReadOnly<{
         name: string,
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js
index c596cebbd11a83..ffbfea1b8cc701 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js
@@ -12,9 +12,6 @@
 
 import type {StructProperty} from './StructCollector';
 
-function capitalize(string: string): string {
-  return string.charAt(0).toUpperCase() + string.slice(1);
-}
 function getSafePropertyName(property: StructProperty): string {
   if (property.name === 'id') {
     return `${property.name}_`;
@@ -30,7 +27,6 @@ function getNamespacedStructName(
 }
 
 module.exports = {
-  capitalize,
   getSafePropertyName,
   getNamespacedStructName,
 };
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
index 0e7f2ab9e2b156..d11a5a8c23d88c 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
@@ -10,11 +10,8 @@
 
 'use strict';
 
-const {
-  capitalize,
-  getSafePropertyName,
-  getNamespacedStructName,
-} = require('../Utils');
+const {getSafePropertyName, getNamespacedStructName} = require('../Utils');
+const {capitalize} = require('../../../Utils');
 
 import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, ConstantsStruct} from '../StructCollector';
@@ -26,11 +23,11 @@ const StructTemplate = ({
   hasteModuleName,
   structName,
   builderInputProps,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   structName: string,
   builderInputProps: string,
-|}>) => `namespace JS {
+}>) => `namespace JS {
   namespace ${hasteModuleName} {
     struct ${structName} {
 
@@ -62,11 +59,11 @@ const MethodTemplate = ({
   hasteModuleName,
   structName,
   properties,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   structName: string,
   properties: string,
-|}>) => `inline JS::${hasteModuleName}::${structName}::Builder::Builder(const Input i) : _factory(^{
+}>) => `inline JS::${hasteModuleName}::${structName}::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
 ${properties}
   return d;
@@ -87,7 +84,7 @@ function toObjCType(
   };
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return wrapFollyOptional('double');
@@ -152,7 +149,7 @@ function toObjCValue(
   }
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return wrapPrimitive('double');
@@ -222,15 +219,15 @@ function serializeConstantsStruct(
     builderInputProps: struct.properties
       .map(property => {
         const {typeAnnotation, optional} = property;
-        const propName = getSafePropertyName(property);
+        const safePropName = getSafePropertyName(property);
         const objCType = toObjCType(hasteModuleName, typeAnnotation, optional);
 
         if (!optional) {
-          return `RCTRequired<${objCType}> ${propName};`;
+          return `RCTRequired<${objCType}> ${safePropName};`;
         }
 
         const space = ' '.repeat(objCType.endsWith('*') ? 0 : 1);
-        return `${objCType}${space}${propName};`;
+        return `${objCType}${space}${safePropName};`;
       })
       .join('\n          '),
   });
@@ -240,17 +237,17 @@ function serializeConstantsStruct(
     structName: struct.name,
     properties: struct.properties
       .map(property => {
-        const {typeAnnotation, optional} = property;
-        const propName = getSafePropertyName(property);
+        const {typeAnnotation, optional, name: propName} = property;
+        const safePropName = getSafePropertyName(property);
         const objCValue = toObjCValue(
           hasteModuleName,
           typeAnnotation,
-          propName,
+          safePropName,
           0,
           optional,
         );
 
-        let varDecl = `auto ${propName} = i.${propName}`;
+        let varDecl = `auto ${safePropName} = i.${safePropName}`;
         if (!optional) {
           varDecl += '.get()';
         }
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
index 60e5859a5ca647..fdcb2ab310665f 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
@@ -10,11 +10,8 @@
 
 'use strict';
 
-const {
-  capitalize,
-  getSafePropertyName,
-  getNamespacedStructName,
-} = require('../Utils');
+const {getSafePropertyName, getNamespacedStructName} = require('../Utils');
+const {capitalize} = require('../../../Utils');
 
 import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, RegularStruct} from '../StructCollector';
@@ -26,11 +23,11 @@ const StructTemplate = ({
   hasteModuleName,
   structName,
   structProperties,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   structName: string,
   structProperties: string,
-|}>) => `namespace JS {
+}>) => `namespace JS {
   namespace ${hasteModuleName} {
     struct ${structName} {
       ${structProperties}
@@ -52,13 +49,15 @@ const MethodTemplate = ({
   hasteModuleName,
   structName,
   propertyName,
-}: $ReadOnly<{|
+  safePropertyName,
+}: $ReadOnly<{
   returnType: string,
   returnValue: string,
   hasteModuleName: string,
   structName: string,
   propertyName: string,
-|}>) => `inline ${returnType}JS::${hasteModuleName}::${structName}::${propertyName}() const
+  safePropertyName: string,
+}>) => `inline ${returnType}JS::${hasteModuleName}::${structName}::${safePropertyName}() const
 {
   id const p = _v[@"${propertyName}"];
   return ${returnValue};
@@ -76,7 +75,7 @@ function toObjCType(
   };
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return wrapFollyOptional('double');
@@ -140,7 +139,7 @@ function toObjCValue(
   };
 
   switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return RCTBridgingTo('Double');
@@ -211,7 +210,7 @@ function serializeRegularStruct(
     structProperties: struct.properties
       .map(property => {
         const {typeAnnotation, optional} = property;
-        const propName = getSafePropertyName(property);
+        const safePropName = getSafePropertyName(property);
         const returnType = toObjCType(
           hasteModuleName,
           typeAnnotation,
@@ -219,15 +218,16 @@ function serializeRegularStruct(
         );
 
         const padding = ' '.repeat(returnType.endsWith('*') ? 0 : 1);
-        return `${returnType}${padding}${propName}() const;`;
+        return `${returnType}${padding}${safePropName}() const;`;
       })
       .join('\n      '),
   });
 
+  // $FlowFixMe[missing-type-arg]
   const methods = struct.properties
     .map<string>(property => {
-      const {typeAnnotation, optional} = property;
-      const propName = getSafePropertyName(property);
+      const {typeAnnotation, optional, name: propName} = property;
+      const safePropertyName = getSafePropertyName(property);
       const returnType = toObjCType(hasteModuleName, typeAnnotation, optional);
       const returnValue = toObjCValue(
         hasteModuleName,
@@ -244,6 +244,7 @@ function serializeRegularStruct(
         returnType: returnType + padding,
         returnValue: returnValue,
         propertyName: propName,
+        safePropertyName,
       });
     })
     .join('\n');
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js
index fa851d24f017d6..170ac77c8fe863 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js
@@ -15,10 +15,10 @@ import type {Struct} from '../StructCollector';
 const {serializeConstantsStruct} = require('./serializeConstantsStruct');
 const {serializeRegularStruct} = require('./serializeRegularStruct');
 
-export type StructSerilizationOutput = $ReadOnly<{|
+export type StructSerilizationOutput = $ReadOnly<{
   methods: string,
   declaration: string,
-|}>;
+}>;
 
 function serializeStruct(
   hasteModuleName: string,
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
index 2d5dfa78adaf66..59a2ca93501ed8 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
@@ -26,11 +26,11 @@ const ModuleDeclarationTemplate = ({
   hasteModuleName,
   structDeclarations,
   protocolMethods,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   structDeclarations: string,
   protocolMethods: string,
-|}>) => `${structDeclarations}
+}>) => `${structDeclarations}
 @protocol ${hasteModuleName}Spec <RCTBridgeModule, RCTTurboModule>
 
 ${protocolMethods}
@@ -51,10 +51,13 @@ namespace facebook {
 const HeaderFileTemplate = ({
   moduleDeclarations,
   structInlineMethods,
-}: $ReadOnly<{|
+  assumeNonnull,
+}: $ReadOnly<{
   moduleDeclarations: string,
   structInlineMethods: string,
-|}>) => `/**
+  assumeNonnull: boolean,
+}>) =>
+  `/**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -81,17 +84,20 @@ const HeaderFileTemplate = ({
 #import <folly/Optional.h>
 #import <vector>
 
-${moduleDeclarations}
-${structInlineMethods}
-`;
+` +
+  (assumeNonnull ? '\nNS_ASSUME_NONNULL_BEGIN\n' : '') +
+  moduleDeclarations +
+  '\n' +
+  structInlineMethods +
+  (assumeNonnull ? '\nNS_ASSUME_NONNULL_END\n' : '\n');
 
 const SourceFileTemplate = ({
   headerFileName,
   moduleImplementations,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   headerFileName: string,
   moduleImplementations: string,
-|}>) => `/**
+}>) => `/**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -113,8 +119,8 @@ module.exports = {
   generate(
     libraryName: string,
     schema: SchemaType,
-    moduleSpecName: string,
     packageName?: string,
+    assumeNonnull: boolean,
   ): FilesOutput {
     const nativeModules = getModules(schema);
 
@@ -191,13 +197,14 @@ module.exports = {
       );
     }
 
-    const headerFileName = `${moduleSpecName}.h`;
+    const headerFileName = `${libraryName}.h`;
     const headerFile = HeaderFileTemplate({
       moduleDeclarations: moduleDeclarations.join('\n'),
       structInlineMethods: structInlineMethods.join('\n'),
+      assumeNonnull,
     });
 
-    const sourceFileName = `${moduleSpecName}-generated.mm`;
+    const sourceFileName = `${libraryName}-generated.mm`;
     const sourceFile = SourceFileTemplate({
       headerFileName,
       moduleImplementations: moduleImplementations.join('\n'),
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
index d5db63c7610120..6f5c742a346be7 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
@@ -11,17 +11,19 @@
 'use strict';
 
 import type {
-  NativeModuleMethodParamSchema,
-  NativeModuleReturnTypeAnnotation,
-  NativeModulePropertySchema,
   Nullable,
+  NamedShape,
+  NativeModuleParamTypeAnnotation,
+  NativeModuleReturnTypeAnnotation,
+  NativeModulePropertyShape,
 } from '../../../CodegenSchema';
 
 import type {AliasResolver} from '../Utils';
 
 const invariant = require('invariant');
 const {StructCollector} = require('./StructCollector');
-const {capitalize, getNamespacedStructName} = require('./Utils');
+const {getNamespacedStructName} = require('./Utils');
+const {capitalize} = require('../../Utils');
 const {
   wrapNullable,
   unwrapNullable,
@@ -31,37 +33,38 @@ const ProtocolMethodTemplate = ({
   returnObjCType,
   methodName,
   params,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   returnObjCType: string,
   methodName: string,
   params: string,
-|}>) => `- (${returnObjCType})${methodName}${params};`;
+}>) => `- (${returnObjCType})${methodName}${params};`;
 
-export type StructParameterRecord = $ReadOnly<{|
+export type StructParameterRecord = $ReadOnly<{
   paramIndex: number,
   structName: string,
-|}>;
+}>;
 
 type ReturnJSType =
   | 'VoidKind'
+  | 'BooleanKind'
   | 'PromiseKind'
   | 'ObjectKind'
   | 'ArrayKind'
   | 'NumberKind'
   | 'StringKind';
 
-export type MethodSerializationOutput = $ReadOnly<{|
+export type MethodSerializationOutput = $ReadOnly<{
   methodName: string,
   protocolMethod: string,
   selector: string,
   structParamRecords: $ReadOnlyArray<StructParameterRecord>,
   returnJSType: ReturnJSType,
   argCount: number,
-|}>;
+}>;
 
 function serializeMethod(
   hasteModuleName: string,
-  property: NativeModulePropertySchema,
+  property: NativeModulePropertyShape,
   structCollector: StructCollector,
   resolveAlias: AliasResolver,
 ): $ReadOnlyArray<MethodSerializationOutput> {
@@ -78,7 +81,7 @@ function serializeMethod(
     );
   }
 
-  const methodParams: Array<{|paramName: string, objCType: string|}> = [];
+  const methodParams: Array<{paramName: string, objCType: string}> = [];
   const structParamRecords: Array<StructParameterRecord> = [];
 
   params.forEach((param, index) => {
@@ -141,6 +144,7 @@ function serializeMethod(
   /**
    * Build ObjC Selector
    */
+  // $FlowFixMe[missing-type-arg]
   const selector = methodParams
     .map<string>(({paramName}) => paramName)
     .reduce(($selector, paramName, i) => {
@@ -164,10 +168,9 @@ function serializeMethod(
   ];
 }
 
-function getParamStructName(
-  methodName: string,
-  param: NativeModuleMethodParamSchema,
-): string {
+type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
+
+function getParamStructName(methodName: string, param: Param): string {
   const [typeAnnotation] = unwrapNullable(param.typeAnnotation);
   if (typeAnnotation.type === 'TypeAliasTypeAnnotation') {
     return typeAnnotation.name;
@@ -179,11 +182,11 @@ function getParamStructName(
 function getParamObjCType(
   hasteModuleName: string,
   methodName: string,
-  param: NativeModuleMethodParamSchema,
+  param: Param,
   structName: string,
   structCollector: StructCollector,
   resolveAlias: AliasResolver,
-): $ReadOnly<{|objCType: string, isStruct: boolean|}> {
+): $ReadOnly<{objCType: string, isStruct: boolean}> {
   const {name: paramName, typeAnnotation: nullableTypeAnnotation} = param;
   const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
   const notRequired = param.optional || nullable;
@@ -215,7 +218,7 @@ function getParamObjCType(
        *
        * For example:
        *   Array<number> => NSArray<NSNumber *>
-       *   type Animal = {||};
+       *   type Animal = {};
        *   Array<Animal> => NSArray<JS::NativeSampleTurboModule::Animal *>, etc.
        */
       return notStruct(wrapIntoNullableIfNeeded('NSArray *'));
@@ -246,7 +249,7 @@ function getParamObjCType(
           ' &',
       );
     }
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (structTypeAnnotation.name) {
         case 'RootTag':
           return notStruct(notRequired ? 'NSNumber *' : 'double');
@@ -308,7 +311,7 @@ function getReturnObjCType(
           typeAnnotation.elementType,
         )}> *`,
       );
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       switch (typeAnnotation.name) {
         case 'RootTag':
           return wrapIntoNullableIfNeeded('NSNumber *');
@@ -358,7 +361,7 @@ function getReturnJSType(
       return 'ObjectKind';
     case 'ArrayTypeAnnotation':
       return 'ArrayKind';
-    case 'ReservedFunctionValueTypeAnnotation':
+    case 'ReservedTypeAnnotation':
       return 'NumberKind';
     case 'StringTypeAnnotation':
       return 'StringKind';
@@ -371,7 +374,7 @@ function getReturnJSType(
     case 'Int32TypeAnnotation':
       return 'NumberKind';
     case 'BooleanTypeAnnotation':
-      return 'NumberKind';
+      return 'BooleanKind';
     case 'GenericObjectTypeAnnotation':
       return 'ObjectKind';
     default:
@@ -384,7 +387,7 @@ function getReturnJSType(
 
 function serializeConstantsProtocolMethods(
   hasteModuleName: string,
-  property: NativeModulePropertySchema,
+  property: NativeModulePropertyShape,
   structCollector: StructCollector,
   resolveAlias: AliasResolver,
 ): $ReadOnlyArray<MethodSerializationOutput> {
@@ -398,7 +401,7 @@ function serializeConstantsProtocolMethods(
   const {returnTypeAnnotation} = propertyTypeAnnotation;
   if (returnTypeAnnotation.type !== 'ObjectTypeAnnotation') {
     throw new Error(
-      `${hasteModuleName}.getConstants() may only return an object literal: {|...|}.`,
+      `${hasteModuleName}.getConstants() may only return an object literal: {...}.`,
     );
   }
 
@@ -420,6 +423,7 @@ function serializeConstantsProtocolMethods(
 
   const returnObjCType = `facebook::react::ModuleConstants<JS::${hasteModuleName}::Constants::Builder>`;
 
+  // $FlowFixMe[missing-type-arg]
   return ['constantsToExport', 'getConstants'].map<MethodSerializationOutput>(
     methodName => {
       const protocolMethod = ProtocolMethodTemplate({
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
index c930f98b7d8000..14796e88a65d67 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
@@ -20,11 +20,11 @@ const ModuleTemplate = ({
   hasteModuleName,
   structs,
   methodSerializationOutputs,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   structs: $ReadOnlyArray<Struct>,
   methodSerializationOutputs: $ReadOnlyArray<MethodSerializationOutput>,
-|}>) => `${structs
+}>) => `${structs
   .map(struct =>
     RCTCxxConvertCategoryTemplate({hasteModuleName, structName: struct.name}),
   )
@@ -61,10 +61,10 @@ namespace facebook {
 const RCTCxxConvertCategoryTemplate = ({
   hasteModuleName,
   structName,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   structName: string,
-|}>) => `@implementation RCTCxxConvert (${hasteModuleName}_${structName})
+}>) => `@implementation RCTCxxConvert (${hasteModuleName}_${structName})
 + (RCTManagedPointer *)JS_${hasteModuleName}_${structName}:(id)json
 {
   return facebook::react::managedPointer<JS::${hasteModuleName}::${structName}>(json);
@@ -76,12 +76,12 @@ const InlineHostFunctionTemplate = ({
   methodName,
   returnJSType,
   selector,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   methodName: string,
   returnJSType: string,
   selector: string,
-|}>) => `
+}>) => `
     static facebook::jsi::Value __hostFunction_${hasteModuleName}SpecJSI_${methodName}(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ${returnJSType}, "${methodName}", ${selector}, args, count);
     }`;
@@ -91,12 +91,12 @@ const MethodMapEntryTemplate = ({
   methodName,
   structParamRecords,
   argCount,
-}: $ReadOnly<{|
+}: $ReadOnly<{
   hasteModuleName: string,
   methodName: string,
   structParamRecords: $ReadOnlyArray<StructParameterRecord>,
   argCount: number,
-|}>) => `
+}>) => `
         methodMap_["${methodName}"] = MethodMetadata {${argCount}, __hostFunction_${hasteModuleName}SpecJSI_${methodName}};
         ${structParamRecords
           .map(({paramIndex, structName}) => {
diff --git a/packages/react-native-codegen/src/generators/modules/Utils.js b/packages/react-native-codegen/src/generators/modules/Utils.js
index e5b50c2ddd1e02..10017bb420bb0c 100644
--- a/packages/react-native-codegen/src/generators/modules/Utils.js
+++ b/packages/react-native-codegen/src/generators/modules/Utils.js
@@ -33,8 +33,8 @@ function createAliasResolver(aliasMap: NativeModuleAliasMap): AliasResolver {
 
 function getModules(
   schema: SchemaType,
-): $ReadOnly<{|[hasteModuleName: string]: NativeModuleSchema|}> {
-  return Object.keys(schema.modules).reduce<{|[string]: NativeModuleSchema|}>(
+): $ReadOnly<{[hasteModuleName: string]: NativeModuleSchema}> {
+  return Object.keys(schema.modules).reduce<{[string]: NativeModuleSchema}>(
     (modules, hasteModuleName: string) => {
       const module = schema.modules[hasteModuleName];
       if (module == null || module.type === 'Component') {
diff --git a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
index 17d2f010804efc..eb1f8ddd6f1edf 100644
--- a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
@@ -185,7 +185,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
             typeAnnotation: {
               type: 'FunctionTypeAnnotation',
               returnTypeAnnotation: {
-                type: 'ReservedFunctionValueTypeAnnotation',
+                type: 'ReservedTypeAnnotation',
                 name: 'RootTag',
               },
               params: [
@@ -193,7 +193,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                   optional: false,
                   name: 'arg',
                   typeAnnotation: {
-                    type: 'ReservedFunctionValueTypeAnnotation',
+                    type: 'ReservedTypeAnnotation',
                     name: 'RootTag',
                   },
                 },
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js
index 6dbe02f952f13a..a03ef0508b7851 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js
@@ -22,7 +22,11 @@ describe('GenerateModuleCpp', () => {
 
       it(`can generate fixture ${fixtureName}`, () => {
         expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
+          generator.generate(
+            fixtureName,
+            fixture,
+            'com.facebook.fbreact.specs',
+          ),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js
index 658221b56298f4..3acbc7f638f94c 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js
@@ -22,7 +22,11 @@ describe('GenerateModuleH', () => {
 
       it(`can generate fixture ${fixtureName}`, () => {
         expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
+          generator.generate(
+            fixtureName,
+            fixture,
+            'com.facebook.fbreact.specs',
+          ),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
index 3c4943971857b0..e73d46fa5e9ad2 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
@@ -21,9 +21,14 @@ describe('GenerateModuleHObjCpp', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        const output = generator.generate(fixtureName, fixture, 'SampleSpec');
+        const output = generator.generate(
+          fixtureName,
+          fixture,
+          'com.facebook.fbreact.specs',
+          false,
+        );
         expect(
-          new Map([['SampleSpec.h', output.get('SampleSpec.h')]]),
+          new Map([[`${fixtureName}.h`, output.get(`${fixtureName}.h`)]]),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js
index 5ccb87d2d4b672..854d21388c18a8 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js
@@ -22,7 +22,11 @@ describe('GenerateModuleJavaSpec', () => {
 
       it(`can generate fixture ${fixtureName}`, () => {
         expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
+          generator.generate(
+            fixtureName,
+            fixture,
+            'com.facebook.fbreact.specs',
+          ),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js
index e6030bca0fc2d1..0dfc249f71458f 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js
@@ -22,7 +22,11 @@ describe('GenerateModuleJniCpp', () => {
 
       it(`can generate fixture ${fixtureName}`, () => {
         expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
+          generator.generate(
+            fixtureName,
+            fixture,
+            'com.facebook.fbreact.specs',
+          ),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js
index dcbd78a42c604d..4e9e116b9619cb 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js
@@ -22,7 +22,11 @@ describe('GenerateModuleJniH', () => {
 
       it(`can generate fixture ${fixtureName}`, () => {
         expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
+          generator.generate(
+            fixtureName,
+            fixture,
+            'com.facebook.fbreact.specs',
+          ),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
index ec8f4842a106bf..c1a4feb400adba 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
@@ -21,10 +21,18 @@ describe('GenerateModuleMm', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
-        const output = generator.generate(fixtureName, fixture, 'SampleSpec');
+        const output = generator.generate(
+          fixtureName,
+          fixture,
+          'com.facebook.fbreact.specs',
+          false,
+        );
         expect(
           new Map([
-            ['SampleSpec-generated.mm', output.get('SampleSpec-generated.mm')],
+            [
+              `${fixtureName}-generated.mm`,
+              output.get(`${fixtureName}-generated.mm`),
+            ],
           ]),
         ).toMatchSnapshot();
       });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
index bc98ff9c128927..232d40e7dc114b 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`GenerateModuleHObjCpp can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "COMPLEX_OBJECTS.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -171,7 +171,7 @@ inline NSString *JS::NativeSampleTurboModule::SpecDifficultAE::F() const
 }
 inline double JS::NativeSampleTurboModule::SpecDifficultAE::id_() const
 {
-  id const p = _v[@\\"id_\\"];
+  id const p = _v[@\\"id\\"];
   return RCTBridgingToDouble(p);
 }
 inline bool JS::NativeSampleTurboModule::SpecDifficultA::D() const
@@ -260,7 +260,7 @@ inline facebook::react::LazyVector<JS::NativeSampleTurboModule::SpecGetArraysOpt
 
 exports[`GenerateModuleHObjCpp can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "EMPTY_NATIVE_MODULES.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -311,7 +311,7 @@ namespace facebook {
 
 exports[`GenerateModuleHObjCpp can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "NATIVE_MODULES_WITH_TYPE_ALIASES.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -482,7 +482,7 @@ inline folly::Optional<bool> JS::AliasTurboModule::Options::allowExternalStorage
 
 exports[`GenerateModuleHObjCpp can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "REAL_MODULE_EXAMPLE.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -743,7 +743,7 @@ inline facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> JS::
 }
 inline double JS::NativeExceptionsManager::ExceptionData::id_() const
 {
-  id const p = _v[@\\"id_\\"];
+  id const p = _v[@\\"id\\"];
   return RCTBridgingToDouble(p);
 }
 inline bool JS::NativeExceptionsManager::ExceptionData::isFatal() const
@@ -772,7 +772,7 @@ inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::videoMode() co
 
 exports[`GenerateModuleHObjCpp can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SIMPLE_NATIVE_MODULES.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -878,7 +878,7 @@ inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _
 
 exports[`GenerateModuleHObjCpp can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "TWO_MODULES_DIFFERENT_FILES.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
index a5564d2fbaa10d..f7654f6e4c3f58 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
@@ -16,6 +16,7 @@ Map {
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -32,15 +33,19 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract WritableMap difficult(ReadableMap A);
 
   @ReactMethod
+  @DoNotStrip
   public abstract void optionals(ReadableMap A);
 
   @ReactMethod
+  @DoNotStrip
   public void optionalMethod(ReadableMap options, Callback callback, ReadableArray extras) {}
 
   @ReactMethod
+  @DoNotStrip
   public abstract void getArrays(ReadableMap options);
 }
 ",
@@ -63,6 +68,7 @@ Map {
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -96,6 +102,7 @@ Map {
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -109,6 +116,7 @@ public abstract class AliasTurboModuleSpec extends ReactContextBaseJavaModule im
   }
 
   @ReactMethod
+  @DoNotStrip
   public abstract void cropImage(ReadableMap cropData);
 }
 ",
@@ -131,6 +139,7 @@ Map {
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -146,12 +155,15 @@ public abstract class NativeCameraRollManagerSpec extends ReactContextBaseJavaMo
   }
 
   @ReactMethod
+  @DoNotStrip
   public abstract void getPhotos(ReadableMap params, Promise promise);
 
   @ReactMethod
+  @DoNotStrip
   public abstract void saveToCameraRoll(String uri, String type, Promise promise);
 
   @ReactMethod
+  @DoNotStrip
   public abstract void deletePhotos(ReadableArray assets, Promise promise);
 }
 ",
@@ -169,6 +181,7 @@ public abstract class NativeCameraRollManagerSpec extends ReactContextBaseJavaMo
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -183,18 +196,23 @@ public abstract class NativeExceptionsManagerSpec extends ReactContextBaseJavaMo
   }
 
   @ReactMethod
+  @DoNotStrip
   public abstract void reportFatalException(String message, ReadableArray stack, double exceptionId);
 
   @ReactMethod
+  @DoNotStrip
   public abstract void reportSoftException(String message, ReadableArray stack, double exceptionId);
 
   @ReactMethod
+  @DoNotStrip
   public void reportException(ReadableMap data) {}
 
   @ReactMethod
+  @DoNotStrip
   public abstract void updateExceptionMessage(String message, ReadableArray stack, double exceptionId);
 
   @ReactMethod
+  @DoNotStrip
   public void dismissRedbox() {}
 }
 ",
@@ -217,6 +235,7 @@ Map {
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -243,6 +262,7 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   protected abstract Map<String, Object> getTypedExportedConstants();
 
   @Override
+  @DoNotStrip
   public final @Nullable Map<String, Object> getConstants() {
     Map<String, Object> constants = getTypedExportedConstants();
     if (ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD) {
@@ -268,33 +288,43 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   }
 
   @ReactMethod
+  @DoNotStrip
   public abstract void voidFunc();
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract boolean getBool(boolean arg);
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract double getNumber(double arg);
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract String getString(String arg);
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract WritableArray getArray(ReadableArray arg);
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract WritableMap getObject(ReadableMap arg);
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract double getRootTag(double arg);
 
   @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
   public abstract WritableMap getValue(double x, String y, ReadableMap z);
 
   @ReactMethod
+  @DoNotStrip
   public abstract void getValueWithCallback(Callback callback);
 
   @ReactMethod
+  @DoNotStrip
   public abstract void getValueWithPromise(boolean error, Promise promise);
 }
 ",
@@ -317,6 +347,7 @@ Map {
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -329,6 +360,7 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   }
 
   @ReactMethod
+  @DoNotStrip
   public abstract void voidFunc();
 }
 ",
@@ -346,6 +378,7 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
 
 package com.facebook.fbreact.specs;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -358,6 +391,7 @@ public abstract class NativeSampleTurboModule2Spec extends ReactContextBaseJavaM
   }
 
   @ReactMethod
+  @DoNotStrip
   public abstract void voidFunc();
 }
 ",
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
index 932a69b65e466b..328f1a34779a55 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`GenerateModuleJniCpp can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "jni/SampleSpec-generated.cpp" => "
+  "jni/COMPLEX_OBJECTS-generated.cpp" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -12,7 +12,7 @@ Map {
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
 
-#include \\"SampleSpec.h\\"
+#include \\"COMPLEX_OBJECTS.h\\"
 
 namespace facebook {
 namespace react {
@@ -56,7 +56,7 @@ std::shared_ptr<TurboModule> COMPLEX_OBJECTS_ModuleProvider(const std::string mo
 
 exports[`GenerateModuleJniCpp can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "jni/SampleSpec-generated.cpp" => "
+  "jni/EMPTY_NATIVE_MODULES-generated.cpp" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -66,7 +66,7 @@ Map {
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
 
-#include \\"SampleSpec.h\\"
+#include \\"EMPTY_NATIVE_MODULES.h\\"
 
 namespace facebook {
 namespace react {
@@ -93,7 +93,7 @@ std::shared_ptr<TurboModule> EMPTY_NATIVE_MODULES_ModuleProvider(const std::stri
 
 exports[`GenerateModuleJniCpp can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "jni/SampleSpec-generated.cpp" => "
+  "jni/NATIVE_MODULES_WITH_TYPE_ALIASES-generated.cpp" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -103,7 +103,7 @@ Map {
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
 
-#include \\"SampleSpec.h\\"
+#include \\"NATIVE_MODULES_WITH_TYPE_ALIASES.h\\"
 
 namespace facebook {
 namespace react {
@@ -134,7 +134,7 @@ std::shared_ptr<TurboModule> NATIVE_MODULES_WITH_TYPE_ALIASES_ModuleProvider(con
 
 exports[`GenerateModuleJniCpp can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "jni/SampleSpec-generated.cpp" => "
+  "jni/REAL_MODULE_EXAMPLE-generated.cpp" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -144,7 +144,7 @@ Map {
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
 
-#include \\"SampleSpec.h\\"
+#include \\"REAL_MODULE_EXAMPLE.h\\"
 
 namespace facebook {
 namespace react {
@@ -216,7 +216,7 @@ std::shared_ptr<TurboModule> REAL_MODULE_EXAMPLE_ModuleProvider(const std::strin
 
 exports[`GenerateModuleJniCpp can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "jni/SampleSpec-generated.cpp" => "
+  "jni/SIMPLE_NATIVE_MODULES-generated.cpp" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -226,7 +226,7 @@ Map {
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
 
-#include \\"SampleSpec.h\\"
+#include \\"SIMPLE_NATIVE_MODULES.h\\"
 
 namespace facebook {
 namespace react {
@@ -305,7 +305,7 @@ std::shared_ptr<TurboModule> SIMPLE_NATIVE_MODULES_ModuleProvider(const std::str
 
 exports[`GenerateModuleJniCpp can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "jni/SampleSpec-generated.cpp" => "
+  "jni/TWO_MODULES_DIFFERENT_FILES-generated.cpp" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -315,7 +315,7 @@ Map {
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
 
-#include \\"SampleSpec.h\\"
+#include \\"TWO_MODULES_DIFFERENT_FILES.h\\"
 
 namespace facebook {
 namespace react {
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
index ac403bf8d4b3fb..5f68533849b14c 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`GenerateModuleJniH can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "jni/SampleSpec.h" => "
+  "jni/COMPLEX_OBJECTS.h" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -48,13 +48,11 @@ LOCAL_MODULE := react_codegen_complex_objects
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/complex_objects/*.cpp)
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
 
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
-
-LOCAL_STATIC_LIBRARIES := libjsi
+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -68,7 +66,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "jni/SampleSpec.h" => "
+  "jni/EMPTY_NATIVE_MODULES.h" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -114,13 +112,11 @@ LOCAL_MODULE := react_codegen_empty_native_modules
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/empty_native_modules/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
 
-LOCAL_STATIC_LIBRARIES := libjsi
+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -134,7 +130,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "jni/SampleSpec.h" => "
+  "jni/NATIVE_MODULES_WITH_TYPE_ALIASES.h" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -180,13 +176,11 @@ LOCAL_MODULE := react_codegen_native_modules_with_type_aliases
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
 
-LOCAL_STATIC_LIBRARIES := libjsi
+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -200,7 +194,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "jni/SampleSpec.h" => "
+  "jni/REAL_MODULE_EXAMPLE.h" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -254,13 +248,11 @@ LOCAL_MODULE := react_codegen_real_module_example
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/real_module_example/*.cpp)
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
 
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
-
-LOCAL_STATIC_LIBRARIES := libjsi
+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -274,7 +266,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "jni/SampleSpec.h" => "
+  "jni/SIMPLE_NATIVE_MODULES.h" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -320,13 +312,11 @@ LOCAL_MODULE := react_codegen_simple_native_modules
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/simple_native_modules/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
 
-LOCAL_STATIC_LIBRARIES := libjsi
+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -340,7 +330,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "jni/SampleSpec.h" => "
+  "jni/TWO_MODULES_DIFFERENT_FILES.h" => "
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -394,13 +384,11 @@ LOCAL_MODULE := react_codegen_two_modules_different_files
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/two_modules_different_files/*.cpp)
 
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
 
-LOCAL_STATIC_LIBRARIES := libjsi
+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
index b72fed68efcdec..3053a5fee6acc6 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`GenerateModuleMm can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "/**
+  "COMPLEX_OBJECTS-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -15,7 +15,7 @@ Map {
  * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#import \\"SampleSpec.h\\"
+#import \\"COMPLEX_OBJECTS.h\\"
 
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecDifficultAE)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultAE:(id)json
@@ -95,7 +95,7 @@ namespace facebook {
 
 exports[`GenerateModuleMm can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "/**
+  "EMPTY_NATIVE_MODULES-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -108,7 +108,7 @@ Map {
  * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#import \\"SampleSpec.h\\"
+#import \\"EMPTY_NATIVE_MODULES.h\\"
 
 
 namespace facebook {
@@ -127,7 +127,7 @@ namespace facebook {
 
 exports[`GenerateModuleMm can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "/**
+  "NATIVE_MODULES_WITH_TYPE_ALIASES-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -140,7 +140,7 @@ Map {
  * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#import \\"SampleSpec.h\\"
+#import \\"NATIVE_MODULES_WITH_TYPE_ALIASES.h\\"
 
 @implementation RCTCxxConvert (AliasTurboModule_OptionsOffset)
 + (RCTManagedPointer *)JS_AliasTurboModule_OptionsOffset:(id)json
@@ -187,7 +187,7 @@ namespace facebook {
 
 exports[`GenerateModuleMm can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "/**
+  "REAL_MODULE_EXAMPLE-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -200,7 +200,7 @@ Map {
  * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#import \\"SampleSpec.h\\"
+#import \\"REAL_MODULE_EXAMPLE.h\\"
 
 @implementation RCTCxxConvert (NativeCameraRollManager_GetPhotosParams)
 + (RCTManagedPointer *)JS_NativeCameraRollManager_GetPhotosParams:(id)json
@@ -319,7 +319,7 @@ namespace facebook {
 
 exports[`GenerateModuleMm can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "/**
+  "SIMPLE_NATIVE_MODULES-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -332,7 +332,7 @@ Map {
  * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#import \\"SampleSpec.h\\"
+#import \\"SIMPLE_NATIVE_MODULES.h\\"
 
 
 namespace facebook {
@@ -343,7 +343,7 @@ namespace facebook {
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, BooleanKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -426,7 +426,7 @@ namespace facebook {
 
 exports[`GenerateModuleMm can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "/**
+  "TWO_MODULES_DIFFERENT_FILES-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -439,7 +439,7 @@ Map {
  * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#import \\"SampleSpec.h\\"
+#import \\"TWO_MODULES_DIFFERENT_FILES.h\\"
 
 
 namespace facebook {
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
index b66ee965af504b..48836ae868944b 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
@@ -264,12 +264,8 @@ exports[`RN Codegen Flow Parser can generate fixture ALL_PROP_TYPES_NO_EVENTS 1`
                 'type': 'StringEnumTypeAnnotation',
                 'default': 'small',
                 'options': [
-                  {
-                    'name': 'small'
-                  },
-                  {
-                    'name': 'large'
-                  }
+                  'small',
+                  'large'
                 ]
               }
             },
@@ -280,12 +276,8 @@ exports[`RN Codegen Flow Parser can generate fixture ALL_PROP_TYPES_NO_EVENTS 1`
                 'type': 'StringEnumTypeAnnotation',
                 'default': 'small',
                 'options': [
-                  {
-                    'name': 'small'
-                  },
-                  {
-                    'name': 'large'
-                  }
+                  'small',
+                  'large'
                 ]
               }
             },
@@ -296,12 +288,8 @@ exports[`RN Codegen Flow Parser can generate fixture ALL_PROP_TYPES_NO_EVENTS 1`
                 'type': 'Int32EnumTypeAnnotation',
                 'default': 0,
                 'options': [
-                  {
-                    'value': 0
-                  },
-                  {
-                    'value': 1
-                  }
+                  0,
+                  1
                 ]
               }
             },
@@ -785,12 +773,8 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
                   'type': 'StringEnumTypeAnnotation',
                   'default': 'small',
                   'options': [
-                    {
-                      'name': 'small'
-                    },
-                    {
-                      'name': 'large'
-                    }
+                    'small',
+                    'large'
                   ]
                 }
               }
@@ -804,12 +788,8 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
                   'type': 'StringEnumTypeAnnotation',
                   'default': 'small',
                   'options': [
-                    {
-                      'name': 'small'
-                    },
-                    {
-                      'name': 'large'
-                    }
+                    'small',
+                    'large'
                   ]
                 }
               }
@@ -1300,291 +1280,369 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -1601,291 +1659,369 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -1901,291 +2037,369 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -2202,291 +2416,369 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -2513,7 +2805,10 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
                       'type': 'BooleanTypeAnnotation'
                     }
                   }
-                ]
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
               }
             }
           ]
@@ -2549,11 +2844,14 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_T
                   {
                     'name': 'rootTag',
                     'typeAnnotation': {
-                      'type': 'ReservedFunctionValueTypeAnnotation',
+                      'type': 'ReservedTypeAnnotation',
                       'name': 'RootTag'
                     }
                   }
-                ]
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
               }
             },
             {
@@ -2574,7 +2872,10 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_T
                       'type': 'Int32TypeAnnotation'
                     }
                   }
-                ]
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
               }
             },
             {
@@ -2607,7 +2908,10 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_T
                       'type': 'BooleanTypeAnnotation'
                     }
                   }
-                ]
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
               }
             }
           ]
@@ -2652,7 +2956,10 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_WITH_EXTERNAL_TYPE
                       'type': 'BooleanTypeAnnotation'
                     }
                   }
-                ]
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
               }
             }
           ]
@@ -2833,291 +3140,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -3133,291 +3518,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -3433,291 +3896,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -3733,291 +4274,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -4034,291 +4653,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -4334,291 +5031,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
-                    },
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
+                    },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -4634,291 +5409,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -4934,291 +5787,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -5234,291 +6165,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
-                    },
-                    {
-                      'type': 'StringEnumTypeAnnotation',
-                      'name': 'enum_optional_value',
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -5535,291 +6544,369 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
-                    },
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -6059,12 +7146,8 @@ exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS
                         'type': 'StringEnumTypeAnnotation',
                         'default': 'small',
                         'options': [
-                          {
-                            'name': 'small'
-                          },
-                          {
-                            'name': 'large'
-                          }
+                          'small',
+                          'large'
                         ]
                       }
                     }
@@ -6787,291 +7870,369 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
-                    },
-                    {
-                      'type': 'ObjectTypeAnnotation',
-                      'name': 'object_optional_both',
-                      'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -7088,291 +8249,369 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -7388,291 +8627,369 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
-                    },
-                    {
-                      'type': 'ObjectTypeAnnotation',
-                      'name': 'object_readonly_optional_key',
-                      'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
@@ -7689,291 +9006,369 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
                   'type': 'ObjectTypeAnnotation',
                   'properties': [
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'BooleanTypeAnnotation',
                       'name': 'boolean_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringTypeAnnotation',
                       'name': 'string_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'DoubleTypeAnnotation',
                       'name': 'double_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'FloatTypeAnnotation',
                       'name': 'float_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_required',
-                      'optional': false
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_key',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_value',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'Int32TypeAnnotation',
                       'name': 'int32_optional_both',
-                      'optional': true
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_required',
                       'optional': false,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_key',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_value',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'StringEnumTypeAnnotation',
                       'name': 'enum_optional_both',
                       'optional': true,
-                      'options': [
-                        {
-                          'name': 'small'
-                        },
-                        {
-                          'name': 'large'
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_required_nested_2_layers',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'ObjectTypeAnnotation',
-                          'name': 'object_optional_nested_1_layer',
-                          'optional': true,
-                          'properties': [
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'boolean_required',
-                              'optional': false
-                            },
-                            {
-                              'type': 'StringTypeAnnotation',
-                              'name': 'string_optional_key',
-                              'optional': true
-                            },
-                            {
-                              'type': 'DoubleTypeAnnotation',
-                              'name': 'double_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'FloatTypeAnnotation',
-                              'name': 'float_optional_value',
-                              'optional': true
-                            },
-                            {
-                              'type': 'Int32TypeAnnotation',
-                              'name': 'int32_optional_both',
-                              'optional': true
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
                             }
-                          ]
-                        }
-                      ]
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_required',
                       'optional': false,
-                      'properties': [
-                        {
-                          'type': 'BooleanTypeAnnotation',
-                          'name': 'boolean_required',
-                          'optional': false
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_key',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'StringTypeAnnotation',
-                          'name': 'string_optional_key',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_value',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'FloatTypeAnnotation',
-                          'name': 'float_optional_value',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
-                      'type': 'ObjectTypeAnnotation',
                       'name': 'object_readonly_optional_both',
                       'optional': true,
-                      'properties': [
-                        {
-                          'type': 'Int32TypeAnnotation',
-                          'name': 'int32_optional_both',
-                          'optional': true
-                        }
-                      ]
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     }
                   ]
                 }
diff --git a/packages/react-native-codegen/src/parsers/flow/components/commands.js b/packages/react-native-codegen/src/parsers/flow/components/commands.js
index 92aef0a2ad0b18..c967645211f605 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/commands.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/commands.js
@@ -10,7 +10,10 @@
 
 'use strict';
 
-import type {CommandTypeShape} from '../../../CodegenSchema.js';
+import type {
+  NamedShape,
+  CommandTypeAnnotation,
+} from '../../../CodegenSchema.js';
 import type {TypeDeclarationMap} from '../utils.js';
 
 const {getValueFromTypes} = require('../utils.js');
@@ -49,7 +52,7 @@ function buildCommandSchema(property, types: TypeDeclarationMap) {
     switch (type) {
       case 'RootTag':
         returnType = {
-          type: 'ReservedFunctionValueTypeAnnotation',
+          type: 'ReservedTypeAnnotation',
           name: 'RootTag',
         };
         break;
@@ -73,6 +76,11 @@ function buildCommandSchema(property, types: TypeDeclarationMap) {
           type: 'FloatTypeAnnotation',
         };
         break;
+      case 'StringTypeAnnotation':
+        returnType = {
+          type: 'StringTypeAnnotation',
+        };
+        break;
       default:
         (type: empty);
         throw new Error(
@@ -92,6 +100,9 @@ function buildCommandSchema(property, types: TypeDeclarationMap) {
     typeAnnotation: {
       type: 'FunctionTypeAnnotation',
       params,
+      returnTypeAnnotation: {
+        type: 'VoidTypeAnnotation',
+      },
     },
   };
 }
@@ -99,7 +110,7 @@ function buildCommandSchema(property, types: TypeDeclarationMap) {
 function getCommands(
   commandTypeAST: $ReadOnlyArray<EventTypeAST>,
   types: TypeDeclarationMap,
-): $ReadOnlyArray<CommandTypeShape> {
+): $ReadOnlyArray<NamedShape<CommandTypeAnnotation>> {
   return commandTypeAST
     .filter(property => property.type === 'ObjectTypeProperty')
     .map(property => buildCommandSchema(property, types))
diff --git a/packages/react-native-codegen/src/parsers/flow/components/events.js b/packages/react-native-codegen/src/parsers/flow/components/events.js
index 81295411a08c06..b950f8245590f0 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/events.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/events.js
@@ -12,10 +12,15 @@
 
 import type {
   EventTypeShape,
-  EventObjectPropertyType,
+  NamedShape,
+  EventTypeAnnotation,
 } from '../../../CodegenSchema.js';
 
-function getPropertyType(name, optional, typeAnnotation) {
+function getPropertyType(
+  name,
+  optional,
+  typeAnnotation,
+): NamedShape<EventTypeAnnotation> {
   const type =
     typeAnnotation.type === 'GenericTypeAnnotation'
       ? typeAnnotation.id.name
@@ -24,33 +29,43 @@ function getPropertyType(name, optional, typeAnnotation) {
   switch (type) {
     case 'BooleanTypeAnnotation':
       return {
-        type: 'BooleanTypeAnnotation',
         name,
         optional,
+        typeAnnotation: {
+          type: 'BooleanTypeAnnotation',
+        },
       };
     case 'StringTypeAnnotation':
       return {
-        type: 'StringTypeAnnotation',
         name,
         optional,
+        typeAnnotation: {
+          type: 'StringTypeAnnotation',
+        },
       };
     case 'Int32':
       return {
-        type: 'Int32TypeAnnotation',
         name,
         optional,
+        typeAnnotation: {
+          type: 'Int32TypeAnnotation',
+        },
       };
     case 'Double':
       return {
-        type: 'DoubleTypeAnnotation',
         name,
         optional,
+        typeAnnotation: {
+          type: 'DoubleTypeAnnotation',
+        },
       };
     case 'Float':
       return {
-        type: 'FloatTypeAnnotation',
         name,
         optional,
+        typeAnnotation: {
+          type: 'FloatTypeAnnotation',
+        },
       };
     case '$ReadOnly':
       return getPropertyType(
@@ -60,17 +75,21 @@ function getPropertyType(name, optional, typeAnnotation) {
       );
     case 'ObjectTypeAnnotation':
       return {
-        type: 'ObjectTypeAnnotation',
         name,
         optional,
-        properties: typeAnnotation.properties.map(buildPropertiesForEvent),
+        typeAnnotation: {
+          type: 'ObjectTypeAnnotation',
+          properties: typeAnnotation.properties.map(buildPropertiesForEvent),
+        },
       };
     case 'UnionTypeAnnotation':
       return {
-        type: 'StringEnumTypeAnnotation',
         name,
         optional,
-        options: typeAnnotation.types.map(option => ({name: option.value})),
+        typeAnnotation: {
+          type: 'StringEnumTypeAnnotation',
+          options: typeAnnotation.types.map(option => option.value),
+        },
       };
     default:
       (type: empty);
@@ -132,7 +151,7 @@ function findEventArgumentsAndType(
   }
 }
 
-function buildPropertiesForEvent(property): EventObjectPropertyType {
+function buildPropertiesForEvent(property): NamedShape<EventTypeAnnotation> {
   const name = property.key.name;
   const optional =
     property.value.type === 'NullableTypeAnnotation' || property.optional;
@@ -212,11 +231,11 @@ function buildEventSchema(
   }
 }
 
-// $FlowFixMe there's no flowtype for ASTs
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
 type EventTypeAST = Object;
 
 type TypeMap = {
-  // $FlowFixMe there's no flowtype for ASTs
+  // $FlowFixMe[unclear-type] there's no flowtype for ASTs
   [string]: Object,
   ...,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/components/extends.js b/packages/react-native-codegen/src/parsers/flow/components/extends.js
index 7d5e899b80828b..890329400a6206 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/extends.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/extends.js
@@ -47,7 +47,7 @@ function removeKnownExtends(
   );
 }
 
-// $FlowFixMe there's no flowtype for ASTs
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
 type PropsAST = Object;
 
 function getExtendsProps(
diff --git a/packages/react-native-codegen/src/parsers/flow/components/index.js b/packages/react-native-codegen/src/parsers/flow/components/index.js
index 8c68c98d650d33..34b8233c07e570 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/index.js
@@ -167,7 +167,7 @@ function getCommandProperties(commandTypeName, types, commandOptions) {
   return properties;
 }
 
-// $FlowFixMe there's no flowtype for AST
+// $FlowFixMe[signature-verification-failure] there's no flowtype for AST
 function buildComponentSchema(ast): ComponentSchemaBuilderConfig {
   const {
     componentName,
diff --git a/packages/react-native-codegen/src/parsers/flow/components/options.js b/packages/react-native-codegen/src/parsers/flow/components/options.js
index 8044575db15913..8a137c5cd7c911 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/options.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/options.js
@@ -12,12 +12,12 @@
 
 import type {OptionsShape} from '../../../CodegenSchema.js';
 
-// $FlowFixMe there's no flowtype for ASTs
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
 type OptionsAST = Object;
 
-export type CommandOptions = $ReadOnly<{|
+export type CommandOptions = $ReadOnly<{
   supportedCommands: $ReadOnlyArray<string>,
-|}>;
+}>;
 
 function getCommandOptions(
   commandOptionsExpression: OptionsAST,
diff --git a/packages/react-native-codegen/src/parsers/flow/components/props.js b/packages/react-native-codegen/src/parsers/flow/components/props.js
index 50e887bcd93b9e..536606f1a1d952 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/props.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/props.js
@@ -12,7 +12,7 @@
 
 const {getValueFromTypes} = require('../utils.js');
 
-import type {PropTypeShape} from '../../../CodegenSchema.js';
+import type {NamedShape, PropTypeAnnotation} from '../../../CodegenSchema.js';
 import type {TypeDeclarationMap} from '../utils.js';
 
 function getPropProperties(
@@ -153,7 +153,7 @@ function getTypeAnnotationForArray(name, typeAnnotation, defaultValue, types) {
         return {
           type: 'StringEnumTypeAnnotation',
           default: (defaultValue: string),
-          options: typeAnnotation.types.map(option => ({name: option.value})),
+          options: typeAnnotation.types.map(option => option.value),
         };
       } else if (unionType === 'NumberLiteralTypeAnnotation') {
         throw new Error(
@@ -301,13 +301,13 @@ function getTypeAnnotation(
         return {
           type: 'StringEnumTypeAnnotation',
           default: (defaultValue: string),
-          options: typeAnnotation.types.map(option => ({name: option.value})),
+          options: typeAnnotation.types.map(option => option.value),
         };
       } else if (unionType === 'NumberLiteralTypeAnnotation') {
         return {
           type: 'Int32EnumTypeAnnotation',
           default: (defaultValue: number),
-          options: typeAnnotation.types.map(option => ({value: option.value})),
+          options: typeAnnotation.types.map(option => option.value),
         };
       } else {
         throw new Error(
@@ -324,7 +324,10 @@ function getTypeAnnotation(
   }
 }
 
-function buildPropSchema(property, types: TypeDeclarationMap): ?PropTypeShape {
+function buildPropSchema(
+  property,
+  types: TypeDeclarationMap,
+): ?NamedShape<PropTypeAnnotation> {
   const name = property.key.name;
 
   const value = getValueFromTypes(property.value, types);
@@ -413,7 +416,7 @@ function buildPropSchema(property, types: TypeDeclarationMap): ?PropTypeShape {
   };
 }
 
-// $FlowFixMe there's no flowtype for ASTs
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
 type PropAST = Object;
 
 function verifyPropNotAlreadyDefined(
@@ -460,7 +463,7 @@ function flattenProperties(
 function getProps(
   typeDefinition: $ReadOnlyArray<PropAST>,
   types: TypeDeclarationMap,
-): $ReadOnlyArray<PropTypeShape> {
+): $ReadOnlyArray<NamedShape<PropTypeAnnotation>> {
   return flattenProperties(typeDefinition, types)
     .map(property => buildPropSchema(property, types))
     .filter(Boolean);
diff --git a/packages/react-native-codegen/src/parsers/flow/components/schema.js b/packages/react-native-codegen/src/parsers/flow/components/schema.js
index 9ca89ebc12ef52..21ce46d6856ea0 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/schema.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/schema.js
@@ -12,22 +12,23 @@
 
 import type {
   EventTypeShape,
-  PropTypeShape,
-  CommandTypeShape,
+  NamedShape,
+  CommandTypeAnnotation,
+  PropTypeAnnotation,
   ExtendsPropsShape,
   SchemaType,
   OptionsShape,
 } from '../../../CodegenSchema.js';
 
-export type ComponentSchemaBuilderConfig = $ReadOnly<{|
+export type ComponentSchemaBuilderConfig = $ReadOnly<{
   filename: string,
   componentName: string,
   extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
   events: $ReadOnlyArray<EventTypeShape>,
-  props: $ReadOnlyArray<PropTypeShape>,
-  commands: $ReadOnlyArray<CommandTypeShape>,
+  props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
+  commands: $ReadOnlyArray<NamedShape<CommandTypeAnnotation>>,
   options?: ?OptionsShape,
-|}>;
+}>;
 
 function wrapComponentSchema({
   filename,
diff --git a/packages/react-native-codegen/src/parsers/flow/errors.js b/packages/react-native-codegen/src/parsers/flow/errors.js
index 9a98c4dd334591..b480f321f592a4 100644
--- a/packages/react-native-codegen/src/parsers/flow/errors.js
+++ b/packages/react-native-codegen/src/parsers/flow/errors.js
@@ -11,11 +11,17 @@
 'use strict';
 
 class ParserError extends Error {
-  node: $FlowFixMe;
-  constructor(hasteModuleName: string, astNode: $FlowFixMe, message: string) {
+  nodes: $ReadOnlyArray<$FlowFixMe>;
+  constructor(
+    hasteModuleName: string,
+    astNodeOrNodes: $FlowFixMe,
+    message: string,
+  ) {
     super(`Module ${hasteModuleName}: ${message}`);
 
-    this.node = astNode;
+    this.nodes = Array.isArray(astNodeOrNodes)
+      ? astNodeOrNodes
+      : [astNodeOrNodes];
 
     // assign the error class name in your custom error (as a shortcut)
     this.name = this.constructor.name;
diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index b33d32f99748b9..b7550b07a77213 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import type {SchemaType} from '../../CodegenSchema.js';
-// $FlowFixMe there's no flowtype flow-parser
+// $FlowFixMe[untyped-import] there's no flowtype flow-parser
 const flowParser = require('flow-parser');
 const fs = require('fs');
 const path = require('path');
@@ -19,183 +19,103 @@ const {buildComponentSchema} = require('./components');
 const {wrapComponentSchema} = require('./components/schema');
 const {buildModuleSchema} = require('./modules');
 const {wrapModuleSchema} = require('./modules/schema');
-const {createParserErrorCapturer} = require('./utils');
+const {
+  createParserErrorCapturer,
+  visit,
+  isModuleRegistryCall,
+} = require('./utils');
 const invariant = require('invariant');
 
-function isComponent(ast) {
-  const defaultExports = ast.body.filter(
-    node => node.type === 'ExportDefaultDeclaration',
-  );
-
-  if (defaultExports.length === 0) {
-    return false;
-  }
-
-  let declaration = defaultExports[0].declaration;
-  // codegenNativeComponent can be nested inside a cast
-  // expression so we need to go one level deeper
-  if (declaration.type === 'TypeCastExpression') {
-    declaration = declaration.expression;
-  }
-
-  if (declaration.type !== 'CallExpression') {
-    return false;
-  }
-
-  return (
-    declaration.callee.type === 'Identifier' &&
-    declaration.callee.name === 'codegenNativeComponent'
-  );
-}
-
-function isModule(
+function getConfigType(
   // TODO(T71778680): Flow-type this node.
   ast: $FlowFixMe,
-) {
-  const moduleInterfaces = ast.body
-    .map(node => {
+): 'module' | 'component' | 'none' {
+  let isComponent = false;
+  let isModule = false;
+
+  visit(ast, {
+    CallExpression(node) {
       if (
-        node.type === 'ExportNamedDeclaration' &&
-        node.exportKind === 'type' &&
-        node.declaration.type === 'InterfaceDeclaration'
+        node.callee.type === 'Identifier' &&
+        node.callee.name === 'codegenNativeComponent'
       ) {
-        return node.declaration;
+        isComponent = true;
       }
-      return node;
-    })
-    .filter(declaration => {
-      return (
-        declaration.type === 'InterfaceDeclaration' &&
-        declaration.extends.length === 1 &&
-        declaration.extends[0].type === 'InterfaceExtends' &&
-        declaration.extends[0].id.name === 'TurboModule'
-      );
-    })
-    .map(declaration => declaration.id.name);
 
-  if (moduleInterfaces.length === 0) {
-    return false;
-  }
-
-  if (moduleInterfaces.length > 1) {
-    throw new Error(
-      'File contains declarations of more than one module: ' +
-        moduleInterfaces.join(', ') +
-        '. Please declare exactly one module in this file.',
-    );
-  }
-
-  return true;
-}
-
-function getConfigType(
-  // TODO(T71778680): Flow-type this node.
-  ast: $FlowFixMe,
-): 'module' | 'component' {
-  const isConfigAComponent = isComponent(ast);
-  const isConfigAModule = isModule(ast);
+      if (isModuleRegistryCall(node)) {
+        isModule = true;
+      }
+    },
+    InterfaceExtends(node) {
+      if (node.id.name === 'TurboModule') {
+        isModule = true;
+      }
+    },
+  });
 
-  if (isConfigAModule && isConfigAComponent) {
+  if (isModule && isComponent) {
     throw new Error(
       'Found type extending "TurboModule" and exported "codegenNativeComponent" declaration in one file. Split them into separated files.',
     );
   }
 
-  if (isConfigAModule) {
+  if (isModule) {
     return 'module';
-  } else if (isConfigAComponent) {
+  } else if (isComponent) {
     return 'component';
   } else {
-    throw new Error(
-      'File neither contains a module declaration, nor a component declaration. ' +
-        'For module declarations, please make sure your file has an InterfaceDeclaration extending TurboModule. ' +
-        'For component declarations, please make sure your file has a default export calling the codegenNativeComponent<Props>(...) macro.',
-    );
+    return 'none';
   }
 }
 
-const withSpace = (...args) => args.join('\\s*');
-/**
- * Parse the TurboModuleRegistry.get(Enforcing)? call using RegExp.
- * Why? This call can appear anywhere in the NativeModule spec. Currently,
- * there is no good way of traversing the AST to find the MemberExpression
- * responsible for the call.
- */
-const TURBO_MODULE_REGISTRY_REQUIRE_REGEX_STRING = withSpace(
-  'TurboModuleRegistry',
-  '\\.',
-  'get(Enforcing)?',
-  '<',
-  'Spec',
-  '>',
-  '\\(',
-  '[\'"](?<nativeModuleName>[A-Za-z$_0-9]+)[\'"]',
-  ',?',
-  '\\)',
-);
-
 function buildSchema(contents: string, filename: ?string): SchemaType {
-  const ast = flowParser.parse(contents);
+  // Early return for non-Spec JavaScript files
+  if (
+    !contents.includes('codegenNativeComponent') &&
+    !contents.includes('TurboModule')
+  ) {
+    return {modules: {}};
+  }
 
+  const ast = flowParser.parse(contents);
   const configType = getConfigType(ast);
 
-  if (configType === 'component') {
-    return wrapComponentSchema(buildComponentSchema(ast));
-  } else {
-    if (filename === undefined || filename === null) {
-      throw new Error('Filepath expected while parasing a module');
+  switch (configType) {
+    case 'component': {
+      return wrapComponentSchema(buildComponentSchema(ast));
     }
-    const hasteModuleName = path.basename(filename).replace(/\.js$/, '');
-
-    const regex = new RegExp(TURBO_MODULE_REGISTRY_REQUIRE_REGEX_STRING, 'g');
-    let match = regex.exec(contents);
-
-    const errorHeader = `Error while parsing Module '${hasteModuleName}'`;
+    case 'module': {
+      if (filename === undefined || filename === null) {
+        throw new Error('Filepath expected while parasing a module');
+      }
+      const hasteModuleName = path.basename(filename).replace(/\.js$/, '');
 
-    if (match == null) {
-      throw new Error(
-        `${errorHeader}: No call to TurboModuleRegistry.get<Spec>('...') detected.`,
+      const [parsingErrors, tryParse] = createParserErrorCapturer();
+      const schema = tryParse(() =>
+        buildModuleSchema(hasteModuleName, ast, tryParse),
       );
-    }
 
-    const moduleNames = [];
-    while (match != null) {
-      const resultGroups = match.groups;
-      invariant(
-        resultGroups != null,
-        `Couldn't parse TurboModuleRegistry.(get|getEnforcing)<Spec> call in module '${hasteModuleName}'.`,
-      );
+      if (parsingErrors.length > 0) {
+        /**
+         * TODO(T77968131): We have two options:
+         *  - Throw the first error, but indicate there are more then one errors.
+         *  - Display all errors, nicely formatted.
+         *
+         * For the time being, we're just throw the first error.
+         **/
 
-      if (!moduleNames.includes(resultGroups.nativeModuleName)) {
-        moduleNames.push(resultGroups.nativeModuleName);
+        throw parsingErrors[0];
       }
-      match = regex.exec(contents);
-    }
-
-    const [parsingErrors, guard] = createParserErrorCapturer();
-
-    const schema = guard(() =>
-      buildModuleSchema(hasteModuleName, moduleNames, ast, guard),
-    );
 
-    if (parsingErrors.length > 0) {
-      /**
-       * TODO(T77968131): We have two options:
-       *  - Throw the first error, but indicate there are more then one errors.
-       *  - Display all errors, nicely formatted.
-       *
-       * For the time being, we're just throw the first error.
-       **/
+      invariant(
+        schema != null,
+        'When there are no parsing errors, the schema should not be null',
+      );
 
-      throw parsingErrors[0];
+      return wrapModuleSchema(schema, hasteModuleName);
     }
-
-    invariant(
-      schema != null,
-      'When there are no parsing errors, the schema should not be null',
-    );
-
-    return wrapModuleSchema(schema, hasteModuleName);
+    default:
+      return {modules: {}};
   }
 }
 
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
index 9ef58d4d097333..e05e185232ca59 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
@@ -257,6 +257,31 @@ export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 
 `;
 
+const NATIVE_MODULE_WITH_UNSAFE_OBJECT = `
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {TurboModule} from '../RCTExport';
+import * as TurboModuleRegistry from '../TurboModuleRegistry';
+import type {UnsafeObject} from 'react-native/Libraries/Types/CodegenTypes';
+
+export interface Spec extends TurboModule {
+  +getUnsafeObject: (o: UnsafeObject) => UnsafeObject,
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
+
+`;
+
 const NATIVE_MODULE_WITH_ROOT_TAG = `
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
@@ -555,6 +580,7 @@ module.exports = {
   NATIVE_MODULE_WITH_COMPLEX_OBJECTS,
   NATIVE_MODULE_WITH_COMPLEX_OBJECTS_WITH_NULLABLE_KEY,
   NATIVE_MODULE_WITH_SIMPLE_OBJECT,
+  NATIVE_MODULE_WITH_UNSAFE_OBJECT,
   NATIVE_MODULE_WITH_ROOT_TAG,
   NATIVE_MODULE_WITH_NULLABLE_PARAM,
   NATIVE_MODULE_WITH_BASIC_ARRAY,
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
index 5aca4040dbcbee..b17885a171e66c 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
@@ -12,9 +12,9 @@ exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_REA
 
 exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_UNNAMED_PARAMS 1`] = `"Module NativeSampleTurboModule: All function parameters must be named."`;
 
-exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_EXTENDING_TURBO_MODULE 1`] = `"File contains declarations of more than one module: Spec, Spec2. Please declare exactly one module in this file."`;
+exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_EXTENDING_TURBO_MODULE 1`] = `"Module NativeSampleTurboModule: Every NativeModule spec file must declare exactly one NativeModule Flow interface. This file declares 2: 'Spec', and 'Spec2'. Please remove the extraneous Flow interface declarations."`;
 
-exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_MODULES_EXPORTED_WITH_DEFAULT 1`] = `"File neither contains a module declaration, nor a component declaration. For module declarations, please make sure your file has an InterfaceDeclaration extending TurboModule. For component declarations, please make sure your file has a default export calling the codegenNativeComponent<Props>(...) macro."`;
+exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_MODULES_EXPORTED_WITH_DEFAULT 1`] = `"Module NativeSampleTurboModule: No Flow interfaces extending TurboModule were detected in this NativeModule spec."`;
 
 exports[`RN Codegen Flow Parser can generate fixture ANDROID_ONLY_NATIVE_MODULE 1`] = `
 "{
@@ -1236,7 +1236,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ROOT_TAG
             'typeAnnotation': {
               'type': 'FunctionTypeAnnotation',
               'returnTypeAnnotation': {
-                'type': 'ReservedFunctionValueTypeAnnotation',
+                'type': 'ReservedTypeAnnotation',
                 'name': 'RootTag'
               },
               'params': [
@@ -1244,7 +1244,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ROOT_TAG
                   'name': 'rootTag',
                   'optional': false,
                   'typeAnnotation': {
-                    'type': 'ReservedFunctionValueTypeAnnotation',
+                    'type': 'ReservedTypeAnnotation',
                     'name': 'RootTag'
                   }
                 }
@@ -1297,3 +1297,40 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_SIMPLE_O
   }
 }"
 `;
+
+exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_UNSAFE_OBJECT 1`] = `
+"{
+  'modules': {
+    'NativeSampleTurboModule': {
+      'type': 'NativeModule',
+      'aliases': {},
+      'spec': {
+        'properties': [
+          {
+            'name': 'getUnsafeObject',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'GenericObjectTypeAnnotation'
+              },
+              'params': [
+                {
+                  'name': 'o',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'GenericObjectTypeAnnotation'
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      'moduleNames': [
+        'SampleTurboModule'
+      ]
+    }
+  }
+}"
+`;
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
index bf2e29082f08eb..ef3354df45f3e2 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
@@ -9,7 +9,6 @@
  */
 
 import type {
-  ReservedFunctionValueTypeName,
   NativeModuleReturnTypeAnnotation,
   NativeModuleBaseTypeAnnotation,
   NativeModuleSchema,
@@ -43,16 +42,16 @@ const PRIMITIVES: $ReadOnlyArray<[string, PrimitiveTypeAnnotationType]> = [
   ['boolean', 'BooleanTypeAnnotation'],
 ];
 
-const RESERVED_FUNCTION_VALUE_TYPE_NAME: $ReadOnlyArray<ReservedFunctionValueTypeName> = [
+const RESERVED_FUNCTION_VALUE_TYPE_NAME: $ReadOnlyArray<'RootTag'> = [
   'RootTag',
 ];
 
 const MODULE_NAME = 'NativeFoo';
 
 const TYPE_ALIAS_DECLARATIONS = `
-type Animal = {|
+type Animal = {
   name: string,
-|};
+};
 
 type AnimalPointer = Animal;
 `;
@@ -201,12 +200,9 @@ describe('Flow Module Parser', () => {
               it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of reserved type '${FLOW_TYPE}'`, () => {
                 const [paramTypeAnnotation] = parseParamType('arg', FLOW_TYPE);
 
-                expect(paramTypeAnnotation.type).toBe(
-                  'ReservedFunctionValueTypeAnnotation',
-                );
+                expect(paramTypeAnnotation.type).toBe('ReservedTypeAnnotation');
                 invariant(
-                  paramTypeAnnotation.type ===
-                    'ReservedFunctionValueTypeAnnotation',
+                  paramTypeAnnotation.type === 'ReservedTypeAnnotation',
                   'Param must be a Reserved type',
                 );
 
@@ -267,13 +263,8 @@ describe('Flow Module Parser', () => {
                     'arg',
                     FLOW_TYPE,
                   );
-                  expect(elementType.type).toBe(
-                    'ReservedFunctionValueTypeAnnotation',
-                  );
-                  invariant(
-                    elementType.type === 'ReservedFunctionValueTypeAnnotation',
-                    '',
-                  );
+                  expect(elementType.type).toBe('ReservedTypeAnnotation');
+                  invariant(elementType.type === 'ReservedTypeAnnotation', '');
 
                   expect(elementType.name).toBe(FLOW_TYPE);
                 });
@@ -297,10 +288,10 @@ describe('Flow Module Parser', () => {
               expectAnimalTypeAliasToExist(module);
             });
 
-            it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<{|foo: ?string|}>'`, () => {
+            it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<{foo: ?string}>'`, () => {
               const [elementType] = parseParamArrayElementType(
                 'arg',
-                '{|foo: ?string|}',
+                '{foo: ?string}',
               );
               expect(elementType).not.toBe(null);
 
@@ -360,9 +351,9 @@ describe('Flow Module Parser', () => {
               import type {TurboModule} from 'RCTExport';
               import * as TurboModuleRegistry from 'TurboModuleRegistry';
 
-              type Animal = ?{|
+              type Animal = ?{
                 name: string,
-              |};
+              };
 
               type AnimalPointer = Animal;
 
@@ -437,7 +428,7 @@ describe('Flow Module Parser', () => {
             ] {
               const [paramTypeAnnotation, module] = parseParamType(
                 'arg',
-                `{|${annotateProp(propName, propType)}|}`,
+                `{${annotateProp(propName, propType)}}`,
               );
 
               expect(paramTypeAnnotation.type).toBe('ObjectTypeAnnotation');
@@ -511,11 +502,10 @@ describe('Flow Module Parser', () => {
                         FLOW_TYPE,
                       );
                       expect(prop.typeAnnotation.type).toBe(
-                        'ReservedFunctionValueTypeAnnotation',
+                        'ReservedTypeAnnotation',
                       );
                       invariant(
-                        prop.typeAnnotation.type ===
-                          'ReservedFunctionValueTypeAnnotation',
+                        prop.typeAnnotation.type === 'ReservedTypeAnnotation',
                         '',
                       );
 
@@ -583,12 +573,9 @@ describe('Flow Module Parser', () => {
                         FLOW_TYPE,
                       );
 
-                      expect(elementType.type).toBe(
-                        'ReservedFunctionValueTypeAnnotation',
-                      );
+                      expect(elementType.type).toBe('ReservedTypeAnnotation');
                       invariant(
-                        elementType.type ===
-                          'ReservedFunctionValueTypeAnnotation',
+                        elementType.type === 'ReservedTypeAnnotation',
                         '',
                       );
                       expect(elementType.name).toBe(FLOW_TYPE);
@@ -621,10 +608,10 @@ describe('Flow Module Parser', () => {
                     expectAnimalTypeAliasToExist(module);
                   });
 
-                  it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of 'Array<{|foo: ?string|}>'`, () => {
+                  it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of 'Array<{foo: ?string}>'`, () => {
                     const [elementType] = parseArrayElementType(
                       'prop',
-                      '{|foo: ?string|}',
+                      '{foo: ?string}',
                     );
 
                     expect(elementType.type).toBe('ObjectTypeAnnotation');
@@ -651,10 +638,10 @@ describe('Flow Module Parser', () => {
                   });
                 });
 
-                it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type '{|foo: ?string|}'`, () => {
+                it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type '{foo: ?string}'`, () => {
                   const [property] = parseParamTypeObjectLiteralProp(
                     'prop',
-                    '{|foo: ?string|}',
+                    '{foo: ?string}',
                   );
 
                   expect(property.typeAnnotation.type).toBe(
@@ -777,7 +764,7 @@ describe('Flow Module Parser', () => {
       describe(
         IS_RETURN_TYPE_NULLABLE ? 'Nullable Returns' : 'Non-Nullable Returns',
         () => {
-          ['Promise<void>', 'Promise<{||}>', 'Promise<*>'].forEach(
+          ['Promise<void>', 'Promise<{}>', 'Promise<*>'].forEach(
             promiseFlowType => {
               it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type '${promiseFlowType}'`, () => {
                 const [returnTypeAnnotation] = parseReturnType(promiseFlowType);
@@ -800,11 +787,10 @@ describe('Flow Module Parser', () => {
               it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} reserved return of type '${FLOW_TYPE}'`, () => {
                 const [returnTypeAnnotation] = parseReturnType(FLOW_TYPE);
                 expect(returnTypeAnnotation.type).toBe(
-                  'ReservedFunctionValueTypeAnnotation',
+                  'ReservedTypeAnnotation',
                 );
                 invariant(
-                  returnTypeAnnotation.type ===
-                    'ReservedFunctionValueTypeAnnotation',
+                  returnTypeAnnotation.type === 'ReservedTypeAnnotation',
                   '',
                 );
                 expect(returnTypeAnnotation.name).toBe(FLOW_TYPE);
@@ -863,13 +849,8 @@ describe('Flow Module Parser', () => {
               RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
                 it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<${FLOW_TYPE}>'`, () => {
                   const [elementType] = parseArrayElementReturnType(FLOW_TYPE);
-                  expect(elementType.type).toBe(
-                    'ReservedFunctionValueTypeAnnotation',
-                  );
-                  invariant(
-                    elementType.type === 'ReservedFunctionValueTypeAnnotation',
-                    '',
-                  );
+                  expect(elementType.type).toBe('ReservedTypeAnnotation');
+                  invariant(elementType.type === 'ReservedTypeAnnotation', '');
 
                   expect(elementType.name).toBe(FLOW_TYPE);
                 });
@@ -891,9 +872,9 @@ describe('Flow Module Parser', () => {
               expectAnimalTypeAliasToExist(module);
             });
 
-            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<{|foo: ?string|}>'`, () => {
+            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<{foo: ?string}>'`, () => {
               const [elementType] = parseArrayElementReturnType(
-                '{|foo: ?string|}',
+                '{foo: ?string}',
               );
               expect(elementType.type).toBe('ObjectTypeAnnotation');
               invariant(elementType.type === 'ObjectTypeAnnotation', '');
@@ -945,7 +926,7 @@ describe('Flow Module Parser', () => {
             // TODO: Inexact vs exact object literals?
 
             it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an empty object literal`, () => {
-              const [returnTypeAnnotation] = parseReturnType('{||}');
+              const [returnTypeAnnotation] = parseReturnType('{}');
               expect(returnTypeAnnotation.type).toBe('ObjectTypeAnnotation');
               invariant(
                 returnTypeAnnotation.type === 'ObjectTypeAnnotation',
@@ -997,7 +978,7 @@ describe('Flow Module Parser', () => {
                 NativeModuleSchema,
               ] {
                 const [returnTypeAnnotation, module] = parseReturnType(
-                  `{|${annotateProp(propName, propType)}|}`,
+                  `{${annotateProp(propName, propType)}}`,
                 );
                 expect(returnTypeAnnotation.type).toBe('ObjectTypeAnnotation');
                 invariant(
@@ -1079,11 +1060,11 @@ describe('Flow Module Parser', () => {
                         );
 
                         expect(property.typeAnnotation.type).toBe(
-                          'ReservedFunctionValueTypeAnnotation',
+                          'ReservedTypeAnnotation',
                         );
                         invariant(
                           property.typeAnnotation.type ===
-                            'ReservedFunctionValueTypeAnnotation',
+                            'ReservedTypeAnnotation',
                           '',
                         );
 
@@ -1152,12 +1133,9 @@ describe('Flow Module Parser', () => {
                           'prop',
                           FLOW_TYPE,
                         );
-                        expect(elementType.type).toBe(
-                          'ReservedFunctionValueTypeAnnotation',
-                        );
+                        expect(elementType.type).toBe('ReservedTypeAnnotation');
                         invariant(
-                          elementType.type ===
-                            'ReservedFunctionValueTypeAnnotation',
+                          elementType.type === 'ReservedTypeAnnotation',
                           '',
                         );
 
@@ -1190,10 +1168,10 @@ describe('Flow Module Parser', () => {
                       expectAnimalTypeAliasToExist(module);
                     });
 
-                    it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<{|foo: ?string|}>'`, () => {
+                    it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<{foo: ?string}>'`, () => {
                       const [elementType] = parseArrayElementType(
                         'prop',
-                        '{|foo: ?string|}',
+                        '{foo: ?string}',
                       );
                       expect(elementType.type).toBe('ObjectTypeAnnotation');
                       invariant(
@@ -1220,10 +1198,10 @@ describe('Flow Module Parser', () => {
                     });
                   });
 
-                  it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of '{|foo: ?string|}'`, () => {
+                  it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of '{foo: ?string}'`, () => {
                     const [property] = parseObjectLiteralReturnTypeProp(
                       'prop',
-                      '{|foo: ?string|}',
+                      '{foo: ?string}',
                     );
 
                     expect(property.typeAnnotation.type).toBe(
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/errors.js b/packages/react-native-codegen/src/parsers/flow/modules/errors.js
index 5a382052e0a8c6..370262cfcb7448 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/errors.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/errors.js
@@ -23,12 +23,33 @@ class MisnamedModuleFlowInterfaceParserError extends ParserError {
   }
 }
 
-class ModuleFlowInterfaceNotParserError extends ParserError {
+class ModuleFlowInterfaceNotFoundParserError extends ParserError {
   constructor(hasteModuleName: string, ast: $FlowFixMe) {
     super(
       hasteModuleName,
       ast,
-      `Module ${hasteModuleName}: No Flow interfaces extending TurboModule were detected in this NativeModule spec.`,
+      'No Flow interfaces extending TurboModule were detected in this NativeModule spec.',
+    );
+  }
+}
+
+class MoreThanOneModuleFlowInterfaceParserError extends ParserError {
+  constructor(
+    hasteModuleName: string,
+    flowModuleInterfaces: $ReadOnlyArray<$FlowFixMe>,
+    names: $ReadOnlyArray<string>,
+  ) {
+    const finalName = names[names.length - 1];
+    const allButLastName = names.slice(0, -1);
+    const quote = x => `'${x}'`;
+
+    const nameStr =
+      allButLastName.map(quote).join(', ') + ', and ' + quote(finalName);
+
+    super(
+      hasteModuleName,
+      flowModuleInterfaces,
+      `Every NativeModule spec file must declare exactly one NativeModule Flow interface. This file declares ${names.length}: ${nameStr}. Please remove the extraneous Flow interface declarations.`,
     );
   }
 }
@@ -206,10 +227,96 @@ class UnsupportedFunctionReturnTypeAnnotationParserError extends ParserError {
   }
 }
 
+class UnusedModuleFlowInterfaceParserError extends ParserError {
+  constructor(hasteModuleName: string, flowInterface: $FlowFixMe) {
+    super(
+      hasteModuleName,
+      flowInterface,
+      "Unused NativeModule spec. Please load the NativeModule by calling TurboModuleRegistry.get<Spec>('<moduleName>').",
+    );
+  }
+}
+
+class MoreThanOneModuleRegistryCallsParserError extends ParserError {
+  constructor(
+    hasteModuleName: string,
+    flowCallExpressions: $FlowFixMe,
+    numCalls: number,
+  ) {
+    super(
+      hasteModuleName,
+      flowCallExpressions,
+      `Every NativeModule spec file must contain exactly one NativeModule load. This file contains ${numCalls}. Please simplify this spec file, splitting it as necessary, to remove the extraneous loads.`,
+    );
+  }
+}
+
+class UntypedModuleRegistryCallParserError extends ParserError {
+  constructor(
+    hasteModuleName: string,
+    flowCallExpression: $FlowFixMe,
+    methodName: string,
+    moduleName: string,
+  ) {
+    super(
+      hasteModuleName,
+      flowCallExpression,
+      `Please type this NativeModule load: TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
+    );
+  }
+}
+
+class IncorrectModuleRegistryCallTypeParameterParserError extends ParserError {
+  constructor(
+    hasteModuleName: string,
+    flowTypeArguments: $FlowFixMe,
+    methodName: string,
+    moduleName: string,
+  ) {
+    super(
+      hasteModuleName,
+      flowTypeArguments,
+      `Please change these type arguments to reflect TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
+    );
+  }
+}
+
+class IncorrectModuleRegistryCallArityParserError extends ParserError {
+  constructor(
+    hasteModuleName: string,
+    flowCallExpression: $FlowFixMe,
+    methodName: string,
+    incorrectArity: number,
+  ) {
+    super(
+      hasteModuleName,
+      flowCallExpression,
+      `Please call TurboModuleRegistry.${methodName}<Spec>() with exactly one argument. Detected ${incorrectArity}.`,
+    );
+  }
+}
+
+class IncorrectModuleRegistryCallArgumentTypeParserError extends ParserError {
+  constructor(
+    hasteModuleName: string,
+    flowArgument: $FlowFixMe,
+    methodName: string,
+    type: string,
+  ) {
+    const a = /[aeiouy]/.test(type.toLowerCase()) ? 'an' : 'a';
+    super(
+      hasteModuleName,
+      flowArgument,
+      `Please call TurboModuleRegistry.${methodName}<Spec>() with a string literal. Detected ${a} '${type}'`,
+    );
+  }
+}
+
 module.exports = {
   IncorrectlyParameterizedFlowGenericParserError,
   MisnamedModuleFlowInterfaceParserError,
-  ModuleFlowInterfaceNotParserError,
+  ModuleFlowInterfaceNotFoundParserError,
+  MoreThanOneModuleFlowInterfaceParserError,
   UnnamedFunctionParamParserError,
   UnsupportedArrayElementTypeAnnotationParserError,
   UnsupportedFlowGenericParserError,
@@ -219,4 +326,10 @@ module.exports = {
   UnsupportedModulePropertyParserError,
   UnsupportedObjectPropertyTypeAnnotationParserError,
   UnsupportedObjectPropertyValueTypeAnnotationParserError,
+  UnusedModuleFlowInterfaceParserError,
+  MoreThanOneModuleRegistryCallsParserError,
+  UntypedModuleRegistryCallParserError,
+  IncorrectModuleRegistryCallTypeParameterParserError,
+  IncorrectModuleRegistryCallArityParserError,
+  IncorrectModuleRegistryCallArgumentTypeParserError,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index 9c71bd6704e1cd..ffbb50af398771 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -11,13 +11,13 @@
 'use strict';
 
 import type {
+  NamedShape,
   NativeModuleAliasMap,
   NativeModuleArrayTypeAnnotation,
   NativeModuleBaseTypeAnnotation,
   NativeModuleFunctionTypeAnnotation,
-  NativeModuleMethodParamSchema,
-  NativeModuleObjectTypeAnnotationPropertySchema,
-  NativeModulePropertySchema,
+  NativeModuleParamTypeAnnotation,
+  NativeModulePropertyShape,
   NativeModuleSchema,
   Nullable,
 } from '../../../CodegenSchema.js';
@@ -26,12 +26,18 @@ import type {TypeDeclarationMap} from '../utils.js';
 import type {ParserErrorCapturer} from '../utils';
 import type {NativeModuleTypeAnnotation} from '../../../CodegenSchema.js';
 
-const {resolveTypeAnnotation, getTypes} = require('../utils.js');
+const {
+  resolveTypeAnnotation,
+  getTypes,
+  visit,
+  isModuleRegistryCall,
+} = require('../utils.js');
 const {unwrapNullable, wrapNullable} = require('./utils');
 const {
   IncorrectlyParameterizedFlowGenericParserError,
   MisnamedModuleFlowInterfaceParserError,
-  ModuleFlowInterfaceNotParserError,
+  ModuleFlowInterfaceNotFoundParserError,
+  MoreThanOneModuleFlowInterfaceParserError,
   UnnamedFunctionParamParserError,
   UnsupportedArrayElementTypeAnnotationParserError,
   UnsupportedFlowGenericParserError,
@@ -41,6 +47,12 @@ const {
   UnsupportedModulePropertyParserError,
   UnsupportedObjectPropertyTypeAnnotationParserError,
   UnsupportedObjectPropertyValueTypeAnnotationParserError,
+  UnusedModuleFlowInterfaceParserError,
+  MoreThanOneModuleRegistryCallsParserError,
+  UntypedModuleRegistryCallParserError,
+  IncorrectModuleRegistryCallTypeParameterParserError,
+  IncorrectModuleRegistryCallArityParserError,
+  IncorrectModuleRegistryCallArgumentTypeParserError,
 } = require('./errors.js');
 
 const invariant = require('invariant');
@@ -57,7 +69,7 @@ function translateTypeAnnotation(
   flowTypeAnnotation: $FlowFixMe,
   types: TypeDeclarationMap,
   aliasMap: {...NativeModuleAliasMap},
-  guard: ParserErrorCapturer,
+  tryParse: ParserErrorCapturer,
 ): Nullable<NativeModuleTypeAnnotation> {
   const {
     nullable,
@@ -70,7 +82,7 @@ function translateTypeAnnotation(
       switch (typeAnnotation.id.name) {
         case 'RootTag': {
           return wrapNullable(nullable, {
-            type: 'ReservedFunctionValueTypeAnnotation',
+            type: 'ReservedTypeAnnotation',
             name: 'RootTag',
           });
         }
@@ -167,7 +179,7 @@ function translateTypeAnnotation(
             typeAnnotation.typeParameters.params[0],
             types,
             aliasMap,
-            guard,
+            tryParse,
           );
         }
         case 'Stringish': {
@@ -190,6 +202,7 @@ function translateTypeAnnotation(
             type: 'FloatTypeAnnotation',
           });
         }
+        case 'UnsafeObject':
         case 'Object': {
           return wrapNullable(nullable, {
             type: 'GenericObjectTypeAnnotation',
@@ -206,69 +219,72 @@ function translateTypeAnnotation(
     case 'ObjectTypeAnnotation': {
       const objectTypeAnnotation = {
         type: 'ObjectTypeAnnotation',
+        // $FlowFixMe[missing-type-arg]
         properties: (typeAnnotation.properties: Array<$FlowFixMe>)
-          .map<?NativeModuleObjectTypeAnnotationPropertySchema>(property => {
-            return guard(() => {
-              if (property.type !== 'ObjectTypeProperty') {
-                throw new UnsupportedObjectPropertyTypeAnnotationParserError(
-                  hasteModuleName,
-                  property,
-                  property.type,
-                );
-              }
-
-              const {optional, key} = property;
-
-              const [
-                propertyTypeAnnotation,
-                isPropertyNullable,
-              ] = unwrapNullable(
-                translateTypeAnnotation(
-                  hasteModuleName,
-                  property.value,
-                  types,
-                  aliasMap,
-                  guard,
-                ),
-              );
-
-              if (propertyTypeAnnotation.type === 'FunctionTypeAnnotation') {
-                throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
-                  hasteModuleName,
-                  property.value,
-                  property.key,
-                  propertyTypeAnnotation.type,
-                );
-              }
-
-              if (propertyTypeAnnotation.type === 'VoidTypeAnnotation') {
-                throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
-                  hasteModuleName,
-                  property.value,
-                  property.key,
-                  'void',
-                );
-              }
-
-              if (propertyTypeAnnotation.type === 'PromiseTypeAnnotation') {
-                throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
-                  hasteModuleName,
-                  property.value,
-                  property.key,
-                  'Promise',
+          .map<?NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>>(
+            property => {
+              return tryParse(() => {
+                if (property.type !== 'ObjectTypeProperty') {
+                  throw new UnsupportedObjectPropertyTypeAnnotationParserError(
+                    hasteModuleName,
+                    property,
+                    property.type,
+                  );
+                }
+
+                const {optional, key} = property;
+
+                const [
+                  propertyTypeAnnotation,
+                  isPropertyNullable,
+                ] = unwrapNullable(
+                  translateTypeAnnotation(
+                    hasteModuleName,
+                    property.value,
+                    types,
+                    aliasMap,
+                    tryParse,
+                  ),
                 );
-              }
 
-              return {
-                name: key.name,
-                optional,
-                typeAnnotation: wrapNullable(
-                  isPropertyNullable,
-                  propertyTypeAnnotation,
-                ),
-              };
-            });
-          })
+                if (propertyTypeAnnotation.type === 'FunctionTypeAnnotation') {
+                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
+                    hasteModuleName,
+                    property.value,
+                    property.key,
+                    propertyTypeAnnotation.type,
+                  );
+                }
+
+                if (propertyTypeAnnotation.type === 'VoidTypeAnnotation') {
+                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
+                    hasteModuleName,
+                    property.value,
+                    property.key,
+                    'void',
+                  );
+                }
+
+                if (propertyTypeAnnotation.type === 'PromiseTypeAnnotation') {
+                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
+                    hasteModuleName,
+                    property.value,
+                    property.key,
+                    'Promise',
+                  );
+                }
+
+                return {
+                  name: key.name,
+                  optional,
+                  typeAnnotation: wrapNullable(
+                    isPropertyNullable,
+                    propertyTypeAnnotation,
+                  ),
+                };
+              });
+            },
+          )
           .filter(Boolean),
       };
 
@@ -286,9 +302,9 @@ function translateTypeAnnotation(
        *
        * Consider this case:
        *
-       * type Animal = ?{|
+       * type Animal = ?{
        *   name: string,
-       * |};
+       * };
        *
        * type B = Animal
        *
@@ -296,11 +312,11 @@ function translateTypeAnnotation(
        *   +greet: (animal: B) => void;
        * }
        *
-       * In this case, we follow B to Animal, and then Animal to ?{|name: string|}.
+       * In this case, we follow B to Animal, and then Animal to ?{name: string}.
        *
        * We:
        *   1. Replace `+greet: (animal: B) => void;` with `+greet: (animal: ?Animal) => void;`,
-       *   2. Pretend that Animal = {|name: string|}.
+       *   2. Pretend that Animal = {name: string}.
        *
        * Why do we do this?
        *  1. In ObjC, we need to generate a struct called Animal, not B.
@@ -343,7 +359,7 @@ function translateTypeAnnotation(
           typeAnnotation,
           types,
           aliasMap,
-          guard,
+          tryParse,
         ),
       );
     }
@@ -389,12 +405,13 @@ function translateFunctionTypeAnnotation(
   flowFunctionTypeAnnotation: $FlowFixMe,
   types: TypeDeclarationMap,
   aliasMap: {...NativeModuleAliasMap},
-  guard: ParserErrorCapturer,
+  tryParse: ParserErrorCapturer,
 ): NativeModuleFunctionTypeAnnotation {
-  const params: Array<NativeModuleMethodParamSchema> = [];
+  type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
+  const params: Array<Param> = [];
 
   for (const flowParam of (flowFunctionTypeAnnotation.params: $ReadOnlyArray<$FlowFixMe>)) {
-    const parsedParam = guard(() => {
+    const parsedParam = tryParse(() => {
       if (flowParam.name == null) {
         throw new UnnamedFunctionParamParserError(flowParam, hasteModuleName);
       }
@@ -409,7 +426,7 @@ function translateFunctionTypeAnnotation(
           flowParam.typeAnnotation,
           types,
           aliasMap,
-          guard,
+          tryParse,
         ),
       );
 
@@ -452,7 +469,7 @@ function translateFunctionTypeAnnotation(
       flowFunctionTypeAnnotation.returnType,
       types,
       aliasMap,
-      guard,
+      tryParse,
     ),
   );
 
@@ -483,8 +500,8 @@ function buildPropertySchema(
   property: $FlowFixMe,
   types: TypeDeclarationMap,
   aliasMap: {...NativeModuleAliasMap},
-  guard: ParserErrorCapturer,
-): NativeModulePropertySchema {
+  tryParse: ParserErrorCapturer,
+): NativeModulePropertyShape {
   let nullable = false;
   let {key, value} = property;
 
@@ -511,47 +528,134 @@ function buildPropertySchema(
         value,
         types,
         aliasMap,
-        guard,
+        tryParse,
       ),
     ),
   };
 }
 
+function isModuleInterface(node) {
+  return (
+    node.type === 'InterfaceDeclaration' &&
+    node.extends.length === 1 &&
+    node.extends[0].type === 'InterfaceExtends' &&
+    node.extends[0].id.name === 'TurboModule'
+  );
+}
+
 function buildModuleSchema(
   hasteModuleName: string,
-  moduleNames: $ReadOnlyArray<string>,
   /**
    * TODO(T71778680): Flow-type this node.
    */
   ast: $FlowFixMe,
-  guard: ParserErrorCapturer,
+  tryParse: ParserErrorCapturer,
 ): NativeModuleSchema {
   const types = getTypes(ast);
-  const moduleInterfaceNames = (Object.keys(
-    types,
-  ): $ReadOnlyArray<string>).filter((typeName: string) => {
-    const declaration = types[typeName];
-    return (
-      declaration.type === 'InterfaceDeclaration' &&
-      declaration.extends.length === 1 &&
-      declaration.extends[0].type === 'InterfaceExtends' &&
-      declaration.extends[0].id.name === 'TurboModule'
-    );
-  });
+  const moduleSpecs = (Object.values(types): $ReadOnlyArray<$FlowFixMe>).filter(
+    isModuleInterface,
+  );
 
-  if (moduleInterfaceNames.length !== 1) {
-    throw new ModuleFlowInterfaceNotParserError(hasteModuleName, ast);
+  if (moduleSpecs.length === 0) {
+    throw new ModuleFlowInterfaceNotFoundParserError(hasteModuleName, ast);
+  }
+
+  if (moduleSpecs.length > 1) {
+    throw new MoreThanOneModuleFlowInterfaceParserError(
+      hasteModuleName,
+      moduleSpecs,
+      moduleSpecs.map(node => node.id.name),
+    );
   }
 
-  const [moduleInterfaceName] = moduleInterfaceNames;
+  const [moduleSpec] = moduleSpecs;
 
-  if (moduleInterfaceName !== 'Spec') {
+  if (moduleSpec.id.name !== 'Spec') {
     throw new MisnamedModuleFlowInterfaceParserError(
       hasteModuleName,
-      types[moduleInterfaceName].id,
+      moduleSpec.id,
     );
   }
 
+  // Parse Module Names
+  const moduleName = tryParse((): string => {
+    const callExpressions = [];
+    visit(ast, {
+      CallExpression(node) {
+        if (isModuleRegistryCall(node)) {
+          callExpressions.push(node);
+        }
+      },
+    });
+
+    if (callExpressions.length === 0) {
+      throw new UnusedModuleFlowInterfaceParserError(
+        hasteModuleName,
+        moduleSpec,
+      );
+    }
+
+    if (callExpressions.length > 1) {
+      throw new MoreThanOneModuleRegistryCallsParserError(
+        hasteModuleName,
+        callExpressions,
+        callExpressions.length,
+      );
+    }
+
+    const [callExpression] = callExpressions;
+    const {typeArguments} = callExpression;
+    const methodName = callExpression.callee.property.name;
+
+    if (callExpression.arguments.length !== 1) {
+      throw new IncorrectModuleRegistryCallArityParserError(
+        hasteModuleName,
+        callExpression,
+        methodName,
+        callExpression.arguments.length,
+      );
+    }
+
+    if (callExpression.arguments[0].type !== 'Literal') {
+      const {type} = callExpression.arguments[0];
+      throw new IncorrectModuleRegistryCallArgumentTypeParserError(
+        hasteModuleName,
+        callExpression.arguments[0],
+        methodName,
+        type,
+      );
+    }
+
+    const $moduleName = callExpression.arguments[0].value;
+
+    if (typeArguments == null) {
+      throw new UntypedModuleRegistryCallParserError(
+        hasteModuleName,
+        callExpression,
+        methodName,
+        $moduleName,
+      );
+    }
+
+    if (
+      typeArguments.type !== 'TypeParameterInstantiation' ||
+      typeArguments.params.length !== 1 ||
+      typeArguments.params[0].type !== 'GenericTypeAnnotation' ||
+      typeArguments.params[0].id.name !== 'Spec'
+    ) {
+      throw new IncorrectModuleRegistryCallTypeParameterParserError(
+        hasteModuleName,
+        typeArguments,
+        methodName,
+        $moduleName,
+      );
+    }
+
+    return $moduleName;
+  });
+
+  const moduleNames = moduleName == null ? [] : [moduleName];
+
   // Some module names use platform suffix to indicate platform-exclusive modules.
   // Eventually this should be made explicit in the Flow type itself.
   // Also check the hasteModuleName for platform suffix.
@@ -566,34 +670,34 @@ function buildModuleSchema(
     }
   });
 
-  const declaration = types[moduleInterfaceName];
-  return (declaration.body.properties: $ReadOnlyArray<$FlowFixMe>)
+  // $FlowFixMe[missing-type-arg]
+  return (moduleSpec.body.properties: $ReadOnlyArray<$FlowFixMe>)
     .filter(property => property.type === 'ObjectTypeProperty')
-    .map<?{|
+    .map<?{
       aliasMap: NativeModuleAliasMap,
-      propertySchema: NativeModulePropertySchema,
-    |}>(property => {
+      propertyShape: NativeModulePropertyShape,
+    }>(property => {
       const aliasMap: {...NativeModuleAliasMap} = {};
 
-      return guard(() => ({
+      return tryParse(() => ({
         aliasMap: aliasMap,
-        propertySchema: buildPropertySchema(
+        propertyShape: buildPropertySchema(
           hasteModuleName,
           property,
           types,
           aliasMap,
-          guard,
+          tryParse,
         ),
       }));
     })
     .filter(Boolean)
     .reduce(
-      (moduleSchema: NativeModuleSchema, {aliasMap, propertySchema}) => {
+      (moduleSchema: NativeModuleSchema, {aliasMap, propertyShape}) => {
         return {
           type: 'NativeModule',
           aliases: {...moduleSchema.aliases, ...aliasMap},
           spec: {
-            properties: [...moduleSchema.spec.properties, propertySchema],
+            properties: [...moduleSchema.spec.properties, propertyShape],
           },
           moduleNames: moduleSchema.moduleNames,
           excludedPlatforms: moduleSchema.excludedPlatforms,
diff --git a/packages/react-native-codegen/src/parsers/flow/utils.js b/packages/react-native-codegen/src/parsers/flow/utils.js
index 8bc2770b44ea4b..70d4536a12ef25 100644
--- a/packages/react-native-codegen/src/parsers/flow/utils.js
+++ b/packages/react-native-codegen/src/parsers/flow/utils.js
@@ -20,7 +20,7 @@ const {ParserError} = require('./errors');
  *
  * TODO(T71778680): Flow type AST Nodes
  */
-export type TypeDeclarationMap = {|[declarationName: string]: $FlowFixMe|};
+export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};
 
 function getTypes(ast: $FlowFixMe): TypeDeclarationMap {
   return ast.body.reduce((types, node) => {
@@ -41,19 +41,19 @@ function getTypes(ast: $FlowFixMe): TypeDeclarationMap {
   }, {});
 }
 
-// $FlowFixMe there's no flowtype for ASTs
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
 export type ASTNode = Object;
 
 const invariant = require('invariant');
 
 type TypeAliasResolutionStatus =
-  | $ReadOnly<{|
+  | $ReadOnly<{
       successful: true,
       aliasName: string,
-    |}>
-  | $ReadOnly<{|
+    }>
+  | $ReadOnly<{
       successful: false,
-    |}>;
+    }>;
 
 function resolveTypeAnnotation(
   // TODO(T71778680): This is an Flow TypeAnnotation. Flow-type this
@@ -137,9 +137,74 @@ function createParserErrorCapturer(): [
   return [errors, guard];
 }
 
+// TODO(T71778680): Flow-type ASTNodes.
+function visit(
+  astNode: $FlowFixMe,
+  visitor: {
+    [type: string]: (node: $FlowFixMe) => void,
+  },
+) {
+  const queue = [astNode];
+  while (queue.length !== 0) {
+    let item = queue.shift();
+
+    if (!(typeof item === 'object' && item != null)) {
+      continue;
+    }
+
+    if (
+      typeof item.type === 'string' &&
+      typeof visitor[item.type] === 'function'
+    ) {
+      // Don't visit any children
+      visitor[item.type](item);
+    } else if (Array.isArray(item)) {
+      queue.push(...item);
+    } else {
+      queue.push(...Object.values(item));
+    }
+  }
+}
+
+// TODO(T71778680): Flow-type ASTNodes.
+function isModuleRegistryCall(node: $FlowFixMe): boolean {
+  if (node.type !== 'CallExpression') {
+    return false;
+  }
+
+  const callExpression = node;
+
+  if (callExpression.callee.type !== 'MemberExpression') {
+    return false;
+  }
+
+  const memberExpression = callExpression.callee;
+  if (
+    !(
+      memberExpression.object.type === 'Identifier' &&
+      memberExpression.object.name === 'TurboModuleRegistry'
+    )
+  ) {
+    return false;
+  }
+
+  if (
+    !(
+      memberExpression.property.type === 'Identifier' &&
+      (memberExpression.property.name === 'get' ||
+        memberExpression.property.name === 'getEnforcing')
+    )
+  ) {
+    return false;
+  }
+  return true;
+}
+
 module.exports = {
   getValueFromTypes,
   resolveTypeAnnotation,
   createParserErrorCapturer,
   getTypes,
+  visit,
+  isModuleRegistryCall,
 };
diff --git a/packages/react-native-codegen/src/parsers/schema/index.js b/packages/react-native-codegen/src/parsers/schema/index.js
index 663ffcb2f807e8..bf736a725fa052 100644
--- a/packages/react-native-codegen/src/parsers/schema/index.js
+++ b/packages/react-native-codegen/src/parsers/schema/index.js
@@ -14,7 +14,7 @@ import type {SchemaType} from '../../CodegenSchema.js';
 
 function parse(filename: string): ?SchemaType {
   try {
-    // $FlowFixMe Can't require dynamic variables
+    // $FlowFixMe[unsupported-syntax] Can't require dynamic variables
     return require(filename);
   } catch (err) {
     // Ignore
diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts
new file mode 100644
index 00000000000000..75a8bb54da3fb9
--- /dev/null
+++ b/packages/react-native-gradle-plugin/build.gradle.kts
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+plugins {
+  `java-gradle-plugin`
+  `kotlin-dsl`
+}
+
+repositories {
+  google()
+  mavenCentral()
+}
+
+gradlePlugin {
+  plugins {
+    create("reactApp") {
+      id = "com.facebook.react.app"
+      implementationClass = "com.facebook.react.ReactAppPlugin"
+    }
+  }
+}
+
+dependencies {
+  implementation("com.android.tools.build:gradle:4.2.2")
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/AndroidConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/AndroidConfiguration.kt
new file mode 100644
index 00000000000000..0e5cf8f75f273e
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/AndroidConfiguration.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react
+
+import com.android.build.gradle.BaseExtension
+import org.gradle.api.Project
+
+fun Project.configureDevPorts(androidExt: BaseExtension) {
+  val devServerPort = project.properties["reactNativeDevServerPort"]?.toString() ?: "8081"
+  val inspectorProxyPort =
+      project.properties["reactNativeInspectorProxyPort"]?.toString() ?: devServerPort
+
+  androidExt.buildTypes.all {
+    resValue("integer", "react_native_dev_server_port", devServerPort)
+    resValue("integer", "react_native_inspector_proxy_port", inspectorProxyPort)
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppExtension.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppExtension.kt
new file mode 100644
index 00000000000000..09099f7aa0925a
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppExtension.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react
+
+import com.android.build.gradle.api.BaseVariant
+import java.io.File
+import org.apache.tools.ant.taskdefs.condition.Os
+import org.gradle.api.Project
+
+open class ReactAppExtension(private val project: Project) {
+  var composeSourceMapsPath: String = "node_modules/react-native/scripts/compose-source-maps.js"
+  var bundleAssetName: String = "index.android.bundle"
+  var entryFile: File? = null
+  var bundleCommand: String = "bundle"
+  var reactRoot: File = File(project.projectDir, "../../")
+  var inputExcludes: List<String> = listOf("android/**", "ios/**")
+  var bundleConfig: String? = null
+  var enableVmCleanup: Boolean = true
+  var hermesCommand: String = "node_modules/hermes-engine/%OS-BIN%/hermesc"
+  var cliPath: String? = null
+  var nodeExecutableAndArgs: List<String> = listOf("node")
+  var enableHermes: Boolean = false
+  var enableHermesForVariant: (BaseVariant) -> Boolean = { enableHermes }
+  var devDisabledInVariants: List<String> = emptyList()
+  // todo maybe lambda as for hermes?
+  var bundleIn: Map<String, Boolean> = emptyMap()
+  var extraPackagerArgs: List<String> = emptyList()
+  var hermesFlagsDebug: List<String> = emptyList()
+  var hermesFlagsRelease: List<String> = listOf("-O", "-output-source-map")
+  var resourcesDir: Map<String, File> = emptyMap()
+  var jsBundleDir: Map<String, File> = emptyMap()
+
+  internal val detectedEntryFile: File
+    get() = detectEntryFile(entryFile = entryFile, reactRoot = reactRoot)
+
+  internal val detectedCliPath: String
+    get() =
+        detectCliPath(
+            projectDir = project.projectDir, reactRoot = reactRoot, preconfuredCliPath = cliPath)
+
+  internal val osAwareHermesCommand: String
+    get() = getOSAwareHermesCommand(hermesCommand)
+
+  private fun detectEntryFile(entryFile: File?, reactRoot: File): File =
+      when {
+        System.getenv("ENTRY_FILE") != null -> File(System.getenv("ENTRY_FILE"))
+        entryFile != null -> entryFile
+        File(reactRoot, "index.android.js").exists() -> File(reactRoot, "index.android.js")
+        else -> File(reactRoot, "index.android.js")
+      }
+
+  private fun detectCliPath(
+      projectDir: File,
+      reactRoot: File,
+      preconfuredCliPath: String?
+  ): String {
+    // 1. preconfigured path
+    if (preconfuredCliPath != null) return preconfuredCliPath
+
+    // 2. node module path
+    val nodeProcess =
+        Runtime.getRuntime()
+            .exec(
+                arrayOf("node", "-e", "console.log(require('react-native/cli').bin);"),
+                emptyArray(),
+                projectDir)
+
+    val nodeProcessOutput = nodeProcess.inputStream.use { it.bufferedReader().readText().trim() }
+
+    if (nodeProcessOutput.isNotEmpty()) {
+      return nodeProcessOutput
+    }
+
+    // 3. cli.js in the root folder
+    val rootCliJs = File(reactRoot, "node_modules/react-native/cli.js")
+    if (rootCliJs.exists()) {
+      return rootCliJs.absolutePath
+    }
+
+    error(
+        "Couldn't determine CLI location. " +
+            "Please set `project.react.cliPath` to the path of the react-native cli.js")
+  }
+
+  // Make sure not to inspect the Hermes config unless we need it,
+  // to avoid breaking any JSC-only setups.
+  private fun getOSAwareHermesCommand(hermesCommand: String): String {
+    // If the project specifies a Hermes command, don't second guess it.
+    if (!hermesCommand.contains("%OS-BIN%")) {
+      return hermesCommand
+    }
+
+    // Execution on Windows fails with / as separator
+    return hermesCommand.replace("%OS-BIN%", getHermesOSBin()).replace('/', File.separatorChar)
+  }
+
+  private fun getHermesOSBin(): String {
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) return "win64-bin"
+    if (Os.isFamily(Os.FAMILY_MAC)) return "osx-bin"
+    if (Os.isOs(null, "linux", "amd64", null)) return "linux64-bin"
+    error(
+        "OS not recognized. Please set project.react.hermesCommand " +
+            "to the path of a working Hermes compiler.")
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppPlugin.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppPlugin.kt
new file mode 100644
index 00000000000000..7b06e9067d1314
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactAppPlugin.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react
+
+import com.android.build.gradle.AppExtension
+import com.android.build.gradle.BaseExtension
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.getByType
+
+class ReactAppPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    val config = project.extensions.create<ReactAppExtension>("reactApp", project)
+
+    project.afterEvaluate {
+      val androidConfiguration = extensions.getByType<BaseExtension>()
+      configureDevPorts(androidConfiguration)
+
+      val isAndroidLibrary = plugins.hasPlugin("com.android.library")
+      val variants =
+          if (isAndroidLibrary) {
+            extensions.getByType<LibraryExtension>().libraryVariants
+          } else {
+            extensions.getByType<AppExtension>().applicationVariants
+          }
+      variants.all { configureReactTasks(variant = this, config = config) }
+    }
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
new file mode 100644
index 00000000000000..e518d780497ca8
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react
+
+import com.android.build.gradle.api.ApplicationVariant
+import com.android.build.gradle.api.BaseVariant
+import com.android.build.gradle.api.LibraryVariant
+import com.android.build.gradle.internal.tasks.factory.dependsOn
+import com.facebook.react.tasks.BundleJsAndAssetsTask
+import com.facebook.react.tasks.HermesBinaryTask
+import java.io.File
+import org.gradle.api.Project
+import org.gradle.api.tasks.Copy
+import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.register
+
+private const val REACT_GROUP = "react"
+
+@Suppress("SpreadOperator")
+internal fun Project.configureReactTasks(variant: BaseVariant, config: ReactAppExtension) {
+  val targetName = variant.name.capitalize()
+  val isRelease = variant.isRelease
+  val targetPath = variant.dirName
+
+  // React js bundle directories
+  val jsBundleDir = File(buildDir, "generated/assets/react/$targetPath")
+  val resourcesDir = File(buildDir, "generated/res/react/$targetPath")
+
+  val jsBundleFile = File(jsBundleDir, config.bundleAssetName)
+  val jsSourceMapsDir = File(buildDir, "generated/sourcemaps/react/$targetPath")
+  val jsIntermediateSourceMapsDir = File(buildDir, "intermediates/sourcemaps/react/$targetPath")
+  val jsPackagerSourceMapFile =
+      File(jsIntermediateSourceMapsDir, "${config.bundleAssetName}.packager.map")
+  val jsCompilerSourceMapFile =
+      File(jsIntermediateSourceMapsDir, "${config.bundleAssetName}.compiler.map")
+  val jsOutputSourceMapFile = File(jsSourceMapsDir, "${config.bundleAssetName}.map")
+
+  // Additional node and packager commandline arguments
+  val nodeExecutableAndArgs = config.nodeExecutableAndArgs
+  val cliPath = config.detectedCliPath
+
+  val execCommand = nodeExecutableAndArgs + cliPath
+  val enableHermes = config.enableHermesForVariant(variant)
+  val bundleEnabled = variant.checkBundleEnabled(config)
+
+  val bundleTask =
+      tasks.register<BundleJsAndAssetsTask>("createBundle${targetName}JsAndAssets") {
+        val task = this
+        task.group = REACT_GROUP
+        task.description = "create JS bundle and assets for $targetName."
+
+        task.reactRoot = config.reactRoot
+        task.sources = fileTree(config.reactRoot) { setExcludes(config.inputExcludes) }
+        task.execCommand = execCommand
+        task.bundleCommand = config.bundleCommand
+        task.devEnabled = !(variant.name in config.devDisabledInVariants || isRelease)
+        task.entryFile = config.detectedEntryFile
+
+        val extraArgs = mutableListOf<String>()
+
+        if (config.bundleConfig != null) {
+          extraArgs.add("--config")
+          extraArgs.add(config.bundleConfig.orEmpty())
+        }
+
+        // Hermes doesn't require JS minification.
+        if (enableHermes && !devEnabled) {
+          extraArgs.add("--minify")
+          extraArgs.add("false")
+        }
+
+        extraArgs.addAll(config.extraPackagerArgs)
+
+        task.extraArgs = emptyList()
+
+        task.jsBundleDir = jsBundleDir
+        task.jsBundleFile = jsBundleFile
+        task.resourcesDir = resourcesDir
+        task.jsIntermediateSourceMapsDir = jsIntermediateSourceMapsDir
+        task.jsSourceMapsDir = jsSourceMapsDir
+        task.jsSourceMapsFile = if (enableHermes) jsPackagerSourceMapFile else jsOutputSourceMapFile
+
+        task.enabled = bundleEnabled
+      }
+
+  val hermesTask =
+      tasks.register<HermesBinaryTask>("emit${targetName}HermesResources") {
+        val task = this
+        task.group = REACT_GROUP
+        task.description = "bundle hermes resources for $targetName"
+
+        task.reactRoot = config.reactRoot
+        task.hermesCommand = config.osAwareHermesCommand
+        task.hermesFlags = if (isRelease) config.hermesFlagsRelease else config.hermesFlagsDebug
+        task.jsBundleFile = jsBundleFile
+        task.composeSourceMapsCommand = nodeExecutableAndArgs + config.composeSourceMapsPath
+        task.jsPackagerSourceMapFile = jsPackagerSourceMapFile
+        task.jsCompilerSourceMapFile = jsCompilerSourceMapFile
+        task.jsOutputSourceMapFile = jsOutputSourceMapFile
+
+        task.dependsOn(bundleTask)
+
+        task.enabled = bundleEnabled && enableHermes
+      }
+
+  val aggregatedBundleTask =
+      tasks.register("bundle${targetName}JsAndAssets") {
+        val task = this
+        task.group = REACT_GROUP
+        task.description = "bundle JS and resources for $targetName"
+
+        task.dependsOn(bundleTask, hermesTask)
+
+        // this was exposed before, do we still need it?
+        task.extra["generatedResFolders"] = files(resourcesDir).builtBy(task)
+        task.extra["generatedAssetsFolders"] = files(jsBundleDir).builtBy(task)
+      }
+
+  val generatedResFolders = files(resourcesDir).builtBy(aggregatedBundleTask)
+
+  // Android configuration
+  variant.registerGeneratedResFolders(generatedResFolders)
+
+  val packageTask =
+      when (variant) {
+        is ApplicationVariant -> variant.packageApplicationProvider
+        is LibraryVariant -> variant.packageLibraryProvider
+        else -> tasks.named("package$targetName")
+      }
+
+  val mergeResourcesTask = variant.mergeResourcesProvider
+  val mergeAssetsTask = variant.mergeAssetsProvider
+  val preBundleTask = tasks.named("build${targetName}PreBundle")
+
+  val resourcesDirConfigValue = config.resourcesDir[variant.name]
+  if (resourcesDirConfigValue != null) {
+    val currentCopyResTask =
+        tasks.register<Copy>("copy${targetName}BundledResources") {
+          group = "react"
+          description = "copy bundled resources into custom location for $targetName."
+
+          from(resourcesDir)
+          into(file(resourcesDirConfigValue))
+
+          dependsOn(bundleTask)
+
+          enabled = bundleEnabled
+        }
+
+    packageTask.dependsOn(currentCopyResTask)
+    preBundleTask.dependsOn(currentCopyResTask)
+  }
+
+  packageTask.configure {
+    if (config.enableVmCleanup) {
+      doFirst { cleanupVMFiles(enableHermes, isRelease, targetPath) }
+    }
+  }
+
+  val currentAssetsCopyTask =
+      tasks.register<Copy>("copy${targetName}BundledJs") {
+        group = "react"
+        description = "copy bundled JS into $targetName."
+
+        from(jsBundleDir)
+
+        val jsBundleDirConfigValue = config.jsBundleDir[targetName]
+        if (jsBundleDirConfigValue != null) {
+          into(jsBundleDirConfigValue)
+        } else {
+          into(mergeAssetsTask.map { it.outputDir.get() })
+        }
+
+        dependsOn(mergeAssetsTask)
+
+        enabled = bundleEnabled
+      }
+
+  // mergeResources task runs before the bundle file is copied to the intermediate asset directory
+  // from Android plugin 4.1+.
+  // This ensures to copy the bundle file before mergeResources task starts
+  mergeResourcesTask.dependsOn(currentAssetsCopyTask)
+  packageTask.dependsOn(currentAssetsCopyTask)
+  preBundleTask.dependsOn(currentAssetsCopyTask)
+}
+
+private fun Project.cleanupVMFiles(enableHermes: Boolean, isRelease: Boolean, targetPath: String) {
+  // Delete the VM related libraries that this build doesn't need.
+  // The application can manage this manually by setting 'enableVmCleanup: false'
+  //
+  // This should really be done by packaging all Hermes related libs into
+  // two separate HermesDebug and HermesRelease AARs, but until then we'll
+  // kludge it by deleting the .so files out of the /transforms/ directory.
+  val libDir = "$buildDir/intermediates/transforms/"
+  fileTree(libDir) {
+    if (enableHermes) {
+      // For Hermes, delete all the libjsc* files
+      include("**/libjsc*.so")
+
+      if (isRelease) {
+        // Reduce size by deleting the debugger/inspector
+        include("**/libhermes-inspector.so")
+        include("**/libhermes-executor-debug.so")
+      } else {
+        // Release libs take precedence and must be removed
+        // to allow debugging
+        include("**/libhermes-executor-release.so")
+      }
+    } else {
+      // For JSC, delete all the libhermes* files
+      include("**/libhermes*.so")
+    }
+  }
+      .visit {
+        val targetVariant = ".*/transforms/[^/]*/$targetPath/.*".toRegex()
+        val path = file.absolutePath.replace(File.separatorChar, '/')
+        if (path.matches(targetVariant) && file.isFile()) {
+          file.delete()
+        }
+      }
+}
+
+private fun BaseVariant.checkBundleEnabled(config: ReactAppExtension): Boolean {
+  if (name in config.bundleIn) {
+    return config.bundleIn.getValue(name)
+  }
+
+  if (buildType.name in config.bundleIn) {
+    return config.bundleIn.getValue(buildType.name)
+  }
+
+  return isRelease
+}
+
+private val BaseVariant.isRelease: Boolean
+  get() = name.toLowerCase().contains("release")
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleJsAndAssetsTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleJsAndAssetsTask.kt
new file mode 100644
index 00000000000000..086f2515f98d13
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleJsAndAssetsTask.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.tasks
+
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.FileTree
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+open class BundleJsAndAssetsTask : DefaultTask() {
+  internal lateinit var reactRoot: File
+
+  @get:InputFiles
+  @Suppress("UNUSED") // used to invalidate caches
+  internal lateinit var sources: FileTree
+  @get:Input internal lateinit var execCommand: List<String>
+  @get:Input internal lateinit var bundleCommand: String
+  @get:Input internal var devEnabled: Boolean = true
+  @get:Input internal lateinit var entryFile: File
+  @get:Input internal var extraArgs: List<String> = emptyList()
+
+  @get:OutputDirectory internal lateinit var jsBundleDir: File
+  @get:OutputFile internal lateinit var jsBundleFile: File
+  @get:OutputDirectory internal lateinit var resourcesDir: File
+  @get:OutputDirectory internal lateinit var jsIntermediateSourceMapsDir: File
+  @get:OutputDirectory internal lateinit var jsSourceMapsDir: File
+  @get:OutputFile internal lateinit var jsSourceMapsFile: File
+
+  @TaskAction
+  fun run() {
+    cleanOutputDirectories()
+    executeBundleCommand()
+  }
+
+  private fun cleanOutputDirectories() {
+    jsBundleDir.recreateDir()
+    resourcesDir.recreateDir()
+    jsIntermediateSourceMapsDir.recreateDir()
+    jsSourceMapsDir.recreateDir()
+  }
+
+  private fun executeBundleCommand() {
+    project.exec {
+      workingDir(reactRoot)
+
+      @Suppress("SpreadOperator")
+      windowsAwareCommandLine(
+          *execCommand.toTypedArray(),
+          bundleCommand,
+          "--platform",
+          "android",
+          "--dev",
+          devEnabled,
+          "--reset-cache",
+          "--entry-file",
+          entryFile,
+          "--bundle-output",
+          jsBundleFile,
+          "--assets-dest",
+          resourcesDir,
+          "--sourcemap-output",
+          jsSourceMapsFile,
+          *extraArgs.toTypedArray())
+    }
+  }
+
+  private fun File.recreateDir() {
+    deleteRecursively()
+    mkdirs()
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/HermesBinaryTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/HermesBinaryTask.kt
new file mode 100644
index 00000000000000..0e641dea7ad8ad
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/HermesBinaryTask.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.tasks
+
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+open class HermesBinaryTask : DefaultTask() {
+  internal lateinit var reactRoot: File
+
+  @get:Input internal lateinit var hermesCommand: String
+  @get:Input internal var hermesFlags: List<String> = emptyList()
+  @get:InputFile internal lateinit var jsBundleFile: File
+
+  @get:Input internal lateinit var composeSourceMapsCommand: List<String>
+  @get:Input internal lateinit var jsPackagerSourceMapFile: File
+
+  @get:OutputFile internal lateinit var jsCompilerSourceMapFile: File
+  @get:OutputFile internal lateinit var jsOutputSourceMapFile: File
+
+  @TaskAction
+  fun run() {
+    val bytecodeTempFile = File("$jsBundleFile.hbc")
+    emitHermesBinary(outputFile = bytecodeTempFile)
+    bytecodeTempFile.moveTo(jsBundleFile)
+
+    if (hermesFlags.contains("-output-source-map")) {
+      val hermesTempSourceMapFile = File("$bytecodeTempFile.map")
+      hermesTempSourceMapFile.moveTo(jsCompilerSourceMapFile)
+      composeSourceMaps()
+    }
+  }
+
+  private fun emitHermesBinary(outputFile: File) {
+    project.exec {
+      @Suppress("SpreadOperator")
+      windowsAwareCommandLine(
+          hermesCommand,
+          "-emit-binary",
+          "-out",
+          outputFile,
+          jsBundleFile,
+          *hermesFlags.toTypedArray())
+    }
+  }
+
+  private fun composeSourceMaps() {
+    project.exec {
+      workingDir(reactRoot)
+
+      @Suppress("SpreadOperator")
+      windowsAwareCommandLine(
+          *composeSourceMapsCommand.toTypedArray(),
+          jsPackagerSourceMapFile,
+          jsCompilerSourceMapFile,
+          "-o",
+          jsOutputSourceMapFile)
+    }
+  }
+
+  private fun File.moveTo(destination: File) {
+    copyTo(destination, overwrite = true)
+    delete()
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/TaskUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/TaskUtils.kt
new file mode 100644
index 00000000000000..84aac7af0434ed
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/TaskUtils.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.tasks
+
+import org.apache.tools.ant.taskdefs.condition.Os
+import org.gradle.process.ExecSpec
+
+internal fun ExecSpec.windowsAwareCommandLine(vararg args: Any) {
+  if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    commandLine(listOf("cmd", "/c") + args)
+  } else {
+    commandLine(args.toList())
+  }
+}
diff --git a/packages/react-native-macos-init/package.json b/packages/react-native-macos-init/package.json
index 078acdf729573c..f78ace63dc7e59 100644
--- a/packages/react-native-macos-init/package.json
+++ b/packages/react-native-macos-init/package.json
@@ -36,7 +36,7 @@
     "@types/yargs": "^15.0.3",
     "beachball": "^1.27.0",
     "just-scripts": "^0.36.1",
-    "typescript": "3.5.3"
+    "typescript": "4.5.4"
   },
   "files": [
     "bin.js",
diff --git a/packages/react-native-macos-init/src/cli.ts b/packages/react-native-macos-init/src/cli.ts
index 575f8a1a4585f2..1f363273dce0a4 100644
--- a/packages/react-native-macos-init/src/cli.ts
+++ b/packages/react-native-macos-init/src/cli.ts
@@ -80,10 +80,7 @@ function getReactNativeAppName() {
   return name;
 }
 
-function getPackageVersion(
-  packageName: string,
-  exitOnError: boolean = true
-) {
+function getPackageVersion(packageName: string, exitOnError: boolean = true) {
   console.log(`Reading ${chalk.cyan(packageName)} version from node_modules…`);
 
   try {
@@ -112,16 +109,14 @@ function getReactNativeMacOSVersion() {
 }
 
 function errorOutOnUnsupportedVersionOfReactNative(rnVersion: string) {
-  printError(`Unsupported version of ${RNPKG}: ${chalk.cyan(
-    rnVersion,
-  )}
+  printError(`Unsupported version of ${RNPKG}: ${chalk.cyan(rnVersion)}
 ${MACOSPKG} supports ${RNPKG} versions ${chalk.cyan('>=0.60')}`);
   process.exit(EXITCODE_UNSUPPORTED_VERION_RN);
 }
 
 function getDefaultReactNativeMacOSSemVerForReactNativeVersion(
   rnVersion: string,
-  reactNativeMacOSLatestVersion: string
+  reactNativeMacOSLatestVersion: string,
 ) {
   const validVersion = semver.valid(rnVersion);
   if (validVersion) {
@@ -208,17 +203,12 @@ async function getLatestMatchingReactNativeMacOSVersion(
   versionSemVer: string,
 ): Promise<string> {
   try {
-    const version = await getLatestMatchingVersion(
-      MACOSPKG,
-      versionSemVer,
-    );
+    const version = await getLatestMatchingVersion(MACOSPKG, versionSemVer);
     return version;
   } catch (err) {
-    printError(
-      `No version of ${printPkg(MACOSPKG, versionSemVer)} found!`,
-    );
+    printError(`No version of ${printPkg(MACOSPKG, versionSemVer)} found!`);
     process.exit(EXITCODE_NO_MATCHING_RNMACOS);
-    return "";
+    return '';
   }
 }
 
@@ -233,7 +223,9 @@ function isProjectUsingYarn(cwd: string) {
  * Outputs decorated version of the package for the CLI
  */
 function printPkg(name: string, version?: string) {
-  return `${chalk.yellow(name)}${version ? `${chalk.grey('@')}${chalk.cyan(version)}` : ''}`;
+  return `${chalk.yellow(name)}${
+    version ? `${chalk.grey('@')}${chalk.cyan(version)}` : ''
+  }`;
 }
 
 /**
@@ -245,53 +237,66 @@ function printError(message: string, ...optionalParams: any[]) {
 
 (async () => {
   try {
-    const { overwrite, verbose } = argv;
+    const {overwrite, verbose} = argv;
     let version = argv.version;
 
     const name = getReactNativeAppName();
     const reactNativeVersion = getReactNativeVersion();
     const reactNativeMacOSVersion = getReactNativeMacOSVersion();
-    const reactNativeMacOSLatestVersion = await getLatestMatchingReactNativeMacOSVersion('latest');
+    const reactNativeMacOSLatestVersion = await getLatestMatchingReactNativeMacOSVersion(
+      'latest',
+    );
 
     if (!version) {
       version = getDefaultReactNativeMacOSSemVerForReactNativeVersion(
         reactNativeVersion,
-        reactNativeMacOSLatestVersion
+        reactNativeMacOSLatestVersion,
       );
     }
 
-    const reactNativeMacOSResolvedVersion = await getLatestMatchingReactNativeMacOSVersion(version);
+    const reactNativeMacOSResolvedVersion = await getLatestMatchingReactNativeMacOSVersion(
+      version,
+    );
 
     if (!argv.version) {
       console.log(
         `Latest matching version of ${chalk.green(MACOSPKG)} for ${printPkg(
-          RNPKG, 
-          reactNativeVersion
-        )} is ${printPkg(
-          MACOSPKG, 
-          reactNativeMacOSResolvedVersion
-        )}.`,
+          RNPKG,
+          reactNativeVersion,
+        )} is ${printPkg(MACOSPKG, reactNativeMacOSResolvedVersion)}.`,
       );
 
       if (semver.prerelease(reactNativeMacOSResolvedVersion)) {
         console.warn(
           `
-${printPkg(MACOSPKG, reactNativeMacOSResolvedVersion)} is a ${chalk.bgYellow('pre-release')} version.
-The latest supported version is ${printPkg(MACOSPKG, reactNativeMacOSLatestVersion)}.
+${printPkg(MACOSPKG, reactNativeMacOSResolvedVersion)} is a ${chalk.bgYellow(
+            'pre-release',
+          )} version.
+The latest supported version is ${printPkg(
+            MACOSPKG,
+            reactNativeMacOSLatestVersion,
+          )}.
 You can either downgrade your version of ${chalk.yellow(RNPKG)} to ${chalk.cyan(
             getMatchingReactNativeSemVerForReactNativeMacOSVersion(
               reactNativeMacOSLatestVersion,
             ),
-)}, or continue with a ${chalk.bgYellow('pre-release')} version of ${chalk.yellow(MACOSPKG)}.
+          )}, or continue with a ${chalk.bgYellow(
+            'pre-release',
+          )} version of ${chalk.yellow(MACOSPKG)}.
 `,
         );
 
         if (!argv.prerelease) {
-          const confirm = (await prompts({
-            type: 'confirm',
-            name: 'confirm',
-            message: `Do you wish to continue with ${printPkg(MACOSPKG, reactNativeMacOSResolvedVersion)}?`,
-          })).confirm;
+          const confirm = (
+            await prompts({
+              type: 'confirm',
+              name: 'confirm',
+              message: `Do you wish to continue with ${printPkg(
+                MACOSPKG,
+                reactNativeMacOSResolvedVersion,
+              )}?`,
+            })
+          ).confirm;
 
           if (!confirm) {
             process.exit(EXITCODE_USER_CANCEL);
@@ -303,17 +308,23 @@ You can either downgrade your version of ${chalk.yellow(RNPKG)} to ${chalk.cyan(
     const pkgLatest = printPkg(MACOSPKG, version);
 
     if (reactNativeMacOSResolvedVersion !== reactNativeMacOSVersion) {
-      console.log(`${reactNativeMacOSVersion ? 'Upgrading to' : 'Installing'} ${pkgLatest}…`);
+      console.log(
+        `${
+          reactNativeMacOSVersion ? 'Upgrading to' : 'Installing'
+        } ${pkgLatest}…`,
+      );
 
       const pkgmgr = isProjectUsingYarn(process.cwd())
         ? `yarn add${verbose ? '' : ' -s'}`
         : `npm install --save${verbose ? '' : ' --silent'}`;
-      const execOptions = verbose ? { stdio: 'inherit' as 'inherit' } : {};
+      const execOptions = verbose ? {stdio: 'inherit' as 'inherit'} : {};
       execSync(`${pkgmgr} "${MACOSPKG}@${version}"`, execOptions);
 
       console.log(`${pkgLatest} ${chalk.green('successfully installed!')}`);
     } else {
-      console.log(`${chalk.green('Latest version')} of ${pkgLatest} already installed.`);
+      console.log(
+        `${chalk.green('Latest version')} of ${pkgLatest} already installed.`,
+      );
     }
 
     const generateMacOS = require(reactNativeMacOSGeneratePath());
diff --git a/packages/rn-tester/BUCK b/packages/rn-tester/BUCK
index 8fd38289431bdb..d6f37cd11b23f8 100644
--- a/packages/rn-tester/BUCK
+++ b/packages/rn-tester/BUCK
@@ -1,4 +1,23 @@
-load("@fbsource//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace")
+load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
+load("//tools/build_defs:fb_xplat_platform_specific_rule.bzl", "fb_xplat_platform_specific_rule")
+load("//tools/build_defs:fb_xplat_resource.bzl", "fb_xplat_resource")
+load("//tools/build_defs/apple:fb_apple_asset_catalog.bzl", "fb_apple_asset_catalog")
+load("//tools/build_defs/apple:fb_apple_bundle.bzl", "fb_apple_bundle")
+load("//tools/build_defs/apple:fb_apple_test.bzl", "fb_apple_test")
+load("//tools/build_defs/apple:fb_js_dep.bzl", "rn_js_bundle_dep")
+load("//tools/build_defs/apple:flag_defs.bzl", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode")
+load("//tools/build_defs/oss:metro_defs.bzl", "rn_library")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "APPLE",
+    "YOGA_APPLE_TARGET",
+    "make_resource_glob",
+    "react_module_plugin_providers",
+    "rn_apple_library",
+    "rn_extra_build_flags",
+    "rn_xplat_cxx_library2",
+)
+load("//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace")
 
 yarn_workspace(
     name = "yarn-workspace",
@@ -21,3 +40,232 @@ yarn_workspace(
     ),
     visibility = ["PUBLIC"],
 )
+
+rn_library(
+    name = "rn-tester",
+    srcs = glob(
+        [
+            "js/**/*",
+            "NativeModuleExample/**/*",
+            "RCTTest/**/*",
+        ],
+        exclude = [
+            "**/__*__/**",
+            "**/*.md",
+            "js/examples/WebSocket/http_test_server.js",
+            "js/examples/WebSocket/websocket_test_server.js",
+        ],
+    ),
+    labels = ["supermodule:xplat/default/public.react_native.playground"],
+    skip_processors = True,
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js:node_modules__nullthrows",
+        "//xplat/js/RKJSModules/Libraries/Core:Core",
+        "//xplat/js/RKJSModules/vendor/react:react",
+        "//xplat/js/react-native-github:react-native",
+        "//xplat/js/react-native-github/packages/assets:assets",
+    ],
+)
+
+fb_native.filegroup(
+    name = "nativecomponent-srcs",
+    srcs = glob(
+        [
+            "**/*NativeComponent.js",
+        ],
+    ),
+    visibility = ["PUBLIC"],
+)
+
+REACT_CORE_OSS_DEPS = [
+    "//xplat/js/react-native-github:ReactInternalApple",
+    "//xplat/js/react-native-github:RCTPushNotificationApple",
+    "//xplat/js/react-native-github:RCTLinkingApple",
+    "//xplat/js/react-native-github:RCTAnimationApple",
+    "//xplat/js/react-native-github:RCTImageApple",
+    "//xplat/js/react-native-github:RCTNetworkApple",
+    "//xplat/js/react-native-github:RCTTextApple",
+    "//xplat/js/react-native-github:RCTBlobApple",
+]
+
+fb_xplat_resource(
+    name = "RNTesterUnitTestsResources",
+    dirs = [],
+    files = [
+        "RNTesterUnitTests/RNTesterUnitTestsBundle.js",
+    ],
+    platforms = APPLE,
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:",
+    ],
+)
+
+fb_apple_test(
+    name = "RNTesterUnitTests",
+    srcs = glob(
+        [
+            "RNTesterUnitTests/**/*.m",
+        ],
+    ),
+    headers = glob([
+        "RNTesterUnitTests/**/*.h",
+    ]),
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    frameworks = [
+        "$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework",
+        "CoreGraphics",
+        "Foundation",
+        "QuartzCore",
+        "UIKit",
+    ],
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:workspace",
+    ],
+    deps = REACT_CORE_OSS_DEPS + [
+        "//xplat/js/react-native-github:RCTCxxBridgeApple",
+        ":RCTTestApple",
+        ":RNTesterUnitTestsResourcesApple",
+        "//fbobjc/VendorLib/OCMock:OCMock",
+    ],
+)
+
+fb_xplat_resource(
+    name = "RNTesterIntegrationTestsResources",
+    files = make_resource_glob("RNTesterIntegrationTests"),
+    platforms = APPLE,
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:",
+    ],
+)
+
+fb_apple_test(
+    name = "RNTesterIntegrationTests",
+    autoglob = True,
+    contacts = ["oncall+react_native@xmail.facebook.com"],
+    frameworks = [
+        "$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework",
+        "CoreGraphics",
+        "Foundation",
+        "QuartzCore",
+        "UIKit",
+    ],
+    info_plist = "//xplat/configurations/buck/common_info_plists:ApplicationTest-Info.plist",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
+    test_host_app = "//fbobjc/Configurations/Buck/CommonTestHost:CommonTestHost",
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:workspace",
+    ],
+    deps = REACT_CORE_OSS_DEPS + [
+        ":RCTTestApple",
+        ":RNTesterIntegrationTestsResourcesApple",
+        ":RNTesterResourcesApple",
+        "//xplat/js/react-native-github:RCTCxxBridgeApple",
+        "//xplat/js/react-native-github/React/CoreModules:CoreModulesApple",
+        rn_js_bundle_dep("//xplat/js/RKJSModules/EntryPoints:RNTesterTestBundle"),
+    ],
+)
+
+fb_xplat_platform_specific_rule(
+    name = "RNTesterBundleAssetCatalog",
+    dirs = ["RNTester/RNTesterBundle/OtherImages.xcassets"],
+    platform = APPLE,
+    rule = fb_apple_asset_catalog,
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:",
+    ],
+)
+
+fb_xplat_resource(
+    name = "RNTesterBundleResources",
+    dirs = [],
+    files = [
+        "RNTester/RNTesterBundle/ImageInBundle.png",
+    ],
+    platforms = APPLE,
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:",
+    ],
+)
+
+rn_xplat_cxx_library2(
+    name = "RNTesterBundleBinary",
+    srcs = ["//xplat/configurations/buck/apple/common_files:dummy.c"],
+    deps = [":RNTesterBundleAssetCatalog"],
+)
+
+fb_apple_bundle(
+    name = "RNTesterBundle",
+    binary = ":RNTesterBundleBinaryApple#static",
+    extension = "bundle",
+    info_plist = "RNTester/RNTesterBundle/Info.plist",
+    info_plist_substitutions = {
+        "PRODUCT_BUNDLE_IDENTIFIER": "com.facebook.react.RNTesterBundle",
+    },
+    deps = [
+        ":RNTesterBundleResourcesApple",
+    ],
+)
+
+fb_xplat_platform_specific_rule(
+    name = "RNTesterAssetCatalog",
+    dirs = ["RNTester/Images.xcassets"],
+    platform = APPLE,
+    rule = fb_apple_asset_catalog,
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:",
+    ],
+)
+
+fb_xplat_resource(
+    name = "RNTesterResources",
+    dirs = [],
+    files = [
+        "RNTester/legacy_image@2x.png",
+        "RNTester/LaunchScreen.storyboard",
+        ":RNTesterBundle",
+    ],
+    platforms = APPLE,
+    visibility = [
+        "//fbobjc/Libraries/FBReactKit:",
+    ],
+)
+
+rn_apple_library(
+    name = "RCTTestApple",
+    srcs = glob([
+        "RCTTest/**/*.m",
+        "RCTTest/**/*.mm",
+    ]),
+    headers = glob([
+        "RCTTest/**/*.h",
+    ]),
+    exported_headers = {
+        "RCTTest/RCTTestRunner.h": "RCTTest/RCTTestRunner.h",
+    },
+    autoglob = False,
+    frameworks = [
+        "XCTest",
+    ],
+    header_path_prefix = "React",
+    labels = [
+        "disable_plugins_only_validation",
+    ],
+    plugins = react_module_plugin_providers(
+        name = "TestModule",
+        native_class_func = "RCTTestModuleCls",
+    ),
+    plugins_header = "FBRCTTestPlugins.h",
+    preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
+        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:ReactInternalApple",
+        "//xplat/js/react-native-github/React/CoreModules:CoreModulesApple",
+        YOGA_APPLE_TARGET,
+    ],
+)
diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile
index 03d842220cfb0e..5fa6e91f2c14c6 100644
--- a/packages/rn-tester/Gemfile
+++ b/packages/rn-tester/Gemfile
@@ -1,4 +1,5 @@
 # Gemfile
 source 'https://rubygems.org'
 
-gem 'cocoapods', '= 1.10.0'
+gem 'cocoapods', '= 1.10.1'
+gem 'rexml'
diff --git a/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js b/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js
index 4155995bb7a93d..376c6fcccad85d 100644
--- a/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js
+++ b/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile
index 56fedf74cba92f..9ab07c529bfda8 100644
--- a/packages/rn-tester/Podfile
+++ b/packages/rn-tester/Podfile
@@ -1,14 +1,16 @@
 require_relative '../../scripts/react_native_pods'
 
 source 'https://cdn.cocoapods.org/'
-platform :ios, '10.0'
+platform :ios, '11.0'
 
 # TODO(macOS GH#214)
 # Otherwise duplicate UUIDs are being generated between the iOS and macOS targets.
 # FIXME: https://github.com/microsoft/react-native/issues/210
 install! 'cocoapods', :deterministic_uuids => false
 
-if ENV['USE_FRAMEWORKS'] == '1'
+USE_FRAMEWORKS = ENV['USE_FRAMEWORKS'] == '1'
+
+if USE_FRAMEWORKS
   puts "Installing pods with use_frameworks!"
   use_frameworks!
 end
@@ -20,25 +22,25 @@ end
 def pods(options = {})
   project 'RNTesterPods.xcodeproj'
 
-  # Enable TurboModule
+  fabric_enabled = false
+
   prefix_path = "../.."
-  use_react_native!(path: prefix_path, hermes_enabled: ENV['USE_HERMES'] == '1')
+  use_react_native!(path: prefix_path, fabric_enabled: fabric_enabled, hermes_enabled: ENV['USE_HERMES'] == '1')
   pod 'ReactCommon/turbomodule/samples', :path => "#{prefix_path}/ReactCommon"
 
   # Additional Pods which aren't included in the default Podfile
   pod 'React-RCTPushNotification', :path => "#{prefix_path}/Libraries/PushNotificationIOS"
   pod 'Yoga', :path => "#{prefix_path}/ReactCommon/yoga", :modular_headers => true
-  pod 'React-TurboModuleCxx-WinRTPort', :path => "#{prefix_path}/ReactTurboModuleCxx"
-  pod 'React-TurboModuleCxx-RNW', :podspec => "#{prefix_path}/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec"
+  pod 'React-TurboModuleCxx-WinRTPort', :path => "#{prefix_path}/ReactTurboModuleCxx" # TODO(macOS GH#774)
+  pod 'React-TurboModuleCxx-RNW', :podspec => "#{prefix_path}/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec" # TODO(macOS GH#774)
   # Additional Pods which are classed as unstable
-  #
-  # To use fabric: add `fabric_enabled` option to the use_react_native method above, like below
-  # use_react_native!(path: "..", fabric_enabled: true)
 end
 
 target 'RNTester' do
   pods()
-  use_flipper!
+  if !USE_FRAMEWORKS
+    use_flipper!
+  end
 end
 
 target 'RNTesterUnitTests' do
@@ -52,55 +54,40 @@ target 'RNTesterIntegrationTests' do
 end
 
 target 'RNTester-macOS' do
-  platform :osx, '10.14'
+  platform :osx, '10.15'
   pods(:hermes_enabled => false)
 end
 
 target 'RNTester-macOSUnitTests' do
-  platform :osx, '10.14'
+  platform :osx, '10.15'
   pods()
   pod 'React-RCTTest', :path => "./RCTTest"
 end
 
 target 'RNTester-macOSIntegrationTests' do
-  platform :osx, '10.14'
+  platform :osx, '10.15'
   pods()
   pod 'React-RCTTest', :path => "./RCTTest"
 end
 
 # [TODO(macOS GH#774): these are special targets used by the internal Microsoft build pipeline
 target 'iosDeviceBuild' do
-  platform :ios, '10.0'
+  platform :ios, '11.0'
   pods()
 end
 
 target 'iosSimulatorBuild' do
-  platform :ios, '10.0'
+  platform :ios, '11.0'
   pods()
 end
 
 target 'macOSBuild' do
-  platform :osx, '10.14'
+  platform :osx, '10.15'
   pods()
 end
 # ]TODO(macOS GH#774)
 
-def frameworks_pre_install(installer)
-  static_frameworks = ['FlipperKit', 'Flipper', 'Flipper-Folly',
-      'CocoaAsyncSocket', 'ComponentKit', 'Flipper-DoubleConversion',
-      'Flipper-Glog', 'Flipper-PeerTalk', 'Flipper-RSocket',
-      'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
-
-  Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
-  installer.pod_targets.each do |pod|
-    if static_frameworks.include?(pod.name)
-      def pod.build_type
-        Pod::BuildType.static_library
-      end
-    end
-  end
-end
-
 post_install do |installer|
-  flipper_post_install(installer)
+  react_native_post_install(installer)
+  __apply_Xcode_12_5_M1_post_install_workaround(installer)
 end
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 4fcac42cfefef1..22e1f5454f2e38 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -1,79 +1,95 @@
 PODS:
+  - boost (1.76.0)
   - boost-for-react-native (1.63.0)
-  - CocoaAsyncSocket (7.6.4)
-  - CocoaLibEvent (1.0.0)
+  - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
   - FBLazyVector (1000.0.0)
   - FBReactNativeSpec (1000.0.0):
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - RCTRequired (= 1000.0.0)
     - RCTTypeSafety (= 1000.0.0)
     - React-Core (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
-  - Flipper (0.54.0):
-    - Flipper-Folly (~> 2.2)
-    - Flipper-RSocket (~> 1.1)
-  - Flipper-DoubleConversion (1.1.7)
-  - Flipper-Folly (2.3.0):
-    - boost-for-react-native
-    - CocoaLibEvent (~> 1.0)
+  - Flipper (0.99.0):
+    - Flipper-Folly (~> 2.6)
+    - Flipper-RSocket (~> 1.4)
+  - Flipper-Boost-iOSX (1.76.0.1.11)
+  - Flipper-DoubleConversion (3.1.7)
+  - Flipper-Fmt (7.1.7)
+  - Flipper-Folly (2.6.7):
+    - Flipper-Boost-iOSX
     - Flipper-DoubleConversion
+    - Flipper-Fmt (= 7.1.7)
     - Flipper-Glog
-    - OpenSSL-Universal (= 1.0.2.20)
+    - libevent (~> 2.1.12)
+    - OpenSSL-Universal (= 1.1.180)
   - Flipper-Glog (0.3.6)
   - Flipper-PeerTalk (0.0.4)
-  - Flipper-RSocket (1.1.0):
-    - Flipper-Folly (~> 2.2)
-  - FlipperKit (0.54.0):
-    - FlipperKit/Core (= 0.54.0)
-  - FlipperKit/Core (0.54.0):
-    - Flipper (~> 0.54.0)
+  - Flipper-RSocket (1.4.3):
+    - Flipper-Folly (~> 2.6)
+  - FlipperKit (0.99.0):
+    - FlipperKit/Core (= 0.99.0)
+  - FlipperKit/Core (0.99.0):
+    - Flipper (~> 0.99.0)
     - FlipperKit/CppBridge
     - FlipperKit/FBCxxFollyDynamicConvert
     - FlipperKit/FBDefines
     - FlipperKit/FKPortForwarding
-  - FlipperKit/CppBridge (0.54.0):
-    - Flipper (~> 0.54.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (0.54.0):
-    - Flipper-Folly (~> 2.2)
-  - FlipperKit/FBDefines (0.54.0)
-  - FlipperKit/FKPortForwarding (0.54.0):
+  - FlipperKit/CppBridge (0.99.0):
+    - Flipper (~> 0.99.0)
+  - FlipperKit/FBCxxFollyDynamicConvert (0.99.0):
+    - Flipper-Folly (~> 2.6)
+  - FlipperKit/FBDefines (0.99.0)
+  - FlipperKit/FKPortForwarding (0.99.0):
     - CocoaAsyncSocket (~> 7.6)
     - Flipper-PeerTalk (~> 0.0.4)
-  - FlipperKit/FlipperKitHighlightOverlay (0.54.0)
-  - FlipperKit/FlipperKitLayoutPlugin (0.54.0):
+  - FlipperKit/FlipperKitHighlightOverlay (0.99.0)
+  - FlipperKit/FlipperKitLayoutHelpers (0.99.0):
     - FlipperKit/Core
     - FlipperKit/FlipperKitHighlightOverlay
     - FlipperKit/FlipperKitLayoutTextSearchable
+  - FlipperKit/FlipperKitLayoutIOSDescriptors (0.99.0):
+    - FlipperKit/Core
+    - FlipperKit/FlipperKitHighlightOverlay
+    - FlipperKit/FlipperKitLayoutHelpers
     - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0)
-  - FlipperKit/FlipperKitNetworkPlugin (0.54.0):
+  - FlipperKit/FlipperKitLayoutPlugin (0.99.0):
     - FlipperKit/Core
-  - FlipperKit/FlipperKitReactPlugin (0.54.0):
+    - FlipperKit/FlipperKitHighlightOverlay
+    - FlipperKit/FlipperKitLayoutHelpers
+    - FlipperKit/FlipperKitLayoutIOSDescriptors
+    - FlipperKit/FlipperKitLayoutTextSearchable
+    - YogaKit (~> 1.18)
+  - FlipperKit/FlipperKitLayoutTextSearchable (0.99.0)
+  - FlipperKit/FlipperKitNetworkPlugin (0.99.0):
+    - FlipperKit/Core
+  - FlipperKit/FlipperKitReactPlugin (0.99.0):
     - FlipperKit/Core
-  - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0):
+  - FlipperKit/FlipperKitUserDefaultsPlugin (0.99.0):
     - FlipperKit/Core
-  - FlipperKit/SKIOSNetworkPlugin (0.54.0):
+  - FlipperKit/SKIOSNetworkPlugin (0.99.0):
     - FlipperKit/Core
     - FlipperKit/FlipperKitNetworkPlugin
+  - fmt (6.2.1)
   - glog (0.3.5)
-  - OpenSSL-Universal (1.0.2.20):
-    - OpenSSL-Universal/Static (= 1.0.2.20)
-  - OpenSSL-Universal/Static (1.0.2.20)
-  - RCT-Folly (2020.01.13.00):
-    - boost-for-react-native
+  - libevent (2.1.12)
+  - OpenSSL-Universal (1.1.180)
+  - RCT-Folly (2021.06.28.00-v2):
+    - boost
     - DoubleConversion
+    - fmt (~> 6.2.1)
     - glog
-    - RCT-Folly/Default (= 2020.01.13.00)
-  - RCT-Folly/Default (2020.01.13.00):
-    - boost-for-react-native
+    - RCT-Folly/Default (= 2021.06.28.00-v2)
+  - RCT-Folly/Default (2021.06.28.00-v2):
+    - boost
     - DoubleConversion
+    - fmt (~> 6.2.1)
     - glog
   - RCTRequired (1000.0.0)
   - RCTTypeSafety (1000.0.0):
     - FBLazyVector (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - RCTRequired (= 1000.0.0)
     - React-Core (= 1000.0.0)
   - React (1000.0.0):
@@ -92,7 +108,7 @@ PODS:
   - React-callinvoker (1000.0.0)
   - React-Core (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default (= 1000.0.0)
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -101,7 +117,7 @@ PODS:
     - Yoga
   - React-Core/CoreModulesHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -110,7 +126,7 @@ PODS:
     - Yoga
   - React-Core/Default (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - React-jsiexecutor (= 1000.0.0)
@@ -118,7 +134,7 @@ PODS:
     - Yoga
   - React-Core/DevSupport (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default (= 1000.0.0)
     - React-Core/RCTWebSocket (= 1000.0.0)
     - React-cxxreact (= 1000.0.0)
@@ -129,7 +145,7 @@ PODS:
     - Yoga
   - React-Core/RCTActionSheetHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -138,7 +154,7 @@ PODS:
     - Yoga
   - React-Core/RCTAnimationHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -147,7 +163,7 @@ PODS:
     - Yoga
   - React-Core/RCTBlobHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -156,7 +172,7 @@ PODS:
     - Yoga
   - React-Core/RCTImageHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -165,7 +181,7 @@ PODS:
     - Yoga
   - React-Core/RCTLinkingHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -174,7 +190,7 @@ PODS:
     - Yoga
   - React-Core/RCTNetworkHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -183,7 +199,7 @@ PODS:
     - Yoga
   - React-Core/RCTPushNotificationHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -192,7 +208,7 @@ PODS:
     - Yoga
   - React-Core/RCTSettingsHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -201,7 +217,7 @@ PODS:
     - Yoga
   - React-Core/RCTTextHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -210,7 +226,7 @@ PODS:
     - Yoga
   - React-Core/RCTVibrationHeaders (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -219,7 +235,7 @@ PODS:
     - Yoga
   - React-Core/RCTWebSocket (1000.0.0):
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default (= 1000.0.0)
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -228,54 +244,57 @@ PODS:
     - Yoga
   - React-CoreModules (1000.0.0):
     - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - RCTTypeSafety (= 1000.0.0)
     - React-Core/CoreModulesHeaders (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - React-RCTImage (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - React-cxxreact (1000.0.0):
-    - boost-for-react-native (= 1.63.0)
+    - boost (= 1.76.0)
     - DoubleConversion
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-callinvoker (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - React-jsinspector (= 1000.0.0)
+    - React-logger (= 1000.0.0)
     - React-perflogger (= 1000.0.0)
     - React-runtimeexecutor (= 1000.0.0)
   - React-jsi (1000.0.0):
-    - boost-for-react-native (= 1.63.0)
+    - boost (= 1.76.0)
     - DoubleConversion
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-jsi/Default (= 1000.0.0)
   - React-jsi/Default (1000.0.0):
-    - boost-for-react-native (= 1.63.0)
+    - boost (= 1.76.0)
     - DoubleConversion
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
   - React-jsiexecutor (1000.0.0):
     - DoubleConversion
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - React-perflogger (= 1000.0.0)
   - React-jsinspector (1000.0.0)
+  - React-logger (1000.0.0):
+    - glog
   - React-perflogger (1000.0.0)
   - React-RCTActionSheet (1000.0.0):
     - React-Core/RCTActionSheetHeaders (= 1000.0.0)
   - React-RCTAnimation (1000.0.0):
     - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - RCTTypeSafety (= 1000.0.0)
     - React-Core/RCTAnimationHeaders (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - React-RCTBlob (1000.0.0):
     - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/RCTBlobHeaders (= 1000.0.0)
     - React-Core/RCTWebSocket (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -283,7 +302,7 @@ PODS:
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - React-RCTImage (1000.0.0):
     - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - RCTTypeSafety (= 1000.0.0)
     - React-Core/RCTImageHeaders (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -296,7 +315,7 @@ PODS:
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - React-RCTNetwork (1000.0.0):
     - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - RCTTypeSafety (= 1000.0.0)
     - React-Core/RCTNetworkHeaders (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -309,13 +328,13 @@ PODS:
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - React-RCTSettings (1000.0.0):
     - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - RCTTypeSafety (= 1000.0.0)
     - React-Core/RCTSettingsHeaders (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - React-RCTTest (1000.0.0):
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core (= 1000.0.0)
     - React-CoreModules (= 1000.0.0)
     - React-jsi (= 1000.0.0)
@@ -324,14 +343,14 @@ PODS:
     - React-Core/RCTTextHeaders (= 1000.0.0)
   - React-RCTVibration (1000.0.0):
     - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/RCTVibrationHeaders (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - React-runtimeexecutor (1000.0.0):
     - React-jsi (= 1000.0.0)
   - React-TurboModuleCxx-RNW (1000.0.0):
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-callinvoker (= 1000.0.0)
     - React-TurboModuleCxx-WinRTPort (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
@@ -340,26 +359,28 @@ PODS:
     - React-TurboModuleCxx-WinRTPort/WinRT (= 1000.0.0)
   - React-TurboModuleCxx-WinRTPort/Shared (1000.0.0)
   - React-TurboModuleCxx-WinRTPort/WinRT (1000.0.0):
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-callinvoker (= 1000.0.0)
     - React-TurboModuleCxx-WinRTPort/Shared (= 1000.0.0)
   - ReactCommon/turbomodule/core (1000.0.0):
     - DoubleConversion
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-callinvoker (= 1000.0.0)
     - React-Core (= 1000.0.0)
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
+    - React-logger (= 1000.0.0)
     - React-perflogger (= 1000.0.0)
   - ReactCommon/turbomodule/samples (1000.0.0):
     - DoubleConversion
     - glog
-    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly (= 2021.06.28.00-v2)
     - React-callinvoker (= 1000.0.0)
     - React-Core (= 1000.0.0)
     - React-cxxreact (= 1000.0.0)
     - React-jsi (= 1000.0.0)
+    - React-logger (= 1000.0.0)
     - React-perflogger (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
   - Yoga (1.14.0)
@@ -367,29 +388,32 @@ PODS:
     - Yoga (~> 1.14)
 
 DEPENDENCIES:
+  - boost (from `../../third-party-podspecs/boost.podspec`)
   - boost-for-react-native (from `../../third-party-podspecs/boost-for-react-native.podspec`)
   - DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../../Libraries/FBLazyVector`)
-  - FBReactNativeSpec (from `../../Libraries/FBReactNativeSpec`)
-  - Flipper (~> 0.54.0)
-  - Flipper-DoubleConversion (= 1.1.7)
-  - Flipper-Folly (~> 2.2)
+  - FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
+  - Flipper (= 0.99.0)
+  - Flipper-Boost-iOSX (= 1.76.0.1.11)
+  - Flipper-DoubleConversion (= 3.1.7)
+  - Flipper-Fmt (= 7.1.7)
+  - Flipper-Folly (= 2.6.7)
   - Flipper-Glog (= 0.3.6)
-  - Flipper-PeerTalk (~> 0.0.4)
-  - Flipper-RSocket (~> 1.1)
-  - FlipperKit (~> 0.54.0)
-  - FlipperKit/Core (~> 0.54.0)
-  - FlipperKit/CppBridge (~> 0.54.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0)
-  - FlipperKit/FBDefines (~> 0.54.0)
-  - FlipperKit/FKPortForwarding (~> 0.54.0)
-  - FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0)
-  - FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0)
-  - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0)
-  - FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0)
-  - FlipperKit/FlipperKitReactPlugin (~> 0.54.0)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0)
-  - FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
+  - Flipper-PeerTalk (= 0.0.4)
+  - Flipper-RSocket (= 1.4.3)
+  - FlipperKit (= 0.99.0)
+  - FlipperKit/Core (= 0.99.0)
+  - FlipperKit/CppBridge (= 0.99.0)
+  - FlipperKit/FBCxxFollyDynamicConvert (= 0.99.0)
+  - FlipperKit/FBDefines (= 0.99.0)
+  - FlipperKit/FKPortForwarding (= 0.99.0)
+  - FlipperKit/FlipperKitHighlightOverlay (= 0.99.0)
+  - FlipperKit/FlipperKitLayoutPlugin (= 0.99.0)
+  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.99.0)
+  - FlipperKit/FlipperKitNetworkPlugin (= 0.99.0)
+  - FlipperKit/FlipperKitReactPlugin (= 0.99.0)
+  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0)
+  - FlipperKit/SKIOSNetworkPlugin (= 0.99.0)
   - glog (from `../../third-party-podspecs/glog.podspec`)
   - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../../Libraries/RCTRequired`)
@@ -404,6 +428,7 @@ DEPENDENCIES:
   - React-jsi (from `../../ReactCommon/jsi`)
   - React-jsiexecutor (from `../../ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../../ReactCommon/jsinspector`)
+  - React-logger (from `../../ReactCommon/logger`)
   - React-perflogger (from `../../ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../../Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../../Libraries/NativeAnimation`)
@@ -426,18 +451,23 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - CocoaAsyncSocket
-    - CocoaLibEvent
     - Flipper
+    - Flipper-Boost-iOSX
     - Flipper-DoubleConversion
+    - Flipper-Fmt
     - Flipper-Folly
     - Flipper-Glog
     - Flipper-PeerTalk
     - Flipper-RSocket
     - FlipperKit
+    - fmt
+    - libevent
     - OpenSSL-Universal
     - YogaKit
 
 EXTERNAL SOURCES:
+  boost:
+    :podspec: "../../third-party-podspecs/boost.podspec"
   boost-for-react-native:
     :podspec: "../../third-party-podspecs/boost-for-react-native.podspec"
   DoubleConversion:
@@ -445,7 +475,7 @@ EXTERNAL SOURCES:
   FBLazyVector:
     :path: "../../Libraries/FBLazyVector"
   FBReactNativeSpec:
-    :path: "../../Libraries/FBReactNativeSpec"
+    :path: "../../React/FBReactNativeSpec"
   glog:
     :podspec: "../../third-party-podspecs/glog.podspec"
   RCT-Folly:
@@ -470,6 +500,8 @@ EXTERNAL SOURCES:
     :path: "../../ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../../ReactCommon/jsinspector"
+  React-logger:
+    :path: "../../ReactCommon/logger"
   React-perflogger:
     :path: "../../ReactCommon/reactperflogger"
   React-RCTActionSheet:
@@ -506,51 +538,56 @@ EXTERNAL SOURCES:
     :path: "../../ReactCommon/yoga"
 
 SPEC CHECKSUMS:
+  boost: af377b4e3b1e398af5372741cfac107a2ae7e331
   boost-for-react-native: d5ad1140010aa8cb622323a781ecbeab4425d19a
-  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
-  CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
-  DoubleConversion: 0ea4559a49682230337df966e735d6cc7760108e
-  FBLazyVector: 51cc83402f3d709f74795ff5c422a3d64aad2d5c
-  FBReactNativeSpec: 3a039b4dcabf30506715ca5c18c30d31d6c3e771
-  Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
-  Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
-  Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a
+  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
+  DoubleConversion: 8dfb8e6a364e688caa15f66896caee7845035144
+  FBLazyVector: ecacdf60242a748ec88abf375fa537a477ce7cce
+  FBReactNativeSpec: c24354727fa9ae1be804a71ee8ab825a1d7e4d5a
+  Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733
+  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
+  Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
+  Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
+  Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a
   Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
-  FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
-  glog: 0dc7efada961c0793012970b60faebbd58b0decb
-  OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd
-  RCT-Folly: b3998425a8ee9f695f57a204dc494534246f0fe9
-  RCTRequired: 2d686a7dce047f5d49d3cfaaafcac309faabdfa3
-  RCTTypeSafety: 381a24d058ab4456271b44774bb2b13bffe73fe4
-  React: c057844fd06ecfa863cfb9c84991ab0f486540f3
-  React-callinvoker: 488e8d69e0eb35579dc5ef2b36efd4aa1a94f40b
-  React-Core: 7260200dfa2667c56ed4cc27265c1e57d5d040fd
-  React-CoreModules: 1a58a4fbe3a667760e0921a85c5da21492fb7715
-  React-cxxreact: 1e319bcd17b54b6768c10b8b9e89397f153d7f87
-  React-jsi: a4a24e1ea3874772a28eaef6124b17fad1a29e41
-  React-jsiexecutor: 332bca23c317135ea722ab7bdd1f65b61be13a0f
-  React-jsinspector: b1cb2f7a601f8aed95928062b908deddf3c82a48
-  React-perflogger: 983acb8318ed9b7e9a7d0e1054218eaa24dfebe7
-  React-RCTActionSheet: 83604ec93778a3b52805862d6feef63466765888
-  React-RCTAnimation: 510927e07ee1e22b6a8ccbc7736df3105312c4cc
-  React-RCTBlob: eb1e62da8269a1acb2a48edfa36c872b79dda27a
-  React-RCTImage: e21d4e5881383144983a76fea1aa572b411f5d3e
-  React-RCTLinking: 793a4b3843b04c4e6f63c491cb114b24c17a8e5c
-  React-RCTNetwork: 7efd214d99d4e79d4ddabe76d2e01449267303d2
-  React-RCTPushNotification: a4c94a936589b9b01ae6bc403b4b126f0ab64790
-  React-RCTSettings: fe346a2cb5a0f73781b4430df3cba4ddeef9bafc
-  React-RCTTest: a75eb8f43f21d1b6429e081945447accdd7047f0
-  React-RCTText: 38b52e9a804c7f5c5197f8f59cfc64295af63e38
-  React-RCTVibration: dcb108280be8bf84c1ab716348587ffce989a40d
-  React-runtimeexecutor: fa0f514ab1020dbde36e9c88512930ceedb9bb2b
-  React-TurboModuleCxx-RNW: 12172bdbaaf052406ec571465243fad4b2eb2702
-  React-TurboModuleCxx-WinRTPort: 3844727e8cd53c024b276029bd96e01358d702e8
-  ReactCommon: 94a1371a376fb197ff69b52efef86dc19d627abb
-  Yoga: 28f20bff355b99c1d8bc07008f47546796859a1d
+  Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
+  FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9
+  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
+  glog: 1ef03a8a5f8e1978691d927bb31c0935ceb005f8
+  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
+  OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
+  RCT-Folly: 1870fc2f6c34038cae3556a1af98f979f2ce63d9
+  RCTRequired: 6f74fd96b062938e33bfb9f532715278591f81af
+  RCTTypeSafety: e81fb08d37c83fe3436a444932a592bd79cc8c2b
+  React: c7f87233b4b3b94fb27ffc4656d820a84d4750b0
+  React-callinvoker: 2188feda5c50e0e1bb4095a0d58e7379e90f35d0
+  React-Core: 1963b1b00bfe0b7bea4189570cc7879e99f0b77b
+  React-CoreModules: 76a95db816a348df5f7a81e8e30e7ec588a50458
+  React-cxxreact: c6fc2fbeed038a7d930e9de52dfa5b515124232d
+  React-jsi: 52cf528fe8423cb62ce736ab63ad0b26f1cff96e
+  React-jsiexecutor: 59763a1806b0d51d7b6909de4748055ddee2aac5
+  React-jsinspector: 3289457acc8f5ddd8b6532cc52b5148abe4c3850
+  React-logger: 72dba72411d323584bb9b201b67963a00f5b6cdb
+  React-perflogger: aa748460926457aa289b9729832b94072e955f8e
+  React-RCTActionSheet: 2e67249f09c734e0b15f651c68a4ae9138ef52ba
+  React-RCTAnimation: 2142e57698ad0b3cfa80fe0b7d3ea3fb3d384fe9
+  React-RCTBlob: 1fba774b7c9cdf07b3bf248b46c75d5bbfe7fdde
+  React-RCTImage: a41f786fed42dd712af8addf67498a3e202b448b
+  React-RCTLinking: 9e2688e00d538e7d99d69fb7de91265f69d721f1
+  React-RCTNetwork: aa51591e8575c96cc161471ba07dcceb81f94558
+  React-RCTPushNotification: 03d2e955289511231da75ace7d08d2e00d27397b
+  React-RCTSettings: 3d97a65258ef5d8adae59d94b98b268c49069edf
+  React-RCTTest: b12caca2d64c764e1c9b271f26a46134da011e86
+  React-RCTText: c03196bf49ab84a0ac26723c15d7c8feabf26470
+  React-RCTVibration: fc9b3c4789dfbae38b4970ee2f9ddedc38078280
+  React-runtimeexecutor: 5acb34ce3f3cb453db416a4691c637545d464bf7
+  React-TurboModuleCxx-RNW: 84be9c2264b05327ba1133dcf1c8e67a4c238a57
+  React-TurboModuleCxx-WinRTPort: 365cf72f8bb5e27f81113097cd263a0824d7df7e
+  ReactCommon: 71bfd2766343c173f1180466328b36fad23556fa
+  Yoga: ff04bdfd8d4c638a484657a809d89a7c56c87e5e
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 096cbc796e89167c003b0c49186597432f0fb5e8
+PODFILE CHECKSUM: 0d4a59b8a9a45fb5448c60c0bc782f1313a9b0a0
 
 COCOAPODS: 1.11.2
diff --git a/packages/rn-tester/RCTTest/RCTTestModule.mm b/packages/rn-tester/RCTTest/RCTTestModule.mm
index ecfb5464da5635..df4939605dffa6 100644
--- a/packages/rn-tester/RCTTest/RCTTestModule.mm
+++ b/packages/rn-tester/RCTTest/RCTTestModule.mm
@@ -79,6 +79,7 @@ @implementation RCTTestModule {
 }
 
 @synthesize bridge = _bridge;
+@synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -120,7 +121,7 @@ - (dispatch_queue_t)methodQueue
 {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [_bridge.eventDispatcher sendAppEventWithName:name body:body];
+  [[_moduleRegistry moduleForName:"EventDispatcher"] sendAppEventWithName:name body:body];
 #pragma clang diagnostic pop
 }
 
diff --git a/packages/rn-tester/RCTTest/RCTTestRunner.m b/packages/rn-tester/RCTTest/RCTTestRunner.m
index 289c2e1fa8f954..83ca46eff94e7f 100644
--- a/packages/rn-tester/RCTTest/RCTTestRunner.m
+++ b/packages/rn-tester/RCTTest/RCTTestRunner.m
@@ -22,8 +22,7 @@
 
 static const NSTimeInterval kTestTimeoutSeconds = 120;
 
-@implementation RCTTestRunner
-{
+@implementation RCTTestRunner {
   FBSnapshotTestController *_testController;
   RCTBridgeModuleListProvider _moduleProvider;
   NSString *_appPath;
@@ -68,7 +67,8 @@ - (instancetype)initWithApp:(NSString *)app
 
   if ((self = [super init])) {
     if (!referenceDirectory.length) {
-      referenceDirectory = [[NSBundle bundleForClass:self.class].resourcePath stringByAppendingPathComponent:@"ReferenceImages"];
+      referenceDirectory =
+          [[NSBundle bundleForClass:self.class].resourcePath stringByAppendingPathComponent:@"ReferenceImages"];
     }
 
     NSString *sanitizedAppName = [app stringByReplacingOccurrencesOfString:@"/" withString:@"-"];
@@ -88,7 +88,7 @@ - (instancetype)initWithApp:(NSString *)app
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (NSURL *)defaultScriptURL
 {
@@ -127,53 +127,63 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
   [self runTest:test module:moduleName initialProps:nil configurationBlock:nil expectErrorBlock:nil];
 }
 
-- (void)runTest:(SEL)test module:(NSString *)moduleName
-   initialProps:(NSDictionary<NSString *, id> *)initialProps
-configurationBlock:(void(^)(RCTRootView *rootView))configurationBlock
+- (void)runTest:(SEL)test
+                module:(NSString *)moduleName
+          initialProps:(NSDictionary<NSString *, id> *)initialProps
+    configurationBlock:(void (^)(RCTRootView *rootView))configurationBlock
 {
-  [self runTest:test module:moduleName initialProps:initialProps configurationBlock:configurationBlock expectErrorBlock:nil];
+  [self runTest:test
+                  module:moduleName
+            initialProps:initialProps
+      configurationBlock:configurationBlock
+        expectErrorBlock:nil];
 }
 
-- (void)runTest:(SEL)test module:(NSString *)moduleName
-   initialProps:(NSDictionary<NSString *, id> *)initialProps
-configurationBlock:(void(^)(RCTRootView *rootView))configurationBlock
-expectErrorRegex:(NSString *)errorRegex
+- (void)runTest:(SEL)test
+                module:(NSString *)moduleName
+          initialProps:(NSDictionary<NSString *, id> *)initialProps
+    configurationBlock:(void (^)(RCTRootView *rootView))configurationBlock
+      expectErrorRegex:(NSString *)errorRegex
 {
-  BOOL(^expectErrorBlock)(NSString *error)  = ^BOOL(NSString *error){
+  BOOL (^expectErrorBlock)(NSString *error) = ^BOOL(NSString *error) {
     return [error rangeOfString:errorRegex options:NSRegularExpressionSearch].location != NSNotFound;
   };
 
-  [self runTest:test module:moduleName initialProps:initialProps configurationBlock:configurationBlock expectErrorBlock:expectErrorBlock];
+  [self runTest:test
+                  module:moduleName
+            initialProps:initialProps
+      configurationBlock:configurationBlock
+        expectErrorBlock:expectErrorBlock];
 }
 
-- (void)runTest:(SEL)test module:(NSString *)moduleName
-   initialProps:(NSDictionary<NSString *, id> *)initialProps
-configurationBlock:(void(^)(RCTRootView *rootView))configurationBlock
-expectErrorBlock:(BOOL(^)(NSString *error))expectErrorBlock
+- (void)runTest:(SEL)test
+                module:(NSString *)moduleName
+          initialProps:(NSDictionary<NSString *, id> *)initialProps
+    configurationBlock:(void (^)(RCTRootView *rootView))configurationBlock
+      expectErrorBlock:(BOOL (^)(NSString *error))expectErrorBlock
 {
   __weak RCTBridge *batchedBridge;
   NSNumber *rootTag;
   RCTLogFunction defaultLogFunction = RCTGetLogFunction();
   // Catch all error logs, that are equivalent to redboxes in dev mode.
   __block NSMutableArray<NSString *> *errors = nil;
-  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-    defaultLogFunction(level, source, fileName, lineNumber, message);
-    if (level >= RCTLogLevelError) {
-      if (errors == nil) {
-        errors = [NSMutableArray new];
-      }
-      [errors addObject:message];
-    }
-  });
+  RCTSetLogFunction(
+      ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+        defaultLogFunction(level, source, fileName, lineNumber, message);
+        if (level >= RCTLogLevelError) {
+          if (errors == nil) {
+            errors = [NSMutableArray new];
+          }
+          [errors addObject:message];
+        }
+      });
 
   @autoreleasepool {
     RCTBridge *bridge;
     if (_bridgeDelegate) {
       bridge = [[RCTBridge alloc] initWithDelegate:_bridgeDelegate launchOptions:nil];
     } else {
-      bridge= [[RCTBridge alloc] initWithBundleURL:_scriptURL
-                                    moduleProvider:_moduleProvider
-                                     launchOptions:nil];
+      bridge = [[RCTBridge alloc] initWithBundleURL:_scriptURL moduleProvider:_moduleProvider launchOptions:nil];
     }
     [bridge.devSettings setIsDebuggingRemotely:_useJSDebugger];
     batchedBridge = [bridge batchedBridge];
@@ -191,7 +201,9 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
 
     @autoreleasepool {
       // The rootView needs to be deallocated after this @autoreleasepool block exits.
-      RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProps];
+      RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
+                                                       moduleName:moduleName
+                                                initialProperties:initialProps];
 #if TARGET_OS_TV
       rootView.frame = CGRectMake(0, 0, 1920, 1080); // Standard screen size for tvOS
 #else
@@ -222,20 +234,22 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
     }
 
     // From this point on catch only fatal errors.
-    RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-      defaultLogFunction(level, source, fileName, lineNumber, message);
-      if (level >= RCTLogLevelFatal) {
-        if (errors == nil) {
-          errors = [NSMutableArray new];
-        }
-        [errors addObject:message];
-      }
-    });
+    RCTSetLogFunction(
+        ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+          defaultLogFunction(level, source, fileName, lineNumber, message);
+          if (level >= RCTLogLevelFatal) {
+            if (errors == nil) {
+              errors = [NSMutableArray new];
+            }
+            [errors addObject:message];
+          }
+        });
 
 #if RCT_DEV && !TARGET_OS_OSX // TODO(macOS GH#774)
-    NSArray<UIView *> *nonLayoutSubviews = [vc.view.subviews filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id subview, NSDictionary *bindings) {
-      return ![NSStringFromClass([subview class]) isEqualToString:@"_UILayoutGuide"];
-    }]];
+    NSArray<UIView *> *nonLayoutSubviews = [vc.view.subviews
+        filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id subview, NSDictionary *bindings) {
+          return ![NSStringFromClass([subview class]) isEqualToString:@"_UILayoutGuide"];
+        }]];
 
     RCTAssert(nonLayoutSubviews.count == 0, @"There shouldn't be any other views: %@", nonLayoutSubviews);
 #endif
@@ -246,7 +260,8 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
       // [TODO(OSS Candidate ISS#2710739): xcpretty formats the test failure output to show only one line of the assert string followed by a snippet of source code including the assert statement and the lines just before and after.
       // Convert the `errors` array into a single line string delimited by \n so that CI logs contain meaningful information.
       RCTAssert(errors == nil, @"RedBox errors: %@", [[errors valueForKey:@"description"] componentsJoinedByString:@"\\n"]); // ]TODO(OSS Candidate ISS#2710739)
-      RCTAssert(testModule.status != RCTTestStatusPending, @"Test didn't finish within %0.f seconds", kTestTimeoutSeconds);
+      RCTAssert(
+          testModule.status != RCTTestStatusPending, @"Test didn't finish within %0.f seconds", kTestTimeoutSeconds);
       RCTAssert(testModule.status == RCTTestStatusPassed, @"Test failed");
     }
 
diff --git a/packages/rn-tester/RCTTest/React-RCTTest.podspec b/packages/rn-tester/RCTTest/React-RCTTest.podspec
index f2c3f7b7af21e5..9ef64d3bfc6046 100644
--- a/packages/rn-tester/RCTTest/React-RCTTest.podspec
+++ b/packages/rn-tester/RCTTest/React-RCTTest.podspec
@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTTest"
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  s.platforms              = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{h,m,mm}"
diff --git a/packages/rn-tester/README.md b/packages/rn-tester/README.md
index 98027009b6fd47..3043578eddc190 100644
--- a/packages/rn-tester/README.md
+++ b/packages/rn-tester/README.md
@@ -20,7 +20,7 @@ Both macOS and Xcode are required.
 
 ### Running on Android
 
-You'll need to have all the [prerequisites](https://github.com/facebook/react-native/tree/master/ReactAndroid#prerequisites) (SDK, NDK) for Building React Native installed.
+You'll need to have all the [prerequisites](https://github.com/facebook/react-native/wiki/Building-from-source#prerequisites) (SDK, NDK) for Building React Native installed.
 
 Start an Android emulator.
 
diff --git a/packages/rn-tester/RNTester-macOS/AppDelegate.mm b/packages/rn-tester/RNTester-macOS/AppDelegate.mm
index c23bb31183be5c..efb30ae04e36e4 100644
--- a/packages/rn-tester/RNTester-macOS/AppDelegate.mm
+++ b/packages/rn-tester/RNTester-macOS/AppDelegate.mm
@@ -153,13 +153,13 @@ - (Class)getModuleClassFromName:(const char *)name
 - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
 {
   if (moduleClass == RCTImageLoader.class) {
-    return [[moduleClass alloc] initWithRedirectDelegate:nil loadersProvider:^NSArray<id<RCTImageURLLoader>> *{
+    return [[moduleClass alloc] initWithRedirectDelegate:nil loadersProvider:^NSArray<id<RCTImageURLLoader>> *(__unused RCTModuleRegistry * moduleRegistry) {
       return @[[RCTLocalAssetImageLoader new]];
-    } decodersProvider:^NSArray<id<RCTImageDataDecoder>> *{
+    } decodersProvider:^NSArray<id<RCTImageDataDecoder>> *(__unused RCTModuleRegistry * moduleRegistry) {
       return @[[RCTGIFImageDecoder new]];
     }];
   } else if (moduleClass == RCTNetworking.class) {
-    return [[moduleClass alloc] initWithHandlersProvider:^NSArray<id<RCTURLRequestHandler>> *{
+    return [[moduleClass alloc] initWithHandlersProvider:^NSArray<id<RCTURLRequestHandler>> *(__unused RCTModuleRegistry * moduleRegistry) {
       return @[
         [RCTHTTPRequestHandler new],
         [RCTDataRequestHandler new],
diff --git a/packages/rn-tester/RNTester-tvOS/Info.plist b/packages/rn-tester/RNTester-tvOS/Info.plist
index 1f05733996acbd..0afedbb816c675 100644
--- a/packages/rn-tester/RNTester-tvOS/Info.plist
+++ b/packages/rn-tester/RNTester-tvOS/Info.plist
@@ -31,7 +31,5 @@
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Automatic</string>
-	<key>RN_BUNDLE_PREFIX</key>
-	<string>$(RN_BUNDLE_PREFIX)</string>
 </dict>
 </plist>
diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm
index 70ce1a3cebfb0e..d3e3522babae84 100644
--- a/packages/rn-tester/RNTester/AppDelegate.mm
+++ b/packages/rn-tester/RNTester/AppDelegate.mm
@@ -7,28 +7,33 @@
 
 #import "AppDelegate.h"
 
-#if __has_include(<hermes/hermes.h>)
+#ifndef RCT_USE_HERMES
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
 #define RCT_USE_HERMES 1
+#else
+#define RCT_USE_HERMES 0
+#endif
 #endif
+
 #if RCT_USE_HERMES
-#import <React/HermesExecutorFactory.h>
+#import <reacthermes/HermesExecutorFactory.h>
 #else
 #import <React/JSCExecutorFactory.h>
 #endif
 
-#import <React/RCTJSIExecutorRuntimeInstaller.h>
 #import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTCxxBridgeDelegate.h>
+#import <React/RCTDataRequestHandler.h>
+#import <React/RCTFileRequestHandler.h>
+#import <React/RCTGIFImageDecoder.h>
+#import <React/RCTHTTPRequestHandler.h>
+#import <React/RCTImageLoader.h>
+#import <React/RCTJSIExecutorRuntimeInstaller.h>
 #import <React/RCTJavaScriptLoader.h>
 #import <React/RCTLinkingManager.h>
-#import <React/RCTImageLoader.h>
 #import <React/RCTLocalAssetImageLoader.h>
-#import <React/RCTGIFImageDecoder.h>
 #import <React/RCTNetworking.h>
-#import <React/RCTHTTPRequestHandler.h>
-#import <React/RCTDataRequestHandler.h>
-#import <React/RCTFileRequestHandler.h>
 #import <React/RCTRootView.h>
 
 #import <cxxreact/JSExecutor.h>
@@ -38,14 +43,13 @@
 #endif
 
 #ifdef RN_FABRIC_ENABLED
+#import <React/RCTFabricSurfaceHostingProxyRootView.h>
 #import <React/RCTSurfacePresenter.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
-#import <React/RCTFabricSurfaceHostingProxyRootView.h>
 
 #import <react/config/ReactNativeConfig.h>
 #endif
 
-  
 #if DEBUG
 #ifdef FB_SONARKIT_ENABLED
 #import <FlipperKit/FlipperClient.h>
@@ -63,8 +67,7 @@
 
 #import "RNTesterTurboModuleProvider.h"
 
-@interface AppDelegate() <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate>{
-
+@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
 #ifdef RN_FABRIC_ENABLED
   RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
   std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
@@ -81,8 +84,7 @@ - (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWith
 {
   RCTEnableTurboModule(YES);
 
-  _bridge = [[RCTBridge alloc] initWithDelegate:self
-                                  launchOptions:launchOptions];
+  _bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
 
   // [TODO(OSS Candidate ISS#2710739)
   // Optionally set the global `fontSmoothing` setting.
@@ -94,7 +96,8 @@ - (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWith
   NSDictionary *initProps = @{};
   NSString *_routeUri = [[NSUserDefaults standardUserDefaults] stringForKey:@"route"];
   if (_routeUri) {
-    initProps = @{@"exampleFromAppetizeParams": [NSString stringWithFormat:@"rntester://example/%@Example", _routeUri]};
+    initProps =
+        @{@"exampleFromAppetizeParams" : [NSString stringWithFormat:@"rntester://example/%@Example", _routeUri]};
   }
 
 #ifdef RN_FABRIC_ENABLED
@@ -103,12 +106,13 @@ - (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWith
 
   _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
 
-  _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:_bridge
-                                                           contextContainer:_contextContainer];
+  _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:_bridge contextContainer:_contextContainer];
 
   _bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
 
-  UIView *rootView = [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:_bridge moduleName:@"RNTesterApp" initialProperties:initProps];
+  UIView *rootView = [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:_bridge
+                                                                       moduleName:@"RNTesterApp"
+                                                                initialProperties:initProps];
 #else
   UIView *rootView = [[RCTRootView alloc] initWithBridge:_bridge moduleName:@"RNTesterApp" initialProperties:initProps];
 #endif
@@ -124,9 +128,7 @@ - (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWith
 
 - (NSURL *)sourceURLForBridge:(__unused RCTBridge *)bridge
 {
-  NSString *bundlePrefix = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"RN_BUNDLE_PREFIX"];
-  NSString *bundleRoot = [NSString stringWithFormat:@"%@packages/rn-tester/js/RNTesterApp.ios", bundlePrefix];
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:bundleRoot
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"packages/rn-tester/js/RNTesterApp.ios"
                                                         fallbackResource:nil];
 }
 
@@ -148,7 +150,7 @@ - (void)initializeFlipper:(UIApplication *)application
 
 - (BOOL)application:(UIApplication *)app
             openURL:(NSURL *)url
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
+            options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options
 {
   return [RCTLinkingManager application:app openURL:url options:options];
 }
@@ -157,12 +159,10 @@ - (void)loadSourceForBridge:(RCTBridge *)bridge
                  onProgress:(RCTSourceLoadProgressBlock)onProgress
                  onComplete:(RCTSourceLoadBlock)loadCallback
 {
-  [RCTJavaScriptLoader loadBundleAtURL:[self sourceURLForBridge:bridge]
-                            onProgress:onProgress
-                            onComplete:loadCallback];
+  [RCTJavaScriptLoader loadBundleAtURL:[self sourceURLForBridge:bridge] onProgress:onProgress onComplete:loadCallback];
 }
 
-# pragma mark - RCTCxxBridgeDelegate
+#pragma mark - RCTCxxBridgeDelegate
 
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
 {
@@ -185,19 +185,17 @@ - (void)loadSourceForBridge:(RCTBridge *)bridge
 #else
   return std::make_unique<facebook::react::JSCExecutorFactory>(
 #endif
-    facebook::react::RCTJSIExecutorRuntimeInstaller([weakSelf, bridge](facebook::jsi::Runtime &runtime) {
-      if (!bridge) {
-        return;
-      }
-      __typeof(self) strongSelf = weakSelf;
-      if (strongSelf) {
-        facebook::react::RuntimeExecutor syncRuntimeExecutor = [&](std::function<void(facebook::jsi::Runtime &runtime_)> &&callback) {
-          callback(runtime);
-        };
-        [strongSelf->_turboModuleManager installJSBindingWithRuntimeExecutor:syncRuntimeExecutor];
-      }
-    })
-  );
+      facebook::react::RCTJSIExecutorRuntimeInstaller([weakSelf, bridge](facebook::jsi::Runtime &runtime) {
+        if (!bridge) {
+          return;
+        }
+        __typeof(self) strongSelf = weakSelf;
+        if (strongSelf) {
+          facebook::react::RuntimeExecutor syncRuntimeExecutor =
+              [&](std::function<void(facebook::jsi::Runtime & runtime_)> &&callback) { callback(runtime); };
+          [strongSelf->_turboModuleManager installJSBindingWithRuntimeExecutor:syncRuntimeExecutor];
+        }
+      }));
 }
 
 #pragma mark RCTTurboModuleManagerDelegate
@@ -213,22 +211,18 @@ - (Class)getModuleClassFromName:(const char *)name
   return facebook::react::RNTesterTurboModuleProvider(name, jsInvoker);
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                       initParams:(const facebook::react::ObjCTurboModule::InitParams &)params
-{
-  return facebook::react::RNTesterTurboModuleProvider(name, params);
-}
-
 - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
 {
   if (moduleClass == RCTImageLoader.class) {
-    return [[moduleClass alloc] initWithRedirectDelegate:nil loadersProvider:^NSArray<id<RCTImageURLLoader>> *{
-      return @[[RCTLocalAssetImageLoader new]];
-    } decodersProvider:^NSArray<id<RCTImageDataDecoder>> *{
-      return @[[RCTGIFImageDecoder new]];
-    }];
+    return [[moduleClass alloc] initWithRedirectDelegate:nil
+        loadersProvider:^NSArray<id<RCTImageURLLoader>> *(RCTModuleRegistry * moduleRegistry) {
+          return @ [[RCTLocalAssetImageLoader new]];
+        }
+        decodersProvider:^NSArray<id<RCTImageDataDecoder>> *(RCTModuleRegistry * moduleRegistry) {
+          return @ [[RCTGIFImageDecoder new]];
+        }];
   } else if (moduleClass == RCTNetworking.class) {
-    return [[moduleClass alloc] initWithHandlersProvider:^NSArray<id<RCTURLRequestHandler>> *{
+    return [[moduleClass alloc] initWithHandlersProvider:^NSArray<id<RCTURLRequestHandler>> *(RCTModuleRegistry * moduleRegistry) {
       return @[
         [RCTHTTPRequestHandler new],
         [RCTDataRequestHandler new],
@@ -240,24 +234,27 @@ - (Class)getModuleClassFromName:(const char *)name
   return [moduleClass new];
 }
 
-# pragma mark - Push Notifications
+#pragma mark - Push Notifications
 
 #if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
 
 // Required to register for notifications
-- (void)application:(__unused UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
+- (void)application:(__unused UIApplication *)application
+    didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
 {
   [RCTPushNotificationManager didRegisterUserNotificationSettings:notificationSettings];
 }
 
 // Required for the remoteNotificationsRegistered event.
-- (void)application:(__unused UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
+- (void)application:(__unused UIApplication *)application
+    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
   [RCTPushNotificationManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
 }
 
 // Required for the remoteNotificationRegistrationError event.
-- (void)application:(__unused UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
+- (void)application:(__unused UIApplication *)application
+    didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
 {
   [RCTPushNotificationManager didFailToRegisterForRemoteNotificationsWithError:error];
 }
@@ -269,7 +266,8 @@ - (void)application:(__unused UIApplication *)application didReceiveRemoteNotifi
 }
 
 // Required for the localNotificationReceived event.
-- (void)application:(__unused UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
+- (void)application:(__unused UIApplication *)application
+    didReceiveLocalNotification:(UILocalNotification *)notification
 {
   [RCTPushNotificationManager didReceiveLocalNotification:notification];
 }
diff --git a/packages/rn-tester/RNTester/Images.xcassets/customColor.colorset/Contents.json b/packages/rn-tester/RNTester/Images.xcassets/customColor.colorset/Contents.json
new file mode 100644
index 00000000000000..01f38e73bd883b
--- /dev/null
+++ b/packages/rn-tester/RNTester/Images.xcassets/customColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "0.516"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.746",
+          "green" : "0.195",
+          "red" : "0.080"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/packages/rn-tester/RNTester/Info.plist b/packages/rn-tester/RNTester/Info.plist
index 3b0806d0b90814..13573d49b86602 100644
--- a/packages/rn-tester/RNTester/Info.plist
+++ b/packages/rn-tester/RNTester/Info.plist
@@ -60,7 +60,5 @@
 	<false/>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>You need to add NSPhotoLibraryUsageDescription key in Info.plist to enable photo library usage, otherwise it is going to *fail silently*!</string>
-	<key>RN_BUNDLE_PREFIX</key>
-	<string>$(RN_BUNDLE_PREFIX)</string>
 </dict>
 </plist>
diff --git a/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.h b/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.h
index 7c80b27b39a534..1fc0e2040d9d0d 100644
--- a/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.h
+++ b/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.h
@@ -20,11 +20,5 @@ Class RNTesterTurboModuleClassProvider(const char *name);
  */
 std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name, std::shared_ptr<CallInvoker> jsInvoker);
 
-/**
- * Provide an instance of a ObjCTurboModule, given the ObjC instance, specific to this app.
- */
-std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name,
-                                                         const ObjCTurboModule::InitParams &params);
-
 } // namespace react
 } // namespace facebook
diff --git a/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm b/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm
index 97e5a16ced6eff..25c77f05c6f38c 100644
--- a/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm
+++ b/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm
@@ -28,14 +28,5 @@ Class RNTesterTurboModuleClassProvider(const char *name) {
   return nullptr;
 }
 
-std::shared_ptr<TurboModule> RNTesterTurboModuleProvider(const std::string &name,
-                                                         const ObjCTurboModule::InitParams &params) {
-  if (name == "SampleTurboModule") {
-    return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
-  }
-
-  return nullptr;
-}
-
 } // namespace react
 } // namespace facebook
diff --git a/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m b/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m
index b724b7bfb5c64e..b311e3e27623d8 100644
--- a/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m
+++ b/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m
@@ -15,8 +15,7 @@ @interface RCTLoggingTests : XCTestCase
 
 @end
 
-@implementation RCTLoggingTests
-{
+@implementation RCTLoggingTests {
   RCTBridge *_bridge;
 
   dispatch_semaphore_t _logSem;
@@ -34,7 +33,8 @@ - (void)setUp
       bundlePrefix = @"";
     } // TODO(macOS GH#774)]
     NSString *app = @"IntegrationTests/IntegrationTestsApp";
-    scriptURL = [NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:8081/%@%@.bundle?platform=ios&dev=true", bundlePrefix, app]];
+    scriptURL =
+        [NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:8081/%@.bundle?platform=ios&dev=true", app]];
   } else {
     scriptURL = [[NSBundle bundleForClass:[RCTBridge class]] URLForResource:@"main" withExtension:@"jsbundle"];
   }
@@ -64,18 +64,23 @@ - (void)testLogging
 {
   // First console log call will fire after 2.0 sec, to allow for any initial log messages
   // that might come in (seeing this in tvOS)
-  [_bridge enqueueJSCall:@"LoggingTestModule.logToConsoleAfterWait" args:@[@"Invoking console.log",@2000]];
+  [_bridge enqueueJSCall:@"LoggingTestModule.logToConsoleAfterWait" args:@[ @"Invoking console.log", @2000 ]];
   // Spin native layer for 1.9 sec
   [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.9]];
   // Now set the log function to signal the semaphore
-  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, __unused NSString *fileName, __unused NSNumber *lineNumber, NSString *message) {
-    if (source == RCTLogSourceJavaScript) {
-      self->_lastLogLevel = level;
-      self->_lastLogSource = source;
-      self->_lastLogMessage = message;
-      dispatch_semaphore_signal(self->_logSem);
-    }
-  });
+  RCTSetLogFunction(
+      ^(RCTLogLevel level,
+        RCTLogSource source,
+        __unused NSString *fileName,
+        __unused NSNumber *lineNumber,
+        NSString *message) {
+        if (source == RCTLogSourceJavaScript) {
+          self->_lastLogLevel = level;
+          self->_lastLogSource = source;
+          self->_lastLogMessage = message;
+          dispatch_semaphore_signal(self->_logSem);
+        }
+      });
   // Wait for console log to signal the semaphore
   dispatch_semaphore_wait(_logSem, RCT_TEST_LOGGING_TIMEOUT); // TODO(OSS Candidate ISS#2710739)
 
@@ -83,21 +88,21 @@ - (void)testLogging
   XCTAssertEqual(_lastLogSource, RCTLogSourceJavaScript);
   XCTAssertEqualObjects(_lastLogMessage, @"Invoking console.log");
 
-  [_bridge enqueueJSCall:@"LoggingTestModule.warning" args:@[@"Generating warning"]];
+  [_bridge enqueueJSCall:@"LoggingTestModule.warning" args:@[ @"Generating warning" ]];
   dispatch_semaphore_wait(_logSem, RCT_TEST_LOGGING_TIMEOUT); // TODO(OSS Candidate ISS#2710739)
 
   XCTAssertEqual(_lastLogLevel, RCTLogLevelWarning);
   XCTAssertEqual(_lastLogSource, RCTLogSourceJavaScript);
   XCTAssertEqualObjects(_lastLogMessage, @"Generating warning");
 
-  [_bridge enqueueJSCall:@"LoggingTestModule.invariant" args:@[@"Invariant failed"]];
+  [_bridge enqueueJSCall:@"LoggingTestModule.invariant" args:@[ @"Invariant failed" ]];
   dispatch_semaphore_wait(_logSem, RCT_TEST_LOGGING_TIMEOUT); // TODO(OSS Candidate ISS#2710739)
 
   XCTAssertEqual(_lastLogLevel, RCTLogLevelError);
   XCTAssertEqual(_lastLogSource, RCTLogSourceJavaScript);
   XCTAssertTrue([_lastLogMessage containsString:@"Invariant Violation: Invariant failed"]);
 
-  [_bridge enqueueJSCall:@"LoggingTestModule.logErrorToConsole" args:@[@"Invoking console.error"]];
+  [_bridge enqueueJSCall:@"LoggingTestModule.logErrorToConsole" args:@[ @"Invoking console.error" ]];
   dispatch_semaphore_wait(_logSem, RCT_TEST_LOGGING_TIMEOUT); // TODO(OSS Candidate ISS#2710739)
 
   // For local bundles, we'll first get a warning about symbolication
@@ -109,7 +114,7 @@ - (void)testLogging
   XCTAssertEqual(_lastLogSource, RCTLogSourceJavaScript);
   XCTAssertEqualObjects(_lastLogMessage, @"Invoking console.error");
 
-  [_bridge enqueueJSCall:@"LoggingTestModule.throwError" args:@[@"Throwing an error"]];
+  [_bridge enqueueJSCall:@"LoggingTestModule.throwError" args:@[ @"Throwing an error" ]];
   dispatch_semaphore_wait(_logSem, RCT_TEST_LOGGING_TIMEOUT); // TODO(OSS Candidate ISS#2710739)
 
   // For local bundles, we'll first get a warning about symbolication
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
index 448426a71f3421..527bdaf6633210 100644
--- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
+++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
@@ -7,14 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		10F9D0AD3F8E4C0DD7187464 /* libPods-RNTester-macOSUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E39630912E65B1C853EA5C8 /* libPods-RNTester-macOSUnitTests.a */; };
+		087CFC06CF5A5AA9DBB32BE2 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0102C840930F7AC64C3D36 /* libPods-RNTesterUnitTests.a */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; };
 		27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; };
 		2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; };
 		3811324724550A8F009E988D /* RNTesterUnitTestsBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = E7DB20B322B2BAA4005AC45F /* RNTesterUnitTestsBundle.js */; };
 		383838BD244BC2FF005FAC75 /* RCTComponentPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20CC22B2BAA5005AC45F /* RCTComponentPropsTests.m */; };
-		383838C0244BC3BD005FAC75 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 383838BF244BC3AE005FAC75 /* libPods-RNTesterUnitTests.a */; };
 		383838C1244BC3D9005FAC75 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7DB213022B2C649005AC45F /* JavaScriptCore.framework */; };
 		383838C2244BC52B005FAC75 /* RCTAllocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20C622B2BAA5005AC45F /* RCTAllocationTests.m */; };
 		383838C3244BC52E005FAC75 /* RCTAnimationUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20B222B2BAA4005AC45F /* RCTAnimationUtilsTests.m */; };
@@ -57,26 +56,25 @@
 		38C8AC1F246611E500BA7FAA /* RNTesterLoadAllPages.m in Sources */ = {isa = PBXBuildFile; fileRef = 38C8AC1E246611E500BA7FAA /* RNTesterLoadAllPages.m */; };
 		38C8AC20246611E500BA7FAA /* RNTesterLoadAllPages.m in Sources */ = {isa = PBXBuildFile; fileRef = 38C8AC1E246611E500BA7FAA /* RNTesterLoadAllPages.m */; };
 		38CB64352445042D009035CC /* RNTesterTurboModuleProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */; };
+		3C3340D75414A4B2BB18F71B /* libPods-macOSBuild.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A407431AB1D73B2E00E5ABF /* libPods-macOSBuild.a */; };
 		3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; };
-		413F654822EE16AED0DF2540 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F94084777080D7B374FB4783 /* libPods-RNTester.a */; };
+		460CE8493C58CA1961711C65 /* libPods-RNTester-macOSUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 631E567DA6FC6811984E2E9E /* libPods-RNTester-macOSUnitTests.a */; };
 		5101985723AD9EE600118BF1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5101985523AD9EE600118BF1 /* Main.storyboard */; };
 		5101985A23AD9F5B00118BF1 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5101985923AD9F5B00118BF1 /* ViewController.m */; };
 		5101985B23ADA00B00118BF1 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; };
 		5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; };
 		5CB07C9B226467E60039471C /* RNTesterTurboModuleProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */; };
-		6766440649168A1FAD1DB4A4 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */; };
-		7BD4120C2ED6C1CC8686E344 /* libPods-macOSBuild.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB624ED465B02C53F121EBC8 /* libPods-macOSBuild.a */; };
-		7C718C7B78F06C4CD1D1771A /* libPods-RNTester-macOSIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B8A3294D74D7AC1BE88DC4E /* libPods-RNTester-macOSIntegrationTests.a */; };
+		69BC8E93DA44B97973109653 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E8B230FF4022BC6F5F8A1467 /* libPods-RNTester.a */; };
 		8145AE06241172D900A3F8DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */; };
-		85C7978AB28C149170A56955 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */; };
-		8BBFF9F061783A02D50DD2EC /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */; };
+		84A868BA1CE1467EBC8F4291 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A84904C6079328ECC03280D1 /* libPods-RNTesterIntegrationTests.a */; };
+		84C4279B1214742A42EB3568 /* libPods-RNTester-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F4FA272D3E8358AEC6A516B9 /* libPods-RNTester-macOS.a */; };
+		8A21778100EA6DC535FC3577 /* libPods-RNTester-macOSIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A3D174930AD75B12F47289E6 /* libPods-RNTester-macOSIntegrationTests.a */; };
+		9B4F7CFBFB1B833085A71670 /* libPods-iosSimulatorBuild.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C43F9DC02AAFE8EF86D62D78 /* libPods-iosSimulatorBuild.a */; };
 		9F15345F233AB2C4006DFE44 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F15345E233AB2C4006DFE44 /* AppDelegate.mm */; };
 		9F153461233AB2C7006DFE44 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9F153460233AB2C7006DFE44 /* Assets.xcassets */; };
 		9F153467233AB2C7006DFE44 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F153466233AB2C7006DFE44 /* main.m */; };
-		A13DC98BDCE5EE508FFA7BE7 /* libPods-RNTester-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A355204268D03CF69ABC11D /* libPods-RNTester-macOS.a */; };
+		AFC757F10008B167B9DCFD43 /* libPods-iosDeviceBuild.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDE8ED7D8FB17AFA3F66FF96 /* libPods-iosDeviceBuild.a */; };
 		B2F2040A24E76D7600863BE1 /* ScreenshotMacOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2F2040924E76D7600863BE1 /* ScreenshotMacOS.mm */; };
-		CDFF3988A89A5269C488653F /* libPods-iosDeviceBuild.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 287A4762E82517B7FACCE7D3 /* libPods-iosDeviceBuild.a */; };
-		E59A0FBD0170A092274A6207 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72247071A1BF06D54F0FECC7 /* libPods-RNTesterUnitTests.a */; };
 		E7C1241A22BEC44B00DA25C0 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */; };
 		E7DB20D122B2BAA6005AC45F /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20A922B2BAA3005AC45F /* RCTBundleURLProviderTests.m */; };
 		E7DB20D222B2BAA6005AC45F /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20AA22B2BAA3005AC45F /* RCTModuleInitNotificationRaceTests.m */; };
@@ -113,7 +111,6 @@
 		E7DB216622B2F3EC005AC45F /* RCTRootViewIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB216122B2F3EC005AC45F /* RCTRootViewIntegrationTests.m */; };
 		E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7DB213022B2C649005AC45F /* JavaScriptCore.framework */; };
 		E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7DB218B22B41FCD005AC45F /* XCTest.framework */; };
-		FF08A9A0C4D6521A383C90BC /* libPods-iosSimulatorBuild.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E65D2B0329006BC5338BB7D5 /* libPods-iosSimulatorBuild.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -180,24 +177,18 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0A355204268D03CF69ABC11D /* libPods-RNTester-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		0BFED72B21FBD987A97E30B9 /* Pods-RNTester-macOSIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSIntegrationTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
-		11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* RNTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RNTester.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RNTester/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RNTester/main.m; sourceTree = "<group>"; };
-		1B8A3294D74D7AC1BE88DC4E /* libPods-RNTester-macOSIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOSIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1ECF206BF13260815AAC95EA /* Pods-iosDeviceBuild.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosDeviceBuild.debug.xcconfig"; path = "Target Support Files/Pods-iosDeviceBuild/Pods-iosDeviceBuild.debug.xcconfig"; sourceTree = "<group>"; };
 		272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePropertiesExampleView.h; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.h; sourceTree = "<group>"; };
 		272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePropertiesExampleView.m; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.m; sourceTree = "<group>"; };
+		27E7277560D64734B4F0E7D9 /* Pods-RNTester-macOSIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSIntegrationTests.release.xcconfig"; path = "Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
 		27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlexibleSizeExampleView.m; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.m; sourceTree = "<group>"; };
 		27F441EA1BEBE5030039B79C /* FlexibleSizeExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FlexibleSizeExampleView.h; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.h; sourceTree = "<group>"; };
-		287A4762E82517B7FACCE7D3 /* libPods-iosDeviceBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosDeviceBuild.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		2BE07A0C310D8A03C00D6F07 /* Pods-RNTester-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS.debug.xcconfig"; sourceTree = "<group>"; };
 		2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RNTester/Images.xcassets; sourceTree = "<group>"; };
-		34028D6B10F47E490042EB27 /* Pods-RNTesterUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.debug.xcconfig"; sourceTree = "<group>"; };
 		38360C8B244E7D8B007B212D /* RNTester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = RNTester.entitlements; path = RNTester/RNTester.entitlements; sourceTree = "<group>"; };
-		383838BF244BC3AE005FAC75 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-RNTesterUnitTests.a"; path = "../../../Library/Developer/Xcode/DerivedData/RNTesterPods-bpqvwgykvczlrybljbollkvfwjik/Build/Products/Debug-iphoneos/libPods-RNTesterUnitTests.a"; sourceTree = "<group>"; };
 		383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_UIColorTests.m; sourceTree = "<group>"; };
 		387847D1245631D80035033A /* libiosDeviceBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libiosDeviceBuild.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		387847DE245631F50035033A /* libiosSimulatorBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libiosSimulatorBuild.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -206,30 +197,24 @@
 		38A9381B244532460025DABB /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
 		38BB7CB524455C4100803CDE /* libPods-RNTester-macOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libPods-RNTester-macOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		38C8AC1E246611E500BA7FAA /* RNTesterLoadAllPages.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNTesterLoadAllPages.m; sourceTree = "<group>"; };
-		3CCA44B8467CB06ACED8E0E9 /* Pods-RNTester-macOSIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSIntegrationTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests.debug.xcconfig"; sourceTree = "<group>"; };
+		3CD3706443F2188E09CBF2D2 /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = "<group>"; };
 		3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "RNTester/legacy_image@2x.png"; sourceTree = "<group>"; };
-		406E6935B300A29BA57EE1B0 /* Pods-RNTester-macOSUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSUnitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests.debug.xcconfig"; sourceTree = "<group>"; };
-		4DFD492869336A171286E9EB /* Pods-macOSBuild.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSBuild.release.xcconfig"; path = "Pods/Target Support Files/Pods-macOSBuild/Pods-macOSBuild.release.xcconfig"; sourceTree = "<group>"; };
+		3DC317D3EE16C63CD9243667 /* Pods-RNTester.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.release.xcconfig"; path = "Target Support Files/Pods-RNTester/Pods-RNTester.release.xcconfig"; sourceTree = "<group>"; };
+		50AD031542320BFA83630EDE /* Pods-iosSimulatorBuild.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosSimulatorBuild.release.xcconfig"; path = "Target Support Files/Pods-iosSimulatorBuild/Pods-iosSimulatorBuild.release.xcconfig"; sourceTree = "<group>"; };
 		5101985623AD9EE600118BF1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		5101985823AD9F5B00118BF1 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		5101985923AD9F5B00118BF1 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		5BEC8567F3741044B6A5EFC5 /* Pods-RNTester.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.release.xcconfig"; sourceTree = "<group>"; };
 		5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = "<group>"; };
 		5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RNTesterTurboModuleProvider.mm; path = RNTester/RNTesterTurboModuleProvider.mm; sourceTree = "<group>"; };
 		5CB07C9A226467E60039471C /* RNTesterTurboModuleProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNTesterTurboModuleProvider.h; path = RNTester/RNTesterTurboModuleProvider.h; sourceTree = "<group>"; };
-		5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		72247071A1BF06D54F0FECC7 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		7D51F73F0DA20287418D98BD /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
-		7E39630912E65B1C853EA5C8 /* libPods-RNTester-macOSUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOSUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		604873ABF80DC3EE97E87CCF /* Pods-RNTester-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOS.release.xcconfig"; path = "Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS.release.xcconfig"; sourceTree = "<group>"; };
+		631E567DA6FC6811984E2E9E /* libPods-RNTester-macOSUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOSUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6A407431AB1D73B2E00E5ABF /* libPods-macOSBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-macOSBuild.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6D3E7ECE8F9BEC26E5786555 /* Pods-RNTester.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.debug.xcconfig"; path = "Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig"; sourceTree = "<group>"; };
 		8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = RNTester/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		84C1A5DCCB6A5B4ABD3C2C93 /* Pods-macOSBuild.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSBuild.debug.xcconfig"; path = "Pods/Target Support Files/Pods-macOSBuild/Pods-macOSBuild.debug.xcconfig"; sourceTree = "<group>"; };
-		972A459EE6CF8CC63531A088 /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = "<group>"; };
-		98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig"; sourceTree = "<group>"; };
-		99A17281BF2B134DA8F8B2C4 /* Pods-iosSimulatorBuild.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosSimulatorBuild.release.xcconfig"; path = "Pods/Target Support Files/Pods-iosSimulatorBuild/Pods-iosSimulatorBuild.release.xcconfig"; sourceTree = "<group>"; };
-		9AED879F1A9397646A861A9F /* Pods-RNTester-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS.release.xcconfig"; sourceTree = "<group>"; };
-		9AEE8A836A0F632B88084FA2 /* Pods-iosDeviceBuild.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosDeviceBuild.release.xcconfig"; path = "Pods/Target Support Files/Pods-iosDeviceBuild/Pods-iosDeviceBuild.release.xcconfig"; sourceTree = "<group>"; };
-		9EAC9B16F3BA65B8E1511E5E /* Pods-RNTester-macOSUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSUnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests.release.xcconfig"; sourceTree = "<group>"; };
+		821937C864FDA0F3C485B4A6 /* Pods-RNTester-macOSUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSUnitTests.release.xcconfig"; path = "Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests.release.xcconfig"; sourceTree = "<group>"; };
+		8735BC063632C9712E25C7D9 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = "<group>"; };
+		87D5D06CD6060D32601A10DD /* Pods-RNTester-macOSUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSUnitTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests.debug.xcconfig"; sourceTree = "<group>"; };
 		9F15345B233AB2C4006DFE44 /* RNTester-macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RNTester-macOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9F15345D233AB2C4006DFE44 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		9F15345E233AB2C4006DFE44 /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
@@ -243,12 +228,17 @@
 		9F153478233AB2C7006DFE44 /* RNTester-macOSIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "RNTester-macOSIntegrationTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9F15347C233AB2C7006DFE44 /* RNTesterIntegrationTests_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests_macOS.m; sourceTree = "<group>"; };
 		9F15347E233AB2C7006DFE44 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A112BDF7485AEF790F6D3E26 /* Pods-iosDeviceBuild.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosDeviceBuild.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iosDeviceBuild/Pods-iosDeviceBuild.debug.xcconfig"; sourceTree = "<group>"; };
+		A3D174930AD75B12F47289E6 /* libPods-RNTester-macOSIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOSIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A84904C6079328ECC03280D1 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		AB0102C840930F7AC64C3D36 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		ABC5325C94F71908317C26A8 /* Pods-macOSBuild.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSBuild.debug.xcconfig"; path = "Target Support Files/Pods-macOSBuild/Pods-macOSBuild.debug.xcconfig"; sourceTree = "<group>"; };
+		AC6DB4C70AE6C558CFE78E9D /* Pods-iosDeviceBuild.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosDeviceBuild.release.xcconfig"; path = "Target Support Files/Pods-iosDeviceBuild/Pods-iosDeviceBuild.release.xcconfig"; sourceTree = "<group>"; };
+		AFC451B51B7D6F0C1CAD0C18 /* Pods-RNTester-macOSIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOSIntegrationTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests.debug.xcconfig"; sourceTree = "<group>"; };
 		B2F2040824E76D7600863BE1 /* ScreenshotMacOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenshotMacOS.h; path = NativeModuleExample/ScreenshotMacOS.h; sourceTree = SOURCE_ROOT; };
 		B2F2040924E76D7600863BE1 /* ScreenshotMacOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScreenshotMacOS.mm; path = NativeModuleExample/ScreenshotMacOS.mm; sourceTree = SOURCE_ROOT; };
-		B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		C81D39A606858D29861E5930 /* Pods-iosSimulatorBuild.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosSimulatorBuild.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iosSimulatorBuild/Pods-iosSimulatorBuild.debug.xcconfig"; sourceTree = "<group>"; };
-		E65D2B0329006BC5338BB7D5 /* libPods-iosSimulatorBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosSimulatorBuild.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		C38CB0C2095A8FFDE13321E5 /* Pods-RNTesterUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.debug.xcconfig"; sourceTree = "<group>"; };
+		C43F9DC02AAFE8EF86D62D78 /* libPods-iosSimulatorBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosSimulatorBuild.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		DDE8ED7D8FB17AFA3F66FF96 /* libPods-iosDeviceBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosDeviceBuild.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E68A0B7D2448B4F300228B0B /* RNTesterUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNTesterUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		E771AEEA22B44E3100EA1189 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = "<group>"; };
 		E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests.m; sourceTree = "<group>"; };
@@ -321,9 +311,12 @@
 		E7DB216022B2F3EC005AC45F /* RNTesterSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterSnapshotTests.m; sourceTree = "<group>"; };
 		E7DB216122B2F3EC005AC45F /* RCTRootViewIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootViewIntegrationTests.m; sourceTree = "<group>"; };
 		E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCTest.framework; sourceTree = DEVELOPER_DIR; };
-		E9618482EC8608D4872A6E28 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = "<group>"; };
-		F94084777080D7B374FB4783 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		FB624ED465B02C53F121EBC8 /* libPods-macOSBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-macOSBuild.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E88C98CC10E157202A961408 /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
+		E8B230FF4022BC6F5F8A1467 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E9CE1968E72EB97B674E80A4 /* Pods-RNTester-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester-macOS.debug.xcconfig"; path = "Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS.debug.xcconfig"; sourceTree = "<group>"; };
+		F4FA272D3E8358AEC6A516B9 /* libPods-RNTester-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		F7DC249273A51CC8A56ED858 /* Pods-macOSBuild.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSBuild.release.xcconfig"; path = "Target Support Files/Pods-macOSBuild/Pods-macOSBuild.release.xcconfig"; sourceTree = "<group>"; };
+		FEC7DFC73F5A7055398F11B6 /* Pods-iosSimulatorBuild.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosSimulatorBuild.debug.xcconfig"; path = "Target Support Files/Pods-iosSimulatorBuild/Pods-iosSimulatorBuild.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -331,7 +324,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				413F654822EE16AED0DF2540 /* libPods-RNTester.a in Frameworks */,
+				69BC8E93DA44B97973109653 /* libPods-RNTester.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -339,7 +332,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CDFF3988A89A5269C488653F /* libPods-iosDeviceBuild.a in Frameworks */,
+				AFC757F10008B167B9DCFD43 /* libPods-iosDeviceBuild.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -347,7 +340,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FF08A9A0C4D6521A383C90BC /* libPods-iosSimulatorBuild.a in Frameworks */,
+				9B4F7CFBFB1B833085A71670 /* libPods-iosSimulatorBuild.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -355,7 +348,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7BD4120C2ED6C1CC8686E344 /* libPods-macOSBuild.a in Frameworks */,
+				3C3340D75414A4B2BB18F71B /* libPods-macOSBuild.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -363,7 +356,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A13DC98BDCE5EE508FFA7BE7 /* libPods-RNTester-macOS.a in Frameworks */,
+				84C4279B1214742A42EB3568 /* libPods-RNTester-macOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -372,7 +365,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				38BB7CD524455EDD00803CDE /* OCMock.framework in Frameworks */,
-				10F9D0AD3F8E4C0DD7187464 /* libPods-RNTester-macOSUnitTests.a in Frameworks */,
+				460CE8493C58CA1961711C65 /* libPods-RNTester-macOSUnitTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -380,7 +373,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7C718C7B78F06C4CD1D1771A /* libPods-RNTester-macOSIntegrationTests.a in Frameworks */,
+				8A21778100EA6DC535FC3577 /* libPods-RNTester-macOSIntegrationTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -388,11 +381,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				383838C0244BC3BD005FAC75 /* libPods-RNTesterUnitTests.a in Frameworks */,
 				383838C1244BC3D9005FAC75 /* JavaScriptCore.framework in Frameworks */,
 				38A9383C244532470025DABB /* libOCMock.a in Frameworks */,
-				E59A0FBD0170A092274A6207 /* libPods-RNTesterUnitTests.a in Frameworks */,
-				85C7978AB28C149170A56955 /* libPods-RNTesterUnitTests.a in Frameworks */,
+				087CFC06CF5A5AA9DBB32BE2 /* libPods-RNTesterUnitTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -402,8 +393,7 @@
 			files = (
 				E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */,
 				E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */,
-				8BBFF9F061783A02D50DD2EC /* libPods-RNTesterIntegrationTests.a in Frameworks */,
-				6766440649168A1FAD1DB4A4 /* libPods-RNTesterIntegrationTests.a in Frameworks */,
+				84A868BA1CE1467EBC8F4291 /* libPods-RNTesterIntegrationTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -474,48 +464,19 @@
 				E7DB211822B2BD53005AC45F /* libReact-RCTText.a */,
 				E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */,
 				E7DB212222B2BD53005AC45F /* libyoga.a */,
-				F94084777080D7B374FB4783 /* libPods-RNTester.a */,
-				0A355204268D03CF69ABC11D /* libPods-RNTester-macOS.a */,
-				8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */,
-				72247071A1BF06D54F0FECC7 /* libPods-RNTesterUnitTests.a */,
-				7E39630912E65B1C853EA5C8 /* libPods-RNTester-macOSUnitTests.a */,
-				1B8A3294D74D7AC1BE88DC4E /* libPods-RNTester-macOSIntegrationTests.a */,
-				383838BF244BC3AE005FAC75 /* libPods-RNTesterUnitTests.a */,
-				287A4762E82517B7FACCE7D3 /* libPods-iosDeviceBuild.a */,
-				E65D2B0329006BC5338BB7D5 /* libPods-iosSimulatorBuild.a */,
-				FB624ED465B02C53F121EBC8 /* libPods-macOSBuild.a */,
-				B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */,
-				5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */,
-				11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */,
+				E8B230FF4022BC6F5F8A1467 /* libPods-RNTester.a */,
+				F4FA272D3E8358AEC6A516B9 /* libPods-RNTester-macOS.a */,
+				A3D174930AD75B12F47289E6 /* libPods-RNTester-macOSIntegrationTests.a */,
+				631E567DA6FC6811984E2E9E /* libPods-RNTester-macOSUnitTests.a */,
+				A84904C6079328ECC03280D1 /* libPods-RNTesterIntegrationTests.a */,
+				AB0102C840930F7AC64C3D36 /* libPods-RNTesterUnitTests.a */,
+				DDE8ED7D8FB17AFA3F66FF96 /* libPods-iosDeviceBuild.a */,
+				C43F9DC02AAFE8EF86D62D78 /* libPods-iosSimulatorBuild.a */,
+				6A407431AB1D73B2E00E5ABF /* libPods-macOSBuild.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		571A4A20844C3BA40A3D302B /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */,
-				5BEC8567F3741044B6A5EFC5 /* Pods-RNTester.release.xcconfig */,
-				2BE07A0C310D8A03C00D6F07 /* Pods-RNTester-macOS.debug.xcconfig */,
-				9AED879F1A9397646A861A9F /* Pods-RNTester-macOS.release.xcconfig */,
-				972A459EE6CF8CC63531A088 /* Pods-RNTesterIntegrationTests.debug.xcconfig */,
-				7D51F73F0DA20287418D98BD /* Pods-RNTesterIntegrationTests.release.xcconfig */,
-				34028D6B10F47E490042EB27 /* Pods-RNTesterUnitTests.debug.xcconfig */,
-				E9618482EC8608D4872A6E28 /* Pods-RNTesterUnitTests.release.xcconfig */,
-				406E6935B300A29BA57EE1B0 /* Pods-RNTester-macOSUnitTests.debug.xcconfig */,
-				9EAC9B16F3BA65B8E1511E5E /* Pods-RNTester-macOSUnitTests.release.xcconfig */,
-				3CCA44B8467CB06ACED8E0E9 /* Pods-RNTester-macOSIntegrationTests.debug.xcconfig */,
-				0BFED72B21FBD987A97E30B9 /* Pods-RNTester-macOSIntegrationTests.release.xcconfig */,
-				A112BDF7485AEF790F6D3E26 /* Pods-iosDeviceBuild.debug.xcconfig */,
-				9AEE8A836A0F632B88084FA2 /* Pods-iosDeviceBuild.release.xcconfig */,
-				C81D39A606858D29861E5930 /* Pods-iosSimulatorBuild.debug.xcconfig */,
-				99A17281BF2B134DA8F8B2C4 /* Pods-iosSimulatorBuild.release.xcconfig */,
-				84C1A5DCCB6A5B4ABD3C2C93 /* Pods-macOSBuild.debug.xcconfig */,
-				4DFD492869336A171286E9EB /* Pods-macOSBuild.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
@@ -527,7 +488,7 @@
 				9F15347B233AB2C7006DFE44 /* RNTester-macOSIntegrationTests */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2DE7E7D81FB2A4F3009E225D /* Frameworks */,
-				571A4A20844C3BA40A3D302B /* Pods */,
+				E23BD6487B06BD71F1A86914 /* Pods */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -587,6 +548,31 @@
 			path = "RNTester-macOSIntegrationTests";
 			sourceTree = "<group>";
 		};
+		E23BD6487B06BD71F1A86914 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				6D3E7ECE8F9BEC26E5786555 /* Pods-RNTester.debug.xcconfig */,
+				3DC317D3EE16C63CD9243667 /* Pods-RNTester.release.xcconfig */,
+				3CD3706443F2188E09CBF2D2 /* Pods-RNTesterIntegrationTests.debug.xcconfig */,
+				E88C98CC10E157202A961408 /* Pods-RNTesterIntegrationTests.release.xcconfig */,
+				C38CB0C2095A8FFDE13321E5 /* Pods-RNTesterUnitTests.debug.xcconfig */,
+				8735BC063632C9712E25C7D9 /* Pods-RNTesterUnitTests.release.xcconfig */,
+				E9CE1968E72EB97B674E80A4 /* Pods-RNTester-macOS.debug.xcconfig */,
+				604873ABF80DC3EE97E87CCF /* Pods-RNTester-macOS.release.xcconfig */,
+				AFC451B51B7D6F0C1CAD0C18 /* Pods-RNTester-macOSIntegrationTests.debug.xcconfig */,
+				27E7277560D64734B4F0E7D9 /* Pods-RNTester-macOSIntegrationTests.release.xcconfig */,
+				87D5D06CD6060D32601A10DD /* Pods-RNTester-macOSUnitTests.debug.xcconfig */,
+				821937C864FDA0F3C485B4A6 /* Pods-RNTester-macOSUnitTests.release.xcconfig */,
+				1ECF206BF13260815AAC95EA /* Pods-iosDeviceBuild.debug.xcconfig */,
+				AC6DB4C70AE6C558CFE78E9D /* Pods-iosDeviceBuild.release.xcconfig */,
+				FEC7DFC73F5A7055398F11B6 /* Pods-iosSimulatorBuild.debug.xcconfig */,
+				50AD031542320BFA83630EDE /* Pods-iosSimulatorBuild.release.xcconfig */,
+				ABC5325C94F71908317C26A8 /* Pods-macOSBuild.debug.xcconfig */,
+				F7DC249273A51CC8A56ED858 /* Pods-macOSBuild.release.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		E7DB20A022B2BA84005AC45F /* RNTesterUnitTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -682,7 +668,8 @@
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */,
 				5CF0FD27207FC6EC00C13D65 /* Start Metro */,
-				8BA2D8960038381F0B753726 /* [CP] Copy Pods Resources */,
+				59FB8E2EE11176798F1F79BF /* [CP] Embed Pods Frameworks */,
+				876175BE889FD351D8E77AC9 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -697,7 +684,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 387847D7245631D80035033A /* Build configuration list for PBXNativeTarget "iosDeviceBuild" */;
 			buildPhases = (
-				79A2B74F37E4F8AF8B3D0A7A /* [CP] Check Pods Manifest.lock */,
+				77A2E97C65AABD4BA2F6F29B /* [CP] Check Pods Manifest.lock */,
 				387847CD245631D80035033A /* Sources */,
 				387847CE245631D80035033A /* Frameworks */,
 				387847CF245631D80035033A /* CopyFiles */,
@@ -715,7 +702,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 387847E4245631F50035033A /* Build configuration list for PBXNativeTarget "iosSimulatorBuild" */;
 			buildPhases = (
-				DBAEBACAAEA09D5E7591E051 /* [CP] Check Pods Manifest.lock */,
+				C55342180F72D0025E2DD28C /* [CP] Check Pods Manifest.lock */,
 				387847DA245631F50035033A /* Sources */,
 				387847DB245631F50035033A /* Frameworks */,
 				387847DC245631F50035033A /* CopyFiles */,
@@ -733,7 +720,8 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 387847F12456320C0035033A /* Build configuration list for PBXNativeTarget "macOSBuild" */;
 			buildPhases = (
-				26905525A793EABD06A4E9DD /* [CP] Check Pods Manifest.lock */,
+				10AB8F2FA248D122E5FC5D4C /* [CP] Check Pods Manifest.lock */,
+				26905525A793EABD06A4E9DD /* Start Metro */,
 				387847E72456320C0035033A /* Headers */,
 				387847E82456320C0035033A /* Sources */,
 				387847E92456320C0035033A /* Frameworks */,
@@ -751,13 +739,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 9F153485233AB2C7006DFE44 /* Build configuration list for PBXNativeTarget "RNTester-macOS" */;
 			buildPhases = (
-				840572194E08440DE712816E /* [CP] Check Pods Manifest.lock */,
+				4D5C96E508ED312A9EEBDBB4 /* [CP] Check Pods Manifest.lock */,
 				9F153457233AB2C4006DFE44 /* Sources */,
 				9F153458233AB2C4006DFE44 /* Frameworks */,
 				9F153459233AB2C4006DFE44 /* Resources */,
 				38C8132424577FB500BFFA62 /* Build JS Bundle */,
 				51B9D81723C4D5A4002B30E1 /* Start Metro */,
-				33B976C36DF90C0A044DC053 /* [CP] Copy Pods Resources */,
+				170C222AF602946553790BB0 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -772,12 +760,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 9F153486233AB2C7006DFE44 /* Build configuration list for PBXNativeTarget "RNTester-macOSUnitTests" */;
 			buildPhases = (
-				8BEE9E647FF71296D5EFD137 /* [CP] Check Pods Manifest.lock */,
+				9F8B51C0405957F2A7BE3F54 /* [CP] Check Pods Manifest.lock */,
 				9F153469233AB2C7006DFE44 /* Sources */,
 				9F15346A233AB2C7006DFE44 /* Frameworks */,
 				9F15346B233AB2C7006DFE44 /* Resources */,
 				3882C0E12445655100E92FB9 /* Copy Files (1 item) */,
-				DCF7F2DA774E70B7DE02783C /* [CP] Copy Pods Resources */,
+				6AFB016C9B7463C62B44F318 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -793,11 +781,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 9F153487233AB2C7006DFE44 /* Build configuration list for PBXNativeTarget "RNTester-macOSIntegrationTests" */;
 			buildPhases = (
-				B8BFFD6300CD470A1DF043B6 /* [CP] Check Pods Manifest.lock */,
+				3328F106F9BD3562E3CF9D5E /* [CP] Check Pods Manifest.lock */,
 				9F153474233AB2C7006DFE44 /* Sources */,
 				9F153475233AB2C7006DFE44 /* Frameworks */,
 				9F153476233AB2C7006DFE44 /* Resources */,
-				4BDC0C5271A785332898B818 /* [CP] Copy Pods Resources */,
+				90DA0640700ADDD73F8842BD /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -817,7 +805,7 @@
 				E7DB209B22B2BA84005AC45F /* Sources */,
 				E7DB209C22B2BA84005AC45F /* Frameworks */,
 				E7DB209D22B2BA84005AC45F /* Resources */,
-				D3E745B9771EC6F02AC52196 /* [CP] Copy Pods Resources */,
+				66536E8DF39B47627A510DF1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -837,7 +825,7 @@
 				E7DB214F22B2F332005AC45F /* Sources */,
 				E7DB215022B2F332005AC45F /* Frameworks */,
 				E7DB215122B2F332005AC45F /* Resources */,
-				186E435C9BE5B7CC0656A19C /* [CP] Copy Pods Resources */,
+				A0F82A7ABB9969342057CBE1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -970,21 +958,43 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		186E435C9BE5B7CC0656A19C /* [CP] Copy Pods Resources */ = {
+		10AB8F2FA248D122E5FC5D4C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-macOSBuild-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		170C222AF602946553790BB0 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		1FD7CC5A44DCEE15C8D13E0A /* [CP] Check Pods Manifest.lock */ = {
@@ -1009,43 +1019,42 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		26905525A793EABD06A4E9DD /* [CP] Check Pods Manifest.lock */ = {
+		26905525A793EABD06A4E9DD /* Start Metro */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
 			);
+			name = "Start Metro";
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/Pods-macOSBuild-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		33B976C36DF90C0A044DC053 /* [CP] Copy Pods Resources */ = {
+		3328F106F9BD3562E3CF9D5E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RNTester-macOSIntegrationTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		38C8132424577FB500BFFA62 /* Build JS Bundle */ = {
@@ -1066,21 +1075,26 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/../..\nexport SOURCEMAP_FILE=sourcemap.macOS.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" packages/rn-tester/js/RNTesterApp.macos.js\n";
 		};
-		4BDC0C5271A785332898B818 /* [CP] Copy Pods Resources */ = {
+		4D5C96E508ED312A9EEBDBB4 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RNTester-macOS-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		51B9D81723C4D5A4002B30E1 /* Start Metro */ = {
@@ -1102,97 +1116,87 @@
 			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		5CF0FD27207FC6EC00C13D65 /* Start Metro */ = {
+		59FB8E2EE11176798F1F79BF /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "Start Metro";
-			outputPaths = (
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */ = {
+		5CF0FD27207FC6EC00C13D65 /* Start Metro */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Build JS Bundle";
+			name = "Start Metro";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/../..\nexport SOURCEMAP_FILE=../../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" packages/rn-tester/js/RNTesterApp.ios.js\n";
+			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../../scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
+			showEnvVarsInLog = 0;
 		};
-		79A2B74F37E4F8AF8B3D0A7A /* [CP] Check Pods Manifest.lock */ = {
+		66536E8DF39B47627A510DF1 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-iosDeviceBuild-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		840572194E08440DE712816E /* [CP] Check Pods Manifest.lock */ = {
+		68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
 			);
+			name = "Build JS Bundle";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RNTester-macOS-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "export NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/../..\nexport SOURCEMAP_FILE=../../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" packages/rn-tester/js/RNTesterApp.ios.js\n";
 		};
-		8BA2D8960038381F0B753726 /* [CP] Copy Pods Resources */ = {
+		6AFB016C9B7463C62B44F318 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8BEE9E647FF71296D5EFD137 /* [CP] Check Pods Manifest.lock */ = {
+		77A2E97C65AABD4BA2F6F29B /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1207,36 +1211,48 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RNTester-macOSUnitTests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-iosDeviceBuild-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A7D95A9E84DEB30F42E4B186 /* [CP] Check Pods Manifest.lock */ = {
+		876175BE889FD351D8E77AC9 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RNTesterIntegrationTests-checkManifestLockResult.txt",
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		90DA0640700ADDD73F8842BD /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B8BFFD6300CD470A1DF043B6 /* [CP] Check Pods Manifest.lock */ = {
+		9F8B51C0405957F2A7BE3F54 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1251,31 +1267,31 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RNTester-macOSIntegrationTests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-RNTester-macOSUnitTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D3E745B9771EC6F02AC52196 /* [CP] Copy Pods Resources */ = {
+		A0F82A7ABB9969342057CBE1 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D9BE43355C8C29497EED268E /* [CP] Check Pods Manifest.lock */ = {
+		A7D95A9E84DEB30F42E4B186 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1290,14 +1306,14 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RNTester-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-RNTesterIntegrationTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DBAEBACAAEA09D5E7591E051 /* [CP] Check Pods Manifest.lock */ = {
+		C55342180F72D0025E2DD28C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1319,21 +1335,26 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DCF7F2DA774E70B7DE02783C /* [CP] Copy Pods Resources */ = {
+		D9BE43355C8C29497EED268E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RNTester-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -1522,24 +1543,21 @@
 /* Begin XCBuildConfiguration section */
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */;
+			baseConfigurationReference = 6D3E7ECE8F9BEC26E5786555 /* Pods-RNTester.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 				DEVELOPMENT_TEAM = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-					"FB_SONARKIT_ENABLED=1",
-				);
 				INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
+					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"\"$(SDKROOT)/usr/lib/swift\"",
 					"$(inherited)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
@@ -1569,7 +1587,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5BEC8567F3741044B6A5EFC5 /* Pods-RNTester.release.xcconfig */;
+			baseConfigurationReference = 3DC317D3EE16C63CD9243667 /* Pods-RNTester.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -1607,7 +1625,7 @@
 		};
 		387847D8245631D80035033A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A112BDF7485AEF790F6D3E26 /* Pods-iosDeviceBuild.debug.xcconfig */;
+			baseConfigurationReference = 1ECF206BF13260815AAC95EA /* Pods-iosDeviceBuild.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1631,7 +1649,7 @@
 		};
 		387847D9245631D80035033A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9AEE8A836A0F632B88084FA2 /* Pods-iosDeviceBuild.release.xcconfig */;
+			baseConfigurationReference = AC6DB4C70AE6C558CFE78E9D /* Pods-iosDeviceBuild.release.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1655,7 +1673,7 @@
 		};
 		387847E5245631F50035033A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C81D39A606858D29861E5930 /* Pods-iosSimulatorBuild.debug.xcconfig */;
+			baseConfigurationReference = FEC7DFC73F5A7055398F11B6 /* Pods-iosSimulatorBuild.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1679,7 +1697,7 @@
 		};
 		387847E6245631F50035033A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 99A17281BF2B134DA8F8B2C4 /* Pods-iosSimulatorBuild.release.xcconfig */;
+			baseConfigurationReference = 50AD031542320BFA83630EDE /* Pods-iosSimulatorBuild.release.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1703,7 +1721,7 @@
 		};
 		387847F22456320C0035033A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 84C1A5DCCB6A5B4ABD3C2C93 /* Pods-macOSBuild.debug.xcconfig */;
+			baseConfigurationReference = ABC5325C94F71908317C26A8 /* Pods-macOSBuild.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1712,7 +1730,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				EXECUTABLE_PREFIX = lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
@@ -1728,7 +1746,7 @@
 		};
 		387847F32456320C0035033A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4DFD492869336A171286E9EB /* Pods-macOSBuild.release.xcconfig */;
+			baseConfigurationReference = F7DC249273A51CC8A56ED858 /* Pods-macOSBuild.release.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1738,7 +1756,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -1788,6 +1806,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1812,7 +1831,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CPLUSPLUSFLAGS = (
@@ -1871,6 +1890,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
@@ -1888,7 +1908,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
@@ -1912,7 +1932,7 @@
 		};
 		9F15347F233AB2C7006DFE44 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2BE07A0C310D8A03C00D6F07 /* Pods-RNTester-macOS.debug.xcconfig */;
+			baseConfigurationReference = E9CE1968E72EB97B674E80A4 /* Pods-RNTester-macOS.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -1936,7 +1956,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
@@ -1952,7 +1972,7 @@
 		};
 		9F153480233AB2C7006DFE44 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9AED879F1A9397646A861A9F /* Pods-RNTester-macOS.release.xcconfig */;
+			baseConfigurationReference = 604873ABF80DC3EE97E87CCF /* Pods-RNTester-macOS.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -1977,7 +1997,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -1992,7 +2012,7 @@
 		};
 		9F153481233AB2C7006DFE44 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 406E6935B300A29BA57EE1B0 /* Pods-RNTester-macOSUnitTests.debug.xcconfig */;
+			baseConfigurationReference = 87D5D06CD6060D32601A10DD /* Pods-RNTester-macOSUnitTests.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2012,7 +2032,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
@@ -2028,7 +2048,7 @@
 		};
 		9F153482233AB2C7006DFE44 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9EAC9B16F3BA65B8E1511E5E /* Pods-RNTester-macOSUnitTests.release.xcconfig */;
+			baseConfigurationReference = 821937C864FDA0F3C485B4A6 /* Pods-RNTester-macOSUnitTests.release.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2049,7 +2069,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -2064,7 +2084,7 @@
 		};
 		9F153483233AB2C7006DFE44 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3CCA44B8467CB06ACED8E0E9 /* Pods-RNTester-macOSIntegrationTests.debug.xcconfig */;
+			baseConfigurationReference = AFC451B51B7D6F0C1CAD0C18 /* Pods-RNTester-macOSIntegrationTests.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2085,7 +2105,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
@@ -2102,7 +2122,7 @@
 		};
 		9F153484233AB2C7006DFE44 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0BFED72B21FBD987A97E30B9 /* Pods-RNTester-macOSIntegrationTests.release.xcconfig */;
+			baseConfigurationReference = 27E7277560D64734B4F0E7D9 /* Pods-RNTester-macOSIntegrationTests.release.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2119,7 +2139,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -2135,7 +2155,7 @@
 		};
 		E7DB20A722B2BA84005AC45F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 34028D6B10F47E490042EB27 /* Pods-RNTesterUnitTests.debug.xcconfig */;
+			baseConfigurationReference = C38CB0C2095A8FFDE13321E5 /* Pods-RNTesterUnitTests.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2171,7 +2191,7 @@
 		};
 		E7DB20A822B2BA84005AC45F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E9618482EC8608D4872A6E28 /* Pods-RNTesterUnitTests.release.xcconfig */;
+			baseConfigurationReference = 8735BC063632C9712E25C7D9 /* Pods-RNTesterUnitTests.release.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2207,7 +2227,7 @@
 		};
 		E7DB215B22B2F332005AC45F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 972A459EE6CF8CC63531A088 /* Pods-RNTesterIntegrationTests.debug.xcconfig */;
+			baseConfigurationReference = 3CD3706443F2188E09CBF2D2 /* Pods-RNTesterIntegrationTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
@@ -2245,7 +2265,7 @@
 		};
 		E7DB215C22B2F332005AC45F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7D51F73F0DA20287418D98BD /* Pods-RNTesterIntegrationTests.release.xcconfig */;
+			baseConfigurationReference = E88C98CC10E157202A961408 /* Pods-RNTesterIntegrationTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme
index 53412600d9bbf7..8d487f97cdb398 100644
--- a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme
+++ b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTesterIntegrationTests.xcscheme
@@ -42,11 +42,6 @@
             value = "1"
             isEnabled = "YES">
          </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "RN_BUNDLE_PREFIX"
-            value = ""
-            isEnabled = "YES">
-         </EnvironmentVariable>
       </EnvironmentVariables>
       <Testables>
          <TestableReference
diff --git a/packages/rn-tester/RNTesterUnitTests/RCTBlobManagerTests.m b/packages/rn-tester/RNTesterUnitTests/RCTBlobManagerTests.m
index 7b10ce9178e765..7e88f3e7381e90 100644
--- a/packages/rn-tester/RNTesterUnitTests/RCTBlobManagerTests.m
+++ b/packages/rn-tester/RNTesterUnitTests/RCTBlobManagerTests.m
@@ -26,6 +26,7 @@ - (void)setUp
 
   _module = [RCTBlobManager new];
   [_module setValue:nil forKey:@"bridge"];
+  [_module initialize];
   NSInteger size = 120;
   _data = [NSMutableData dataWithCapacity:size];
   for (NSInteger i = 0; i < size / 4; i++) {
diff --git a/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m b/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m
index 7e023f96cda650..17265f36a664c5 100644
--- a/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m
+++ b/packages/rn-tester/RNTesterUnitTests/RCTBundleURLProviderTests.m
@@ -99,7 +99,7 @@ - (void)testLocalhostURL
 - (void)testIPURL
 {
   id classMock = OCMClassMock([RCTBundleURLProvider class]);
-  [[[classMock stub] andReturnValue:@YES] isPackagerRunning:[OCMArg any]];
+  [[[classMock stub] andReturnValue:@YES] isPackagerRunning:[OCMArg any] scheme:[OCMArg any]];
   RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings];
   settings.jsLocation = @"192.168.1.1";
   NSURL *URL = [settings jsBundleURLForBundleRoot:testFile fallbackResource:nil];
diff --git a/packages/rn-tester/RNTesterUnitTests/RCTEventDispatcherTests.m b/packages/rn-tester/RNTesterUnitTests/RCTEventDispatcherTests.m
index 382b7045ed7867..376a3af7db1862 100644
--- a/packages/rn-tester/RNTesterUnitTests/RCTEventDispatcherTests.m
+++ b/packages/rn-tester/RNTesterUnitTests/RCTEventDispatcherTests.m
@@ -75,6 +75,7 @@ @implementation RCTEventDispatcherTests
 {
   id _bridge;
   RCTEventDispatcher *_eventDispatcher;
+  RCTCallableJSModules *_callableJSModules;
 
   NSString *_eventName;
   NSDictionary<NSString *, id> *_body;
@@ -89,8 +90,13 @@ - (void)setUp
 
   _bridge = [OCMockObject mockForClass:[RCTDummyBridge class]];
 
+  _callableJSModules = [RCTCallableJSModules new];
+  [_callableJSModules setBridge:_bridge];
+
   _eventDispatcher = [RCTEventDispatcher new];
   [_eventDispatcher setValue:_bridge forKey:@"bridge"];
+  [_eventDispatcher setValue:_callableJSModules forKey:@"callableJSModules"];
+  [_eventDispatcher initialize];
 
   _eventName = RCTNormalizeInputEventName(@"sampleEvent");
   _body = @{ @"foo": @"bar" };
@@ -161,8 +167,8 @@ - (void)testRunningTheDispatchedBlockResultInANewOneBeingEnqueued
   [_bridge verify];
 
   // eventsEmittingBlock would be called when js is no longer busy, which will result in emitting events
-  [[_bridge expect] enqueueJSCall:[[_testEvent class] moduleDotMethod]
-                             args:[_testEvent arguments]];
+  [self _expectBridgeJSCall:[[_testEvent class] moduleDotMethod]
+                       args:[_testEvent arguments]];
   eventsEmittingBlock();
   [_bridge verify];
 
@@ -179,8 +185,8 @@ - (void)testBasicCoalescingReturnsLastEvent
     eventsEmittingBlock = block;
     return YES;
   }] queue:RCTJSThread];
-  [[_bridge expect] enqueueJSCall:[[_testEvent class] moduleDotMethod]
-                             args:[_testEvent arguments]];
+  [self _expectBridgeJSCall:[[_testEvent class] moduleDotMethod]
+                       args:[_testEvent arguments]];
 
   RCTTestEvent *ignoredEvent = [[RCTTestEvent alloc] initWithViewTag:nil
                                                            eventName:_eventName
@@ -206,10 +212,10 @@ - (void)testDifferentEventTypesDontCoalesce
     eventsEmittingBlock = block;
     return YES;
   }] queue:RCTJSThread];
-  [[_bridge expect] enqueueJSCall:[[_testEvent class] moduleDotMethod]
-                             args:[firstEvent arguments]];
-  [[_bridge expect] enqueueJSCall:[[_testEvent class] moduleDotMethod]
-                             args:[_testEvent arguments]];
+  [self _expectBridgeJSCall:[[_testEvent class] moduleDotMethod]
+                       args:[firstEvent arguments]];
+  [self _expectBridgeJSCall:[[_testEvent class] moduleDotMethod]
+                       args:[_testEvent arguments]];
 
 
   [_eventDispatcher sendEvent:firstEvent];
@@ -235,10 +241,10 @@ - (void)testDifferentViewTagsDontCoalesce
     eventsEmittingBlock = block;
     return YES;
   }] queue:RCTJSThread];
-  [[_bridge expect] enqueueJSCall:[[firstEvent class] moduleDotMethod]
-                             args:[firstEvent arguments]];
-  [[_bridge expect] enqueueJSCall:[[secondEvent class] moduleDotMethod]
-                             args:[secondEvent arguments]];
+  [self _expectBridgeJSCall:[[firstEvent class] moduleDotMethod]
+                       args:[firstEvent arguments]];
+  [self _expectBridgeJSCall:[[secondEvent class] moduleDotMethod]
+                       args:[secondEvent arguments]];
 
 
   [_eventDispatcher sendEvent:firstEvent];
@@ -265,10 +271,10 @@ - (void)testSameEventTypesWithDifferentCoalesceKeysDontCoalesce
     eventsEmittingBlock = block;
     return YES;
   }] queue:RCTJSThread];
-  [[_bridge expect] enqueueJSCall:[[_testEvent class] moduleDotMethod]
-                             args:[firstEvent arguments]];
-  [[_bridge expect] enqueueJSCall:[[_testEvent class] moduleDotMethod]
-                             args:[secondEvent arguments]];
+  [self _expectBridgeJSCall:[[_testEvent class] moduleDotMethod]
+                       args:[firstEvent arguments]];
+  [self _expectBridgeJSCall:[[_testEvent class] moduleDotMethod]
+                       args:[secondEvent arguments]];
 
 
   [_eventDispatcher sendEvent:firstEvent];
@@ -284,4 +290,15 @@ - (void)testSameEventTypesWithDifferentCoalesceKeysDontCoalesce
   [_bridge verify];
 }
 
+-(void)_expectBridgeJSCall:(NSString *)moduleDotMethod args:(NSArray *)args
+{
+  NSArray<NSString *> *const components = [moduleDotMethod componentsSeparatedByString:@"."];
+  NSString *const moduleName = components[0];
+  NSString *const methodName = components[1];
+  [[_bridge expect] enqueueJSCall:moduleName
+                           method:methodName
+                             args:args
+                       completion:NULL];
+}
+
 @end
diff --git a/packages/rn-tester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m b/packages/rn-tester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
index 781b74bb74af5d..67aef5d42ae142 100644
--- a/packages/rn-tester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
+++ b/packages/rn-tester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
@@ -15,6 +15,7 @@
 #import <React/RCTJavaScriptExecutor.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTViewManager.h>
+#import <React/RCTInitializing.h>
 
 @interface RCTTestViewManager : RCTViewManager
 @end
@@ -36,7 +37,7 @@ @implementation RCTTestViewManager
 @end
 
 
-@interface RCTNotificationObserverModule : NSObject <RCTBridgeModule>
+@interface RCTNotificationObserverModule : NSObject <RCTBridgeModule, RCTInitializing>
 
 @property (nonatomic, assign) BOOL didDetectViewManagerInit;
 
@@ -48,9 +49,8 @@ @implementation RCTNotificationObserverModule
 
 RCT_EXPORT_MODULE()
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  _bridge = bridge;
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didInitViewManager:) name:RCTDidInitializeModuleNotification object:nil];
 }
 
diff --git a/packages/rn-tester/RNTesterUnitTests/RCTModuleInitTests.m b/packages/rn-tester/RNTesterUnitTests/RCTModuleInitTests.m
index 3056bc5f8f654d..c0899183142d35 100644
--- a/packages/rn-tester/RNTesterUnitTests/RCTModuleInitTests.m
+++ b/packages/rn-tester/RNTesterUnitTests/RCTModuleInitTests.m
@@ -14,6 +14,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTJavaScriptExecutor.h>
 #import <React/RCTUtils.h>
+#import <React/RCTInitializing.h>
 
 @interface RCTTestInjectedModule : NSObject <RCTBridgeModule>
 @end
@@ -52,7 +53,7 @@ - (id)init
 @end
 
 
-@interface RCTTestCustomSetBridgeModule : NSObject <RCTBridgeModule>
+@interface RCTTestCustomSetBridgeModule : NSObject <RCTBridgeModule, RCTInitializing>
 
 @property (nonatomic, assign) BOOL setBridgeOnMainQueue;
 
@@ -65,9 +66,8 @@ @implementation RCTTestCustomSetBridgeModule
 
 RCT_EXPORT_MODULE()
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  _bridge = bridge;
   _setBridgeOnMainQueue = RCTIsMainQueue();
 }
 
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index 13c150cb30dfc0..7f04213604bfff 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -8,6 +8,7 @@
 plugins {
     id("com.android.application")
     id("com.facebook.react.codegen")
+    id("com.facebook.react.app")
 }
 
 /**
@@ -66,7 +67,7 @@ plugins {
  *   // Root dir for all JS files for the app. Defaults to `root` above.
  *   jsRootDir: "../..",
  *
- *   // Enable Fabric at build time and runtime.
+ *   // Enable Fabric at runtime.
  *   enableFabric: true,
  *
  *   // Java package name to use for any codegen artifacts produced during build time.
@@ -75,21 +76,23 @@ plugins {
  * ]
  */
 
+reactApp {
+    cliPath = "$rootDir/cli.js"
+    bundleAssetName = "RNTesterApp.android.bundle"
+    entryFile = file("../../js/RNTesterApp.android.js")
+    reactRoot = rootDir
+    inputExcludes = ["android/**", "./**", ".gradle/**"]
+    composeSourceMapsPath = "$rootDir/scripts/compose-source-maps.js"
+    hermesCommand = "$rootDir/node_modules/hermes-engine/%OS-BIN%/hermesc"
+    enableHermesForVariant { def v -> v.name.contains("hermes") }
+}
+
 project.ext.react = [
-    cliPath: "$rootDir/cli.js",
-    bundleAssetName: "RNTesterApp.android.bundle",
-    entryFile: file("../../js/RNTesterApp.android.js"),
-    root: "$rootDir",
-    inputExcludes: ["android/**", "./**", ".gradle/**"],
-    composeSourceMapsPath: "$rootDir/scripts/compose-source-maps.js",
-    hermesCommand: "$rootDir/node_modules/hermes-engine/%OS-BIN%/hermesc",
-    enableHermesForVariant: { def v -> v.name.contains("hermes") },
-    jsRootDir: "$rootDir/RNTester",
     enableCodegen: true, // Keep this here until it's sync'ed to Android template.
-    enableFabric: (System.getenv('USE_FABRIC') ?: '0').toBoolean(),
+    enableFabric: (System.getenv('USE_FABRIC') ?: '0').toBoolean()
 ]
 
-apply from: "../../../../react.gradle"
+//apply from: "../../../../react.gradle"
 
 /**
  * Set this to true to create three separate APKs instead of one:
@@ -113,7 +116,7 @@ def enableProguardInReleaseBuilds = true
 def enableCodegen = project.ext.react.enableCodegen
 
 /**
- * Build and enable Fabric in RN Tester app.
+ * Enable Fabric in RN Tester app.
  */
 def enableFabric = project.ext.react.enableFabric
 
@@ -125,13 +128,18 @@ def enableFabric = project.ext.react.enableFabric
  */
 def useIntlJsc = false
 
+/**
+ * Architectures to build native code for in debug.
+ */
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 android {
     compileSdkVersion 29
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    ndkVersion ANDROID_NDK_VERSION
+    if (ANDROID_NDK_PATH != null) {
+        ndkPath ANDROID_NDK_PATH
     }
+
     dexOptions {
         javaMaxHeapSize "4g"
     }
@@ -174,9 +182,16 @@ android {
     }
     buildTypes {
         debug {
+            debuggable true
             signingConfig signingConfigs.release
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
         }
         release {
+            debuggable false
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
@@ -249,7 +264,6 @@ if (enableCodegen) {
         defaultConfig {
             externalNativeBuild {
                 ndkBuild {
-                    abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a"
                     arguments "APP_PLATFORM=android-21",
                             "APP_STL=c++_shared",
                             "NDK_TOOLCHAIN_VERSION=clang",
diff --git a/packages/rn-tester/android/app/gradle.properties b/packages/rn-tester/android/app/gradle.properties
index 5c93b3bca832dc..46d5807985877b 100644
--- a/packages/rn-tester/android/app/gradle.properties
+++ b/packages/rn-tester/android/app/gradle.properties
@@ -10,4 +10,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.99.0
diff --git a/packages/rn-tester/android/app/src/main/AndroidManifest.xml b/packages/rn-tester/android/app/src/main/AndroidManifest.xml
index d47ee519ae3180..e2e88576591989 100644
--- a/packages/rn-tester/android/app/src/main/AndroidManifest.xml
+++ b/packages/rn-tester/android/app/src/main/AndroidManifest.xml
@@ -52,6 +52,11 @@
       </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    <provider
+      android:name="com.facebook.react.modules.blob.BlobProvider"
+      android:authorities="@string/blob_provider_authority"
+      android:exported="false"
+    />
   </application>
 
 </manifest>
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index a101b8cef9e872..6d014d9dac3f57 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -15,8 +15,8 @@
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
 import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.JSIModule;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.JSIModuleSpec;
@@ -33,7 +33,7 @@
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.shell.MainReactPackage;
-import com.facebook.react.turbomodule.core.TurboModuleManager;
+import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.views.text.ReactFontManager;
 import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
@@ -107,6 +107,13 @@ public Map<String, ReactModuleInfo> getReactModuleInfos() {
               });
         }
 
+        @Nullable
+        @Override
+        protected ReactPackageTurboModuleManagerDelegate.Builder
+            getReactPackageTurboModuleManagerDelegateBuilder() {
+          return new RNTesterTurboModuleManagerDelegate.Builder();
+        }
+
         @Nullable
         @Override
         protected JSIModulePackage getJSIModulePackage() {
@@ -121,40 +128,6 @@ public List<JSIModuleSpec> getJSIModules(
                 final JavaScriptContextHolder jsContext) {
               final List<JSIModuleSpec> specs = new ArrayList<>();
 
-              // Install the new native module system.
-              if (ReactFeatureFlags.useTurboModules) {
-                specs.add(
-                    new JSIModuleSpec() {
-                      @Override
-                      public JSIModuleType getJSIModuleType() {
-                        return JSIModuleType.TurboModuleManager;
-                      }
-
-                      @Override
-                      public JSIModuleProvider getJSIModuleProvider() {
-                        return new JSIModuleProvider() {
-                          @Override
-                          public JSIModule get() {
-                            final ReactInstanceManager reactInstanceManager =
-                                getReactInstanceManager();
-                            final List<ReactPackage> packages = reactInstanceManager.getPackages();
-
-                            return new TurboModuleManager(
-                                jsContext,
-                                new RNTesterTurboModuleManagerDelegate(
-                                    reactApplicationContext, packages),
-                                reactApplicationContext
-                                    .getCatalystInstance()
-                                    .getJSCallInvokerHolder(),
-                                reactApplicationContext
-                                    .getCatalystInstance()
-                                    .getNativeCallInvokerHolder());
-                          }
-                        };
-                      }
-                    });
-              }
-
               // Install the new renderer.
               if (BuildConfig.ENABLE_FABRIC) {
                 specs.add(
@@ -168,6 +141,13 @@ public JSIModuleType getJSIModuleType() {
                       public JSIModuleProvider<UIManager> getJSIModuleProvider() {
                         final ComponentFactory ComponentFactory = new ComponentFactory();
                         CoreComponentsRegistry.register(ComponentFactory);
+                        final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
+
+                        ViewManagerRegistry viewManagerRegistry =
+                            new ViewManagerRegistry(
+                                reactInstanceManager.getOrCreateViewManagers(
+                                    reactApplicationContext));
+
                         return new FabricJSIModuleProvider(
                             reactApplicationContext,
                             ComponentFactory,
@@ -192,7 +172,8 @@ public String getString(final String s) {
                               public double getDouble(final String s) {
                                 return 0;
                               }
-                            });
+                            },
+                            viewManagerRegistry);
                       }
                     });
               }
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
index 0baf04bc1d7da5..f0a9c75efa0222 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
@@ -10,24 +10,38 @@
 import androidx.annotation.VisibleForTesting;
 import com.facebook.jni.HybridData;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.turbomodule.core.ReactPackageTurboModuleManagerDelegate;
 import com.facebook.soloader.SoLoader;
 import java.util.List;
 
 /** This class is responsible for creating all the TurboModules for the RNTester app. */
 public class RNTesterTurboModuleManagerDelegate extends ReactPackageTurboModuleManagerDelegate {
-  static {
-    SoLoader.loadLibrary("rntester_appmodules");
-  }
+  private static volatile boolean sIsSoLibraryLoaded;
 
   protected native HybridData initHybrid();
 
   @VisibleForTesting
   native boolean canCreateTurboModule(String moduleName);
 
-  public RNTesterTurboModuleManagerDelegate(
+  private RNTesterTurboModuleManagerDelegate(
       ReactApplicationContext context, List<ReactPackage> packages) {
     super(context, packages);
   }
+
+  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
+    protected RNTesterTurboModuleManagerDelegate build(
+        ReactApplicationContext context, List<ReactPackage> packages) {
+      return new RNTesterTurboModuleManagerDelegate(context, packages);
+    }
+  }
+
+  @Override
+  protected synchronized void maybeLoadOtherSoLibraries() {
+    // Prevents issues with initializer interruptions.
+    if (!sIsSoLibraryLoaded) {
+      SoLoader.loadLibrary("rntester_appmodules");
+      sIsSoLibraryLoaded = true;
+    }
+  }
 }
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index 6e003cdb953721..61fd15a793969c 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -18,9 +18,9 @@ LOCAL_MODULE := rntester_appmodules
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libturbomodulejsijni libreact_codegen_reactandroidspec
+LOCAL_SHARED_LIBRARIES := libfbjni libglog libfolly_json libyoga libreact_nativemodule_core libturbomodulejsijni librrc_view libreact_render_core libreact_render_graphics libreact_codegen_rncore
 LOCAL_STATIC_LIBRARIES := libsampleturbomodule
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 include $(BUILD_SHARED_LIBRARY)
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
index 854775a6b1efc2..615cdc5d907265 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
@@ -8,8 +8,8 @@
 #include "RNTesterAppModuleProvider.h"
 
 #include <PackagesRnTesterAndroidAppSpec.h>
-#include <ReactAndroidSpec.h>
 #include <ReactCommon/SampleTurboModuleSpec.h>
+#include <rncore.h>
 
 namespace facebook {
 namespace react {
@@ -25,7 +25,7 @@ std::shared_ptr<TurboModule> RNTesterAppModuleProvider(const std::string moduleN
     return module;
   }
 
-  return ReactAndroidSpec_ModuleProvider(moduleName, params);
+  return rncore_ModuleProvider(moduleName, params);
 }
 
 } // namespace react
diff --git a/packages/rn-tester/android/app/src/main/res/values/strings.xml b/packages/rn-tester/android/app/src/main/res/values/strings.xml
index 10487f504c9208..50058dbb1f29be 100644
--- a/packages/rn-tester/android/app/src/main/res/values/strings.xml
+++ b/packages/rn-tester/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">RNTester App</string>
+    <string name="blob_provider_authority">com.facebook.react.uiapp.blobs</string>
 </resources>
diff --git a/packages/rn-tester/js/RNTesterApp.android.js b/packages/rn-tester/js/RNTesterApp.android.js
index ba0aa1846d0dde..5b0d85532c62e6 100644
--- a/packages/rn-tester/js/RNTesterApp.android.js
+++ b/packages/rn-tester/js/RNTesterApp.android.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import {AppRegistry} from 'react-native';
 
 import RNTesterApp from './RNTesterAppShared';
diff --git a/packages/rn-tester/js/RNTesterApp.ios.js b/packages/rn-tester/js/RNTesterApp.ios.js
index 2f9c513a5b1cf5..2faee2feb0d652 100644
--- a/packages/rn-tester/js/RNTesterApp.ios.js
+++ b/packages/rn-tester/js/RNTesterApp.ios.js
@@ -8,19 +8,16 @@
  * @flow
  */
 
-'use strict';
-
 import {AppRegistry, NativeModules, Platform, View} from 'react-native'; // TODO(OSS Candidate ISS#2710739): everything but AppRegistry
 import React from 'react';
 
 import SnapshotViewIOS from './examples/Snapshot/SnapshotViewIOS.ios';
-import RNTesterExampleContainer from './components/RNTesterExampleContainer';
+import RNTesterModuleContainer from './components/RNTesterModuleContainer';
 import RNTesterList from './utils/RNTesterList';
 import RNTesterApp from './RNTesterAppShared';
-import type {RNTesterExample} from './types/RNTesterTypes';
+import type {RNTesterModuleInfo} from './types/RNTesterTypes';
 
 const {TestModule} = NativeModules; // TODO(OSS Candidate ISS#2710739)
-const requestAnimationFrame = require('fbjs/lib/requestAnimationFrame'); // TODO(OSS Candidate ISS#2710739)
 
 AppRegistry.registerComponent('SetPropertiesExampleApp', () =>
   require('./examples/SetPropertiesExample/SetPropertiesExampleApp'),
@@ -31,15 +28,18 @@ AppRegistry.registerComponent('RootViewSizeFlexibilityExampleApp', () =>
 AppRegistry.registerComponent('RNTesterApp', () => RNTesterApp);
 
 // Register suitable examples for snapshot tests
-RNTesterList.ComponentExamples.concat(RNTesterList.APIExamples).forEach(
-  (Example: RNTesterExample) => {
+RNTesterList.Components.concat(RNTesterList.APIs).forEach(
+  (Example: RNTesterModuleInfo) => {
     const ExampleModule = Example.module;
     if (ExampleModule.displayName) {
       class Snapshotter extends React.Component<{...}> {
         render() {
           return (
             <SnapshotViewIOS>
-              <RNTesterExampleContainer module={ExampleModule} />
+              <RNTesterModuleContainer
+                module={ExampleModule}
+                onExampleCardPress={() => {}}
+              />
             </SnapshotViewIOS>
           );
         }
@@ -60,7 +60,7 @@ RNTesterList.ComponentExamples.concat(RNTesterList.APIExamples).forEach(
       }
 
       render() {
-        return <RNTesterExampleContainer module={ExampleModule} />;
+        return <RNTesterModuleContainer module={ExampleModule} />;
       }
     }
 
@@ -75,8 +75,8 @@ RNTesterList.ComponentExamples.concat(RNTesterList.APIExamples).forEach(
 // [TODO(OSS Candidate ISS#2710739)
 class EnumerateExamplePages extends React.Component<{}> {
   render() {
-    RNTesterList.ComponentExamples.concat(RNTesterList.APIExamples).forEach(
-      (Example: RNTesterExample) => {
+    RNTesterList.Components.concat(RNTesterList.APIs).forEach(
+      (Example: RNTesterModuleInfo) => {
         let skipTest = false;
         if ('skipTest' in Example) {
           const platforms = Example.skipTest;
diff --git a/packages/rn-tester/js/RNTesterAppShared.js b/packages/rn-tester/js/RNTesterAppShared.js
index ee0c73677cfbc5..90609a0b4ab1d2 100644
--- a/packages/rn-tester/js/RNTesterAppShared.js
+++ b/packages/rn-tester/js/RNTesterAppShared.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import {
   BackHandler,
   StyleSheet,
@@ -19,9 +17,9 @@ import {
 } from 'react-native';
 import * as React from 'react';
 
-import RNTesterExampleContainer from './components/RNTesterExampleContainer';
-import RNTesterExampleList from './components/RNTesterExampleList';
-import RNTesterNavBar from './components/RNTesterNavbar';
+import RNTesterModuleContainer from './components/RNTesterModuleContainer';
+import RNTesterModuleList from './components/RNTesterModuleList';
+import RNTesterNavBar, {navBarHeight} from './components/RNTesterNavbar';
 import RNTesterList from './utils/RNTesterList';
 import {
   Screens,
@@ -32,12 +30,9 @@ import {
 import {useAsyncStorageReducer} from './utils/useAsyncStorageReducer';
 import {RNTesterReducer, RNTesterActionsType} from './utils/RNTesterReducer';
 import {RNTesterThemeContext, themes} from './components/RNTesterTheme';
-import {Header} from './components/RNTesterHeader';
+import RNTTitleBar from './components/RNTTitleBar';
 import {RNTesterEmptyBookmarksState} from './components/RNTesterEmptyBookmarksState';
 
-import type {RNTesterTheme} from './components/RNTesterTheme';
-import type {ExamplesList} from './types/RNTesterTypes';
-
 const APP_STATE_KEY = 'RNTesterAppState.v3';
 
 // RNTester App currently uses AsyncStorage from react-native for storing navigation state
@@ -45,65 +40,6 @@ const APP_STATE_KEY = 'RNTesterAppState.v3';
 // TODO: Vendor AsyncStorage or create our own.
 LogBox.ignoreLogs([/AsyncStorage has been extracted from react-native/]);
 
-const DisplayIfVisible = ({isVisible, children}) => (
-  <View style={[styles.container, !isVisible && styles.hidden]}>
-    {children}
-  </View>
-);
-
-type ExampleListsContainerProps = $ReadOnly<{|
-  theme: RNTesterTheme,
-  screen: string,
-  title: string,
-  examplesList: ExamplesList,
-  toggleBookmark: (args: {exampleType: string, key: string}) => mixed,
-  handleExampleCardPress: (args: {exampleType: string, key: string}) => mixed,
-  isVisible: boolean,
-|}>;
-
-const ExampleListsContainer = ({
-  theme,
-  screen,
-  title,
-  examplesList,
-  toggleBookmark,
-  handleExampleCardPress,
-  isVisible,
-}: ExampleListsContainerProps) => {
-  const isBookmarkEmpty = examplesList.bookmarks.length === 0;
-
-  return (
-    <DisplayIfVisible isVisible={isVisible}>
-      <Header title={title} theme={theme} />
-      <DisplayIfVisible isVisible={screen === Screens.COMPONENTS}>
-        <RNTesterExampleList
-          sections={examplesList.components}
-          toggleBookmark={toggleBookmark}
-          handleExampleCardPress={handleExampleCardPress}
-        />
-      </DisplayIfVisible>
-      <DisplayIfVisible isVisible={screen === Screens.APIS}>
-        <RNTesterExampleList
-          sections={examplesList.apis}
-          toggleBookmark={toggleBookmark}
-          handleExampleCardPress={handleExampleCardPress}
-        />
-      </DisplayIfVisible>
-      <DisplayIfVisible isVisible={screen === Screens.BOOKMARKS}>
-        {isBookmarkEmpty ? (
-          <RNTesterEmptyBookmarksState />
-        ) : (
-          <RNTesterExampleList
-            sections={examplesList.bookmarks}
-            toggleBookmark={toggleBookmark}
-            handleExampleCardPress={handleExampleCardPress}
-          />
-        )}
-      </DisplayIfVisible>
-    </DisplayIfVisible>
-  );
-};
-
 const RNTesterApp = (): React.Node => {
   const [state, dispatch] = useAsyncStorageReducer(
     RNTesterReducer,
@@ -112,7 +48,14 @@ const RNTesterApp = (): React.Node => {
   );
   const colorScheme = useColorScheme();
 
-  const {openExample, screen, bookmarks, recentlyUsed} = state;
+  const {
+    activeModuleKey,
+    activeModuleTitle,
+    activeModuleExampleKey,
+    screen,
+    bookmarks,
+    recentlyUsed,
+  } = state;
 
   React.useEffect(() => {
     getInitialStateFromAsyncStorage(APP_STATE_KEY).then(
@@ -132,15 +75,15 @@ const RNTesterApp = (): React.Node => {
   );
 
   const handleBackPress = React.useCallback(() => {
-    if (openExample) {
+    if (activeModuleKey != null) {
       dispatch({type: RNTesterActionsType.BACK_BUTTON_PRESS});
     }
-  }, [dispatch, openExample]);
+  }, [dispatch, activeModuleKey]);
 
   // Setup hardware back button press listener
   React.useEffect(() => {
     const handleHardwareBackPress = () => {
-      if (openExample) {
+      if (activeModuleKey) {
         handleBackPress();
         return true;
       }
@@ -155,13 +98,23 @@ const RNTesterApp = (): React.Node => {
         handleHardwareBackPress,
       );
     };
-  }, [openExample, handleBackPress]);
+  }, [activeModuleKey, handleBackPress]);
 
-  const handleExampleCardPress = React.useCallback(
-    ({exampleType, key}) => {
+  const handleModuleCardPress = React.useCallback(
+    ({exampleType, key, title}) => {
+      dispatch({
+        type: RNTesterActionsType.MODULE_CARD_PRESS,
+        data: {exampleType, key, title},
+      });
+    },
+    [dispatch],
+  );
+
+  const handleModuleExampleCardPress = React.useCallback(
+    exampleName => {
       dispatch({
         type: RNTesterActionsType.EXAMPLE_CARD_PRESS,
-        data: {exampleType, key},
+        data: {key: exampleName},
       });
     },
     [dispatch],
@@ -193,40 +146,58 @@ const RNTesterApp = (): React.Node => {
     return null;
   }
 
-  const ExampleModule = openExample && RNTesterList.Modules[openExample];
-  const title = Screens.COMPONENTS
-    ? 'Components'
-    : Screens.APIS
-    ? 'APIs'
-    : 'Bookmarks';
+  const activeModule =
+    activeModuleKey != null ? RNTesterList.Modules[activeModuleKey] : null;
+  const activeModuleExample =
+    activeModuleExampleKey != null
+      ? activeModule?.examples.find(e => e.name === activeModuleExampleKey)
+      : null;
+  const title =
+    activeModuleTitle != null
+      ? activeModuleTitle
+      : screen === Screens.COMPONENTS
+      ? 'Components'
+      : screen === Screens.APIS
+      ? 'APIs'
+      : 'Bookmarks';
+
+  const activeExampleList =
+    screen === Screens.COMPONENTS
+      ? examplesList.components
+      : screen === Screens.APIS
+      ? examplesList.apis
+      : examplesList.bookmarks;
 
   return (
     <RNTesterThemeContext.Provider value={theme}>
-      {ExampleModule && (
-        <View style={styles.container}>
-          <Header
-            onBack={handleBackPress}
-            title={title}
-            theme={theme}
-            documentationURL={ExampleModule.documentationURL}
-          />
-          <RNTesterExampleContainer module={ExampleModule} />
-        </View>
-      )}
-
-      <ExampleListsContainer
-        isVisible={!ExampleModule}
-        screen={screen || Screens.COMPONENTS}
+      <RNTTitleBar
         title={title}
         theme={theme}
-        examplesList={examplesList}
-        handleExampleCardPress={handleExampleCardPress}
-        toggleBookmark={toggleBookmark}
+        onBack={activeModule ? handleBackPress : null}
+        documentationURL={activeModule?.documentationURL}
       />
+      <View style={styles.container}>
+        {activeModule != null ? (
+          <RNTesterModuleContainer
+            module={activeModule}
+            example={activeModuleExample}
+            onExampleCardPress={handleModuleExampleCardPress}
+          />
+        ) : screen === Screens.BOOKMARKS &&
+          examplesList.bookmarks.length === 0 ? (
+          <RNTesterEmptyBookmarksState />
+        ) : (
+          <RNTesterModuleList
+            sections={activeExampleList}
+            toggleBookmark={toggleBookmark}
+            handleModuleCardPress={handleModuleCardPress}
+          />
+        )}
+      </View>
       <View style={styles.bottomNavbar}>
         <RNTesterNavBar
           screen={screen || Screens.COMPONENTS}
-          isExamplePageOpen={!!ExampleModule}
+          isExamplePageOpen={!!activeModule}
           handleNavBarPress={handleNavBarPress}
         />
       </View>
@@ -241,11 +212,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   bottomNavbar: {
-    bottom: 0,
-    width: '100%',
-    display: 'flex',
-    flexDirection: 'column',
-    position: 'absolute',
+    height: navBarHeight,
   },
   hidden: {
     display: 'none',
diff --git a/packages/rn-tester/js/assets/bottom-nav-center-box.png b/packages/rn-tester/js/assets/bottom-nav-center-box.png
deleted file mode 100644
index 31b0427bb776abcb4f82fc47f2fc1a64dc60280f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmeAS@N?(olHy`uVBq!ia0vp^CxAGGgAGU?ZmZ`8QY`6?zK#qG8~eHcB(ehe3dtTp
zz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}MQ<;1OBOz`!jG!i)^F
z=14FwFh*vEM3hAM`dB6B=jtV<<R_)-Rpb@`RWmTyR9FF-xv3?I3Kh9IdBs*0wn|_X
zRzNmLSYJs2tfVB{Rw=?aK*2e`C{@8!&qU8a$&O1wLBXadCCw_x#SN+*$g@?-C@Cqh
z($_C9FV`zK*2^zS*Eh7ZwA42+(l;{F1**_3uFNY*tkBIXR)!b?Gsh*hIJqdZpd>Rt
zPXT0ZVp4u-iLH_n$Rap^xU(cP4PjGWG1OZ?59)(t^bPe4^x<X$wc3D0t^A8JQ-L;v
z%(pYN0joq2gW6-G53(G|F%X}EMS)(m<Fe6*2b&$2&mr|l1_owdPZ!6K3dXm09P^|d
zd0YamPyE%N?OVn-XRAWM48gmucKWG{JpaAoPiAYf|NrOjuU{XU8JPGv|5W{0$uH>e
zz@D*b2M33ZqQeCBf<Ih94l|t7Xya(tT4vMeDEXB0(b6v;>uPvTY4}h0yuO{2T~Oh~
z0)w?hK;3uFU+HY-5J(A_5w>&wfsai*Rf<LRRf_6r=@okvn&UcJVxIp#?sM)#h2y*a
z)14ewI0crR^LpyU#1bj7YwBwjj-d3VMT(3~Iy`qzl`^rc+#IxX0)wMiTi#PE#-=Ng
zD`Pww6u6zY7tLjGe6=P-PsL$E>%!=rehmtxVOrus3MUR-SR146Fu_WDDmSM<O5%&K
zb;1fBbElqaW#QOlP@;XE2<w23R{8J0wDtSTho??T%ISN2`X5qN5iM3XW6r~mO*(u0
z!|Xa39Qn8oYdi;fyK?4?7Ya-)mKr>Z=eR5QPk0ip^!(}nd7W&jQ`9{^X;1tfbNsWP
z?3BQH3eRKNg?ZH+CLDYi^%m%vnDiGd2U$3bEMiv20$u!?XRg5v21mB`?5)61D4M%a
zm`zyW#DjvhWk9d4GcGxlz_gfE@=I^K{Qjos$Ud=@3+8flF%#D6xO0Dcy!{lzM-~nt
z`Gu_aJR20=FM0i@f{Ep4--q9vC69w&T-zIe;oEoat;OEk?Hcp${%)Q9M*jr&hAHoq
z9VXPyy#0ffiKUWp+ND~cwdv31^8cE<_g#uenV91{o;9BrZr^-;ZqK1}N*)mj$KI+s
kOo+R;t5r~8Wbi)lUs)@(^(wCn6R3>xboFyt=akR{0C)oefB*mh

diff --git a/packages/rn-tester/js/components/ExamplePage.js b/packages/rn-tester/js/components/ExamplePage.js
deleted file mode 100644
index ff9bf7f6f3ac85..00000000000000
--- a/packages/rn-tester/js/components/ExamplePage.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-import * as React from 'react';
-import {StyleSheet, View, Text, Dimensions} from 'react-native';
-
-type Props = $ReadOnly<{|
-  children?: React.Node,
-  title: string,
-  description?: ?string,
-  category?: ?string,
-  ios?: ?boolean,
-  android?: ?boolean,
-|}>;
-
-const ScreenWidth = Dimensions.get('window').width;
-import {RNTesterThemeContext} from './RNTesterTheme';
-
-export default function ExamplePage(props: Props): React.Node {
-  const theme = React.useContext(RNTesterThemeContext);
-
-  const description = props.description ?? '';
-  const onAndroid = props.android;
-  const onIos = props.ios;
-  const category = props.category;
-
-  return (
-    <>
-      <View style={styles.titleView}>
-        <Text style={styles.description}>{description}</Text>
-        <View style={styles.rowStyle}>
-          <Text style={{color: theme.SecondaryLabelColor, width: 65}}>
-            {category || 'Other'}
-          </Text>
-          <View style={styles.platformLabelStyle}>
-            <Text
-              style={{
-                color: onIos ? '#787878' : theme.SeparatorColor,
-                fontWeight: onIos ? '500' : '300',
-              }}>
-              iOS
-            </Text>
-            <Text
-              style={{
-                color: onAndroid ? '#787878' : theme.SeparatorColor,
-                fontWeight: onAndroid ? '500' : '300',
-              }}>
-              Android
-            </Text>
-          </View>
-        </View>
-      </View>
-      <View style={styles.examplesContainer}>{props.children}</View>
-    </>
-  );
-}
-
-const styles = StyleSheet.create({
-  titleView: {
-    backgroundColor: '#F3F8FF',
-    paddingHorizontal: 25,
-    paddingTop: 8,
-    overflow: 'hidden',
-  },
-  iconContainer: {
-    flexDirection: 'row',
-    justifyContent: 'flex-end',
-  },
-  examplesContainer: {
-    width: ScreenWidth,
-    flexGrow: 1,
-  },
-  description: {
-    marginVertical: 8,
-    fontSize: 16,
-  },
-  docsContainer: {
-    alignContent: 'center',
-    justifyContent: 'center',
-  },
-  rowStyle: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-  },
-  platformLabelStyle: {
-    flexDirection: 'row',
-    width: 100,
-    justifyContent: 'space-between',
-  },
-});
diff --git a/packages/rn-tester/js/components/ListExampleShared.js b/packages/rn-tester/js/components/ListExampleShared.js
index 522d72e3d93318..2312ee69c22f93 100644
--- a/packages/rn-tester/js/components/ListExampleShared.js
+++ b/packages/rn-tester/js/components/ListExampleShared.js
@@ -225,34 +225,26 @@ function getItemLayout(
   return {length, offset: (length + separator) * index + header, index};
 }
 
-function pressItem(context: Object, key: string) {
-  const index = Number(key);
-  const pressed = !context.state.data[index].pressed;
-  context.setState(state => {
-    const newData = [...state.data];
-    newData[index] = {
-      ...state.data[index],
-      pressed,
-      title: 'Item ' + key + (pressed ? ' (pressed)' : ''),
-    };
-    return {data: newData};
-  });
+function pressItem(item: Item): Item {
+  const title = `Item ${item.key}${!item.pressed ? ' (pressed)' : ''}`;
+  return {...item, title, pressed: !item.pressed};
 }
 
 function renderSmallSwitchOption(
-  context: Object,
-  key: string,
+  label: string,
+  value: boolean,
+  setValue: boolean => void,
 ): null | React.Node {
   if (Platform.isTV) {
     return null;
   }
   return (
     <View style={styles.option}>
-      <Text>{key}:</Text>
+      <Text>{label}:</Text>
       <Switch
         style={styles.smallSwitch}
-        value={context.state[key]}
-        onValueChange={value => context.setState({[key]: value})}
+        value={value}
+        onValueChange={setValue}
       />
     </View>
   );
diff --git a/packages/rn-tester/js/components/RNTConfigurationBlock.js b/packages/rn-tester/js/components/RNTConfigurationBlock.js
new file mode 100644
index 00000000000000..2f25bafa786f28
--- /dev/null
+++ b/packages/rn-tester/js/components/RNTConfigurationBlock.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+'use strict';
+
+import * as React from 'react';
+import {StyleSheet, View} from 'react-native';
+import {RNTesterThemeContext} from './RNTesterTheme';
+
+type Props = $ReadOnly<{|
+  children?: ?React.Node,
+  testID?: string,
+|}>;
+
+/**
+ * Container view for a block of configuration options for an example.
+ */
+export default function RNTConfigurationBlock(props: Props): React.Node {
+  const theme = React.useContext(RNTesterThemeContext);
+  return (
+    <View
+      style={StyleSheet.compose(styles.container, {
+        borderColor: theme.SeparatorColor,
+      })}
+      testID={props.testID}>
+      {props.children}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    paddingVertical: 6,
+    paddingHorizontal: 10,
+    borderBottomWidth: 1,
+  },
+});
diff --git a/packages/rn-tester/js/components/RNTOption.js b/packages/rn-tester/js/components/RNTOption.js
new file mode 100644
index 00000000000000..af09d58aacb361
--- /dev/null
+++ b/packages/rn-tester/js/components/RNTOption.js
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+'use strict';
+
+import * as React from 'react';
+import {Text, Pressable, StyleSheet, View} from 'react-native';
+import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
+import {RNTesterThemeContext} from './RNTesterTheme';
+
+type Props = $ReadOnly<{|
+  testID?: ?string,
+  label: string,
+  onPress?: ?(event: PressEvent) => mixed,
+  selected?: ?boolean,
+  multiSelect?: ?boolean,
+  disabled?: ?boolean,
+  style?: ViewStyleProp,
+|}>;
+
+/**
+ * A reusable toggle button component for RNTester. Highlights when selected.
+ */
+export default function RNTOption(props: Props): React.Node {
+  const [pressed, setPressed] = React.useState(false);
+  const theme = React.useContext(RNTesterThemeContext);
+
+  return (
+    <Pressable
+      accessibilityState={{selected: !!props.selected}}
+      disabled={
+        props.disabled === false || props.multiSelect === true
+          ? false
+          : props.selected
+      }
+      hitSlop={4}
+      onPress={props.onPress}
+      onPressIn={() => setPressed(true)}
+      onPressOut={() => setPressed(false)}
+      testID={props.testID}>
+      <View
+        style={[
+          styles.container,
+          props.selected === true ? styles.selected : null,
+          pressed && props.selected !== true ? styles.pressed : null,
+          props.disabled === true
+            ? [
+                styles.disabled,
+                {backgroundColor: theme.TertiarySystemFillColor},
+              ]
+            : null,
+          props.style,
+        ]}>
+        <Text style={styles.label}>{props.label}</Text>
+      </View>
+    </Pressable>
+  );
+}
+
+const styles = StyleSheet.create({
+  pressed: {
+    backgroundColor: 'rgba(100,215,255,.3)',
+  },
+  label: {
+    color: 'black',
+  },
+  selected: {
+    backgroundColor: 'rgba(100,215,255,.3)',
+    borderColor: 'rgba(100,215,255,.3)',
+  },
+  disabled: {borderWidth: 0},
+  container: {
+    borderColor: 'rgba(0,0,0, 0.1)',
+    borderWidth: 1,
+    borderRadius: 16,
+    padding: 6,
+    paddingHorizontal: 10,
+    alignItems: 'center',
+  },
+});
diff --git a/packages/rn-tester/js/components/RNTPressableRow.js b/packages/rn-tester/js/components/RNTPressableRow.js
new file mode 100644
index 00000000000000..1b111c0122dd7e
--- /dev/null
+++ b/packages/rn-tester/js/components/RNTPressableRow.js
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+import * as React from 'react';
+import {RNTesterThemeContext} from './RNTesterTheme';
+import RNTesterComponentTitle from './RNTesterComponentTitle';
+
+import {Platform, StyleSheet, Pressable, Text, View} from 'react-native';
+
+type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
+type Props = {
+  accessibilityLabel?: ?string,
+  testID?: ?string,
+  onPressIn?: ?() => mixed,
+  onPressOut?: ?() => mixed,
+  rightAddOn?: ?React.Node,
+  bottomAddOn?: ?React.Node,
+  children?: ?React.Node,
+  title: string,
+  description?: ?string,
+  onPress: () => mixed,
+  style?: ViewStyleProp | ((pressed: boolean) => ViewStyleProp),
+};
+
+export default function RNTPressableRow({
+  onPressIn,
+  onPressOut,
+  title,
+  description,
+  rightAddOn,
+  bottomAddOn,
+  onPress,
+  style,
+  accessibilityLabel,
+}: Props): React.Node {
+  const theme = React.useContext(RNTesterThemeContext);
+  const label = accessibilityLabel ?? `${title} ${description ?? ''}`;
+  return (
+    <Pressable
+      testID={title}
+      onPressIn={onPressIn}
+      onPressOut={onPressOut}
+      accessibilityLabel={label}
+      style={({pressed}) => [
+        styles.row,
+        typeof style === 'function' ? style(pressed) : style,
+        pressed
+          ? styles.pressed
+          : {backgroundColor: theme.SystemBackgroundColor},
+      ]}
+      onPress={onPress}>
+      <View style={styles.topRowStyle}>
+        <RNTesterComponentTitle>{title}</RNTesterComponentTitle>
+        {rightAddOn}
+      </View>
+      <Text
+        style={[styles.descriptionText, {color: theme.SecondaryLabelColor}]}>
+        {description}
+      </Text>
+      {bottomAddOn}
+    </Pressable>
+  );
+}
+
+const styles = StyleSheet.create({
+  row: {
+    justifyContent: 'center',
+    paddingHorizontal: 15,
+    paddingVertical: 12,
+    marginVertical: Platform.select({ios: 4, android: 8}),
+    marginHorizontal: 15,
+    overflow: 'hidden',
+    elevation: 5,
+    backgroundColor: Platform.select({ios: '#FFFFFF', android: '#F3F8FF'}),
+  },
+  descriptionText: {
+    fontSize: 12,
+    lineHeight: 20,
+    marginBottom: 5,
+  },
+  pressed: {
+    backgroundColor: 'rgb(242,242,242)',
+    elevation: 3,
+  },
+  topRowStyle: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    flex: 1,
+  },
+});
diff --git a/packages/rn-tester/js/components/RNTTestDetails.js b/packages/rn-tester/js/components/RNTTestDetails.js
new file mode 100644
index 00000000000000..2f7c247ad8c86c
--- /dev/null
+++ b/packages/rn-tester/js/components/RNTTestDetails.js
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import * as React from 'react';
+import {View, Text, StyleSheet, Button} from 'react-native';
+import {type RNTesterTheme} from './RNTesterTheme';
+
+function RNTTestDetails({
+  description,
+  expect,
+  title,
+  theme,
+}: {
+  description?: string,
+  expect?: string,
+  title: string,
+  theme: RNTesterTheme,
+}): React.Node {
+  const [collapsed, setCollapsed] = React.useState(false);
+
+  const content = (
+    <>
+      {description == null ? null : (
+        <View style={styles.section}>
+          <Text style={styles.heading}>Description</Text>
+          <Text style={styles.paragraph}>{description}</Text>
+        </View>
+      )}
+      {expect == null ? null : (
+        <View style={styles.section}>
+          <Text style={styles.heading}>Expectation</Text>
+          <Text style={styles.paragraph}>{expect}</Text>
+        </View>
+      )}
+    </>
+  );
+  return (
+    <View
+      style={StyleSheet.compose(styles.container, {
+        borderColor: theme.SeparatorColor,
+      })}>
+      <View style={styles.titleRow}>
+        <Text
+          numberOfLines={1}
+          style={StyleSheet.compose(styles.title, {color: theme.LabelColor})}>
+          {title}
+        </Text>
+        {content != null && (
+          <Button
+            title={collapsed ? 'Expand' : 'Collapse'}
+            onPress={() => setCollapsed(!collapsed)}
+            color={theme.LinkColor}
+          />
+        )}
+      </View>
+      {!collapsed ? content : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    paddingHorizontal: 10,
+    paddingTop: 6,
+    paddingBottom: 10,
+    borderBottomWidth: 1,
+  },
+  heading: {
+    fontSize: 16,
+    color: 'grey',
+    fontWeight: '500',
+  },
+  paragraph: {
+    fontSize: 14,
+  },
+  section: {
+    marginVertical: 4,
+  },
+  title: {
+    fontSize: 18,
+  },
+  titleRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+});
+
+export default RNTTestDetails;
diff --git a/packages/rn-tester/js/components/RNTesterHeader.js b/packages/rn-tester/js/components/RNTTitleBar.js
similarity index 78%
rename from packages/rn-tester/js/components/RNTesterHeader.js
rename to packages/rn-tester/js/components/RNTTitleBar.js
index 9a6293c1feca09..5774c61f840841 100644
--- a/packages/rn-tester/js/components/RNTesterHeader.js
+++ b/packages/rn-tester/js/components/RNTTitleBar.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import {
   Text,
   View,
@@ -20,27 +18,21 @@ import {
 } from 'react-native';
 import * as React from 'react';
 import RNTesterDocumentationURL from './RNTesterDocumentationURL';
-import {RNTesterThemeContext} from './RNTesterTheme';
+import {type RNTesterTheme} from './RNTesterTheme';
 
 const HeaderIOS = ({
   onBack,
   title,
   documentationURL,
+  theme,
 }: {
-  onBack?: () => mixed,
+  onBack?: ?() => mixed,
   title: string,
   documentationURL?: string,
+  theme: RNTesterTheme,
 }) => {
-  const theme = React.useContext(RNTesterThemeContext);
   return (
-    <SafeAreaView
-      style={[
-        styles.headerContainer,
-        {
-          borderBottomColor: theme.SeparatorColor,
-          backgroundColor: theme.TertiarySystemBackgroundColor,
-        },
-      ]}>
+    <SafeAreaView>
       <View style={styles.header}>
         <View style={styles.headerCenter}>
           <Text style={{...styles.title, ...{color: theme.LabelColor}}}>
@@ -50,7 +42,7 @@ const HeaderIOS = ({
             <RNTesterDocumentationURL documentationURL={documentationURL} />
           )}
         </View>
-        {onBack && (
+        {onBack != null && (
           <View>
             <Button
               title="Back"
@@ -70,14 +62,15 @@ const HeaderIOS = ({
 const HeaderAndroid = ({
   title,
   documentationURL,
+  theme,
 }: {
   title: string,
   documentationURL?: string,
+  theme: RNTesterTheme,
 }) => {
-  const theme = React.useContext(RNTesterThemeContext);
   return (
     <SafeAreaView>
-      <View style={[styles.toolbar, {backgroundColor: '#F3F8FF'}]}>
+      <View style={[styles.toolbar, {backgroundColor: theme.BackgroundColor}]}>
         <View style={styles.toolbarCenter}>
           <Text style={[styles.title, {color: theme.LabelColor}]}>{title}</Text>
           {documentationURL && (
@@ -89,25 +82,33 @@ const HeaderAndroid = ({
   );
 };
 
-export const Header = ({
+export default function RNTTitleBar({
   onBack,
   title,
   documentationURL,
+  theme,
 }: {
-  onBack?: () => mixed,
+  onBack?: ?() => mixed,
   title: string,
   documentationURL?: string,
+  theme: RNTesterTheme,
   ...
-}): React.Node =>
-  Platform.OS === 'ios' ? (
+}): React.Node {
+  return Platform.OS === 'ios' ? (
     <HeaderIOS
       documentationURL={documentationURL}
       title={title}
       onBack={onBack}
+      theme={theme}
     />
   ) : (
-    <HeaderAndroid documentationURL={documentationURL} title={title} />
+    <HeaderAndroid
+      documentationURL={documentationURL}
+      title={title}
+      theme={theme}
+    />
   );
+}
 
 const styles = StyleSheet.create({
   headerContainer: {
diff --git a/packages/rn-tester/js/components/RNTesterBlock.js b/packages/rn-tester/js/components/RNTesterBlock.js
index 467d5e8a2768df..375985fc100568 100644
--- a/packages/rn-tester/js/components/RNTesterBlock.js
+++ b/packages/rn-tester/js/components/RNTesterBlock.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import * as React from 'react';
 import {RNTesterThemeContext} from './RNTesterTheme';
 import {PlatformColor, StyleSheet, Text, View} from 'react-native';
@@ -24,11 +22,23 @@ type Props = $ReadOnly<{|
 const RNTesterBlock = ({description, title, children}: Props): React.Node => {
   const theme = React.useContext(RNTesterThemeContext);
   return (
-    <View style={[[styles.container], {borderColor: theme.SeparatorColor}]}>
+    <View
+      style={[
+        [styles.container],
+        {
+          borderColor: theme.SeparatorColor,
+          backgroundColor: theme.SystemBackgroundColor,
+        },
+      ]}>
       <View style={[styles.titleContainer]}>
-        <Text style={[styles.titleText]}>{title}</Text>
+        <Text style={[styles.titleText, {color: theme.LabelColor}]}>
+          {title}
+        </Text>
         <Text
-          style={[styles.descriptionText, {marginTop: description ? 10 : 0}]}>
+          style={[
+            styles.descriptionText,
+            {color: theme.LabelColor, marginTop: description ? 10 : 0},
+          ]}>
           {description}
         </Text>
       </View>
@@ -92,6 +102,7 @@ const styles = StyleSheet.create({
   descriptionText: {
     fontSize: 12,
     opacity: 0.5,
+    // [ TODO(macOS GH#774) Fix tester block description color in DarkMode
     ...Platform.select({
       macos: {
         color: PlatformColor('secondaryLabelColor'),
@@ -100,12 +111,11 @@ const styles = StyleSheet.create({
         color: PlatformColor('secondaryLabelColor'),
       },
       default: undefined,
-    }),
+    }), // TODO(macOS GH#774) ]
   },
   children: {
-    paddingTop: 10,
-    paddingHorizontal: 10,
-    margin: 10,
+    marginHorizontal: 20,
+    marginVertical: 10,
   },
 });
 
diff --git a/packages/rn-tester/js/components/RNTesterBookmarkButton.js b/packages/rn-tester/js/components/RNTesterBookmarkButton.js
index 63de5a5b45270a..83868c8c990ef3 100644
--- a/packages/rn-tester/js/components/RNTesterBookmarkButton.js
+++ b/packages/rn-tester/js/components/RNTesterBookmarkButton.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const React = require('react');
 
 import {TouchableOpacity, Image, StyleSheet} from 'react-native';
diff --git a/packages/rn-tester/js/components/RNTesterButton.js b/packages/rn-tester/js/components/RNTesterButton.js
index d006e17f2b1c6a..0f5ffe4720b207 100644
--- a/packages/rn-tester/js/components/RNTesterButton.js
+++ b/packages/rn-tester/js/components/RNTesterButton.js
@@ -17,6 +17,7 @@ const {StyleSheet, Text, TouchableHighlight} = require('react-native');
 import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 
 type Props = $ReadOnly<{|
+  testID?: string,
   children?: React.Node,
   onPress?: ?(event: PressEvent) => mixed,
 |}>;
@@ -25,6 +26,7 @@ class RNTesterButton extends React.Component<Props> {
   render(): React.Node {
     return (
       <TouchableHighlight
+        testID={this.props.testID}
         onPress={this.props.onPress}
         style={styles.button}
         underlayColor="grey">
diff --git a/packages/rn-tester/js/components/RNTesterDocumentationURL.js b/packages/rn-tester/js/components/RNTesterDocumentationURL.js
index 0a8b20823fb860..8c95f9f9f67443 100644
--- a/packages/rn-tester/js/components/RNTesterDocumentationURL.js
+++ b/packages/rn-tester/js/components/RNTesterDocumentationURL.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import * as React from 'react';
 import {Image, StyleSheet, TouchableOpacity} from 'react-native';
 import openURLInBrowser from 'react-native/Libraries/Core/Devtools/openURLInBrowser';
diff --git a/packages/rn-tester/js/components/RNTesterEmptyBookmarksState.js b/packages/rn-tester/js/components/RNTesterEmptyBookmarksState.js
index dd6aa6a43aae72..3a526168a564f9 100644
--- a/packages/rn-tester/js/components/RNTesterEmptyBookmarksState.js
+++ b/packages/rn-tester/js/components/RNTesterEmptyBookmarksState.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import * as React from 'react';
 import {View, Image, Text, StyleSheet} from 'react-native';
 
diff --git a/packages/rn-tester/js/components/RNTesterExampleContainer.js b/packages/rn-tester/js/components/RNTesterExampleContainer.js
deleted file mode 100644
index f64e3ff43925d1..00000000000000
--- a/packages/rn-tester/js/components/RNTesterExampleContainer.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-'use strict';
-
-const React = require('react');
-const {Platform} = require('react-native');
-const RNTesterBlock = require('./RNTesterBlock');
-const RNTesterExampleFilter = require('./RNTesterExampleFilter');
-
-const invariant = require('invariant');
-import ExamplePage from './ExamplePage';
-
-class RNTesterExampleContainer extends React.Component {
-  renderExample(example, i) {
-    // Filter platform-specific examples
-    const {description, platform} = example;
-    let {title} = example;
-    if (platform) {
-      // [TODO(macOS GH#774)
-      if (platform instanceof Array) {
-        if (!platform.includes(Platform.OS)) {
-          return null;
-        }
-        title += ' (' + platform.join() + ' only)';
-      } else {
-        // ]TODO(macOS GH#774)
-        if (Platform.OS !== platform) {
-          return null;
-        }
-        title += ' (' + platform + ' only)';
-      } // TODO(macOS GH#774)
-    }
-    return (
-      <RNTesterBlock key={i} title={title} description={description}>
-        {example.render()}
-      </RNTesterBlock>
-    );
-  }
-
-  render(): React.Element<any> {
-    const {module} = this.props;
-    if (module.simpleExampleContainer) {
-      invariant(
-        module.examples.length === 1,
-        'If noExampleContainer is specified, only one example is allowed',
-      );
-      return (
-        <ExamplePage
-          title={module.title}
-          description={module.description}
-          android={!module.platform || module.platform === 'android'}
-          ios={!module.platform || module.platform === 'ios'}
-          documentationURL={module.documentationURL}
-          category={module.category}>
-          {module.examples[0].render()}
-        </ExamplePage>
-      );
-    }
-    if (module.examples.length === 1) {
-      return (
-        <ExamplePage
-          title={module.title}
-          description={module.description}
-          android={!module.platform || module.platform === 'android'}
-          ios={!module.platform || module.platform === 'ios'}
-          documentationURL={module.documentationURL}
-          category={module.category}>
-          {module.examples[0].render()}
-        </ExamplePage>
-      );
-    }
-
-    const filter = ({example, filterRegex}) => filterRegex.test(example.title);
-
-    const sections = [
-      {
-        data: module.examples,
-        title: 'EXAMPLES',
-        key: 'e',
-      },
-    ];
-
-    return (
-      <ExamplePage
-        title={module.title}
-        description={module.description}
-        android={!module.platform || module.platform === 'android'}
-        ios={!module.platform || module.platform === 'ios'}
-        documentationURL={module.documentationURL}
-        category={module.category}>
-        <RNTesterExampleFilter
-          testID="example_search"
-          page="examples_page"
-          hideFilterPills={true}
-          sections={sections}
-          filter={filter}
-          render={({filteredSections}) =>
-            filteredSections[0].data.map(this.renderExample)
-          }
-        />
-      </ExamplePage>
-    );
-  }
-}
-
-module.exports = RNTesterExampleContainer;
diff --git a/packages/rn-tester/js/components/RNTesterExampleFilter.js b/packages/rn-tester/js/components/RNTesterExampleFilter.js
index efcefc5a2717c4..768b0137fcad8d 100644
--- a/packages/rn-tester/js/components/RNTesterExampleFilter.js
+++ b/packages/rn-tester/js/components/RNTesterExampleFilter.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const React = require('react');
 const RNTesterListFilters = require('./RNTesterListFilters');
 const {
@@ -20,24 +18,23 @@ const {
   Image,
 } = require('react-native');
 import {RNTesterThemeContext} from './RNTesterTheme';
-import type {RNTesterExample} from '../types/RNTesterTypes';
 
 import type {SectionData} from '../types/RNTesterTypes';
 
-type Props = {
+type Props<T> = {
   filter: Function,
   render: Function,
   disableSearch?: boolean,
   testID?: string,
   hideFilterPills?: boolean,
   page: 'examples_page' | 'components_page' | 'bookmarks_page',
-  sections: SectionData[],
+  sections: $ReadOnlyArray<SectionData<T>>,
   ...
 };
 
 type State = {filter: string, category: string, ...};
 
-class RNTesterExampleFilter extends React.Component<Props, State> {
+class RNTesterExampleFilter<T> extends React.Component<Props<T>, State> {
   state: State = {filter: '', category: ''};
 
   render(): React.Node {
@@ -108,7 +105,11 @@ class RNTesterExampleFilter extends React.Component<Props, State> {
       <RNTesterThemeContext.Consumer>
         {theme => {
           return (
-            <View style={[styles.searchRow, {backgroundColor: '#F3F8FF'}]}>
+            <View
+              style={[
+                styles.searchRow,
+                {backgroundColor: theme.BackgroundColor},
+              ]}>
               <View style={styles.textInputStyle}>
                 <Image
                   source={require('../assets/search-icon.png')}
@@ -157,7 +158,7 @@ const styles = StyleSheet.create({
   },
   searchRow: {
     paddingHorizontal: 20,
-    paddingVertical: 10,
+    paddingVertical: 6,
     alignItems: 'center',
   },
   searchTextInput: {
diff --git a/packages/rn-tester/js/components/RNTesterModuleContainer.js b/packages/rn-tester/js/components/RNTesterModuleContainer.js
new file mode 100644
index 00000000000000..73e8a84f5f010b
--- /dev/null
+++ b/packages/rn-tester/js/components/RNTesterModuleContainer.js
@@ -0,0 +1,157 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import * as React from 'react';
+const RNTesterBlock = require('./RNTesterBlock');
+const RNTesterExampleFilter = require('./RNTesterExampleFilter');
+import RNTPressableRow from './RNTPressableRow';
+import {RNTesterThemeContext, type RNTesterTheme} from './RNTesterTheme';
+import {View, Text, StyleSheet, Platform} from 'react-native';
+import RNTTestDetails from './RNTTestDetails';
+
+import type {
+  RNTesterModule,
+  RNTesterModuleExample,
+} from '../types/RNTesterTypes';
+
+type Props = {
+  module: RNTesterModule,
+  example?: ?RNTesterModuleExample,
+  onExampleCardPress?: ?(exampleName: string) => mixed,
+};
+
+function getExampleTitle(title, platform) {
+  return platform != null ? `${title} (${platform} only)` : title;
+}
+
+export default function RNTesterModuleContainer(props: Props): React.Node {
+  const {module, example, onExampleCardPress} = props;
+  const theme = React.useContext(RNTesterThemeContext);
+  const renderExample = (e, i) => {
+    // Filter platform-specific es
+    const {title, description, platform, render: ExampleComponent} = e;
+    if (platform != null && Platform.OS !== platform) {
+      return null;
+    }
+    return module.showIndividualExamples === true ? (
+      <RNTPressableRow
+        key={e.name}
+        onPress={() => onExampleCardPress?.(e.name)}
+        title={title}
+        description={description}
+        accessibilityLabel={e.name + ' ' + description}
+        style={StyleSheet.compose(styles.separator, {
+          borderBottomColor: theme.SeparatorColor,
+        })}
+      />
+    ) : (
+      <RNTesterBlock
+        key={i}
+        title={getExampleTitle(title, platform)}
+        description={description}>
+        <ExampleComponent />
+      </RNTesterBlock>
+    );
+  };
+
+  // TODO remove this case
+  if (module.examples.length === 1) {
+    const description = module.examples[0].description ?? module.description;
+    const ModuleSingleExample = module.examples[0].render;
+    return (
+      <>
+        <Header description={description} theme={theme} />
+        <ModuleSingleExample />
+      </>
+    );
+  }
+
+  const filter = ({example: e, filterRegex}) => filterRegex.test(e.title);
+
+  const sections = [
+    {
+      data: module.examples,
+      title: 'EXAMPLES',
+      key: 'e',
+    },
+  ];
+
+  return module.showIndividualExamples === true && example != null ? (
+    <>
+      <RNTTestDetails
+        title={example.title}
+        description={example.description}
+        expect={example.expect}
+        theme={theme}
+      />
+      <View style={styles.examplesContainer}>
+        <example.render />
+      </View>
+    </>
+  ) : (
+    <>
+      <Header description={module.description} noBottomPadding theme={theme} />
+      <View style={styles.examplesContainer}>
+        <RNTesterExampleFilter
+          testID="example_search"
+          page="examples_page"
+          hideFilterPills={true}
+          sections={sections}
+          filter={filter}
+          render={({filteredSections}) =>
+            filteredSections[0].data.map(renderExample)
+          }
+        />
+      </View>
+    </>
+  );
+}
+
+function Header(props: {
+  description: string,
+  theme: RNTesterTheme,
+  noBottomPadding?: ?boolean,
+}) {
+  return (
+    <View
+      style={[
+        styles.headerContainer,
+        props.noBottomPadding === true ? styles.headerNoBottomPadding : null,
+        {backgroundColor: props.theme.BackgroundColor},
+      ]}>
+      <Text style={styles.headerDescription}>{props.description}</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  headerContainer: {
+    paddingHorizontal: Platform.OS === 'android' ? 15 : 6,
+    paddingVertical: 6,
+    alignItems: 'center',
+  },
+  headerDescription: {
+    fontSize: 14,
+  },
+  headerNoBottomPadding: {
+    paddingBottom: 0,
+  },
+  examplesContainer: {
+    flexGrow: 1,
+    flex: 1,
+  },
+  separator: {
+    borderBottomWidth: Platform.select({
+      ios: StyleSheet.hairlineWidth,
+      android: 0,
+    }),
+    marginHorizontal: 15,
+  },
+});
diff --git a/packages/rn-tester/js/components/RNTesterExampleList.js b/packages/rn-tester/js/components/RNTesterModuleList.js
similarity index 83%
rename from packages/rn-tester/js/components/RNTesterExampleList.js
rename to packages/rn-tester/js/components/RNTesterModuleList.js
index 47a7b1b8b8132f..b551f7736efbb6 100644
--- a/packages/rn-tester/js/components/RNTesterExampleList.js
+++ b/packages/rn-tester/js/components/RNTesterModuleList.js
@@ -8,10 +8,8 @@
  * @flow
  */
 
-'use strict';
-
 const RNTesterExampleFilter = require('./RNTesterExampleFilter');
-const RNTesterComponentTitle = require('./RNTesterComponentTitle');
+import RNTPressableRow from './RNTPressableRow';
 const React = require('react');
 
 const {
@@ -27,7 +25,7 @@ const {
 
 import {RNTesterThemeContext} from './RNTesterTheme';
 
-const ExampleCard = ({
+const ExampleModuleRow = ({
   onShowUnderlay,
   onHideUnderlay,
   item,
@@ -38,44 +36,36 @@ const ExampleCard = ({
   const platform = item.module.platform;
   const onIos = !platform || platform === 'ios';
   const onAndroid = !platform || platform === 'android';
-  return (
+  const rightAddOn = (
     <TouchableHighlight
-      testID={item.module.title}
-      onShowUnderlay={onShowUnderlay}
-      onHideUnderlay={onHideUnderlay}
       focusable={false} // TODO(macOS GH#774)
-      accessibilityLabel={item.module.title + ' ' + item.module.description}
-      style={styles.listItem}
-      underlayColor={'rgb(242,242,242)'}
+      style={styles.imageViewStyle}
       onPress={() =>
-        handlePress({exampleType: item.exampleType, key: item.key})
+        toggleBookmark({
+          exampleType: item.exampleType,
+          key: item.key,
+        })
       }>
-      <View
-        style={[styles.row, {backgroundColor: theme.SystemBackgroundColor}]}>
-        <View style={styles.topRowStyle}>
-          <RNTesterComponentTitle>{item.module.title}</RNTesterComponentTitle>
-          <TouchableHighlight
-            style={styles.imageViewStyle}
-            onPress={() =>
-              toggleBookmark({exampleType: item.exampleType, key: item.key})
-            }>
-            <Image
-              style={styles.imageStyle}
-              source={
-                item.isBookmarked
-                  ? require('../assets/bookmark-outline-blue.png')
-                  : require('../assets/bookmark-outline-gray.png')
-              }
-            />
-          </TouchableHighlight>
-        </View>
-        <Text
-          style={[
-            styles.rowDetailText,
-            {color: theme.SecondaryLabelColor, marginBottom: 5},
-          ]}>
-          {item.module.description}
-        </Text>
+      <Image
+        style={styles.imageStyle}
+        source={
+          item.isBookmarked
+            ? require('../assets/bookmark-outline-blue.png')
+            : require('../assets/bookmark-outline-gray.png')
+        }
+      />
+    </TouchableHighlight>
+  );
+  return (
+    <RNTPressableRow
+      title={item.module.title}
+      description={item.module.description}
+      testID={item.module.title}
+      onPressIn={onShowUnderlay}
+      onPressOut={onHideUnderlay}
+      accessibilityLabel={item.module.title + ' ' + item.module.description}
+      rightAddOn={rightAddOn}
+      bottomAddOn={
         <View style={styles.bottomRowStyle}>
           <Text style={{color: theme.SecondaryLabelColor, width: 65}}>
             {item.module.category || 'Other'}
@@ -97,8 +87,15 @@ const ExampleCard = ({
             </Text>
           </View>
         </View>
-      </View>
-    </TouchableHighlight>
+      }
+      onPress={() =>
+        handlePress({
+          exampleType: item.exampleType,
+          key: item.key,
+          title: item.module.title,
+        })
+      }
+    />
   );
 };
 
@@ -121,8 +118,8 @@ const renderSectionHeader = ({section}) => (
   </RNTesterThemeContext.Consumer>
 );
 
-const RNTesterExampleList: React$AbstractComponent<any, void> = React.memo(
-  ({sections, toggleBookmark, handleExampleCardPress}) => {
+const RNTesterModuleList: React$AbstractComponent<any, void> = React.memo(
+  ({sections, toggleBookmark, handleModuleCardPress}) => {
     const theme = React.useContext(RNTesterThemeContext);
 
     const filter = ({example, filterRegex, category}) =>
@@ -132,13 +129,13 @@ const RNTesterExampleList: React$AbstractComponent<any, void> = React.memo(
 
     const renderListItem = ({item, section, separators}) => {
       return (
-        <ExampleCard
+        <ExampleModuleRow
           item={item}
           section={section}
           onShowUnderlay={separators.highlight}
           onHideUnderlay={separators.unhighlight}
           toggleBookmark={toggleBookmark}
-          handlePress={handleExampleCardPress}
+          handlePress={handleModuleCardPress}
         />
       );
     };
@@ -154,6 +151,7 @@ const RNTesterExampleList: React$AbstractComponent<any, void> = React.memo(
           page="components_page"
           sections={sections}
           filter={filter}
+          hideFilterPills={true}
           render={({filteredSections}) => (
             <SectionList
               sections={filteredSections}
@@ -310,10 +308,6 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'space-between',
   },
-  rowDetailText: {
-    fontSize: 12,
-    lineHeight: 20,
-  },
   imageViewStyle: {
     height: 30,
     width: 30,
@@ -334,4 +328,4 @@ const styles = StyleSheet.create({
   },
 });
 
-module.exports = RNTesterExampleList;
+module.exports = RNTesterModuleList;
diff --git a/packages/rn-tester/js/components/RNTesterNavbar.js b/packages/rn-tester/js/components/RNTesterNavbar.js
index 24d703c00e4028..c3360581e8db6d 100644
--- a/packages/rn-tester/js/components/RNTesterNavbar.js
+++ b/packages/rn-tester/js/components/RNTesterNavbar.js
@@ -15,9 +15,11 @@ import {RNTesterThemeContext} from './RNTesterTheme';
 
 const BookmarkTab = ({handleNavBarPress, isBookmarkActive, theme}) => (
   <View style={styles.centerBox}>
-    <Image
-      style={styles.centralBoxCutout}
-      source={require('./../assets/bottom-nav-center-box.png')}
+    <View
+      style={[
+        styles.centralBoxCutout,
+        {backgroundColor: theme.BackgroundColor},
+      ]}
     />
     <View style={styles.floatContainer}>
       <Pressable
@@ -133,6 +135,8 @@ const RNTesterNavbar = ({
   );
 };
 
+export const navBarHeight = 65;
+
 const styles = StyleSheet.create({
   floatContainer: {
     flex: 1,
@@ -191,11 +195,11 @@ const styles = StyleSheet.create({
   },
   centerBox: {
     flex: 1,
-    height: 65,
+    height: navBarHeight,
   },
   navButton: {
     flex: 1,
-    height: 65,
+    height: navBarHeight,
     justifyContent: 'center',
     alignItems: 'center',
   },
@@ -207,4 +211,4 @@ const styles = StyleSheet.create({
   },
 });
 
-module.exports = RNTesterNavbar;
+export default RNTesterNavbar;
diff --git a/packages/rn-tester/js/components/RNTesterPage.js b/packages/rn-tester/js/components/RNTesterPage.js
index e599db011a806b..b9f02264621718 100644
--- a/packages/rn-tester/js/components/RNTesterPage.js
+++ b/packages/rn-tester/js/components/RNTesterPage.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const RNTesterTitle = require('./RNTesterTitle');
 const React = require('react');
 const {ScrollView, StyleSheet, View} = require('react-native');
diff --git a/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js b/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js
index fafcf7a5ffb722..3d38793e9ea6ed 100644
--- a/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js
+++ b/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js
@@ -47,9 +47,9 @@ const styles = StyleSheet.create({
     justifyContent: 'space-between',
   },
 });
-/* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.85 was deployed. To see the error, delete this comment
- * and run Flow. */
+/* $FlowFixMe[cannot-reassign-export] (>=0.85.0 site=react_native_fb) This
+ * comment suppresses an error found when Flow v0.85 was deployed. To see the
+ * error, delete this comment and run Flow. */
 RNTesterSettingSwitchRow = RNTesterStatePersister.createContainer(
   RNTesterSettingSwitchRow,
   {
diff --git a/packages/rn-tester/js/components/RNTesterTheme.js b/packages/rn-tester/js/components/RNTesterTheme.js
index 4a9371296321a8..28bab6c1dce12a 100644
--- a/packages/rn-tester/js/components/RNTesterTheme.js
+++ b/packages/rn-tester/js/components/RNTesterTheme.js
@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import {Appearance} from 'react-native';
 import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheet';
diff --git a/packages/rn-tester/js/components/RNTesterTitle.js b/packages/rn-tester/js/components/RNTesterTitle.js
index 44c1abac2f070e..a9955654043224 100644
--- a/packages/rn-tester/js/components/RNTesterTitle.js
+++ b/packages/rn-tester/js/components/RNTesterTitle.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const React = require('react');
 
 const {StyleSheet, Text, View} = require('react-native');
diff --git a/packages/rn-tester/js/components/TextInlineView.js b/packages/rn-tester/js/components/TextInlineView.js
index a15762131b5d22..b5b23ea2f85cb2 100644
--- a/packages/rn-tester/js/components/TextInlineView.js
+++ b/packages/rn-tester/js/components/TextInlineView.js
@@ -107,7 +107,7 @@ type ChangeSizeState = {|
   width: number,
 |};
 
-class ChangeImageSize extends React.Component<*, ChangeSizeState> {
+class ChangeImageSize extends React.Component<mixed, ChangeSizeState> {
   state: ChangeSizeState = {
     width: 50,
   };
@@ -143,7 +143,7 @@ class ChangeImageSize extends React.Component<*, ChangeSizeState> {
   }
 }
 
-class ChangeViewSize extends React.Component<*, ChangeSizeState> {
+class ChangeViewSize extends React.Component<mixed, ChangeSizeState> {
   state: ChangeSizeState = {
     width: 50,
   };
@@ -175,7 +175,7 @@ class ChangeViewSize extends React.Component<*, ChangeSizeState> {
   }
 }
 
-class ChangeInnerViewSize extends React.Component<*, ChangeSizeState> {
+class ChangeInnerViewSize extends React.Component<mixed, ChangeSizeState> {
   state: ChangeSizeState = {
     width: 50,
   };
diff --git a/packages/rn-tester/js/components/TextLegend.js b/packages/rn-tester/js/components/TextLegend.js
index 2f513038390857..68f5fba87be43b 100644
--- a/packages/rn-tester/js/components/TextLegend.js
+++ b/packages/rn-tester/js/components/TextLegend.js
@@ -8,242 +8,248 @@
  * @flow
  */
 
-'use strict';
+import * as React from 'react';
+import {Text, View, StyleSheet} from 'react-native';
+import RNTOption from './RNTOption';
 
-const React = require('react');
+const PANGRAMS = {
+  arabic:
+    'صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ',
+  chinese: 'Innovation in China 中国智造，慧及全球 0123456789',
+  english: 'The quick brown fox jumps over the lazy dog.',
+  emoji: '🙏🏾🚗💩😍🤯👩🏽‍🔧🇨🇦💯',
+  german: 'Falsches Üben von Xylophonmusik quält jeden größeren Zwerg',
+  greek: 'Ταχίστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός',
+  hebrew: 'דג סקרן שט בים מאוכזב ולפתע מצא חברה',
+  hindi:
+    'ऋषियों को सताने वाले दुष्ट राक्षसों के राजा रावण का सर्वनाश करने वाले विष्णुवतार भगवान श्रीराम, अयोध्या के महाराज दशरथ के बड़े सपुत्र थे।',
+  igbo:
+    'Nne, nna, wepụ he’l’ụjọ dum n’ime ọzụzụ ụmụ, vufesi obi nye Chukwu, ṅụrịanụ, gbakọọnụ kpaa, kwee ya ka o guzoshie ike; ọ ghaghị ito, nwapụta ezi agwa',
+  irish: 'D’fhuascail Íosa Úrmhac na hÓighe Beannaithe pór Éava agus Ádhaimh',
+  japanese:
+    '色は匂へど 散りぬるを 我が世誰ぞ 常ならむ 有為の奥山 今日越えて 浅き夢見じ 酔ひもせず',
+  korean: '키스의 고유조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다',
+  norwegian:
+    'Vår sære Zulu fra badeøya spilte jo whist og quickstep i min taxi.',
+  polish: 'Jeżu klątw, spłódź Finom część gry hańb!',
+  romanian: 'Muzicologă în bej vând whisky și tequila, preț fix.',
+  russian: 'Эх, чужак, общий съём цен шляп (юфть) – вдрызг!',
+  swedish: 'Yxskaftbud, ge vår WC-zonmö IQ-hjälp.',
+  thai:
+    'เป็นมนุษย์สุดประเสริฐเลิศคุณค่า กว่าบรรดาฝูงสัตว์เดรัจฉาน จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า หัดอภัยเหมือนกีฬาอัชฌาสัย ปฏิบัติประพฤติกฎกำหนดใจ พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอยฯ',
+};
 
-const {Text, View} = require('react-native');
-import {Picker} from 'react-native';
-
-class TextLegend extends React.Component<*, *> {
-  state: {|
-    alignment: $TEMPORARY$string<'left'>,
-    fontSize: number,
-    language: $TEMPORARY$string<'english'>,
-    textMetrics: Array<any>,
-  |} = {
-    textMetrics: [],
-    language: 'english',
-    alignment: 'left',
-    fontSize: 50,
-  };
-
-  render(): React.Node {
-    const PANGRAMS = {
-      arabic:
-        'صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ',
-      chinese: 'Innovation in China 中国智造，慧及全球 0123456789',
-      english: 'The quick brown fox jumps over the lazy dog.',
-      emoji: '🙏🏾🚗💩😍🤯👩🏽‍🔧🇨🇦💯',
-      german: 'Falsches Üben von Xylophonmusik quält jeden größeren Zwerg',
-      greek: 'Ταχίστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός',
-      hebrew: 'דג סקרן שט בים מאוכזב ולפתע מצא חברה',
-      hindi:
-        'ऋषियों को सताने वाले दुष्ट राक्षसों के राजा रावण का सर्वनाश करने वाले विष्णुवतार भगवान श्रीराम, अयोध्या के महाराज दशरथ के बड़े सपुत्र थे।',
-      igbo:
-        'Nne, nna, wepụ he’l’ụjọ dum n’ime ọzụzụ ụmụ, vufesi obi nye Chukwu, ṅụrịanụ, gbakọọnụ kpaa, kwee ya ka o guzoshie ike; ọ ghaghị ito, nwapụta ezi agwa',
-      irish:
-        'D’fhuascail Íosa Úrmhac na hÓighe Beannaithe pór Éava agus Ádhaimh',
-      japanese:
-        '色は匂へど 散りぬるを 我が世誰ぞ 常ならむ 有為の奥山 今日越えて 浅き夢見じ 酔ひもせず',
-      korean:
-        '키스의 고유조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다',
-      norwegian:
-        'Vår sære Zulu fra badeøya spilte jo whist og quickstep i min taxi.',
-      polish: 'Jeżu klątw, spłódź Finom część gry hańb!',
-      romanian: 'Muzicologă în bej vând whisky și tequila, preț fix.',
-      russian: 'Эх, чужак, общий съём цен шляп (юфть) – вдрызг!',
-      swedish: 'Yxskaftbud, ge vår WC-zonmö IQ-hjälp.',
-      thai:
-        'เป็นมนุษย์สุดประเสริฐเลิศคุณค่า กว่าบรรดาฝูงสัตว์เดรัจฉาน จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า หัดอภัยเหมือนกีฬาอัชฌาสัย ปฏิบัติประพฤติกฎกำหนดใจ พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอยฯ',
-    };
-    return (
-      <View>
-        <Text
-          onPress={() =>
-            this.setState(prevState => ({fontSize: prevState.fontSize + 3}))
-          }>
-          Increase size
-        </Text>
-        <Text
-          onPress={() =>
-            this.setState(prevState => ({fontSize: prevState.fontSize - 3}))
-          }>
-          Decrease size
-        </Text>
-        <Picker
-          selectedValue={this.state.language}
-          onValueChange={itemValue => this.setState({language: itemValue})}>
-          {Object.keys(PANGRAMS).map(x => (
-            <Picker.Item
-              label={x[0].toUpperCase() + x.substring(1)}
-              key={x}
-              value={x}
+export default function TextLegend(): React.Node {
+  const [language, setLanguage] = React.useState('english');
+  const [alignment, setAlignment] = React.useState('left');
+  const [textMetrics, setTextMetrics] = React.useState([]);
+  const [fontSize, setFontSize] = React.useState(50);
+  return (
+    <View>
+      <Text onPress={() => setFontSize(fontSize + 3)}>Increase size</Text>
+      <Text onPress={() => setFontSize(fontSize - 3)}>Decrease size</Text>
+      <View style={styles.block}>
+        <Text style={styles.title}>Language</Text>
+        <View style={styles.row}>
+          {Object.keys(PANGRAMS).map(lang => (
+            <RNTOption
+              label={lang[0].toUpperCase() + lang.substring(1)}
+              key={lang}
+              onPress={() => setLanguage(lang)}
+              selected={lang === language}
+              style={styles.option}
             />
           ))}
-        </Picker>
-        <View>
-          {this.state.textMetrics.map(
-            ({
-              x,
-              y,
-              width,
-              height,
-              capHeight,
-              ascender,
-              descender,
-              xHeight,
-            }) => {
-              return [
-                <View
-                  key="baseline view"
-                  style={{
-                    top: y + ascender,
-                    height: 1,
-                    left: 0,
-                    right: 0,
-                    position: 'absolute',
-                    backgroundColor: 'red',
-                  }}
-                />,
-                <Text
-                  key="baseline text"
-                  style={{
-                    top: y + ascender,
-                    right: 0,
-                    position: 'absolute',
-                    color: 'red',
-                  }}>
-                  Baseline
-                </Text>,
-                <View
-                  key="capheight view"
-                  style={{
-                    top: y + ascender - capHeight,
-                    height: 1,
-                    left: 0,
-                    right: 0,
-                    position: 'absolute',
-                    backgroundColor: 'green',
-                  }}
-                />,
-                <Text
-                  key="capheight text"
-                  style={{
-                    top: y + ascender - capHeight,
-                    right: 0,
-                    position: 'absolute',
-                    color: 'green',
-                  }}>
-                  Capheight
-                </Text>,
-                <View
-                  key="xheight view"
-                  style={{
-                    top: y + ascender - xHeight,
-                    height: 1,
-                    left: 0,
-                    right: 0,
-                    position: 'absolute',
-                    backgroundColor: 'blue',
-                  }}
-                />,
-                <Text
-                  key="xheight text"
-                  style={{
-                    top: y + ascender - xHeight,
-                    right: 0,
-                    position: 'absolute',
-                    color: 'blue',
-                  }}>
-                  X-height
-                </Text>,
-                <View
-                  key="descender view"
-                  style={{
-                    top: y + ascender + descender,
-                    height: 1,
-                    left: 0,
-                    right: 0,
-                    position: 'absolute',
-                    backgroundColor: 'orange',
-                  }}
-                />,
-                <Text
-                  key="descender text"
-                  style={{
-                    top: y + ascender + descender,
-                    right: 0,
-                    position: 'absolute',
-                    color: 'orange',
-                  }}>
-                  Descender
-                </Text>,
-                <View
-                  key="end of text view"
-                  style={{
-                    top: y,
-                    height: height,
-                    width: 1,
-                    left: x + width,
-                    position: 'absolute',
-                    backgroundColor: 'brown',
-                  }}
-                />,
-                <Text
-                  key="end of text text"
-                  style={{
-                    top: y,
-                    left: x + width + 5,
-                    position: 'absolute',
-                    color: 'brown',
-                  }}>
-                  End of text
-                </Text>,
-                <View
-                  key="start of text view"
-                  style={{
-                    top: y,
-                    height: height,
-                    width: 1,
-                    left: x,
-                    position: 'absolute',
-                    backgroundColor: 'brown',
-                  }}
-                />,
-                <Text
-                  key="start of text text"
-                  style={{
-                    top: y,
-                    left: x + 5,
-                    position: 'absolute',
-                    color: 'brown',
-                  }}>
-                  Start of text
-                </Text>,
-              ];
-            },
-          )}
-          <Text
-            onTextLayout={event => {
-              this.setState({textMetrics: event.nativeEvent.lines});
-            }}
-            style={{
-              fontSize: this.state.fontSize,
-              textAlign: this.state.alignment,
-            }}>
-            {PANGRAMS[this.state.language]}
-          </Text>
         </View>
-        <Picker
-          selectedValue={this.state.alignment}
-          onValueChange={itemValue => this.setState({alignment: itemValue})}>
-          <Picker.Item label="Left align" value="left" />
-          <Picker.Item label="Center align" value="center" />
-          <Picker.Item label="Right align" value="right" />
-        </Picker>
       </View>
-    );
-  }
+      <View>
+        {textMetrics.map(
+          ({x, y, width, height, capHeight, ascender, descender, xHeight}) => {
+            return [
+              <View
+                key="baseline view"
+                style={{
+                  top: y + ascender,
+                  height: 1,
+                  left: 0,
+                  right: 0,
+                  position: 'absolute',
+                  backgroundColor: 'red',
+                }}
+              />,
+              <Text
+                key="baseline text"
+                style={{
+                  top: y + ascender,
+                  right: 0,
+                  position: 'absolute',
+                  color: 'red',
+                }}>
+                Baseline
+              </Text>,
+              <View
+                key="capheight view"
+                style={{
+                  top: y + ascender - capHeight,
+                  height: 1,
+                  left: 0,
+                  right: 0,
+                  position: 'absolute',
+                  backgroundColor: 'green',
+                }}
+              />,
+              <Text
+                key="capheight text"
+                style={{
+                  top: y + ascender - capHeight,
+                  right: 0,
+                  position: 'absolute',
+                  color: 'green',
+                }}>
+                Capheight
+              </Text>,
+              <View
+                key="xheight view"
+                style={{
+                  top: y + ascender - xHeight,
+                  height: 1,
+                  left: 0,
+                  right: 0,
+                  position: 'absolute',
+                  backgroundColor: 'blue',
+                }}
+              />,
+              <Text
+                key="xheight text"
+                style={{
+                  top: y + ascender - xHeight,
+                  right: 0,
+                  position: 'absolute',
+                  color: 'blue',
+                }}>
+                X-height
+              </Text>,
+              <View
+                key="descender view"
+                style={{
+                  top: y + ascender + descender,
+                  height: 1,
+                  left: 0,
+                  right: 0,
+                  position: 'absolute',
+                  backgroundColor: 'orange',
+                }}
+              />,
+              <Text
+                key="descender text"
+                style={{
+                  top: y + ascender + descender,
+                  right: 0,
+                  position: 'absolute',
+                  color: 'orange',
+                }}>
+                Descender
+              </Text>,
+              <View
+                key="end of text view"
+                style={{
+                  top: y,
+                  height: height,
+                  width: 1,
+                  left: x + width,
+                  position: 'absolute',
+                  backgroundColor: 'brown',
+                }}
+              />,
+              <Text
+                key="end of text text"
+                style={{
+                  top: y,
+                  left: x + width + 5,
+                  position: 'absolute',
+                  color: 'brown',
+                }}>
+                End of text
+              </Text>,
+              <View
+                key="start of text view"
+                style={{
+                  top: y,
+                  height: height,
+                  width: 1,
+                  left: x,
+                  position: 'absolute',
+                  backgroundColor: 'brown',
+                }}
+              />,
+              <Text
+                key="start of text text"
+                style={{
+                  top: y,
+                  left: x + 5,
+                  position: 'absolute',
+                  color: 'brown',
+                }}>
+                Start of text
+              </Text>,
+            ];
+          },
+        )}
+        <Text
+          onTextLayout={event => {
+            setTextMetrics(event.nativeEvent.lines);
+          }}
+          style={{
+            fontSize: fontSize,
+            textAlign: alignment,
+          }}>
+          {PANGRAMS[language]}
+        </Text>
+      </View>
+      <View style={styles.row}>
+        <Text>Alignment:</Text>
+        <RNTOption
+          label="Left Align"
+          key="left_align"
+          onPress={() => setAlignment('left')}
+          selected={alignment === 'left'}
+          style={styles.option}
+        />
+        <RNTOption
+          label="Center Align"
+          key="center_align"
+          onPress={() => setAlignment('center')}
+          selected={alignment === 'center'}
+          style={styles.option}
+        />
+        <RNTOption
+          label="Right Align"
+          key="right_align"
+          onPress={() => setAlignment('right')}
+          selected={alignment === 'right'}
+          style={styles.option}
+        />
+      </View>
+    </View>
+  );
 }
-module.exports = TextLegend;
+
+const styles = StyleSheet.create({
+  row: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    margin: 6,
+    alignItems: 'center',
+  },
+  title: {
+    fontWeight: 'bold',
+  },
+  block: {
+    borderColor: 'rgba(0,0,0, 0.1)',
+    borderBottomWidth: 1,
+    padding: 6,
+  },
+  option: {
+    margin: 4,
+  },
+});
diff --git a/packages/rn-tester/js/components/createExamplePage.js b/packages/rn-tester/js/components/createExamplePage.js
index b508bc0dd915aa..477717fef1fc4c 100644
--- a/packages/rn-tester/js/components/createExamplePage.js
+++ b/packages/rn-tester/js/components/createExamplePage.js
@@ -12,16 +12,16 @@
 
 const React = require('react');
 
-const RNTesterExampleContainer = require('./RNTesterExampleContainer');
-import type {RNTesterExample} from '../types/RNTesterTypes';
+import RNTesterModuleContainer from './RNTesterModuleContainer';
+import type {RNTesterModule} from '../types/RNTesterTypes';
 
 const createExamplePage = function(
   title: ?string,
-  exampleModule: RNTesterExample,
+  exampleModule: RNTesterModule,
 ): React.ComponentType<any> {
   class ExamplePage extends React.Component<{...}> {
     render() {
-      return <RNTesterExampleContainer module={exampleModule} title={title} />;
+      return <RNTesterModuleContainer module={exampleModule} />;
     }
   }
 
diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js
index e35299d58a8803..3f807fdc5982b1 100644
--- a/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js
+++ b/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js
@@ -5,20 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow strict-local
  */
 
 'use strict';
 
 const React = require('react');
-const {
-  StyleSheet,
-  Text,
-  View,
-  TouchableWithoutFeedback,
-} = require('react-native');
-
-const RNTesterBlock = require('../../components/RNTesterBlock');
-const RNTesterPage = require('../../components/RNTesterPage');
+import RNTesterBlock from '../../components/RNTesterBlock';
+import RNTesterPage from '../../components/RNTesterPage';
+import {StyleSheet, Text, View, TouchableWithoutFeedback} from 'react-native';
 
 const importantForAccessibilityValues = [
   'auto',
@@ -27,8 +22,17 @@ const importantForAccessibilityValues = [
   'no-hide-descendants',
 ];
 
-class AccessibilityAndroidExample extends React.Component {
-  state = {
+type AccessibilityAndroidExampleState = {
+  count: number,
+  backgroundImportantForAcc: number,
+  forgroundImportantForAcc: number,
+};
+
+class AccessibilityAndroidExample extends React.Component<
+  {},
+  AccessibilityAndroidExampleState,
+> {
+  state: AccessibilityAndroidExampleState = {
     count: 0,
     backgroundImportantForAcc: 0,
     forgroundImportantForAcc: 0,
@@ -52,7 +56,7 @@ class AccessibilityAndroidExample extends React.Component {
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <RNTesterPage title={'Accessibility Android APIs'}>
         <RNTesterBlock title="LiveRegion">
@@ -61,22 +65,14 @@ class AccessibilityAndroidExample extends React.Component {
               <Text>Click me</Text>
             </View>
           </TouchableWithoutFeedback>
-          <Text accessibilityLiveRegion="polite">
-            Clicked {this.state.count} times
-          </Text>
+          <View accessibilityLiveRegion="polite">
+            <Text>Clicked {this.state.count} times</Text>
+          </View>
         </RNTesterBlock>
 
         <RNTesterBlock title="Overlapping views and importantForAccessibility property">
           <View style={styles.container}>
             <TouchableWithoutFeedback
-              style={{
-                position: 'absolute',
-                left: 10,
-                top: 10,
-                right: 10,
-                height: 100,
-                backgroundColor: 'green',
-              }}
               accessible={true}
               accessibilityLabel="First layout"
               importantForAccessibility={
@@ -84,7 +80,7 @@ class AccessibilityAndroidExample extends React.Component {
                   this.state.backgroundImportantForAcc
                 ]
               }>
-              <View accessible={true}>
+              <View accessible={true} style={styles.touchableContainer}>
                 <Text style={{fontSize: 25}}>Hello</Text>
               </View>
             </TouchableWithoutFeedback>
@@ -153,6 +149,14 @@ class AccessibilityAndroidExample extends React.Component {
 }
 
 const styles = StyleSheet.create({
+  touchableContainer: {
+    position: 'absolute',
+    left: 10,
+    top: 10,
+    right: 10,
+    height: 100,
+    backgroundColor: 'green',
+  },
   embedded: {
     backgroundColor: 'yellow',
     padding: 10,
diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
index 78ec520a9cb06f..b12eb19f2bbd63 100644
--- a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
+++ b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow
  */
 
 'use strict';
@@ -12,34 +13,63 @@
 const React = require('react');
 const {
   AccessibilityInfo,
-  Alert,
+  TextInput,
   Button,
   findNodeHandle,
   Image,
-  StyleSheet,
   Text,
   TouchableOpacity,
   TouchableWithoutFeedback,
   View,
+  Alert,
+  StyleSheet,
+  Slider,
+  Platform,
 } = require('react-native');
+import type {EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 
 const RNTesterBlock = require('../../components/RNTesterBlock');
 
 const checkImageSource = require('./check.png');
 const uncheckImageSource = require('./uncheck.png');
 const mixedCheckboxImageSource = require('./mixed.png');
+const {createRef} = require('react');
 
 const styles = StyleSheet.create({
+  default: {
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: '#0f0f0f',
+    flex: 1,
+    fontSize: 13,
+    padding: 4,
+  },
+  touchable: {
+    backgroundColor: 'blue',
+    borderColor: 'red',
+    borderWidth: 1,
+    borderRadius: 10,
+    padding: 10,
+    borderStyle: 'solid',
+  },
   image: {
     width: 20,
     height: 20,
     resizeMode: 'contain',
     marginRight: 10,
   },
+  disabledImage: {
+    width: 120,
+    height: 120,
+  },
+  containerAlignCenter: {
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'space-between',
+  },
 });
 
-class AccessibilityExample extends React.Component {
-  render() {
+class AccessibilityExample extends React.Component<{}> {
+  render(): React.Node {
     return (
       <View>
         <RNTesterBlock title="TextView without label">
@@ -79,7 +109,7 @@ class AccessibilityExample extends React.Component {
         </RNTesterBlock>
 
         {/* Android screen readers will say the accessibility hint instead of the text
-        since the view doesn't have a label. */}
+           since the view doesn't have a label. */}
         <RNTesterBlock title="Accessible view with TextViews with hint">
           <View accessibilityHint="Accessibility hint." accessible={true}>
             <Text style={{color: 'green'}}>This is text one.</Text>
@@ -133,6 +163,18 @@ class AccessibilityExample extends React.Component {
           </TouchableOpacity>
         </RNTesterBlock>
 
+        <RNTesterBlock title="Disabled TouchableOpacity">
+          <TouchableOpacity
+            onPress={() => Alert.alert('Disabled Button has been pressed!')}
+            accessibilityLabel={'You are pressing Disabled TouchableOpacity'}
+            accessibilityState={{disabled: true}}>
+            <View>
+              <Text>
+                I am disabled. Clicking me will not trigger any action.
+              </Text>
+            </View>
+          </TouchableOpacity>
+        </RNTesterBlock>
         <RNTesterBlock title="View with multiple states">
           <View
             accessible={true}
@@ -156,7 +198,12 @@ class AccessibilityExample extends React.Component {
   }
 }
 
-class CheckboxExample extends React.Component {
+class CheckboxExample extends React.Component<
+  {},
+  {
+    checkboxState: boolean | 'mixed',
+  },
+> {
   state = {
     checkboxState: true,
   };
@@ -190,7 +237,12 @@ class CheckboxExample extends React.Component {
   }
 }
 
-class SwitchExample extends React.Component {
+class SwitchExample extends React.Component<
+  {},
+  {
+    switchState: boolean,
+  },
+> {
   state = {
     switchState: true,
   };
@@ -217,49 +269,74 @@ class SwitchExample extends React.Component {
   }
 }
 
-class SelectionExample extends React.Component {
-  constructor(props) {
+class SelectionExample extends React.Component<
+  {},
+  {
+    isSelected: boolean,
+    isEnabled: boolean,
+  },
+> {
+  constructor(props: {}) {
     super(props);
-    this.selectableElement = React.createRef();
+    this.selectableElement = createRef();
   }
+  selectableElement: {
+    current: React.ElementRef<typeof TouchableOpacity> | null,
+  };
 
   state = {
     isSelected: true,
     isEnabled: false,
   };
 
-  render() {
+  render(): React.Node {
+    const {isSelected, isEnabled} = this.state;
     let accessibilityHint = 'click me to select';
-    if (this.state.isSelected) {
+    if (isSelected) {
       accessibilityHint = 'click me to unselect';
     }
-    if (!this.state.isEnabled) {
+    if (!isEnabled) {
       accessibilityHint = 'use the button on the right to enable selection';
     }
-    let buttonTitle = this.state.isEnabled
-      ? 'Disable selection'
-      : 'Enable selection';
-
+    let buttonTitle = isEnabled ? 'Disable selection' : 'Enable selection';
+    const touchableHint = ` (touching the TouchableOpacity will ${
+      isSelected ? 'disable' : 'enable'
+    } accessibilityState.selected)`;
     return (
-      <View style={{flex: 1, flexDirection: 'row'}}>
+      <View style={styles.containerAlignCenter}>
         <TouchableOpacity
           ref={this.selectableElement}
           accessible={true}
           onPress={() => {
-            if (this.state.isEnabled) {
+            if (isEnabled) {
               this.setState({
-                isSelected: !this.state.isSelected,
+                isSelected: !isSelected,
               });
+            } else {
+              console.warn('selection is disabled, please enable selection.');
             }
           }}
           accessibilityLabel="element 19"
           accessibilityState={{
-            selected: this.state.isSelected,
-            disabled: !this.state.isEnabled,
+            selected: isSelected,
+            disabled: !isEnabled,
           }}
+          style={styles.touchable}
           accessibilityHint={accessibilityHint}>
-          <Text>Selectable element example</Text>
+          <Text style={{color: 'white'}}>
+            {`Selectable TouchableOpacity Example ${touchableHint}`}
+          </Text>
         </TouchableOpacity>
+        <TextInput
+          accessibilityLabel="element 20"
+          accessibilityState={{
+            selected: isSelected,
+          }}
+          multiline={true}
+          placeholder={`TextInput Example - ${
+            isSelected ? 'enabled' : 'disabled'
+          } selection`}
+        />
         <Button
           onPress={() => {
             this.setState({
@@ -273,7 +350,12 @@ class SelectionExample extends React.Component {
   }
 }
 
-class ExpandableElementExample extends React.Component {
+class ExpandableElementExample extends React.Component<
+  {},
+  {
+    expandState: boolean,
+  },
+> {
   state = {
     expandState: false,
   };
@@ -299,7 +381,14 @@ class ExpandableElementExample extends React.Component {
   }
 }
 
-class NestedCheckBox extends React.Component {
+class NestedCheckBox extends React.Component<
+  {},
+  {
+    checkbox1: boolean | 'mixed',
+    checkbox2: boolean | 'mixed',
+    checkbox3: boolean | 'mixed',
+  },
+> {
   state = {
     checkbox1: false,
     checkbox2: false,
@@ -408,7 +497,7 @@ class NestedCheckBox extends React.Component {
 }
 
 class AccessibilityRoleAndStateExample extends React.Component<{}> {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <View
@@ -513,8 +602,8 @@ class AccessibilityRoleAndStateExample extends React.Component<{}> {
   }
 }
 
-class AccessibilityActionsExample extends React.Component {
-  render() {
+class AccessibilityActionsExample extends React.Component<{}> {
+  render(): React.Node {
     return (
       <View>
         <RNTesterBlock title="Non-touchable with activate action">
@@ -576,7 +665,7 @@ class AccessibilityActionsExample extends React.Component {
           </View>
         </RNTesterBlock>
 
-        <RNTesterBlock title="Button with custom accessibility actions">
+        <RNTesterBlock title="TouchableWithoutFeedback with custom accessibility actions">
           <TouchableWithoutFeedback
             accessible={true}
             accessibilityActions={[
@@ -604,18 +693,99 @@ class AccessibilityActionsExample extends React.Component {
             </View>
           </TouchableWithoutFeedback>
         </RNTesterBlock>
+
+        <RNTesterBlock title="Button with accessibility actions">
+          <Button
+            accessible={true}
+            accessibilityActions={[
+              {name: 'activate', label: 'activate label'},
+              {name: 'copy', label: 'copy label'},
+            ]}
+            onAccessibilityAction={event => {
+              switch (event.nativeEvent.actionName) {
+                case 'activate':
+                  Alert.alert('Alert', 'Activate accessiblity action');
+                  break;
+                case 'copy':
+                  Alert.alert('Alert', 'copy action success');
+                  break;
+              }
+            }}
+            onPress={() => Alert.alert('Button has been pressed!')}
+            title="Button with accessiblity action"
+          />
+        </RNTesterBlock>
+
+        {/* TODO(macOS GH#774) - This doesn't work, see https://github.com/facebook/react-native/issues/32616
+          <RNTesterBlock title="Text with custom accessibility actions">
+            <Text
+              accessible={true}
+              accessibilityActions={[
+                {name: 'activate', label: 'activate label'},
+                {name: 'copy', label: 'copy label'},
+              ]}
+              onAccessibilityAction={event => {
+                switch (event.nativeEvent.actionName) {
+                  case 'activate':
+                    Alert.alert('Alert', 'Activate accessiblity action');
+                    break;
+                  case 'copy':
+                    Alert.alert('Alert', 'copy action success');
+                    break;
+                }
+              }}>
+              Text
+            </Text>
+          </RNTesterBlock>
+        */}
       </View>
     );
   }
 }
 
-class FakeSliderExample extends React.Component {
-  state = {
+function SliderAccessibilityExample(): React.Node {
+  return (
+    <View>
+      <RNTesterBlock
+        title="Disabled Slider via disabled"
+        description="Verify with TalkBack/VoiceOver announces Slider as disabled">
+        <Slider value={25} maximumValue={100} minimumValue={0} disabled />
+      </RNTesterBlock>
+      <RNTesterBlock
+        title="Disabled Slider via accessibiltyState"
+        description="Verify with TalkBack/VoiceOver announces Slider as disabled">
+        <Slider
+          value={75}
+          maximumValue={100}
+          minimumValue={0}
+          accessibilityState={{disabled: true}}
+        />
+      </RNTesterBlock>
+      <RNTesterBlock
+        title="Selected Slider"
+        description="Verify with TalkBack/VoiceOver announces Slider as selected">
+        <Slider
+          value={75}
+          maximumValue={100}
+          minimumValue={0}
+          accessibilityState={{selected: true}}
+        />
+      </RNTesterBlock>
+    </View>
+  );
+}
+
+type FakeSliderExampleState = {
+  current: number,
+  textualValue: 'center' | 'left' | 'right',
+};
+class FakeSliderExample extends React.Component<{}, FakeSliderExampleState> {
+  state: FakeSliderExampleState = {
     current: 50,
     textualValue: 'center',
   };
 
-  increment = () => {
+  increment: () => void = () => {
     let newValue = this.state.current + 2;
     if (newValue > 100) {
       newValue = 100;
@@ -625,7 +795,7 @@ class FakeSliderExample extends React.Component {
     });
   };
 
-  decrement = () => {
+  decrement: () => void = () => {
     let newValue = this.state.current - 2;
     if (newValue < 0) {
       newValue = 0;
@@ -635,7 +805,7 @@ class FakeSliderExample extends React.Component {
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <View
@@ -693,50 +863,122 @@ class FakeSliderExample extends React.Component {
   }
 }
 
-class ScreenReaderStatusExample extends React.Component<{}> {
-  state = {
-    screenReaderEnabled: false,
-  };
+class AnnounceForAccessibility extends React.Component<{}> {
+  _handleOnPress = () =>
+    AccessibilityInfo.announceForAccessibility('Announcement Test');
 
-  componentDidMount() {
-    AccessibilityInfo.addEventListener(
-      'change',
-      this._handleScreenReaderToggled,
+  render(): React.Node {
+    return (
+      <View>
+        <Button
+          onPress={this._handleOnPress}
+          title="Announce for Accessibility"
+        />
+      </View>
     );
-    AccessibilityInfo.fetch().done(isEnabled => {
-      this.setState({
-        screenReaderEnabled: isEnabled,
-      });
-    });
   }
+}
 
-  componentWillUnmount() {
-    AccessibilityInfo.removeEventListener(
-      'change',
-      this._handleScreenReaderToggled,
+class SetAccessibilityFocusExample extends React.Component<{}> {
+  render(): React.Node {
+    const myRef: {current: React.ElementRef<any> | null} = createRef();
+
+    const onClose = () => {
+      if (myRef && myRef.current) {
+        AccessibilityInfo.sendAccessibilityEvent_unstable(
+          myRef.current,
+          'focus',
+        );
+      }
+    };
+
+    return (
+      <View>
+        <Text>SetAccessibilityFocus on native element</Text>
+        <Button
+          ref={myRef}
+          title={'Click'}
+          onPress={() => {
+            Alert.alert(
+              'Set Accessibility Focus',
+              'Press okay to proceed',
+              [{text: 'Okay', onPress: onClose}],
+              {cancelable: true},
+            );
+          }}
+        />
+      </View>
     );
   }
+}
 
-  _handleScreenReaderToggled = isEnabled => {
-    this.setState({
-      screenReaderEnabled: isEnabled,
-    });
-  };
-
-  render() {
+class EnabledExamples extends React.Component<{}> {
+  render(): React.Node {
     return (
       <View>
-        <Text>
-          The screen reader is{' '}
-          {this.state.screenReaderEnabled ? 'enabled' : 'disabled'}.
-        </Text>
+        {Platform.OS === 'ios' ? (
+          <>
+            <RNTesterBlock title="isBoldTextEnabled()">
+              <EnabledExample
+                test="bold text"
+                eventListener="boldTextChanged"
+              />
+            </RNTesterBlock>
+            <RNTesterBlock title="isGrayScaleEnabled()">
+              <EnabledExample
+                test="gray scale"
+                eventListener="grayscaleChanged"
+              />
+            </RNTesterBlock>
+            <RNTesterBlock title="isInvertColorsEnabled()">
+              <EnabledExample
+                test="invert colors"
+                eventListener="invertColorsChanged"
+              />
+            </RNTesterBlock>
+            <RNTesterBlock title="isReduceTransparencyEnabled()">
+              <EnabledExample
+                test="reduce transparency"
+                eventListener="reduceTransparencyChanged"
+              />
+            </RNTesterBlock>
+          </>
+        ) : null}
+
+        <RNTesterBlock title="isReduceMotionEnabled()">
+          <EnabledExample
+            test="reduce motion"
+            eventListener="reduceMotionChanged"
+          />
+        </RNTesterBlock>
+
+        <RNTesterBlock title="isScreenReaderEnabled()">
+          <EnabledExample
+            test="screen reader"
+            eventListener="screenReaderChanged"
+          />
+        </RNTesterBlock>
       </View>
     );
   }
 }
 // [TODO(OSS Candidate ISS#2710739)
-class DisplayOptionsStatusExample extends React.Component<{}> {
-  state = {};
+type DisplayOptionsStatusExampleState = {
+  highContrastEnabled?: boolean,
+  invertColorsEnabled?: boolean,
+  reduceMotionEnabled?: boolean,
+  reduceTransparencyEnabled?: boolean,
+};
+class DisplayOptionsStatusExample extends React.Component<
+  {},
+  DisplayOptionsStatusExampleState,
+> {
+  state: DisplayOptionsStatusExampleState = {
+    highContrastEnabled: undefined,
+    invertColorsEnabled: undefined,
+    reduceMotionEnabled: undefined,
+    reduceTransparencyEnabled: undefined,
+  };
 
   componentDidMount() {
     AccessibilityInfo.addEventListener(
@@ -823,31 +1065,40 @@ class DisplayOptionsStatusExample extends React.Component<{}> {
     });
   };
 
-  render() {
+  // TODO(macOS GH#774) - slight refactoring to allow state to handle undefined values
+  _statusString = isEnabled => {
+    if (isEnabled !== undefined) {
+      return isEnabled ? 'enabled' : 'disabled';
+    } else {
+      return 'unknown';
+    }
+  };
+
+  render(): React.Node {
     return (
       <View>
         <View>
           <Text>
             High contrast is{' '}
-            {this.state.highContrastEnabled ? 'enabled' : 'disabled'}.
+            {this._statusString(this.state.highContrastEnabled)}.
           </Text>
         </View>
         <View>
           <Text>
             Invert colors is{' '}
-            {this.state.invertColorsEnabled ? 'enabled' : 'disabled'}.
+            {this._statusString(this.state.invertColorsEnabled)}.
           </Text>
         </View>
         <View>
           <Text>
             Reduce motion is{' '}
-            {this.state.reduceMotionEnabled ? 'enabled' : 'disabled'}.
+            {this._statusString(this.state.reduceMotionEnabled)}.
           </Text>
         </View>
         <View>
           <Text>
             Reduce transparency is{' '}
-            {this.state.reduceTransparencyEnabled ? 'enabled' : 'disabled'}.
+            {this._statusString(this.state.reduceTransparencyEnabled)}.
           </Text>
         </View>
       </View>
@@ -855,37 +1106,66 @@ class DisplayOptionsStatusExample extends React.Component<{}> {
   }
 }
 // ]TODO(OSS Candidate ISS#2710739)
-class AnnounceForAccessibility extends React.Component<{}> {
-  _handleOnPress = () =>
-    AccessibilityInfo.announceForAccessibility('Announcement Test');
 
-  render() {
-    return (
-      <View>
-        <Button
-          onPress={this._handleOnPress}
-          title="Announce for Accessibility"
-        />
-      </View>
+class EnabledExample extends React.Component<
+  {
+    eventListener:
+      | 'reduceMotionChanged'
+      | 'boldTextChanged'
+      | 'grayscaleChanged'
+      | 'invertColorsChanged'
+      | 'reduceTransparencyChanged'
+      | 'reduceMotionChanged'
+      | 'screenReaderChanged',
+    test: string,
+  },
+  {
+    isEnabled: boolean,
+  },
+> {
+  state = {
+    isEnabled: false,
+  };
+  _subscription: EventSubscription;
+  componentDidMount() {
+    this._subscription = AccessibilityInfo.addEventListener(
+      this.props.eventListener,
+      this._handleToggled,
     );
+
+    switch (this.props.eventListener) {
+      case 'reduceMotionChanged':
+        return AccessibilityInfo.isReduceMotionEnabled().then(state => {
+          this.setState({isEnabled: state});
+        });
+      default:
+        return null;
+    }
   }
-}
 
-class SetAccessibilityFocus extends React.Component<{}> {
-  _handleOnPress = () => {
-    if (findNodeHandle(this.focusRef.current)) {
-      const reactTag = findNodeHandle(this.focusRef.current);
-      AccessibilityInfo.setAccessibilityFocus(reactTag);
+  componentWillUnmount() {
+    this._subscription?.remove();
+  }
+
+  _handleToggled = isEnabled => {
+    if (!this.state.isEnabled) {
+      this.setState({isEnabled: true});
+    } else {
+      this.setState({isEnabled: false});
     }
   };
-  render() {
-    this.focusRef = React.createRef();
+
+  render(): React.Node {
     return (
       <View>
-        <Button onPress={this._handleOnPress} title="Set Accessibility Focus" />
-        <Text ref={this.focusRef} accessible={true}>
-          Move focus here on button press.
+        <Text>
+          The {this.props.test} is{' '}
+          {this.state.isEnabled ? 'enabled' : 'disabled'}
         </Text>
+        <Button
+          title={this.state.isEnabled ? 'disable' : 'enable'}
+          onPress={this._handleToggled}
+        />
       </View>
     );
   }
@@ -903,7 +1183,7 @@ exports.examples = [
   },
   {
     title: 'New accessibility roles and states',
-    render(): React.Element<typeof AccessibilityRoleAndStateExamples> {
+    render(): React.Element<typeof AccessibilityRoleAndStateExample> {
       return <AccessibilityRoleAndStateExample />;
     },
   },
@@ -914,15 +1194,15 @@ exports.examples = [
     },
   },
   {
-    title: 'Fake Slider Example',
-    render(): React.Element<typeof FakeSliderExample> {
-      return <FakeSliderExample />;
+    title: 'Slider Accessibility Examples',
+    render(): React.Element<typeof SliderAccessibilityExample> {
+      return <SliderAccessibilityExample />;
     },
   },
   {
-    title: 'Check if the screen reader is enabled',
-    render(): React.Element<typeof ScreenReaderStatusExample> {
-      return <ScreenReaderStatusExample />;
+    title: 'Fake Slider Example',
+    render(): React.Element<typeof FakeSliderExample> {
+      return <FakeSliderExample />;
     },
   },
   // [TODO(OSS Candidate ISS#2710739)
@@ -940,9 +1220,30 @@ exports.examples = [
     },
   },
   {
-    title: 'Check if the screen reader focus sets ',
-    render(): React.Element<typeof SetAccessibilityFocus> {
-      return <SetAccessibilityFocus />;
+    title: 'Check if accessibility is focused',
+    render(): React.Element<typeof SetAccessibilityFocusExample> {
+      return <SetAccessibilityFocusExample />;
+    },
+  },
+  {
+    title: 'Check if these properties are enabled',
+    render(): React.Element<typeof EnabledExamples> {
+      return <EnabledExamples />;
+    },
+  },
+  {
+    title:
+      'Check if accessibilityState disabled is announced when the screenreader focus moves on the image',
+    render(): React.Element<typeof Image> {
+      return (
+        <Image
+          accessible={true}
+          accessibilityLabel="plain local image"
+          accessibilityState={{disabled: true}}
+          source={require('../../assets/like.png')}
+          style={styles.disabledImage}
+        />
+      );
     },
   },
 ];
diff --git a/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js b/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js
index 786811a725d53f..917cba05c0ce09 100644
--- a/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js
+++ b/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js
@@ -25,6 +25,7 @@ const ScreenshotManager = NativeModules.ScreenshotManager;
 const BUTTONS = ['Option 0', 'Option 1', 'Option 2', 'Delete', 'Cancel'];
 const DESTRUCTIVE_INDEX = 3;
 const CANCEL_INDEX = 4;
+const DISABLED_BUTTON_INDICES = [1, 2];
 
 type Props = $ReadOnly<{||}>;
 type State = {|clicked: string|};
@@ -138,6 +139,37 @@ class ActionSheetAnchorExample extends React.Component<
   };
 }
 
+class ActionSheetDisabledExample extends React.Component<Props, State> {
+  state = {
+    clicked: 'none',
+  };
+
+  render() {
+    return (
+      <View>
+        <Text onPress={this.showActionSheet} style={style.button}>
+          Click to show the ActionSheet
+        </Text>
+        <Text>Clicked button: {this.state.clicked}</Text>
+      </View>
+    );
+  }
+
+  showActionSheet = () => {
+    ActionSheetIOS.showActionSheetWithOptions(
+      {
+        options: BUTTONS,
+        cancelButtonIndex: CANCEL_INDEX,
+        destructiveButtonIndex: DESTRUCTIVE_INDEX,
+        disabledButtonIndices: DISABLED_BUTTON_INDICES,
+      },
+      buttonIndex => {
+        this.setState({clicked: BUTTONS[buttonIndex]});
+      },
+    );
+  };
+}
+
 class ShareActionSheetExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
@@ -316,6 +348,12 @@ exports.examples = [
       return <ActionSheetAnchorExample />;
     },
   },
+  {
+    title: 'Show Action Sheet with disabled buttons',
+    render(): React.Element<any> {
+      return <ActionSheetDisabledExample />;
+    },
+  },
   {
     title: 'Show Share Action Sheet',
     render(): React.Element<any> {
diff --git a/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js b/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js
index 793fac7bfa09ca..871bf1cb4657a2 100644
--- a/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js
+++ b/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js
@@ -8,7 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
 import type {Node} from 'React';
 import {ActivityIndicator, StyleSheet, View} from 'react-native';
 import React, {Component} from 'react';
diff --git a/packages/rn-tester/js/examples/Alert/AlertExample.js b/packages/rn-tester/js/examples/Alert/AlertExample.js
index 4139bbb9249cb4..d17f8ed93573a1 100644
--- a/packages/rn-tester/js/examples/Alert/AlertExample.js
+++ b/packages/rn-tester/js/examples/Alert/AlertExample.js
@@ -7,8 +7,6 @@
  * @format
  */
 
-'use strict';
-
 import React, {useState} from 'react';
 import {Alert, StyleSheet, Text, TouchableHighlight, View} from 'react-native';
 
diff --git a/packages/rn-tester/js/examples/Alert/AlertIOSExample.js b/packages/rn-tester/js/examples/Alert/AlertIOSExample.js
index 62d857d543b90b..5b4926d1293223 100644
--- a/packages/rn-tester/js/examples/Alert/AlertIOSExample.js
+++ b/packages/rn-tester/js/examples/Alert/AlertIOSExample.js
@@ -21,7 +21,7 @@ const {
 
 const {examples: SharedAlertExamples} = require('./AlertExample');
 
-import type {RNTesterExampleModuleItem} from '../../types/RNTesterTypes';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 
 type Props = $ReadOnly<{||}>;
 type State = {|promptValue: ?string|};
@@ -32,7 +32,9 @@ class PromptOptions extends React.Component<Props, State> {
   constructor(props) {
     super(props);
 
-    // $FlowFixMe this seems to be a Flow bug, `saveResponse` is defined below
+    /* $FlowFixMe[cannot-write] this seems to be a Flow bug, `saveResponse` is
+     * defined below */
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     this.saveResponse = this.saveResponse.bind(this);
 
     this.customButtons = [
@@ -61,6 +63,8 @@ class PromptOptions extends React.Component<Props, State> {
 
         <TouchableHighlight
           style={styles.wrapper}
+          // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+          // $FlowFixMe[incompatible-call]
           onPress={() => Alert.prompt('Type a value', null, this.saveResponse)}>
           <View style={styles.button}>
             <Text>prompt with title & callback</Text>
@@ -100,6 +104,8 @@ class PromptOptions extends React.Component<Props, State> {
             Alert.prompt(
               'Type a value',
               null,
+              // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+              // $FlowFixMe[incompatible-call]
               this.saveResponse,
               undefined,
               'Default value',
@@ -199,4 +205,4 @@ exports.examples = ([
       );
     },
   },
-]: RNTesterExampleModuleItem[]);
+]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/Alert/AlertMacOSExample.js b/packages/rn-tester/js/examples/Alert/AlertMacOSExample.js
index 7d685a16814d27..da9c6a8d30febc 100644
--- a/packages/rn-tester/js/examples/Alert/AlertMacOSExample.js
+++ b/packages/rn-tester/js/examples/Alert/AlertMacOSExample.js
@@ -16,7 +16,7 @@ const {StyleSheet, View, Text, TouchableHighlight, AlertMacOS} = ReactNative;
 
 const {examples: SharedAlertExamples} = require('./AlertExample');
 
-import type {RNTesterExampleModuleItem} from '../../types/RNTesterTypes';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 
 exports.framework = 'React';
 exports.title = 'AlertMacOS';
@@ -149,7 +149,7 @@ exports.examples = ([
       );
     },
   },
-]: RNTesterExampleModuleItem[]);
+]: RNTesterModuleExample[]);
 
 class PromptOptions extends React.Component<$FlowFixMeProps, any> {
   state: any;
@@ -188,7 +188,9 @@ class PromptOptions extends React.Component<$FlowFixMeProps, any> {
         <TouchableHighlight
           style={styles.wrapper}
           onPress={() =>
-            AlertMacOS.prompt('Type a value', null, this.saveResponse)
+            AlertMacOS.prompt('Type a value', null, value =>
+              this.saveResponse(value),
+            )
           }>
           <View style={styles.button}>
             <Text>prompt with title & callback</Text>
@@ -211,7 +213,7 @@ class PromptOptions extends React.Component<$FlowFixMeProps, any> {
             AlertMacOS.prompt(
               'Type a value',
               null,
-              this.saveResponse,
+              value => this.saveResponse(value),
               undefined,
               [{default: 'Default value', placeholder: ''}],
             )
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedExample.js b/packages/rn-tester/js/examples/Animated/AnimatedExample.js
deleted file mode 100644
index 126d8317e8d111..00000000000000
--- a/packages/rn-tester/js/examples/Animated/AnimatedExample.js
+++ /dev/null
@@ -1,458 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-const RNTesterButton = require('../../components/RNTesterButton');
-const React = require('react');
-
-const {Animated, Easing, StyleSheet, Text, View} = require('react-native');
-
-const styles = StyleSheet.create({
-  content: {
-    backgroundColor: 'deepskyblue',
-    borderWidth: 1,
-    borderColor: 'dodgerblue',
-    padding: 20,
-    margin: 20,
-    borderRadius: 10,
-    alignItems: 'center',
-  },
-  rotatingImage: {
-    width: 70,
-    height: 70,
-  },
-});
-
-exports.framework = 'React';
-exports.title = 'Animated - Examples';
-exports.category = 'UI';
-exports.documentationURL = 'https://reactnative.dev/docs/animated';
-exports.description = ('Animated provides a powerful ' +
-  'and easy-to-use API for building modern, ' +
-  'interactive user experiences.': string);
-
-exports.examples = [
-  {
-    title: 'FadeInView',
-    description: ('Uses a simple timing animation to ' +
-      'bring opacity from 0 to 1 when the component ' +
-      'mounts.': string),
-    render: function(): React.Node {
-      class FadeInView extends React.Component<$FlowFixMeProps, any> {
-        constructor(props) {
-          super(props);
-          this.state = {
-            fadeAnim: new Animated.Value(0), // opacity 0
-          };
-        }
-        componentDidMount() {
-          Animated.timing(
-            // Uses easing functions
-            this.state.fadeAnim, // The value to drive
-            {
-              // Target
-              toValue: 1,
-
-              // Configuration
-              duration: 2000,
-
-              useNativeDriver: false,
-            },
-          ).start(); // Don't forget start!
-        }
-        render() {
-          return (
-            <Animated.View // Special animatable View
-              style={{
-                opacity: this.state.fadeAnim, // Binds
-              }}>
-              {this.props.children}
-            </Animated.View>
-          );
-        }
-      }
-
-      type Props = $ReadOnly<{||}>;
-      type State = {|show: boolean|};
-      class FadeInExample extends React.Component<Props, State> {
-        constructor(props: Props) {
-          super(props);
-          this.state = {
-            show: true,
-          };
-        }
-        render() {
-          return (
-            <View>
-              <RNTesterButton
-                onPress={() => {
-                  this.setState(state => ({show: !state.show}));
-                }}>
-                Press to {this.state.show ? 'Hide' : 'Show'}
-              </RNTesterButton>
-              {this.state.show && (
-                <FadeInView>
-                  <View style={styles.content}>
-                    <Text>FadeInView</Text>
-                  </View>
-                </FadeInView>
-              )}
-            </View>
-          );
-        }
-      }
-      return <FadeInExample />;
-    },
-  },
-  {
-    title: 'Transform Bounce',
-    description: ('One `Animated.Value` is driven by a ' +
-      'spring with custom constants and mapped to an ' +
-      'ordered set of transforms.  Each transform has ' +
-      'an interpolation to convert the value into the ' +
-      'right range and units.': string),
-    render: function(): React.Node {
-      this.anim = this.anim || new Animated.Value(0);
-      return (
-        <View>
-          <RNTesterButton
-            onPress={() => {
-              Animated.spring(this.anim, {
-                // Returns to the start
-                toValue: 0,
-
-                // Velocity makes it move
-                velocity: 3,
-
-                // Slow
-                tension: -10,
-
-                // Oscillate a lot
-                friction: 1,
-
-                useNativeDriver: false,
-              }).start();
-            }}>
-            Press to Fling it!
-          </RNTesterButton>
-          <Animated.View
-            style={[
-              styles.content,
-              {
-                transform: [
-                  // Array order matters
-                  {
-                    scale: this.anim.interpolate({
-                      inputRange: [0, 1],
-                      outputRange: [1, 4],
-                    }),
-                  },
-                  {
-                    translateX: this.anim.interpolate({
-                      inputRange: [0, 1],
-                      outputRange: [0, 500],
-                    }),
-                  },
-                  {
-                    rotate: this.anim.interpolate({
-                      inputRange: [0, 1],
-                      outputRange: [
-                        '0deg',
-                        '360deg', // 'deg' or 'rad'
-                      ],
-                    }),
-                  },
-                ],
-              },
-            ]}>
-            <Text>Transforms!</Text>
-          </Animated.View>
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Composite Animations with Easing',
-    description: ('Sequence, parallel, delay, and ' +
-      'stagger with different easing functions.': string),
-    render: function(): React.Node {
-      this.anims = this.anims || [1, 2, 3].map(() => new Animated.Value(0));
-      return (
-        <View>
-          <RNTesterButton
-            onPress={() => {
-              const timing = Animated.timing;
-              Animated.sequence([
-                // One after the other
-                timing(this.anims[0], {
-                  toValue: 200,
-                  easing: Easing.linear,
-                  useNativeDriver: false,
-                }),
-                Animated.delay(400), // Use with sequence
-                timing(this.anims[0], {
-                  toValue: 0,
-
-                  // Springy
-                  easing: Easing.elastic(2),
-
-                  useNativeDriver: false,
-                }),
-                Animated.delay(400),
-                Animated.stagger(
-                  200,
-                  this.anims
-                    .map(anim =>
-                      timing(anim, {
-                        toValue: 200,
-                        useNativeDriver: false,
-                      }),
-                    )
-                    .concat(
-                      this.anims.map(anim =>
-                        timing(anim, {
-                          toValue: 0,
-                          useNativeDriver: false,
-                        }),
-                      ),
-                    ),
-                ),
-                Animated.delay(400),
-                Animated.parallel(
-                  [
-                    Easing.inOut(Easing.quad), // Symmetric
-                    Easing.back(1.5), // Goes backwards first
-                    Easing.ease, // Default bezier
-                  ].map((easing, ii) =>
-                    timing(this.anims[ii], {
-                      toValue: 320,
-                      easing,
-                      duration: 3000,
-                      useNativeDriver: false,
-                    }),
-                  ),
-                ),
-                Animated.delay(400),
-                Animated.stagger(
-                  200,
-                  this.anims.map(anim =>
-                    timing(anim, {
-                      toValue: 0,
-
-                      // Like a ball
-                      easing: Easing.bounce,
-
-                      duration: 2000,
-                      useNativeDriver: false,
-                    }),
-                  ),
-                ),
-              ]).start();
-            }}>
-            Press to Animate
-          </RNTesterButton>
-          {['Composite', 'Easing', 'Animations!'].map((text, ii) => (
-            <Animated.View
-              key={text}
-              style={[
-                styles.content,
-                {
-                  left: this.anims[ii],
-                },
-              ]}>
-              <Text>{text}</Text>
-            </Animated.View>
-          ))}
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Rotating Images',
-    description: 'Simple Animated.Image rotation.',
-    render: function(): React.Node {
-      this.anim = this.anim || new Animated.Value(0);
-      return (
-        <View>
-          <RNTesterButton
-            onPress={() => {
-              Animated.spring(this.anim, {
-                // Returns to the start
-                toValue: 0,
-
-                // Velocity makes it move
-                velocity: 3,
-
-                // Slow
-                tension: -10,
-
-                // Oscillate a lot
-                friction: 1,
-
-                useNativeDriver: false,
-              }).start();
-            }}>
-            Press to Spin it!
-          </RNTesterButton>
-          <Animated.Image
-            source={require('../../assets/bunny.png')}
-            style={[
-              styles.rotatingImage,
-              {
-                transform: [
-                  {
-                    scale: this.anim.interpolate({
-                      inputRange: [0, 1],
-                      outputRange: [1, 10],
-                    }),
-                  },
-                  {
-                    translateX: this.anim.interpolate({
-                      inputRange: [0, 1],
-                      outputRange: [0, 100],
-                    }),
-                  },
-                  {
-                    rotate: this.anim.interpolate({
-                      inputRange: [0, 1],
-                      outputRange: [
-                        '0deg',
-                        '360deg', // 'deg' or 'rad'
-                      ],
-                    }),
-                  },
-                ],
-              },
-            ]}
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Moving box example',
-    description: ('Click arrow buttons to move the box.' +
-      'Then hide the box and reveal it again.' +
-      'After that the box position will reset to initial position.': string),
-    render: (): React.Node => {
-      const containerWidth = 200;
-      const boxSize = 50;
-
-      const movingBoxStyles = StyleSheet.create({
-        container: {
-          display: 'flex',
-          alignItems: 'center',
-          flexDirection: 'column',
-          backgroundColor: '#fff',
-          padding: 30,
-        },
-        boxContainer: {
-          backgroundColor: '#d3d3d3',
-          height: boxSize,
-          width: containerWidth,
-        },
-        box: {
-          width: boxSize,
-          height: boxSize,
-          margin: 0,
-        },
-        buttonsContainer: {
-          marginTop: 20,
-          display: 'flex',
-          flexDirection: 'row',
-          justifyContent: 'space-between',
-          width: containerWidth,
-        },
-      });
-      type Props = $ReadOnly<{||}>;
-      type State = {|boxVisible: boolean|};
-
-      class MovingBoxExample extends React.Component<Props, State> {
-        x: Animated.Value;
-        constructor(props) {
-          super(props);
-          this.x = new Animated.Value(0);
-          this.state = {
-            boxVisible: true,
-          };
-        }
-
-        render() {
-          const {boxVisible} = this.state;
-          const toggleText = boxVisible ? 'Hide' : 'Show';
-          return (
-            <View style={movingBoxStyles.container}>
-              {this.renderBox()}
-              <View style={movingBoxStyles.buttonsContainer}>
-                <RNTesterButton onPress={() => this.moveTo(0)}>
-                  {'<-'}
-                </RNTesterButton>
-                <RNTesterButton onPress={this.toggleVisibility}>
-                  {toggleText}
-                </RNTesterButton>
-                <RNTesterButton
-                  onPress={() => this.moveTo(containerWidth - boxSize)}>
-                  {'->'}
-                </RNTesterButton>
-              </View>
-            </View>
-          );
-        }
-
-        renderBox = () => {
-          if (this.state.boxVisible) {
-            const horizontalLocation = {transform: [{translateX: this.x}]};
-            return (
-              <View style={movingBoxStyles.boxContainer}>
-                <Animated.View
-                  style={[
-                    styles.content,
-                    movingBoxStyles.box,
-                    horizontalLocation,
-                  ]}
-                />
-              </View>
-            );
-          } else {
-            return (
-              <View style={movingBoxStyles.boxContainer}>
-                <Text>The box view is not being rendered</Text>
-              </View>
-            );
-          }
-        };
-
-        moveTo = x => {
-          Animated.timing(this.x, {
-            toValue: x,
-            duration: 1000,
-            useNativeDriver: true,
-          }).start();
-        };
-
-        toggleVisibility = () => {
-          const {boxVisible} = this.state;
-          this.setState({boxVisible: !boxVisible});
-        };
-      }
-      return <MovingBoxExample />;
-    },
-  },
-  {
-    title: 'Continuous Interactions',
-    description: ('Gesture events, chaining, 2D ' +
-      'values, interrupting and transitioning ' +
-      'animations, etc.': string),
-    render: (): React.Node => (
-      <Text>Checkout the Gratuitous Animation App!</Text>
-    ),
-  },
-];
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedIndex.js b/packages/rn-tester/js/examples/Animated/AnimatedIndex.js
new file mode 100644
index 00000000000000..9e9966d4e5ebea
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/AnimatedIndex.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModule} from '../../types/RNTesterTypes';
+import RotatingImagesExample from './RotatingImagesExample';
+import ContinuousInteractionsExample from './ContinuousInteractionsExample';
+import LoopingExample from './LoopingExample';
+import MovingBoxExample from './MovingBoxExample';
+import EasingExample from './EasingExample';
+import FadeInViewExample from './FadeInViewExample';
+import ComposeAnimationsWithEasingExample from './ComposeAnimationsWithEasingExample';
+import TransformBounceExample from './TransformBounceExample';
+import ComposingExample from './ComposingExample';
+import TransformStylesExample from './TransformStylesExample';
+
+export default ({
+  framework: 'React',
+  title: 'Animated',
+  category: 'UI',
+  documentationURL: 'https://reactnative.dev/docs/animated',
+  description:
+    'Library designed to make animations fluid, powerful, and painless to ' +
+    'build and maintain.',
+  showIndividualExamples: true,
+  examples: [
+    TransformStylesExample,
+    FadeInViewExample,
+    ComposingExample,
+    EasingExample,
+    ComposeAnimationsWithEasingExample,
+    RotatingImagesExample,
+    MovingBoxExample,
+    TransformBounceExample,
+    LoopingExample,
+    ContinuousInteractionsExample,
+  ],
+}: RNTesterModule);
diff --git a/packages/rn-tester/js/examples/Animated/ComposeAnimationsWithEasingExample.js b/packages/rn-tester/js/examples/Animated/ComposeAnimationsWithEasingExample.js
new file mode 100644
index 00000000000000..99666c5ede1fc2
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/ComposeAnimationsWithEasingExample.js
@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import * as React from 'react';
+import RNTesterButton from '../../components/RNTesterButton';
+import {Text, Easing, StyleSheet, View, Animated} from 'react-native';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+
+const styles = StyleSheet.create({
+  content: {
+    backgroundColor: 'deepskyblue',
+    borderWidth: 1,
+    borderColor: 'dodgerblue',
+    padding: 20,
+    margin: 20,
+    borderRadius: 10,
+    alignItems: 'center',
+  },
+});
+
+function CompositeAnimationsWithEasingExample(): React.Node {
+  const anims = [1, 2, 3].map(() => new Animated.Value(0));
+
+  return (
+    <View>
+      <RNTConfigurationBlock>
+        <Text>Note you cannot `useNativeDriver` for layout properties.</Text>
+      </RNTConfigurationBlock>
+      <RNTesterButton
+        onPress={() => {
+          Animated.sequence([
+            // One after the other
+            Animated.timing(anims[0], {
+              toValue: 200,
+              // $FlowFixMe[method-unbinding]
+              easing: Easing.linear,
+              useNativeDriver: false,
+            }),
+            Animated.delay(400), // Use with sequence
+            Animated.timing(anims[0], {
+              toValue: 0,
+
+              // Springy
+              easing: Easing.elastic(2),
+
+              useNativeDriver: false,
+            }),
+            Animated.delay(400),
+            Animated.stagger(
+              200,
+              anims
+                .map(anim =>
+                  Animated.timing(anim, {
+                    toValue: 200,
+                    useNativeDriver: false,
+                  }),
+                )
+                .concat(
+                  anims.map(anim =>
+                    Animated.timing(anim, {
+                      toValue: 0,
+                      useNativeDriver: false,
+                    }),
+                  ),
+                ),
+            ),
+            Animated.delay(400),
+            Animated.parallel(
+              [
+                // $FlowFixMe[method-unbinding]
+                Easing.inOut(Easing.quad), // Symmetric
+                Easing.back(1.5), // Goes backwards first
+                Easing.ease, // Default bezier
+              ].map((easing, ii) =>
+                Animated.timing(anims[ii], {
+                  toValue: 320,
+                  // $FlowFixMe[method-unbinding]
+                  easing,
+                  duration: 3000,
+                  useNativeDriver: false,
+                }),
+              ),
+            ),
+            Animated.delay(400),
+            Animated.stagger(
+              200,
+              anims.map(anim =>
+                Animated.timing(anim, {
+                  toValue: 0,
+
+                  // Like a ball
+                  // $FlowFixMe[method-unbinding]
+                  easing: Easing.bounce,
+
+                  duration: 2000,
+                  useNativeDriver: false,
+                }),
+              ),
+            ),
+          ]).start();
+        }}>
+        Press to Animate
+      </RNTesterButton>
+      {['Composite', 'Easing', 'Animations!'].map((text, ii) => (
+        <Animated.View
+          key={text}
+          style={[
+            styles.content,
+            {
+              left: anims[ii],
+            },
+          ]}>
+          <Text>{text}</Text>
+        </Animated.View>
+      ))}
+    </View>
+  );
+}
+
+export default ({
+  title: 'Composite Animations with Easing',
+  name: 'compositeAnimationsWithEasing',
+  description: ('Sequence, parallel, delay, and ' +
+    'stagger with different easing functions.': string),
+  expect:
+    'The 3 views will animate their `left` position based on their animation configurations.',
+  render: () => <CompositeAnimationsWithEasingExample />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/ComposingExample.js b/packages/rn-tester/js/examples/Animated/ComposingExample.js
new file mode 100644
index 00000000000000..c262d55d22dd4e
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/ComposingExample.js
@@ -0,0 +1,251 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import type {CompositeAnimation} from 'react-native/Libraries/Animated/AnimatedMock';
+import * as React from 'react';
+import RNTesterButton from '../../components/RNTesterButton';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+import {
+  Text,
+  StyleSheet,
+  View,
+  Animated,
+  FlatList,
+  useWindowDimensions,
+} from 'react-native';
+
+type Props = $ReadOnly<{||}>;
+const boxSize = 12;
+const padding = 8;
+const leftToRightTimingConfig = (useNativeDriver: boolean) => ({
+  toValue: 1,
+  useNativeDriver,
+});
+const rightToLeftTimingConfig = (useNativeDriver: boolean) => ({
+  toValue: 0,
+  useNativeDriver,
+});
+
+const items = [
+  {
+    title: 'Parallel',
+    description: 'Starts a number of animations at the same time',
+    compositeAnimation: (values, useNativeDriver) =>
+      Animated.sequence([
+        Animated.parallel(
+          values.map(value =>
+            Animated.timing(value, leftToRightTimingConfig(useNativeDriver)),
+          ),
+        ),
+        Animated.parallel(
+          values.map(value =>
+            Animated.timing(value, rightToLeftTimingConfig(useNativeDriver)),
+          ),
+        ),
+      ]),
+  },
+  {
+    title: 'Sequence',
+    description:
+      'Starts the animations in order, waiting for each to complete before starting the next',
+    compositeAnimation: (values, useNativeDriver) =>
+      Animated.sequence([
+        Animated.sequence(
+          values.map(value =>
+            Animated.timing(value, leftToRightTimingConfig(useNativeDriver)),
+          ),
+        ),
+        Animated.sequence(
+          values.map(value =>
+            Animated.timing(value, rightToLeftTimingConfig(useNativeDriver)),
+          ),
+        ),
+      ]),
+  },
+  {
+    title: 'Stagger',
+    description:
+      'Starts animations in order and in parallel, but with successive delays',
+    compositeAnimation: (values, useNativeDriver) =>
+      Animated.sequence([
+        Animated.stagger(
+          150,
+          values.map(value =>
+            Animated.timing(value, leftToRightTimingConfig(useNativeDriver)),
+          ),
+        ),
+        Animated.stagger(
+          150,
+          values.map(value =>
+            Animated.timing(value, rightToLeftTimingConfig(useNativeDriver)),
+          ),
+        ),
+      ]),
+  },
+  {
+    title: 'Delay',
+    description: 'Starts an animation after a given delay',
+    compositeAnimation: (values, useNativeDriver) =>
+      Animated.sequence([
+        Animated.delay(2000),
+        Animated.parallel(
+          values.map(value =>
+            Animated.timing(value, leftToRightTimingConfig(useNativeDriver)),
+          ),
+        ),
+        Animated.delay(2000),
+        Animated.parallel(
+          values.map(value =>
+            Animated.timing(value, rightToLeftTimingConfig(useNativeDriver)),
+          ),
+        ),
+      ]),
+  },
+];
+
+function ComposingExampleItem({
+  title,
+  description,
+  compositeAnimation,
+  useNativeDriver,
+}: {
+  title: string,
+  description: string,
+  compositeAnimation: (
+    values: Animated.Value[],
+    useNativeDriver: boolean,
+  ) => CompositeAnimation,
+  useNativeDriver: boolean,
+}): React.Node {
+  const {width: windowWidth} = useWindowDimensions();
+
+  // Figure out how far along the x axis we should translate the box by taking into
+  // account the window width, box size, and padding
+  const maxXTranslation = windowWidth - boxSize - 4 * padding;
+  const boxIndexes = React.useMemo(() => [0, 1, 2, 3, 4], []);
+  const xTranslations = React.useRef(
+    boxIndexes.map(() => new Animated.Value(0)),
+  );
+  const animation = React.useRef(
+    compositeAnimation(xTranslations.current, useNativeDriver),
+  );
+
+  return (
+    <View style={styles.itemContainer}>
+      <Text style={styles.itemTitle}>{title}</Text>
+      <Text>{description}</Text>
+      <View style={styles.boxesContainer}>
+        {boxIndexes.map(boxIndex => {
+          const translateX = xTranslations.current[boxIndex].interpolate({
+            inputRange: [0, 1],
+            outputRange: ([0, maxXTranslation]: [number, number]),
+          });
+
+          return (
+            <Animated.View
+              key={boxIndex}
+              style={[
+                styles.box,
+                {
+                  transform: [{translateX}],
+                },
+              ]}
+            />
+          );
+        })}
+      </View>
+      <View style={styles.buttonsContainer}>
+        <RNTesterButton
+          onPress={() => {
+            animation.current.reset();
+            animation.current.start();
+          }}>
+          Start
+        </RNTesterButton>
+        <RNTesterButton
+          onPress={() => {
+            animation.current.stop();
+          }}>
+          Stop
+        </RNTesterButton>
+        <RNTesterButton
+          onPress={() => {
+            // TODO (T96213225): Animated.reset() doesn't work without using native driver
+            animation.current.reset();
+          }}>
+          Reset
+        </RNTesterButton>
+      </View>
+    </View>
+  );
+}
+
+function ComposingExample(props: Props): React.Node {
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+
+  return (
+    <>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={setUseNativeDriver}
+        />
+      </RNTConfigurationBlock>
+      <FlatList
+        data={items}
+        renderItem={({item}) => (
+          <ComposingExampleItem
+            key={`${item.title}${useNativeDriver ? 'native' : 'non-native'}`}
+            title={item.title}
+            description={item.description}
+            compositeAnimation={item.compositeAnimation}
+            useNativeDriver={useNativeDriver}
+          />
+        )}
+      />
+    </>
+  );
+}
+
+const styles = StyleSheet.create({
+  itemContainer: {
+    padding,
+    alignItems: 'stretch',
+  },
+  itemTitle: {
+    fontSize: 18,
+    fontWeight: '300',
+  },
+  boxesContainer: {
+    marginVertical: padding,
+    padding,
+    backgroundColor: '#eeeeee',
+    borderRadius: 4,
+  },
+  box: {
+    borderRadius: 1,
+    backgroundColor: '#61dafb',
+    width: boxSize,
+    height: boxSize,
+    marginBottom: 2,
+  },
+  buttonsContainer: {
+    flexDirection: 'row',
+  },
+});
+
+export default ({
+  title: 'Composing',
+  name: 'composing',
+  description: 'Combine multiple animations using composition functions',
+  render: () => <ComposingExample />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/ContinuousInteractionsExample.js b/packages/rn-tester/js/examples/Animated/ContinuousInteractionsExample.js
new file mode 100644
index 00000000000000..19d6268b81b363
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/ContinuousInteractionsExample.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import * as React from 'react';
+import {Text} from 'react-native';
+
+export default ({
+  title: 'Continuous Interactions',
+  name: 'continuousInteractions',
+  description: ('Gesture events, chaining, 2D ' +
+    'values, interrupting and transitioning ' +
+    'animations, etc.': string),
+  render: (): React.Node => <Text>Checkout the Gratuitous Animation App!</Text>,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/EasingExample.js b/packages/rn-tester/js/examples/Animated/EasingExample.js
new file mode 100644
index 00000000000000..6203fc36de4a74
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/EasingExample.js
@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import * as React from 'react';
+import RNTesterButton from '../../components/RNTesterButton';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+import {
+  Text,
+  StyleSheet,
+  View,
+  Animated,
+  SectionList,
+  Easing,
+} from 'react-native';
+
+type Props = $ReadOnly<{||}>;
+
+type EasingListItem = {
+  title: string,
+  easing: (value: number) => number,
+};
+
+const easingSections = [
+  {
+    title: 'Predefined animations',
+    data: [
+      // $FlowFixMe[method-unbinding]
+      {title: 'Bounce', easing: Easing.bounce},
+      // $FlowFixMe[method-unbinding]
+      {title: 'Ease', easing: Easing.ease},
+      {title: 'Elastic', easing: Easing.elastic(4)},
+    ],
+  },
+  {
+    title: 'Standard functions',
+    data: [
+      // $FlowFixMe[method-unbinding]
+      {title: 'Linear', easing: Easing.linear},
+      // $FlowFixMe[method-unbinding]
+      {title: 'Quad', easing: Easing.quad},
+      // $FlowFixMe[method-unbinding]
+      {title: 'Cubic', easing: Easing.cubic},
+    ],
+  },
+  {
+    title: 'Additional functions',
+    data: [
+      {
+        title: 'Bezier',
+        easing: Easing.bezier(0, 2, 1, -1),
+      },
+      // $FlowFixMe[method-unbinding]
+      {title: 'Circle', easing: Easing.circle},
+      // $FlowFixMe[method-unbinding]
+      {title: 'Sin', easing: Easing.sin},
+      // $FlowFixMe[method-unbinding]
+      {title: 'Exp', easing: Easing.exp},
+    ],
+  },
+  {
+    title: 'Combinations',
+    data: [
+      {
+        title: 'In + Bounce',
+        // $FlowFixMe[method-unbinding]
+        easing: Easing.in(Easing.bounce),
+      },
+      {
+        title: 'Out + Exp',
+        // $FlowFixMe[method-unbinding]
+        easing: Easing.out(Easing.exp),
+      },
+      {
+        title: 'InOut + Elastic',
+        easing: Easing.inOut(Easing.elastic(1)),
+      },
+    ],
+  },
+];
+
+function EasingItem({
+  item,
+  useNativeDriver,
+}: {
+  item: EasingListItem,
+  useNativeDriver: boolean,
+}): React.Node {
+  const opacityAndScale = React.useRef(new Animated.Value(1));
+  const animation = React.useRef(
+    Animated.timing(opacityAndScale.current, {
+      toValue: 1,
+      duration: 1200,
+      easing: item.easing,
+      useNativeDriver,
+    }),
+  );
+
+  const animatedStyles = [
+    styles.box,
+    {
+      opacity: opacityAndScale.current,
+      transform: [{scale: opacityAndScale.current}],
+    },
+  ];
+
+  return (
+    <View style={styles.itemContainer}>
+      <View style={styles.itemMeta}>
+        <Text style={styles.itemTitle}>{item.title}</Text>
+        <RNTesterButton
+          onPress={() => {
+            opacityAndScale.current.setValue(0);
+            animation.current.start();
+          }}>
+          Animate
+        </RNTesterButton>
+      </View>
+      <View style={styles.boxContainer}>
+        <Animated.View style={animatedStyles} />
+      </View>
+    </View>
+  );
+}
+
+function EasingExample(props: Props): React.Node {
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+
+  return (
+    <>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={setUseNativeDriver}
+        />
+      </RNTConfigurationBlock>
+      <SectionList
+        sections={easingSections}
+        renderItem={info => {
+          const item = (info.item: EasingListItem);
+
+          return (
+            <EasingItem
+              key={`${item.title}${useNativeDriver ? 'native' : 'non-native'}`}
+              item={item}
+              useNativeDriver={useNativeDriver}
+            />
+          );
+        }}
+        renderSectionHeader={({section: {title}}) => (
+          <Text style={styles.sectionHeader}>{title}</Text>
+        )}
+      />
+    </>
+  );
+}
+
+const boxSize = 50;
+const styles = StyleSheet.create({
+  sectionHeader: {
+    paddingHorizontal: 8,
+    paddingVertical: 4,
+    backgroundColor: '#f4f4f4',
+    color: '#999',
+    fontSize: 12,
+  },
+  itemContainer: {
+    padding: 8,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  itemMeta: {
+    flex: 1,
+    alignItems: 'flex-start',
+  },
+  itemTitle: {
+    fontSize: 18,
+    fontWeight: '300',
+  },
+  boxContainer: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    height: boxSize,
+    width: boxSize * 2,
+  },
+  box: {
+    borderRadius: 4,
+    backgroundColor: '#61dafb',
+    width: boxSize,
+    height: boxSize,
+  },
+});
+
+export default ({
+  title: 'Easing',
+  name: 'easing',
+  description:
+    'The Easing module implements common easing functions. This module is used by Animated.timing() to convey physically believable motion in animations.',
+  render: () => <EasingExample />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/FadeInViewExample.js b/packages/rn-tester/js/examples/Animated/FadeInViewExample.js
new file mode 100644
index 00000000000000..8a8d8ea09d0ed8
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/FadeInViewExample.js
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import * as React from 'react';
+import RNTesterButton from '../../components/RNTesterButton';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+import {Text, StyleSheet, View, Animated} from 'react-native';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+
+const styles = StyleSheet.create({
+  content: {
+    backgroundColor: 'deepskyblue',
+    borderWidth: 1,
+    borderColor: 'dodgerblue',
+    padding: 20,
+    margin: 20,
+    borderRadius: 10,
+    alignItems: 'center',
+  },
+});
+
+function FadeInView({
+  useNativeDriver,
+  children,
+}: {
+  useNativeDriver: boolean,
+  children: React.Node,
+}) {
+  //opacity 0
+  const [fadeAnim, setFadeAnim] = React.useState(() => new Animated.Value(0));
+  React.useEffect(() => {
+    Animated.timing(
+      // Uses easing functions
+      fadeAnim, // The value to drive
+      {
+        // Target
+        toValue: 1,
+
+        // Configuration
+        duration: 2000,
+
+        useNativeDriver,
+      },
+    ).start(); // Don't forget start!
+  }, [fadeAnim, useNativeDriver]);
+
+  return (
+    <Animated.View // Special animatable View
+      style={{
+        opacity: fadeAnim, // Binds
+      }}>
+      {children}
+    </Animated.View>
+  );
+}
+
+function FadeInExample(): React.Node {
+  const [show, setShow] = React.useState(true);
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+  return (
+    <View>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={setUseNativeDriver}
+        />
+      </RNTConfigurationBlock>
+      <RNTesterButton testID="toggle-button" onPress={() => setShow(!show)}>
+        Press to {show ? 'Hide' : 'Show'}
+      </RNTesterButton>
+      {show && (
+        <FadeInView useNativeDriver={useNativeDriver}>
+          <View testID="fade-in-view" style={styles.content}>
+            <Text>FadeInView</Text>
+          </View>
+        </FadeInView>
+      )}
+    </View>
+  );
+}
+
+export default ({
+  title: 'FadeInView',
+  name: 'fadeInView',
+  description: ('Uses a simple timing animation to ' +
+    'bring opacity from 0 to 1 when the component ' +
+    'mounts.': string),
+  expect:
+    'FadeInView box should animate from opacity 0 to 1. \nExpect no animation when hiding.\nHiding the view mid-animation should not affect next animation.',
+  render: (): React.Node => <FadeInExample />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/LoopingExample.js b/packages/rn-tester/js/examples/Animated/LoopingExample.js
new file mode 100644
index 00000000000000..8f4ce6e173d2b9
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/LoopingExample.js
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import RNTesterButton from '../../components/RNTesterButton';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import {Animated, StyleSheet, Text, View} from 'react-native';
+import * as React from 'react';
+import {useEffect} from 'react';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+
+export default ({
+  title: 'Looping Example',
+  name: 'loopingView',
+  description: 'Native looping animation that shrinks and fades out a view.',
+  render: () => <LoopingExample />,
+}: RNTesterModuleExample);
+
+function LoopingView({
+  useNativeDriver,
+  running,
+}: {
+  useNativeDriver: boolean,
+  running: boolean,
+}) {
+  const opacity = React.useMemo(() => new Animated.Value(1), []);
+  const scale = React.useMemo(() => new Animated.Value(1), []);
+
+  useEffect(() => {
+    if (!running) {
+      return;
+    }
+
+    const options = {
+      duration: 1000,
+      toValue: 0,
+      useNativeDriver,
+    };
+    const animation = Animated.loop(
+      Animated.parallel([
+        Animated.timing(opacity, options),
+        Animated.timing(scale, options),
+      ]),
+    );
+    animation.start();
+
+    return () => {
+      animation.reset();
+    };
+  }, [opacity, scale, running, useNativeDriver]);
+
+  return (
+    <Animated.View style={[styles.view, {opacity, transform: [{scale}]}]}>
+      <Text>Looping!</Text>
+    </Animated.View>
+  );
+}
+
+function LoopingExample(props: {}): React.Node {
+  const [running, setRunning] = React.useState(false);
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+
+  return (
+    <View>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={value => {
+            setRunning(false);
+            setUseNativeDriver(value);
+          }}
+        />
+      </RNTConfigurationBlock>
+      <RNTesterButton onPress={() => setRunning(!running)}>
+        Press to {running ? 'Reset' : 'Start'}
+      </RNTesterButton>
+      <LoopingView
+        key={`looping-view-${useNativeDriver ? 'native' : 'js'}-driver`}
+        useNativeDriver={useNativeDriver}
+        running={running}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  view: {
+    backgroundColor: 'deepskyblue',
+    borderWidth: 1,
+    borderColor: 'dodgerblue',
+    borderRadius: 10,
+    padding: 20,
+    alignItems: 'center',
+    margin: 20,
+  },
+});
diff --git a/packages/rn-tester/js/examples/Animated/MovingBoxExample.js b/packages/rn-tester/js/examples/Animated/MovingBoxExample.js
new file mode 100644
index 00000000000000..73d9d03ad1a3fe
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/MovingBoxExample.js
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import * as React from 'react';
+import RNTesterButton from '../../components/RNTesterButton';
+import {Text, StyleSheet, View, Animated} from 'react-native';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+const containerWidth = 200;
+const boxSize = 50;
+
+const styles = StyleSheet.create({
+  content: {
+    backgroundColor: 'deepskyblue',
+    borderWidth: 1,
+    borderColor: 'dodgerblue',
+    padding: 20,
+    margin: 20,
+    borderRadius: 10,
+    alignItems: 'center',
+  },
+  container: {
+    display: 'flex',
+    alignItems: 'center',
+    flexDirection: 'column',
+    backgroundColor: '#fff',
+    padding: 30,
+  },
+  boxContainer: {
+    backgroundColor: '#d3d3d3',
+    height: boxSize,
+    width: containerWidth,
+  },
+  box: {
+    width: boxSize,
+    height: boxSize,
+    margin: 0,
+  },
+  buttonsContainer: {
+    marginTop: 20,
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    width: containerWidth,
+  },
+});
+
+type Props = $ReadOnly<{||}>;
+
+function MovingBoxView({useNativeDriver}: {useNativeDriver: boolean}) {
+  const x = React.useRef(new Animated.Value(0));
+  const [update, setUpdate] = React.useState(0);
+  const [boxVisible, setBoxVisible] = React.useState(true);
+
+  const moveTo = (pos: number) => {
+    Animated.timing(x.current, {
+      toValue: pos,
+      duration: 1000,
+      useNativeDriver,
+    }).start();
+  };
+
+  const toggleVisibility = () => {
+    setBoxVisible(!boxVisible);
+  };
+  const toggleText = boxVisible ? 'Hide' : 'Show';
+  const onReset = () => {
+    x.current.resetAnimation();
+    setUpdate(update + 1);
+  };
+  return (
+    <View style={styles.container}>
+      <View style={styles.boxContainer}>
+        {boxVisible ? (
+          <Animated.View
+            testID="moving-view"
+            style={[
+              styles.content,
+              styles.box,
+              {transform: [{translateX: x.current}]},
+            ]}
+          />
+        ) : (
+          <Text>The box view is not being rendered</Text>
+        )}
+      </View>
+      <View style={styles.buttonsContainer}>
+        <RNTesterButton testID="move-left-button" onPress={() => moveTo(0)}>
+          {'<-'}
+        </RNTesterButton>
+        <RNTesterButton onPress={toggleVisibility}>{toggleText}</RNTesterButton>
+        <RNTesterButton onPress={onReset}>Reset</RNTesterButton>
+        <RNTesterButton
+          testID="move-right-button"
+          onPress={() => moveTo(containerWidth - boxSize)}>
+          {'->'}
+        </RNTesterButton>
+      </View>
+    </View>
+  );
+}
+
+function MovingBoxExample(props: Props): React.Node {
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+
+  return (
+    <>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={setUseNativeDriver}
+        />
+      </RNTConfigurationBlock>
+      <MovingBoxView
+        key={`moving-box-view-${useNativeDriver ? 'native' : 'js'}-driver`}
+        useNativeDriver={useNativeDriver}
+      />
+    </>
+  );
+}
+
+export default ({
+  title: 'Moving box example',
+  name: 'movingView',
+  description:
+    'Click arrow buttons to move the box. Hide will remove the box from layout.',
+  expect:
+    'During animation, removing box from layout will stop the animation and box will stay in its current position.\nStarting animation when box is not rendered and rendering mid-way does not affect animation.\nReset will reset the animation to its starting position.',
+  render: (): React.Node => <MovingBoxExample />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/RotatingImagesExample.js b/packages/rn-tester/js/examples/Animated/RotatingImagesExample.js
new file mode 100644
index 00000000000000..0c1a73e802b0e1
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/RotatingImagesExample.js
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import * as React from 'react';
+import RNTesterButton from '../../components/RNTesterButton';
+import {Animated, View, StyleSheet} from 'react-native';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+
+const styles = StyleSheet.create({
+  rotatingImage: {
+    width: 70,
+    height: 70,
+  },
+});
+
+function RotatingImagesView({useNativeDriver}: {useNativeDriver: boolean}) {
+  const anim = new Animated.Value(0);
+  const rotatingAnimation = Animated.spring(anim, {
+    // Returns to the start
+    toValue: 0,
+
+    // Velocity makes it move
+    velocity: 3,
+
+    // Slow
+    tension: -10,
+
+    // Oscillate a lot
+    friction: 1,
+    useNativeDriver,
+  });
+
+  return (
+    <>
+      <RNTesterButton
+        onPress={() => {
+          rotatingAnimation.start();
+        }}>
+        Press to Spin it!
+      </RNTesterButton>
+      <Animated.Image
+        source={require('../../assets/bunny.png')}
+        style={[
+          styles.rotatingImage,
+          {
+            transform: [
+              {
+                scale: anim.interpolate({
+                  inputRange: [0, 1],
+                  outputRange: ([1, 10]: $ReadOnlyArray<number>),
+                }),
+              },
+              {
+                translateX: anim.interpolate({
+                  inputRange: [0, 1],
+                  outputRange: ([0, 100]: $ReadOnlyArray<number>),
+                }),
+              },
+              {
+                rotate: anim.interpolate({
+                  inputRange: [0, 1],
+                  outputRange: ([
+                    '0deg',
+                    '360deg', // 'deg' or 'rad'
+                  ]: $ReadOnlyArray<string>),
+                }),
+              },
+            ],
+          },
+        ]}
+      />
+    </>
+  );
+}
+
+function RotatingImagesExample(): React.Node {
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+
+  return (
+    <View>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={setUseNativeDriver}
+        />
+      </RNTConfigurationBlock>
+      <RotatingImagesView
+        key={`rotating-images-view-${useNativeDriver ? 'native' : 'js'}-driver`}
+        useNativeDriver={useNativeDriver}
+      />
+    </View>
+  );
+}
+
+export default ({
+  title: 'Rotating Images',
+  name: 'rotatingImages',
+  description: 'Simple Animated.Image rotation.',
+  expect:
+    'Transform animation on image in scale, rotation, and translation. JS driver will ignore any calls to `start` on running animation. Native driver will re-start the animation.',
+  render: RotatingImagesExample,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/TransformBounceExample.js b/packages/rn-tester/js/examples/Animated/TransformBounceExample.js
new file mode 100644
index 00000000000000..a86ef503bb9f96
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/TransformBounceExample.js
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import * as React from 'react';
+import RNTesterButton from '../../components/RNTesterButton';
+import {Text, StyleSheet, View, Animated} from 'react-native';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+
+const styles = StyleSheet.create({
+  content: {
+    backgroundColor: 'deepskyblue',
+    borderWidth: 1,
+    borderColor: 'dodgerblue',
+    padding: 20,
+    margin: 20,
+    borderRadius: 10,
+    alignItems: 'center',
+  },
+});
+
+function TransformBounceView({useNativeDriver}: {useNativeDriver: boolean}) {
+  const anim = new Animated.Value(0);
+  const bounceAnimation = Animated.spring(anim, {
+    // Returns to the start
+    toValue: 0,
+
+    // Velocity makes it move
+    velocity: 3,
+
+    // Slow
+    tension: -10,
+
+    // Oscillate a lot
+    friction: 1,
+
+    useNativeDriver,
+  });
+
+  return (
+    <>
+      <RNTesterButton
+        onPress={() => {
+          bounceAnimation.start();
+        }}>
+        Press to Fling it!
+      </RNTesterButton>
+      <Animated.View
+        style={[
+          styles.content,
+          {
+            transform: [
+              // Array order matters
+              {
+                scale: anim.interpolate({
+                  inputRange: [0, 1],
+                  outputRange: ([1, 4]: $ReadOnlyArray<number>),
+                }),
+              },
+              {
+                translateX: anim.interpolate({
+                  inputRange: [0, 1],
+                  outputRange: ([0, 500]: $ReadOnlyArray<number>),
+                }),
+              },
+              {
+                rotate: anim.interpolate({
+                  inputRange: [0, 1],
+                  outputRange: ([
+                    '0deg',
+                    '360deg', // 'deg' or 'rad'
+                  ]: $ReadOnlyArray<string>),
+                }),
+              },
+            ],
+          },
+        ]}>
+        <Text>Transforms!</Text>
+      </Animated.View>
+    </>
+  );
+}
+
+function TransformBounceExample(): React.Node {
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+
+  return (
+    <View>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={setUseNativeDriver}
+        />
+      </RNTConfigurationBlock>
+      <TransformBounceView
+        key={`transform-bounce-view-${
+          useNativeDriver ? 'native' : 'js'
+        }-driver`}
+        useNativeDriver={useNativeDriver}
+      />
+    </View>
+  );
+}
+
+export default ({
+  title: 'Transform Bounce',
+  name: 'transformBounce',
+  expect: 'Transform animation on rotation, translation, scale of View',
+  description: ('One `Animated.Value` is driven by a ' +
+    'spring with custom constants and mapped to an ' +
+    'ordered set of transforms.  Each transform has ' +
+    'an interpolation to convert the value into the ' +
+    'right range and units.': string),
+  render: () => <TransformBounceExample />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/TransformStylesExample.js b/packages/rn-tester/js/examples/Animated/TransformStylesExample.js
new file mode 100644
index 00000000000000..78493630d5cee8
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/TransformStylesExample.js
@@ -0,0 +1,168 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import {RNTesterThemeContext} from '../../components/RNTesterTheme';
+import RNTOption from '../../components/RNTOption';
+import * as React from 'react';
+import {Animated, Text, View, StyleSheet} from 'react-native';
+import RNTConfigurationBlock from '../../components/RNTConfigurationBlock';
+import RNTesterButton from '../../components/RNTesterButton';
+import ToggleNativeDriver from './utils/ToggleNativeDriver';
+
+const transformProperties = {
+  rotate: {outputRange: ['0deg', '360deg'], selected: false},
+  rotateX: {outputRange: ['0deg', '360deg'], selected: false},
+  rotateY: {outputRange: ['0deg', '360deg'], selected: false},
+  rotateZ: {outputRange: ['0deg', '360deg'], selected: false},
+  skewX: {outputRange: ['0deg', '45deg'], selected: false},
+  skewY: {outputRange: ['0deg', '45deg'], selected: false},
+  perspective: {outputRange: [1, 2], selected: false},
+  scale: {outputRange: [1, 3], selected: false},
+  scaleX: {outputRange: [1, 3], selected: false},
+  scaleY: {outputRange: [1, 3], selected: false},
+  translateX: {outputRange: [0, 100], selected: false},
+  translateY: {outputRange: [0, 100], selected: false},
+};
+
+function AnimatedView({
+  properties,
+  useNativeDriver,
+}: {
+  properties: Array<string>,
+  useNativeDriver: boolean,
+}) {
+  const animatedValue = new Animated.Value(0);
+  const transformStyles = properties.map(property => ({
+    [property]: animatedValue.interpolate({
+      inputRange: [0, 1],
+      outputRange: transformProperties[property].outputRange,
+    }),
+  }));
+  const animation = Animated.sequence([
+    Animated.timing(animatedValue, {
+      toValue: 1,
+      duration: 500,
+      useNativeDriver,
+    }),
+    Animated.timing(animatedValue, {
+      toValue: 0,
+      duration: 500,
+      useNativeDriver,
+    }),
+  ]);
+  return (
+    <>
+      <RNTesterButton
+        onPress={() => {
+          animation.reset();
+          animation.start();
+        }}>
+        Apply Selected Transforms
+      </RNTesterButton>
+      <Animated.View
+        style={[styles.animatedView, {transform: transformStyles}]}
+      />
+    </>
+  );
+}
+
+function notSupportedByNativeDriver(property: string) {
+  return property === 'skewX' || property === 'skewY';
+}
+
+function AnimatedTransformStyleExample(): React.Node {
+  const [properties, setProperties] = React.useState(transformProperties);
+  const [useNativeDriver, setUseNativeDriver] = React.useState(false);
+  const onToggle = (property: string) =>
+    setProperties({
+      ...properties,
+      [property]: {
+        ...properties[property],
+        selected: !properties[property].selected,
+      },
+    });
+  const theme = React.useContext(RNTesterThemeContext);
+
+  return (
+    <View>
+      <RNTConfigurationBlock>
+        <ToggleNativeDriver
+          value={useNativeDriver}
+          onValueChange={setUseNativeDriver}
+          style={StyleSheet.compose(styles.bottomSeparation, {
+            borderBottomColor: theme.SeparatorColor,
+          })}
+        />
+        <Text style={styles.optionsTitle}>Selected Styles</Text>
+        <View style={styles.options}>
+          {Object.keys(properties).map(property => {
+            return (
+              <RNTOption
+                key={property}
+                label={property}
+                multiSelect
+                disabled={
+                  notSupportedByNativeDriver(property) && useNativeDriver
+                }
+                selected={properties[property].selected}
+                onPress={() => {
+                  onToggle(property);
+                }}
+                style={styles.option}
+              />
+            );
+          })}
+        </View>
+      </RNTConfigurationBlock>
+      <AnimatedView
+        key={`animated-view-use-${useNativeDriver ? 'native' : 'js'}-driver`}
+        useNativeDriver={useNativeDriver}
+        properties={Object.keys(properties).filter(
+          property =>
+            properties[property].selected &&
+            !(useNativeDriver && notSupportedByNativeDriver(property)),
+        )}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  optionsTitle: {
+    marginTop: 4,
+    marginBottom: 6,
+  },
+  options: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+  },
+  option: {
+    margin: 2,
+  },
+  animatedView: {
+    height: 100,
+    width: 100,
+    backgroundColor: 'blue',
+  },
+  bottomSeparation: {
+    paddingBottom: 6,
+    marginBottom: 6,
+    borderBottomWidth: 1,
+  },
+});
+
+export default ({
+  title: 'Transform Styles',
+  name: 'transformStyles',
+  description:
+    'Variations of transform styles. `skewX` and `skewY` are not supported on native driver.',
+  render: () => <AnimatedTransformStyleExample />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Animated/utils/ToggleNativeDriver.js b/packages/rn-tester/js/examples/Animated/utils/ToggleNativeDriver.js
new file mode 100644
index 00000000000000..718f560cb97f2e
--- /dev/null
+++ b/packages/rn-tester/js/examples/Animated/utils/ToggleNativeDriver.js
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import {View, Text, StyleSheet, Switch} from 'react-native';
+import * as React from 'react';
+
+type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
+
+type Props = {
+  value: boolean,
+  onValueChange: $ElementType<
+    React.ElementConfig<typeof Switch>,
+    'onValueChange',
+  >,
+  style?: ?ViewStyleProp,
+};
+
+export default function ToggleNativeDriver({
+  value,
+  onValueChange,
+  style,
+}: Props): React.Node {
+  return (
+    <View style={StyleSheet.compose(styles.row, style)}>
+      <Text>Use Native Driver</Text>
+      <Switch
+        testID="toggle-use-native-driver"
+        onValueChange={onValueChange}
+        value={value}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  },
+});
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExApp.js b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExApp.js
similarity index 95%
rename from packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExApp.js
rename to packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExApp.js
index 849efab08ea3c7..2bebbe67ad008b 100644
--- a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExApp.js
+++ b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExApp.js
@@ -15,9 +15,7 @@ const {
   Animated,
   LayoutAnimation,
   PanResponder,
-  Platform,
   StyleSheet,
-  UIManager,
   View,
 } = require('react-native');
 
@@ -41,10 +39,6 @@ class Circle extends React.Component<any, any> {
       pan: new Animated.ValueXY(), // Vectors reduce boilerplate.  (step1: uncomment)
       pop: new Animated.Value(0), // Initial value.               (step2a: uncomment)
     };
-
-    if (Platform.OS === 'android') {
-      UIManager.setLayoutAnimationEnabledExperimental(true);
-    }
   }
 
   _onLongPress(): void {
@@ -114,16 +108,16 @@ class Circle extends React.Component<any, any> {
         onResponderGrant: () => {
           this.state.pan.setValue({x: 0, y: 0}); // reset                (step1: uncomment)
           this.state.pan.setOffset(this.props.restLayout); // offset from onLayout (step1: uncomment)
-          /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.63 was deployed. To see the error
-           * delete this comment and run Flow. */
+          /* $FlowFixMe[incompatible-type] (>=0.63.0 site=react_native_fb) This
+           * comment suppresses an error found when Flow v0.63 was deployed. To
+           * see the error delete this comment and run Flow. */
           this.longTimer = setTimeout(this._onLongPress, 300);
         },
         onResponderRelease: () => {
           if (!this.state.panResponder) {
-            /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.63 was deployed. To see
-             * the error delete this comment and run Flow. */
+            /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb)
+             * This comment suppresses an error found when Flow v0.63 was
+             * deployed. To see the error delete this comment and run Flow. */
             clearTimeout(this.longTimer);
             this._toggleIsActive();
           }
@@ -262,6 +256,7 @@ class AnExApp extends React.Component<any, any> {
             openVal={this.state.openVal}
             onLayout={onLayout}
             restLayout={this.state.restLayouts[idx]}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             onActivate={this.setState.bind(this, {
               activeKey: key,
               activeInitialLayout: this.state.restLayouts[idx],
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExBobble.js b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExBobble.js
similarity index 100%
rename from packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExBobble.js
rename to packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExBobble.js
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExChained.js b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExChained.js
similarity index 94%
rename from packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExChained.js
rename to packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExChained.js
index 4175fdf3684384..cd4117700476d4 100644
--- a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExChained.js
+++ b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExChained.js
@@ -110,11 +110,11 @@ const styles = StyleSheet.create({
 });
 
 const CHAIN_IMGS = [
-  require('../../../assets/hawk.png'),
-  require('../../../assets/bunny.png'),
-  require('../../../assets/relay.png'),
-  require('../../../assets/hawk.png'),
-  require('../../../assets/bunny.png'),
+  require('../../assets/hawk.png'),
+  require('../../assets/bunny.png'),
+  require('../../assets/relay.png'),
+  require('../../assets/hawk.png'),
+  require('../../assets/bunny.png'),
 ];
 
 module.exports = AnExChained;
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExScroll.js b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExScroll.js
similarity index 100%
rename from packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExScroll.js
rename to packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExScroll.js
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExSet.js b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExSet.js
similarity index 100%
rename from packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExSet.js
rename to packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExSet.js
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExSlides.md b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExSlides.md
similarity index 100%
rename from packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExSlides.md
rename to packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExSlides.md
diff --git a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExTilt.js b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExTilt.js
similarity index 98%
rename from packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExTilt.js
rename to packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExTilt.js
index ba8ca33efb9a71..ca193a94cb0943 100644
--- a/packages/rn-tester/js/examples/Animated/AnimatedGratuitousApp/AnExTilt.js
+++ b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExTilt.js
@@ -132,7 +132,7 @@ class AnExTilt extends React.Component<Object, any> {
               },
             ],
           }}
-          source={require('../../../assets/trees.jpg')}
+          source={require('../../assets/trees.jpg')}
         />
       </Animated.View>
     );
diff --git a/packages/rn-tester/js/examples/AppState/AppStateExample.js b/packages/rn-tester/js/examples/AppState/AppStateExample.js
index 54d83415780212..ddb2d8c9808980 100644
--- a/packages/rn-tester/js/examples/AppState/AppStateExample.js
+++ b/packages/rn-tester/js/examples/AppState/AppStateExample.js
@@ -12,7 +12,8 @@
 
 const React = require('react');
 
-const {AppState, Text, View} = require('react-native');
+import {type EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
+const {AppState, Text, View, Platform} = require('react-native');
 
 class AppStateSubscription extends React.Component<
   $FlowFixMeProps,
@@ -22,22 +23,48 @@ class AppStateSubscription extends React.Component<
     appState: AppState.currentState,
     previousAppStates: [],
     memoryWarnings: 0,
+    eventsDetected: [],
   };
 
+  _subscriptions: ?Array<EventSubscription>;
+
   componentDidMount() {
-    AppState.addEventListener('change', this._handleAppStateChange);
-    AppState.addEventListener('memoryWarning', this._handleMemoryWarning);
+    this._subscriptions = [
+      AppState.addEventListener('change', this._handleAppStateChange),
+      AppState.addEventListener('memoryWarning', this._handleMemoryWarning),
+    ];
+    if (Platform.OS === 'android') {
+      this._subscriptions.push(
+        AppState.addEventListener('focus', this._handleFocus),
+        AppState.addEventListener('blur', this._handleBlur),
+      );
+    }
   }
 
   componentWillUnmount() {
-    AppState.removeEventListener('change', this._handleAppStateChange);
-    AppState.removeEventListener('memoryWarning', this._handleMemoryWarning);
+    if (this._subscriptions != null) {
+      for (const subscription of this._subscriptions) {
+        subscription.remove();
+      }
+    }
   }
 
   _handleMemoryWarning = () => {
     this.setState({memoryWarnings: this.state.memoryWarnings + 1});
   };
 
+  _handleBlur = () => {
+    const eventsDetected = this.state.eventsDetected.slice();
+    eventsDetected.push('blur');
+    this.setState({eventsDetected});
+  };
+
+  _handleFocus = () => {
+    const eventsDetected = this.state.eventsDetected.slice();
+    eventsDetected.push('focus');
+    this.setState({eventsDetected});
+  };
+
   _handleAppStateChange = appState => {
     const previousAppStates = this.state.previousAppStates.slice();
     previousAppStates.push(this.state.appState);
@@ -62,6 +89,13 @@ class AppStateSubscription extends React.Component<
         </View>
       );
     }
+    if (this.props.detectEvents) {
+      return (
+        <View>
+          <Text>{JSON.stringify(this.state.eventsDetected)}</Text>
+        </View>
+      );
+    }
     return (
       <View>
         <Text>{JSON.stringify(this.state.previousAppStates)}</Text>
@@ -105,4 +139,13 @@ exports.examples = [
       return <AppStateSubscription showMemoryWarnings={true} />;
     },
   },
+  {
+    platform: 'android',
+    title: 'Focus/Blur Events',
+    description:
+      'In the Android simulator, toggle the notification drawer to fire events.',
+    render(): React.Element<any> {
+      return <AppStateSubscription detectEvents={true} />;
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/Appearance/AppearanceExample.js b/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
index 38a7e68fd8f491..55b38f03346f2c 100644
--- a/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
+++ b/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
@@ -8,34 +8,35 @@
  * @flow
  */
 
-'use strict';
-
 import * as React from 'react';
 import {Appearance, Text, useColorScheme, View} from 'react-native';
 import type {AppearancePreferences} from 'react-native/Libraries/Utilities/NativeAppearance';
+import type {EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 import {RNTesterThemeContext, themes} from '../../components/RNTesterTheme';
 
 class ColorSchemeSubscription extends React.Component<
   {...},
   {colorScheme: ?string, ...},
 > {
+  _subscription: ?EventSubscription;
+
   state = {
     colorScheme: Appearance.getColorScheme(),
   };
 
   componentDidMount() {
-    Appearance.addChangeListener(this._handleAppearanceChange);
+    this._subscription = Appearance.addChangeListener(
+      (preferences: AppearancePreferences) => {
+        const {colorScheme} = preferences;
+        this.setState({colorScheme});
+      },
+    );
   }
 
   componentWillUnmount() {
-    Appearance.removeChangeListener(this._handleAppearanceChange);
+    this._subscription?.remove();
   }
 
-  _handleAppearanceChange = (preferences: AppearancePreferences) => {
-    const {colorScheme} = preferences;
-    this.setState({colorScheme});
-  };
-
   render() {
     return (
       <RNTesterThemeContext.Consumer>
diff --git a/packages/rn-tester/js/examples/Border/BorderExample.js b/packages/rn-tester/js/examples/Border/BorderExample.js
index dbcb00b702841c..755e51eda1b954 100644
--- a/packages/rn-tester/js/examples/Border/BorderExample.js
+++ b/packages/rn-tester/js/examples/Border/BorderExample.js
@@ -10,7 +10,13 @@
 'use strict';
 
 const React = require('react');
-const {StyleSheet, View} = require('react-native');
+const {
+  StyleSheet,
+  View,
+  PlatformColor,
+  Platform,
+  DynamicColorIOS,
+} = require('react-native');
 
 const styles = StyleSheet.create({
   box: {
@@ -23,6 +29,7 @@ const styles = StyleSheet.create({
   border1: {
     borderWidth: 10,
     borderColor: 'brown',
+    borderStyle: 'dotted',
   },
   borderRadius: {
     borderWidth: 10,
@@ -38,10 +45,10 @@ const styles = StyleSheet.create({
   },
   border3: {
     borderColor: 'purple',
-    borderTopWidth: 10,
+    borderTopWidth: 7,
     borderRightWidth: 20,
-    borderBottomWidth: 30,
-    borderLeftWidth: 40,
+    borderBottomWidth: 10,
+    borderLeftWidth: 5,
   },
   border4: {
     borderTopWidth: 10,
@@ -99,12 +106,14 @@ const styles = StyleSheet.create({
   },
   border8Left: {
     borderLeftWidth: 5,
+    borderStyle: 'dotted',
   },
   border8Bottom: {
     borderBottomWidth: 5,
   },
   border8Right: {
     borderRightWidth: 5,
+    borderStyle: 'dashed',
   },
   border9: {
     borderWidth: 10,
@@ -172,6 +181,20 @@ const styles = StyleSheet.create({
     borderBottomRightRadius: 30,
     borderBottomLeftRadius: 40,
   },
+  border15: {
+    borderWidth: 10,
+    borderColor: PlatformColor(
+      'systemGray', // TODO(macOS GH#774)
+      '@android:color/holo_orange_dark',
+    ),
+  },
+  border16: {
+    borderWidth: 10,
+    borderColor:
+      Platform.OS === 'ios'
+        ? DynamicColorIOS({light: 'magenta', dark: 'cyan'})
+        : 'black',
+  },
 });
 
 exports.title = 'Border';
@@ -299,4 +322,19 @@ exports.examples = [
       return <View style={[styles.box, styles.border14]} />;
     },
   },
+  {
+    title: 'System color',
+    description: 'Using a platform color',
+    render() {
+      return <View style={[styles.box, styles.border15]} />;
+    },
+  },
+  {
+    title: 'Dynamic color',
+    description: 'Using a custom dynamic color',
+    platform: 'ios',
+    render() {
+      return <View style={[styles.box, styles.border16]} />;
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/Button/ButtonExample.js b/packages/rn-tester/js/examples/Button/ButtonExample.js
index c15a451589539d..f3b3e057832af4 100644
--- a/packages/rn-tester/js/examples/Button/ButtonExample.js
+++ b/packages/rn-tester/js/examples/Button/ButtonExample.js
@@ -174,6 +174,29 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'Button with accessibilityState={{disabled: true}}',
+    description: ('Note: This prop will announce on TalkBack that the button is disabled. ' +
+      'The "disabled" prop has higher precedence on the state of the component': string),
+    render: function(): React.Node {
+      return (
+        <RNTesterThemeContext.Consumer>
+          {theme => {
+            return (
+              <Button
+                accessibilityState={{disabled: true}}
+                onPress={() => onButtonPress('submitted')}
+                testID="accessibilityState_button"
+                color={theme.LinkColor}
+                title="Submit Application"
+                accessibilityLabel="Press to submit your application!"
+              />
+            );
+          }}
+        </RNTesterThemeContext.Consumer>
+      );
+    },
+  },
 ];
 
 const styles = StyleSheet.create({
diff --git a/packages/rn-tester/js/examples/Crash/CrashExample.js b/packages/rn-tester/js/examples/Crash/CrashExample.js
index 5d45b571510f43..6ac4f8fa90ef76 100644
--- a/packages/rn-tester/js/examples/Crash/CrashExample.js
+++ b/packages/rn-tester/js/examples/Crash/CrashExample.js
@@ -8,7 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
 import type {Node} from 'React';
 import {NativeModules, Button} from 'react-native';
 import React from 'react';
diff --git a/packages/rn-tester/js/examples/DevSettings/DevSettingsExample.js b/packages/rn-tester/js/examples/DevSettings/DevSettingsExample.js
index 9b8d267f946c70..4993b66212513c 100644
--- a/packages/rn-tester/js/examples/DevSettings/DevSettingsExample.js
+++ b/packages/rn-tester/js/examples/DevSettings/DevSettingsExample.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import * as React from 'react';
 import {Alert, Button, DevSettings} from 'react-native';
 
diff --git a/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js b/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js
index 64167e6c2e5f6c..5fd29d2f0b0d28 100644
--- a/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js
+++ b/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js
@@ -8,8 +8,7 @@
  * @flow
  */
 
-'use strict';
-
+import type {EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 import {Dimensions, Text, useWindowDimensions} from 'react-native';
 import * as React from 'react';
 
@@ -21,20 +20,23 @@ class DimensionsSubscription extends React.Component<
     dims: Dimensions.get(this.props.dim),
   };
 
+  _dimensionsSubscription: ?EventSubscription;
+
   componentDidMount() {
-    Dimensions.addEventListener('change', this._handleDimensionsChange);
+    this._dimensionsSubscription = Dimensions.addEventListener(
+      'change',
+      dimensions => {
+        this.setState({
+          dims: dimensions[this.props.dim],
+        });
+      },
+    );
   }
 
   componentWillUnmount() {
-    Dimensions.removeEventListener('change', this._handleDimensionsChange);
+    this._dimensionsSubscription?.remove();
   }
 
-  _handleDimensionsChange = dimensions => {
-    this.setState({
-      dims: dimensions[this.props.dim],
-    });
-  };
-
   render() {
     return <Text>{JSON.stringify(this.state.dims, null, 2)}</Text>;
   }
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js b/packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js
new file mode 100644
index 00000000000000..ea4f16a892d0e0
--- /dev/null
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-onEndReached.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+import {FlatList_onEndReached} from './FlatListExamples';
+const React = require('react');
+
+exports.title = 'FlatList onEndReached';
+exports.testTitle = 'Test onEndReached callback';
+exports.category = 'ListView';
+exports.documentationURL = 'https://reactnative.dev/docs/flatlist';
+exports.description =
+  'Scroll to end of list or tap Test button to see `onEndReached` triggered.';
+exports.examples = [
+  {
+    title: 'FlatList onEndReached',
+    render: function(): React.Element<typeof FlatList_onEndReached> {
+      return <FlatList_onEndReached />;
+    },
+  },
+];
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js b/packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js
new file mode 100644
index 00000000000000..f65f51a461ccd3
--- /dev/null
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+import {FlatList_onViewableItemsChanged} from './FlatListExamples';
+const React = require('react');
+
+const VIEWABILITY_CONFIG = {
+  minimumViewTime: 1000,
+  viewAreaCoveragePercentThreshold: 100,
+  waitForInteraction: true,
+};
+
+exports.title = 'FlatList onViewableItemsChanged';
+exports.testTitle = 'Test onViewableItemsChanged callback';
+exports.category = 'ListView';
+exports.documentationURL = 'https://reactnative.dev/docs/sectionlist';
+exports.description =
+  'Scroll list to see what items are returned in `onViewableItemsChanged` callback.';
+exports.examples = [
+  {
+    title: 'FlatList onViewableItemsChanged',
+    render: function(): React.Element<typeof FlatList_onViewableItemsChanged> {
+      return (
+        <FlatList_onViewableItemsChanged
+          viewabilityConfig={VIEWABILITY_CONFIG}
+        />
+      );
+    },
+  },
+];
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js b/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js
new file mode 100644
index 00000000000000..eccf762de53aca
--- /dev/null
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+import {FlatList_withSeparators} from './FlatListExamples';
+const React = require('react');
+
+exports.title = 'FlatList with Separators';
+exports.testTitle = 'Test custom separator components';
+exports.category = 'ListView';
+exports.documentationURL = 'https://reactnative.dev/docs/sectionlist';
+exports.description = 'Tap to see pressed states for separator components.';
+exports.examples = [
+  {
+    title: 'FlatList with Separators',
+    render: function(): React.Element<typeof FlatList_withSeparators> {
+      return <FlatList_withSeparators />;
+    },
+  },
+];
diff --git a/packages/rn-tester/js/examples/FlatList/FlatListExample.js b/packages/rn-tester/js/examples/FlatList/FlatListExample.js
index 4dec5886a01a7a..4606d68090c628 100644
--- a/packages/rn-tester/js/examples/FlatList/FlatListExample.js
+++ b/packages/rn-tester/js/examples/FlatList/FlatListExample.js
@@ -98,6 +98,9 @@ class FlatListExample extends React.PureComponent<Props, State> {
     this._listRef.recordInteraction(); // e.g. flipping logViewable switch
   }
 
+  _setBooleanValue: string => boolean => void = key => value =>
+    this.setState({[key]: value});
+
   render(): React.Node {
     const filterRegex = new RegExp(String(this.state.filterText), 'i');
     const filter = item =>
@@ -123,14 +126,46 @@ class FlatListExample extends React.PureComponent<Props, State> {
               />
             </View>
             <View style={styles.options}>
-              {renderSmallSwitchOption(this, 'virtualized')}
-              {renderSmallSwitchOption(this, 'horizontal')}
-              {renderSmallSwitchOption(this, 'fixedHeight')}
-              {renderSmallSwitchOption(this, 'log')}
-              {renderSmallSwitchOption(this, 'inverted')}
-              {renderSmallSwitchOption(this, 'empty')}
-              {renderSmallSwitchOption(this, 'debug')}
-              {renderSmallSwitchOption(this, 'useFlatListItemComponent')}
+              {renderSmallSwitchOption(
+                'Virtualized',
+                this.state.virtualized,
+                this._setBooleanValue('virtualized'),
+              )}
+              {renderSmallSwitchOption(
+                'Horizontal',
+                this.state.horizontal,
+                this._setBooleanValue('horizontal'),
+              )}
+              {renderSmallSwitchOption(
+                'Fixed Height',
+                this.state.fixedHeight,
+                this._setBooleanValue('fixedHeight'),
+              )}
+              {renderSmallSwitchOption(
+                'Log Viewable',
+                this.state.logViewable,
+                this._setBooleanValue('logViewable'),
+              )}
+              {renderSmallSwitchOption(
+                'Inverted',
+                this.state.inverted,
+                this._setBooleanValue('inverted'),
+              )}
+              {renderSmallSwitchOption(
+                'Empty',
+                this.state.empty,
+                this._setBooleanValue('empty'),
+              )}
+              {renderSmallSwitchOption(
+                'Debug',
+                this.state.debug,
+                this._setBooleanValue('debug'),
+              )}
+              {renderSmallSwitchOption(
+                'Use FlatListItemComponent',
+                this.state.useFlatListItemComponent,
+                this._setBooleanValue('useFlatListItemComponent'),
+              )}
               {Platform.OS === 'android' && (
                 <View>
                   <TextInput
@@ -161,6 +196,7 @@ class FlatListExample extends React.PureComponent<Props, State> {
             getItemLayout={
               this.state.fixedHeight ? this._getItemLayout : undefined
             }
+            accessibilityRole="list"
             horizontal={this.state.horizontal}
             inverted={this.state.inverted}
             key={
@@ -208,9 +244,9 @@ class FlatListExample extends React.PureComponent<Props, State> {
 
     return {
       renderItem: undefined,
-      /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.111 was deployed. To see the error, delete
-       * this comment and run Flow. */
+      /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb)
+       * This comment suppresses an error found when Flow v0.111 was deployed.
+       * To see the error, delete this comment and run Flow. */
       [flatListPropKey]: ({item, separators}) => {
         return (
           <ItemComponent
@@ -246,10 +282,21 @@ class FlatListExample extends React.PureComponent<Props, State> {
       );
     }
   };
+
   _pressItem = (key: string) => {
     this._listRef && this._listRef.recordInteraction();
-    pressItem(this, key);
+    const index = Number(key);
+    const itemState = pressItem(this.state.data[index]);
+    this.setState(state => ({
+      ...state,
+      data: [
+        ...state.data.slice(0, index),
+        itemState,
+        ...state.data.slice(index + 1),
+      ],
+    }));
   };
+
   _listRef: React.ElementRef<typeof Animated.FlatList>;
 }
 
@@ -276,7 +323,6 @@ exports.title = 'FlatList';
 exports.category = 'ListView';
 exports.documentationURL = 'https://reactnative.dev/docs/flatlist';
 exports.description = 'Performant, scrollable list of data.';
-exports.simpleExampleContainer = true;
 exports.examples = [
   {
     title: 'Simple list of items',
diff --git a/packages/rn-tester/js/examples/FlatList/FlatListExamples.js b/packages/rn-tester/js/examples/FlatList/FlatListExamples.js
new file mode 100644
index 00000000000000..dd7aff7302215d
--- /dev/null
+++ b/packages/rn-tester/js/examples/FlatList/FlatListExamples.js
@@ -0,0 +1,323 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import {
+  Pressable,
+  Button,
+  FlatList,
+  StyleSheet,
+  Text,
+  View,
+} from 'react-native';
+
+import * as React from 'react';
+type FlatListProps = React.ElementProps<typeof FlatList>;
+
+type ViewabilityConfig = $PropertyType<FlatListProps, 'viewabilityConfig'>;
+
+const DATA = [
+  'Pizza',
+  'Burger',
+  'Risotto',
+  'French Fries',
+  'Onion Rings',
+  'Fried Shrimps',
+  'Water',
+  'Coke',
+  'Beer',
+  'Cheesecake',
+  'Ice Cream',
+];
+
+const Item = ({item, separators}) => {
+  return (
+    <Pressable
+      onPressIn={() => {
+        separators.highlight();
+      }}
+      onPress={() => {
+        separators.updateProps('trailing', {hasBeenHighlighted: true});
+        separators.updateProps('leading', {hasBeenHighlighted: true});
+      }}
+      onPressOut={() => {
+        separators.unhighlight();
+      }}
+      style={({pressed}) => [
+        styles.item,
+        {
+          backgroundColor: pressed ? 'red' : 'pink',
+        },
+      ]}
+      testID={item}>
+      <Text style={styles.title}>{item}</Text>
+    </Pressable>
+  );
+};
+
+const Separator = (defaultColor, highlightColor) => ({
+  leadingItem,
+  trailingItem,
+  highlighted,
+  hasBeenHighlighted,
+}) => {
+  const text = `Separator for leading ${leadingItem} and trailing ${trailingItem} has ${
+    !hasBeenHighlighted ? 'not ' : ''
+  }been pressed`;
+
+  return (
+    <View
+      style={[
+        styles.separator,
+        {backgroundColor: highlighted ? highlightColor : defaultColor},
+      ]}>
+      <Text style={styles.separtorText}>{text}</Text>
+    </View>
+  );
+};
+
+export function FlatList_inverted(): React.Node {
+  const [output, setOutput] = React.useState('inverted false');
+  const [exampleProps, setExampleProps] = React.useState({
+    inverted: false,
+  });
+
+  const onTest = () => {
+    setExampleProps({
+      inverted: !exampleProps.inverted,
+    });
+    setOutput(`Is inverted: ${(!exampleProps.inverted).toString()}`);
+  };
+
+  return (
+    <FlatListExampleWithForwardedRef
+      exampleProps={exampleProps}
+      testOutput={output}
+      onTest={onTest}
+      testLabel={exampleProps.inverted ? 'Toggle false' : 'Toggle true'}
+    />
+  );
+}
+
+export function FlatList_contentInset(): React.Node {
+  const [initialContentInset, toggledContentInset] = [44, 88];
+
+  const [output, setOutput] = React.useState(
+    `contentInset top: ${initialContentInset.toString()}`,
+  );
+  const [exampleProps, setExampleProps] = React.useState({
+    automaticallyAdjustContentInsets: false,
+    contentInset: {top: initialContentInset},
+    contentOffset: {y: -initialContentInset, x: 0},
+  });
+
+  const onTest = () => {
+    const newContentInset =
+      exampleProps.contentInset.top === initialContentInset
+        ? toggledContentInset
+        : initialContentInset;
+    setExampleProps({
+      automaticallyAdjustContentInsets: false,
+      contentInset: {top: newContentInset},
+      contentOffset: {y: -newContentInset, x: 0},
+    });
+    setOutput(`contentInset top: ${newContentInset.toString()}`);
+  };
+
+  return (
+    <>
+      <View
+        style={[
+          styles.titleContainer,
+          {height: exampleProps.contentInset.top},
+        ]}>
+        <Text style={styles.titleText}>Menu</Text>
+      </View>
+      <FlatListExampleWithForwardedRef
+        exampleProps={exampleProps}
+        testOutput={output}
+        onTest={onTest}
+        testLabel={'Toggle header size'}
+      />
+    </>
+  );
+}
+export function FlatList_onEndReached(): React.Node {
+  const [output, setOutput] = React.useState('');
+  const exampleProps = {
+    onEndReached: info => setOutput('onEndReached'),
+    onEndReachedThreshold: 0,
+  };
+  const ref = React.useRef(null);
+
+  const onTest = () => {
+    const scrollResponder = ref?.current?.getScrollResponder();
+    if (scrollResponder != null) {
+      scrollResponder.scrollToEnd();
+    }
+  };
+
+  return (
+    <FlatListExampleWithForwardedRef
+      ref={ref}
+      exampleProps={exampleProps}
+      testOutput={output}
+      onTest={onTest}
+    />
+  );
+}
+
+export function FlatList_withSeparators(): React.Node {
+  const exampleProps = {
+    ItemSeparatorComponent: Separator('lightgreen', 'green'),
+  };
+  const ref = React.useRef(null);
+
+  return (
+    <FlatListExampleWithForwardedRef ref={ref} exampleProps={exampleProps} />
+  );
+}
+
+export function FlatList_onViewableItemsChanged(props: {
+  viewabilityConfig: ViewabilityConfig,
+  offScreen?: ?boolean,
+  horizontal?: ?boolean,
+  useScrollRefScroll?: ?boolean,
+}): React.Node {
+  const {viewabilityConfig, offScreen, horizontal, useScrollRefScroll} = props;
+  const [output, setOutput] = React.useState('');
+  const onViewableItemsChanged = React.useCallback(
+    info =>
+      setOutput(
+        info.viewableItems
+          .filter(viewToken => viewToken.index != null && viewToken.isViewable)
+          .map(viewToken => viewToken.item)
+          .join(', '),
+      ),
+    [setOutput],
+  );
+  const exampleProps = {
+    onViewableItemsChanged,
+    viewabilityConfig,
+    horizontal,
+  };
+
+  const ref = React.useRef(null);
+  const onTest =
+    useScrollRefScroll === true
+      ? () => {
+          ref?.current?.getScrollResponder()?.scrollToEnd();
+        }
+      : null;
+
+  return (
+    <FlatListExampleWithForwardedRef
+      ref={ref}
+      exampleProps={exampleProps}
+      onTest={onTest}
+      testOutput={output}>
+      {offScreen === true ? <View style={styles.offScreen} /> : null}
+    </FlatListExampleWithForwardedRef>
+  );
+}
+
+type Props = {
+  exampleProps: $Shape<React.ElementConfig<typeof FlatList>>,
+  onTest?: ?() => void,
+  testLabel?: ?string,
+  testOutput?: ?string,
+  children?: ?React.Node,
+};
+
+const FlatListExampleWithForwardedRef = React.forwardRef(
+  (props: Props, ref) => {
+    return (
+      <View style={styles.container}>
+        {props.testOutput != null ? (
+          <View testID="test_container" style={styles.testContainer}>
+            <Text style={styles.output} numberOfLines={1} testID="output">
+              {props.testOutput}
+            </Text>
+            {props.onTest != null ? (
+              <Button
+                testID="start_test"
+                onPress={props.onTest}
+                title={props.testLabel ?? 'Test'}
+              />
+            ) : null}
+          </View>
+        ) : null}
+        {props.children}
+        <FlatList
+          {...props.exampleProps}
+          ref={ref}
+          testID="flat_list"
+          data={DATA}
+          keyExtractor={(item, index) => item + index}
+          style={styles.list}
+          renderItem={Item}
+        />
+      </View>
+    );
+  },
+);
+
+const styles = StyleSheet.create({
+  item: {
+    backgroundColor: 'pink',
+    padding: 20,
+    marginVertical: 8,
+  },
+  header: {
+    fontSize: 32,
+    backgroundColor: 'white',
+  },
+  title: {
+    fontSize: 24,
+  },
+  titleContainer: {
+    position: 'absolute',
+    top: 45,
+    left: 0,
+    right: 0,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+    backgroundColor: 'gray',
+    zIndex: 1,
+  },
+  titleText: {
+    fontSize: 24,
+    lineHeight: 44,
+    fontWeight: 'bold',
+  },
+  testContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    backgroundColor: '#f2f2f7ff',
+    height: 40,
+  },
+  output: {
+    fontSize: 12,
+    width: '80%',
+  },
+  separator: {
+    height: 12,
+  },
+  separtorText: {
+    fontSize: 10,
+  },
+  list: {
+    flex: 1,
+  },
+  container: {flex: 1},
+  offScreen: {
+    height: 1000,
+  },
+});
diff --git a/packages/rn-tester/js/examples/Image/ImageExample.js b/packages/rn-tester/js/examples/Image/ImageExample.js
index beb04cc12e5988..aa47a8130b7fe5 100644
--- a/packages/rn-tester/js/examples/Image/ImageExample.js
+++ b/packages/rn-tester/js/examples/Image/ImageExample.js
@@ -33,10 +33,63 @@ type ImageSource = $ReadOnly<{|
   uri: string,
 |}>;
 
+type BlobImageState = {|
+  objectURL: ?string,
+|};
+
+type BlobImageProps = $ReadOnly<{|
+  url: string,
+|}>;
+
+class BlobImage extends React.Component<BlobImageProps, BlobImageState> {
+  state = {
+    objectURL: null,
+  };
+
+  UNSAFE_componentWillMount() {
+    (async () => {
+      const result = await fetch(this.props.url);
+      const blob = await result.blob();
+      const objectURL = URL.createObjectURL(blob);
+      this.setState({objectURL});
+    })();
+  }
+
+  render() {
+    return this.state.objectURL !== null ? (
+      <Image source={{uri: this.state.objectURL}} style={styles.base} />
+    ) : (
+      <Text>Object URL not created yet</Text>
+    );
+  }
+}
+
+type BlobImageExampleState = {||};
+
+type BlobImageExampleProps = $ReadOnly<{|
+  urls: string[],
+|}>;
+
+class BlobImageExample extends React.Component<
+  BlobImageExampleProps,
+  BlobImageExampleState,
+> {
+  render() {
+    return (
+      <View style={styles.horizontal}>
+        {this.props.urls.map(url => (
+          <BlobImage key={url} url={url} />
+        ))}
+      </View>
+    );
+  }
+}
+
 type NetworkImageCallbackExampleState = {|
   events: Array<string>,
   startLoadPrefetched: boolean,
   mountTime: number,
+  imageHash: number,
 |};
 
 type NetworkImageCallbackExampleProps = $ReadOnly<{|
@@ -52,6 +105,7 @@ class NetworkImageCallbackExample extends React.Component<
     events: [],
     startLoadPrefetched: false,
     mountTime: Date.now(),
+    imageHash: Date.now(),
   };
 
   UNSAFE_componentWillMount() {
@@ -64,6 +118,10 @@ class NetworkImageCallbackExample extends React.Component<
     }));
   };
 
+  updateLoadingImageHash = () => {
+    this.setState({imageHash: Date.now()});
+  };
+
   render() {
     const {mountTime} = this.state;
     return (
@@ -341,6 +399,193 @@ class MultipleSourcesExample extends React.Component<
   }
 }
 
+type LoadingIndicatorSourceExampleState = {|
+  imageHash: number,
+|};
+
+type LoadingIndicatorSourceExampleProps = $ReadOnly<{||}>;
+
+class LoadingIndicatorSourceExample extends React.Component<
+  LoadingIndicatorSourceExampleProps,
+  LoadingIndicatorSourceExampleState,
+> {
+  state = {
+    imageHash: Date.now(),
+  };
+
+  reloadImage = () => {
+    this.setState({
+      imageHash: Date.now(),
+    });
+  };
+
+  loaderGif = {
+    uri: 'https://media1.giphy.com/media/3oEjI6SIIHBdRxXI40/200.gif',
+  };
+
+  render() {
+    const loadingImage = {
+      uri: `https://www.facebook.com/ads/pics/successstories.png?hash=${this.state.imageHash}`,
+    };
+
+    return (
+      <View>
+        <View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
+          <Text style={styles.touchableText} onPress={this.reloadImage}>
+            Refresh Image
+          </Text>
+        </View>
+        <Image
+          loadingIndicatorSource={this.loaderGif}
+          source={loadingImage}
+          style={styles.base}
+        />
+        <Text>Image Hash: {this.state.imageHash}</Text>
+        <Text>Image URI: {loadingImage.uri}</Text>
+      </View>
+    );
+  }
+}
+
+type OnLayoutExampleState = {|
+  width: number,
+  height: number,
+  layoutHandlerMessage: string,
+|};
+
+type OnLayoutExampleProps = $ReadOnly<{||}>;
+
+class OnLayoutExample extends React.Component<
+  OnLayoutExampleProps,
+  OnLayoutExampleState,
+> {
+  state = {
+    width: 30,
+    height: 30,
+    layoutHandlerMessage: 'No Message',
+  };
+
+  onLayoutHandler = event => {
+    this.setState({
+      width: this.state.width,
+      height: this.state.height,
+      layoutHandlerMessage: JSON.stringify(event.nativeEvent),
+    });
+    console.log(event.nativeEvent);
+  };
+
+  increaseImageSize = () => {
+    if (this.state.width >= 100) {
+      return;
+    }
+    this.setState({
+      width: this.state.width + 10,
+      height: this.state.height + 10,
+    });
+  };
+
+  increaseImageSize = () => {
+    if (this.state.width >= 100) {
+      return;
+    }
+    this.setState({
+      width: this.state.width + 10,
+      height: this.state.height + 10,
+    });
+  };
+
+  decreaseImageSize = () => {
+    if (this.state.width <= 10) {
+      return;
+    }
+    this.setState({
+      width: this.state.width - 10,
+      height: this.state.height - 10,
+    });
+  };
+
+  render() {
+    return (
+      <View>
+        <Text>Adjust the image size to trigger the OnLayout handler.</Text>
+        <View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
+          <Text style={styles.touchableText} onPress={this.decreaseImageSize}>
+            Decrease image size
+          </Text>
+          <Text style={styles.touchableText} onPress={this.increaseImageSize}>
+            Increase image size
+          </Text>
+        </View>
+        <Text>
+          Container image size: {this.state.width}x{this.state.height}{' '}
+        </Text>
+        <View style={{height: this.state.height, width: this.state.width}}>
+          <Image
+            onLayout={this.onLayoutHandler}
+            style={{flex: 1}}
+            source={[
+              {
+                uri: 'https://www.facebook.com/favicon.ico',
+                width: 38,
+                height: 38,
+              },
+              {
+                uri: 'https://www.facebook.com/favicon.ico',
+                width: 76,
+                height: 76,
+              },
+              {
+                uri: 'https://www.facebook.com/ads/pics/successstories.png',
+                width: 400,
+                height: 400,
+              },
+            ]}
+          />
+        </View>
+        <Text>Layout Handler Message: {this.state.layoutHandlerMessage}</Text>
+      </View>
+    );
+  }
+}
+
+type OnPartialLoadExampleState = {|
+  hasLoaded: boolean,
+|};
+
+type OnPartialLoadExampleProps = $ReadOnly<{||}>;
+
+class OnPartialLoadExample extends React.Component<
+  OnPartialLoadExampleProps,
+  OnPartialLoadExampleState,
+> {
+  state = {
+    hasLoaded: false,
+  };
+
+  partialLoadHandler = () => {
+    this.setState({
+      hasLoaded: true,
+    });
+  };
+
+  render() {
+    return (
+      <View>
+        <Text>
+          Partial Load Function Executed: {JSON.stringify(this.state.hasLoaded)}
+        </Text>
+        <Image
+          source={{
+            uri: `https://images.pexels.com/photos/671557/pexels-photo-671557.jpeg?&buster=${Math.random()}`,
+          }}
+          onPartialLoad={this.partialLoadHandler}
+          style={styles.base}
+        />
+      </View>
+    );
+  }
+}
+
 const fullImage = {
   uri: 'https://www.facebook.com/ads/pics/successstories.png',
 };
@@ -416,6 +661,21 @@ exports.examples = [
       return <Image source={fullImage} style={styles.base} />;
     },
   },
+  {
+    title: 'Plain Blob Image',
+    description: ('If the `source` prop `uri` property is an object URL, ' +
+      'then it will be resolved using `BlobProvider` (Android) or `RCTBlobManager` (iOS).': string),
+    render: function(): React.Node {
+      return (
+        <BlobImageExample
+          urls={[
+            'https://www.facebook.com/favicon.ico',
+            'https://www.facebook.com/ads/pics/successstories.png',
+          ]}
+        />
+      );
+    },
+  },
   {
     title: 'Plain Static Image',
     description: ('Static assets should be placed in the source code tree, and ' +
@@ -780,9 +1040,10 @@ exports.examples = [
                       source={image}
                     />
                   </View>
-                  {/* $FlowFixMe(>=0.115.0 site=react_native_fb) This comment
-                   * suppresses an error found when Flow v0.115 was deployed.
-                   * To see the error, delete this comment and run Flow. */}
+                  {/* $FlowFixMe[incompatible-type] (>=0.115.0 site=react_
+                   * native_fb) This comment suppresses an error found when
+                   * Flow v0.115 was deployed. To see the error, delete this
+                   * comment and run Flow. */}
                   <View style={styles.leftMargin}>
                     <Text style={[styles.resizeModeText]}>Cover</Text>
                     <Image
@@ -801,9 +1062,10 @@ exports.examples = [
                       source={image}
                     />
                   </View>
-                  {/* $FlowFixMe(>=0.115.0 site=react_native_fb) This comment
-                   * suppresses an error found when Flow v0.115 was deployed.
-                   * To see the error, delete this comment and run Flow. */}
+                  {/* $FlowFixMe[incompatible-type] (>=0.115.0 site=react_
+                   * native_fb) This comment suppresses an error found when
+                   * Flow v0.115 was deployed. To see the error, delete this
+                   * comment and run Flow. */}
                   <View style={styles.leftMargin}>
                     <Text style={[styles.resizeModeText]}>Repeat</Text>
                     <Image
@@ -812,9 +1074,10 @@ exports.examples = [
                       source={image}
                     />
                   </View>
-                  {/* $FlowFixMe(>=0.115.0 site=react_native_fb) This comment
-                   * suppresses an error found when Flow v0.115 was deployed.
-                   * To see the error, delete this comment and run Flow. */}
+                  {/* $FlowFixMe[incompatible-type] (>=0.115.0 site=react_
+                   * native_fb) This comment suppresses an error found when
+                   * Flow v0.115 was deployed. To see the error, delete this
+                   * comment and run Flow. */}
                   <View style={styles.leftMargin}>
                     <Text style={[styles.resizeModeText]}>Center</Text>
                     <Image
@@ -866,9 +1129,12 @@ exports.examples = [
   {
     title: 'Image Size',
     render: function(): React.Node {
-      /* $FlowFixMe(>=0.115.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.115 was deployed. To see the error, delete
-       * this comment and run Flow. */
+      /* $FlowFixMe[prop-missing] (>=0.115.0 site=react_native_fb) This comment
+       * suppresses an error found when Flow v0.115 was deployed. To see the
+       * error, delete this comment and run Flow. */
+      /* $FlowFixMe[incompatible-type] (>=0.115.0 site=react_native_fb) This
+       * comment suppresses an error found when Flow v0.115 was deployed. To
+       * see the error, delete this comment and run Flow. */
       return <ImageSizeExample source={fullImage} />;
     },
   },
@@ -954,4 +1220,60 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'Accessibility',
+    description: ('If the `accessible` (boolean) prop is set to True, the image will be indicated as an accessbility element.': string),
+    render: function(): React.Node {
+      return <Image accessible source={fullImage} style={styles.base} />;
+    },
+  },
+  {
+    title: 'Accessibility Label',
+    description: ('When an element is marked as accessibile (using the accessibility prop), it is good practice to set an accessibilityLabel on the image to provide a description of the element to people who use VoiceOver. VoiceOver will read this string when people select this element.': string),
+    render: function(): React.Node {
+      return (
+        <Image
+          accessible
+          accessibilityLabel="Picture of people standing around a table"
+          source={fullImage}
+          style={styles.base}
+        />
+      );
+    },
+  },
+  {
+    title: 'Fade Duration',
+    description: ('The time (in miliseconds) that an image will fade in for when it appears (default = 300).': string),
+    render: function(): React.Node {
+      return (
+        <>
+          <Image fadeDuration={1500} source={fullImage} style={styles.base} />
+          <Text>This image will fade in over the time of 1.5s.</Text>
+        </>
+      );
+    },
+    platform: 'android',
+  },
+  {
+    title: 'Loading Indicator Source',
+    description: ('This prop is used to set the resource that will be used as the loading indicator for the image (displayed until the image is ready to be displayed).': string),
+    render: function(): React.Node {
+      return <LoadingIndicatorSourceExample />;
+    },
+  },
+  {
+    title: 'On Layout',
+    description: ('This prop is used to set the handler function to be called when the image is mounted or its layout changes. The function receives an event with `{nativeEvent: {layout: {x, y, width, height}}}`': string),
+    render: function(): React.Node {
+      return <OnLayoutExample />;
+    },
+  },
+  {
+    title: 'On Partial Load',
+    description: ('This prop is used to set the handler function to be called when the partial load of the image is complete. This is meant for progressive JPEG loads.': string),
+    render: function(): React.Node {
+      return <OnPartialLoadExample />;
+    },
+    platform: 'ios',
+  },
 ];
diff --git a/packages/rn-tester/js/examples/JSResponderHandlerExample/JSResponderHandlerExample.js b/packages/rn-tester/js/examples/JSResponderHandlerExample/JSResponderHandlerExample.js
index cbfffbf266b800..e3fa336cb81dc7 100644
--- a/packages/rn-tester/js/examples/JSResponderHandlerExample/JSResponderHandlerExample.js
+++ b/packages/rn-tester/js/examples/JSResponderHandlerExample/JSResponderHandlerExample.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 const React = require('react');
 
 const {Text, View, StyleSheet} = require('react-native');
diff --git a/packages/rn-tester/js/examples/KeyboardAvoidingView/KeyboardAvoidingViewExample.js b/packages/rn-tester/js/examples/KeyboardAvoidingView/KeyboardAvoidingViewExample.js
index 4ca55175b14dda..c494fffc9b3c9a 100644
--- a/packages/rn-tester/js/examples/KeyboardAvoidingView/KeyboardAvoidingViewExample.js
+++ b/packages/rn-tester/js/examples/KeyboardAvoidingView/KeyboardAvoidingViewExample.js
@@ -50,7 +50,7 @@ const CloseButton = props => {
         {marginHorizontal: props.behavior === 'position' ? 0 : 25},
       ]}>
       <Pressable
-        onPress={() => props.setModdalOpen(false)}
+        onPress={() => props.setModalOpen(false)}
         style={styles.closeButton}>
         <Text>Close</Text>
       </Pressable>
@@ -59,7 +59,7 @@ const CloseButton = props => {
 };
 
 const KeyboardAvoidingViewBehaviour = () => {
-  const [modalOpen, setModdalOpen] = useState(false);
+  const [modalOpen, setModalOpen] = useState(false);
   const [behavior, setBehavior] = useState('padding');
   return (
     <View style={styles.outerContainer}>
@@ -87,7 +87,7 @@ const KeyboardAvoidingViewBehaviour = () => {
                 {backgroundColor: behavior === 'position' ? 'blue' : 'white'},
               ]}>
               <Text style={{color: behavior === 'position' ? 'white' : 'blue'}}>
-                Padding
+                Position
               </Text>
             </TouchableOpacity>
             <TouchableOpacity
@@ -104,12 +104,12 @@ const KeyboardAvoidingViewBehaviour = () => {
               </Text>
             </TouchableOpacity>
           </View>
-          <CloseButton behavior={behavior} setModdalOpen={setModdalOpen} />
+          <CloseButton behavior={behavior} setModalOpen={setModalOpen} />
           <TextInputForm />
         </KeyboardAvoidingView>
       </Modal>
       <View>
-        <Pressable onPress={() => setModdalOpen(true)}>
+        <Pressable onPress={() => setModalOpen(true)}>
           <Text>Open Example</Text>
         </Pressable>
       </View>
@@ -118,7 +118,7 @@ const KeyboardAvoidingViewBehaviour = () => {
 };
 
 const KeyboardAvoidingDisabled = () => {
-  const [modalOpen, setModdalOpen] = useState(false);
+  const [modalOpen, setModalOpen] = useState(false);
   return (
     <View style={styles.outerContainer}>
       <Modal animationType="fade" visible={modalOpen}>
@@ -126,12 +126,12 @@ const KeyboardAvoidingDisabled = () => {
           enabled={false}
           behavior={'height'}
           style={styles.container}>
-          <CloseButton behavior={'height'} setModdalOpen={setModdalOpen} />
+          <CloseButton behavior={'height'} setModalOpen={setModalOpen} />
           <TextInputForm />
         </KeyboardAvoidingView>
       </Modal>
       <View>
-        <Pressable onPress={() => setModdalOpen(true)}>
+        <Pressable onPress={() => setModalOpen(true)}>
           <Text>Open Example</Text>
         </Pressable>
       </View>
@@ -140,7 +140,7 @@ const KeyboardAvoidingDisabled = () => {
 };
 
 const KeyboardAvoidingVerticalOffset = () => {
-  const [modalOpen, setModdalOpen] = useState(false);
+  const [modalOpen, setModalOpen] = useState(false);
   return (
     <View style={styles.outerContainer}>
       <Modal animationType="fade" visible={modalOpen}>
@@ -148,12 +148,35 @@ const KeyboardAvoidingVerticalOffset = () => {
           keyboardVerticalOffset={20}
           behavior={'padding'}
           style={styles.container}>
-          <CloseButton behavior={'height'} setModdalOpen={setModdalOpen} />
+          <CloseButton behavior={'height'} setModalOpen={setModalOpen} />
           <TextInputForm />
         </KeyboardAvoidingView>
       </Modal>
       <View>
-        <Pressable onPress={() => setModdalOpen(true)}>
+        <Pressable onPress={() => setModalOpen(true)}>
+          <Text>Open Example</Text>
+        </Pressable>
+      </View>
+    </View>
+  );
+};
+
+const KeyboardAvoidingContentContainerStyle = () => {
+  const [modalOpen, setModalOpen] = useState(false);
+  return (
+    <View>
+      <Modal animationType="fade" visible={modalOpen}>
+        <KeyboardAvoidingView
+          keyboardVerticalOffset={20}
+          behavior={'position'}
+          style={styles.container}
+          contentContainerStyle={styles.contentContainer}>
+          <CloseButton behavior={'height'} setModalOpen={setModalOpen} />
+          <TextInputForm />
+        </KeyboardAvoidingView>
+      </Modal>
+      <View>
+        <Pressable onPress={() => setModalOpen(true)}>
           <Text>Open Example</Text>
         </Pressable>
       </View>
@@ -172,6 +195,10 @@ const styles = StyleSheet.create({
     paddingHorizontal: 20,
     paddingTop: 20,
   },
+  contentContainer: {
+    paddingTop: 20,
+    backgroundColor: '#abdebf',
+  },
   textInput: {
     borderRadius: 5,
     borderWidth: 1,
@@ -225,4 +252,10 @@ exports.examples = [
       return <KeyboardAvoidingDisabled />;
     },
   },
+  {
+    title: 'Keyboard Avoiding View with contentContainerStyle',
+    render(): React.Node {
+      return <KeyboardAvoidingContentContainerStyle />;
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js b/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
index 55e9e275e48910..f5e7a066b921f9 100644
--- a/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
+++ b/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
@@ -15,6 +15,7 @@ const React = require('react');
 const {
   Image,
   LayoutAnimation,
+  Platform, // TODO(macOS GH#774)
   StyleSheet,
   Text,
   View,
@@ -44,7 +45,12 @@ class LayoutEventExample extends React.Component<Props, State> {
   };
 
   animateViewLayout = () => {
-    LayoutAnimation.configureNext(LayoutAnimation.Presets.spring, () => {
+    // TODO(macOS GH#774): LayoutAnimation.Presets.spring isn't available on macOS
+    const animationConfig =
+      Platform.OS === 'macos'
+        ? LayoutAnimation.Presets.easeInEaseOut
+        : LayoutAnimation.Presets.spring;
+    LayoutAnimation.configureNext(animationConfig, () => {
       console.log('layout animation done.');
       this.addWrapText();
     });
@@ -107,9 +113,10 @@ class LayoutEventExample extends React.Component<Props, State> {
           />
           <Text>
             ViewLayout:{' '}
-            {/* $FlowFixMe(>=0.95.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.95 was deployed. To see
-             * the error, delete this comment and run Flow. */
+            {/* $FlowFixMe[incompatible-type] (>=0.95.0 site=react_native_fb)
+             * This comment suppresses an error found when Flow v0.95 was
+             * deployed. To see the error, delete this comment and run Flow.
+             */
             JSON.stringify(this.state.viewLayout, null, '  ') + '\n\n'}
           </Text>
           <Text ref="txt" onLayout={this.onTextLayout} style={styles.text}>
diff --git a/packages/rn-tester/js/examples/Modal/ModalExample.js b/packages/rn-tester/js/examples/Modal/ModalExample.js
index 9d8b07e63d8757..79242e6e872461 100644
--- a/packages/rn-tester/js/examples/Modal/ModalExample.js
+++ b/packages/rn-tester/js/examples/Modal/ModalExample.js
@@ -4,282 +4,21 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict-local
+ * @format
  */
 
-'use strict';
-
-const React = require('react');
-
-const {
-  Modal,
-  Picker,
-  Platform,
-  StyleSheet,
-  Switch,
-  Text,
-  TouchableHighlight,
-  View,
-} = require('react-native');
-
-const Item = Picker.Item;
-
-exports.displayName = (undefined: ?string);
-exports.framework = 'React';
-exports.title = 'Modal';
-exports.category = 'UI';
-exports.documentationURL = 'https://reactnative.dev/docs/modal';
-exports.description = 'Component for presenting modal views.';
-
-class Button extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
-  state = {
-    active: false,
-  };
-
-  _onHighlight = () => {
-    this.setState({active: true});
-  };
-
-  _onUnhighlight = () => {
-    this.setState({active: false});
-  };
-
-  render() {
-    const colorStyle = {
-      color: this.state.active ? '#fff' : '#000',
-    };
-    return (
-      <TouchableHighlight
-        onHideUnderlay={this._onUnhighlight}
-        onPress={this.props.onPress}
-        onShowUnderlay={this._onHighlight}
-        style={[styles.button, this.props.style]}
-        underlayColor="#a9d9d4">
-        <Text style={[styles.buttonText, colorStyle]}>
-          {this.props.children}
-        </Text>
-      </TouchableHighlight>
-    );
-  }
-}
-
-const supportedOrientationsPickerValues = [
-  ['portrait'],
-  ['landscape'],
-  ['landscape-left'],
-  ['portrait', 'landscape-right'],
-  ['portrait', 'landscape'],
-  [],
-];
-
-class ModalExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
-    animationType: 'none',
-    modalVisible: false,
-    transparent: false,
-    presentationStyle: 'fullScreen',
-    selectedSupportedOrientation: '0',
-    currentOrientation: 'unknown',
-  };
-
-  _setModalVisible = visible => {
-    this.setState({modalVisible: visible});
-  };
-
-  _setAnimationType = type => {
-    this.setState({animationType: type});
-  };
-
-  _toggleTransparent = () => {
-    this.setState({transparent: !this.state.transparent});
-  };
-
-  renderSwitch() {
-    if (Platform.isTV) {
-      return null;
-    }
-    return (
-      <Switch
-        value={this.state.transparent}
-        onValueChange={this._toggleTransparent}
-      />
-    );
-  }
-
-  render() {
-    const modalBackgroundStyle = {
-      backgroundColor: this.state.transparent
-        ? 'rgba(0, 0, 0, 0.5)'
-        : '#f5fcff',
-    };
-    const innerContainerTransparentStyle = this.state.transparent
-      ? {backgroundColor: '#fff', padding: 20}
-      : null;
-    const activeButtonStyle = {
-      backgroundColor: '#ddd',
-    };
-
-    return (
-      <View>
-        <Modal
-          animationType={this.state.animationType}
-          presentationStyle={this.state.presentationStyle}
-          transparent={this.state.transparent}
-          visible={this.state.modalVisible}
-          onRequestClose={() => this._setModalVisible(false)}
-          supportedOrientations={
-            supportedOrientationsPickerValues[
-              Number(this.state.selectedSupportedOrientation)
-            ]
-          }
-          onOrientationChange={evt =>
-            this.setState({currentOrientation: evt.nativeEvent.orientation})
-          }>
-          <View style={[styles.container, modalBackgroundStyle]}>
-            <View
-              style={[styles.innerContainer, innerContainerTransparentStyle]}>
-              <Text>
-                This modal was presented{' '}
-                {this.state.animationType === 'none' ? 'without' : 'with'}{' '}
-                animation.
-              </Text>
-              <Text>
-                It is currently displayed in {this.state.currentOrientation}{' '}
-                mode.
-              </Text>
-              <Button
-                onPress={this._setModalVisible.bind(this, false)}
-                style={styles.modalButton}>
-                Close
-              </Button>
-            </View>
-          </View>
-        </Modal>
-        <View style={styles.row}>
-          <Text style={styles.rowTitle}>Animation Type</Text>
-          <Button
-            onPress={this._setAnimationType.bind(this, 'none')}
-            style={
-              this.state.animationType === 'none' ? activeButtonStyle : {}
-            }>
-            none
-          </Button>
-          <Button
-            onPress={this._setAnimationType.bind(this, 'slide')}
-            style={
-              this.state.animationType === 'slide' ? activeButtonStyle : {}
-            }>
-            slide
-          </Button>
-          <Button
-            onPress={this._setAnimationType.bind(this, 'fade')}
-            style={
-              this.state.animationType === 'fade' ? activeButtonStyle : {}
-            }>
-            fade
-          </Button>
-        </View>
-
-        <View style={styles.row}>
-          <Text style={styles.rowTitle}>Transparent</Text>
-          {this.renderSwitch()}
-        </View>
-        {this.renderPickers()}
-        <Button onPress={this._setModalVisible.bind(this, true)}>
-          Present
-        </Button>
-      </View>
-    );
-  }
-  renderPickers() {
-    if (Platform.isTV) {
-      return null;
-    }
-    return (
-      <View>
-        <View>
-          <Text style={styles.rowTitle}>Presentation style</Text>
-          <Picker
-            selectedValue={this.state.presentationStyle}
-            onValueChange={presentationStyle =>
-              this.setState({presentationStyle})
-            }
-            itemStyle={styles.pickerItem}>
-            <Item label="Full Screen" value="fullScreen" />
-            <Item label="Page Sheet" value="pageSheet" />
-            <Item label="Form Sheet" value="formSheet" />
-            <Item label="Over Full Screen" value="overFullScreen" />
-            <Item label="Default presentationStyle" value={null} />
-          </Picker>
-        </View>
-
-        <View>
-          <Text style={styles.rowTitle}>Supported orientations</Text>
-          <Picker
-            selectedValue={this.state.selectedSupportedOrientation}
-            onValueChange={(_, i) =>
-              this.setState({selectedSupportedOrientation: i})
-            }
-            itemStyle={styles.pickerItem}>
-            <Item label="Portrait" value={'0'} />
-            <Item label="Landscape" value={'1'} />
-            <Item label="Landscape left" value={'2'} />
-            <Item label="Portrait and landscape right" value={'3'} />
-            <Item label="Portrait and landscape" value={'4'} />
-            <Item label="Default supportedOrientations" value={'5'} />
-          </Picker>
-        </View>
-      </View>
-    );
-  }
-}
-
-exports.examples = [
-  {
-    title: 'Modal Presentation',
-    description: 'Modals can be presented with or without animation',
-    render: (): React.Node => <ModalExample />,
-  },
-];
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    padding: 20,
-  },
-  innerContainer: {
-    borderRadius: 10,
-    alignItems: 'center',
-  },
-  row: {
-    alignItems: 'center',
-    flex: 1,
-    flexDirection: 'row',
-    marginBottom: 20,
-  },
-  rowTitle: {
-    flex: 1,
-    fontWeight: 'bold',
-  },
-  button: {
-    borderRadius: 5,
-    flexGrow: 1,
-    height: 44,
-    alignSelf: 'stretch',
-    justifyContent: 'center',
-    overflow: 'hidden',
-  },
-  buttonText: {
-    fontSize: 18,
-    margin: 5,
-    textAlign: 'center',
-  },
-  modalButton: {
-    marginTop: 10,
-  },
-  pickerItem: {
-    fontSize: 16,
-  },
-});
+import ModalPresentation from './ModalPresentation';
+import ModalOnShow from './ModalOnShow';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+
+export const displayName = (undefined: ?string);
+export const framework = 'React';
+export const title = 'Modal';
+export const category = 'UI';
+export const documentationURL = 'https://reactnative.dev/docs/modal';
+export const description = 'Component for presenting modal views.';
+export const examples = ([
+  ModalPresentation,
+  ModalOnShow,
+]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/Modal/ModalOnShow.js b/packages/rn-tester/js/examples/Modal/ModalOnShow.js
new file mode 100644
index 00000000000000..d8a4c628b91833
--- /dev/null
+++ b/packages/rn-tester/js/examples/Modal/ModalOnShow.js
@@ -0,0 +1,137 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import * as React from 'react';
+import {Modal, Pressable, StyleSheet, Text, View} from 'react-native';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+
+function ModalOnShowOnDismiss(): React.Node {
+  const [modalShowComponent, setModalShowComponent] = React.useState(true);
+  const [modalVisible, setModalVisible] = React.useState(false);
+  const [onShowCount, setOnShowCount] = React.useState(0);
+  const [onDismissCount, setOnDismissCount] = React.useState(0);
+
+  return (
+    <View style={styles.container}>
+      {modalShowComponent && (
+        <Modal
+          animationType="slide"
+          transparent={true}
+          visible={modalVisible}
+          onShow={() => {
+            setOnShowCount(onShowCount + 1);
+          }}
+          onDismiss={() => {
+            setOnDismissCount(onDismissCount + 1);
+          }}
+          onRequestClose={() => {
+            setModalVisible(false);
+          }}>
+          <View style={[styles.centeredView, styles.modalBackdrop]}>
+            <View style={styles.modalView}>
+              <Text testID="modal-on-show-count">
+                onShow is called {onShowCount} times
+              </Text>
+              <Text testID="modal-on-dismiss-count">
+                onDismiss is called {onDismissCount} times
+              </Text>
+              <Pressable
+                style={[styles.button, styles.buttonClose]}
+                onPress={() => setModalVisible(false)}>
+                <Text testID="dismiss-modal" style={styles.textStyle}>
+                  Hide modal by setting visible to false
+                </Text>
+              </Pressable>
+              <Pressable
+                style={[styles.button, styles.buttonClose]}
+                onPress={() => setModalShowComponent(false)}>
+                <Text
+                  testID="dismiss-modal-by-removing-component"
+                  style={styles.textStyle}>
+                  Hide modal by removing component
+                </Text>
+              </Pressable>
+            </View>
+          </View>
+        </Modal>
+      )}
+      <Text testID="on-show-count">onShow is called {onShowCount} times</Text>
+      <Text testID="on-dismiss-count">
+        onDismiss is called {onDismissCount} times
+      </Text>
+      <Pressable
+        style={[styles.button, styles.buttonOpen]}
+        onPress={() => {
+          setModalShowComponent(true);
+          setModalVisible(true);
+        }}>
+        <Text testID="open-modal" style={styles.textStyle}>
+          Show Modal
+        </Text>
+      </Pressable>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    display: 'flex',
+    alignItems: 'center',
+    paddingVertical: 30,
+  },
+  centeredView: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  modalBackdrop: {
+    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+  },
+  modalView: {
+    margin: 20,
+    backgroundColor: 'white',
+    borderRadius: 20,
+    padding: 35,
+    alignItems: 'center',
+    shadowColor: '#000',
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.25,
+    shadowRadius: 4,
+    elevation: 5,
+  },
+  button: {
+    borderRadius: 20,
+    padding: 10,
+    marginVertical: 20,
+    elevation: 2,
+  },
+  buttonOpen: {
+    backgroundColor: '#F194FF',
+  },
+  buttonClose: {
+    backgroundColor: '#2196F3',
+  },
+  textStyle: {
+    color: 'white',
+    fontWeight: 'bold',
+    textAlign: 'center',
+  },
+});
+
+export default ({
+  title: "Modal's onShow/onDismiss",
+  name: 'onShow',
+  description:
+    'onShow and onDismiss (iOS only) callbacks are called when a modal is shown/dismissed',
+  render: (): React.Node => <ModalOnShowOnDismiss />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Modal/ModalPresentation.js b/packages/rn-tester/js/examples/Modal/ModalPresentation.js
new file mode 100644
index 00000000000000..2776e920ed1bca
--- /dev/null
+++ b/packages/rn-tester/js/examples/Modal/ModalPresentation.js
@@ -0,0 +1,264 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import * as React from 'react';
+import {Modal, Platform, StyleSheet, Switch, Text, View} from 'react-native';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import RNTOption from '../../components/RNTOption';
+const RNTesterButton = require('../../components/RNTesterButton');
+
+const supportedOrientations = {
+  Portrait: ['portrait'],
+  Landscape: ['landscape'],
+  'Landscape Left': ['landscape-left'],
+  'Portrait and Landscape Right': ['portrait', 'landscape-right'],
+  'Portrait and Landscape': ['portrait', 'landscape'],
+  Default: [],
+};
+
+const animationTypes = ['slide', 'none', 'fade'];
+const presentationStyles = [
+  'fullScreen',
+  'pageSheet',
+  'formSheet',
+  'overFullScreen',
+];
+const iOSActions = ['None', 'On Dismiss', 'On Show'];
+const noniOSActions = ['None', 'On Show'];
+
+function ModalPresentation() {
+  const [animationType, setAnimationType] = React.useState('none');
+  const [transparent, setTransparent] = React.useState(false);
+  const [visible, setVisible] = React.useState(false);
+  const [hardwareAccelerated, setHardwareAccelerated] = React.useState(false);
+  const [statusBarTranslucent, setStatusBarTranslucent] = React.useState(false);
+  const [presentationStyle, setPresentationStyle] = React.useState(
+    'fullScreen',
+  );
+  const [supportedOrientationKey, setSupportedOrientationKey] = React.useState(
+    'Portrait',
+  );
+  const [currentOrientation, setCurrentOrientation] = React.useState('unknown');
+  const [action, setAction] = React.useState('None');
+  const actions = Platform.OS === 'ios' ? iOSActions : noniOSActions;
+  const onDismiss = () => {
+    setVisible(false);
+    if (action === 'onDismiss') {
+      alert('onDismiss');
+    }
+  };
+
+  const onShow = () => {
+    if (action === 'onShow') {
+      alert('onShow');
+    }
+  };
+  const onOrientationChange = event =>
+    setCurrentOrientation(event.nativeEvent.orientation);
+  const modalBackgroundStyle = {
+    backgroundColor: transparent ? 'rgba(0, 0, 0, 0.5)' : '#f5fcff',
+  };
+  const innerContainerTransparentStyle = transparent
+    ? {backgroundColor: '#fff', padding: 20}
+    : null;
+  return (
+    <View>
+      <RNTesterButton onPress={() => setVisible(true)}>
+        Show Modal
+      </RNTesterButton>
+      <Modal
+        animationType={animationType}
+        presentationStyle={presentationStyle}
+        transparent={transparent}
+        hardwareAccelerated={hardwareAccelerated}
+        statusBarTranslucent={statusBarTranslucent}
+        visible={visible}
+        onRequestClose={onDismiss}
+        supportedOrientations={supportedOrientations[supportedOrientationKey]}
+        onOrientationChange={onOrientationChange}
+        onDismiss={onDismiss}
+        onShow={onShow}>
+        <View style={[styles.modalContainer, modalBackgroundStyle]}>
+          <View
+            style={[
+              styles.modalInnerContainer,
+              innerContainerTransparentStyle,
+            ]}>
+            <Text>
+              This modal was presented with animationType: '{animationType}'
+            </Text>
+            {Platform.OS === 'ios' ? (
+              <Text>
+                It is currently displayed in {currentOrientation} mode.
+              </Text>
+            ) : null}
+            <RNTesterButton onPress={onDismiss}>Close</RNTesterButton>
+          </View>
+        </View>
+      </Modal>
+      <View style={styles.block}>
+        <Text style={styles.title}>Animation Type</Text>
+        <View style={styles.row}>
+          {animationTypes.map(type => (
+            <RNTOption
+              key={type}
+              style={styles.option}
+              label={type}
+              onPress={() => setAnimationType(type)}
+              selected={type === animationType}
+            />
+          ))}
+        </View>
+      </View>
+      {Platform.OS === 'android' && Platform.isTV !== true ? (
+        <>
+          <View style={styles.inlineBlock}>
+            <Text style={styles.title}>Status Bar Translucent</Text>
+            <Switch
+              value={statusBarTranslucent}
+              onValueChange={() =>
+                setStatusBarTranslucent(!statusBarTranslucent)
+              }
+            />
+          </View>
+          <View style={styles.inlineBlock}>
+            <Text style={styles.title}>Hardware Acceleration</Text>
+            <Switch
+              value={hardwareAccelerated}
+              onValueChange={() => setHardwareAccelerated(!hardwareAccelerated)}
+            />
+          </View>
+        </>
+      ) : null}
+      {Platform.isTV !== true ? (
+        <>
+          {Platform.OS === 'ios' ? (
+            <View style={styles.block}>
+              <Text style={styles.title}>Presentation Style</Text>
+              <View style={styles.row}>
+                {presentationStyles.map(type => (
+                  <RNTOption
+                    key={type}
+                    style={styles.option}
+                    label={type}
+                    onPress={() => {
+                      if (type !== 'overFullScreen' && transparent) {
+                        setTransparent(false);
+                      }
+                      setPresentationStyle(type);
+                    }}
+                    selected={type === presentationStyle}
+                  />
+                ))}
+              </View>
+            </View>
+          ) : null}
+          <View style={styles.block}>
+            <View style={styles.rowWithSpaceBetween}>
+              <Text style={styles.title}>Transparent</Text>
+              <Switch
+                value={transparent}
+                disabled={presentationStyle !== 'overFullScreen'}
+                onValueChange={() => setTransparent(!transparent)}
+              />
+            </View>
+            {Platform.OS === 'ios' && presentationStyle !== 'overFullScreen' ? (
+              <Text style={styles.warning}>
+                iOS Modal can only be transparent with 'overFullScreen'
+                Presentation Style
+              </Text>
+            ) : null}
+          </View>
+          <View style={styles.block}>
+            <Text style={styles.title}>Supported Orientation</Text>
+            <View style={styles.row}>
+              {Object.keys(supportedOrientations).map(label => (
+                <RNTOption
+                  key={label}
+                  style={styles.option}
+                  label={label}
+                  onPress={() => setSupportedOrientationKey(label)}
+                  selected={label === supportedOrientationKey}
+                />
+              ))}
+            </View>
+          </View>
+          <View style={styles.block}>
+            <Text style={styles.title}>Actions</Text>
+            <View style={styles.row}>
+              {actions.map(value => (
+                <RNTOption
+                  key={value}
+                  style={styles.option}
+                  label={value}
+                  onPress={() => setAction(value)}
+                  selected={value === action}
+                />
+              ))}
+            </View>
+          </View>
+        </>
+      ) : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  row: {
+    flexWrap: 'wrap',
+    flexDirection: 'row',
+  },
+  rowWithSpaceBetween: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
+  block: {
+    borderColor: 'rgba(0,0,0, 0.1)',
+    borderBottomWidth: 1,
+    padding: 6,
+  },
+  inlineBlock: {
+    padding: 6,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    borderColor: 'rgba(0,0,0, 0.1)',
+    borderBottomWidth: 1,
+  },
+  title: {
+    margin: 3,
+    fontWeight: 'bold',
+  },
+  option: {
+    marginRight: 8,
+    marginTop: 6,
+  },
+  modalContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    padding: 20,
+  },
+  modalInnerContainer: {
+    borderRadius: 10,
+    alignItems: 'center',
+  },
+  warning: {
+    margin: 3,
+    fontSize: 12,
+    color: 'red',
+  },
+});
+
+export default ({
+  title: 'Modal Presentation',
+  name: 'basic',
+  description: 'Modals can be presented with or without animation',
+  render: (): React.Node => <ModalPresentation />,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js b/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js
index 7d6b554cd5951f..7b8cc944d6e8b5 100644
--- a/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js
+++ b/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js
@@ -56,6 +56,10 @@ class MultiColumnExample extends React.PureComponent<
   _onChangeNumColumns = numColumns => {
     this.setState(() => ({numColumns: Number(numColumns)}));
   };
+
+  _setBooleanValue: string => boolean => void = key => value =>
+    this.setState({[key]: value});
+
   render(): React.Node {
     const filterRegex = new RegExp(String(this.state.filterText), 'i');
     const filter = item =>
@@ -81,9 +85,21 @@ class MultiColumnExample extends React.PureComponent<
             />
           </View>
           <View style={styles.row}>
-            {renderSmallSwitchOption(this, 'virtualized')}
-            {renderSmallSwitchOption(this, 'fixedHeight')}
-            {renderSmallSwitchOption(this, 'logViewable')}
+            {renderSmallSwitchOption(
+              'Virtualized',
+              this.state.virtualized,
+              this._setBooleanValue('virtualized'),
+            )}
+            {renderSmallSwitchOption(
+              'Fixed Height',
+              this.state.fixedHeight,
+              this._setBooleanValue('fixedHeight'),
+            )}
+            {renderSmallSwitchOption(
+              'Log Viewable',
+              this.state.logViewable,
+              this._setBooleanValue('logViewable'),
+            )}
           </View>
         </View>
         <SeparatorComponent />
@@ -91,6 +107,7 @@ class MultiColumnExample extends React.PureComponent<
           ListFooterComponent={FooterComponent}
           ListHeaderComponent={HeaderComponent}
           getItemLayout={
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
             this.state.fixedHeight ? this._getItemLayout : undefined
           }
           data={filteredData}
@@ -136,7 +153,7 @@ class MultiColumnExample extends React.PureComponent<
     changed: Array<{
       key: string,
       isViewable: boolean,
-      item: {columns: Array<*>, ...},
+      item: {columns: Array<any>, ...},
       index: ?number,
       section?: any,
       ...
@@ -151,8 +168,18 @@ class MultiColumnExample extends React.PureComponent<
       );
     }
   };
+
   _pressItem = (key: string) => {
-    pressItem(this, key);
+    const index = Number(key);
+    const itemState = pressItem(this.state.data[index]);
+    this.setState(state => ({
+      ...state,
+      data: [
+        ...state.data.slice(0, index),
+        itemState,
+        ...state.data.slice(index + 1),
+      ],
+    }));
   };
 }
 
diff --git a/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js b/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
index 81851e1e2f7ff2..a12171494a2ead 100644
--- a/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
+++ b/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
@@ -145,9 +145,9 @@ class LoopExample extends React.Component<{...}, $FlowFixMeState> {
             {
               opacity: this.state.value.interpolate({
                 inputRange: [0, 0.5, 1],
-                /* $FlowFixMe(>=0.38.0) - Flow error detected during the
-                 * deployment of v0.38.0. To see the error, remove this comment
-                 * and run flow */
+                /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error
+                 * detected during the deployment of v0.38.0. To see the error,
+                 * remove this comment and run flow */
                 outputRange: [0, 1, 0],
               }),
             },
@@ -175,9 +175,9 @@ class InternalSettings extends React.Component<
           initialValue={false}
           label="Force JS Stalls"
           onEnable={() => {
-            /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.63 was deployed. To see
-             * the error delete this comment and run Flow. */
+            /* $FlowFixMe[incompatible-type] (>=0.63.0 site=react_native_fb)
+             * This comment suppresses an error found when Flow v0.63 was
+             * deployed. To see the error delete this comment and run Flow. */
             this._stallInterval = setInterval(() => {
               const start = Date.now();
               console.warn('burn CPU');
@@ -185,9 +185,9 @@ class InternalSettings extends React.Component<
             }, 300);
           }}
           onDisable={() => {
-            /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment
-             * suppresses an error found when Flow v0.63 was deployed. To see
-             * the error delete this comment and run Flow. */
+            /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb)
+             * This comment suppresses an error found when Flow v0.63 was
+             * deployed. To see the error delete this comment and run Flow. */
             clearInterval(this._stallInterval || 0);
           }}
         />
@@ -243,9 +243,9 @@ class EventExample extends React.Component<{...}, $FlowFixMeState> {
                 {
                   rotate: this.state.anim.interpolate({
                     inputRange: [0, 1],
-                    /* $FlowFixMe(>=0.38.0) - Flow error detected during the
-                     * deployment of v0.38.0. To see the error, remove this
-                     * comment and run flow */
+                    /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow
+                     * error detected during the deployment of v0.38.0. To see
+                     * the error, remove this comment and run flow */
                     outputRange: ['0deg', '1deg'],
                   }),
                 },
diff --git a/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js b/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
index c8b2df92d3ed80..70da9fff850bb8 100644
--- a/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
+++ b/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const React = require('react');
 
 const {DeviceEventEmitter, Text, View} = require('react-native');
diff --git a/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js b/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js
index fcb807edb9d391..0ee624339f5236 100644
--- a/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js
+++ b/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow weak
+ * @flow
  */
 
 'use strict';
@@ -110,9 +110,12 @@ class PanResponderExample extends React.Component<Props, State> {
             }}
             style={[
               styles.circle,
+              // $FlowFixMe[incompatible-type]
               {
-                translateX: this.state.left,
-                translateY: this.state.top,
+                transform: [
+                  {translateX: this.state.left},
+                  {translateY: this.state.top},
+                ],
                 backgroundColor: this.state.pressed ? 'blue' : 'green',
               },
             ]}
@@ -145,11 +148,9 @@ exports.category = 'Basic';
 exports.documentationURL = 'https://reactnative.dev/docs/panresponder';
 exports.description =
   'Shows the Use of PanResponder to provide basic gesture handling';
-exports.simpleExampleContainer = true;
 exports.examples = [
   {
     title: 'Basic gesture handling',
-    // $FlowFixMe[value-as-type]
     render: function(): React.Element<typeof PanResponderExample> {
       return <PanResponderExample />;
     },
diff --git a/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js b/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js
index d1585d97105e99..0ef31bb25d4693 100644
--- a/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js
+++ b/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js
@@ -10,96 +10,125 @@
 
 'use strict';
 
-const React = require('react');
+import * as React from 'react';
 
-const {
-  PermissionsAndroid,
-  Picker,
-  StyleSheet,
-  Text,
-  TouchableWithoutFeedback,
-  View,
-} = require('react-native');
+import {PermissionsAndroid, StyleSheet, Text, View} from 'react-native';
+import RNTOption from '../../components/RNTOption';
+import RNTesterButton from '../../components/RNTesterButton';
 
-const Item = Picker.Item;
+function PermissionsExample() {
+  const [permission, setPermission] = React.useState(
+    PermissionsAndroid.PERMISSIONS.CAMERA,
+  );
+  const [hasPermission, setHasPermission] = React.useState('Not Checked');
 
-class PermissionsExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
-    permission: PermissionsAndroid.PERMISSIONS.CAMERA,
-    hasPermission: 'Not Checked',
+  const requestPermission = async () => {
+    let result;
+    try {
+      result = await PermissionsAndroid.request(permission, {
+        title: 'Permission Explanation',
+        message:
+          'The app needs the following permission ' +
+          permission +
+          ' because of reasons. Please approve.',
+      });
+      setHasPermission(result + ' for ' + permission);
+    } catch (e) {
+      throw e;
+    }
   };
 
-  render() {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.text}>Permission Name:</Text>
-        <Picker
-          style={styles.picker}
-          selectedValue={this.state.permission}
-          onValueChange={this._onSelectPermission.bind(this)}>
-          <Item
+  const checkPermission = async () => {
+    let result;
+    try {
+      result = await PermissionsAndroid.check(permission);
+    } catch (e) {
+      throw e;
+    }
+    setHasPermission(`${result ? 'Granted' : 'Revoked'} for ${permission}`);
+  };
+
+  return (
+    <View style={styles.container}>
+      <View style={styles.block}>
+        <Text style={styles.title}>Select Permission</Text>
+        <View style={styles.row}>
+          <RNTOption
             label={PermissionsAndroid.PERMISSIONS.CAMERA}
-            value={PermissionsAndroid.PERMISSIONS.CAMERA}
+            key={PermissionsAndroid.PERMISSIONS.CAMERA}
+            onPress={() => setPermission(PermissionsAndroid.PERMISSIONS.CAMERA)}
+            selected={permission === PermissionsAndroid.PERMISSIONS.CAMERA}
+            style={styles.option}
           />
-          <Item
+          <RNTOption
             label={PermissionsAndroid.PERMISSIONS.READ_CALENDAR}
-            value={PermissionsAndroid.PERMISSIONS.READ_CALENDAR}
+            key={PermissionsAndroid.PERMISSIONS.READ_CALENDAR}
+            onPress={() =>
+              setPermission(PermissionsAndroid.PERMISSIONS.READ_CALENDAR)
+            }
+            selected={
+              permission === PermissionsAndroid.PERMISSIONS.READ_CALENDAR
+            }
+            style={styles.option}
           />
-          <Item
+          <RNTOption
             label={PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION}
-            value={PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION}
+            key={PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION}
+            onPress={() =>
+              setPermission(PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION)
+            }
+            selected={
+              permission === PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION
+            }
+            style={styles.option}
           />
-        </Picker>
-        <TouchableWithoutFeedback onPress={this._checkPermission}>
-          <View>
-            <Text style={[styles.touchable, styles.text]}>
-              Check Permission
-            </Text>
-          </View>
-        </TouchableWithoutFeedback>
-        <Text style={styles.text}>
-          Permission Status: {this.state.hasPermission}
-        </Text>
-        <TouchableWithoutFeedback onPress={this._requestPermission}>
-          <View>
-            <Text style={[styles.touchable, styles.text]}>
-              Request Permission
-            </Text>
-          </View>
-        </TouchableWithoutFeedback>
+        </View>
       </View>
-    );
-  }
-
-  _onSelectPermission = (permission: string | number) => {
-    this.setState({
-      permission: permission,
-    });
-  };
-
-  _checkPermission = async () => {
-    let result = await PermissionsAndroid.check(this.state.permission);
-    this.setState({
-      hasPermission:
-        (result ? 'Granted' : 'Revoked') + ' for ' + this.state.permission,
-    });
-  };
-
-  _requestPermission = async () => {
-    let result = await PermissionsAndroid.request(this.state.permission, {
-      title: 'Permission Explanation',
-      message:
-        'The app needs the following permission ' +
-        this.state.permission +
-        ' because of reasons. Please approve.',
-    });
-
-    this.setState({
-      hasPermission: result + ' for ' + this.state.permission,
-    });
-  };
+      <RNTesterButton onPress={checkPermission}>
+        <View>
+          <Text style={[styles.touchable, styles.text]}>Check Permission</Text>
+        </View>
+      </RNTesterButton>
+      <RNTesterButton onPress={requestPermission}>
+        <View>
+          <Text style={[styles.touchable, styles.text]}>
+            Request Permission
+          </Text>
+        </View>
+      </RNTesterButton>
+      <Text style={styles.text}>Permission Status: {hasPermission}</Text>
+    </View>
+  );
 }
 
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: 'white',
+  },
+  block: {
+    borderColor: 'rgba(0,0,0, 0.1)',
+    borderBottomWidth: 1,
+    padding: 6,
+  },
+  row: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+  },
+  title: {
+    fontWeight: 'bold',
+  },
+  text: {
+    fontSize: 20,
+  },
+  touchable: {
+    color: '#007AFF',
+  },
+  option: {
+    margin: 6,
+  },
+});
+
 exports.displayName = (undefined: ?string);
 exports.framework = 'React';
 exports.title = 'PermissionsAndroid';
@@ -113,19 +142,3 @@ exports.examples = [
     render: (): React.Node => <PermissionsExample />,
   },
 ];
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: 'white',
-  },
-  text: {
-    margin: 10,
-  },
-  touchable: {
-    color: '#007AFF',
-  },
-  picker: {
-    flex: 1,
-  },
-});
diff --git a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
index 7f0899ef0027a5..ea55de56c44c96 100644
--- a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
+++ b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const React = require('react');
 const ReactNative = require('react-native');
 import Platform from 'react-native/Libraries/Utilities/Platform';
@@ -120,6 +118,7 @@ function PlatformColorsExample() {
         {label: 'systemGray6', color: PlatformColor('systemGray6')},
         // Transparent Color
         {label: 'clear', color: PlatformColor('clear')},
+        {label: 'customColor', color: PlatformColor('customColor')},
       ];
     } else if (Platform.OS === 'android') {
       colors = [
@@ -284,6 +283,20 @@ function DynamicColorsExample() {
           }}
         />
       </View>
+      <View style={styles.row}>
+        <Text style={styles.labelCell}>
+          DynamicColorIOS({'{\n'}
+          {'  '}light: 'red', dark: 'blue'{'\n'}
+          {'}'})
+        </Text>
+        <View
+          style={{
+            ...styles.colorCell,
+            borderColor: DynamicColorIOS({light: 'red', dark: 'blue'}),
+            borderWidth: 1,
+          }}
+        />
+      </View>
       <View style={styles.row}>
         <Text style={styles.labelCell}>
           DynamicColorIOS({'{\n'}
diff --git a/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js b/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js
index 569ae494ddda48..ff5aaab93117ae 100644
--- a/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js
+++ b/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js
@@ -14,12 +14,25 @@ const React = require('react');
 
 const {StyleSheet, Text, View} = require('react-native');
 
-class ExampleBox extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
+type ExampleBoxComponentProps = $ReadOnly<{|
+  onLog: (msg: string) => void,
+|}>;
+
+type ExampleBoxProps = $ReadOnly<{|
+  Component: React.ComponentType<ExampleBoxComponentProps>,
+|}>;
+
+type ExampleBoxState = $ReadOnly<{|
+  log: string[],
+|}>;
+
+class ExampleBox extends React.Component<ExampleBoxProps, ExampleBoxState> {
   state = {
     log: [],
   };
 
-  handleLog = msg => {
+  handleLog = (msg: string) => {
+    // $FlowFixMe
     this.state.log = this.state.log.concat([msg]);
   };
 
@@ -32,19 +45,22 @@ class ExampleBox extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
    * happens.
    */
   handleTouchCapture = () => {
+    // $FlowFixMe
     this.state.log = this.state.log.concat(['---']);
   };
 
   render() {
+    const {Component} = this.props;
     return (
       <View>
         <View
           onTouchEndCapture={this.handleTouchCapture}
           onTouchStart={this.flushReactChanges}>
-          {/* $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.Component onLog={this.handleLog} />
+          {/* $FlowFixMe[type-as-value] (>=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. */}
+          <Component onLog={this.handleLog} />
         </View>
         <View style={styles.logBox}>
           <DemoText style={styles.logText}>
@@ -165,6 +181,57 @@ class BoxOnlyExample extends React.Component<$FlowFixMeProps> {
   }
 }
 
+type OverflowExampleProps = $ReadOnly<{|
+  overflow: 'hidden' | 'visible',
+  onLog: (msg: string) => void,
+|}>;
+
+class OverflowExample extends React.Component<OverflowExampleProps> {
+  render() {
+    const {overflow} = this.props;
+    return (
+      <View
+        onTouchStart={() => this.props.onLog(`A overflow ${overflow} touched`)}
+        style={[
+          styles.box,
+          styles.boxWithOverflowSet,
+          {overflow: this.props.overflow},
+        ]}>
+        <DemoText style={styles.text}>A: overflow: {overflow}</DemoText>
+        <View
+          onTouchStart={() => this.props.onLog('B overflowing touched')}
+          style={[styles.box, styles.boxOverflowing]}>
+          <DemoText style={styles.text}>B: overflowing</DemoText>
+        </View>
+        <View
+          onTouchStart={() => this.props.onLog('C fully outside touched')}
+          style={[styles.box, styles.boxFullyOutside]}>
+          <DemoText style={styles.text}>C: fully outside</DemoText>
+          <View
+            onTouchStart={() =>
+              this.props.onLog('D fully outside child touched')
+            }
+            style={[styles.box, styles.boxFullyOutsideChild]}>
+            <DemoText style={styles.text}>D: child of fully outside</DemoText>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}
+
+class OverflowVisibleExample extends React.Component<ExampleBoxComponentProps> {
+  render() {
+    return <OverflowExample {...this.props} overflow="visible" />;
+  }
+}
+
+class OverflowHiddenExample extends React.Component<ExampleBoxComponentProps> {
+  render() {
+    return <OverflowExample {...this.props} overflow="hidden" />;
+  }
+}
+
 type ExampleClass = {
   Component: React.ComponentType<any>,
   title: string,
@@ -191,6 +258,18 @@ const exampleClasses: Array<ExampleClass> = [
     description:
       "`box-only` causes touch events on the container's child components to pass through and will only detect touch events on the container itself.",
   },
+  {
+    Component: OverflowVisibleExample,
+    title: '`overflow: visible`',
+    description:
+      '`overflow: visible` style should allow subelements that are outside of the parent box to be touchable. Tapping the parts of Box B outside Box A should print "B touched" and "A touched", and tapping Box C should also print "C touched" and "A touched".',
+  },
+  {
+    Component: OverflowHiddenExample,
+    title: '`overflow: hidden`',
+    description:
+      '`overflow: hidden` style should only allow subelements within the parent box to be touchable. Tapping just below Box A (where Box B would otherwise extend if it weren\'t cut off) should not trigger any touches or messages. Touching Box D (inside the bounds) should print "D touched" and "A touched".',
+  },
 ];
 
 const infoToExample = info => {
@@ -221,6 +300,26 @@ const styles = StyleSheet.create({
   boxPassedThrough: {
     borderColor: '#99bbee',
   },
+  boxWithOverflowSet: {
+    paddingBottom: 40,
+    marginBottom: 50,
+  },
+  boxOverflowing: {
+    position: 'absolute',
+    top: 30,
+    paddingBottom: 40,
+  },
+  boxFullyOutside: {
+    position: 'absolute',
+    left: 200,
+    top: 65,
+  },
+  boxFullyOutsideChild: {
+    position: 'absolute',
+    left: 0,
+    top: -65,
+    width: 100,
+  },
   logText: {
     fontSize: 9,
   },
diff --git a/packages/rn-tester/js/examples/Pressable/PressableExample.js b/packages/rn-tester/js/examples/Pressable/PressableExample.js
index b592a2b0e6d7f1..e7b0537000f263 100644
--- a/packages/rn-tester/js/examples/Pressable/PressableExample.js
+++ b/packages/rn-tester/js/examples/Pressable/PressableExample.js
@@ -8,11 +8,10 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import * as React from 'react';
 import {
   Animated,
+  Image,
   Pressable,
   StyleSheet,
   Text,
@@ -314,6 +313,10 @@ const styles = StyleSheet.create({
     fontWeight: '500',
     color: 'blue',
   },
+  image: {
+    height: 100,
+    width: 100,
+  },
 });
 
 exports.displayName = (undefined: ?string);
@@ -429,6 +432,22 @@ exports.examples = [
               </Text>
             </View>
           </Pressable>
+
+          <View style={{alignItems: 'center'}}>
+            <Pressable
+              android_ripple={{
+                borderless: false,
+                foreground: true,
+              }}>
+              <Image
+                source={{
+                  uri: 'https://www.facebook.com/ads/pics/successstories.png',
+                }}
+                style={styles.image}
+              />
+            </Pressable>
+            <Text>use foreground</Text>
+          </View>
         </View>
       );
     },
diff --git a/packages/rn-tester/js/examples/RTL/RTLExample.js b/packages/rn-tester/js/examples/RTL/RTLExample.js
index d93995a0388b21..837609d312d4c0 100644
--- a/packages/rn-tester/js/examples/RTL/RTLExample.js
+++ b/packages/rn-tester/js/examples/RTL/RTLExample.js
@@ -145,7 +145,10 @@ type RTLSwitcherComponentState = {|
 |};
 
 function withRTLState(Component) {
-  return class extends React.Component<*, RTLSwitcherComponentState> {
+  return class extends React.Component<
+    {style?: any},
+    RTLSwitcherComponentState,
+  > {
     constructor(...args) {
       super(...args);
       this.state = {
@@ -668,6 +671,7 @@ exports.examples = [
     description: ('In iOS, it depends on active language. ' +
       'In Android, it depends on the text content.': string),
     render: function(): React.Element<any> {
+      // $FlowFixMe[speculation-ambiguous]
       return <TextAlignmentExample style={styles.fontSizeSmall} />;
     },
   },
@@ -677,6 +681,7 @@ exports.examples = [
       'languages or text content.': string),
     render: function(): React.Element<any> {
       return (
+        // $FlowFixMe[speculation-ambiguous]
         <TextAlignmentExample
           style={[styles.fontSizeSmall, styles.textAlignLeft]}
         />
@@ -689,6 +694,7 @@ exports.examples = [
       'languages or text content.': string),
     render: function(): React.Element<any> {
       return (
+        // $FlowFixMe[speculation-ambiguous]
         <TextAlignmentExample
           style={[styles.fontSizeSmall, styles.textAlignRight]}
         />
@@ -699,6 +705,7 @@ exports.examples = [
     title: "Using textAlign: 'right' for TextInput",
     description: ('Flip TextInput direction to RTL': string),
     render: function(): React.Element<any> {
+      // $FlowFixMe[speculation-ambiguous]
       return <TextInputExample style={[styles.textAlignRight]} />;
     },
   },
diff --git a/packages/rn-tester/js/examples/RefreshControl/RefreshControlExample.js b/packages/rn-tester/js/examples/RefreshControl/RefreshControlExample.js
index fc582cb7d5a35b..a4158240786ab9 100644
--- a/packages/rn-tester/js/examples/RefreshControl/RefreshControlExample.js
+++ b/packages/rn-tester/js/examples/RefreshControl/RefreshControlExample.js
@@ -118,7 +118,6 @@ exports.title = 'RefreshControl';
 exports.category = 'Basic';
 exports.documentationURL = 'https://reactnative.dev/docs/refreshcontrol';
 exports.description = 'Adds pull-to-refresh support to a scrollview.';
-exports.simpleExampleContainer = true;
 exports.examples = [
   {
     title: 'Simple refresh',
diff --git a/packages/rn-tester/js/examples/RootViewSizeFlexibilityExample/RootViewSizeFlexibilityExampleApp.js b/packages/rn-tester/js/examples/RootViewSizeFlexibilityExample/RootViewSizeFlexibilityExampleApp.js
index ccaf8e82b648a9..a6c80ee726eb76 100644
--- a/packages/rn-tester/js/examples/RootViewSizeFlexibilityExample/RootViewSizeFlexibilityExampleApp.js
+++ b/packages/rn-tester/js/examples/RootViewSizeFlexibilityExample/RootViewSizeFlexibilityExampleApp.js
@@ -33,6 +33,7 @@ class RootViewSizeFlexibilityExampleApp extends React.Component<
       : styles.smallContainer;
 
     return (
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       <TouchableHighlight onPress={this._onPressButton.bind(this)}>
         <View style={viewStyle}>
           <View style={styles.center}>
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js
index 656c51276f6285..bfd4b77183f462 100644
--- a/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js
@@ -31,6 +31,7 @@ class ScrollViewAnimatedExample extends Component<{...}> {
     Animated.timing(this._scrollViewPos, {
       toValue: 100,
       duration: 10000,
+      // $FlowFixMe[method-unbinding]
       easing: Easing.linear,
       useNativeDriver: true,
     }).start();
@@ -39,14 +40,16 @@ class ScrollViewAnimatedExample extends Component<{...}> {
   render(): React.Node {
     const interpolated = this._scrollViewPos.interpolate({
       inputRange: [0, 1],
-      /* $FlowFixMe(>=0.38.0) - Flow error detected during the deployment of
-       * v0.38.0. To see the error, remove this comment and run flow */
+      /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error detected
+       * during the deployment of v0.38.0. To see the error, remove this
+       * comment and run flow */
       outputRange: [0, 0.1],
     });
     const interpolated2 = this._scrollViewPos.interpolate({
       inputRange: [0, 1],
-      /* $FlowFixMe(>=0.38.0) - Flow error detected during the deployment of
-       * v0.38.0. To see the error, remove this comment and run flow */
+      /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error detected
+       * during the deployment of v0.38.0. To see the error, remove this
+       * comment and run flow */
       outputRange: ['0deg', '1deg'],
     });
     return (
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
index 7aa352b4228aca..4668599fb2aa46 100644
--- a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
@@ -4,26 +4,29 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-'use strict';
+import * as React from 'react';
 
-const React = require('react');
-
-const {
+import {
   Platform,
   ScrollView,
   StyleSheet,
   Text,
   TouchableOpacity,
   View,
-} = require('react-native');
+  TextInput,
+  RefreshControl,
+} from 'react-native';
 
-const nullthrows = require('nullthrows');
+import nullthrows from 'nullthrows';
 
+import {useState, useCallback} from 'react';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
+import ScrollViewPressableStickyHeaderExample from './ScrollViewPressableStickyHeaderExample';
 
 exports.displayName = 'ScrollViewExample';
 exports.title = 'ScrollView';
@@ -31,8 +34,9 @@ exports.documentationURL = 'https://reactnative.dev/docs/scrollview';
 exports.category = 'Basic';
 exports.description =
   'Component that enables scrolling through child components';
-exports.examples = [
+exports.examples = ([
   {
+    name: 'scrollTo',
     title: '<ScrollView>\n',
     description:
       'To make content scrollable, wrap it within a <ScrollView> component',
@@ -49,7 +53,8 @@ exports.examples = [
               console.log('onScroll!');
             }}
             scrollEventThrottle={200}
-            style={styles.scrollView}>
+            style={styles.scrollView}
+            testID="scroll_vertical">
             {ITEMS.map(createItemRow)}
           </ScrollView>
           <Button
@@ -57,71 +62,48 @@ exports.examples = [
             onPress={() => {
               nullthrows(_scrollView).scrollTo({y: 0});
             }}
+            testID="scroll_to_top_button"
           />
           <Button
             label="Scroll to bottom"
             onPress={() => {
               nullthrows(_scrollView).scrollToEnd({animated: true});
             }}
+            testID="scroll_to_bottom_button"
           />
           <Button
             label="Flash scroll indicators"
             onPress={() => {
               nullthrows(_scrollView).flashScrollIndicators();
             }}
+            testID="flash_scroll_indicators_button"
           />
         </View>
       );
     },
   },
   {
+    name: 'horizontalScrollTo',
     title: '<ScrollView> (horizontal = true)\n',
     description:
       "You can display <ScrollView>'s child components horizontally rather than vertically",
     render: function(): React.Node {
-      function renderScrollView(
-        title: string,
-        additionalStyles: ViewStyleProp,
-      ) {
-        let _scrollView: ?React.ElementRef<typeof ScrollView>;
-        return (
-          <View style={additionalStyles}>
-            <Text style={styles.text}>{title}</Text>
-            <ScrollView
-              ref={scrollView => {
-                _scrollView = scrollView;
-              }}
-              automaticallyAdjustContentInsets={false}
-              horizontal={true}
-              style={[styles.scrollView, styles.horizontalScrollView]}>
-              {ITEMS.map(createItemRow)}
-            </ScrollView>
-            <Button
-              label="Scroll to start"
-              onPress={() => {
-                nullthrows(_scrollView).scrollTo({x: 0});
-              }}
-            />
-            <Button
-              label="Scroll to end"
-              onPress={() => {
-                nullthrows(_scrollView).scrollToEnd({animated: true});
-              }}
-            />
-            <Button
-              label="Flash scroll indicators"
-              onPress={() => {
-                nullthrows(_scrollView).flashScrollIndicators();
-              }}
-            />
-          </View>
-        );
-      }
-
       return (
         <View>
-          {renderScrollView('LTR layout', {direction: 'ltr'})}
-          {renderScrollView('RTL layout', {direction: 'rtl'})}
+          <HorizontalScrollView direction="ltr" />
+        </View>
+      );
+    },
+  },
+  {
+    name: 'horizontalScrollToRTL',
+    title: '<ScrollView> (horizontal = true) in RTL\n',
+    description:
+      "You can display <ScrollView>'s child components horizontally rather than vertically",
+    render: function(): React.Node {
+      return (
+        <View>
+          <HorizontalScrollView direction="rtl" />
         </View>
       );
     },
@@ -130,7 +112,10 @@ exports.examples = [
     title: '<ScrollView> enable & disable\n',
     description: 'ScrollView scrolling behaviour can be disabled and enabled',
     render: function(): React.Node {
-      class EnableDisableList extends React.Component<{...}, *> {
+      class EnableDisableList extends React.Component<
+        {},
+        {scrollEnabled: boolean},
+      > {
         state = {
           scrollEnabled: true,
         };
@@ -165,7 +150,124 @@ exports.examples = [
       return <EnableDisableList />;
     },
   },
-];
+  {
+    title: '<ScrollView> Content\n',
+    description: 'Adjust properties of content inside ScrollView.',
+    render: function(): React.Node {
+      return <ContentExample />;
+    },
+  },
+  {
+    title: '<ScrollView> Deceleration Rate\n',
+    description:
+      'Determines how quickly the scroll view decelerates after the user lifts their finger.',
+    render: function(): React.Node {
+      return <DecelerationRateExample />;
+    },
+  },
+  {
+    title: '<ScrollView> Enable & Disable Scrolling Behavior\n',
+    description:
+      'DirectionalLockEnabled (iOS), disableIntervalMomentum, disableScrollViewPanResponder can be enabled or disabled.',
+    render: function(): React.Node {
+      return <DisableEnable />;
+    },
+  },
+  {
+    name: 'invertStickyHeaders',
+    title: '<ScrollView> Invert Sticky Headers\n',
+    description:
+      'If sticky headers should stick at the bottom instead of the top of the ScrollView. This is usually used with inverted ScrollViews.',
+    render: function(): React.Node {
+      return <InvertStickyHeaders />;
+    },
+  },
+  {
+    name: 'multipleStickyHeaders',
+    title: '<ScrollView> Multiple Sticky Headers\n',
+    description:
+      'Scroll down to see 3 sticky headers stick when they get to the top.',
+    render: function(): React.Node {
+      return <MultipleStickyHeaders />;
+    },
+  },
+  {
+    name: 'pressableStickyHeaders',
+    title: '<ScrollView> Pressable Sticky Header\n',
+    description:
+      'Press the blue box to toggle it between blue and yellow. The box should remain Pressable after scrolling.',
+    render: function(): React.Node {
+      return (
+        <View style={{height: 400}}>
+          <ScrollViewPressableStickyHeaderExample />
+        </View>
+      );
+    },
+  },
+  {
+    name: 'keyboardShouldPersistTaps',
+    title: '<ScrollView> Keyboard Options\n',
+    description:
+      'Toggle the keyboard using the search bar and determine keyboard behavior in response to drag and tap.',
+    render: function(): React.Node {
+      return <KeyboardExample />;
+    },
+  },
+  {
+    title: '<ScrollView> OnContentSizeChange\n',
+    description:
+      'The text below will change when scrollable content view of the ScrollView changes.',
+    render: function(): React.Node {
+      return <OnContentSizeChange />;
+    },
+  },
+  {
+    title: '<ScrollView> OnMomentumScroll\n',
+    description:
+      'An alert will be called when the momentum scroll starts or ends.',
+    render: function(): React.Node {
+      return <OnMomentumScroll />;
+    },
+  },
+  {
+    title: '<ScrollView> OnScroll Options\n',
+    description:
+      'Change the behavior of onScroll using these options: onScrollBeginDrag, onScrollEndDrag, onScrollToTop (iOS), and overScrollMode (Android).',
+    render: function(): React.Node {
+      return <OnScrollOptions />;
+    },
+  },
+  {
+    title: '<ScrollView> RefreshControl\n',
+    description: 'Pull down to see RefreshControl indicator.',
+    render: function(): React.Node {
+      return <RefreshControlExample />;
+    },
+  },
+  {
+    title: '<ScrollView> Remove Clipped Subviews\n',
+    description:
+      'When true, offscreen child views (whose overflow value is hidden) are removed from their native backing superview when offscreen.',
+    render: function(): React.Node {
+      return <RemoveClippedSubviews />;
+    },
+  },
+  {
+    title: '<ScrollView> Scroll Indicator\n',
+    description: 'Adjust properties of the scroll indicator.',
+    render: function(): React.Node {
+      return <ScrollIndicatorExample />;
+    },
+  },
+  {
+    title: '<ScrollView> SnapTo Options\n',
+    description: 'Adjust properties of snapping to the scroll view.',
+    render: function(): React.Node {
+      return <SnapToOptions />;
+    },
+  },
+]: Array<RNTesterModuleExample>);
+
 if (Platform.OS === 'ios') {
   exports.examples.push({
     title: '<ScrollView> smooth bi-directional content loading\n',
@@ -174,11 +276,11 @@ if (Platform.OS === 'ios') {
       'without causing the visible content to jump. Re-ordering is not supported.',
     render: function() {
       let itemCount = 6;
-      class AppendingList extends React.Component<{...}, *> {
+      class AppendingList extends React.Component<
+        {},
+        {items: Array<React.Element<typeof Item>>},
+      > {
         state = {
-          /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses
-           * an error found when Flow v0.85 was deployed. To see the error,
-           * delete this comment and run Flow. */
           items: [...Array(itemCount)].map((_, ii) => (
             <Item msg={`Item ${ii}`} />
           )),
@@ -321,8 +423,832 @@ if (Platform.OS === 'ios') {
       return <CenterContentList />;
     },
   });
+  exports.examples.push({
+    title: '<ScrollView> Always Bounces\n',
+    description: 'Always bounce vertically or horizontally.',
+    render: function(): React.Node {
+      return (
+        <>
+          <Text style={styles.text}>Vertical</Text>
+          <BouncesExampleVertical />
+          <Text style={styles.text}>Horizontal</Text>
+          <BouncesExampleHorizontal />
+        </>
+      );
+    },
+  });
+  exports.examples.push({
+    title: '<ScrollView> Bounces & Bounces Zoom\n',
+    description: 'There are different options for bouncing behavior.',
+    render: function(): React.Node {
+      return <BouncesExample />;
+    },
+  });
+  exports.examples.push({
+    title: '<ScrollView> Indicator Style\n',
+    description: 'There are different options for indicator style colors.',
+    render: function(): React.Node {
+      return <IndicatorStyle />;
+    },
+  });
+  exports.examples.push({
+    title: '<ScrollView> Maximum & Minimum Zoom Scale\n',
+    description: 'Set the maximum and minimum allowed zoom scale.',
+    render: function(): React.Node {
+      return <MaxMinZoomScale />;
+    },
+  });
+  exports.examples.push({
+    title: '<ScrollView> Maximum & Minimum Zoom Scale\n',
+    description: 'Set the maximum and minimum allowed zoom scale.',
+    render: function(): React.Node {
+      return <MaxMinZoomScale />;
+    },
+  });
+  exports.examples.push({
+    title: '<ScrollView> ScrollTo Options\n',
+    description:
+      'Toggle scrollToOverflowEnabled and scrollsToTop. When scrollToOverflowEnabled is true, the scroll view can be programmatically scrolled beyond its content size. When scrollsToTop is true, the scroll view scrolls to top when the status bar is tapped.',
+    render: function(): React.Node {
+      return <ScrollToOptions />;
+    },
+  });
+} else if (Platform.OS === 'android') {
+  exports.examples.push({
+    title: '<ScrollView> EndFillColor & FadingEdgeLength\n',
+    description: 'Toggle to set endFillColor and fadingEdgeLength.',
+    render: function(): React.Node {
+      return <EndFillColorFadingEdgeLen />;
+    },
+  });
+  exports.examples.push({
+    title: '<ScrollView> persistentScrollBar\n',
+    description: 'Toggle to set persistentScrollbar option.',
+    render: function(): React.Node {
+      return <AndroidScrollBarOptions />;
+    },
+  });
 }
 
+const AndroidScrollBarOptions = () => {
+  const [persistentScrollBar, setPersistentScrollBar] = useState(false);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        persistentScrollbar={persistentScrollBar}>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Button
+        label={'persistentScrollBar: ' + persistentScrollBar.toString()}
+        onPress={() => setPersistentScrollBar(!persistentScrollBar)}
+      />
+    </View>
+  );
+};
+
+const HorizontalScrollView = (props: {direction: 'ltr' | 'rtl'}) => {
+  const {direction} = props;
+  const scrollRef = React.useRef<?React.ElementRef<typeof ScrollView>>();
+  const title = direction === 'ltr' ? 'LTR Layout' : 'RTL Layout';
+  return (
+    <View style={{direction}}>
+      <Text style={styles.text}>{title}</Text>
+      <ScrollView
+        ref={scrollRef}
+        automaticallyAdjustContentInsets={false}
+        horizontal={true}
+        style={[styles.scrollView, styles.horizontalScrollView]}
+        testID={'scroll_horizontal'}>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Button
+        label="Scroll to start"
+        onPress={() => {
+          nullthrows(scrollRef.current).scrollTo({x: 0});
+        }}
+        testID={'scroll_to_start_button'}
+      />
+      <Button
+        label="Scroll to end"
+        onPress={() => {
+          nullthrows(scrollRef.current).scrollToEnd({animated: true});
+        }}
+        testID={'scroll_to_end_button'}
+      />
+    </View>
+  );
+};
+
+const EndFillColorFadingEdgeLen = () => {
+  const [endFillColor, setEndFillColor] = useState('');
+  const [fadingEdgeLen, setFadingEdgeLen] = useState(0);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        endFillColor={endFillColor}
+        fadingEdgeLength={fadingEdgeLen}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Button
+        label={endFillColor === '' ? 'setEndFillColor' : 'resetEndFillColor'}
+        onPress={() =>
+          endFillColor === '' ? setEndFillColor('#A9DFD0') : setEndFillColor('')
+        }
+      />
+      <Button
+        label={fadingEdgeLen === 0 ? 'setFadingEdgeLen' : 'resetFadingEdgeLen'}
+        onPress={() =>
+          fadingEdgeLen === 0 ? setFadingEdgeLen(300) : setFadingEdgeLen(0)
+        }
+      />
+    </View>
+  );
+};
+
+const SnapToOptions = () => {
+  const [snapToAlignment, setSnapToAlignment] = useState('start');
+  const snapToAlignmentModes = ['start', 'center', 'end'];
+  const [snapToEnd, setSnapToEnd] = useState(true);
+  const [snapToInterval, setSnapToInterval] = useState(0);
+  const [snapToOffsets, setSnapToOffsets] = useState([]);
+  const [snapToStart, setSnapToStart] = useState(true);
+
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        snapToAlignment={snapToAlignment}
+        snapToEnd={snapToEnd}
+        snapToInterval={snapToInterval}
+        snapToOffsets={snapToOffsets}
+        snapToStart={snapToStart}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      {Platform.OS === 'ios' ? (
+        <>
+          <Text style={styles.rowTitle}>Select Snap to Alignment Mode</Text>
+          <View style={styles.row}>
+            {snapToAlignmentModes.map(label => (
+              <Button
+                active={snapToAlignment === label}
+                key={label}
+                label={label}
+                onPress={() => setSnapToAlignment(label)}
+              />
+            ))}
+          </View>
+        </>
+      ) : null}
+      <Button
+        label={'snapToEnd: ' + snapToEnd.toString()}
+        onPress={() => setSnapToEnd(!snapToEnd)}
+      />
+      <Button
+        label={'snapToStart: ' + snapToStart.toString()}
+        onPress={() => setSnapToStart(!snapToStart)}
+      />
+      <Button
+        label={
+          snapToInterval === 0 ? 'setSnapToInterval' : 'reset snapToInterval'
+        }
+        onPress={() =>
+          snapToInterval === 0 ? setSnapToInterval(2) : setSnapToInterval(0)
+        }
+      />
+      <Button
+        label={
+          snapToOffsets === [] ? 'setSnapToOffsets' : 'reset snapToOffsets'
+        }
+        onPress={() =>
+          snapToOffsets === []
+            ? setSnapToOffsets([2, 4, 6, 8, 10])
+            : setSnapToOffsets([])
+        }
+      />
+    </View>
+  );
+};
+
+const ScrollToOptions = () => {
+  const [scrollToOverflowEnabled, setScrollToOverflowEnabled] = useState(false);
+  const [scrollsToTop, setScrollsToTop] = useState(true);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        scrollToOverflowEnabled={scrollToOverflowEnabled}
+        scrollsToTop={scrollsToTop}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Button
+        label={'scrollToOverflowEnabled: ' + scrollToOverflowEnabled.toString()}
+        onPress={() => setScrollToOverflowEnabled(!scrollToOverflowEnabled)}
+      />
+      <Button
+        label={'scrollsToTop: ' + scrollsToTop.toString()}
+        onPress={() => setScrollsToTop(!scrollsToTop)}
+      />
+    </View>
+  );
+};
+
+const ScrollIndicatorExample = () => {
+  const [scrollIndicatorInsets, setScrollIndicatorInsets] = useState(null);
+  const [showsHorizontalScrollIndic, setShowsHorizontalScrollIndic] = useState(
+    true,
+  );
+  const [showsVerticallScrollIndic, setShowsVerticalScrollIndic] = useState(
+    true,
+  );
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        contentInset={{top: 10, bottom: 10, left: 10, right: 10}}
+        scrollIndicatorInsets={scrollIndicatorInsets}
+        showsHorizontalScrollIndicator={showsHorizontalScrollIndic}
+        showsVerticalScrollIndicator={showsVerticallScrollIndic}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Button
+        label={
+          scrollIndicatorInsets == null
+            ? 'setScrollIndicatorInsets'
+            : 'Reset scrollIndicatorInsets'
+        }
+        onPress={() =>
+          scrollIndicatorInsets == null
+            ? setScrollIndicatorInsets({
+                top: 10,
+                left: 10,
+                bottom: 10,
+                right: 10,
+              })
+            : setScrollIndicatorInsets(null)
+        }
+      />
+      <Button
+        label={
+          'showsHorizontalScrollIndicator: ' +
+          showsHorizontalScrollIndic.toString()
+        }
+        onPress={() =>
+          setShowsHorizontalScrollIndic(!showsHorizontalScrollIndic)
+        }
+      />
+      <Button
+        label={
+          'showsVerticalScrollIndicator: ' +
+          showsVerticallScrollIndic.toString()
+        }
+        onPress={() => setShowsVerticalScrollIndic(!showsVerticallScrollIndic)}
+      />
+    </View>
+  );
+};
+
+const RemoveClippedSubviews = () => {
+  const [removeClippedSubviews, setRemoveClippedSubviews] = useState(false);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        removeClippedSubviews={removeClippedSubviews}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Button
+        label={'removeClippedSubviews: ' + removeClippedSubviews.toString()}
+        onPress={() => setRemoveClippedSubviews(!removeClippedSubviews)}
+      />
+    </View>
+  );
+};
+
+const RefreshControlExample = () => {
+  const [refreshing, setRefreshing] = useState(false);
+  const onRefresh = useCallback(() => {
+    setRefreshing(true);
+    wait(2000).then(() => setRefreshing(false));
+  }, []);
+
+  const wait = timeout => {
+    return new Promise(resolve => {
+      setTimeout(resolve, timeout);
+    });
+  };
+
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+    </View>
+  );
+};
+
+const OnScrollOptions = () => {
+  const [onScrollDrag, setOnScrollDrag] = useState('none');
+  const [overScrollMode, setOverScrollMode] = useState('auto');
+  const overScrollModeOptions = ['auto', 'always', 'never'];
+  return (
+    <View>
+      <Text>onScroll: {onScrollDrag}</Text>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        onScrollBeginDrag={() => setOnScrollDrag('onScrollBeginDrag')}
+        onScrollEndDrag={() => setOnScrollDrag('onScrollEndDrag')}
+        onScrollToTop={() => setOnScrollDrag('onScrollToTop')}
+        overScrollMode={overScrollMode}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      {Platform.OS === 'android' ? (
+        <>
+          <Text style={styles.rowTitle}>Over Scroll Mode</Text>
+          <View style={styles.row}>
+            {overScrollModeOptions.map(value => (
+              <Button
+                active={value === overScrollMode}
+                label={value}
+                key={value}
+                onPress={() => setOverScrollMode(value)}
+              />
+            ))}
+          </View>
+        </>
+      ) : null}
+    </View>
+  );
+};
+
+const OnMomentumScroll = () => {
+  const [scroll, setScroll] = useState('none');
+  return (
+    <View>
+      <Text>Scroll State: {scroll}</Text>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        onMomentumScrollBegin={() => setScroll('onMomentumScrollBegin')}
+        onMomentumScrollEnd={() => setScroll('onMomentumScrollEnd')}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+    </View>
+  );
+};
+
+const OnContentSizeChange = () => {
+  const [items, setItems] = useState(ITEMS);
+  const [contentSizeChanged, setContentSizeChanged] = useState('original');
+  return (
+    <View>
+      <Text>Content Size Changed: {contentSizeChanged}</Text>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        onContentSizeChange={() =>
+          contentSizeChanged === 'original'
+            ? setContentSizeChanged('changed')
+            : setContentSizeChanged('original')
+        }
+        nestedScrollEnabled>
+        {items.map(createItemRow)}
+      </ScrollView>
+      <Button
+        label="Change Content Size"
+        onPress={() =>
+          items === ITEMS
+            ? setItems(['1', '2', '3', '4', '5'])
+            : setItems(ITEMS)
+        }
+      />
+    </View>
+  );
+};
+
+const MaxMinZoomScale = () => {
+  const [maxZoomScale, setMaxZoomScale] = useState('1.0');
+  const [minZoomScale, setMinZoomScale] = useState('1.0');
+  const [zoomScale, setZoomScale] = useState('1.0');
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        pinchGestureEnabled
+        maximumZoomScale={maxZoomScale !== '' ? parseFloat(maxZoomScale) : 0.0}
+        minimumZoomScale={minZoomScale !== '' ? parseFloat(minZoomScale) : 0.0}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Text style={styles.rowTitle}>Set Maximum Zoom Scale</Text>
+      <TextInput
+        style={styles.textInput}
+        value={maxZoomScale}
+        onChangeText={val => setMaxZoomScale(val)}
+        keyboardType="decimal-pad"
+      />
+      <Text style={styles.rowTitle}>Set Minimum Zoom Scale</Text>
+      <TextInput
+        style={styles.textInput}
+        value={minZoomScale.toString()}
+        onChangeText={val => setMinZoomScale(val)}
+        keyboardType="decimal-pad"
+      />
+      {Platform.OS === 'ios' ? (
+        <>
+          <Text style={styles.rowTitle}>Set Zoom Scale</Text>
+          <TextInput
+            style={styles.textInput}
+            value={zoomScale.toString()}
+            onChangeText={val => setZoomScale(val)}
+            keyboardType="decimal-pad"
+          />
+        </>
+      ) : null}
+    </View>
+  );
+};
+
+const KeyboardExample = () => {
+  const [keyboardDismissMode, setKeyboardDismissMode] = useState('none');
+  const [keyboardShouldPersistTaps, setKeyboardShouldPersistTaps] = useState(
+    'never',
+  );
+  const [textInputValue, setTextInputValue] = useState('Tap to open Keyboard');
+  const dismissOptions =
+    Platform.OS === 'ios'
+      ? ['none', 'on-drag', 'interactive']
+      : ['none', 'on-drag'];
+  const persistOptions = ['never', 'always', 'handled'];
+  return (
+    <View>
+      <TextInput
+        style={styles.textInput}
+        value={textInputValue}
+        onChangeText={val => setTextInputValue(val)}
+      />
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        keyboardDismissMode={keyboardDismissMode}
+        keyboardShouldPersistTaps={keyboardShouldPersistTaps}
+        nestedScrollEnabled>
+        <Button
+          onPress={() => console.log('button pressed!')}
+          label={'Button'}
+        />
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <Text style={styles.rowTitle}>Keyboard Dismiss Mode</Text>
+      <View style={styles.row}>
+        {dismissOptions.map(value => (
+          <Button
+            active={value === keyboardDismissMode}
+            label={value}
+            key={value}
+            onPress={() => setKeyboardDismissMode(value)}
+          />
+        ))}
+      </View>
+      <Text style={styles.rowTitle}>Keyboard Should Persist taps</Text>
+      <View style={styles.row}>
+        {persistOptions.map(value => (
+          <Button
+            active={value === keyboardShouldPersistTaps}
+            label={value}
+            key={value}
+            onPress={() => setKeyboardShouldPersistTaps(value)}
+          />
+        ))}
+      </View>
+    </View>
+  );
+};
+
+const InvertStickyHeaders = () => {
+  const [invertStickyHeaders, setInvertStickyHeaders] = useState(false);
+  const _scrollView = React.useRef<?React.ElementRef<typeof ScrollView>>(null);
+  return (
+    <View>
+      <ScrollView
+        ref={_scrollView}
+        style={[styles.scrollView, {height: 200}]}
+        stickyHeaderIndices={[0]}
+        invertStickyHeaders={invertStickyHeaders}
+        nestedScrollEnabled
+        testID="scroll_sticky_header">
+        {<Text>STICKY HEADER</Text>}
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        <Button
+          onPress={() => setInvertStickyHeaders(!invertStickyHeaders)}
+          label={'invertStickyHeaders: ' + invertStickyHeaders.toString()}
+        />
+        <Button
+          label="Scroll to top"
+          onPress={() => {
+            nullthrows(_scrollView.current).scrollTo({y: 0});
+          }}
+          testID="scroll_to_top_button"
+        />
+        <Button
+          label="Scroll to bottom"
+          onPress={() => {
+            nullthrows(_scrollView.current).scrollToEnd({animated: true});
+          }}
+          testID="scroll_to_bottom_button"
+        />
+      </View>
+    </View>
+  );
+};
+
+const MultipleStickyHeaders = () => {
+  const _scrollView = React.useRef<?React.ElementRef<typeof ScrollView>>(null);
+  const stickyHeaderStyle = {backgroundColor: 'yellow'};
+  return (
+    <View>
+      <ScrollView
+        ref={_scrollView}
+        style={[styles.scrollView, {height: 200}]}
+        stickyHeaderIndices={[0, 13, 26]}
+        nestedScrollEnabled
+        testID="scroll_multiple_sticky_headers">
+        {<Item msg={'Sticky Header 1'} style={stickyHeaderStyle} />}
+        {ITEMS.map(createItemRow)}
+        {<Item msg={'Sticky Header 2'} style={stickyHeaderStyle} />}
+        {ITEMS.map(createItemRow)}
+        {<Item msg={'Sticky Header 3'} style={stickyHeaderStyle} />}
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        <Button
+          label="Scroll to top"
+          onPress={() => {
+            nullthrows(_scrollView.current).scrollTo({y: 0});
+          }}
+          testID="scroll_to_top_button"
+        />
+        <Button
+          label="Scroll to bottom"
+          onPress={() => {
+            nullthrows(_scrollView.current).scrollToEnd({animated: true});
+          }}
+          testID="scroll_to_bottom_button"
+        />
+      </View>
+    </View>
+  );
+};
+
+const IndicatorStyle = () => {
+  const [indicatorStyle, setIndicatorStyle] = useState('default');
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        indicatorStyle={indicatorStyle}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        <Button
+          onPress={() =>
+            indicatorStyle === 'default'
+              ? setIndicatorStyle('white')
+              : setIndicatorStyle('default')
+          }
+          label={'Indicator Style: ' + indicatorStyle}
+        />
+      </View>
+    </View>
+  );
+};
+
+const DisableEnable = () => {
+  const [directionalLockEnabled, setDirectionalLockEnabled] = useState(false);
+  const [disableIntervalMomentum, setDisableIntervalMomentum] = useState(false);
+  const [
+    disableScrollViewPanResponder,
+    setDisableScrollViewPanResponder,
+  ] = useState(false);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        contentInset={{top: 10, bottom: 10, left: 10, right: 10}}
+        snapToInterval={0}
+        directionalLockEnabled={directionalLockEnabled}
+        disableIntervalMomentum={disableIntervalMomentum}
+        disableScrollViewPanResponder={disableScrollViewPanResponder}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        {Platform.OS === 'ios' ? (
+          <Button
+            onPress={() => setDirectionalLockEnabled(!directionalLockEnabled)}
+            label={
+              'directionalLockEnabled: ' + directionalLockEnabled.toString()
+            }
+          />
+        ) : null}
+        <Button
+          onPress={() => setDisableIntervalMomentum(!disableIntervalMomentum)}
+          label={
+            'setDisableIntervalMomentum: ' + disableIntervalMomentum.toString()
+          }
+        />
+        <Button
+          onPress={() =>
+            setDisableScrollViewPanResponder(!disableScrollViewPanResponder)
+          }
+          label={
+            'setDisableScrollViewPanResponder: ' +
+            disableScrollViewPanResponder.toString()
+          }
+        />
+      </View>
+    </View>
+  );
+};
+
+const DecelerationRateExample = () => {
+  const [decelRate, setDecelRate] = useState('normal');
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        decelerationRate={decelRate}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        <Button
+          onPress={() =>
+            decelRate === 'normal'
+              ? setDecelRate('fast')
+              : setDecelRate('normal')
+          }
+          label={'Deceleration Rate: ' + decelRate}
+        />
+      </View>
+    </View>
+  );
+};
+
+const ContentExample = () => {
+  const [canCancelContentTouches, setCanCancelContentTouches] = useState(false);
+  const [contentInset, setContentInset] = useState(null);
+  const [contentContainerStyle, setContentContainerStyle] = useState(null);
+  const [
+    contentInsetAdjustmentBehavior,
+    setContentInsetAdjustmentBehavior,
+  ] = useState('never');
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        canCancelContentTouches={canCancelContentTouches}
+        contentOffset={{x: 100, y: 0}}
+        contentContainerStyle={contentContainerStyle}
+        contentInset={contentInset}
+        contentInsetAdjustmentBehavior={contentInsetAdjustmentBehavior}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        {Platform.OS === 'ios' ? (
+          <>
+            <Button
+              onPress={() =>
+                setCanCancelContentTouches(!canCancelContentTouches)
+              }
+              label={
+                'canCancelContentTouches: ' + canCancelContentTouches.toString()
+              }
+            />
+            <Button
+              onPress={() =>
+                contentInsetAdjustmentBehavior === 'never'
+                  ? setContentInsetAdjustmentBehavior('always')
+                  : setContentInsetAdjustmentBehavior('never')
+              }
+              label={
+                contentInsetAdjustmentBehavior === 'never'
+                  ? "setContentInsetAdjustmentBehavior to 'always'"
+                  : 'reset content inset adjustment behavior'
+              }
+            />
+          </>
+        ) : null}
+        <Button
+          onPress={() =>
+            contentContainerStyle === null
+              ? setContentContainerStyle(styles.containerStyle)
+              : setContentContainerStyle(null)
+          }
+          label={
+            contentContainerStyle === null
+              ? 'setContentContainerStyle'
+              : 'reset content container style'
+          }
+        />
+        <Button
+          onPress={() =>
+            contentInset === null
+              ? setContentInset({top: 10, bottom: 10, left: 10, right: 10})
+              : setContentInset(null)
+          }
+          label={
+            contentInset === null ? 'setContentInset' : 'reset content inset'
+          }
+        />
+      </View>
+    </View>
+  );
+};
+
+const BouncesExample = () => {
+  const [bounces, setBounces] = useState(false);
+  const [bouncesZoom, setBouncesZoom] = useState(false);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        bounces={bounces}
+        bouncesZoom={bouncesZoom}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        <Button
+          onPress={() => setBounces(!bounces)}
+          label={'Bounces: ' + bounces.toString()}
+        />
+        <Button
+          onPress={() => setBouncesZoom(!bouncesZoom)}
+          label={'Bounces Zoom: ' + bouncesZoom.toString()}
+        />
+      </View>
+    </View>
+  );
+};
+
+const BouncesExampleHorizontal = () => {
+  const [bounce, setBounce] = useState(false);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        horizontal={true}
+        alwaysBounceHorizontal={bounce}
+        contentOffset={{x: 100, y: 0}}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        <Button
+          onPress={() => setBounce(!bounce)}
+          label={'Always Bounce Horizontal: ' + bounce.toString()}
+        />
+      </View>
+    </View>
+  );
+};
+
+const BouncesExampleVertical = () => {
+  const [bounce, setBounce] = useState(false);
+  return (
+    <View>
+      <ScrollView
+        style={[styles.scrollView, {height: 200}]}
+        alwaysBounceVertical={bounce}
+        contentOffset={{x: 100, y: 0}}
+        nestedScrollEnabled>
+        {ITEMS.map(createItemRow)}
+      </ScrollView>
+      <View>
+        <Button
+          onPress={() => setBounce(!bounce)}
+          label={'Always Bounce Vertical: ' + bounce.toString()}
+        />
+      </View>
+    </View>
+  );
+};
+
 class Item extends React.PureComponent<{|
   msg?: string,
   style?: ViewStyleProp,
@@ -340,9 +1266,20 @@ let ITEMS = [...Array(12)].map((_, i) => `Item ${i}`);
 
 const createItemRow = (msg, index) => <Item key={index} msg={msg} />;
 
-const Button = ({label, onPress}) => (
-  <TouchableOpacity style={styles.button} onPress={onPress}>
-    <Text>{label}</Text>
+const Button = (props: {
+  active?: boolean,
+  label: string,
+  onPress: () => void,
+  testID?: string,
+}) => (
+  <TouchableOpacity
+    style={StyleSheet.compose(
+      styles.button,
+      props.active === true ? styles.activeButton : null,
+    )}
+    onPress={props.onPress}
+    testID={props.testID}>
+    <Text>{props.label}</Text>
   </TouchableOpacity>
 );
 
@@ -359,6 +1296,9 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
     margin: 5,
   },
+  activeButton: {
+    backgroundColor: 'rgba(100,215,255,.3)',
+  },
   button: {
     margin: 5,
     padding: 5,
@@ -377,4 +1317,17 @@ const styles = StyleSheet.create({
     borderRadius: 3,
     minWidth: 96,
   },
+  containerStyle: {
+    backgroundColor: '#aae3b6',
+  },
+  rowTitle: {
+    flex: 1,
+    fontWeight: 'bold',
+    alignSelf: 'center',
+  },
+  textInput: {
+    height: 40,
+    borderColor: 'gray',
+    borderWidth: 1,
+  },
 });
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.ios.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.ios.js
new file mode 100644
index 00000000000000..0ef49b259bccaf
--- /dev/null
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.ios.js
@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+import * as React from 'react';
+
+import {
+  Button,
+  Modal,
+  ScrollView,
+  StyleSheet,
+  Switch,
+  Text,
+  View,
+  useWindowDimensions,
+} from 'react-native';
+
+export function ScrollViewIndicatorInsetsExample() {
+  const [automaticallyAdjustsScrollIndicatorInsets, setAutomaticallyAdjustsScrollIndicatorInsets] = React.useState(true);
+  const [modalVisible, setModalVisible] = React.useState(false);
+  const { height, width } = useWindowDimensions();
+
+    return (
+      <View>
+        <Modal
+          animationType="slide"
+          visible={modalVisible}
+          onRequestClose={() => setModalVisible(false)}
+          presentationStyle="fullScreen"
+          statusBarTranslucent={false}
+          supportedOrientations={['portrait', 'landscape']}>
+          <View style={styles.modal}>
+            <ScrollView
+              contentContainerStyle={[
+                styles.scrollViewContent,
+                {
+                  height: (height * 1.2),
+                  width: (width * 1.2),
+                },
+              ]}
+              automaticallyAdjustsScrollIndicatorInsets={automaticallyAdjustsScrollIndicatorInsets}
+              style={styles.scrollView}>
+              <View style={styles.description}>
+                <Text>When <Text style={styles.code}>automaticallyAdjustsScrollIndicatorInsets</Text> is true, the scrollbar is inset to the status bar. When false, it reaches the edge of the modal.</Text>
+                <Text>Check out the UIScrollView docs to learn more about <Text style={styles.code}>automaticallyAdjustsScrollIndicatorInsets</Text></Text>
+              </View>
+              <View style={styles.toggle}>
+              <Text><Text style={styles.code}>automaticallyAdjustsScrollIndicatorInsets</Text> is {automaticallyAdjustsScrollIndicatorInsets + ''}</Text>
+              <Switch
+                onValueChange={v => setAutomaticallyAdjustsScrollIndicatorInsets(v)}
+                value={automaticallyAdjustsScrollIndicatorInsets}
+                style={styles.switch}/>
+                </View>
+              <Button
+                onPress={() => setModalVisible(false)}
+                title="Close"/>
+            </ScrollView>
+          </View>
+        </Modal>
+        <Text />
+        <Button
+          onPress={() => setModalVisible(true)}
+          title="Present Fullscreen Modal with ScrollView"/>
+      </View>
+    );
+  }
+
+const styles = StyleSheet.create({
+  modal: {
+    flex: 1,
+  },
+  scrollView: {
+    flex: 1,
+    height: 1000,
+  },
+  scrollViewContent: {
+    alignItems: 'center',
+    backgroundColor: '#ffaaaa',
+    justifyContent: 'flex-start',
+    paddingTop: 200,
+  },
+  switch: {
+    marginBottom: 40,
+  },
+  toggle:{
+    margin: 20,
+    alignItems: 'center',
+  },
+  description: {
+    marginHorizontal: 80,
+  },
+  code: {
+    fontSize: 10,
+    fontFamily: 'Courier',
+  },
+});
+
+exports.title = 'ScrollViewIndicatorInsets';
+exports.category = 'iOS';
+exports.description =
+  'ScrollView automaticallyAdjustsScrollIndicatorInsets adjusts scroll indicator insets using OS-defined logic on iOS 13+.';
+exports.examples = [
+  {
+    title: '<ScrollView> automaticallyAdjustsScrollIndicatorInsets Example',
+    render: (): React.Node => <ScrollViewIndicatorInsetsExample/>,
+  },
+];
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.macos.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.macos.js
new file mode 100644
index 00000000000000..0ef49b259bccaf
--- /dev/null
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewIndicatorInsetsExample.macos.js
@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+import * as React from 'react';
+
+import {
+  Button,
+  Modal,
+  ScrollView,
+  StyleSheet,
+  Switch,
+  Text,
+  View,
+  useWindowDimensions,
+} from 'react-native';
+
+export function ScrollViewIndicatorInsetsExample() {
+  const [automaticallyAdjustsScrollIndicatorInsets, setAutomaticallyAdjustsScrollIndicatorInsets] = React.useState(true);
+  const [modalVisible, setModalVisible] = React.useState(false);
+  const { height, width } = useWindowDimensions();
+
+    return (
+      <View>
+        <Modal
+          animationType="slide"
+          visible={modalVisible}
+          onRequestClose={() => setModalVisible(false)}
+          presentationStyle="fullScreen"
+          statusBarTranslucent={false}
+          supportedOrientations={['portrait', 'landscape']}>
+          <View style={styles.modal}>
+            <ScrollView
+              contentContainerStyle={[
+                styles.scrollViewContent,
+                {
+                  height: (height * 1.2),
+                  width: (width * 1.2),
+                },
+              ]}
+              automaticallyAdjustsScrollIndicatorInsets={automaticallyAdjustsScrollIndicatorInsets}
+              style={styles.scrollView}>
+              <View style={styles.description}>
+                <Text>When <Text style={styles.code}>automaticallyAdjustsScrollIndicatorInsets</Text> is true, the scrollbar is inset to the status bar. When false, it reaches the edge of the modal.</Text>
+                <Text>Check out the UIScrollView docs to learn more about <Text style={styles.code}>automaticallyAdjustsScrollIndicatorInsets</Text></Text>
+              </View>
+              <View style={styles.toggle}>
+              <Text><Text style={styles.code}>automaticallyAdjustsScrollIndicatorInsets</Text> is {automaticallyAdjustsScrollIndicatorInsets + ''}</Text>
+              <Switch
+                onValueChange={v => setAutomaticallyAdjustsScrollIndicatorInsets(v)}
+                value={automaticallyAdjustsScrollIndicatorInsets}
+                style={styles.switch}/>
+                </View>
+              <Button
+                onPress={() => setModalVisible(false)}
+                title="Close"/>
+            </ScrollView>
+          </View>
+        </Modal>
+        <Text />
+        <Button
+          onPress={() => setModalVisible(true)}
+          title="Present Fullscreen Modal with ScrollView"/>
+      </View>
+    );
+  }
+
+const styles = StyleSheet.create({
+  modal: {
+    flex: 1,
+  },
+  scrollView: {
+    flex: 1,
+    height: 1000,
+  },
+  scrollViewContent: {
+    alignItems: 'center',
+    backgroundColor: '#ffaaaa',
+    justifyContent: 'flex-start',
+    paddingTop: 200,
+  },
+  switch: {
+    marginBottom: 40,
+  },
+  toggle:{
+    margin: 20,
+    alignItems: 'center',
+  },
+  description: {
+    marginHorizontal: 80,
+  },
+  code: {
+    fontSize: 10,
+    fontFamily: 'Courier',
+  },
+});
+
+exports.title = 'ScrollViewIndicatorInsets';
+exports.category = 'iOS';
+exports.description =
+  'ScrollView automaticallyAdjustsScrollIndicatorInsets adjusts scroll indicator insets using OS-defined logic on iOS 13+.';
+exports.examples = [
+  {
+    title: '<ScrollView> automaticallyAdjustsScrollIndicatorInsets Example',
+    render: (): React.Node => <ScrollViewIndicatorInsetsExample/>,
+  },
+];
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js
new file mode 100644
index 00000000000000..98b706007a2c40
--- /dev/null
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewPressableStickyHeaderExample.js
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import {
+  StyleSheet,
+  View,
+  Text,
+  Pressable,
+  ScrollView,
+  Button,
+} from 'react-native';
+import * as React from 'react';
+
+function StickyHeader() {
+  const [backgroundColor, setBackgroundColor] = React.useState('blue');
+  return (
+    <View
+      key={0}
+      style={{
+        backgroundColor: backgroundColor,
+        margin: 10,
+        width: 500,
+        height: 100,
+      }}>
+      <Pressable
+        style={{flex: 1}}
+        onPress={() => {
+          setBackgroundColor(backgroundColor === 'blue' ? 'yellow' : 'blue');
+        }}
+        testID="pressable_header">
+        <Text>Press to change color</Text>
+      </Pressable>
+    </View>
+  );
+}
+
+function renderComponent1(i) {
+  return (
+    <View
+      key={i}
+      style={{backgroundColor: 'red', margin: 10, width: 500, height: 100}}
+    />
+  );
+}
+
+export default function ScrollViewPressableStickyHeaderExample(): React.Node {
+  const scrollRef = React.useRef(null);
+  const components = [];
+  for (var i = 1; i < 10; i++) {
+    components.push(renderComponent1(i));
+  }
+  return (
+    <View style={styles.container}>
+      <ScrollView
+        nestedScrollEnabled={true}
+        ref={scrollRef}
+        style={{flex: 1}}
+        stickyHeaderIndices={[0]}
+        showsVerticalScrollIndicator={false}
+        testID="scroll_pressable_sticky_header">
+        <StickyHeader />
+        {components}
+      </ScrollView>
+      <View>
+        <Button
+          title="scroll to top"
+          onPress={() => {
+            scrollRef.current?.scrollTo({y: 0});
+          }}
+          testID="scroll_to_top_button"
+        />
+        <Button
+          title="scroll to bottom"
+          onPress={() => {
+            scrollRef.current?.scrollToEnd();
+          }}
+          testID="scroll_to_bottom_button"
+        />
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    padding: 10,
+    paddingTop: 30,
+    flex: 1,
+  },
+});
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-contentInset.js b/packages/rn-tester/js/examples/SectionList/SectionList-contentInset.js
new file mode 100644
index 00000000000000..daf6dfa9fcfaf7
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-contentInset.js
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+import SectionListBaseExample from './SectionListBaseExample';
+import * as React from 'react';
+import {View, Text, StyleSheet} from 'react-native';
+
+export function SectionList_contentInset(): React.Node {
+  const [initialContentInset, toggledContentInset] = [44, 88];
+
+  const [output, setOutput] = React.useState(
+    `contentInset top: ${initialContentInset.toString()}`,
+  );
+  const [exampleProps, setExampleProps] = React.useState({
+    automaticallyAdjustContentInsets: false,
+    contentInset: {top: initialContentInset},
+    contentOffset: {y: -initialContentInset, x: 0},
+  });
+
+  const onTest = () => {
+    const newContentInset =
+      exampleProps.contentInset.top === initialContentInset
+        ? toggledContentInset
+        : initialContentInset;
+    setExampleProps({
+      automaticallyAdjustContentInsets: false,
+      contentInset: {top: newContentInset},
+      contentOffset: {y: -newContentInset, x: 0},
+    });
+    setOutput(`contentInset top: ${newContentInset.toString()}`);
+  };
+
+  return (
+    <>
+      <View
+        style={[
+          styles.titleContainer,
+          {height: exampleProps.contentInset.top},
+        ]}>
+        <Text style={styles.titleText}>Menu</Text>
+      </View>
+      <SectionListBaseExample
+        exampleProps={exampleProps}
+        testOutput={output}
+        onTest={onTest}
+        testLabel={'Toggle header size'}
+      />
+    </>
+  );
+}
+const styles = StyleSheet.create({
+  titleContainer: {
+    position: 'absolute',
+    top: 40,
+    left: 0,
+    right: 0,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+    backgroundColor: 'gray',
+    zIndex: 1,
+  },
+  titleText: {
+    fontSize: 24,
+    lineHeight: 44,
+    fontWeight: 'bold',
+  },
+});
+
+export default {
+  title: 'SectionList Content Inset',
+  platform: 'ios',
+  name: 'SectionList-contentInset',
+  render: function(): React.Element<typeof SectionList_contentInset> {
+    return <SectionList_contentInset />;
+  },
+};
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-inverted.js b/packages/rn-tester/js/examples/SectionList/SectionList-inverted.js
new file mode 100644
index 00000000000000..926faf026a893e
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-inverted.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+import SectionListBaseExample from './SectionListBaseExample';
+import * as React from 'react';
+
+export function SectionList_inverted(): React.Node {
+  const [output, setOutput] = React.useState('inverted false');
+  const [exampleProps, setExampleProps] = React.useState({
+    inverted: false,
+  });
+
+  const onTest = () => {
+    setExampleProps({
+      inverted: !exampleProps.inverted,
+    });
+    setOutput(`Is inverted: ${(!exampleProps.inverted).toString()}`);
+  };
+
+  return (
+    <SectionListBaseExample
+      exampleProps={exampleProps}
+      testOutput={output}
+      onTest={onTest}
+      testLabel={exampleProps.inverted ? 'Toggle false' : 'Toggle true'}
+    />
+  );
+}
+
+export default {
+  title: 'SectionList Inverted',
+  name: 'SectionList-inverted',
+  render: function(): React.Element<typeof SectionList_inverted> {
+    return <SectionList_inverted />;
+  },
+};
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js b/packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js
new file mode 100644
index 00000000000000..c9fe34254b68b3
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-onEndReached.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+import SectionListBaseExample from './SectionListBaseExample';
+import * as React from 'react';
+
+export function SectionList_onEndReached(): React.Node {
+  const [output, setOutput] = React.useState('');
+  const exampleProps = {
+    onEndReached: info => setOutput('onEndReached'),
+    onEndReachedThreshold: 0,
+  };
+  const ref = React.useRef(null);
+
+  const onTest = () => {
+    const scrollResponder = ref?.current?.getScrollResponder();
+    if (scrollResponder != null) {
+      scrollResponder.scrollToEnd();
+    }
+  };
+
+  return (
+    <SectionListBaseExample
+      ref={ref}
+      exampleProps={exampleProps}
+      testOutput={output}
+      onTest={onTest}
+    />
+  );
+}
+
+export default {
+  title: 'SectionList onEndReached',
+  name: 'SectionList-onEndReached',
+  description: 'Test onEndReached behavior',
+  render: function(): React.Element<typeof SectionList_onEndReached> {
+    return <SectionList_onEndReached />;
+  },
+};
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-onViewableItemsChanged.js b/packages/rn-tester/js/examples/SectionList/SectionList-onViewableItemsChanged.js
new file mode 100644
index 00000000000000..92a5f35e3c0bad
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-onViewableItemsChanged.js
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+import SectionListBaseExample from './SectionListBaseExample';
+import {View, StyleSheet, SectionList} from 'react-native';
+import * as React from 'react';
+
+const VIEWABILITY_CONFIG = {
+  minimumViewTime: 1000,
+  viewAreaCoveragePercentThreshold: 100,
+  waitForInteraction: true,
+};
+
+type SectionListProps = React.ElementProps<typeof SectionList>;
+type ViewabilityConfig = $PropertyType<SectionListProps, 'viewabilityConfig'>;
+
+export function SectionList_onViewableItemsChanged(props: {
+  viewabilityConfig: ViewabilityConfig,
+  offScreen?: ?boolean,
+  horizontal?: ?boolean,
+  useScrollRefScroll?: ?boolean,
+}): React.Node {
+  const {viewabilityConfig, offScreen, horizontal, useScrollRefScroll} = props;
+  const [output, setOutput] = React.useState('');
+  const exampleProps = {
+    onViewableItemsChanged: info =>
+      setOutput(
+        info.viewableItems
+          .filter(viewToken => viewToken.index != null && viewToken.isViewable)
+          .map(viewToken => viewToken.item)
+          .join(', '),
+      ),
+    viewabilityConfig,
+    horizontal,
+  };
+  const ref = React.useRef(null);
+  const onTest =
+    useScrollRefScroll === true
+      ? () => {
+          ref?.current?.getScrollResponder()?.scrollToEnd();
+        }
+      : null;
+
+  return (
+    <SectionListBaseExample
+      ref={ref}
+      exampleProps={exampleProps}
+      onTest={onTest}
+      testOutput={output}>
+      {offScreen === true ? <View style={styles.offScreen} /> : null}
+    </SectionListBaseExample>
+  );
+}
+const styles = StyleSheet.create({
+  offScreen: {
+    height: 1000,
+  },
+});
+
+export default {
+  title: 'SectionList On Viewable Items Changed',
+  name: 'SectionList_onViewableItemsChanged',
+  render: function(): React.Element<typeof SectionList_onViewableItemsChanged> {
+    return (
+      <SectionList_onViewableItemsChanged
+        viewabilityConfig={VIEWABILITY_CONFIG}
+      />
+    );
+  },
+};
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js b/packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js
new file mode 100644
index 00000000000000..0ad4060dd6c25a
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-scrollable.js
@@ -0,0 +1,350 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+const RNTesterPage = require('../../components/RNTesterPage');
+const React = require('react');
+
+const infoLog = require('react-native/Libraries/Utilities/infoLog');
+
+const {
+  HeaderComponent,
+  FooterComponent,
+  ItemComponent,
+  PlainInput,
+  SeparatorComponent,
+  Spindicator,
+  genItemData,
+  pressItem,
+  renderSmallSwitchOption,
+  renderStackedItem,
+} = require('../../components/ListExampleShared');
+const {
+  Alert,
+  Animated,
+  Button,
+  StyleSheet,
+  Text,
+  View,
+  SectionList,
+} = require('react-native');
+
+const VIEWABILITY_CONFIG = {
+  minimumViewTime: 3000,
+  viewAreaCoveragePercentThreshold: 100,
+  waitForInteraction: true,
+};
+
+const CONSTANT_SECTION_EXAMPLES = [
+  {
+    key: 'empty section',
+    data: [],
+  },
+  {
+    renderItem: renderStackedItem,
+    key: 's1',
+    data: [
+      {
+        title: 'Item In Header Section',
+        text: 'Section s1',
+        key: 'header item',
+      },
+    ],
+  },
+  {
+    key: 's2',
+    data: [
+      {
+        noImage: true,
+        title: '1st item',
+        text: 'Section s2',
+        key: 'noimage0',
+      },
+      {
+        noImage: true,
+        title: '2nd item',
+        text: 'Section s2',
+        key: 'noimage1',
+      },
+    ],
+  },
+];
+
+const renderSectionHeader = ({section}) => (
+  <View style={styles.header}>
+    <Text style={styles.headerText}>SECTION HEADER: {section.key}</Text>
+    <SeparatorComponent />
+  </View>
+);
+
+const renderSectionFooter = ({section}) => (
+  <View style={styles.header}>
+    <Text style={styles.headerText}>SECTION FOOTER: {section.key}</Text>
+    <SeparatorComponent />
+  </View>
+);
+
+const CustomSeparatorComponent = ({highlighted, text}) => (
+  <View
+    style={[
+      styles.customSeparator,
+      highlighted && {backgroundColor: 'rgb(217, 217, 217)'},
+    ]}>
+    <Text style={styles.separatorText}>{text}</Text>
+  </View>
+);
+
+const EmptySectionList = () => (
+  <View style={{alignItems: 'center'}}>
+    <Text style={{fontSize: 20}}>This is rendered when the list is empty</Text>
+  </View>
+);
+
+const renderItemComponent = setItemState => ({item, separators}) => {
+  if (isNaN(item.key)) {
+    return;
+  }
+  const onPress = () => {
+    const updatedItem = pressItem(item);
+    setItemState(updatedItem);
+  };
+
+  return (
+    <ItemComponent
+      item={item}
+      onPress={onPress}
+      onHideUnderlay={separators.unhighlight}
+      onShowUnderlay={separators.highlight}
+    />
+  );
+};
+
+const onScrollToIndexFailed = (info: {
+  index: number,
+  c: number,
+  averageItemLength: number,
+}) => {
+  console.warn('onScrollToIndexFailed. See comment in callback', info);
+  /**
+   * scrollToLocation() can only scroll to viewable area.
+   * For any failure cases this callback will get triggered with `info` object
+   *
+   * The idea is to calculate a yPosition from `info` to call scrollResponder.scrollTo on.
+   *
+   * const scrollResponder = ref.current?.getScrollResponder();
+   * const positionY = some value we calculate from `info`;
+   * if (scrollResponder != null) {
+   *    scrollResponder.scrollTo({x, y:positionY, animated: true});
+   * }
+   */
+};
+
+export function SectionList_scrollable(Props: {
+  ...,
+}): React.Element<typeof RNTesterPage> {
+  const scrollPos = new Animated.Value(0);
+  const scrollSinkY = Animated.event(
+    [{nativeEvent: {contentOffset: {y: scrollPos}}}],
+    {useNativeDriver: true},
+  );
+  const [filterText, setFilterText] = React.useState('');
+  const [virtualized, setVirtualized] = React.useState(true);
+  const [logViewable, setLogViewable] = React.useState(false);
+  const [debug, setDebug] = React.useState(false);
+  const [inverted, setInverted] = React.useState(false);
+  const [data, setData] = React.useState(genItemData(1000));
+
+  const filterRegex = new RegExp(String(filterText), 'i');
+  const filter = item =>
+    filterRegex.test(item.text) || filterRegex.test(item.title);
+  const filteredData = data.filter(filter);
+  const filteredSectionData = [...CONSTANT_SECTION_EXAMPLES];
+
+  let startIndex = 0;
+  const endIndex = filteredData.length - 1;
+  for (let ii = 10; ii <= endIndex + 10; ii += 10) {
+    filteredSectionData.push({
+      key: `${filteredData[startIndex].key} - ${
+        filteredData[Math.min(ii - 1, endIndex)].key
+      }`,
+      data: filteredData.slice(startIndex, ii),
+    });
+    startIndex = ii;
+  }
+
+  const setItemPress = item => {
+    if (isNaN(item.key)) {
+      return;
+    }
+    const index = Number(item.key);
+    setData([...data.slice(0, index), item, ...data.slice(index + 1)]);
+  };
+
+  const ref = React.useRef<?React.ElementRef<typeof SectionList>>(null);
+  const scrollToLocation = (sectionIndex, itemIndex) => {
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+    if (ref != null && ref.current?.scrollToLocation != null) {
+      ref.current.scrollToLocation({sectionIndex, itemIndex});
+    }
+  };
+
+  const onViewableItemsChanged = (info: {
+    changed: Array<{
+      key: string,
+      isViewable: boolean,
+      item: {columns: Array<any>, ...},
+      index: ?number,
+      section?: any,
+      ...
+    }>,
+    ...
+  }) => {
+    // Impressions can be logged here
+    if (logViewable) {
+      infoLog(
+        'onViewableItemsChanged: ',
+        info.changed.map((v: Object) => ({
+          ...v,
+          item: '...',
+          section: v.section.key,
+        })),
+      );
+    }
+  };
+
+  return (
+    <RNTesterPage noSpacer={true} noScroll={true}>
+      <View style={styles.searchRow}>
+        <PlainInput
+          onChangeText={text => setFilterText(text)}
+          placeholder="Search..."
+          value={filterText}
+        />
+        <View style={styles.optionSection}>
+          {renderSmallSwitchOption('Virtualized', virtualized, setVirtualized)}
+          {renderSmallSwitchOption('Log Viewable', logViewable, setLogViewable)}
+          {renderSmallSwitchOption('Debug', debug, setDebug)}
+          {renderSmallSwitchOption('Inverted', inverted, setInverted)}
+          <Spindicator value={scrollPos} />
+        </View>
+        <View style={styles.scrollToColumn}>
+          <Text>scroll to:</Text>
+          <View style={styles.button}>
+            <Button
+              title="Top"
+              onPress={() => scrollToLocation(Math.max(0, 2), 0)}
+            />
+          </View>
+          <View style={styles.button}>
+            <Button
+              title="3rd Section"
+              onPress={() => scrollToLocation(Math.max(0, 3), 0)}
+            />
+          </View>
+          <View style={styles.button}>
+            <Button
+              title="6th Section"
+              onPress={() => scrollToLocation(Math.max(0, 6), 0)}
+            />
+          </View>
+          <View style={styles.button}>
+            <Button
+              title="Out of Viewable Area (See warning) "
+              onPress={() =>
+                scrollToLocation(filteredSectionData.length - 1, 0)
+              }
+            />
+          </View>
+        </View>
+      </View>
+      <SeparatorComponent />
+      <Animated.SectionList
+        ref={ref}
+        ListHeaderComponent={HeaderComponent}
+        ListFooterComponent={FooterComponent}
+        SectionSeparatorComponent={info => (
+          <CustomSeparatorComponent {...info} text="SECTION SEPARATOR" />
+        )}
+        ItemSeparatorComponent={info => (
+          <CustomSeparatorComponent {...info} text="ITEM SEPARATOR" />
+        )}
+        accessibilityRole="list"
+        debug={debug}
+        inverted={inverted}
+        disableVirtualization={!virtualized}
+        onRefresh={() => Alert.alert('onRefresh: nothing to refresh :P')}
+        onScroll={scrollSinkY}
+        onViewableItemsChanged={onViewableItemsChanged}
+        onScrollToIndexFailed={onScrollToIndexFailed}
+        refreshing={false}
+        renderItem={renderItemComponent(setItemPress)}
+        renderSectionHeader={renderSectionHeader}
+        renderSectionFooter={renderSectionFooter}
+        stickySectionHeadersEnabled
+        initialNumToRender={10}
+        ListEmptyComponent={EmptySectionList}
+        onEndReached={() =>
+          Alert.alert(
+            'onEndReached called',
+            'You have reached the end of this list',
+          )
+        }
+        onEndReachedThreshold={0}
+        sections={filteredSectionData}
+        style={styles.list}
+        viewabilityConfig={VIEWABILITY_CONFIG}
+      />
+    </RNTesterPage>
+  );
+}
+
+const styles = StyleSheet.create({
+  button: {
+    marginTop: 5,
+  },
+  customSeparator: {
+    backgroundColor: 'rgb(200, 199, 204)',
+  },
+  header: {
+    backgroundColor: '#e9eaed',
+  },
+  headerText: {
+    padding: 4,
+    fontWeight: '600',
+  },
+  list: {
+    backgroundColor: 'white',
+  },
+  optionSection: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    alignItems: 'center',
+  },
+  searchRow: {
+    paddingHorizontal: 10,
+  },
+  scrollToColumn: {
+    flexDirection: 'column',
+    paddingHorizontal: 8,
+  },
+  separatorText: {
+    color: 'gray',
+    alignSelf: 'center',
+    fontSize: 7,
+  },
+});
+
+export default {
+  title: 'SectionList scrollable',
+  name: 'SectionList-scrollable',
+  render: function(): React.Element<typeof SectionList_scrollable> {
+    return <SectionList_scrollable />;
+  },
+};
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-stickyHeadersEnabled.js b/packages/rn-tester/js/examples/SectionList/SectionList-stickyHeadersEnabled.js
new file mode 100644
index 00000000000000..63353820048c83
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-stickyHeadersEnabled.js
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+import SectionListBaseExample from './SectionListBaseExample';
+import * as React from 'react';
+
+export function SectionList_stickySectionHeadersEnabled(): React.Node {
+  const [output, setOutput] = React.useState(
+    'stickySectionHeadersEnabled false',
+  );
+  const [exampleProps, setExampleProps] = React.useState({
+    stickySectionHeadersEnabled: false,
+  });
+
+  const onTest = () => {
+    setExampleProps({
+      stickySectionHeadersEnabled: !exampleProps.stickySectionHeadersEnabled,
+    });
+    setOutput(
+      `stickySectionHeadersEnabled ${(!exampleProps.stickySectionHeadersEnabled).toString()}`,
+    );
+  };
+
+  return (
+    <SectionListBaseExample
+      exampleProps={exampleProps}
+      testOutput={output}
+      onTest={onTest}
+      testLabel={
+        exampleProps.stickySectionHeadersEnabled ? 'Sticky Off' : 'Sticky On'
+      }
+    />
+  );
+}
+
+export default {
+  title: 'SectionList Sticky Headers Enabled',
+  name: 'SectionList-stickyHeadersEnabled',
+  description: 'Toggle sticky headers on/off',
+  render: function(): React.Element<
+    typeof SectionList_stickySectionHeadersEnabled,
+  > {
+    return <SectionList_stickySectionHeadersEnabled />;
+  },
+};
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js b/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js
new file mode 100644
index 00000000000000..106c172e7609e1
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+import SectionListBaseExample from './SectionListBaseExample';
+import {View, Text, StyleSheet} from 'react-native';
+import * as React from 'react';
+
+const Separator = (defaultColor, highlightColor, isSectionSeparator) => ({
+  leadingItem,
+  trailingItem,
+  highlighted,
+  hasBeenHighlighted,
+}) => {
+  const text = `${
+    isSectionSeparator ? 'Section ' : ''
+  }separator for leading ${leadingItem} and trailing ${trailingItem} has ${
+    !hasBeenHighlighted ? 'not ' : ''
+  }been pressed`;
+
+  return (
+    <View
+      style={[
+        styles.separator,
+        {backgroundColor: highlighted ? highlightColor : defaultColor},
+      ]}>
+      <Text style={styles.separtorText}>{text}</Text>
+    </View>
+  );
+};
+
+export function SectionList_withSeparators(): React.Node {
+  const exampleProps = {
+    ItemSeparatorComponent: Separator('lightgreen', 'green', false),
+    SectionSeparatorComponent: Separator('lightblue', 'blue', true),
+  };
+  const ref = React.useRef(null);
+
+  return <SectionListBaseExample ref={ref} exampleProps={exampleProps} />;
+}
+
+const styles = StyleSheet.create({
+  separator: {
+    height: 12,
+  },
+  separtorText: {
+    fontSize: 10,
+  },
+});
+
+export default {
+  title: 'SectionList With Separators',
+  name: 'SectionList-withSeparators',
+  render: function(): React.Element<typeof SectionList_withSeparators> {
+    return <SectionList_withSeparators />;
+  },
+};
diff --git a/packages/rn-tester/js/examples/SectionList/SectionListBaseExample.js b/packages/rn-tester/js/examples/SectionList/SectionListBaseExample.js
new file mode 100644
index 00000000000000..ce93c31c5bb47d
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionListBaseExample.js
@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import {
+  Pressable,
+  Button,
+  SectionList,
+  StyleSheet,
+  Text,
+  View,
+} from 'react-native';
+
+import * as React from 'react';
+
+const DATA = [
+  {
+    title: 'Main dishes',
+    data: ['Pizza', 'Burger', 'Risotto'],
+  },
+  {
+    title: 'Sides',
+    data: ['French Fries', 'Onion Rings', 'Fried Shrimps'],
+  },
+  {
+    title: 'Drinks',
+    data: ['Water', 'Coke', 'Beer'],
+  },
+  {
+    title: 'Desserts',
+    data: ['Cheesecake', 'Ice Cream'],
+  },
+];
+
+const Item = ({item, section, separators}) => {
+  return (
+    <Pressable
+      onPressIn={() => {
+        separators.highlight();
+      }}
+      onPress={() => {
+        separators.updateProps('trailing', {hasBeenHighlighted: true});
+        separators.updateProps('leading', {hasBeenHighlighted: true});
+      }}
+      onPressOut={() => {
+        separators.unhighlight();
+      }}
+      style={({pressed}) => [
+        styles.item,
+        {
+          backgroundColor: pressed ? 'red' : 'pink',
+        },
+      ]}
+      testID={item}>
+      <Text style={styles.title}>{item}</Text>
+    </Pressable>
+  );
+};
+
+type Props = {
+  exampleProps: $Shape<React.ElementConfig<typeof SectionList>>,
+  onTest?: ?() => void,
+  testLabel?: ?string,
+  testOutput?: ?string,
+  children?: ?React.Node,
+};
+
+const SectionListBaseExample: React.AbstractComponent<
+  Props,
+  React.ElementRef<typeof SectionList>,
+> = React.forwardRef((props: Props, ref): React.Node => {
+  return (
+    <View style={styles.container}>
+      {props.testOutput != null ? (
+        <View testID="test_container" style={styles.testContainer}>
+          <Text style={styles.output} numberOfLines={1} testID="output">
+            {props.testOutput}
+          </Text>
+          {props.onTest != null ? (
+            <Button
+              testID="start_test"
+              onPress={props.onTest}
+              title={props.testLabel ?? 'Test'}
+            />
+          ) : null}
+        </View>
+      ) : null}
+      {props.children}
+      <SectionList
+        ref={ref}
+        testID="section_list"
+        accessibilityRole="list"
+        sections={DATA}
+        keyExtractor={(item, index) => item + index}
+        style={styles.list}
+        renderItem={Item}
+        renderSectionHeader={({section: {title}}) => (
+          <Text style={styles.header}>{title}</Text>
+        )}
+        {...props.exampleProps}
+      />
+    </View>
+  );
+});
+
+const styles = StyleSheet.create({
+  item: {
+    backgroundColor: 'pink',
+    padding: 20,
+    marginVertical: 8,
+  },
+  header: {
+    fontSize: 32,
+    backgroundColor: 'white',
+  },
+  title: {
+    fontSize: 24,
+  },
+  testContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    backgroundColor: '#f2f2f7ff',
+    height: 40,
+  },
+  output: {
+    flex: 1,
+    fontSize: 12,
+  },
+  list: {
+    flex: 1,
+  },
+  container: {flex: 1},
+});
+
+export default SectionListBaseExample;
diff --git a/packages/rn-tester/js/examples/SectionList/SectionListExample.js b/packages/rn-tester/js/examples/SectionList/SectionListExample.js
deleted file mode 100644
index b00cc81c71e1fa..00000000000000
--- a/packages/rn-tester/js/examples/SectionList/SectionListExample.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-const RNTesterPage = require('../../components/RNTesterPage');
-const React = require('react');
-
-const infoLog = require('react-native/Libraries/Utilities/infoLog');
-
-const {
-  HeaderComponent,
-  FooterComponent,
-  ItemComponent,
-  PlainInput,
-  SeparatorComponent,
-  Spindicator,
-  genItemData,
-  pressItem,
-  renderSmallSwitchOption,
-  renderStackedItem,
-} = require('../../components/ListExampleShared');
-const {
-  Alert,
-  Animated,
-  Button,
-  StyleSheet,
-  Text,
-  View,
-} = require('react-native');
-
-import type {Item} from '../../components/ListExampleShared';
-
-const VIEWABILITY_CONFIG = {
-  minimumViewTime: 3000,
-  viewAreaCoveragePercentThreshold: 100,
-  waitForInteraction: true,
-};
-
-const renderSectionHeader = ({section}) => (
-  <View style={styles.header}>
-    <Text style={styles.headerText}>SECTION HEADER: {section.key}</Text>
-    <SeparatorComponent />
-  </View>
-);
-
-const renderSectionFooter = ({section}) => (
-  <View style={styles.header}>
-    <Text style={styles.headerText}>SECTION FOOTER: {section.key}</Text>
-    <SeparatorComponent />
-  </View>
-);
-
-const CustomSeparatorComponent = ({highlighted, text}) => (
-  <View
-    style={[
-      styles.customSeparator,
-      highlighted && {backgroundColor: 'rgb(217, 217, 217)'},
-    ]}>
-    <Text style={styles.separatorText}>{text}</Text>
-  </View>
-);
-
-class SectionListExample extends React.PureComponent<{...}, $FlowFixMeState> {
-  state:
-    | any
-    | {|
-        data: Array<Item>,
-        debug: boolean,
-        filterText: string,
-        inverted: boolean,
-        logViewable: boolean,
-        virtualized: boolean,
-      |} = {
-    data: genItemData(1000),
-    debug: false,
-    filterText: '',
-    logViewable: false,
-    virtualized: true,
-    inverted: false,
-  };
-
-  _scrollPos = new Animated.Value(0);
-  _scrollSinkY = Animated.event(
-    [{nativeEvent: {contentOffset: {y: this._scrollPos}}}],
-    {useNativeDriver: true},
-  );
-
-  _sectionListRef: ?React.ElementRef<typeof Animated.SectionList> = null;
-  _captureRef = ref => {
-    this._sectionListRef = ref;
-  };
-
-  _scrollToLocation(sectionIndex: number, itemIndex: number) {
-    this._sectionListRef &&
-      this._sectionListRef.scrollToLocation({sectionIndex, itemIndex});
-  }
-
-  render(): React.Node {
-    const filterRegex = new RegExp(String(this.state.filterText), 'i');
-    const filter = item =>
-      filterRegex.test(item.text) || filterRegex.test(item.title);
-    const filteredData = this.state.data.filter(filter);
-    const filteredSectionData = [];
-    let startIndex = 0;
-    const endIndex = filteredData.length - 1;
-    for (let ii = 10; ii <= endIndex + 10; ii += 10) {
-      filteredSectionData.push({
-        key: `${filteredData[startIndex].key} - ${
-          filteredData[Math.min(ii - 1, endIndex)].key
-        }`,
-        data: filteredData.slice(startIndex, ii),
-      });
-      startIndex = ii;
-    }
-    return (
-      <RNTesterPage noSpacer={true} noScroll={true}>
-        <View style={styles.searchRow}>
-          <PlainInput
-            onChangeText={filterText => {
-              this.setState(() => ({filterText}));
-            }}
-            placeholder="Search..."
-            value={this.state.filterText}
-          />
-          <View style={styles.optionSection}>
-            {renderSmallSwitchOption(this, 'virtualized')}
-            {renderSmallSwitchOption(this, 'logViewable')}
-            {renderSmallSwitchOption(this, 'debug')}
-            {renderSmallSwitchOption(this, 'inverted')}
-            <Spindicator value={this._scrollPos} />
-          </View>
-          <View style={styles.scrollToRow}>
-            <Text>scroll to:</Text>
-            <Button
-              title="Item A"
-              onPress={() => this._scrollToLocation(2, 1)}
-            />
-            <Button
-              title="Item B"
-              onPress={() => this._scrollToLocation(3, 6)}
-            />
-            <Button
-              title="Item C"
-              onPress={() => this._scrollToLocation(6, 3)}
-            />
-          </View>
-        </View>
-        <SeparatorComponent />
-        <Animated.SectionList
-          ref={this._captureRef}
-          ListHeaderComponent={HeaderComponent}
-          ListFooterComponent={FooterComponent}
-          SectionSeparatorComponent={info => (
-            <CustomSeparatorComponent {...info} text="SECTION SEPARATOR" />
-          )}
-          ItemSeparatorComponent={info => (
-            <CustomSeparatorComponent {...info} text="ITEM SEPARATOR" />
-          )}
-          debug={this.state.debug}
-          inverted={this.state.inverted}
-          disableVirtualization={!this.state.virtualized}
-          onRefresh={() => Alert.alert('onRefresh: nothing to refresh :P')}
-          onScroll={this._scrollSinkY}
-          onViewableItemsChanged={this._onViewableItemsChanged}
-          refreshing={false}
-          renderItem={this._renderItemComponent}
-          renderSectionHeader={renderSectionHeader}
-          renderSectionFooter={renderSectionFooter}
-          stickySectionHeadersEnabled
-          sections={[
-            {
-              key: 'empty section',
-              data: [],
-            },
-            {
-              renderItem: renderStackedItem,
-              key: 's1',
-              data: [
-                {
-                  title: 'Item In Header Section',
-                  text: 'Section s1',
-                  key: 'header item',
-                },
-              ],
-            },
-            {
-              key: 's2',
-              data: [
-                {
-                  noImage: true,
-                  title: '1st item',
-                  text: 'Section s2',
-                  key: 'noimage0',
-                },
-                {
-                  noImage: true,
-                  title: '2nd item',
-                  text: 'Section s2',
-                  key: 'noimage1',
-                },
-              ],
-            },
-            ...filteredSectionData,
-          ]}
-          style={styles.list}
-          viewabilityConfig={VIEWABILITY_CONFIG}
-        />
-      </RNTesterPage>
-    );
-  }
-
-  _renderItemComponent = ({item, separators}) => (
-    <ItemComponent
-      item={item}
-      onPress={this._pressItem}
-      onHideUnderlay={separators.unhighlight}
-      onShowUnderlay={separators.highlight}
-    />
-  );
-
-  // This is called when items change viewability by scrolling into our out of
-  // the viewable area.
-  _onViewableItemsChanged = (info: {
-    changed: Array<{
-      key: string,
-      isViewable: boolean,
-      item: {columns: Array<*>, ...},
-      index: ?number,
-      section?: any,
-      ...
-    }>,
-    ...
-  }) => {
-    // Impressions can be logged here
-    if (this.state.logViewable) {
-      infoLog(
-        'onViewableItemsChanged: ',
-        info.changed.map((v: Object) => ({
-          ...v,
-          item: '...',
-          section: v.section.key,
-        })),
-      );
-    }
-  };
-
-  _pressItem = (key: string) => {
-    !isNaN(key) && pressItem(this, key);
-  };
-}
-
-const styles = StyleSheet.create({
-  customSeparator: {
-    backgroundColor: 'rgb(200, 199, 204)',
-  },
-  header: {
-    backgroundColor: '#e9eaed',
-  },
-  headerText: {
-    padding: 4,
-    fontWeight: '600',
-  },
-  list: {
-    backgroundColor: 'white',
-  },
-  optionSection: {
-    flexDirection: 'row',
-    flexWrap: 'wrap',
-    alignItems: 'center',
-  },
-  searchRow: {
-    paddingHorizontal: 10,
-  },
-  scrollToRow: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    paddingHorizontal: 8,
-  },
-  separatorText: {
-    color: 'gray',
-    alignSelf: 'center',
-    fontSize: 7,
-  },
-});
-
-exports.title = 'SectionList';
-exports.category = 'ListView';
-exports.documentationURL = 'https://reactnative.dev/docs/sectionlist';
-exports.description = 'Performant, scrollable list of data.';
-exports.examples = [
-  {
-    title: 'Simple scrollable list',
-    render: function(): React.Element<typeof SectionListExample> {
-      return <SectionListExample />;
-    },
-  },
-];
diff --git a/packages/rn-tester/js/examples/SectionList/SectionListIndex.js b/packages/rn-tester/js/examples/SectionList/SectionListIndex.js
new file mode 100644
index 00000000000000..b5a4231bd34922
--- /dev/null
+++ b/packages/rn-tester/js/examples/SectionList/SectionListIndex.js
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow
+ */
+
+'use strict';
+
+import Scrollable from './SectionList-scrollable';
+import ContentInset from './SectionList-contentInset';
+import onEndReached from './SectionList-onEndReached';
+import onViewableItemsChanged from './SectionList-onViewableItemsChanged';
+import withSeparators from './SectionList-withSeparators';
+import stickyHeadersEnabled from './SectionList-stickyHeadersEnabled';
+import inverted from './SectionList-inverted';
+
+exports.title = 'SectionList';
+exports.category = 'ListView';
+exports.documentationURL = 'https://reactnative.dev/docs/sectionlist';
+exports.description = 'Performant, scrollable list of data.';
+exports.showIndividualExamples = true;
+exports.examples = [
+  ContentInset,
+  onEndReached,
+  onViewableItemsChanged,
+  withSeparators,
+  stickyHeadersEnabled,
+  inverted,
+  Scrollable,
+];
diff --git a/packages/rn-tester/js/examples/Share/ShareExample.js b/packages/rn-tester/js/examples/Share/ShareExample.js
index 3ec9a7d6f5c89f..1bcd7cfd174da7 100644
--- a/packages/rn-tester/js/examples/Share/ShareExample.js
+++ b/packages/rn-tester/js/examples/Share/ShareExample.js
@@ -76,6 +76,46 @@ const ShareMessageWithTitle = () => {
   );
 };
 
+const SharedAction = () => {
+  const [shared, setShared] = React.useState();
+
+  const sharedAction = async () => {
+    try {
+      const result = await Share.share(
+        {
+          title: 'Create native apps',
+          message: ('React Native combines the best parts of native development with React, a best-in-class JavaScript library for building user interfaces.': string),
+          url: 'https://reactnative.dev/',
+        },
+        {
+          subject: 'MUST READ: Create native apps with React Native',
+          dialogTitle: 'Share React Native Home Page',
+          tintColor: 'blue',
+        },
+      );
+      if (result.action === Share.sharedAction) {
+        setShared(result.action);
+      } else if (result.action === Share.dismissedAction) {
+        //iOS only, if dialog was dismissed
+        setShared(null);
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  };
+  return (
+    <View style={styles.container}>
+      <Text>action: {shared ? shared : 'null'}</Text>
+      <Text style={styles.title}>Create native apps</Text>
+      <Text>
+        React Native combines the best parts of native development with React, a
+        best-in-class JavaScript library for building user interfaces.
+      </Text>
+      <Button title="SHARE" onPress={sharedAction} />
+    </View>
+  );
+};
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -104,4 +144,10 @@ exports.examples = [
       return <ShareMessageWithTitle />;
     },
   },
+  {
+    title: 'sharedAction: If the content was successfully shared',
+    render(): React.Node {
+      return <SharedAction />;
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js b/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js
index 89296d7d3d767f..48f77b2f99dec5 100644
--- a/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js
+++ b/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js
@@ -22,7 +22,7 @@ import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTyp
 // Verify that RCTSnapshot is part of the UIManager since it is only loaded
 // if you have linked against RCTTest like in tests, otherwise we will have
 // a warning printed out
-const RCTSnapshot = UIManager.getViewManagerConfig('RCTSnapshot')
+const RCTSnapshot = UIManager.hasViewManagerConfig('RCTSnapshot')
   ? require('../../../RCTTest/RCTSnapshotNativeComponent')
   : View;
 
@@ -47,7 +47,7 @@ class SnapshotViewIOS extends React.Component<Props> {
     const testIdentifier = this.props.testIdentifier || 'test';
     const onSnapshotReady = this.props.onSnapshotReady || this.onDefaultAction;
     return (
-      // $FlowFixMe - Typing ReactNativeComponent revealed errors
+      // $FlowFixMe[prop-missing] - Typing ReactNativeComponent revealed errors
       <RCTSnapshot
         style={style.snapshot}
         {...this.props}
diff --git a/packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js b/packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js
new file mode 100644
index 00000000000000..747ccb01e7aa86
--- /dev/null
+++ b/packages/rn-tester/js/examples/SwipeableCardExample/SwipeableCardExample.js
@@ -0,0 +1,207 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import * as React from 'react';
+import {
+  Animated,
+  PanResponder,
+  View,
+  StyleSheet,
+  FlatList,
+  Text,
+  useWindowDimensions,
+} from 'react-native';
+
+module.exports = {
+  displayName: 'SwipeableCardExample',
+  framework: 'React',
+  title: 'SwipeableCard',
+  category: 'Basic',
+  description:
+    'Example of a swipeable card with scrollable content to test PanResponder and JSResponderHandler interaction.',
+  examples: [
+    {
+      title: 'SwipeableCardExample',
+      description: ('This example creates a swipeable card using PanResponder. ' +
+        'Under the hood, JSResponderHandler should prevent scroll when the card is being swiped.': string),
+      render: function(): React.Node {
+        return <SwipeableCardExample />;
+      },
+    },
+  ],
+};
+
+function SwipeableCardExample() {
+  const cardColors = ['red', 'blue', 'pink', 'aquamarine'];
+  const [currentIndex, setCurrentIndex] = React.useState(0);
+
+  const nextIndex = currentIndex + 1;
+
+  const isFirstCardOnTop = currentIndex % 2 !== 0;
+
+  const incrementCurrent = () => setCurrentIndex(currentIndex + 1);
+
+  const getCardColor = index => cardColors[index % cardColors.length];
+
+  /*
+   * The cards try to reuse the views. Instead of always rebuilding the current card on top
+   * the order is configured by zIndex. This way, the native side reuses the same views for bottom
+   * and top after swiping out.
+   */
+  return (
+    <>
+      <SwipeableCard
+        zIndex={isFirstCardOnTop ? 2 : 1}
+        color={
+          isFirstCardOnTop
+            ? getCardColor(currentIndex)
+            : getCardColor(nextIndex)
+        }
+        onSwipedOut={incrementCurrent}
+      />
+      <SwipeableCard
+        zIndex={isFirstCardOnTop ? 1 : 2}
+        color={
+          isFirstCardOnTop
+            ? getCardColor(nextIndex)
+            : getCardColor(currentIndex)
+        }
+        onSwipedOut={incrementCurrent}
+      />
+    </>
+  );
+}
+
+function SwipeableCard(props: {
+  zIndex: number,
+  color: string,
+  onSwipedOut: () => void,
+}) {
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const movementX = React.useMemo(() => new Animated.Value(0), [props.color]);
+
+  const panResponder = React.useMemo(
+    () =>
+      PanResponder.create({
+        onMoveShouldSetPanResponderCapture: (e, gestureState) => {
+          const {dx} = gestureState;
+          return Math.abs(dx) > 5;
+        },
+        onPanResponderMove: Animated.event([null, {dx: movementX}], {
+          useNativeDriver: false,
+        }),
+        onPanResponderEnd: (e, gestureState) => {
+          const {dx} = gestureState;
+          if (Math.abs(dx) > 120) {
+            Animated.timing(movementX, {
+              toValue: dx > 0 ? 1000 : -1000,
+              useNativeDriver: true,
+            }).start(props.onSwipedOut);
+          } else {
+            Animated.timing(movementX, {
+              toValue: 0,
+              useNativeDriver: true,
+            }).start();
+          }
+        },
+      }),
+    [movementX, props.onSwipedOut],
+  );
+
+  const {width} = useWindowDimensions();
+  const rotation = movementX.interpolate({
+    inputRange: [-width / 2, 0, width / 2],
+    outputRange: (['-5deg', '0deg', '5deg']: $ReadOnlyArray<string>),
+    extrapolate: 'clamp',
+  });
+
+  return (
+    <View style={StyleSheet.compose(styles.container, {zIndex: props.zIndex})}>
+      <Animated.View
+        {...panResponder.panHandlers}
+        style={{
+          transform: [{translateX: movementX}, {rotateZ: rotation}],
+          flex: 1,
+        }}>
+        <Card color={props.color} />
+      </Animated.View>
+    </View>
+  );
+}
+
+const cardData = Array(5);
+
+function Card(props: {color: string}) {
+  const renderItem = ({item, index}) => (
+    <CardSection color={props.color} index={index} />
+  );
+
+  const separatorComponent = () => <View style={styles.separator} />;
+
+  const listRef = React.useRef<?React.ElementRef<typeof FlatList>>();
+
+  React.useEffect(() => {
+    listRef.current?.scrollToOffset({offset: 0, animated: false});
+  }, [props.color]);
+
+  return (
+    <View style={styles.card}>
+      <FlatList
+        style={{flex: 1}}
+        data={cardData}
+        renderItem={renderItem}
+        ItemSeparatorComponent={separatorComponent}
+        ref={listRef}
+      />
+    </View>
+  );
+}
+
+function CardSection(props: {index: number, color: string}) {
+  return (
+    <View
+      style={StyleSheet.compose(styles.sectionBg, {
+        backgroundColor: props.color,
+      })}>
+      <Text style={styles.sectionText}>Section #{props.index}</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    position: 'absolute',
+    height: '100%',
+    width: '100%',
+    padding: 10,
+    paddingTop: 30,
+  },
+  card: {
+    flex: 1,
+    margin: 5,
+    backgroundColor: 'white',
+    borderWidth: 1,
+    borderColor: 'lightgray',
+  },
+  separator: {
+    width: '100%',
+    height: 2,
+    backgroundColor: 'white',
+  },
+  sectionBg: {
+    height: 200,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  sectionText: {
+    color: 'white',
+    fontWeight: 'bold',
+  },
+});
diff --git a/packages/rn-tester/js/examples/Switch/SwitchExample.js b/packages/rn-tester/js/examples/Switch/SwitchExample.js
index 1acbb65c765608..d31abc5166dd85 100644
--- a/packages/rn-tester/js/examples/Switch/SwitchExample.js
+++ b/packages/rn-tester/js/examples/Switch/SwitchExample.js
@@ -135,6 +135,7 @@ class ColorSwitchExample extends React.Component<{...}, $FlowFixMeState> {
     return (
       <View>
         <Switch
+          testID="initial-false-switch"
           onValueChange={value => this.setState({colorFalseSwitchIsOn: value})}
           style={{marginBottom: 10}}
           thumbColor="#0000ff"
@@ -145,6 +146,7 @@ class ColorSwitchExample extends React.Component<{...}, $FlowFixMeState> {
           value={this.state.colorFalseSwitchIsOn}
         />
         <Switch
+          testID="initial-true-switch"
           onValueChange={value => this.setState({colorTrueSwitchIsOn: value})}
           thumbColor="#0000ff"
           trackColor={{
@@ -169,19 +171,24 @@ class EventSwitchExample extends React.Component<{...}, $FlowFixMeState> {
       <View style={{flexDirection: 'row', justifyContent: 'space-around'}}>
         <View>
           <Switch
+            testID="event-switch-top"
             onValueChange={value => this.setState({eventSwitchIsOn: value})}
             style={{marginBottom: 10}}
             value={this.state.eventSwitchIsOn}
           />
           <Switch
+            testID="event-switch-bottom"
             onValueChange={value => this.setState({eventSwitchIsOn: value})}
             style={{marginBottom: 10}}
             value={this.state.eventSwitchIsOn}
           />
-          <Text>{this.state.eventSwitchIsOn ? 'On' : 'Off'}</Text>
+          <Text testID="event-switch-indicator">
+            {this.state.eventSwitchIsOn ? 'On' : 'Off'}
+          </Text>
         </View>
         <View>
           <Switch
+            testID="event-switch-regression-top"
             onValueChange={value =>
               this.setState({eventSwitchRegressionIsOn: value})
             }
@@ -189,13 +196,16 @@ class EventSwitchExample extends React.Component<{...}, $FlowFixMeState> {
             value={this.state.eventSwitchRegressionIsOn}
           />
           <Switch
+            testID="event-switch-regression-bottom"
             onValueChange={value =>
               this.setState({eventSwitchRegressionIsOn: value})
             }
             style={{marginBottom: 10}}
             value={this.state.eventSwitchRegressionIsOn}
           />
-          <Text>{this.state.eventSwitchRegressionIsOn ? 'On' : 'Off'}</Text>
+          <Text testID="event-switch-regression-indicator">
+            {this.state.eventSwitchRegressionIsOn ? 'On' : 'Off'}
+          </Text>
         </View>
       </View>
     );
@@ -210,30 +220,35 @@ exports.description = 'Native boolean input';
 exports.examples = [
   {
     title: 'Switches can be set to true or false',
+    name: 'basic',
     render(): React.Element<any> {
       return <BasicSwitchExample />;
     },
   },
   {
     title: 'Switches can be disabled',
+    name: 'disabled',
     render(): React.Element<any> {
       return <DisabledSwitchExample />;
     },
   },
   {
     title: 'Change events can be detected',
+    name: 'events',
     render(): React.Element<any> {
       return <EventSwitchExample />;
     },
   },
   {
     title: 'Switches are controlled components',
+    name: 'controlled',
     render(): React.Element<any> {
-      return <Switch />;
+      return <Switch testID="controlled-switch" />;
     },
   },
   {
     title: 'Custom colors can be provided',
+    name: 'custom-colors',
     render(): React.Element<any> {
       return <ColorSwitchExample />;
     },
diff --git a/packages/rn-tester/js/examples/Text/TextAdjustsDynamicLayoutExample.js b/packages/rn-tester/js/examples/Text/TextAdjustsDynamicLayoutExample.js
new file mode 100644
index 00000000000000..d4d61260d25d3a
--- /dev/null
+++ b/packages/rn-tester/js/examples/Text/TextAdjustsDynamicLayoutExample.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import {Button, Text, StyleSheet, View} from 'react-native';
+import * as React from 'react';
+import {useState} from 'react';
+
+export default function TextAdjustsDynamicLayoutExample(props: {}): React.Node {
+  const [height, setHeight] = useState(20);
+
+  return (
+    <>
+      <View>
+        <View style={[styles.subjectContainer, {height}]}>
+          <Text
+            adjustsFontSizeToFit={true}
+            numberOfLines={1}
+            style={styles.subjectText}>
+            This is adjusting text.
+          </Text>
+        </View>
+      </View>
+      <View style={styles.row}>
+        <Button onPress={() => setHeight(20)} title="Set Height to 20" />
+      </View>
+      <View style={styles.row}>
+        <Button onPress={() => setHeight(40)} title="Set Height to 40" />
+      </View>
+      <View style={styles.row}>
+        <Button onPress={() => setHeight(60)} title="Set Height to 60" />
+      </View>
+    </>
+  );
+}
+
+const styles = StyleSheet.create({
+  subjectContainer: {
+    backgroundColor: 'rgba(254, 255, 0, 0.75)',
+    justifyContent: 'center',
+  },
+  subjectText: {
+    fontSize: 40,
+    textAlign: 'center',
+  },
+  row: {
+    marginTop: 10,
+  },
+});
diff --git a/packages/rn-tester/js/examples/Text/TextExample.android.js b/packages/rn-tester/js/examples/Text/TextExample.android.js
index 9a53a9f553169a..6b3668663d8266 100644
--- a/packages/rn-tester/js/examples/Text/TextExample.android.js
+++ b/packages/rn-tester/js/examples/Text/TextExample.android.js
@@ -10,11 +10,13 @@
 
 'use strict';
 
+import TextAdjustsDynamicLayoutExample from './TextAdjustsDynamicLayoutExample';
+
 const RNTesterBlock = require('../../components/RNTesterBlock');
 const RNTesterPage = require('../../components/RNTesterPage');
 const React = require('react');
 const TextInlineView = require('../../components/TextInlineView');
-const TextLegend = require('../../components/TextLegend');
+import TextLegend from '../../components/TextLegend';
 
 const {LayoutAnimation, StyleSheet, Text, View} = require('react-native');
 
@@ -202,6 +204,9 @@ class TextExample extends React.Component<{...}> {
         <RNTesterBlock title="Dynamic Font Size Adjustment">
           <AdjustingFontSize />
         </RNTesterBlock>
+        <RNTesterBlock title="Font Size Adjustment with Dynamic Layout">
+          <TextAdjustsDynamicLayoutExample />
+        </RNTesterBlock>
         <RNTesterBlock title="Wrap">
           <Text>
             The text should wrap if it goes on multiple lines. See, this is
@@ -383,6 +388,15 @@ class TextExample extends React.Component<{...}> {
         <RNTesterBlock title="Font Weight">
           <Text style={{fontWeight: 'bold'}}>Move fast and be bold</Text>
           <Text style={{fontWeight: 'normal'}}>Move fast and be normal</Text>
+          <Text style={{fontWeight: '900'}}>FONT WEIGHT 900</Text>
+          <Text style={{fontWeight: '800'}}>FONT WEIGHT 800</Text>
+          <Text style={{fontWeight: '700'}}>FONT WEIGHT 700</Text>
+          <Text style={{fontWeight: '600'}}>FONT WEIGHT 600</Text>
+          <Text style={{fontWeight: '500'}}>FONT WEIGHT 500</Text>
+          <Text style={{fontWeight: '400'}}>FONT WEIGHT 400</Text>
+          <Text style={{fontWeight: '300'}}>FONT WEIGHT 300</Text>
+          <Text style={{fontWeight: '200'}}>FONT WEIGHT 200</Text>
+          <Text style={{fontWeight: '100'}}>FONT WEIGHT 100</Text>
         </RNTesterBlock>
         <RNTesterBlock title="Font Style">
           <Text style={{fontStyle: 'italic'}}>Move fast and be italic</Text>
diff --git a/packages/rn-tester/js/examples/Text/TextExample.ios.js b/packages/rn-tester/js/examples/Text/TextExample.ios.js
index 723742d4475d51..876df2eccd29e0 100644
--- a/packages/rn-tester/js/examples/Text/TextExample.ios.js
+++ b/packages/rn-tester/js/examples/Text/TextExample.ios.js
@@ -13,7 +13,7 @@
 const React = require('react');
 const TextAncestor = require('react-native/Libraries/Text/TextAncestor');
 const TextInlineView = require('../../components/TextInlineView');
-const TextLegend = require('../../components/TextLegend');
+import TextLegend from '../../components/TextLegend';
 
 const {
   Button,
@@ -39,8 +39,11 @@ type TextAlignExampleRTLState = {|
   isRTL: boolean,
 |};
 
-class TextAlignRTLExample extends React.Component<*, TextAlignExampleRTLState> {
-  constructor(...args: Array<*>) {
+class TextAlignRTLExample extends React.Component<
+  {},
+  TextAlignExampleRTLState,
+> {
+  constructor(...args: Array<any>) {
     super(...args);
 
     this.state = {
@@ -264,7 +267,7 @@ class AdjustingFontSize extends React.Component<
   }
 }
 
-class TextBaseLineLayoutExample extends React.Component<*, *> {
+class TextBaseLineLayoutExample extends React.Component<{}, mixed> {
   render() {
     const texts = [];
     for (let i = 9; i >= 0; i--) {
@@ -355,7 +358,24 @@ class TextBaseLineLayoutExample extends React.Component<*, *> {
   }
 }
 
-class TextRenderInfoExample extends React.Component<*, *> {
+class TextRenderInfoExample extends React.Component<
+  {},
+  {
+    fontSize: number,
+    numberOfTextBlocks: number,
+    textMetrics: $ReadOnly<{
+      ascender: number,
+      capHeight: number,
+      descender: number,
+      height: number,
+      text?: string,
+      width: number,
+      x: number,
+      xHeight: number,
+      y: number,
+    }>,
+  },
+> {
   state = {
     textMetrics: {
       x: 0,
@@ -439,7 +459,22 @@ class TextRenderInfoExample extends React.Component<*, *> {
   }
 }
 
-class TextWithCapBaseBox extends React.Component<*, *> {
+class TextWithCapBaseBox extends React.Component<
+  {children: string, style?: any},
+  {
+    textMetrics: $ReadOnly<{
+      ascender: number,
+      capHeight: number,
+      descender: number,
+      height: number,
+      text?: string,
+      width: number,
+      x: number,
+      xHeight: number,
+      y: number,
+    }>,
+  },
+> {
   state = {
     textMetrics: {
       x: 0,
@@ -640,21 +675,17 @@ exports.examples = [
     render: function(): React.Node {
       return (
         <View>
-          <Text style={{fontSize: 20, fontWeight: '100'}}>
-            Move fast and be ultralight
-          </Text>
-          <Text style={{fontSize: 20, fontWeight: '200'}}>
-            Move fast and be light
-          </Text>
-          <Text style={{fontSize: 20, fontWeight: 'normal'}}>
-            Move fast and be normal
-          </Text>
-          <Text style={{fontSize: 20, fontWeight: 'bold'}}>
-            Move fast and be bold
-          </Text>
-          <Text style={{fontSize: 20, fontWeight: '900'}}>
-            Move fast and be ultrabold
-          </Text>
+          <Text style={{fontWeight: 'bold'}}>Move fast and be bold</Text>
+          <Text style={{fontWeight: 'normal'}}>Move fast and be normal</Text>
+          <Text style={{fontWeight: '900'}}>FONT WEIGHT 900</Text>
+          <Text style={{fontWeight: '800'}}>FONT WEIGHT 800</Text>
+          <Text style={{fontWeight: '700'}}>FONT WEIGHT 700</Text>
+          <Text style={{fontWeight: '600'}}>FONT WEIGHT 600</Text>
+          <Text style={{fontWeight: '500'}}>FONT WEIGHT 500</Text>
+          <Text style={{fontWeight: '400'}}>FONT WEIGHT 400</Text>
+          <Text style={{fontWeight: '300'}}>FONT WEIGHT 300</Text>
+          <Text style={{fontWeight: '200'}}>FONT WEIGHT 200</Text>
+          <Text style={{fontWeight: '100'}}>FONT WEIGHT 100</Text>
         </View>
       );
     },
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js b/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
index 9551a9a96fca89..ea9f6b0c98270b 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
@@ -23,7 +23,7 @@ const {
 
 const TextInputSharedExamples = require('./TextInputSharedExamples.js');
 
-import type {RNTesterExampleModuleItem} from '../../types/RNTesterTypes';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 
 class ToggleDefaultPaddingExample extends React.Component<
   $FlowFixMeProps,
@@ -200,6 +200,38 @@ exports.examples = ([
       );
     },
   },
+  {
+    title: 'Font Weight',
+    render: function(): React.Node {
+      return (
+        <View>
+          <TextInput
+            defaultValue="Font Weight (default)"
+            style={[styles.singleLine]}
+          />
+          {[
+            'normal',
+            'bold',
+            '900',
+            '800',
+            '700',
+            '600',
+            '500',
+            '400',
+            '300',
+            '200',
+            '100',
+          ].map(fontWeight => (
+            <TextInput
+              defaultValue={`Font Weight (${fontWeight})`}
+              key={fontWeight}
+              style={[styles.singleLine, {fontWeight}]}
+            />
+          ))}
+        </View>
+      );
+    },
+  },
   {
     title: 'Text input, themes and heights',
     render: function(): React.Node {
@@ -424,4 +456,4 @@ exports.examples = ([
       return <ToggleDefaultPaddingExample />;
     },
   },
-]: Array<RNTesterExampleModuleItem>);
+]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js b/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js
index 218ad62d9f4e45..d550a933476535 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js
@@ -23,10 +23,11 @@ const {
   Switch,
   Alert,
 } = require('react-native');
+import type {KeyboardType} from 'react-native/Libraries/Components/TextInput/TextInput';
 
 const TextInputSharedExamples = require('./TextInputSharedExamples.js');
 
-import type {RNTesterExampleModuleItem} from '../../types/RNTesterTypes';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 
 class WithLabel extends React.Component<$FlowFixMeProps> {
   render() {
@@ -41,7 +42,10 @@ class WithLabel extends React.Component<$FlowFixMeProps> {
   }
 }
 
-class TextInputAccessoryViewExample extends React.Component<{...}, *> {
+class TextInputAccessoryViewChangeTextExample extends React.Component<
+  {...},
+  {text: string},
+> {
   constructor(props) {
     super(props);
     this.state = {text: 'Placeholder Text'};
@@ -51,6 +55,7 @@ class TextInputAccessoryViewExample extends React.Component<{...}, *> {
     const inputAccessoryViewID = 'inputAccessoryView1';
     return (
       <View>
+        <Text>Set InputAccessoryView with ID & reset text:</Text>
         <TextInput
           style={styles.default}
           inputAccessoryViewID={inputAccessoryViewID}
@@ -70,6 +75,70 @@ class TextInputAccessoryViewExample extends React.Component<{...}, *> {
   }
 }
 
+class TextInputAccessoryViewChangeKeyboardExample extends React.Component<
+  {...},
+  {keyboardType: string, text: string},
+> {
+  constructor(props) {
+    super(props);
+    this.state = {text: '', keyboardType: 'default'};
+  }
+
+  _switchKeyboard = () => {
+    this.setState({
+      keyboardType:
+        this.state.keyboardType === 'default' ? 'number-pad' : 'default',
+    });
+  };
+
+  render() {
+    const inputAccessoryViewID = 'inputAccessoryView2';
+    return (
+      <View>
+        <Text>Set InputAccessoryView with ID & switch keyboard:</Text>
+        <TextInput
+          style={styles.default}
+          inputAccessoryViewID={inputAccessoryViewID}
+          onChangeText={text => this.setState({text})}
+          value={this.state.text}
+          // $FlowFixMe[incompatible-type]
+          keyboardType={this.state.keyboardType}
+          returnKeyType="done"
+        />
+        <InputAccessoryView nativeID={inputAccessoryViewID}>
+          <View style={{backgroundColor: 'white'}}>
+            <Button onPress={this._switchKeyboard} title="Switch Keyboard" />
+          </View>
+        </InputAccessoryView>
+      </View>
+    );
+  }
+}
+
+class TextInputAccessoryViewDefaultDoneButtonExample extends React.Component<
+  $ReadOnly<{|
+    keyboardType: KeyboardType,
+  |}>,
+  {text: string},
+> {
+  constructor(props) {
+    super(props);
+    this.state = {text: ''};
+  }
+
+  render() {
+    return (
+      <TextInput
+        style={styles.default}
+        onChangeText={text => this.setState({text})}
+        value={this.state.text}
+        keyboardType={this.props.keyboardType}
+        returnKeyType="done"
+      />
+    );
+  }
+}
+
 class RewriteExampleKana extends React.Component<$FlowFixMeProps, any> {
   constructor(props) {
     super(props);
@@ -268,9 +337,36 @@ exports.examples = ([
     },
   },
   {
-    title: 'Keyboard Accessory View',
+    title: 'Keyboard Input Accessory View',
     render: function(): React.Node {
-      return <TextInputAccessoryViewExample />;
+      return (
+        <View>
+          <TextInputAccessoryViewChangeTextExample />
+          <TextInputAccessoryViewChangeKeyboardExample />
+        </View>
+      );
+    },
+  },
+  {
+    title: "Default Input Accessory View with returnKeyType = 'done'",
+    render: function(): React.Node {
+      const keyboardTypesWithDoneButton = [
+        'number-pad',
+        'phone-pad',
+        'decimal-pad',
+        'ascii-capable-number-pad',
+      ];
+      const examples = keyboardTypesWithDoneButton.map(type => {
+        return (
+          <WithLabel key={'keyboardType: ' + type} label={type}>
+            <TextInputAccessoryViewDefaultDoneButtonExample
+              key={type}
+              keyboardType={type}
+            />
+          </WithLabel>
+        );
+      });
+      return <View>{examples}</View>;
     },
   },
   {
@@ -721,4 +817,4 @@ exports.examples = ([
       );
     },
   },
-]: Array<RNTesterExampleModuleItem>);
+]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 50feec436f801a..d33e03d432ff1d 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -21,7 +21,7 @@ const {
   StyleSheet,
 } = require('react-native');
 
-import type {RNTesterExampleModuleItem} from '../../types/RNTesterTypes';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 
 const styles = StyleSheet.create({
   default: {
@@ -46,7 +46,6 @@ const styles = StyleSheet.create({
   labelContainer: {
     flexDirection: 'row',
     marginVertical: 2,
-    flex: 1,
   },
   label: {
     width: 115,
@@ -54,6 +53,9 @@ const styles = StyleSheet.create({
     marginRight: 10,
     paddingTop: 2,
   },
+  inputContainer: {
+    flex: 1,
+  },
   rewriteContainer: {
     flexDirection: 'row',
     alignItems: 'center',
@@ -79,7 +81,7 @@ class WithLabel extends React.Component<$FlowFixMeProps> {
         <View style={styles.label}>
           <Text>{this.props.label}</Text>
         </View>
-        {this.props.children}
+        <View style={styles.inputContainer}>{this.props.children}</View>
       </View>
     );
   }
@@ -325,7 +327,9 @@ class TokenizedTextExample extends React.Component<
         index = 1;
       }
       parts.push(_text.substr(0, index));
+      // $FlowFixMe[incompatible-use]
       parts.push(token[0]);
+      // $FlowFixMe[incompatible-use]
       index = index + token[0].length;
       _text = _text.slice(index);
     }
@@ -335,7 +339,7 @@ class TokenizedTextExample extends React.Component<
     parts = parts.map(text => {
       if (/^#/.test(text)) {
         return (
-          <Text key={text} style={styles.hashtag}>
+          <Text testID="hashtag" key={text} style={styles.hashtag}>
             {text}
           </Text>
         );
@@ -345,8 +349,9 @@ class TokenizedTextExample extends React.Component<
     });
 
     return (
-      <View>
+      <View style={{flexDirection: 'row'}}>
         <TextInput
+          testID="text-input"
           multiline={true}
           style={styles.multiline}
           onChangeText={text => {
@@ -362,7 +367,7 @@ class TokenizedTextExample extends React.Component<
 type SelectionExampleState = {
   selection: $ReadOnly<{|
     start: number,
-    end?: number,
+    end: number,
   |}>,
   value: string,
   ...
@@ -417,25 +422,47 @@ class SelectionExample extends React.Component<
 
     return (
       <View>
-        <TextInput
-          multiline={this.props.multiline}
-          onChangeText={value => this.setState({value})}
-          onSelectionChange={this.onSelectionChange.bind(this)}
-          ref={textInput => (this._textInput = textInput)}
-          selection={this.state.selection}
-          style={this.props.style}
-          value={this.state.value}
-        />
+        <View style={{flexDirection: 'row'}}>
+          <TextInput
+            testID={`${this.props.testID}-text-input`}
+            multiline={this.props.multiline}
+            onChangeText={value => this.setState({value})}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+            onSelectionChange={this.onSelectionChange.bind(this)}
+            ref={textInput => (this._textInput = textInput)}
+            selection={this.state.selection}
+            style={this.props.style}
+            value={this.state.value}
+          />
+        </View>
         <View>
-          <Text>selection = {JSON.stringify(this.state.selection)}</Text>
-          <Text onPress={this.placeAt.bind(this, 0)}>
+          <Text testID={`${this.props.testID}-selection`}>
+            selection ={' '}
+            {`{start:${this.state.selection.start},end:${this.state.selection.end}}`}
+          </Text>
+          <Text
+            testID={`${this.props.testID}-cursor-start`}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+            onPress={this.placeAt.bind(this, 0)}>
             Place at Start (0, 0)
           </Text>
-          <Text onPress={this.placeAt.bind(this, length)}>
+          <Text
+            testID={`${this.props.testID}-cursor-end`}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+            onPress={this.placeAt.bind(this, length)}>
             Place at End ({length}, {length})
           </Text>
+          {/* $FlowFixMe[method-unbinding] added when improving typing for this
+           * parameters */}
           <Text onPress={this.placeAtRandom.bind(this)}>Place at Random</Text>
-          <Text onPress={this.select.bind(this, 0, length)}>Select All</Text>
+          <Text
+            testID={`${this.props.testID}-select-all`}
+            // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+            onPress={this.select.bind(this, 0, length)}>
+            Select All
+          </Text>
+          {/* $FlowFixMe[method-unbinding] added when improving typing for this
+           * parameters */}
           <Text onPress={this.selectRandom.bind(this)}>Select Random</Text>
         </View>
       </View>
@@ -457,6 +484,7 @@ module.exports = ([
     },
   },
   {
+    name: 'maxLength',
     title: "Live Re-Write (<sp>  ->  '_') + maxLength",
     render: function(): React.Node {
       return <RewriteExample />;
@@ -469,6 +497,7 @@ module.exports = ([
     },
   },
   {
+    name: 'clearButton',
     title: 'Live Re-Write (no spaces allowed) and clear',
     render: function(): React.Node {
       return <RewriteInvalidCharactersAndClearExample />;
@@ -476,20 +505,37 @@ module.exports = ([
   },
   {
     title: 'Auto-capitalize',
+    name: 'autoCapitalize',
     render: function(): React.Node {
       return (
         <View>
           <WithLabel label="none">
-            <TextInput autoCapitalize="none" style={styles.default} />
+            <TextInput
+              testID="capitalize-none"
+              autoCapitalize="none"
+              style={styles.default}
+            />
           </WithLabel>
           <WithLabel label="sentences">
-            <TextInput autoCapitalize="sentences" style={styles.default} />
+            <TextInput
+              testID="capitalize-sentences"
+              autoCapitalize="sentences"
+              style={styles.default}
+            />
           </WithLabel>
           <WithLabel label="words">
-            <TextInput autoCapitalize="words" style={styles.default} />
+            <TextInput
+              testID="capitalize-words"
+              autoCapitalize="words"
+              style={styles.default}
+            />
           </WithLabel>
           <WithLabel label="characters">
-            <TextInput autoCapitalize="characters" style={styles.default} />
+            <TextInput
+              testID="capitalize-characters"
+              autoCapitalize="characters"
+              style={styles.default}
+            />
           </WithLabel>
         </View>
       );
@@ -512,6 +558,7 @@ module.exports = ([
   },
   {
     title: 'Keyboard types',
+    name: 'keyboardTypes',
     render: function(): React.Node {
       const keyboardTypes = [
         'default',
@@ -601,20 +648,24 @@ module.exports = ([
   },
   {
     title: 'Attributed text',
+    name: 'attributedText',
     render: function(): React.Node {
       return <TokenizedTextExample />;
     },
   },
   {
     title: 'Text selection & cursor placement',
+    name: 'cursorPlacement',
     render: function(): React.Node {
       return (
         <View>
           <SelectionExample
+            testID="singleline"
             style={styles.default}
             value="text selection can be changed"
           />
           <SelectionExample
+            testID="multiline"
             multiline
             style={styles.multiline}
             value={'multiline text selection\ncan also be changed'}
@@ -623,4 +674,4 @@ module.exports = ([
       );
     },
   },
-]: Array<RNTesterExampleModuleItem>);
+]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/Timer/TimerExample.js b/packages/rn-tester/js/examples/Timer/TimerExample.js
index 596020e12705f9..3519a89d0701f6 100644
--- a/packages/rn-tester/js/examples/Timer/TimerExample.js
+++ b/packages/rn-tester/js/examples/Timer/TimerExample.js
@@ -44,10 +44,14 @@ class RequestIdleCallbackTester extends React.Component<
   render() {
     return (
       <View>
+        {/* $FlowFixMe[method-unbinding] added when improving typing for this
+         * parameters */}
         <RNTesterButton onPress={this._run.bind(this, false)}>
           Run requestIdleCallback
         </RNTesterButton>
 
+        {/* $FlowFixMe[method-unbinding] added when improving typing for this
+         * parameters */}
         <RNTesterButton onPress={this._run.bind(this, true)}>
           Burn CPU inside of requestIdleCallback
         </RNTesterButton>
diff --git a/packages/rn-tester/js/examples/Touchable/TouchableExample.js b/packages/rn-tester/js/examples/Touchable/TouchableExample.js
index be8f5518ea0ae7..6d88f90689c44e 100644
--- a/packages/rn-tester/js/examples/Touchable/TouchableExample.js
+++ b/packages/rn-tester/js/examples/Touchable/TouchableExample.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const React = require('react');
 
 const {
@@ -588,6 +586,105 @@ const remoteImage = {
   uri: 'https://www.facebook.com/favicon.ico',
 };
 
+const TouchableHighlightUnderlayMethods = () => {
+  const [underlayVisible, setUnderlayVisible] = useState(
+    'Underlay not visible',
+  );
+
+  const hiddenUnderlay = () => {
+    setUnderlayVisible('Press to make underlay visible');
+  };
+
+  const shownUnderlay = () => {
+    setUnderlayVisible('Underlay visible');
+  };
+  return (
+    <TouchableHighlight
+      style={styles.logBox}
+      underlayColor={'#eee'}
+      onShowUnderlay={shownUnderlay}
+      onHideUnderlay={hiddenUnderlay}
+      onPress={() => {
+        console.log('TouchableHighlight underlay shown!');
+      }}>
+      <Text style={styles.textBlock}>{underlayVisible}</Text>
+    </TouchableHighlight>
+  );
+};
+
+const TouchableTouchSoundDisabled = () => {
+  const [soundEnabled, setSoundEnabled] = useState(false);
+  const toggleTouchableSound = () => {
+    soundEnabled ? setSoundEnabled(false) : setSoundEnabled(true);
+  };
+  return (
+    <>
+      {Platform.OS === 'android' ? (
+        <>
+          <TouchableWithoutFeedback
+            touchSoundDisabled={soundEnabled}
+            onPress={() => console.log('touchSoundDisabled pressed!')}>
+            <Text
+              style={{
+                padding: 10,
+              }}>
+              Touchables make a sound on Android, which can be turned off.
+            </Text>
+          </TouchableWithoutFeedback>
+          <TouchableOpacity
+            style={{
+              padding: 10,
+            }}
+            onPress={toggleTouchableSound}
+            touchSoundDisabled={soundEnabled}>
+            <Text style={styles.button}>
+              {soundEnabled
+                ? 'Disable Touchable Sound'
+                : 'Enable Touchable Sound'}
+            </Text>
+          </TouchableOpacity>
+        </>
+      ) : null}
+    </>
+  );
+};
+
+function TouchableOnFocus<T: React.AbstractComponent<any, any>>() {
+  const ref = useRef<?React.ElementRef<T> | {focus: Function}>(null);
+  const [isFocused, setIsFocused] = useState(false);
+  const [focusStatus, setFocusStatus] = useState(
+    'This touchable is not focused.',
+  );
+  const [isBlurred, setIsBlurred] = useState(
+    'This item still has focus, onBlur is not called',
+  );
+
+  const toggleFocus = () => {
+    isFocused
+      ? setFocusStatus('This touchable is focused')
+      : setIsFocused('This touchable is not focused') &&
+        setIsBlurred('This item has lost focus, onBlur called');
+  };
+  const focusTouchable = () => {
+    if (ref.current) {
+      ref.current.focus();
+    }
+  };
+
+  return (
+    <TouchableHighlight
+      ref={ref}
+      onFocus={toggleFocus}
+      onPress={focusTouchable}>
+      <Text>
+        {focusStatus}
+        {'\n'}
+        {isBlurred}
+      </Text>
+    </TouchableHighlight>
+  );
+}
+
 const styles = StyleSheet.create({
   row: {
     justifyContent: 'center',
@@ -712,6 +809,24 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'TouchableHighlight Underlay Visibility',
+    render: function(): React.Node {
+      return <TouchableHighlightUnderlayMethods />;
+    },
+  },
+  {
+    title: 'Touchable Touch Sound',
+    render: function(): React.Node {
+      return <TouchableTouchSoundDisabled />;
+    },
+  },
+  {
+    title: 'Touchable onFocus',
+    render: function(): React.Node {
+      return <TouchableOnFocus />;
+    },
+  },
   {
     title: '<Text onPress={fn}> with highlight',
     render: function(): React.Element<any> {
diff --git a/packages/rn-tester/js/examples/Transform/TransformExample.js b/packages/rn-tester/js/examples/Transform/TransformExample.js
index 350f1c6c3fd265..32f2760db21590 100644
--- a/packages/rn-tester/js/examples/Transform/TransformExample.js
+++ b/packages/rn-tester/js/examples/Transform/TransformExample.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import React, {useEffect, useState} from 'react';
 import {Animated, StyleSheet, Text, View} from 'react-native';
 
@@ -40,9 +38,9 @@ function AnimateTansformSingleProp() {
               {
                 rotate: theta.interpolate({
                   inputRange: [0, 100],
-                  /* $FlowFixMe(>=0.38.0) - Flow error detected during the
-                   * deployment of v0.38.0. To see the error, remove this
-                   * comment and run flow */
+                  /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error
+                   * detected during the deployment of v0.38.0. To see the
+                   * error, remove this comment and run flow */
                   outputRange: ['0deg', '360deg'],
                 }),
               },
@@ -81,9 +79,9 @@ function Flip() {
               {
                 rotateX: theta.interpolate({
                   inputRange: [0, 180],
-                  /* $FlowFixMe(>=0.38.0) - Flow error detected during the
-                   * deployment of v0.38.0. To see the error, remove this
-                   * comment and run flow */
+                  /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error
+                   * detected during the deployment of v0.38.0. To see the
+                   * error, remove this comment and run flow */
                   outputRange: ['0deg', '180deg'],
                 }),
               },
@@ -102,9 +100,9 @@ function Flip() {
               {
                 rotateX: theta.interpolate({
                   inputRange: [0, 180],
-                  /* $FlowFixMe(>=0.38.0) - Flow error detected during the
-                   * deployment of v0.38.0. To see the error, remove this
-                   * comment and run flow */
+                  /* $FlowFixMe[speculation-ambiguous] (>=0.38.0) - Flow error
+                   * detected during the deployment of v0.38.0. To see the
+                   * error, remove this comment and run flow */
                   outputRange: ['180deg', '360deg'],
                 }),
               },
diff --git a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
index bc227cdc94c357..6526ea5a9c6638 100644
--- a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
+++ b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeSampleTurboModule from 'react-native/Libraries/TurboModule/samples/NativeSampleTurboModule';
 import type {RootTag} from 'react-native/Libraries/ReactNative/RootTag';
 import {
@@ -19,7 +17,7 @@ import {
   FlatList,
   Platform,
   TouchableOpacity,
-  unstable_RootTagContext,
+  RootTagContext,
 } from 'react-native';
 import * as React from 'react';
 
@@ -35,7 +33,7 @@ type State = {|
 |};
 
 class SampleTurboModuleExample extends React.Component<{||}, State> {
-  static contextType: React$Context<RootTag> = unstable_RootTagContext;
+  static contextType: React$Context<RootTag> = RootTagContext;
 
   state: State = {
     testResults: {},
@@ -68,6 +66,8 @@ class SampleTurboModuleExample extends React.Component<{||}, State> {
       ]),
     getObject: () =>
       NativeSampleTurboModule.getObject({a: 1, b: 'foo', c: null}),
+    getUnsafeObject: () =>
+      NativeSampleTurboModule.getObject({a: 1, b: 'foo', c: null}),
     getRootTag: () => NativeSampleTurboModule.getRootTag(this.context),
     getValue: () =>
       NativeSampleTurboModule.getValue(5, 'test', {a: 1, b: 'foo'}),
@@ -75,14 +75,14 @@ class SampleTurboModuleExample extends React.Component<{||}, State> {
 
   _setResult(name, result) {
     this.setState(({testResults}) => ({
-      /* $FlowFixMe(>=0.122.0 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.122.0 was deployed. To see the error, delete
-       * this comment and run Flow. */
+      /* $FlowFixMe[cannot-spread-indexer] (>=0.122.0 site=react_native_fb)
+       * This comment suppresses an error found when Flow v0.122.0 was
+       * deployed. To see the error, delete this comment and run Flow. */
       testResults: {
         ...testResults,
-        /* $FlowFixMe(>=0.111.0 site=react_native_fb) This comment suppresses
-         * an error found when Flow v0.111 was deployed. To see the error,
-         * delete this comment and run Flow. */
+        /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb)
+         * This comment suppresses an error found when Flow v0.111 was
+         * deployed. To see the error, delete this comment and run Flow. */
         [name]: {value: result, type: typeof result},
       },
     }));
diff --git a/packages/rn-tester/js/examples/View/ViewExample.js b/packages/rn-tester/js/examples/View/ViewExample.js
index cea8eddf7ac750..dee2a5947b9a49 100644
--- a/packages/rn-tester/js/examples/View/ViewExample.js
+++ b/packages/rn-tester/js/examples/View/ViewExample.js
@@ -371,6 +371,7 @@ exports.examples = [
           width: 100,
           height: 50,
           marginTop: -10,
+          position: 'relative',
         },
       });
 
diff --git a/packages/rn-tester/js/examples/XHR/XHRExampleBinaryUpload.js b/packages/rn-tester/js/examples/XHR/XHRExampleBinaryUpload.js
index 9dfbe61da5ddf2..85b01cce64a718 100644
--- a/packages/rn-tester/js/examples/XHR/XHRExampleBinaryUpload.js
+++ b/packages/rn-tester/js/examples/XHR/XHRExampleBinaryUpload.js
@@ -15,12 +15,12 @@ const React = require('react');
 const {
   Alert,
   Linking,
-  Picker,
   StyleSheet,
   Text,
   TouchableHighlight,
   View,
 } = require('react-native');
+import RNTOption from '../../components/RNTOption';
 
 const BINARY_TYPES = {
   String,
@@ -62,7 +62,9 @@ class XHRExampleBinaryUpload extends React.Component<{...}, $FlowFixMeState> {
       Alert.alert('Upload failed', 'No response payload.');
       return;
     }
-    const index = xhr.responseText.indexOf('http://www.posttestserver.com/');
+    const index = xhr.responseText.indexOf(
+      'http://ptsv2.com/t/react-native/d/',
+    );
     if (index === -1) {
       Alert.alert('Upload failed', 'Invalid response payload.');
       return;
@@ -78,7 +80,7 @@ class XHRExampleBinaryUpload extends React.Component<{...}, $FlowFixMeState> {
 
   _upload = () => {
     const xhr = new XMLHttpRequest();
-    xhr.open('POST', 'http://posttestserver.com/post.php');
+    xhr.open('POST', 'http://ptsv2.com/t/react-native/post');
     xhr.onload = () => XHRExampleBinaryUpload.handlePostTestServerUpload(xhr);
     xhr.setRequestHeader('Content-Type', 'text/plain');
 
@@ -108,14 +110,20 @@ class XHRExampleBinaryUpload extends React.Component<{...}, $FlowFixMeState> {
   render(): React.Node {
     return (
       <View>
-        <Text>Upload 255 bytes as...</Text>
-        <Picker
-          selectedValue={this.state.type}
-          onValueChange={type => this.setState({type})}>
-          {Object.keys(BINARY_TYPES).map(type => (
-            <Picker.Item key={type} label={type} value={type} />
-          ))}
-        </Picker>
+        <View style={styles.block}>
+          <Text style={styles.title}>Upload 255 bytes as ...</Text>
+          <View style={styles.row}>
+            {Object.keys(BINARY_TYPES).map(type => (
+              <RNTOption
+                selected={this.state.type === type}
+                key={type}
+                label={type}
+                onPress={() => this.setState({type})}
+                style={styles.option}
+              />
+            ))}
+          </View>
+        </View>
         <View style={styles.uploadButton}>
           <TouchableHighlight onPress={this._upload}>
             <View style={styles.uploadButtonBox}>
@@ -129,6 +137,19 @@ class XHRExampleBinaryUpload extends React.Component<{...}, $FlowFixMeState> {
 }
 
 const styles = StyleSheet.create({
+  block: {
+    borderColor: 'rgba(0,0,0, 0.1)',
+    borderBottomWidth: 1,
+    padding: 6,
+  },
+  row: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+  },
+  title: {
+    fontWeight: 'bold',
+  },
+  option: {margin: 6},
   uploadButton: {
     marginTop: 16,
   },
diff --git a/packages/rn-tester/js/examples/XHR/XHRExampleOnTimeOut.js b/packages/rn-tester/js/examples/XHR/XHRExampleOnTimeOut.js
index e38f792ccd7f80..1bda5d85deb03c 100644
--- a/packages/rn-tester/js/examples/XHR/XHRExampleOnTimeOut.js
+++ b/packages/rn-tester/js/examples/XHR/XHRExampleOnTimeOut.js
@@ -69,6 +69,7 @@ class XHRExampleOnTimeOut extends React.Component<any, any> {
     ) : (
       <TouchableHighlight
         style={styles.wrapper}
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         onPress={this.loadTimeOutRequest.bind(this)}>
         <View style={styles.button}>
           <Text>Make Time Out Request</Text>
diff --git a/packages/rn-tester/js/types/RNTesterTypes.js b/packages/rn-tester/js/types/RNTesterTypes.js
index b8b86f17774c5b..addb6c173086b7 100644
--- a/packages/rn-tester/js/types/RNTesterTypes.js
+++ b/packages/rn-tester/js/types/RNTesterTypes.js
@@ -8,33 +8,38 @@
  * @flow
  */
 
-'use strict';
-
 import * as React from 'react';
 
-export type RNTesterExampleModuleItem = $ReadOnly<{|
+// TODO(macOS GH#774) - useful since RNTesterModuleExample.platform can either be
+// one of these strings or an array of said strings
+type RNTesterPlatform = 'ios' | 'android' | 'macos';
+
+export type RNTesterModuleExample = $ReadOnly<{|
+  name?: string,
   title: string,
-  platform?: string | Array<string>, // TODO(OSS Candidate ISS#2710739)
+  platform?: RNTesterPlatform | Array<RNTesterPlatform>, // TODO(OSS Candidate ISS#2710739)
   description?: string,
+  expect?: string,
   render: () => React.Node,
 |}>;
 
-export type RNTesterExampleModule = $ReadOnly<{|
+export type RNTesterModule = $ReadOnly<{|
   title: string,
+  testTitle?: ?string,
   description: string,
   displayName?: ?string,
   documentationURL?: ?string,
   category?: ?string,
   framework?: string,
-  examples: Array<RNTesterExampleModuleItem>,
-  simpleExampleContainer?: ?boolean,
+  examples: Array<RNTesterModuleExample>,
   category?: string,
   documentationURL?: string,
+  showIndividualExamples?: boolean,
 |}>;
 
-export type RNTesterExample = $ReadOnly<{|
+export type RNTesterModuleInfo = $ReadOnly<{|
   key: string,
-  module: RNTesterExampleModule,
+  module: RNTesterModule,
   skipTest?: {
     ios?: string,
     macos?: string,
@@ -47,16 +52,16 @@ export type RNTesterExample = $ReadOnly<{|
   exampleType?: 'components' | 'apis',
 |}>;
 
-export type SectionData = {
+export type SectionData<T> = {
   key: string,
   title: string,
-  data: Array<RNTesterExample>,
+  data: Array<T>,
 };
 
 export type ExamplesList = $ReadOnly<{|
-  components: SectionData[],
-  apis: SectionData[],
-  bookmarks: SectionData[],
+  components: $ReadOnlyArray<SectionData<RNTesterModuleInfo>>,
+  apis: $ReadOnlyArray<SectionData<RNTesterModuleInfo>>,
+  bookmarks: $ReadOnlyArray<SectionData<RNTesterModuleInfo>>,
 |}>;
 
 export type ScreenTypes = 'components' | 'apis' | 'bookmarks' | null;
@@ -64,7 +69,9 @@ export type ScreenTypes = 'components' | 'apis' | 'bookmarks' | null;
 export type ComponentList = null | {components: string[], apis: string[]};
 
 export type RNTesterState = {
-  openExample: null | string,
+  activeModuleKey: null | string,
+  activeModuleTitle: null | string,
+  activeModuleExampleKey: null | string,
   screen: ScreenTypes,
   bookmarks: ComponentList,
   recentlyUsed: ComponentList,
diff --git a/packages/rn-tester/js/utils/RNTesterList.android.js b/packages/rn-tester/js/utils/RNTesterList.android.js
index 5971a0facf278c..f528ca65eb4323 100644
--- a/packages/rn-tester/js/utils/RNTesterList.android.js
+++ b/packages/rn-tester/js/utils/RNTesterList.android.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {RNTesterExample} from '../types/RNTesterTypes';
+import type {RNTesterModuleInfo} from '../types/RNTesterTypes';
 
-const ComponentExamples: Array<RNTesterExample> = [
+const Components: Array<RNTesterModuleInfo> = [
   {
     key: 'ActivityIndicatorExample',
     category: 'UI',
@@ -28,6 +28,21 @@ const ComponentExamples: Array<RNTesterExample> = [
     category: 'ListView',
     module: require('../examples/FlatList/FlatListExample'),
   },
+  {
+    key: 'FlatList-withSeparators',
+    module: require('../examples/FlatList/FlatList-withSeparators'),
+    category: 'ListView',
+  },
+  {
+    key: 'FlatList-onViewableItemsChanged',
+    module: require('../examples/FlatList/FlatList-onViewableItemsChanged'),
+    category: 'ListView',
+  },
+  {
+    key: 'FlatList-onEndReached',
+    module: require('../examples/FlatList/FlatList-onEndReached'),
+    category: 'ListView',
+  },
   {
     key: 'ImageExample',
     category: 'Basic',
@@ -82,13 +97,18 @@ const ComponentExamples: Array<RNTesterExample> = [
   {
     key: 'SectionListExample',
     category: 'ListView',
-    module: require('../examples/SectionList/SectionListExample'),
+    module: require('../examples/SectionList/SectionListIndex'),
   },
   {
     key: 'StatusBarExample',
     category: 'UI',
     module: require('../examples/StatusBar/StatusBarExample'),
   },
+  {
+    key: 'SwipeableCardExample',
+    category: 'UI',
+    module: require('../examples/SwipeableCardExample/SwipeableCardExample'),
+  },
   {
     key: 'SwitchExample',
     category: 'UI',
@@ -116,7 +136,7 @@ const ComponentExamples: Array<RNTesterExample> = [
   },
 ];
 
-const APIExamples: Array<RNTesterExample> = [
+const APIs: Array<RNTesterModuleInfo> = [
   {
     key: 'AccessibilityExample',
     category: 'Basic',
@@ -133,14 +153,14 @@ const APIExamples: Array<RNTesterExample> = [
     module: require('../examples/Alert/AlertExample'),
   },
   {
-    key: 'AnimatedExample',
+    key: 'AnimatedIndex',
     category: 'UI',
-    module: require('../examples/Animated/AnimatedExample'),
+    module: require('../examples/Animated/AnimatedIndex').default,
   },
   {
     key: 'Animation - GratuitousAnimation',
     category: 'UI',
-    module: require('../examples/Animated/AnimatedGratuitousApp/AnExApp'),
+    module: require('../examples/AnimatedGratuitousApp/AnExApp'),
   },
   {
     key: 'AppearanceExample',
@@ -265,7 +285,7 @@ const APIExamples: Array<RNTesterExample> = [
 ];
 
 if (global.__turboModuleProxy) {
-  APIExamples.push({
+  APIs.push({
     key: 'TurboModuleExample',
     category: 'Basic',
     module: require('../examples/TurboModule/TurboModuleExample'),
@@ -274,13 +294,13 @@ if (global.__turboModuleProxy) {
 
 const Modules: any = {};
 
-APIExamples.concat(ComponentExamples).forEach(Example => {
+APIs.concat(Components).forEach(Example => {
   Modules[Example.key] = Example.module;
 });
 
 const RNTesterList = {
-  APIExamples,
-  ComponentExamples,
+  APIs,
+  Components,
   Modules,
 };
 
diff --git a/packages/rn-tester/js/utils/RNTesterList.ios.js b/packages/rn-tester/js/utils/RNTesterList.ios.js
index 15dc5832e3456e..b634240b1ebdbb 100644
--- a/packages/rn-tester/js/utils/RNTesterList.ios.js
+++ b/packages/rn-tester/js/utils/RNTesterList.ios.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {RNTesterExample} from '../types/RNTesterTypes';
+import type {RNTesterModuleInfo} from '../types/RNTesterTypes';
 
-const ComponentExamples: Array<RNTesterExample> = [
+const Components: Array<RNTesterModuleInfo> = [
   {
     key: 'ActivityIndicatorExample',
     category: 'UI',
@@ -58,6 +58,21 @@ const ComponentExamples: Array<RNTesterExample> = [
     key: 'AccessibilityShowMenu',
     module: require('../examples/AccessibilityShowMenu/AccessibilityShowMenu'),
   }, // ]TODO(OSS Candidate ISS#2710739)
+  {
+    key: 'FlatList-withSeparators',
+    module: require('../examples/FlatList/FlatList-withSeparators'),
+    category: 'ListView',
+  },
+  {
+    key: 'FlatList-onViewableItemsChanged',
+    module: require('../examples/FlatList/FlatList-onViewableItemsChanged'),
+    category: 'ListView',
+  },
+  {
+    key: 'FlatList-onEndReached',
+    module: require('../examples/FlatList/FlatList-onEndReached'),
+    category: 'ListView',
+  },
   {
     key: 'ImageExample',
     module: require('../examples/Image/ImageExample'),
@@ -136,12 +151,13 @@ const ComponentExamples: Array<RNTesterExample> = [
     supportsTVOS: true,
   },
   {
-    key: 'SectionListExample',
-    module: require('../examples/SectionList/SectionListExample'),
-    skipTest: {
-      // [TODO(OSS Candidate ISS#2710739)
-      ios: 'Reason: RedBox shown on failure to load an image.',
-    }, // ]TODO(OSS Candidate ISS#2710739)
+    key: 'ScrollViewIndicatorInsetsExample',
+    /* $FlowFixMe TODO(macOS GH#774): allow macOS to share iOS test */
+    module: require('../examples/ScrollView/ScrollViewIndicatorInsetsExample.ios'),
+  },
+  {
+    key: 'SectionListIndex',
+    module: require('../examples/SectionList/SectionListIndex'),
     category: 'ListView',
     supportsTVOS: true,
   },
@@ -150,6 +166,12 @@ const ComponentExamples: Array<RNTesterExample> = [
     module: require('../examples/StatusBar/StatusBarExample'),
     supportsTVOS: false,
   },
+  {
+    key: 'SwipeableCardExample',
+    module: require('../examples/SwipeableCardExample/SwipeableCardExample'),
+    category: 'UI',
+    supportsTVOS: false,
+  },
   {
     key: 'SwitchExample',
     module: require('../examples/Switch/SwitchExample'),
@@ -192,7 +214,7 @@ const ComponentExamples: Array<RNTesterExample> = [
   },
 ];
 
-const APIExamples: Array<RNTesterExample> = [
+const APIs: Array<RNTesterModuleInfo> = [
   {
     key: 'AccessibilityExample',
     module: require('../examples/Accessibility/AccessibilityExample'),
@@ -222,13 +244,13 @@ const APIExamples: Array<RNTesterExample> = [
     module: require('../examples/Alert/AlertMacOSExample'),
   }, // ]TODO(macOS GH#774)
   {
-    key: 'AnimatedExample',
-    module: require('../examples/Animated/AnimatedExample'),
+    key: 'AnimatedIndex',
+    module: require('../examples/Animated/AnimatedIndex').default,
     supportsTVOS: true,
   },
   {
     key: 'AnExApp',
-    module: require('../examples/Animated/AnimatedGratuitousApp/AnExApp'),
+    module: require('../examples/AnimatedGratuitousApp/AnExApp'),
     supportsTVOS: true,
   },
   {
@@ -377,13 +399,13 @@ const APIExamples: Array<RNTesterExample> = [
 
 const Modules: {...} = {};
 
-APIExamples.concat(ComponentExamples).forEach(Example => {
+APIs.concat(Components).forEach(Example => {
   Modules[Example.key] = Example.module;
 });
 
 const RNTesterList = {
-  APIExamples,
-  ComponentExamples,
+  APIs,
+  Components,
   Modules,
 };
 
diff --git a/packages/rn-tester/js/utils/RNTesterReducer.js b/packages/rn-tester/js/utils/RNTesterReducer.js
index a4f204e00fe1f5..dc54ab77a80881 100644
--- a/packages/rn-tester/js/utils/RNTesterReducer.js
+++ b/packages/rn-tester/js/utils/RNTesterReducer.js
@@ -8,16 +8,15 @@
  * @flow
  */
 
-'use strict';
-
 import type {RNTesterState, ComponentList} from '../types/RNTesterTypes';
 
 export const RNTesterActionsType = {
   INIT_FROM_STORAGE: 'INIT_FROM_STORAGE',
   NAVBAR_PRESS: 'NAVBAR_PRESS',
-  EXAMPLE_CARD_PRESS: 'EXAMPLE_CARD_PRESS',
   BOOKMARK_PRESS: 'BOOKMARK_PRESS',
   BACK_BUTTON_PRESS: 'BACK_BUTTON_PRESS',
+  MODULE_CARD_PRESS: 'MODULE_CARD_PRESS',
+  EXAMPLE_CARD_PRESS: 'EXAMPLE_CARD_PRESS',
 };
 
 const getUpdatedBookmarks = ({
@@ -78,19 +77,28 @@ export const RNTesterReducer = (
     case RNTesterActionsType.NAVBAR_PRESS:
       return {
         ...state,
-        openExample: null,
+        activeModuleKey: null,
+        activeModuleTitle: null,
+        activeModuleExampleKey: null,
         screen: action.data.screen,
       };
-    case RNTesterActionsType.EXAMPLE_CARD_PRESS:
+    case RNTesterActionsType.MODULE_CARD_PRESS:
       return {
         ...state,
-        openExample: action.data.key,
+        activeModuleKey: action.data.key,
+        activeModuleTitle: action.data.title,
+        activeModuleExampleKey: null,
         recentlyUsed: getUpdatedRecentlyUsed({
           exampleType: action.data.exampleType,
           key: action.data.key,
           recentlyUsed: state.recentlyUsed,
         }),
       };
+    case RNTesterActionsType.EXAMPLE_CARD_PRESS:
+      return {
+        ...state,
+        activeModuleExampleKey: action.data.key,
+      };
     case RNTesterActionsType.BOOKMARK_PRESS:
       return {
         ...state,
@@ -101,9 +109,14 @@ export const RNTesterReducer = (
         }),
       };
     case RNTesterActionsType.BACK_BUTTON_PRESS:
+      // Go back to module or list
       return {
         ...state,
-        openExample: null,
+        activeModuleExampleKey: null,
+        activeModuleKey:
+          state.activeModuleExampleKey != null ? state.activeModuleKey : null,
+        activeModuleTitle:
+          state.activeModuleExampleKey != null ? state.activeModuleTitle : null,
       };
     default:
       throw new Error(`Invalid action type ${action.type}`);
diff --git a/packages/rn-tester/js/utils/RNTesterStatePersister.js b/packages/rn-tester/js/utils/RNTesterStatePersister.js
index 8130a69c38bba9..65be7ff46f2c3f 100644
--- a/packages/rn-tester/js/utils/RNTesterStatePersister.js
+++ b/packages/rn-tester/js/utils/RNTesterStatePersister.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 const React = require('react');
 import {AsyncStorage} from 'react-native';
 
@@ -59,7 +57,11 @@ function createContainer<Props: Object, State>(
     _passSetState = (stateLamda: (state: State) => State): void => {
       this.setState(state => {
         const value = stateLamda(state.value);
-        AsyncStorage.setItem(this._cacheKey, JSON.stringify(value));
+        AsyncStorage.setItem(
+          this._cacheKey,
+          // $FlowFixMe[incompatible-call] Error surfaced when typing AsyncStorage
+          JSON.stringify(value),
+        );
         return {value};
       });
     };
diff --git a/packages/rn-tester/js/utils/testerStateUtils.js b/packages/rn-tester/js/utils/testerStateUtils.js
index 3dc729e25210e3..584bbffee73d26 100644
--- a/packages/rn-tester/js/utils/testerStateUtils.js
+++ b/packages/rn-tester/js/utils/testerStateUtils.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import {AsyncStorage} from 'react-native';
 
 import RNTesterList from './RNTesterList';
@@ -27,7 +25,9 @@ export const Screens = {
 };
 
 export const initialState: RNTesterState = {
-  openExample: null,
+  activeModuleKey: null,
+  activeModuleTitle: null,
+  activeModuleExampleKey: null,
   screen: null,
   bookmarks: null,
   recentlyUsed: null,
@@ -58,7 +58,7 @@ export const getExamplesListWithBookmarksAndRecentlyUsed = ({
     return null;
   }
 
-  const components = RNTesterList.ComponentExamples.map(componentExample => ({
+  const components = RNTesterList.Components.map(componentExample => ({
     ...componentExample,
     isBookmarked: bookmarks.components.includes(componentExample.key),
     exampleType: Screens.COMPONENTS,
@@ -74,7 +74,7 @@ export const getExamplesListWithBookmarksAndRecentlyUsed = ({
     component => component.isBookmarked,
   );
 
-  const apis = RNTesterList.APIExamples.map(apiExample => ({
+  const apis = RNTesterList.APIs.map(apiExample => ({
     ...apiExample,
     isBookmarked: bookmarks.apis.includes(apiExample.key),
     exampleType: Screens.APIS,
@@ -135,7 +135,9 @@ export const getInitialStateFromAsyncStorage = async (
 
   if (!initialStateString) {
     return {
-      openExample: null,
+      activeModuleKey: null,
+      activeModuleTitle: null,
+      activeModuleExampleKey: null,
       screen: Screens.COMPONENTS,
       bookmarks: {components: [], apis: []},
       recentlyUsed: {components: [], apis: []},
diff --git a/packages/rn-tester/js/utils/useAsyncStorageReducer.js b/packages/rn-tester/js/utils/useAsyncStorageReducer.js
index ceb8ef8eb36eec..01ff9d5cdcbedf 100644
--- a/packages/rn-tester/js/utils/useAsyncStorageReducer.js
+++ b/packages/rn-tester/js/utils/useAsyncStorageReducer.js
@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import * as React from 'react';
 import {AsyncStorage} from 'react-native';
 
diff --git a/packages/rn-tester/package.json b/packages/rn-tester/package.json
index 167fcd6bc70000..39b5b65944f459 100644
--- a/packages/rn-tester/package.json
+++ b/packages/rn-tester/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "license": "MIT",
   "description": "React Native tester app.",
-  "homepage": "https://github.com/facebook/react-native/tree/master/packages/rn-tester",
+  "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/rn-tester",
   "repository": {
     "type": "git",
     "url": "git@github.com:facebook/react-native.git",
@@ -14,7 +14,7 @@
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {
-    "react": "17.0.1",
+    "react": "17.0.2",
     "react-native": "*"
   },
   "devDependencies": {
diff --git a/packages/rn-tester/yarn.lock b/packages/rn-tester/yarn.lock
new file mode 100644
index 00000000000000..59f362f75a5cc6
--- /dev/null
+++ b/packages/rn-tester/yarn.lock
@@ -0,0 +1,1026 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
+  integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==
+  dependencies:
+    "@babel/highlight" "^7.14.5"
+
+"@babel/compat-data@^7.15.0":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
+  integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
+
+"@babel/core@^7.4.5":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10"
+  integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==
+  dependencies:
+    "@babel/code-frame" "^7.15.8"
+    "@babel/generator" "^7.15.8"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.8"
+    "@babel/helpers" "^7.15.4"
+    "@babel/parser" "^7.15.8"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.6"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.15.4", "@babel/generator@^7.15.8":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1"
+  integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==
+  dependencies:
+    "@babel/types" "^7.15.6"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-compilation-targets@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
+    semver "^6.3.0"
+
+"@babel/helper-function-name@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+  integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-get-function-arity@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+  integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-hoist-variables@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+  integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-member-expression-to-functions@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-module-imports@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+  integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-module-transforms@^7.15.8":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz#d8c0e75a87a52e374a8f25f855174786a09498b2"
+  integrity sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-simple-access" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.6"
+
+"@babel/helper-optimise-call-expression@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+  integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-replace-supers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-simple-access@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+  integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-split-export-declaration@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+  integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
+
+"@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
+"@babel/helpers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+  integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
+  dependencies:
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
+"@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.15.4", "@babel/parser@^7.15.8":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016"
+  integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==
+
+"@babel/template@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
+"@babel/traverse@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+  integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.15.4", "@babel/types@^7.15.6":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+  integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.9"
+    to-fast-properties "^2.0.0"
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+bluebird@^3.5.4:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+browserslist@^4.16.6:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.4.tgz#72e2508af2a403aec0a49847ef31bd823c57ead4"
+  integrity sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==
+  dependencies:
+    caniuse-lite "^1.0.30001265"
+    electron-to-chromium "^1.3.867"
+    escalade "^3.1.1"
+    node-releases "^2.0.0"
+    picocolors "^1.0.0"
+
+bunyan-debug-stream@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-1.1.1.tgz#4740a00b7d5c2d9d1b714925ab0802516040813e"
+  integrity sha512-jJbQ1gXUL6vMmZVdbaTFK1v1sGa7axLrSQQwkB6HU9HCPTzsw2HsKcPHm1vgXZlEck/4IvEuRwg/9+083YelCg==
+  dependencies:
+    colors "^1.0.3"
+    exception-formatter "^1.0.4"
+
+bunyan@^1.8.12:
+  version "1.8.15"
+  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46"
+  integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==
+  optionalDependencies:
+    dtrace-provider "~0.8"
+    moment "^2.19.3"
+    mv "~2"
+    safe-json-stringify "~1"
+
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+caniuse-lite@^1.0.30001265:
+  version "1.0.30001267"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001267.tgz#b1cf2937175afc0570e4615fc2d2f9069fa0ed30"
+  integrity sha512-r1mjTzAuJ9W8cPBGbbus8E0SKcUP7gn03R14Wk8FlAlqhH9hroy9nLqmpuXlfKEw/oILW+FGz47ipXV2O7x8lg==
+
+chalk@^2.0.0, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+child-process-promise@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/child-process-promise/-/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074"
+  integrity sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=
+  dependencies:
+    cross-spawn "^4.0.2"
+    node-version "^1.0.0"
+    promise-polyfill "^6.0.1"
+
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+colors@^1.0.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+connect@^3.6.5:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+convert-source-map@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cross-spawn@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^4.1.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+detox@16.7.2:
+  version "16.7.2"
+  resolved "https://registry.yarnpkg.com/detox/-/detox-16.7.2.tgz#531c98416adf52d4ba95601b669969acadafb970"
+  integrity sha512-+837eRgk4xOewXmeF5H6vOTn0RbKUFIyCi5UsTXEhvplsMk+KrrqfKik2j8fvubJkByry7HqIN/JF9jKe+meIQ==
+  dependencies:
+    "@babel/core" "^7.4.5"
+    bunyan "^1.8.12"
+    bunyan-debug-stream "^1.1.0"
+    chalk "^2.4.2"
+    child-process-promise "^2.2.0"
+    find-up "^4.1.0"
+    fs-extra "^4.0.2"
+    funpermaproxy "^1.0.1"
+    get-port "^2.1.0"
+    ini "^1.3.4"
+    lodash "^4.17.5"
+    minimist "^1.2.0"
+    proper-lockfile "^3.0.2"
+    sanitize-filename "^1.6.1"
+    shell-utils "^1.0.9"
+    tail "^2.0.0"
+    telnet-client "1.2.8"
+    tempfile "^2.0.0"
+    which "^1.3.1"
+    ws "^3.3.1"
+    yargs "^13.0.0"
+    yargs-parser "^13.0.0"
+
+dtrace-provider@~0.8:
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e"
+  integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==
+  dependencies:
+    nan "^2.14.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.867:
+  version "1.3.871"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.871.tgz#6e87365fd72037a6c898fb46050ad4be3ac9ef62"
+  integrity sha512-qcLvDUPf8DSIMWarHT2ptgcqrYg62n3vPA7vhrOF24d8UNzbUBaHu2CySiENR3nEDzYgaN60071t0F6KLYMQ7Q==
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+exception-formatter@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/exception-formatter/-/exception-formatter-1.0.7.tgz#3291616b86fceabefa97aee6a4708032c6e3b96d"
+  integrity sha512-zV45vEsjytJrwfGq6X9qd1Ll56cW4NC2mhCO6lqwMk4ZpA1fZ6C3UiaQM/X7if+7wZFmCgss3ahp9B/uVFuLRw==
+  dependencies:
+    colors "^1.0.3"
+
+finalhandler@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+fs-extra@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+funpermaproxy@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/funpermaproxy/-/funpermaproxy-1.0.1.tgz#4650e69b7c334d9717c06beba9b339cc08ac3335"
+  integrity sha512-9pEzs5vnNtR7ZGihly98w/mQ7blsvl68Wj30ZCDAXy7qDN4CWLLjdfjtH/P2m6whsnaJkw15hysCNHMXue+wdA==
+
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-port@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a"
+  integrity sha1-h4P53OvR7qSVozThpqJR54iHqxo=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+glob@^6.0.1:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+json5@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lodash@4.x.x, lodash@^4.17.5:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lru-cache@^4.0.1:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+"minimatch@2 || 3":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+mkdirp@~0.5.1:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+moment@^2.19.3:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+mv@~2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
+  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=
+  dependencies:
+    mkdirp "~0.5.1"
+    ncp "~2.0.0"
+    rimraf "~2.4.0"
+
+nan@^2.14.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
+  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
+
+ncp@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
+
+node-releases@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.0.tgz#67dc74903100a7deb044037b8a2e5f453bb05400"
+  integrity sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA==
+
+node-version@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d"
+  integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==
+
+nullthrows@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
+  integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+p-limit@^2.0.0, p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+promise-polyfill@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
+  integrity sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=
+
+proper-lockfile@^3.0.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-3.2.0.tgz#89ca420eea1d55d38ca552578851460067bcda66"
+  integrity sha512-iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==
+  dependencies:
+    graceful-fs "^4.1.11"
+    retry "^0.12.0"
+    signal-exit "^3.0.2"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
+rimraf@~2.4.0:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
+  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+  dependencies:
+    glob "^6.0.1"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-json-stringify@~1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
+  integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
+
+sanitize-filename@^1.6.1:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
+  integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
+  dependencies:
+    truncate-utf8-bytes "^1.0.0"
+
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+shell-utils@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/shell-utils/-/shell-utils-1.0.10.tgz#7fe7b8084f5d6d21323d941267013bc38aed063e"
+  integrity sha512-p1xuqhj3jgcXiV8wGoF1eL/NOvapN9tyGDoObqKwvZTUZn7fIzK75swLTEHfGa7sObeN9vxFplHw/zgYUYRTsg==
+  dependencies:
+    lodash "4.x.x"
+
+signal-exit@^3.0.2:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f"
+  integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
+
+source-map@^0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+tail@^2.0.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.4.tgz#90dd4c5a174a3fa39dcb65a1df1950a4a0093a41"
+  integrity sha512-PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ==
+
+telnet-client@1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/telnet-client/-/telnet-client-1.2.8.tgz#946c0dadc8daa3f19bb40a3e898cb870403a4ca4"
+  integrity sha512-W+w4k3QAmULVNhBVT2Fei369kGZCh/TH25M7caJAXW+hLxwoQRuw0di3cX4l0S9fgH3Mvq7u+IFMoBDpEw/eIg==
+  dependencies:
+    bluebird "^3.5.4"
+
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
+
+tempfile@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
+  integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU=
+  dependencies:
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+truncate-utf8-bytes@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
+  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+  dependencies:
+    utf8-byte-length "^1.0.1"
+
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+utf8-byte-length@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
+  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.0.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@^1.2.9, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+ws@^3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
+
+ws@^6.1.4:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
+  dependencies:
+    async-limiter "~1.0.0"
+
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yargs-parser@^13.0.0, yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@^13.0.0:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
diff --git a/react.gradle b/react.gradle
index 5995ad5fbb328a..ff46476cacc7a6 100644
--- a/react.gradle
+++ b/react.gradle
@@ -28,17 +28,11 @@ def detectCliPath(config) {
     if (config.cliPath) {
         return config.cliPath
     }
-
-    def cliPath = ["node", "-e", "console.log(require('react-native/cli').bin);"].execute([], projectDir).text.trim()
-
-    if (cliPath) {
-        return cliPath
-    } else if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
+    if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
         return "${projectDir}/../../node_modules/react-native/cli.js"
-    } else {
-        throw new Exception("Couldn't determine CLI location. " +
-            "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
     }
+    throw new Exception("Couldn't determine CLI location. " +
+             "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
 }
 
 def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"
@@ -159,12 +153,21 @@ afterEvaluate {
             def devEnabled = !(config."devDisabledIn${targetName}"
                 || targetName.toLowerCase().contains("release"))
 
-            def extraArgs = config.extraPackagerArgs ?: [];
+            def extraArgs = []
 
             if (bundleConfig) {
-                extraArgs = extraArgs.clone()
-                extraArgs.add("--config");
-                extraArgs.add(bundleConfig);
+                extraArgs.add("--config")
+                extraArgs.add(bundleConfig)
+            }
+
+            // Hermes doesn't require JS minification.
+            if (enableHermes && !devEnabled) {
+                extraArgs.add("--minify")
+                extraArgs.add("false")
+            }
+
+            if (config.extraPackagerArgs) {
+                extraArgs.addAll(config.extraPackagerArgs)
             }
 
             commandLine(*execCommand, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
@@ -281,18 +284,24 @@ afterEvaluate {
                 into(file(config."jsBundleDir${targetName}"))
             } else {
                 into ("$buildDir/intermediates")
-                into ("assets/${targetPath}") {
-                    from(jsBundleDir)
-                }
+                if (isAndroidLibrary) {
+                    into ("library_assets/${variant.name}/out") {
+                        from(jsBundleDir)
+                    }
+                } else {
+                    into ("assets/${targetPath}") {
+                        from(jsBundleDir)
+                    }
 
-                // Workaround for Android Gradle Plugin 3.2+ new asset directory
-                into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
-                    from(jsBundleDir)
-                }
+                    // Workaround for Android Gradle Plugin 3.2+ new asset directory
+                    into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
+                        from(jsBundleDir)
+                    }
 
-                // Workaround for Android Gradle Plugin 3.4+ new asset directory
-                into ("merged_assets/${variant.name}/out") {
-                    from(jsBundleDir)
+                    // Workaround for Android Gradle Plugin 3.4+ new asset directory
+                    into ("merged_assets/${variant.name}/out") {
+                        from(jsBundleDir)
+                    }
                 }
             }
 
@@ -300,6 +309,7 @@ afterEvaluate {
             dependsOn(variant.mergeAssetsProvider.get())
 
             enabled(currentBundleTask.enabled)
+            dependsOn(currentBundleTask)
         }
 
         // mergeResources task runs before the bundle file is copied to the intermediate asset directory from Android plugin 4.1+.
@@ -315,7 +325,7 @@ afterEvaluate {
         // Delete the VM related libraries that this build doesn't need.
         // The application can manage this manually by setting 'enableVmCleanup: false'
         //
-        // This should really be done by packaging all Hermes releated libs into
+        // This should really be done by packaging all Hermes related libs into
         // two separate HermesDebug and HermesRelease AARs, but until then we'll
         // kludge it by deleting the .so files out of the /transforms/ directory.
         def isRelease = targetName.toLowerCase().contains("release")
@@ -349,8 +359,7 @@ afterEvaluate {
         }
 
         if (enableVmCleanup) {
-            def task = tasks.findByName("package${targetName}")
-            task.doFirst(vmSelectionAction)
+            packageTask.doFirst(vmSelectionAction)
         }
     }
 }
diff --git a/repo-config/package.json b/repo-config/package.json
index 58d11fae5c7513..d8369d13787a54 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -9,19 +9,22 @@
     "url": "git@github.com:facebook/react-native.git"
   },
   "dependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/generator": "^7.5.0",
+    "@babel/core": "^7.14.0",
+    "@babel/generator": "^7.14.0",
+    "@babel/template": "^7.0.0",
+    "@babel/types": "^7.0.0",
     "@react-native-community/eslint-plugin": "*",
     "@reactions/component": "^2.0.2",
     "@typescript-eslint/eslint-plugin": "4.30.0",
     "@typescript-eslint/parser": "4.30.0",
     "async": "^2.4.0",
     "babel-eslint": "^10.1.0",
+    "babel-preset-fbjs": "^3.4.0",
     "clang-format": "^1.2.4",
     "connect": "^3.6.5",
     "coveralls": "^3.0.2",
     "detox": "16.7.2",
-    "eslint": "6.8.0",
+    "eslint": "7.12.0",
     "eslint-config-fb-strict": "^24.9.0",
     "eslint-config-fbjs": "2.1.0",
     "eslint-config-prettier": "^6.0.0",
@@ -32,20 +35,20 @@
     "eslint-plugin-jsx-a11y": "6.2.1",
     "eslint-plugin-prettier": "2.6.2",
     "eslint-plugin-react": "7.21.5",
-    "eslint-plugin-react-hooks": "^4.0.7",
-    "eslint-plugin-react-native": "3.8.1",
-    "eslint-plugin-relay": "1.7.1",
-    "flow-bin": "^0.137.0",
-    "flow-remove-types": "1.2.3",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-react-native": "3.10.0",
+    "eslint-plugin-relay": "1.8.1",
+    "flow-bin": "^0.158.0",
     "hermes-engine-darwin": "~0.5.0",
-    "jest": "^26.5.2",
+    "jest": "^26.6.3",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.11.0",
+    "metro-transform-plugins": "^0.66.0",
     "mkdirp": "^0.5.1",
     "prettier": "1.19.1",
-    "react": "17.0.1",
+    "react": "17.0.2",
     "react-shallow-renderer": "16.14.1",
-    "react-test-renderer": "17.0.1",
+    "react-test-renderer": "17.0.2",
     "shelljs": "^0.7.8",
     "signedsource": "^1.0.0",
     "typescript": "4.4.2",
diff --git a/scripts/.tests.env b/scripts/.tests.env
index d01ca84fbd5b9f..defef2eb98a249 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -4,7 +4,7 @@
 
 ## ANDROID ##
 # Android SDK Build Tools revision
-export ANDROID_SDK_BUILD_TOOLS_REVISION=29.0.3
+export ANDROID_SDK_BUILD_TOOLS_REVISION=30.0.2
 # Android API Level we build with
 export ANDROID_SDK_BUILD_API_LEVEL="28"
 # Google APIs for Android level
@@ -24,7 +24,7 @@ export AVD_ABI=x86
 export ANDROID_DISABLE_AVD_TESTS=1
 
 ## IOS ##
-export IOS_TARGET_OS="14.1"
+export IOS_TARGET_OS="latest"
 export IOS_DEVICE="iPhone 8"
 export SDK_IOS="iphonesimulator"
 
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
index 9107380bdedb04..96306ac5ed57a9 100755
--- a/scripts/bump-oss-version.js
+++ b/scripts/bump-oss-version.js
@@ -144,10 +144,12 @@ fs.writeFileSync(
 
 let packageJson = JSON.parse(cat('package.json'));
 packageJson.version = version;
-if (!rnmpublish) {
-  delete packageJson.workspaces;
-  delete packageJson.private;
-}
+delete packageJson.workspaces;
+delete packageJson.private;
+
+// Copy dependencies over from repo-config/package.json
+const repoConfigJson = JSON.parse(cat('repo-config/package.json'));
+packageJson.devDependencies = {...packageJson.devDependencies, ...repoConfigJson.dependencies};
 fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2), 'utf-8');
 
 // Change ReactAndroid/gradle.properties
@@ -167,23 +169,37 @@ if (
 exec(`node scripts/set-rn-template-version.js ${version}`);
 
 // Verify that files changed, we just do a git diff and check how many times version is added across files
+const filesToValidate = [
+  'package.json',
+  'ReactAndroid/gradle.properties',
+  'template/package.json',
+];
 let numberOfChangedLinesWithNewVersion = exec(
-  `git diff -U0 | grep '^[+]' | grep -c ${version} `,
+  `git diff -U0 ${filesToValidate.join(' ')}| grep '^[+]' | grep -c ${version} `,
   {silent: true},
 ).stdout.trim();
 
 // Release builds should commit the version bumps, and create tags.
 // Nightly builds do not need to do that.
-if (!nightlyBuild && !rnmpublish) {
-  if (+numberOfChangedLinesWithNewVersion !== 3) {
+if (!nightlyBuild) {
+  if (+numberOfChangedLinesWithNewVersion !== filesToValidate.length) {
     echo(
-      'Failed to update all the files. package.json and gradle.properties must have versions in them',
+      `Failed to update all the files: [${filesToValidate.join(', ')}] must have versions in them`,
     );
     echo('Fix the issue, revert and try again');
     exec('git diff');
     exit(1);
   }
 
+  // Update Podfile.lock only on release builds, not nightly.
+  // Nightly builds don't need it as the main branch will already be up-to-date.
+  echo('Updating RNTester Podfile.lock...');
+  if (exec('source scripts/update_podfile_lock.sh && update_pods').code) {
+    echo('Failed to update RNTester Podfile.lock.');
+    echo('Fix the issue, revert and try again.');
+    exit(1);
+  }
+
   // Make commit [0.21.0-rc] Bump version numbers
   if (exec(`git commit -a -m "[${version}] Bump version numbers"`).code) {
     echo('failed to commit');
diff --git a/scripts/circleci/analyze_code.sh b/scripts/circleci/analyze_code.sh
index fbf02e7668b2d8..a2eda88385bcb5 100755
--- a/scripts/circleci/analyze_code.sh
+++ b/scripts/circleci/analyze_code.sh
@@ -9,7 +9,7 @@ GITHUB_REPO=${CIRCLE_PROJECT_REPONAME:-react-native}
 export GITHUB_OWNER
 export GITHUB_REPO
 
-cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow-check-ios --silent --json; echo flow; npm run flow-check-android --silent --json) | GITHUB_PR_NUMBER="$CIRCLE_PR_NUMBER" node bots/code-analysis-bot.js
+cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow-check-ios --silent --json; echo flow; npm run flow-check-android --silent --json; echo google-java-format; node scripts/lint-java.js --diff) | GITHUB_PR_NUMBER="$CIRCLE_PR_NUMBER" node bots/code-analysis-bot.js
 
 STATUS=$?
 if [ $STATUS == 0 ]; then
diff --git a/scripts/circleci/buck_fetch.sh b/scripts/circleci/buck_fetch.sh
index 5c4ca33a45bd1f..d012c4ea057a20 100755
--- a/scripts/circleci/buck_fetch.sh
+++ b/scripts/circleci/buck_fetch.sh
@@ -6,8 +6,44 @@
 
 set -ex
 
-buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
-buck fetch ReactAndroid/src/main/java/com/facebook/react
-buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
-buck fetch ReactAndroid/src/test/...
-buck fetch ReactAndroid/src/androidTest/...
+# Source: https://gist.github.com/sj26/88e1c6584397bb7c13bd11108a579746
+# Modified to 1) address lint errors and 2) output to stderr.
+#
+# Retry a command up to a specific numer of times until it exits successfully,
+# with exponential back off.
+#
+#  $ retry 5 echo Hello
+#  Hello
+#
+#  $ retry 5 false
+#  Retry 1/5 exited 1, retrying in 1 seconds...
+#  Retry 2/5 exited 1, retrying in 2 seconds...
+#  Retry 3/5 exited 1, retrying in 4 seconds...
+#  Retry 4/5 exited 1, retrying in 8 seconds...
+#  Retry 5/5 exited 1, no more retries left.
+#
+function retry {
+  local retries=$1
+  shift
+
+  local count=0
+  until "$@"; do
+    exit=$?
+    wait=$((2 ** count))
+    count=$((count + 1))
+    if [ $count -lt "$retries" ]; then
+      echo "Retry $count/$retries exited $exit, retrying in $wait seconds..." >&2
+      sleep $wait
+    else
+      echo "Retry $count/$retries exited $exit, no more retries left." >&2
+      return $exit
+    fi
+  done
+  return 0
+}
+
+retry 3 buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
+retry 3 buck fetch ReactAndroid/src/main/java/com/facebook/react
+retry 3 buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
+retry 3 buck fetch ReactAndroid/src/test/...
+retry 3 buck fetch ReactAndroid/src/androidTest/...
diff --git a/scripts/circleci/gradle_download_deps.sh b/scripts/circleci/gradle_download_deps.sh
index dd3d781dc926e9..1413f6dc83f496 100755
--- a/scripts/circleci/gradle_download_deps.sh
+++ b/scripts/circleci/gradle_download_deps.sh
@@ -6,4 +6,4 @@
 
 set -e
 
-./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
+./gradlew :ReactAndroid:downloadNdkBuildDependencies
diff --git a/scripts/codegen.js b/scripts/codegen.js
new file mode 100644
index 00000000000000..12ff0917dd6642
--- /dev/null
+++ b/scripts/codegen.js
@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+'use strict';
+
+require('shelljs/global');
+const yargs = require('yargs');
+const execSync = require('child_process').execSync;
+
+let argv = yargs.option('srcs', {
+    alias: 'srcs_dir',
+    type: 'string',
+    description: 'Path to JavaScript sources',
+}).option('modules_library_name', {
+    type: 'string',
+    description: 'Native modules interfaces library name',
+}).option('modules_output_dir', {
+    type: 'string',
+    description: 'Native modules interfaces output dir',
+}).option('components_library_name', {
+    type: 'string',
+    description: 'Native components interfaces library name',
+}).option('components_output_dir', {
+    type: 'string',
+    description: 'Native components interfaces output dir',
+}).argv;
+
+let env_vars = [];
+const { srcs_dir, modules_library_name, modules_output_dir, components_library_name, components_output_dir } = argv;
+
+if (srcs_dir) {
+    env_vars.push(`SRCS_DIR=${srcs_dir}`);
+}
+if (modules_library_name) {
+    env_vars.push(`MODULES_LIBRARY_NAME=${modules_library_name}`);
+}
+if (modules_output_dir) {
+    env_vars.push(`MODULES_OUTPUT_DIR=${modules_output_dir}`);
+}
+if (components_library_name) {
+    env_vars.push(`COMPONENTS_LIBRARY_NAME=${components_library_name}`);
+}
+if (components_output_dir) {
+    env_vars.push(`COMPONENTS_OUTPUT_DIR=${components_output_dir}`);
+}
+
+execSync(`${env_vars.join(' ')} ./generate-specs.sh`);
diff --git a/scripts/find-node.sh b/scripts/find-node.sh
new file mode 100755
index 00000000000000..c498ba617a29fe
--- /dev/null
+++ b/scripts/find-node.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+set -e
+
+# Support Homebrew on M1
+HOMEBREW_M1_BIN=/opt/homebrew/bin
+if [[ -d $HOMEBREW_M1_BIN && ! $PATH =~ $HOMEBREW_M1_BIN ]]; then
+  export PATH="$HOMEBREW_M1_BIN:$PATH"
+fi
+
+# Define NVM_DIR and source the nvm.sh setup script
+[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
+
+if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
+  # shellcheck source=/dev/null
+  . "$HOME/.nvm/nvm.sh"
+elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
+  # shellcheck source=/dev/null
+  . "$(brew --prefix nvm)/nvm.sh"
+fi
+
+# Set up the nodenv node version manager if present
+if [[ -x "$HOME/.nodenv/bin/nodenv" ]]; then
+  eval "$("$HOME/.nodenv/bin/nodenv" init -)"
+elif [[ -x "$(command -v brew)" && -x "$(brew --prefix nodenv)/bin/nodenv" ]]; then
+  eval "$("$(brew --prefix nodenv)/bin/nodenv" init -)"
+fi
+
+# Set up the ndenv of anyenv if preset
+if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
+  export PATH=${HOME}/.anyenv/bin:${PATH}
+  if [[ "$(anyenv envs | grep -c ndenv )" -eq 1 ]]; then
+    eval "$(anyenv init -)"
+  fi
+fi
diff --git a/scripts/generate-native-modules-specs.sh b/scripts/generate-native-modules-specs.sh
deleted file mode 100755
index b9b71b33134743..00000000000000
--- a/scripts/generate-native-modules-specs.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-# This script collects the JavaScript spec definitions for core
-# native modules, then uses react-native-codegen to generate
-# native code.
-# The script will use the local react-native-codegen package by
-# default. Optionally, set the CODEGEN_PATH to point to the
-# desired codegen library (e.g. when using react-native-codegen
-# from npm).
-#
-# Usage:
-#   ./scripts/generate-native-modules-specs.sh
-#
-# Example:
-#  CODEGEN_PATH=.. ./scripts/generate-native-modules-specs.sh
-
-# shellcheck disable=SC2038
-
-set -e
-
-THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
-TEMP_DIR=$(mktemp -d /tmp/react-native-codegen-XXXXXXXX)
-RN_DIR=$(cd "$THIS_DIR/.." && pwd)
-CODEGEN_PATH="${CODEGEN_PATH:-$(cd "$RN_DIR/packages/react-native-codegen" && pwd)}"
-YARN_BINARY="${YARN_BINARY:-$(command -v yarn)}"
-
-cleanup () {
-  set +e
-  rm -rf "$TEMP_DIR"
-  set -e
-}
-
-describe () {
-  printf "\\n\\n>>>>> %s\\n\\n\\n" "$1"
-}
-
-run_codegen () {
-  SRCS_DIR=$1
-  LIBRARY_NAME=$2
-  OUTPUT_DIR=$3
-
-  SCHEMA_FILE="$TEMP_DIR/schema-$LIBRARY_NAME.json"
-
-  if [ ! -d "$CODEGEN_PATH/lib" ]; then
-    describe "Building react-native-codegen package"
-    pushd "$CODEGEN_PATH" >/dev/null || exit
-      "$YARN_BINARY"
-      "$YARN_BINARY" build
-    popd >/dev/null || exit
-  fi
-
-  describe "Generating schema from flow types"
-  "$YARN_BINARY" node "$CODEGEN_PATH/lib/cli/combine/combine-js-to-schema-cli.js" "$SCHEMA_FILE" "$SRCS_DIR"
-
-  describe "Generating native code from schema (iOS)"
-  pushd "$RN_DIR" >/dev/null || exit
-    "$YARN_BINARY" --silent node scripts/generate-native-modules-specs-cli.js ios "$SCHEMA_FILE" "$OUTPUT_DIR"
-  popd >/dev/null || exit
-}
-
-# Handle Core Modules
-run_codegen_core_modules () {
-  LIBRARY_NAME="FBReactNativeSpec"
-  SRCS_DIR=$(cd "$RN_DIR/Libraries" && pwd)
-  OUTPUT_DIR="$SRCS_DIR/$LIBRARY_NAME/$LIBRARY_NAME"
-
-  run_codegen "$SRCS_DIR" "$LIBRARY_NAME" "$OUTPUT_DIR"
-}
-
-main() {
-  run_codegen_core_modules
-}
-
-trap cleanup EXIT
-main "$@"
diff --git a/scripts/generate-rncore.sh b/scripts/generate-rncore.sh
deleted file mode 100755
index 5e67d91c812302..00000000000000
--- a/scripts/generate-rncore.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-# This script collects the "core" component schemas used by fabric
-# then uses react-native-codegen to generate the component headers
-# to a location that the podspecs expect.
-
-# shellcheck disable=SC2038
-
-find "$PWD/../Libraries" -name "*NativeComponent.js" -print | xargs yarn flow-node packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js schema-rncore.json
-yarn flow-node packages/react-native-codegen/buck_tests/generate-tests.js schema-rncore.json rncore ReactCommon/fabric/components/rncore rncore
diff --git a/scripts/generate-native-modules-specs-cli.js b/scripts/generate-specs-cli.js
similarity index 65%
rename from scripts/generate-native-modules-specs-cli.js
rename to scripts/generate-specs-cli.js
index 257ecc84126bac..427eff561044ed 100644
--- a/scripts/generate-native-modules-specs-cli.js
+++ b/scripts/generate-specs-cli.js
@@ -11,9 +11,9 @@
 
 let RNCodegen;
 try {
-  RNCodegen = require('react-native-codegen/lib/generators/RNCodegen.js');
-} catch (e) {
   RNCodegen = require('../packages/react-native-codegen/lib/generators/RNCodegen.js');
+} catch (e) {
+  RNCodegen = require('react-native-codegen/lib/generators/RNCodegen.js');
   if (!RNCodegen) {
     throw 'RNCodegen not found.';
   }
@@ -24,8 +24,8 @@ const mkdirp = require('mkdirp');
 const path = require('path');
 
 const GENERATORS = {
-  android: ['modulesAndroid'],
-  ios: ['modulesIOS'],
+  android: ['componentsAndroid', 'modulesAndroid'],
+  ios: ['componentsIOS', 'modulesIOS'],
 };
 
 function generateSpec(
@@ -35,7 +35,6 @@ function generateSpec(
   libraryName,
   packageName,
 ) {
-  const moduleSpecName = libraryName;
   const schemaText = fs.readFileSync(schemaPath, 'utf-8');
 
   if (schemaText == null) {
@@ -43,13 +42,7 @@ function generateSpec(
   }
 
   if (!outputDirectory) {
-    outputDirectory = path.resolve(
-      __dirname,
-      '..',
-      'Libraries',
-      libraryName,
-      moduleSpecName,
-    );
+    outputDirectory = path.resolve(__dirname, '..', 'Libraries', libraryName);
   }
   mkdirp.sync(outputDirectory);
 
@@ -65,13 +58,27 @@ function generateSpec(
       libraryName,
       schema,
       outputDirectory,
-      moduleSpecName,
       packageName,
     },
     {
       generators: GENERATORS[platform],
     },
   );
+
+  if (platform === 'android') {
+    // Move all components C++ files to a structured jni folder for now.
+    // Note: this should've been done by RNCodegen's generators, but:
+    // * the generators don't support platform option yet
+    // * this subdir structure is Android-only, not applicable to iOS
+    const files = fs.readdirSync(outputDirectory);
+    const jniOutputDirectory = `${outputDirectory}/jni/react/renderer/components/${libraryName}`;
+    mkdirp.sync(jniOutputDirectory);
+    files
+      .filter(f => f.endsWith('.h') || f.endsWith('.cpp'))
+      .forEach(f => {
+        fs.renameSync(`${outputDirectory}/${f}`, `${jniOutputDirectory}/${f}`);
+      });
+  }
 }
 
 function main() {
diff --git a/scripts/generate-specs.sh b/scripts/generate-specs.sh
new file mode 100755
index 00000000000000..4456557dfbb6cb
--- /dev/null
+++ b/scripts/generate-specs.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# This script collects the JavaScript spec definitions for core
+# native modules and components, then uses react-native-codegen
+# to generate native code.
+#
+# Optionally, set these envvars to override defaults:
+# - SRCS_DIR: Path to JavaScript sources
+# - MODULES_LIBRARY_NAME: Defaults to FBReactNativeSpec
+# - MODULES_OUTPUT_DIR: Defaults to React/$MODULES_LIBRARY_NAME/$MODULES_LIBRARY_NAME
+# - COMPONENTS_LIBRARY_NAME: Defaults to rncore
+# - COMPONENTS_OUTPUT_DIR: Defaults to ReactCommon/react/renderer/components/$COMPONENTS_LIBRARY_NAME
+#
+# Usage:
+#   ./scripts/generate-specs.sh
+#   SRCS_DIR=myapp/js MODULES_LIBRARY_NAME=MySpecs MODULES_OUTPUT_DIR=myapp/MySpecs ./scripts/generate-specs.sh
+#
+
+# shellcheck disable=SC2038
+
+set -e
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+TEMP_DIR=$(mktemp -d /tmp/react-native-codegen-XXXXXXXX)
+RN_DIR=$(cd "$THIS_DIR/.." && pwd)
+
+# Find path to Node
+# shellcheck source=/dev/null
+source "$RN_DIR/scripts/find-node.sh"
+
+NODE_BINARY="${NODE_BINARY:-$(command -v node || true)}"
+
+cleanup () {
+  set +e
+  rm -rf "$TEMP_DIR"
+  set -e
+}
+
+describe () {
+  printf "\\n\\n>>>>> %s\\n\\n\\n" "$1" >&2
+}
+
+main() {
+  SRCS_DIR=${SRCS_DIR:-$(cd "$RN_DIR/Libraries" && pwd)}
+  MODULES_LIBRARY_NAME=${MODULES_LIBRARY_NAME:-FBReactNativeSpec}
+
+  COMPONENTS_LIBRARY_NAME=${COMPONENTS_LIBRARY_NAME:-rncore}
+  MODULES_OUTPUT_DIR=${MODULES_OUTPUT_DIR:-"$RN_DIR/React/$MODULES_LIBRARY_NAME/$MODULES_LIBRARY_NAME"}
+  # TODO: $COMPONENTS_PATH should be programmatically specified, and may change with use_frameworks! support.
+  COMPONENTS_PATH="ReactCommon/react/renderer/components"
+  COMPONENTS_OUTPUT_DIR=${COMPONENTS_OUTPUT_DIR:-"$RN_DIR/$COMPONENTS_PATH/$COMPONENTS_LIBRARY_NAME"}
+
+  TEMP_OUTPUT_DIR="$TEMP_DIR/out"
+  SCHEMA_FILE="$TEMP_DIR/schema.json"
+
+  CODEGEN_REPO_PATH="$RN_DIR/packages/react-native-codegen"
+  CODEGEN_NPM_PATH="$RN_DIR/../react-native-codegen"
+
+  if [ -z "$NODE_BINARY" ]; then
+    echo "Error: Could not find node. Make sure it is in bash PATH or set the NODE_BINARY environment variable." 1>&2
+    exit 1
+  fi
+
+  if [ -d "$CODEGEN_REPO_PATH" ]; then
+    CODEGEN_PATH=$(cd "$CODEGEN_REPO_PATH" && pwd)
+  elif [ -d "$CODEGEN_NPM_PATH" ]; then
+    CODEGEN_PATH=$(cd "$CODEGEN_NPM_PATH" && pwd)
+  else
+    echo "Error: Could not determine react-native-codegen location. Try running 'yarn install' or 'npm install' in your project root." 1>&2
+    exit 1
+  fi
+
+  if [ ! -d "$CODEGEN_PATH/lib" ]; then
+    describe "Building react-native-codegen package"
+    bash "$CODEGEN_PATH/scripts/oss/build.sh"
+  fi
+
+  describe "Generating schema from Flow types"
+  "$NODE_BINARY" "$CODEGEN_PATH/lib/cli/combine/combine-js-to-schema-cli.js" "$SCHEMA_FILE" "$SRCS_DIR"
+
+  describe "Generating native code from schema (iOS)"
+  pushd "$RN_DIR" >/dev/null || exit 1
+    "$NODE_BINARY" scripts/generate-specs-cli.js ios "$SCHEMA_FILE" "$TEMP_OUTPUT_DIR" "$MODULES_LIBRARY_NAME"
+  popd >/dev/null || exit 1
+
+  mkdir -p "$COMPONENTS_OUTPUT_DIR" "$MODULES_OUTPUT_DIR"
+  cp -R "$TEMP_OUTPUT_DIR/$MODULES_LIBRARY_NAME.h" "$TEMP_OUTPUT_DIR/$MODULES_LIBRARY_NAME-generated.mm" "$MODULES_OUTPUT_DIR" || exit 1
+  find "$TEMP_OUTPUT_DIR" -type f | xargs sed -i.bak "s/$MODULES_LIBRARY_NAME/$COMPONENTS_LIBRARY_NAME/g" || exit 1
+  find "$TEMP_OUTPUT_DIR" -type f -not -iname "$MODULES_LIBRARY_NAME*" -exec cp '{}' "$COMPONENTS_OUTPUT_DIR/" ';' || exit 1
+
+  echo >&2 'Done.'
+}
+
+trap cleanup EXIT
+main "$@"
diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh
index 9642c5322d48b5..dd79583976ba36 100755
--- a/scripts/ios-configure-glog.sh
+++ b/scripts/ios-configure-glog.sh
@@ -16,7 +16,7 @@ if [ -z "$CURRENT_ARCH" ] || [ "$CURRENT_ARCH" == "undefined_arch" ]; then
     if [[ "$PLATFORM_NAME" == *"simulator"* ]]; then
         CURRENT_ARCH="x86_64"
     else
-        CURRENT_ARCH="armv7"
+        CURRENT_ARCH="arm64"
     fi
 fi
 
diff --git a/scripts/lint-java.js b/scripts/lint-java.js
new file mode 100644
index 00000000000000..82e07bb6eda5e8
--- /dev/null
+++ b/scripts/lint-java.js
@@ -0,0 +1,205 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+'use strict';
+
+const {exec} = require('shelljs');
+const https = require('https');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const yargs = require('yargs');
+
+const googleJavaFormatUrl =
+  'https://github.com/google/google-java-format/releases/download/google-java-format-1.7/google-java-format-1.7-all-deps.jar';
+const googleJavaFormatPath = path.join(
+  os.tmpdir(),
+  'google-java-format-all-deps.jar',
+);
+const javaFilesCommand = 'find ./ReactAndroid -name "*.java"';
+
+function _download(url, downloadPath, resolve, reject, redirectCount) {
+  https.get(url, response => {
+    switch (response.statusCode) {
+      case 302: //Permanent Redirect
+        if (redirectCount === 0) {
+          throw new Error(
+            `Unhandled response code (HTTP${response.statusCode}) while retrieving google-java-format binary from ${url}`,
+          );
+        }
+
+        _download(
+          response.headers.location,
+          downloadPath,
+          resolve,
+          reject,
+          redirectCount - 1,
+        );
+        break;
+      case 200: //OK
+        const file = fs.createWriteStream(downloadPath);
+
+        response.pipe(file);
+        file.on('finish', () => file.close(() => resolve()));
+        break;
+      default:
+        reject(
+          `Unhandled response code (HTTP${response.statusCode}) while retrieving google-java-format binary from ${url}`,
+        );
+    }
+  });
+}
+
+function download(url, downloadPath) {
+  return new Promise((resolve, reject) => {
+    _download(url, downloadPath, resolve, reject, 1);
+  });
+}
+
+function filesWithLintingIssues() {
+  const proc = exec(
+    `java -jar ${googleJavaFormatPath} --dry-run $(${javaFilesCommand})`,
+    {silent: true},
+  );
+
+  if (proc.code !== 0) {
+    throw new Error(proc.stderr);
+  }
+
+  return proc.stdout.split('\n').filter(x => x);
+}
+
+function unifiedDiff(file) {
+  const lintedProc = exec(
+    `java -jar ${googleJavaFormatPath} --set-exit-if-changed ${file}`,
+    {silent: true},
+  );
+
+  //Exit code 1 indicates lint violations, which is what we're expecting
+  if (lintedProc.code !== 1) {
+    throw new Error(lintedProc.stderr);
+  }
+
+  const diffProc = lintedProc.exec(`diff -U 0 ${file} -`, {silent: true});
+
+  //Exit code 0 if inputs are the same, 1 if different, 2 if trouble.
+  if (diffProc.code !== 0 && diffProc.code !== 1) {
+    throw new Error(diffProc.stderr);
+  }
+
+  return {
+    file,
+    diff: diffProc.stdout,
+  };
+}
+
+function extractRangeInformation(range) {
+  //eg;
+  //  @@ -54 +54,2 @@
+  //  @@ -1,3 +1,9 @@
+
+  const regex = /^@@ [-+](\d+,?\d+) [-+](\d+,?\d+) @@$/;
+  const match = regex.exec(range);
+
+  if (match) {
+    const original = match[1].split(',');
+    const updated = match[2].split(',');
+
+    return {
+      original: {
+        line: parseInt(original[0], 10),
+        lineCount: parseInt(original[1], 10) || 1,
+      },
+      updated: {
+        line: parseInt(updated[0], 10),
+        lineCount: parseInt(updated[1], 10) || 1,
+      },
+    };
+  }
+}
+
+function parseChanges(file, diff) {
+  let group = null;
+  const groups = [];
+
+  diff.split('\n').forEach(line => {
+    const range = extractRangeInformation(line);
+
+    if (range) {
+      group = {
+        range,
+        description: [line],
+      };
+      groups.push(group);
+    } else if (group) {
+      group.description.push(line);
+    }
+  });
+
+  return groups.map(x => ({
+    file,
+    line: x.range.original.line,
+    lineCount: x.range.original.lineCount,
+    description: x.description.join('\n'),
+  }));
+}
+
+async function main() {
+  const {argv} = yargs
+    .scriptName('lint-java')
+    .usage('Usage: $0 [options]')
+    .command(
+      '$0',
+      'Downloads the google-java-format package and reformats Java source code to comply with Google Java Style.\n\nSee https://github.com/google/google-java-format',
+    )
+    .option('check', {
+      type: 'boolean',
+      description:
+        'Outputs a list of files with lint violations.\nExit code is set to 1 if there are violations, otherwise 0.\nDoes not reformat lint issues.',
+    })
+    .option('diff', {
+      type: 'boolean',
+      description:
+        'Outputs a diff of the lint fix changes in json format.\nDoes not reformat lint issues.',
+    });
+
+  await download(googleJavaFormatUrl, googleJavaFormatPath);
+
+  if (argv.check) {
+    const files = filesWithLintingIssues();
+
+    files.forEach(x => console.log(x));
+
+    process.exit(files.length === 0 ? 0 : 1);
+
+    return;
+  }
+
+  if (argv.diff) {
+    const suggestions = filesWithLintingIssues()
+      .map(unifiedDiff)
+      .filter(x => x)
+      .map(x => parseChanges(x.file, x.diff))
+      .reduce((accumulator, current) => accumulator.concat(current), []);
+
+    console.log(JSON.stringify(suggestions));
+
+    return;
+  }
+
+  const proc = exec(
+    `java -jar ${googleJavaFormatPath} --set-exit-if-changed --replace $(${javaFilesCommand})`,
+  );
+
+  process.exit(proc.code);
+}
+
+(async () => {
+  await main();
+})();
diff --git a/scripts/publish-npm.js b/scripts/publish-npm.js
index 6107a9efd2a1a6..954eaaf7c77a12 100644
--- a/scripts/publish-npm.js
+++ b/scripts/publish-npm.js
@@ -137,7 +137,7 @@ exec('git checkout ReactAndroid/gradle.properties');
 
 echo('Generated artifacts for Maven');
 
-let artifacts = ['-javadoc.jar', '-sources.jar', '.aar', '.pom'].map(suffix => {
+let artifacts = ['.aar', '.pom'].map(suffix => {
   return `react-native-${releaseVersion}${suffix}`;
 });
 
diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh
index 48ed05a94c77a1..e9bc54d02e33d1 100755
--- a/scripts/react-native-xcode.sh
+++ b/scripts/react-native-xcode.sh
@@ -64,9 +64,6 @@ PROJECT_ROOT=${PROJECT_ROOT:-"$REACT_NATIVE_DIR/../.."}
 
 cd "$PROJECT_ROOT" || exit
 
-# Define NVM_DIR and source the nvm.sh setup script
-[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
-
 # Define entry file
 if [[ "$ENTRY_FILE" ]]; then
   # Use ENTRY_FILE defined by user
@@ -84,26 +81,9 @@ if [[ $DEV != true && ! -f "$ENTRY_FILE" ]]; then
   exit 2
 fi
 
-if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
-  . "$HOME/.nvm/nvm.sh"
-elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
-  . "$(brew --prefix nvm)/nvm.sh"
-fi
-
-# Set up the nodenv node version manager if present
-if [[ -x "$HOME/.nodenv/bin/nodenv" ]]; then
-  eval "$("$HOME/.nodenv/bin/nodenv" init -)"
-elif [[ -x "$(command -v brew)" && -x "$(brew --prefix nodenv)/bin/nodenv" ]]; then
-  eval "$("$(brew --prefix nodenv)/bin/nodenv" init -)"
-fi
-
-# Set up the ndenv of anyenv if preset
-if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
-  export PATH=${HOME}/.anyenv/bin:${PATH}
-  if [[ "$(anyenv envs | grep -c ndenv )" -eq 1 ]]; then
-    eval "$(anyenv init -)"
-  fi
-fi
+# Find path to Node
+# shellcheck source=/dev/null
+source "$RN_DIR/scripts/find-node.sh"
 
 # check and assign NODE_BINARY env
 # shellcheck source=/dev/null
@@ -150,6 +130,10 @@ case "$PLATFORM_NAME" in
     ;;
 esac
 
+if [ "${IS_MACCATALYST}" = "YES" ]; then
+  BUNDLE_PLATFORM="ios"
+fi
+
 EMIT_SOURCEMAP=
 if [[ ! -z "$SOURCEMAP_FILE" ]]; then
   EMIT_SOURCEMAP=true
@@ -165,6 +149,11 @@ if [[ $EMIT_SOURCEMAP == true ]]; then
   EXTRA_ARGS="$EXTRA_ARGS --sourcemap-output $PACKAGER_SOURCEMAP_FILE"
 fi
 
+# Hermes doesn't require JS minification.
+if [[ $USE_HERMES == true && $DEV == false ]]; then
+  EXTRA_ARGS="$EXTRA_ARGS --minify false"
+fi
+
 "$NODE_BINARY" $NODE_ARGS "$CLI_PATH" $BUNDLE_COMMAND \
   $CONFIG_ARG \
   --entry-file "$ENTRY_FILE" \
@@ -189,7 +178,7 @@ else
   if [[ $EMIT_SOURCEMAP == true ]]; then
     EXTRA_COMPILER_ARGS="$EXTRA_COMPILER_ARGS -output-source-map"
   fi
-  "$HERMES_CLI_PATH" -emit-binary $EXTRA_COMPILER_ARGS -out "$DEST/main.jsbundle" "$BUNDLE_FILE" 
+  "$HERMES_CLI_PATH" -emit-binary $EXTRA_COMPILER_ARGS -out "$DEST/main.jsbundle" "$BUNDLE_FILE"
   if [[ $EMIT_SOURCEMAP == true ]]; then
     HBC_SOURCEMAP_FILE="$BUNDLE_FILE.map"
     "$NODE_BINARY" "$COMPOSE_SOURCEMAP_PATH" "$PACKAGER_SOURCEMAP_FILE" "$HBC_SOURCEMAP_FILE" -o "$SOURCEMAP_FILE"
diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb
index 97dc46ca16425b..bb71c58215f67d 100644
--- a/scripts/react_native_pods.rb
+++ b/scripts/react_native_pods.rb
@@ -18,7 +18,7 @@ def use_react_native! (options={})
 
   # The Pods which should be included in all projects
   pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "#{prefix}/Libraries/FBReactNativeSpec"
+  pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec"
   pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired"
   pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety"
   pod 'React', :path => "#{prefix}/"
@@ -46,11 +46,13 @@ def use_react_native! (options={})
   pod 'React-callinvoker', :path => "#{prefix}/ReactCommon/callinvoker"
   pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
   pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
+  pod 'React-logger', :path => "#{prefix}/ReactCommon/logger"
   pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon"
   pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga", :modular_headers => true
 
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
   pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
+  pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
   pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
 
   # TODO(macOS GH#214)
@@ -58,26 +60,28 @@ def use_react_native! (options={})
 
   if fabric_enabled
     pod 'React-Fabric', :path => "#{prefix}/ReactCommon"
-    pod 'React-graphics', :path => "#{prefix}/ReactCommon/fabric/graphics"
+    pod 'React-graphics', :path => "#{prefix}/ReactCommon/react/renderer/graphics"
     pod 'React-jsi/Fabric', :path => "#{prefix}/ReactCommon/jsi"
     pod 'React-RCTFabric', :path => "#{prefix}/React"
     pod 'RCT-Folly/Fabric', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
   end
 
   if hermes_enabled
-    pod 'React-Core/Hermes', :path => "#{prefix}/"
-    pod 'hermes-engine'
-    pod 'libevent', :podspec => "#{prefix}/third-party-podspecs/libevent.podspec"
+    pod 'React-hermes', :path => "#{prefix}/ReactCommon/hermes"
+    pod 'hermes-engine', '~> 0.9.0'
+    pod 'libevent', '~> 2.1.12'
   end
 end
 
 def use_flipper!(versions = {}, configurations: ['Debug'])
-  versions['Flipper'] ||= '~> 0.54.0'
-  versions['Flipper-DoubleConversion'] ||= '1.1.7'
-  versions['Flipper-Folly'] ||= '~> 2.2'
+  versions['Flipper'] ||= '0.99.0'
+  versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
+  versions['Flipper-DoubleConversion'] ||= '3.1.7'
+  versions['Flipper-Fmt'] ||= '7.1.7'
+  versions['Flipper-Folly'] ||= '2.6.7'
   versions['Flipper-Glog'] ||= '0.3.6'
-  versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
-  versions['Flipper-RSocket'] ||= '~> 1.1'
+  versions['Flipper-PeerTalk'] ||= '0.0.4'
+  versions['Flipper-RSocket'] ||= '1.4.3'
   pod 'FlipperKit', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations
@@ -86,7 +90,9 @@ def use_flipper!(versions = {}, configurations: ['Debug'])
   # List all transitive dependencies for FlipperKit pods
   # to avoid them being linked in Release builds
   pod 'Flipper', versions['Flipper'], :configurations => configurations
+  pod 'Flipper-Boost-iOSX', versions['Flipper-Boost-iOSX'], :configurations => configurations
   pod 'Flipper-DoubleConversion', versions['Flipper-DoubleConversion'], :configurations => configurations
+  pod 'Flipper-Fmt', versions['Flipper-Fmt'], :configurations => configurations
   pod 'Flipper-Folly', versions['Flipper-Folly'], :configurations => configurations
   pod 'Flipper-Glog', versions['Flipper-Glog'], :configurations => configurations
   pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configurations => configurations
@@ -101,6 +107,10 @@ def use_flipper!(versions = {}, configurations: ['Debug'])
   pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configurations => configurations
 end
 
+def has_pod(installer, name)
+  installer.pods_project.pod_group(name) != nil
+end
+
 # Post Install processing for Flipper
 def flipper_post_install(installer)
   installer.pods_project.targets.each do |target|
@@ -111,3 +121,132 @@ def flipper_post_install(installer)
     end
   end
 end
+
+def exclude_architectures(installer)
+  projects = installer.aggregate_targets
+    .map{ |t| t.user_project }
+    .uniq{ |p| p.path }
+    .push(installer.pods_project)
+
+  arm_value = `/usr/sbin/sysctl -n hw.optional.arm64 2>&1`.to_i
+
+  # Hermes does not support `i386` architecture
+  excluded_archs_default = has_pod(installer, 'hermes-engine') ? "i386" : ""
+
+  projects.each do |project|
+    project.build_configurations.each do |config|
+      if arm_value == 1 then
+        config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = excluded_archs_default
+      else
+        config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 " + excluded_archs_default
+      end
+    end
+
+    project.save()
+  end
+end
+
+def react_native_post_install(installer)
+  if has_pod(installer, 'Flipper')
+    flipper_post_install(installer)
+  end
+
+  exclude_architectures(installer)
+end
+
+def use_react_native_codegen!(spec, options={})
+  return if ENV['DISABLE_CODEGEN'] == '1'
+
+  # The prefix to react-native
+  prefix = options[:react_native_path] ||= "../.."
+
+  # The path to JavaScript files
+  js_srcs = options[:js_srcs_dir] ||= "#{prefix}/Libraries"
+
+  # Library name (e.g. FBReactNativeSpec)
+  modules_library_name = options[:library_name] ||= spec.name
+
+  # Output dir, relative to podspec that invoked this method
+  modules_output_dir = options[:modules_output_dir] ||= "#{prefix}/React/#{modules_library_name}/#{modules_library_name}"
+
+  generated_dirs = [ modules_output_dir ]
+  generated_filenames = [ "#{modules_library_name}.h", "#{modules_library_name}-generated.mm" ]
+  generated_files = generated_filenames.map { |filename| "#{modules_output_dir}/#{filename}" }
+
+  # Run the codegen as part of the Xcode build pipeline.
+  env_vars = "SRCS_DIR='${PODS_TARGET_SRCROOT}/#{js_srcs}'"
+  env_vars += " MODULES_OUTPUT_DIR='${PODS_TARGET_SRCROOT}/#{modules_output_dir}'"
+  env_vars += " MODULES_LIBRARY_NAME='#{modules_library_name}'"
+
+  if ENV['USE_FABRIC'] == '1'
+    # We use a different library name for components, as well as an additional set of files.
+    # Eventually, we want these to be part of the same library as #{modules_library_name} above.
+    components_output_dir = options[:components_output_dir] ||= "#{prefix}/ReactCommon/react/renderer/components/rncore/"
+    generated_dirs.push components_output_dir
+    env_vars += " COMPONENTS_OUTPUT_DIR='${PODS_TARGET_SRCROOT}/#{components_output_dir}'"
+    components_generated_filenames = [
+      "ComponentDescriptors.h",
+      "EventEmitters.cpp",
+      "EventEmitters.h",
+      "Props.cpp",
+      "Props.h",
+      "RCTComponentViewHelpers.h",
+      "ShadowNodes.cpp",
+      "ShadowNodes.h"
+    ]
+    generated_files = generated_files.concat(components_generated_filenames.map { |filename| "#{components_output_dir}/#{filename}" })
+  end
+
+  # Prepare filesystem by creating empty files that will be picked up as references by CocoaPods.
+  prepare_command = "mkdir -p #{generated_dirs.join(" ")} && touch -a #{generated_files.join(" ")}"
+  system(prepare_command) # Always run prepare_command when a podspec uses the codegen, as CocoaPods may skip invoking this command in certain scenarios
+  spec.prepare_command = prepare_command
+
+  spec.script_phase = {
+    :name => 'Generate Specs',
+    :input_files => [ "${PODS_TARGET_SRCROOT}/#{js_srcs}" ], # This also needs to be relative to Xcode
+    :output_files => ["${DERIVED_FILE_DIR}/codegen-#{modules_library_name}.log"].concat(generated_files.map { |filename| " ${PODS_TARGET_SRCROOT}/#{filename}"} ),
+    # The final generated files will be created when this script is invoked at Xcode build time.
+    :script => %{set -o pipefail
+
+bash -l -c '#{env_vars} $\{PODS_TARGET_SRCROOT\}/#{prefix}/scripts/generate-specs.sh' 2>&1 | tee "${SCRIPT_OUTPUT_FILE_0}"
+    },
+    :execution_position => :before_compile,
+    :show_env_vars_in_log => true
+  }
+end
+
+# This provides a post_install workaround for build issues related Xcode 12.5 and Apple Silicon (M1) machines.
+# Call this in the app's main Podfile's post_install hook.
+# See https://github.com/facebook/react-native/issues/31480#issuecomment-902912841 for more context.
+# Actual fix was authored by https://github.com/mikehardy.
+# New app template will call this for now until the underlying issue is resolved.
+def __apply_Xcode_12_5_M1_post_install_workaround(installer)
+  # Apple Silicon builds require a library path tweak for Swift library discovery to resolve Swift-related "symbol not found".
+  # Note: this was fixed via https://github.com/facebook/react-native/commit/eb938863063f5535735af2be4e706f70647e5b90
+  # Keeping this logic here but commented out for future reference.
+  #
+  # installer.aggregate_targets.each do |aggregate_target|
+  #   aggregate_target.user_project.native_targets.each do |target|
+  #     target.build_configurations.each do |config|
+  #       config.build_settings['LIBRARY_SEARCH_PATHS'] = ['$(SDKROOT)/usr/lib/swift', '$(inherited)']
+  #     end
+  #   end
+  #   aggregate_target.user_project.save
+  # end
+
+  # Flipper podspecs are still targeting an older iOS deployment target, and may cause an error like:
+  #   "error: thread-local storage is not supported for the current target"
+  # The most reliable known workaround is to bump iOS deployment target to match react-native (iOS 11 now).
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      end
+  end
+
+  # But... doing so caused another issue in Flipper:
+  #   "Time.h:52:17: error: typedef redefinition with different types"
+  # We need to make a patch to RCT-Folly - set `__IPHONE_10_0` to our iOS target + 1.
+  # See https://github.com/facebook/flipper/issues/834 for more details.
+  `sed -i -e  $'s/VERSION_MIN_REQUIRED </VERSION_MIN_REQUIRED >=/' #{installer.sandbox.root}/RCT-Folly/folly/portability/Time.h`
+end
diff --git a/scripts/test-manual-e2e.sh b/scripts/test-manual-e2e.sh
index e8a5fb6b9ac25e..68162c3faecb4d 100755
--- a/scripts/test-manual-e2e.sh
+++ b/scripts/test-manual-e2e.sh
@@ -4,8 +4,6 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-JAVA_VERSION="1.7"
-
 RED="\033[0;31m"
 GREEN="\033[0;32m"
 BLUE="\033[0;35m"
@@ -40,7 +38,7 @@ rm -rf android
 
 success "Generated artifacts for Maven"
 
-npm install
+yarn
 
 success "Killing any running packagers"
 lsof -i :8081 | grep LISTEN
@@ -49,28 +47,55 @@ lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill
 info "Start the packager in another terminal by running 'npm start' from the root"
 info "and then press any key."
 info ""
-read -n 1
+read -r -n 1
 
 ./gradlew :packages:rn-tester:android:app:installJscDebug || error "Couldn't build RNTester Android"
 
 info "Press any key to run RNTester in an already running Android emulator/device"
 info ""
-read -n 1
+read -r -n 1
+adb shell am start -n com.facebook.react.uiapp/.RNTesterActivity
+
+
+info "Once done testing, keep emulator running"
+info "Press any key to run RNTester on Android with Hermes enabled"
+read -r -n 1
+
+./gradlew :packages:rn-tester:android:app:installHermesDebug || error "Couldn't build RNTester Android"
 adb shell am start -n com.facebook.react.uiapp/.RNTesterActivity
 
-success "Installing CocoaPods dependencies"
+info "When done testing RNTester on Android,"
+info "Press any key to start testing RNTester in iOS"
+read -r -n 1
+
+success "About to test iOS JSC... "
+success "Installing CocoaPods dependencies..."
 rm -rf packages/rn-tester/Pods
 (cd packages/rn-tester && pod install)
 
 info "Press any key to open the workspace in Xcode, then build and test manually."
 info ""
-read -n 1
+read -r -n 1
+
+open "packages/rn-tester/RNTesterPods.xcworkspace"
+
+info "When done testing iOS JSC, press any key to test iOS Hermes"
+read -r -n 1
+
+success "About to test iOS Hermes... "
+success "Installing CocoaPods dependencies..."
+rm -rf packages/rn-tester/Pods
+(cd packages/rn-tester && USE_HERMES=1 pod install)
+
+info "Press any key to open the workspace in Xcode, then build and test manually."
+info ""
+read -r -n 1
 
 open "packages/rn-tester/RNTesterPods.xcworkspace"
 
 info "When done testing RNTester app on iOS and Android press any key to continue."
 info ""
-read -n 1
+read -r -n 1
 
 success "Killing packager"
 lsof -i :8081 | grep LISTEN
@@ -78,20 +103,23 @@ lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill
 
 npm pack
 
-PACKAGE=$(pwd)/react-native-$PACKAGE_VERSION.tgz
+TIMESTAMP=$(date +%s)
+PACKAGE=$(pwd)/react-native-$PACKAGE_VERSION-$TIMESTAMP.tgz
 success "Package bundled ($PACKAGE)"
 
+mv "$(pwd)/react-native-$PACKAGE_VERSION.tgz" "$PACKAGE"
+
 node scripts/set-rn-template-version.js "file:$PACKAGE"
 success "React Native version changed in the template"
 
 project_name="RNTestProject"
 
-cd /tmp/
+cd /tmp/ || exit
 rm -rf "$project_name"
 node "$repo_root/cli.js" init "$project_name" --template "$repo_root"
 
 info "Double checking the versions in package.json are correct:"
-grep "\"react-native\": \".*react-native-$PACKAGE_VERSION.tgz\"" "/tmp/${project_name}/package.json" || error "Incorrect version number in /tmp/${project_name}/package.json"
+grep "\"react-native\": \".*react-native-$PACKAGE_VERSION-$TIMESTAMP.tgz\"" "/tmp/${project_name}/package.json" || error "Incorrect version number in /tmp/${project_name}/package.json"
 grep -E "com.facebook.react:react-native:\\+" "${project_name}/android/app/build.gradle" || error "Dependency in /tmp/${project_name}/android/app/build.gradle must be com.facebook.react:react-native:+"
 
 success "New sample project generated at /tmp/${project_name}"
@@ -104,7 +132,7 @@ info "   - Verify 'Reload JS' works"
 info ""
 info "Press any key to run the sample in Android emulator/device"
 info ""
-read -n 1
+read -r -n 1
 cd "/tmp/${project_name}" && npx react-native run-android
 
 info "Test the following on iOS:"
@@ -117,10 +145,10 @@ info "   - Disable Fast Refresh."
 info ""
 info "Press any key to open the project in Xcode"
 info ""
-read -n 1
+read -r -n 1
 open "/tmp/${project_name}/ios/${project_name}.xcworkspace"
 
-cd "$repo_root"
+cd "$repo_root" || exit
 
 info "Next steps:"
-info "   - https://github.com/facebook/react-native/blob/master/Releases.md"
+info "   - https://github.com/facebook/react-native/blob/HEAD/Releases.md"
diff --git a/scripts/update_podfile_lock.sh b/scripts/update_podfile_lock.sh
new file mode 100755
index 00000000000000..31163e29e4366c
--- /dev/null
+++ b/scripts/update_podfile_lock.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# This script updates RNTester Podfile.lock after verifying the CocoaPods environment.
+# Usage:
+#   source scripts/update_podfile_lock && update_pods
+
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+RNTESTER_DIR="$THIS_DIR/../packages/rn-tester"
+
+# Note: Keep in sync with FB internal.
+REQUIRED_COCOAPODS_VERSION="1.11.2"
+
+validate_env () {
+  # Check that CocoaPods is working.
+  if [ -z "$(command -v pod)" ]; then
+    echo "You need to install CocoaPods."
+    echo "See https://guides.cocoapods.org/using/getting-started.html#getting-started for instructions."
+    exit 1
+  fi
+
+  COCOAPODS_VERSION=$(pod --version)
+  if [[ "$COCOAPODS_VERSION" != "$REQUIRED_COCOAPODS_VERSION" ]];
+  then
+    echo "You must have CocoaPods $REQUIRED_COCOAPODS_VERSION installed; you have $COCOAPODS_VERSION."
+    echo "Installing via gem is recommended:"
+    echo "  sudo gem install cocoapods -v $REQUIRED_COCOAPODS_VERSION"
+    exit 1
+  fi
+}
+
+update_pods () {
+  validate_env
+
+  cd "$RNTESTER_DIR" || exit
+  pod install
+  cd "$THIS_DIR" || exit
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dd6b7adbec3064..1d838685e2591f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,3 +21,4 @@ include(
 
 // Include this to enable codegen Gradle plugin.
 includeBuild("packages/react-native-codegen/android")
+includeBuild("packages/react-native-gradle-plugin/")
diff --git a/template/_editorconfig b/template/_editorconfig
new file mode 100644
index 00000000000000..7c286132fe9a98
--- /dev/null
+++ b/template/_editorconfig
@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf
diff --git a/template/_flowconfig b/template/_flowconfig
index 52c764892f8ad8..e4eec7ee02557a 100644
--- a/template/_flowconfig
+++ b/template/_flowconfig
@@ -26,11 +26,10 @@ node_modules/react-native/flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
 exact_by_default=true
 
+format.bracket_spacing=false
+
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
@@ -66,4 +65,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.137.0
+^0.158.0
diff --git a/template/_gitattributes b/template/_gitattributes
new file mode 100644
index 00000000000000..45a3dcb2a20316
--- /dev/null
+++ b/template/_gitattributes
@@ -0,0 +1,3 @@
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf
diff --git a/template/_gitignore b/template/_gitignore
index ad572e632bc8ce..cc53454ef4ee6e 100644
--- a/template/_gitignore
+++ b/template/_gitignore
@@ -28,6 +28,7 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
 
 # node.js
 #
diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
index f75c160968e7eb..4e64e6a0d08431 100644
--- a/template/android/app/build.gradle
+++ b/template/android/app/build.gradle
@@ -120,16 +120,16 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Architectures to build native code for in debug.
+ */
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 android {
     ndkVersion rootProject.ext.ndkVersion
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         applicationId "com.helloworld"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -156,6 +156,11 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
@@ -191,7 +196,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-      exclude group:'com.facebook.fbjni'
+        exclude group:'com.facebook.fbjni'
     }
 
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
@@ -215,7 +220,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 
diff --git a/template/android/app/src/main/res/values/styles.xml b/template/android/app/src/main/res/values/styles.xml
index 9fab0be743760d..24bc061368750c 100644
--- a/template/android/app/src/main/res/values/styles.xml
+++ b/template/android/app/src/main/res/values/styles.xml
@@ -3,7 +3,6 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:textColor">#000000</item>
     </style>
 
 </resources>
diff --git a/template/android/build.gradle b/template/android/build.gradle
index 93232f5fca9389..650989507d2d28 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -2,18 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.3"
+        buildToolsVersion = "30.0.2"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
-        ndkVersion = "20.1.5948944"
+        compileSdkVersion = 30
+        targetSdkVersion = 30
+        ndkVersion = "21.4.7075529"
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
+        classpath("com.android.tools.build:gradle:4.2.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -21,6 +21,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -32,7 +33,6 @@ allprojects {
         }
 
         google()
-        jcenter()
         maven { url 'https://www.jitpack.io' }
     }
 }
diff --git a/template/android/gradle.properties b/template/android/gradle.properties
index 3bdbd3d4e90ec3..cdb4c21108b623 100644
--- a/template/android/gradle.properties
+++ b/template/android/gradle.properties
@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.99.0
diff --git a/template/android/gradle/wrapper/gradle-wrapper.properties b/template/android/gradle/wrapper/gradle-wrapper.properties
index 14e30f7416a55e..7665b0fa93ae75 100644
--- a/template/android/gradle/wrapper/gradle-wrapper.properties
+++ b/template/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/template/ios/HelloWorld.xcodeproj/project.pbxproj b/template/ios/HelloWorld.xcodeproj/project.pbxproj
index 99eb88550df204..fbe9f29272fa46 100644
--- a/template/ios/HelloWorld.xcodeproj/project.pbxproj
+++ b/template/ios/HelloWorld.xcodeproj/project.pbxproj
@@ -293,7 +293,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = HelloWorldTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -316,7 +316,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
 				INFOPLIST_FILE = HelloWorldTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -429,12 +429,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
@@ -486,12 +487,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
diff --git a/template/ios/Podfile b/template/ios/Podfile
index 6701249e83ac20..9409747f917830 100644
--- a/template/ios/Podfile
+++ b/template/ios/Podfile
@@ -1,12 +1,16 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '10.0'
+platform :ios, '11.0'
 
 target 'HelloWorld' do
   config = use_native_modules!
 
-  use_react_native!(:path => config[:reactNativePath])
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :hermes_enabled => false
+  )
 
   target 'HelloWorldTests' do
     inherit! :complete
@@ -16,9 +20,11 @@ target 'HelloWorld' do
   # Enables Flipper.
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
-  # you should disable these next few lines.
-  use_flipper!
+  # you should disable the next line.
+  use_flipper!()
+
   post_install do |installer|
-    flipper_post_install(installer)
+    react_native_post_install(installer)
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end
diff --git a/template/package.json b/template/package.json
index 351a586f2318f9..5cf9a0f48d0196 100644
--- a/template/package.json
+++ b/template/package.json
@@ -10,19 +10,18 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "react": "17.0.1",
-    "react-native": "0.63.3"
+    "react": "17.0.2",
+    "react-native": "0.66.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.4",
-    "@babel/runtime": "^7.8.4",
-    "@react-native-community/eslint-config": "^1.1.0",
-    "babel-jest": "^25.1.0",
-    "eslint": "^6.5.1",
-    "jest": "^25.1.0",
-    "metro-react-native-babel-preset": "^0.63.0",
-    "react-test-renderer": "17.0.1",
-    "react-native-codegen": "0.0.4"
+    "@babel/core": "^7.12.9",
+    "@babel/runtime": "^7.12.5",
+    "@react-native-community/eslint-config": "^2.0.0",
+    "babel-jest": "^26.6.3",
+    "eslint": "7.14.0",
+    "jest": "^26.6.3",
+    "metro-react-native-babel-preset": "^0.66.2",
+    "react-test-renderer": "17.0.2"
   },
   "jest": {
     "preset": "react-native"
diff --git a/third-party-podspecs/DoubleConversion.podspec b/third-party-podspecs/DoubleConversion.podspec
index f0fcefc371c585..b7aa4172f7d8c8 100644
--- a/third-party-podspecs/DoubleConversion.podspec
+++ b/third-party-podspecs/DoubleConversion.podspec
@@ -18,7 +18,9 @@ Pod::Spec.new do |spec|
   spec.source_files = 'double-conversion/*.{h,cc}'
   spec.compiler_flags = '-Wno-unreachable-code'
 
+  spec.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/DoubleConversion\"" }
+
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  spec.platforms = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
 
 end
diff --git a/third-party-podspecs/RCT-Folly.podspec b/third-party-podspecs/RCT-Folly.podspec
index 206c4a63694651..5d3806674b3d74 100644
--- a/third-party-podspecs/RCT-Folly.podspec
+++ b/third-party-podspecs/RCT-Folly.podspec
@@ -3,27 +3,32 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
+folly_release_version = '2021.06.28.00'
+
 Pod::Spec.new do |spec|
   spec.name = 'RCT-Folly'
-  spec.version = '2020.01.13.00'
+  # Patched to v2 to address https://github.com/react-native-community/releases/issues/251
+  spec.version = folly_release_version + '-v2'
   spec.license = { :type => 'Apache License, Version 2.0' }
   spec.homepage = 'https://github.com/facebook/folly'
   spec.summary = 'An open-source C++ library developed and used at Facebook.'
   spec.authors = 'Facebook'
   spec.source = { :git => 'https://github.com/facebook/folly.git',
-                  :tag => "v#{spec.version}" }
+                  :tag => "v#{folly_release_version}" }
   spec.module_name = 'folly'
   spec.header_mappings_dir = '.'
-  spec.dependency 'boost-for-react-native'
+  spec.dependency 'boost'
   spec.dependency 'DoubleConversion'
   spec.dependency 'glog'
-  spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_PTHREAD=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation'
+  spec.dependency 'fmt' , '~> 6.2.1'
+  spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_PTHREAD=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation -faligned-new'
   spec.source_files = 'folly/String.cpp',
                       'folly/Conv.cpp',
                       'folly/Demangle.cpp',
                       'folly/FileUtil.cpp',
                       'folly/Format.cpp',
                       'folly/lang/SafeAssert.cpp',
+                      'folly/lang/ToAscii.cpp',
                       'folly/ScopeGuard.cpp',
                       'folly/Unicode.cpp',
                       'folly/dynamic.cpp',
@@ -35,9 +40,12 @@ Pod::Spec.new do |spec|
                       'folly/hash/SpookyHashV2.cpp',
                       'folly/lang/Assume.cpp',
                       'folly/lang/CString.cpp',
+                      # 'folly/lang/Exception.cpp', # TODO(macOS GH#214) later versions of boost don't support macOS, revert this back to upstream when fixed
                       'folly/memory/detail/MallocImpl.cpp',
                       'folly/net/NetOps.cpp',
                       'folly/portability/SysUio.cpp',
+                      'folly/system/ThreadId.h',
+                      'folly/system/ThreadId.cpp',
                       'folly/*.h',
                       'folly/container/*.h',
                       'folly/container/detail/*.h',
@@ -64,13 +72,13 @@ Pod::Spec.new do |spec|
                         'folly/net/*.h',
                         'folly/net/detail/*.h',
                         'folly/portability/*.h'
-  spec.libraries           = "stdc++"
+  spec.libraries           = "stdc++", "c++abi" # NOTE Apple-only: Keep c++abi here due to https://github.com/react-native-community/releases/issues/251
   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include/\"" }
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include/\"" }
 
   # TODO: The boost spec should really be selecting these files so that dependents of Folly can also access the required headers.
-  spec.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"" }
+  spec.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"" }
 
   spec.default_subspec = 'Default'
 
@@ -84,6 +92,7 @@ Pod::Spec.new do |spec|
                           'folly/detail/Futex.cpp',
                           'folly/synchronization/ParkingLot.cpp',
                           'folly/portability/Malloc.cpp'
+
     fabric.preserve_paths = 'folly/concurrency/CacheLocality.h',
                             'folly/synchronization/ParkingLot.h',
                             'folly/synchronization/SanitizeThread.h',
@@ -102,16 +111,27 @@ Pod::Spec.new do |spec|
                            'folly/system/{ThreadId,ThreadName,HardwareConcurrency}.{h,cpp}',
                            'folly/synchronization/*.{h,cpp}',
                            'folly/synchronization/detail/*.{h,cpp}',
+                           'folly/Try.cpp',
+                           'folly/concurrency/CacheLocality.cpp',
                            'folly/experimental/{ExecutionObserver,ReadMostlySharedPtr,SingleWriterFixedHashMap,TLRefCount}.{h,cpp}',
-                           'folly/io/async/{AsyncTimeout,DelayedDestruction,DelayedDestructionBase,EventBase,EventBaseManager,EventBaseBackendBase,EventHandler,EventUtil,HHWheelTimer,HHWheelTimer-fwd,NotificationQueue,Request,TimeoutManager,VirtualEventBase}.{h,cpp}',
+                           'folly/io/async/{AtomicNotificationQueue,AtomicNotificationQueue-inl,AsyncTimeout,DelayedDestruction,DelayedDestructionBase,EventBase,EventBaseLocal,EventBaseManager,EventBaseAtomicNotificationQueue,EventBaseAtomicNotificationQueue-inl,EventBaseBackendBase,EventHandler,EventUtil,HHWheelTimer,HHWheelTimer-fwd,NotificationQueue,Request,TimeoutManager,VirtualEventBase}.{h,cpp}',
                            'folly/io/{Cursor,Cursor-inl,IOBuf,IOBufQueue}.{h,cpp}',
                            'folly/tracing/StaticTracepoint.{h,cpp}',
-                           'folly/{Executor,ExceptionWrapper,ExceptionWrapper-inl,FileUtil,Singleton,SharedMutex}.{h,cpp}',
+                           'folly/tracing/AsyncStack.{h,cpp}',
+                           'folly/tracing/AsyncStack-inl.h',
+                           'folly/{Executor,ExceptionString,ExceptionWrapper,ExceptionWrapper-inl,FileUtil,Singleton,SharedMutex}.{h,cpp}',
                            'folly/detail/{AsyncTrace,AtFork,Futex,Futex-inl,MemoryIdler,SingletonStackTrace,StaticSingletonManager,ThreadLocalDetail}.{h,cpp}',
                            'folly/lang/SafeAssert.{h,cpp}',
                            'folly/memory/MallctlHelper.{h,cpp}',
                            'folly/portability/{GFlags,SysUio}.{h,cpp}',
-                           'folly/chrono/Hardware.{h,cpp}'
+                           'folly/portability/SysMembarrier.cpp',
+                           'folly/chrono/Hardware.{h,cpp}',
+                           'folly/experimental/coro/Traits.{h,cpp}',
+                           'folly/fibers/*.{h,cpp}',
+                           'folly/experimental/coro/Coroutine.{h,cpp}',
+                           'folly/fibers/Baton-inl.h',
+                           'folly/experimental/**/*.h',
+                           'folly/system/Pid.{h,cpp}'
                           # TODO: Perhaps some of the wildcards above can be further trimmed down with some of these:
                           #
                           #  'folly/executors/{DrivableExecutor,InlineExecutor,QueuedImmediateExecutor,TimedDrivableExecutor}.{h,cpp}',
@@ -123,7 +143,6 @@ Pod::Spec.new do |spec|
                           #  'folly/experimental/{ReadMostlySharedPtr,TLRefCount}.h',
   end
 
-  # Folly has issues when compiled with iOS 10 set as deployment target
-  # See https://github.com/facebook/folly/issues/1470 for details
-  spec.platforms = { :ios => "9.0", :osx => "10.14", :tvos => "9.0", } # TODO(macOS GH#214)
+  # Pinning to the same version as React.podspec.
+  spec.platforms = { :ios => "9.0", :tvos => "9.0", :osx => "10.15" } # TODO(macOS GH#214)
 end
diff --git a/third-party-podspecs/boost-for-react-native.podspec b/third-party-podspecs/boost-for-react-native.podspec
index 592192a6d889fc..27caa8bc4139ac 100644
--- a/third-party-podspecs/boost-for-react-native.podspec
+++ b/third-party-podspecs/boost-for-react-native.podspec
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
 
   # Pinning to the same version as React.podspec.
   # TODO: Move this osx addition back upstream to https://github.com/react-native-community/boost-for-react-native
-  spec.platforms = { :ios => '8.0', :osx => "10.14" }
+  spec.platforms = { :ios => '8.0', :osx => "10.15" }
   spec.requires_arc = false
 
   spec.module_name = 'boost'
diff --git a/third-party-podspecs/boost.podspec b/third-party-podspecs/boost.podspec
new file mode 100644
index 00000000000000..e60ddf7239d0c0
--- /dev/null
+++ b/third-party-podspecs/boost.podspec
@@ -0,0 +1,23 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+Pod::Spec.new do |spec|
+  spec.name = 'boost'
+  spec.version = '1.76.0'
+  spec.license = { :type => 'Boost Software License', :file => "LICENSE_1_0.txt" }
+  spec.homepage = 'http://www.boost.org'
+  spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.'
+  spec.authors = 'Rene Rivera'
+  spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2',
+                  :sha256 => 'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41' }
+
+  # Pinning to the same version as React.podspec.
+  spec.platforms = { :ios => '11.0', :tvos => '11.0', :osx => "10.15" } # TODO(macOS GH#214)
+  spec.requires_arc = false
+
+  spec.module_name = 'boost'
+  spec.header_dir = 'boost'
+  spec.preserve_path = 'boost'
+end
diff --git a/third-party-podspecs/glog.podspec b/third-party-podspecs/glog.podspec
index ef6cc0e262a237..ff1f4bf642289d 100644
--- a/third-party-podspecs/glog.podspec
+++ b/third-party-podspecs/glog.podspec
@@ -34,6 +34,6 @@ Pod::Spec.new do |spec|
                                "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src" }
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "10.0", :osx => "10.14" } # TODO(macOS GH#214)
+  spec.platforms = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
 
 end
diff --git a/third-party-podspecs/libevent.podspec b/third-party-podspecs/libevent.podspec
deleted file mode 100644
index ee693a75739695..00000000000000
--- a/third-party-podspecs/libevent.podspec
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-# Because libevent is also relied on by Flipper and *with* OpenSSL bindings,
-# building it as a prebuilt binary may lead to hard to satisfy permutations, if
-# we'd ever try to build this for other Apple platforms besides macOS. Therefore
-# let Xcode build it from source instead.
-#
-# Generated with:
-#
-# $ mkdir build && cd build
-# $ cmake -G Ninja .. \
-#   -DEVENT__DISABLE_OPENSSL:BOOL=ON \
-#   -DEVENT__DISABLE_BENCHMARK:BOOL=ON \
-#   -DEVENT__DISABLE_TESTS:BOOL=ON \
-#   -DEVENT__DISABLE_REGRESS:BOOL=ON \
-#   -DEVENT__DISABLE_SAMPLES:BOOL=ON
-# $ cat include/event2/event-config.h
-#
-CONFIG_WITHOUT_OPENSSL = <<-END_OF_CONFIG
-/* event-config.h
- *
- * This file was generated by cmake when the makefiles were generated.
- *
- * DO NOT EDIT THIS FILE.
- *
- * Do not rely on macros in this file existing in later versions.
- */
-#ifndef EVENT2_EVENT_CONFIG_H_INCLUDED_
-#define EVENT2_EVENT_CONFIG_H_INCLUDED_
-
-/* Numeric representation of the version */
-#define EVENT__NUMERIC_VERSION 0x02020001
-#define EVENT__PACKAGE_VERSION "2.2.0"
-
-#define EVENT__VERSION_MAJOR 2
-#define EVENT__VERSION_MINOR 2
-#define EVENT__VERSION_PATCH 0
-
-/* Version number of package */
-#define EVENT__VERSION "2.2.0-alpha-dev"
-
-/* Name of package */
-#define EVENT__PACKAGE "libevent"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define EVENT__PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define EVENT__PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define EVENT__PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define EVENT__PACKAGE_TARNAME ""
-
-/* Define if libevent should build without support for a debug mode */
-/* #undef EVENT__DISABLE_DEBUG_MODE */
-
-/* Define if libevent should not allow replacing the mm functions */
-/* #undef EVENT__DISABLE_MM_REPLACEMENT */
-
-/* Define if libevent should not be compiled with thread support */
-/* #undef EVENT__DISABLE_THREAD_SUPPORT */
-
-/* Define to 1 if you have the `accept4' function. */
-/* #undef EVENT__HAVE_ACCEPT4 */
-
-/* Define to 1 if you have the `arc4random' function. */
-#define EVENT__HAVE_ARC4RANDOM 1
-
-/* Define to 1 if you have the `arc4random_buf' function. */
-#define EVENT__HAVE_ARC4RANDOM_BUF 1
-
-/* Define to 1 if you have the `arc4random_addrandom' function. */
-#define EVENT__HAVE_ARC4RANDOM_ADDRANDOM 1
-
-/* Define if clock_gettime is available in libc */
-#define EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1
-
-/* Define is no secure id variant is available */
-/* #undef EVENT__DNS_USE_GETTIMEOFDAY_FOR_ID */
-/* #undef EVENT__DNS_USE_FTIME_FOR_ID */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define EVENT__HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#define EVENT__HAVE_CLOCK_GETTIME 1
-
-/* Define to 1 if you have the declaration of `CTL_KERN'. */
-#define EVENT__HAVE_DECL_CTL_KERN 1
-
-/* Define to 1 if you have the declaration of `KERN_ARND'. */
-#define EVENT__HAVE_DECL_KERN_ARND 0
-
-/* Define to 1 if you have `getrandom' function. */
-/* #undef EVENT__HAVE_GETRANDOM */
-
-/* Define if /dev/poll is available */
-/* #undef EVENT__HAVE_DEVPOLL */
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define EVENT__HAVE_NETDB_H 1
-
-/* Define to 1 if fd_mask type is defined */
-#define EVENT__HAVE_FD_MASK 1
-
-/* Define to 1 if the <sys/queue.h> header file defines TAILQ_FOREACH. */
-#define EVENT__HAVE_TAILQFOREACH 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define EVENT__HAVE_DLFCN_H 1
-
-/* Define if your system supports the epoll system calls */
-/* #undef EVENT__HAVE_EPOLL */
-
-/* Define to 1 if you have the `epoll_create1' function. */
-/* #undef EVENT__HAVE_EPOLL_CREATE1 */
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-/* #undef EVENT__HAVE_EPOLL_CTL */
-
-/* Define if your system supports the wepoll module */
-/* #undef EVENT__HAVE_WEPOLL */
-
-/* Define to 1 if you have the `eventfd' function. */
-/* #undef EVENT__HAVE_EVENTFD */
-
-/* Define if your system supports event ports */
-/* #undef EVENT__HAVE_EVENT_PORTS */
-
-/* Define to 1 if you have the `fcntl' function. */
-#define EVENT__HAVE_FCNTL 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define EVENT__HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-#define EVENT__HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `getegid' function. */
-#define EVENT__HAVE_GETEGID 1
-
-/* Define to 1 if you have the `geteuid' function. */
-#define EVENT__HAVE_GETEUID 1
-
-/* TODO: Check for different gethostname argument counts. CheckPrototypeDefinition.cmake can be used. */
-/* Define this if you have any gethostbyname_r() */
-/* #undef EVENT__HAVE_GETHOSTBYNAME_R */
-
-/* Define this if gethostbyname_r takes 3 arguments */
-/* #undef EVENT__HAVE_GETHOSTBYNAME_R_3_ARG */
-
-/* Define this if gethostbyname_r takes 5 arguments */
-/* #undef EVENT__HAVE_GETHOSTBYNAME_R_5_ARG */
-
-/* Define this if gethostbyname_r takes 6 arguments */
-/* #undef EVENT__HAVE_GETHOSTBYNAME_R_6_ARG */
-
-/* Define to 1 if you have the `getifaddrs' function. */
-#define EVENT__HAVE_GETIFADDRS 1
-
-/* Define to 1 if you have the `getnameinfo' function. */
-#define EVENT__HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the `getprotobynumber' function. */
-#define EVENT__HAVE_GETPROTOBYNUMBER 1
-
-/* Define to 1 if you have the `getservbyname' function. */
-#define EVENT__HAVE_GETSERVBYNAME 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define EVENT__HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-#define EVENT__HAVE_IFADDRS_H 1
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#define EVENT__HAVE_INET_NTOP 1
-
-/* Define to 1 if you have the `inet_pton' function. */
-#define EVENT__HAVE_INET_PTON 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define EVENT__HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `issetugid' function. */
-#define EVENT__HAVE_ISSETUGID 1
-
-/* Define to 1 if you have the `kqueue' function. */
-#define EVENT__HAVE_KQUEUE 1
-
-/* Define if the system has zlib */
-/* #undef EVENT__HAVE_LIBZ */
-
-/* Define to 1 if you have the `mach_absolute_time' function. */
-#define EVENT__HAVE_MACH_ABSOLUTE_TIME 1
-
-/* Define to 1 if you have the <mach/mach_time.h> header file. */
-#define EVENT__HAVE_MACH_MACH_TIME_H 1
-
-/* Define to 1 if you have the <mach/mach.h> header file. */
-#define EVENT__HAVE_MACH_MACH_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define EVENT__HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mmap' function. */
-#define EVENT__HAVE_MMAP 1
-
-/* Define to 1 if you have the `nanosleep' function. */
-#define EVENT__HAVE_NANOSLEEP 1
-
-/* Define to 1 if you have the `usleep' function. */
-#define EVENT__HAVE_USLEEP 1
-
-/* Define to 1 if you have the <netinet/in6.h> header file. */
-/* #undef EVENT__HAVE_NETINET_IN6_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define EVENT__HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define EVENT__HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <sys/un.h> header file. */
-#define EVENT__HAVE_SYS_UN_H 1
-
-/* Define to 1 if you have the <afunix.h> header file. */
-/* #undef EVENT__HAVE_AFUNIX_H */
-
-/* Define if the system has openssl */
-/* #undef EVENT__HAVE_OPENSSL */
-
-/* Define to 1 if you have the `pipe' function. */
-#define EVENT__HAVE_PIPE 1
-
-/* Define to 1 if you have the `pipe2' function. */
-/* #undef EVENT__HAVE_PIPE2 */
-
-/* Define to 1 if you have the `poll' function. */
-#define EVENT__HAVE_POLL 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define EVENT__HAVE_POLL_H 1
-
-/* Define to 1 if you have the `port_create' function. */
-/* #undef EVENT__HAVE_PORT_CREATE */
-
-/* Define to 1 if you have the <port.h> header file. */
-/* #undef EVENT__HAVE_PORT_H */
-
-/* Define if we have pthreads on this system */
-#define EVENT__HAVE_PTHREADS 1
-
-/* Define to 1 if you have the `putenv' function. */
-#define EVENT__HAVE_PUTENV 1
-
-/* Define to 1 if the system has the type `sa_family_t'. */
-#define EVENT__HAVE_SA_FAMILY_T 1
-
-/* Define to 1 if you have the `select' function. */
-#define EVENT__HAVE_SELECT 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define EVENT__HAVE_SETENV 1
-
-/* Define if F_SETFD is defined in <fcntl.h> */
-#define EVENT__HAVE_SETFD 1
-
-/* Define to 1 if you have the `setrlimit' function. */
-#define EVENT__HAVE_SETRLIMIT 1
-
-/* Define to 1 if you have the `sendfile' function. */
-#define EVENT__HAVE_SENDFILE 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#define EVENT__HAVE_SIGACTION 1
-
-/* Define to 1 if you have the `signal' function. */
-#define EVENT__HAVE_SIGNAL 1
-
-/* Define to 1 if you have the `strsignal' function. */
-#define EVENT__HAVE_STRSIGNAL 1
-
-/* Define to 1 if you have the `splice' function. */
-/* #undef EVENT__HAVE_SPLICE */
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define EVENT__HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define EVENT__HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define EVENT__HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define EVENT__HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define EVENT__HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strlcpy' function. */
-#define EVENT__HAVE_STRLCPY 1
-
-/* Define to 1 if you have the `strsep' function. */
-#define EVENT__HAVE_STRSEP 1
-
-/* Define to 1 if you have the `strtok_r' function. */
-#define EVENT__HAVE_STRTOK_R 1
-
-/* Define to 1 if you have the `strtoll' function. */
-#define EVENT__HAVE_STRTOLL 1
-
-/* Define to 1 if you have the `_gmtime64_s' function. */
-/* #undef EVENT__HAVE__GMTIME64_S */
-
-/* Define to 1 if you have the `_gmtime64' function. */
-/* #undef EVENT__HAVE__GMTIME64 */
-
-/* Define to 1 if the system has the type `struct addrinfo'. */
-#define EVENT__HAVE_STRUCT_ADDRINFO 1
-
-/* Define to 1 if the system has the type `struct in6_addr'. */
-#define EVENT__HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */
-/* #undef EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 */
-
-/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */
-/* #undef EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 */
-
-/* Define to 1 if the system has the type `struct sockaddr_in6'. */
-#define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* Define to 1 if `sin6_len' is member of `struct sockaddr_in6'. */
-#define EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN 1
-
-/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */
-/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-
-/* Define to 1 if the system has the type `struct sockaddr_un'. */
-#define EVENT__HAVE_STRUCT_SOCKADDR_UN 1
-
-/* Define to 1 if the system has the type `struct sockaddr_storage'. */
-#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1
-
-/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
-#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
-
-/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
-/* #undef EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */
-
-/* Define to 1 if the system has the type `struct linger'. */
-#define EVENT__HAVE_STRUCT_LINGER 1
-
-/* Define to 1 if you have the `sysctl' function. */
-#define EVENT__HAVE_SYSCTL 1
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-/* #undef EVENT__HAVE_SYS_EPOLL_H */
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef EVENT__HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-#define EVENT__HAVE_SYS_EVENT_H 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define EVENT__HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define EVENT__HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define EVENT__HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/queue.h> header file. */
-#define EVENT__HAVE_SYS_QUEUE_H 1
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#define EVENT__HAVE_SYS_RESOURCE_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define EVENT__HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/sendfile.h> header file. */
-/* #undef EVENT__HAVE_SYS_SENDFILE_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define EVENT__HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define EVENT__HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/random.h> header file. */
-#define EVENT__HAVE_SYS_RANDOM_H 1
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-#define EVENT__HAVE_SYS_SYSCTL_H 1
-
-/* Define to 1 if you have the <sys/timerfd.h> header file. */
-/* #undef EVENT__HAVE_SYS_TIMERFD_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define EVENT__HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define EVENT__HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define EVENT__HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#define EVENT__HAVE_SYS_WAIT_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define EVENT__HAVE_ERRNO_H 1
-
-/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-#define EVENT__HAVE_TAILQFOREACH 1
-
-/* Define if timeradd is defined in <sys/time.h> */
-#define EVENT__HAVE_TIMERADD 1
-
-/* Define if timerclear is defined in <sys/time.h> */
-#define EVENT__HAVE_TIMERCLEAR 1
-
-/* Define if timercmp is defined in <sys/time.h> */
-#define EVENT__HAVE_TIMERCMP 1
-
-
-/* Define to 1 if you have the `timerfd_create' function. */
-/* #undef EVENT__HAVE_TIMERFD_CREATE */
-
-/* Define if timerisset is defined in <sys/time.h> */
-#define EVENT__HAVE_TIMERISSET 1
-
-/* Define to 1 if the system has the type `uint8_t'. */
-#define EVENT__HAVE_UINT8_T 1
-
-/* Define to 1 if the system has the type `uint16_t'. */
-#define EVENT__HAVE_UINT16_T 1
-
-/* Define to 1 if the system has the type `uint32_t'. */
-#define EVENT__HAVE_UINT32_T 1
-
-/* Define to 1 if the system has the type `uint64_t'. */
-#define EVENT__HAVE_UINT64_T 1
-
-/* Define to 1 if the system has the type `uintptr_t'. */
-#define EVENT__HAVE_UINTPTR_T 1
-
-/* Define to 1 if you have the `umask' function. */
-#define EVENT__HAVE_UMASK 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define EVENT__HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `unsetenv' function. */
-#define EVENT__HAVE_UNSETENV 1
-
-/* Define to 1 if you have the `vasprintf' function. */
-#define EVENT__HAVE_VASPRINTF 1
-
-/* Define if kqueue works correctly with pipes */
-#define EVENT__HAVE_WORKING_KQUEUE 1
-
-#ifdef __USE_UNUSED_DEFINITIONS__
-/* Define to necessary symbol if this constant uses a non-standard name on your system. */
-/* XXX: Hello, this isn't even used, nor is it defined anywhere... - Ellzey */
-#define EVENT__PTHREAD_CREATE_JOINABLE
-#endif
-
-/* The size of `pthread_t', as computed by sizeof. */
-#define EVENT__SIZEOF_PTHREAD_T 8
-
-/* The size of a `int', as computed by sizeof. */
-#define EVENT__SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define EVENT__SIZEOF_LONG 8
-
-/* The size of a `long long', as computed by sizeof. */
-#define EVENT__SIZEOF_LONG_LONG 8
-
-/* The size of `off_t', as computed by sizeof. */
-#define EVENT__SIZEOF_OFF_T 8
-
-#define EVENT__SIZEOF_SSIZE_T 8
-
-
-/* The size of a `short', as computed by sizeof. */
-#define EVENT__SIZEOF_SHORT 2
-
-/* The size of `size_t', as computed by sizeof. */
-#define EVENT__SIZEOF_SIZE_T 8
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-/* #undef EVENT__TIME_WITH_SYS_TIME */
-
-/* The size of `socklen_t', as computed by sizeof. */
-#define EVENT__SIZEOF_SOCKLEN_T 4
-
-/* The size of 'void *', as computer by sizeof */
-#define EVENT__SIZEOF_VOID_P 8
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* why not c++?
- *
- *  and are we really expected to use EVENT__inline everywhere,
- *  shouldn't we just do:
- *     ifdef EVENT__inline
- *     define inline EVENT__inline
- *
- * - Ellzey
- */
-
-#define EVENT__inline inline
-#endif
-
-#define EVENT__HAVE___func__ 1
-#define EVENT__HAVE___FUNCTION__ 1
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#define EVENT__size_t size_t
-
-/* Define to unsigned int if you dont have it */
-#define EVENT__socklen_t socklen_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#define EVENT__ssize_t ssize_t
-
-#endif /* \EVENT2_EVENT_CONFIG_H_INCLUDED_ */
-END_OF_CONFIG
-
-Pod::Spec.new do |spec|
-  spec.name            = "libevent"
-  spec.version         = "2.1.11"
-  spec.summary         = "Event notification library"
-  spec.description     = "The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts."
-  spec.homepage        = "https://libevent.org"
-  spec.license         = { :type => "BSD 3-Clause", :file => "LICENSE" }
-  spec.author          = "Niels Provos and Nick Mathewson"
-  spec.platforms       = { :osx => "10.14", :ios => "10.0" }
-  spec.source          = { :git => "https://github.com/libevent/libevent.git", :tag => "release-#{spec.version}-stable" }
-  spec.prepare_command = "touch evconfig-private.h; echo -e #{Shellwords.escape(CONFIG_WITHOUT_OPENSSL)} > include/event2/event-config.h"
-  spec.source_files =
-    "include/*.h", "*-{internal,private}.h",
-    "buffer.c", "bufferevent.c", "bufferevent_filter.c", "bufferevent_pair.c", "bufferevent_ratelim.c", "bufferevent_sock.c",
-    "event.c", "evmap.c", "evthread.c", "evutil.c", "evutil_rand.c", "evutil_time.c",
-    "kqueue.c", "listener.c", "log.c", "poll.c", "select.c", "signal.c", "strlcpy.c", "watch.c",
-    "evdns.c", "event_tagging.c", "evrpc.c", "http.c"
-  spec.private_header_files = "*-{internal,private}.h"
-  spec.public_header_files = "include/*.h"
-  spec.preserve_paths = "include/event2/*.h"
-  spec.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/include/\"" }
-end
diff --git a/tools/build_defs/apple/config_utils_defs.bzl b/tools/build_defs/apple/config_utils_defs.bzl
new file mode 100644
index 00000000000000..273efa404725d2
--- /dev/null
+++ b/tools/build_defs/apple/config_utils_defs.bzl
@@ -0,0 +1,12 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+STATIC_LIBRARY_APPLETVOS_CONFIG = {}
+
+def fbobjc_configs(
+        common_settings = {},
+        config_specific_settings = {},
+        extra_target_config = {}):
+    return {}
diff --git a/packages/react-native-codegen/src/cli/verify_all_modules_with_old_codegen.sh b/tools/build_defs/apple/fb_apple_asset_catalog.bzl
old mode 100755
new mode 100644
similarity index 58%
rename from packages/react-native-codegen/src/cli/verify_all_modules_with_old_codegen.sh
rename to tools/build_defs/apple/fb_apple_asset_catalog.bzl
index a46079351aaf8c..ecfbc65066cdf8
--- a/packages/react-native-codegen/src/cli/verify_all_modules_with_old_codegen.sh
+++ b/tools/build_defs/apple/fb_apple_asset_catalog.bzl
@@ -1,10 +1,7 @@
-#!/bin/bash
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-set -e
-set -u
-
-exec buck query "filter('generated_objcpp_modules_tests_', '//xplat/js/...')" | xargs buck build
+def fb_apple_asset_catalog(sdks, **kwargs):
+    pass
diff --git a/tools/build_defs/apple/fb_apple_bundle.bzl b/tools/build_defs/apple/fb_apple_bundle.bzl
new file mode 100644
index 00000000000000..1d9666e378c436
--- /dev/null
+++ b/tools/build_defs/apple/fb_apple_bundle.bzl
@@ -0,0 +1,7 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+def fb_apple_bundle(name, sdk = None, **kwargs):
+    pass
diff --git a/tools/build_defs/apple/fb_apple_test.bzl b/tools/build_defs/apple/fb_apple_test.bzl
new file mode 100644
index 00000000000000..cb1c322fb80299
--- /dev/null
+++ b/tools/build_defs/apple/fb_apple_test.bzl
@@ -0,0 +1,7 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+def fb_apple_test(**kwargs):
+    pass
diff --git a/tools/build_defs/apple/fb_js_dep.bzl b/tools/build_defs/apple/fb_js_dep.bzl
new file mode 100644
index 00000000000000..5841ea8e367d56
--- /dev/null
+++ b/tools/build_defs/apple/fb_js_dep.bzl
@@ -0,0 +1,7 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+def rn_js_bundle_dep(bundle):
+    return bundle
diff --git a/tools/build_defs/apple/flag_defs.bzl b/tools/build_defs/apple/flag_defs.bzl
new file mode 100644
index 00000000000000..d2f4ae9ced68a7
--- /dev/null
+++ b/tools/build_defs/apple/flag_defs.bzl
@@ -0,0 +1,16 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+def get_base_appletvos_flags():
+    return []
+
+def get_objc_arc_preprocessor_flags():
+    return []
+
+def get_preprocessor_flags_for_build_mode():
+    return []
+
+def get_static_library_ios_flags():
+    return []
diff --git a/tools/build_defs/apple/plugins/plugin_defs.bzl b/tools/build_defs/apple/plugins/plugin_defs.bzl
new file mode 100644
index 00000000000000..70b0a8240af6bf
--- /dev/null
+++ b/tools/build_defs/apple/plugins/plugin_defs.bzl
@@ -0,0 +1,7 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+def plugin(socket, **kwargs):
+    return None
diff --git a/tools/build_defs/fb_xplat_platform_specific_rule.bzl b/tools/build_defs/fb_xplat_platform_specific_rule.bzl
new file mode 100644
index 00000000000000..699ce2abadf447
--- /dev/null
+++ b/tools/build_defs/fb_xplat_platform_specific_rule.bzl
@@ -0,0 +1,16 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+def fb_xplat_platform_specific_rule(
+        name,
+        platform,
+        rule,
+        apple_configurator = None,
+        apple_sdks = None,
+        xplat_mangled_args = {},
+        injected_args = {},
+        repo = None,
+        **kwargs):
+    pass
diff --git a/tools/build_defs/fb_xplat_resource.bzl b/tools/build_defs/fb_xplat_resource.bzl
new file mode 100644
index 00000000000000..411e55d6faea9a
--- /dev/null
+++ b/tools/build_defs/fb_xplat_resource.bzl
@@ -0,0 +1,7 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+def fb_xplat_resource(apple_sdks = None, platforms = None, **kwargs):
+    pass
diff --git a/tools/build_defs/js_glob.bzl b/tools/build_defs/js_glob.bzl
new file mode 100644
index 00000000000000..eb0e5004506c28
--- /dev/null
+++ b/tools/build_defs/js_glob.bzl
@@ -0,0 +1,40 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+"""Special globbing for js libraries, including and excluding certain files"""
+
+js_glob_exts = (
+    "gif",
+    "html",
+    "jpeg",
+    "jpg",
+    "js",
+    "js.flow",
+    "json",
+    "mp4",
+    "png",
+)
+
+def js_glob(dirs, excludes = []):
+    globs = []
+    for glob_dir in dirs:
+        if glob_dir == ".":
+            globs.extend(["*.%s" % (ext) for ext in js_glob_exts])
+        elif glob_dir == "**/*":
+            globs.extend(["**/*.%s" % (ext) for ext in js_glob_exts])
+        else:
+            globs.extend(
+                ["%s/**/*.%s" % (glob_dir, ext) for ext in js_glob_exts],
+            )
+    return native.glob(
+        globs,
+        exclude = [
+            "**/__tests__/**",
+            "**/__mocks__/**",
+            "**/__MOCKS__/**",
+            "**/__flowtests__/**",
+            "**/*.xcodeproj/**",
+        ] + (excludes or []),
+    )
diff --git a/tools/build_defs/oss/metro_defs.bzl b/tools/build_defs/oss/metro_defs.bzl
new file mode 100644
index 00000000000000..031f69a7b5fe2c
--- /dev/null
+++ b/tools/build_defs/oss/metro_defs.bzl
@@ -0,0 +1,9 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# metro-buck integration
+def rn_library(**kwargs):
+    # Noop for now
+    pass
diff --git a/tools/build_defs/oss/rn_codegen_defs.bzl b/tools/build_defs/oss/rn_codegen_defs.bzl
index 07d3b05ed6d45a..57e9d5e6859c51 100644
--- a/tools/build_defs/oss/rn_codegen_defs.bzl
+++ b/tools/build_defs/oss/rn_codegen_defs.bzl
@@ -11,6 +11,78 @@ load(
     _rn_codegen_components = "rn_codegen_components",
     _rn_codegen_modules = "rn_codegen_modules",
 )
+load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "react_native_root_target",
+)
 
 rn_codegen_components = _rn_codegen_components
 rn_codegen_modules = _rn_codegen_modules
+
+def rn_codegen(
+        name,
+        ios_assume_nonnull,
+        native_module_spec_name = None,
+        android_package_name = None,
+        codegen_components = False,
+        codegen_modules = False,
+        library_labels = [],
+        src_prefix = ""):
+    if (codegen_modules):
+        error_header = "rn_codegen(name=\"{}\")".format(name)
+        if not native_module_spec_name:
+            fail("{}: When codegen_modules = True, native_module_spec_name must be specified.".format(error_header))
+
+        if not android_package_name:
+            fail("{}: When codegen_modules = True, android_package_name must be specified.".format(error_header))
+
+        spec_srcs = native.glob(
+            [
+                src_prefix + "**/Native*.js",
+            ],
+            exclude = [
+                src_prefix + "**/nativeImageSource.js",
+                "**/__*__/**",
+            ],
+        )
+
+        module_schema_target = "{}-codegen-modules-schema".format(native_module_spec_name)
+
+        fb_native.genrule(
+            name = module_schema_target,
+            srcs = spec_srcs,
+            cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
+            out = "schema-{}.json".format(native_module_spec_name),
+            labels = ["codegen_rule", "react_native_schema_target"],
+        )
+
+        rn_codegen_modules(
+            name = native_module_spec_name,
+            android_package_name = android_package_name,
+            ios_assume_nonnull = ios_assume_nonnull,
+            schema_target = ":{}".format(module_schema_target),
+            library_labels = library_labels,
+        )
+
+    if (codegen_components):
+        fb_native.genrule(
+            name = "codegen_rn_components_schema_{}".format(name),
+            srcs = native.glob(
+                [
+                    src_prefix + "**/*NativeComponent.js",
+                ],
+                exclude = [
+                    "**/__*__/**",
+                ],
+            ),
+            cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
+            out = "schema-{}.json".format(name),
+            labels = ["codegen_rule"],
+        )
+
+        rn_codegen_components(
+            name = name,
+            schema_target = ":codegen_rn_components_schema_{}".format(name),
+            library_labels = library_labels,
+        )
diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl
index c255f62bc0ecab..3d562aa3fd6197 100644
--- a/tools/build_defs/oss/rn_defs.bzl
+++ b/tools/build_defs/oss/rn_defs.bzl
@@ -24,11 +24,12 @@ def get_preprocessor_flags_for_build_mode():
 def get_static_library_ios_flags():
     return _APPLE_COMPILER_FLAGS
 
-OBJC_ARC_PREPROCESSOR_FLAGS = [
-    "-fobjc-arc",
-    "-fno-objc-arc-exceptions",
-    "-Qunused-arguments",
-]
+def get_objc_arc_preprocessor_flags():
+    return [
+        "-fobjc-arc",
+        "-fno-objc-arc-exceptions",
+        "-Qunused-arguments",
+    ]
 
 IS_OSS_BUILD = True
 
@@ -48,6 +49,8 @@ IOS = "ios"
 
 MACOSX = "macosx"
 
+APPLETVOS = "appletvos"
+
 YOGA_TARGET = "//ReactAndroid/src/main/java/com/facebook:yoga"
 
 YOGA_CXX_TARGET = "//ReactCommon/yoga:yoga"
@@ -66,6 +69,11 @@ def get_apple_inspector_flags():
 def get_android_inspector_flags():
     return []
 
+def get_react_native_preprocessor_flags():
+    # TODO: use this to define the compiler flag REACT_NATIVE_DEBUG in debug/dev mode builds only.
+    # This is a replacement for NDEBUG since NDEBUG is always defined in Buck on all Android builds.
+    return []
+
 # Building is not supported in OSS right now
 def rn_xplat_cxx_library(name, **kwargs):
     new_kwargs = {
@@ -80,6 +88,8 @@ def rn_xplat_cxx_library(name, **kwargs):
         **new_kwargs
     )
 
+rn_xplat_cxx_library2 = rn_xplat_cxx_library
+
 # Example: react_native_target('java/com/facebook/react/common:common')
 def react_native_target(path):
     return "//ReactAndroid/src/main/" + path
@@ -120,8 +130,13 @@ def react_native_xplat_dep(path):
 def rn_extra_build_flags():
     return []
 
+def _unique(li):
+    return list({x: () for x in li})
+
 # React property preprocessor
 def rn_android_library(name, deps = [], plugins = [], *args, **kwargs):
+    _ = kwargs.pop("autoglob", False)
+    _ = kwargs.pop("is_androidx", False)
     if react_native_target(
         "java/com/facebook/react/uimanager/annotations:annotations",
     ) in deps and name != "processing":
@@ -131,7 +146,7 @@ def rn_android_library(name, deps = [], plugins = [], *args, **kwargs):
             ),
         ]
 
-        plugins = list(set(plugins + react_property_plugins))
+        plugins = _unique(plugins + react_property_plugins)
 
     if react_native_target(
         "java/com/facebook/react/module/annotations:annotations",
@@ -142,32 +157,9 @@ def rn_android_library(name, deps = [], plugins = [], *args, **kwargs):
             ),
         ]
 
-        plugins = list(set(plugins + react_module_plugins))
-
-    is_androidx = kwargs.pop("is_androidx", False)
-    provided_deps = kwargs.pop("provided_deps", [])
-    appcompat = react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat")
-    support_v4 = react_native_dep("third-party/android/support/v4:lib-support-v4")
-
-    if is_androidx and (appcompat in deps or appcompat in provided_deps):
-        # add androidx target to provided_deps
-        pass
-        # provided_deps.append(
-        #     react_native_dep(
-        #         ""
-        #     )
-        # )
-
-    if is_androidx and (support_v4 in deps or support_v4 in provided_deps):
-        # add androidx target to provided_deps
-        pass
-        # provided_deps.append(
-        #     react_native_dep(
-        #         ""
-        #     )
-        # )
-
-    native.android_library(name = name, deps = deps, plugins = plugins, provided_deps = provided_deps, *args, **kwargs)
+        plugins = _unique(plugins + react_module_plugins)
+
+    native.android_library(name = name, deps = deps, plugins = plugins, *args, **kwargs)
 
 def rn_android_binary(*args, **kwargs):
     native.android_binary(*args, **kwargs)
@@ -184,15 +176,9 @@ def rn_android_prebuilt_aar(*args, **kwargs):
 def rn_apple_library(*args, **kwargs):
     kwargs.setdefault("link_whole", True)
     kwargs.setdefault("enable_exceptions", True)
-    kwargs.setdefault("target_sdk_version", "10.0")
-
-    # Unsupported kwargs
-    _ = kwargs.pop("plugins_only", False)
-    _ = kwargs.pop("enable_exceptions", False)
-    _ = kwargs.pop("extension_api_only", False)
-    _ = kwargs.pop("sdks", [])
+    kwargs.setdefault("target_sdk_version", "11.0")
 
-    native.apple_library(*args, **kwargs)
+    fb_apple_library(*args, **kwargs)
 
 def rn_java_library(*args, **kwargs):
     _ = kwargs.pop("is_androidx", False)
@@ -213,11 +199,12 @@ def rn_genrule(*args, **kwargs):
 def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
     vm_args = vm_args or []
 
-    is_androidx = kwargs.pop("is_androidx", False)
+    _ = kwargs.pop("autoglob", False)
+    _ = kwargs.pop("is_androidx", False)
 
     kwargs["deps"] = kwargs.pop("deps", []) + [
         react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
-        react_native_dep("third-party/java/robolectric/4.4:robolectric"),
+        react_native_dep("third-party/java/robolectric:robolectric"),
         react_native_tests_target("resources:robolectric"),
         react_native_xplat_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock2"),
     ]
@@ -226,8 +213,8 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
         "-XX:+UseConcMarkSweepGC",  # required by -XX:+CMSClassUnloadingEnabled
         "-XX:+CMSClassUnloadingEnabled",
         "-XX:ReservedCodeCacheSize=150M",
-        "-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.4",
-        "-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.4/*.jar",
+        "-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric",
+        "-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/*.jar",
         "-Drobolectric.logging.enabled=true",
         "-XX:MaxPermSize=620m",
         "-Drobolectric.offline=true",
@@ -344,6 +331,17 @@ def _single_subdir_glob(dirpath, glob_pattern, exclude = None, prefix = None):
     return results
 
 def fb_apple_library(*args, **kwargs):
+    # Unsupported kwargs
+    _ = kwargs.pop("autoglob", False)
+    _ = kwargs.pop("plugins_only", False)
+    _ = kwargs.pop("enable_exceptions", False)
+    _ = kwargs.pop("extension_api_only", False)
+    _ = kwargs.pop("sdks", [])
+    _ = kwargs.pop("inherited_buck_flags", [])
+    _ = kwargs.pop("plugins", [])
+    _ = kwargs.pop("complete_nullability", False)
+    _ = kwargs.pop("plugins_header", "")
+
     native.apple_library(*args, **kwargs)
 
 def oss_cxx_library(**kwargs):
@@ -358,6 +356,25 @@ def fb_xplat_cxx_test(**_kwargs):
     pass
 
 # iOS Plugin support.
-def react_module_plugin_providers():
+def react_module_plugin_providers(*args, **kwargs):
     # Noop for now
     return []
+
+def react_fabric_component_plugin_provider(name, native_class_func):
+    return None
+
+HERMES_BYTECODE_VERSION = -1
+
+RCT_IMAGE_DATA_DECODER_SOCKET = None
+RCT_IMAGE_URL_LOADER_SOCKET = None
+RCT_URL_REQUEST_HANDLER_SOCKET = None
+
+def make_resource_glob(path):
+    return native.glob([path + "/**/*." + x for x in [
+        "m4a",
+        "mp3",
+        "otf",
+        "png",
+        "ttf",
+        "caf",
+    ]])
diff --git a/yarn.lock b/yarn.lock
index bf0a420badfc5f..1f47c6c255a6e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,287 +2,245 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
-
-"@babel/code-frame@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
-  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
+  integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==
   dependencies:
     "@babel/highlight" "^7.14.5"
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.4.5", "@babel/core@^7.7.5":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.0.tgz#a6fe5db77ebfb61e0da6c5c36aaf14aab07b2b44"
-  integrity sha512-FGgV2XyPoVtYDvbFXlukEWt13Afka4mBRQ2CoTsHxpgVGO6XfgtT6eI+WyjQRGGTL90IDkIVmme8riFCLZ8lUw==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.10.0"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.10.0"
-    "@babel/parser" "^7.10.0"
-    "@babel/template" "^7.10.0"
-    "@babel/traverse" "^7.10.0"
-    "@babel/types" "^7.10.0"
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
+  integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
+
+"@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10"
+  integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==
+  dependencies:
+    "@babel/code-frame" "^7.15.8"
+    "@babel/generator" "^7.15.8"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.8"
+    "@babel/helpers" "^7.15.4"
+    "@babel/parser" "^7.15.8"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.6"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
+    gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
+    semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.10.0", "@babel/generator@^7.5.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.0.tgz#a238837896edf35ee5fbfb074548d3256b4bc55d"
-  integrity sha512-ThoWCJHlgukbtCP79nAK4oLqZt5fVo70AHUni/y8Jotyg5rtJiG2FVl+iJjRNKIyl4hppqztLyAoEWcCvqyOFQ==
+"@babel/generator@^7.14.0", "@babel/generator@^7.15.4", "@babel/generator@^7.15.8":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1"
+  integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==
   dependencies:
-    "@babel/types" "^7.10.0"
+    "@babel/types" "^7.15.6"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.15.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
-  integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==
+"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
+  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
   dependencies:
-    "@babel/types" "^7.15.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+  integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-builder-react-jsx-experimental@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz#0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"
-  integrity sha512-HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/types" "^7.9.5"
-
-"@babel/helper-builder-react-jsx@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
-  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/types" "^7.9.0"
-
-"@babel/helper-create-class-features-plugin@^7.10.0", "@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.0.tgz#3a2b7b86f6365ea4ac3837a49ec5791e65217944"
-  integrity sha512-n4tPJaI0iuLRayriXTQ8brP3fMA/fNmxpxswfNuhe4qXQbcCWzeAqm6SeR/KExIOcdCvOh/KkPQVgBsjcb0oqA==
-  dependencies:
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-member-expression-to-functions" "^7.10.0"
-    "@babel/helper-optimise-call-expression" "^7.10.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.10.0"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-
-"@babel/helper-create-regexp-features-plugin@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.7.0"
-
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
+    semver "^6.3.0"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
+  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
 
-"@babel/helper-function-name@^7.14.5":
+"@babel/helper-create-regexp-features-plugin@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
-  integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
+  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.14.5"
-    "@babel/template" "^7.14.5"
-    "@babel/types" "^7.14.5"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    regexpu-core "^4.7.1"
 
-"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+"@babel/helper-define-polyfill-provider@^0.2.2":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
+  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
 
-"@babel/helper-get-function-arity@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
-  integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
+"@babel/helper-explode-assignable-expression@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+  integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
   dependencies:
-    "@babel/types" "^7.14.5"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+  integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-hoist-variables@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
-  integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+"@babel/helper-get-function-arity@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+  integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
   dependencies:
-    "@babel/types" "^7.14.5"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-member-expression-to-functions@^7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.0.tgz#e8cf57470bfd1247f2b41aa621a527e952efa6f1"
-  integrity sha512-xKLTpbMkJcvwEsDaTfs9h0IlfUiBLPFfybxaPpPPsQDsZTRg+UKh+86oK7sctHF3OUiRQkb10oS9MXSqgyV6/g==
+"@babel/helper-hoist-variables@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+  integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
   dependencies:
-    "@babel/types" "^7.10.0"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+"@babel/helper-member-expression-to-functions@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+  integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-optimise-call-expression@^7.10.0", "@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.0.tgz#6dcfb565842f43bed31b24f3e4277f18826e5e79"
-  integrity sha512-HgMd8QKA8wMJs5uK/DYKdyzJAEuGt1zyDp9wLMlMR6LitTQTHPUE+msC82ZsEDwq+U3/yHcIXIngRm9MS4IcIg==
+"@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.15.8":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz#d8c0e75a87a52e374a8f25f855174786a09498b2"
+  integrity sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==
   dependencies:
-    "@babel/types" "^7.10.0"
+    "@babel/helper-module-imports" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-simple-access" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
-  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+"@babel/helper-optimise-call-expression@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+  integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
+  dependencies:
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-remap-async-to-generator@^7.14.5":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
+  integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
   dependencies:
-    lodash "^4.17.13"
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-wrap-function" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-replace-supers@^7.10.0", "@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.0.tgz#26bc22ee1a35450934d2e2a9b27de10a22fac9d6"
-  integrity sha512-erl4iVeiANf14JszXP7b69bSrz3e3+qW09pVvEmTWwzRQEOoyb1WFlYCA8d/VjVZGYW8+nGpLh7swf9CifH5wg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.0"
-    "@babel/helper-optimise-call-expression" "^7.10.0"
-    "@babel/traverse" "^7.10.0"
-    "@babel/types" "^7.10.0"
-
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-split-export-declaration@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
-  integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+"@babel/helper-simple-access@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+  integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
   dependencies:
-    "@babel/types" "^7.14.5"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
+  integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9":
-  version "7.14.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48"
-  integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==
+"@babel/helper-split-export-declaration@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+  integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
+  dependencies:
+    "@babel/types" "^7.15.4"
 
-"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
+"@babel/helper-wrap-function@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
+  integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/helpers@^7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.0.tgz#634400a0977b8dcf7b311761a77ca94ed974b3b6"
-  integrity sha512-lQtFJoDZAGf/t2PgR6Z59Q2MwjvOGGsxZ0BAlsrgyDhKuMbe63EfbQmVmcLfyTBj8J4UtiadQimcotvYVg/kVQ==
+"@babel/helpers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+  integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
   dependencies:
-    "@babel/template" "^7.10.0"
-    "@babel/traverse" "^7.10.0"
-    "@babel/types" "^7.10.0"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
 "@babel/highlight@^7.14.5":
   version "7.14.5"
@@ -293,80 +251,62 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.0.tgz#8eca3e71a73dd562c5222376b08253436bb4995b"
-  integrity sha512-fnDUl1Uy2gThM4IFVW4ISNHqr3cJrCsRkSCasFgx0XDO9JcttDS5ytyBc4Cu4X1+fjoo3IVvFbRD6TeFlHJlEQ==
-
-"@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0":
-  version "7.15.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862"
-  integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==
-
-"@babel/plugin-external-helpers@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.8.3.tgz#5a94164d9af393b2820a3cdc407e28ebf237de4b"
-  integrity sha512-mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.7.0":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016"
+  integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==
 
 "@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.1.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
+  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-proposal-export-default-from@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.8.3.tgz#4cb7c2fdeaed490b60d9bfd3dc8a20f81f9c2e7c"
-  integrity sha512-PYtv2S2OdCdp7GSPDg5ndGZFm9DmWFvuLoS5nBxZCgOBggluLnhTScspJxng96alHQzPyrrHxvC9/w4bFuspeA==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.14.5.tgz#8931a6560632c650f92a8e5948f6e73019d6d321"
+  integrity sha512-T8KZ5abXvKMjF6JcoXjgac3ElmXf0AWzJwi2O/42Jk+HmCky3D9+i1B7NPP1FblyceqTevKeV/9szeikFoaMDg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-export-default-from" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-export-default-from" "^7.14.5"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.1.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
+  integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.0.tgz#d27b0910b637f7c9d9a5629f2adcd04dc9ea4e69"
-  integrity sha512-DOD+4TqMcRKJdAfN08+v9cciK5d0HW5hwTndOoKZEfEzU/mRrKboheD5mnWU4Q96VOnDdAj86kKjZhoQyG6s+A==
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
+  integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.15.4"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
+  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
 "@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.1.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.0.tgz#f9bdcd5cbf2e3037674903a45e56ed0cbaea1550"
-  integrity sha512-bn+9XT8Y6FJCO37ewj4E1gIirR35nDm+mGcqQV4dM3LKSVp3QTAU3f65Z0ld4y6jdfAlv2VKzCh4mezhRnl+6Q==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
+  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -383,11 +323,11 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7"
-  integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-dynamic-import@^7.0.0":
   version "7.8.3"
@@ -396,19 +336,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.0.0", "@babel/plugin-syntax-export-default-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.8.3.tgz#f1e55ce850091442af4ba9c2550106035b29d678"
-  integrity sha512-a1qnnsr73KLNIQcQlcQ4ZHxqqfBKM6iNQZW2OMTyxNbA2WC7SHWHtGVpFzWtQAuS2pspkWVzdEBXXx8Ik0Za4w==
+"@babel/plugin-syntax-export-default-from@^7.0.0", "@babel/plugin-syntax-export-default-from@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.14.5.tgz#cdfa9d43d2b2c89b6f1af3e83518e8c8b9ed0dbc"
+  integrity sha512-snWDxjuaPEobRBnhpqEfZ8RMxDbHt8+87fiEioGuE+Uc0xAKgSD8QiuL3lF93hPVQfZFAcYwrrf+H5qUhike3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0", "@babel/plugin-syntax-flow@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz#f2c883bd61a6316f2c89380ae5122f923ba4527f"
-  integrity sha512-innAx3bUbA0KSYj2E2MNFSn9hiCeowOFLxlsuhXzw8hMQnzkDomUr9QCD7E9VF60NmnG1sNTuuv6Qf4f8INYsg==
+"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.14.5", "@babel/plugin-syntax-flow@^7.2.0":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.14.5.tgz#2ff654999497d7d7d142493260005263731da180"
+  integrity sha512-9WK5ZwKCdWHxVuU13XNT6X73FGmutAXeor5lGFq6qhOFtMFUF4jkbijuyUdZZlpYq6E2hZeZf/u3959X9wsv0Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
@@ -424,21 +364,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz#521b06c83c40480f1e58b4fd33b92eceb1d6ea94"
-  integrity sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==
+"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201"
+  integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897"
-  integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -446,376 +386,349 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
-  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-typescript@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
+  integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-arrow-functions@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
+  integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-async-to-generator@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
+  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.14.5"
 
 "@babel/plugin-transform-block-scoped-functions@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
+  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.0.tgz#5d7aa0cf921ec91bdc97c9b311bf1fce0ea979b0"
-  integrity sha512-AoMn0D3nLG9i71useuBrZZTnHbjnhcaTXCckUtOx3JPuhGGJdOUYMwOV9niPJ+nZCk52dfLLqbmV3pBMCRQLNw==
+  version "7.15.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
+  integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-classes@^7.0.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
+  integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
+  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-destructuring@^7.0.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.0.tgz#59145194029721e49e511afb4bdd1d2f38369180"
-  integrity sha512-yKoghHpYbC0eM+6o6arPUJT9BQBvOOn8iOCEHwFvkJ5gjAxYmoUaAuLwaoA9h2YvC6dzcRI0KPQOpRXr8qQTxQ==
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
+  integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-exponentiation-operator@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
+  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392"
-  integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==
+"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.14.5.tgz#0dc9c1d11dcdc873417903d6df4bed019ef0f85e"
+  integrity sha512-KhcolBKfXbvjwI3TV7r7TkYm8oNXHNBqGOy6JDVwtecFaRoKYsUUqJdS10q0YDKW1c6aZQgO+Ys3LfGkox8pXA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-flow" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-flow" "^7.14.5"
 
 "@babel/plugin-transform-for-of@^7.0.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.0.tgz#ff2bf95dc1deb9b309c7fd78d9620ac9266a3efe"
-  integrity sha512-0ldl5xEe9kbuhB1cDqs17JiBPEm1+6/LH7loo29+MAJOyB/xbpLI/u6mRzDPjr0nYL7z0S14FPT4hs2gH8Im9Q==
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
+  integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-function-name@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
+  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-literals@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
+  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-member-expression-literals@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
+  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.1.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
-  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
+  integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-simple-access" "^7.15.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-object-assign@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.8.3.tgz#dc3b8dd50ef03837868a37b7df791f64f288538e"
-  integrity sha512-i3LuN8tPDqUCRFu3dkzF2r1Nx0jp4scxtm7JxtIqI9he9Vk20YD+/zshdzR9JLsoBMlJlNR82a62vQExNEVx/Q==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.14.5.tgz#62537d54b6d85de04f4df48bfdba2eebff17b760"
+  integrity sha512-lvhjk4UN9xJJYB1mI5KC0/o1D5EcJXdbhVe+4fSk08D6ZN+iuAIs7LJC+71h8av9Ew4+uRq9452v9R93SFmQlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-object-super@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
+  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
 
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
+  integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-property-literals@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
+  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz#70ded987c91609f78353dd76d2fb2a0bb991e8e5"
-  integrity sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==
+  version "7.15.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz#6aaac6099f1fcf6589d35ae6be1b6e10c8c602b9"
+  integrity sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-react-jsx-self@^7.0.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
-  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
+  version "7.14.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.9.tgz#33041e665453391eb6ee54a2ecf3ba1d46bd30f4"
+  integrity sha512-Fqqu0f8zv9W+RyOnx29BX/RlEsBRANbOf5xs5oxb2aHP4FKbLXxIaVPUiCti56LAR1IixMH4EyaixhUsKqoBHw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-react-jsx-source@^7.0.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.0.tgz#0e24978505130a79bb8ee1af15a1a7d8e783347d"
-  integrity sha512-EmUZ2YYXK6YFIdSxUJ1thg7gIBMHSEp8nGS6GwkXGpGdplpmOhj6azYjszT8YcFt6HyPElycDOd2lXckzN+OEw==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.5.tgz#79f728e60e6dbd31a2b860b0bf6c9765918acf1d"
+  integrity sha512-1TpSDnD9XR/rQ2tzunBVPThF5poaYT9GqP+of8fAtguYuI/dm2RkrMBDemsxtY0XBzvW7nXjYM0hRyKX9QYj7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
-  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
+  version "7.14.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c"
+  integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.9.0"
-    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-jsx" "^7.14.5"
+    "@babel/types" "^7.14.9"
 
 "@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
+  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
   dependencies:
     regenerator-transform "^0.14.2"
 
 "@babel/plugin-transform-runtime@^7.0.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.0.tgz#16e50ba682aa9925b94123a622d996cadd4cbef7"
-  integrity sha512-SWIc5IJnoLHk9qVRvvpebUW5lafStcKlLcqELMiNOApVIxPbCtkQfLRMCdaEKw4X92JItFKdoBxv2udiyGwFtg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    resolve "^1.8.1"
-    semver "^5.5.1"
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz#9d15b1e94e1c7f6344f65a8d573597d93c6cd886"
+  integrity sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.5"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
+  integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-spread@^7.0.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.0.tgz#6918d9b2b52c604802bd50a5f22b649efddf9af6"
-  integrity sha512-P3Zj04ylqumJBjmjylNl05ZHRo4j4gFNG7P70loys0//q5BTe30E8xIj6PnqEWAfsPYu2sdIPcJeeQdclqlM6A==
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz#79d5aa27f68d700449b2da07691dfa32d2f6d468"
+  integrity sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
 
 "@babel/plugin-transform-sticky-regex@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
+  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-template-literals@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
+  integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-typescript@^7.5.0", "@babel/plugin-transform-typescript@^7.9.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.0.tgz#00273cddb1f5321af09db5c096bb865eab137124"
-  integrity sha512-BGH4yn+QwYFfzh8ITmChwrcvhLf+jaYBlz+T87CNKTP49SbqrjqTsMqtFijivYWYjcYHvac8II53RYd82vRaAw==
+"@babel/plugin-transform-typescript@^7.15.0", "@babel/plugin-transform-typescript@^7.5.0":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.8.tgz#ff0e6a47de9b2d58652123ab5a879b2ff20665d8"
+  integrity sha512-ZXIkJpbaf6/EsmjeTbiJN/yMxWPFWvlr7sEG1P95Xb4S4IBcrf2n7s/fItIhsAmOf8oSh3VJPDppO6ExfAfKRQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-typescript" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-typescript" "^7.14.5"
 
 "@babel/plugin-transform-unicode-regex@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
+  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/preset-flow@^7.0.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.9.0.tgz#fee847c3e090b0b2d9227c1949e4da1d1379280d"
-  integrity sha512-88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA==
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.14.5.tgz#a1810b0780c8b48ab0bece8e7ab8d0d37712751c"
+  integrity sha512-pP5QEb4qRUSVGzzKx9xqRuHUrM/jEzMqdrZpdMA+oUCRgd5zM1qGr5y5+ZgAL/1tVv1H0dyk5t4SKJntqyiVtg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-flow-strip-types" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-flow-strip-types" "^7.14.5"
 
 "@babel/preset-typescript@^7.1.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
-  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz#e8fca638a1a0f64f14e1119f7fe4500277840945"
+  integrity sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-typescript" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-typescript" "^7.15.0"
 
 "@babel/register@^7.0.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.9.0.tgz#02464ede57548bddbb5e9f705d263b7c3f43d48b"
-  integrity sha512-Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q==
+  version "7.15.3"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.15.3.tgz#6b40a549e06ec06c885b2ec42c3dd711f55fe752"
+  integrity sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw==
   dependencies:
+    clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
-    lodash "^4.17.13"
     make-dir "^2.1.0"
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
 "@babel/runtime@^7.8.4":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.0.tgz#2cdcd6d7a391c24f7154235134c830cfb58ac0b1"
-  integrity sha512-tgYb3zVApHbLHYOPWtVwg25sBqHhfBXRKeKoTIyoheIxln1nA7oBl7SfHfiTG2GhDPI8EUBkOD/0wJCP/3HN4Q==
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
+  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.10.0", "@babel/template@^7.3.3", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.0.tgz#f15d852ce16cd5fb3e219097a75f662710b249b1"
-  integrity sha512-aMLEQn5tcG49LEWrsEwxiRTdaJmvLem3+JMCMSeCy2TILau0IDVyWdm/18ACx7XOCady64FLt6KkHy28tkDQHQ==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.10.0"
-    "@babel/types" "^7.10.0"
-
-"@babel/template@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
-  integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+"@babel/template@^7.0.0", "@babel/template@^7.15.4", "@babel/template@^7.3.3":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
   dependencies:
     "@babel/code-frame" "^7.14.5"
-    "@babel/parser" "^7.14.5"
-    "@babel/types" "^7.14.5"
-
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.0", "@babel/traverse@^7.8.3":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.0.tgz#290935529881baf619398d94fd453838bef36740"
-  integrity sha512-NZsFleMaLF1zX3NxbtXI/JCs2RPOdpGru6UBdGsfhdsDsP+kFF+h2QQJnMJglxk0kc69YmMFs4A44OJY0tKo5g==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.10.0"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.10.0"
-    "@babel/types" "^7.10.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
 
-"@babel/traverse@^7.7.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
-  integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+  integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
   dependencies:
     "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.15.0"
-    "@babel/helper-function-name" "^7.14.5"
-    "@babel/helper-hoist-variables" "^7.14.5"
-    "@babel/helper-split-export-declaration" "^7.14.5"
-    "@babel/parser" "^7.15.0"
-    "@babel/types" "^7.15.0"
+    "@babel/generator" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.8.3", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.0.tgz#d47d92249e42393a5723aad5319035ae411e3e38"
-  integrity sha512-t41W8yWFyQFPOAAvPvjyRhejcLGnJTA3iRpFcDbEKwVJ3UnHQePFzLk8GagTsucJlImyNwrGikGsYURrWbQG8w==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.14.5", "@babel/types@^7.15.0", "@babel/types@^7.7.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
-  integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==
+"@babel/types@^7.0.0", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+  integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
   dependencies:
     "@babel/helper-validator-identifier" "^7.14.9"
     to-fast-properties "^2.0.0"
@@ -826,175 +739,151 @@
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
 "@cnakazawa/watch@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
-  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
   dependencies:
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@hapi/address@2.x.x":
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a"
-  integrity sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==
-
-"@hapi/hoek@6.x.x":
-  version "6.2.4"
-  resolved "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz#4b95fbaccbfba90185690890bdf1a2fbbda10595"
-  integrity sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A==
-
-"@hapi/hoek@8.x.x":
-  version "8.0.2"
-  resolved "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.0.2.tgz#f63a5ff00e891a4e7aa98f11119f9515c6672032"
-  integrity sha512-O6o6mrV4P65vVccxymuruucb+GhP2zl9NLCG8OdoFRS8BEGw3vwpPp20wpAtpbQQxz1CEUtmxJGgWhjq1XA3qw==
-
-"@hapi/joi@^15.0.3":
-  version "15.1.0"
-  resolved "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz#940cb749b5c55c26ab3b34ce362e82b6162c8e7a"
-  integrity sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==
+"@eslint/eslintrc@^0.2.0":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
+  integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
   dependencies:
-    "@hapi/address" "2.x.x"
-    "@hapi/hoek" "6.x.x"
-    "@hapi/marker" "1.x.x"
-    "@hapi/topo" "3.x.x"
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    lodash "^4.17.19"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
 
-"@hapi/marker@1.x.x":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@hapi/marker/-/marker-1.0.0.tgz#65b0b2b01d1be06304886ce9b4b77b1bfb21a769"
-  integrity sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==
+"@hapi/hoek@^9.0.0":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17"
+  integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==
 
-"@hapi/topo@3.x.x":
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.2.tgz#57cc1317be1a8c5f47c124f9b0e3c49cd78424d2"
-  integrity sha512-r+aumOqJ5QbD6aLPJWqVjMAPsx5pZKz+F5yPqXZ/WWG9JTtHbQqlzrJoknJ0iJxLj9vlXtmpSdjlkszseeG8OA==
+"@hapi/topo@^5.0.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
+  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
   dependencies:
-    "@hapi/hoek" "8.x.x"
+    "@hapi/hoek" "^9.0.0"
 
 "@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
-  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
     find-up "^4.1.0"
+    get-package-type "^0.1.0"
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
 "@istanbuljs/schema@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
-  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
-
-"@jest/console@^24.7.1":
-  version "24.7.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
-  integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==
-  dependencies:
-    "@jest/source-map" "^24.3.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.5.2.tgz#94fc4865b1abed7c352b5e21e6c57be4b95604a6"
-  integrity sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==
+"@jest/console@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
+  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.5.2"
-    jest-util "^26.5.2"
+    jest-message-util "^26.6.2"
+    jest-util "^26.6.2"
     slash "^3.0.0"
 
-"@jest/core@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.5.2.tgz#e39f14676f4ba4632ecabfdc374071ab22131f22"
-  integrity sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==
+"@jest/core@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
+  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
   dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/reporters" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/reporters" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^26.5.2"
-    jest-config "^26.5.2"
-    jest-haste-map "^26.5.2"
-    jest-message-util "^26.5.2"
+    jest-changed-files "^26.6.2"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.5.2"
-    jest-resolve-dependencies "^26.5.2"
-    jest-runner "^26.5.2"
-    jest-runtime "^26.5.2"
-    jest-snapshot "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
-    jest-watcher "^26.5.2"
+    jest-resolve "^26.6.2"
+    jest-resolve-dependencies "^26.6.3"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
+    jest-watcher "^26.6.2"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/create-cache-key-function@^26.5.0":
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-26.5.0.tgz#1d07947adc51ea17766d9f0ccf5a8d6ea94c47dc"
-  integrity sha512-DJ+pEBUIqarrbv1W/C39f9YH0rJ4wsXZ/VC6JafJPlHW2HOucKceeaqTOQj9MEDQZjySxMLkOq5mfXZXNZcmWw==
-
-"@jest/environment@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.2.tgz#eba3cfc698f6e03739628f699c28e8a07f5e65fe"
-  integrity sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==
+"@jest/create-cache-key-function@^27.0.1":
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-27.3.1.tgz#95d0dda8fb5b340b29399ca1d4de11b78040ffd9"
+  integrity sha512-21lx0HRgkznc5Tc2WGiXVYQQ6Vdfohs6CkLV2FLogLRb52f6v9SiSIjTNflu23lzEmY4EalLgQLxCfhgvREV6w==
   dependencies:
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/types" "^26.5.2"
-    "@types/node" "*"
-    jest-mock "^26.5.2"
+    "@jest/types" "^27.2.5"
 
-"@jest/fake-timers@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz#2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"
-  integrity sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==
+"@jest/environment@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
+  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
   dependencies:
-    "@jest/types" "^24.8.0"
-    jest-message-util "^24.8.0"
-    jest-mock "^24.8.0"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    jest-mock "^26.6.2"
 
-"@jest/fake-timers@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.2.tgz#1291ac81680ceb0dc7daa1f92c059307eea6400a"
-  integrity sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==
+"@jest/fake-timers@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
+  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@sinonjs/fake-timers" "^6.0.1"
     "@types/node" "*"
-    jest-message-util "^26.5.2"
-    jest-mock "^26.5.2"
-    jest-util "^26.5.2"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
-"@jest/globals@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.2.tgz#c333f82c29e19ecb609a75d1a532915a5c956c59"
-  integrity sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==
+"@jest/globals@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
+  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
   dependencies:
-    "@jest/environment" "^26.5.2"
-    "@jest/types" "^26.5.2"
-    expect "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    expect "^26.6.2"
 
-"@jest/reporters@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.5.2.tgz#0f1c900c6af712b46853d9d486c9c0382e4050f6"
-  integrity sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==
+"@jest/reporters@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
+  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -1005,88 +894,70 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^26.5.2"
-    jest-resolve "^26.5.2"
-    jest-util "^26.5.2"
-    jest-worker "^26.5.0"
+    jest-haste-map "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
     terminal-link "^2.0.0"
-    v8-to-istanbul "^5.0.1"
+    v8-to-istanbul "^7.0.0"
   optionalDependencies:
     node-notifier "^8.0.0"
 
-"@jest/source-map@^24.3.0":
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28"
-  integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==
-  dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
-
-"@jest/source-map@^26.5.0":
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.5.0.tgz#98792457c85bdd902365cd2847b58fff05d96367"
-  integrity sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==
+"@jest/source-map@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
+  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
   dependencies:
     callsites "^3.0.0"
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3"
-  integrity sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/types" "^24.8.0"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-
-"@jest/test-result@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.2.tgz#cc1a44cfd4db2ecee3fb0bc4e9fe087aa54b5230"
-  integrity sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==
+"@jest/test-result@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
+  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
   dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz#c4559c7e134b27b020317303ee5399bf62917a4b"
-  integrity sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==
+"@jest/test-sequencer@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
+  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
   dependencies:
-    "@jest/test-result" "^26.5.2"
+    "@jest/test-result" "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.5.2"
-    jest-runner "^26.5.2"
-    jest-runtime "^26.5.2"
+    jest-haste-map "^26.6.2"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
 
-"@jest/transform@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.2.tgz#6a0033a1d24316a1c75184d010d864f2c681bef5"
-  integrity sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==
+"@jest/transform@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
+  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     babel-plugin-istanbul "^6.0.0"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.5.2"
+    jest-haste-map "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-util "^26.5.2"
+    jest-util "^26.6.2"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     slash "^3.0.0"
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
-"@jest/types@^24.8.0", "@jest/types@^24.9.0":
+"@jest/types@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
   integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
@@ -1095,25 +966,26 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@jest/types@^25.5.0":
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
-  integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==
+"@jest/types@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
     "@types/yargs" "^15.0.0"
-    chalk "^3.0.0"
+    chalk "^4.0.0"
 
-"@jest/types@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.5.2.tgz#44c24f30c8ee6c7f492ead9ec3f3c62a5289756d"
-  integrity sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==
+"@jest/types@^27.2.5":
+  version "27.2.5"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.2.5.tgz#420765c052605e75686982d24b061b4cbba22132"
+  integrity sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
-    "@types/yargs" "^15.0.0"
+    "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
 "@microsoft/node-core-library@3.19.3":
@@ -1212,30 +1084,30 @@
   resolved "https://registry.yarnpkg.com/@pnpm/types/-/types-6.4.0.tgz#312c3bf0b43b003508cb21bd3815406ea0f3b669"
   integrity sha512-nco4+4sZqNHn60Y4VE/fbtlShCBqipyUO+nKRPvDHqLrecMW9pzHWMVRxk4nrMRoeowj3q0rX3GYRBa8lsHTAg==
 
-"@react-native-community/cli-debugger-ui@^4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.9.0.tgz#4177764ba69243c97aa26829d59d9501acb2bd71"
-  integrity sha512-fBFGamHm4VUrDqkBGnsrwQL8OC6Om7K6EBQb4xj0nWekpXt1HSa3ScylYHTTWwYcpRf9htGMRGiv4dQDY/odAw==
+"@react-native-community/cli-debugger-ui@^6.0.0-rc.0":
+  version "6.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-6.0.0-rc.0.tgz#774378626e4b70f5e1e2e54910472dcbaffa1536"
+  integrity sha512-achYcPPoWa9D02C5tn6TBzjeY443wQTyx37urptc75JpZ7gR5YHsDyIEEWa3DDYp1va9zx/iGg+uZ/hWw07GAw==
   dependencies:
     serve-static "^1.13.1"
 
-"@react-native-community/cli-hermes@^4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-4.13.0.tgz#6243ed9c709dad5e523f1ccd7d21066b32f2899d"
-  integrity sha512-oG+w0Uby6rSGsUkJGLvMQctZ5eVRLLfhf84lLyz942OEDxFRa9U19YJxOe9FmgCKtotbYiM3P/XhK+SVCuerPQ==
+"@react-native-community/cli-hermes@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-6.1.0.tgz#f689f1b4fec4510cba063144b60da84ff6235858"
+  integrity sha512-BJyzGlUqnggbBL4Vh4cIC08oKOK4PoelxZFEo7TjFjfdBKvbM6955JN77ExJ7IdeLuGVpY4vaMwAJdx5l7LxKg==
   dependencies:
-    "@react-native-community/cli-platform-android" "^4.13.0"
-    "@react-native-community/cli-tools" "^4.13.0"
+    "@react-native-community/cli-platform-android" "^6.1.0"
+    "@react-native-community/cli-tools" "^6.1.0"
     chalk "^3.0.0"
     hermes-profile-transformer "^0.0.6"
     ip "^1.1.5"
 
-"@react-native-community/cli-platform-android@^4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.13.0.tgz#922681ec82ee1aadd993598b814df1152118be02"
-  integrity sha512-3i8sX8GklEytUZwPnojuoFbCjIRzMugCdzDIdZ9UNmi/OhD4/8mLGO0dgXfT4sMWjZwu3qjy45sFfk2zOAgHbA==
+"@react-native-community/cli-platform-android@^6.0.0", "@react-native-community/cli-platform-android@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-6.1.0.tgz#8c853807c8c1526593b735e8a19dc1f4471de69e"
+  integrity sha512-MBYGfgCpieoqskKc5QyQYIPc74DBEW60JaacQLntHjPLCEXG+hPsJi3AuXeNTJYPki5pyiSp3kviqciUvrS96A==
   dependencies:
-    "@react-native-community/cli-tools" "^4.13.0"
+    "@react-native-community/cli-tools" "^6.1.0"
     chalk "^3.0.0"
     execa "^1.0.0"
     fs-extra "^8.1.0"
@@ -1246,61 +1118,85 @@
     slash "^3.0.0"
     xmldoc "^1.1.2"
 
-"@react-native-community/cli-platform-ios@^4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.13.0.tgz#a738915c68cac86df54e578b59a1311ea62b1aef"
-  integrity sha512-6THlTu8zp62efkzimfGr3VIuQJ2514o+vScZERJCV1xgEi8XtV7mb/ZKt9o6Y9WGxKKkc0E0b/aVAtgy+L27CA==
+"@react-native-community/cli-platform-ios@^6.0.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-6.1.0.tgz#369cd936b689af93d070f52df2796994223e7705"
+  integrity sha512-whIm55fUeJUHrqZ2ecZ6FycZ5c/R3ZK8ViHwZQ+wM4uhXY8YSkrjnrJPUg68Q8inLkrAliLisypfm1z+VqJljw==
   dependencies:
-    "@react-native-community/cli-tools" "^4.13.0"
+    "@react-native-community/cli-tools" "^6.1.0"
     chalk "^3.0.0"
     glob "^7.1.3"
     js-yaml "^3.13.1"
     lodash "^4.17.15"
-    plist "^3.0.1"
+    plist "^3.0.2"
     xcode "^2.0.0"
 
-"@react-native-community/cli-server-api@^4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.13.0.tgz#ef0e53fe0edc7356d62bca725ca47cb368f748a5"
-  integrity sha512-ER138ChLc1YYX7j9yE6fDm4DdNdsHThr+pla/B6iZoKje1r7TwymDdKaUvOsYalG7sWG9glW3bofcCq+Yh0Dvw==
+"@react-native-community/cli-plugin-metro@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-6.1.0.tgz#3f34732a36a683c21e73843de49b13452ed63b06"
+  integrity sha512-ltHJquEgA6H4OTIUqWIkNm/xxAB9D4DK2K9M0jie9FfkOoqBXA7QS2WnC8GEa6a+3VIDwevB0RJsch218FdZCw==
+  dependencies:
+    "@react-native-community/cli-server-api" "^6.1.0"
+    "@react-native-community/cli-tools" "^6.1.0"
+    chalk "^3.0.0"
+    metro "^0.66.1"
+    metro-config "^0.66.1"
+    metro-core "^0.66.1"
+    metro-react-native-babel-transformer "^0.66.1"
+    metro-resolver "^0.66.1"
+    metro-runtime "^0.66.1"
+    mkdirp "^0.5.1"
+    readline "^1.3.0"
+
+"@react-native-community/cli-server-api@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-6.1.0.tgz#13839052733fec6ee656425cd44ce39064c84af1"
+  integrity sha512-WEJzdoF4JNUogZAd+Gdgbr+D/S/PHGjxH+PDjk3ST9pAUxEHb6naNwEl5dSJUY/ecBV63latNZkKunRyvFAx9A==
   dependencies:
-    "@react-native-community/cli-debugger-ui" "^4.9.0"
-    "@react-native-community/cli-tools" "^4.13.0"
+    "@react-native-community/cli-debugger-ui" "^6.0.0-rc.0"
+    "@react-native-community/cli-tools" "^6.1.0"
     compression "^1.7.1"
     connect "^3.6.5"
     errorhandler "^1.5.0"
-    pretty-format "^25.1.0"
+    nocache "^2.1.0"
+    pretty-format "^26.6.2"
     serve-static "^1.13.1"
     ws "^1.1.0"
 
-"@react-native-community/cli-tools@^4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.13.0.tgz#b406463d33af16cedc4305a9a9257ed32845cf1b"
-  integrity sha512-s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg==
+"@react-native-community/cli-tools@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-6.1.0.tgz#fb16b8e4805dadf4d2a57c69ffe83ddadffbe771"
+  integrity sha512-MT8syhvk0vpfyYyHlcDoGicKcqMtBN7WPmDeyW16u+eKBtw/+EKq+86cFCuOHCfHK20ujG1mZqA1txxlCbu8GA==
   dependencies:
+    appdirsjs "^1.2.4"
     chalk "^3.0.0"
     lodash "^4.17.15"
     mime "^2.4.1"
+    mkdirp "^0.5.1"
     node-fetch "^2.6.0"
     open "^6.2.0"
+    semver "^6.3.0"
     shell-quote "1.6.1"
 
-"@react-native-community/cli-types@^4.10.1":
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-4.10.1.tgz#d68a2dcd1649d3b3774823c64e5e9ce55bfbe1c9"
-  integrity sha512-ael2f1onoPF3vF7YqHGWy7NnafzGu+yp88BbFbP0ydoCP2xGSUzmZVw0zakPTC040Id+JQ9WeFczujMkDy6jYQ==
-
-"@react-native-community/cli@^4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.13.0.tgz#04d5032f9b2b423c61ceef6be83b1bcc8a37db75"
-  integrity sha512-R+1VehIQ6VTLf+e7YOwzJk0F9tstfeSC4xy7oT6GSgB3FnXbTJGHFUp4siyO68Ae/gzGqt8SiUO145teWkP+ZA==
-  dependencies:
-    "@hapi/joi" "^15.0.3"
-    "@react-native-community/cli-debugger-ui" "^4.9.0"
-    "@react-native-community/cli-hermes" "^4.13.0"
-    "@react-native-community/cli-server-api" "^4.13.0"
-    "@react-native-community/cli-tools" "^4.13.0"
-    "@react-native-community/cli-types" "^4.10.1"
+"@react-native-community/cli-types@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-6.0.0.tgz#90269fbdc7229d5e3b8f2f3e029a94083551040d"
+  integrity sha512-K493Fk2DMJC0ZM8s8gnfseKxGasIhuDaCUDeLZcoCSFlrjKEuEs1BKKEJiev0CARhKEXKOyyp/uqYM9nWhisNw==
+  dependencies:
+    ora "^3.4.0"
+
+"@react-native-community/cli@^6.0.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-6.1.0.tgz#e4aad5240715a587a51d7f779f60d20199e347ce"
+  integrity sha512-Ck1XjvsnYYVYqooxmSlvRvGMGgxj3t+evUGlg80b+TxnurhlGq8D8pW7++L/sECChI43YWMBtLIdAYG/lGkN8Q==
+  dependencies:
+    "@react-native-community/cli-debugger-ui" "^6.0.0-rc.0"
+    "@react-native-community/cli-hermes" "^6.1.0"
+    "@react-native-community/cli-plugin-metro" "^6.1.0"
+    "@react-native-community/cli-server-api" "^6.1.0"
+    "@react-native-community/cli-tools" "^6.1.0"
+    "@react-native-community/cli-types" "^6.0.0"
+    appdirsjs "^1.2.4"
     chalk "^3.0.0"
     command-exists "^1.2.8"
     commander "^2.19.0"
@@ -1312,19 +1208,15 @@
     fs-extra "^8.1.0"
     glob "^7.1.3"
     graceful-fs "^4.1.3"
-    inquirer "^3.0.6"
+    joi "^17.2.1"
     leven "^3.1.0"
     lodash "^4.17.15"
-    metro "^0.58.0"
-    metro-config "^0.58.0"
-    metro-core "^0.58.0"
-    metro-react-native-babel-transformer "^0.58.0"
-    metro-resolver "^0.58.0"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     node-stream-zip "^1.9.1"
     ora "^3.4.0"
-    pretty-format "^25.2.0"
+    pretty-format "^26.6.2"
+    prompts "^2.4.0"
     semver "^6.3.0"
     serve-static "^1.13.1"
     strip-ansi "^5.2.0"
@@ -1334,11 +1226,29 @@
 "@reactions/component@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@reactions/component/-/component-2.0.2.tgz#40f8c1c2c37baabe57a0c944edb9310dc1ec6642"
+  integrity sha1-QPjBwsN7qr5XoMlE7bkxDcHsZkI=
+
+"@sideway/address@^4.1.0":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.2.tgz#811b84333a335739d3969cfc434736268170cad1"
+  integrity sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
+  integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
+
+"@sideway/pinpoint@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
 "@sinonjs/commons@^1.7.0":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
-  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
   dependencies:
     type-detect "4.0.8"
 
@@ -1349,10 +1259,15 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
-  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
+  version "7.1.16"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
+  integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1361,24 +1276,24 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
-  integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
+  integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
-  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
-  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
+  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1389,42 +1304,37 @@
   dependencies:
     chalk "*"
 
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
 "@types/graceful-fs@^4.1.2":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
-  integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
+  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
   dependencies:
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
 
 "@types/istanbul-lib-report@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
-  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
+  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
-  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
@@ -1439,9 +1349,9 @@
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
 "@types/node@*":
-  version "13.13.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
-  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
+  version "16.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.1.tgz#2e50a649a50fc403433a14f829eface1a3443e97"
+  integrity sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==
 
 "@types/node@10.17.13":
   version "10.17.13"
@@ -1454,9 +1364,9 @@
   integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1464,9 +1374,9 @@
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prettier@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.0.tgz#dc85454b953178cc6043df5208b9e949b54a3bc4"
-  integrity sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb"
+  integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==
 
 "@types/prompts@^2.0.3":
   version "2.0.14"
@@ -1476,19 +1386,14 @@
     "@types/node" "*"
 
 "@types/semver@^7.1.0":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59"
-  integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==
-
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
+  integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
-  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/valid-url@^1.0.2":
   version "1.0.3"
@@ -1496,31 +1401,31 @@
   integrity sha512-+33x29mg+ecU88ODdWpqaie2upIuRkhujVLA7TuJjM823cNMbeggfI6NhxewaRaRF8dy+g33e4uIg/m5Mb3xDQ==
 
 "@types/yargs-parser@*":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
-  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+  version "20.2.1"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
+  integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
 
 "@types/yargs@^13.0.0":
-  version "13.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.10.tgz#e77bf3fc73c781d48c2eb541f87c453e321e5f4b"
-  integrity sha512-MU10TSgzNABgdzKvQVW1nuuT+sgBMWeXNc3XOs5YXV5SDAK+PPja2eUuBNB9iqElu03xyEDqlnGw0jgl4nbqGQ==
+  version "13.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.12.tgz#d895a88c703b78af0465a9de88aa92c61430b092"
+  integrity sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yargs@^15.0.0":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.3.tgz#41453a0bc7ab393e995d1f5451455638edbd2baf"
-  integrity sha512-XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@types/yargs@^15.0.3":
+"@types/yargs@^15.0.0", "@types/yargs@^15.0.3":
   version "15.0.14"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
   integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yargs@^16.0.0":
+  version "16.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
+  integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@typescript-eslint/eslint-plugin@4.30.0":
   version "4.30.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb"
@@ -1610,15 +1515,10 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abab@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
-  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+abab@^2.0.3, abab@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
 abort-controller@^3.0.0:
   version "3.0.0"
@@ -1632,7 +1532,7 @@ absolute-path@^0.0.0:
   resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
   integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c=
 
-accepts@~1.3.5, accepts@~1.3.7:
+accepts@^1.3.7, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
   integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
@@ -1648,20 +1548,25 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.2.0:
+acorn-jsx@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
-  integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
+acorn@^7.1.1, acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
-  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+acorn@^8.2.4:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+  integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
 
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
@@ -1670,6 +1575,13 @@ agent-base@4, agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -1684,17 +1596,7 @@ agentkeepalive@^3.4.1:
   dependencies:
     humanize-ms "^1.2.1"
 
-ajv@^6.10.0, ajv@^6.10.2:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.12.3:
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1705,14 +1607,14 @@ ajv@^6.12.3:
     uri-js "^4.2.2"
 
 anser@^1.4.9:
-  version "1.4.9"
-  resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
-  integrity sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==
+  version "1.4.10"
+  resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b"
+  integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww==
 
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-escapes@^3.1.0:
   version "3.2.0"
@@ -1720,11 +1622,11 @@ ansi-escapes@^3.1.0:
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
-    type-fest "^0.11.0"
+    type-fest "^0.21.3"
 
 ansi-fragments@^0.2.1:
   version "0.2.1"
@@ -1750,10 +1652,10 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -1763,11 +1665,10 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
-  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
-    "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
 ansicolors@~0.3.2:
@@ -1789,26 +1690,23 @@ anymatch@^2.0.0:
     normalize-path "^2.1.1"
 
 anymatch@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+appdirsjs@^1.2.4:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/appdirsjs/-/appdirsjs-1.2.5.tgz#c9888c8a0a908014533d5176ec56f1d5a8fd3700"
+  integrity sha512-UyaAyzj+7XLoKhbXJi4zoAw8IDXCiLNCKfQEiuCsCCTkDmiG1vpCliQn/MoUvO3DZqCN1i6gOahokcFtNSIrVA==
+
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1873,14 +1771,16 @@ array-filter@~0.0.0:
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
   integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
 
-array-includes@^3.0.3, array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.3:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
+  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    is-string "^1.0.5"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.7"
 
 array-initial@^1.0.0:
   version "1.1.0"
@@ -1923,20 +1823,20 @@ array-unique@^0.3.2:
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 array.prototype.flatmap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443"
-  integrity sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
+  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.19.0"
 
 arrify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-asap@~2.0.3, asap@~2.0.6:
+asap@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -1970,10 +1870,10 @@ ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
-ast-types@0.14.1:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.1.tgz#0b415043770d7a2cbe4b2770271cbd7d2c9f61b9"
-  integrity sha512-pfSiukbt23P1qMhNnsozLzhMLBs7EEeXqPyvPmnuZM+RMfwfqwDbSVKYflgGuVI7/VehR4oMks0igzdNAg4VeQ==
+ast-types@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
+  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
   dependencies:
     tslib "^2.0.1"
 
@@ -1993,9 +1893,9 @@ async-done@^1.2.2:
     stream-exhaust "^1.0.1"
 
 async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async-settle@^1.0.0:
   version "1.0.0"
@@ -2015,11 +1915,11 @@ async@^1.5.2:
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@^2.4.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.14"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -2031,7 +1931,7 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.1.1:
+atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
@@ -2042,16 +1942,14 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 axobject-query@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
-  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
-  dependencies:
-    ast-types-flow "0.0.7"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
+  integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
 babel-core@^7.0.0-bridge.0:
   version "7.0.0-bridge.0"
@@ -2070,16 +1968,16 @@ babel-eslint@^10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.2.tgz#164f367a35946c6cf54eaccde8762dec50422250"
-  integrity sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==
+babel-jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
+  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
   dependencies:
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.5.0"
+    babel-preset-jest "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     slash "^3.0.0"
@@ -2092,35 +1990,59 @@ babel-plugin-dynamic-import-node@^2.3.3:
     object.assign "^4.1.0"
 
 babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
-  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz#3916b3a28129c29528de91e5784a44680db46385"
-  integrity sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==
+babel-plugin-jest-hoist@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
+  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
+babel-plugin-polyfill-corejs2@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
+  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
+  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    core-js-compat "^3.16.2"
+
+babel-plugin-polyfill-regenerator@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
+  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+
 babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
   version "7.0.0-beta.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
   integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
 
-babel-preset-current-node-syntax@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz#826f1f8e7245ad534714ba001f84f7e906c3b615"
-  integrity sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==
+babel-preset-current-node-syntax@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -2133,11 +2055,12 @@ babel-preset-current-node-syntax@^0.1.3:
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-fbjs@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541"
-  integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw==
+babel-preset-fbjs@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c"
+  integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.0.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
@@ -2167,18 +2090,13 @@ babel-preset-fbjs@^3.3.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
-babel-preset-jest@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz#f1b166045cd21437d1188d29f7fba470d5bdb0e7"
-  integrity sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==
+babel-preset-jest@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
+  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
   dependencies:
-    babel-plugin-jest-hoist "^26.5.0"
-    babel-preset-current-node-syntax "^0.1.3"
-
-babylon@^6.15.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+    babel-plugin-jest-hoist "^26.6.2"
+    babel-preset-current-node-syntax "^1.0.0"
 
 bach@^1.0.0, bach@^1.2.0:
   version "1.2.0"
@@ -2203,14 +2121,14 @@ back@1.0.x:
     xtend "^4.0.0"
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.1.2, base64-js@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+base64-js@^1.1.2, base64-js@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base@^0.11.1:
   version "0.11.2"
@@ -2252,10 +2170,10 @@ beachball@^1.27.0:
     workspace-tools "^0.12.3"
     yargs-parser "^20.2.4"
 
-big-integer@^1.6.7:
-  version "1.6.36"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36"
-  integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==
+big-integer@^1.6.44:
+  version "1.6.50"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.50.tgz#299a4be8bd441c73dcc492ed46b7169c34e92e70"
+  integrity sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==
 
 bluebird@^3.5.1, bluebird@^3.5.4, bluebird@^3.5.5:
   version "3.7.2"
@@ -2270,19 +2188,19 @@ bluebird@^3.5.1, bluebird@^3.5.4, bluebird@^3.5.5:
     fast-safe-stringify "~1.1.0"
     individual "~3.0.0"
 
-bplist-creator@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/bplist-creator/-/bplist-creator-0.0.7.tgz#37df1536092824b87c42f957b01344117372ae45"
-  integrity sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=
+bplist-creator@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/bplist-creator/-/bplist-creator-0.0.8.tgz#56b2a6e79e9aec3fc33bf831d09347d73794e79c"
+  integrity sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==
   dependencies:
     stream-buffers "~2.2.0"
 
-bplist-parser@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
-  integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
+bplist-parser@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
+  integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==
   dependencies:
-    big-integer "^1.6.7"
+    big-integer "^1.6.44"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2320,22 +2238,28 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-bser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
-  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
+browserslist@^4.16.6, browserslist@^4.17.3:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.4.tgz#72e2508af2a403aec0a49847ef31bd823c57ead4"
+  integrity sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==
   dependencies:
-    node-int64 "^0.4.0"
+    caniuse-lite "^1.0.30001265"
+    electron-to-chromium "^1.3.867"
+    escalade "^3.1.1"
+    node-releases "^2.0.0"
+    picocolors "^1.0.0"
 
-buffer-crc32@^0.2.13:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 builtins@^1.0.3:
   version "1.0.3"
@@ -2351,12 +2275,12 @@ bunyan-debug-stream@^1.1.0:
     exception-formatter "^1.0.4"
 
 bunyan@^1.8.12:
-  version "1.8.12"
-  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797"
-  integrity sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=
+  version "1.8.15"
+  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46"
+  integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==
   optionalDependencies:
     dtrace-provider "~0.8"
-    moment "^2.10.6"
+    moment "^2.19.3"
     mv "~2"
     safe-json-stringify "~1"
 
@@ -2400,7 +2324,7 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-call-bind@^1.0.0:
+call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
@@ -2428,9 +2352,9 @@ callsites@^2.0.0:
   integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 callsites@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
-  integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
@@ -2438,16 +2362,21 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
-  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-capture-exit@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
-  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+caniuse-lite@^1.0.30001265:
+  version "1.0.30001270"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz#cc9c37a4ec5c1a8d616fc7bace902bb053b0cdea"
+  integrity sha512-TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A==
+
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
   dependencies:
-    rsvp "^3.3.3"
+    rsvp "^4.8.4"
 
 cardinal@^2.1.1:
   version "2.1.1"
@@ -2462,7 +2391,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@*, chalk@^4.1.0:
+chalk@*, chalk@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2470,7 +2399,7 @@ chalk@*, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2487,29 +2416,11 @@ chalk@^3, chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
-  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-chardet@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
 child-process-promise@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/child-process-promise/-/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074"
@@ -2519,11 +2430,6 @@ child-process-promise@^2.2.0:
     node-version "^1.0.0"
     promise-polyfill "^6.0.1"
 
-chownr@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
-
 chownr@^1.1.1, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -2534,10 +2440,15 @@ ci-info@^2.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
+cjs-module-lexer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
+  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+
 clang-format@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.2.4.tgz#4bb4b0a98180428deb093cf20982e9fc1af20b6c"
-  integrity sha512-sw+nrGUp3hvmANd1qF8vZPuezSYQAiXgGBiEtkXTtJnnu6b00fCqkkDIsnRKrNgg4nv6NYZE92ejvOMIXZoejw==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.5.0.tgz#1bd4c47b66a1a02556b192b93f5505e7ccec84fb"
+  integrity sha512-C1LucFX7E+ABVYcPEbBHM4PYQ2+WInXsqsLpFlQ9cmRfSbk7A7b1I06h/nE4bQ3MsyEkb31jY2gC0Dtc76b4IA==
   dependencies:
     async "^1.5.2"
     glob "^7.0.0"
@@ -2560,17 +2471,10 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
 cli-spinners@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.1.0.tgz#22c34b4d51f573240885b201efda4e4ec9fff3c7"
-  integrity sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
 
 cli-table@^0.3.1:
   version "0.3.6"
@@ -2579,16 +2483,6 @@ cli-table@^0.3.1:
   dependencies:
     colors "1.0.3"
 
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -2616,6 +2510,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -2698,9 +2601,9 @@ color@0.8.x:
     color-string "^0.3.0"
 
 colorette@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.0.7.tgz#7adf43c445ee63a541b4a4aef7d13f03df1e0cc0"
-  integrity sha512-KeK4klsvAgdODAjFPm6QLzvStizJqlxMBtVo4KQMCgk5tt/tf9rAzxmxLHNRynJg3tJjkKGKbHx3j4HLox27Lw==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+  integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
 colornames@0.0.2:
   version "0.0.2"
@@ -2713,9 +2616,9 @@ colors@1.0.3:
   integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
 colors@^1.0.3, colors@^1.1.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
-  integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
 colors@~1.2.1:
   version "1.2.5"
@@ -2730,24 +2633,19 @@ colorspace@1.0.x:
     color "0.8.x"
     text-hex "0.0.x"
 
-combined-stream@1.0.6, combined-stream@~1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
 command-exists@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
-  integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69"
+  integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==
 
-commander@^2.11.0, commander@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commander@^2.7.1:
+commander@^2.11.0, commander@^2.19.0, commander@^2.7.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2763,9 +2661,9 @@ commondir@^1.0.1:
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 compressible@~2.0.16:
   version "2.0.18"
@@ -2792,7 +2690,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2803,24 +2701,19 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
     typedarray "^0.0.6"
 
 connect@^3.6.5:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
   dependencies:
     debug "2.6.9"
-    finalhandler "1.1.0"
-    parseurl "~1.3.2"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
     utils-merge "1.0.1"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
   dependencies:
     safe-buffer "~5.1.1"
 
@@ -2841,24 +2734,32 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js@^2.2.2, core-js@^2.4.1:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
+core-js-compat@^3.16.2:
+  version "3.18.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.3.tgz#e0e7e87abc55efb547e7fa19169e45fa9df27a67"
+  integrity sha512-4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw==
+  dependencies:
+    browserslist "^4.17.3"
+    semver "7.0.0"
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
 cosmiconfig@^5.0.5, cosmiconfig@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
-  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.13.0"
+    js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
 cosmiconfig@^6.0.0:
@@ -2873,16 +2774,15 @@ cosmiconfig@^6.0.0:
     yaml "^1.7.2"
 
 coveralls@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.2.tgz#f5a0bcd90ca4e64e088b710fa8dda640aea4884f"
-  integrity sha512-Tv0LKe/MkBOilH2v7WBiTBdudg2ChfGbdXafc/s330djpF3zKOmuehTeRwjXWc7pzfj9FrDUTA7tEx6Div8NFw==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.1.1.tgz#f5d4431d8b5ae69c5079c8f8ca00d64ac77cf081"
+  integrity sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==
   dependencies:
-    growl "~> 1.10.0"
-    js-yaml "^3.11.0"
-    lcov-parse "^0.0.10"
+    js-yaml "^3.13.1"
+    lcov-parse "^1.0.0"
     log-driver "^1.2.7"
-    minimist "^1.2.0"
-    request "^2.85.0"
+    minimist "^1.2.5"
+    request "^2.88.2"
 
 cross-spawn@^4.0.2:
   version "4.0.2"
@@ -2892,7 +2792,7 @@ cross-spawn@^4.0.2:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2903,10 +2803,10 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
-  integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==
+cross-spawn@^7.0.0, cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -2922,7 +2822,7 @@ cssom@~0.3.6:
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
-cssstyle@^2.2.0:
+cssstyle@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
   integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
@@ -2943,9 +2843,9 @@ d@1, d@^1.0.1:
     type "^1.0.1"
 
 damerau-levenshtein@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
-  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
+  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -2964,9 +2864,9 @@ data-urls@^2.0.0:
     whatwg-url "^8.0.0"
 
 dayjs@^1.8.15:
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.15.tgz#7121bc04e6a7f2621ed6db566be4a8aaf8c3913e"
-  integrity sha512-HYHCI1nohG52B45vCQg8Re3hNDZbMroWPkhz50yaX7Lu0ATyjGsTdoYZBpjED9ar6chqTx2dmSmM8A51mojnAg==
+  version "1.10.7"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
+  integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
 
 debug@0.7.x:
   version "0.7.4"
@@ -2978,7 +2878,7 @@ debug@0.8.x:
   resolved "https://registry.yarnpkg.com/debug/-/debug-0.8.1.tgz#20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"
   integrity sha1-IP9NJvXkIstoobrLu2EDmtjBwTA=
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2992,6 +2892,13 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.1.0:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -2999,49 +2906,30 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.3.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decimal.js@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231"
-  integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==
+decimal.js@^10.2.1:
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
+  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+deep-is@^0.1.3, deep-is@~0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
-  integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.3.0.tgz#d3c47fd6f3a93d517b14426b0628a17b0125f5f7"
+  integrity sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA==
 
 deepmerge@^4.2.2:
   version "4.2.2"
@@ -3094,11 +2982,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 denodeify@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
@@ -3114,11 +2997,6 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -3166,10 +3044,10 @@ diff-match-patch@1.0.4:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
   integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
 
-diff-sequences@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.5.0.tgz#ef766cf09d43ed40406611f11c6d8d9dd8b2fefd"
-  integrity sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==
+diff-sequences@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
+  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -3200,11 +3078,11 @@ domexception@^2.0.1:
     webidl-conversions "^5.0.0"
 
 dtrace-provider@~0.8:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"
-  integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ=
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e"
+  integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==
   dependencies:
-    nan "^2.10.0"
+    nan "^2.14.0"
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -3229,6 +3107,11 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
+electron-to-chromium@^1.3.867:
+  version "1.3.874"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.874.tgz#75d68ce2b3a778346916ae1293f80f389ecf439c"
+  integrity sha512-OxEyMXzLi6Y9UMPgyjP6XSuIsgD1xgK2FWnek/toV3G0Zr89bKSuNaX8YRM5hWtSaNEiL/TqubOvwtDTU3pwZA==
+
 emits@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/emits/-/emits-1.0.2.tgz#db20ec6668325071c313441e30cfe2a69ea73859"
@@ -3240,9 +3123,9 @@ emits@3.0.x:
   integrity sha1-MnUrupXhcHshlWI4Srm7ix/WL3A=
 
 emittery@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
-  integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
+  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
 
 emoji-regex@^7.0.1, emoji-regex@^7.0.2:
   version "7.0.3"
@@ -3261,31 +3144,31 @@ enabled@1.0.x:
   dependencies:
     env-variable "0.0.x"
 
-encodeurl@~1.0.1, encodeurl@~1.0.2:
+encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
   dependencies:
-    iconv-lite "~0.4.13"
+    iconv-lite "^0.6.2"
 
-end-of-stream@^1.0.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
-end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
   dependencies:
-    once "^1.4.0"
+    ansi-colors "^4.1.1"
 
 env-variable@0.0.x:
   version "0.0.6"
@@ -3293,9 +3176,9 @@ env-variable@0.0.x:
   integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
 
 envinfo@^7.7.2:
-  version "7.7.3"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
-  integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
 err-code@^1.0.0:
   version "1.1.2"
@@ -3309,6 +3192,13 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+error-stack-parser@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8"
+  integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==
+  dependencies:
+    stackframe "^1.1.1"
+
 errorhandler@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91"
@@ -3317,40 +3207,31 @@ errorhandler@^1.5.0:
     accepts "~1.3.7"
     escape-html "~1.0.3"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
-  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
+es-abstract@^1.19.0, es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
   dependencies:
+    call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -3409,6 +3290,11 @@ es6-weak-map@^2.0.1:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -3424,13 +3310,13 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escodegen@^1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
-  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+escodegen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
   dependencies:
     esprima "^4.0.1"
-    estraverse "^4.2.0"
+    estraverse "^5.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
@@ -3454,23 +3340,23 @@ eslint-config-fbjs@^3.1.0:
   integrity sha512-Vpyqz+ZcyLyiUGUdUfiQmZnxiQ4Nj/KDRKed/Y5qSm+xHbQJ5zcZUQwLUMWHQicpDHewsdXwlpUAblvy1DtGvg==
 
 eslint-config-prettier@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz#f429a53bde9fc7660e6353910fd996d6284d3c25"
-  integrity sha512-vDrcCFE3+2ixNT5H83g28bO/uYAwibJxerXPj+E7op4qzBCsAV36QfvdAyVOoNxKAH2Os/e01T/2x++V0LPukA==
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
+  integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
   dependencies:
     get-stdin "^6.0.0"
 
 eslint-plugin-babel@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz#2e7f251ccc249326da760c1a4c948a91c32d0023"
-  integrity sha512-HPuNzSPE75O+SnxHIafbW5QB45r2w78fxqwK3HmjqIUoPfPzVrq6rD+CINU3yzoDSzEhUkX07VUphbF73Lth/w==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560"
+  integrity sha512-VsQEr6NH3dj664+EyxJwO4FCYm/00JhYb3Sk3ft8o+fpKuIfQ9TaW6uVUfvwMXHcf/lsnRIoyFPsLMyiWCSL/g==
   dependencies:
     eslint-rule-composer "^0.3.0"
 
 eslint-plugin-eslint-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.1.tgz#32ff0afba8a48e17073817e6d03fbc5622f735b7"
-  integrity sha512-GZDKhOFqJLKlaABX+kdoLskcTINMrVOWxGca54KcFb1QCPd0CLmqgAMRxkkUfGSmN+5NJUMGh7NGccIMcWPSfQ==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa"
+  integrity sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==
   dependencies:
     escape-string-regexp "^1.0.5"
     ignore "^5.0.5"
@@ -3509,21 +3395,22 @@ eslint-plugin-prettier@2.6.2:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
 
-eslint-plugin-react-hooks@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.0.7.tgz#19f9e3d07dd3a0fb9e6f0f07153707feedea8108"
-  integrity sha512-5PuW2OMHQyMLr/+MqTluYN3/NeJJ1RuvmEp5TR9Xl2gXKxvcusUZuMz8XBUtbELNaiRYWs693LQs0cljKuuHRQ==
+eslint-plugin-react-hooks@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
+  integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
 
 eslint-plugin-react-native-globals@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"
   integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==
 
-eslint-plugin-react-native@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz#92811e37191ecb0d29c0f0a0c9e5c943ee573821"
-  integrity sha512-6Z4s4nvgFRdda/1s1+uu4a6EMZwEjjJ9Bk/1yBImv0fd9U2CsGu2cUakAtV83cZKhizbWhSouXoaK4JtlScdFg==
+eslint-plugin-react-native@3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.10.0.tgz#240f7e6979a908af3dfd9ba9652434c33f4d64cd"
+  integrity sha512-4f5+hHYYq5wFhB5eptkPEAR7FfvqbS7AzScUOANfAMZtYw5qgnCxRq45bpfBaQF+iyPMim5Q8pubcpvLv75NAg==
   dependencies:
+    "@babel/traverse" "^7.7.4"
     eslint-plugin-react-native-globals "^0.1.1"
 
 eslint-plugin-react@7.21.5:
@@ -3543,10 +3430,10 @@ eslint-plugin-react@7.21.5:
     resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
 
-eslint-plugin-relay@1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-relay/-/eslint-plugin-relay-1.7.1.tgz#70f479becb06320e57dd86ebc0d38938cb8a5e6e"
-  integrity sha512-K7j5BF8raseLfgA97udZMGKEtWan+y5BLrBYlApy952saStF0ghYzU9WElIwoVIkcBO8QP+pT4AOuNFFNRzcUw==
+eslint-plugin-relay@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-relay/-/eslint-plugin-relay-1.8.1.tgz#7363b1c134cfa3468377d46eadaa3a2b9b73dfcf"
+  integrity sha512-7xhyLDq3Bv5q+lKZUMYcRHq1OdFsgjuY5hAu3NNY+TkPPsdcp80de7eEJ8Ux5M3YJpnyr2UAHGksx5Exx6+I7g==
   dependencies:
     graphql "^14.0.0 || ^15.0.0-rc.1"
 
@@ -3555,7 +3442,7 @@ eslint-rule-composer@^0.3.0:
   resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
   integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3563,10 +3450,10 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
@@ -3577,32 +3464,34 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint-visitor-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+eslint@7.12.0:
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.0.tgz#7b6a85f87a9adc239e979bb721cde5ce0dc27da6"
+  integrity sha512-n5pEU27DRxCSlOhJ2rO57GDLcNsxO0LPpAbpFdh7xmcDmjmlGUfoyrsB3I7yYdQXO5N3gkSTiDrPSPNFiiirXA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
+    "@eslint/eslintrc" "^0.2.0"
     ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
+    enquirer "^2.3.5"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.0"
+    esquery "^1.2.0"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
@@ -3611,45 +3500,43 @@ eslint@6.8.0:
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
     is-glob "^4.0.0"
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
+    levn "^0.4.1"
+    lodash "^4.17.19"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.3"
+    optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
     table "^5.2.3"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+espree@^7.3.0:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
-    acorn "^7.1.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+esquery@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.1.0"
 
 esrecurse@^4.3.0:
   version "4.3.0"
@@ -3658,20 +3545,20 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@~1.8.1:
   version "1.8.1"
@@ -3688,11 +3575,6 @@ eventemitter3@1.2.x:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
   integrity sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=
 
-eventemitter3@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
-
 exception-formatter@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/exception-formatter/-/exception-formatter-1.0.7.tgz#3291616b86fceabefa97aee6a4708032c6e3b96d"
@@ -3701,9 +3583,9 @@ exception-formatter@^1.0.4:
     colors "^1.0.3"
 
 exec-sh@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
-  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
+  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -3718,22 +3600,7 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.0.tgz#7f37d6ec17f09e6b8fc53288611695b6d12b9daf"
-  integrity sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
-execa@^4.0.3:
+execa@^4.0.0, execa@^4.0.3:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -3766,22 +3633,22 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.2.tgz#3e0631c4a657a83dbec769ad246a2998953a55a6"
-  integrity sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==
+expect@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
+  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     ansi-styles "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.5.2"
-    jest-message-util "^26.5.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
 ext@^1.1.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz#e93b97ae0cb23f8370380f6107d2d2b7887687ad"
-  integrity sha512-+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
+  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
   dependencies:
     type "^2.5.0"
 
@@ -3810,24 +3677,6 @@ extendible@0.1.x:
   resolved "https://registry.yarnpkg.com/extendible/-/extendible-0.1.1.tgz#e2a37ed87129fb4f9533e8a8d7506230a539c905"
   integrity sha1-4qN+2HEp+0+VM+io11BiMKU5yQU=
 
-external-editor@^2.0.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
-  integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
-  dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
-    tmp "^0.0.33"
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3847,15 +3696,20 @@ extract-github@0.0.x:
   resolved "https://registry.yarnpkg.com/extract-github/-/extract-github-0.0.5.tgz#f542536db8c19b983a3bec9db96d2ef2a5ff1a86"
   integrity sha1-9UJTbbjBm5g6O+yduW0u8qX/GoY=
 
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
   integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
 fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.1:
   version "1.2.0"
@@ -3874,16 +3728,16 @@ fast-glob@^3.1.1:
     micromatch "^4.0.4"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"
   integrity sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=
 
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -3894,57 +3748,24 @@ fast-safe-stringify@~1.1.0:
   integrity sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y=
 
 fastq@^1.6.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794"
-  integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
   dependencies:
     reusify "^1.0.4"
 
 fb-watchman@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
-  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
-  dependencies:
-    bser "^2.0.0"
-
-fbjs-css-vars@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.1.tgz#836d876e887d702f45610f5ebd2fbeef649527fc"
-  integrity sha512-IM+v/C40MNZWqsLErc32e0TyIk/NhkkQZL0QmjBh6zi1eXv0/GeVKmKmueQX7nn9SXQBQbTUcB8zuexIF3/88w==
-
-fbjs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a"
-  integrity sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
   dependencies:
-    core-js "^2.4.1"
-    fbjs-css-vars "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
+    bser "2.1.1"
 
 figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -3974,17 +3795,17 @@ filter-obj@^1.1.0:
   resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
   integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
 
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
+finalhandler@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.1"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.3.1"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
     unpipe "~1.0.0"
 
 find-cache-dir@^2.0.0:
@@ -4033,24 +3854,21 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-flow-bin@^0.137.0:
-  version "0.137.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.137.0.tgz#322a15b3744195af1e02bf1fec0a716296aee7d5"
-  integrity sha512-ytwUn68fPKK/VWVpCxJ4KNeNIjCC/uX0Ll6Z1E98sOXfMknB000WtgQjKYDdO6tOR8mvXBE0adzjgCrChVympw==
+flow-bin@^0.158.0:
+  version "0.158.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.158.0.tgz#0a09763d41eb8ec7135ced6a3b9f8fa370a393d8"
+  integrity sha512-Gk5md8XTwk/M+J5M+rFyS1LJfFen6ldY60jM9+meWixlKf4b0vwdoUO8R7oo471pze+GY+blrnskUeqLDxFJfg==
 
-flow-parser@0.*, flow-parser@^0.121.0:
+flow-parser@0.*:
+  version "0.162.1"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.162.1.tgz#128150cd483c4899719fb5ceb06744282e51a10d"
+  integrity sha512-yp0oSVaawR8p39PGhOb/TtclByOxJirI+DVPR99GkeRY8xZ/4gLt+BeqcLgJsed1tE1YwMgdiAYKSfhoLTFVeg==
+
+flow-parser@^0.121.0:
   version "0.121.0"
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f"
   integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg==
 
-flow-remove-types@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-1.2.3.tgz#6131aefc7da43364bb8b479758c9dec7735d1a18"
-  integrity sha512-ypq/U3V+t9atYiOuSJd40tekCra03EHKoRsiK/wXGrsZimuum0kdwVY7Yv0HTaoXgHW1WiayomYd+Q3kkvPl9Q==
-  dependencies:
-    babylon "^6.15.0"
-    vlq "^0.2.1"
-
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -4076,13 +3894,22 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 fragment-cache@^0.2.1:
@@ -4151,13 +3978,6 @@ fs-extra@^9.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
-  dependencies:
-    minipass "^2.2.1"
-
 fs-minipass@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -4180,18 +4000,10 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
 fsevents@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -4231,24 +4043,10 @@ fusing@1.0.x:
     emits "3.0.x"
     predefine "0.1.x"
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
@@ -4260,7 +4058,7 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
@@ -4269,6 +4067,11 @@ get-intrinsic@^1.0.2:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
 get-port@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a"
@@ -4289,12 +4092,20 @@ get-stream@^4.0.0:
     pump "^3.0.0"
 
 get-stream@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
-  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -4350,9 +4161,9 @@ glob@^6.0.1:
     path-is-absolute "^1.0.0"
 
 glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4362,9 +4173,9 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
     path-is-absolute "^1.0.0"
 
 globals@^11.1.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
-  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^12.1.0:
   version "12.4.0"
@@ -4386,19 +4197,14 @@ globby@^11.0.0, globby@^11.0.3:
     slash "^3.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
 "graphql@^14.0.0 || ^15.0.0-rc.1":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.0.0.tgz#042a5eb5e2506a2e2111ce41eb446a8e570b8be9"
-  integrity sha512-ZyVO1xIF9F+4cxfkdhOJINM+51B06Friuv4M66W7HzUOeFd+vNzUn4vtswYINPi6sysjf1M2Ri/rwZALqgwbaQ==
-
-"growl@~> 1.10.0":
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.6.1.tgz#9125bdf057553525da251e19e96dab3d3855ddfc"
+  integrity sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==
 
 growly@^1.3.0:
   version "1.3.0"
@@ -4430,6 +4236,11 @@ har-validator@~5.1.3:
     ajv "^6.12.3"
     har-schema "^2.0.0"
 
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -4445,20 +4256,17 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has-symbols@^1.0.1:
+has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
 
 has-value@^0.3.1:
   version "0.3.1"
@@ -4499,14 +4307,19 @@ has@^1.0.3:
     function-bind "^1.1.1"
 
 hermes-engine-darwin@~0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/hermes-engine-darwin/-/hermes-engine-darwin-0.5.1.tgz#697ac45c3aa2ea17a18494c9f8898d984c34c060"
-  integrity sha512-+IHmncqIrZfOhUYgmInujJVnTQ5qxjijdKC5ohlHalVj088/H6hnAIGr4nX84HAs1JjLCGLA0xujRfd0WY50wA==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/hermes-engine-darwin/-/hermes-engine-darwin-0.5.3.tgz#4eb8edabfff640c2150cf974290a03429b66cc11"
+  integrity sha512-TwCpLJgEDm/Z2pOr88IDlXlC1Y3WITvXoYtOr4iChc6ecJqYOUklQW838lKZ7urBBFfPb0rW6poVD6iZORdzZQ==
 
-hermes-engine@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.7.0.tgz#c4a13e09811d7bc975a0662bd2ca7120003d6ef8"
-  integrity sha512-lU9OenFWXXOzYldqn15QvbiD0kDc+uw2arhCOkR+9D+PhrLFcbEqnaXFESgchN77JYEf77KkqXncTZA8aoXw2A==
+hermes-engine@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.9.0.tgz#84d9cfe84e8f6b1b2020d6e71b350cec84ed982f"
+  integrity sha512-r7U+Y4P2Qg/igFVZN+DpT7JFfXUn1MM4dFne8aW+cCrF6RRymof+VqrUHs1kl07j8h8V2CNesU19RKgWbr3qPw==
+
+hermes-parser@0.4.7:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.4.7.tgz#410f5129d57183784d205a0538e6fbdcf614c9ea"
+  integrity sha512-jc+zCtXbtwTiXoMAoXOHepxAaGVFIp89wwE9qcdwnMd/uGVEtPoY8FaFSsx0ThPvyKirdR2EsIIDVrpbSXz1Ag==
 
 hermes-profile-transformer@^0.0.6:
   version "0.0.6"
@@ -4515,12 +4328,7 @@ hermes-profile-transformer@^0.0.6:
   dependencies:
     source-map "^0.7.3"
 
-hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
-
-hosted-git-info@^2.7.1:
+hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
@@ -4533,24 +4341,25 @@ html-encoding-sniffer@^2.0.1:
     whatwg-encoding "^1.0.5"
 
 html-escaper@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
-  integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
   dependencies:
     depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
@@ -4560,6 +4369,15 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4577,6 +4395,14 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -4589,40 +4415,40 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.5.tgz#c663c548d6ce186fb33616a8ccb5d46e56bdbbf9"
-  integrity sha512-kOC8IUb8HSDMVcYrDVezCxpJkzSQWTAzf3olpKM6o9rM5zpojx23O0Fl8Wr4+qJ6ZbPEHqf1fdwev/DS7v7pmA==
-
-ignore@^5.1.4:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
+ignore@^5.1.4:
+  version "5.1.9"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
+  integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
+
 image-size@^0.6.0:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2"
@@ -4636,7 +4462,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0, import-fresh@^3.1.0:
+import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -4645,9 +4471,9 @@ import-fresh@^3.0.0, import-fresh@^3.1.0:
     resolve-from "^4.0.0"
 
 import-local@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
-  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0"
+  integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==
   dependencies:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
@@ -4670,73 +4496,29 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@^2.0.1:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-inquirer@^3.0.6:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
-inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-slot@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
-  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
   dependencies:
-    es-abstract "^1.17.0-next.1"
+    get-intrinsic "^1.1.0"
     has "^1.0.3"
-    side-channel "^1.0.2"
+    side-channel "^1.0.4"
 
 interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 invariant@^2.2.4:
   version "2.2.4"
@@ -4750,11 +4532,6 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
 ip@1.1.5, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -4779,15 +4556,30 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
+
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+is-callable@^1.1.4, is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -4796,10 +4588,10 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
-  integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==
+is-core-module@^2.2.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
   dependencies:
     has "^1.0.3"
 
@@ -4818,9 +4610,11 @@ is-data-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -4846,9 +4640,9 @@ is-directory@^0.3.1:
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -4885,21 +4679,28 @@ is-fullwidth-code-point@^3.0.0:
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-fn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e"
-  integrity sha512-elzyIdM7iKoFHzcrndIqjYomImhxrFRnGP3galODoII4TB9gI7mZ+FnlLQmmjf27SxHS2gKEeyhX5/+YRS6H9g==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-glob@^4.0.0, is-glob@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-number-object@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
+  integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -4918,24 +4719,30 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
-  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
-    has-symbols "^1.0.1"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
 is-ssh@^1.3.0:
   version "1.3.3"
@@ -4944,33 +4751,42 @@ is-ssh@^1.3.0:
   dependencies:
     protocols "^1.1.0"
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
-is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
-    has-symbols "^1.0.0"
+    has-symbols "^1.0.2"
 
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  dependencies:
+    call-bind "^1.0.0"
+
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -4978,7 +4794,7 @@ is-windows@^1.0.2:
 
 is-wsl@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 is-wsl@^2.2.0:
@@ -5010,25 +4826,17 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
+istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
   integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
@@ -5038,6 +4846,17 @@ istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.0.4.tgz#e976f2aa66ebc6737f236d3ab05b76e36f885c80"
+  integrity sha512-W6jJF9rLGEISGoCyXRqa/JCGQGmmxPO10TMu7izaUTynxvBvTjqzAIIGCK9USBmIbQAaSWD6XJPrM9Pv5INknw==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
@@ -5048,83 +4867,83 @@ istanbul-lib-report@^3.0.0:
     supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
-  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
   dependencies:
     debug "^4.1.1"
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
 istanbul-reports@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
-  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.5.tgz#a2580107e71279ea6d661ddede929ffc6d693384"
+  integrity sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.5.2.tgz#330232c6a5c09a7f040a5870e8f0a9c6abcdbed5"
-  integrity sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==
+jest-changed-files@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
+  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     execa "^4.0.0"
     throat "^5.0.0"
 
-jest-cli@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.5.2.tgz#0df114399b4036a3f046f0a9f25c50372c76b3a2"
-  integrity sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==
+jest-cli@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
+  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
   dependencies:
-    "@jest/core" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/core" "^26.6.3"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
+    jest-config "^26.6.3"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     prompts "^2.0.1"
     yargs "^15.4.1"
 
-jest-config@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.2.tgz#6e828e25f10124433dd008fbd83348636de0972a"
-  integrity sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==
+jest-config@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
+  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.5.2"
-    "@jest/types" "^26.5.2"
-    babel-jest "^26.5.2"
+    "@jest/test-sequencer" "^26.6.3"
+    "@jest/types" "^26.6.2"
+    babel-jest "^26.6.3"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.5.2"
-    jest-environment-node "^26.5.2"
+    jest-environment-jsdom "^26.6.2"
+    jest-environment-node "^26.6.2"
     jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.5.2"
+    jest-jasmine2 "^26.6.3"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     micromatch "^4.0.2"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
-jest-diff@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.2.tgz#8e26cb32dc598e8b8a1b9deff55316f8313c8053"
-  integrity sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==
+jest-diff@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
+  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.5.0"
+    diff-sequences "^26.6.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
 jest-docblock@^21.0.0:
   version "21.2.0"
@@ -5138,41 +4957,41 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.2.tgz#35e68d6906a7f826d3ca5803cfe91d17a5a34c31"
-  integrity sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==
+jest-each@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
+  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-util "^26.5.2"
-    pretty-format "^26.5.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
 
-jest-environment-jsdom@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz#5feab05b828fd3e4b96bee5e0493464ddd2bb4bc"
-  integrity sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==
+jest-environment-jsdom@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
+  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
   dependencies:
-    "@jest/environment" "^26.5.2"
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.5.2"
-    jest-util "^26.5.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
     jsdom "^16.4.0"
 
-jest-environment-node@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.2.tgz#275a0f01b5e47447056f1541a15ed4da14acca03"
-  integrity sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==
+jest-environment-node@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
+  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
   dependencies:
-    "@jest/environment" "^26.5.2"
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.5.2"
-    jest-util "^26.5.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
 jest-get-type@^24.9.0:
   version "24.9.0"
@@ -5184,68 +5003,49 @@ jest-get-type@^26.3.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
-jest-haste-map@^24.7.1:
-  version "24.8.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.1.tgz#f39cc1d2b1d907e014165b4bd5a957afcb992982"
-  integrity sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    anymatch "^2.0.0"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.1.15"
-    invariant "^2.2.4"
-    jest-serializer "^24.4.0"
-    jest-util "^24.8.0"
-    jest-worker "^24.6.0"
-    micromatch "^3.1.10"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-jest-haste-map@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.2.tgz#a15008abfc502c18aa56e4919ed8c96304ceb23d"
-  integrity sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==
+jest-haste-map@^26.5.2, jest-haste-map@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
+  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/graceful-fs" "^4.1.2"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.4"
     jest-regex-util "^26.0.0"
-    jest-serializer "^26.5.0"
-    jest-util "^26.5.2"
-    jest-worker "^26.5.0"
+    jest-serializer "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz#0e33819d31b1f2aab5efd1e02ce502209c0e64a2"
-  integrity sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==
+jest-jasmine2@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
+  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.5.2"
-    "@jest/source-map" "^26.5.0"
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^26.5.2"
+    expect "^26.6.2"
     is-generator-fn "^2.0.0"
-    jest-each "^26.5.2"
-    jest-matcher-utils "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-runtime "^26.5.2"
-    jest-snapshot "^26.5.2"
-    jest-util "^26.5.2"
-    pretty-format "^26.5.2"
+    jest-each "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
     throat "^5.0.0"
 
 jest-junit@^10.0.0:
@@ -5259,65 +5059,45 @@ jest-junit@^10.0.0:
     uuid "^3.3.3"
     xml "^1.0.1"
 
-jest-leak-detector@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz#83fcf9a4a6ef157549552cb4f32ca1d6221eea69"
-  integrity sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==
+jest-leak-detector@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
+  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
   dependencies:
     jest-get-type "^26.3.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
-jest-matcher-utils@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz#6aa2c76ce8b9c33e66f8856ff3a52bab59e6c85a"
-  integrity sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==
+jest-matcher-utils@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
+  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.5.2"
+    jest-diff "^26.6.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.5.2"
-
-jest-message-util@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b"
-  integrity sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
+    pretty-format "^26.6.2"
 
-jest-message-util@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.2.tgz#6c4c4c46dcfbabb47cd1ba2f6351559729bc11bb"
-  integrity sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==
+jest-message-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
+  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.2"
+    pretty-format "^26.6.2"
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
-jest-mock@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"
-  integrity sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==
+jest-mock@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
+  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
   dependencies:
-    "@jest/types" "^24.8.0"
-
-jest-mock@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.2.tgz#c9302e8ef807f2bfc749ee52e65ad11166a1b6a1"
-  integrity sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==
-  dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
 
 jest-pnp-resolver@^1.2.2:
@@ -5330,153 +5110,131 @@ jest-regex-util@^26.0.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz#ee30b7cfea81c81bf5e195a9287d7ec07f893170"
-  integrity sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==
+jest-resolve-dependencies@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
+  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-snapshot "^26.5.2"
+    jest-snapshot "^26.6.2"
 
-jest-resolve@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.2.tgz#0d719144f61944a428657b755a0e5c6af4fc8602"
-  integrity sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==
+jest-resolve@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
+  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.5.2"
+    jest-util "^26.6.2"
     read-pkg-up "^7.0.1"
-    resolve "^1.17.0"
+    resolve "^1.18.1"
     slash "^3.0.0"
 
-jest-runner@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.2.tgz#4f9e6b0bb7eb4710c209a9e145b8a10894f4c19f"
-  integrity sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==
+jest-runner@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
+  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
   dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/environment" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.7.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-config "^26.5.2"
+    jest-config "^26.6.3"
     jest-docblock "^26.0.0"
-    jest-haste-map "^26.5.2"
-    jest-leak-detector "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-resolve "^26.5.2"
-    jest-runtime "^26.5.2"
-    jest-util "^26.5.2"
-    jest-worker "^26.5.0"
+    jest-haste-map "^26.6.2"
+    jest-leak-detector "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.2.tgz#b72f5f79eb2fe0c46bfef4cdb9c1e01d1c69ba41"
-  integrity sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==
-  dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/environment" "^26.5.2"
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/globals" "^26.5.2"
-    "@jest/source-map" "^26.5.0"
-    "@jest/test-result" "^26.5.2"
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+jest-runtime@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
+  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
+  dependencies:
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/globals" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
+    cjs-module-lexer "^0.6.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-config "^26.5.2"
-    jest-haste-map "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-mock "^26.5.2"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.5.2"
-    jest-snapshot "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
+    jest-resolve "^26.6.2"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     slash "^3.0.0"
     strip-bom "^4.0.0"
     yargs "^15.4.1"
 
-jest-serializer@^24.4.0:
-  version "24.4.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
-  integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
-
-jest-serializer@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.5.0.tgz#f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13"
-  integrity sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==
+jest-serializer@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
+  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
   dependencies:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.2.tgz#0cf7642eaf8e8d2736bd443f619959bf237f9ccf"
-  integrity sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==
+jest-snapshot@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
+  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.0.0"
     chalk "^4.0.0"
-    expect "^26.5.2"
+    expect "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-diff "^26.5.2"
+    jest-diff "^26.6.2"
     jest-get-type "^26.3.0"
-    jest-haste-map "^26.5.2"
-    jest-matcher-utils "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-resolve "^26.5.2"
+    jest-haste-map "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
     natural-compare "^1.4.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
     semver "^7.3.2"
 
-jest-util@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1"
-  integrity sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/fake-timers" "^24.8.0"
-    "@jest/source-map" "^24.3.0"
-    "@jest/test-result" "^24.8.0"
-    "@jest/types" "^24.8.0"
-    callsites "^3.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.15"
-    is-ci "^2.0.0"
-    mkdirp "^0.5.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
-
-jest-util@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.2.tgz#8403f75677902cc52a1b2140f568e91f8ed4f4d7"
-  integrity sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==
+jest-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     is-ci "^2.0.0"
     micromatch "^4.0.2"
 
-jest-validate@^24.7.0, jest-validate@^24.9.0:
+jest-validate@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
   integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==
@@ -5488,76 +5246,79 @@ jest-validate@^24.7.0, jest-validate@^24.9.0:
     leven "^3.1.0"
     pretty-format "^24.9.0"
 
-jest-validate@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.2.tgz#7ea266700b64234cd1c0cee982490c5a80e9b0f0"
-  integrity sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==
+jest-validate@^26.5.2, jest-validate@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
+  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     camelcase "^6.0.0"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
-jest-watcher@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.5.2.tgz#2957f4461007e0769d74b537379ecf6b7c696916"
-  integrity sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==
+jest-watcher@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
+  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
   dependencies:
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.5.2"
+    jest-util "^26.6.2"
     string-length "^4.0.1"
 
-jest-worker@^24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
-  integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
-  dependencies:
-    merge-stream "^1.0.1"
-    supports-color "^6.1.0"
-
-jest-worker@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30"
-  integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==
+jest-worker@^26.0.0, jest-worker@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.5.2.tgz#c6791642b331fe7abd2f993b0a74aa546f7be0fb"
-  integrity sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==
+jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
+  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
   dependencies:
-    "@jest/core" "^26.5.2"
+    "@jest/core" "^26.6.3"
     import-local "^3.0.2"
-    jest-cli "^26.5.2"
+    jest-cli "^26.6.3"
 
 jetifier@^1.6.2:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.4.tgz#6159db8e275d97980d26162897a0648b6d4a3222"
-  integrity sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA==
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.8.tgz#e88068697875cbda98c32472902c4d3756247798"
+  integrity sha512-3Zi16h6L5tXDRQJTb221cnRoVG9/9OvreLdLU2/ZjRv/GILL+2Cemt0IKvkowwkDpvouAU1DQPOJ7qaiHeIdrw==
 
 jju@^1.4.0, jju@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
   integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
 
+joi@^17.2.1:
+  version "17.4.2"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.2.tgz#02f4eb5cf88e515e614830239379dcbbe28ce7f7"
+  integrity sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+    "@hapi/topo" "^5.0.0"
+    "@sideway/address" "^4.1.0"
+    "@sideway/formula" "^3.0.0"
+    "@sideway/pinpoint" "^2.0.0"
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5574,10 +5335,10 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsc-android@^245459.0.0:
-  version "245459.0.0"
-  resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-245459.0.0.tgz#e584258dd0b04c9159a27fb104cd5d491fd202c9"
-  integrity sha512-wkjURqwaB1daNkDi2OYYbsLnIdC/lUM2nPXQKRs5pqEU9chDg435bjvo+LSaHotDENygHQDHe+ntUkkw2gwMtg==
+jsc-android@^250230.2.1:
+  version "250230.2.1"
+  resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250230.2.1.tgz#3790313a970586a03ab0ad47defbc84df54f1b83"
+  integrity sha512-KmxeBlRjwoqCnBBKGsihFtvsBHyUFlBxJPK4FzeYcIuBfdjv6jFys44JITAgSTbQD+vIdwMEfyZklsuQX0yI1Q==
 
 jscodeshift@^0.11.0:
   version "0.11.0"
@@ -5605,41 +5366,42 @@ jscodeshift@^0.11.0:
     write-file-atomic "^2.3.0"
 
 jsdom@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
-  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
   dependencies:
-    abab "^2.0.3"
-    acorn "^7.1.1"
+    abab "^2.0.5"
+    acorn "^8.2.4"
     acorn-globals "^6.0.0"
     cssom "^0.4.4"
-    cssstyle "^2.2.0"
+    cssstyle "^2.3.0"
     data-urls "^2.0.0"
-    decimal.js "^10.2.0"
+    decimal.js "^10.2.1"
     domexception "^2.0.1"
-    escodegen "^1.14.1"
+    escodegen "^2.0.0"
+    form-data "^3.0.0"
     html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-potential-custom-element-name "^1.0.1"
     nwsapi "^2.2.0"
-    parse5 "5.1.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.8"
-    saxes "^5.0.0"
+    parse5 "6.0.1"
+    saxes "^5.0.1"
     symbol-tree "^3.2.4"
-    tough-cookie "^3.0.1"
+    tough-cookie "^4.0.0"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
     webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-    ws "^7.2.3"
+    whatwg-url "^8.5.0"
+    ws "^7.4.6"
     xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
@@ -5651,6 +5413,11 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -5666,22 +5433,15 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
-  dependencies:
-    jsonify "~0.0.0"
-
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
@@ -5729,19 +5489,20 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jsx-ast-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
-  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e"
+  integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==
   dependencies:
-    array-includes "^3.0.3"
+    array-includes "^3.1.1"
+    object.assign "^4.1.0"
 
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891"
-  integrity sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+  integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
   dependencies:
-    array-includes "^3.1.1"
-    object.assign "^4.1.1"
+    array-includes "^3.1.3"
+    object.assign "^4.1.2"
 
 "just-scripts-utils@>=0.8.4 <1.0.0":
   version "0.9.2"
@@ -5831,12 +5592,7 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-kleur@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.2.tgz#83c7ec858a41098b613d5998a7b653962b504f68"
-  integrity sha512-3h7B2WRT5LNXOtQiAaWonilegHcPSf9nLVXlSTci8lu1dZUuui61+EsPEZqSVxY7rXYmB2DVKMQILxaO5WL61Q==
-
-kleur@^3.0.3:
+kleur@^3.0.2, kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
@@ -5863,17 +5619,25 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-lcov-parse@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
-  integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
+lcov-parse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
+  integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=
 
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levn@^0.3.0, levn@~0.3.0:
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
@@ -5912,6 +5676,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.get@^4.0.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -5922,22 +5691,12 @@ lodash.isequal@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
-
 lodash.throttle@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash@4.x.x, lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.5, lodash@^4.3.0:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21:
+lodash@4.x.x, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5971,9 +5730,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
     js-tokens "^3.0.0 || ^4.0.0"
 
 lru-cache@^4.0.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -6001,9 +5760,9 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     semver "^5.6.0"
 
 make-dir@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392"
-  integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
@@ -6052,9 +5811,9 @@ mana@0.1.x:
     request "2.x.x"
 
 map-age-cleaner@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
-  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
   dependencies:
     p-defer "^1.0.0"
 
@@ -6088,20 +5847,13 @@ marked@^0.7.0:
   integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==
 
 mem@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
-  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^1.1.0"
-
-merge-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -6113,151 +5865,93 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-metro-babel-register@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.58.0.tgz#5c44786d49a044048df56cf476a2263491d4f53a"
-  integrity sha512-P5+G3ufhSYL6cA3a7xkbSJzzFBvtivj/PhWvGXFXnuFssDlMAX1CTktff+0gpka5Cd6B6QLt0UAMWulUAAE4Eg==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/register" "^7.0.0"
-    core-js "^2.2.2"
-    escape-string-regexp "^1.0.5"
-
-metro-babel-register@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.63.0.tgz#8e196535d4c77ff3103a681e8217f8661f5850c9"
-  integrity sha512-y1XBXtHX3Wp25a5+Yfx0oxmjDR4aIzjOy5ywfRaz+2GLUkT6JngRQ2inyQ66wWDj8fjifPpH74j8vf7LGfyICQ==
+metro-babel-register@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.66.2.tgz#c6bbe36c7a77590687ccd74b425dc020d17d05af"
+  integrity sha512-3F+vsVubUPJYKfVMeol8/7pd8CC287Rw92QYzJD8LEmI980xcgwMUEVBZ0UIAUwlLgiJG/f4Mwhuji2EeBXrPg==
   dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
+    "@babel/core" "^7.14.0"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
     "@babel/plugin-proposal-optional-chaining" "^7.0.0"
+    "@babel/plugin-syntax-class-properties" "^7.0.0"
     "@babel/plugin-transform-flow-strip-types" "^7.0.0"
     "@babel/plugin-transform-modules-commonjs" "^7.0.0"
     "@babel/register" "^7.0.0"
     escape-string-regexp "^1.0.5"
 
-metro-babel-transformer@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.58.0.tgz#317c83b863cceb0573943815f1711fbcbe69b106"
-  integrity sha512-yBX3BkRhw2TCNPhe+pmLSgsAEA3huMvnX08UwjFqSXXI1aiqzRQobn92uKd1U5MM1Vx8EtXVomlJb95ZHNAv6A==
+metro-babel-transformer@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.66.2.tgz#fce0a3e314d28a5e7141c135665e1cc9b8e7ce86"
+  integrity sha512-aJ/7fc/Xkofw8Fqa51OTDhBzBz26mmpIWrXAZcPdQ8MSTt883EWncxeCEjasc79NJ89BRi7sOkkaWZo2sXlKvw==
   dependencies:
-    "@babel/core" "^7.0.0"
-    metro-source-map "0.58.0"
+    "@babel/core" "^7.14.0"
+    hermes-parser "0.4.7"
+    metro-source-map "0.66.2"
+    nullthrows "^1.1.1"
 
-metro-babel-transformer@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.63.0.tgz#0fe7dd2d58fba8a64917d431ba0dcbbdd874f076"
-  integrity sha512-u8s6wKua9G0P/uLcw6hwPA1RCTKwlauvxMUoceci8HrK6FQyZamYbAM4fGxMSgjb2ogqKG7oGfBneTIrAn9HvA==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    metro-source-map "0.63.0"
+metro-cache-key@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.66.2.tgz#d6463d2a53e887a38419d523962cc24ea0e780b4"
+  integrity sha512-WtkNmRt41qOpHh1MkNA4nLiQ/m7iGL90ysSKD+fcLqlUnOBKJptPQm0ZUv8Kfqk18ddWX2KmsSbq+Sf3I6XohQ==
 
-metro-cache@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.58.0.tgz#630ea0a4626dfb9591c71fdb85dce14b5e9a04ec"
-  integrity sha512-jjW9zCTKxhgKcVkyQ6LHyna9Zdf4TK/45vvT1fPyyTk1RY82ZYjU1qs+84ycKEd08Ka4YcK9xcUew9SIDJYI8Q==
+metro-cache@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.66.2.tgz#e0af4e0a319898f7d42a980f7ee5da153fcfd019"
+  integrity sha512-5QCYJtJOHoBSbL3H4/Fpl36oA697C3oYHqsce+Hk/dh2qtODUGpS3gOBhvP1B8iB+H8jJMyR75lZq129LJEsIQ==
   dependencies:
-    jest-serializer "^24.4.0"
-    metro-core "0.58.0"
+    metro-core "0.66.2"
     mkdirp "^0.5.1"
     rimraf "^2.5.4"
 
-metro-config@0.58.0, metro-config@^0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.58.0.tgz#1e24b43a5a00971d75662b1a0d3c04a13d4a1746"
-  integrity sha512-4vgBliXwL56vjUlYplvGMVSNrJJpkHuLcD+O20trV3FvPxKg4ZsvuOcNSxqDSMU26FCtIEJ15ojcuCbRL7KY0w==
+metro-config@0.66.2, metro-config@^0.66.1:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.66.2.tgz#e365acdb66ad0cda0182b9c9910760a97ee4293b"
+  integrity sha512-0C+PrKKIBNNzLZUKN/8ZDJS2U5FLMOTXDWbvBHIdqb6YXz8WplXR2+xlSlaSCCi5b+GR7cWFWUNeKA4GQS1/AQ==
   dependencies:
     cosmiconfig "^5.0.5"
-    jest-validate "^24.7.0"
-    metro "0.58.0"
-    metro-cache "0.58.0"
-    metro-core "0.58.0"
-    pretty-format "^24.7.0"
-
-metro-core@0.58.0, metro-core@^0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.58.0.tgz#ad9f6645a2b439a3fbce7ce4e19b01b00375768a"
-  integrity sha512-RzXUjGFmCLOyzUqcKDvr91AldGtIOxnzNZrWUIiG8uC3kerVLo0mQp4YH3+XVm6fMNiLMg6iER7HLqD+MbpUjQ==
-  dependencies:
-    jest-haste-map "^24.7.1"
+    jest-validate "^26.5.2"
+    metro "0.66.2"
+    metro-cache "0.66.2"
+    metro-core "0.66.2"
+    metro-runtime "0.66.2"
+
+metro-core@0.66.2, metro-core@^0.66.1:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.66.2.tgz#ead776a17b3e5a307e6dc22259db30bf5c7e8490"
+  integrity sha512-JieLZkef/516yxXYvQxWnf3OWw5rcgWRy76K8JV/wr/i8LGVGulPAXlIi445/QZzXVydzRVASKAEVqyxM5F4mA==
+  dependencies:
+    jest-haste-map "^26.5.2"
     lodash.throttle "^4.1.1"
-    metro-resolver "0.58.0"
-    wordwrap "^1.0.0"
+    metro-resolver "0.66.2"
 
-metro-inspector-proxy@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.58.0.tgz#6fefb0cdf25655919d56c82ebe09cd26eb00e636"
-  integrity sha512-oFqTyNTJdCdvcw1Ha6SKE7ITbSaoTbO4xpYownIoJR+WZ0ZfxbWpp225JkHuBJm9UcBAnG9c0CME924m3uBbaw==
+metro-hermes-compiler@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.66.2.tgz#30290748f83805faa601aa487632444915795823"
+  integrity sha512-nCVL1g9uR6vrw5+X1wjwZruRyMkndnzGRMqjqoljf+nGEqBTD607CR7elXw4fMWn/EM+1y0Vdq5altUu9LdgCA==
+
+metro-inspector-proxy@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.66.2.tgz#a83c76bd2f2fd7b9240be92acf9a8b1d1404547a"
+  integrity sha512-gnLc9121eznwP0iiA9tCBW8qZjwIsCgwHWMF1g1Qaki9le9tzeJv3dK4/lFNGxyfSaLO7vahQEhsEYsiRnTROg==
   dependencies:
     connect "^3.6.5"
     debug "^2.2.0"
-    rxjs "^5.4.3"
     ws "^1.1.5"
-    yargs "^14.2.0"
+    yargs "^15.3.1"
 
-metro-minify-uglify@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.58.0.tgz#7e1066954bfd4f767ba6aca7feef676ca44c68b8"
-  integrity sha512-vRHsA7bCi7eCn3LXLm20EfY2NoWDyYOnmWaq/N8LB0OxL2L5DXRqMYAQK+prWGJ5S1yvVnDuuNVP+peQ9851TA==
+metro-minify-uglify@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.66.2.tgz#6061dbee4f61e6d5bb3c100e4379ff6f2e16e42b"
+  integrity sha512-7TUK+L5CmB5x1PVnFbgmjzHW4CUadq9H5jgp0HfFoWT1skXAyEsx0DHkKDXwnot0khnNhBOEfl62ctQOnE110Q==
   dependencies:
     uglify-es "^3.1.9"
 
-metro-react-native-babel-preset@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.58.0.tgz#18f48d33fe124280ffabc000ab8b42c488d762a2"
-  integrity sha512-MRriNW+fF6jxABsgPphocUY6mIhmCm8idcrQZ58fT3Iti2vCdtkaK32TyCGUNUptzhUe2/cbE57j4aC+eaodAA==
-  dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-export-default-from" "^7.0.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.0.0"
-    "@babel/plugin-syntax-export-default-from" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.2.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-object-assign" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    "@babel/plugin-transform-typescript" "^7.5.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    react-refresh "^0.4.0"
-
-metro-react-native-babel-preset@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.63.0.tgz#bc67d4d251ac72f30b7f3d92a069aea825577751"
-  integrity sha512-iTM6V/hzqTd2dg0LHtD4f/TU+d4A7MFiMPUmIYDb0OZmCq6avfcxHQTXk/ZNbAr+eRoN/owx9OIkjt/CvG4vUA==
+metro-react-native-babel-preset@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.66.2.tgz#fddebcf413ad4ea617d4f47f7c1da401052de734"
+  integrity sha512-H/nLBAz0MgfDloSe1FjyH4EnbokHFdncyERvLPXDACY3ROVRCeUyFNo70ywRGXW2NMbrV4H7KUyU4zkfWhC2HQ==
   dependencies:
-    "@babel/core" "^7.0.0"
+    "@babel/core" "^7.14.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
     "@babel/plugin-proposal-export-default-from" "^7.0.0"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
@@ -6270,6 +5964,7 @@ metro-react-native-babel-preset@0.63.0:
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
     "@babel/plugin-syntax-optional-chaining" "^7.0.0"
     "@babel/plugin-transform-arrow-functions" "^7.0.0"
+    "@babel/plugin-transform-async-to-generator" "^7.0.0"
     "@babel/plugin-transform-block-scoping" "^7.0.0"
     "@babel/plugin-transform-classes" "^7.0.0"
     "@babel/plugin-transform-computed-properties" "^7.0.0"
@@ -6297,149 +5992,144 @@ metro-react-native-babel-preset@0.63.0:
     "@babel/template" "^7.0.0"
     react-refresh "^0.4.0"
 
-metro-react-native-babel-transformer@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.63.0.tgz#527e1e5ef7b63512189a5b5bb4cb06d1fdb57815"
-  integrity sha512-HbyGvCoGJZ2WrstyTgHg05O5UOYgkatRLpalAnhHjPt+1Wr0Z3vr33SesibHRlnT5ETUBZME+txukcnN9eSdIA==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    babel-preset-fbjs "^3.3.0"
-    metro-babel-transformer "0.63.0"
-    metro-react-native-babel-preset "0.63.0"
-    metro-source-map "0.63.0"
-
-metro-react-native-babel-transformer@^0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.58.0.tgz#5da0e5a1b83c01d11626905fa59f34fda53a21a5"
-  integrity sha512-3A73+cRq1eUPQ8g+hPNGgMUMCGmtQjwqHfoG1DwinAoJ/kr4WOXWWbGZo0xHJNBe/zdHGl0uHcDCp2knPglTdQ==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    babel-preset-fbjs "^3.3.0"
-    metro-babel-transformer "0.58.0"
-    metro-react-native-babel-preset "0.58.0"
-    metro-source-map "0.58.0"
-
-metro-resolver@0.58.0, metro-resolver@^0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.58.0.tgz#4d03edc52e2e25d45f16688adf3b3f268ea60df9"
-  integrity sha512-XFbAKvCHN2iWqKeiRARzEXn69eTDdJVJC7lu16S4dPQJ+Dy82dZBr5Es12iN+NmbJuFgrAuIHbpWrdnA9tOf6Q==
+metro-react-native-babel-transformer@0.66.2, metro-react-native-babel-transformer@^0.66.1:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.66.2.tgz#768f341e7c3d3d1c38189799c9884b90d1c32eb7"
+  integrity sha512-z1ab7ihIT0pJrwgi9q2IH+LcW/xUWMQ0hH+Mrk7wbKQB0RnJdXFoxphrfoVHBHMUu+TBPetUcEkKawkK1e7Cng==
+  dependencies:
+    "@babel/core" "^7.14.0"
+    babel-preset-fbjs "^3.4.0"
+    hermes-parser "0.4.7"
+    metro-babel-transformer "0.66.2"
+    metro-react-native-babel-preset "0.66.2"
+    metro-source-map "0.66.2"
+    nullthrows "^1.1.1"
+
+metro-resolver@0.66.2, metro-resolver@^0.66.1:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.66.2.tgz#f743ddbe7a12dd137d1f7a555732cafcaea421f8"
+  integrity sha512-pXQAJR/xauRf4kWFj2/hN5a77B4jLl0Fom5I3PHp6Arw/KxSBp0cnguXpGLwNQ6zQC0nxKCoYGL9gQpzMnN7Hw==
   dependencies:
     absolute-path "^0.0.0"
 
-metro-runtime@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.63.0.tgz#7cb397eb45b5f605886251cd2ccd40d0b9ad7a97"
-  integrity sha512-iE3B2zFQBtSomz73extpfS/qvd4iEc2zbCEnytThPBtHY9g/pBTeR+sVqVlkG2Vl3sVXgxKx+Pq0QXuLz1ipLg==
+metro-runtime@0.66.2, metro-runtime@^0.66.1:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.66.2.tgz#3409ee957b949b6c7b72ef6ed2b9af9a4f4a910e"
+  integrity sha512-vFhKBk2ot9FS4b+2v0OTa/guCF/QDAOJubY0CNg7PzCS5+w4y3IvZIcPX4SSS1t8pYEZBLvtdtTDarlDl81xmg==
 
-metro-source-map@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.58.0.tgz#e951b99f4c653239ce9323bb08339c6f1978a112"
-  integrity sha512-yvN1YPmejmgiiS7T1aKBiiUTHPw2Vcm3r2TZ+DY92z/9PR4alysIywrCs/fTHs8rbDcKM5VfPCKGLpkBrbKeOw==
+metro-source-map@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.66.2.tgz#b5304a282a5d55fa67b599265e9cf3217175cdd7"
+  integrity sha512-038tFmB7vSh73VQcDWIbr5O1m+WXWyYafDaOy+1A/2K308YP0oj33gbEgDnZsLZDwcJ+xt1x6KUEBIzlX4YGeQ==
   dependencies:
-    "@babel/traverse" "^7.0.0"
+    "@babel/traverse" "^7.14.0"
     "@babel/types" "^7.0.0"
     invariant "^2.2.4"
-    metro-symbolicate "0.58.0"
-    ob1 "0.58.0"
+    metro-symbolicate "0.66.2"
+    nullthrows "^1.1.1"
+    ob1 "0.66.2"
     source-map "^0.5.6"
     vlq "^1.0.0"
 
-metro-source-map@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.63.0.tgz#bbfdfd2ce317dcccb7d52999d30bdbca69c8086c"
-  integrity sha512-gDa91b9jeZJfzV3f9tq4++AEicrX95+cnvkpXx1f5X+VktQYDUhoTJ/WSCYAZOwoeE1+QC3+TfKpFKWNs1Siqw==
+metro-symbolicate@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.66.2.tgz#addd095ce5f77e73ca21ddb5dfb396ff5d4fa041"
+  integrity sha512-u+DeQHyAFXVD7mVP+GST/894WHJ3i/U8oEJFnT7U3P52ZuLgX8n4tMNxhqZU12RcLR6etF8143aP0Ktx1gFLEQ==
   dependencies:
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
     invariant "^2.2.4"
-    metro-symbolicate "0.63.0"
-    ob1 "0.63.0"
+    metro-source-map "0.66.2"
+    nullthrows "^1.1.1"
     source-map "^0.5.6"
+    through2 "^2.0.1"
     vlq "^1.0.0"
 
-metro-symbolicate@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.58.0.tgz#ba9fd52549c41fc1b656adaad7c8875726dd5abe"
-  integrity sha512-uIVxUQC1E26qOMj13dKROhwAa2FmZk5eR0NcBqej/aXmQhpr8LjJg2sondkoLKUp827Tf/Fm9+pS4icb5XiqCw==
+metro-transform-plugins@0.66.2, metro-transform-plugins@^0.66.0:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.66.2.tgz#39dd044a23b1343e4f2d2ec34d08128cdf255ed4"
+  integrity sha512-KTvqplh0ut7oDKovvDG6yzXM02R6X+9b2oVG+qYq8Zd3aCGTi51ASx4ThCNkAHyEvCuJdYg9fxXTL+j+wvhB5w==
   dependencies:
-    invariant "^2.2.4"
-    metro-source-map "0.58.0"
-    source-map "^0.5.6"
-    through2 "^2.0.1"
-    vlq "^1.0.0"
+    "@babel/core" "^7.14.0"
+    "@babel/generator" "^7.14.0"
+    "@babel/template" "^7.0.0"
+    "@babel/traverse" "^7.14.0"
+    nullthrows "^1.1.1"
 
-metro-symbolicate@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.63.0.tgz#c099605f38a1ff1857712f49d15e7eab743bcc7d"
-  integrity sha512-bJtz+hpHNHtUib9OUzxj/wShRm6p3qG0MtkLJKzWPe9SwxeGUH1mV0IUec4cgJL9csQ2iPMB00OknVH8K1eDaw==
+metro-transform-worker@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.66.2.tgz#0a8455992132c479721accd52c9bd47deb77769e"
+  integrity sha512-dO4PtYOMGB7Vzte8aIzX39xytODhmbJrBYPu+zYzlDjyefJZT7BkZ0LkPIThtyJi96xWcGqi9JBSo0CeRupAHw==
   dependencies:
-    invariant "^2.2.4"
-    metro-source-map "0.63.0"
-    source-map "^0.5.6"
-    through2 "^2.0.1"
-    vlq "^1.0.0"
+    "@babel/core" "^7.14.0"
+    "@babel/generator" "^7.14.0"
+    "@babel/parser" "^7.14.0"
+    "@babel/types" "^7.0.0"
+    babel-preset-fbjs "^3.4.0"
+    metro "0.66.2"
+    metro-babel-transformer "0.66.2"
+    metro-cache "0.66.2"
+    metro-cache-key "0.66.2"
+    metro-hermes-compiler "0.66.2"
+    metro-source-map "0.66.2"
+    metro-transform-plugins "0.66.2"
+    nullthrows "^1.1.1"
 
-metro@0.58.0, metro@^0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/metro/-/metro-0.58.0.tgz#c037318c112f80dc96199780c8b401ab72cfd142"
-  integrity sha512-yi/REXX+/s4r7RjzXht+E+qE6nzvFIrEXO5Q61h+70Q7RODMU8EnlpXx04JYk7DevHuMhFaX+NWhCtRINzR4zA==
+metro@0.66.2, metro@^0.66.1:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/metro/-/metro-0.66.2.tgz#f21759bf00995470e7577b5b88a5277963f24492"
+  integrity sha512-uNsISfcQ3iKKSHoN5Q+LAh0l3jeeg7ZcNZ/4BAHGsk02erA0OP+l2m+b5qYVoPptHz9Oc3KyG5oGJoTu41pWjg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/core" "^7.0.0"
-    "@babel/generator" "^7.5.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/plugin-external-helpers" "^7.0.0"
+    "@babel/core" "^7.14.0"
+    "@babel/generator" "^7.14.0"
+    "@babel/parser" "^7.14.0"
     "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
+    "@babel/traverse" "^7.14.0"
     "@babel/types" "^7.0.0"
     absolute-path "^0.0.0"
+    accepts "^1.3.7"
     async "^2.4.0"
-    babel-preset-fbjs "^3.3.0"
-    buffer-crc32 "^0.2.13"
-    chalk "^2.4.1"
+    chalk "^4.0.0"
     ci-info "^2.0.0"
-    concat-stream "^1.6.0"
     connect "^3.6.5"
     debug "^2.2.0"
     denodeify "^1.2.1"
-    eventemitter3 "^3.0.0"
-    fbjs "^1.0.0"
+    error-stack-parser "^2.0.6"
     fs-extra "^1.0.0"
     graceful-fs "^4.1.3"
+    hermes-parser "0.4.7"
     image-size "^0.6.0"
     invariant "^2.2.4"
-    jest-haste-map "^24.7.1"
-    jest-worker "^24.6.0"
-    json-stable-stringify "^1.0.1"
+    jest-haste-map "^26.5.2"
+    jest-worker "^26.0.0"
     lodash.throttle "^4.1.1"
-    merge-stream "^1.0.1"
-    metro-babel-register "0.58.0"
-    metro-babel-transformer "0.58.0"
-    metro-cache "0.58.0"
-    metro-config "0.58.0"
-    metro-core "0.58.0"
-    metro-inspector-proxy "0.58.0"
-    metro-minify-uglify "0.58.0"
-    metro-react-native-babel-preset "0.58.0"
-    metro-resolver "0.58.0"
-    metro-source-map "0.58.0"
-    metro-symbolicate "0.58.0"
-    mime-types "2.1.11"
+    metro-babel-register "0.66.2"
+    metro-babel-transformer "0.66.2"
+    metro-cache "0.66.2"
+    metro-cache-key "0.66.2"
+    metro-config "0.66.2"
+    metro-core "0.66.2"
+    metro-hermes-compiler "0.66.2"
+    metro-inspector-proxy "0.66.2"
+    metro-minify-uglify "0.66.2"
+    metro-react-native-babel-preset "0.66.2"
+    metro-resolver "0.66.2"
+    metro-runtime "0.66.2"
+    metro-source-map "0.66.2"
+    metro-symbolicate "0.66.2"
+    metro-transform-plugins "0.66.2"
+    metro-transform-worker "0.66.2"
+    mime-types "^2.1.27"
     mkdirp "^0.5.1"
     node-fetch "^2.2.0"
     nullthrows "^1.1.1"
-    resolve "^1.5.0"
     rimraf "^2.5.4"
     serialize-error "^2.1.0"
     source-map "^0.5.6"
-    strip-ansi "^4.0.0"
+    strip-ansi "^6.0.0"
     temp "0.8.3"
-    throat "^4.1.0"
-    wordwrap "^1.0.0"
-    write-file-atomic "^1.2.0"
+    throat "^5.0.0"
     ws "^1.1.5"
-    xpipe "^1.0.5"
-    yargs "^14.2.0"
+    yargs "^15.3.1"
 
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
@@ -6460,15 +6150,7 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
   integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
@@ -6481,58 +6163,34 @@ millisecond@0.1.x:
   resolved "https://registry.yarnpkg.com/millisecond/-/millisecond-0.1.2.tgz#6cc5ad386241cab8e78aff964f87028eec92dac5"
   integrity sha1-bMWtOGJByrjniv+WT4cCjuyS2sU=
 
-mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
-mime-db@~1.23.0:
-  version "1.23.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659"
-  integrity sha1-oxtAcK2uon1zLqMzdApk0OyaZlk=
-
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
-
-mime-types@2.1.11:
-  version "2.1.11"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c"
-  integrity sha1-wlnEcb2oCKhdbNGTtDCl+uRHOzw=
-  dependencies:
-    mime-db "~1.23.0"
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
-  dependencies:
-    mime-db "~1.36.0"
+mime-db@1.50.0, "mime-db@>= 1.43.0 < 2":
+  version "1.50.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+  integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
 
-mime-types@~2.1.24:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.33"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb"
+  integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==
   dependencies:
-    mime-db "1.44.0"
+    mime-db "1.50.0"
 
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.4.1:
-  version "2.4.4"
-  resolved "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.1.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -6544,24 +6202,11 @@ mimic-fn@^2.1.0:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
 minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
@@ -6570,13 +6215,6 @@ minipass@^2.6.0, minipass@^2.9.0:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
-  integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==
-  dependencies:
-    minipass "^2.2.1"
-
 minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -6601,31 +6239,24 @@ mississippi@^3.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
-moment@^2.10.6:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
+moment@^2.19.3:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -6644,21 +6275,21 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0:
+ms@^2.0.0, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 multimatch@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
@@ -6670,16 +6301,6 @@ multimatch@^4.0.0:
     arrify "^2.0.1"
     minimatch "^3.0.4"
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
 mv@~2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
@@ -6698,10 +6319,10 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.10.0, nan@^2.9.2:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
+nan@^2.14.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
+  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6740,26 +6361,12 @@ ndjson@^1.5.0:
     split2 "^2.1.0"
     through2 "^2.0.3"
 
-needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
-  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
-
-neo-async@^2.6.0:
+neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -6774,6 +6381,11 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+nocache@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f"
+  integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==
+
 node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@@ -6797,18 +6409,12 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
 node-fetch@^2.2.0, node-fetch@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
+  integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==
+  dependencies:
+    whatwg-url "^5.0.0"
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -6821,9 +6427,9 @@ node-modules-regexp@^1.0.0:
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
 node-notifier@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
-  integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
+  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.2.0"
@@ -6832,40 +6438,21 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
+node-releases@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.0.tgz#67dc74903100a7deb044037b8a2e5f453bb05400"
+  integrity sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA==
 
 node-stream-zip@^1.9.1:
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.11.3.tgz#223892620b4889bce9782b256a76682631c507be"
-  integrity sha512-GY+9LxkQuIT3O7K8BTdHVGKFcBYBy2vAVcTBtkKpu+OlBef/NSb6VuIWSyLiVDfmLMkggHeRJZN0F3W0GWU/uw==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea"
+  integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==
 
 node-version@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d"
   integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==
 
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6900,11 +6487,6 @@ now-and-later@^2.0.0:
   dependencies:
     once "^1.3.2"
 
-npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
-  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
-
 npm-package-arg@^6.1.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
@@ -6915,14 +6497,6 @@ npm-package-arg@^6.1.0:
     semver "^5.6.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.6:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
-  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
 npm-registry-fetch@^3.9.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.1.tgz#00ff6e4e35d3f75a172b332440b53e93f4cb67de"
@@ -6960,16 +6534,6 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nullthrows@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
@@ -6990,17 +6554,12 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-ob1@0.58.0:
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.58.0.tgz#484a1e9a63a8b79d9ea6f3a83b2a42110faac973"
-  integrity sha512-uZP44cbowAfHafP1k4skpWItk5iHCoRevMfrnUvYCfyNNPPJd3rfDCyj0exklWi2gDXvjlj2ObsfiqP/bs/J7Q==
+ob1@0.66.2:
+  version "0.66.2"
+  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.66.2.tgz#8caf548202cf2688944bae47db405a08bca17a61"
+  integrity sha512-RFewnL/RjE0qQBOuM+2bbY96zmJPIge/aDtsiDbLSb+MOiK8CReAhBHDgL+zrA3F1hQk00lMWpUwYcep750plA==
 
-ob1@0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.63.0.tgz#2f34b178b5918028a0d76072a7b155b91f9cb6bd"
-  integrity sha512-y7AtRIuISHuA5sc0Alcw/Cj2azU1ruuAmJIKSKk//IryxmHtmyA/M5DFcmpDAisaIB255bBt/P9aqc8jr1ocsg==
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7014,12 +6573,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
-
-object-inspect@^1.9.0:
+object-inspect@^1.11.0, object-inspect@^1.9.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
   integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
@@ -7036,13 +6590,13 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
+object.assign@^4.1.0, object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
@@ -7057,23 +6611,22 @@ object.defaults@^1.0.0:
     isobject "^3.0.0"
 
 object.entries@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
-  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
+  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    has "^1.0.3"
+    es-abstract "^1.19.1"
 
 object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
-  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
+  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-abstract "^1.19.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -7091,14 +6644,13 @@ object.reduce@^1.0.0:
     make-iterator "^1.0.0"
 
 object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
+  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-abstract "^1.19.1"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -7127,20 +6679,20 @@ onetime@^2.0.0:
     mimic-fn "^1.0.0"
 
 onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
 open@^6.2.0:
   version "6.4.0"
-  resolved "https://registry.npmjs.org/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
   integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
   dependencies:
     is-wsl "^1.1.0"
 
-optionator@^0.8.1, optionator@^0.8.3:
+optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -7152,6 +6704,18 @@ optionator@^0.8.1, optionator@^0.8.3:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
 options@>=0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
@@ -7174,7 +6738,7 @@ os-homedir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@^3.0.0, os-locale@^3.1.0:
+os-locale@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -7183,12 +6747,12 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4, osenv@^0.1.5:
+osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -7202,24 +6766,24 @@ p-defer@^1.0.0:
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-each-series@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
-  integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
+  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^2.0.0, p-limit@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
@@ -7245,9 +6809,9 @@ p-locate@^4.1.0:
     p-limit "^2.2.0"
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parallel-transform@^1.1.0:
   version "1.2.0"
@@ -7274,13 +6838,13 @@ parse-json@^4.0.0:
     json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f"
-  integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
+    json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
 parse-path@^4.0.0:
@@ -7303,15 +6867,15 @@ parse-url@^6.0.0:
     parse-path "^4.0.0"
     protocols "^1.4.0"
 
-parse5@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+parse5@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -7344,9 +6908,9 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -7358,12 +6922,12 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.2.3:
+picomatch@^2.0.4, picomatch@^2.2.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
   integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
@@ -7406,14 +6970,13 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-plist@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
-  integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==
+plist@^3.0.1, plist@^3.0.2:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe"
+  integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==
   dependencies:
-    base64-js "^1.2.3"
+    base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
-    xmldom "0.1.x"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -7427,6 +6990,11 @@ predefine@0.1.x:
   dependencies:
     extendible "0.1.x"
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -7437,7 +7005,7 @@ prettier@1.19.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-format@^24.7.0, pretty-format@^24.9.0:
+pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
   integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
@@ -7447,45 +7015,25 @@ pretty-format@^24.7.0, pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-pretty-format@^25.1.0, pretty-format@^25.2.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
-  integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
-  dependencies:
-    "@jest/types" "^25.5.0"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
-pretty-format@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.2.tgz#5d896acfdaa09210683d34b6dc0e6e21423cd3e1"
-  integrity sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==
+pretty-format@^26.5.2, pretty-format@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+    react-is "^17.0.1"
 
-process-nextick-args@^2.0.0:
+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
 progress@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-  integrity sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
@@ -7505,32 +7053,17 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
 promise@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz#f592e099c6cddc000d538ee7283bb190452b0bf6"
-  integrity sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e"
+  integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==
   dependencies:
     asap "~2.0.6"
 
-prompts@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.2.tgz#094119b0b0a553ec652908b583205b9867630154"
-  integrity sha512-Pc/c53d2WZHJWZr78/BhZ5eHsdQtltbyBjHoA4T0cs/4yKJqCcoOHrq2SNKwtspVE0C+ebqAR5u0/mXwrHaADQ==
-  dependencies:
-    kleur "^3.0.2"
-    sisteransi "^1.0.0"
-
-prompts@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
-  integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
+prompts@^2.0.1, prompts@^2.3.0, prompts@^2.4.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
   dependencies:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
@@ -7553,12 +7086,13 @@ prop-types@^15.7.2:
     react-is "^16.8.1"
 
 proper-lockfile@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-3.0.2.tgz#d30b3b83ecb157e08fe0d411f2393bc384b77ad1"
-  integrity sha512-SDrSRyuKE1jM9b2kdpL6SA78wgG+M+fZKe2zbWkURsshOzUmoOornXQcasKQRP9hGhMoEILNpSbWcYoymoB5cA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-3.2.0.tgz#89ca420eea1d55d38ca552578851460067bcda66"
+  integrity sha512-iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==
   dependencies:
     graceful-fs "^4.1.11"
-    retry "^0.10.1"
+    retry "^0.12.0"
+    signal-exit "^3.0.2"
 
 protocols@^1.1.0, protocols@^1.4.0:
   version "1.4.8"
@@ -7570,7 +7104,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.28:
+psl@^1.1.28, psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -7637,43 +7171,33 @@ ramda@^0.27.1:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9"
   integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==
 
-range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-react-devtools-core@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.6.0.tgz#2443b3c6fac78b801702af188abc6d83d56224e6"
-  integrity sha512-sjR3KC5VvGV7X6vzR3OTutPT5VeBcSKwoIXUwihpl1Nb4dkmweEbzCTPx2PYMVAqc+NZ5tPGhqBzXV+iGg5CNA==
+react-devtools-core@^4.13.0:
+  version "4.20.2"
+  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.20.2.tgz#0be500c80e09b640a2ee57f5ad5407e53bff6651"
+  integrity sha512-ep2j84M1ZtDFWsTtFrKyLyg4GEbnw4gFj/8brA+BZtsINgKHhWEVzscz5E/bFWRdyTM8mWdcaKQAk2hR+IezPw==
   dependencies:
     shell-quote "^1.6.1"
     ws "^7"
 
-react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4:
+"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.1, react-is@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
+
+react-is@^16.8.1, react-is@^16.8.4:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
-  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
-
 react-refresh@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.0.tgz#d421f9bd65e0e4b9822a399f14ac56bda9c92292"
-  integrity sha512-bacjSio8GOtzNZKZZM6EWqbhlbb6pr28JWJWFTLwEBKvPIBRo6/Ob68D2EWZA2VyTdQxAh+TRnCYOPNKsQiXTA==
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.3.tgz#966f1750c191672e76e16c2efa569150cc73ab53"
+  integrity sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==
 
 react-shallow-renderer@16.14.1, react-shallow-renderer@^16.13.1:
   version "16.14.1"
@@ -7683,20 +7207,20 @@ react-shallow-renderer@16.14.1, react-shallow-renderer@^16.13.1:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0"
 
-react-test-renderer@17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.1.tgz#3187e636c3063e6ae498aedf21ecf972721574c7"
-  integrity sha512-/dRae3mj6aObwkjCcxZPlxDFh73XZLgvwhhyON2haZGUEhiaY5EjfAdw+d/rQmlcFwdTpMXCSGVk374QbCTlrA==
+react-test-renderer@17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c"
+  integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==
   dependencies:
     object-assign "^4.1.1"
-    react-is "^17.0.1"
+    react-is "^17.0.2"
     react-shallow-renderer "^16.13.1"
-    scheduler "^0.20.1"
+    scheduler "^0.20.2"
 
-react@17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
-  integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
+react@17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
+  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7728,7 +7252,7 @@ read-yaml-file@^2.0.0:
     js-yaml "^4.0.0"
     strip-bom "^4.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7741,27 +7265,18 @@ read-yaml-file@^2.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
+readline@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c"
+  integrity sha1-xYDXfvLPyHUrEySYBg3JeTp6wBw=
 
 recast@^0.20.3:
-  version "0.20.3"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.3.tgz#ac9387e4a59e5c8caef9057a35e306646287a7ef"
-  integrity sha512-jrEPzRV5B7wfRiN0UYMtjgIx1Hp8MRHdLcMYqMNd0DoOe1CB5JmPL/04I7WPuuApCs7LCSisYK/FfKnPEaJrzw==
+  version "0.20.5"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae"
+  integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==
   dependencies:
-    ast-types "0.14.1"
+    ast-types "0.14.2"
     esprima "~4.0.0"
-    private "^0.1.8"
     source-map "~0.6.1"
     tslib "^2.0.1"
 
@@ -7779,30 +7294,29 @@ redeyed@~2.1.0:
   dependencies:
     esprima "~4.0.0"
 
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
   dependencies:
-    regenerate "^1.4.0"
+    regenerate "^1.4.2"
 
-regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+regenerate@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
 regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -7812,45 +7326,40 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+regexp.prototype.flags@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 regexpp@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+regexpu-core@^4.7.1:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^9.0.0"
+    regjsgen "^0.5.2"
+    regjsparser "^0.7.0"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
 
-regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+regjsgen@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
-regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+regjsparser@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -7860,32 +7369,16 @@ remove-trailing-separator@^1.0.1:
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-promise-core@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
-  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
-  dependencies:
-    lodash "^4.17.15"
-
-request-promise-native@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
-  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
-  dependencies:
-    request-promise-core "1.1.3"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@2.x.x, request@^2.85.0, request@^2.88.2:
+request@2.x.x, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -7953,12 +7446,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
-  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.8.1:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
-    is-core-module "^2.0.0"
+    is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
 restore-cursor@^2.0.0:
@@ -7969,37 +7462,34 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry@^0.10.0, retry@^0.10.1:
+retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1:
+rimraf@2.6.3, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.6.3:
+rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -8025,15 +7515,10 @@ rimraf@~2.4.0:
   dependencies:
     glob "^6.0.1"
 
-rsvp@^3.3.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
-  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
-
-run-async@^2.2.0, run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-parallel-limit@^1.0.5:
   version "1.1.0"
@@ -8056,38 +7541,12 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-
-rxjs@^5.4.3:
-  version "5.5.12"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc"
-  integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==
-  dependencies:
-    symbol-observable "1.0.1"
-
-rxjs@^6.6.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.1.1, safe-buffer@^5.2.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8104,19 +7563,19 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sane@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.3.tgz#e878c3f19e25cc57fbb734602f48f8a97818b181"
-  integrity sha512-hSLkC+cPHiBQs7LSyXkotC3UUtyn8C4FMn50TNaacRyvBlI+3ebcxMpqckmTdtXVtel87YS7GXN3UIOj7NiGVQ==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
   dependencies:
     "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
-    capture-exit "^1.2.0"
+    capture-exit "^2.0.0"
     exec-sh "^0.3.2"
     execa "^1.0.0"
     fb-watchman "^2.0.0"
@@ -8125,33 +7584,33 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sanitize-filename@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
-  integrity sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
+  integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sax@^1.2.1, sax@^1.2.4:
+sax@^1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^5.0.0:
+saxes@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
   integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
-  integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
+scheduler@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
+  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -8161,32 +7620,32 @@ semver@2.2.x:
   resolved "https://registry.yarnpkg.com/semver/-/semver-2.2.1.tgz#7941182b3ffcc580bff1c17942acdf7951c0d213"
   integrity sha1-eUEYKz/8xYC/8cF5QqzfeVHA0hM=
 
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.3, semver@^7.3.4, semver@^7.3.5:
+semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
   integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -8195,12 +7654,12 @@ send@0.16.2:
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
     on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
 
 serialize-error@^2.1.0:
   version "2.1.0"
@@ -8208,49 +7667,41 @@ serialize-error@^2.1.0:
   integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=
 
 serve-static@^1.13.1:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -8276,7 +7727,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@1.6.1, shell-quote@^1.6.1:
+shell-quote@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
   integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
@@ -8286,6 +7737,11 @@ shell-quote@1.6.1, shell-quote@^1.6.1:
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
+shell-quote@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
+
 shell-utils@^1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/shell-utils/-/shell-utils-1.0.10.tgz#7fe7b8084f5d6d21323d941267013bc38aed063e"
@@ -8307,14 +7763,6 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-side-channel@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
-  integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
-  dependencies:
-    es-abstract "^1.18.0-next.0"
-    object-inspect "^1.8.0"
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -8325,9 +7773,9 @@ side-channel@^1.0.4:
     object-inspect "^1.9.0"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f"
+  integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
 
 signedsource@^1.0.0:
   version "1.0.0"
@@ -8335,29 +7783,19 @@ signedsource@^1.0.0:
   integrity sha1-HdrOSYF5j5O9gzlzgD2A1S6TrWo=
 
 simple-plist@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.0.0.tgz#bed3085633b22f371e111f45d159a1ccf94b81eb"
-  integrity sha512-043L2rO80LVF7zfZ+fqhsEkoJFvW8o59rt/l4ctx1TJWoTx7/jkiS1R5TatD15Z1oYnuLJytzE7gcnnBuIPL2g==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.1.1.tgz#54367ca28bc5996a982c325c1c4a4c1a05f4047c"
+  integrity sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==
   dependencies:
-    bplist-creator "0.0.7"
-    bplist-parser "0.1.1"
+    bplist-creator "0.0.8"
+    bplist-parser "0.2.0"
     plist "^3.0.1"
 
-sisteransi@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
-  integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ==
-
-sisteransi@^1.0.5:
+sisteransi@^1.0.0, sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -8372,11 +7810,6 @@ slice-ansi@^2.0.0, slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
-slide@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
-
 smart-buffer@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
@@ -8429,11 +7862,11 @@ socks@~2.3.2:
     smart-buffer "^4.1.0"
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
@@ -8447,17 +7880,17 @@ source-map-support@0.5.0:
     source-map "^0.6.0"
 
 source-map-support@^0.5.16, source-map-support@^0.5.6:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
@@ -8475,30 +7908,30 @@ source-map@^0.7.3:
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b"
+  integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==
 
 split-on-first@^1.0.0:
   version "1.1.0"
@@ -8525,9 +7958,9 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.1.tgz#b79a089a732e346c6e0714830f36285cd38191a2"
-  integrity sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -8546,22 +7979,24 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-stack-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
-  integrity sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=
-
 stack-utils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593"
-  integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
+  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
   dependencies:
     escape-string-regexp "^2.0.0"
 
+stackframe@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303"
+  integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==
+
 stacktrace-parser@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e"
-  integrity sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4=
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a"
+  integrity sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==
+  dependencies:
+    type-fest "^0.7.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -8571,26 +8006,11 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 stream-buffers@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
@@ -8620,9 +8040,9 @@ strict-uri-encode@^2.0.0:
   integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
 
 string-length@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
-  integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
@@ -8636,7 +8056,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8654,41 +8074,43 @@ string-width@^3.0.0, string-width@^3.1.0:
     strip-ansi "^5.1.0"
 
 string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
 string.prototype.matchall@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
-  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
+  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    has-symbols "^1.0.1"
-    internal-slot "^1.0.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.2"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.3.1"
+    side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
-  integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
 
-string.prototype.trimstart@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
-  integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
 
 string_decoder@~1.1.1:
   version "1.1.1"
@@ -8718,12 +8140,12 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
 strip-bom@^4.0.0:
   version "4.0.0"
@@ -8740,20 +8162,15 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@^3.0.1:
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 sudo-prompt@^9.0.0:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.1.1.tgz#73853d729770392caec029e2470db9c221754db0"
-  integrity sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz#77efb84309c9ca489527a4e749f287e6bdd52afd"
+  integrity sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==
 
 supports-color@^5.0.0, supports-color@^5.3.0:
   version "5.5.0"
@@ -8762,17 +8179,10 @@ supports-color@^5.0.0, supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
@@ -8785,18 +8195,13 @@ supports-hyperlinks@^1.0.1:
     supports-color "^5.0.0"
 
 supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
-  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
+  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
-symbol-observable@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
-
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -8813,22 +8218,9 @@ table@^5.2.3:
     string-width "^3.0.0"
 
 tail@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tail/-/tail-2.0.2.tgz#86073f3a9a568807b7fd886897a7350314275b5f"
-  integrity sha512-raFipiKWdGKEzxbvZwnhUGqjvsv0gpa/1A479rL//NOxnNwYZDN4MPk6xJJdUFs8P2Xrff3nbH5fcyYRLU4UHQ==
-
-tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.4.tgz#90dd4c5a174a3fa39dcb65a1df1950a4a0093a41"
+  integrity sha512-PX8klSxW1u3SdgDrDeewh5GNE+hkJ4h02JvHfV6YrHqWOVJ88nUdSQqtsUf/gWhgZlPAws3fiZ+F1f8euspcuQ==
 
 tar@^4.4.8:
   version "4.4.19"
@@ -8855,7 +8247,7 @@ temp-dir@^1.0.0:
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
   integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
 
-temp@0.8.3, temp@^0.8.1:
+temp@0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
   integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
@@ -8863,6 +8255,13 @@ temp@0.8.3, temp@^0.8.1:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
+temp@^0.8.1:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
+  integrity sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==
+  dependencies:
+    rimraf "~2.6.2"
+
 tempfile@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
@@ -8912,11 +8311,6 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-throat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
-  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
-
 throat@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
@@ -8930,7 +8324,7 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-"through@>=2.2.7 <3", through@^2.3.6:
+"through@>=2.2.7 <3":
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -8940,17 +8334,10 @@ timsort@~0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
@@ -8989,12 +8376,26 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
+tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -9002,21 +8403,17 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+tr46@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
   dependencies:
-    ip-regex "^2.1.0"
-    psl "^1.1.28"
     punycode "^2.1.1"
 
-tr46@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
-  dependencies:
-    punycode "^2.1.1"
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
@@ -9025,15 +8422,15 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
-  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
 tsutils@^3.21.0:
   version "3.21.0"
@@ -9054,6 +8451,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -9066,16 +8470,21 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
+type-fest@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48"
+  integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==
+
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -9103,20 +8512,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
-  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
-
 typescript@4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86"
   integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==
 
-ua-parser-js@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
-  integrity sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==
+typescript@4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
+  integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
 
 uglify-es@^3.1.9:
   version "3.3.9"
@@ -9127,9 +8531,9 @@ uglify-es@^3.1.9:
     source-map "~0.6.1"
 
 uglify-js@^3.1.4:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.2.tgz#d7dd6a46ca57214f54a2d0a43cad0f35db82ac99"
-  integrity sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==
+  version "3.14.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz#c0f25dfea1e8e5323eccf59610be08b6043c15cf"
+  integrity sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g==
 
 ultron@1.0.x:
   version "1.0.2"
@@ -9141,6 +8545,16 @@ ultron@~1.1.0:
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
   integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
 undertaker-registry@^1.0.0, undertaker-registry@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
@@ -9162,38 +8576,38 @@ undertaker@^1.2.1:
     object.reduce "^1.0.0"
     undertaker-registry "^1.0.0"
 
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
-  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 unique-filename@^1.1.1:
   version "1.1.1"
@@ -9209,7 +8623,7 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-universalify@^0.1.0:
+universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -9233,9 +8647,9 @@ unset-value@^1.0.0:
     isobject "^3.0.0"
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -9245,9 +8659,11 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 use-subscription@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.0.0.tgz#25ed2161f75e9f6bd8c5c4acfe6087bfebfbfef4"
-  integrity sha512-PkDL9KSMN01nJYfa5c8O7Qbs7lmpzirfRWhWfIQN053hbIj5s1o5L7hrTzCfCCO2FsN2bKrU7ciRxxRcinmxAA==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1"
+  integrity sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==
+  dependencies:
+    object-assign "^4.1.1"
 
 use@^3.1.0:
   version "3.1.1"
@@ -9274,12 +8690,7 @@ uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.3.0:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
-
-uuid@^8.3.1:
+uuid@^8.3.0, uuid@^8.3.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -9289,10 +8700,10 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-to-istanbul@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5"
-  integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==
+v8-to-istanbul@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
+  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -9337,11 +8748,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vlq@^0.2.1:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
-  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
-
 vlq@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468"
@@ -9375,6 +8781,11 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
 webidl-conversions@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
@@ -9399,24 +8810,43 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+whatwg-fetch@^3.0.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
+  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
 
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.0.0.tgz#37f256cb746398e19b107bd6ef820b4ae2d15871"
-  integrity sha512-41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ==
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.0"
-    webidl-conversions "^5.0.0"
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
+  dependencies:
+    lodash "^4.7.0"
+    tr46 "^2.1.0"
+    webidl-conversions "^6.1.0"
+
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
 
 which-module@^2.0.0:
   version "2.0.0"
@@ -9437,14 +8867,7 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-word-wrap@~1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -9502,19 +8925,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^1.2.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
-  integrity sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    slide "^1.1.5"
-
 write-file-atomic@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -9555,21 +8969,21 @@ ws@^3.3.1:
     ultron "~1.1.0"
 
 ws@^6.1.4:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7, ws@^7.2.3:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
-  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
+ws@^7, ws@^7.4.6:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+  integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
 
 xcode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xcode/-/xcode-2.0.0.tgz#134f1f94c26fbfe8a9aaa9724bfb2772419da1a2"
-  integrity sha512-5xF6RCjAdDEiEsbbZaS/gBRt3jZ/177otZcpoLCjGN/u1LrfgH7/Sgeeavpr/jELpyDqN2im3AKosl2G2W8hfw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/xcode/-/xcode-2.1.0.tgz#bab64a7e954bb50ca8d19da7e09531c65a43ecfe"
+  integrity sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==
   dependencies:
     simple-plist "^1.0.0"
     uuid "^3.3.2"
@@ -9601,47 +9015,22 @@ xmldoc@^1.1.2:
   dependencies:
     sax "^1.2.1"
 
-xmldom@0.1.x:
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
-
-xpipe@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf"
-  integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98=
-
-xtend@^4.0.0:
+xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-"y18n@^3.2.1 || ^4.0.0":
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
-y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
-
-yallist@^3.1.1:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
@@ -9664,18 +9053,10 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
-  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
-  integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==
+yargs-parser@^13.0.0, yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -9712,29 +9093,11 @@ yargs@^12.0.5:
     yargs-parser "^11.1.1"
 
 yargs@^13.0.0:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
-  dependencies:
-    cliui "^4.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.0.0"
-
-yargs@^14.2.0:
-  version "14.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3"
-  integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
   dependencies:
     cliui "^5.0.0"
-    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"
@@ -9743,7 +9106,7 @@ yargs@^14.2.0:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^15.0.0"
+    yargs-parser "^13.1.2"
 
 yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1:
   version "15.4.1"